View | Details | Raw Unified | Return to bug 51898 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-6 / +44 lines)
Lines 6-27 Link Here
6
#
6
#
7
7
8
PORTNAME=	ettercap
8
PORTNAME=	ettercap
9
PORTVERSION=	0.6.7
9
PORTVERSION=	0.6.a
10
CATEGORIES=	net
10
PORTEPOCH=	1
11
CATEGORIES=	net security
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
13
14
14
MAINTAINER=	greid@FreeBSD.org
15
MAINTAINER=	greid@FreeBSD.org
15
COMMENT=	A network sniffer/interceptor/injector/logger for switched LANs
16
COMMENT=	A network sniffer/interceptor/injector/logger for switched LANs
16
17
18
USE_REINPLACE=	yes
17
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
20
WANT_GNOME=	yes
18
21
22
MAN8=		ettercap.8
23
24
.include <bsd.port.pre.mk>
25
26
.if !defined(WITHOUT_SSL)
27
.include "${PORTSDIR}/security/openssl/bsd.openssl.mk"
28
.endif
29
30
CFLAGS+=		${PTHREAD_CFLAGS}
31
32
CONFIGURE_TARGET=	-build=${ARCH}-portbld-freebsd${OSREL}
33
.if defined(WITHOUT_SSL)
34
CONFIGURE_ARGS=		--without-openssl
35
PLIST_SUB+=		SSL="@comment "
36
.else
37
CONFIGURE_ARGS=		--with-openssl=${OPENSSLBASE}
38
PLIST_SUB+=		SSL=""
39
.endif
40
.if ${HAVE_GNOME:Mgtk20}!=""
41
USE_GNOME+=		gtk20
42
PKGNAMESUFFIX=		-gnome
43
.else
44
CONFIGURE_ARGS+=	--disable-gtk
45
.endif
46
CONFIGURE_ENV=		WGET_PATH=""
47
48
ALL_TARGET=		all plug-ins
49
50
INSTALL_TARGET=		install plug-ins_install
19
.if !defined(NOPORTDOCS)
51
.if !defined(NOPORTDOCS)
20
INSTALL_TARGET=	install install-doc
52
INSTALL_TARGET+=	install-doc
21
.endif
53
.endif
22
54
23
PLIST_SUB+=	PORTVERSION=${PORTVERSION}
55
post-patch:
56
	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
57
	@${MV} -f ${WRKSRC}/share/lc-converter.c ${WRKSRC}
24
58
25
MAN8=		ettercap.8
59
post-build:
60
	${CC} ${CFLAGS} -o ${WRKSRC}/lc-converter ${WRKSRC}/lc-converter.c
61
62
post-install::
63
	${INSTALL_PROGRAM} ${WRKSRC}/lc-converter ${PREFIX}/bin
