diff options
| author | jlam <jlam> | 2004-12-14 19:24:29 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-12-14 19:24:29 +0000 |
| commit | 164f59ef046c60e530f8eccbb331c7382452d328 (patch) | |
| tree | e416cb16d25bfad873bc7eaecd5852cef2126929 /security/heimdal | |
| parent | 50b826b20a943dfdb94a46d9de4b97054ab31d65 (diff) | |
| download | pkgsrc-164f59ef046c60e530f8eccbb331c7382452d328.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 'security/heimdal')
| -rw-r--r-- | security/heimdal/distinfo | 5 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-ad | 38 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-ah | 13 |
3 files changed, 3 insertions, 53 deletions
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo index 6451dd01593..b46aef126f9 100644 --- a/security/heimdal/distinfo +++ b/security/heimdal/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.8 2004/12/04 03:59:26 jlam Exp $ +$NetBSD: distinfo,v 1.9 2004/12/14 19:24:29 jlam Exp $ SHA1 (heimdal-0.6.3.tar.gz) = 91863a1bd9f8a55063a09c28a5f41985b7a31145 Size (heimdal-0.6.3.tar.gz) = 3333604 bytes SHA1 (patch-ab) = 400a9ac3a76ac7e8b4dcc230e0bdf7fc5222fbb7 SHA1 (patch-ac) = 121961811f559822c6a4f3d7f7e4646b16908942 -SHA1 (patch-ad) = b2ebbf5ad71125634fd569a0ee0245d23bcfd068 +SHA1 (patch-ad) = 20347c61cf79c17500ab3508424632efc3545b65 SHA1 (patch-ae) = 518eabed07d4fc69e86ace3f02d23ca3064d4bd1 -SHA1 (patch-ah) = b7ef27e2a218d5f69180f799b31a1b6c08ec602f diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad index abdd50b2b5e..5ba870a2b88 100644 --- a/security/heimdal/patches/patch-ad +++ b/security/heimdal/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.4 2004/12/04 03:59:27 jlam Exp $ +$NetBSD: patch-ad,v 1.5 2004/12/14 19:24:29 jlam Exp $ --- configure.orig 2004-09-13 08:27:10.000000000 -0400 +++ configure @@ -12,39 +12,3 @@ $NetBSD: patch-ad,v 1.4 2004/12/04 03:59:27 jlam Exp $ # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -@@ -22005,7 +22002,7 @@ cat >>conftest.$ac_ext <<_ACEOF - #include <openssl/md5.h> - #include <openssl/sha.h> - #define OPENSSL_DES_LIBDES_COMPATIBILITY -- #include <openssl/des.h> -+ #include <openssl/des_old.h> - #include <openssl/rc4.h> - #include <openssl/rand.h> - #else -@@ -22101,7 +22098,7 @@ cat >>conftest.$ac_ext <<_ACEOF - #include <openssl/md5.h> - #include <openssl/sha.h> - #define OPENSSL_DES_LIBDES_COMPATIBILITY -- #include <openssl/des.h> -+ #include <openssl/des_old.h> - #include <openssl/rc4.h> - #include <openssl/rand.h> - #else -@@ -22197,7 +22194,7 @@ cat >>conftest.$ac_ext <<_ACEOF - #include <openssl/md5.h> - #include <openssl/sha.h> - #define OPENSSL_DES_LIBDES_COMPATIBILITY -- #include <openssl/des.h> -+ #include <openssl/des_old.h> - #include <openssl/rc4.h> - #include <openssl/rand.h> - #else -@@ -22324,7 +22321,7 @@ cat >>conftest.$ac_ext <<_ACEOF - #include <openssl/md5.h> - #include <openssl/sha.h> - #define OPENSSL_DES_LIBDES_COMPATIBILITY -- #include <openssl/des.h> -+ #include <openssl/des_old.h> - #include <openssl/rc4.h> - #include <openssl/rand.h> - #else diff --git a/security/heimdal/patches/patch-ah b/security/heimdal/patches/patch-ah deleted file mode 100644 index 81eccd55fa1..00000000000 --- a/security/heimdal/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2004/12/04 03:59:27 jlam Exp $ - ---- include/make_crypto.c.orig 2003-05-05 16:10:27.000000000 -0400 -+++ include/make_crypto.c -@@ -61,7 +61,7 @@ main(int argc, char **argv) - fprintf(f, "#define __%s__\n", argv[1]); - #ifdef HAVE_OPENSSL - fputs("#define OPENSSL_DES_LIBDES_COMPATIBILITY\n", f); -- fputs("#include <openssl/des.h>\n", f); -+ fputs("#include <openssl/des_old.h>\n", f); - fputs("#include <openssl/rc4.h>\n", f); - fputs("#include <openssl/md4.h>\n", f); - fputs("#include <openssl/md5.h>\n", f); |