gentoo resync : 12.03.2021

13 files changed, 233 insertions, 21 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index dd3f2d22836a..c0f2dbfc8385 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index fb579f7bf0f8..fc2becf71bc6 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,8 +1,9 @@
 AUX conntrack-tools-1.4.5-rpc.patch 1555 BLAKE2B d92009c2bc4de820956ad2d7459a19cde970356aff4e960e3c17808a28a76483a104df7beaf437dfa30b124d5a2b90bd41db27b4b3b76ab57c3dd2e8bf6bad5f SHA512 55cf7451c3e36e414c8bdc43c46b235259f259b0f7c0b5a11d6543438308ed74621b363ae157160634d00bf45d6115e06badc06848951157facec6b8d496026c
 AUX conntrackd.confd-r2 441 BLAKE2B 5898c470f1d99beb47d01c9215c8e3da2e624455f65c3c41e77dbf26db3ebfa4624ac6556098f303c4f4588e093b7f94ae29921b1a6cdc4a881060eaf0dc425c SHA512 3d72d56d44094593f6ff1eac421fe6a4f0d20450ce698c175adf1b18a859b1a24c7120fa60431b2a00da62ae3749c4619106c8e93fb8fc763ceefc26a82d2ed2
 AUX conntrackd.initd-r3 2238 BLAKE2B 711bf4ab403f61d5d528e0dc504d272a7e410be70c529d8f7a624f742ca66f4692b683f3283b79f000589bdab7f83598130e4ca1a0ae2bed9afce80ec78d00c8 SHA512 445c19ad42e92136e9dfd6b7885334075e72971b73ff7178c6bf16a31e0c037f17d9d039394fa8002f0ad5182a353f7c803d3f900e8873b671eecca94ced78fe
+AUX conntrackd.service 273 BLAKE2B 24df8adeaf71d208d3314c3eec6d4d05ba9e211c3ae7f28034071beec69ea85c0703052a2b7fe385242d9647bd9d3a1cd313c9b9c6bdb9a3add8266c7fda99b2 SHA512 a8e0589ddbfcdcf4c2cd0534d7185503901c0b21c87727ea99afa13adbd077a3832902c6e81c1b208742082107f15e6cee6ad6a051232f8cb9be0c0b4a12e3ad
 DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
 DIST conntrack-tools-1.4.6.tar.bz2 499806 BLAKE2B 7c1ee1c5fc2b6f9d33c6cf850eca80978b8763317b1a76892cefb776130564f15fbd4e4554fdb08dbba93d9f16b7e4624a1b4dd5a631f747f5fcc0a5b01b8d5e SHA512 a48260308a12b11b584fcf4658ec2c4c1adb2801c9cf9a73fc259e5c30d2fbe401aca21e931972413f03e415f98fbf9bd678d2126faa6c6d5748e8a652e58f1a
 EBUILD conntrack-tools-1.4.5.ebuild 2190 BLAKE2B 49e4d6cf2f37939da6d577c6de370d6a68e391a5c57c7f84a5d002befb231560d6e443d5070d0ccde1f888bcae67d9185d93aac4acfcc0dc4ae6359f49509f09 SHA512 7cdf3820923462eab080ab8c2b5ede6d3f4dd08247343aa7e0bcfdb0ed4f1e95538c1ea10a1d427470ce27df652f44bdcc9d1dfee1436adc3b51a5bf123c6e97
