gentoo resync : 14.05.2020

4 files changed, 69 insertions, 0 deletions

diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest
index 5b04916ae0e5..961a37d26036 100644
--- a/net-analyzer/thcrut/Manifest
+++ b/net-analyzer/thcrut/Manifest
@@ -1,5 +1,8 @@
 AUX thcrut-1.2.5-configure.patch 2088 BLAKE2B 413e67d125ac4dcf086b06a63519d79d4d049ee6d94455f20a74c02a1ef9a2c8c9be99a268febe14ae2eab6c7a7c4d61a9861d2b6c4cd71f4ba5067ffb4b9c1e SHA512 0d3e77959f534d3231037c0cb71e602842f19dbbf33864100b854931ceb3b47c95017dc84f5f6b557562c338864f8809e20f96ff7f7fa88dafb930a443056d3a
+AUX thcrut-1.2.5-flags.patch 246 BLAKE2B ab0cc5cc76bc4635e68d0c7ca5f4d1f9595c308fee387d0579107be9a295c88e100f6a2157b9503dff5185ac1a2d270cc116230645491535436fbd94d3e337f2 SHA512 4ebfafb9f9d9610b1ed695ca471f5a5284d06069db7a9635bdf29a72032c052f8e60688853048ee7ef90c2c99c3e34a4dcce0b88d2f1e1716a1a4ec3411578d6
+AUX thcrut-1.2.5-fno-common.patch 480 BLAKE2B 745161f671fa666661064b5ad62808ed561be1e4d0ba3d533ee3f67d0d27c8bba821ff966d2fdb5d37e4ea1a4a059b437f99b09be5e5a792ec2937ab99bb67a0 SHA512 c238316e56a225633a5665199c392916dfb6fedbe53f3d1bb763d39c318db753a16b6b91250ff0a93041f4f0e7b55669095431f852c97b7a90cfb65bb4dafe17
 AUX thcrut-1.2.5-libnet.patch 1344 BLAKE2B 1b996af83b2db43dbf1528e3de7fcfc20397b4a1d5f4a033e506e5567c40d639fb0734f86d5cf26cca59ca833d85174b58bd8ff893635c76345e217f0b92773f SHA512 412f925820c3aab4333ee56d7a0d697ebd278225cd90cf0e7abe5edae363faa95c3ff450b5311ddb05e12b2839b99a850a4a7f1a0cc7ce51c6c53c1c56874b07
 DIST thcrut-1.2.5.tar.gz 660673 BLAKE2B b57d2f15a4190880b135c2631a377f7136f56764d16a5fcd367b72d2cb33313a5c3651bd9f8558eb7b12a630de45674ab8d7c279dd3c0b57a2a8a2407dce33be SHA512 954f7512bd3e3937796cc065612214ae7d17f70175305ee66951a4e4dc2fcd83c7b15c690f429c7642c9951c2219f86a045418a77e42e3e4a54deac2ae0c46ab
 EBUILD thcrut-1.2.5-r1.ebuild 634 BLAKE2B 8c7de5db26feaf3e6f53cbfd01a90d6daabd79e776d247f697408f317859ba9e79eb16429d04c94f3fcf883928379c16f508687f79e51af733cd6243540d2ac8 SHA512 c92ed1665bcc1a909f8b9366ec8a411160c7a2c43423b47d57e2ee9f88862df18c5d2315b447ebcd44c8c98825127ed708954d8bd4cbb44eeda96156450a346d
+EBUILD thcrut-1.2.5-r2.ebuild 725 BLAKE2B 54412f5d079e49dc9626110a3656dba6b4a248e91cfe751a14a2c76b2b971014815d8ea0023172439d6df25e264ca7ebc9b518bafde3db546644be31782ffafd SHA512 0291295d555bb457157088f48f1ebc04607720b585e6b54051737e97c1f40baba6a99b653be4a6cc620833d7f474147ba6badcdc79db9a9b481942b052d7f5a4
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch
new file mode 100644
index 000000000000..0a6bcaf4ebce
--- /dev/null
+++ b/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -23,7 +23,7 @@
+ dnl
+ dnl Use these compiler flags if we have gcc.
+ dnl
+-if test $ac_cv_prog_gcc = yes; then
++if test $ac_cv_prog_gcc_not_on_gentoo = yes; then
+   CCOPTS='-O2 -Wall'
+   CFLAGS="$CCOPTS"
+ fi
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch
new file mode 100644
index 000000000000..a934048f341e
--- /dev/null
+++ b/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/discover_dispatch.c
++++ b/src/discover_dispatch.c
+@@ -81,7 +81,6 @@
+ 
+ unsigned short ip_tcp_sync_chksum;
+ unsigned short ip_tcp_fp_chksum;
+-struct sockaddr_in ip_tcp_sync_addr;
+ static dispatch_func_recv_t dispatch_funcs[] = {
+ 	dis_recvdummy,
+ 	dis_recv,
+--- a/src/discover_main.c
++++ b/src/discover_main.c
+@@ -22,7 +22,6 @@
+ extern struct _opt opt;
+ extern char ip_tcp_sync[];
+ 
+-struct sockaddr_in ip_tcp_sync_addr;
+ int rawsox;
+ 
+ #define DFL_HOSTS_PARALLEL	(5000)
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
new file mode 100644
index 000000000000..191ed447f475
--- /dev/null
+++ b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Network discovery and fingerprinting tool"
+HOMEPAGE="http://www.thc.org/thc-rut/"
+SRC_URI="http://www.thc.org/thc-rut/${P}.tar.gz"
+
+LICENSE="free-noncomm PCRE GPL-1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	dev-libs/libpcre
+	net-libs/libnet:1.0
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( ChangeLog FAQ README TODO thcrutlogo.txt )
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-libnet.patch
+)
+
+src_prepare() {
+	rm -r Libnet-1.0.2a pcre-3.9 || die
+	default
+	eautoreconf
+}