gentoo resync : 25.01.2020

4 files changed, 170 insertions, 0 deletions

diff --git a/net-analyzer/hunt/Manifest b/net-analyzer/hunt/Manifest
index c6b19a3a7f00..457d81c75a51 100644
--- a/net-analyzer/hunt/Manifest
+++ b/net-analyzer/hunt/Manifest
@@ -1,7 +1,12 @@
 AUX hunt-1.5-exit.patch 208 BLAKE2B 0cb8afdb88649dc60e2d854a17cfc0ca5177257f101b25411c22707776369f9e758b3795d3c8d2a1f2bf68607371c3f7e99b6a0d5d850082800260febfb24267 SHA512 f268d172d1280bf1f05cb61da7295c74f0c60ba2c648058491cda7e89702f740648f9fc90c764867d6bb490a24ab318db95de594c1111b7c2b4d099dd113bae8
 AUX hunt-1.5-flags.patch 507 BLAKE2B 2eccfe6119d07770fa6ddeecf7de405ec8fd2f3d28318a0cbc264c6ad6069fff7152109bd7aad5b06e90d0de3b1b4c625d4bfb6b7f35774c86ae8ba8077c8681 SHA512 2d354317438a387220089635aeda449a922746ce0b38b14b57bc0daf30f5216691a7c5098d569143e2b70bd7e8d7156b2a42423bca13c5e77c635f64d1804546
+AUX hunt-1.5-gentoo.patch 377 BLAKE2B 728df0a5a8eb29c039fab217825acd3162e9ec58ec1f73e854d3e10b981b6835f387592d0be81c622676fdeb6966b28243e4adb57d4e4e9863b9e3c759e4f542 SHA512 f2f499ee496112fd89e632565d393ce4af6e358481a47de4418490e87c90128870cf201274a39fe92b7e01044e3d182fb0c30d370161917bf2bdbb8961491799
 AUX hunt-1.5-log2.patch 387 BLAKE2B ba98751feb2a4c7544ac6c238016071fb01dbdbd81ab8a6a08df64b3adf8ac1896a8e883a4295c5681ee806c6528191ceb2ccef293705ab188ed5ea59efc872b SHA512 efb910e3149a97195323ddf35ab1a3e4ed075d7dcc0a1972e727b0107266b183bc09f7bd12f8dcf2735be1f6f76a5201caa1b7d1b50bce5464ef8f70a00f4bff
+AUX hunt-1.5-tpserv-log.patch 3426 BLAKE2B 23ef690623d82440e5749c42eb78c48e3226ffbe9b8aa1b59e1f63bf0595aa9f52c091c0897ecc8fa28d974d0356c472227416ed51d0909b3d3af9c22d94c1d4 SHA512 7690f0e1089b1767a1d4349fac66fc9897c542482677c54f77732b4377f561387301982c7aed60a15973ec2f08d2901d936fb86d6ad516594639441eeb81f289
 DIST hunt-1.5.tgz 99241 BLAKE2B df9092cdf6de0016ae5fe8d360a712eccd3c0f71bead3c93142ba2c3c421031cb5e6ff8c3b4782856286fd41a61e40a6453b48f240365ba88f6805bb3bbdd909 SHA512 b016f7ae0ac7568b4a5006b7c5e6f3e80df71a67d94a1e62afc46fb0f10cb661df7e3bff1f0229836a2247ef368dc2681ad955821e97cb6a91fcfe489b871a61