-EBUILD conntrack-tools-1.4.6.ebuild 2117 BLAKE2B f8a2c02de86c5956879e63f062279f9472de8620ef2251eb9b18c372e12434254f20fd5195d93abc937a389cf6487dd15f1241ca738d0e69080c7e9b6a850336 SHA512 d01489363478fcf3b3c7e9951d0ac4bb28d82339aa7d31d02169d9d6b6392ec0be94c58f7b59ee835388617e0f91911bab25aa04a741d0c40040b2771633af5b
+EBUILD conntrack-tools-1.4.6-r1.ebuild 2185 BLAKE2B 75d4ec9588d9de46c0bc0077645e671c0a9007bc6cb7ba298ff3a419e1559bdcf21a1ec056858b3190d4c112e4fbcc4004ec08f99f99e35e20e12f0d7ff1911a SHA512 92775efc55a58a828a6fd1c19a11059d9f375dac9f90973581b1395c88680ddaa488732259753699093a51df992a7763bcb05e1996c03d826802337a97d4df3c
 MISC metadata.xml 1048 BLAKE2B beb5773ccddbbf517dd5a1e81672a502e3f728085d3c1128207bcd91c544dd8abc3fc3dead68c4bc44b86c3bda2c2f101620ecc86a03fae5c7231716c882f5bb SHA512 4fd1da860481f73d5a47422c93fb5051995884dd488b64d8cd80bc720f81fd37e15a9bb9b86192c37bdfdb024201f600900cd6bcf38b20979c40019b0b290338
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.6.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
index 2ac5faccf0f8..5c420d948769 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.6.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit linux-info
+
+inherit linux-info systemd
 
 DESCRIPTION="Connection tracking userspace tools"
 HOMEPAGE="http://conntrack-tools.netfilter.org"
