update to 0.6.9

changes:
+ GTK+ 2.0 interface (experimental) (--enable-devel)
+ Windows Plugins porting
+ Updated the passive OS fingerprint database (1093 records)
+ Dissector Proxy 8080
+ NTLM auth
+ Enhanced poisoning method (solaris issue)
+ NEW PLUGIN: troll, PPTP suite
+ text and ebcdic view from command line
+ lc-convert utility (share dir)
-fixes

5 files changed, 46 insertions, 14 deletions

diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 0bd71aeef20..08851c1b08a 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2003/01/24 13:36:20 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/30 10:46:56 drochner Exp $
 
-DISTNAME=		ettercap-0.6.7
+DISTNAME=		ettercap-0.6.9
 CATEGORIES=		security net
 MASTER_SITES=		http://ettercap.sourceforge.net/download/
 
@@ -17,6 +17,9 @@ USE_BUILDLINK2=		yes
 USE_NCURSES=		# newpad(), MAX_FORM_COMMAND
 PTHREAD_OPTS+=		require
 
+post-build:
+			cd ${WRKSRC}/plugins ; ${MAKE_ENV} ${MAKE} all
+
 post-install:
 			cd ${WRKSRC}/plugins ; ${MAKE_ENV} ${MAKE} install
 
diff --git a/net/ettercap/PLIST b/net/ettercap/PLIST
index bcb75d789fc..73e5e2a5452 100644
--- a/net/ettercap/PLIST
+++ b/net/ettercap/PLIST
@@ -1,7 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/05 00:29:02 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/30 10:46:57 drochner Exp $
 lib/ettercap/ec_H00_lurker.so
 lib/ettercap/ec_H01_zaratan.so
-lib/ettercap/ec_H05_roper.so
+lib/ettercap/ec_H02_troll.so
+lib/ettercap/ec_H03_hydra1.so
+lib/ettercap/ec_H04_hydra2.so
+lib/ettercap/ec_H05_hydra3.so
+lib/ettercap/ec_H06_hydra4.so
+lib/ettercap/ec_H07_hydra5.so
+lib/ettercap/ec_H08_hydra6.so
+lib/ettercap/ec_H09_roper.so
 lib/ettercap/ec_H10_phantom.so
 lib/ettercap/ec_H20_dwarf.so
 lib/ettercap/ec_H30_thief.so
@@ -26,6 +33,7 @@ share/doc/ettercap/AUTHORS
 share/doc/ettercap/CHANGELOG
 share/doc/ettercap/COPYING
 share/doc/ettercap/HISTORY
+share/doc/ettercap/HYDRA.HOWTO
 share/doc/ettercap/INSTALL
 share/doc/ettercap/KNOWN-BUGS
 share/doc/ettercap/PORTINGS
@@ -41,6 +49,8 @@ share/doc/ettercap/debug.txt
 share/doc/ettercap/errors.txt
 share/doc/ettercap/ettercap.fr.8.in
 share/doc/ettercap/threads.txt
+share/ettercap/AUTHORS
+share/ettercap/THANKS
 share/ettercap/etter.conf
 share/ettercap/etter.dns
 share/ettercap/etter.filter
@@ -48,6 +58,7 @@ share/ettercap/etter.filter.ssh
 share/ettercap/etter.mime
 share/ettercap/etter.passive.os.fp
 share/ettercap/etter.ssl.crt
+share/ettercap/lc-converter.c
 share/ettercap/mac-fingerprints
 share/ettercap/nmap-os-fingerprints
 share/ettercap/services
diff --git a/net/ettercap/distinfo b/net/ettercap/distinfo
index b6d7d310449..b16f30872b1 100644
--- a/net/ettercap/distinfo
+++ b/net/ettercap/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/11/19 21:07:57 agc Exp $
+$NetBSD: distinfo,v 1.5 2003/01/30 10:46:57 drochner Exp $
 
-SHA1 (ettercap-0.6.7.tar.gz) = 09c4614bd5581f9af920911d3c9b0e93f2961976
-Size (ettercap-0.6.7.tar.gz) = 559056 bytes
-SHA1 (patch-aa) = faf5044190e8f30e0490238d276ff65a8c5bfb98
+SHA1 (ettercap-0.6.9.tar.gz) = 2f70055af569cca75cf2460677229b7b4e4c38a5
+Size (ettercap-0.6.9.tar.gz) = 681245 bytes
+SHA1 (patch-aa) = 50d559708ba4c89fd1848f379c57bc84ec424dfb
 SHA1 (patch-ab) = 107ef5dda9457313d7d939745a6a21dbe2b989ce
+SHA1 (patch-ac) = 6771b96f36fa9439b0edf79e632f0d2f1125eecd
diff --git a/net/ettercap/patches/patch-aa b/net/ettercap/patches/patch-aa
index 24665219ffc..87f71bd9d58 100644
--- a/net/ettercap/patches/patch-aa
+++ b/net/ettercap/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2002/06/05 00:29:02 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2003/01/30 10:46:57 drochner Exp $
 
---- Makefile.in.orig	Fri May 17 15:48:19 2002
-+++ Makefile.in	Tue Jun  4 17:19:35 2002
-@@ -28,7 +28,7 @@
+--- Makefile.in.orig	Wed Jan 22 16:00:38 2003
++++ Makefile.in	Tue Jan 28 11:45:39 2003
+@@ -29,7 +29,7 @@
  
  DEBUG    = @DEBUG@
  CFLAG    = @E_CFLAGS@
--COPTS    = -I. @COPTS@
-+COPTS    = -I. -I${prefix}/include @COPTS@
+-COPTS    = -I. -Isrc/include @COPTS@ @GTK_CFLAGS@
++COPTS    = -I. -Isrc/include -I${prefix}/include @COPTS@ @GTK_CFLAGS@
  
  PROG     = @PROG@
  VERSION  = @VERSION@
diff --git a/net/ettercap/patches/patch-ac b/net/ettercap/patches/patch-ac
new file mode 100644
index 00000000000..bcb929026d4
--- /dev/null
+++ b/net/ettercap/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2003/01/30 10:46:57 drochner Exp $
+
+--- plugins/Makefile.in.orig	Mon Oct 28 16:02:14 2002
++++ plugins/Makefile.in	Tue Jan 28 12:19:57 2003
+@@ -10,10 +10,10 @@
+ 
+ plugins:
+ 	for plug in $(PLUGINS); do \
+-	make -C $$plug; \
++	( cd $$plug; ${MAKE} ) \
+ 	done
+ 
+-install: plugins
++install:
+ 	for plug in $(PLUGINS); do \
+ 	$(INSTALL) -d $(DESTDIR)$(PLUGDIR) ; \
+ 	$(INSTALL) -m 700 ./$$plug/ec_$$plug.so $(DESTDIR)$(PLUGDIR) ; \