ettercap: Update to 0.8.3.1.

Builds again. Added a spearate package for the GTK ui.

Removed ettercap-NG, it's now obsoleted by the main ettercap package.

17 files changed, 193 insertions, 310 deletions

diff --git a/net/ettercap/DESCR b/net/ettercap/DESCR
index 4998a40ae20..e3b79705160 100644
--- a/net/ettercap/DESCR
+++ b/net/ettercap/DESCR
@@ -1,3 +1,4 @@
-Ettercap is a multipurpose sniffer/interceptor/logger for switched LAN. It
-supports active and passive dissection of many protocols (even ciphered ones)
-and includes many features for network and host analysis.
+Ettercap is a comprehensive suite for man in the middle attacks. It features
+sniffing of live connections, content filtering on the fly and many other
+interesting tricks. It supports active and passive dissection of many
+protocols and includes many features for network and host analysis.
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 7cf8e5b8e79..f1a552a5ab3 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,37 +1,12 @@
-# $NetBSD: Makefile,v 1.91 2020/08/17 20:19:44 leot Exp $
+# $NetBSD: Makefile,v 1.92 2021/03/06 11:20:56 nia Exp $
 
-DISTNAME=		ettercap-0.6.b
-PKGREVISION=		43
-CATEGORIES=		security net
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ettercap/}
+.include "Makefile.common"
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://ettercap.sourceforge.net/
-COMMENT=		Multipurpose sniffer/interceptor/logger for switched LAN
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Suite for man in the middle attacks
 
-BROKEN=			"Fails to build with OpenSSL 1.1"
+CONFLICTS+=	ettercap-gtk-[0-9]*
 
-CONFLICTS+=		ettercap-NG-[0-9]*
+CMAKE_ARGS+=	-DENABLE_GTK=OFF
 
