old

Package-Manager: portage-2.1_pre3-r1

8 files changed, 11 insertions, 336 deletions

diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 177ab13e9b15..f89166d15d9c 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d7179d0b79fdc01831668bf6e27d2efb ChangeLog 8920
+MD5 05ebbcad45030e806f8be710defa0aac files/digest-net-tools-1.60-r11 145
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 525ce366a2cad86e72c01e2cfe84ef2c net-tools-1.60-r11.ebuild 2103
-MD5 f2d060ba7da394a61bdd8510cd205b6b net-tools-1.60-r9.ebuild 3311
-MD5 21723cf8906d7431823260022ba2bb12 files/1.60-gcc34.patch 712
-MD5 f8edd79687cbd930b5a5d749b3d8b4f1 files/1.60-man.patch 987
-MD5 05ebbcad45030e806f8be710defa0aac files/digest-net-tools-1.60-r11 145
-MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r9 148
-MD5 51de6eabe2d6d6dc860f72c41cee636b files/net-tools-1.60-2.6-compilefix.patch 784
-MD5 e98da89f3a64d4842946223b199fd5c7 files/net-tools-1.60-cleanup-list-handling.patch 1322
-MD5 492e3dfd36d8f80cfd73ef58dcb2082e files/net-tools-1.60-get_name.patch 1608
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDyIli2+ySkm8kpY0RAuKBAJ4sFwz/N2nQKcsxX4UFM6QzLool1QCeJ8SH
+5mHmZnXkT4+9ZWbnWP2FOhU=
+=ExYa
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/files/1.60-gcc34.patch b/sys-apps/net-tools/files/1.60-gcc34.patch
deleted file mode 100644
index 87a5a75bf6c9..000000000000
--- a/sys-apps/net-tools/files/1.60-gcc34.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./hostname.c.orig	2001-04-08 17:04:23.000000000 +0000
-+++ ./hostname.c	2004-04-17 01:31:11.686122040 +0000
-@@ -98,6 +98,7 @@
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
- 	default:
-+	;
- 	}
- 	exit(1);
-     };
-@@ -117,6 +118,7 @@
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
- 	default:
-+	;
- 	}
- 	exit(1);
-     };
-@@ -174,6 +176,7 @@
- 	printf("%s\n", hp->h_name);
- 	break;
-     default:
-+    ;
-     }
- }
- 
---- ./lib/inet_sr.c.orig	2000-02-20 21:46:45.000000000 +0000
-+++ ./lib/inet_sr.c	2004-04-17 01:31:02.388535488 +0000
-@@ -105,6 +105,7 @@
-     case 2:
-        isnet = 0; break;
-     default:
-+    ;
-     }
- 
-     /* Fill in the other fields. */
diff --git a/sys-apps/net-tools/files/1.60-man.patch b/sys-apps/net-tools/files/1.60-man.patch
deleted file mode 100644
index 61e53416a9f0..000000000000
--- a/sys-apps/net-tools/files/1.60-man.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-splite writes:
-The netstat(8) man page in sys-apps/net-tools states that the "-i" and
-"--interfaces" flags to netstat take an optional argument denoting a 
-particular interface when it in fact does not.
-
-http://bugs.gentoo.org/show_bug.cgi?id=29677
-
---- man/en_US/netstat.8.orig	2003-09-26 10:08:19.000000000 -0500
-+++ man/en_US/netstat.8	2003-09-26 10:25:39.000000000 -0500
-@@ -44,7 +44,6 @@
- .P
- .B netstat
- .RB { \-\-interfaces | \-i }
--.RI [ iface ]
- .RB [ \-\-all | \-a ]
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-verbose | \-v ]
-@@ -107,9 +106,8 @@
- Display the kernel routing tables.
- .SS "\-\-groups , \-g"
- Display multicast group membership information for IPv4 and IPv6.
--.SS "\-\-interface=\fIiface \fR, \fB\-i"
--Display a table of all network interfaces, or the specified
--.IR iface ) .
-+.SS "\-\-interface , \-i"
-+Display a table of all network interfaces.
- .SS "\-\-masquerade , \-M"
- Display a list of masqueraded connections.
- .SS "\-\-statistics , \-s"
diff --git a/sys-apps/net-tools/files/digest-net-tools-1.60-r9 b/sys-apps/net-tools/files/digest-net-tools-1.60-r9
deleted file mode 100644
index 0a4ac9ee6c4e..000000000000
--- a/sys-apps/net-tools/files/digest-net-tools-1.60-r9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 888774accab40217dde927e21979c165 net-tools-1.60.tar.bz2 198520
-MD5 d733ef8b0bad3dbd0cf98e14b45fe1a6 net-tools-1.60-gentoo-extra-1.tar.bz2 10370
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
deleted file mode 100644
index 92ce90128458..000000000000
--- a/sys-apps/net-tools/files/net-tools-1.60-2.6-compilefix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/files/net-tools-1.60-cleanup-list-handling.patch b/sys-apps/net-tools/files/net-tools-1.60-cleanup-list-handling.patch
deleted file mode 100644
index d8971585fcaa..000000000000
--- a/sys-apps/net-tools/files/net-tools-1.60-cleanup-list-handling.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -u -r1.1 -r1.3
---- nameif.c	18 Oct 2000 17:26:29 -0000	1.1
-+++ nameif.c	6 Mar 2003 23:26:52 -0000	1.3
-@@ -117,7 +117,8 @@
- }
- 
- struct change { 
--	struct change *next,**pprev;
-+	struct change *next;
-+	int found;
- 	char ifname[IFNAMSIZ+1];
- 	unsigned char mac[6];
- }; 
-@@ -139,10 +140,7 @@
- 			ch->ifname, pos); 
- 	if (parsemac(p,ch->mac) < 0) 
- 		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
--	if (clist) 
--		clist->pprev = &ch->next;
- 	ch->next = clist;
--	ch->pprev = &clist;
- 	clist = ch;
- 	return 0; 
- }
-@@ -200,7 +198,7 @@
- 
- void usage(void)
- {
--	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
-+	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); 
- 	exit(1); 
- }
- 
-@@ -277,21 +275,21 @@
- 		ch = lookupmac(mac); 
- 		if (!ch) 
- 			continue;
--			
--		*ch->pprev = ch->next;
-+		
-+		ch->found = 1;	
- 		if (strcmp(p, ch->ifname)) { 
- 			if (setname(p, ch->ifname) < 0)  
- 				complain(_("cannot change name of %s to %s: %s"),
- 						p, ch->ifname, strerror(errno)); 
- 		} 
--		free(ch);
- 	} 
- 	fclose(ifh); 
- 	
- 	while (clist) { 
- 		struct change *ch = clist;
- 		clist = clist->next;
--		warning(_("interface '%s' not found"), ch->ifname); 
-+		if (!ch->found)
-+			warning(_("interface '%s' not found"), ch->ifname); 
- 		free(ch); 
- 	}
-
-
-
diff --git a/sys-apps/net-tools/files/net-tools-1.60-get_name.patch b/sys-apps/net-tools/files/net-tools-1.60-get_name.patch
deleted file mode 100644
index 1371c672ce0e..000000000000
--- a/sys-apps/net-tools/files/net-tools-1.60-get_name.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nrup net-tools-1.60.orig/lib/interface.c net-tools-1.60/lib/interface.c
---- net-tools-1.60.orig/lib/interface.c	2004-08-12 05:54:09.000000000 -0400
-+++ net-tools-1.60/lib/interface.c	2004-08-12 06:03:20.000000000 -0400
-@@ -203,28 +203,34 @@ out:
- 
- static char *get_name(char *name, char *p)
- {
--    while (isspace(*p))
--	p++;
--    while (*p) {
--	if (isspace(*p))
--	    break;
--	if (*p == ':') {	/* could be an alias */
--	    char *dot = p, *dotname = name;
--	    *name++ = *p++;
--	    while (isdigit(*p))
--		*name++ = *p++;
--	    if (*p != ':') {	/* it wasn't, backup */
--		p = dot;
--		name = dotname;
--	    }
--	    if (*p == '\0')
--		return NULL;
--	    p++;
--	    break;
-+    /* Extract <name>[:<alias>] from nul-terminated p where p matches
-+       <name>[:<alias>]: after leading whitespace.
-+       If match is not made, set name empty and return unchanged p */
-+    int namestart=0, nameend=0, aliasend;
-+    while (isspace(p[namestart]))
-+	namestart++;
-+    nameend=namestart;
-+    while (p[nameend] && p[nameend]!=':' && !isspace(p[nameend]))
-+	nameend++;
-+    if (p[nameend]==':') {
-+	aliasend=nameend+1;
-+	while (p[aliasend] && isdigit(p[aliasend]))
-+	    aliasend++;
-+	if (p[aliasend]==':') {
-+	    nameend=aliasend;
-+	}
-+	if ((nameend-namestart)<IFNAMSIZ) {
-+	    memcpy(name,&p[namestart],nameend-namestart);
-+	    name[nameend-namestart]='\0';
-+	    p=&p[nameend+1];
-+	} else {
-+	    /* Interface name too large */
-+	    name[0]='\0';
- 	}
--	*name++ = *p++;
-+    } else {
-+      /* first ':' not found - return empty */
-+      name[0]='\0';
-     }
--    *name++ = '\0';
-     return p;
- }
- 
diff --git a/sys-apps/net-tools/net-tools-1.60-r9.ebuild b/sys-apps/net-tools/net-tools-1.60-r9.ebuild
deleted file mode 100644
index 78030870123c..000000000000
--- a/sys-apps/net-tools/net-tools-1.60-r9.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r9.ebuild,v 1.16 2005/05/30 02:42:32 solar Exp $
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="Standard Linux networking tools"
-HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
-SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-extra-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls build static"
-
-RDEPEND=""
-DEPEND="nls? ( sys-devel/gettext )
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	PATCHDIR=${WORKDIR}/${P}-gentoo
-
-	unpack ${A}
-	cd ${S}
-
-	# Compile fix for 2.6 kernels
-	epatch ${FILESDIR}/net-tools-1.60-2.6-compilefix.patch
-	epatch ${FILESDIR}/${PV}-gcc34.patch #48167
-	epatch ${FILESDIR}/net-tools-1.60-cleanup-list-handling.patch
-
-	# Stack smashing attack in if_readlist_proc() from ifconfig - bug #58633
-	epatch ${FILESDIR}/net-tools-1.60-get_name.patch
-
-	# some redhat patches
-	epatch ${PATCHDIR}/net-tools-1.54-ipvs.patch
-	epatch ${PATCHDIR}/net-tools-1.57-bug22040.patch
-	epatch ${PATCHDIR}/net-tools-1.60-manydevs.patch
-	epatch ${PATCHDIR}/net-tools-1.60-miiioctl.patch
-	epatch ${PATCHDIR}/net-tools-1.60-virtualname.patch
-	epatch ${PATCHDIR}/net-tools-1.60-cycle.patch
-
-	# GCC-3.3 Compile Fix
-	epatch ${PATCHDIR}/${P}-multiline-string.patch
-
-	# manpage fix #29677
-	epatch ${FILESDIR}/${PV}-man.patch
-
-	cp ${PATCHDIR}/net-tools-1.60-config.h config.h
-	cp ${PATCHDIR}/net-tools-1.60-config.make config.make
-
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-
-	sed -i \
-		-e 's/^libdir:/libdir: version.h/' \
-		-e "s:-O2 -Wall -g:${CFLAGS}:" \
-		-e "/^LOPTS =/ s/\$/${CFLAGS}/" Makefile \
-		|| die "sed Makefile failed"
-
-	sed -i -e "s:/usr/man:/usr/share/man:" man/Makefile \
-		|| die "sed man/Makefile failed"
-
-	if ! use elibc_uclibc ; then
-		cp -f ${PATCHDIR}/ether-wake.c ${S}
-		cp -f ${PATCHDIR}/ether-wake.8 ${S}/man/en_US
-	fi
-
-	if ! use nls ; then
-		sed -i -e 's:\(#define I18N\) 1:\1 0:' config.h || \
-			die "sed config.h failed"
-
-		sed -i -e 's:I18N=1:I18N=0:' config.make ||
-			die "sed config.make failed"
-	fi
-
-	touch config.{h,make}		# sync timestamps
-}
-
-src_compile() {
-	# configure shouldn't run anymore so bug #820 shouldn't apply...
-	tc-export CC
-	emake libdir || die "emake libdir failed"
-	emake || die "emake failed"
-
-	if use nls ; then
-		emake i18ndir || die "emake i18ndir failed"
-	fi
-
-	if ! use elibc_uclibc ; then
-		$(tc-getCC) ${CFLAGS} -o ether-wake ether-wake.c || die "ether-wake failed to build"
-	fi
-}
-
-src_install() {
-	make BASEDIR="${D}" install || die "make install failed"
-
-	if ! use elibc_uclibc ; then
-		dosbin ether-wake || die "dosbin failed"
-	fi
-	mv ${D}/bin/* ${D}/sbin || die "mv failed"
-	mv ${D}/sbin/{hostname,domainname,netstat,dnsdomainname,ypdomainname,nisdomainname} ${D}/bin \
-		|| die "mv failed"
-	use elibc_uclibc && rm -f ${D}/bin/{yp,nis}domainname
-	dodir /usr/bin
-	dosym /bin/hostname /usr/bin/hostname
-
-	if ! use build
-	then
-		dodoc README README.ipv6 TODO
-	else
-		#only install /bin/hostname
-		rm -rf ${D}/usr ${D}/sbin
-		rm -f ${D}/bin/{domainname,netstat,dnsdomainname}
-		rm -f ${D}/bin/{ypdomainname,nisdomainname}
-	fi
-}