old, specially the ones still pulling in obsolete sys-fs/sysfsutils

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

8 files changed, 9 insertions, 398 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 7e663a50d566..1912cb456292 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/iputils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.105 2012/02/13 09:54:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.106 2012/04/20 19:56:55 ssuominen Exp $
+
+  20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/iputils-20070202-makefile.patch, -iputils-20100418-r1.ebuild,
+  -files/iputils-20100418-arping-broadcast.patch,
+  -files/iputils-20100418-ping-CVE-2010-2529.patch, -iputils-20101006.ebuild,
+  -iputils-20101006-r1.ebuild,
+  -files/iputils-20101006-tracepath-error-typo.patch:
+  old
 
   13 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org>
   iputils-20101006-r2.ebuild:
diff --git a/net-misc/iputils/files/iputils-20070202-makefile.patch b/net-misc/iputils/files/iputils-20070202-makefile.patch
deleted file mode 100644
index 9426053a16b4..000000000000
--- a/net-misc/iputils/files/iputils-20070202-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -1,20 +1,17 @@
- # Path to parent kernel include files directory
- LIBC_INCLUDE=/usr/include
- 
--DEFINES= 
--
- #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
- LDLIBS=-lresolv
--ADDLIB=
- 
- #options if you compile with libc5, and without a bind>=4.9.4 libresolv
- # NOT AVAILABLE. Please, use libresolv.
- 
--CC=gcc
- # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
- #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
--CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
--CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
-+CFLAGS ?= -O2 -g
-+CFLAGS += -Wstrict-prototypes -Wall
-+CPPFLAGS += -D_GNU_SOURCE
- 
- IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
- IPV6_TARGETS=tracepath6 traceroute6 ping6
-@@ -35,7 +32,7 @@
- rdisc_srv: rdisc_srv.o
- 
- rdisc_srv.o: rdisc.c
--	$(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
- 
- 
- check-kernel:
diff --git a/net-misc/iputils/files/iputils-20100418-arping-broadcast.patch b/net-misc/iputils/files/iputils-20100418-arping-broadcast.patch
deleted file mode 100644
index a5c906346bda..000000000000
--- a/net-misc/iputils/files/iputils-20100418-arping-broadcast.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://bugs.gentoo.org/337049
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585591
-
-From: Jesper Dangaard Brouer <hawk@comx.dk>
-Subject: [PATCH] iputils: arping fails to set correct broadcast address
-
-From: Paul Martin <pm@debian.org>
-
-There seems to have been introduced a bug in iputils release s20100418.
-
-This patch is based upon git://www.linux-ipv6.org/gitroot/iputils.git
-(git commit fe342ca3148)
-
-The regression is caused by commit 56018bf1b3
- arping: Support link-layer type with larger link-layer address.
-
-As reported by: Paul Martin <pm@debian.org> in Debian bugreport #585591.
-
- There's a logic error in the function that parses the interface's
- broadcast address, causing it not to fill the broadcast address array
- correctly.
-
-Please apply.
-
-Reported-by: Paul Martin <pm@debian.org>
-Tested-by: Jesper Dangaard Brouer <hawk@comx.dk>
-Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
----
- arping.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arping.c b/arping.c
-index 9bd6927..2613a12 100644
---- a/arping.c
-+++ b/arping.c
-@@ -336,7 +336,7 @@ void set_device_broadcast(char *device, unsigned char *ba, size_t balen)
- 	}
- 
- 	for (p = ba, ch = 0; p < ba + balen; p++, ch += 3)
--		*p++ = strtoul(brdcast->value + ch * 3, NULL, 16);
-+		*p = strtoul(brdcast->value + ch, NULL, 16);
- 
- 	return;
- }
-
-
-
-
-
-
diff --git a/net-misc/iputils/files/iputils-20100418-ping-CVE-2010-2529.patch b/net-misc/iputils/files/iputils-20100418-ping-CVE-2010-2529.patch
deleted file mode 100644
index e9ffb04e85f3..000000000000
--- a/net-misc/iputils/files/iputils-20100418-ping-CVE-2010-2529.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/332527
-
---- iputils-s20100418/ping.c
-+++ iputils-s20100418/ping.c
-@@ -1083,7 +1083,7 @@ void pr_options(unsigned char * cp, int 
- 				i = j;
- 			i -= IPOPT_MINOFF;
- 			if (i <= 0)
--				continue;
-+				break;
- 			if (i == old_rrlen
- 			    && !strncmp((char *)cp, old_rr, i)
- 			    && !(options & F_FLOOD)) {
-@@ -1120,7 +1120,7 @@ void pr_options(unsigned char * cp, int 
- 				i = j;
- 			i -= 5;
- 			if (i <= 0)
--				continue;
-+				break;
- 			flags = *++cp;
- 			printf("\nTS: ");
- 			cp++;
diff --git a/net-misc/iputils/files/iputils-20101006-tracepath-error-typo.patch b/net-misc/iputils/files/iputils-20101006-tracepath-error-typo.patch
deleted file mode 100644
index 2acfb8d37512..000000000000
--- a/net-misc/iputils/files/iputils-20101006-tracepath-error-typo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/355337
-
-From 171324751917bd9c000077edffba9681f7181843 Mon Sep 17 00:00:00 2001
-From: Jeroen Roovers <jer@gentoo.org>
-Date: Sat, 19 Feb 2011 12:47:44 -0500
-Subject: [PATCH] tracepath: fix typo in -l error message
-
-Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tracepath.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tracepath.c b/tracepath.c
-index 0a14b1b..90e1b28 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -306,7 +306,7 @@ main(int argc, char **argv)
- 			break;
- 		case 'l':
- 			if ((mtu = atoi(optarg)) <= overhead) {
--				fprintf(stderr, "Error: length must be >= %d\n", overhead);
-+				fprintf(stderr, "Error: length must be > %d\n", overhead);
- 				exit(1);
- 			}
- 			break;
--- 
-1.7.4.1
-
diff --git a/net-misc/iputils/iputils-20100418-r1.ebuild b/net-misc/iputils/iputils-20100418-r1.ebuild
deleted file mode 100644
index 5dab44213857..000000000000
--- a/net-misc/iputils/iputils-20100418-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20100418-r1.ebuild,v 1.9 2011/01/07 20:57:52 ranger Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils"
-SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-	mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
-IUSE="doc idn ipv6 SECURITY_HAZARD ssl static"
-
-# sysfsutils is needed for libsysfs which is used by arping only
-RDEPEND="!net-misc/rarpd
-	ssl? ( dev-libs/openssl )
-	idn? ( net-dns/libidn )
-	sys-fs/sysfsutils"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-S=${WORKDIR}/${PN}-s${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-	epatch "${FILESDIR}"/${PN}-20100418-arping-broadcast.patch #337049
-	epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436
-	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
-	epatch "${FILESDIR}"/${PN}-20100418-makefile.patch
-	epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703
-	epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch
-	epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch
-	epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
-	epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
-	epatch "${FILESDIR}"/${PN}-20100418-ping-CVE-2010-2529.patch #332527
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
-	use static && append-ldflags -static
-	use ssl && append-cppflags -DHAVE_OPENSSL
-	use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
-	export IDN=$(use idn && echo yes)
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "make main failed"
-}
-
-src_install() {
-	into /
-	dobin ping || die "ping"
-	use ipv6 && dobin ping6
-	dosbin arping || die "arping"
-	into /usr
-	dosbin tracepath || die "tracepath"
-	use ipv6 && dosbin trace{path,route}6
-	dosbin clockdiff rarpd rdisc ipg tftpd || die "misc sbin"
-
-	fperms 4711 /bin/ping
-	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
-
-	dodoc INSTALL RELNOTES
-	use ipv6 \
-		&& dosym ping.8 /usr/share/man/man8/ping6.8 \
-		|| rm -f doc/*6.8
-	rm -f doc/setkey.8
-	doman doc/*.8
-
-	use doc && dohtml doc/*.html
-}
diff --git a/net-misc/iputils/iputils-20101006-r1.ebuild b/net-misc/iputils/iputils-20101006-r1.ebuild
deleted file mode 100644
index 4a24f98ed06f..000000000000
--- a/net-misc/iputils/iputils-20101006-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20101006-r1.ebuild,v 1.1 2011/08/07 20:09:31 ssuominen Exp $
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-
-EAPI="2"
-
-inherit flag-o-matic eutils toolchain-funcs
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
-	inherit git
-else
-	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-		mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc idn ipv6 SECURITY_HAZARD ssl static"
-
-RDEPEND="!net-misc/rarpd
-	ssl? ( dev-libs/openssl )
-	idn? ( net-dns/libidn )"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-	"
-fi
-
-S=${WORKDIR}/${PN}-s${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-	epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436
-	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
-	epatch "${FILESDIR}"/${PN}-20100418-makefile.patch
-	epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703
-	epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch
-	epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch
-	epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
-	epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
-	epatch "${FILESDIR}"/${PN}-20071127-infiniband.patch #377687
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
-	use static && append-ldflags -static
-	use ssl && append-cppflags -DHAVE_OPENSSL
-	use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
-	export IDN=$(use idn && echo yes)
-}
-
-src_compile() {
-	tc-export CC
-	emake || die
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake -j1 html man || die
-	fi
-}
-
-src_install() {
-	into /
-	dobin ping || die
-	use ipv6 && dobin ping6
-	dosbin arping || die
-	into /usr
-	dosbin tracepath || die
-	use ipv6 && dosbin trace{path,route}6
-	dosbin clockdiff rarpd rdisc ipg tftpd || die
-
-	fperms 4711 /bin/ping
-	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
-
-	dodoc INSTALL RELNOTES
-	use ipv6 \
-		&& dosym ping.8 /usr/share/man/man8/ping6.8 \
-		|| rm -f doc/*6.8
-	rm -f doc/setkey.8
-	doman doc/*.8
-
-	use doc && dohtml doc/*.html
-}
diff --git a/net-misc/iputils/iputils-20101006.ebuild b/net-misc/iputils/iputils-20101006.ebuild
deleted file mode 100644
index 4aeb387e84a6..000000000000
--- a/net-misc/iputils/iputils-20101006.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20101006.ebuild,v 1.1 2011/02/19 18:09:49 vapier Exp $
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-
-EAPI="2"
-
-inherit flag-o-matic eutils toolchain-funcs
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
-	inherit git
-else
-	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-		mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc idn ipv6 SECURITY_HAZARD ssl static"
-
-# sysfsutils is needed for libsysfs which is used by arping only
-RDEPEND="!net-misc/rarpd
-	ssl? ( dev-libs/openssl )
-	idn? ( net-dns/libidn )
-	sys-fs/sysfsutils"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-	"
-fi
-
-S=${WORKDIR}/${PN}-s${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-	epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436
-	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
-	epatch "${FILESDIR}"/${PN}-20100418-makefile.patch
-	epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703
-	epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch
-	epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch
-	epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
-	epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
-	use static && append-ldflags -static
-	use ssl && append-cppflags -DHAVE_OPENSSL
-	use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
-	export IDN=$(use idn && echo yes)
-}
-
-src_compile() {
-	tc-export CC
-	emake || die
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake -j1 html man || die
-	fi
-}
-
-src_install() {
-	into /
-	dobin ping || die
-	use ipv6 && dobin ping6
-	dosbin arping || die
-	into /usr
-	dosbin tracepath || die
-	use ipv6 && dosbin trace{path,route}6
-	dosbin clockdiff rarpd rdisc ipg tftpd || die
-
-	fperms 4711 /bin/ping
-	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
-
-	dodoc INSTALL RELNOTES
-	use ipv6 \
-		&& dosym ping.8 /usr/share/man/man8/ping6.8 \
-		|| rm -f doc/*6.8
-	rm -f doc/setkey.8
-	doman doc/*.8
-
-	use doc && dohtml doc/*.html
-}