gentoo resync : 05.02.2020

19 files changed, 83 insertions, 19 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 78bfae82a953..7d920559308f 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 592bfba18bc2..9b6b1bb55797 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -4,6 +4,6 @@ AUX conntrackd.confd-r2 441 BLAKE2B 5898c470f1d99beb47d01c9215c8e3da2e624455f65c
 AUX conntrackd.initd-r3 2238 BLAKE2B 711bf4ab403f61d5d528e0dc504d272a7e410be70c529d8f7a624f742ca66f4692b683f3283b79f000589bdab7f83598130e4ca1a0ae2bed9afce80ec78d00c8 SHA512 445c19ad42e92136e9dfd6b7885334075e72971b73ff7178c6bf16a31e0c037f17d9d039394fa8002f0ad5182a353f7c803d3f900e8873b671eecca94ced78fe
 DIST conntrack-tools-1.4.4.tar.bz2 1010504 BLAKE2B 4190672f017f434b6b4a1841022d64256eac1953c6f62aecb087e2ef0f5c83ad57809c9170de816eb7e0f934c41de0a541328bab7e064243e48e9f18ade3f5fb SHA512 f53bd620bfd4e854e792416527a3090d883c5f00d1d8365e52ce3ba204218dc431490703985d3fdae44decbcddb24ed610bf81a6a99bd7ea01482f95f71df0f5
 DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
-EBUILD conntrack-tools-1.4.4-r1.ebuild 2087 BLAKE2B f30c6468219e9020d40f73f5a2977d04825da1a7d2e6a9765c90a6b3104c8f4bfe7b49c9d4b234ca076f02ac252b72c27faab601dac06ab12e9a5f9bfe04adcc SHA512 6a0cc74bc6bd2e6fe30ecf4c54309d57ec4dd82d3189a890f2ce600ee9c73ffdb1c06eba081cf0ccb1bf39797a5676d7cc12d7317fea4633c0ffe157abc42e79
-EBUILD conntrack-tools-1.4.5.ebuild 2188 BLAKE2B 1faf2dc4138283ca08d36a9384d7bf4f88c2f5566f00a563e4779ec9dfb44a2bfca86bb1ba451b0a6d8d87a088f8dd86e670fccbc85bd4f93b1dd4eaebeb71b0 SHA512 3d72e57cd130c034f86176f6a583bc43ed7d063c203b3450bee2ca2f6afe3b130636d5e6f5399143ead765838eef10c5606e3cd789c98a50f21c96bf6b11711f
+EBUILD conntrack-tools-1.4.4-r1.ebuild 2088 BLAKE2B 002971c3e5a47fa50f84f7d034074ff0a358b64892a592fe6b8692397d1579e595dffc3ce772e1490301ebbfa0d72d8b93870a359ad5fd95f64277786da78d51 SHA512 67ece91406e0137d78119c95bac4a938c546a7e84d47a310d72e0ea3d690540e7c5754566820fa58779773868d682cac1357fa3c620c10dd037b771a04e91671
+EBUILD conntrack-tools-1.4.5.ebuild 2189 BLAKE2B 617bcbfaa951c08d9103a1d12026bfb2391c3ea67d57e165937221731dd470b1c5cb61b656536adf841b5d7d6986322247bbc12f209843a45ddc9027f7728c55 SHA512 8f6113d42ca988eb16e46feb3877a65e07ea5207179cc0cd1c16c8db54378d51dd488f7bb27e3aa1b1e43bfbb93599b35ca34ce57b83a37fbd5758c81ad8b021
 MISC metadata.xml 1048 BLAKE2B beb5773ccddbbf517dd5a1e81672a502e3f728085d3c1128207bcd91c544dd8abc3fc3dead68c4bc44b86c3bda2c2f101620ecc86a03fae5c7231716c882f5bb SHA512 4fd1da860481f73d5a47422c93fb5051995884dd488b64d8cd80bc720f81fd37e15a9bb9b86192c37bdfdb024201f600900cd6bcf38b20979c40019b0b290338
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild
index 8ed101b088db..457aa7d56063 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 hppa x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa x86"
 IUSE="doc +libtirpc"
 
 RDEPEND="
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
index fb22fa51a3c0..88e3c5b83a9d 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 hppa x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa x86"
 IUSE="doc +cthelper +cttimeout +libtirpc"
 
 RDEPEND="
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index f0fe326bd7db..baf3ee243e22 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,7 +1,8 @@
 AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022cbc117fb2916792661166d04e456e6f23e8f285c0ab6b713ccfd764ccac0a3a8b41ad2d159c9270ea0480d5f2b1b2482 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0
 AUX ipt_netflow-2.3-flags.patch 1743 BLAKE2B 5c2cf2b603aae5017e685fbfcb76bf0a5be29b0e3f1299d2e72a516d80cd5479b92c463d4bb4ab192b9cd7b59ef59eeef673c12696a79d6517ec7346dbbe3b5c SHA512 b8a74b0f9daf0e532a8015b576b59e13948684bee8d22a2a62cd8d2a11e4d8d5a2d4b257842dab4df379c3549bdb39d9814bebe24573714e3bff2d2d765021ad
