[gentoo-commits] proj/musl:master commit in: net-firewall/iptables/, net-firewall/iptables/files/

[gentoo-commits] proj/musl:master commit in: net-firewall/iptables/, net-firewall/iptables/files/

[Aric Belsito]

commit:     aa2b2cc0d5d889c6b74eb11232047b4e2f0f66f7
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jan 29 20:46:11 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan 29 20:46:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=aa2b2cc0

net-firewall/iptables: Version bump to 1.6.1

 net-firewall/iptables/Manifest                     |  6 ++--
 .../iptables/files/iptables-1.6.0-musl.patch       | 38 ----------------------
 .../iptables/files/iptables-1.6.1-musl.patch       | 13 ++++++++
 ...ables-1.6.0-r1.ebuild => iptables-1.6.1.ebuild} |  2 +-
 4 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 408f0d2..b8db3c2 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -2,7 +2,7 @@ AUX ip6tables-1.4.13.confd 690 SHA256 2938fe4206514d9868047bd8f888a699fa2097ca69
 AUX iptables-1.4.13-r1.init 2773 SHA256 eca52b98f6d7cc0f74ad2ba65f3a4ea96a0a46424ddab321928c4e82ebf1f5aa SHA512 4e5b555dc32d8358c5a15f50d573c6581c5dc1a726976a46739f13f8f2e0a2524dc6e8faa41d38665cb9068cdfe1785bc91f34104a3bcb0078ad3b1451a418e1 WHIRLPOOL d823437736fcabf54605b7ddbee2c898bb7315cb05f536565714798dea36d66c5141dc4a4dc4a5cff75323f6b09eb361dcd635bc228d8dba4923d5d5159cf779
 AUX iptables-1.4.13.confd 687 SHA256 7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70 WHIRLPOOL 111b809b3122b04cce8ac0e551cfcdec7fde1ad563e1001bbbb3dbb4cae0ddf13851ece1024e13fb26aab2fe306dfc4fd9e59ab5a10127b301bc7a65ec20486b
 AUX iptables-1.4.21-musl.patch 2165 SHA256 1f202ca1f6549af674a7a8300376ca2c451aba5dc1a3203a799ab4c1e6fc7c76 SHA512 1460408bc9a3e08d65a2cf208badb55f927974ae8b364b16f20b15c788fab1720ea55b4d1f3d61f3fb8adcfe8f748dbd817b1ed0d9f2ca9f8be94d585980af0f WHIRLPOOL 05d0254a60872dcb1a767d503c784eca534cf66c71bf448f1863e0b88c753eece249a5b56e57f7e2abf5d1fdf14a6f53e55d045b8af2770ca292482dbf877513
-AUX iptables-1.6.0-musl.patch 1192 SHA256 c1c18e1ba5294af84c9cd8a24648c20486355ed2d27f7c5b0042ea33e131a613 SHA512 abcba22aeab80ac59ca6a5293dd88c258bfa03ca46ad3d83f1298f7f019a1e6fdadf5debf6c7129c4a401af58684658a4b0e5dbfb9336b66975c0865927a434b WHIRLPOOL 53fe9b560b60a1a24cba51f03a7b597a7939eb9d80d0f4629d9c0177dd34cbefbf471dceaef591ff67d4cfe5e73993ea4625f8225e35bae3ad9b3f29b6f21ed8
+AUX iptables-1.6.1-musl.patch 494 SHA256 787c8a0dc79e6be1d025d8d46f7c2724d8f0f46a8034aa26c36e859496aba441 SHA512 20345147f3b1d794da2d14ee82736b55196bddf9bd0413e7ae6e71c84c280479756e0d32eaf50874380bd03ea83b6ed5046e97dbb944c999be8e97adb88b86e2 WHIRLPOOL cc44f8e9188282cea27ea2b87e3a3df81a28e14a1333ee83935fa3daddb5a9e86502d1da49eedfbe38bd4549d5c325a1db1c9350099cfa263c6d0890563fc541
 AUX iptables.init 2794 SHA256 9e83a7dae3a75a4fd58721cf8df2888c661af9e32e478a59a2507d234bd3d95f SHA512 0fccbdd6152ff422d86bab82eea1ddd09f554107f1eab9423e5703ab805930394086ad52717241d767f9793d3e1b4accf7c9539c9431020610711ca5313d9a16 WHIRLPOOL 65a108a045910c97c7d76bf351c4283e9dc19771f54c632351063785251589aeb302ee04b58910e3faf18ee4af208396fc6af69e692b9e3806de394094bbc554
 AUX systemd/ip6tables-restore.service 398 SHA256 611fb01a539f421a06d443ac5bec4ee412699021bb8f99bcc52056b825b72baa SHA512 4df4f73b14e123c463003656631d1affa431f722c9f598cdde6a63a531432aa3f97635b32c59aa2e1ddc4b45f500169c88da1c055fccac6c8ce89db23d015a7a WHIRLPOOL eabe0338f58a300ea53c15e09e35f8c1eb10ac9574213fbe30aff75eb350eaa676f0c927a14e24e7b2eaad6b69124645ff0df995204e65f2a23f0bc00d5d2e1c
 AUX systemd/ip6tables-store.service 243 SHA256 ce93fc2ba81f7693877479ddc75cdec94627c302a140bd27ff30656fad78e72b SHA512 7cee224f91d4c8348606ba176d0d689749a59229958cfdf4e75451d77271363e7cff71dbb7e30dbc4a5a837363a72d70d6960d2dfb218f3ad16456ae109cba10 WHIRLPOOL d84687a142843fa9cd930171e817652afb22b950214349ca156ba6da174312989973d17fed04cd129c18d4d6fbd5ad3124b9afa0d105d128333248c90fdb4ca6
