Add fix from upstream for USE=static-libs builds #437712 by Tina.

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

4 files changed, 82 insertions, 10 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 466e215f5674..637e983603ce 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.277 2012/10/10 12:18:24 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.278 2012/10/12 18:53:04 vapier Exp $
+
+  12 Oct 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/iptables-1.4.16.2-static.patch, iptables-1.4.16.2.ebuild:
+  Add fix from upstream for USE=static-libs builds #437712 by Tina.
 
   10 Oct 2012; Tiziano Müller <dev-zero@gentoo.org> iptables-1.4.13.ebuild,
   iptables-1.4.13-r2.ebuild, iptables-1.4.14-r1.ebuild,
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index bdabf61f27b9..35aee8367dca 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -12,10 +12,11 @@ AUX iptables-1.4.12.1-lm.patch 2107 SHA256 dfc429b71c6a3d77a6447e4d7c0c13f62cf08
 AUX iptables-1.4.13-r1.init 2666 SHA256 add450154d983c09e1ade0d929d9eb8b151634c0eb8e0a2c512f12e3c9574ade SHA512 8d1150dd076ad41644bc99342e20f1ecea0bfa6f5da106019b479f76398d774b55bdbe842cfa4e5d0a7f364eba10374695df3249e92ae53c56b2b2ac928ea6a1 WHIRLPOOL 2ba3227729c85d2695eb9682d98441fcf4d373ea88861330c7d299ddb0d04660a734ecdea08cba01b15796998c66ffe7657b934f414c821bd228b5d4d45c3b0a
 AUX iptables-1.4.13.confd 687 SHA256 7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70 WHIRLPOOL 111b809b3122b04cce8ac0e551cfcdec7fde1ad563e1001bbbb3dbb4cae0ddf13851ece1024e13fb26aab2fe306dfc4fd9e59ab5a10127b301bc7a65ec20486b
 AUX iptables-1.4.13.init 2632 SHA256 3c955bbc787e57d6c0d6d5e97ec34e350fbcbf4f0b453bd2ed624e68ac83155f SHA512 ffb5eb1372a69f3aa9ed3181b3c96fe34b3a07a1b7021e132d0b8eca65f65d83bc546371bc3e7081de68e02fd18bf99993eff6a643715e4b4d0d0d9066c5eee8 WHIRLPOOL 50a3771e5ac7b0ee38cc23c11791c05616687bc44fd6708a89c431422dcee99a92448c55f5b4c790614e785b3b74cc0e168c9d91c547e9e4faa477bed7b0cdea
-DIST iptables-1.4.10.tar.bz2 478007 SHA256 7544e437d2222078b15e6cd063b521c6f1ec4dac49e6af9ba3bfece2a6a93445
+AUX iptables-1.4.16.2-static.patch 2437 SHA256 fd56eaf9a400caa7c25f9893058bbde57085aa3b6d337d30a2eb6f00dead22c9 SHA512 d53a426125493e83c82c7b689bad8b104bbb1d99ed6a4aaf05724877a1260cbbf599476e5192cd14739076f6478a6d8e5ec085afb6782f7ef95abd8a1846ef42 WHIRLPOOL 2158ed63a922951e5e9e8ebd83b67d62f7bc3305c3a6295d5d1999e50e8cda936db9477dbc99051483ab296063074160b4299468ec7eb512c02b4ecc8ec2c7f6
+DIST iptables-1.4.10.tar.bz2 478007 SHA256 7544e437d2222078b15e6cd063b521c6f1ec4dac49e6af9ba3bfece2a6a93445 SHA512 264a974cc303cf9b352ccdf50d3aa1491167cdf1d7919074925645cc94d7f5e40d315cff048d0fab48e31853dcdad64bd65b83ef6fdd05f9e896be4e3317cd1e WHIRLPOOL 4ca6629ed2f43f1393be5a24284147272ff208d27e8bc073ccadb80f27887f2ef2c477e08ab2f8f22414cd11ab6a33dc42071f2ee3168e15026a76a3270cbc2e
 DIST iptables-1.4.11.1.tar.bz2 486926 SHA256 170c294698ca573477b1b2a3815e1563bf9929d182efef6cf0331a6e955c9ade
-DIST iptables-1.4.12.1.tar.bz2 473418 SHA256 77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba
-DIST iptables-1.4.12.tar.bz2 487036 SHA256 3e07a0beb746b580fbcfb04b3842ef0bd94a2f281786552f586415b26a7e971c
+DIST iptables-1.4.12.1.tar.bz2 473418 SHA256 77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba SHA512 ca8960d6d11faaba293e62169a32f8821d9240907d7ca11741dfca78ce92e32d5e2625f99786f55fb08d27ff7643e2531cc741aa0867f45df61248264b8ffe18 WHIRLPOOL b737fb2704511066d052227f7fe73a1ce64f427c614e56a1a681a7dcc37bac214448f9821b416a35cbe7efdf5436c49d0202f6da77aa0ec60de724137d28abda
+DIST iptables-1.4.12.tar.bz2 487036 SHA256 3e07a0beb746b580fbcfb04b3842ef0bd94a2f281786552f586415b26a7e971c SHA512 e61652cee5b3e691643769ac16dd9674ad7e2d5684f9e3146200be91a6db5674cead4525a97e232644f966692bea9143eb3b0c64a2dc01a32bf34834d3a0b4de WHIRLPOOL c5f5b29387322b36cce9c59fd548bb582b7b9b11da2616f5ff14c4ddc5eec8bc500da3756593406f5a5a4ab5b43d0f0b9d44b028b270479e10d1d8f716e1d0a0
 DIST iptables-1.4.13.tar.bz2 502942 SHA256 321e2600fc4541a958e44cafd85a42864b0035404097e0f2e082d474029b9ded SHA512 598b05aa1446172c65b5103bdd02e29f8c8253eb3395e8cabc33e664e7d7afb4a842deea4f0faaac4645acd29a4fbfc0c0675c55f67e38c822ae28b549eab73c WHIRLPOOL 44df42d7fd66349c6bdef8cfa6d80571e7ec7d58a7092b188ef41a8431cd02394835177bdc4d31255b8a115f088daba269f6ecb9230b8d04df6e01151a926017
 DIST iptables-1.4.14.tar.bz2 507123 SHA256 9be675696f41cd4f35cc332b667d285fe9489ca93c8e1f77804bd04b3315a522 SHA512 3bf6db564359acafa738068980793129982318317bea69f21282d80f40dcb1e16938f8e2928e6cdcc4e77d89b2bc3f6c45aad7eb11ff84063b78e5f8e1907f9e WHIRLPOOL 16f630e38272b76c3d7eefa83869902b0f111d9ffba2eca6fe885759619dc81f1c9fc1bfe2f946adc99edfdfc5f4002a331e412a8fef674f63bfb760aa44e868
 DIST iptables-1.4.15.tar.bz2 514830 SHA256 867c144e60075e7bebe6fcecf0b65169d5e2d1fa5ceec2ebd9780cd5026123ea SHA512 2ef559f1079838b2aa8348e66248aac7bc7549be93014ddbdaf730fbad168a657e20e031dcfd9ffa62ed45a52dbefc3683783a5d9b929d539d07ba6ad6adcfa0 WHIRLPOOL 8a56ed3cffd572f2202f172a3b903283452b4fd9647b6123530a1cc489a150bc88e7eb1f911f896b655d1de37f26c0a5eadd383c06103a0f395a82e1bc321b89
@@ -31,14 +32,24 @@ EBUILD iptables-1.4.13-r2.ebuild 2272 SHA256 d00e5cb3a738325119912d49d2cb00292f5
 EBUILD iptables-1.4.13.ebuild 2250 SHA256 11d8f7207bc3a0752db292ae8225dc2ae45e0b14711fb66225d04fde538667ae SHA512 4cd927004bb5e06d36bcd3449621508df186709e00a477e954eefe8dcd48d393f4489dff2fd3b543ccffd071d1177dc7e2da177aeb07625f9dcf80130ccc07c7 WHIRLPOOL b79370bab032360cd60558b4eb0cd0f46b708e426eee2f611f9dec85306b6b0085a2480957e1e33c49d20d522831f755eec3a54009b111d3444cdb50df810ce8
 EBUILD iptables-1.4.14-r1.ebuild 2248 SHA256 de1269c992c6f6abffdfa44241a43ed664965924de3cb5e89a7fed706e1ae639 SHA512 d56ddb75d0a48f2abd7360d49ff344157dfc2588da28d97db4e4484584fc2a7316da23a3538afefb2896ea125fb8aa6472bbf7f15e64b8525da5f75ec937f55b WHIRLPOOL d192fbfacae8ecc69d0988fbe61d199e86ef334086caa5755e793d9caa678f38ad67e0fc07254967f3c878181bda1321950ae98682aa464acc17a3ea676fa72d
 EBUILD iptables-1.4.15-r1.ebuild 2248 SHA256 d72709f4ab54d0358d5a5ef8da029bf8819e24cfc1d2f4e0f51964f72933f637 SHA512 d380ff6545451b7ff16fceb1683b4ae79840c26a5a17b41197a17fd43a7fa5c5220fab2b5b1814b0b31c0f669c3f9b9e1aab5fe7bc606cf172c9e6c1ef4d6a8a WHIRLPOOL bd4299ead3bfeeb114f2857a4070ab73eb6cc9eb7537635466b959737b9bcfd2a9a1f368557ae03eed55d6695ac23b6aa54b25cde4d9c9fc2c07b4c216d4347a
