diff options
| author | grant <grant> | 2005-02-20 05:42:51 +0000 |
|---|---|---|
| committer | grant <grant> | 2005-02-20 05:42:51 +0000 |
| commit | db6aae41e3e7e542412c4caafcbffd01c1c1d6cd (patch) | |
| tree | fc73d1f174fa65681e48a701ddafa6898fe0068c /security | |
| parent | 7a8c20a4c46682085b1fc4a5233613608667ef00 (diff) | |
| download | pkgsrc-db6aae41e3e7e542412c4caafcbffd01c1c1d6cd.tar.gz | |
when linking shared libssl on Solaris, make sure the rpath is
included so it can find libcrypto.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/distinfo | 4 | ||||
| -rw-r--r-- | security/openssl/patches/patch-af | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 4d5806a321d..3be7b232e79 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.42 2005/01/18 10:25:17 grant Exp $ +$NetBSD: distinfo,v 1.43 2005/02/20 05:42:51 grant 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) = f470b63fe24795cb7bbb566262e8ae0b32404a05 SHA1 (patch-ad) = 3d0a5534c6946aeda219d670f241a01e72d86c6a SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8 -SHA1 (patch-af) = 6e1c0f674be9b0358b1e152b50eb5bc47f2fff17 +SHA1 (patch-af) = 6afdf70d0be25fa39950efe3e6af459ff0caf9c9 SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54 diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af index 30e5d445ecb..ca12d8de2f7 100644 --- a/security/openssl/patches/patch-af +++ b/security/openssl/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.14 2004/12/31 17:34:10 jlam Exp $ +$NetBSD: patch-af,v 1.15 2005/02/20 05:42:51 grant Exp $ ---- Makefile.org.orig 2004-09-28 16:52:14.000000000 -0400 +--- Makefile.org.orig 2004-09-29 06:52:14.000000000 +1000 +++ Makefile.org @@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl @@ -43,7 +43,15 @@ $NetBSD: patch-af,v 1.14 2004/12/31 17:34:10 jlam Exp $ -Wl,--whole-archive lib$$i.a \ -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \ libs="-l$$i $$libs"; \ -@@ -548,7 +550,7 @@ do_hpux64-shared: +@@ -415,6 +417,7 @@ do_solaris-shared: + -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + -Wl,-Bsymbolic \ ++ -Wl,-R${INSTALLTOP}/lib \ + $${MINUSZ}allextract lib$$i.a $${MINUSZ}defaultextract \ + $$libs ${EX_LIBS} -lc ) || exit 1; \ + libs="-l$$i $$libs"; \ +@@ -548,7 +551,7 @@ do_hpux64-shared: # HP/UX-64bit: +forceload # AIX: -bnogc # SHAREDFLAGS would be: @@ -52,7 +60,7 @@ $NetBSD: patch-af,v 1.14 2004/12/31 17:34:10 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 +792,14 @@ dist: +@@ -790,16 +793,14 @@ dist: dist_pem_h: (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) |