@@ -11,7 +11,7 @@ AUX systemd/iptables-restore.service 394 SHA256 611debe959039341f2ee93c276290046
 AUX systemd/iptables-store.service 240 SHA256 14965fd0f3cd4285e77ea1e3d9975a818b0d64fb0026b925d8434896b2cbf839 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e WHIRLPOOL e3a5b77b2c19ad8445a21cc9c8680c2d632d968483357221fac1c309275bd17aa25c05cf23188d5ae644d5b1266c64b3dd5fe8fbdec9f2a439a212c3d1c767db
 AUX systemd/iptables.service 130 SHA256 c404c54c98521817aca75b96774a24684e0c7ed2fc8de2ced78f4ae4d8a6b99d SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef WHIRLPOOL 844296866dfe2fe6b1207c99d2f938f4c87a37592e95576f9504fe056fe82fc29878b9aa1a204fa31d6711fbe7ba5cd48f7a639e4839bbe366e6220246a0d3c3
 DIST iptables-1.4.21.tar.bz2 547439 SHA256 52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b WHIRLPOOL 475541d1b2b7fe4ee8fa3b537274ef082aab8bfd262201ee14cd53577dfac6f591445cc6d64ed93b226a4b71d54ae1b9ab4cbb378b5440861a585f770f0db200
-DIST iptables-1.6.0.tar.bz2 608288 SHA256 4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60 SHA512 60360910db76e3265fb7b6456a55b91708263bde9c4e5b9cadf3832d2e2a9db3e6cb60c82e278ea0672618bd5c9566c374e00d19d35a2e8f330116c3ab6aaf51 WHIRLPOOL e5ab2398b0650883d31ea144777a6b00904a4e02434f0420037aa54cfc5e47359b95604e945ae3a1abbf3037c37aea2143d3a5457a500e12f1c1139b11655015
+DIST iptables-1.6.1.tar.bz2 620890 SHA256 0fc2d7bd5d7be11311726466789d4c65fb4c8e096c9182b56ce97440864f0cf5 SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8 WHIRLPOOL e34fffbad8a5aea278cdfd11f042e2318862f8e6045a94a2eff35e6cb233ec62d030d83838613338ca2d928f6982cebf9665d039ba61218399139745c9cb08f9
 EBUILD iptables-1.4.21-r1.ebuild 2484 SHA256 a0b493d89bb704f35e835d8fffd1d73ea8528cfaac3f7288e9b7fc9e3b63e0ae SHA512 8145a17bbcccca9aab848150f4068589f2a67562654dd5923ddce6cfdb1f1488027c9d1db878d0d6c5993e9dab1023a7a57ec28c62c924a78cce99d2380bfc67 WHIRLPOOL ca1591bfe3908d020a38c89085b92b2e5483e83f48e0579aeb897d6ff0af1f52e4f786fe600e704aa131015e978061a1376a98030b52940285b773aaac203d7d
-EBUILD iptables-1.6.0-r1.ebuild 3159 SHA256 71a6c1db9fabdc44348bd76e1253c69df7bc658f7148eaf230b2952311ddfb22 SHA512 facfb6d9c6f03a3f04f6f0e32149bb6b90034c7d90aa97624f0326036b10694f85dfa9da61e26be83c7ab2bb6fcdc17d26bee246751f6f1a0c414980a3f5ceee WHIRLPOOL 6a53d4b6685e0178ea9035f52f1e84044beecfce3795c725c53cb5310ac047236a52e96e1e005ae62016969f2c4efec0fb49cf1983cc0f29d53b0f2fc819d8e1
+EBUILD iptables-1.6.1.ebuild 3159 SHA256 d9c7887d1134c3ad98b6547f8ccac7bf11114de87657b67f4e12450e35726177 SHA512 f9a95065cd3a9f627f6ad4e86f695348df8821f7f7d31ab9d1f9b05f978ba50c2a814e6f052589f2d829e313e79350482929e04440be16e7ed1f1aedeec56f64 WHIRLPOOL 8cbf0bad8b9669e387998ca44bb6f9d74b0593cc70b654bc92063eef0ff6fc811987b41996e2e6dea06729c418f49d8155282c92993f850082c6198a21fcccd1
 MISC metadata.xml 1450 SHA256 12a59ccb10431b7760a10a4421f05fd3763eb14c91d27239f04d9bcacec548ab SHA512 3cd157fddc3a2aeca4ba563509b021ae52f02e23a721488eaf47b2aa701e6fee5ab8432603ca9999e6854b4d8a69950cf1a156104ee5db35f9232302326601f1 WHIRLPOOL 4d48988fd6ec8b53a643206c939789a773ab59253506c4659b83f7d563bd558924845dd04bb03702dff160cc49f72a319fa68b7e1e49988022270eeac7cfe82c