26
64
27
.include <bsd.port.mk>
65
.include <bsd.port.post.mk>
(-)distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (ettercap-0.6.7.tar.gz) = 0a4796e9cfab826f27ddfef479c37a62
1
MD5 (ettercap-0.6.a.tar.gz) = 72bee584510c3bb40568188067f43e3f
(-)pkg-plist (-1 / +36 lines)
Lines 1-7 Link Here
1
%%PORTDOCS%%share/doc/ettercap/AUTHORS
1
%%PORTDOCS%%share/doc/ettercap/AUTHORS
2
%%PORTDOCS%%share/doc/ettercap/CHANGELOG
2
%%PORTDOCS%%share/doc/ettercap/CHANGELOG
3
%%PORTDOCS%%share/doc/ettercap/CONFUSION.HOWTO
3
%%PORTDOCS%%share/doc/ettercap/COPYING
4
%%PORTDOCS%%share/doc/ettercap/COPYING
4
%%PORTDOCS%%share/doc/ettercap/HISTORY
5
%%PORTDOCS%%share/doc/ettercap/HISTORY
6
%%PORTDOCS%%share/doc/ettercap/HYDRA.HOWTO
5
%%PORTDOCS%%share/doc/ettercap/INSTALL
7
%%PORTDOCS%%share/doc/ettercap/INSTALL
6
%%PORTDOCS%%share/doc/ettercap/KNOWN-BUGS
8
%%PORTDOCS%%share/doc/ettercap/KNOWN-BUGS
7
%%PORTDOCS%%share/doc/ettercap/PORTINGS
9
%%PORTDOCS%%share/doc/ettercap/PORTINGS
Lines 15-22 Link Here
15
%%PORTDOCS%%share/doc/ettercap/ZARATAN.HOWTO
17
%%PORTDOCS%%share/doc/ettercap/ZARATAN.HOWTO
16
%%PORTDOCS%%share/doc/ettercap/debug.txt
18
%%PORTDOCS%%share/doc/ettercap/debug.txt
17
%%PORTDOCS%%share/doc/ettercap/errors.txt
19
%%PORTDOCS%%share/doc/ettercap/errors.txt
18
%%PORTDOCS%%share/doc/ettercap/ettercap.fr.8.in
19
%%PORTDOCS%%share/doc/ettercap/threads.txt
20
%%PORTDOCS%%share/doc/ettercap/threads.txt
21
bin/lc-converter
22
lib/ettercap/ec_H00_lurker.so
23
lib/ettercap/ec_H01_zaratan.so
24
lib/ettercap/ec_H02_troll.so
25
%%SSL%%lib/ettercap/ec_H03_hydra1.so
26
lib/ettercap/ec_H04_hydra2.so
27
lib/ettercap/ec_H05_hydra3.so
28
lib/ettercap/ec_H06_hydra4.so
29
lib/ettercap/ec_H07_hydra5.so
30
lib/ettercap/ec_H08_hydra6.so
31
lib/ettercap/ec_H09_roper.so
32
lib/ettercap/ec_H10_phantom.so
33
lib/ettercap/ec_H12_giant1.so
34
lib/ettercap/ec_H13_giant2.so
35
lib/ettercap/ec_H20_dwarf.so
36
lib/ettercap/ec_H30_thief.so
37
lib/ettercap/ec_H99_dummy.so
38
lib/ettercap/ec_arpcop.so
39
lib/ettercap/ec_banshee.so
40
lib/ettercap/ec_basilisk.so
41
lib/ettercap/ec_beholder.so
42
lib/ettercap/ec_confusion.so
43
lib/ettercap/ec_dummy.so
44
lib/ettercap/ec_golem.so
45
lib/ettercap/ec_hunter.so
46
lib/ettercap/ec_imp.so
47
lib/ettercap/ec_lamia.so
48
lib/ettercap/ec_leech.so
49
lib/ettercap/ec_ooze.so
50
lib/ettercap/ec_phantom.so
51
lib/ettercap/ec_shadow.so
52
lib/ettercap/ec_spectre.so
53
lib/ettercap/ec_triton.so
20
sbin/ettercap
54
sbin/ettercap
21
share/ettercap/etter.conf
55
share/ettercap/etter.conf
22
share/ettercap/etter.dns
56
share/ettercap/etter.dns
Lines 28-32 Link Here
28
share/ettercap/mac-fingerprints
62
share/ettercap/mac-fingerprints
29
share/ettercap/nmap-os-fingerprints
63
share/ettercap/nmap-os-fingerprints
30
share/ettercap/services
64
share/ettercap/services
65
@dirrm lib/ettercap
31
@dirrm share/ettercap
66
@dirrm share/ettercap
32
%%PORTDOCS%%@dirrm share/doc/ettercap
67
%%PORTDOCS%%@dirrm share/doc/ettercap
(-)files/patch-aa (-9 / +30 lines)
Lines 1-25 Link Here
1
--- Makefile.in.orig	Thu Jun 27 19:27:33 2002
1
--- Makefile.in.orig	Thu Jun 27 19:27:33 2002
2
+++ Makefile.in	Wed Jul 17 17:06:29 2002
2
+++ Makefile.in	Wed Jul 17 17:06:29 2002
3
@@ -70,10 +70,7 @@
3
@@ -25,10 +25,10 @@
4
 DOC      = COPYING README README.PLUGINS README.WIN32 CHANGELOG HISTORY \
5
            AUTHORS TODO TODO.WIN32 THANKS KNOWN-BUGS PORTINGS INSTALL \
6
            ./plugins/H01_zaratan/ZARATAN.HOWTO ./plugins/H09_roper/ROPER.HOWTO \
7
-	   ./plugins/H03_hydra1/HYDRA.HOWTO    
8
+	   ./plugins/H03_hydra1/HYDRA.HOWTO ./plugins/confusion/CONFUSION.HOWTO
9
 
10
 DEBUG    = @DEBUG@
11
-CFLAG    = @E_CFLAGS@
12
+CFLAG    = @CFLAGS@
13
 COPTS    = -I. -Isrc/include @COPTS@ @GTK_CFLAGS@
14
 
15
 PROG     = @PROG@
16
@@ -74,12 +74,7 @@
4
 	$(INSTALL) -m 644 ./etter.filter.ssh $(DESTDIR)$(DATADIR)
17
 	$(INSTALL) -m 644 ./etter.filter.ssh $(DESTDIR)$(DATADIR)
