gentoo resync : 05.02.2020

4 files changed, 17 insertions, 4 deletions

diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index 92b867a54855..65ea81bced8b 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -7,6 +7,7 @@ AUX hping-3_pre20051105-tcl.patch 260 BLAKE2B b8ad9492a1d4a4ff2b45cdf0263457d16e
 AUX hping-3_pre20051105-tclsh-proper-escaping.patch 550 BLAKE2B 463c740662c2477379df97a795afb58725c30258eadbd4e1e3495b5ffa9e9cc04e5d4eec2a33dfa619d6a4450f79cba4c89463f250cdd7bf50bc1a6ed9f77b68 SHA512 349286fe6e22f491debe399bdf68d99f27c1baaf27bc9fd976691fc8bcb6fcfb03dae09b3796c1e181a0deca279c6e8a0721d39862a302d02bb05d7557b505ab
 AUX hping-3_pre20051105.patch 1036 BLAKE2B c06043dbd14fd7f7806a9404f5523a3ece4e9af3b619cb19965cc983191f553d28df1bedae0b534029d374fb2bc49ae6c5bff84a6b4f829081e92a1835a90913 SHA512 ab1a6f85d8ba6e91097260b2044502f69033dd7466869cac19d50a1830a9eeea105617ec62e14cebe953b49992a3548c08f243638171de3524cb0058cf6d713e
 AUX hping-3_pre20141226-compile.patch 1043 BLAKE2B a58b97bd9404c1c360c5a6604959a91912ac5bc7df9096661cf9bb057d9421ce7170497a97596417547f396f4034dfd587f9e835a82a03c0e352adca656204ea SHA512 bc34affaefddb8515ce3e478b72683937d4a7e64ce7037e827dc957326d652a3c41a6016cf5a25f7f0185316a349d448a87c5f8d343002f833998826f6125c50
+AUX hping-3_pre20141226-fno-common.patch 229 BLAKE2B 75d9474d97444d636dae1012496ac94353b79fec632ffefa5d1e9d86410375fc42edbbfeae2cc5e4cf2cbf25927db8f68c276c659202194896c38593d968f49e SHA512 c994a2a9775556870b4b0ed26147b06773756c97a221c38bcfde01c5defd8736a52dd6b58b1c27632c0960090ad0aa06787573d2c137531a2650012a13be3954
 AUX hping-3_pre20141226-hping2-2-hping.patch 9089 BLAKE2B 319a656267ecff667550940ae2c5be2471c6c0308d4750a53f42c698e442119ddb8025ecdd3fd9835e22eef87d53f73d9bd1bb3de89bf523e25a1f1cbd00d9b8 SHA512 a660375853d37e3dfb3a1ad1e09dfbdd70ed88900d4a9d07d32c8d1cc782e2d4e357eb0fdc78b46711b6c8e5bf21b8572bc2e696874cf6f52a3a14d54b395bd6
 AUX hping-3_pre20141226-indent.patch 217 BLAKE2B 7db91fb6ae7585bdcedcf07f5f0373967dcbce4a34785574e9e0392fcee720190f087466dbdd6272102c6280a56a7640c2a2726539ed8dd557d277c4b2d40c76 SHA512 bfb024c3d50a7674969472ac38019d6f06622bbe8a7392c3babd1bb99c3c4c6c5a553cf7a9e1bc7ad9c6636e1fa5d8faca8679df191995b8b76d6c5f6aa936e9
 AUX hping-3_pre20141226-pcap-bpf.patch 421 BLAKE2B ff0b48788abe2151c60ab3a99c8800f817a01f64e3eaa40218c227fb180a1abd1e23cf4c98f689ba8ec7a8ac5ac2698a574d0264b64c9d8edf1bc8729309ed5a SHA512 58b493b860a8fb702292faf17bb6d033a855748dcb7db173025ba7ca54a1ecd8e8f9bfa32e0c36a3988c38baec2757b99be12afae052196d338ee24f3100a975
