CVS commit: pkgsrc/net

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sat, 6 Mar 2021 11:20:56 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar  6 11:20:56 UTC 2021

Modified Files:
        pkgsrc/net: Makefile
        pkgsrc/net/ettercap: DESCR Makefile PLIST distinfo
Added Files:
        pkgsrc/net/ettercap: Makefile.common
        pkgsrc/net/ettercap-gtk: DESCR Makefile PLIST
        pkgsrc/net/ettercap/patches: patch-CMakeLists.txt
            patch-cmake_Modules_EttercapLibCheck.cmake
Removed Files:
        pkgsrc/net/ettercap: hacks.mk options.mk
        pkgsrc/net/ettercap-NG: DESCR Makefile PLIST distinfo
        pkgsrc/net/ettercap-NG/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae
        pkgsrc/net/ettercap/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag patch-src_ec__grell.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.1386 -r1.1387 pkgsrc/net/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/ettercap/DESCR
cvs rdiff -u -r1.91 -r1.92 pkgsrc/net/ettercap/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ettercap/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/ettercap/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/ettercap/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/ettercap/hacks.mk \
    pkgsrc/net/ettercap/options.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/net/ettercap-NG/DESCR
cvs rdiff -u -r1.33 -r0 pkgsrc/net/ettercap-NG/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/net/ettercap-NG/PLIST
cvs rdiff -u -r1.9 -r0 pkgsrc/net/ettercap-NG/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/net/ettercap-NG/patches/patch-aa
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/net/ettercap-NG/patches/patch-ab \
    pkgsrc/net/ettercap-NG/patches/patch-ac \
    pkgsrc/net/ettercap-NG/patches/patch-ad
cvs rdiff -u -r1.5 -r0 pkgsrc/net/ettercap-NG/patches/patch-ae
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ettercap-gtk/DESCR \
    pkgsrc/net/ettercap-gtk/Makefile pkgsrc/net/ettercap-gtk/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ettercap/patches/patch-CMakeLists.txt \
    pkgsrc/net/ettercap/patches/patch-cmake_Modules_EttercapLibCheck.cmake
cvs rdiff -u -r1.5 -r0 pkgsrc/net/ettercap/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/net/ettercap/patches/patch-ab \
    pkgsrc/net/ettercap/patches/patch-ac pkgsrc/net/ettercap/patches/patch-ad \
    pkgsrc/net/ettercap/patches/patch-ae pkgsrc/net/ettercap/patches/patch-ag \
    pkgsrc/net/ettercap/patches/patch-src_ec__grell.c
cvs rdiff -u -r1.4 -r0 pkgsrc/net/ettercap/patches/patch-af

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

Modified files:

Index: pkgsrc/net/Makefile
diff -u pkgsrc/net/Makefile:1.1386 pkgsrc/net/Makefile:1.1387
--- pkgsrc/net/Makefile:1.1386  Sat Mar  6 09:44:31 2021
+++ pkgsrc/net/Makefile Sat Mar  6 11:20:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1386 2021/03/06 09:44:31 nia Exp $
+# $NetBSD: Makefile,v 1.1387 2021/03/06 11:20:55 nia Exp $
 #
 
 COMMENT=       Networking tools
@@ -134,7 +134,7 @@ SUBDIR+=    erlang-xmpp
 SUBDIR+=       ether2dns
 SUBDIR+=       etherape
 SUBDIR+=       ettercap
-SUBDIR+=       ettercap-NG
+SUBDIR+=       ettercap-gtk
 SUBDIR+=       exabgp
 SUBDIR+=       ez-ipupdate
 SUBDIR+=       fair-identd

Index: pkgsrc/net/ettercap/DESCR
diff -u pkgsrc/net/ettercap/DESCR:1.1.1.1 pkgsrc/net/ettercap/DESCR:1.2
--- pkgsrc/net/ettercap/DESCR:1.1.1.1   Mon Apr  8 20:25:03 2002
+++ pkgsrc/net/ettercap/DESCR   Sat Mar  6 11:20:56 2021
@@ -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.

Index: pkgsrc/net/ettercap/Makefile
diff -u pkgsrc/net/ettercap/Makefile:1.91 pkgsrc/net/ettercap/Makefile:1.92
--- pkgsrc/net/ettercap/Makefile:1.91   Mon Aug 17 20:19:44 2020
+++ pkgsrc/net/ettercap/Makefile        Sat Mar  6 11:20:56 2021
@@ -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@localhost
-HOMEPAGE=              http://ettercap.sourceforge.net/
-COMMENT=               Multipurpose sniffer/interceptor/logger for switched LAN
-LICENSE=               gnu-gpl-v2
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+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"