5
 	$(INSTALL) -m 644 ./etter.passive.os.fp $(DESTDIR)$(DATADIR)
18
 	$(INSTALL) -m 644 ./etter.passive.os.fp $(DESTDIR)$(DATADIR)
6
 	$(INSTALL) -m 644 ./etter.ssl.crt $(DESTDIR)$(DATADIR)
19
 	$(INSTALL) -m 644 ./etter.ssl.crt $(DESTDIR)$(DATADIR)
7
-	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
20
-	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
8
-	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
21
-	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
22
-	$(INSTALL) -m 644 ./THANKS $(DESTDIR)$(DATADIR)
23
-	$(INSTALL) -m 644 ./AUTHORS $(DESTDIR)$(DATADIR)
9
 	-$(INSTALL) -m 644 ./share/[a-z]* $(DESTDIR)$(DATADIR)
24
 	-$(INSTALL) -m 644 ./share/[a-z]* $(DESTDIR)$(DATADIR)
10
-	-$(INSTALL) -m 644 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
25
-	-$(INSTALL) -m 644 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
11
 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
26
 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
12
 	$(INSTALL) -m 644 $(PROG).8 $(DESTDIR)$(MANDIR)/man8/$(PROG).8
27
 	$(INSTALL) -m 644 $(PROG).8 $(DESTDIR)$(MANDIR)/man8/$(PROG).8
13
 	@echo
28
 	@echo
14
@@ -86,6 +83,11 @@
29
@@ -88,6 +83,17 @@
15
 	@echo
30
 	@echo "@SB@ $(PROG)@EB@     installed in @SB@$(DESTDIR)$(BINDIR) @EB@"
16
 	@echo "=============================================================="
31
 	@echo "@SB@ shared files@EB@ installed in @SB@$(DESTDIR)$(DATADIR) @EB@"
17
 	@echo
32
 	@echo "@SB@ man pages@EB@    installed in @SB@$(DESTDIR)$(MANDIR)/man8/ @EB@"
33
+	@echo
34
+	@echo "=============================================================="
35
+	@echo
18
+
36
+
19
+install-doc:
37
+install-doc:
20
+	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
38
+	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
21
+	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
39
+	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
22
+	-$(INSTALL) -m 644 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
40
+	-$(INSTALL) -m 644 ./docs/development/[a-z]* $(DESTDIR)$(DOCDIR)
23
 
41
+	@echo
24
 plug-ins: src/include/ec_install_path.h
42
+	@echo "=============================================================="
25
 	@if test "@MAKEPLUG@" = "0"; then \
43
+	@echo
44
 	@echo "@SB@ DOCS@EB@         installed in @SB@$(DESTDIR)$(DOCDIR) @EB@"
45
 	@echo
46
 	@echo "=============================================================="
(-)files/patch-ab (-5 / +85 lines)
Lines 1-19 Link Here
1
--- configure.orig	Fri Jun 14 18:53:14 2002
1
--- configure.orig	Fri Jun 14 18:53:14 2002
2
+++ configure	Wed Jul 17 17:09:18 2002
2
+++ configure	Wed Jul 17 17:09:18 2002
3
@@ -8554,14 +8554,14 @@
3
@@ -3924,27 +3924,27 @@
4
 if test "${ac_cv_path_WGET_PATH+set}" = set; then
5
   echo $ECHO_N "(cached) $ECHO_C" >&6
6
 else
7
-  case $WGET_PATH in
8
-  [\\/]* | ?:[\\/]*)
9
+#  case $WGET_PATH in
10
+#  [\\/]* | ?:[\\/]*)
11
   ac_cv_path_WGET_PATH="$WGET_PATH" # Let the user override the test with a path.
12
-  ;;
13
-  *)
14
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15
-for as_dir in $PATH
16
-do
17
-  IFS=$as_save_IFS
18
-  test -z "$as_dir" && as_dir=.
19
-  for ac_exec_ext in '' $ac_executable_extensions; do
20
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
21
-    ac_cv_path_WGET_PATH="$as_dir/$ac_word$ac_exec_ext"
22
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23
-    break 2
24
-  fi
25
-done
26
-done
27
+#  ;;
28
+#  *)
29
+#  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
30
+#for as_dir in $PATH
31
+#do
32
+#  IFS=$as_save_IFS
33
+#  test -z "$as_dir" && as_dir=.
34
+#  for ac_exec_ext in '' $ac_executable_extensions; do
35
+#  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
36
+#    ac_cv_path_WGET_PATH="$as_dir/$ac_word$ac_exec_ext"
37
+#    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
38
+#    break 2
39
+#  fi
40
+#done
41
+#done
42
 
