- Update to 0.7.1. For changes since 0.6.b see:

  http://ettercap.sourceforge.net/history.php
- Switch to build all the extras (like pcre and UTF-8 support, GTK2+ GUI,
  plugins etc.) by default but provide WITHOUT knobs so one can save on
  dependencies.

Approved by:	netchild

5 files changed, 81 insertions, 156 deletions

diff --git a/net-mgmt/ettercap/files/patch-aa b/net-mgmt/ettercap/files/patch-aa
deleted file mode 100644
index c38436d908ad..000000000000
--- a/net-mgmt/ettercap/files/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.in.orig	Thu Jun 27 19:27:33 2002
-+++ Makefile.in	Wed Jul 17 17:06:29 2002
-@@ -25,10 +25,10 @@
- DOC      = COPYING README README.PLUGINS README.WIN32 CHANGELOG HISTORY \
-            AUTHORS TODO TODO.WIN32 THANKS KNOWN-BUGS PORTINGS INSTALL \
-            ./plugins/H01_zaratan/ZARATAN.HOWTO ./plugins/H09_roper/ROPER.HOWTO \
--	   ./plugins/H03_hydra1/HYDRA.HOWTO    
-+	   ./plugins/H03_hydra1/HYDRA.HOWTO ./plugins/confusion/CONFUSION.HOWTO
- 
- DEBUG    = @DEBUG@
--CFLAG    = @E_CFLAGS@
-+CFLAG    = @CFLAGS@
- COPTS    = -I. -Isrc/include @COPTS@ @GTK_CFLAGS@
- 
- PROG     = @PROG@
-@@ -74,12 +74,7 @@
- 	$(INSTALL) -m 644 ./etter.filter.ssh $(DESTDIR)$(DATADIR)
- 	$(INSTALL) -m 644 ./etter.passive.os.fp $(DESTDIR)$(DATADIR)
- 	$(INSTALL) -m 644 ./etter.ssl.crt $(DESTDIR)$(DATADIR)
--	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
--	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
--	$(INSTALL) -m 644 ./THANKS $(DESTDIR)$(DATADIR)
--	$(INSTALL) -m 644 ./AUTHORS $(DESTDIR)$(DATADIR)
- 	-$(INSTALL) -m 644 ./share/[a-z]* $(DESTDIR)$(DATADIR)
--	-$(INSTALL) -m 644 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
- 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
- 	$(INSTALL) -m 644 $(PROG).8 $(DESTDIR)$(MANDIR)/man8/$(PROG).8
- 	@echo
-@@ -88,6 +83,17 @@
- 	@echo "@SB@ $(PROG)@EB@     installed in @SB@$(DESTDIR)$(BINDIR) @EB@"
- 	@echo "@SB@ shared files@EB@ installed in @SB@$(DESTDIR)$(DATADIR) @EB@"
- 	@echo "@SB@ man pages@EB@    installed in @SB@$(DESTDIR)$(MANDIR)/man8/ @EB@"
-+	@echo
-+	@echo "=============================================================="
-+	@echo
-+
-+install-doc:
-+	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
-+	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
-+	-$(INSTALL) -m 644 ./docs/development/[a-z]* $(DESTDIR)$(DOCDIR)
-+	@echo
-+	@echo "=============================================================="
-+	@echo
- 	@echo "@SB@ DOCS@EB@         installed in @SB@$(DESTDIR)$(DOCDIR) @EB@"
- 	@echo
- 	@echo "=============================================================="
diff --git a/net-mgmt/ettercap/files/patch-ab b/net-mgmt/ettercap/files/patch-ab
index 1d1b7a831774..77db4c590bf0 100644
--- a/net-mgmt/ettercap/files/patch-ab
+++ b/net-mgmt/ettercap/files/patch-ab
@@ -1,64 +1,17 @@
 --- configure.orig	Fri Jun 14 18:53:14 2002
 +++ configure	Wed Jul 17 17:09:18 2002