Index: pkgsrc/net/ettercap/PLIST
diff -u pkgsrc/net/ettercap/PLIST:1.5 pkgsrc/net/ettercap/PLIST:1.6
--- pkgsrc/net/ettercap/PLIST:1.5       Sun Jun 14 18:09:26 2009
+++ pkgsrc/net/ettercap/PLIST   Sat Mar  6 11:20:56 2021
@@ -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

Index: pkgsrc/net/ettercap/distinfo
diff -u pkgsrc/net/ettercap/distinfo:1.17 pkgsrc/net/ettercap/distinfo:1.18
--- pkgsrc/net/ettercap/distinfo:1.17   Tue Mar 29 21:59:15 2016
+++ pkgsrc/net/ettercap/distinfo        Sat Mar  6 11:20:56 2021
@@ -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

Added files:

Index: pkgsrc/net/ettercap/Makefile.common
diff -u /dev/null pkgsrc/net/ettercap/Makefile.common:1.1
--- /dev/null   Sat Mar  6 11:20:56 2021
+++ pkgsrc/net/ettercap/Makefile.common Sat Mar  6 11:20:56 2021
@@ -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"

Index: pkgsrc/net/ettercap-gtk/DESCR
diff -u /dev/null pkgsrc/net/ettercap-gtk/DESCR:1.1
--- /dev/null   Sat Mar  6 11:20:56 2021
+++ pkgsrc/net/ettercap-gtk/DESCR       Sat Mar  6 11:20:56 2021
@@ -0,0 +1,6 @@
+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.
+
+This package also includes the optional GTK graphical user interface.
Index: pkgsrc/net/ettercap-gtk/Makefile
diff -u /dev/null pkgsrc/net/ettercap-gtk/Makefile:1.1
--- /dev/null   Sat Mar  6 11:20:56 2021
+++ pkgsrc/net/ettercap-gtk/Makefile    Sat Mar  6 11:20:56 2021
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2021/03/06 11:20:56 nia Exp $
+
+.include "../../net/ettercap/Makefile.common"
+
+PKGNAME=       ${DISTNAME:S/ettercap-/ettercap-gtk-/1}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+COMMENT=       Suite for man in the middle attacks (with GTK GUI)
+
+CONFLICTS+=    ettercap-[0-9]*
+
+CMAKE_ARGS+=   -DGTK_BUILD_TYPE=GTK3
+CMAKE_ARGS+=   -DENABLE_GTK=ON
+
+.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 /dev/null pkgsrc/net/ettercap-gtk/PLIST:1.1
--- /dev/null   Sat Mar  6 11:20:56 2021
+++ pkgsrc/net/ettercap-gtk/PLIST       Sat Mar  6 11:20:56 2021
@@ -0,0 +1,77 @@
+@comment $NetBSD: PLIST,v 1.1 2021/03/06 11:20:56 nia Exp $
+bin/ettercap
+bin/ettercap-pkexec
+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_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
+man/man8/ettercap_curses.8
+man/man8/ettercap_plugins.8
+man/man8/etterfilter.8
+man/man8/etterlog.8
+share/applications/ettercap.desktop
+share/ettercap/AUTHORS
+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.services
+share/ettercap/etter.ssl.crt
+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
+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 /dev/null pkgsrc/net/ettercap/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Mar  6 11:20:56 2021
+++ pkgsrc/net/ettercap/patches/patch-CMakeLists.txt    Sat Mar  6 11:20:56 2021
@@ -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
Index: pkgsrc/net/ettercap/patches/patch-cmake_Modules_EttercapLibCheck.cmake
diff -u /dev/null pkgsrc/net/ettercap/patches/patch-cmake_Modules_EttercapLibCheck.cmake:1.1
--- /dev/null   Sat Mar  6 11:20:56 2021
+++ pkgsrc/net/ettercap/patches/patch-cmake_Modules_EttercapLibCheck.cmake      Sat Mar  6 11:20:56 2021
@@ -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})

Prev by Date: CVS commit: pkgsrc/emulators/qemu
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/emulators/qemu
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index