pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/net



Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Feb  6 13:31:22 UTC 2026

Modified Files:
        pkgsrc/net/ettercap: Makefile Makefile.common PLIST distinfo
        pkgsrc/net/ettercap-gtk: Makefile PLIST
        pkgsrc/net/ettercap/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/net/ettercap/patches: patch-src_CMakeLists.txt
Removed Files:
        pkgsrc/net/ettercap/patches: patch-plug-ins_sslstrip_sslstrip.c

Log Message:
ettercap: updated to 0.8.4

0.8.4

!! Fix curl version detection for curl version > 7
!! Proper unloading for all plugins
!! Fixing some memory leaks
!! Fix issue when de- and re-activating dns_spoof plugin
!! Fix segmentation fault when stopping isolate plugin
!! Handle pre-defined target host list when used in silent mode
!! Fix support when used with network sub-interfaces
!! Globals are properly freed before exit
!! OpenSSL access to opaque data
!! Match cmake minimum version requirement - fixes 1278 (Gentoo bug: 955891)
!! Fix fingerprint composition
!! Default connection buffer size increased from 10KByte to 10MByte
!! /etc/ettercap is now by default /usr/local/etc/ettercap under non-Linux OS
!! Fix build issue on FreeBSD
!! Fix redirect rule (de-)installation for port 8080 on FreeBSD
!! Fix Accept button icon
++ Updated bundled OUI mac addresses
++ Updated bundled libnet from version 1.2 to 1.3
++ Updated bundled curl from version 7.86 to 8.18
++ Updated bundled luajit from version 2.0.5 to v2.1-20250826
++ Proper XDG hi-color icon support
++ new random etterfilter function
++ superseded legacy GeoIP C API with libmaxminddb C API
++ enable refresh of SSL redirect list in GTK UI


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/net/ettercap/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ettercap/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/ettercap/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/ettercap/distinfo
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/ettercap-gtk/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ettercap-gtk/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ettercap/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/ettercap/patches/patch-plug-ins_sslstrip_sslstrip.c
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ettercap/patches/patch-src_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ettercap/Makefile
diff -u pkgsrc/net/ettercap/Makefile:1.112 pkgsrc/net/ettercap/Makefile:1.113
--- pkgsrc/net/ettercap/Makefile:1.112  Fri Feb  6 10:05:30 2026
+++ pkgsrc/net/ettercap/Makefile        Fri Feb  6 13:31:21 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.112 2026/02/06 10:05:30 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2026/02/06 13:31:21 adam Exp $
 
-PKGREVISION= 18
 .include "Makefile.common"
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -9,6 +8,5 @@ COMMENT=        Suite for man in the middle att
 CONFLICTS+=    ettercap-gtk-[0-9]*
 
 CMAKE_CONFIGURE_ARGS+= -DENABLE_GTK=OFF
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ettercap/Makefile.common
diff -u pkgsrc/net/ettercap/Makefile.common:1.4 pkgsrc/net/ettercap/Makefile.common:1.5
--- pkgsrc/net/ettercap/Makefile.common:1.4     Sun Aug 25 06:19:05 2024
+++ pkgsrc/net/ettercap/Makefile.common Fri Feb  6 13:31:21 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2024/08/25 06:19:05 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2026/02/06 13:31:21 adam Exp $
 # used by net/ettercap/Makefile
 # used by net/ettercap-gtk/Makefile
 
-DISTNAME=      ettercap-0.8.3.1
+DISTNAME=      ettercap-0.8.4
 CATEGORIES=    net security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Ettercap/}
 GITHUB_PROJECT=        ettercap  # explicit for WRKSRC in net/ettercap-gtk
@@ -13,29 +13,32 @@ 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_CONFIGURE_ARGS+= -DENABLE_IPV6=ON
 CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SYSCONFDIR=${PREFIX}/share/examples
 
 DISTINFO_FILE= ${.CURDIR}/../../net/ettercap/distinfo
 PATCHDIR=      ${.CURDIR}/../../net/ettercap/patches
 
-pre-configure:
-       ${MKDIR} ${WRKSRC}/build
+PKG_SYSCONFSUBDIR=     ettercap
+
+EGDIR=         ${PREFIX}/share/examples/ettercap
+CONF_FILES=    ${EGDIR}/etter.conf ${PKG_SYSCONFDIR}/etter.conf
+CONF_FILES+=   ${EGDIR}/etter.dns ${PKG_SYSCONFDIR}/etter.dns
+CONF_FILES+=   ${EGDIR}/etter.mdns ${PKG_SYSCONFDIR}/etter.mdns
+CONF_FILES+=   ${EGDIR}/etter.nbns ${PKG_SYSCONFDIR}/etter.nbns
 
 .include "../../devel/check/buildlink3.mk"
