Version bump #460554 by Manuel Rüger.

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

5 files changed, 276 insertions, 15 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 8ed3be66d382..6208fd9b50a7 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.290 2013/04/27 17:45:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.291 2013/04/27 21:44:41 vapier Exp $
+
+*iptables-1.4.18 (27 Apr 2013)
+
+  27 Apr 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/iptables-1.4.18-extensions-link.patch,
+  +files/iptables-1.4.18-ipv6-linkage.patch, +iptables-1.4.18.ebuild:
+  Version bump #460554 by Manuel Rüger.
 
   27 Apr 2013; Mike Frysinger <vapier@gentoo.org> iptables-1.4.17.ebuild:
   Export AR to avoid `ar` usage #444282 by Agostino Sarubbo.
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 29ac3eccbf3a..ba7b1f89a3e4 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -14,6 +14,8 @@ AUX iptables-1.4.13.confd 687 SHA256 7e2341211ca14997b7a8a1f930f94db855291af597c
 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
+AUX iptables-1.4.18-extensions-link.patch 2717 SHA256 cf73e86b3077f13dd8f287276b766b0e27c29d809335dbe4cc84adc86c254731 SHA512 a53861ab1c6ea703a46c3300a35217ba9205355614a5109b9aeb441a34cad5ac020b4e2d014b88976a53901fe6031c332d87a488050bce7689022753dc795d51 WHIRLPOOL 1bafbfabe562c08d37dfa911c8f11c4b60c7269b764842078559b4352f4287715092752ed6b2c412b32469d1297e579df86cc77cdb32256c5f5904ac82e75262
+AUX iptables-1.4.18-ipv6-linkage.patch 3006 SHA256 c242affce8ff2edfe946c4bbe4f39edd0cfe8a870ed1cbd808863fab57870f11 SHA512 1cfabdeac2e031451cf4c86396893ab34d093d523f25e9bb7f8ab617d4c9c0d03ffc9707ff42bd24bd7951f2b8ee752f1c4b7e4fbab919f67b6773596bf514bf WHIRLPOOL a4253fdf0ba67ca7887f87737c401b480567c7fac50514a53fac81716a7175d841b1a185a945a46487405e5ffe1921b88f897990ab329b28621c3e4cafb62ed9
 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
@@ -24,6 +26,7 @@ DIST iptables-1.4.15.tar.bz2 514830 SHA256 867c144e60075e7bebe6fcecf0b65169d5e2d
 DIST iptables-1.4.16.2.tar.bz2 536755 SHA256 4468ce7e1d68349a8e30f26110eb7969dbfdbf497d6c53758883123b3f2d6f6e SHA512 1ec9d12cc069a8acb1a443e7325c2bb98f0216e0a454413424b49c90bd6f4f94832ed1187a8fc75bdc7d80aa4ca9f3534e15799c46cb17344886d7b4ad34e4c0 WHIRLPOOL b0c782f41bb7d0df794064b1f57853ec664ddf0f899ab4b1f8cf51df0f98594065b7e7e3a77ee398cbb4fcc03fe360e67cf679bf6f9f730263ad29be394e76e0
 DIST iptables-1.4.16.3.tar.bz2 536872 SHA256 643ccf34099d53d5b839e1d889c05627745a51ec122648e76a9fcec3a8a9ec79 SHA512 c232a927fe63623cc0d336b4a09d7baad2d0c5a2a5e3b7ad083727e9f17cd0b668a826a4c5ff0bbb45233fee6c38c153710b13f458514516af7cf7df10d720e2 WHIRLPOOL 2dadcdb39f7741cb7b3c493bc36792a6edbdd9ddaa0c862d2ec0a6fbb89eb82c55f04ae407ab641f425208b15ef6e689af10ce6c03368e40652367c39dead75f
 DIST iptables-1.4.17.tar.bz2 541137 SHA256 51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925 SHA512 022f89cbf56408842bdeb1adbe05076addaad007599fdb662f32a1c134d743dade28c26842acc7545d2474903164be5fe3ec7fd1e276cd2c37bd3b33b8a30de1 WHIRLPOOL f2cb85d5f4080fce2c6673a58737ace3d55130f74c66207bc515d0c7b4ecd75bd7ac8540a862e8af133e740d34eee40833d72c9c3236c7ef4dc75cd43816ec41
