diff options
| author | jlam <jlam> | 2004-12-14 19:24:29 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-12-14 19:24:29 +0000 |
| commit | c6cd2687e3e1e9868865b6affd8086c7118f6424 (patch) | |
| tree | e416cb16d25bfad873bc7eaecd5852cef2126929 /net | |
| parent | c9e369310c68516b71f80c022b6b2d2832a9e662 (diff) | |
| download | pkgsrc-c6cd2687e3e1e9868865b6affd8086c7118f6424.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 'net')
| -rw-r--r-- | net/openvpn-current/distinfo | 3 | ||||
| -rw-r--r-- | net/openvpn-current/patches/patch-aa | 13 |
2 files changed, 1 insertions, 15 deletions
diff --git a/net/openvpn-current/distinfo b/net/openvpn-current/distinfo index 32ec72cb7a4..ba01a84aa5e 100644 --- a/net/openvpn-current/distinfo +++ b/net/openvpn-current/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2004/12/03 23:13:10 jlam Exp $ +$NetBSD: distinfo,v 1.3 2004/12/14 19:24:29 jlam Exp $ SHA1 (openvpn-2.0_beta15.tar.gz) = f1b210df6c8b6ea45737f97e3a184e6dac7b2ec1 Size (openvpn-2.0_beta15.tar.gz) = 585952 bytes -SHA1 (patch-aa) = 06898cead40974b91d5fa4f2d5a4a9e3ae9d3ffe diff --git a/net/openvpn-current/patches/patch-aa b/net/openvpn-current/patches/patch-aa deleted file mode 100644 index 7b8dc87c98b..00000000000 --- a/net/openvpn-current/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2004/12/03 23:13:10 jlam Exp $ - ---- ntlm.c.orig 2004-10-02 06:22:38.000000000 -0400 -+++ ntlm.c -@@ -29,7 +29,7 @@ - - #if NTLM - --#include <openssl/des.h> -+#include <openssl/des_old.h> - #include <openssl/md4.h> - #include "common.h" - #include "buffer.h" |