diff options
| author | jlam <jlam@pkgsrc.org> | 2004-12-14 19:24:29 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-12-14 19:24:29 +0000 |
| commit | f9724a680ae83bd3cbbafa2f6555be8f00ef1ce0 (patch) | |
| tree | e416cb16d25bfad873bc7eaecd5852cef2126929 /mail | |
| parent | ab96b003e85a1c55469b04e0e45b57df19da1519 (diff) | |
| download | pkgsrc-f9724a680ae83bd3cbbafa2f6555be8f00ef1ce0.tar.gz | |
Change the way that openssl/builtin.mk handles the USE_OLD_DES_API flag.
The idea is to prevent needing to patch source files for packages that
use OpenSSL for DES support by ensuring that including <openssl/des.h>
will always present the old DES API.
(1) If des_old.h exists, then we're using OpenSSL>=0.9.7, and
<openssl/des.h> already does the right thing.
(2) If des_old.h doesn't exist, then one of two things is happening:
(a) If <openssl/des.h> is old and (only) supports the old DES API,
then <openssl/des.h> does the right thing.
(b) If it's NetBSD's Special(TM) one that stripped out the old DES
support into a separate library and header (-ldes, <des.h>),
then we create a new header <openssl/des.h> that includes the
system one and <des.h>.
Also modify existing packages that set USE_OLD_DES_API to simply include
<openssl/des.h> instead of either <des.h> or <openssl/des_old.h> (This
step is mostly just removing unnecessary patches).
This should fix building packages that use OpenSSL's old DES API support
on non-NetBSD systems where the built-in OpenSSL is at least 0.9.7.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/libesmtp/distinfo | 3 | ||||
| -rw-r--r-- | mail/libesmtp/patches/patch-ad | 13 |
2 files changed, 1 insertions, 15 deletions
diff --git a/mail/libesmtp/distinfo b/mail/libesmtp/distinfo index eeba903c330..d906c3e3c88 100644 --- a/mail/libesmtp/distinfo +++ b/mail/libesmtp/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.6 2004/12/11 00:13:54 jlam Exp $ +$NetBSD: distinfo,v 1.7 2004/12/14 19:24:29 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) = 48763f8db999c17230cbf671c249177ac4b882e7 diff --git a/mail/libesmtp/patches/patch-ad b/mail/libesmtp/patches/patch-ad deleted file mode 100644 index 63efabc5ce7..00000000000 --- a/mail/libesmtp/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$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 -@@ -24,7 +24,7 @@ - #include <stdlib.h> - #include <string.h> - #include <ctype.h> --#include <openssl/des.h> -+#include <openssl/des_old.h> - #include <openssl/md4.h> - - #include "ntlm.h" |