pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net ettercap: Update to 0.8.3.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/263ac4fd675c
branches: trunk
changeset: 448222:263ac4fd675c
user: nia <nia%pkgsrc.org@localhost>
date: Sat Mar 06 11:20:55 2021 +0000
description:
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.
diffstat:
net/Makefile | 4 +-
net/ettercap-NG/DESCR | 5 -
net/ettercap-NG/Makefile | 63 -----
net/ettercap-NG/PLIST | 54 ----
net/ettercap-NG/distinfo | 11 -
net/ettercap-NG/patches/patch-aa | 13 -
net/ettercap-NG/patches/patch-ab | 13 -
net/ettercap-NG/patches/patch-ac | 101 --------
net/ettercap-NG/patches/patch-ad | 16 -
net/ettercap-NG/patches/patch-ae | 52 ----
net/ettercap-gtk/DESCR | 6 +
net/ettercap-gtk/Makefile | 17 +
net/ettercap-gtk/PLIST | 77 ++++++
net/ettercap/DESCR | 7 +-
net/ettercap/Makefile | 37 +--
net/ettercap/Makefile.common | 41 +++
net/ettercap/PLIST | 126 +++++----
net/ettercap/distinfo | 20 +-
net/ettercap/hacks.mk | 11 -
net/ettercap/options.mk | 14 -
net/ettercap/patches/patch-CMakeLists.txt | 37 ++
net/ettercap/patches/patch-aa | 11 -
net/ettercap/patches/patch-ab | 32 --
net/ettercap/patches/patch-ac | 17 -
net/ettercap/patches/patch-ad | 37 --
net/ettercap/patches/patch-ae | 14 -
net/ettercap/patches/patch-af | 12 -
net/ettercap/patches/patch-ag | 36 --
net/ettercap/patches/patch-cmake_Modules_EttercapLibCheck.cmake | 33 ++
net/ettercap/patches/patch-src_ec__grell.c | 18 -
30 files changed, 295 insertions(+), 640 deletions(-)
diffs (truncated from 1079 to 300 lines):
diff -r 4b48cae7d3de -r 263ac4fd675c net/Makefile
--- a/net/Makefile Sat Mar 06 11:19:34 2021 +0000
+++ b/net/Makefile Sat Mar 06 11:20:55 2021 +0000
@@ -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+= ether2dns
SUBDIR+= etherape
SUBDIR+= ettercap
-SUBDIR+= ettercap-NG
+SUBDIR+= ettercap-gtk
SUBDIR+= exabgp
SUBDIR+= ez-ipupdate
SUBDIR+= fair-identd
diff -r 4b48cae7d3de -r 263ac4fd675c net/ettercap-NG/DESCR
--- a/net/ettercap-NG/DESCR Sat Mar 06 11:19:34 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-Ettercap is a suite for man in the middle attacks on LAN. 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 (even ciphered ones) and includes many feature
-for network and host analysis.
diff -r 4b48cae7d3de -r 263ac4fd675c net/ettercap-NG/Makefile
--- a/net/ettercap-NG/Makefile Sat Mar 06 11:19:34 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-# $NetBSD: Makefile,v 1.33 2020/04/24 11:56:56 nia Exp $
-
-DISTNAME= ettercap-NG-0.7.3
-PKGREVISION= 15
-CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ettercap/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://ettercap.sourceforge.net/
-COMMENT= Multipurpose sniffer/interceptor/logger for switched LAN
-LICENSE= gnu-gpl-v2
-
-BROKEN= "Fails to build with OpenSSL 1.1"
-
-MAKE_JOBS_SAFE= no
-
-CONFLICTS= ettercap-[0-9]*
-
-BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.8.1
-
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE= YES
-PTHREAD_OPTS+= require
-USE_LIBTOOL= YES
-USE_NCURSES= YES # ncurses.h menu.h panel.h form.h
-CPPFLAGS+= -L${BUILDLINK_PREFIX.libnet11}/lib/libnet11
-CPPFLAGS+= -L${PREFIX}/lib
-
-CONFIGURE_ARGS+= --with-libnet=${BUILDLINK_PREFIX.libnet11}
-CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap}
-CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre}
-CONFIGURE_ARGS+= --with-libncurses=${BUILDLINK_PREFIX.ncurses}
-CONFIGURE_ARGS+= --enable-plugins
-CONFIGURE_ARGS+= --disable-gtk
-
-SUBST_CLASSES+= conf
-SUBST_STAGE.conf= pre-configure
-SUBST_FILES.conf= configure
-SUBST_SED.conf+= -e "s|@@LN_INC@@|${BUILDLINK_PREFIX.libnet11}/include/libnet11|g"
-SUBST_SED.conf+= -e "s|@@LN_LIB@@|${BUILDLINK_PREFIX.libnet11}/lib/libnet11|g"
-SUBST_MESSAGE.conf= Fixing configuration script.
-
-CONF_FILES= ${PREFIX}/share/examples/ettercap-NG/etter.conf \
- ${PKG_SYSCONFDIR}/etter.conf
-
-INSTALLATION_DIRS+= share/examples/ettercap-NG
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/share/etter.conf \
- ${DESTDIR}${PREFIX}/share/examples/ettercap-NG
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/libnet11/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../net/libpcap/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 4b48cae7d3de -r 263ac4fd675c net/ettercap-NG/PLIST
--- a/net/ettercap-NG/PLIST Sat Mar 06 11:19:34 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:26 joerg Exp $
-bin/ettercap
-bin/etterfilter
-bin/etterlog
-lib/ettercap/ec_arp_cop.la
-lib/ettercap/ec_autoadd.la
-lib/ettercap/ec_chk_poison.la
-lib/ettercap/ec_dns_spoof.la
-lib/ettercap/ec_dos_attack.la
-lib/ettercap/ec_dummy.la
-lib/ettercap/ec_find_conn.la
-lib/ettercap/ec_find_ettercap.la
-lib/ettercap/ec_find_ip.la
-lib/ettercap/ec_finger.la
-lib/ettercap/ec_finger_submit.la
-lib/ettercap/ec_gre_relay.la
-lib/ettercap/ec_gw_discover.la
-lib/ettercap/ec_isolate.la
-lib/ettercap/ec_link_type.la
-lib/ettercap/ec_pptp_chapms1.la
-lib/ettercap/ec_pptp_clear.la
-lib/ettercap/ec_pptp_pap.la
-lib/ettercap/ec_pptp_reneg.la
-lib/ettercap/ec_rand_flood.la
-lib/ettercap/ec_remote_browser.la
-lib/ettercap/ec_reply_arp.la
-lib/ettercap/ec_repoison_arp.la
-lib/ettercap/ec_scan_poisoner.la
-lib/ettercap/ec_search_promisc.la
-lib/ettercap/ec_smb_clear.la
-lib/ettercap/ec_smb_down.la
-lib/ettercap/ec_stp_mangler.la
-man/man5/etter.conf.5
-man/man8/ettercap.8
-man/man8/ettercap_curses.8
-man/man8/ettercap_plugins.8
-man/man8/etterfilter.8
-man/man8/etterlog.8
-share/ettercap/etter.dns
-share/ettercap/etter.fields
-share/ettercap/etter.filter
-share/ettercap/etter.filter.examples
-share/ettercap/etter.filter.kill
-share/ettercap/etter.filter.ssh
-share/ettercap/etter.finger.mac
-share/ettercap/etter.finger.os
-share/ettercap/etter.mime
-share/ettercap/etter.services
-share/ettercap/etter.ssl.crt
-share/ettercap/ettercap.png
-share/ettercap/etterfilter.cnt
-share/ettercap/etterfilter.tbl
-share/ettercap/etterlog.dtd
-share/examples/ettercap-NG/etter.conf
diff -r 4b48cae7d3de -r 263ac4fd675c net/ettercap-NG/distinfo
--- a/net/ettercap-NG/distinfo Sat Mar 06 11:19:34 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 00:34:59 agc Exp $
-
-SHA1 (ettercap-NG-0.7.3.tar.gz) = 7a2c3f848ca4f39c07fddeb0d6308641265bc4ff
-RMD160 (ettercap-NG-0.7.3.tar.gz) = f4e6c0d87b2064b3775e9af60f34575273742616
-SHA512 (ettercap-NG-0.7.3.tar.gz) = 3681e5c7eacdce5a367111286672c5a8a5f9a74f963285289bf48f67527343a8278723a4c4ca8a000289a6a640bf1a96bbb6899c069cde2fbdf875e8c4ea3f5b
-Size (ettercap-NG-0.7.3.tar.gz) = 1138643 bytes
-SHA1 (patch-aa) = 27c7f53e0d704b7dc2b8c9c76bf1f9aeff1bbece
-SHA1 (patch-ab) = 7cf863797abac4b67dbca55f6f763bf7b9830259
-SHA1 (patch-ac) = ad04400499dcfdb4067079a58c849c287a34d12f
-SHA1 (patch-ad) = f39de66feb894ef2f1134abd3a3ca36677bea2b4
-SHA1 (patch-ae) = 0932412d46b780f948c7e65d326ae93cabd0e5fb
diff -r 4b48cae7d3de -r 263ac4fd675c net/ettercap-NG/patches/patch-aa
--- a/net/ettercap-NG/patches/patch-aa Sat Mar 06 11:19:34 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/05/31 19:03:50 adrianp Exp $
-
---- share/Makefile.in.orig 2005-05-31 19:58:25.000000000 +0100
-+++ share/Makefile.in
-@@ -321,8 +321,6 @@ install-sysconfDATA: $(sysconf_DATA)
- @list='$(sysconf_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
-- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
- done
-
- uninstall-sysconfDATA:
diff -r 4b48cae7d3de -r 263ac4fd675c net/ettercap-NG/patches/patch-ab
--- a/net/ettercap-NG/patches/patch-ab Sat Mar 06 11:19:34 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/05/05 19:34:44 xtraeme Exp $
-
---- include/ec_resolv.h.orig 2004-07-24 12:43:21.000000000 +0200
-+++ include/ec_resolv.h
-@@ -8,7 +8,7 @@
-
- #ifdef HAVE_ARPA_NAMESER_H
- #include <arpa/nameser.h>
-- #ifndef OS_BSD_OPEN
-+ #if (!defined OS_BSD_OPEN && !defined OS_BSD_NET) || defined __APPLE__
- #include <arpa/nameser_compat.h>
- #endif
- #include <resolv.h>
diff -r 4b48cae7d3de -r 263ac4fd675c net/ettercap-NG/patches/patch-ac
--- a/net/ettercap-NG/patches/patch-ac Sat Mar 06 11:19:34 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/05/05 19:34:44 xtraeme Exp $
-
---- src/ec_threads.c.orig 2004-11-05 15:12:01.000000000 +0100
-+++ src/ec_threads.c
-@@ -48,6 +48,10 @@ static pthread_mutex_t init_mtx = PTHREA
- #define BROKEN_PTHREAD_JOIN
- #endif
-
-+#ifdef OS_BSD_NET
-+ int init_lock_helper;
-+#endif
-+
- /* protos... */
-
- char * ec_thread_getname(pthread_t id);
-@@ -190,6 +194,39 @@ pthread_t ec_thread_new(char *name, char
- pthread_t id;
-
- DEBUG_MSG("ec_thread_new -- %s", name);
-+
-+#ifdef OS_BSD_NET
-+ /*
-+ * Since unlocking a mutex from a thread other than the locking
-+ * is a NO-NO, use a helper lockflag. The new thread will set this
-+ * to "1" when finished.
-+ */
-+ INIT_LOCK;
-+ init_lock_helper = 0;
-+ INIT_UNLOCK;
-+
-+ if (pthread_create(&id, NULL, function, args) != 0)
-+ ERROR_MSG("not enough resources to create a new thread in this process");
-+
-+ ec_thread_register(id, name, desc);
-+
-+ DEBUG_MSG("ec_thread_new -- %lu created ", PTHREAD_ID(id));
-+
-+ /* The new thread will set the variable to "1" */
-+ for (;;) {
-+ INIT_LOCK;
-+
-+ if (init_lock_helper == 1) {
-+ INIT_UNLOCK;
-+ break;
-+ }
-+
-+ INIT_UNLOCK;
-+
-+ /* Wait for next term */
-+ sched_yield();
-+ }
-+#else
-
- /*
- * lock the mutex to syncronize with the new thread.
-@@ -209,6 +246,7 @@ pthread_t ec_thread_new(char *name, char
- /* the new thread will unlock this */
- INIT_LOCK;
- INIT_UNLOCK;
-+#endif
-
- return id;
- }
-@@ -219,6 +257,9 @@ pthread_t ec_thread_new(char *name, char
- */
- void ec_thread_init(void)
- {
-+#ifdef OS_BSD_NET
-+ INIT_LOCK;
-+
- pthread_t id = pthread_self();
-
- DEBUG_MSG("ec_thread_init -- %lu", PTHREAD_ID(id));
-@@ -231,9 +272,27 @@ void ec_thread_init(void)
- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
-
- /* sync with the creator */
-+ init_lock_helper = 1;
- INIT_UNLOCK;
-
- DEBUG_MSG("ec_thread_init -- (%lu) ready and syncronized", PTHREAD_ID(id));
-+#else
-+ pthread_t id = pthread_self();
-+
-+ DEBUG_MSG("ec_thread_init -- %lu", PTHREAD_ID(id));
-+
-+ /*
-+ * allow a thread to be cancelled as soon as the
-+ * cancellation request is received
-+ */
-+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-+ pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
-+
-+ /* sync with the creator */
-+ INIT_UNLOCK;
Home |
Main Index |
Thread Index |
Old Index