+.include "../../devel/cmake/build.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/ncurses/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../net/GeoIP/buildlink3.mk"
+.include "../../geography/libmaxminddb/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"

Index: pkgsrc/net/ettercap/PLIST
diff -u pkgsrc/net/ettercap/PLIST:1.6 pkgsrc/net/ettercap/PLIST:1.7
--- pkgsrc/net/ettercap/PLIST:1.6       Sat Mar  6 11:20:56 2021
+++ pkgsrc/net/ettercap/PLIST   Fri Feb  6 13:31:21 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2021/03/06 11:20:56 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2026/02/06 13:31:21 adam Exp $
 bin/ettercap
 bin/etterfilter
 bin/etterlog
@@ -37,11 +37,11 @@ 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-ui.so.0
 lib/libettercap.so
-lib/libettercap.so.0
 lib/libettercap.so.${PKGVERSION}
+lib/libettercap.so.0
 man/man5/etter.conf.5
 man/man8/ettercap-pkexec.8
 man/man8/ettercap.8
@@ -50,6 +50,7 @@ man/man8/ettercap_plugins.8
 man/man8/etterfilter.8
 man/man8/etterlog.8
 share/ettercap/AUTHORS
+share/ettercap/GeoLite2-Country.mmdb
 share/ettercap/LICENSE
 share/ettercap/etter.dns.examples
 share/ettercap/etter.fields
@@ -70,3 +71,7 @@ share/ettercap/ettercap.svg
 share/ettercap/etterfilter.cnt
 share/ettercap/etterfilter.tbl
 share/ettercap/etterlog.dtd
+share/examples/ettercap/etter.conf
+share/examples/ettercap/etter.dns
+share/examples/ettercap/etter.mdns
+share/examples/ettercap/etter.nbns

Index: pkgsrc/net/ettercap/distinfo
diff -u pkgsrc/net/ettercap/distinfo:1.22 pkgsrc/net/ettercap/distinfo:1.23
--- pkgsrc/net/ettercap/distinfo:1.22   Fri Aug 22 14:22:17 2025
+++ pkgsrc/net/ettercap/distinfo        Fri Feb  6 13:31:21 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2025/08/22 14:22:17 wiz Exp $
+$NetBSD: distinfo,v 1.23 2026/02/06 13:31:21 adam Exp $
 
-BLAKE2s (ettercap-0.8.3.1.tar.gz) = df662ced097a9072eed9221ecf5f53de9d702ab46531baa22492a38cf0398265
-SHA512 (ettercap-0.8.3.1.tar.gz) = 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5
-Size (ettercap-0.8.3.1.tar.gz) = 6678653 bytes
-SHA1 (patch-CMakeLists.txt) = 65a111443311a5fa099cb20a09c4be6fe85c1bee
+BLAKE2s (ettercap-0.8.4.tar.gz) = 0b6a7b7a8d9153810ca0479d12d5e94a26f5a69b9082133ba315ea7a06c230c2
+SHA512 (ettercap-0.8.4.tar.gz) = ba96d1cda6302e754c7b180ac4e74f4e96cbf40edef04a5f14e287225b0fe3f7a71247f4fea5600fd1e20dc8b6950730e6a629e6015d4afeb887662d2e859e47
+Size (ettercap-0.8.4.tar.gz) = 12067187 bytes
+SHA1 (patch-CMakeLists.txt) = 26111bf471c29f6a7a076c7ed427ff5c0f0ffb59
 SHA1 (patch-cmake_Modules_EttercapLibCheck.cmake) = 4d5d523735b64cf06d13fa4eb177d16553a9f8f3
-SHA1 (patch-plug-ins_sslstrip_sslstrip.c) = 6b59b92787387ad04c99a2c99df0869bbf641283
+SHA1 (patch-src_CMakeLists.txt) = 9a82f254b1c753b11421630184d8eb164b010f0f

Index: pkgsrc/net/ettercap-gtk/Makefile
diff -u pkgsrc/net/ettercap-gtk/Makefile:1.35 pkgsrc/net/ettercap-gtk/Makefile:1.36
--- pkgsrc/net/ettercap-gtk/Makefile:1.35       Fri Feb  6 10:05:30 2026
+++ pkgsrc/net/ettercap-gtk/Makefile    Fri Feb  6 13:31:22 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.35 2026/02/06 10:05:30 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2026/02/06 13:31:22 adam Exp $
 
-PKGREVISION= 33
 .include "../../net/ettercap/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/ettercap-/ettercap-gtk-/1}
