Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/net
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1923
Modified Files:
ettercap.info
Added Files:
ettercap_safe-free-mem.patch
Log Message:
ettercap 0.8.0
--- NEW FILE: ettercap_safe-free-mem.patch ---
>From 33ac95f78e4f6f067e6bc33b8883b3b7daa896f3 Mon Sep 17 00:00:00 2001
From: "Emilio A. Escobar" <eesco...@gmail.com>
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
--- a/include/ec.h
+++ b/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
--- a/src/CMakeLists.txt
+++ b/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
+++ b/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 <ec.h>
+
+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
--- a/src/os/ec_linux.c
+++ b/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
Index: ettercap.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/ettercap.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ettercap.info 14 Aug 2013 18:04:12 -0000 1.9
+++ ettercap.info 8 Oct 2013 18:50:58 -0000 1.10
@@ -1,6 +1,6 @@
Info2: <<
Package: ettercap%type_pkg[-gtk]
-Version: 0.7.6
+Version: 0.8.0
Revision: 1
Description: Powerful net sniffer (with OpenSSL)
License: GPL
@@ -26,8 +26,8 @@
<<
BuildDepends: <<
cctools (>= 446-1),
-
cmake,
+ fink (>= 0.30.0),
fink-package-precedence,
gettext-bin,
gettext-tools,
@@ -40,7 +40,6 @@
libpcre1,
libtool2,
system-openssl-dev,
-
(%type_raw[-gtk] = -gtk) atk1 (>= 1.32.0-1),
(%type_raw[-gtk] = -gtk) cairo (>= 1.12.14-1),
(%type_raw[-gtk] = -gtk) fontconfig2-dev (>= 2.10.2-1),
@@ -62,11 +61,14 @@
ettercap-ssl,
ettercap-ssl-gtk
<<
-Source: mirror:sourceforge:ettercap/%{Ni}-%v.tar.gz
+Source: https://github.com/Ettercap/ettercap/archive/v%v.tar.gz
Source-MD5: 7c5f5e1fd4002afdfd13765ef92866e1
-Source-Checksum: SHA1(55818952a8c28beb1b650f3ccc9600a2d784a18f)
+Source-Checksum: SHA1(008fca94bbd67b578699300eb321766cd41fbfff)
+SourceRename: %{Ni}-%v.tar.gz
PatchFile: %{Ni}.patch
PatchFile-MD5: 854f5b5483beed16577ccc77cd01d4fb
+PatchFile2: %{Ni}_safe-free-mem.patch
+PatchFile2-MD5: 4e3e371aa4acd8dafef04d1e0a34f1c4
PatchScript: <<
%{default_script}
perl -pi -e 's|INSTALL_DATADIR|"%p/share"|' \
@@ -76,9 +78,9 @@
src/ec_sslwrap.c
perl -pi -e 's|INSTALL_LIBDIR|"%p/lib"|'
src/interfaces/gtk/ec_gtk_plugins.c src/ec_plugins.c
perl -pi -e 's|INSTALL_SYSCONFDIR|"%p/etc"|' src/ec_file.c
- perl -pi -e 's|MACPORTS_BASE_DIRECTORY|FINK_BASE_DIRECTORY|g'
CMakeLists.txt
+ # https://github.com/Ettercap/ettercap/issues/326
+ perl -ni -e 'print unless /net\/bpf.h/' src/ec_send.c
<<
-#UseMaxBuildJobs: false
SetLDFLAGS: -L%p/lib/system-openssl/lib
NoSetMACOSX_DEPLOYMENT_TARGET: true
CompileScript: <<
@@ -92,10 +94,11 @@
pushd finkbuild
cmake \
-DCMAKE_INSTALL_PREFIX=%p \
+ -DCMAKE_INSTALL_NAME_DIR=%p/lib \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_C_FLAGS:STRING=-MD \
-DINSTALL_SYSCONFDIR=%p/etc \
- -DFINK_BASE_DIRECTORY:PATH=%p \
+ -DSPECIAL_LIB_DIR:PATH=%p \
-DCURL_INCLUDE_DIR:PATH=%p/include \
-DCURL_LIBRARY:FILEPATH=%p/lib/libcurl.dylib \
-DCURSES_CURSES_H_PATH:PATH=%p/include \
@@ -119,6 +122,9 @@
ln -s %p/etc/ettercap %i/share/ettercap
popd
<<
+Shlibs: <<
+ !%p/lib/libettercap.dylib
+<<
ConfFiles: <<
%p/etc/ettercap/etter.conf
%p/etc/ettercap/etter.dns
@@ -152,7 +158,8 @@
<<
DescUsage: <<
Ettercap must be run as root, either through "sudo" or "su -".
-Start Ettercap with the -C option to use the curse interface.
+Start Ettercap with the -C option to use the curses interface.
+If using ettercap-gtk, start with -G to use the graphical interface.
<<
DescPackaging: <<
'CMakeParams' points to proper locations of Fink provided libraries, rather
@@ -172,5 +179,10 @@
Unset MACOSX_DEPLOYMENT_TARGET because newer cmake doesn't like it
when it and OSX_SYSROOT mismatch (as when only the command line
tools
are installed).
+
+nieder: 0.8.0
+ Fix for _safe_free_mem not defined
+ https://github.com/Ettercap/ettercap/issues/344
+ https://github.com/Ettercap/ettercap/pull/354
<<
<<
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