43
-  ;;
44
-esac
45
+#  ;;
46
+#esac
47
 fi
48
 WGET_PATH=$ac_cv_path_WGET_PATH
49
 
50
@@ -6735,7 +6735,6 @@
51
          echo "$as_me:$LINENO: checking whether $CC accepts -pthread" >&5
52
 echo $ECHO_N "checking whether $CC accepts -pthread... $ECHO_C" >&6
53
          CFLAGS_store="$CFLAGS"
54
-         CFLAGS="$CFLAGS -pthread"
55
          cat >conftest.$ac_ext <<_ACEOF
56
 #line $LINENO "configure"
57
 /* confdefs.h.  */
58
@@ -9656,14 +9655,14 @@
4
       ;;
59
       ;;
5
    no)  echo "$as_me:$LINENO: result: no." >&5
60
    no)  echo "$as_me:$LINENO: result: no." >&5
6
 echo "${ECHO_T}no." >&6
61
 echo "${ECHO_T}no." >&6
7
-      E_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
62
-      E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
8
+#      E_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
63
+#      E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
9
       ac_cv_ec_debug=no
64
       ac_cv_ec_debug=no
10
       ;;
65
       ;;
11
 esac
66
 esac
12
 else
67
 else
13
   echo "$as_me:$LINENO: result: no. disabled by default." >&5
68
   echo "$as_me:$LINENO: result: no. disabled by default." >&5
14
 echo "${ECHO_T}no. disabled by default." >&6
69
 echo "${ECHO_T}no. disabled by default." >&6
15
-   E_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
70
-   E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
16
+#   E_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
71
+#   E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
17
    ac_cv_ec_debug=no
72
    ac_cv_ec_debug=no
18
 
73
 
19
 fi;
74
 fi;
75
@@ -10085,6 +10084,8 @@
76
    if test $ac_cv_ec_ssh = "yes"; then
77
       CYGWINLIB="$CYGWINLIB cygcrypto.dll cygssl.dll"
78
       echo "Dissector_ssh" >> ./src/ec_add.def
79
+   else
80
+      PLUGINS_SOURCES=`echo $PLUGINS_SOURCES | sed 's/.\/plugins\/H03_hydra1\/H03_hydra1.c//g'`
81
    fi
82
 
83
 
84
@@ -10238,9 +10239,15 @@
85
 if test "$ac_cv_ec_plugin" = "yes"; then
86
 
87
    PLUGINS=`ls ./plugins | grep -v Make | grep -v CVS | awk ' { printf "%s ", $1 } '`
88
+   if test $ac_cv_ec_ssh = "no"; then
89
+      PLUGINS=`echo $PLUGINS | sed 's/H03_hydra1//g'`
90
+   fi
91
 
92
 
93
    makeplug=`ls ./plugins | grep -v Make | grep -v CVS | awk '{ printf("plugins/%s/Makefile ", $1) }'`
94
+   if test $ac_cv_ec_ssh = "no"; then
95
+      makeplug=`echo $makeplug | sed 's/plugins\/H03_hydra1\/Makefile//g'`
96
+   fi
97
    makeplug="plugins/Makefile $makeplug"
98
    MAKEPLUG="1"
99
 else
(-)files/patch-plugins::H03_hydra1::Makefile.in (+11 lines)
Added Link Here
1
--- plugins/H03_hydra1/Makefile.in.orig	Sun May  4 18:58:02 2003
2
+++ plugins/H03_hydra1/Makefile.in	Sun May  4 18:58:37 2003
3
@@ -3,7 +3,7 @@
4
 DEFS     = @PICFLAG@ @DEFS@ -D@OS@
5
 
6
 CFLAG    = @CFLAGS@
7
-COPTS    = -I../..
8
+COPTS    = -I../.. @COPTS@
9
 
10
 PROG     = H03_hydra1
11
 
(-)files/patch-plugins::Makefile.in (+11 lines)
Added Link Here
1
--- plugins/Makefile.in.orig	Sun May  4 01:59:51 2003
2
+++ plugins/Makefile.in	Sun May  4 02:00:18 2003
3
@@ -13,7 +13,7 @@
4
 	make -C $$plug; \
5
 	done
6
 
7
-install: plugins
8
+install:
9
 	for plug in $(PLUGINS); do \
10
 	$(INSTALL) -d $(DESTDIR)$(PLUGDIR) ; \
11
 	$(INSTALL) -m 700 ./$$plug/ec_$$plug.so $(DESTDIR)$(PLUGDIR) ; \

Return to bug 51898