commit: 1d1f3295d822b7abd5573073959e912f05adf9ae Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun May 10 14:20:48 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun May 10 14:21:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d1f3295
net-analyzer/thcrut: Fix building with CFLAGS=-fno-common - Respect CFLAGS - Remove unused declarations of ip_tcp_sync_addr Package-Manager: Portage-2.3.99, Repoman-2.3.22 Closes: https://bugs.gentoo.org/show_bug.cgi?id=722138 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch | 11 +++++++ .../thcrut/files/thcrut-1.2.5-fno-common.patch | 20 +++++++++++++ net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild | 35 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) 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 00000000000..0a6bcaf4ebc --- /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 00000000000..a934048f341 --- /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 00000000000..191ed447f47 --- /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 +}
