Handle ipv6 define updates in newer kernels #134751 by Mekong.

Package-Manager: portage-2.1.1_pre5-r2

5 files changed, 113 insertions, 18 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index e350b6f24880..cf877d282770 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/iputils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.41 2006/06/08 10:57:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.42 2006/08/20 07:26:41 vapier Exp $
+
+  20 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/iputils-021109-ipv6-updates.patch, iputils-021109-r3.ebuild:
+  Handle ipv6 define updates in newer kernels #134751 by Mekong.
 
   08 Jun 2006; Mike Frysinger <vapier@gentoo.org>
   +files/iputils-021109-gcc4.patch, iputils-021109-r3.ebuild:
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 6a73ad39397f..e13448a1552c 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -29,30 +29,34 @@ AUX iputils-021109-gcc4.patch 4071 RMD160 c433ebf099e09320a60b7d1aeb7eb4127ce969
 MD5 02ad61a6cb57f69f04b50434a49b3017 files/iputils-021109-gcc4.patch 4071
 RMD160 c433ebf099e09320a60b7d1aeb7eb4127ce9697f files/iputils-021109-gcc4.patch 4071
 SHA256 f6d270b69a41b296d92b9c191a03f46379dc75270e92cb392b6f67ecfaf8069f files/iputils-021109-gcc4.patch 4071
+AUX iputils-021109-ipv6-updates.patch 2563 RMD160 f61c4b52050e0605c950a9c0613af3cf38a43612 SHA1 100b05ec74c4fb3520c7e4a3c246da028e6a627f SHA256 6237ec5eb37d5c7c7892bb10b16a2c43b8f7a07248555a72139f35fd05d9b693
+MD5 8651cc962f1ab3ad2c7858d153a436cb files/iputils-021109-ipv6-updates.patch 2563
+RMD160 f61c4b52050e0605c950a9c0613af3cf38a43612 files/iputils-021109-ipv6-updates.patch 2563
+SHA256 6237ec5eb37d5c7c7892bb10b16a2c43b8f7a07248555a72139f35fd05d9b693 files/iputils-021109-ipv6-updates.patch 2563
 AUX iputils-021109-linux-udp-header.patch 418 RMD160 fc11364990492f813061116252bdab361e43092e SHA1 85ec6af23a1dfacf773772a4645c341ab7fe5b64 SHA256 0a206f5b0848b73609ff8be30411510431a6b8ec91a6fbed4e7c84788a2584f9
 MD5 79de65b9da536090d0560ba51520fd9d files/iputils-021109-linux-udp-header.patch 418
 RMD160 fc11364990492f813061116252bdab361e43092e files/iputils-021109-linux-udp-header.patch 418
 SHA256 0a206f5b0848b73609ff8be30411510431a6b8ec91a6fbed4e7c84788a2584f9 files/iputils-021109-linux-udp-header.patch 418
