Fixed glibc-2.4-dep bug #126479 and added suid-root support bug #125681

(Portage version: 2.1_pre6-r5)

8 files changed, 246 insertions, 1 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index 62c4e921332e..409a6f7b2fd0 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.34 2006/03/05 20:53:03 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.35 2006/03/21 23:01:42 jokey Exp $
+
+*iptraf-3.0.0-r2 (21 Mar 2006)
+*iptraf-2.7.0-r2 (21 Mar 2006)
+
+  21 Mar 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/iptraf-2.7.0-ipv6-glibc24.patch,
+  +files/iptraf-3.0.0-ipv6-glibc24.patch, +iptraf-2.7.0-r2.ebuild,
+  +iptraf-3.0.0-r2.ebuild:
+  Fixed glibc-2.4-dep bug #126479 and added suid-root support bug #125681
 
   05 Mar 2006; Markus Ullmann <jokey@gentoo.org> iptraf-2.7.0-r1.ebuild,
   iptraf-3.0.0.ebuild:
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index 9c987fe569bb..80e0010d3ebd 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -4,18 +4,27 @@ SHA256 e15bc1102d15cbe7435f6fb3395e448bb06ce97eb36ee926cc7a256327a1e5ad ChangeLo
 MD5 65e102b7957229dfe2075b4d76c2f9fe files/digest-iptraf-2.7.0-r1 506
 RMD160 15ac4fd6a3a2fe747dc1f98b9a856239513384f1 files/digest-iptraf-2.7.0-r1 506
 SHA256 ccd3a95582730408892aed8b56a36bf5145c020fd1df7c35b17b811fa1b477f1 files/digest-iptraf-2.7.0-r1 506
+MD5 65e102b7957229dfe2075b4d76c2f9fe files/digest-iptraf-2.7.0-r2 506
+RMD160 15ac4fd6a3a2fe747dc1f98b9a856239513384f1 files/digest-iptraf-2.7.0-r2 506
+SHA256 ccd3a95582730408892aed8b56a36bf5145c020fd1df7c35b17b811fa1b477f1 files/digest-iptraf-2.7.0-r2 506
 MD5 ddf09316d6ccb3f72355dbf82d9fd1e2 files/digest-iptraf-3.0.0 64
 RMD160 768d3a247cc29c38374abfc112e406dce2b9881d files/digest-iptraf-3.0.0 64
 SHA256 3d088b94702567832770d30b90d30adb6fdeb92ec39bb934f0034acedf15cb11 files/digest-iptraf-3.0.0 64
 MD5 d17a4675bb2066a4624512c84292e321 files/digest-iptraf-3.0.0-r1 497
 RMD160 5bcc0c5ecc6945b3abfd43dcc11dc409ae5af4c8 files/digest-iptraf-3.0.0-r1 497
 SHA256 3a40ce7007c51191bedddacfcab6de40e1e66c2a00dff68832e22126f8f410c8 files/digest-iptraf-3.0.0-r1 497
+MD5 d17a4675bb2066a4624512c84292e321 files/digest-iptraf-3.0.0-r2 497
+RMD160 5bcc0c5ecc6945b3abfd43dcc11dc409ae5af4c8 files/digest-iptraf-3.0.0-r2 497
+SHA256 3a40ce7007c51191bedddacfcab6de40e1e66c2a00dff68832e22126f8f410c8 files/digest-iptraf-3.0.0-r2 497
 MD5 98fb7659373bc05930f0f3837135c811 files/iptraf-2.7.0-2.6.patch 1711
 RMD160 f839a835d8553803d47dd9c0905254c41ba6e33b files/iptraf-2.7.0-2.6.patch 1711
 SHA256 59441534079f43a381c68d48f1160ddd64bbf0ecdc42bd364559287504e8b57a files/iptraf-2.7.0-2.6.patch 1711
 MD5 1bf72405b3017f7732841188b6914160 files/iptraf-2.7.0-atheros.patch 1644
 RMD160 90c21cbced797182f39c22713bef74e110fe004a files/iptraf-2.7.0-atheros.patch 1644
 SHA256 17d3d64c204297dca178e546b49f5ab980377b3f7a6cfa53c7e724de44eed127 files/iptraf-2.7.0-atheros.patch 1644
