Link against local libip6tc #449262 by Mike Gilbert.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 55 insertions, 11 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 6c2b32253536..8c713bd5232a 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.284 2012/12/29 05:16:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.285 2012/12/30 23:11:07 vapier Exp $
+
+  30 Dec 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/iptables-1.4.17-libip6tc.patch, iptables-1.4.17.ebuild:
+  Link against local libip6tc #449262 by Mike Gilbert.
 
 *iptables-1.4.17 (29 Dec 2012)
 
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 970a7f97e9b0..9c54c5c54883 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -13,6 +13,7 @@ AUX iptables-1.4.13-r1.init 2666 SHA256 add450154d983c09e1ade0d929d9eb8b151634c0
 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
 AUX iptables-1.4.16.2-static.patch 2437 SHA256 fd56eaf9a400caa7c25f9893058bbde57085aa3b6d337d30a2eb6f00dead22c9 SHA512 d53a426125493e83c82c7b689bad8b104bbb1d99ed6a4aaf05724877a1260cbbf599476e5192cd14739076f6478a6d8e5ec085afb6782f7ef95abd8a1846ef42 WHIRLPOOL 2158ed63a922951e5e9e8ebd83b67d62f7bc3305c3a6295d5d1999e50e8cda936db9477dbc99051483ab296063074160b4299468ec7eb512c02b4ecc8ec2c7f6
+AUX iptables-1.4.17-libip6tc.patch 1084 SHA256 5940f8020a131df4baa03578256ea9ff4fd975c913e062e3876e64e61a6fa8f3 SHA512 1d91231ad352c16a2af2c5d8593a59b8af4d5d9d4a7248a46170c843e85976bc34b4998f2cb86496cacd1ba30520cd3fe0d41705b7e5f4550bae7da70553ef2d WHIRLPOOL 027368602724dcbda0ddcd443c4a90aee278f409cfe0b3ce221a4e1826d10a4a0d95f6cbe18f887e712b4076161ba2e7adf0d09cf2055224f81ecadd173e5a73
 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 SHA512 432dff8d1bc2b65cd636bb7a8d9ace5402db134df6e5e15c11c2bf1684d513a0f3cf70af099875fbddb25a1ef8868716b4a80791d7475848dd9d7917752d451a WHIRLPOOL ace3dc5ed59f98faea78cce2f1e673cb9b9726360cb1fcaa6ff73b9c36ba2ece8b415f191f1c6862a85829bb857202571bb851132a503ffb272c078d87889cbf
 DIST iptables-1.4.12.1.tar.bz2 473418 SHA256 77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba SHA512 ca8960d6d11faaba293e62169a32f8821d9240907d7ca11741dfca78ce92e32d5e2625f99786f55fb08d27ff7643e2531cc741aa0867f45df61248264b8ffe18 WHIRLPOOL b737fb2704511066d052227f7fe73a1ce64f427c614e56a1a681a7dcc37bac214448f9821b416a35cbe7efdf5436c49d0202f6da77aa0ec60de724137d28abda
@@ -36,18 +37,24 @@ EBUILD iptables-1.4.14-r1.ebuild 2248 SHA256 de1269c992c6f6abffdfa44241a43ed6649
 EBUILD iptables-1.4.15-r1.ebuild 2248 SHA256 d72709f4ab54d0358d5a5ef8da029bf8819e24cfc1d2f4e0f51964f72933f637 SHA512 d380ff6545451b7ff16fceb1683b4ae79840c26a5a17b41197a17fd43a7fa5c5220fab2b5b1814b0b31c0f669c3f9b9e1aab5fe7bc606cf172c9e6c1ef4d6a8a WHIRLPOOL bd4299ead3bfeeb114f2857a4070ab73eb6cc9eb7537635466b959737b9bcfd2a9a1f368557ae03eed55d6695ac23b6aa54b25cde4d9c9fc2c07b4c216d4347a
 EBUILD iptables-1.4.16.2.ebuild 2281 SHA256 5a82c683f71eb2ccc7680885c3f23efa165330c17c5b2b52ea22c2d367ef75a3 SHA512 a2805f9f6d6ea809a3ff06ca1dd6b6550b479307391f6abb1f155ce3e60854e4ef7f80d1675ab1f5fd2d3892fbdd77e42ebb3dfda3a93cd1be4a06e42654efc5 WHIRLPOOL 599b91c11c4cb890970155e1f6dd8eb9d56f3ab727bc70cd8f2f926a18868f1b8afc84782078810abe1cd6713b68c3676f119ca37f213c7be818513c4febcc19
 EBUILD iptables-1.4.16.3.ebuild 2222 SHA256 b2084937f4632122b87cb5499fb758895029f06789401846bac0ca0c9f329ee4 SHA512 6c5956f7810e41886002fcb34d7ab1a38d01c66f98efd1955692ec1552abaed4f2523f1d600ea64d1b6c1b25d1656def9d8305349f4eedae08ced4ecd6403fd8 WHIRLPOOL 505d782a295db64953e7c9b9a9291caf7ee18fa293ec2325258c0e3c199f2bbb828c1480eae43a692f9f888454454e8e163ee9dfcc92d414a1836f5cdc343006
