From bcb2c19a244db541beda1ca437736387499378e0 Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 10 Jan 2013 18:11:14 +0000 Subject: [PATCH] update ettercap to 0.7.5.1 but also mark it as BROKEN; mutex locking problems at runtime means this no longer works since the move to rthreads. --- net/ettercap/Makefile | 58 +++++++------ net/ettercap/distinfo | 7 +- .../patches/patch-CMakeFiles_lib_check_cmake | 35 ++++++++ net/ettercap/patches/patch-configure_in | 82 ------------------- .../patches/patch-include_ec_stdint_h | 12 --- ...man_ettercap_8 => patch-man_ettercap_8_in} | 8 +- .../patches/patch-plug-ins_CMakeLists_txt | 13 +++ .../patch-plug-ins_stp_mangler_stp_mangler_c | 8 +- net/ettercap/patches/patch-share_etter_conf | 10 +-- net/ettercap/patches/patch-src_ec_capture_c | 26 ------ .../patch-src_interfaces_gtk_ec_gtk_conf_c | 12 --- .../patches/patch-src_protocols_ec_tcp_c | 16 ---- net/ettercap/pkg/PFRAG.no-no_x11 | 7 ++ net/ettercap/pkg/PLIST | 45 +++------- 14 files changed, 110 insertions(+), 229 deletions(-) create mode 100644 net/ettercap/patches/patch-CMakeFiles_lib_check_cmake delete mode 100644 net/ettercap/patches/patch-configure_in delete mode 100644 net/ettercap/patches/patch-include_ec_stdint_h rename net/ettercap/patches/{patch-man_ettercap_8 => patch-man_ettercap_8_in} (73%) create mode 100644 net/ettercap/patches/patch-plug-ins_CMakeLists_txt delete mode 100644 net/ettercap/patches/patch-src_ec_capture_c delete mode 100644 net/ettercap/patches/patch-src_interfaces_gtk_ec_gtk_conf_c delete mode 100644 net/ettercap/patches/patch-src_protocols_ec_tcp_c create mode 100644 net/ettercap/pkg/PFRAG.no-no_x11 diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index 4fef192dd7e..ab918fd98ec 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -1,17 +1,17 @@ -# $OpenBSD: Makefile,v 1.56 2012/01/26 08:03:57 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.57 2013/01/10 18:11:14 sthen Exp $ + +BROKEN= broken mutex locking +# see http://marc.info/?l=openbsd-ports&m=135577437106908&w=2 SHARED_ONLY= Yes COMMENT= multi-purpose sniffer/interceptor/logger -VER= 0.7.3 -DISTNAME= ettercap-NG-${VER} -PKGNAME= ettercap-${VER} -REVISION= 10 +DISTNAME= ettercap-0.7.5.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ettercap/} -HOMEPAGE= http://ettercap.sourceforge.net/ +HOMEPAGE= http://www.ettercap-project.org/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes @@ -19,44 +19,42 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c crypto form menu ncurses panel pcap pthread ssl z -WANTLIB += lib/libnet-1.1/net=11 ltdl pcre +WANTLIB += c crypto curl curses form lib/libnet-1.1/net=11 menu ncurses +WANTLIB += panel pcap pcre pthread ssl z + +MODULES= devel/cmake \ + devel/gettext LIB_DEPENDS= net/libnet/1.1 \ - devel/libtool,-ltdl \ + net/curl \ devel/pcre FLAVORS= no_x11 FLAVOR?= -USE_LIBTOOL= Yes -USE_GROFF = Yes -LIBTOOL_FLAGS= --tag=disable-static -CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.59 -CONFIGURE_ARGS+= --with-libnet=${LOCALBASE} \ - --with-libpcre=${LOCALBASE} -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS+= -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + -DMAN_INSTALLDIR="${TRUEPREFIX}/man" .if ${FLAVOR:L:Mno_x11} -CONFIGURE_ARGS+= --enable-gtk=no +CONFIGURE_ARGS+= -DENABLE_GTK=off .else -MODULES = devel/gettext -LIB_DEPENDS += x11/gtk+2 -WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig -WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png pthread-stubs xcb gdk_pixbuf-2.0 -WANTLIB += gdk-x11-2.0 gtk-x11-2.0 +LIB_DEPENDS+= x11/gtk+2 +RUN_DEPENDS+= devel/desktop-file-utils \ + x11/gtk+2,-guic + +WANTLIB += atk-1.0 cairo curl freetype gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 pango-1.0 .endif NO_REGRESS= Yes post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ettercap - ${INSTALL_DATA} ${WRKINST}${SYSCONFDIR}/etter.conf \ - ${PREFIX}/share/examples/ettercap + mv ${WRKINST}/etc/ettercap ${PREFIX}/share/examples/ettercap + ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps \ + ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/desktop/ettercap.desktop \ + ${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKSRC}/desktop/ettercap.svg \ + ${PREFIX}/share/icons/hicolor/scalable/apps/ .include diff --git a/net/ettercap/distinfo b/net/ettercap/distinfo index d976e2fd89f..12b725ab0ef 100644 --- a/net/ettercap/distinfo +++ b/net/ettercap/distinfo @@ -1,5 +1,2 @@ -MD5 (ettercap-NG-0.7.3.tar.gz) = KPsVzQJBYsVSSYiP4bl4IA== -RMD160 (ettercap-NG-0.7.3.tar.gz) = 9ObA2HsgZLN3Xpr2DzRXUnN0JhY= -SHA1 (ettercap-NG-0.7.3.tar.gz) = eiw/hIyk85wH/d6w1jCGQSZbxP8= -SHA256 (ettercap-NG-0.7.3.tar.gz) = x0I5BS1iVlwTqC+bvyF6T9zOSzSUnjYbU7s/KOMWhUM= -SIZE (ettercap-NG-0.7.3.tar.gz) = 1138643 +SHA256 (ettercap-0.7.5.1.tar.gz) = cxPrAwlZmK/L29TZgbCaGjLSR+x4y1M6+/U1eaocovE= +SIZE (ettercap-0.7.5.1.tar.gz) = 721872 diff --git a/net/ettercap/patches/patch-CMakeFiles_lib_check_cmake b/net/ettercap/patches/patch-CMakeFiles_lib_check_cmake new file mode 100644 index 00000000000..08a695858d1 --- /dev/null +++ b/net/ettercap/patches/patch-CMakeFiles_lib_check_cmake @@ -0,0 +1,35 @@ +$OpenBSD: patch-CMakeFiles_lib_check_cmake,v 1.1 2013/01/10 18:11:14 sthen Exp $ +--- CMakeFiles/lib_check.cmake.orig Thu Jan 3 04:56:19 2013 ++++ CMakeFiles/lib_check.cmake Thu Jan 10 17:27:10 2013 +@@ -38,14 +38,10 @@ if(ENABLE_GTK) + include_directories(${GTK2_INCLUDE_DIRS}) + endif(GTK2_FOUND) + +- if(OS_DARWIN) +- find_library(FOUND_GTHREAD gthread-2.0) +- if(FOUND_GTHREAD) +- set(EC_LIBS ${EC_LIBS} ${FOUND_GTHREAD}) +- endif(FOUND_GTHREAD) +- else(OS_DARWIN) +- set(EC_LIBS ${EC_LIBS} gthread-2.0) +- endif(OS_DARWIN) ++ find_library(FOUND_GTHREAD gthread-2.0) ++ if(FOUND_GTHREAD) ++ set(EC_LIBS ${EC_LIBS} ${FOUND_GTHREAD}) ++ endif(FOUND_GTHREAD) + endif(ENABLE_GTK) + + if(ENABLE_SSL) +@@ -144,6 +140,12 @@ if(HAVE_LIBNET) + find_path(LIBNET_INCLUDE_DIR libnet.h) + if(LIBNET_INCLUDE_DIR) + include_directories(${LIBNET_INCLUDE_DIR}) ++ find_path(LIBNET_INCLUDE_DIR libnet.h) ++ else(LIBNET_INCLUDE_DIR) ++ find_path(LIBNET_INCLUDE_DIR libnet-1.1/libnet.h) ++ if(LIBNET_INCLUDE_DIR) ++ include_directories(${LIBNET_INCLUDE_DIR}/libnet-1.1) ++ endif(LIBNET_INCLUDE_DIR) + endif(LIBNET_INCLUDE_DIR) + set(EC_LIBS ${EC_LIBS} ${HAVE_LIBNET}) + else(HAVE_LIBNET) diff --git a/net/ettercap/patches/patch-configure_in b/net/ettercap/patches/patch-configure_in deleted file mode 100644 index 7e9c143b25d..00000000000 --- a/net/ettercap/patches/patch-configure_in +++ /dev/null @@ -1,82 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.1 2008/04/23 20:49:46 okan Exp $ ---- configure.in.orig Thu Jan 13 04:24:28 2005 -+++ configure.in Thu Apr 10 02:03:36 2008 -@@ -272,7 +272,9 @@ AC_SEARCH_LIBS(gzopen,c z,,AC_MSG_ERROR(not found.)) - dnl - dnl Do we have dn_expand ? - dnl --EC_RESOLVE_CHECK() -+HAVE_DN_EXPAND_TRUE='#' -+HAVE_DN_EXPAND_FALSE= -+ac_ec_dns=no - - dnl =============================== - dnl Check for non standard libs -@@ -328,17 +330,17 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug,cre - [ case "$enableval" in - yes) - AC_DEFINE(DEBUG, 1) -- DEBUG_FLAGS="-g -ggdb -Wmissing-prototypes -Wno-uninitialized -Werror -Wformat-security -Wsign-compare -Wall" -+ DEBUG_FLAGS="-g -ggdb -Wmissing-prototypes -Wno-uninitialized -Wformat-security -Wsign-compare -Wall" - AC_MSG_RESULT(yes) - ac_ec_debug=yes - ;; - no) AC_MSG_RESULT(no) -- DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall" -+ DEBUG_FLAGS="-Wall" - ac_ec_debug=no - ;; - esac ], - AC_MSG_RESULT(no) -- DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall" -+ DEBUG_FLAGS="-Wall" - ac_ec_debug=no - ) - -@@ -447,15 +449,6 @@ AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR - AC_MSG_RESULT(yes) ] - ) - --if test "$OS" = "WINDOWS"; then -- EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required])) -- EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required])) -- AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.])) -- AC_CHECK_LIB(iphlpapi, main) --else -- EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required])) --fi -- - dnl --------- - dnl libnet - dnl --------- -@@ -483,6 +476,13 @@ AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,u - LNETLIB="-L$withval/lib -L$withval/src -lnet" - ac_ec_libnet=$withval - AC_MSG_RESULT($withval) -+ elif test -f $withval/include/libnet-1.1/libnet.h; then -+ owd=`pwd` -+ if cd $withval; then withval=`pwd`; cd $owd; fi -+ LNETINC="-I$withval/include/libnet-1.1" -+ LNETLIB="-L$withval/lib/libnet-1.1 -lnet" -+ ac_ec_libnet=$withval -+ AC_MSG_RESULT($withval) - else - AC_MSG_RESULT(no) - AC_MSG_ERROR([libnet.h not found in $withval]) -@@ -500,7 +500,6 @@ AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,u - ] - ) - --EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required])) - - dnl ------------------ - dnl Checks for openssl -@@ -793,7 +792,7 @@ AC_ARG_ENABLE(gtk, AC_HELP_STRING(--enable-gtk,enable - dnl ----------------------- - dnl set up the final vars - dnl ----------------------- --EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC" -+EC_CFLAGS="$CFLAGS $DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC" - EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB" - - AC_SUBST(EC_CFLAGS) diff --git a/net/ettercap/patches/patch-include_ec_stdint_h b/net/ettercap/patches/patch-include_ec_stdint_h deleted file mode 100644 index fca533c37fa..00000000000 --- a/net/ettercap/patches/patch-include_ec_stdint_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-include_ec_stdint_h,v 1.1 2008/04/23 20:49:46 okan Exp $ ---- include/ec_stdint.h.orig Mon Mar 24 15:17:58 2008 -+++ include/ec_stdint.h Mon Mar 24 15:22:33 2008 -@@ -26,7 +26,7 @@ - typedef uint32_t u_int32; - typedef uint64_t u_int64; - -- #ifdef OS_BSD_OPEN -+ #if defined OS_BSD_OPEN && !defined HAVE_STDINT_H - #define INT8_MAX CHAR_MAX - #define UINT8_MAX UCHAR_MAX - #define INT16_MAX SHRT_MAX diff --git a/net/ettercap/patches/patch-man_ettercap_8 b/net/ettercap/patches/patch-man_ettercap_8_in similarity index 73% rename from net/ettercap/patches/patch-man_ettercap_8 rename to net/ettercap/patches/patch-man_ettercap_8_in index 93ce2b23c03..3d26fbdb29e 100644 --- a/net/ettercap/patches/patch-man_ettercap_8 +++ b/net/ettercap/patches/patch-man_ettercap_8_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-man_ettercap_8,v 1.1 2009/08/06 23:44:07 martynas Exp $ ---- man/ettercap.8.orig Fri May 27 18:12:11 2005 -+++ man/ettercap.8 Tue Aug 4 22:09:19 2009 -@@ -164,7 +164,7 @@ the subnet. +$OpenBSD: patch-man_ettercap_8_in,v 1.1 2013/01/10 18:11:14 sthen Exp $ +--- man/ettercap.8.in.orig Thu Jan 10 17:03:41 2013 ++++ man/ettercap.8.in Thu Jan 10 17:03:50 2013 +@@ -170,7 +170,7 @@ 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_CMakeLists_txt b/net/ettercap/patches/patch-plug-ins_CMakeLists_txt new file mode 100644 index 00000000000..2ebe84aa95e --- /dev/null +++ b/net/ettercap/patches/patch-plug-ins_CMakeLists_txt @@ -0,0 +1,13 @@ +$OpenBSD: patch-plug-ins_CMakeLists_txt,v 1.1 2013/01/10 18:11:14 sthen Exp $ +--- plug-ins/CMakeLists.txt.orig Thu Jan 10 17:10:03 2013 ++++ plug-ins/CMakeLists.txt Thu Jan 10 17:10:24 2013 +@@ -9,7 +9,9 @@ add_library(chk_poison MODULE chk_poison/chk_poison.c) + set_target_properties(chk_poison PROPERTIES PREFIX "ec_") + + add_library(dns_spoof MODULE dns_spoof/dns_spoof.c) ++if(HAVE_RESOLV) + target_link_libraries(dns_spoof ${HAVE_RESOLV}) ++endif(HAVE_RESOLV) + set_target_properties(dns_spoof PROPERTIES PREFIX "ec_") + + add_library(dos_attack MODULE dos_attack/dos_attack.c) diff --git a/net/ettercap/patches/patch-plug-ins_stp_mangler_stp_mangler_c b/net/ettercap/patches/patch-plug-ins_stp_mangler_stp_mangler_c index 50266a13f69..3d5f2726e76 100644 --- a/net/ettercap/patches/patch-plug-ins_stp_mangler_stp_mangler_c +++ b/net/ettercap/patches/patch-plug-ins_stp_mangler_stp_mangler_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-plug-ins_stp_mangler_stp_mangler_c,v 1.1 2011/08/18 19:23:22 naddy Exp $ +$OpenBSD: patch-plug-ins_stp_mangler_stp_mangler_c,v 1.2 2013/01/10 18:11:14 sthen Exp $ Conflicting definition used elsewhere. ---- plug-ins/stp_mangler/stp_mangler.c.orig Wed Aug 10 19:15:24 2011 -+++ plug-ins/stp_mangler/stp_mangler.c Wed Aug 10 19:15:39 2011 -@@ -63,7 +63,7 @@ struct stp_header +--- plug-ins/stp_mangler/stp_mangler.c.orig Thu Jan 3 04:56:19 2013 ++++ plug-ins/stp_mangler/stp_mangler.c Thu Jan 10 17:01:11 2013 +@@ -62,7 +62,7 @@ struct stp_header #define FAKE_PCK_LEN 60 struct packet_object fake_po; diff --git a/net/ettercap/patches/patch-share_etter_conf b/net/ettercap/patches/patch-share_etter_conf index 812f56fbc20..e1e9b483af9 100644 --- a/net/ettercap/patches/patch-share_etter_conf +++ b/net/ettercap/patches/patch-share_etter_conf @@ -1,7 +1,7 @@ -$OpenBSD: patch-share_etter_conf,v 1.3 2009/08/06 23:44:07 martynas Exp $ ---- share/etter.conf.orig Tue Oct 12 11:28:38 2004 -+++ share/etter.conf Wed Jul 16 15:49:45 2008 -@@ -14,8 +14,8 @@ +$OpenBSD: patch-share_etter_conf,v 1.4 2013/01/10 18:11:14 sthen Exp $ +--- share/etter.conf.orig Thu Jan 3 04:56:19 2013 ++++ share/etter.conf Thu Jan 10 17:01:11 2013 +@@ -13,8 +13,8 @@ ############################################################################ [privs] @@ -11,7 +11,7 @@ $OpenBSD: patch-share_etter_conf,v 1.3 2009/08/06 23:44:07 martynas Exp $ +ec_gid = 636 # _ettercap is the default [mitm] - arp_storm_delay = 10 # milliseconds + arp_storm_delay = 10 # seconds @@ -67,7 +67,7 @@ ftp = 21 # tcp 21 ssh = 22 # tcp 22 telnet = 23 # tcp 23 diff --git a/net/ettercap/patches/patch-src_ec_capture_c b/net/ettercap/patches/patch-src_ec_capture_c deleted file mode 100644 index 28eb173b57a..00000000000 --- a/net/ettercap/patches/patch-src_ec_capture_c +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-src_ec_capture_c,v 1.1 2008/04/23 20:49:46 okan Exp $ ---- src/ec_capture.c.orig Mon Mar 24 14:29:44 2008 -+++ src/ec_capture.c Mon Mar 24 14:31:05 2008 -@@ -211,8 +211,8 @@ void capture_init(void) - /* set the right dlt type for the iface */ - GBL_PCAP->dlt = pcap_datalink(pd); - -- DEBUG_MSG("capture_init: %s [%d]", pcap_datalink_val_to_description(GBL_PCAP->dlt), GBL_PCAP->dlt); -- USER_MSG("(%s)\n\n", pcap_datalink_val_to_description(GBL_PCAP->dlt)); -+ DEBUG_MSG("capture_init: [%d]", GBL_PCAP->dlt); -+ USER_MSG("\n\n"); - - /* check that the bridge type is the same as the main iface */ - if (GBL_SNIFF->type == SM_BRIDGED && pcap_datalink(pb) != GBL_PCAP->dlt) -@@ -221,9 +221,9 @@ void capture_init(void) - /* check if we support this media */ - if (get_decoder(LINK_LAYER, GBL_PCAP->dlt) == NULL) { - if (GBL_OPTIONS->read) -- FATAL_ERROR("Dump file not supported (%s)", pcap_datalink_val_to_description(GBL_PCAP->dlt)); -+ FATAL_ERROR("Dump file not supported"); - else -- FATAL_ERROR("Inteface \"%s\" not supported (%s)", GBL_OPTIONS->iface, pcap_datalink_val_to_description(GBL_PCAP->dlt)); -+ FATAL_ERROR("Inteface \"%s\" not supported", GBL_OPTIONS->iface); - } - - /* set the alignment for the buffer */ diff --git a/net/ettercap/patches/patch-src_interfaces_gtk_ec_gtk_conf_c b/net/ettercap/patches/patch-src_interfaces_gtk_ec_gtk_conf_c deleted file mode 100644 index 2fa0ee84f35..00000000000 --- a/net/ettercap/patches/patch-src_interfaces_gtk_ec_gtk_conf_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_interfaces_gtk_ec_gtk_conf_c,v 1.1 2008/04/23 20:49:46 okan Exp $ ---- src/interfaces/gtk/ec_gtk_conf.c.orig Wed Apr 9 14:30:55 2008 -+++ src/interfaces/gtk/ec_gtk_conf.c Wed Apr 9 14:32:31 2008 -@@ -66,7 +66,7 @@ short gtkui_conf_get(char *name) { - void gtkui_conf_read(void) { - FILE *fd; - char *path; -- char line[50], name[30]; -+ char line[100], name[30]; - short value; - - #ifdef OS_WINDOWS diff --git a/net/ettercap/patches/patch-src_protocols_ec_tcp_c b/net/ettercap/patches/patch-src_protocols_ec_tcp_c deleted file mode 100644 index 9a964555a3a..00000000000 --- a/net/ettercap/patches/patch-src_protocols_ec_tcp_c +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_protocols_ec_tcp_c,v 1.1 2011/08/02 18:40:16 dcoppa Exp $ - -Fix segfault when trying to scan for hosts on 64bit systems -(from Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521857) - ---- src/protocols/ec_tcp.c.orig Tue Sep 28 11:56:13 2004 -+++ src/protocols/ec_tcp.c Tue Aug 2 09:59:46 2011 -@@ -116,7 +116,7 @@ FUNC_DECODER(decode_tcp) - tcp = (struct tcp_header *)DECODE_DATA; - - opt_start = (u_char *)(tcp + 1); -- opt_end = (u_char *)((int)tcp + tcp->off * 4); -+ opt_end = (u_char *)tcp + tcp->off * 4; - - DECODED_LEN = (u_int32)(tcp->off * 4); - diff --git a/net/ettercap/pkg/PFRAG.no-no_x11 b/net/ettercap/pkg/PFRAG.no-no_x11 new file mode 100644 index 00000000000..aa38f10a3f0 --- /dev/null +++ b/net/ettercap/pkg/PFRAG.no-no_x11 @@ -0,0 +1,7 @@ +@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2013/01/10 18:11:14 sthen Exp $ +share/applications/ettercap.desktop +share/icons/hicolor/scalable/apps/ettercap.svg +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database diff --git a/net/ettercap/pkg/PLIST b/net/ettercap/pkg/PLIST index e774f5153a2..d75ad0c1e92 100644 --- a/net/ettercap/pkg/PLIST +++ b/net/ettercap/pkg/PLIST @@ -1,65 +1,38 @@ -@comment $OpenBSD: PLIST,v 1.18 2012/01/26 08:03:57 ajacoutot Exp $ -@newgroup _ettercap:636 -@newuser _ettercap:636:_ettercap:daemon:ettercap:/nonexistent:/sbin/nologin +@comment $OpenBSD: PLIST,v 1.19 2013/01/10 18:11:14 sthen Exp $ @bin bin/ettercap @bin bin/etterfilter @bin bin/etterlog lib/ettercap/ -@comment lib/ettercap/ec_arp_cop.la lib/ettercap/ec_arp_cop.so -@comment lib/ettercap/ec_autoadd.la lib/ettercap/ec_autoadd.so -@comment lib/ettercap/ec_chk_poison.la lib/ettercap/ec_chk_poison.so -@comment lib/ettercap/ec_dns_spoof.la lib/ettercap/ec_dns_spoof.so -@comment lib/ettercap/ec_dos_attack.la lib/ettercap/ec_dos_attack.so -@comment lib/ettercap/ec_dummy.la lib/ettercap/ec_dummy.so -@comment lib/ettercap/ec_find_conn.la lib/ettercap/ec_find_conn.so -@comment lib/ettercap/ec_find_ettercap.la lib/ettercap/ec_find_ettercap.so -@comment lib/ettercap/ec_find_ip.la lib/ettercap/ec_find_ip.so -@comment lib/ettercap/ec_finger.la lib/ettercap/ec_finger.so -@comment lib/ettercap/ec_finger_submit.la lib/ettercap/ec_finger_submit.so -@comment lib/ettercap/ec_gre_relay.la lib/ettercap/ec_gre_relay.so -@comment lib/ettercap/ec_gw_discover.la lib/ettercap/ec_gw_discover.so -@comment lib/ettercap/ec_isolate.la lib/ettercap/ec_isolate.so -@comment lib/ettercap/ec_link_type.la lib/ettercap/ec_link_type.so -@comment lib/ettercap/ec_pptp_chapms1.la +lib/ettercap/ec_nbns_spoof.so lib/ettercap/ec_pptp_chapms1.so -@comment lib/ettercap/ec_pptp_clear.la lib/ettercap/ec_pptp_clear.so -@comment lib/ettercap/ec_pptp_pap.la lib/ettercap/ec_pptp_pap.so -@comment lib/ettercap/ec_pptp_reneg.la lib/ettercap/ec_pptp_reneg.so -@comment lib/ettercap/ec_rand_flood.la lib/ettercap/ec_rand_flood.so -@comment lib/ettercap/ec_remote_browser.la lib/ettercap/ec_remote_browser.so -@comment lib/ettercap/ec_reply_arp.la lib/ettercap/ec_reply_arp.so -@comment lib/ettercap/ec_repoison_arp.la lib/ettercap/ec_repoison_arp.so -@comment lib/ettercap/ec_scan_poisoner.la lib/ettercap/ec_scan_poisoner.so -@comment lib/ettercap/ec_search_promisc.la lib/ettercap/ec_search_promisc.so -@comment lib/ettercap/ec_smb_clear.la lib/ettercap/ec_smb_clear.so -@comment lib/ettercap/ec_smb_down.la lib/ettercap/ec_smb_down.so -@comment lib/ettercap/ec_stp_mangler.la +lib/ettercap/ec_smurf_attack.so +lib/ettercap/ec_sslstrip.so lib/ettercap/ec_stp_mangler.so @man man/man5/etter.conf.5 @man man/man8/ettercap.8 @@ -68,11 +41,11 @@ lib/ettercap/ec_stp_mangler.so @man man/man8/etterfilter.8 @man man/man8/etterlog.8 share/ettercap/ -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.pcre share/ettercap/etter.filter.ssh share/ettercap/etter.finger.mac share/ettercap/etter.finger.os @@ -84,5 +57,11 @@ share/ettercap/etterfilter.cnt share/ettercap/etterfilter.tbl share/ettercap/etterlog.dtd share/examples/ettercap/ +@sample ${SYSCONFDIR}/ettercap/ share/examples/ettercap/etter.conf -@sample ${SYSCONFDIR}/etter.conf +@sample ${SYSCONFDIR}/ettercap/etter.conf +share/examples/ettercap/etter.dns +@sample ${SYSCONFDIR}/ettercap/etter.dns +share/examples/ettercap/etter.nbns +@sample ${SYSCONFDIR}/ettercap/etter.nbns +!%%no_x11%%