+DIST hunt_1.5-6.1.diff.gz 4556 BLAKE2B 74c27722ae61494ca922b013cc691c0e835d7cdcc01399aaf7fe9bc7da4532954c4da2023fc92e3a4f664bb2b5ab8ef22ff1c04694dc1ab7c205125ccea1ff84 SHA512 45ff3f977a32202d8ab9b7daa76a0ebb507d0b73d635c0f3649cf3b2bcb9fdc3094c9631d696dfaf27371bc5fb5eb62dbdc258795979755c7713a45357938a05
+DIST hunt_1.5.orig.tar.gz 99241 BLAKE2B df9092cdf6de0016ae5fe8d360a712eccd3c0f71bead3c93142ba2c3c421031cb5e6ff8c3b4782856286fd41a61e40a6453b48f240365ba88f6805bb3bbdd909 SHA512 b016f7ae0ac7568b4a5006b7c5e6f3e80df71a67d94a1e62afc46fb0f10cb661df7e3bff1f0229836a2247ef368dc2681ad955821e97cb6a91fcfe489b871a61
 EBUILD hunt-1.5-r1.ebuild 673 BLAKE2B 52bc3e41d1e9a0e49bf7d63a7e6b1d1f56e75d0143176a52d9fc4f3fbd6d5637f1d716bbe852945183cdee39ec3b9ba340f0c00afd84dea09290a0e6639f3601 SHA512 a9efe3c17f62afd6b7cec5f468f60494da5bce16dc2ef3a2af2cc93c27245ea5f67f1456ef3e3a76c21a894a65611b2640151c437aed8103cbb6c6a6f0e7f757
 EBUILD hunt-1.5-r3.ebuild 689 BLAKE2B 0504ac8d1999897fd5e0509d5c6e522df144fd0b258d63f165f57411332da7776b85fa6e1bfd64289b34e7cc88d1298315edb617131ebe5326beddffc19fdd9b SHA512 4e459769df7a4c42d1b2a269b01ca5ce51a47666ce73a4a983e62b27df284b9950e568a8b95c2c3ecd274ea3021499b37f8ba3673cc7a0134ce17a995c98a9f6