-@@ -3924,27 +3924,27 @@
- if test "${ac_cv_path_WGET_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case $WGET_PATH in
--  [\\/]* | ?:[\\/]*)
-+#  case $WGET_PATH in
-+#  [\\/]* | ?:[\\/]*)
-   ac_cv_path_WGET_PATH="$WGET_PATH" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_WGET_PATH="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
-+#  ;;
-+#  *)
-+#  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+#for as_dir in $PATH
-+#do
-+#  IFS=$as_save_IFS
-+#  test -z "$as_dir" && as_dir=.
-+#  for ac_exec_ext in '' $ac_executable_extensions; do
-+#  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+#    ac_cv_path_WGET_PATH="$as_dir/$ac_word$ac_exec_ext"
-+#    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+#    break 2
-+#  fi
-+#done
-+#done
- 
--  ;;
--esac
-+#  ;;
-+#esac
- fi
- WGET_PATH=$ac_cv_path_WGET_PATH
- 
-@@ -6676,8 +6676,8 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -27504,8 +27504,8 @@
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
  if test "$ac_cv_search_pthread_create" = no; then
--  for ac_lib in pthread; do
+-  for ac_lib in c_r pthread; do
 -    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+#  for ac_lib in pthread; do
++#  for ac_lib in c_r pthread; do
 +    LIBS="%%PTHREAD_LIBS%%  $ac_func_search_save_LIBS"
      cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -6713,7 +6713,7 @@
+ _ACEOF
+@@ -27550,7 +27550,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -67,54 +20,83 @@
  break
  else
    echo "$as_me: failed program was:" >&5
-@@ -6721,7 +6721,7 @@
- 
+@@ -27559,7 +27559,7 @@
  fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
 -  done
 +#  done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
-@@ -9720,14 +9720,14 @@
+@@ -27699,10 +27699,10 @@
+ fi
+ 
+    elif test "$OS" != "MACOSX" -a "$OS" != "WINDOWS"; then
+-      echo "$as_me:$LINENO: checking whether $CC accepts -pthread" >&5
+-echo $ECHO_N "checking whether $CC accepts -pthread... $ECHO_C" >&6
++      echo "$as_me:$LINENO: checking whether $CC accepts %%PTHREAD_LIBS%%" >&5
++echo $ECHO_N "checking whether $CC accepts %%PTHREAD_LIBS%%... $ECHO_C" >&6
+       LDFLAGS_store="$LDFLAGS"
+-      LDFLAGS="$LDFLAGS -pthread"
++      LDFLAGS="$LDFLAGS %%PTHREAD_LIBS%%"
+       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30441,14 +30441,14 @@
        ;;
-    no)  echo "$as_me:$LINENO: result: no." >&5
- echo "${ECHO_T}no." >&6
--      E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-+#      E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-       ac_cv_ec_debug=no
+    no)  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-      DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++      DEBUG_FLAGS="-Wall"
+       ac_ec_debug=no
        ;;
  esac
  else
-   echo "$as_me:$LINENO: result: no. disabled by default." >&5
- echo "${ECHO_T}no. disabled by default." >&6
--   E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-+#   E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-    ac_cv_ec_debug=no
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-   DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++   DEBUG_FLAGS="-Wall"
+    ac_ec_debug=no
  
  fi;
-@@ -10149,6 +10149,8 @@
-    if test $ac_cv_ec_ssh = "yes"; then
-       CYGWINLIB="$CYGWINLIB cygcrypto.dll cygssl.dll"
-       echo "Dissector_ssh" >> ./src/ec_add.def
-+   else
-+      PLUGINS_SOURCES=`echo $PLUGINS_SOURCES | sed 's/.\/plugins\/H03_hydra1\/H03_hydra1.c//g'`
-    fi
+@@ -30935,7 +30935,7 @@
  
+    OLDLDFLAGS="${LDFLAGS}"
+    OLDLIBS="${LIBS}"
+-   LDFLAGS="$PCAPLIB"
++   LDFLAGS="$LDFLAGS $PCAPLIB"
+    LIBS="$LIBS"
  
