diff options
| -rw-r--r-- | sys-apps/net-tools/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/net-tools/Manifest | 9 | ||||
| -rw-r--r-- | sys-apps/net-tools/files/net-tools-1.60-2.6-compilefix.patch | 23 | ||||
| -rw-r--r-- | sys-apps/net-tools/net-tools-1.60-r7.ebuild | 5 |
4 files changed, 38 insertions, 6 deletions
diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog index 10d038bcc865..9e441b9a365b 100644 --- a/sys-apps/net-tools/ChangeLog +++ b/sys-apps/net-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/net-tools # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.24 2003/09/29 17:01:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.25 2003/10/19 11:39:59 plasmaroo Exp $ + + 19 Oct 2003; <plasmaroo@gentoo.org> net-tools-1.60-r7.ebuild, + files/net-tools-1.60-2.6-compilefix.patch: + Added patch to get net-tools to go on 2.6 headers: Bug #31240. + Thanks to Peter Gnodde <peter@gnodde.org> for the patch. *net-tools-1.60-r7 (18 May 2003) diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest index e1f76d6e3764..3256a06083bb 100644 --- a/sys-apps/net-tools/Manifest +++ b/sys-apps/net-tools/Manifest @@ -1,6 +1,7 @@ -MD5 1d1fe012725b8b4031d10a4b9607aba5 net-tools-1.60-r7.ebuild 2731 +MD5 29f6a9d3f77bc5ed07b0e3ec866f6bc1 ChangeLog 4630 +MD5 5def3c4872281507527dbab0dd68dba4 net-tools-1.60-r7.ebuild 2823 +MD5 7bdacc97b3764bb0d409c3c6b7beb1a7 net-tools-1.60-r6.ebuild 2278 MD5 3d8683073f95e3da2c596bb09c1cbb89 files/1.60-man.patch 737 -MD5 a959c1cde872578cac11854c55ab9d55 files/digest-net-tools-1.60-r6 145 MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r7 148 -MD5 7bdacc97b3764bb0d409c3c6b7beb1a7 net-tools-1.60-r6.ebuild 2278 -MD5 d099361c4c7353156429c2373fa08bab ChangeLog 4393 +MD5 a959c1cde872578cac11854c55ab9d55 files/digest-net-tools-1.60-r6 145 +MD5 51de6eabe2d6d6dc860f72c41cee636b files/net-tools-1.60-2.6-compilefix.patch 784 diff --git a/sys-apps/net-tools/files/net-tools-1.60-2.6-compilefix.patch b/sys-apps/net-tools/files/net-tools-1.60-2.6-compilefix.patch new file mode 100644 index 000000000000..92ce90128458 --- /dev/null +++ b/sys-apps/net-tools/files/net-tools-1.60-2.6-compilefix.patch @@ -0,0 +1,23 @@ +diff -ruN net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c +--- net-tools-1.60.orig/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200 ++++ net-tools-1.60/lib/x25_sr.c 2003-10-18 20:33:31.927574928 +0200 +@@ -22,6 +22,7 @@ + #include <sys/socket.h> + #include <sys/ioctl.h> + #include <linux/x25.h> ++#include <linux/version.h> + #include <ctype.h> + #include <errno.h> + #include <netdb.h> +@@ -77,7 +78,11 @@ + rt.sigdigits=sigdigits; + + /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) + memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); ++#else ++ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address)); ++#endif + + while (*args) { + if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { diff --git a/sys-apps/net-tools/net-tools-1.60-r7.ebuild b/sys-apps/net-tools/net-tools-1.60-r7.ebuild index 5ad5d9865964..3b879ec8433d 100644 --- a/sys-apps/net-tools/net-tools-1.60-r7.ebuild +++ b/sys-apps/net-tools/net-tools-1.60-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r7.ebuild,v 1.9 2003/09/29 17:01:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r7.ebuild,v 1.10 2003/10/19 11:39:59 plasmaroo Exp $ inherit eutils @@ -29,6 +29,9 @@ src_unpack() { unpack ${A} cd ${S} + # Compile fix for 2.6 kernels + epatch ${FILESDIR}/net-tools-1.60-2.6-compilefix.patch + # some redhat patches epatch ${PATCHDIR}/net-tools-1.54-ipvs.patch epatch ${PATCHDIR}/net-tools-1.57-bug22040.patch |