-DIST iputils-ss021109-try.tar.bz2 428335
-EBUILD iputils-021109-r3.ebuild 2424 RMD160 3ff7dea11b2785fbf3cf1525afd1ae43f4c98785 SHA1 51ac8c32f3cd2b47aa48203c8e9ff35e70e16e59 SHA256 709a81dcd7568eaae18e08d1c9d538e39fdf0fc874a185c681a7541b799ac286
-MD5 14593d47e174f7adf9ed1bc1786e920f iputils-021109-r3.ebuild 2424
-RMD160 3ff7dea11b2785fbf3cf1525afd1ae43f4c98785 iputils-021109-r3.ebuild 2424
-SHA256 709a81dcd7568eaae18e08d1c9d538e39fdf0fc874a185c681a7541b799ac286 iputils-021109-r3.ebuild 2424
-MISC ChangeLog 6307 RMD160 fc9b02a22923da3bc59b86c614f8033372826aba SHA1 bf1d226df41a27968954d6cb8785b6e6ba545cb3 SHA256 e5683763e970f69c4a08e1bbbf96c56fc9eefeb872920484089da78f72b9ac33
-MD5 8a96a81041503c309221f38c3d42add1 ChangeLog 6307
-RMD160 fc9b02a22923da3bc59b86c614f8033372826aba ChangeLog 6307
-SHA256 e5683763e970f69c4a08e1bbbf96c56fc9eefeb872920484089da78f72b9ac33 ChangeLog 6307
+DIST iputils-ss021109-try.tar.bz2 428335 RMD160 7786bff8416164906208d47853af83581195c6b6 SHA1 8e695eb45d7f63fe2321b59b8cb64bff1078a03a SHA256 06ea9c83b5ff1ed02f526ed798a59e949793da1c232457077e75fcc8a10cdcb4
+EBUILD iputils-021109-r3.ebuild 2478 RMD160 4dd808a39dda06bd9cf610a6db233d37cffa12a9 SHA1 60372b3559916d373c09dd001a55850ca922735c SHA256 3d8b4110f6c6b833e6acd574a119ebda4450f3f07f24e6eeabef850d3b94b625
+MD5 31bb4f0403d1bbf7919def937f33c240 iputils-021109-r3.ebuild 2478
+RMD160 4dd808a39dda06bd9cf610a6db233d37cffa12a9 iputils-021109-r3.ebuild 2478
+SHA256 3d8b4110f6c6b833e6acd574a119ebda4450f3f07f24e6eeabef850d3b94b625 iputils-021109-r3.ebuild 2478
+MISC ChangeLog 6493 RMD160 d372afbcf6bb19f81605723135ea543893eb1413 SHA1 5c774575b9dc3e02be5b1cf5802ee632235aa105 SHA256 a93afdf648e19e908dad5ea0a2930a77469542847e762d642c808d7d9cd102de
+MD5 69928d08a762b86040b094eaa357c063 ChangeLog 6493
+RMD160 d372afbcf6bb19f81605723135ea543893eb1413 ChangeLog 6493
+SHA256 a93afdf648e19e908dad5ea0a2930a77469542847e762d642c808d7d9cd102de ChangeLog 6493
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 66a524e27160410a2dbaef8d2eed5365 files/digest-iputils-021109-r3 73
-RMD160 557f17d8511d97b81f783a456cb9f56f42ed0855 files/digest-iputils-021109-r3 73
-SHA256 5118692d8b1f6a1331d66d10cde790bb62239e1509c8dd758bed3f1e5fe4ca83 files/digest-iputils-021109-r3 73
+MD5 2125d037650c8570ef6590ee37901f17 files/digest-iputils-021109-r3 265
+RMD160 b38a02ef844475283c5af946c5c0f9166acde648 files/digest-iputils-021109-r3 265
+SHA256 701565fd43b0b8af78eb94ed1f695a3ce68a94674c309bd47a79e4f20fed02b4 files/digest-iputils-021109-r3 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEiANy2+ySkm8kpY0RArv5AJ9MGpHwahWZTh1QjUv2T7m572T9VQCgviRJ
-hC05ARvsNutVsbo4rYSCPu4=
-=Nc3H
+iD8DBQFE6A79amhnQswr0vIRAuHWAKCcUWwI1q0hyTPqhaj4VxOcLdnEbQCffrUZ
+XTrLgz/MO8UD4Il5hhRcZpI=
+=VfJ/
 -----END PGP SIGNATURE-----
diff --git a/net-misc/iputils/files/digest-iputils-021109-r3 b/net-misc/iputils/files/digest-iputils-021109-r3
index ea769a132e46..2396ba35bbb0 100644
--- a/net-misc/iputils/files/digest-iputils-021109-r3
+++ b/net-misc/iputils/files/digest-iputils-021109-r3
@@ -1 +1,3 @@
 MD5 dd10ef3d76480990a2174d2bb0daddaf iputils-ss021109-try.tar.bz2 428335