+DIST iptables-1.4.18.tar.bz2 542308 SHA256 14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c SHA512 fc62916bd90863c0868f70d711fd6716cbcb54402c32bdeebfd0cee05137fa3ff1a137f0a4b5b31ee0bb6492e23e60e7025d51914b26c0e0b233181cbb1cb1b5 WHIRLPOOL 5d89e0f8d2dfad0f25a369f936f86386c799b2c475cef9fb13fb3c8cb9fcb201361c7d134a24f68099b2b5468c97476e1982bc116fa6448a07d776c724fddbd3
 DIST iptables-1.4.6.tar.bz2 463758 SHA256 6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4 SHA512 0ec1314462a154b5892093b17b997f130760b2ada4fb2b7cdc0f6cb7bb9da9ddaf77400c3fcbe57c4db1400adaec37d38f9debe37f7ed33dabbbe3b58c13e942 WHIRLPOOL 39e1f0f3f46350c81d2fe219b5d40174f4a390180f71ac8c896a634aa29abe98da665c8e93d373465dad351a9604d6c5e36c0f99f7256b85ffbc3615cefa28ae
 EBUILD iptables-1.4.10-r1.ebuild 2224 SHA256 1f18f98ec9949b78b8df8fe8bfe9472b91fd8b235c4cad1e162a99d55dd458b5 SHA512 b0027e43422a8f07f607ce67921420dfc3d56a59b7856f4c4bf70af1c9e8d5731752570ab67d320d71b07276fb4489ca84158686ac7829a23c1e4bf84ded1b66 WHIRLPOOL a8a40bcc3a05b9e5f5dcbcb23c38092732289f3fd3d8962fd0ba3a8b4d7f7d776da68373e028823c8fc04730d05791dd9d45e1fe7baf645ac9d4c006220c1773
 EBUILD iptables-1.4.10.ebuild 1858 SHA256 8933ec2e405043641c48d57a2bc979546a60a242499f26634135f8ccd3256040 SHA512 9fe0e222ccf6a47afc4a609e330bf802b05d88dbf027d7fd58a118a7d9d3a550a1e2725a833aabc0866fe8d30fe611f789a8a34e36459196b0735b2f7c5088d7 WHIRLPOOL 0375aa73a95588a0bd0b50452ca3fe2218cad7f450c221907a1848057d7fd0829cc2c99719fb87ab984305449c0b1f066ec719c04bf0117abb97ba98a1eb42a0
@@ -38,23 +41,24 @@ EBUILD iptables-1.4.15-r1.ebuild 2248 SHA256 d72709f4ab54d0358d5a5ef8da029bf8819
 EBUILD iptables-1.4.16.2.ebuild 2281 SHA256 5a82c683f71eb2ccc7680885c3f23efa165330c17c5b2b52ea22c2d367ef75a3 SHA512 a2805f9f6d6ea809a3ff06ca1dd6b6550b479307391f6abb1f155ce3e60854e4ef7f80d1675ab1f5fd2d3892fbdd77e42ebb3dfda3a93cd1be4a06e42654efc5 WHIRLPOOL 599b91c11c4cb890970155e1f6dd8eb9d56f3ab727bc70cd8f2f926a18868f1b8afc84782078810abe1cd6713b68c3676f119ca37f213c7be818513c4febcc19
 EBUILD iptables-1.4.16.3.ebuild 2217 SHA256 852a0755aba86918ead04ca8315fbc6ddbbbc169e384645e29186ad41eea933e SHA512 19fe94028c3cf9f85611c78bed9fd25516769930f431a1d0dbf8af9121eca53d57118c82cacaada095549b8044f554eb985042e43e666e1b33bdd23bb512b4ff WHIRLPOOL 5e83716016c05d5da819a5901d6b63e91b10d9aa9785b3ab0aa6890ce8c642f6ec3bbf14ff17f548b9be45419c10313359dd502c2ec5f6b0e672cc40a2a25df5
 EBUILD iptables-1.4.17.ebuild 2355 SHA256 c7656bc972eb6cf702aa10ba04682ae5457bf2a11eacfb5f3a54de8a607ecbec SHA512 8802734174dabbd3f51144a63e1c21622632ad97727a3bd7eb507ea28b7dd642ac3b081e941c4f55840202d192f4d756d4385743ae2de2a822ffe6fa8a6c531c WHIRLPOOL f050cdec4a7712f155d82646cee9e4ca4a80f253754eb4b94011a9a5406dcbc03a3665e648fd8db1f02bdb32a805cb3ea4481b92d03a55495fab600b8e354274
