Add net-firewall/iptables-1.6.1-r3

4 files changed, 130 insertions, 4 deletions

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 8169d959..86092e9a 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -3,10 +3,10 @@ AUX iptables-1.4.13.confd 687 SHA256 7e2341211ca14997b7a8a1f930f94db855291af597c
 AUX iptables-1.4.21-configure.patch 1066 SHA256 73454c278b48fae5debcdb72ada8f2d60a36b5134cb1052b1a332b83169cbdc0 SHA512 45445d1460072ed19ba617be983be82094fdd0535a25de4f6159173de4a08be9bee9da13c7aeea419291beb92402ca25efba3a0e269510e221f7eacc8bcd5176 WHIRLPOOL 55c56c9e0711409c54b8635dc9b480be885c852b60ac336a32b3a48586c85ba5b7b9a0b4d2d427f7d646dfdc4d49c9fe6957ed39eac5cdd7de3526249f99e6ed
 AUX iptables-1.4.21-static-connlabel-config.patch 2195 SHA256 e03de480a940b0ac386bba2ec681f724ba39f5e53153398e061f2d74ae491c49 SHA512 d838773bf2db9f97548d2f7eaab0ce3205265a7ec8b274df479fcecb474ba09ed061abae50534c0379a1290479c2e94927595eca0f4570b27744ec165348b6b1 WHIRLPOOL c1b79bb8e9a915d27940b443c564d0d00ccbd31728b8519bd18a6957ca7085c19dd09592d94a4aecee48102303a000130eba85710ad1de1533ef783ef1c28811
 AUX iptables.init 3104 SHA256 7545281ee5f359f83e1e2d7d50c402821f637b53bda3694a399e672889b63293 SHA512 99050c04186422dfab346493e201f7b9caecb2c08fb45ae1bc557182757b6d768c5a37e57e7ea9a1929834ced6f7f880e318cea553ee976d0d1c6f31cdfc2403 WHIRLPOOL ff6828f5941e322ffa2052788234d4a96fa6912e3fe277b53ddc3a48a89925484ecf66004bfa71d542d29f2cd40f42ea228a4954c8b32a86b0c9f9dd1076239b
-AUX systemd/ip6tables-restore.service 398 SHA256 611fb01a539f421a06d443ac5bec4ee412699021bb8f99bcc52056b825b72baa SHA512 4df4f73b14e123c463003656631d1affa431f722c9f598cdde6a63a531432aa3f97635b32c59aa2e1ddc4b45f500169c88da1c055fccac6c8ce89db23d015a7a WHIRLPOOL eabe0338f58a300ea53c15e09e35f8c1eb10ac9574213fbe30aff75eb350eaa676f0c927a14e24e7b2eaad6b69124645ff0df995204e65f2a23f0bc00d5d2e1c
+AUX systemd/ip6tables-restore.service 404 SHA256 bd3f70939efbf2ad29e1fac63179390a8bc074594ee7b5d19b165edb2efcdd49 SHA512 34730df7464354bce11ca5bdceb5cf305e8ab7e2ded2c2689448379e74ff93252e7a83cfe05c2f3238f59a2ade69cd9c328291c28c43b6612bfb7b29fcb0feee WHIRLPOOL d6423e367645ed38279a0e0a35744cdd694feeb6cdc5d717b939dfb71ab8ab45e6e219b566ebf1420f8a4f1bb4150858ba86a5246d92f9d335e2f41de658241f
 AUX systemd/ip6tables-store.service 243 SHA256 ce93fc2ba81f7693877479ddc75cdec94627c302a140bd27ff30656fad78e72b SHA512 7cee224f91d4c8348606ba176d0d689749a59229958cfdf4e75451d77271363e7cff71dbb7e30dbc4a5a837363a72d70d6960d2dfb218f3ad16456ae109cba10 WHIRLPOOL d84687a142843fa9cd930171e817652afb22b950214349ca156ba6da174312989973d17fed04cd129c18d4d6fbd5ad3124b9afa0d105d128333248c90fdb4ca6
 AUX systemd/ip6tables.service 133 SHA256 1b8d342ffdf471ef25e365dacf106e1899b438dad4bf9154cfad2d5217c3a019 SHA512 f871e694a8c666a59840c4c7ae1f355dc47f481501b3472601b65460c1d6e163a7e33f7a6c42a84ac33131ddb96170b316e83507a43f1ede54d61446f81950dc WHIRLPOOL 24140e7398cfa494210b8d3b773bdca5ee1abbbdb29c2921e84ff025848e26844b5c20fadefa9b961ce14564ce8daa9b8e9f197b7d7ec70c26bb6609b74b10d0