@@ -13,6 +12,7 @@ CONFLICTS+=   ettercap-[0-9]*
 CMAKE_CONFIGURE_ARGS+= -DGTK_BUILD_TYPE=GTK3
 CMAKE_CONFIGURE_ARGS+= -DENABLE_GTK=ON
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ettercap-gtk/PLIST
diff -u pkgsrc/net/ettercap-gtk/PLIST:1.1 pkgsrc/net/ettercap-gtk/PLIST:1.2
--- pkgsrc/net/ettercap-gtk/PLIST:1.1   Sat Mar  6 11:20:56 2021
+++ pkgsrc/net/ettercap-gtk/PLIST       Fri Feb  6 13:31:22 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/03/06 11:20:56 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/02/06 13:31:22 adam Exp $
 bin/ettercap
 bin/ettercap-pkexec
 bin/etterfilter
@@ -38,11 +38,11 @@ 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-ui.so.0
 lib/libettercap.so
-lib/libettercap.so.0
 lib/libettercap.so.${PKGVERSION}
+lib/libettercap.so.0
 man/man5/etter.conf.5
 man/man8/ettercap-pkexec.8
 man/man8/ettercap.8
@@ -52,6 +52,7 @@ man/man8/etterfilter.8
 man/man8/etterlog.8
 share/applications/ettercap.desktop
 share/ettercap/AUTHORS
+share/ettercap/GeoLite2-Country.mmdb
 share/ettercap/LICENSE
 share/ettercap/etter.dns.examples
 share/ettercap/etter.fields
@@ -72,6 +73,10 @@ share/ettercap/ettercap.svg
 share/ettercap/etterfilter.cnt
 share/ettercap/etterfilter.tbl
 share/ettercap/etterlog.dtd
+share/examples/ettercap/etter.conf
+share/examples/ettercap/etter.dns
+share/examples/ettercap/etter.mdns
+share/examples/ettercap/etter.nbns
+share/icons/hicolor/scalable/apps/ettercap.svg
 share/metainfo/ettercap.metainfo.xml
-share/pixmaps/ettercap.svg
 share/polkit-1/actions/org.pkexec.ettercap.policy

Index: pkgsrc/net/ettercap/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/ettercap/patches/patch-CMakeLists.txt:1.2 pkgsrc/net/ettercap/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/net/ettercap/patches/patch-CMakeLists.txt:1.2        Fri Aug 22 14:22:17 2025
+++ pkgsrc/net/ettercap/patches/patch-CMakeLists.txt    Fri Feb  6 13:31:21 2026
@@ -1,48 +1,25 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2025/08/22 14:22:17 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2026/02/06 13:31:21 adam 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.orig        2026-02-01 10:38:53.000000000 +0000
 +++ CMakeLists.txt
-@@ -1,9 +1,9 @@
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.5)
- project(ettercap C)
- 
- set(VERSION "0.8.3.1")
- 
- set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
- set(CMAKE_SCRIPT_PATH "${CMAKE_SOURCE_DIR}/cmake/Scripts")
- 
- include(MacroEnsureOutOfSourceBuild)
-@@ -90,10 +90,6 @@ include(EttercapOSTest)
+@@ -92,8 +92,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")
+@@ -112,7 +110,7 @@ set(INSTALL_LIBDIR ${CMAKE_INSTALL_FULL_
+ set(INSTALL_DATADIR ${CMAKE_INSTALL_FULL_DATADIR} CACHE PATH "Data installation directory")
+ set(INSTALL_EXECPREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "")
+ set(INSTALL_BINDIR  ${CMAKE_INSTALL_FULL_BINDIR} 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")
+   set(INSTALL_SYSCONFDIR ${CMAKE_INSTALL_PREFIX}/etc CACHE PATH "System configuration directory")
+   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
-@@ -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

Added files:

Index: pkgsrc/net/ettercap/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/net/ettercap/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Fri Feb  6 13:31:22 2026
+++ pkgsrc/net/ettercap/patches/patch-src_CMakeLists.txt        Fri Feb  6 13:31:21 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2026/02/06 13:31:21 adam Exp $
+
+Don't generate exports (.tbd files on Darwin). This makes PLIST portable.
+
+--- src/CMakeLists.txt.orig    2026-02-06 13:16:45.627984379 +0000
++++ src/CMakeLists.txt
+@@ -227,7 +227,6 @@ endif()
+ #endif(NOT LIBRARY_BUILD)
+ 
+ set_target_properties(lib_ettercap PROPERTIES
+-  ENABLE_EXPORTS On
+   #  LINK_INTERFACE_LIBRARIES ""
+   OUTPUT_NAME ettercap
+   VERSION ${VERSION}



Home | Main Index | Thread Index | Old Index