-EBUILD iptables-1.4.17.ebuild 2233 SHA256 4715c7afbbe80f5cb0e6b3f4bfba729327689eedc59194a1bfd81c02ee698a79 SHA512 30affc06072bf5814c6ef4027cae054185e7a69f2c0ed6bc4197c90ae570eb2c1fb36bcd27c911842af8f09a5027c72863d7d21c067544f8de4d2f811c25fff3 WHIRLPOOL 23510c1da7910e35805417e49a9ab8587401d6813d41b20b9a55926a6e8a42135afd0cacd3b8b37ae751eedcb6b5b018f54eec6547ea667e4b3c2da263943845
+EBUILD iptables-1.4.17.ebuild 2280 SHA256 625fd16306c4539887b3a42abd98095614ee5d6db6fffbaec9371414dfb6c146 SHA512 e818288eccc7b93acbd7ddb6fdc4b8087de0f2a31e39de6ffa34021ca0765f3928dbfe5a716510cb0dea90bf8e3fb451817263d9a268739244a4d5c04dfe67c7 WHIRLPOOL bc921f01716f861eaa2c33d6f3dad700400c80635fe19936d3d24e87700906f8fe814744db3744fc28d1668d9de0a4a8298411a83b2fabcb1b0420ec1e447328
 EBUILD iptables-1.4.6.ebuild 1443 SHA256 3ca97a6095af334fe9b734329ae8e2a58ac78dd1f7a52e0295b203eec4e5178c SHA512 a30301a6f28cc5b90c97b58f37f04005f01313b66f6cb2b5b65294d0612887147d99a7cc8a73940c48a5e4f7d504e643a1e3f0664383bbf7e2e24017944b4436 WHIRLPOOL 836783d6a1f9b733edb965742996cbcac2869a3f716b9b78af4ae912a051919c61c2beb1ea061262da9f80c647db6892e597981ed75d8d5a94cef813722727a4
-MISC ChangeLog 49204 SHA256 476c9bc1d8d25e27195989c1fb3ecf02af7890c63b9529ba86f39a5bc9c35c46 SHA512 21ed1d7f4b0a9ff64a70218af4d35c5fc4b672720542dd6d21a207ec60d9f8421a77c63a1ade8d40ea92769586fda7cab5c3eba2d11418479de63f2ae17199d3 WHIRLPOOL 38d04cee2c404026f1b189bd7d6831792e700d300c266fe8f4d58618d52aadcb5ac4da90ccf685aa5deb9dbdb114f32aad8ad938fae5acb650203037832c1906
+MISC ChangeLog 49372 SHA256 785c5214dfea96dc3be30f132619dfe97fb2ad9a5010db8a4fd7654f84709040 SHA512 6c464e17eed01fbd76f1ea248ea9c2cfcecbb151d3c4331f3d4d69ed1590a34d9980ec5072950c329964347cb324e5dc70ee3723b3ec81d6374e2b21186816d7 WHIRLPOOL 60c764eec84a1db6f9bf47f297fcc2048010aaa0ea16e4098aa13d71ada977f34c1ebe4f15d4309101ca63610e82017e2f785e479b734e84a772ec693b82726d
 MISC metadata.xml 1033 SHA256 6972ae7bad5c0025564a15429579f046ab4c365929aa175b1e84c1586872bdc9 SHA512 fe251377457099cbf9014fc206176a79d377b2c61f1b239b81e10cb05e740ac8e6d4849ac60987091d33b66ae9d72fbb36cf590bfe663e3dc1338c3648e1c179 WHIRLPOOL e0282695b2be9ab1b56e3779d26e27ce38803fa7fce9b1c66eb0ab3226d527e354436fcde7e15aa238c83dcbeab74cbf6f1aba36609096ca4bcdf982fce52abc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEbBAEBCAAGBQJQ3ny7AAoJEEqz6FtPBkyjlGMH+L3EM84FMpgB8NXlTSdqSejx
