summaryrefslogtreecommitdiff
path: root/mail/libesmtp
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-12-11 00:13:54 +0000
committerjlam <jlam@pkgsrc.org>2004-12-11 00:13:54 +0000
commitabf21b18a5ce589139c4548659a4a0899c0de9ee (patch)
tree4b1367f5504faf0f0739f59a4f8c37795746deea /mail/libesmtp
parent98a8065e34b5386a1c9f1d6e71549cfbe6e460ed (diff)
downloadpkgsrc-abf21b18a5ce589139c4548659a4a0899c0de9ee.tar.gz
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 (limited to 'mail/libesmtp')
-rw-r--r--mail/libesmtp/Makefile21
-rw-r--r--mail/libesmtp/distinfo4
-rw-r--r--mail/libesmtp/patches/patch-ad4
3 files changed, 6 insertions, 23 deletions
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 5af2ead1575..0dfd385088d 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -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_GNU_TOOLS+= make
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 --git a/mail/libesmtp/distinfo b/mail/libesmtp/distinfo
index f0432720e65..eeba903c330 100644
--- a/mail/libesmtp/distinfo
+++ b/mail/libesmtp/distinfo
@@ -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 --git a/mail/libesmtp/patches/patch-ad b/mail/libesmtp/patches/patch-ad
index 060a61c8419..63efabc5ce7 100644
--- a/mail/libesmtp/patches/patch-ad
+++ b/mail/libesmtp/patches/patch-ad
@@ -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 @@ $NetBSD: patch-ad,v 1.1 2003/07/28 14:51:37 drochner Exp $
#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"