diff options
| author | jlam <jlam@pkgsrc.org> | 2004-12-31 17:34:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-12-31 17:34:10 +0000 |
| commit | 83ff9738ed2e69b342c74f187b390789b8d90cd8 (patch) | |
| tree | 152813d65ee7c6f1fe8b1ffcaf202a78781efea8 /security | |
| parent | 0819ecb23f268c173959cfb48d66241838fcd3a9 (diff) | |
| download | pkgsrc-83ff9738ed2e69b342c74f187b390789b8d90cd8.tar.gz | |
Fix a bug in the OpenSSL makefiles that installed a libfips.so symlink
that pointed to nothing. There is no such thing as "libfips".
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/distinfo | 4 | ||||
| -rw-r--r-- | security/openssl/patches/patch-af | 22 |
2 files changed, 20 insertions, 6 deletions
diff --git a/security/openssl/distinfo b/security/openssl/distinfo index e8e28d653ca..7599327cd6d 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2004/12/27 06:14:40 jlam Exp $ +$NetBSD: distinfo,v 1.38 2004/12/31 17:34:10 jlam Exp $ SHA1 (openssl-0.9.7e.tar.gz) = b2eb7f13cc09655ec2378c3dde3025bf7072af54 Size (openssl-0.9.7e.tar.gz) = 3043231 bytes @@ -6,5 +6,5 @@ SHA1 (patch-aa) = 5ab4ec9fdf15c9ded6a6205dc4801e053b3769fc SHA1 (patch-ac) = dce0f8e7722d852c9d7e822d3d86bbe9b97014fd SHA1 (patch-ad) = 3d0a5534c6946aeda219d670f241a01e72d86c6a SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8 -SHA1 (patch-af) = 4909cf3d5441ae51917281642b3871e1466fd2fa +SHA1 (patch-af) = 6e1c0f674be9b0358b1e152b50eb5bc47f2fff17 SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54 diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af index 15b1b48b5cd..30e5d445ecb 100644 --- a/security/openssl/patches/patch-af +++ b/security/openssl/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.13 2004/12/24 22:02:38 jlam Exp $ +$NetBSD: patch-af,v 1.14 2004/12/31 17:34:10 jlam Exp $ --- Makefile.org.orig 2004-09-28 16:52:14.000000000 -0400 +++ Makefile.org @@ -19,7 +19,21 @@ $NetBSD: patch-af,v 1.13 2004/12/24 22:02:38 jlam Exp $ MAN1=1 MAN3=3 MANSUFFIX= -@@ -306,8 +307,7 @@ do_gnu-shared: +@@ -287,11 +288,13 @@ link-shared: + tmp="$(SHARED_LIBS_LINK_EXTS)"; \ + for i in $(SHLIBDIRS); do \ + prev=lib$$i$(SHLIB_EXT); \ ++ if [ -f "$$prev" ]; then \ + for j in $${tmp:-x}; do \ + ( set -x; \ + rm -f lib$$i$$j; ln -s $$prev lib$$i$$j ); \ + prev=lib$$i$$j; \ + done; \ ++ fi; \ + done; \ + fi + +@@ -306,8 +309,7 @@ do_gnu-shared: fi; \ ( set -x; ${CC} ${SHARED_LDFLAGS} \ -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ @@ -29,7 +43,7 @@ $NetBSD: patch-af,v 1.13 2004/12/24 22:02:38 jlam Exp $ -Wl,--whole-archive lib$$i.a \ -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \ libs="-l$$i $$libs"; \ -@@ -548,7 +548,7 @@ do_hpux64-shared: +@@ -548,7 +550,7 @@ do_hpux64-shared: # HP/UX-64bit: +forceload # AIX: -bnogc # SHAREDFLAGS would be: @@ -38,7 +52,7 @@ $NetBSD: patch-af,v 1.13 2004/12/24 22:02:38 jlam Exp $ # Tru64 Unix: -shared \ # -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" # Solaris: -G -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} -@@ -790,16 +790,14 @@ dist: +@@ -790,16 +792,14 @@ dist: dist_pem_h: (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) |