From ba282c2daaff24a1e7e4a04caa0f26d602bc6cc4 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Nov 2014 18:24:33 +0000 Subject: - Update to 0.8.1 - Cleanup PLIST Changes: https://github.com/Ettercap/ettercap/releases --- net-mgmt/ettercap/Makefile | 25 ++---- net-mgmt/ettercap/distinfo | 4 +- net-mgmt/ettercap/files/patch-include-ec.h | 11 --- net-mgmt/ettercap/files/patch-safe_free_mem | 122 ---------------------------- net-mgmt/ettercap/files/patch-src-ec_send.c | 11 --- net-mgmt/ettercap/pkg-plist | 38 +-------- 6 files changed, 13 insertions(+), 198 deletions(-) delete mode 100644 net-mgmt/ettercap/files/patch-include-ec.h delete mode 100644 net-mgmt/ettercap/files/patch-safe_free_mem delete mode 100644 net-mgmt/ettercap/files/patch-src-ec_send.c (limited to 'net-mgmt') diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile index d5548c5ff492..e1324b417b4b 100644 --- a/net-mgmt/ettercap/Makefile +++ b/net-mgmt/ettercap/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ettercap -PORTVERSION= 0.8.0 -PORTREVISION= 2 +PORTVERSION= 0.8.1 PORTEPOCH= 1 CATEGORIES= net-mgmt security @@ -23,13 +22,11 @@ PCRE_DESC= Use PCRE in filters SSL_DESC= SSH1 and SSL decryption support CMAKE_ARGS= -DBUNDLED_LIBS=OFF \ - -DHAVE_LIBNET=${LOCALBASE}/lib/libnet11 \ + -DHAVE_DLOPEN=ON \ -DHAVE_PCAP=${LIBDIR} \ -DHAVE_RESOLV=${LIBDIR} \ + -DHAVE_LIBNET=${LOCALBASE}/lib/libnet11 \ -DINSTALL_SYSCONFDIR=${PREFIX}/etc \ - -DLIBNET_INCLUDE_DIR=${LOCALBASE}/include/libnet11 \ - -DLIBNET_LIB_DIR=${LOCALBASE}/lib/libnet11 \ - -DLIBNET_LIBRARY=${LOCALBASE}/lib/libnet11 \ -DMAN_INSTALLDIR=${PREFIX}/man CMAKE_VERBOSE= yes LDFLAGS+= -L${LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet11 ${ICONV_LIB} -lnet -lpcap @@ -38,14 +35,16 @@ USES= bison cmake:outsource cpe iconv pkgconfig DOCS= AUTHORS CHANGELOG README README.BINARIES README.BUGS \ README.GIT README.PLATFORMS THANKS TODO TODO.TESTING \ - doc/capture doc/decoders doc/dissectors doc/threads + doc/capture doc/decoders doc/dissectors doc/plugins doc/threads +PORTDATA= * +PORTDOCS= * CPE_VENDOR= ${PORTNAME}_project GH_ACCOUNT= Ettercap GH_PROJECT= ${PORTNAME} GH_TAGNAME= v${PORTVERSION} -GH_COMMIT= 99e062a +GH_COMMIT= 535f984 USE_GITHUB= yes DESKTOP_CMAKE_OFF= -DINSTALL_DESKTOP=OFF @@ -67,6 +66,7 @@ PLUGINS_BUILD_DEPENDS= curl>=7.26.0:${PORTSDIR}/ftp/curl PLUGINS_CMAKE_OFF= -DENABLE_PLUGINS=OFF PLUGINS_CMAKE_ON= -DENABLE_PLUGINS=ON PLUGINS_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +PLUGINS_USE= LDCONFIG=${PREFIX}/lib/ettercap PLUGINS_USE_OFF= LDCONFIG=yes SSL_CMAKE_OFF= -DENABLE_SSL=OFF SSL_CMAKE_ON= -DENABLE_SSL=ON @@ -76,15 +76,8 @@ UTF8_CMAKE_ON= -DHAVE_UTF8=ON \ -DHAVE_ICONV=${ICONV_PREFIX} UTF8_USES= iconv -.include - -.if ${PORT_OPTIONS:MPLUGINS} -USE_LDCONFIG= ${PREFIX}/lib/ettercap -DOCS+= doc/plugins -.endif - post-install: - ${INSTALL_DATA} ${WRKSRC}/share/etter.conf ${STAGEDIR}${PREFIX}/etc/etter.conf.sample + ${INSTALL_DATA} ${STAGEDIR}${ETCDIR}/etter.conf ${STAGEDIR}${PREFIX}/etc/etter.conf.sample ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ diff --git a/net-mgmt/ettercap/distinfo b/net-mgmt/ettercap/distinfo index 89c8bdaea368..6db6c8b95e30 100644 --- a/net-mgmt/ettercap/distinfo +++ b/net-mgmt/ettercap/distinfo @@ -1,2 +1,2 @@ -SHA256 (ettercap-0.8.0.tar.gz) = 0533f2fb41528d2100e36523772b8c43b1ca96c4720364dbb8bc7e665a6c4da9 -SIZE (ettercap-0.8.0.tar.gz) = 7069171 +SHA256 (ettercap-0.8.1.tar.gz) = b121313fcfdd9a28349df74040df13d8229ee1bfa0e0a301306c952d9f520e5b +SIZE (ettercap-0.8.1.tar.gz) = 7903392 diff --git a/net-mgmt/ettercap/files/patch-include-ec.h b/net-mgmt/ettercap/files/patch-include-ec.h deleted file mode 100644 index a79e660c8459..000000000000 --- a/net-mgmt/ettercap/files/patch-include-ec.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/ec.h.orig 2013-09-12 04:18:45.000000000 +0800 -+++ include/ec.h 2013-10-22 03:14:56.006394661 +0800 -@@ -12,6 +12,8 @@ - #include - #include - -+#include -+ - #ifdef OS_WINDOWS - #include - #endif diff --git a/net-mgmt/ettercap/files/patch-safe_free_mem b/net-mgmt/ettercap/files/patch-safe_free_mem deleted file mode 100644 index 817e1bbbb993..000000000000 --- a/net-mgmt/ettercap/files/patch-safe_free_mem +++ /dev/null @@ -1,122 +0,0 @@ -From 33ac95f78e4f6f067e6bc33b8883b3b7daa896f3 Mon Sep 17 00:00:00 2001 -From: "Emilio A. Escobar" -Date: Wed, 11 Sep 2013 16:53:57 -0400 -Subject: [PATCH] Fix for issue #344, now safe_free_mem() will be available for - all OS'es - ---- - include/ec.h | 3 +++ - src/CMakeLists.txt | 1 + - src/ec_mem.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ - src/os/ec_linux.c | 10 ---------- - 4 files changed, 51 insertions(+), 10 deletions(-) - create mode 100644 src/ec_mem.c - -diff --git a/include/ec.h b/include/ec.h -index 069e3f1..270860a 100644 ---- include/ec.h.orig -+++ include/ec.h -@@ -172,6 +172,9 @@ - /* exported by ec_main */ - EC_API_EXTERN void clean_exit(int errcode); - -+/* exported by ec_mem */ -+EC_API_EXTERN void safe_free_mem(char **param, int *param_length, char *command); -+ - - #endif /* EC_H */ - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 22d021d..4754073 100644 ---- src/CMakeLists.txt.orig -+++ src/CMakeLists.txt -@@ -1,4 +1,5 @@ - set(EC_SRC -+ ec_mem.c - ec_capture.c - ec_checksum.c - ec_conf.c -diff --git a/src/ec_mem.c b/src/ec_mem.c -new file mode 100644 -index 0000000..b1d8d34 ---- /dev/null -+++ src/ec_mem.c -@@ -0,0 +1,47 @@ -+/* -+ ettercap -- global variables handling module -+ -+ Copyright (C) ALoR & NaGA -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+*/ -+ -+#include -+ -+void safe_free_mem(char **param, int *param_length, char *command); -+ -+ -+void safe_free_mem(char **param, int *param_length, char *command) -+{ -+ int k; -+ -+ SAFE_FREE(command); -+ for(k= 0; k < (*param_length); ++k) -+ SAFE_FREE(param[k]); -+ SAFE_FREE(param); -+} -+ -+ -+ -+ -+ -+ -+ -+ -+/* EOF */ -+ -+// vim:ts=3:expandtab -+ -diff --git a/src/os/ec_linux.c b/src/os/ec_linux.c -index e27cd2b..32a7b13 100644 ---- src/os/ec_linux.c.orig -+++ src/os/ec_linux.c -@@ -31,7 +31,6 @@ - static void restore_ip_forward(void); - u_int16 get_iface_mtu(const char *iface); - void disable_interface_offload(void); --void safe_free_mem(char **param, int *param_length, char *command); - - /*******************************************/ - -@@ -133,15 +132,6 @@ u_int16 get_iface_mtu(const char *iface) - return mtu; - } - --void safe_free_mem(char **param, int *param_length, char *command) --{ -- int k; -- -- SAFE_FREE(command); -- for(k= 0; k < (*param_length); ++k) -- SAFE_FREE(param[k]); -- SAFE_FREE(param); --} - - /* - * disable segmentation offload on interface --- -1.8.4 - diff --git a/net-mgmt/ettercap/files/patch-src-ec_send.c b/net-mgmt/ettercap/files/patch-src-ec_send.c deleted file mode 100644 index 7f3334f7be31..000000000000 --- a/net-mgmt/ettercap/files/patch-src-ec_send.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ec_send.c.orig 2013-09-12 04:18:45.000000000 +0800 -+++ src/ec_send.c 2013-10-22 03:13:55.980398663 +0800 -@@ -22,7 +22,7 @@ - #include - - #if defined(OS_DARWIN) || defined(OS_BSD) -- #include -+// #include - #include - #endif - diff --git a/net-mgmt/ettercap/pkg-plist b/net-mgmt/ettercap/pkg-plist index a9c21d15d178..16f325f57e90 100644 --- a/net-mgmt/ettercap/pkg-plist +++ b/net-mgmt/ettercap/pkg-plist @@ -41,6 +41,8 @@ bin/etterlog %%PLUGINS%%lib/ettercap/ec_sslstrip.so %%PLUGINS%%lib/ettercap/ec_stp_mangler.so lib/libettercap.so +lib/libettercap.so.0 +lib/libettercap.so.0.0.0 man/man5/etter.conf.5.gz man/man8/ettercap.8.gz %%DESKTOP%%man/man8/ettercap-pkexec.8.gz @@ -49,41 +51,5 @@ man/man8/etterfilter.8.gz man/man8/etterlog.8.gz %%PLUGINS%%man/man8/ettercap_plugins.8.gz %%DESKTOP%%share/applications/ettercap.desktop -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.BINARIES -%%PORTDOCS%%%%DOCSDIR%%/README.BUGS -%%PORTDOCS%%%%DOCSDIR%%/README.GIT -%%PORTDOCS%%%%DOCSDIR%%/README.PLATFORMS -%%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/TODO.TESTING -%%PORTDOCS%%%%DOCSDIR%%/capture -%%PORTDOCS%%%%DOCSDIR%%/decoders -%%PORTDOCS%%%%DOCSDIR%%/dissectors -%%PLUGINS%%%%PORTDOCS%%%%DOCSDIR%%/plugins -%%PORTDOCS%%%%DOCSDIR%%/threads -%%DATADIR%%/etter.fields -%%DATADIR%%/etter.filter -%%DATADIR%%/etter.filter.examples -%%DATADIR%%/etter.filter.kill -%%DATADIR%%/etter.filter.pcre -%%DATADIR%%/etter.filter.ssh -%%DATADIR%%/etter.finger.mac -%%DATADIR%%/etter.finger.os -%%DATADIR%%/etter.mime -%%DATADIR%%/etter.services -%%DATADIR%%/etter.ssl.crt -%%DATADIR%%/ettercap.png -%%DATADIR%%/etterfilter.cnt -%%DATADIR%%/etterfilter.tbl -%%DATADIR%%/etterlog.dtd %%DESKTOP%%share/pixmaps/ettercap.svg %%DESKTOP%%share/polkit-1/actions/org.pkexec.ettercap.policy -%%DESKTOP%%@dirrmtry share/polkit-1/actions -%%DESKTOP%%@dirrmtry share/polkit-1 -@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PLUGINS%%@dirrm lib/ettercap -@dirrm %%ETCDIR%% -- cgit