Forward port USE=iptables and USE=ipv6 support to newer verisons #414661 by Mike Gilbert.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

6 files changed, 100 insertions, 14 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 26348d026d27..0bc786ecacfd 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.187 2012/05/04 09:17:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.188 2012/05/05 05:12:31 vapier Exp $
+
+  05 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-3.1.0-no-ipv6.patch, iproute2-3.1.0.ebuild,
+  iproute2-3.3.0.ebuild, iproute2-9999.ebuild:
+  Forward port USE=iptables and USE=ipv6 support to newer verisons #414661 by
+  Mike Gilbert.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> iproute2-2.6.35-r3.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index e6039f832e30..c85f354ed910 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX iproute2-2.6.26-ldflags.patch 330 RMD160 0dd7dd7837120eb31ffc8b9650063c4f8c8f8889 SHA1 a2dead0f194cfa039ecab330b0a945748f894948 SHA256 c7206270a72a9e0aa66ddf641d10a384501e58b87917b1e3161f297349b8ec13
 AUX iproute2-2.6.29.1-flush.patch 5669 RMD160 63441945760ddaa5de5678934fc5e2d2a7f960f0 SHA1 289383e5d198e33992eda9984bdd2fea1071a894 SHA256 13007eb0335e4a8a88f4946cea9fc61ee4fbe840ce308279696212b11aa1928a
 AUX iproute2-2.6.29.1-hfsc.patch 37615 RMD160 580fbe97f4561ca9190768147100006602bef82e SHA1 276401d6ca4965a1008a1e7098de3acd2d4684d6 SHA256 4d41873a00841749a47142dc5591572b2d7df3b4d4c56d8dcebeb3c4cab30672
@@ -7,6 +10,7 @@ AUX iproute2-2.6.35-no-ipv6.patch 859 RMD160 5e3760d4a9cbd9a74be4b66fbd08e272f49
 AUX iproute2-2.6.35-xtables.patch 1027 RMD160 ba09b7f3fc7d6b38c1321ec6f43089679e6e3ebe SHA1 985aba3c19d085230e97c3e7aee64eff5c86d9b3 SHA256 4f2227b31407002dcad8d547fe61e8b5aaba7b70a11ea20b9bfb9583ac105801
 AUX iproute2-2.6.38-parallel-build.patch 1191 RMD160 d007fece03f344dc0a1901482a815507d4c24f56 SHA1 56d810756f09696997871c0fb44778f12da6cdba SHA256 fe3cb7e51398c6f6929e93ea03a822ed404d0e1cb302f4ca9e8fcb350b1abf18
 AUX iproute2-3.1.0-mtu.patch 1649 RMD160 bd3be1f242f8e0c56b30538ef6c6decc5247c668 SHA1 81aee5e83a04fa1aba10c516a47b31ba22543b1b SHA256 d8d1d3b81a3fd5674e6c9e202bce9e84f41b579ba2c6a554df3346f4642715af
+AUX iproute2-3.1.0-no-ipv6.patch 1352 RMD160 75ce3b7935b69801465a1c1aed2e2def2c555fa6 SHA1 6f92efd504599147352af22492a7a31375cf06d5 SHA256 ee93d86903e6f0aff54cd3c861f91e3d37639d7fc975c9c088f281f1ca8017da
 DIST iproute2-2.6.29-1.tar.bz2 367905 RMD160 f96c3ec0877c9d5a2dcba582b399a80ed71a4a8b SHA1 b6a43799bf5e8131307cf88b855031317af90eb4 SHA256 13ffb0ffe5404c9dcc8bed8c692f07d934aa3fd44661df79dd1efbb37f83fb9b
 DIST iproute2-2.6.35.tar.bz2 387193 RMD160 39a4eb0b07fa5b1ddbfc9f31f4053a5e777e8b97 SHA1 862b86ac73ea696867675765d119654553a22aeb SHA256 8ab2f47e129925fb8acb09421008d07aeafa01b2ddd1fcba4a056de079f090a3
 DIST iproute2-2.6.38.tar.bz2 390166 RMD160 7c59dab852cd4c6eb685ac778c1e27d7e59d9b6f SHA1 e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a SHA256 47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4