+AUX ipt_netflow-2.4-bridge_netfilter.patch 1785 BLAKE2B 45b3e9124bbf17a3e38da1777951db2516abf18988426920f40d56b8c5083c369f52c36f605849590fef06884a566e1573bd6612b62da8e1333be40a7e913734 SHA512 bae60dd8fe7e50eb8e1061e007f2e603b23e04ca45ce60530b85ed626acaa4eeb44d061d48d2e90cc5409c3d7976030ec0a0683a6bd4723379315c4bf0e09730
 AUX ipt_netflow-9999-flags.patch 1956 BLAKE2B 4595118518958c379a33e0fd7b6e3769fe764a633876cb46b76517ccec9fe6430fd4441b5509019699003b07966e1b09b257d302d3a1f29c4b437f90bce1c211 SHA512 bf8a723d0cf5a57b49231d444d6e0926b2aa667a5ac8aebdedd92b8271be30e5cbfd330e03ed63969d37a5fb694038378468ae1d4b2483b087785734214d00bd
 DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56 SHA512 3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74
-EBUILD ipt_netflow-2.4.ebuild 2340 BLAKE2B 7abc0b0e4577043dd7f83ef2ece5ceb211f0e0420ab0fc303403683825a4d415fd810050368c0e59dbfcf8ab082806e83d5cf12cbc26fe2642e63a1ae79e65bc SHA512 ef541ed5900c75b531f33e97bb5b5c24877807a7154f94e9c13b9af288fc0002e6afe9fb3de79d3a6278168867e81e49a5a26036dc3f55a9b32f844471fee66b
+EBUILD ipt_netflow-2.4.ebuild 2383 BLAKE2B 961e4ef35da8c6bc4111bb9a9ed8e4be4e05c24e9262e6fb6b7b55fc0ea8ce084e7830b3d8ec8b317a4afc89d242cd2f3ecd5a6dd8e9463f2a574aa80bf22b8e SHA512 6da791363ee57e08680722864203134a0fb89bf3079ab12e34ed02bfa2178606f1a65356ec727c615ce105c5ce0fd6fd91ad7c26554792f64abec8b765c2a6ec
 EBUILD ipt_netflow-9999.ebuild 2364 BLAKE2B a88838239348fe309a4fd6efe1d6133af629e884a35429f9a7c7577ab840fa5c219dc582169d48a010970e31e78e3fd47676642fa2e4eceaadb0836ac96964e9 SHA512 02f9f6ff65516e90a7143db1b7a91225589d91e1d41d10ede3e16986f0eeba1dc948a9f415fe1239950359a9389f5f7f522fd1408122a15f43cfd024dddb13ab
 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch
new file mode 100644
index 000000000000..cde23bc9fe7c
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch
@@ -0,0 +1,61 @@
+From 9288e30f493d252ee85b492a894f78073e4f6d41 Mon Sep 17 00:00:00 2001
+From: ABC <abc@openwall.com>
+Date: Sat, 28 Sep 2019 23:29:40 +0300
+Subject: [PATCH] Don't compile physdev-override if BRIDGE_NETFILTER is
+ disabled.
+
+Fixes #120 "Compile error nf_bridge / nf_trace" reported by DocMAX.
+
+Fixes: 51bdc2b ("Use nf_bridge_info_get() instead of skb->nf_bridge").
+---
+ compat.h      | 2 ++
+ configure     | 1 +
+ ipt_NETFLOW.c | 5 +++++
+ 3 files changed, 8 insertions(+)
+
+diff --git a/compat.h b/compat.h
+index 0f9896b..66e224b 100644
+--- a/compat.h
++++ b/compat.h
+@@ -680,11 +680,13 @@ static inline int is_vlan_dev(struct net_device *dev)
+ #endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0)
++# ifdef CONFIG_BRIDGE_NETFILTER
+ static inline struct nf_bridge_info *
+ nf_bridge_info_get(const struct sk_buff *skb)
+ {
+ 	return skb->nf_bridge;
+ }
++# endif
+ #endif
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)
+diff --git a/configure b/configure
+index 74eece5..8aae8bf 100755
+--- a/configure
++++ b/configure
+@@ -470,6 +470,7 @@ kernel_check_config() {
+   kconfig CONFIG_NF_CONNTRACK_EVENTS	"natevents"
+   kconfig CONFIG_IPV6			"IPv6"
+   kconfig CONFIG_IP6_NF_IPTABLES	"ip6tables target"
++  kconfig CONFIG_BRIDGE_NETFILTER	"physdev override"
+ }
+ 
+ kernel_check_include() {
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index fe25655..064de6c 100644
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
+@@ -83,6 +83,11 @@
+ #if defined(CONFIG_NF_NAT_NEEDED) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
+ # include <net/netfilter/nf_conntrack_timestamp.h>
+ #endif
++#ifdef ENABLE_PHYSDEV_OVER
++# ifndef CONFIG_BRIDGE_NETFILTER
++#  undef ENABLE_PHYSDEV_OVER
++# endif
++#endif
+ 
+ #define IPT_NETFLOW_VERSION "2.4"   /* Note that if you are using git, you
+ 				       will see version in other format. */
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
index 8db277d79e5a..c3bec366b466 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
 	"${FILESDIR}/${PN}-2.3-flags.patch"
+	"${FILESDIR}/${P}-bridge_netfilter.patch"
 )
 
 pkg_setup() {
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 97db563591b3..8bc9118a9812 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -16,7 +16,7 @@ DIST iptables-1.6.2.tar.bz2 639785 BLAKE2B 3d129756fd33c8c73d56d57e3c5595896db86
 DIST iptables-1.8.2.tar.bz2 679858 BLAKE2B 2004d85c89ecbc37ef0d571ac8ece680fd2e11a51b074f6387d6e9c4892da524c785d6bf3f30e26af4e7c2cb1f401d51bf8bcb21a91e380e24945374553139cb SHA512 8cf0f515764e1dc6e03284581d682d1949b33e8f25fea29c27ae856f1089fe8ca7b1814524b85f4378fd1fc7c7c7d002f06557b257ae2bbc945f8555bad0dc76
 DIST iptables-1.8.3.tar.bz2 716257 BLAKE2B 58c606a5753ae2cb8ada9039e4653d2abe03c7c9b6aeef1e458baa3e10e818893f35e8f2aed5221e692415115e618aa673c8fcd33d172f85e9d1b609ed79c7b8 SHA512 84b10080646077cbea78b7f3fcc58c6c6e1898213341c69862e1b48179f37a6820c3d84437c896071f966b61aa6d16b132d91948a85fd8c05740f29be3a0986d
 DIST iptables-1.8.4.tar.bz2 704312 BLAKE2B f677bb9ed2c86e6a39953c0565766991e9647224effdc7db2b563f3f491f6ace2f9073ecc8e865d489101a9f80cf964d9775ab81536412dbd4ca85937432de94 SHA512 a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb
-EBUILD iptables-1.6.1-r3.ebuild 3264 BLAKE2B f63b279cc34c5bae77bf29173e20e959d769e9caa7487d7a5d9d2777d70a944a2af4d6a6ee0c4360ad018b625b3b9d2e849b8e6021b97eb1dd505646a6962253 SHA512 4d78e90b73f46fcbfa87bef6d6c5fc1ebed6d19a01b6aadaf55549d897c45e6763470cf1d5e02c381844072a6c7380d4f35ff9b8c33efda0711c7afdfe1c228e
+EBUILD iptables-1.6.1-r3.ebuild 3265 BLAKE2B 24ace2d4b4c2c4b29e1121ae7371d434ac81ec51c05c69a93a977db620aec28e235043ef1befa2e8c00c2a5a0de78be0ae3d75d931e4c169854fbf7060f6bf61 SHA512 29e8c70007798a6681134e9ff622f856595310a7447f9f36e2b61646372b3e494aa20cbbe3a6ef0a4595cd102d37a24df10ab79b2b749f59445a5f510d53bbe7
 EBUILD iptables-1.6.2-r2.ebuild 3340 BLAKE2B aad99bac62ba2ec4754e93a211ef82672ad2639011009ade87ead6062221900ec32dcc5bd732fecf3017fd53e22e45d51343e8e6b656768d5d97403ee11daa59 SHA512 744bff7edd5b33d18d8cc28b7f8fba70f692975f2f8f36143524abcd7edec827bf5d7b21b2127ffcb155f542b9520787776968e158af71b1611b1cfad11d463a
 EBUILD iptables-1.8.2-r2.ebuild 3446 BLAKE2B 9cbf96d3253ddf4bdbbdcdd7bd93b384503528c9ca021523236ebda045a0046c1287236ea473967782cc6eff43653ac573b8ca1425b70f85275697282d330fa9 SHA512 068bec8142df4c2cbe1c0019afb8011be2d22bb72820659e0c8a6079b6bdfb67c1671cb2a9a323cad67a6acff677988838fa387c80ac9e1d54b6891add893674
 EBUILD iptables-1.8.3-r1.ebuild 3402 BLAKE2B ff4b46d0c95ec9ae02b269b32234834553e48ca7884c9dd0b8bf719d84a176b79898d7f3aef6fefc8764774f95b2d3f380cb3a1d4dbde78de612181e685de0ec SHA512 a639d8de9b7884ed51e77fadb40885e2dd83011c609d78dc8c55b362ee1f81b066a854b495ca0adba09fbe5cedf572901e23256340a777b8384e6a0333390330
diff --git a/net-firewall/iptables/iptables-1.6.1-r3.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
index 8c2f8c8173fa..006c8df53370 100644
--- a/net-firewall/iptables/iptables-1.6.1-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="conntrack ipv6 netlink nftables pcap static-libs"
 
 COMMON_DEPEND="
diff --git a/net-firewall/lutelwall/Manifest b/net-firewall/lutelwall/Manifest
index 565898685f00..a1f1b881365d 100644
--- a/net-firewall/lutelwall/Manifest
+++ b/net-firewall/lutelwall/Manifest
@@ -1,4 +1,4 @@
 AUX lutelwall 354 BLAKE2B 27d2a5092f7c3bc9dcf505762378571e1a2c557790a05648a8c630f275381c764ce68e2e2bdf8594697e7058e8d9b41352f0cfd7df9af3b87298a9f9b55a9526 SHA512 43b9c9ba93d65767bfc1d6a36ee4acb98a3d671784d021a0cf501390b79d9d38c0913b63c693098941868fc65c17a1625f087e679a0fcbb9a3adf5f6009be4e1
 DIST lutelwall-0.99.tar.gz 29209 BLAKE2B 1f9e0c1516105e271ea3fc0ab51cdb4957a86ce725e305ef681951960f84029ecb8b911a1b49827dec67b00289385e8a62a5c90529463057859aa3d130897d39 SHA512 8812048c9e4ec3beff2214ed3ceb2d980d769ada686a934af22baec76a3670e51ddb171097adbfb78c63ce9bc25554b1da93ec8c86f59457277fd4651cf1068c
-EBUILD lutelwall-0.99-r1.ebuild 673 BLAKE2B a001d2687942b286ea3f268afd0a8db93ed6132f43e5907a06406fb5e6e82e0b2c256b6ea9a22f9aaca858bd75631b04a4b3590f072e87bc41c20a8cbf147b6a SHA512 afbc83a04b42793174e1c4d6318986592ee0394dbf9cc043d2af7523cbf53922dd3d0043c5e106cd6664233620f4e6678c2571f3bd2b1a9fce60f2e63ef93f3b
+EBUILD lutelwall-0.99-r1.ebuild 674 BLAKE2B 3ce9c2d267f07efb32dbfd8747e058ffee449a2d6b79dfe0979ca48f99c69703e53e7d6ac274bd4fbcae0996ad2702e6dd6e6f4816bf9fa09923dd4f217293e2 SHA512 6584741ddfea398c7becd906da5cab145d588c6c39af046f50ef5317f4061239a48d66def9598ddaa0671ca37779a777fd60aaa0626441234fcabcade1599e86
 MISC metadata.xml 869 BLAKE2B 8fae2c62b1e34e2f35ca01da9746a78b36c9fb2a0318717d7c5ae9e6d698ebbfe969b8f9945c10ff50db399c45539bb4f63bff1adc66a2efd4ed5a4efd724035 SHA512 a4326ec5c7720e296a1e74ae39eafe359a3d0d919112ac6f6f6522dfbfd89ffbb98764a952d110c93df6f84dcccbc942c7902e3ad06dfdc18788d45741862755
diff --git a/net-firewall/lutelwall/lutelwall-0.99-r1.ebuild b/net-firewall/lutelwall/lutelwall-0.99-r1.ebuild
index e167c836d934..0f97a1465b44 100644
--- a/net-firewall/lutelwall/lutelwall-0.99-r1.ebuild
+++ b/net-firewall/lutelwall/lutelwall-0.99-r1.ebuild
@@ -8,7 +8,7 @@ LICENSE="GPL-2"
 HOMEPAGE="https://www.lutel.pl/lutelwall/"
 SRC_URI="https://www.lutel.pl/wp-content/uploads/${PV}/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 
 RDEPEND="
 	>=net-firewall/iptables-1.2.6
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index d642f5f6e4dd..758b553c65cf 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -15,5 +15,5 @@ EBUILD nftables-0.9.0-r5.ebuild 2886 BLAKE2B bea596aa70ac2317ad61e3ee2bd27e904c3
 EBUILD nftables-0.9.0-r6.ebuild 2869 BLAKE2B af739ee33b4666216d4bc049b3c5f274a90a3f906ef72a60ce433848cc4cf2801c5ccc9fe19945fd36f3da821ddbcfbccb7af510dbc4df2b0b35c38c39529ba7 SHA512 50bb9e432f6b4de5aaac7010799a915841b870ab49fe6b1636fe1e0ce8dc0bf60a1fb1bc412c24af9b66f886bc41d9a7f77ffa092db2b8d84d83213d79c896fd
 EBUILD nftables-0.9.1-r2.ebuild 3838 BLAKE2B c2e56f1b280a899848a052ef5860fb50de0130c2896fc34271514ab2e9d6365a9df2f2adbcc8813eb84a69c802e6cd51240d21784dd7325e5493f0e56d90e334 SHA512 440efe48987ce9eec72b4ec47b7258b36adf3f666c4bee60f687eae9f0ae6b4977f8905648aa7b8b30375163bb0b69005f035b663762f58ec9ced3db642d3eb1
 EBUILD nftables-0.9.2-r2.ebuild 3741 BLAKE2B 1aefcc28925d397aa277214069c8f03f9974028f44d8a65742fc9fb4d85c553b8d2cca9f468d05fdcb21455bdbca62be5398dcd5aa868a8f3d72dfe2cd87d278 SHA512 3d3229de926b53f4ec6104ba791b00f8cd30e815a1463c75d282d4321952ced419fc227e8326a1d1e91e76fbfa5db23d09061ba7cd184665682e22de12928627
-EBUILD nftables-0.9.3-r1.ebuild 3754 BLAKE2B 8894657320fce57b6d5d7791cd8c309607702fc40ca5c406e41cf60009108230a1ebc96304a443b7008463f5131886ba04fa1772638f083cd6c1a9ad8ea3554b SHA512 feac069bc91131f2d5ee49df251bb7bf91df0a35e02db5116ced63aa3c67d6b973f3233c6fc2f98b794dcdf43b51ddcb2300f7a77ff1672d5018a7793a5a2534
+EBUILD nftables-0.9.3-r1.ebuild 3753 BLAKE2B 9aea7b576e61a0fbf92c880be1652a196a8e276b7beceb9463c684e3fe9140f8e95a0a54654516ad2223f5553bc8e9680f0434e959f514173c323b9786fb2d04 SHA512 15b0d5ea31b132f83f70feb523998b53715cc212eb3357576bcdbd7bf0d1e3b7c719302176125191fc97a0903f13ce92a116a7ae616e2ff788cb82f1d4597ec5
 MISC metadata.xml 918 BLAKE2B 8c2c39f04e2c5591ea06788788d244bddc1cdc25780810b2a19e131d43d0bdf964d2129c01605fc536451cb9a3354420a1c2f656dad45c56dec4f360a95fe473 SHA512 08de9d11f48dcb132eb5423de56b458dd4c4122329b84b56c252436c882b7670233f2217cc01755649f27e14ff9346cf99e3a742224567e712f5cb3678165dcf
diff --git a/net-firewall/nftables/nftables-0.9.3-r1.ebuild b/net-firewall/nftables/nftables-0.9.3-r1.ebuild
index 0971c21eb9ec..3c1bc7e056a2 100644
--- a/net-firewall/nftables/nftables-0.9.3-r1.ebuild
+++ b/net-firewall/nftables/nftables-0.9.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ia64 ~ppc64 ~sparc x86"
 IUSE="debug +doc +gmp json +modern-kernel python +readline static-libs xtables"
 
 RDEPEND="
diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest
index b7eb151c8d9f..7ae0e3816f44 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -5,5 +5,5 @@ AUX nufw-2.2.22-var-run.patch 1438 BLAKE2B 259d96d3a7386ac30f4ca7a88ecb0a4714b04
 AUX nufw-conf.d 122 BLAKE2B 3263b28a9a783f35920a30cb022fe86b8a0fdc05b45c5a191e53c0b201ca38da9fe9eeda82866cf69dc760e0ff2fcd0264ee17f53f03a6077b63d9fcbd2dd1f0 SHA512 df48fc1843bf07e7ccfacd647caafc43752fdfa76da09a89d9ec0d76b79746c60c70f68c004c7e37899f195ae63adefc7d1c1b2c7b41da27911eb4cdc54212fb
 AUX nufw-init.d 273 BLAKE2B 00827d4cf93b484c6563b7bccc4020e9de0e8f2652eb29f9b1a64dfb4333b7e04b370f977a43a8f9af4b680d62e658a7779822c6671059e83a5ceea7f1872f5e SHA512 7f8b16532ae74b6aae8a9c7ef4a7509b66253f03a47c8ee521163a35db525e8c25b091289e10337307906a27e0aba558bd2a28dc0b91cbc09ce17ba78002d0e1
 DIST nufw-2.2.22.tar.bz2 597491 BLAKE2B 4c3092aeaced237ceb9faa16cff275938de23cdca31d2d6f6406238a0fe75ad15468f91a80b1d6e0bfc6dac520b6331ee19a1d95a006d591b891b91aad6caa8b SHA512 cc9f43b9ebf6aabbab4c83799ca1735fc456c085959cfb24d17571302c71518660424195b2cc62ed615f811bd6b3c45e1b99db99138d1caa6a744370775acaee
-EBUILD nufw-2.2.22-r3.ebuild 2650 BLAKE2B 1a22d6dc4bb32d595d147d8b7f739d9bf21658df7e7befda1157008a0841c25b1f864671d0c4a9662f9aefebafea82cbd445ab98399a016c6522ed361762abb2 SHA512 0593a072ba72284ffdce5c591dda4adb17f24842ff42d2021218140b5fe2e4abf910d707afb8ddd974d67eda856d686e3e6e198ab4b0ca5268866e2aae9ee3a5
+EBUILD nufw-2.2.22-r3.ebuild 2687 BLAKE2B 66845496fb300d9b159609036e25be0685942bba2520284256ddc94c7891bbf3df077bfe89e605d1b6027e8efa31719c061b32ea21bfe395c69cb376e8abf52e SHA512 6e78cc47bf3fadedd2277f2a6306ea0b26dbfcacaa32d002f144fed47e3d3fc1a11415482dac8dda451d960878fd14f8e47afbe53ea5e156feadcb22e63b7cb4
 MISC metadata.xml 639 BLAKE2B 5949c30f493d0cb89581785cb440fefff80a3c204b7d2c0fc41606c4306cd39048403a339a15126d4b870b008dcab2e78132f64e85fdb6652f0677dd9a7cf74b SHA512 5fb1a59d891ebadc0df099810c33a229dd2e446b0e2b25caa0aabfe3f89ac1dcd278aae322f9e2493428f1699a93d0db80a820d8b8a44abbf17bf5a271e59071
diff --git a/net-firewall/nufw/nufw-2.2.22-r3.ebuild b/net-firewall/nufw/nufw-2.2.22-r3.ebuild
index ec1f263bec86..c7c3a8db4667 100644
--- a/net-firewall/nufw/nufw-2.2.22-r3.ebuild
+++ b/net-firewall/nufw/nufw-2.2.22-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 SSL_CERT_MANDATORY=1
-inherit autotools eutils multilib pam ssl-cert
+inherit autotools eutils flag-o-matic multilib pam ssl-cert
 
 DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
 HOMEPAGE="http://www.nufw.org/"
@@ -54,6 +54,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cflags -fcommon
 	econf \
 		$(use_enable debug) \
 		$(use_enable pam_nuauth pam-nufw) \
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 8b89d1e0eb71..550bbdd3e311 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -2,7 +2,7 @@ AUX psad-2.2.4-var-run.patch 589 BLAKE2B 11c7095cc2eac066c44ae03d59787c92a7db095
 DIST psad-2.2.5.tar.bz2 1243987 BLAKE2B f6b3a86a841b2685a21c4f46cab8cbb720a7955644f28cd0931f0a620aed4a743213a9f276a98b637cd5b13f93565dee22876042e43a0233cb989021fff9b813 SHA512 195a06420cf821d182a5422705ba2d407fd35f23887430e61925cad0eada7d20e2416eaf6317857a5aec2f1264a280a7e0128cc301f17dcf20cf833a9f0efb6e
 DIST psad-2.4.5.tar.bz2 1631602 BLAKE2B 83d5a6811743e56e86984e79f0176db7982243cefcbdef7bdc30300de6a3e2c1d5033e75ec5b7e68e89784b04c98a0ed6b9475a93f4e633ad96380facaf08c21 SHA512 6466cf3191092672557fb6c044c6126290f1d89aea37a20aad1b3eb148b5b8be5bc2cf3700938b91263d7403f776613f304bd491c24a7e16b0975b81f24481a0
 DIST psad-2.4.6.tar.bz2 2548405 BLAKE2B 7479ce4496343ca988da4dbe82190053385f1a8fa2e190002545c63f2e36283bc84293d932ebe147c9078923fa9e0527b4265fffdb8e1fd99bfc5d9955f9f3cd SHA512 a5de29b9ca0108aa8c6a325b725145f408dc517aeee4654596c7a037762f495a78827c64fc2e9c4284bc8db65caf0321982ecaf02de6d73784c2038e1078f42d
-EBUILD psad-2.2.5.ebuild 1870 BLAKE2B cd57e4844e7cdd92b25d06a2778fc8a7c6ab717657c5552df532d363d1f259e6b2a25016542e522d57ba5dd22ffaa24da234737b40a9e72726212e55e6673d6e SHA512 c613774660bf0c54a3fd696b12b8df3230c6d3631ce257e165ad573142d447ce674e47c917eb250860ed88e53fae9398749cfcc3be5b599cc81bf4fcbee2b9b7
+EBUILD psad-2.2.5.ebuild 1871 BLAKE2B edb9063cb74a7a5a0f4e62b78bc09d14a5a83ebe931468a72ebbcc87c888e638fe6308693e7ee7157d816164db7b827ef42632f63483a673cdf07522d42f612f SHA512 211c9ba371d209fef31f45425094fabda27f2557016112f65ebfc20be69816f04dd75550be8d37c1cccc4ec235556959d7d72ea143fbba0acc81f1a23623d82c
 EBUILD psad-2.4.5.ebuild 1924 BLAKE2B 95af89c036864eb14580e0bd78767df519bc077817f231894625921bf69ae52cbca2d509f454b0714f2d10731fae1c45b8cb9e8ab50588a178cc96ac583497b2 SHA512 d8b0f17e7ad6d570e8a3aa54d10ae0d921eb324cc1168814c61d8c23b23c5924ae86183c0194914024b21b1db0dc34c0babf7a5ce333959422f99f59ee1c9df4
 EBUILD psad-2.4.6.ebuild 1924 BLAKE2B 95af89c036864eb14580e0bd78767df519bc077817f231894625921bf69ae52cbca2d509f454b0714f2d10731fae1c45b8cb9e8ab50588a178cc96ac583497b2 SHA512 d8b0f17e7ad6d570e8a3aa54d10ae0d921eb324cc1168814c61d8c23b23c5924ae86183c0194914024b21b1db0dc34c0babf7a5ce333959422f99f59ee1c9df4
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-firewall/psad/psad-2.2.5.ebuild b/net-firewall/psad/psad-2.2.5.ebuild
index e032dfdfdeb1..e14294c65bfb 100644
--- a/net-firewall/psad/psad-2.2.5.ebuild
+++ b/net-firewall/psad/psad-2.2.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.cipherdyne.org/psad/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index af2b6baa4c8d..5645b08b8d2c 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -29,6 +29,6 @@ DIST shorewall6-5.2.3.4.tar.bz2 190759 BLAKE2B ad4a8530341700c475f6fadc840968c7c
 DIST shorewall6-5.2.3.5.tar.bz2 191963 BLAKE2B b1aa5e5576749313a351eac29b2c247d58c4e38b9d948374f2c64a97a51bd6f7407afd52601ad0856c2899765ff4fe3ac0c96b4507e777a3112ec962a7dc71c9 SHA512 10081615887a5507b885ba6177016575829ca9cec81fe0fb8d5a6c12871d87ae1c63bb7319ea1e831d0c259084e243294125cad3650a0ffc66d0c09e457283d1
 DIST shorewall6-lite-5.2.3.4.tar.bz2 39623 BLAKE2B fc7ee2d7eee5a4f50b53882ad0ced13893b5f3c4348214529791e7aeffc6662ec5a6e9cead676287be028a8575ccb083570606f12b5e6880848c7476ca90a382 SHA512 3acb0a11c175ec8fd18b48a164c53aedb9e65347e0ca985307624ea892e3609ef645e8b2659319e00757a42efc161a219691027163387da70c6db624d0d6739d
 DIST shorewall6-lite-5.2.3.5.tar.bz2 39907 BLAKE2B d396c4365d0fedac5afd997c2283c9cfaa05077d786dc95f40f3bcebf778f2cf8a95b386aeed8e8c80f556b000399da8c7c2e3fae9f1cbf2e9ebe4935acd27f4 SHA512 533be2c2bcc6b406eda45916d49bf38d776445fa6a7b43946ab5f11623f45f922d9a49ed47abc141a843c0afbec5ed08f6050d431ff73aba922fd8b5197f6bf0
-EBUILD shorewall-5.2.3.4.ebuild 16972 BLAKE2B b6391331228e5d0fc72ccd31474bb15f664366e7288d98f5cee5392cc55be5d8f3d82e38ab37d41a42fb055603b4bd5c166cdb980ffb8ad5522eb11767aff33c SHA512 92914339e37e3688236ae4cbde8efabc42434708db1f4dbd3695084fa1da10d9509ab373de72743776ac13cdccb750610c5a3725cbdf387585009b806eedcf0c
+EBUILD shorewall-5.2.3.4.ebuild 16973 BLAKE2B 9b8844f4b713ab7e003f7d33880630dfa8b2f4a1d6cb3cf7d48a22d20f91ef01c466465b5a13b22cc096705a0805db92c35bf57bf227d182b8d894a55a4b5275 SHA512 2365c5f2bf845d1e264f0e4b930d3a55bad825cdb21a4c4b38199f6a3a9662ef9942b4aec8cddc32bd981482f497897f26478f791482c81cb58e4746cbe276c6
 EBUILD shorewall-5.2.3.5.ebuild 16955 BLAKE2B 17fe7a10d6c7fd11ece4169246604d8e33864a2a5a9c508a9f150da4034bb4531f5b21d9e6ad9787add150fc371361ed114edd4cd7574baba79c81cc4cc8c002 SHA512 40611e703f784b36a6435e8e2209a8d41268fba1ab6b29ad7ea66a1ad9dae5586a744dd506774baa71fc00296d225d975d7a387567b70ba59dcbf77aa8745956
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
index a36cb7a7d14d..2d5a9ab68128 100644
--- a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="