[pkgsrc/trunk]: pkgsrc/net/ettercap Modify how OpenSSL's des.h is included, t...

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3631f5228bdc
branches:  trunk
changeset: 482218:3631f5228bdc
user:      ben <ben%pkgsrc.org@localhost>
date:      Fri Oct 22 14:10:44 2004 +0000

description:
Modify how OpenSSL's des.h is included, to make ettercap build with
builtin SSL on -1.6_STABLE and -current.  This addresses PR#26615.

diffstat:

 net/ettercap/Makefile         |   8 +-------
 net/ettercap/distinfo         |   4 ++--
 net/ettercap/patches/patch-af |  13 +++++++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diffs (62 lines):

diff -r 28ff187081b3 -r 3631f5228bdc net/ettercap/Makefile
--- a/net/ettercap/Makefile     Fri Oct 22 13:32:18 2004 +0000
+++ b/net/ettercap/Makefile     Fri Oct 22 14:10:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: Makefile,v 1.31 2004/10/22 14:10:44 ben Exp $
 
 DISTNAME=              ettercap-0.6.b
 PKGREVISION=           2
@@ -29,12 +29,6 @@
 GCC_REQD+=             3.0
 .endif
 
-post-buildlink:
-       if [ ! -f /usr/include/des.h ]; then \
-               ${LN} -s ${BUILDLINK_DIR}/include/openssl/des.h \
-                       ${BUILDLINK_DIR}/include; \
-       fi
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 28ff187081b3 -r 3631f5228bdc net/ettercap/distinfo
--- a/net/ettercap/distinfo     Fri Oct 22 13:32:18 2004 +0000
+++ b/net/ettercap/distinfo     Fri Oct 22 14:10:44 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/12/18 03:01:38 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2004/10/22 14:10:44 ben Exp $
 
 SHA1 (ettercap-0.6.b.tar.gz) = 8cc1bbfe61e894620deef74cff0b8ca5a0b9e628
 Size (ettercap-0.6.b.tar.gz) = 689038 bytes
@@ -7,4 +7,4 @@
 SHA1 (patch-ac) = 6771b96f36fa9439b0edf79e632f0d2f1125eecd
 SHA1 (patch-ad) = c7f997876c5b76fff77f70280f5b5fe523778abf
 SHA1 (patch-ae) = 58ea3d1500fb5f1c4b38ec795b884cfb2dd0ab42
-SHA1 (patch-af) = 5dd9ef0e9cb2ab9fa6cbd6a7d2f13dbe670f9023
+SHA1 (patch-af) = 2d6501a50474524c05ecff837adea1ee87da1ac1
diff -r 28ff187081b3 -r 3631f5228bdc net/ettercap/patches/patch-af
--- a/net/ettercap/patches/patch-af     Fri Oct 22 13:32:18 2004 +0000
+++ b/net/ettercap/patches/patch-af     Fri Oct 22 14:10:44 2004 +0000
@@ -1,12 +1,17 @@
-$NetBSD: patch-af,v 1.2 2003/12/18 03:01:38 xtraeme Exp $
+$NetBSD: patch-af,v 1.3 2004/10/22 14:10:44 ben Exp $
 
---- src/ec_dissector_ssh.c.orig        2003-12-18 03:54:11.000000000 +0100
-+++ src/ec_dissector_ssh.c     2003-12-18 03:54:43.000000000 +0100
-@@ -37,6 +37,7 @@
+--- src/ec_dissector_ssh.c.orig        Thu Jul 10 08:25:32 2003
++++ src/ec_dissector_ssh.c
+@@ -37,6 +37,12 @@
     #define NS_PUT32 PUTLONG
  #endif
  
++#include <openssl/opensslv.h>
++#if OPENSSL_VERSION_NUMBER < 0x0090700fL
++#include <openssl/des.h>
++#else
 +#include <des.h>
++#endif
  #include <openssl/ssl.h>
  #include <openssl/rand.h>
  #include <ctype.h>