-EBUILD iptables-1.4.16.2.ebuild 2235 SHA256 83fd4ae9778bb1049dc1c6cea8bd026492f86dc0ca77f9500f5af53a3b00f004 SHA512 7ef40c414da528adbaff22a9190e5f83ec730484f6af8f3b2c96584d3ccb9ad51cc45317ce7c3de0705c5ce29865c71de082a5e2c47d89e7b4c37f21bffe2cad WHIRLPOOL 365e3510c97ac7673df126ac2c0145ec6ac985d0afdf6cf6a4b77da24173d810a0cc9ed5e465aafe0666b25511c72ac949c8cb9cef33fd6ea17fd09f17f62836
+EBUILD iptables-1.4.16.2.ebuild 2281 SHA256 5a82c683f71eb2ccc7680885c3f23efa165330c17c5b2b52ea22c2d367ef75a3 SHA512 a2805f9f6d6ea809a3ff06ca1dd6b6550b479307391f6abb1f155ce3e60854e4ef7f80d1675ab1f5fd2d3892fbdd77e42ebb3dfda3a93cd1be4a06e42654efc5 WHIRLPOOL 599b91c11c4cb890970155e1f6dd8eb9d56f3ab727bc70cd8f2f926a18868f1b8afc84782078810abe1cd6713b68c3676f119ca37f213c7be818513c4febcc19
 EBUILD iptables-1.4.6.ebuild 1443 SHA256 3ca97a6095af334fe9b734329ae8e2a58ac78dd1f7a52e0295b203eec4e5178c SHA512 a30301a6f28cc5b90c97b58f37f04005f01313b66f6cb2b5b65294d0612887147d99a7cc8a73940c48a5e4f7d504e643a1e3f0664383bbf7e2e24017944b4436 WHIRLPOOL 836783d6a1f9b733edb965742996cbcac2869a3f716b9b78af4ae912a051919c61c2beb1ea061262da9f80c647db6892e597981ed75d8d5a94cef813722727a4
-MISC ChangeLog 48286 SHA256 6c861fd5bd00c2a5db1d40b3a2edb6c0d460a70543a24ef65ee899519caf0a1e SHA512 f1b7199f2a0ef2117abab8974896b266bea50bbec16855068db69fff1b7d7163c8e025b8bee834fdc9db0986d865a76000ee1461ac4a873fa74bf700eab883f8 WHIRLPOOL 71e494c858238ff251bd61e82743f30e06778052f8c3373c358841e0b0a2bdc095b629cb0f2313546e745908b3e33f8df6e6a7e7357d3b1ca79213cf9b877cf6
+MISC ChangeLog 48470 SHA256 b723279a5224259eab86a2c30dc307524be44b5b50ba82234f69578b5436dcd5 SHA512 05e9572cb775b9a0775fc605b608f648886f329e541106870f21e8c3ba389eecf408f9b3e7a0e47bce7e18a032533a0c7f169a492f2d30b7e4f83672984500ee WHIRLPOOL f9123b6fa31d0d49d37d7695929038222ca723b679c7a877891271b77b98e51787e19f7af7be4aaab8dbe24b27a8bb2c7b2c5cd2b980e27bfadfd844bccfa9b5
 MISC metadata.xml 1033 SHA256 6972ae7bad5c0025564a15429579f046ab4c365929aa175b1e84c1586872bdc9 SHA512 fe251377457099cbf9014fc206176a79d377b2c61f1b239b81e10cb05e740ac8e6d4849ac60987091d33b66ae9d72fbb36cf590bfe663e3dc1338c3648e1c179 WHIRLPOOL e0282695b2be9ab1b56e3779d26e27ce38803fa7fce9b1c66eb0ab3226d527e354436fcde7e15aa238c83dcbeab74cbf6f1aba36609096ca4bcdf982fce52abc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB1Z5cACgkQGwVqY66cHjD+nQCfQWteN2nfAib1Fm3LjCJ7Mdhz