+RMD160 7786bff8416164906208d47853af83581195c6b6 iputils-ss021109-try.tar.bz2 428335
+SHA256 06ea9c83b5ff1ed02f526ed798a59e949793da1c232457077e75fcc8a10cdcb4 iputils-ss021109-try.tar.bz2 428335
diff --git a/net-misc/iputils/files/iputils-021109-ipv6-updates.patch b/net-misc/iputils/files/iputils-021109-ipv6-updates.patch
new file mode 100644
index 000000000000..f6ccfed6caa4
--- /dev/null
+++ b/net-misc/iputils/files/iputils-021109-ipv6-updates.patch
@@ -0,0 +1,84 @@
+Handle ipv6 define changes
+
+http://bugs.gentoo.org/134751
+
+--- iputils/ping_common.h
++++ iputils/ping_common.h
+@@ -37,6 +37,17 @@
+ #define	CLR(bit)	(A(bit) &= (~B(bit)))
+ #define	TST(bit)	(A(bit) & B(bit))
+ 
++/* handle updates to IPV6 defines */
++#ifndef IPV6_2292PKTINFO
++# define IPV6_2292PKTINFO IPV6_PKTINFO
++#endif
++#ifndef IPV6_2292RTHDR
++# define IPV6_2292RTHDR IPV6_RTHDR
++#endif
++#ifndef IPV6_2292HOPLIMIT
++# define IPV6_2292HOPLIMIT IPV6_HOPLIMIT
++#endif
++
+ /* various options */
+ extern int options;
+ #define	F_FLOOD		0x001
+--- iputils/ping6.c
++++ iputils/ping6.c
+@@ -153,7 +153,7 @@ extern struct cmsghdr *	inet6_srcrt_init
+ 
+ 	cmsg->cmsg_len = sizeof(struct cmsghdr) + sizeof(struct rt0_hdr);
+ 	cmsg->cmsg_level = SOL_IPV6;
+-	cmsg->cmsg_type = IPV6_RTHDR;
++	cmsg->cmsg_type = IPV6_2292RTHDR;
+ 
+ 	return cmsg;
+ }
+@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
+ 		cmsglen += CMSG_SPACE(sizeof(*ipi));
+ 		cmsg->cmsg_len = CMSG_LEN(sizeof(*ipi));
+ 		cmsg->cmsg_level = SOL_IPV6;
+-		cmsg->cmsg_type = IPV6_PKTINFO;
++		cmsg->cmsg_type = IPV6_2292PKTINFO;
+ 				
+ 		ipi = (struct in6_pktinfo*)CMSG_DATA(cmsg);
+ 		memset(ipi, 0, sizeof(*ipi));
+@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
+ 
+ 	if (1) {
+ 		int on = 1;
+-		if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_HOPLIMIT,
++		if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_2292HOPLIMIT,
+ 			       &on, sizeof(on)) == -1) {
+ 			perror ("can't receive hop limit");
+ 			exit(2);
+@@ -701,7 +701,7 @@ parse_reply(struct msghdr *msg, int cc, 
+ 
+ 	for (c = CMSG_FIRSTHDR(msg); c; c = CMSG_NXTHDR(msg, c)) {
+ 		if (c->cmsg_level != SOL_IPV6 ||
+-		    c->cmsg_type != IPV6_HOPLIMIT)
++		    c->cmsg_type != IPV6_2292HOPLIMIT)
+ 			continue;
+ 		if (c->cmsg_len < CMSG_LEN(sizeof(int)))
+ 			continue;
+--- iputils/tracepath6.c
++++ iputils/tracepath6.c
+@@ -111,7 +111,7 @@ int recverr(int fd, int ttl)
+ 		if (cmsg->cmsg_level == SOL_IPV6) {
+ 			if (cmsg->cmsg_type == IPV6_RECVERR) {
+ 				e = (struct sock_extended_err *)CMSG_DATA(cmsg);
+-			} else if (cmsg->cmsg_type == IPV6_HOPLIMIT) {
++			} else if (cmsg->cmsg_type == IPV6_2292HOPLIMIT) {
+ 				rethops = *(int*)CMSG_DATA(cmsg);
+ 			}
+ 		} else if (cmsg->cmsg_level == SOL_IP) {
+@@ -349,8 +349,8 @@ int main(int argc, char **argv)
+ 		perror("IP_RECVERR");
+ 		exit(1);
+ 	}
+-	if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &on, sizeof(on))) {
+-		perror("IPV6_HOPLIMIT");
++	if (setsockopt(fd, SOL_IPV6, IPV6_2292HOPLIMIT, &on, sizeof(on))) {
++		perror("IPV6_2292HOPLIMIT");
+ 		exit(1);
+ 	}
+ 	if (mapped && setsockopt(fd, SOL_IP, IP_RECVTTL, &on, sizeof(on))) {
diff --git a/net-misc/iputils/iputils-021109-r3.ebuild b/net-misc/iputils/iputils-021109-r3.ebuild
index b71b6fdbc29c..b822afec942a 100644
--- a/net-misc/iputils/iputils-021109-r3.ebuild
+++ b/net-misc/iputils/iputils-021109-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.25 2006/06/08 10:57:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.26 2006/08/20 07:26:41 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -35,6 +35,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PV}-syserror.patch
 	epatch "${FILESDIR}"/${PV}-uclibc-no-ether_ntohost.patch
 	epatch "${FILESDIR}"/${P}-bindnow.patch #77526
+	epatch "${FILESDIR}"/${P}-ipv6-updates.patch #134751
 	# make iputils work with newer glibc snapshots
 	epatch "${FILESDIR}"/${P}-linux-udp-header.patch