+EBUILD iptables-1.4.18.ebuild 2424 SHA256 14f273e0d6ac1d3df9d073f666a448d7db68b8fe64e3641dcda8ac28ca082cf6 SHA512 d835d34529a4e6609ac712de9a16eda946e4f35afe6fdbb2161f0c3c9c726f52167c142d0609510040d51273e13f984760f97f9ebdfb4db9ce03592915db01ee WHIRLPOOL 902e9678fe338d190d4a2f21a2b62d342ee322cfd15801bdd0f9d3ceac8c0edb2f34b46d23b9161b3ea4d187371fa4596eb6198fc97cf533171857afdca4a526
 EBUILD iptables-1.4.6.ebuild 1443 SHA256 3ca97a6095af334fe9b734329ae8e2a58ac78dd1f7a52e0295b203eec4e5178c SHA512 a30301a6f28cc5b90c97b58f37f04005f01313b66f6cb2b5b65294d0612887147d99a7cc8a73940c48a5e4f7d504e643a1e3f0664383bbf7e2e24017944b4436 WHIRLPOOL 836783d6a1f9b733edb965742996cbcac2869a3f716b9b78af4ae912a051919c61c2beb1ea061262da9f80c647db6892e597981ed75d8d5a94cef813722727a4
-MISC ChangeLog 50067 SHA256 b083e1792142d833f1696dff8c63df7d8d735e3cd5954c6d797aeb216590c16a SHA512 ac842b8123fa98dc275b168fc1940c86ce311200164dcba43a22300ce1550fa98e6db202fe60f64e045d1b5884561ad42dbfe2c3e9b8df6c922f1ff6737fdf6c WHIRLPOOL ebf138be228eadbc1d62adc3a37e0cd0ce1a9b168fc6b8e2fb9e802d0daf82d61a9aacd30f6ea1c6bb276546ba0d0d1a4f3ec16ecde68e6b839e5d8838a55988
+MISC ChangeLog 50309 SHA256 f2326cd1a7e8fc83f057c484ee912c0d11ce66d3fda36acc59ae117e09327699 SHA512 e76db301ee0c7dc0f8e80a2479633008ab5ac102696e1a79c1c09b17e5afaee8fc2be3ddf15e8447f98fd3e45cdf6aa9bf03bf1a1c978fe01e0d699f3bdf3e36 WHIRLPOOL acb8723bf2ec5af56e58fb367308dd40aec2a7d77cd93223fdf86ce22c31462629ab3ab3033d2628b456c0b4e15391c0478dd5f03ad6e2684f76cd7213b632f4
 MISC metadata.xml 975 SHA256 38ddd680c554f60b7c19281b9546f69ffc2fd4f37479a2d0299e4fb68483e036 SHA512 56c220422bcb69e9b87a5971847d28944621ae5f782d08911d0f536c62eef60f2cd8416159e2e373ce632064686d5ffa4d2c5ac6c28e354089bf9a31d237cea0 WHIRLPOOL 6804c6fbda37b4cb2fb3615454558c064ef8559cf72eca2d657bdffbd4262dd67ce877ff70c89df4866c0710c62b37a66b73f5a45ced1c540b4d24f8e2fd52ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRfA7VAAoJELEHsLL7fEFWIj8P/1fKdVQlFfJ1Osx03OGf6uOJ