+MD5 269060aa00c5646c2f55a52de6cbf1bd files/iptraf-2.7.0-ipv6-glibc24.patch 1299
+RMD160 881d15260024a062277abdd88e2f80666fb4722a files/iptraf-2.7.0-ipv6-glibc24.patch 1299
+SHA256 ef4430bed8ec7fa1ed83f79d537e8520f505279d74e115bafca27e7b88299023 files/iptraf-2.7.0-ipv6-glibc24.patch 1299
 MD5 a39e6f036e00cc0497eadbc3095c41e5 files/iptraf-3.0.0-Makefile.patch 740
 RMD160 5d7b61d42843c2c2e70e7b33358e11caf4ee73be files/iptraf-3.0.0-Makefile.patch 740
 SHA256 d4246568afb834b35deca81e49860335cfa1c57d2f6848d0f3713c34843a9835 files/iptraf-3.0.0-Makefile.patch 740
@@ -28,15 +37,24 @@ SHA256 dcd54d8dd2cb5c92448359f9ffe9312d6171586fb47a2d091a3c933040713531 files/ip
 MD5 20c0e87723c58d6ce51de7fc3af1781a files/iptraf-3.0.0-build.patch 949
 RMD160 15dfd3e0a9385af04c592b71c4a3ca55ace86fee files/iptraf-3.0.0-build.patch 949
 SHA256 a0fd3a9ae85f565df9322465aea0163b9bee9268d12b173e63a4bf7b44e3bd91 files/iptraf-3.0.0-build.patch 949
+MD5 d2fea82d823f7372e4d0dad01440ea53 files/iptraf-3.0.0-ipv6-glibc24.patch 1324
+RMD160 4e88de3dcc03d87508cf7acf83598dcd62419865 files/iptraf-3.0.0-ipv6-glibc24.patch 1324
+SHA256 a99ad5aacab94dcc7e6358014809211cfbe5eccb1da152bd3a5a873f650320b6 files/iptraf-3.0.0-ipv6-glibc24.patch 1324
 MD5 59493b3c2f0bb06541a55aeffd9f097c files/iptraf-3.0.0-linux-headers.patch 963
 RMD160 aac7828fdeab874ad44f6f019398497a1e15d4c5 files/iptraf-3.0.0-linux-headers.patch 963
 SHA256 6fa481ad5111e05f4b4ad84f34bf386ae8cc05f998b3d746ece9fb0c79bac6ae files/iptraf-3.0.0-linux-headers.patch 963
 MD5 0b0ef8d085bb59d6a8804b37c0c9d382 iptraf-2.7.0-r1.ebuild 1446
 RMD160 3e404caad9c14fe86b82167a8fdb9e2104aee8a6 iptraf-2.7.0-r1.ebuild 1446
 SHA256 f821f149f1f857f2cda01711c04ec01ddbb10de9fc6e8b82b8a1007feac66f9b iptraf-2.7.0-r1.ebuild 1446
+MD5 a2fbc7346d53aee132f5a108b36a1dfd iptraf-2.7.0-r2.ebuild 1914
+RMD160 3d8aec10839b22e67fedaa5a8f91779eae1afb65 iptraf-2.7.0-r2.ebuild 1914
+SHA256 b7475a0c9786c12621a271f5cfa946bc59a81f40eae67a00164cc87199b434c5 iptraf-2.7.0-r2.ebuild 1914
 MD5 28828d5f3b6ea64612609f2f4644bb9a iptraf-3.0.0-r1.ebuild 1211
 RMD160 3a38fb3aa64099fdf045f644001678ac620525d1 iptraf-3.0.0-r1.ebuild 1211
 SHA256 875e521ff99538b66aeb894a38a0f80eb120cfd6fa426a0009e9ae5e18d12aaa iptraf-3.0.0-r1.ebuild 1211
