pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q3]: pkgsrc/security/openssl Pullup tickets 822 and 825 - ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1149a19d5937
branches: pkgsrc-2005Q3
changeset: 499584:1149a19d5937
user: salo <salo%pkgsrc.org@localhost>
date: Thu Oct 13 13:21:07 2005 +0000
description:
Pullup tickets 822 and 825 - requested by Johnny C. Lam
security update for openssl
Revisions pulled up:
- pkgsrc/security/openssl/Makefile 1.107
- pkgsrc/security/openssl/PLIST.common 1.11
- pkgsrc/security/openssl/builtin.mk 1.16, 1.17
- pkgsrc/security/openssl/distinfo 1.46
- pkgsrc/security/openssl/patches/patch-aa 1.18
- pkgsrc/security/openssl/patches/patch-ac 1.28
- pkgsrc/security/openssl/patches/patch-ad 1.15
- pkgsrc/security/openssl/patches/patch-af 1.17
Module Name: pkgsrc
Committed By: jlam
Date: Tue Oct 11 17:19:21 UTC 2005
Modified Files:
pkgsrc/security/openssl: Makefile PLIST.common distinfo
pkgsrc/security/openssl/patches: patch-aa patch-ac patch-ad patch-af
Log Message:
Update security/openssl to version 0.9.7h. This is a security
vulnerability triggered update due to CAN-2005-2969. Changes from
version 0.9.7f include:
o Fix SSL 2.0 Rollback, CAN-2005-2969
o Allow use of fixed-length exponent on DSA signing
o Default fixed-window RSA, DSA, DH private-key operations
o More compilation issues fixed.
o Adaptation to more modern Kerberos API.
o Enhanced or corrected configuration for Solaris64, Mingw
and Cygwin.
o Enhanced x86_64 assembler BIGNUM module.
o More constification.
o Added processing of proxy certificates (RFC 3820).
---
Module Name: pkgsrc
Committed By: jlam
Date: Wed Oct 12 02:00:03 UTC 2005
Modified Files:
pkgsrc/security/openssl: builtin.mk
Log Message:
Remove leading "-" from version number when matching the openssl-0.9.6g
from the netbsd-1-6 branch with the 20040401 fix.
---
Module Name: pkgsrc
Committed By: jlam
Date: Wed Oct 12 02:20:10 UTC 2005
Modified Files:
pkgsrc/security/openssl: builtin.mk
Log Message:
If the native openssl-0.9.7d contains the security fixes pulled up to
the netbsd-2-0, netbsd-2, and netbsd-3-0 branches on 2005-10-11, then
for the purposes of satisfying dependencies, pretend it's openssl-0.9.7h.
diffstat:
security/openssl/Makefile | 20 ++++++++++----------
security/openssl/PLIST.common | 3 ++-
security/openssl/builtin.mk | 21 +++++++++++++++++----
security/openssl/distinfo | 16 ++++++++--------
security/openssl/patches/patch-aa | 6 +++---
security/openssl/patches/patch-ac | 26 +++++++++++++-------------
security/openssl/patches/patch-ad | 6 +++---
security/openssl/patches/patch-af | 30 +++++++++++++++---------------
8 files changed, 71 insertions(+), 57 deletions(-)
diffs (truncated from 315 to 300 lines):
diff -r 645fff702c39 -r 1149a19d5937 security/openssl/Makefile
--- a/security/openssl/Makefile Wed Oct 12 03:56:31 2005 +0000
+++ b/security/openssl/Makefile Thu Oct 13 13:21:07 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.106 2005/07/16 01:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.106.2.1 2005/10/13 13:21:07 salo Exp $
OPENSSL_SNAPSHOT?= # empty
OPENSSL_STABLE?= # empty
-OPENSSL_VERS?= 0.9.7f
+OPENSSL_VERS?= 0.9.7h
.if empty(OPENSSL_SNAPSHOT)
DISTNAME= openssl-${OPENSSL_VERS}
@@ -96,14 +96,14 @@
# Also, fix the path to perl in various scripts.
#
pre-configure:
- cd ${WRKSRC}; for file in \
- fips/aes/Makefile fips/des/Makefile \
- fips/dh/Makefile fips/dsa/Makefile \
- fips/rsa/Makefile fips/sha1/Makefile; \
- do \
- ${MV} -f $$file $$file.preawk; \
- ${AWK} '/^install:/ { printf "install:\n\nnot-install:\n"; next } { print }' \
- $$file.preawk > $$file; \
+ cd ${WRKSRC}; \
+ for file in fips/*/Makefile; do \
+ if ${GREP} "^EXHEADER=[ ]*$$" $$file >/dev/null; then \
+ ${ECHO} "Fixing 'install' target in $$file."; \
+ ${MV} -f $$file $$file.preawk; \
+ ${AWK} '/^install:/ { printf "install:\n\nnot-install:\n"; next } { print }' \
+ $$file.preawk > $$file; \
+ fi; \
done
cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5}
diff -r 645fff702c39 -r 1149a19d5937 security/openssl/PLIST.common
--- a/security/openssl/PLIST.common Wed Oct 12 03:56:31 2005 +0000
+++ b/security/openssl/PLIST.common Thu Oct 13 13:21:07 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.10 2005/03/23 09:06:38 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.10.4.1 2005/10/13 13:21:07 salo Exp $
bin/c_rehash
bin/openssl
bin/openssl_fips_fingerprint
@@ -28,6 +28,7 @@
include/openssl/evp.h
include/openssl/fips.h
include/openssl/fips_rand.h
+include/openssl/fips_sha.h
include/openssl/hmac.h
${IDEA}include/openssl/idea.h
include/openssl/krb5_asn.h
diff -r 645fff702c39 -r 1149a19d5937 security/openssl/builtin.mk
--- a/security/openssl/builtin.mk Wed Oct 12 03:56:31 2005 +0000
+++ b/security/openssl/builtin.mk Thu Oct 13 13:21:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2005/08/16 16:58:29 jlam Exp $
+# $NetBSD: builtin.mk,v 1.15.2.1 2005/10/13 13:21:07 salo Exp $
BUILTIN_PKG:= openssl
@@ -54,8 +54,7 @@
} \
' ${H_OPENSSL}
-. if !empty(BUILTIN_VERSION.openssl:M0\.9\.6g) && \
- exists(${H_OPENSSL})
+. if !empty(BUILTIN_VERSION.openssl:M0\.9\.6g) && exists(${H_OPENSSL})
#
# If the native OpenSSL contains the security fixes pulled up to the
# netbsd-1-6 branch on 2003-11-07, then pretend it's openssl-0.9.6l.
@@ -78,7 +77,21 @@
END { print ans; exit 0 } \
' ${H_OPENSSL}
. if !empty(BUILTIN_OPENSSL_HAS_20040401_FIX:M[yY][eE][sS])
-BUILTIN_VERSION.openssl= -0.9.6m
+BUILTIN_VERSION.openssl= 0.9.6m
+. endif
+. elif !empty(BUILTIN_VERSION.openssl:M0\.9\.7d) && exists(${H_OPENSSL})
+#
+# If the native OpenSSL contains the security fixes pulled up to the
+# netbsd-2-0, netbsd-2, and netbsd-3-0 branches on 2005-10-11, then
+# pretend it's openssl-0.9.7h.
+#
+BUILTIN_OPENSSL_HAS_20051011_FIX!= \
+ ${AWK} 'BEGIN { ans = "no" } \
+ /OPENSSL_HAS_20051011_FIX/ { ans = "yes" } \
+ END { print ans; exit 0 } \
+ ' ${H_OPENSSL}
+. if !empty(BUILTIN_OPENSSL_HAS_20051011_FIX:M[yY][eE][sS])
+BUILTIN_VERSION.openssl= 0.9.7h
. endif
. endif
BUILTIN_PKG.openssl= openssl-${BUILTIN_VERSION.openssl}
diff -r 645fff702c39 -r 1149a19d5937 security/openssl/distinfo
--- a/security/openssl/distinfo Wed Oct 12 03:56:31 2005 +0000
+++ b/security/openssl/distinfo Thu Oct 13 13:21:07 2005 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.45 2005/03/23 09:06:38 jlam Exp $
+$NetBSD: distinfo,v 1.45.4.1 2005/10/13 13:21:08 salo Exp $
-SHA1 (openssl-0.9.7f.tar.gz) = 0c655553869e5ef060e824be3641385f6b8f7704
-RMD160 (openssl-0.9.7f.tar.gz) = 38ef59bf557bd1adee79481dbcc6d251f13c3ce6
-Size (openssl-0.9.7f.tar.gz) = 3104957 bytes
-SHA1 (patch-aa) = 5ab4ec9fdf15c9ded6a6205dc4801e053b3769fc
-SHA1 (patch-ac) = 94d20483b9b1cb91f6bf6a3c742a85877d1a3918
-SHA1 (patch-ad) = 0bee225764123f741dd08ec88ba36fc24451e1d2
+SHA1 (openssl-0.9.7h.tar.gz) = 9fe535fce89af967b29c4727dedd25f2b4cc2f0d
+RMD160 (openssl-0.9.7h.tar.gz) = 013a101cf5e5a9474fa7afa4f27783f751245ad8
+Size (openssl-0.9.7h.tar.gz) = 3287019 bytes
+SHA1 (patch-aa) = d6cfc26e1f3b378adff1d7f2219ba8e8f39d91e3
+SHA1 (patch-ac) = d0c6404afcc2d462e16a56c3f20bb7e92861e8ba
+SHA1 (patch-ad) = 2581d06c21ed6d1c9a554289591031a6eb66a686
SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8
-SHA1 (patch-af) = e36f298157d6030b71c2240b67f18a5a09ad8b9a
+SHA1 (patch-af) = 46600f241bb490e234aba0c6c277781007f2250d
SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54
diff -r 645fff702c39 -r 1149a19d5937 security/openssl/patches/patch-aa
--- a/security/openssl/patches/patch-aa Wed Oct 12 03:56:31 2005 +0000
+++ b/security/openssl/patches/patch-aa Thu Oct 13 13:21:07 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.17 2004/12/25 22:11:26 jlam Exp $
+$NetBSD: patch-aa,v 1.17.6.1 2005/10/13 13:21:08 salo Exp $
---- config.orig 2004-06-28 18:01:05.000000000 -0400
+--- config.orig 2005-04-07 16:26:10.000000000 -0400
+++ config
@@ -49,6 +49,7 @@ done
# First get uname entries that we use below
@@ -30,7 +30,7 @@
;;
OpenBSD:*)
-@@ -654,9 +659,21 @@ EOF
+@@ -671,9 +676,21 @@ EOF
ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
*-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
*-freebsd[1-2]*) OUT="FreeBSD" ;;
diff -r 645fff702c39 -r 1149a19d5937 security/openssl/patches/patch-ac
--- a/security/openssl/patches/patch-ac Wed Oct 12 03:56:31 2005 +0000
+++ b/security/openssl/patches/patch-ac Thu Oct 13 13:21:07 2005 +0000
@@ -1,20 +1,20 @@
-$NetBSD: patch-ac,v 1.27 2005/03/23 09:06:38 jlam Exp $
+$NetBSD: patch-ac,v 1.27.4.1 2005/10/13 13:21:08 salo Exp $
---- Configure.orig 2005-03-12 06:28:21.000000000 -0500
+--- Configure.orig 2005-06-26 13:24:48.000000000 -0400
+++ Configure
-@@ -171,7 +171,7 @@ my %table=(
- "solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -180,7 +180,7 @@ my %table=(
+ "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT
DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### Solaris x86 with Sun C setups
--"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris-x86-cc","cc:-xO5 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z
text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"solaris-x86-cc","cc:-xO5 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z
text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT
DES_UNROLL::::::::::dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### SPARC Solaris with GNU C setups
- "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-@@ -403,9 +403,23 @@ my %table=(
- "linux-ia64-ecc", "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT
DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-amd64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-em64t", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT
DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -412,9 +412,23 @@ my %table=(
+ "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64-ecc", "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT
DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -38,7 +38,7 @@
"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2
BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-@@ -836,6 +850,10 @@ PROCESS_ARGS:
+@@ -845,6 +859,10 @@ PROCESS_ARGS:
{
$libs.=$_." ";
}
@@ -49,7 +49,7 @@
elsif (/^-[^-]/ or /^\+/)
{
$flags.=$_." ";
-@@ -1306,7 +1324,7 @@ while (<IN>)
+@@ -1323,7 +1341,7 @@ while (<IN>)
elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
{
my $sotmp = $1;
diff -r 645fff702c39 -r 1149a19d5937 security/openssl/patches/patch-ad
--- a/security/openssl/patches/patch-ad Wed Oct 12 03:56:31 2005 +0000
+++ b/security/openssl/patches/patch-ad Thu Oct 13 13:21:07 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.14 2005/03/23 09:06:38 jlam Exp $
+$NetBSD: patch-ad,v 1.14.4.1 2005/10/13 13:21:08 salo Exp $
---- apps/Makefile.orig 2005-03-12 07:15:19.000000000 -0500
+--- apps/Makefile.orig 2005-06-14 08:29:33.000000000 -0400
+++ apps/Makefile
@@ -10,6 +10,7 @@ CFLAG= -g -static
INSTALL_PREFIX=
@@ -10,7 +10,7 @@
MAKEDEPPROG= makedepend
MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
MAKEFILE= Makefile
-@@ -106,13 +107,13 @@ install:
+@@ -115,13 +116,13 @@ install:
@for i in $(SCRIPTS); \
do \
(echo installing $$i; \
diff -r 645fff702c39 -r 1149a19d5937 security/openssl/patches/patch-af
--- a/security/openssl/patches/patch-af Wed Oct 12 03:56:31 2005 +0000
+++ b/security/openssl/patches/patch-af Thu Oct 13 13:21:07 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.16 2005/03/23 09:06:38 jlam Exp $
+$NetBSD: patch-af,v 1.16.4.1 2005/10/13 13:21:08 salo Exp $
---- Makefile.org.orig 2005-03-15 04:46:13.000000000 -0500
+--- Makefile.org.orig 2005-06-20 00:29:54.000000000 -0400
+++ Makefile.org
@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
@@ -10,7 +10,7 @@
# NO_IDEA - Define to build without the IDEA algorithm
# NO_RC4 - Define to build without the RC4 algorithm
-@@ -194,7 +195,7 @@ TESTS = alltests
+@@ -195,7 +196,7 @@ TESTS = alltests
MAKEFILE= Makefile
@@ -19,7 +19,7 @@
MAN1=1
MAN3=3
MANSUFFIX=
-@@ -287,11 +288,13 @@ link-shared:
+@@ -291,11 +292,13 @@ link-shared:
tmp="$(SHARED_LIBS_LINK_EXTS)"; \
for i in $(SHLIBDIRS); do \
prev=lib$$i$(SHLIB_EXT); \
@@ -33,7 +33,7 @@
done; \
fi
-@@ -306,8 +309,7 @@ do_gnu-shared:
+@@ -310,8 +313,7 @@ do_gnu-shared:
fi; \
( set -x; ${CC} ${SHARED_LDFLAGS} \
-shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ -41,17 +41,17 @@
- -Wl,-Bsymbolic \
+ -Wl,-h,lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-Wl,--whole-archive lib$$i.a \
- -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
+ -Wl,--no-whole-archive $$libs ${EX_LIBS} ) || exit 1; \
libs="-l$$i $$libs"; \
-@@ -422,6 +424,7 @@ do_solaris-shared:
+@@ -427,6 +429,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 ${EX_LIBS} ) || exit 1; \
libs="-l$$i $$libs"; \
-@@ -565,7 +568,7 @@ do_hpux64-shared:
+@@ -534,7 +537,7 @@ do_hpux-shared:
# HP/UX-64bit: +forceload
# AIX: -bnogc
# SHAREDFLAGS would be:
@@ -60,7 +60,7 @@
# Tru64 Unix: -shared \
# -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}"
# Solaris: -G -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-@@ -798,16 +801,14 @@ dist:
+@@ -771,16 +774,14 @@ dist:
dist_pem_h:
(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
@@ -79,7 +79,7 @@
@headerlist="$(EXHEADER)"; for i in $$headerlist ;\
do \
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-@@ -893,35 +894,53 @@ install_docs:
+@@ -875,35 +876,53 @@ install_docs:
for i in doc/apps/*.pod; do \
fn=`basename $$i .pod`; \
if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
@@ -96,8 +96,8 @@
- > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
$(PERL) util/extract-names.pl < $$i | \
- grep -v $$filecase "^$$fn\$$" | \
- grep -v "[ ]" | \
+ (grep -v $$filecase "^$$fn\$$"; true) | \
Home |
Main Index |
Thread Index |
Old Index