Subject: pkg/22710: net/ettercap doesn't compile on -current
To: None <gnats-bugs@gnats.netbsd.org>
From: None <snj@pobox.com>
List: netbsd-bugs
Date: 09/06/2003 21:16:09
>Number:         22710
>Category:       pkg
>Synopsis:       net/ettercap doesn't compile on -current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 07 04:17:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Soren Jacobsen
>Release:        NetBSD 1.6X
>Organization:
>Environment:
pkgsrc as of 9/6/2003.
>Description:
Since the des shuffling, ettercap doesn't compile. Previously, openssl/des.h
was included by openssl/evp.h by openssl/ssl3.h by openssl/ssl.h, which is
included by ettercap. des.h now has to be pulled in explicitly.
>How-To-Repeat:
Try to build on a recentish -current.
>Fix:
This was tested on NetBSD 1.6.1, -current from 9/1/2003, and OpenBSD 3.3.

Add patch-af:
$NetBSD$

--- src/ec_dissector_ssh.c.orig	2003-09-06 20:36:41.000000000 -0700
+++ src/ec_dissector_ssh.c	2003-09-06 20:37:09.000000000 -0700
@@ -29,6 +29,9 @@
 #else
 	#include <arpa/nameser.h>
 #endif
+#ifdef HAVE_DES_H
+#include <des.h>
+#endif
 #include <openssl/ssl.h>
 #include <openssl/rand.h>
 #include <ctype.h>

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ettercap/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	2003/07/13 13:52:50	1.16
+++ Makefile	2003/09/07 04:08:48
@@ -22,6 +22,11 @@
 BUILD_DIRS=		${WRKSRC} ${WRKSRC}/plugins
 INSTALL_DIRS=		${WRKSRC} ${WRKSRC}/plugins
 
+.if exists(/usr/include/des.h)
+CPPFLAGS+=	-DHAVE_DES_H
+LDFLAGS+=	-ldes
+.endif
+
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/ettercap/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo	2003/07/14 11:42:13	1.8
+++ distinfo	2003/09/07 04:08:48
@@ -2,8 +2,9 @@
 
 SHA1 (ettercap-0.6.9.tar.gz) = 2f70055af569cca75cf2460677229b7b4e4c38a5
 Size (ettercap-0.6.9.tar.gz) = 681245 bytes
-SHA1 (patch-aa) = 4096f767a61e96788b7bee33f51948c9006cc665
+SHA1 (patch-aa) = 7b74fca037611d115d1e14294da52c7c4d5eedf8
 SHA1 (patch-ab) = 107ef5dda9457313d7d939745a6a21dbe2b989ce
 SHA1 (patch-ac) = 6771b96f36fa9439b0edf79e632f0d2f1125eecd
 SHA1 (patch-ad) = c7f997876c5b76fff77f70280f5b5fe523778abf
 SHA1 (patch-ae) = 58ea3d1500fb5f1c4b38ec795b884cfb2dd0ab42
+SHA1 (patch-af) = 5bdf384aa15733d81ba8fcfc41673267f9654346
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/ettercap/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa	2003/02/09 23:15:55	1.4
+++ patches/patch-aa	2003/09/07 04:08:48
@@ -1,15 +1,27 @@
-$NetBSD: patch-aa,v 1.4 2003/02/09 23:15:55 dmcmahill Exp $
+$NetBSD$
 
---- Makefile.in.orig	Wed Jan 22 10:00:38 2003
-+++ Makefile.in	Sun Feb  9 18:09:08 2003
-@@ -30,5 +30,5 @@
+--- Makefile.in.orig	2003-01-22 07:00:38.000000000 -0800
++++ Makefile.in	2003-09-06 20:43:14.000000000 -0700
+@@ -11,7 +11,7 @@
+ CC       = @CC@
+ LIBS     = @LDFLAGS@ @LIBS@ @GTK_LIBS@
+ MISSLIBS = @MISSLIBS@
+-DEFS     = @DEFS@ -D@OS@ @OS_OPT@
++DEFS     = @DEFS@ -D@OS@ @OS_OPT@ @CPPFLAGS@
+ INSTALL  = @INSTALL@
+ 
+ prefix      = @prefix@
+@@ -29,7 +29,7 @@
+ 
  DEBUG    = @DEBUG@
  CFLAG    = @E_CFLAGS@
 -COPTS    = -I. -Isrc/include @COPTS@ @GTK_CFLAGS@
 +COPTS    = -I. -Isrc/include -I${prefix}/include @COPTS@ @GTK_CFLAGS@
  
  PROG     = @PROG@
-@@ -262,2 +262,16 @@
+ VERSION  = @VERSION@
+@@ -261,3 +261,17 @@
+ 	@zip -9 -r $(PROG)-$(VERSION)-win32.zip ./"$(PROG) $(VERSION)"
  
  # vim:ts=4:noexpandtab
 +
>Release-Note:
>Audit-Trail:
>Unformatted: