From a8dbeedeee1aaef8a6c80770904c799ef7cc3026 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 9 Jun 2026 13:44:08 +0000 Subject: [PATCH] update to ettercap-0.8.4.1 switches gui mode to gtk+3 which at least works slightly, whereas the gtk+2 support in the previous version wasn't working at all. disable curses mode for now, it's extremely crashy. plaintext and gui do at least do _something_ partly useful. --- net/ettercap/Makefile | 45 ++++++++----------- net/ettercap/distinfo | 4 +- net/ettercap/patches/patch-CMakeLists_txt | 13 +++++- .../patch-cmake_Modules_FindLIBNET_cmake | 17 ------- net/ettercap/patches/patch-man_ettercap_8_in | 2 +- .../patch-plug-ins_dns_spoof_dns_spoof_c | 44 +++++++++--------- .../patch-plug-ins_mdns_spoof_mdns_spoof_c | 26 +++++------ .../patch-plug-ins_sslstrip_sslstrip_c | 14 ------ .../patches/patch-share_CMakeLists_txt | 12 +++++ net/ettercap/patches/patch-src_ec_sslwrap_c | 12 ++--- net/ettercap/pkg/PFRAG.no-no_x11 | 6 ++- net/ettercap/pkg/PLIST | 1 - 12 files changed, 87 insertions(+), 109 deletions(-) delete mode 100644 net/ettercap/patches/patch-cmake_Modules_FindLIBNET_cmake delete mode 100644 net/ettercap/patches/patch-plug-ins_sslstrip_sslstrip_c create mode 100644 net/ettercap/patches/patch-share_CMakeLists_txt diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index a616e6dd736..f5afa40dac7 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -3,11 +3,10 @@ SHARED_LIBS += ettercap-ui 0.0 COMMENT= multi-purpose sniffer/interceptor/logger -V= 0.8.3.1 +V= 0.8.4.1 DISTNAME= ettercap-$V CATEGORIES= net SITES= https://github.com/Ettercap/ettercap/releases/download/v$V/ -REVISION= 0 HOMEPAGE= https://www.ettercap-project.org/ @@ -15,18 +14,18 @@ HOMEPAGE= https://www.ettercap-project.org/ PERMIT_PACKAGE= Yes WANTLIB += c crypto curl curses form iconv lib/libnet-1.1/net=11 menu -WANTLIB += panel pcap pcre pthread ssl z +WANTLIB += panel pcap pcre2-8 pthread ssl z MODULES= devel/cmake DEBUG_PACKAGES= ${BUILD_PACKAGES} DPB_PROPERTIES= parallel -BUILD_DEPENDS+= devel/bison +BUILD_DEPENDS= devel/bison LIB_DEPENDS= net/libnet/1.1 \ net/curl \ converters/libiconv \ - devel/pcre + devel/pcre2 FLAVORS= no_x11 FLAVOR?= @@ -37,35 +36,29 @@ FLAVOR?= # can't be used because it introduces other errors, and, more # importantly, because using those NS_* macros in src/ec_inet.c is just # wrong. -CFLAGS+= -DNS_IN6ADDRSZ=16 -DNS_INT16SZ=2 - -CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS+= -DMAN_INSTALLDIR="${TRUEPREFIX}/man" \ +CFLAGS += -DNS_IN6ADDRSZ=16 -DNS_INT16SZ=2 \ + -I${LOCALBASE}/include +CONFIGURE_ARGS= -DMAN_INSTALLDIR="${TRUEPREFIX}/man" \ -DENABLE_GEOIP=off \ - -DBUNDLED_LIBS=off + -DBUNDLED_LIBS=off \ + -DENABLE_IPV6=on \ + -DINSTALL_SYSCONFDIR=${SYSCONFDIR} -MODCMAKE_POLICY_VERSION_OVERRIDE = Yes +# seems extremely crashy (use after free, etc) in curses mode +# whereas plaintext/gtk are not quite as bad +CONFIGURE_ARGS += -DENABLE_CURSES=off .if ${FLAVOR:Mno_x11} -CONFIGURE_ARGS+= -DENABLE_GTK=off +CONFIGURE_ARGS += -DENABLE_GTK=off .else -RUN_DEPENDS+= devel/desktop-file-utils \ +RUN_DEPENDS += devel/desktop-file-utils \ x11/gtk+4,-guic -CONFIGURE_ARGS+= -DGTK_BUILD_TYPE=GTK2 -# when built with gtk3, it fails at runtime with: -# gtk_list_store_get_value: assertion 'iter_is_valid (iter, list_store)' failed -#LIB_DEPENDS+= x11/gtk+3 -#WANTLIB += atk-1.0 cairo freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 -#WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 gtk-3 pango-1.0 -LIB_DEPENDS+= x11/gtk+2 -WANTLIB += atk-1.0 cairo gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pangoxft-1.0 +CONFIGURE_ARGS += -DGTK_BUILD_TYPE=GTK3 +LIB_DEPENDS += x11/gtk+3 +WANTLIB += atk-1.0 cairo freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 +WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 gtk-3 pango-1.0 .endif NO_TEST= Yes -post-install: - mv ${WRKINST}/etc/ettercap ${PREFIX}/share/examples/ettercap - .include diff --git a/net/ettercap/distinfo b/net/ettercap/distinfo index 9d08767b6b6..a1d996dfa9c 100644 --- a/net/ettercap/distinfo +++ b/net/ettercap/distinfo @@ -1,2 +1,2 @@ -SHA256 (ettercap-0.8.3.1.tar.gz) = YYbofjIMwSyB+1y+RzNYhaPlH5BoHot580zq5m6Zvs8= -SIZE (ettercap-0.8.3.1.tar.gz) = 1219944 +SHA256 (ettercap-0.8.4.1.tar.gz) = BLwHlD8k8vgE87/ohSzOU5gjGNN+ax6ve+6lUEmKwEI= +SIZE (ettercap-0.8.4.1.tar.gz) = 5810125 diff --git a/net/ettercap/patches/patch-CMakeLists_txt b/net/ettercap/patches/patch-CMakeLists_txt index 932b641d83d..1a5dabf8ce3 100644 --- a/net/ettercap/patches/patch-CMakeLists_txt +++ b/net/ettercap/patches/patch-CMakeLists_txt @@ -1,7 +1,16 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -132,7 +132,7 @@ if(NOT DISABLE_RPATH) +@@ -114,6 +114,8 @@ set(INSTALL_EXECPREFIX ${CMAKE_INSTALL_PREFIX} CACHE P + set(INSTALL_BINDIR ${CMAKE_INSTALL_FULL_BINDIR} CACHE PATH "Binary files installation directory") + if(OS_DARWIN OR OS_BSD_FREE OR OS_WINDOWS) + set(INSTALL_SYSCONFDIR ${CMAKE_INSTALL_PREFIX}/etc CACHE PATH "System configuration directory") ++endif() ++if(OS_DARWIN OR OS_BSD_FREE OR OS_WINDOWS OR OS_BSD_OPEN) + set(POLKIT_DIR ${CMAKE_INSTALL_FULL_DATADIR}/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 +@@ -133,7 +135,7 @@ if(NOT DISABLE_RPATH) endif() # set general build flags for debug build-type @@ -10,7 +19,7 @@ Index: CMakeLists.txt ## append ASAN build flags if compiler version has support #if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") # if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8) -@@ -153,7 +153,7 @@ set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb3 -DDEBUG -fno-commo +@@ -154,7 +156,7 @@ set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb3 -DDEBUG -fno-commo #endif() # set build flags for release build-type diff --git a/net/ettercap/patches/patch-cmake_Modules_FindLIBNET_cmake b/net/ettercap/patches/patch-cmake_Modules_FindLIBNET_cmake deleted file mode 100644 index cc5d5b359e0..00000000000 --- a/net/ettercap/patches/patch-cmake_Modules_FindLIBNET_cmake +++ /dev/null @@ -1,17 +0,0 @@ -Index: cmake/Modules/FindLIBNET.cmake ---- cmake/Modules/FindLIBNET.cmake.orig -+++ cmake/Modules/FindLIBNET.cmake -@@ -4,11 +4,11 @@ - # - - # Look for the header file --find_path(LIBNET_INCLUDE_DIR NAMES libnet.h PATH_SUFFIXES libnet11) -+find_path(LIBNET_INCLUDE_DIR NAMES libnet.h PATH_SUFFIXES libnet-1.1) - mark_as_advanced(LIBNET_INCLUDE_DIR) - - #Look for the library --find_library(LIBNET_LIBRARY NAMES net libnet PATH_SUFFIXES libnet11) -+find_library(LIBNET_LIBRARY NAMES net libnet PATH_SUFFIXES libnet-1.1) - mark_as_advanced(LIBNET_LIBRARY) - - # Make sure we've got an include dir. diff --git a/net/ettercap/patches/patch-man_ettercap_8_in b/net/ettercap/patches/patch-man_ettercap_8_in index 4a9daa15226..efb31f39158 100644 --- a/net/ettercap/patches/patch-man_ettercap_8_in +++ b/net/ettercap/patches/patch-man_ettercap_8_in @@ -1,7 +1,7 @@ Index: man/ettercap.8.in --- man/ettercap.8.in.orig +++ man/ettercap.8.in -@@ -174,7 +174,7 @@ the subnet". +@@ -174,7 +174,7 @@ means "all the hosts in the subnet". .SH PRIVILEGES DROPPING ettercap needs root privileges to open the Link Layer sockets. After the initialization phase, the root privs are not needed anymore, so ettercap drops diff --git a/net/ettercap/patches/patch-plug-ins_dns_spoof_dns_spoof_c b/net/ettercap/patches/patch-plug-ins_dns_spoof_dns_spoof_c index d40d0ab0994..0c25570e2e4 100644 --- a/net/ettercap/patches/patch-plug-ins_dns_spoof_dns_spoof_c +++ b/net/ettercap/patches/patch-plug-ins_dns_spoof_dns_spoof_c @@ -3,7 +3,7 @@ cope with openbsd ancient nameser.h Index: plug-ins/dns_spoof/dns_spoof.c --- plug-ins/dns_spoof/dns_spoof.c.orig +++ plug-ins/dns_spoof/dns_spoof.c -@@ -232,7 +232,7 @@ static int load_db(void) +@@ -247,7 +247,7 @@ static int load_db(void) d->ttl = ttl; /* convert the ip address */ @@ -12,7 +12,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c /* Nothing to convert for TXT - just copy the string */ d->text = strndup(ip, 255); if (d->text == NULL) { -@@ -291,28 +291,28 @@ static int parse_line(const char *str, int line, int * +@@ -306,28 +306,28 @@ static int parse_line(const char *str, int line, int * ETTER_DNS, line, str); return (0); } @@ -45,7 +45,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c *name_p = name; *ip_p = ip; return (1); -@@ -336,7 +336,7 @@ static int parse_line(const char *str, int line, int * +@@ -351,7 +351,7 @@ static int parse_line(const char *str, int line, int * if (ttl > MAX_DNS_TTL) ttl = 3600; /* keep TTL within DNS standard limits (2^31 - 1) - see RFC 2181 */ @@ -54,7 +54,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c *name_p = name; *ip_p = txt; *ttl_p = ttl; -@@ -354,7 +354,7 @@ static int parse_line(const char *str, int line, int * +@@ -369,7 +369,7 @@ static int parse_line(const char *str, int line, int * return (0); } @@ -63,7 +63,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c *name_p = name; *ip_p = ip_tmp; *port_p = port; -@@ -528,12 +528,12 @@ static int prepare_dns_reply(u_char *data, const char +@@ -543,12 +543,12 @@ static int prepare_dns_reply(u_char *data, const char is_negative = false; /* it is and address resolution (name to ip) */ @@ -78,7 +78,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c goto any_aaaa; else return -E_NOTFOUND; -@@ -591,12 +591,12 @@ static int prepare_dns_reply(u_char *data, const char +@@ -606,12 +606,12 @@ static int prepare_dns_reply(u_char *data, const char any_aaaa: /* also care about AAAA records */ @@ -93,7 +93,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c goto any_mx; else return -E_NOTFOUND; -@@ -654,12 +654,12 @@ any_aaaa: +@@ -669,12 +669,12 @@ any_aaaa: any_mx: /* it is an MX query (mail to ip) */ @@ -108,7 +108,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c goto any_wins; else return -E_NOTFOUND; -@@ -748,12 +748,12 @@ any_mx: +@@ -763,12 +763,12 @@ any_mx: any_wins: /* it is an WINS query (NetBIOS-name to ip) */ @@ -123,7 +123,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c goto any_txt; else return -E_NOTFOUND; -@@ -797,7 +797,7 @@ any_wins: +@@ -812,7 +812,7 @@ any_wins: any_txt: /* it's a descriptive TXT record */ @@ -132,7 +132,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c char *txt; u_int8 txtlen; u_int16 datalen; -@@ -805,7 +805,7 @@ any_txt: +@@ -820,7 +820,7 @@ any_txt: /* found the reply in the list */ if (get_spoofed_txt(name, &txt, &ttl) != E_SUCCESS) { /* in case of ANY we have to proceed with the next section */ @@ -141,7 +141,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c goto exit; else return -E_NOTFOUND; -@@ -844,7 +844,7 @@ any_txt: +@@ -859,7 +859,7 @@ any_txt: } /* TXT */ /* it is a reverse query (ip to name) */ @@ -150,7 +150,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c u_char *answer, *p; char *a; -@@ -891,7 +891,7 @@ any_txt: +@@ -906,7 +906,7 @@ any_txt: } /* PTR */ /* it is a SRV query (service discovery) */ @@ -159,7 +159,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c char tgtoffset[2]; u_int16 port; -@@ -1002,7 +1002,7 @@ any_txt: +@@ -1017,7 +1017,7 @@ any_txt: type_str(type), name, ip_addr_ntoa(reply, tmp), port, ttl); } /* SRV */ @@ -168,7 +168,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c /* allocate memory for authorative answer */ len = 46; -@@ -1053,7 +1053,7 @@ static int get_spoofed_a(const char *a, struct ip_addr +@@ -1068,7 +1068,7 @@ static int get_spoofed_a(const char *a, struct ip_addr struct dns_spoof_entry *d; SLIST_FOREACH(d, &dns_spoof_head, next) { @@ -177,7 +177,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c /* return the pointer to the struct */ *ip = &d->ip; -@@ -1074,7 +1074,7 @@ static int get_spoofed_aaaa(const char *a, struct ip_a +@@ -1089,7 +1089,7 @@ static int get_spoofed_aaaa(const char *a, struct ip_a struct dns_spoof_entry *d; SLIST_FOREACH(d, &dns_spoof_head, next) { @@ -186,7 +186,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c /* return the pointer to the struct */ *ip = &d->ip; *ttl = d->ttl; -@@ -1094,7 +1094,7 @@ static int get_spoofed_txt(const char *name, char **tx +@@ -1109,7 +1109,7 @@ static int get_spoofed_txt(const char *name, char **tx struct dns_spoof_entry *d; SLIST_FOREACH(d, &dns_spoof_head, next) { @@ -195,7 +195,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c /* return the pointer to the string */ *txt = d->text; *ttl = d->ttl; -@@ -1191,7 +1191,7 @@ static int get_spoofed_ptr(const char *arpa, char **a, +@@ -1206,7 +1206,7 @@ static int get_spoofed_ptr(const char *arpa, char **a, * we cannot return whildcards in the reply, * so skip the entry if the name contains a '*' */ @@ -204,7 +204,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c /* return the pointer to the name */ *a = d->name; -@@ -1212,7 +1212,7 @@ static int get_spoofed_mx(const char *a, struct ip_add +@@ -1227,7 +1227,7 @@ static int get_spoofed_mx(const char *a, struct ip_add struct dns_spoof_entry *d; SLIST_FOREACH(d, &dns_spoof_head, next) { @@ -213,7 +213,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c /* return the pointer to the struct */ *ip = &d->ip; -@@ -1253,7 +1253,7 @@ static int get_spoofed_srv(const char *name, struct ip +@@ -1268,7 +1268,7 @@ static int get_spoofed_srv(const char *name, struct ip struct dns_spoof_entry *d; SLIST_FOREACH(d, &dns_spoof_head, next) { @@ -222,7 +222,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c /* return the pointer to the struct */ *ip = &d->ip; *port = d->port; -@@ -1268,14 +1268,14 @@ static int get_spoofed_srv(const char *name, struct ip +@@ -1283,14 +1283,14 @@ static int get_spoofed_srv(const char *name, struct ip char *type_str (int type) { @@ -244,7 +244,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c } static void dns_spoof_dump(void) -@@ -1288,12 +1288,12 @@ static void dns_spoof_dump(void) +@@ -1303,12 +1303,12 @@ static void dns_spoof_dump(void) DEBUG_MSG("dns_spoof entries:"); SLIST_FOREACH(d, &dns_spoof_head, next) { @@ -259,7 +259,7 @@ Index: plug-ins/dns_spoof/dns_spoof.c DEBUG_MSG(" %s -> [%s:%d], type %s, TTL %u, family IPv4", d->name, ip_addr_ntoa(&d->ip, tmp), d->port, type_str(d->type), d->ttl); } -@@ -1304,7 +1304,7 @@ static void dns_spoof_dump(void) +@@ -1319,7 +1319,7 @@ static void dns_spoof_dump(void) } else if (ntohs(d->ip.addr_type) == AF_INET6) { diff --git a/net/ettercap/patches/patch-plug-ins_mdns_spoof_mdns_spoof_c b/net/ettercap/patches/patch-plug-ins_mdns_spoof_mdns_spoof_c index 1f93bd26bec..5ace03aa611 100644 --- a/net/ettercap/patches/patch-plug-ins_mdns_spoof_mdns_spoof_c +++ b/net/ettercap/patches/patch-plug-ins_mdns_spoof_mdns_spoof_c @@ -3,7 +3,7 @@ cope with openbsd ancient nameser.h Index: plug-ins/mdns_spoof/mdns_spoof.c --- plug-ins/mdns_spoof/mdns_spoof.c.orig +++ plug-ins/mdns_spoof/mdns_spoof.c -@@ -207,21 +207,21 @@ static int parse_line (const char *str, int line, int +@@ -233,21 +233,21 @@ static int parse_line (const char *str, int line, int ETTER_MDNS, line, str); return (0); } @@ -28,7 +28,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c *name_p = name; *ip_p = ip; return (1); -@@ -250,7 +250,7 @@ static int parse_line (const char *str, int line, int +@@ -276,7 +276,7 @@ static int parse_line (const char *str, int line, int return 0; } @@ -37,7 +37,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c *name_p = name; *ip_p = ip; *port_p = port & 0x0000ffff; -@@ -312,7 +312,7 @@ static int parse_line (const char *str, int line, int +@@ -338,7 +338,7 @@ static int parse_line (const char *str, int line, int if ((class & ~MDNS_QU_FLAG) != ns_c_in) return; @@ -46,7 +46,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c struct ip_addr *reply; struct ip_addr *sender; struct ip_addr *target; -@@ -361,7 +361,7 @@ static int parse_line (const char *str, int line, int +@@ -387,7 +387,7 @@ static int parse_line (const char *str, int line, int USER_MSG("mdns_spoof: [%s %s] spoofed to [%s]\n", name, type_str(type), ip_addr_ntoa(reply, tmp)); } @@ -55,7 +55,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c struct ip_addr *reply; struct ip_addr *sender; struct ip_addr *target; -@@ -410,7 +410,7 @@ static int parse_line (const char *str, int line, int +@@ -436,7 +436,7 @@ static int parse_line (const char *str, int line, int USER_MSG("mdns_spoof: [%s %s] spoofed to [%s]\n", name, type_str(type), ip_addr_ntoa(reply, tmp)); } @@ -64,7 +64,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c struct ip_addr *reply; struct ip_addr *sender; struct ip_addr *target; -@@ -453,7 +453,7 @@ static int parse_line (const char *str, int line, int +@@ -479,7 +479,7 @@ static int parse_line (const char *str, int line, int USER_MSG("mdns_spoof: [%s %s] spoofed to [%s]\n", name, type_str(type), a); } @@ -73,7 +73,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c struct ip_addr *reply; struct ip_addr *sender; struct ip_addr *target; -@@ -572,7 +572,7 @@ static int get_spoofed_a(const char *a, struct ip_addr +@@ -598,7 +598,7 @@ static int get_spoofed_a(const char *a, struct ip_addr struct mdns_spoof_entry *d; SLIST_FOREACH(d, &mdns_spoof_head, next) { @@ -82,7 +82,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c /* return the pointer to the struct */ *ip = &d->ip; -@@ -592,7 +592,7 @@ static int get_spoofed_aaaa(const char *a, struct ip_a +@@ -618,7 +618,7 @@ static int get_spoofed_aaaa(const char *a, struct ip_a struct mdns_spoof_entry *d; SLIST_FOREACH(d, &mdns_spoof_head, next) { @@ -91,7 +91,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c /* return the pointer to the struct */ *ip = &d->ip; -@@ -687,7 +687,7 @@ static int get_spoofed_ptr(const char *arpa, char **a, +@@ -713,7 +713,7 @@ static int get_spoofed_ptr(const char *arpa, char **a, * we cannot return whildcards in the reply, * so skip the entry if the name contains a '*' */ @@ -100,7 +100,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c /* return the pointer to the name */ *a = d->name; -@@ -705,7 +705,7 @@ static int get_spoofed_srv(const char *name, struct ip +@@ -731,7 +731,7 @@ static int get_spoofed_srv(const char *name, struct ip struct mdns_spoof_entry *d; SLIST_FOREACH(d, &mdns_spoof_head, next) { @@ -109,7 +109,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c /* return the pointer to the struct */ *ip = &d->ip; *port = d->port; -@@ -811,12 +811,12 @@ static int prep_mdns_reply(struct packet_object *po, u +@@ -837,12 +837,12 @@ static int prep_mdns_reply(struct packet_object *po, u char *type_str (int type) { @@ -127,7 +127,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c } static void mdns_spoof_dump(void) -@@ -827,7 +827,7 @@ static void mdns_spoof_dump(void) +@@ -853,7 +853,7 @@ static void mdns_spoof_dump(void) DEBUG_MSG("mdns_spoof entries:"); SLIST_FOREACH(d, &mdns_spoof_head, next) { if (ntohs(d->ip.addr_type) == AF_INET) { @@ -136,7 +136,7 @@ Index: plug-ins/mdns_spoof/mdns_spoof.c DEBUG_MSG(" %s -> [%s:%d], type %s, family IPv4", d->name, ip_addr_ntoa(&d->ip, tmp), d->port , type_str(d->type)); } -@@ -837,7 +837,7 @@ static void mdns_spoof_dump(void) +@@ -863,7 +863,7 @@ static void mdns_spoof_dump(void) } } else if (ntohs(d->ip.addr_type) == AF_INET6) { diff --git a/net/ettercap/patches/patch-plug-ins_sslstrip_sslstrip_c b/net/ettercap/patches/patch-plug-ins_sslstrip_sslstrip_c deleted file mode 100644 index 7235d798f79..00000000000 --- a/net/ettercap/patches/patch-plug-ins_sslstrip_sslstrip_c +++ /dev/null @@ -1,14 +0,0 @@ -Index: plug-ins/sslstrip/sslstrip.c ---- plug-ins/sslstrip/sslstrip.c.orig -+++ plug-ins/sslstrip/sslstrip.c -@@ -53,10 +53,6 @@ - - #include - --#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26) --#error libcurl 7.26.0 or up is needed --#endif -- - /* - * This plugin will basically replace all https links sent to the user's browser with http - * but keep track of those https links to send a proper HTTPS request to the links when requested. diff --git a/net/ettercap/patches/patch-share_CMakeLists_txt b/net/ettercap/patches/patch-share_CMakeLists_txt new file mode 100644 index 00000000000..f580e7e597d --- /dev/null +++ b/net/ettercap/patches/patch-share_CMakeLists_txt @@ -0,0 +1,12 @@ +Index: share/CMakeLists.txt +--- share/CMakeLists.txt.orig ++++ share/CMakeLists.txt +@@ -50,7 +50,7 @@ endforeach() + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${EC_CONFFILES} + ${CMAKE_CURRENT_BINARY_DIR}/etter.conf +- DESTINATION ${INSTALL_SYSCONFDIR}/ettercap) ++ DESTINATION ${INSTALL_DATADIR}/examples/ettercap) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${EC_DATAFILES} + DESTINATION ${INSTALL_DATADIR}/ettercap) diff --git a/net/ettercap/patches/patch-src_ec_sslwrap_c b/net/ettercap/patches/patch-src_ec_sslwrap_c index bfbc3d1ddb2..f237355a61b 100644 --- a/net/ettercap/patches/patch-src_ec_sslwrap_c +++ b/net/ettercap/patches/patch-src_ec_sslwrap_c @@ -1,17 +1,11 @@ Index: src/ec_sslwrap.c --- src/ec_sslwrap.c.orig +++ src/ec_sslwrap.c -@@ -71,11 +71,11 @@ - #define TLS_server_method SSLv23_server_method +@@ -72,6 +72,7 @@ #endif --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++/* wants at least SSL_CONF_CTX */ #define HAVE_OPENSSL_1_1_0 #endif --#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) - #define HAVE_OPENSSL_1_1_1 - #endif - diff --git a/net/ettercap/pkg/PFRAG.no-no_x11 b/net/ettercap/pkg/PFRAG.no-no_x11 index af21973617f..aa66eccd9b0 100644 --- a/net/ettercap/pkg/PFRAG.no-no_x11 +++ b/net/ettercap/pkg/PFRAG.no-no_x11 @@ -1,9 +1,11 @@ bin/ettercap-pkexec @man man/man8/ettercap-pkexec.8 share/applications/ettercap.desktop +share/icons/hicolor/scalable/apps/ettercap.svg share/metainfo/ share/metainfo/ettercap.metainfo.xml -share/pixmaps/ -share/pixmaps/ettercap.svg +share/polkit-1/ +share/polkit-1/actions/ +share/polkit-1/actions/org.pkexec.ettercap.policy @tag gtk-update-icon-cache %D/share/icons/hicolor @tag update-desktop-database diff --git a/net/ettercap/pkg/PLIST b/net/ettercap/pkg/PLIST index d3d77e00a4c..9ff1bc5e65a 100644 --- a/net/ettercap/pkg/PLIST +++ b/net/ettercap/pkg/PLIST @@ -40,7 +40,6 @@ lib/ettercap/ @lib lib/libettercap.so.${LIBettercap_VERSION} @man man/man5/etter.conf.5 @man man/man8/ettercap.8 -@man man/man8/ettercap_curses.8 @man man/man8/ettercap_plugins.8 @man man/man8/etterfilter.8 @man man/man8/etterlog.8