[pkgsrc/trunk]: pkgsrc/security/openssl Fix a bug in the OpenSSL makefiles th...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/04b384647895
branches:  trunk
changeset: 486671:04b384647895
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Dec 31 17:34:10 2004 +0000

description:
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:

 security/openssl/distinfo         |   4 ++--
 security/openssl/patches/patch-af |  22 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r 40dae1d92338 -r 04b384647895 security/openssl/distinfo
--- a/security/openssl/distinfo Fri Dec 31 17:14:30 2004 +0000
+++ b/security/openssl/distinfo Fri Dec 31 17:34:10 2004 +0000
@@ -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-ac) = dce0f8e7722d852c9d7e822d3d86bbe9b97014fd
 SHA1 (patch-ad) = 3d0a5534c6946aeda219d670f241a01e72d86c6a
 SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8
-SHA1 (patch-af) = 4909cf3d5441ae51917281642b3871e1466fd2fa
+SHA1 (patch-af) = 6e1c0f674be9b0358b1e152b50eb5bc47f2fff17
 SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54
diff -r 40dae1d92338 -r 04b384647895 security/openssl/patches/patch-af
--- a/security/openssl/patches/patch-af Fri Dec 31 17:14:30 2004 +0000
+++ b/security/openssl/patches/patch-af Fri Dec 31 17:34:10 2004 +0000
@@ -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 @@
  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 @@
                -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 @@
  #  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)