[src/trunk]: src/crypto/dist/openssl openssl 0.9.6g, build framework fixes

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/49d3023ea4be
branches:  trunk
changeset: 535071:49d3023ea4be
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Aug 09 15:45:08 2002 +0000

description:
openssl 0.9.6g, build framework fixes

diffstat:

 crypto/dist/openssl/Makefile.org      |  7 ++++---
 crypto/dist/openssl/Makefile.ssl      |  9 +++++----
 crypto/dist/openssl/NEWS              |  4 ++++
 crypto/dist/openssl/README            |  2 +-
 crypto/dist/openssl/config            |  3 +++
 crypto/dist/openssl/crypto/opensslv.h |  4 ++--
 crypto/dist/openssl/openssl.spec      |  2 +-
 7 files changed, 20 insertions(+), 11 deletions(-)

diffs (134 lines):

diff -r b47c8840414a -r 49d3023ea4be crypto/dist/openssl/Makefile.org
--- a/crypto/dist/openssl/Makefile.org  Fri Aug 09 15:02:26 2002 +0000
+++ b/crypto/dist/openssl/Makefile.org  Fri Aug 09 15:45:08 2002 +0000
@@ -677,7 +677,8 @@
                done; \
                (       here="`pwd`"; \
                        cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
-                       $(MAKE) -f $$here/Makefile link-shared ); \
+                       set $(MAKE); \
+                       $$1 -f $$here/Makefile link-shared ); \
        fi
 
 install_docs:
@@ -686,7 +687,7 @@
                $(INSTALL_PREFIX)$(MANDIR)/man3 \
                $(INSTALL_PREFIX)$(MANDIR)/man5 \
                $(INSTALL_PREFIX)$(MANDIR)/man7
-       @pod2man=`cd ../../util; ./pod2mantest ignore`; \
+       @pod2man=`cd util; ./pod2mantest ignore`; \
        for i in doc/apps/*.pod; do \
                fn=`basename $$i .pod`; \
                if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
@@ -697,7 +698,7 @@
                        --release=$(VERSION) `basename $$i`") \
                        >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
        done; \
-       @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+       for i in doc/crypto/*.pod doc/ssl/*.pod; do \
                fn=`basename $$i .pod`; \
                if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
                echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
diff -r b47c8840414a -r 49d3023ea4be crypto/dist/openssl/Makefile.ssl
--- a/crypto/dist/openssl/Makefile.ssl  Fri Aug 09 15:02:26 2002 +0000
+++ b/crypto/dist/openssl/Makefile.ssl  Fri Aug 09 15:45:08 2002 +0000
@@ -4,7 +4,7 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=0.9.6f
+VERSION=0.9.6g
 MAJOR=0
 MINOR=9.6
 SHLIB_VERSION_NUMBER=0.9.6
@@ -679,7 +679,8 @@
                done; \
                (       here="`pwd`"; \
                        cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
-                       $(MAKE) -f $$here/Makefile link-shared ); \
+                       set $(MAKE); \
+                       $$1 -f $$here/Makefile link-shared ); \
        fi
 
 install_docs:
@@ -688,7 +689,7 @@
                $(INSTALL_PREFIX)$(MANDIR)/man3 \
                $(INSTALL_PREFIX)$(MANDIR)/man5 \
                $(INSTALL_PREFIX)$(MANDIR)/man7
-       @pod2man=`cd ../../util; ./pod2mantest ignore`; \
+       @pod2man=`cd util; ./pod2mantest ignore`; \
        for i in doc/apps/*.pod; do \
                fn=`basename $$i .pod`; \
                if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
@@ -699,7 +700,7 @@
                        --release=$(VERSION) `basename $$i`") \
                        >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
        done; \
-       @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+       for i in doc/crypto/*.pod doc/ssl/*.pod; do \
                fn=`basename $$i .pod`; \
                if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
                echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
diff -r b47c8840414a -r 49d3023ea4be crypto/dist/openssl/NEWS
--- a/crypto/dist/openssl/NEWS  Fri Aug 09 15:02:26 2002 +0000
+++ b/crypto/dist/openssl/NEWS  Fri Aug 09 15:45:08 2002 +0000
@@ -5,6 +5,10 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
+  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g:
+
+      o Important building fixes on Unix.
+
   Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f:
 
       o Various important bugfixes.
diff -r b47c8840414a -r 49d3023ea4be crypto/dist/openssl/README
--- a/crypto/dist/openssl/README        Fri Aug 09 15:02:26 2002 +0000
+++ b/crypto/dist/openssl/README        Fri Aug 09 15:45:08 2002 +0000
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.6f 8 August 2002
+ OpenSSL 0.9.6g 9 August 2002
 
  Copyright (c) 1998-2002 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff -r b47c8840414a -r 49d3023ea4be crypto/dist/openssl/config
--- a/crypto/dist/openssl/config        Fri Aug 09 15:02:26 2002 +0000
+++ b/crypto/dist/openssl/config        Fri Aug 09 15:45:08 2002 +0000
@@ -384,6 +384,9 @@
 GCCVER=`(gcc -dumpversion) 2>/dev/null`
 if [ "$GCCVER" != "" ]; then
   CC=gcc
+  # then strip off whatever prefix egcs prepends the number with...
+  # Hopefully, this will work for any future prefixes as well.
+  GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'`
   # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
   # does give us what we want though, so we use that.  We just just the
   # major and minor version numbers.
diff -r b47c8840414a -r 49d3023ea4be crypto/dist/openssl/crypto/opensslv.h
--- a/crypto/dist/openssl/crypto/opensslv.h     Fri Aug 09 15:02:26 2002 +0000
+++ b/crypto/dist/openssl/crypto/opensslv.h     Fri Aug 09 15:45:08 2002 +0000
@@ -25,8 +25,8 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER 0x0090606fL
-#define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.6f 8 Aug 2002"
+#define OPENSSL_VERSION_NUMBER 0x0090607fL
+#define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.6g 9 Aug 2002"
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT
 
 
diff -r b47c8840414a -r 49d3023ea4be crypto/dist/openssl/openssl.spec
--- a/crypto/dist/openssl/openssl.spec  Fri Aug 09 15:02:26 2002 +0000
+++ b/crypto/dist/openssl/openssl.spec  Fri Aug 09 15:45:08 2002 +0000
@@ -1,7 +1,7 @@
 %define libmaj 0
 %define libmin 9
 %define librel 6
-%define librev f
+%define librev g
 Release: 1
 
 %define openssldir /var/ssl