-AUX systemd/iptables-restore.service 394 SHA256 611debe959039341f2ee93c276290046365622e4a168c98a9f39684bee9565de SHA512 f0d042b487beaaa0dab0884ccb12c1cb63f9f5949b58187dcd4fcdb28a5b9874fd7b9cc8c14862f8a311a6e4016e2472edc51a776904c9940e1280da7dd3c01b WHIRLPOOL 8fc540b450347ea78e56d03591be2d22bbccadbe65dfe021c23231f9efcda3405d5555a6d5b93f38fbf5cc16855d397da104a873a5dd0fa01270d3b542f9403d
+AUX systemd/iptables-restore.service 400 SHA256 f8a1e54b951c0dfd6218549595f95d48b0f05f3239899d2d229efe7e105a3be4 SHA512 8c005e321ad041068f243e4baa6588b24b0ffd69991f2129dfab0a34d0ebaf702ff2be8b7328126c84abdc3bbd300e1c387a690c5f6a002b50b2e9148feeb8ef WHIRLPOOL 09de6790f1de69f86c6b15f6188db4107f28597c3eff7899a89209dfdf423f305dff6427ad3a5902227ae684f9e0733e84ccfc9ac678c3ca38d9e152c7f22839
 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.6.0.tar.bz2 608288 SHA256 4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60 SHA512 60360910db76e3265fb7b6456a55b91708263bde9c4e5b9cadf3832d2e2a9db3e6cb60c82e278ea0672618bd5c9566c374e00d19d35a2e8f330116c3ab6aaf51 WHIRLPOOL e5ab2398b0650883d31ea144777a6b00904a4e02434f0420037aa54cfc5e47359b95604e945ae3a1abbf3037c37aea2143d3a5457a500e12f1c1139b11655015
@@ -14,4 +14,5 @@ DIST iptables-1.6.1.tar.bz2 620890 SHA256 0fc2d7bd5d7be11311726466789d4c65fb4c8e
 EBUILD iptables-1.6.0-r1.ebuild 3295 SHA256 1c0cf3a3db731ade408d54404047e5b0bcf806494acc3b7a04fc8ed6a08910cf SHA512 cdbbd4286e2df731a2e4f91f8c147e5ff1ed319bbfebb493e3760bb4f4c5f61df88f217133e5760e8f3c8dce6f37f9303e6274eab4f817e4225975e3a03e69d8 WHIRLPOOL 631edaf39bd09afef1569c8c730537181002ca85acd4db253ac0364b1079b45c97f326bcbd077075739a0229dfbcc9cab38498606a0ff1ae95d53afb76fa8e35
 EBUILD iptables-1.6.0.ebuild 3307 SHA256 b382f04b62997bb5a0f805d0675ffefde4b0ea38231f7d8b2b048d83bc222d3c SHA512 24d8cbebf82fea1f367009e035708a1cd53e867df1e71cdbdc9dc57922da0082a7b6bf4921675edee7e1995ea033bf444fdd46f8e05f7863cd0423205ba143b7 WHIRLPOOL b27c8bb82c6932554c9266c2f81cbdea20b8527e9f0a00e8b4dfb1c27fb683b0ae4a85c3f6ea952d61dae5f2356a1668ca6367377fd46ec1a724704bf444db58
 EBUILD iptables-1.6.1-r2.ebuild 3254 SHA256 0df1acf1dc00378525a9b2de68cac38fbb8547152c947bd637e6568fe90397f8 SHA512 297d1edc3c77e4fcdd3fe1223b717b4344ca5ebb77c84668ab2787d79705f9eb8c2d767fac60ad11fdc8a5e6348d7b9d97f33354c48e9a2305f58beb5f6ecaf8 WHIRLPOOL affba06cd2d86e0f62898e46acb8c2117bb89166baf073790273151bb7838707cf3a4c11edc7ecb7397c8684e8b47b572542a8708817690a72068e34ba23d14f