+EBUILD hunt-1.5_p6_p1.ebuild 1144 BLAKE2B d9194774128ad2151134216b39de45a55e31790e50c10adf028983bd41eff38211c493d4ea4dd04dd276cd780ce7caad363d4c4754ccfc8e3a62117a3a9579e0 SHA512 8aceb3a846a4f01f8611dcabdcd7517522878c8272f7431acc4b72a9a61372f6015be65f36090a378cc2c37ab80205e51578d66eeeff873ef4a9a6a487d1e494
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/hunt/files/hunt-1.5-gentoo.patch b/net-analyzer/hunt/files/hunt-1.5-gentoo.patch
new file mode 100644
index 000000000000..e0bcccae0aae
--- /dev/null
+++ b/net-analyzer/hunt/files/hunt-1.5-gentoo.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-Wall -O2 -g -D_REENTRANT -std=gnu89
++CFLAGS += -Wall -D_REENTRANT -std=gnu89
+ #CFLAGS+=-DSYNC_FAST
+ #CFLAGS+=-D_WITH_LINUX_KERNEL_HDR
+ 
+--- a/tpserv/Makefile
++++ b/tpserv/Makefile
+@@ -3,7 +3,7 @@
+ all: tpserv
+ 
+ tpserv: tpserv.o
+-	$(CC) -o $@ $< $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ clean:
+ 	rm -f *.o
diff --git a/net-analyzer/hunt/files/hunt-1.5-tpserv-log.patch b/net-analyzer/hunt/files/hunt-1.5-tpserv-log.patch
new file mode 100644
index 000000000000..2e50dfe04ec6
--- /dev/null
+++ b/net-analyzer/hunt/files/hunt-1.5-tpserv-log.patch
@@ -0,0 +1,100 @@
+--- a/tpserv/tpserv.c
++++ b/tpserv/tpserv.c
+@@ -55,7 +55,7 @@
+ 	return v1 > v2 ? v1 : v2;
+ }
+ 
+-static void log(int level, int pid, char *format, ...)
++static void hunt_log(int level, int pid, char *format, ...)
+ {
+ 	char buf[BUFSIZE];
+ 	va_list va;
+@@ -93,21 +93,21 @@
+ {
+ 	if (verbose <= 1)
+ 		return;
+-	log(LOG_DEBUG, pid, "read  %4d bytes %s", len, print_connection(from_addr, to_addr));
++	hunt_log(LOG_DEBUG, pid, "read  %4d bytes %s", len, print_connection(from_addr, to_addr));
+ }
+ 
+ static void print_write(int pid, struct sockaddr_in *from_addr, struct sockaddr_in *to_addr, int len)
+ {
+ 	if (verbose <= 1)
+ 		return;
+-	log(LOG_DEBUG, pid, "write %4d bytes %s", len, print_connection(from_addr, to_addr));
++	hunt_log(LOG_DEBUG, pid, "write %4d bytes %s", len, print_connection(from_addr, to_addr));
+ }
+ 
+ static void print_connect(int pid, struct sockaddr_in *from_addr, struct sockaddr_in *to_addr)
+ {
+ 	if (!verbose)
+ 		return;
+-	log(LOG_DEBUG, pid, "connect          %s", print_connection(from_addr, to_addr));
++	hunt_log(LOG_DEBUG, pid, "connect          %s", print_connection(from_addr, to_addr));
+ 
+ }
+ 
+@@ -115,7 +115,7 @@
+ {
+ 	if (!verbose)
+ 		return;
+-	log(LOG_DEBUG, pid, "disconnect       %s", print_connection(from_addr, to_addr));
++	hunt_log(LOG_DEBUG, pid, "disconnect       %s", print_connection(from_addr, to_addr));
+ }
+ 
+ #if 0
+@@ -154,17 +154,17 @@
+ 	int fd_remote;
+ 	
+ 	if ((fd_remote = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+-		log(LOG_ERR, pid, "socket failed %d:%s\n", errno, strerror(errno));
++		hunt_log(LOG_ERR, pid, "socket failed %d:%s\n", errno, strerror(errno));
+ 		exit(1);
+ 	}
+ 	to_addr_len = sizeof(*to_addr);
+ 	if (connect(fd_remote, to_addr, to_addr_len) < 0) {
+-		log(LOG_ERR, pid, "failed to connect to remote addr\n");
++		hunt_log(LOG_ERR, pid, "failed to connect to remote addr\n");
+ 		exit(1);
+ 	}
+ 	local_addr_len = sizeof(local_addr);
+ 	if (getsockname(fd_remote, (struct sockaddr *) &local_addr, &local_addr_len) < 0) {
+-		log(LOG_ERR, pid, "getpeername failed %d:%s\n", errno, strerror(errno));
++		hunt_log(LOG_ERR, pid, "getpeername failed %d:%s\n", errno, strerror(errno));
+ 		exit(1);
+ 	}
+ 
+@@ -214,13 +214,13 @@
+ 	to_addr_len = sizeof(to_addr);
+ 	memset(&to_addr, 0, sizeof(to_addr));
+ 	if (getsockname(fd, (struct sockaddr *) &to_addr, &to_addr_len) < 0) {
+-		log(LOG_ERR, pid, "getsockname failed %d:%s\n", errno, strerror(errno));
++		hunt_log(LOG_ERR, pid, "getsockname failed %d:%s\n", errno, strerror(errno));
+ 		exit(1);
+ 	}
+ 	from_addr_len = sizeof(from_addr);
+ 	memset(&from_addr, 0, sizeof(from_addr));
+ 	if (getpeername(fd, (struct sockaddr *) &from_addr, &from_addr_len) < 0) {
+-		log(LOG_ERR, pid, "getpeername failed %d:%s\n", errno, strerror(errno));
++		hunt_log(LOG_ERR, pid, "getpeername failed %d:%s\n", errno, strerror(errno));
+ 		exit(1);
+ 	}
+ 	print_connect(pid, &from_addr, &to_addr);
+@@ -328,7 +328,7 @@
+ 		openlog(prog_name, LOG_PID, LOG_DAEMON);
+ 	}
+ 	if (verbose)
+-		log(LOG_DEBUG, getpid(), "ready");
++		hunt_log(LOG_DEBUG, getpid(), "ready");
+ 
+ 	for (;;) {
+ 		clilen = sizeof(cliaddr);
+@@ -336,7 +336,7 @@
+ 			clifd = accept(lfd, (struct sockaddr *) &cliaddr, &clilen);
+ 		} while (clifd < 0 && errno == EINTR);
+ 		if (clifd < 0) {
+-			log(LOG_ERR, getpid(), "accept failed %d:%s", errno, strerror(errno));
++			hunt_log(LOG_ERR, getpid(), "accept failed %d:%s", errno, strerror(errno));
+ 			exit(1);
+ 		}
+ 		if ((child_pid = fork()) == 0) {
diff --git a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
new file mode 100644
index 000000000000..bdcca2f3eaf8
--- /dev/null
+++ b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol"
+HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-exit.patch
+	"${FILESDIR}"/${P/_p*}-gentoo.patch
+	"${FILESDIR}"/${P/_p*}-log2.patch
+	"${FILESDIR}"/${P/_p*}-tpserv-log.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	eapply "${WORKDIR}"/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff
+	default
+}
+
+src_configure() {
+	append-cppflags -DSYNC_FAST
+}
+
+src_compile() {
+	local target
+	for target in . tpserv; do
+		emake CC=$(tc-getCC) LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}"
+	done
+}
+
+src_install() {
+	dosbin hunt tpserv/tpserv tpsetup/transproxy
+	doman man/hunt.1
+	dodoc CHANGES README* TODO tpsetup/transproxy
+	newdoc debian/changelog debian.changelog
+}