commit: 02ab4e02e3d0380754f7cc7441d7737adb25680e Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Tue Dec 20 13:55:53 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Tue Dec 20 14:25:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ab4e02
net-analyzer/thcrut: treeclean Closes: https://bugs.gentoo.org/731154 Closes: https://bugs.gentoo.org/861263 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> net-analyzer/thcrut/Manifest | 1 - .../thcrut/files/thcrut-1.2.5-configure.patch | 42 -------------- net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch | 11 ---- .../thcrut/files/thcrut-1.2.5-fno-common.patch | 20 ------- .../thcrut/files/thcrut-1.2.5-libnet.patch | 65 ---------------------- net-analyzer/thcrut/metadata.xml | 11 ---- net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild | 35 ------------ profiles/package.mask | 1 - 8 files changed, 186 deletions(-) diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest deleted file mode 100644 index 2c53d56971d0..000000000000 --- a/net-analyzer/thcrut/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST thcrut-1.2.5.tar.gz 667929 BLAKE2B c7b5f252006ab06a6886efe82a6d9438df3fe3c61b277bc725f2d8a7ba7f86488b89e0254dfa53f16b5f14f9e0f58bb247e6697db10f1e5e87625322ae633ae4 SHA512 cbef051f0e668e57e13cd3435c109c01aac66a31d5c7a6a1b60a7767fb740d50489c9caefeb8a188d803d5ee3a22e5b7cedf425462a9424ace2dbc2dfe0dda39 diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch deleted file mode 100644 index daa069e22afd..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -153,10 +153,8 @@ - dnl libnet_init_packet only available in < libnet-1.1.x - dnl AC_CHECK_LIB(net, libnet_init_packet,, AC_MSG_ERROR(We need libnet. - dnl Get libnet from http://www.packetfactory.net or try --with-[[libs,includes]]=DIR)) --AC_CHECK_LIB(net, libnet_init_packet, [NET=yes], [NET=no]) -+AC_CHECK_LIB(net-1.0, libnet_init_packet, [NET=yes], [NET=no]) - if test x"$NET" = x"no" -o x"$DIST" = x"yes"; then -- AC_CONFIG_SUBDIRS(Libnet-1.0.2a) -- THCRUT_SUBDIRS="$THCRUT_SUBDIRS Libnet-1.0.2a" - CPPFLAGS="-I../Libnet-1.0.2a/include ${CPPFLAGS}" - LDFLAGS="-L../Libnet-1.0.2a/src ${LDFLAGS}" - PRG_LIBNET_CONFIG_CFLAGS="../Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '" -@@ -164,14 +162,12 @@ - dnl CFLAGS="`${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" - dnl LIBS="`${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS" - else -- CFLAGS="`libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" -- LIBS="`libnet-config --libs` $LIBS" -+ CFLAGS="`libnet-1.0-config --cflags --defines | tr '\n' ' '` $CFLAGS" -+ LIBS="`libnet-1.0-config --libs` $LIBS" - fi - - AC_CHECK_LIB(pcre, pcre_compile, [PCRE=yes], [PCRE=no]) - if test x"$PCRE" = x"no" -o x"$DIST" = x"yes"; then -- AC_CONFIG_SUBDIRS(pcre-3.9) -- THCRUT_SUBDIRS="$THCRUT_SUBDIRS pcre-3.9" - CPPFLAGS="-I../pcre-3.9 ${CPPFLAGS}" - LDFLAGS="-L../pcre-3.9 ${LDFLAGS}" - PRG_PCRE_CONFIG_CFLAGS="../pcre-3.9/pcre-config --cflags" -@@ -199,8 +195,8 @@ - AC_OUTPUT(Makefile src/Makefile) - - dnl Just to show the correct values... --CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" --LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS" -+CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" -+LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `libnet-config --libs` $LIBS" - - echo "THCrut has been configured with the following options:" - echo " User binaries: $B" diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch deleted file mode 100644 index 0a6bcaf4ebce..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index a934048f341e..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/files/thcrut-1.2.5-libnet.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch deleted file mode 100644 index 87488c8c5196..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/src/arp_main.c -+++ b/src/arp_main.c -@@ -18 +18 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/arpg.c -+++ b/src/arpg.c -@@ -12 +12 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/dhcp_main.c -+++ b/src/dhcp_main.c -@@ -14 +14 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/discover_dispatch.c -+++ b/src/discover_dispatch.c -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/discover_main.c -+++ b/src/discover_main.c -@@ -8 +8 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/fp.h -+++ b/src/fp.h -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/icmp_main.c -+++ b/src/icmp_main.c -@@ -14 +14 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/network_raw.c -+++ b/src/network_raw.c -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/packets.c -+++ b/src/packets.c -@@ -6 +6 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut.c -+++ b/src/thcrut.c -@@ -87 +87 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut.h -+++ b/src/thcrut.h -@@ -7 +7 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut_libnet.c -+++ b/src/thcrut_libnet.c -@@ -5 +5 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut_libnet.h -+++ b/src/thcrut_libnet.h -@@ -5 +5 @@ --#include <libnet.h> -+#include <libnet-1.0.h> diff --git a/net-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml deleted file mode 100644 index 1e77e950754e..000000000000 --- a/net-analyzer/thcrut/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="github">hackerschoice/thc-rut</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild deleted file mode 100644 index 0e41e8ac8281..000000000000 --- a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# 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="https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/${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 -} diff --git a/profiles/package.mask b/profiles/package.mask index 6b11975f9f64..a21a8e7e5648 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -661,7 +661,6 @@ net-misc/python-x2go net-libs/libnet:1.0 net-analyzer/angst net-analyzer/egressor -net-analyzer/thcrut # Jonas Stein <[email protected]> (2022-11-13) # Dead upstream
