[pkgsrc/trunk]: pkgsrc/mail/libesmtp The "Evil Hack" is now a standard part o...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fe561375be1
branches:  trunk
changeset: 485435:5fe561375be1
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Dec 11 00:13:54 2004 +0000

description:
The "Evil Hack" is now a standard part of openssl buildlink3 which
can be simply turned on by setting USE_OLD_DES_API=yes.  Modify
references to <openssl/des.h> to refer to <openssl/des_old.h> where
the old DES interface is expected.  This is forward compatible with
future versions of OpenSSL.

diffstat:

 mail/libesmtp/Makefile         |  21 ++-------------------
 mail/libesmtp/distinfo         |   4 ++--
 mail/libesmtp/patches/patch-ad |   4 ++--
 3 files changed, 6 insertions(+), 23 deletions(-)

diffs (68 lines):

diff -r 492858fd8e10 -r 5fe561375be1 mail/libesmtp/Makefile
--- a/mail/libesmtp/Makefile    Sat Dec 11 00:04:14 2004 +0000
+++ b/mail/libesmtp/Makefile    Sat Dec 11 00:13:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/11/28 19:19:52 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/11 00:13:54 jlam Exp $
 
 DISTNAME=      libesmtp-1.0.3r1
 PKGNAME=       ${DISTNAME:S/r1//}
@@ -18,27 +18,10 @@
 USE_LIBTOOL=   yes
 GNU_CONFIGURE= yes
 
+USE_OLD_DES_API=       yes
 CONFIGURE_ARGS+=       --enable-all
 CONFIGURE_ARGS+=       --disable-isoc
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-
-# XXX Evil hack to deal with the openssl/des.h interface change
-# between 0.96 and 0.97
-# This pkg needs the old API. It includes <des.h> (by patch).
-# We assume 2 cases:
-# a) We are on NetBSD-current which has a non-backward-compatible
-#    openssl-0.97, but a <des.h> providing the old interface.
-#    So the pkg sees the backward-compatibility header.
-# b) Everything else - we have an old openssl or a pkg version
-#    which is backward-compatible. Create a symlink to find
-#    <openssl/des.h> as <des.h>.
-#
-post-wrapper:
-       if [ ! -f /usr/include/des.h ]; then \
-               ${LN} -s ${SSLBASE}/include/openssl/des.h \
-                       ${BUILDLINK_DIR}/include; \
-       fi
-
 .include "../../mk/bsd.pkg.mk"
diff -r 492858fd8e10 -r 5fe561375be1 mail/libesmtp/distinfo
--- a/mail/libesmtp/distinfo    Sat Dec 11 00:04:14 2004 +0000
+++ b/mail/libesmtp/distinfo    Sat Dec 11 00:13:54 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2004/05/28 23:00:13 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/12/11 00:13:54 jlam Exp $
 
 SHA1 (libesmtp-1.0.3r1.tar.bz2) = 05a11a95f6083c25d99a850dbc0d93c8301b77fd
 Size (libesmtp-1.0.3r1.tar.bz2) = 269527 bytes
 SHA1 (patch-ab) = cc027b93ae55b84c1b569ddcdd2644d4f63a33a5
-SHA1 (patch-ad) = 80446e62fef1bd6a99dec98020924fada41acffa
+SHA1 (patch-ad) = 48763f8db999c17230cbf671c249177ac4b882e7
diff -r 492858fd8e10 -r 5fe561375be1 mail/libesmtp/patches/patch-ad
--- a/mail/libesmtp/patches/patch-ad    Sat Dec 11 00:04:14 2004 +0000
+++ b/mail/libesmtp/patches/patch-ad    Sat Dec 11 00:13:54 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2003/07/28 14:51:37 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2004/12/11 00:13:54 jlam Exp $
 
 --- ntlm/ntlmdes.c.orig        2003-07-25 19:54:18.000000000 +0200
 +++ ntlm/ntlmdes.c     2003-07-25 19:54:34.000000000 +0200
@@ -7,7 +7,7 @@
  #include <string.h>
  #include <ctype.h>
 -#include <openssl/des.h>
-+#include <des.h>
++#include <openssl/des_old.h>
  #include <openssl/md4.h>
  
  #include "ntlm.h"