-@@ -10302,9 +10304,15 @@
- if test "$ac_cv_ec_plugin" = "yes"; then
+ echo "$as_me:$LINENO: checking for pcap_datalink_val_to_description in -lpcap" >&5
+@@ -31271,6 +31271,16 @@
  
-    PLUGINS=`ls ./plugins | grep -v Make | grep -v CVS | awk ' { printf "%s ", $1 } '`
-+   if test $ac_cv_ec_ssh = "no"; then
-+      PLUGINS=`echo $PLUGINS | sed 's/H03_hydra1//g'`
-+   fi
  
  
-    makeplug=`ls ./plugins | grep -v Make | grep -v CVS | awk '{ printf("plugins/%s/Makefile ", $1) }'`
-+   if test $ac_cv_ec_ssh = "no"; then
-+      makeplug=`echo $makeplug | sed 's/plugins\/H03_hydra1\/Makefile//g'`
-+   fi
-    makeplug="plugins/Makefile $makeplug"
-    MAKEPLUG="1"
- else
++if false; then
++  HAVE_PCRE_TRUE=
++  HAVE_PCRE_FALSE='#'
++else
++  HAVE_PCRE_TRUE='#'
++  HAVE_PCRE_FALSE=
++fi
++
++
++
+ 
+ ac_ec_pcre=no
+ 
+@@ -32817,6 +32827,13 @@
+   { { echo "$as_me:$LINENO: error: conditional \"OPENSSL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"OPENSSL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_PCRE_TRUE}" && test -z "${HAVE_PCRE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_PCRE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_PCRE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
diff --git a/net-mgmt/ettercap/files/patch-plugins::H03_hydra1::Makefile.in b/net-mgmt/ettercap/files/patch-plugins::H03_hydra1::Makefile.in
deleted file mode 100644
index fe888fe1146b..000000000000
--- a/net-mgmt/ettercap/files/patch-plugins::H03_hydra1::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/H03_hydra1/Makefile.in.orig	Sun May  4 18:58:02 2003
-+++ plugins/H03_hydra1/Makefile.in	Sun May  4 18:58:37 2003
-@@ -3,7 +3,7 @@
- DEFS     = @PICFLAG@ @DEFS@ -D@OS@
- 
- CFLAG    = @CFLAGS@
--COPTS    = -I../..
-+COPTS    = -I../.. @COPTS@
- 
- PROG     = H03_hydra1
- 
diff --git a/net-mgmt/ettercap/files/patch-plugins::Makefile.in b/net-mgmt/ettercap/files/patch-plugins::Makefile.in
deleted file mode 100644
index efc2b4ff39dd..000000000000
--- a/net-mgmt/ettercap/files/patch-plugins::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/Makefile.in.orig	Sun May  4 01:59:51 2003
-+++ plugins/Makefile.in	Sun May  4 02:00:18 2003
-@@ -13,7 +13,7 @@
- 	make -C $$plug; \
- 	done
- 
--install: plugins
-+install:
- 	for plug in $(PLUGINS); do \
- 	$(INSTALL) -d $(DESTDIR)$(PLUGDIR) ; \
- 	$(INSTALL) -m 700 ./$$plug/ec_$$plug.so $(DESTDIR)$(PLUGDIR) ; \
diff --git a/net-mgmt/ettercap/files/patch-share::Makefile.in b/net-mgmt/ettercap/files/patch-share::Makefile.in
new file mode 100644
index 000000000000..02b8e5164a3a
--- /dev/null
+++ b/net-mgmt/ettercap/files/patch-share::Makefile.in
@@ -0,0 +1,11 @@
+--- share/Makefile.in.orig	Thu Oct  7 21:05:28 2004
++++ share/Makefile.in	Thu Oct  7 21:35:57 2004
+@@ -416,7 +416,7 @@
+ 
+ install-data-am: install-pkgdataDATA
+ 
+-install-exec-am: install-sysconfDATA
++install-exec-am:
+ 
+ install-info: install-info-am
+