[pkgsrc/trunk]: pkgsrc/net/ettercap Convert to set USE_OLD_DES_API=yes and re...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e69d17495d9
branches:  trunk
changeset: 485546:1e69d17495d9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Dec 15 16:17:59 2004 +0000

description:
Convert to set USE_OLD_DES_API=yes and remove NetBSD-specific workarounds.

diffstat:

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

diffs (60 lines):

diff -r bde68b05b9c1 -r 1e69d17495d9 net/ettercap/Makefile
--- a/net/ettercap/Makefile     Wed Dec 15 16:01:48 2004 +0000
+++ b/net/ettercap/Makefile     Wed Dec 15 16:17:59 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/12/04 23:09:06 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2004/12/15 16:17:59 jlam Exp $
 
 DISTNAME=              ettercap-0.6.b
 PKGREVISION=           2
@@ -18,10 +18,10 @@
 USE_BUILDLINK3=                yes
 
 USE_NCURSES=           # putwin()
+USE_OLD_DES_API=       yes
 PTHREAD_OPTS+=         require
 PTHREAD_AUTO_VARS=     yes
 MAKE_ENV+=             MACHINE_ARCH=${MACHINE_ARCH}
-LIBS+=                 -ldes
 
 BUILD_DIRS=            ${WRKSRC} ${WRKSRC}/plugins
 INSTALL_DIRS=          ${WRKSRC} ${WRKSRC}/plugins
diff -r bde68b05b9c1 -r 1e69d17495d9 net/ettercap/distinfo
--- a/net/ettercap/distinfo     Wed Dec 15 16:01:48 2004 +0000
+++ b/net/ettercap/distinfo     Wed Dec 15 16:17:59 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/10/22 14:10:44 ben Exp $
+$NetBSD: distinfo,v 1.12 2004/12/15 16:17:59 jlam 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) = 2d6501a50474524c05ecff837adea1ee87da1ac1
+SHA1 (patch-af) = 27d9d6ca720758d68ef5e091140e8dfa5156e3ed
diff -r bde68b05b9c1 -r 1e69d17495d9 net/ettercap/patches/patch-af
--- a/net/ettercap/patches/patch-af     Wed Dec 15 16:01:48 2004 +0000
+++ b/net/ettercap/patches/patch-af     Wed Dec 15 16:17:59 2004 +0000
@@ -1,17 +1,12 @@
-$NetBSD: patch-af,v 1.3 2004/10/22 14:10:44 ben Exp $
+$NetBSD: patch-af,v 1.4 2004/12/15 16:17:59 jlam Exp $
 
---- src/ec_dissector_ssh.c.orig        Thu Jul 10 08:25:32 2003
+--- src/ec_dissector_ssh.c.orig        2003-07-10 04:25:32.000000000 -0400
 +++ src/ec_dissector_ssh.c
-@@ -37,6 +37,12 @@
+@@ -37,6 +37,7 @@
     #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>