@@ -14,6 +15,6 @@ AUX hping-3_pre20141226-scan-overflow.patch 316 BLAKE2B 7d43d98fe736dc78a2e104c0
 AUX hping-3_pre20141226-unused-but-set.patch 1272 BLAKE2B 8ae0bfad0bab0c8f0f7592b5ec370ebe146bb31c2dd5a53651d2bd27441c605114f46ab98ec9a97e9f5d386cae5a561c80c420c4c15d6d9424440ac4a53736ef SHA512 a9f031c39a448b0d1f6b076193a07c7a9628756af46a06c2f0d8a2859a02e55bbff5ae55ee4341297b19c4e1ba041b5dd2cdee9b64bdf35e6aff5dc4b8faf6db
 DIST hping-3_pre20141226.zip 648502 BLAKE2B 4c75bdb886a37180a4561a8179e00ea5bb6534e32b6fa749cd53824e36dfbeaa38b1a772b58f61d68056f510a294f6c3363f56705adb75f42fec11f4f4cd8fa1 SHA512 33ca573d66d7f6285f69a060f56a95e7307bc24d6c81b5e1752c72b8487ab9c85ac6e4499f9c4897e2656a67e12d608a0a149ca5502bdcf18cf97c88d4a2309b
 DIST hping3-20051105.tar.gz 584001 BLAKE2B b99b7d2310e1706926ec5c649cd03a8889e3cff36f2a8e1f899799ddb1f4e6e432ab2b83c82b741ab827f715dbf8649a94831e75ef22793c7730e80d49c576c1 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3
-EBUILD hping-3_pre20051105-r6.ebuild 1597 BLAKE2B 4ea4ceffe2ddfc9be4e333c282c4f76d820a560f37450359d5b73096a2bef5d03ccc057f9f63740fb6930d433e9723382ad3306a075ea39352ea854fc94da089 SHA512 22f7aa3764f5d91779ab281bd0a173fc8dffad1f61a8886b82d7b0716fe7b36d1d01eb5ae59452859807f3d6dd50cc7d496893140a60dff9b9be09f60d940617
-EBUILD hping-3_pre20141226.ebuild 1522 BLAKE2B 9b69e1a45466607d39a4b79feab0b68017519d52139583e2900959bec47a46506a22e918ed85f88c35f94bf8a86de837f8b1198227b7b751e4f3e687abfede5e SHA512 a971eff457c48e4ef62090ce15633483e9957eee5e37e17564376a23fdc748ae64929eed44ad756819d48636a1e173ff922e2abdcda6847ff387cf2386352414
+EBUILD hping-3_pre20051105-r6.ebuild 1598 BLAKE2B d146b4e7dca3903a4946854411c83f20677b2417f2e4fb16a2b64b26a26d0c72b5b4a1bd28902dd74de3c2c68259d55fb49563b622c1fdb6c6e102de94f8b130 SHA512 15de8e9b07877fb00115c58922791dc73e6703a145aa391af6698789e442e71e40c723d2adaa903942814eda7172d0f033241604421fa32741fdd54eb7a774d4
+EBUILD hping-3_pre20141226.ebuild 1571 BLAKE2B ab837befdc5d18d7d2ceaf015002c7e8a81a2feaf6cb0ed7fea6adf74861bfd8e062eb629325cc1474a4ca8124599d75e1bc193284042f52483d87de8f97d9d7 SHA512 5e9b6abc08d35bdb08f4dd097a565b5b4863ba9b2c82109b2df4b7fb5cbf1a32aa0e2ebe5ffcdca81b59973944906a442180f65836ac3aae934387603f401345
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/hping/files/hping-3_pre20141226-fno-common.patch b/net-analyzer/hping/files/hping-3_pre20141226-fno-common.patch
new file mode 100644
index 000000000000..e21a6d513c59
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20141226-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/hping2.h
++++ b/hping2.h
+@@ -357,8 +357,6 @@
+ 	int status;
+ };
+ 
+-volatile struct delaytable_element delaytable[TABLESIZE];
+-
+ /* protos */
+ void	nop(void);				/* nop */
+ int	parse_options(int, char**);		/* option parser */
diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
index bf8d34d47be1..888c752b7bf5 100644
--- a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86"
 IUSE="tcl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild
index 72c3c7249331..3c3a3f166ea6 100644
--- a/net-analyzer/hping/hping-3_pre20141226.ebuild
+++ b/net-analyzer/hping/hping-3_pre20141226.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3_pre20141226-pcap-bpf.patch
 	"${FILESDIR}"/${PN}-3_pre20141226-scan-overflow.patch
 	"${FILESDIR}"/${PN}-3_pre20141226-unused-but-set.patch
+	"${FILESDIR}"/${PN}-3_pre20141226-fno-common.patch
 )
 
 src_configure() {