+MD5 c030c61f7e776b28083ab93d76ca4d19 iptraf-3.0.0-r2.ebuild 1762
+RMD160 2ef6ae97976a17d14b9e274a525879a4fadfb9fb iptraf-3.0.0-r2.ebuild 1762
+SHA256 7f1f535d204f3e0b6f1adde2ff7cd42b25fc7afb81f5a87f887f81a6e7e41ffa iptraf-3.0.0-r2.ebuild 1762
 MD5 31ec4dadb0b55040e589c0048b14298b iptraf-3.0.0.ebuild 1159
 RMD160 58705f93422f1fe1cbf0bb4e192b1ae624d60f32 iptraf-3.0.0.ebuild 1159
 SHA256 eab8f746729101314443f0494c0d65255ef6b15f84329be84520af085acf88a0 iptraf-3.0.0.ebuild 1159
diff --git a/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r2 b/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r2
new file mode 100644
index 000000000000..3f6628f4452f
--- /dev/null
+++ b/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r2
@@ -0,0 +1,6 @@
+MD5 34081a07879af189cca6865bc3b28c29 iptraf-2.7.0-ipv6-alpha12.diff 57251
+RMD160 5a1851ea0c5fa8d9a5f7910b80c8f35192d8ed6c iptraf-2.7.0-ipv6-alpha12.diff 57251
+SHA256 fca50b42120ae5dd4c86b00880c7867a4c9e6f804cd7d22ea3c8b8d4e1cf05a3 iptraf-2.7.0-ipv6-alpha12.diff 57251
+MD5 7ff0bc933a0a57a4ca9e2b0443307539 iptraf-2.7.0.tar.gz 363496
+RMD160 49e09c9e74a09828c477cc22d75f9e64114d390b iptraf-2.7.0.tar.gz 363496
+SHA256 5a335c8c22d02f7ccc640b37fcc7c0ea6840d4287e532a9efd0d0c9b6f1a16ae iptraf-2.7.0.tar.gz 363496
diff --git a/net-analyzer/iptraf/files/digest-iptraf-3.0.0-r2 b/net-analyzer/iptraf/files/digest-iptraf-3.0.0-r2
new file mode 100644
index 000000000000..a97bd2feb121
--- /dev/null
+++ b/net-analyzer/iptraf/files/digest-iptraf-3.0.0-r2
@@ -0,0 +1,6 @@
+MD5 1cea10de695741befcdf9d3d4c31b9b8 iptraf-3.0.0-ipv6.patch.bz2 10069
+RMD160 021161e47e638590c618c0cb5fbb279e5d5503a7 iptraf-3.0.0-ipv6.patch.bz2 10069
+SHA256 d13c5447d726d01da2c1ce3bc793c9db5e6874b2f6b351114cc28e24be24998b iptraf-3.0.0-ipv6.patch.bz2 10069
+MD5 377371c28ee3c21a76f7024920649ea8 iptraf-3.0.0.tar.gz 575169
+RMD160 aaef797076056d6b788a9c9eff29500060594526 iptraf-3.0.0.tar.gz 575169
+SHA256 9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163 iptraf-3.0.0.tar.gz 575169
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch
new file mode 100644
index 000000000000..5f502090813e
--- /dev/null
+++ b/net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch
@@ -0,0 +1,30 @@
+diff -urN ./iptraf-2.7.0.orig/src/othptab.c ./iptraf-2.7.0/src/othptab.c
+--- ./iptraf-2.7.0.orig/src/othptab.c	2006-03-21 23:13:42.000000000 +0100
++++ ./iptraf-2.7.0/src/othptab.c	2006-03-21 23:18:58.000000000 +0100
+@@ -595,8 +595,8 @@
+                case ICMP6_DST_UNREACH_ADMIN:
+                    strcpy(additional, "admin");
+                    break;
+-               case ICMP6_DST_UNREACH_NOTNEIGHBOR:
+-                   strcpy(additional, "not neigh");
++               case ICMP6_DST_UNREACH_BEYONDSCOPE:
++                   strcpy(additional, "beyondscope");
+                    break;
+                case ICMP6_DST_UNREACH_ADDR:
+                    strcpy(additional, "unreach addr");
+@@ -627,15 +627,6 @@
+            case ND_ROUTER_ADVERT:
+                strcpy(description, "router adv");
+                break;
+-           case ICMP6_MEMBERSHIP_QUERY:
+-               strcpy(description, "mbrship query");
+-               break;
+-           case ICMP6_MEMBERSHIP_REPORT:
+-               strcpy(description, "mbrship report");
+-               break;
+-           case ICMP6_MEMBERSHIP_REDUCTION:
+-               strcpy(description, "mbrship reduc");
+-               break;
+            case ND_NEIGHBOR_SOLICIT:
+                strcpy(description, "neigh sol");
+                break;
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch
new file mode 100644
index 000000000000..05171fbdb580
--- /dev/null
+++ b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch
@@ -0,0 +1,30 @@
+diff -urN ./iptraf-3.0.0.orig/src/othptab.c ./iptraf-3.0.0/src/othptab.c
+--- ./iptraf-3.0.0.orig/src/othptab.c	2006-03-21 23:41:53.000000000 +0100
++++ ./iptraf-3.0.0/src/othptab.c	2006-03-21 23:42:30.000000000 +0100
+@@ -560,8 +560,8 @@
+                 case ICMP6_DST_UNREACH_ADMIN:
+                     strcpy(additional, "admin");
+                     break;
+-                case ICMP6_DST_UNREACH_NOTNEIGHBOR:
+-                    strcpy(additional, "not neigh");
++                case ICMP6_DST_UNREACH_BEYONDSCOPE:
++                    strcpy(additional, "beyondscope");
+                     break;
+                 case ICMP6_DST_UNREACH_ADDR:
+                     strcpy(additional, "unreach addr");
+@@ -592,15 +592,6 @@
+             case ND_ROUTER_ADVERT:
+                 strcpy(description, "router adv");
+                 break;
+-            case ICMP6_MEMBERSHIP_QUERY:
+-                strcpy(description, "mbrship query");
+-                break;
+-            case ICMP6_MEMBERSHIP_REPORT:
+-                strcpy(description, "mbrship report");
+-                break;
+-            case ICMP6_MEMBERSHIP_REDUCTION:
+-                strcpy(description, "mbrship reduc");
+-                break;
+             case ND_NEIGHBOR_SOLICIT:
+                 strcpy(description, "neigh sol");
+                 break;
diff --git a/net-analyzer/iptraf/iptraf-2.7.0-r2.ebuild b/net-analyzer/iptraf/iptraf-2.7.0-r2.ebuild
new file mode 100644
index 000000000000..6bf1950aa6e8
--- /dev/null
+++ b/net-analyzer/iptraf/iptraf-2.7.0-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-2.7.0-r2.ebuild,v 1.1 2006/03/21 23:01:42 jokey Exp $
+
+inherit eutils flag-o-matic
+
+V6PATCH_LEVEL=alpha12
+DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
+HOMEPAGE="http://iptraf.seul.org/"
+SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
+	http://dev.gentoo.org/~gmsoft/patches/${P}-ipv6-${V6PATCH_LEVEL}.diff"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 suid"
+
+DEPEND=">=sys-libs/ncurses-5.2-r1"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${P}-atheros.patch
+	epatch ${DISTDIR}/${P}-ipv6-${V6PATCH_LEVEL}.diff
+
+	# bug 89458
+	if has_version '>=sys-kernel/linux-headers-2.6.11-r2' ; then
+		epatch ${FILESDIR}/${P}-2.6.patch
+	fi
+
+	# bug 126479
+	if has_version '>=sys-libs/glibc-2.4' ; then
+		epatch ${FILESDIR}/${P}-ipv6-glibc24.patch
+	fi
+
+	cd src
+	cp dirs.h dirs.h.orig
+	sed -e s:/var/local/iptraf:/var/lib/iptraf: -e s:/usr/local/bin:/usr/sbin: dirs.h.orig > dirs.h
+}
+
+src_compile() {
+	cd src
+
+	if use ipv6 ; then
+		append-flags -DUSE_IPV6
+	fi
+
+	if use suid ; then
+		append-flags -DALLOWUSERS
+	fi
+
+	emake -j1 CFLAGS="$CFLAGS" DEBUG="" TARGET="/usr/sbin" WORKDIR="/var/lib/iptraf" \
+	clean all || die "emake failed"
+}
+
+src_install() {
+	dosbin src/{iptraf,cfconv,rvnamed} || die
+	dodoc  FAQ README* CHANGES RELEASE-NOTES
+	doman Documentation/*.8
+	dohtml Documentation/*.html
+	keepdir /var/{lib,run,log}/iptraf
+}
+
+pkg_postinst() {
+	if use suid ; then
+		einfo
+		einfo "You've chosen to build iptraf with run-as-user support"
+		einfo
+		einfo "The app now has this support, but for security reasons"
+		einfo "you need to run the following command to allow your users"
+		einfo "to suid-run it:"
+		einfo
+		einfo " # chmod 4755 /usr/sbin/iptraf"
+		einfo
+	fi
+}
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..84fb33ec13b2
--- /dev/null
+++ b/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild,v 1.1 2006/03/21 23:01:42 jokey Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
+HOMEPAGE="http://iptraf.seul.org/"
+SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
+	mirror://gentoo/${P}-ipv6.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ipv6 suid"
+
+DEPEND=">=sys-libs/ncurses-5.2-r1"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${P}-atheros.patch
+	epatch ${FILESDIR}/${P}-build.patch
+	epatch ${FILESDIR}/${P}-linux-headers.patch
+	epatch ${FILESDIR}/${P}-bnep.patch
+	epatch ${FILESDIR}/${P}-Makefile.patch
+
+	sed -i \
+		-e 's:/var/local/iptraf:/var/lib/iptraf:g' \
+		-e "s:Documentation/:/usr/share/doc/${PF}:g" \
+		Documentation/*.* || die "sed doc paths"
+
+	if use ipv6 ; then
+		epatch ${DISTDIR}/${P}-ipv6.patch.bz2
+
+		# bug 126479
+		if has_version '>=sys-libs/glibc-2.4' ; then
+			epatch ${FILESDIR}/${P}-ipv6-glibc24.patch
+		fi
+	fi
+}
+
+src_compile() {
+	if use suid ; then
+		append-flags -DALLOWUSERS
+	fi
+	emake CFLAGS="$CFLAGS" -C src || die "emake failed"
+}
+
+src_install() {
+	dosbin src/{iptraf,rawtime,rvnamed} || die
+	dodoc FAQ README* CHANGES RELEASE-NOTES
+	doman Documentation/*.8
+	dohtml -r Documentation/*
+	keepdir /var/{lib,run,log}/iptraf
+}
+
+pkg_postinst() {
+	if use suid ; then
+		einfo
+		einfo "You've chosen to build iptraf with run-as-user support"
+		einfo
+		einfo "The app now has this support, but for security reasons"
+		einfo "you need to run the following command to allow your users"
+		einfo "to suid-run it:"
+		einfo
+		einfo " # chmod 4755 /usr/sbin/iptraf"
+		einfo
+	fi
+}