-MAKE_JOBS_SAFE=		no
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-plugins
-CONFIGURE_ARGS+=	--enable-https
-
-.include "options.mk"
-
-# needs putwin()
-INCOMPAT_CURSES=	NetBSD-[0-4].*
-PTHREAD_OPTS+=		require
-PTHREAD_AUTO_VARS=	yes
-MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-
-BUILD_DIRS=		. plugins
-INSTALL_DIRS=		. plugins
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ettercap/Makefile.common b/net/ettercap/Makefile.common
new file mode 100644
index 00000000000..dff99309a00
--- /dev/null
+++ b/net/ettercap/Makefile.common
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile.common,v 1.1 2021/03/06 11:20:56 nia Exp $
+# used by net/ettercap/Makefile
+# used by net/ettercap-gtk/Makefile
+
+DISTNAME=	ettercap-0.8.3.1
+CATEGORIES=	net security
+MASTER_SITES=	${MASTER_SITE_GITHUB:=Ettercap/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+
+HOMEPAGE=	https://www.ettercap-project.org/
+LICENSE=	gnu-gpl-v2
+
+CONFLICTS+=	ettercap-NG-[0-9]*
+
+USE_CMAKE=	yes
+USE_TOOLS+=	bison flex pkg-config
+CONFIGURE_DIRS=	build
+CMAKE_ARG_PATH=	..
+
+TEST_TARGET=	test
+
+CMAKE_ARGS+=	-DENABLE_IPV6=ON
+CMAKE_ARGS+=	-DENABLE_TESTS=ON
+
+
+DISTINFO_FILE=	${.CURDIR}/../../net/ettercap/distinfo
+PATCHDIR=	${.CURDIR}/../../net/ettercap/patches
+
+pre-configure:
+	${MKDIR} ${WRKSRC}/build
+
+.include "../../devel/check/buildlink3.mk"
+BUILDLINK_DEPMETHOD.check?=	build # tests only
+.include "../../devel/libnet/buildlink3.mk"
+# It uses set_menu_spacing from libmenu which NetBSD curses doesn't have.
+.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../net/GeoIP/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
diff --git a/net/ettercap/PLIST b/net/ettercap/PLIST
index e1cbb6fadfe..fc5a6c3deda 100644
--- a/net/ettercap/PLIST
+++ b/net/ettercap/PLIST
@@ -1,68 +1,72 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:09:26 joerg Exp $
-lib/ettercap/ec_H00_lurker.so
-lib/ettercap/ec_H01_zaratan.so
-lib/ettercap/ec_H02_troll.so
-lib/ettercap/ec_H03_hydra1.so
-lib/ettercap/ec_H04_hydra2.so
-lib/ettercap/ec_H05_hydra3.so
-lib/ettercap/ec_H06_hydra4.so
-lib/ettercap/ec_H07_hydra5.so
-lib/ettercap/ec_H08_hydra6.so
-lib/ettercap/ec_H09_roper.so
-lib/ettercap/ec_H10_phantom.so
-lib/ettercap/ec_H12_giant1.so
-lib/ettercap/ec_H13_giant2.so
-lib/ettercap/ec_H20_dwarf.so
-lib/ettercap/ec_H30_thief.so
-lib/ettercap/ec_H99_dummy.so
-lib/ettercap/ec_arpcop.so
-lib/ettercap/ec_banshee.so
-lib/ettercap/ec_basilisk.so
-lib/ettercap/ec_beholder.so
-lib/ettercap/ec_confusion.so
+@comment $NetBSD: PLIST,v 1.6 2021/03/06 11:20:56 nia Exp $
+bin/ettercap
+bin/etterfilter
+bin/etterlog
+lib/ettercap/ec_arp_cop.so
+lib/ettercap/ec_autoadd.so
+lib/ettercap/ec_chk_poison.so
+lib/ettercap/ec_dns_spoof.so
+lib/ettercap/ec_dos_attack.so
 lib/ettercap/ec_dummy.so
-lib/ettercap/ec_golem.so
-lib/ettercap/ec_hunter.so
-lib/ettercap/ec_imp.so
-lib/ettercap/ec_lamia.so
-lib/ettercap/ec_leech.so
-lib/ettercap/ec_ooze.so
-lib/ettercap/ec_phantom.so
-lib/ettercap/ec_shadow.so
-lib/ettercap/ec_spectre.so
-lib/ettercap/ec_triton.so
+lib/ettercap/ec_find_conn.so
+lib/ettercap/ec_find_ettercap.so
+lib/ettercap/ec_find_ip.so
+lib/ettercap/ec_finger.so
+lib/ettercap/ec_finger_submit.so
+lib/ettercap/ec_fraggle_attack.so
+lib/ettercap/ec_gre_relay.so
+lib/ettercap/ec_gw_discover.so
+lib/ettercap/ec_isolate.so
+lib/ettercap/ec_krb5_downgrade.so
+lib/ettercap/ec_link_type.so
+lib/ettercap/ec_mdns_spoof.so
+lib/ettercap/ec_nbns_spoof.so
+lib/ettercap/ec_pptp_chapms1.so
+lib/ettercap/ec_pptp_clear.so
+lib/ettercap/ec_pptp_pap.so
+lib/ettercap/ec_pptp_reneg.so
+lib/ettercap/ec_rand_flood.so
+lib/ettercap/ec_remote_browser.so
+lib/ettercap/ec_reply_arp.so
+lib/ettercap/ec_repoison_arp.so
+lib/ettercap/ec_scan_poisoner.so
+lib/ettercap/ec_search_promisc.so
+lib/ettercap/ec_smb_clear.so
+lib/ettercap/ec_smb_down.so
+lib/ettercap/ec_smurf_attack.so
+lib/ettercap/ec_sslstrip.so
+lib/ettercap/ec_stp_mangler.so
+lib/libettercap-ui.so
+lib/libettercap-ui.so.0
+lib/libettercap-ui.so.${PKGVERSION}
+lib/libettercap.so
+lib/libettercap.so.0
+lib/libettercap.so.${PKGVERSION}
+man/man5/etter.conf.5
+man/man8/ettercap-pkexec.8
 man/man8/ettercap.8
-sbin/ettercap
-share/doc/ettercap/AUTHORS
-share/doc/ettercap/CHANGELOG
-share/doc/ettercap/COPYING
-share/doc/ettercap/HISTORY
-share/doc/ettercap/HYDRA.HOWTO
-share/doc/ettercap/INSTALL
-share/doc/ettercap/KNOWN-BUGS
-share/doc/ettercap/PORTINGS
-share/doc/ettercap/README
-share/doc/ettercap/README.PLUGINS
-share/doc/ettercap/README.WIN32
-share/doc/ettercap/ROPER.HOWTO
-share/doc/ettercap/THANKS
-share/doc/ettercap/TODO
-share/doc/ettercap/TODO.WIN32
-share/doc/ettercap/ZARATAN.HOWTO
-share/doc/ettercap/debug.txt
-share/doc/ettercap/errors.txt
-share/doc/ettercap/ettercap.fr.8.in
-share/doc/ettercap/threads.txt
+man/man8/ettercap_curses.8
+man/man8/ettercap_plugins.8
+man/man8/etterfilter.8
+man/man8/etterlog.8
 share/ettercap/AUTHORS
-share/ettercap/THANKS
-share/ettercap/etter.conf
-share/ettercap/etter.dns
+share/ettercap/LICENSE
+share/ettercap/etter.dns.examples
+share/ettercap/etter.fields
 share/ettercap/etter.filter
+share/ettercap/etter.filter.examples
+share/ettercap/etter.filter.kill
+share/ettercap/etter.filter.pcre
 share/ettercap/etter.filter.ssh
+share/ettercap/etter.finger.mac
+share/ettercap/etter.finger.os
+share/ettercap/etter.mdns.examples
 share/ettercap/etter.mime
-share/ettercap/etter.passive.os.fp
+share/ettercap/etter.services
 share/ettercap/etter.ssl.crt
-share/ettercap/lc-converter.c
-share/ettercap/mac-fingerprints
-share/ettercap/nmap-os-fingerprints
-share/ettercap/services
+share/ettercap/ettercap-small.png
+share/ettercap/ettercap.png
+share/ettercap/ettercap.svg
+share/ettercap/etterfilter.cnt
+share/ettercap/etterfilter.tbl
+share/ettercap/etterlog.dtd
diff --git a/net/ettercap/distinfo b/net/ettercap/distinfo
index 42733e57281..e0d15126a78 100644
--- a/net/ettercap/distinfo
+++ b/net/ettercap/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.17 2016/03/29 21:59:15 khorben Exp $
+$NetBSD: distinfo,v 1.18 2021/03/06 11:20:56 nia Exp $
 
-SHA1 (ettercap-0.6.b.tar.gz) = 8cc1bbfe61e894620deef74cff0b8ca5a0b9e628
-RMD160 (ettercap-0.6.b.tar.gz) = 05240616b98fdf1c4486837c6b8ff716188ab48b
-SHA512 (ettercap-0.6.b.tar.gz) = 2edb41f3d600665ac6b206cf58bbc7ef2c1534a470c3198c620b0390fa2c42297aaf1939dce1eee6caf321b7fa4d9a5125960ae9493b156916d3ff2d8dfabade
-Size (ettercap-0.6.b.tar.gz) = 689038 bytes
-SHA1 (patch-aa) = 730e78b97746dc9f4fc4efca99bd3eaf124bf614
-SHA1 (patch-ab) = 107ef5dda9457313d7d939745a6a21dbe2b989ce
-SHA1 (patch-ac) = 6771b96f36fa9439b0edf79e632f0d2f1125eecd
-SHA1 (patch-ad) = c7f997876c5b76fff77f70280f5b5fe523778abf
-SHA1 (patch-ae) = 58ea3d1500fb5f1c4b38ec795b884cfb2dd0ab42
-SHA1 (patch-af) = 27d9d6ca720758d68ef5e091140e8dfa5156e3ed
-SHA1 (patch-ag) = 2051a8c8e3ae0e246cbccd37cea355615a6ac677
-SHA1 (patch-src_ec__grell.c) = e70bafabfd95e7079d1d975a651fb5a6a2cdc5fc
+SHA1 (ettercap-0.8.3.1.tar.gz) = 9185c59883c8d128b852233c9aa0ae46f772d170
+RMD160 (ettercap-0.8.3.1.tar.gz) = 9f32f9320dd8369d7b58b9c07dcb89618d45e9ad
+SHA512 (ettercap-0.8.3.1.tar.gz) = 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5
+Size (ettercap-0.8.3.1.tar.gz) = 6678653 bytes
+SHA1 (patch-CMakeLists.txt) = f14a4c529631897bf5120be395a0111a639cda84
+SHA1 (patch-cmake_Modules_EttercapLibCheck.cmake) = 4d5d523735b64cf06d13fa4eb177d16553a9f8f3
diff --git a/net/ettercap/hacks.mk b/net/ettercap/hacks.mk
deleted file mode 100644
index a8294966a4b..00000000000
--- a/net/ettercap/hacks.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2004/12/15 17:13:17 jlam Exp $
-
-### [Wed Dec 15 12:06:48 EST 2004 : jlam]
-### On alpha, GCC-2.95.x gives a compiler error when building
-### src/ec_inet.c and src/ec_logtofile.c.  Simply require GCC>=3.0 to
-### avoid this problem.
-###
-.if ${MACHINE_ARCH} == "alpha"
-PKG_HACKS+=	gcc2-alpha-optimization
-GCC_REQD+=	3.0
-.endif
diff --git a/net/ettercap/options.mk b/net/ettercap/options.mk
deleted file mode 100644
index 2e20afee9ca..00000000000
--- a/net/ettercap/options.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2005/11/19 14:28:50 rillig Exp $
-#
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.ettercap
-PKG_SUPPORTED_OPTIONS=	gtk
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtk)
-CONFIGURE_ARGS+=	--enable-gtk
-.include "../../x11/gtk2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-gtk
-.endif
diff --git a/net/ettercap/patches/patch-CMakeLists.txt b/net/ettercap/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..77f812ed3c3
--- /dev/null
+++ b/net/ettercap/patches/patch-CMakeLists.txt
@@ -0,0 +1,37 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2021/03/06 11:20:56 nia Exp $
+
+- Don't set CMAKE_LIBRARY_PATH.
+- Use policykit everywhere it makes sense.
+- Honour man pages path from environment.
+
+--- CMakeLists.txt.orig	2020-08-01 14:32:06.000000000 +0000
++++ CMakeLists.txt
+@@ -90,10 +90,6 @@ include(EttercapOSTest)
+ #Check and see if we're running Darwin, specify the CMAKE_LIBARY_PATH to do so
+ if(OS_DARWIN)
+   set(CMAKE_SYSTEM_NAME Darwin)
+-  set(CMAKE_LIBRARY_PATH ${SPECIAL_LIB_DIR}/lib ${CMAKE_LIBRARY_PATH})
+-  set(CMAKE_INCLUDE_PATH ${SPECIAL_LIB_DIR}/include ${CMAKE_INCLUDE_PATH})
+-else()
+-  set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /usr/lib64 /usr/lib32)
+ endif()
+ 
+ if(LIBRARY_BUILD)
+@@ -112,7 +108,7 @@ set(INSTALL_LIBDIR ${INSTALL_PREFIX}/lib
+ set(INSTALL_DATADIR ${INSTALL_PREFIX}/share CACHE PATH "Data installation directory")
+ set(INSTALL_EXECPREFIX ${INSTALL_PREFIX} CACHE PATH "")
+ set(INSTALL_BINDIR  ${INSTALL_PREFIX}/bin CACHE PATH "Binary files installation directory")
+-if(OS_DARWIN OR OS_BSD_FREE OR OS_WINDOWS)
++if(NOT OS_LINUX)
+   set(POLKIT_DIR ${INSTALL_PREFIX}/share/polkit-1/actions/ CACHE PATH "Polkit installation directory")
+ else()
+ #at least on ubuntu, polkit dir couldn't be /usr/local/share, but should be /usr/share
+@@ -122,7 +118,7 @@ set(PKEXEC_INSTALL_WRAPPER org.pkexec.et
+ set(DESKTOP_DIR ${INSTALL_PREFIX}/share/applications/ CACHE PATH "Desktop file installation directory")
+ set(METAINFO_DIR ${INSTALL_PREFIX}/share/metainfo/ CACHE PATH "Metainfo file installation directory")
+ set(ICON_DIR ${INSTALL_PREFIX}/share/pixmaps CACHE PATH "Icon file installation directory")
+-set(MAN_INSTALLDIR ${INSTALL_PREFIX}/share/man CACHE PATH "Path for manual pages")
++set(MAN_INSTALLDIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Path for manual pages")
+ 
+ if(NOT DISABLE_RPATH)
+   # Ensure that, when we link to stuff outside of our build path, we include the
diff --git a/net/ettercap/patches/patch-aa b/net/ettercap/patches/patch-aa
deleted file mode 100644
index 3a698336e9b..00000000000
--- a/net/ettercap/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/12/15 17:13:17 jlam Exp $
-
---- Makefile.in.orig	Wed Jan 22 10:00:38 2003
-+++ Makefile.in	Sun Feb  9 18:09:08 2003
-@@ -30,5 +30,5 @@
- DEBUG    = @DEBUG@
- CFLAG    = @E_CFLAGS@
--COPTS    = -I. -Isrc/include @COPTS@ @GTK_CFLAGS@
-+COPTS    = -I. -Isrc/include -I${prefix}/include @COPTS@ @GTK_CFLAGS@
- 
- PROG     = @PROG@
diff --git a/net/ettercap/patches/patch-ab b/net/ettercap/patches/patch-ab
deleted file mode 100644
index b1ed3b1a2d6..00000000000
--- a/net/ettercap/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/11/06 19:13:29 atatat Exp $
-
-It seems that when kqueue was merged to the trunk, sys/select.h
-was altered to include sys/queue.h, which supplies a pile of macros
-and defines _SYS_QUEUE_H_.  Prior to this change, ettercap was able
-to pull in its own ec_queue.h file to define these macros (and the
-missing ones below) and also define _SYS_QUEUE_H_.  The two macros
-listed below are not in our definition of the macros, so we define
-them manually later, if they're not defined by the include files.
-
---- src/include/ec_main.h.orig	Mon Nov  4 14:45:27 2002
-+++ src/include/ec_main.h
-@@ -44,6 +44,19 @@
- 
- #include "ec_stdint.h"
- 
-+#ifndef LIST_REPLACE
-+#define LIST_REPLACE(elm, elm2, field) do {				\
-+	if (((elm2)->field.le_next = (elm)->field.le_next) != NULL)	\
-+		(elm2)->field.le_next->field.le_prev =			\
-+		    &(elm2)->field.le_next;				\
-+	(elm2)->field.le_prev = (elm)->field.le_prev;			\
-+	*(elm2)->field.le_prev = (elm2);				\
-+} while (0)
-+#endif /* !defined(LIST_REPLACE) */
-+
-+#ifndef LIST_END
-+#define LIST_END(head) NULL
-+#endif /* !defined(LIST_END) */
- 
- #ifdef HAVE_PDCURSES
-    #undef MOUSE_MOVED
diff --git a/net/ettercap/patches/patch-ac b/net/ettercap/patches/patch-ac
deleted file mode 100644
index bcb929026d4..00000000000
--- a/net/ettercap/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/01/30 10:46:57 drochner Exp $
-
---- plugins/Makefile.in.orig	Mon Oct 28 16:02:14 2002
-+++ plugins/Makefile.in	Tue Jan 28 12:19:57 2003
-@@ -10,10 +10,10 @@
- 
- plugins:
- 	for plug in $(PLUGINS); do \
--	make -C $$plug; \
-+	( cd $$plug; ${MAKE} ) \
- 	done
- 
--install: plugins
-+install:
- 	for plug in $(PLUGINS); do \
- 	$(INSTALL) -d $(DESTDIR)$(PLUGDIR) ; \
- 	$(INSTALL) -m 700 ./$$plug/ec_$$plug.so $(DESTDIR)$(PLUGDIR) ; \
diff --git a/net/ettercap/patches/patch-ad b/net/ettercap/patches/patch-ad
deleted file mode 100644
index 1c6620b5b43..00000000000
--- a/net/ettercap/patches/patch-ad
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/06/07 10:42:27 jmmv Exp $
-
---- src/ec_illithid.c.orig	2002-09-06 10:57:31.000000000 +0200
-+++ src/ec_illithid.c
-@@ -87,8 +87,8 @@ int illithid_gwip;
- int illithid_buffer = -1;
- pthread_t decoder_pid;
- 
--pthread_mutex_t decoder_mtx = PTHREAD_MUTEX_INITIALIZER;
--pthread_cond_t decoder_cond = PTHREAD_COND_INITIALIZER;
-+pthread_mutex_t decoder_mtx;
-+pthread_cond_t decoder_cond;
- 
- // protos...
- 
-@@ -117,6 +117,11 @@ void * Illithid_Decoder(void *dummy)    
- 
-    DEBUG_MSG("Illithid_Decoder -- running");
- 
-+   pthread_mutex_init(&decoder_mtx, NULL);
-+   pthread_cond_init(&decoder_cond, NULL);
-+
-+   pthread_mutex_lock(&decoder_mtx);
-+
-    LOOP {
-       pthread_testcancel();
- 
-@@ -1110,6 +1115,9 @@ void Illithid_Reset_Conn(void *dummy)
-       hash_table[j] = 0;
-    }
- 
-+   pthread_mutex_lock(&decoder_mtx);
-+   pthread_mutex_unlock(&decoder_mtx);
-+
-    ECThread_destroy(decoder_pid);
- 
-    Buffer_Flush(illithid_buffer);
diff --git a/net/ettercap/patches/patch-ae b/net/ettercap/patches/patch-ae
deleted file mode 100644
index 67b150f7f36..00000000000
--- a/net/ettercap/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/07/14 11:42:14 jmmv Exp $
-
---- src/OS/BSD/ec_inet_BSD.c.orig	2002-06-12 18:19:35.000000000 +0200
-+++ src/OS/BSD/ec_inet_BSD.c
-@@ -34,8 +34,8 @@
- #include <sys/ioctl.h>
- #include <fcntl.h>
- 
--#include <sys/sysctl.h>
- #include <sys/param.h>
-+#include <sys/sysctl.h>
- #include <sys/timeb.h>
- #include <sys/file.h>
- #include <sys/ioctl.h>
diff --git a/net/ettercap/patches/patch-af b/net/ettercap/patches/patch-af
deleted file mode 100644
index 49e5f15680f..00000000000
--- a/net/ettercap/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.4 2004/12/15 16:17:59 jlam Exp $
-
---- src/ec_dissector_ssh.c.orig	2003-07-10 04:25:32.000000000 -0400
-+++ src/ec_dissector_ssh.c
-@@ -37,6 +37,7 @@
-    #define NS_PUT32 PUTLONG
- #endif
- 
-+#include <openssl/des.h>
- #include <openssl/ssl.h>
- #include <openssl/rand.h>
- #include <ctype.h>
diff --git a/net/ettercap/patches/patch-ag b/net/ettercap/patches/patch-ag
deleted file mode 100644
index 755277feab4..00000000000
--- a/net/ettercap/patches/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/02/24 20:39:42 joerg Exp $
-
---- configure.orig	2006-02-24 20:34:34.000000000 +0000
-+++ configure
-@@ -1497,6 +1497,13 @@ echo "$as_me: WARNING: *****************
-    OS=FREEBSD
-    OS_OPT=
-    ;;
-+
-+*dragonfly*)
-+   LL_SOURCE=./src/OS/BSD/ec_inet_BSD.c
-+   SED_LL_OBJ_DEPEND="s/ec_inet_BSD.o/OS\/BSD\/ec_inet_BSD.o/g"
-+   OS=DRAGONFLY
-+   OS_OPT=
-+   ;;
- *netbsd*)
-    LL_SOURCE=./src/OS/BSD/ec_inet_BSD.c
-    SED_LL_OBJ_DEPEND="s/ec_inet_BSD.o/OS\/BSD\/ec_inet_BSD.o/g"
-@@ -3302,7 +3309,7 @@ fi
- 
- 
- 
--if test "$OS" = "FREEBSD" -o "$OS" = "OPENBSD" -o "$OS" = "NETBSD" -o "$OS" = "MACOSX"; then
-+if test "$OS" = "FREEBSD" -o "$OS" = "OPENBSD" -o "$OS" = "NETBSD" -o "$OS" = "MACOSX" -o "$OS" = "DRAGONFLY"; then
- 
-    echo "$as_me:$LINENO: checking link-layer packet interface" >&5
- echo $ECHO_N "checking link-layer packet interface... $ECHO_C" >&6
-@@ -10251,7 +10258,7 @@ else
-       echo "$as_me:$LINENO: result: NOT available on this OS" >&5
- echo "${ECHO_T}NOT available on this OS" >&6
-       ac_cv_ec_https=no
--   elif test "$OS" = "OPENBSD" -o "$OS" = "FREEBSD" -o "$OS" = "NETBSD"; then
-+   elif test "$OS" = "OPENBSD" -o "$OS" = "FREEBSD" -o "$OS" = "NETBSD" -o "$OS" = "DRAGONFLY"; then
-       echo "$as_me:$LINENO: result: no." >&5
- echo "${ECHO_T}no." >&6
-       ac_cv_ec_https=no
diff --git a/net/ettercap/patches/patch-cmake_Modules_EttercapLibCheck.cmake b/net/ettercap/patches/patch-cmake_Modules_EttercapLibCheck.cmake
new file mode 100644
index 00000000000..2555e610f94
--- /dev/null
+++ b/net/ettercap/patches/patch-cmake_Modules_EttercapLibCheck.cmake
@@ -0,0 +1,33 @@
+$NetBSD: patch-cmake_Modules_EttercapLibCheck.cmake,v 1.1 2021/03/06 11:20:56 nia Exp $
+
+Just use pkg-config to find GTK3 rather than a custom hellfire that checks
+30 system directories but nothing used by pkgsrc.
+
+--- cmake/Modules/EttercapLibCheck.cmake.orig	2020-08-01 14:32:06.000000000 +0000
++++ cmake/Modules/EttercapLibCheck.cmake
+@@ -45,24 +45,9 @@ if(ENABLE_GTK)
+     unset(contains_valid)
+     if(GTK_BUILD_TYPE STREQUAL GTK3)
+         set(GTK3_FIND_VERSION 1)
+-        find_package(GTK3 3.12.0)
++	pkg_check_modules (GTK3 gtk+-3.0)
+         if(GTK3_FOUND)
+           set(HAVE_GTK3 1)
+-        else()
+-            # give it another try but only in GTK3 compatibility mode
+-            find_package(GTK3 REQUIRED)
+-            if(GTK3_FOUND)
+-              message("\n\
+-Your version of GTK3 (${GTK3_VERSION}) is not \
+-sufficient for full GTK3 support.\n\
+-Full support requires >= 3.12.\n\
+-Building in GTK3 compatibility mode.\n")
+-              set(HAVE_GTK3COMPAT 1)
+-            else()
+-              message(FATAL_ERROR
+-"You choose to build against GTK3.\
+-Please install it, or build against GTK1")
+-            endif()
+         endif()
+         set(EC_INTERFACES_LIBS ${EC_INTERFACES_LIBS} ${GTK3_LIBRARIES})
+         set(EC_INCLUDE ${EC_INCLUDE} ${GTK3_INCLUDE_DIRS})
diff --git a/net/ettercap/patches/patch-src_ec__grell.c b/net/ettercap/patches/patch-src_ec__grell.c
deleted file mode 100644
index 21005124193..00000000000
--- a/net/ettercap/patches/patch-src_ec__grell.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_ec__grell.c,v 1.1 2016/03/29 21:59:15 khorben Exp $
-
---- src/ec_grell.c.orig	2003-07-10 08:59:09.000000000 +0000
-+++ src/ec_grell.c
-@@ -447,11 +447,13 @@ static int server_init(char *buf, size_t
- 
-       if (SSL_connect(son_data->ssl_server)!=1)
-       {
-+#ifndef OPENSSL_NO_SSL2
-          son_data->ssl_ctx_server = SSL_CTX_new(SSLv2_client_method());
-          son_data->ssl_server = SSL_new(son_data->ssl_ctx_server);
-          SSL_set_connect_state(son_data->ssl_server);
-          SSL_set_fd(son_data->ssl_server, son_data->server_fd);
-          if (SSL_connect(son_data->ssl_server)!=1)
-+#endif
-          {
-             son_data->ssl_ctx_server = SSL_CTX_new(TLSv1_client_method());
-             son_data->ssl_server = SSL_new(son_data->ssl_ctx_server);