-zySmaVjEbuOMV8YO/+FkNQa2X/hjhXd3+hzbWyda7SEEn91nNdJuzQLyKDCpQ1tX
-T92eYUzcCn1MK2J3IxEnN22AgP6+AVe+e9QejWABEO4tuOstd1W6kLtMAZPFOCH1
-eSqFfskmcMJ7LZBpEaMe4QvL6f5UuJMIbrAPQcBs9R2LgAS3r/spNEiDpL0KDDeS
-m4lARbJ4dz9vZVO5NrJj+eQODAGGubmohAjqQb0Px3OWMv7Qm0sMX9uBZbqqkFt4
-WfM0xmi3I6RyvBL0tegCEb1dcrm0UT/l2GKPgHz5nawViY8Ifk0WLfluHoOZUACa
-oFGj3/5RkKrgBpkOB+QGzQRP6FSkCqiq2PY7n4IzlZmHjApWDnLb52CJfcgBMrtK
-2w2xd0KQsyHUA0Y4rTd2g327Uf3cpdQ+/xjWGr3xfIPYUooG9J0oBBGXILIBiNVt
-LQhzkXR7Nsjo4yNQolYnQSky+hT3Lm2cT4UxZ0UbPReLMYm5SJ15FsRTqBb8YocT
-DivQ87g6+ntCnMrn6ZbSuZeu3BYgG4kcTXAuCltaIHC5z7oGEw3GKx9mGyHPDa+v
-wxtt6txWlqgYRoycb8yHNP3IjtM5YAPE14zAnZ77FFNHSncjmtfPFX1vEvWUKJtl
-uXb9IIhjIKnHSXKo0K2a
-=g7JM
+iQIcBAEBCAAGBQJRfEbNAAoJELEHsLL7fEFWS6wQAL9rX5BQmF4/EwDT1rR18+JT
+gZdbJdANdGExAssJX9UqKUGldY7bnkETHWzij4xzFVfAAZqTkTZSqHPndf7jce63
+8WIHqNm/HKDy8kocxNAFdybgdhSerTm0TSQZ46RU2iMXiKGlyhbnkr7i8aPvoRXn
+O4HLbXbPWAqYylBJ75pcdckpzkX74yUUaiekO5g5rkOCMrr96xAbCBQIrWB3ta6P
+8l4sNVCo7qJuyaBBGNliIfn4HsAHreo+KPWXqJp4kIxU49NOBcR7zjXcrKxu9jeh
+9xS/LP8DlVZYlkM0/z1f/xPd0dkL65wLI4w3p8cbW+6rDpR44kNJWRUlJxVMlETJ
+Yu7Ml6+Q3a3Dd30niMwxD+y2fRNJtLAJVsSJygnFvQSO0/V8Ad+XExGnef3xkJfi
+eOXg6n1DUlF0CIRDegTtq4PffN5siPX0iEkiihDYTV/E1JVyj8PPfCWTVLgS0F8p
+zm22zieFiDTnGoKU/PV1ghSyd0U2HZ1Zgh68b4hDDv8zrjBQhXVXsUJZ5QPh2+/p
+trE6YuS8iQ1LbfdAfrEVPk7rmJ28YPHsz+dIDC/UKVwjPoN6Opy9/5z+HmELJppa
+UzVb5yRo8Ylb+mowZDZmIBmtIeyjYmKbWc+ShGAM0v6j6tlC3mbWJ0aY+p/8ELHx
+x9TqF885r1jSfrOOjRK1
+=BNI9
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/iptables-1.4.18-extensions-link.patch b/net-firewall/iptables/files/iptables-1.4.18-extensions-link.patch
new file mode 100644
index 000000000000..33d048163a18
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.4.18-extensions-link.patch
@@ -0,0 +1,74 @@
+From 37b19d08f3cbc83a653386d76261490e173a874b Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Sat, 16 Mar 2013 12:15:30 +0100
+Subject: [PATCH] Revert "build: resolve link failure for ip6t_NETMAP"
+
+This reverts commit 68e77a26111ee6b8f10c735a76891a7de6d57ee6.
+
+The use of libtool was introduced to resolve linking problems
+in NETMAP (IPv6 version), but that resulted in RPATH problems
+reported from distributors and warnings spotted by libtool at
+linking stage.
+
+Since (0ca548b libip6t_NETMAP: Use xtables_ip6mask_to_cidr and
+get rid of libip6tc dependency) fixed the NETMAP issue, let's
+roll back to our previous stage.
+
+A small conflicts in extensions/GNUmakefile.in has been resolved
+in this revert.
+
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ extensions/GNUmakefile.in | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index 3db6985..1ae7f74 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -33,7 +33,6 @@ AM_VERBOSE_CXX    = @echo "  CXX     " $@;
+ AM_VERBOSE_CXXLD  = @echo "  CXXLD   " $@;
+ AM_VERBOSE_AR     = @echo "  AR      " $@;
+ AM_VERBOSE_GEN    = @echo "  GEN     " $@;
+-AM_VERBOSE_NULL   = @
+ endif
+ 
+ #
+@@ -76,7 +75,7 @@ install: ${targets_install}
+ 	if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
+ 
+ clean:
+-	rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
++	rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
+ 	rm -f .*.d .*.dd;
+ 
+ distclean: clean
+@@ -90,19 +89,16 @@ init%.o: init%.c
+ #
+ #	Shared libraries
+ #
+-lib%.so: lib%.la
+-	${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
++lib%.so: lib%.oo
++	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD};
+ 
+-lib%.la: lib%.lo
+-	${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
+-
+-lib%.lo: ${srcdir}/lib%.c
+-	${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
++lib%.oo: ${srcdir}/lib%.c
++	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
+ 
+ libxt_NOTRACK.so: libxt_CT.so
+-	${AM_VERBOSE_GEN} ln -fs $< $@
++	ln -fs $< $@
+ libxt_state.so: libxt_conntrack.so
+-	${AM_VERBOSE_GEN} ln -fs $< $@
++	ln -fs $< $@
+ 
+ # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
+ xt_RATEEST_LIBADD   = -lm
+-- 
+1.8.2.1
+
diff --git a/net-firewall/iptables/files/iptables-1.4.18-ipv6-linkage.patch b/net-firewall/iptables/files/iptables-1.4.18-ipv6-linkage.patch
new file mode 100644
index 000000000000..52829de24a5f
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.4.18-ipv6-linkage.patch
@@ -0,0 +1,88 @@
+From cccfff9309743f173c504dd265fae173caa5b47f Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Sat, 16 Mar 2013 12:11:07 +0100
+Subject: [PATCH] libip6t_NETMAP: Use xtables_ip6mask_to_cidr and get rid of
+ libip6tc dependency
+
+This patch changes the NETMAP target extension (IPv6 side) to use
+the xtables_ip6mask_to_cidr available in libxtables.
+
+As a side effect, we get rid of the libip6tc dependency.
+
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ extensions/GNUmakefile.in   | 1 -
+ extensions/libip6t_NETMAP.c | 2 +-
+ include/libiptc/libip6tc.h  | 3 ---
+ iptables/ip6tables.c        | 2 +-
+ libiptc/libip6tc.c          | 2 +-
+ 5 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index adad4d6..3db6985 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -105,7 +105,6 @@ libxt_state.so: libxt_conntrack.so
+ 	${AM_VERBOSE_GEN} ln -fs $< $@
+ 
+ # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
+-ip6t_NETMAP_LIBADD  = ../libiptc/libip6tc.la
+ xt_RATEEST_LIBADD   = -lm
+ xt_statistic_LIBADD = -lm
+ 
+diff --git a/extensions/libip6t_NETMAP.c b/extensions/libip6t_NETMAP.c
+index d14dece..a4df70e 100644
+--- a/extensions/libip6t_NETMAP.c
++++ b/extensions/libip6t_NETMAP.c
+@@ -61,7 +61,7 @@ static void NETMAP_print(const void *ip, const struct xt_entry_target *target,
+ 	printf("%s", xtables_ip6addr_to_numeric(&a));
+ 	for (i = 0; i < 4; i++)
+ 		a.s6_addr32[i] = ~(r->min_addr.ip6[i] ^ r->max_addr.ip6[i]);
+-	bits = ipv6_prefix_length(&a);
++	bits = xtables_ip6mask_to_cidr(&a);
+ 	if (bits < 0)
+ 		printf("/%s", xtables_ip6addr_to_numeric(&a));
+ 	else
+diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h
+index c656bc4..9aed80a 100644
+--- a/include/libiptc/libip6tc.h
++++ b/include/libiptc/libip6tc.h
+@@ -154,9 +154,6 @@ int ip6tc_get_raw_socket(void);
+ /* Translates errno numbers into more human-readable form than strerror. */
+ const char *ip6tc_strerror(int err);
+ 
+-/* Return prefix length, or -1 if not contiguous */
+-int ipv6_prefix_length(const struct in6_addr *a);
+-
+ extern void dump_entries6(struct xtc_handle *const);
+ 
+ extern const struct xtc_ops ip6tc_ops;
+diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c
+index 4cfbea3..7d02cc1 100644
+--- a/iptables/ip6tables.c
++++ b/iptables/ip6tables.c
+@@ -1022,7 +1022,7 @@ static void print_ip(const char *prefix, const struct in6_addr *ip,
+ 		     const struct in6_addr *mask, int invert)
+ {
+ 	char buf[51];
+-	int l = ipv6_prefix_length(mask);
++	int l = xtables_ip6mask_to_cidr(mask);
+ 
+ 	if (l == 0 && !invert)
+ 		return;
+diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
+index 7128e1c..ca01bcb 100644
+--- a/libiptc/libip6tc.c
++++ b/libiptc/libip6tc.c
+@@ -113,7 +113,7 @@ typedef unsigned int socklen_t;
+ #define BIT6(a, l) \
+  ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
+ 
+-int
++static int
+ ipv6_prefix_length(const struct in6_addr *a)
+ {
+ 	int l, i;
+-- 
+1.8.2.1
+
diff --git a/net-firewall/iptables/iptables-1.4.18.ebuild b/net-firewall/iptables/iptables-1.4.18.ebuild
new file mode 100644
index 000000000000..f8b2d295a791
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.4.18.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.18.ebuild,v 1.1 2013/04/27 21:44:41 vapier Exp $
+
+EAPI="4"
+
+# Force users doing their own patches to install their own tools
+AUTOTOOLS_AUTO_DEPEND=no
+
+inherit eutils multilib toolchain-funcs autotools
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.netfilter.org/projects/iptables/"
+SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 netlink static-libs"
+
+RDEPEND="
+	netlink? ( net-libs/libnfnetlink )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# use the saner headers from the kernel
+	rm -f include/linux/{kernel,types}.h
+	epatch "${FILESDIR}"/${P}-extensions-link.patch
+	epatch "${FILESDIR}"/${P}-ipv6-linkage.patch
+
+	# Only run autotools if user patched something
+	epatch_user && eautoreconf || elibtoolize
+}
+
+src_configure() {
+	# Some libs use $(AR) rather than libtool to build #444282
+	tc-export AR
+
+	sed -i \
+		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
+		configure || die
+
+	econf \
+		--sbindir="${EPREFIX}/sbin" \
+		--libexecdir="${EPREFIX}/$(get_libdir)" \
+		--enable-devel \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+	dodoc INCOMPATIBILITIES iptables/iptables.xslt
+
+	# all the iptables binaries are in /sbin, so might as well
+	# put these small files in with them
+	into /
+	dosbin iptables/iptables-apply
+	dosym iptables-apply /sbin/ip6tables-apply
+	doman iptables/iptables-apply.8
+
+	insinto /usr/include
+	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
+	insinto /usr/include/iptables
+	doins include/iptables/internal.h
+
+	keepdir /var/lib/iptables
+	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
+	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
+	if use ipv6 ; then
+		keepdir /var/lib/ip6tables
+		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
+		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
+	fi
+
+	# Move important libs to /lib
+	gen_usr_ldscript -a ip{4,6}tc iptc xtables
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}