gentoo resync : 08.01.2021

7 files changed, 3 insertions, 172 deletions

diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index 75d585380f60..b1fcc756fec0 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -1,11 +1,7 @@
 AUX bytesex.h.patch 520 BLAKE2B 137536480eb78d255862ea6a843b834bd64cf8bf163ec553035270ea185a04b36cda586c64ed28ad0ac43bbc863b60b76ba1f3cf73bc78b3e87c219c21556b3a SHA512 f5bf7e1d303824340f667eb0f7335beda354923311b9f65f1b0250d5acdb85a7c6ec15f98c1dc75447e1e0fabeffe51149e99738775845869e099b1409f2b48c
-AUX hping-3_pre20051105-ldflags.patch 602 BLAKE2B 6bb6a8723e1e337f540d94822480e56fca2604301d1a31882db7f627c840934e0eede6c6c44ab89ddfe51be376f3f541b0698eb4a8475128700b28a08d104739 SHA512 b62df43e88724a168e35c21a394ee128d5b7a1870836be18d6327af850d5025bd3c35464c2b8fc0715c3df692996fc41e95023cbc4a778e6e881e9475d25d058
 AUX hping-3_pre20051105-libtcl.patch 507 BLAKE2B f536097a9355501acfe894b09421942b7da955f3bc7aca4f6da559304be21ae4ddf4efc2ca2f5ca9ef61e7b8a84ecf0d6a7263f7e10575abf22fc349b8df6f0c SHA512 282f8934a74ea155596ecdf6f92be5f0c25d535e9b711c32fb015beea746652a7c40444cd1cd03f94b12aeacb0352df304c24153dd11290591143ad7e85ade5a
-AUX hping-3_pre20051105-scan-overflow.patch 299 BLAKE2B 2b6f397328f43c92fd5176e6426e18c0c44b11d8a26fde4fb40a4b2663b98a37dd6df1aeb42db72522aa6f96f91a9f2279f38e2b1df0c151ea8eadd2f6b0ce33 SHA512 632fdc5e48b1ef0924f58c5cf463ceaee26692cedab50869e9d58704948f38b9168a9d88b1c2f89e9d4a562d0454fcaeb6ab3480cb1c76a16bbd0f73ac09af98
-AUX hping-3_pre20051105-strlen.patch 218 BLAKE2B 77d4180b2de3d2eef09413d5e4ce51f13e94dda1e51f82a68d59441e12840fdf7550087179a9abaafa9f931f2f519857726769122d0df15be36d3a9efccb096b SHA512 3029cddbcfa384a551875a5d597bd75763963b08bd86b923637aa6a329ad7a2e73eec8a534a3fa3aa27586b8fda0945c53db455826ee45c067389bd6ff0c39c1
 AUX hping-3_pre20051105-tcl.patch 260 BLAKE2B b8ad9492a1d4a4ff2b45cdf0263457d16e90da809db8485185602d15d7408fea8b5174a2dbc452ee3749efb70336b4ae015a341a9ec51aa8baf8c792f8bb4202 SHA512 67da303e4c4b225607c76cee7cb2b2655b0dce9f2e151dc64f078cc719fcee974566967b1b294c0bab347a58bbfb6f08e3dad91c692dd1c56878c691ef5b7294
 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
@@ -14,7 +10,5 @@ AUX hping-3_pre20141226-pcap-bpf.patch 421 BLAKE2B ff0b48788abe2151c60ab3a99c880
 AUX hping-3_pre20141226-scan-overflow.patch 316 BLAKE2B 7d43d98fe736dc78a2e104c0daa0d206dd30175c8133168fc390b308c3889cf306bcbc1c10265474bbd9397694585b9b16667ca80d91d1175b2daa41aa9ba501 SHA512 ddef839e98f48de04aac8015468808d1e3201f0752cb82a4650e35c27a903d2ceca0603415d8a19f39dd827a8ca249d778312a0f272a4605b3ea67af4a18846b
 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 1596 BLAKE2B 98a30f9e86a119a7f66793717074e18d9b1510e258e1d5be53054ca2b385b18ff8ba2d5806a28a2f203d469c33d97acc852d7c0d1b8b43ba564ebbdfe941f840 SHA512 1b9d3783ecdd143a46c254bcd5a021b588d75b7431b64503ac29b54cf1c4b876592bcb856cb8ed2788e8f9b10288b066c2ec10873dc715ca6fc5a40388504b30