-7Gx4Y6eYE0c11TYfozSRASJ6fWSEeVIVcIa8Bp9Q6vdFgcqgcjd45q64N7SeAdHT
-DMYWpOA/DgqbpY4al1EB3H6CrXEnMVpW1hlkH6yf7OJ+GEv+t+3HMuy6v0xCD/zu
-F+fvutu09VuDF2WJ860bXPRe9D/QpbqsQgDma6LvsfQasab5v6xwWCvDagHfz7TA
-cVzghZqiQM44IsrKjh3dJ4QSfnGRGP7bxp0ecbihDsdmztY5RCxmXX1yqEM/sF8d
-CkRSLyesyObHZAaYnFP3QC5zlx1sVEPOqrgqtn4n/lMMF41TX58kR70w+i/RSg==
-=EwhS
+iQIcBAEBCAAGBQJQ4MpdAAoJELEHsLL7fEFWWnwQAKkluglCvF1i8iozs0sIm9Gn
+hn6g8OCad1TZN7xypKCqhQGpejJOv+NgYRmZNol7OqekXpNUHm/puJ5LzEm9uEeV
+RGAXHpjP4SDUjEaewitN18pOWqRnoLaMX06ROBAbuxjH2NZ3ITsxxNbP6lCJPO/L
+wCoN5M7Mw7oWc0tcFACf0GjqnoxJWZ4tn21xis20pLNXLhC+KbMB5VRQJk1E38Et
++OP4NNDRxRYaaw22gJqLFfyICI0MuR8mamhQZZgo1+HI0lirfkH9ZWC0lZy7/NR0
+YO4/j3Z3Br9vLPkYCadNlKRdDvBpWaOxlmBiHia24GmFGpyIFsEdj4/z3kRoB1Br
+oym6WvAMwsvtndEMuM7/FnN2WLn+zut8gsgPk899Uys3pMQYV3Q+DUNwipDMwTfX
+H8PF0O2L7ZxnI9EzbkDeLH5vZRWTUugxYdtRctMFFDH3G3XY9/jc7463or7RhXqr
+X1hcq4idUDDRWTigW6jAsCe522weBUr0ergPOLow/a50nqJN2CoQ+nDpVJZa6krb
+xG838w7BBVX7NjvCsjjIR1lNbbcZMhTIcS3r+QCunTtVArQyb6DQ0Vh9bewjUvDl
+RMvD7oY6/+RV8HEC/ivp7gLXqazkA+a28tclJf2D378WWAKEkPljMYQHtjI2vjAu
+jJ+4T68YlhEYw1Mqf+pn
+=ITaw
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/iptables-1.4.17-libip6tc.patch b/net-firewall/iptables/files/iptables-1.4.17-libip6tc.patch
new file mode 100644
index 000000000000..5212dd253aa8
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.4.17-libip6tc.patch
@@ -0,0 +1,32 @@
+From d42bc7c100de69396a527e90736198f8e4e3000b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 30 Dec 2012 18:06:15 -0500
+Subject: [PATCH] extensions: fix linking against -lip6tc
+
+The current build forgets to specify a path to find libip6tc which means
+it either fails (if there is no libip6tc in the system), or links against
+an old version (if there is one in the system).
+
+References: https://bugs.gentoo.org/449262
+Reported-by: Mike Gilbert <floppym@gentoo.org>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ extensions/GNUmakefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index e71e3ff..a605474 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -101,7 +101,7 @@ libxt_state.so: libxt_conntrack.so
+ 	ln -fs $< $@
+ 
+ # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
+-ip6t_NETMAP_LIBADD  = -lip6tc
++ip6t_NETMAP_LIBADD  = -L../libiptc/.libs -lip6tc
+ xt_RATEEST_LIBADD   = -lm
+ xt_statistic_LIBADD = -lm
+ 
+-- 
+1.8.0
+
diff --git a/net-firewall/iptables/iptables-1.4.17.ebuild b/net-firewall/iptables/iptables-1.4.17.ebuild
index d696823d30d2..3d15ff97517e 100644
--- a/net-firewall/iptables/iptables-1.4.17.ebuild
+++ b/net-firewall/iptables/iptables-1.4.17.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.17.ebuild,v 1.1 2012/12/29 05:16:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.17.ebuild,v 1.2 2012/12/30 23:11:07 vapier Exp $
 
 EAPI="4"
 
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# use the saner headers from the kernel
 	rm -f include/linux/{kernel,types}.h
+	epatch "${FILESDIR}"/${P}-libip6tc.patch #449262
 
 	# Only run autotools if user patched something
 	epatch_user && eautoreconf || elibtoolize