+EBUILD iptables-1.6.1-r3.ebuild 3371 SHA256 4ec3db9ff72b0074c454b59a0a9a44ffa833d7361527be1bacf7ac9acc8c76c6 SHA512 a3eea92e158017948a2ff4eaa1b6d93a7973fa0027601e3e9209b2c7db8048fb8cdc7b32ec399c1a954d30e5e7bb789ca3f8cd9bcc911ffde99e57aee002eb79 WHIRLPOOL 0a584469466ceb3c877c1031a8f9519aec0cd6dd49dc7eb8118279a6286b3f893caf19a81c60311bc5fb10fe1889ea27f1b56695822d907a46ef269bdb7c15b6
 EBUILD iptables-9999.ebuild 3229 SHA256 ccabbe083d4cb02da393377fc8ea27f550343e13886d76586c08efaafa837390 SHA512 29355ac36360f33a26b0dea26cc9a76498c62b6ba384ead1460cd458b5ed1e5365b690155b6be783d2c0dbb2bc2d334478472a65de4f624d55a0e1a3fb49a9a5 WHIRLPOOL 47de49917b47773e2eb3c1f0a1b6d00bf815447e8468c8baa2a40d0ee35cce4d12e40800135a97adc071c2ed12c3cbb17055dec8ce8b6a8384ed41e9155c2d52
diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index c149e92b..921b6912 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -8,7 +8,7 @@ Wants=network-pre.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/ip6tables-restore /var/lib/ip6tables/rules-save
+ExecStart=/sbin/ip6tables-restore -w -- /var/lib/ip6tables/rules-save
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service b/net-firewall/iptables/files/systemd/iptables-restore.service
index 2474ee3e..a9e56793 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -8,7 +8,7 @@ Wants=network-pre.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/iptables-restore /var/lib/iptables/rules-save
+ExecStart=/sbin/iptables-restore -w -- /var/lib/iptables/rules-save
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/iptables/iptables-1.6.1-r3.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
new file mode 100644
index 00000000..572dbf27
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Force users doing their own patches to install their own tools
+AUTOTOOLS_AUTO_DEPEND=no
+
+inherit autotools eutils flag-o-matic multilib systemd toolchain-funcs
+
+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/12"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+IUSE="conntrack ipv6 netlink nftables pcap static-libs systemd"
+
+COMMON_DEPEND="
+	conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
+	netlink? ( net-libs/libnfnetlink )
+	nftables? (
+		>=net-libs/libmnl-1.0:0=
+		>=net-libs/libnftnl-1.0.5:0=
+	)
+	pcap? ( net-libs/libpcap )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	virtual/pkgconfig
+	nftables? (
+		sys-devel/flex
+		virtual/yacc
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	nftables? (
+		!<net-firewall/ebtables-2.0.10.4-r2
+		!net-misc/ethertypes
+	)
+"
+
+src_prepare() {
+	# use the saner headers from the kernel
+	rm -f include/linux/{kernel,types}.h
+
+	# 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
+
+	sed -i \
+		-e '/define XT_LOCK_NAME/s:"/run/:"/var/run/:' \
+		iptables/xshared.c || die
+
+	econf \
+		--sbindir="${EPREFIX}/sbin" \
+		--libexecdir="${EPREFIX}/$(get_libdir)" \
+		--enable-devel \
+		--enable-shared \
+		--enable-libipq \
+		$(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
+
+	if use systemd; then
+		systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
+		if use ipv6 ; then
+			systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
+		fi
+	fi
+
+	# Move important libs to /lib #332175
+	gen_usr_ldscript -a ip{4,6}tc iptc xtables
+
+	prune_libtool_files
+}