@@ -29,15 +30,15 @@ RDEPEND="
 		>=sys-apps/systemd-227
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
 	doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/xmlto
 	)
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
 "
 
 pkg_setup() {
@@ -93,6 +94,8 @@ src_install() {
 	insinto /etc/conntrackd
 	doins doc/stats/conntrackd.conf
 
+	systemd_dounit "${FILESDIR}/conntrackd.service"
+
 	dodoc -r doc/sync doc/stats AUTHORS TODO
 	use doc && dodoc doc/manual/${PN}.html
 }
diff --git a/net-firewall/conntrack-tools/files/conntrackd.service b/net-firewall/conntrack-tools/files/conntrackd.service
new file mode 100644
index 000000000000..26f950c0d9cc
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrackd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Conntrack Daemon
+Documentation=man:conntrackd(8) man:conntrackd.conf(5)
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/conntrackd -C /etc/conntrackd/conntrackd.conf
+Restart=on-failure
+ProtectSystem=full
+ProtectHome=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index e2b33d128b8a..66b3ed4d6814 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -4,5 +4,5 @@ AUX fwknopd.init 2706 BLAKE2B 561cc62b1e557d425648947c25751dfb2fe323b04cb96ea1d0
 AUX fwknopd.service 235 BLAKE2B c46c01121a745ee46a5415654c0ba422531008ed52915833712f748026eda3afd8019d6ec6bb86434b40ad273a4cc46115d3a64a73b621731ec68f3bad92dc41 SHA512 890bbba586183275cbd3b420a9c0d609ff3eca0fd239b4af97e2730e2790f317fc114f51d60107ba4fbddd2cabb60c70d8b615e2a75bb80cf27d352c894a1c6d
 AUX fwknopd.tmpfiles.conf 31 BLAKE2B 81d88d9bb1fd826c242b2815e1a6c0e5a300f22e19dd65ad67e114d692731cb532162ac877f0239879ebfcf0432d61053adcddd2c234d85ed60bf33720b22dcc SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae
 DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
-EBUILD fwknop-2.6.10-r2.ebuild 3353 BLAKE2B 0e7577c18dd8ff04fb6b529585801bb27e6218fb3eb3424e7f0c49f17b24c35fe2547474eeb565f20cb4301588a6d9757ae5284743b2f74ff7511febe87986eb SHA512 2e30cd3499ee75d9e5ae35ae2ef3f313689a3d2afd10634d4c6e4a88281804ff497f4bb3f344d278dbe2b2d44050bc58c25535067f6b0a96d93db43defee3783
+EBUILD fwknop-2.6.10-r2.ebuild 3353 BLAKE2B 6245fbe2c3e661d16dca817e8a5035652ece42cc0ea106fc471fe1029a4531eb3199a2f689f6d398b81f65e28c1f87f97cfd590c6650fdaea5e75aaf661420d5 SHA512 c8f71073b1058502c482a38b368d625913993e3481e486f9357eafbcfbc44983c7d6107cdf7841b735e6df62e5dc039ca662137416001d9aa744552ae70ae308
 MISC metadata.xml 1217 BLAKE2B 2b44d1d81f7d4bc625c3130cf29328fce6d85fbeedfb5376146dad93b020f03440f620e68187fa1ffd496fdff0cedaa6f02d015578ec0620070ea97029b9eec8 SHA512 b215b1ad55f6ba7e9f4ac316916241ec2084bcd2e3e5ca6a7d81c935df6affdbc36066914b1bb4d984333e005a57f54c6c8f07013a4e14e465f9dd6dbc6c93d2
diff --git a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
index 64a0407290b7..0c11df4d567e 100644
--- a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools eutils linux-info readme.gentoo-r1 systemd
+inherit autotools eutils linux-info readme.gentoo-r1 systemd tmpfiles
 
 DESCRIPTION="Single Packet Authorization and Port Knocking application"
 HOMEPAGE="https://www.cipherdyne.org/fwknop/"
@@ -93,7 +93,7 @@ src_install() {
 		newinitd "${FILESDIR}/fwknopd.init" fwknopd
 		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
 		systemd_dounit "${FILESDIR}/fwknopd.service"
-		systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
+		newtmpfiles "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
 		readme.gentoo_create_doc
 	fi
 
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index e30972c52342..37bdc569cfd9 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -3,6 +3,6 @@ AUX ipt_netflow-2.5-gentoo.patch 1944 BLAKE2B 0acb66305cd7f337a271b356f65c2984b4
 AUX ipt_netflow-2.5.1-vlan_dev_priv.patch 1182 BLAKE2B f5522a888133b5411cb6b3e43e2cc2d0457b521a46e26b3f3d6826a84dc016dd8b58195317601ebf49de81031faf9100f95dd547adbda81a9b4814a75c3e147b SHA512 d1d23794871237338102ed148b94a6d0f92997675f6e059fc0f1e94b54aed894dd4325721d8427edcaf6747bd063338b7f94b4ab51904bf76bd98c8380d4e5e2
 AUX ipt_netflow-9999-gentoo.patch 1956 BLAKE2B 4595118518958c379a33e0fd7b6e3769fe764a633876cb46b76517ccec9fe6430fd4441b5509019699003b07966e1b09b257d302d3a1f29c4b437f90bce1c211 SHA512 bf8a723d0cf5a57b49231d444d6e0926b2aa667a5ac8aebdedd92b8271be30e5cbfd330e03ed63969d37a5fb694038378468ae1d4b2483b087785734214d00bd
 DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc SHA512 dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce
-EBUILD ipt_netflow-2.5.1-r1.ebuild 2449 BLAKE2B 44c5fce0bab30a9254582ecf024806625a66c8f35b1a24d097b93b99c34dd9a781b61b4449ccc5e4869beae02aa529040ae01c8ae9aceb5f9fae1244eebe69d5 SHA512 5deaca6e58577f0e5269c22cc901663ca8681957d98451cb7e1214e25b36c664bf22a2788bc8f6022ec325a0198b0314e4234a2c85c7909b80d256666b293809
-EBUILD ipt_netflow-9999.ebuild 2433 BLAKE2B 5bc455a234b42e8b53be0f100a0d826cd6092fc037132793d63a46467bed0c42f65683c0d83d1f155662fafc25ba731c3430935867e5efcc8dc2bb8e9f451fe1 SHA512 577a38067db83c0d7c67ba80178b7b6519d8342c61febf9d0bc0de288b6aa94d05bdeaf3fb3d59a20ccfff67efb15cd70bfbcf0a6f1639a19d41147d6a6c1551
+EBUILD ipt_netflow-2.5.1-r1.ebuild 2462 BLAKE2B 27dd6837a8be04ddb8d4cc95895630360d2d4e791698ec509477a7c591ac28c853e3b8985dd2178fade70d7477a448f6f8b0f288fe363bbfe636ae94ddbb18f3 SHA512 81f9fd7612a9584c7790f8309450af3e3b6ae9bf07c40042be7cdf6f7414f0fcadb2bf0aa608d92cefd555071d473883ccae090f1024d7c7115ceb14731d7f3b
+EBUILD ipt_netflow-9999.ebuild 2433 BLAKE2B 5b6f3fa7387d690d361f6cc26b83507944f0cefc560db6894efebf9e399b1a97eab5884fb62cddccadb984272e0fd630b19af224f1b26dc335a732eb3ce3dfa8 SHA512 2b2ce7e03db3d3168876c8c83ebf271f75aa3d85e05436234fd4c36738da096243fd7f5f3ba648efdf65d62ec986c956c8014cd69afa73e40e67be717bf3b295
 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
index d64a581002f0..bf18a5d00831 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
@@ -21,10 +22,12 @@ RDEPEND="
 	net-firewall/iptables:0=
 	snmp? ( net-analyzer/net-snmp )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/linux-sources
 	virtual/pkgconfig
 "
+
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
 	"${FILESDIR}/${PN}-2.5-gentoo.patch"
diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
index d4305e2fc5c5..55047faefa34 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit git-r3 linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
@@ -13,18 +14,18 @@ EGIT_REPO_URI="https://github.com/aabc/ipt-netflow"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-
 IUSE="debug natevents snmp"
 
 RDEPEND="
 	net-firewall/iptables:0=
 	snmp? ( net-analyzer/net-snmp )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/linux-sources
 	virtual/pkgconfig
 "
+
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
 	"${FILESDIR}/${PN}-9999-gentoo.patch"
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index be2a3b02e6ef..7c5d9f489d91 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -12,7 +12,7 @@ AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f
 DIST nftables-0.9.6.tar.bz2 859481 BLAKE2B 0ede36370d9f8b75d0179f8f28077124d47132413417382b737508c7ef81c7d2891e1934e69c1ef5af5450ac13c9a914d37bb62ebf40fb91fa048b4ec3a24c90 SHA512 ca6524ff1cb1e79d636afeb96f54e4699773e1cbda8e9a3ec5728f4d5b764c0df16b195cdcc0e304ae5643c8761b6b5a6685c737965a7415aec07aeb9f3dc5df
 DIST nftables-0.9.7.tar.bz2 872759 BLAKE2B 25218d97bd5a102b626a2c4beb37a59da2f6c1a8ead49b18375154ff88da536dfac7442aef2c10d2f6e20e6b51c5760a692960da35b82ab335a58e48189e3ae8 SHA512 174cf2d788dfd21f6709ccdc59060580aff904c3d906bac57d07c1b813b2cfdba895205d8342d722460b813f3504d598b82ac2d8a93af5964569b378b9598455
 DIST nftables-0.9.8.tar.bz2 879516 BLAKE2B 5063090d648668f4d5ae6d4be48ebecc65dfd4b525768e94a0d90ceebbee73874c916727be8de633550db71c612d698d88cf93575931362b48d954e6ac275143 SHA512 1c5709825c8b2c13cbed0310658959ecee164c930bc9e2447618a0894598138b9a549d20509c32a5c23ce99e40438df38f9e170cf656ce993d819f365490a180
-EBUILD nftables-0.9.6-r1.ebuild 4234 BLAKE2B ae3760503eda87b5252b505d73ce1dca606f9bbabce88395cd9cd86a4146f117bf86862a849bc49dc24ff7a529dce74e5dcb43455cd3e492706e1aa650e43f69 SHA512 0ee39716a0e578a3ab8119b7d645fffc0430c55e0d470950454cb03b13afad53774a820af7b2f865e22578d764ad2a9fb96a499e1e18c91c146c82c38f4f48b5
+EBUILD nftables-0.9.6-r1.ebuild 4233 BLAKE2B a00d3e7b452dbcbd82f7626ba1e12d64d69e749fd663f38a2dd4a5ff2e1b5d4bc477ff824412fcdc931536f30d7eee44bbce084eb82b76d9dda6302b4243be49 SHA512 6d9305a2f0fbc89a4a00063be048d794b9513e955f9d7243f68c6676f28bbef9d3d908dc9549b6c955c6c6bebf41252b9b7eb3d611cb470a07eda93cef20b52d
 EBUILD nftables-0.9.6.ebuild 4223 BLAKE2B 8f3fd4eb224eca32929c633083a03e7f6eaac957e5a730a609610639fc6e850ab171b568fa9f65c1355c13d330546a5852f8f2db9f89291160ac3eb83b8ffff9 SHA512 a2a22201a2ca05dc1295fcf9d10458888a3e881d4a77f0024efb140fb4e76b09e3a3905bca635ca8a947c8834b243c29ef59fe6f2b70029d3f2267a003398d03
 EBUILD nftables-0.9.7-r1.ebuild 4230 BLAKE2B 63189df1f6f57039d577928a6c9ab0ca2874a88b01c0d0560d8e9bba7c6ecd4e55435179989bc2091b22b5932d839802d0e975811105c77bd78b382b2d25c0fe SHA512 47c666e520b0046d91cf9ef8bc13eb68b307e2a36f5e0e59ee5bd91e835da7dab93adc0c2fa105dc81eeb274809b3f7c1b35ce5457f37088f355cf5922fd2882
 EBUILD nftables-0.9.8.ebuild 4290 BLAKE2B fbd2f931d824395bc4495f1472ff56ca1c1d825071a17eb5d7a323911093a23da57439ff873a5e9aabddc59d07e075ebfb1dadd5ae1c0a79fecb1512a8191826 SHA512 af1ddc9cc0d5b6411d3bc554c39e7b1ef2e9722e73a7f7996d7610769f068eb2e8a24a56a0795064b9d28d62be985999187fa524b98fcde51db2805ce1adc2e8
diff --git a/net-firewall/nftables/nftables-0.9.6-r1.ebuild b/net-firewall/nftables/nftables-0.9.6-r1.ebuild
index a2a6ade2a24d..372ae0459c07 100644
--- a/net-firewall/nftables/nftables-0.9.6-r1.ebuild
+++ b/net-firewall/nftables/nftables-0.9.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 sparc ~x86"
 IUSE="debug doc +gmp json +modern-kernel python +readline static-libs xtables"
 
 RDEPEND="
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index f49c56c4b27c..e198224d696d 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,10 +1,12 @@
 DIST xtables-addons-2.13.tar.xz 322116 BLAKE2B 31d12adcfdf2043b44b5789f3ba3215197ff48d378b20fd6406f6afd22739e04069f08f32214a2230ec797469b236788dbebef079855539994db69be358ec421 SHA512 51cfa963d6f2f931b0361746e0b48f5ecf43a14e9e8d5297ef55faf0e9f8d1deb4641e88e3fea2afdbb3e39dd06d414de6057fb4a21e5184d4ea3d21b8028497
 DIST xtables-addons-3.13.tar.xz 327104 BLAKE2B 110719a7425060a79df0643ea35cf28ac62af811dde0f6744cf75b632809ff02518366e12ecdf8b017648b85843e689735629fc099b23b21b1999afa3a2e5c69 SHA512 0a9874269dafefe2fc364b41d3f5fb2108ba83dc49457f3aa436b814c8c65fb00f48f664576c8ccf183939edffa854fcf9f9c82a801ac90c0e2b9dc1426e1d85
+DIST xtables-addons-3.17.tar.xz 331272 BLAKE2B 94ec8c8eb318628543b89685482713fe11b80f72416cf10bdf6a5ae27905f130c7a3212481c8c5c0b1f3b1962f7a3707486563d5a0683f3754655f058226b32f SHA512 7d9f80b0f898236e4479f4c618e6f0ad697165c4b4d71fd35d8dc874bccf6376b33ac0fdbf846a8999776854ff175fb8d624b01c12b91142618619c4e6a85706
 DIST xtables-addons-3.7.tar.xz 325124 BLAKE2B e7f0bff03f0b77b55cd578c5a77ab4a306fa5a5cfd3b7e5b801b60d4ccc2c5a476fee2b04f4cb8db4b3ab34c7dab353ec13cba1fe98a714cfbb2e89e3110841d SHA512 336f19596251507a88d7c399f9a3e6f517e4b72787ff7e7108e20e42e68932bca0eed79c54ddfa92112daae73a94a7349a874bcf993bd4abea1d875d7f2b8565
 DIST xtables-addons-3.8.tar.xz 324468 BLAKE2B e460e0dc7fcd7037610b44132628b3c39c81477c2e1ef345d939f1c4d5981517789f240d1d2233c6a8e962e326ff9a25c5e66dcf829fb23db66dc8cd78b076d6 SHA512 2e0594ee0e654a19e6bae4f7acb7efd142957418ed44ce92ecd7474bb2f0bfd8dad684be937e8f6ed28395f9d7a6dbea61e7c3259d7b89c05ab10bcad3c04264
 DIST xtables-addons-3.9.tar.xz 324380 BLAKE2B d78afec65647c9b83b16e591b3cf6827748d70c02b381c30ee1751aadca6397fcbbe4e7f8e1e9199ae93b07e37ae333358e677b89d2b2c62adeb01e345ce2a33 SHA512 ec7d2ec97c433eb94b893aedfd346393986ef140d7ff95cd8be070cfa397efd87df7d73d36359b81c80618eb8575282a1ea8624c3bf182ddd60d8975f58579b5
 EBUILD xtables-addons-2.13-r1.ebuild 5515 BLAKE2B 1ae1dd1a2f6608a42a1f832adc7d66ae0912122d688d96e11bfb9c3e9c09b3844dfcace85d59576415290355a99bb07cc25011110a33daa2b581a4b04a49cd07 SHA512 21409ed9b16bc18140841b30924b56b2e38752f43d93c9ef07aab80069b9899000d98d794d2bde9aae666e99cd8c8f85d9c604640c603eaa17911ef86cf726ad
 EBUILD xtables-addons-3.13.ebuild 5488 BLAKE2B 7dcde7bb73efb21136838c9b288f2f64deaa29812e2137ab0ac9503e1fc079b4775edff0ccd268ea2a2a3d32d725e0c16fe0d042ce58b5e5143bb6f01968ccb3 SHA512 d5f315764835c67930f206caf74e7bdaad87522ccf93f08f040f76408bf8e6f78c27b2e008168ae9a7259934000ef828ee6eafad0f9e38e18878cd61d71b39ad
+EBUILD xtables-addons-3.17.ebuild 5496 BLAKE2B 38bfb58430e7a8c9306bd2bdbe5358f635cbab7aaf25c65fc373fe4fb3e7f4615e31b780a884b8a0041ec0bbe58b87d819a01801794086fc68cf0f2c7c789fbb SHA512 e379c55a8e380fe0906e3d57a17b22f2e3af94da1858b15103e7c50eb35825932426963caeae5e5403019319a93655c444b629efbd7fdd03af25eea7ec0f5072
 EBUILD xtables-addons-3.7-r1.ebuild 5487 BLAKE2B 09a0cb0654233f8899c64b02bd395d9fb964aa82becc4e56e52b092f1ccfa6eaa847e67391c32d353a24c0296ad4b2227bacb86be08957181cf3a042f2baf435 SHA512 e758d352f4a984004d21bb745e19a6ffe39efb9b0e085538eeeb8456dbd88f7ee0bcb8319a81d02b4ae5247c1078004a175a9a93df8c0bbeafa5eb7c28ae3a21
 EBUILD xtables-addons-3.8-r1.ebuild 5487 BLAKE2B 09a0cb0654233f8899c64b02bd395d9fb964aa82becc4e56e52b092f1ccfa6eaa847e67391c32d353a24c0296ad4b2227bacb86be08957181cf3a042f2baf435 SHA512 e758d352f4a984004d21bb745e19a6ffe39efb9b0e085538eeeb8456dbd88f7ee0bcb8319a81d02b4ae5247c1078004a175a9a93df8c0bbeafa5eb7c28ae3a21
 EBUILD xtables-addons-3.9.ebuild 5487 BLAKE2B 09a0cb0654233f8899c64b02bd395d9fb964aa82becc4e56e52b092f1ccfa6eaa847e67391c32d353a24c0296ad4b2227bacb86be08957181cf3a042f2baf435 SHA512 e758d352f4a984004d21bb745e19a6ffe39efb9b0e085538eeeb8456dbd88f7ee0bcb8319a81d02b4ae5247c1078004a175a9a93df8c0bbeafa5eb7c28ae3a21
diff --git a/net-firewall/xtables-addons/xtables-addons-3.17.ebuild b/net-firewall/xtables-addons/xtables-addons-3.17.ebuild
new file mode 100644
index 000000000000..b83321c6b4e3
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-3.17.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MODULES_OPTIONAL_USE=modules
+MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
+inherit eutils linux-info linux-mod multilib toolchain-funcs
+
+DESCRIPTION="iptables extensions not yet accepted in the main kernel"
+HOMEPAGE="https://inai.de/projects/xtables-addons/"
+SRC_URI="https://inai.de/files/xtables-addons/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq proto logmark ipmark echo dnetmap dhcpmac delude chaos account"
+
+for mod in ${MODULES}; do
+	IUSE="${IUSE} xtables_addons_${mod}"
+done
+
+DEPEND=">=net-firewall/iptables-1.6.0"
+
+RDEPEND="${DEPEND}
+	xtables_addons_geoip? (
+		app-arch/unzip
+		dev-perl/Net-CIDR-Lite
+		dev-perl/Text-CSV_XS
+		virtual/perl-Getopt-Long
+	)
+"
+
+DEPEND="${DEPEND}
+	virtual/linux-sources"
+
+SKIP_MODULES=""
+
+XA_check4internal_module() {
+	local mod=${1}
+	local version=${3}
+	local kconfigname=${3}
+
+	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
+		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
+		if ! linux_chkconfig_present ${kconfigname}; then
+			ewarn "Please enable ${kconfigname} target in your kernel
+			configuration or disable checksum module in ${PN}."
+		fi
+		# SKIP_MODULES in case we need to disable building of everything
+		# like having this USE disabled
+		SKIP_MODULES+=" ${mod}"
+	fi
+}
+
+pkg_setup() {
+	if use modules; then
+		get_version
+		check_modules_supported
+		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
+		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
+		linux-mod_pkg_setup
+
+		if ! linux_chkconfig_present IPV6; then
+			SKIP_IPV6_MODULES="ip6table_rawpost"
+			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
+		fi
+		kernel_is -lt 4 18 && die "${P} requires kernel version >= 4.18"
+	fi
+}
+
+# Helper for maintainer: cheks if all possible MODULES are listed.
+XA_qa_check() {
+	local all_modules
+	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
+	if [[ ${all_modules} != ${MODULES} ]]; then
+		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
+		ewarn "Please, update MODULES in ebuild."
+		ewarn "'${all_modules}'"
+	fi
+}
+
+# Is there any use flag set?
+XA_has_something_to_build() {
+	local mod
+	for mod in ${MODULES}; do
+		use xtables_addons_${mod} && return
+	done
+
+	eerror "All modules are disabled. What do you want me to build?"
+	eerror "Please, set XTABLES_ADDONS to any combination of"
+	eerror "${MODULES}"
+	die "All modules are disabled."
+}
+
+# Parse Kbuid files and generates list of sources
+XA_get_module_name() {
+	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
+	local mod objdir build_mod sources_list
+	mod=${1}
+	objdir=${S}/extensions
+	# Take modules name from mconfig
+	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
+	# strip .o, = and everything before = and print
+	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
+		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+
+	if [[ -d ${S}/extensions/${sources_list} ]]; then
+		objdir=${S}/extensions/${sources_list}
+		sources_list=$(sed -n "/^obj-m/\
+			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+	fi
+	for mod_src in ${sources_list}; do
+		has ${mod_src} ${SKIP_IPV6_MODULES} || \
+			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
+	done
+}
+
+# Die on modules known to fail on certain kernel version.
+XA_known_failure() {
+	local module_name=$1
+	local KV_max=$2
+
+	if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
+		eerror
+		eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
+		eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
+		eerror
+		die
+	fi
+}
+
+src_prepare() {
+	XA_qa_check
+	XA_has_something_to_build
+
+	# Bug #553630#c2.  echo fails on linux-4 and above.
+	# This appears to be fixed, at least as of linux-4.2
+	# XA_known_failure "echo" 4
+
+	local mod module_name
+	if use modules; then
+		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
+	fi
+	for mod in ${MODULES}; do
+		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
+			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
+			if use modules; then
+				for module_name in $(XA_get_module_name ${mod}); do
+					MODULE_NAMES+=" ${module_name}"
+				done
+			fi
+		else
+			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
+		fi
+	done
+	einfo "${MODULE_NAMES}" # for debugging
+
+	sed -e 's/depmod -a/true/' -i Makefile.in || die
+	sed -e '/^all-local:/{s: modules::}' \
+		-e '/^install-exec-local:/{s: modules_install::}' \
+			-i extensions/Makefile.in || die
+
+	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
+
+	eapply_user
+}
+
+src_configure() {
+	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
+	econf --prefix="${EPREFIX}/" \
+		--libexecdir="${EPREFIX}/$(get_libdir)/" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
+	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use modules && linux-mod_src_install
+	dodoc -r README doc/*
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
+}