-TRAAn1mjjpbUHm2CNG4ZO2qRJU3utzXx
-=iqal
+iQIcBAEBCAAGBQJQeGcTAAoJELEHsLL7fEFWPacP/jwM20GyjRcmJe8A5KkeOiG0
+uLW3vfB69CNsRzWL3UkdK74Pi99C8Sk4y8IiGuyuPW2k8Me7g/CVfu3wBn26NZuY
+6Jqk8UEL3m4kpt7W3RdfCs46CbTi3tv2h8E7Y1+xrlosdlOSGEFVzmPzetwruPGL
+5c1wYLJ5E/QfkzoJrASTxIW6FEjx50WWvSt/Nt7QY9xlF96kCEWj/DzG6nG1YMpF
+pd+CYgbMb1arLLxjLbpd8Ng5Cw/Sdm3/oFXMuMiowxRCpaB914SwLJfNTrvXi2TD
+VUmSL0nFZK+Snf2rbpfqt3c1jti+HeWFYmHb9mSKz3vMCnp/pDa9n4QZAB1ap1tx
+W9juo/fqlPE0ThxkVlCiMmT+sRR6mPXgik0+b+0fok2ii3V3GMAMdbNNjGDeaO2H
+dPotFeF2JJjAAYCOrTGb6IxWD09rHBIM9VACBfUr65z6IefuJ+fRppIySfZPOBd2
+Q743N9ISx59lSRGPqWc9i5aST790HCbbrPZATUXJizUIT3UlF9inLCciBHQBmmW0
+ltUio1+hdM9s1uCRUpH+uQDDhb8hRalr1gwraJECPv+d0zekYg0CSuxLCJBc2JHh
+ODt6eC5i9r3JjqzRFvFZWcCL61yJxRb0cTAUZXBmHPFTjUmxSXDF9GxCi1eBiZ/n
+HHI9WdJtWIDe4c0YhOV3
+=irFa
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/iptables-1.4.16.2-static.patch b/net-firewall/iptables/files/iptables-1.4.16.2-static.patch
new file mode 100644
index 000000000000..a5d6fe71f670
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.4.16.2-static.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/437712
+
+From 269655d54e22f3a36250bb2c4639dddd102258c6 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Mon, 8 Oct 2012 12:04:56 +0000
+Subject: [PATCH] build: remove symlink-only extensions from static object
+ list
+
+$ ./configure --enable-static --disable-shared --enable-ipv4
+  --enable-ipv6 && make
+[...]
+make[3]: *** No rule to make target "libxt_NOTRACK.o", needed by
+"libext.a". Stop.
+
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ extensions/GNUmakefile.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index 8b38df9..1cef239 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -39,7 +39,7 @@ endif
+ #	Wildcard module list
+ #
+ pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(sort $(wildcard ${srcdir}/libxt_*.c)))
+-pfx_build_mod += NOTRACK state
++pfx_symlinks  := NOTRACK state
+ @ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(sort $(wildcard ${srcdir}/libipt_*.c)))
+ @ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(sort $(wildcard ${srcdir}/libip6t_*.c)))
+ pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
+@@ -48,7 +48,7 @@ pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})
+ pfx_objs      := $(patsubst %,libxt_%.o,${pfx_build_mod})
+ pf4_objs      := $(patsubst %,libipt_%.o,${pf4_build_mod})
+ pf6_objs      := $(patsubst %,libip6t_%.o,${pf6_build_mod})
+-pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod})
++pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
+ pf4_solibs    := $(patsubst %,libipt_%.so,${pf4_build_mod})
+ pf6_solibs    := $(patsubst %,libip6t_%.so,${pf6_build_mod})
+ 
+@@ -220,7 +220,7 @@ man_run    = \
+ 	done >$@;
+ 
+ matches.man: .initext.dd .initext4.dd .initext6.dd $(wildcard ${srcdir}/lib*.man)
+-	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod}))
++	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks}))
+ 
+ targets.man: .initext.dd .initext4.dd .initext6.dd $(wildcard ${srcdir}/lib*.man)
+-	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod}))
++	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks}))
+-- 
+1.7.12
+
diff --git a/net-firewall/iptables/iptables-1.4.16.2.ebuild b/net-firewall/iptables/iptables-1.4.16.2.ebuild
index abddef689820..2a91eedfbbaa 100644
--- a/net-firewall/iptables/iptables-1.4.16.2.ebuild
+++ b/net-firewall/iptables/iptables-1.4.16.2.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/net-firewall/iptables/iptables-1.4.16.2.ebuild,v 1.1 2012/10/08 22:47:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.16.2.ebuild,v 1.2 2012/10/12 18:53:04 vapier Exp $
 
 EAPI="4"
 
@@ -30,6 +30,8 @@ src_prepare() {
 	# use the saner headers from the kernel
 	rm -f include/linux/{kernel,types}.h
 
+	epatch "${FILESDIR}"/${P}-static.patch #437712
+
 	# Only run autotools if user patched something
 	epatch_user && eautoreconf || elibtoolize
 }