diff --git a/net-firewall/iptables/files/iptables-1.6.0-musl.patch b/net-firewall/iptables/files/iptables-1.6.0-musl.patch
deleted file mode 100644
index d5d99ad..0000000
--- a/net-firewall/iptables/files/iptables-1.6.0-musl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naurw iptables-1.6.0.orig/extensions/libip6t_ipv6header.c iptables-1.6.0/extensions/libip6t_ipv6header.c
---- iptables-1.6.0.orig/extensions/libip6t_ipv6header.c	2015-12-09 04:55:06.000000000 -0800
-+++ iptables-1.6.0/extensions/libip6t_ipv6header.c	2015-12-23 17:22:56.757094312 -0800
-@@ -10,6 +10,9 @@
- #include <netdb.h>
- #include <xtables.h>
- #include <linux/netfilter_ipv6/ip6t_ipv6header.h>
-+#ifndef IPPROTO_HOPOPTS
-+#       define IPPROTO_HOPOPTS 0
-+#endif
- 
- enum {
- 	O_HEADER = 0,
-diff -Naurw iptables-1.6.0.orig/extensions/libxt_TCPOPTSTRIP.c iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c
---- iptables-1.6.0.orig/extensions/libxt_TCPOPTSTRIP.c	2015-12-09 04:55:06.000000000 -0800
-+++ iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c	2015-12-23 17:21:50.463763843 -0800
-@@ -12,6 +12,21 @@
- #ifndef TCPOPT_MD5SIG
- #	define TCPOPT_MD5SIG 19
- #endif
-+#ifndef TCPOPT_MAXSEG
-+#	define TCPOPT_MAXSEG 2
-+#endif
-+#ifndef TCPOPT_WINDOW
-+#	define TCPOPT_WINDOW 3
-+#endif
-+#ifndef TCPOPT_SACK_PERMITTED
-+#	define TCPOPT_SACK_PERMITTED 4
-+#endif
-+#ifndef TCPOPT_SACK
-+#	define TCPOPT_SACK 5
-+#endif
-+#ifndef TCPOPT_TIMESTAMP
-+#	define TCPOPT_TIMESTAMP 8
-+#endif
- 
- enum {
- 	O_STRIP_OPTION = 0,

diff --git a/net-firewall/iptables/files/iptables-1.6.1-musl.patch b/net-firewall/iptables/files/iptables-1.6.1-musl.patch
new file mode 100644
index 0000000..90b2be3
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.6.1-musl.patch
@@ -0,0 +1,13 @@
+diff -Naurw iptables-1.6.0.orig/extensions/libip6t_ipv6header.c iptables-1.6.0/extensions/libip6t_ipv6header.c
+--- iptables-1.6.0.orig/extensions/libip6t_ipv6header.c	2015-12-09 04:55:06.000000000 -0800
++++ iptables-1.6.0/extensions/libip6t_ipv6header.c	2015-12-23 17:22:56.757094312 -0800
+@@ -10,6 +10,9 @@
+ #include <netdb.h>
+ #include <xtables.h>
+ #include <linux/netfilter_ipv6/ip6t_ipv6header.h>
++#ifndef IPPROTO_HOPOPTS
++#       define IPPROTO_HOPOPTS 0
++#endif
+ 
+ enum {
+ 	O_HEADER = 0,

diff --git a/net-firewall/iptables/iptables-1.6.0-r1.ebuild b/net-firewall/iptables/iptables-1.6.1.ebuild
similarity index 98%
rename from net-firewall/iptables/iptables-1.6.0-r1.ebuild
rename to net-firewall/iptables/iptables-1.6.1.ebuild
index 16d079a..396ed1b 100644
--- a/net-firewall/iptables/iptables-1.6.0-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

[gentoo-commits] proj/musl:master commit in: net-firewall/iptables/, net-firewall/iptables/files/

[Aric Belsito]

commit:     b244369326ce423219f4a1a79b4ba431803cecac
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Jan 30 18:53:18 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Jan 30 18:53:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=b2443693

net-firewall/iptables: Remove 1.6.1

Current version doesn't actually need a patch

 net-firewall/iptables/Manifest                     |   3 -
 .../iptables/files/iptables-1.6.1-musl.patch       |  13 ---
 net-firewall/iptables/iptables-1.6.1.ebuild        | 116 ---------------------
 3 files changed, 132 deletions(-)

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index b8db3c2..af369ef 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -2,7 +2,6 @@ AUX ip6tables-1.4.13.confd 690 SHA256 2938fe4206514d9868047bd8f888a699fa2097ca69
 AUX iptables-1.4.13-r1.init 2773 SHA256 eca52b98f6d7cc0f74ad2ba65f3a4ea96a0a46424ddab321928c4e82ebf1f5aa SHA512 4e5b555dc32d8358c5a15f50d573c6581c5dc1a726976a46739f13f8f2e0a2524dc6e8faa41d38665cb9068cdfe1785bc91f34104a3bcb0078ad3b1451a418e1 WHIRLPOOL d823437736fcabf54605b7ddbee2c898bb7315cb05f536565714798dea36d66c5141dc4a4dc4a5cff75323f6b09eb361dcd635bc228d8dba4923d5d5159cf779
 AUX iptables-1.4.13.confd 687 SHA256 7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70 WHIRLPOOL 111b809b3122b04cce8ac0e551cfcdec7fde1ad563e1001bbbb3dbb4cae0ddf13851ece1024e13fb26aab2fe306dfc4fd9e59ab5a10127b301bc7a65ec20486b
 AUX iptables-1.4.21-musl.patch 2165 SHA256 1f202ca1f6549af674a7a8300376ca2c451aba5dc1a3203a799ab4c1e6fc7c76 SHA512 1460408bc9a3e08d65a2cf208badb55f927974ae8b364b16f20b15c788fab1720ea55b4d1f3d61f3fb8adcfe8f748dbd817b1ed0d9f2ca9f8be94d585980af0f WHIRLPOOL 05d0254a60872dcb1a767d503c784eca534cf66c71bf448f1863e0b88c753eece249a5b56e57f7e2abf5d1fdf14a6f53e55d045b8af2770ca292482dbf877513
-AUX iptables-1.6.1-musl.patch 494 SHA256 787c8a0dc79e6be1d025d8d46f7c2724d8f0f46a8034aa26c36e859496aba441 SHA512 20345147f3b1d794da2d14ee82736b55196bddf9bd0413e7ae6e71c84c280479756e0d32eaf50874380bd03ea83b6ed5046e97dbb944c999be8e97adb88b86e2 WHIRLPOOL cc44f8e9188282cea27ea2b87e3a3df81a28e14a1333ee83935fa3daddb5a9e86502d1da49eedfbe38bd4549d5c325a1db1c9350099cfa263c6d0890563fc541
 AUX iptables.init 2794 SHA256 9e83a7dae3a75a4fd58721cf8df2888c661af9e32e478a59a2507d234bd3d95f SHA512 0fccbdd6152ff422d86bab82eea1ddd09f554107f1eab9423e5703ab805930394086ad52717241d767f9793d3e1b4accf7c9539c9431020610711ca5313d9a16 WHIRLPOOL 65a108a045910c97c7d76bf351c4283e9dc19771f54c632351063785251589aeb302ee04b58910e3faf18ee4af208396fc6af69e692b9e3806de394094bbc554
 AUX systemd/ip6tables-restore.service 398 SHA256 611fb01a539f421a06d443ac5bec4ee412699021bb8f99bcc52056b825b72baa SHA512 4df4f73b14e123c463003656631d1affa431f722c9f598cdde6a63a531432aa3f97635b32c59aa2e1ddc4b45f500169c88da1c055fccac6c8ce89db23d015a7a WHIRLPOOL eabe0338f58a300ea53c15e09e35f8c1eb10ac9574213fbe30aff75eb350eaa676f0c927a14e24e7b2eaad6b69124645ff0df995204e65f2a23f0bc00d5d2e1c
 AUX systemd/ip6tables-store.service 243 SHA256 ce93fc2ba81f7693877479ddc75cdec94627c302a140bd27ff30656fad78e72b SHA512 7cee224f91d4c8348606ba176d0d689749a59229958cfdf4e75451d77271363e7cff71dbb7e30dbc4a5a837363a72d70d6960d2dfb218f3ad16456ae109cba10 WHIRLPOOL d84687a142843fa9cd930171e817652afb22b950214349ca156ba6da174312989973d17fed04cd129c18d4d6fbd5ad3124b9afa0d105d128333248c90fdb4ca6
@@ -11,7 +10,5 @@ AUX systemd/iptables-restore.service 394 SHA256 611debe959039341f2ee93c276290046
 AUX systemd/iptables-store.service 240 SHA256 14965fd0f3cd4285e77ea1e3d9975a818b0d64fb0026b925d8434896b2cbf839 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e WHIRLPOOL e3a5b77b2c19ad8445a21cc9c8680c2d632d968483357221fac1c309275bd17aa25c05cf23188d5ae644d5b1266c64b3dd5fe8fbdec9f2a439a212c3d1c767db
 AUX systemd/iptables.service 130 SHA256 c404c54c98521817aca75b96774a24684e0c7ed2fc8de2ced78f4ae4d8a6b99d SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef WHIRLPOOL 844296866dfe2fe6b1207c99d2f938f4c87a37592e95576f9504fe056fe82fc29878b9aa1a204fa31d6711fbe7ba5cd48f7a639e4839bbe366e6220246a0d3c3
 DIST iptables-1.4.21.tar.bz2 547439 SHA256 52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b WHIRLPOOL 475541d1b2b7fe4ee8fa3b537274ef082aab8bfd262201ee14cd53577dfac6f591445cc6d64ed93b226a4b71d54ae1b9ab4cbb378b5440861a585f770f0db200
-DIST iptables-1.6.1.tar.bz2 620890 SHA256 0fc2d7bd5d7be11311726466789d4c65fb4c8e096c9182b56ce97440864f0cf5 SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8 WHIRLPOOL e34fffbad8a5aea278cdfd11f042e2318862f8e6045a94a2eff35e6cb233ec62d030d83838613338ca2d928f6982cebf9665d039ba61218399139745c9cb08f9
 EBUILD iptables-1.4.21-r1.ebuild 2484 SHA256 a0b493d89bb704f35e835d8fffd1d73ea8528cfaac3f7288e9b7fc9e3b63e0ae SHA512 8145a17bbcccca9aab848150f4068589f2a67562654dd5923ddce6cfdb1f1488027c9d1db878d0d6c5993e9dab1023a7a57ec28c62c924a78cce99d2380bfc67 WHIRLPOOL ca1591bfe3908d020a38c89085b92b2e5483e83f48e0579aeb897d6ff0af1f52e4f786fe600e704aa131015e978061a1376a98030b52940285b773aaac203d7d
-EBUILD iptables-1.6.1.ebuild 3159 SHA256 d9c7887d1134c3ad98b6547f8ccac7bf11114de87657b67f4e12450e35726177 SHA512 f9a95065cd3a9f627f6ad4e86f695348df8821f7f7d31ab9d1f9b05f978ba50c2a814e6f052589f2d829e313e79350482929e04440be16e7ed1f1aedeec56f64 WHIRLPOOL 8cbf0bad8b9669e387998ca44bb6f9d74b0593cc70b654bc92063eef0ff6fc811987b41996e2e6dea06729c418f49d8155282c92993f850082c6198a21fcccd1
 MISC metadata.xml 1450 SHA256 12a59ccb10431b7760a10a4421f05fd3763eb14c91d27239f04d9bcacec548ab SHA512 3cd157fddc3a2aeca4ba563509b021ae52f02e23a721488eaf47b2aa701e6fee5ab8432603ca9999e6854b4d8a69950cf1a156104ee5db35f9232302326601f1 WHIRLPOOL 4d48988fd6ec8b53a643206c939789a773ab59253506c4659b83f7d563bd558924845dd04bb03702dff160cc49f72a319fa68b7e1e49988022270eeac7cfe82c

diff --git a/net-firewall/iptables/files/iptables-1.6.1-musl.patch b/net-firewall/iptables/files/iptables-1.6.1-musl.patch
deleted file mode 100644
index 90b2be3..0000000
--- a/net-firewall/iptables/files/iptables-1.6.1-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naurw iptables-1.6.0.orig/extensions/libip6t_ipv6header.c iptables-1.6.0/extensions/libip6t_ipv6header.c
---- iptables-1.6.0.orig/extensions/libip6t_ipv6header.c	2015-12-09 04:55:06.000000000 -0800
-+++ iptables-1.6.0/extensions/libip6t_ipv6header.c	2015-12-23 17:22:56.757094312 -0800
-@@ -10,6 +10,9 @@
- #include <netdb.h>
- #include <xtables.h>
- #include <linux/netfilter_ipv6/ip6t_ipv6header.h>
-+#ifndef IPPROTO_HOPOPTS
-+#       define IPPROTO_HOPOPTS 0
-+#endif
- 
- enum {
- 	O_HEADER = 0,

diff --git a/net-firewall/iptables/iptables-1.6.1.ebuild b/net-firewall/iptables/iptables-1.6.1.ebuild
deleted file mode 100644
index 396ed1b..0000000
--- a/net-firewall/iptables/iptables-1.6.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib systemd toolchain-funcs autotools flag-o-matic
-
-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"
-# Subslot tracks libxtables as that's the one other packages generally link
-# against and iptables changes.  Will have to revisit if other sonames change.
-SLOT="0/11"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="conntrack ipv6 netlink nftables pcap static-libs"
-
-RDEPEND="
-	conntrack? ( net-libs/libnetfilter_conntrack )
-	netlink? ( net-libs/libnfnetlink )
-	nftables? (
-		>=net-libs/libmnl-1.0
-		>=net-libs/libnftnl-1.0.5
-	)
-	pcap? ( net-libs/libpcap )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-	nftables? (
-		sys-devel/flex
-		virtual/yacc
-	)
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Fix for MUSL
-	epatch "${FILESDIR}"/${P}-musl.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
-
-	# Hack around struct mismatches between userland & kernel for some ABIs. #472388
-	use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
-		configure || die
-
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable nftables) \
-		$(use_enable pcap bpf-compiler) \
-		$(use_enable pcap nfsynproxy) \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	# Deal with parallel build errors.
-	use nftables && emake -C iptables xtables-config-parser.h
-	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}.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
-	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
-	fi
-
-	# Move important libs to /lib #332175
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
-	prune_libtool_files
-}

[gentoo-commits] proj/musl:master commit in: net-firewall/iptables/, net-firewall/iptables/files/

[Anthony G. Basile]

commit:     3489eb088f018f9ff3871f7ec0744b9386bc53c1
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 16:41:53 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 16:41:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=3489eb08

net-firewall/iptables: cleanup.

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0xF52D4BBA

 net-firewall/iptables/Manifest                     |   3 -
 .../iptables/files/iptables-1.4.20-musl.patch      | 304 ---------------------
 net-firewall/iptables/iptables-1.4.20-r99.ebuild   |  93 -------
 3 files changed, 400 deletions(-)

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 90d0bb2..540a664 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,7 +1,6 @@
 AUX ip6tables-1.4.13.confd 690 SHA256 2938fe4206514d9868047bd8f888a699fa2097ca69edab176453436d4259abaa SHA512 8de9a5de4061bef217fbc07577688a8110f1116af7f3b936dfd18100a6a7a47ec6e70c456b24cf3432fb4f2034b741a487fe6af8d9740f174d51c6eb16945c6e WHIRLPOOL f2f4903812b5b97d5bdf9cb28f0bcb6f8c866f197b46a9128530721a8d9db1cdcedffe2512c9235391a67f494c2daf1266d7bc8a6185949756437221c3861a10
 AUX iptables-1.4.13-r1.init 2891 SHA256 13047698e03079b754957e1e548ce7505dfb2c73c9a31f87e061140603ab0e44 SHA512 c35d4fc3d08e6fe3c567a5fe4b8dc0679c87c01c5d90e9a08b68039e4e846043a1f1ae47bc37bc718af761b9287394e8edfa3681d5ae23d666fc9de60a8c8302 WHIRLPOOL 7007ab6e5524b7d1e6e3c17ed0a7c40c6e7034510ecad2e442a2863a819a72f5f1cda58c5b6ad331b36c6c5c40980f344364593246d46cf95c1527a24115b829
 AUX iptables-1.4.13.confd 687 SHA256 7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70 WHIRLPOOL 111b809b3122b04cce8ac0e551cfcdec7fde1ad563e1001bbbb3dbb4cae0ddf13851ece1024e13fb26aab2fe306dfc4fd9e59ab5a10127b301bc7a65ec20486b
-AUX iptables-1.4.20-musl.patch 9543 SHA256 b245f263a7cd3807389fada98e1ff12c3b9b0359e77c5660841dbd6c6bc4c3cd SHA512 84c7401d89ef048f6221c55dfee0d6971938d4575c8ddd00e5fd03ed39cc277f7d5074b3b20313535389f321a2ef8cdfa12313a5481f8c49a89a4ca26deaf54a WHIRLPOOL 2b95fc4ede005f819676d3d3abe96f6f23881657b5da36d8cc73fb09cbdc93de8e77da8dc17c7669ddb0e0d86b4e3c0e036d9e8a8a65235b50b3cd1b2266c977
 AUX iptables-1.4.21-musl.patch 3947 SHA256 1d5fbdcb4752c480a4198a0188b067352fdd6b99a221de18ab8a106a5b115ee0 SHA512 6fc3c0c29da8f767892b1022e659f341c2ff97bc83a70b4b19fffe3b7385cd4879fe53e9630a6ec9f9449f3b5b20d34a060c4af0c5f186829069da0d075c9dfe WHIRLPOOL f6fe339c790fdfd5de544cc0791b775df2a2c486b7c4b2092ee2cd400874ddb53677abcd5c74022c2dc7079e919890e7da6d481a240b5396bd38162681ce7f54
 AUX systemd/ip6tables-restore.service 395 SHA256 679ba8327bf037e991ff07d8cf910009c67026b0faf8112d75c945b64f4b64de SHA512 e41f7bc55b2b58452b993ccb42014b5bc2701aeeef46eee845a2b016b334299ff4e6d11ba22f3aaff47195f1049dc7fd4be41a7055911420230107b1ee4c6ba3 WHIRLPOOL 232d90f8591358fe853c8c4b569b2825ba02ced59d390232a7f7fb535e3bfbbcb70972938506cbead5e6b57845310f5a91c1fd225898f185cffb96ba7d4d97f3
 AUX systemd/ip6tables-store.service 243 SHA256 ce93fc2ba81f7693877479ddc75cdec94627c302a140bd27ff30656fad78e72b SHA512 7cee224f91d4c8348606ba176d0d689749a59229958cfdf4e75451d77271363e7cff71dbb7e30dbc4a5a837363a72d70d6960d2dfb218f3ad16456ae109cba10 WHIRLPOOL d84687a142843fa9cd930171e817652afb22b950214349ca156ba6da174312989973d17fed04cd129c18d4d6fbd5ad3124b9afa0d105d128333248c90fdb4ca6
@@ -9,8 +8,6 @@ AUX systemd/ip6tables.service 133 SHA256 1b8d342ffdf471ef25e365dacf106e1899b438d
 AUX systemd/iptables-restore.service 391 SHA256 ace3b2085700bde96f0597e8c6f3b8524c28d4f9b6c924deb09b164a5b8e979c SHA512 222a088d487f8e5c199aec4a3619f8c8ee620ffca13c35fd3da8daf926db25fa5203226a6f4a2c426622d935ffd57c02ad4ff5edbca922f8168e29fc3e52c516 WHIRLPOOL 507cfef3650fcce3a17d56edfb39110d08397bbd96c88cb21c2cdb74c69b920142f0f68f71312ae7a6013057e0ab500546a0075806dd424fc85b9aebdb76b5f4
 AUX systemd/iptables-store.service 240 SHA256 14965fd0f3cd4285e77ea1e3d9975a818b0d64fb0026b925d8434896b2cbf839 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e WHIRLPOOL e3a5b77b2c19ad8445a21cc9c8680c2d632d968483357221fac1c309275bd17aa25c05cf23188d5ae644d5b1266c64b3dd5fe8fbdec9f2a439a212c3d1c767db
 AUX systemd/iptables.service 130 SHA256 c404c54c98521817aca75b96774a24684e0c7ed2fc8de2ced78f4ae4d8a6b99d SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef WHIRLPOOL 844296866dfe2fe6b1207c99d2f938f4c87a37592e95576f9504fe056fe82fc29878b9aa1a204fa31d6711fbe7ba5cd48f7a639e4839bbe366e6220246a0d3c3
-DIST iptables-1.4.20.tar.bz2 546864 SHA256 109b8c7ca90b4536bc5de869ae705f6d5efcc0c08ef3003755aad3ed6d2d49ad SHA512 6c8e1d89db66c0cfd76afd7fa7de8a7d451337f6f15f01d811585714f6d488275621ca9a1f4967a2ae99e90f3890cf0e3c7f7a9a3a98fda902b0a56717d7ffe0 WHIRLPOOL 8146d632ec00c663988d4e82e3adfa8b9fa2df269df2e6cc359dae65727e59f4ef614540eb4f970d020eac558d7423731a88246f9df1265718346ca62e59a8e7
 DIST iptables-1.4.21.tar.bz2 547439 SHA256 52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b WHIRLPOOL 475541d1b2b7fe4ee8fa3b537274ef082aab8bfd262201ee14cd53577dfac6f591445cc6d64ed93b226a4b71d54ae1b9ab4cbb378b5440861a585f770f0db200
-EBUILD iptables-1.4.20-r99.ebuild 2351 SHA256 cc58a460821612291fc4040a71d1c6c69b36e315a6c7fa42447009a1c440f208 SHA512 9839e8fd6c7d29ff014dc9f71fb8f85d4c2378384bb9ebb1283dfd03c593bdc968262f7f5f389649407a3596dd7c699c5d0f226a5df84acd81bca85f28dd5f5d WHIRLPOOL 94d8c4a2d94ad72fbb1cbd822494526ae5c5520e6e2fa9500c04d116523ebc22b66c60a24ec18d9ccf138c833fd4eb3ef64a359ba3de074126b6d786a4293dae
 EBUILD iptables-1.4.21-r99.ebuild 2428 SHA256 106e7046e9977b4c69be158b04bb541ec4514b063b80308f860094b920eca726 SHA512 8c45d4c8d0c3ed6d813ba20d41a5a672f5b318b124015d30b5af0035587e96ccd9d62cfc680a097928df965653b1b6b620515153335109d936e0bca70a0a5646 WHIRLPOOL 3dfd8107fa7bb492e224e2966c40928d59ee728f7db5e663ba8fcae4e2f98e38a3f10c5c0582416d235f788b7d3108824fb10be0847b96960e7375d4b024cc17
 MISC metadata.xml 1069 SHA256 91c6679d742c254b368f9a18cb42a3d29f90a9b691dda61967152b629e2abaa2 SHA512 395b2b3b812cc99d31ea812ad2e42fe52e9fc3e5fcd17db18b95b1dba09495bb5124760308ba46a463b47cb089d587819600d5883a313314a865628fa00f6907 WHIRLPOOL 6e1e2717c19802d94f155c6841a0b7cef10ad38cd338e3e5ba8eab671b433c547fbe816a234f8e02ad1a0bfd6f69695ff643f3ca62a99a6d51be8108eb79e9ce

diff --git a/net-firewall/iptables/files/iptables-1.4.20-musl.patch b/net-firewall/iptables/files/iptables-1.4.20-musl.patch
deleted file mode 100644
index cd5b1a7..0000000
--- a/net-firewall/iptables/files/iptables-1.4.20-musl.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-diff -ur a/iptables-1.4.20/extensions/libxt_conntrack.c b/iptables-1.4.20/extensions/libxt_conntrack.c
---- a/iptables-1.4.20/extensions/libxt_conntrack.c
-+++ b/iptables-1.4.20/extensions/libxt_conntrack.c
-@@ -786,7 +786,7 @@
- 
- static void
- conntrack_dump_ports(const char *prefix, const char *opt,
--		     u_int16_t port_low, u_int16_t port_high)
-+		     uint16_t port_low, uint16_t port_high)
- {
- 	if (port_high == 0 || port_low == port_high)
- 		printf(" %s%s %u", prefix, opt, port_low);
-diff -ur a/iptables-1.4.20/include/libipq/libipq.h b/iptables-1.4.20/include/libipq/libipq.h
---- a/iptables-1.4.20/include/libipq/libipq.h
-+++ b/iptables-1.4.20/include/libipq/libipq.h
-@@ -48,19 +48,19 @@
- struct ipq_handle
- {
- 	int fd;
--	u_int8_t blocking;
-+	uint8_t blocking;
- 	struct sockaddr_nl local;
- 	struct sockaddr_nl peer;
- };
- 
--struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol);
-+struct ipq_handle *ipq_create_handle(uint32_t flags, uint32_t protocol);
- 
- int ipq_destroy_handle(struct ipq_handle *h);
- 
- ssize_t ipq_read(const struct ipq_handle *h,
-                 unsigned char *buf, size_t len, int timeout);
- 
--int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len);
-+int ipq_set_mode(const struct ipq_handle *h, uint8_t mode, size_t len);
- 
- ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf);
- 
-diff -ur a/iptables-1.4.20/include/libiptc/ipt_kernel_headers.h b/iptables-1.4.20/include/libiptc/ipt_kernel_headers.h
---- a/iptables-1.4.20/include/libiptc/ipt_kernel_headers.h
-+++ b/iptables-1.4.20/include/libiptc/ipt_kernel_headers.h
-@@ -15,13 +15,12 @@
- #include <sys/types.h>
- #else /* libc5 */
- #include <sys/socket.h>
--#include <linux/ip.h>
--#include <linux/in.h>
--#include <linux/if.h>
-+#include <netinet/ip.h>
-+#include <netinet/in.h>
-+#include <net/if.h>
- #include <linux/icmp.h>
- #include <linux/tcp.h>
- #include <linux/udp.h>
- #include <linux/types.h>
--#include <linux/in6.h>
- #endif
- #endif
-diff -ur a/iptables-1.4.20/include/libiptc/libxtc.h b/iptables-1.4.20/include/libiptc/libxtc.h
---- a/iptables-1.4.20/include/libiptc/libxtc.h
-+++ b/iptables-1.4.20/include/libiptc/libxtc.h
-@@ -10,7 +10,7 @@
- #endif
- 
- #ifndef XT_MIN_ALIGN
--/* xt_entry has pointers and u_int64_t's in it, so if you align to
-+/* xt_entry has pointers and uint64_t's in it, so if you align to
-    it, you'll also align to any crazy matches and targets someone
-    might write */
- #define XT_MIN_ALIGN (__alignof__(struct xt_entry))
-diff -ur a/iptables-1.4.20/include/libipulog/libipulog.h b/iptables-1.4.20/include/libipulog/libipulog.h
---- a/iptables-1.4.20/include/libipulog/libipulog.h	2013-08-06 15:48:43.000000000 +0000
-+++ b/iptables-1.4.20/include/libipulog/libipulog.h	2014-02-09 09:32:45.058650377 +0000
-@@ -21,9 +21,9 @@
- 
- struct ipulog_handle;
- 
--u_int32_t ipulog_group2gmask(u_int32_t group);
-+uint32_t ipulog_group2gmask(uint32_t group);
- 
--struct ipulog_handle *ipulog_create_handle(u_int32_t gmask);
-+struct ipulog_handle *ipulog_create_handle(uint32_t gmask);
- 
- void ipulog_destroy_handle(struct ipulog_handle *h);
- 
-diff -ur a/iptables-1.4.20/include/linux/netfilter_ipv4/ip_tables.h b/iptables-1.4.20/include/linux/netfilter_ipv4/ip_tables.h
---- a/iptables-1.4.20/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/iptables-1.4.20/include/linux/netfilter_ipv4/ip_tables.h
-@@ -15,6 +15,7 @@
- #ifndef _IPTABLES_H
- #define _IPTABLES_H
- 
-+#include <stdint.h>
- #include <linux/types.h>
- 
- #include <linux/netfilter_ipv4.h>
-@@ -73,12 +74,12 @@
- 	unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
- 
- 	/* Protocol, 0 = ANY */
--	u_int16_t proto;
-+	uint16_t proto;
- 
- 	/* Flags word */
--	u_int8_t flags;
-+	uint8_t flags;
- 	/* Inverse flags */
--	u_int8_t invflags;
-+	uint8_t invflags;
- };
- 
- /* Values for "flag" field in struct ipt_ip (general ip structure). */
-@@ -106,9 +107,9 @@
- 	unsigned int nfcache;
- 
- 	/* Size of ipt_entry + matches */
--	u_int16_t target_offset;
-+	uint16_t target_offset;
- 	/* Size of ipt_entry + matches + target */
--	u_int16_t next_offset;
-+	uint16_t next_offset;
- 
- 	/* Back pointer */
- 	unsigned int comefrom;
-@@ -125,7 +126,7 @@
-  * Unlike BSD Linux inherits IP options so you don't have to use a raw
-  * socket for this. Instead we check rights in the calls.
-  *
-- * ATTENTION: check linux/in.h before adding new number here.
-+ * ATTENTION: check netinet/in.h before adding new number here.
-  */
- #define IPT_BASE_CTL		64
- 
-@@ -141,9 +142,9 @@
- 
- /* ICMP matching stuff */
- struct ipt_icmp {
--	u_int8_t type;				/* type to match */
--	u_int8_t code[2];			/* range of code */
--	u_int8_t invflags;			/* Inverse flags */
-+	uint8_t type;				/* type to match */
-+	uint8_t code[2];			/* range of code */
-+	uint8_t invflags;			/* Inverse flags */
- };
- 
- /* Values for "inv" field for struct ipt_icmp. */
-diff -ur a/iptables-1.4.20/include/linux/netfilter_ipv6/ip6_tables.h b/iptables-1.4.20/include/linux/netfilter_ipv6/ip6_tables.h
---- a/iptables-1.4.20/include/linux/netfilter_ipv6/ip6_tables.h
-+++ b/iptables-1.4.20/include/linux/netfilter_ipv6/ip6_tables.h
-@@ -73,14 +73,14 @@
- 	 *   MH do not match any packets.
- 	 * - You also need to set IP6T_FLAGS_PROTO to "flags" to check protocol.
- 	 */
--	u_int16_t proto;
-+	uint16_t proto;
- 	/* TOS to match iff flags & IP6T_F_TOS */
--	u_int8_t tos;
-+	uint8_t tos;
- 
- 	/* Flags word */
--	u_int8_t flags;
-+	uint8_t flags;
- 	/* Inverse flags */
--	u_int8_t invflags;
-+	uint8_t invflags;
- };
- 
- /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
-@@ -110,9 +110,9 @@
- 	unsigned int nfcache;
- 
- 	/* Size of ipt_entry + matches */
--	u_int16_t target_offset;
-+	uint16_t target_offset;
- 	/* Size of ipt_entry + matches + target */
--	u_int16_t next_offset;
-+	uint16_t next_offset;
- 
- 	/* Back pointer */
- 	unsigned int comefrom;
-@@ -162,7 +162,6 @@
-  * Unlike BSD Linux inherits IP options so you don't have to use
-  * a raw socket for this. Instead we check rights in the calls.
-  *
-- * ATTENTION: check linux/in6.h before adding new number here.
-  */
- #define IP6T_BASE_CTL			64
- 
-@@ -178,9 +177,9 @@
- 
- /* ICMP matching stuff */
- struct ip6t_icmp {
--	u_int8_t type;				/* type to match */
--	u_int8_t code[2];			/* range of code */
--	u_int8_t invflags;			/* Inverse flags */
-+	uint8_t type;				/* type to match */
-+	uint8_t code[2];			/* range of code */
-+	uint8_t invflags;			/* Inverse flags */
- };
- 
- /* Values for "inv" field for struct ipt_icmp. */
-diff -ur a/iptables-1.4.20/include/linux/netfilter_ipv6/ip6t_rt.h b/iptables-1.4.20/include/linux/netfilter_ipv6/ip6t_rt.h
---- a/iptables-1.4.20/include/linux/netfilter_ipv6/ip6t_rt.h
-+++ b/iptables-1.4.20/include/linux/netfilter_ipv6/ip6t_rt.h
-@@ -2,7 +2,6 @@
- #define _IP6T_RT_H
- 
- #include <linux/types.h>
--/*#include <linux/in6.h>*/
- 
- #define IP6T_RT_HOPS 16
- 
-diff -ur a/iptables-1.4.20/include/xtables.h b/iptables-1.4.20/include/xtables.h
---- a/iptables-1.4.20/include/xtables.h
-+++ b/iptables-1.4.20/include/xtables.h
-@@ -220,12 +220,12 @@
- 	const char *real_name;
- 
- 	/* Revision of match (0 by default). */
--	u_int8_t revision;
-+	uint8_t revision;
- 
- 	/* Extension flags */
--	u_int8_t ext_flags;
-+	uint8_t ext_flags;
- 
--	u_int16_t family;
-+	uint16_t family;
- 
- 	/* Size of match data. */
- 	size_t size;
-@@ -297,12 +297,12 @@
- 	const char *real_name;
- 
- 	/* Revision of target (0 by default). */
--	u_int8_t revision;
-+	uint8_t revision;
- 
- 	/* Extension flags */
--	u_int8_t ext_flags;
-+	uint8_t ext_flags;
- 
--	u_int16_t family;
-+	uint16_t family;
- 
- 
- 	/* Size of target data. */
-@@ -373,7 +373,7 @@
-  */
- struct xtables_pprot {
- 	const char *name;
--	u_int8_t num;
-+	uint8_t num;
- };
- 
- enum xtables_tryload {
-@@ -446,12 +446,12 @@
- extern bool xtables_strtoui(const char *, char **, unsigned int *,
- 	unsigned int, unsigned int);
- extern int xtables_service_to_port(const char *name, const char *proto);
--extern u_int16_t xtables_parse_port(const char *port, const char *proto);
-+extern uint16_t xtables_parse_port(const char *port, const char *proto);
- extern void
- xtables_parse_interface(const char *arg, char *vianame, unsigned char *mask);
- 
- /* this is a special 64bit data type that is 8-byte aligned */
--#define aligned_u64 u_int64_t __attribute__((aligned(8)))
-+#define aligned_u64 uint64_t __attribute__((aligned(8)))
- 
- extern struct xtables_globals *xt_params;
- #define xtables_error (xt_params->exit_err)
-@@ -514,7 +514,7 @@
- #endif
- 
- extern const struct xtables_pprot xtables_chain_protos[];
--extern u_int16_t xtables_parse_protocol(const char *s);
-+extern uint16_t xtables_parse_protocol(const char *s);
- 
- /* kernel revision handling */
- extern int kernel_version;
-diff -ur a/iptables-1.4.20/libipq/ipq_create_handle.3 b/iptables-1.4.20/libipq/ipq_create_handle.3
---- a/iptables-1.4.20/libipq/ipq_create_handle.3
-+++ b/iptables-1.4.20/libipq/ipq_create_handle.3
-@@ -24,7 +24,7 @@
- .br
- .B #include <libipq.h>
- .sp
--.BI "struct ipq_handle *ipq_create_handle(u_int32_t " flags ", u_int32_t " protocol ");"
-+.BI "struct ipq_handle *ipq_create_handle(uint32_t " flags ", uint32_t " protocol ");"
- .br
- .BI "int ipq_destroy_handle(struct ipq_handle *" h );
- .SH DESCRIPTION
-diff -ur a/iptables-1.4.20/libipq/ipq_set_mode.3 b/iptables-1.4.20/libipq/ipq_set_mode.3
---- a/iptables-1.4.20/libipq/ipq_set_mode.3
-+++ b/iptables-1.4.20/libipq/ipq_set_mode.3
-@@ -24,7 +24,7 @@
- .br
- .B #include <libipq.h>
- .sp
--.BI "int ipq_set_mode(const struct ipq_handle *" h ", u_int8_t " mode ", size_t " range );
-+.BI "int ipq_set_mode(const struct ipq_handle *" h ", uint8_t " mode ", size_t " range );
- .SH DESCRIPTION
- The
- .B ipq_set_mode

diff --git a/net-firewall/iptables/iptables-1.4.20-r99.ebuild b/net-firewall/iptables/iptables-1.4.20-r99.ebuild
deleted file mode 100644
index 287dec6..0000000
--- a/net-firewall/iptables/iptables-1.4.20-r99.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.20.ebuild,v 1.12 2014/01/18 19:48:53 ago 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="amd64 arm ~mips ppc 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}-musl.patch
-
-	# Remove problematic extensions
-	rm -f extensions/libxt_TCPOPTSTRIP.*
-	rm -f extensions/libxt_osf.*
-
-	# 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
-
-	prune_libtool_files
-}