-EBUILD hping-3_pre20141226.ebuild 1570 BLAKE2B d383f47c10f3d2efca53240ee7adc07b2a552112e4086598bacec34c7b3e4ebcd1b04bc5a65dfafda1f9fd8ea251aa296c663b2a9188de170f359766d5062af7 SHA512 c8c10c3d93ef8b94222a66a4e87ca282e3154d091cff24a85877e80fc2e190f6dce427310e0f0e00d4ebec204d1905039cd79b5951e94c7ae25d930bd642fdac
+EBUILD hping-3_pre20141226.ebuild 1566 BLAKE2B 316314c2caa4bca78050582aa520aa0a6274fcb929736839692579ca9fdb5fd5eb8039ee9ce7879ffceedd6c51efc15f818b6714588b89ac613ee014d556c6ac SHA512 ebd41d829135ab4a9daa7f44d8a64a00c81045187dec5e0d1d5689decd58c73c40256e998f4d0685f7bca25731cdafef2f204c573654422a00d5313f823bafcc
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
deleted file mode 100644
index 39814bff0d8c..000000000000
--- a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -50,11 +50,11 @@
- 	$(RANLIB) $@
- 
- hping3: byteorder.h $(OBJ)
--	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
-+	$(CC) -o hping3 $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
- 	@echo
- 
- hping3-static: byteorder.h $(OBJ)
--	$(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
-+	$(CC) -static -o hping3-static $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
- 
- byteorder.h:
- 	./configure
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
deleted file mode 100644
index 2c3e01bf697a..000000000000
--- a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scan.c
-+++ b/scan.c
-@@ -456,7 +456,7 @@
- 				continue;
- 			/* time to copy headers in a safe place */
- 			p = packet+linkhdr_size+iphdrlen;
--			memcpy(&icmp, p, sizeof(subtcp));
-+			memcpy(&icmp, p, sizeof(icmp));
- 			p += sizeof(icmp);
- 			memcpy(&subip, p, sizeof(ip));
- 			p += sizeof(ip);
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch b/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch
deleted file mode 100644
index 692cd93102fb..000000000000
--- a/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ip_opt_build.c
-+++ b/ip_opt_build.c
-@@ -25,7 +25,7 @@
- 	unsigned char optlen = 0;
- 	unsigned long ip;
- 
--    memset(ip_opt, 1, sizeof(ip_opt));
-+    memset(ip_opt, 1, strlen(ip_opt));
- 
-     if (opt_lsrr)
-     {
diff --git a/net-analyzer/hping/files/hping-3_pre20051105.patch b/net-analyzer/hping/files/hping-3_pre20051105.patch
deleted file mode 100644
index e3133f2b6b42..000000000000
--- a/net-analyzer/hping/files/hping-3_pre20051105.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/libpcap_stuff.c
-+++ b/libpcap_stuff.c
-@@ -17,7 +17,7 @@
- #include <stdlib.h>
- #include <sys/ioctl.h>
- #include <pcap.h>
--#include <net/bpf.h>
-+#include <pcap-bpf.h>
- 
- #include "globals.h"
- 
---- a/script.c
-+++ b/script.c
-@@ -24,7 +24,7 @@
- 
- #include <sys/ioctl.h>
- #include <pcap.h>
--#include <net/bpf.h>
-+#include <pcap-bpf.h>
- 
- #include "release.h"
- #include "hping2.h"
---- a/configure
-+++ b/configure
-@@ -93,7 +93,7 @@
- 	else
- 		USE_TCL=""
- 		TCL_LIB=""
--		echo "==> WARNING: no Tcl header files found!"
-+		echo "==> WARNING: no Tcl header files found."
- 	fi
- fi
- if [ -n $USE_TCL ]
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52,9 +52,6 @@
- hping3: byteorder.h $(OBJ)
- 	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
- 	@echo
--	./hping3 -v
--	@echo "use \`make strip' to strip hping3 binary"
--	@echo "use \`make install' to install hping3"
- 
- hping3-static: byteorder.h $(OBJ)
- 	$(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
deleted file mode 100644
index 796be56c9934..000000000000
--- a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib toolchain-funcs
-
-MY_P="${PN}${PV//_pre/-}"
-DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer"
-HOMEPAGE="http://www.hping.org"
-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"
-IUSE="tcl"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="
-	net-libs/libpcap
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${P}.patch
-	"${FILESDIR}"/bytesex.h.patch
-	"${FILESDIR}"/${P}-tcl.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-libtcl.patch
-	"${FILESDIR}"/${P}-scan-overflow.patch
-	"${FILESDIR}"/${P}-tclsh-proper-escaping.patch
-	"${FILESDIR}"/${P}-strlen.patch
-)
-
-src_prepare() {
-	default
-
-	# Correct hard coded values
-	sed -i Makefile.in \
-		-e '/^CC=/d' \
-		-e '/^AR=/d' \
-		-e '/^RANLIB=/d' \
-		-e 's:/usr/local/lib:/usr/$(LIBDIR):g' \
-		-e 's:-O2:$(CFLAGS):' \
-		|| die
-
-	# Change name from hping2 to hping3
-	sed -i docs/hping3.8 \
-		-e 's|HPING2|HPING|g' \
-		-e 's|hping2|hping|g' \
-		|| die
-}
-
-src_configure() {
-	tc-export CC
-
-	# Not an autotools type configure:
-	sh configure $(usex tcl '' --no-tcl) || die
-}
-
-src_compile() {
-	emake \
-		DEBUG="" \
-		"CFLAGS=${CFLAGS}" \
-		"AR=$(tc-getAR)" \
-		"RANLIB=$(tc-getRANLIB)" \
-		"LIBDIR=$(get_libdir)"
-}
-
-src_install() {
-	dosbin hping3
-	dosym /usr/sbin/hping3 /usr/sbin/hping
-	dosym /usr/sbin/hping3 /usr/sbin/hping2
-
-	newman docs/hping3.8 hping.8
-
-	dodoc AUTHORS BUGS CHANGES INSTALL NEWS README TODO
-}
diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild
index d58de2c0ec2a..b624b83ffd18 100644
--- a/net-analyzer/hping/hping-3_pre20141226.ebuild
+++ b/net-analyzer/hping/hping-3_pre20141226.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/antirez/${PN}/archive/${HPING_COMMIT}.zip -> ${P}.zi
 
 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}/${PN}-${HPING_COMMIT}