@@ -16,8 +20,25 @@ EBUILD iproute2-2.6.29.1-r1.ebuild 2737 RMD160 390ab7a08c245e50b6ce69766a812225b
 EBUILD iproute2-2.6.35-r2.ebuild 2611 RMD160 d35ca09dedb9eaff75703cbd1f15c0eaabb3b9e1 SHA1 9938aa61a7ba97cce8007502cf183d95cf60b62d SHA256 5f14ab7b77672d49df8e9648975613cde048220c915670cdc4adb0610b54fcd8
 EBUILD iproute2-2.6.35-r3.ebuild 2878 RMD160 56617d4714dde19458b10b23e8ace22de1e5958c SHA1 6d2d828c87b3ee94f310c9eeea9bb859378a4111 SHA256 28bf4a15e0a33f6f11d909891674769ec51cbddc5d3dc8abb33a30b3b75c5d47
 EBUILD iproute2-2.6.38.ebuild 2256 RMD160 6282620f1b3ac9d2ae03aaf28fada45e6607026b SHA1 7fb1a7996b0bd0d04bcefa5e1fee2e0f8aad64d0 SHA256 6ff28a5a1fe138c5e159c641ca32bb74cb33c8ec7f6f1727c7ebe849dfbc3a24
-EBUILD iproute2-3.1.0.ebuild 2422 RMD160 0ab928d701a117db30b6cd4676be5a8290d464a0 SHA1 8a56e8ec41f2f03f41e907773cf75f17275504f0 SHA256 689a46f538851963f58265098db71a0088a6a3dad62fa0dc6887b80c5bd9403e
-EBUILD iproute2-3.3.0.ebuild 2473 RMD160 480293c3a45182d3e5867dbccb82524c87011a23 SHA1 a7313b73ffaab768ae775f15c84e201b8696aa09 SHA256 0325d9187b3ab2b0059fc754ccd62da7df5bfb3b1c3295df7b318a52fc95248b
-EBUILD iproute2-9999.ebuild 2422 RMD160 8b73b2beaa9149d09e21e01392defed26e10f321 SHA1 1bed2e5f2e66c5555452304e674f738498d62727 SHA256 4466e523498dcea34c44fffc20e6e4ca99d90eab98ddb010b8101c969a94c35b
-MISC ChangeLog 32556 RMD160 20b05e140073b34d7881633be993e34daac99e92 SHA1 5abcc37390b26b83693baf67c76c8d314a323bcc SHA256 161371a37d4956ab84da190854c23eb1a4f2219d2b3649d8d578078aad0c599b
+EBUILD iproute2-3.1.0.ebuild 2771 RMD160 d85818553ddb77b7b5f20575ceb9da83c850b10b SHA1 07223884463cf4bdd6dc77d5f9c49771eb7d51ba SHA256 41a4e29fc6e9eed427c7723671b91749f5d7ae541dbdfa0a9a1efd4670c11844
+EBUILD iproute2-3.3.0.ebuild 2822 RMD160 11b011add704f085dfc1bec59293e6893f426610 SHA1 b07201611d742ca8fd264814b61234055bc835af SHA256 648c8a953c8e14d1125c01ecb9fe020a63421996d6984d163331a0056b13afbf
+EBUILD iproute2-9999.ebuild 2771 RMD160 303b51a00b735ba4c23e491f7b3abdc913ce04ad SHA1 f3dc2f6b02de5f66217f7d7fc874518744a92743 SHA256 25d63831ddcd6ccc216e9cd6ee0d92b1dc6b56096144cf9d6ef2b5961e4cf3d1
+MISC ChangeLog 32810 RMD160 e2240ff20b6a27353640ef216fd1bfa29ec1b499 SHA1 62f7c366b452883c6b8bc578a20b0130f4dcc27f SHA256 b31e407e456a82de2861a33173d16dbc2a57c7bc866f503d211f8e310cded181
 MISC metadata.xml 246 RMD160 f577c668ed7c33423595f7d3db200a5868749b60 SHA1 7727cd7938065c32bef28eee0e3ef096125217e1 SHA256 f081ffa604caba81f8229deeec7b8d4694d83c059564d7c941f7b942b8385012
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPpLcFAAoJELEHsLL7fEFWCBMQAJn/2oLsagvFwM52+rdSYHOh
+oL3qA4i3XlIIigFWeZybbs84DzC3dg6/hIrjBJ9gj1429sXpD58p0Nj/QujC8A5g
+4n1CtDpn4yOaoQ6XFK0baRul6uMAEc6tZZVQouPEZoLZlxmIPb4sWc9dL1NYaGPx
+FDprVG97sT8pTH2Lsqo7XOsUE08PLmMxAWutzNRJAm/f8Cbk1I+t2XobMKlXEDlK
+hlc0He8pc4erTK5jqcSJC2Kc8GAGE5xd5hoDSresRor9p/fHc3/wSVIS6YEBild5
+MBlvD4smn7/o4ONR3BnbJhc3L3NAFeRh2jnkXpS77lt+bNs6DLidNnzTm8cg1Y7i
+HiGNj17hGYhyrS3rsf57MwCicfgFGK4VgsGhq0Kd+96MG+i6L8vC7zPyCjGzIP6Q
+tSKW9hbm3W+2hlFhHk8SfhYPGGEGZVISxLwwqu0hIRyZshL8mwdVtI5nBYZd7Rku
+HQbyDplrbliK3Mhcte7lAiKATnaAB7aY6mOJqNkHAvIrkky8Ws8UWgaX44ObGlq7
+fUyI/Ijztyt4w+kjHU/MmTrDrdyU+yiKnYSrlHqSD+qEOKiw6/wcBus8iz120ATL
+8nNuc3cGZC/xdkMZnEAUwMCt2gl4z3+/xQqrFlIlf3/P1u7hrIH/L6cTOUNQYUKq
+FQT5M6UKh0W0DrgXKJrm
+=9G61
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch
new file mode 100644
index 000000000000..1282a1b59f9b
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/326849
+
+allow ipv6 to be disabled
+
+--- a/ip/iptunnel.c
++++ b/ip/iptunnel.c
+@@ -456,13 +456,6 @@ int do_iptunnel(int argc, char **argv)
+ 		break;
+ 	case AF_INET:
+ 		break;
+-	/*
+-	 * This is silly enough but we have no easy way to make it
+-	 * protocol-independent because of unarranged structure between
+-	 * IPv4 and IPv6.
+-	 */
+-	case AF_INET6:
+-		return do_ip6tunnel(argc, argv);
+ 	default:
+ 		fprintf(stderr, "Unsupported family:%d\n", preferred_family);
+ 		exit(-1);
+--- a/ip/Makefile
++++ b/ip/Makefile
+@@ -1,6 +1,6 @@
+ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
+-    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
+-    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o \
++    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
++    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o \
+     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
+     iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
+     iplink_macvlan.o iplink_macvtap.o ipl2tp.o
+--- a/ip/ipmonitor.c
++++ b/ip/ipmonitor.c
+@@ -76,7 +76,6 @@ int accept_msg(const struct sockaddr_nl *who,
+ 	if (n->nlmsg_type == RTM_NEWPREFIX) {
+ 		if (prefix_banner)
+ 			fprintf(fp, "[PREFIX]");
+-		print_prefix(who, n, arg);
+ 		return 0;
+ 	}
+ 	if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
diff --git a/sys-apps/iproute2/iproute2-3.1.0.ebuild b/sys-apps/iproute2/iproute2-3.1.0.ebuild
index 4fea4ad0f53a..00303235df68 100644
--- a/sys-apps/iproute2/iproute2-3.1.0.ebuild
+++ b/sys-apps/iproute2/iproute2-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.1.0.ebuild,v 1.4 2012/02/16 05:21:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.1.0.ebuild,v 1.5 2012/05/05 05:12:31 vapier Exp $
 
 EAPI="4"
 
@@ -21,12 +21,14 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iprou
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb minimal"
+IUSE="atm berkdb +iptables ipv6 minimal"
 
 RDEPEND="!net-misc/arpd
+	iptables? ( >=net-firewall/iptables-1.4.5 )
 	!minimal? ( berkdb? ( sys-libs/db ) )
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
+	iptables? ( virtual/pkgconfig )
 	sys-devel/bison
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6.27
@@ -34,6 +36,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
 
 	sed -i \
 		-e '/^CC =/d' \
@@ -58,13 +61,16 @@ src_configure() {
 	pushd "${T}" >/dev/null
 	echo 'main(){return setns();};' > test.c
 	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'main(){};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
 	popd >/dev/null
 
 	cat <<-EOF > Config
 	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
 	IP_CONFIG_SETNS := ${setns}
 	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(${PKG_CONFIG} xtables --variable=xtlibdir)
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
 	EOF
 }
 
diff --git a/sys-apps/iproute2/iproute2-3.3.0.ebuild b/sys-apps/iproute2/iproute2-3.3.0.ebuild
index ab1a974cade1..2e5bb2da5142 100644
--- a/sys-apps/iproute2/iproute2-3.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.3.0.ebuild,v 1.1 2012/03/30 21:00:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.3.0.ebuild,v 1.2 2012/05/05 05:12:31 vapier Exp $
 
 EAPI="4"
 
@@ -21,12 +21,14 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iprou
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb minimal"
+IUSE="atm berkdb +iptables ipv6 minimal"
 
 RDEPEND="!net-misc/arpd
+	iptables? ( >=net-firewall/iptables-1.4.5 )
 	!minimal? ( berkdb? ( sys-libs/db ) )
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
+	iptables? ( virtual/pkgconfig )
 	sys-devel/bison
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6.27
@@ -34,6 +36,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
 
 	sed -i \
 		-e '/^CC =/d' \
@@ -59,13 +62,16 @@ src_configure() {
 	pushd "${T}" >/dev/null
 	echo 'main(){return setns();};' > test.c
 	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'main(){};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
 	popd >/dev/null
 
 	cat <<-EOF > Config
 	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
 	IP_CONFIG_SETNS := ${setns}
 	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(${PKG_CONFIG} xtables --variable=xtlibdir)
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
 	EOF
 }
 
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index e3d954164c36..20bae9b62107 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.20 2012/03/30 21:00:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.21 2012/05/05 05:12:31 vapier Exp $
 
 EAPI="4"
 
@@ -21,12 +21,14 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iprou
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb minimal"
+IUSE="atm berkdb +iptables ipv6 minimal"
 
 RDEPEND="!net-misc/arpd
+	iptables? ( >=net-firewall/iptables-1.4.5 )
 	!minimal? ( berkdb? ( sys-libs/db ) )
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
+	iptables? ( virtual/pkgconfig )
 	sys-devel/bison
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6.27
@@ -34,6 +36,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
 
 	sed -i \
 		-e '/^CC =/d' \
@@ -58,13 +61,16 @@ src_configure() {
 	pushd "${T}" >/dev/null
 	echo 'main(){return setns();};' > test.c
 	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'main(){};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
 	popd >/dev/null
 
 	cat <<-EOF > Config
 	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
 	IP_CONFIG_SETNS := ${setns}
 	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(${PKG_CONFIG} xtables --variable=xtlibdir)
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
 	EOF
 }