mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS tkr21_DEV300

Browse Source 
2009-03-30 13:45:59 +0200 tkr  r270224 : #i100606# openssl upgrade to 0.9.8k. (security fixes)
This commit is contained in:
Ivo Hinkelmann
2009-04-03 20:48:20 +00:00
parent 55aa942c51
commit 4039bec2f4
7 changed files with 3971 additions and 3985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openssl/makefile.mk
View File

@@ -50,7 +50,7 @@ TARGET=openssl
@echo "openssl disabled...."
.ENDIF
OPENSSL_NAME=openssl-0.9.8g
OPENSSL_NAME=openssl-0.9.8k
TARFILE_NAME=$(OPENSSL_NAME)
@@ -68,8 +68,8 @@ OUT2INC += include/openssl/*
.IF "$(OS)" == "LINUX"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8e.map \
libssl_OOo_0_9_8e.map
libcrypto_OOo_0_9_8k.map \
libssl_OOo_0_9_8k.map
# if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
.ENDIF
@@ -77,8 +77,8 @@ OUT2INC += include/openssl/*
.IF "$(OS)" == "SOLARIS"
PATCH_FILES=opensslsol.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8e.map \
libssl_OOo_0_9_8e.map
libcrypto_OOo_0_9_8k.map \
libssl_OOo_0_9_8k.map
#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'
# We need a 64 BIT switch (currently I disable 64 Bit by default).

40
openssl/openssl.patch
View File

@@ -1,5 +1,5 @@
--- misc/openssl-0.9.8g/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100
+++ misc/build/openssl-0.9.8g/crypto/x509v3/v3_pci.c 2008-03-20 13:30:16.000000000 +0100
--- misc/openssl-0.9.8k/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100
+++ misc/build/openssl-0.9.8k/crypto/x509v3/v3_pci.c 2008-03-20 13:30:16.000000000 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard@levitte.org)
@@ -9,8 +9,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
--- misc/openssl-0.9.8g/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
+++ misc/build/openssl-0.9.8g/crypto/x509v3/v3_pcia.c 2008-03-20 13:30:47.000000000 +0100
--- misc/openssl-0.9.8k/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
+++ misc/build/openssl-0.9.8k/crypto/x509v3/v3_pcia.c 2008-03-20 13:30:47.000000000 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard@levitte.org)
@@ -20,8 +20,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
--- misc/openssl-0.9.8g/ms/do_ms.bat 2005-05-17 02:07:13.000000000 +0200
+++ misc/build/openssl-0.9.8g/ms/do_ms.bat 2008-03-20 13:27:06.000000000 +0100
--- misc/openssl-0.9.8k/ms/do_ms.bat 2005-05-17 02:07:13.000000000 +0200
+++ misc/build/openssl-0.9.8k/ms/do_ms.bat 2008-03-20 13:27:06.000000000 +0100
@@ -1,9 +1,8 @@
+%1 util\mkfiles.pl >MINFO
+%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
@@ -39,8 +39,8 @@
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+%1 util\mkdef.pl 32 libeay > ms\libeay32.def
+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
--- misc/openssl-0.9.8g/util/mk1mf.pl 2007-08-13 00:31:14.000000000 +0200
+++ misc/build/openssl-0.9.8g/util/mk1mf.pl 2008-03-20 13:27:06.000000000 +0100
--- misc/openssl-0.9.8k/util/mk1mf.pl 2007-08-13 00:31:14.000000000 +0200
+++ misc/build/openssl-0.9.8k/util/mk1mf.pl 2008-03-20 13:27:06.000000000 +0100
@@ -115,7 +115,7 @@
$inc_def="outinc";
$tmp_def="tmp";
@@ -59,9 +59,9 @@
#define PLATFORM "$platform"
EOF
printf OUT " #define DATE \"%s\"\n", scalar gmtime();
--- misc/openssl-0.9.8g/util/pl/VC-32.pl 2007-07-19 19:39:07.000000000 +0200
+++ misc/build/openssl-0.9.8g/util/pl/VC-32.pl 2008-03-20 13:27:06.000000000 +0100
@@ -14,7 +14,7 @@
--- misc/openssl-0.9.8k/util/pl/VC-32.pl 2007-07-19 19:39:07.000000000 +0200
+++ misc/build/openssl-0.9.8k/util/pl/VC-32.pl 2008-03-20 13:27:06.000000000 +0100
@@ -28,7 +28,7 @@
$zlib_lib="zlib1.lib";
# C compiler stuff
@@ -70,7 +70,7 @@
if ($FLAVOR =~ /WIN64/)
{
# Note that we currently don't have /WX on Win64! There is a lot of
@@ -83,19 +83,19 @@
@@ -99,21 +99,21 @@
}
$cc='$(CC)';
@@ -89,14 +89,18 @@
+ $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
$base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
- $opt_cflags=' /MD /Ox /O2 /Ob2';
- $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
+ $opt_cflags=' -MD -Ox -O2 -Ob2';
+ $dbg_cflags=' -MDd -Od -DDEBUG -D_DEBUG';
- my $f = $shlib || $fips ?' /MD':' /MT';
+ my $f = $shlib || $fips ?' -MD':' -MT';
- $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
+ $lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
- $opt_cflags=$f.' /Ox /O2 /Ob2';
- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
+ $opt_cflags=$f.' -Ox -O2 -Ob2';
+ $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
$lflags="/nologo /subsystem:console /opt:ref";
}
$mlflags='';
@@ -116,7 +116,7 @@
@@ -134,7 +134,7 @@
}
$obj='.obj';
@@ -105,7 +109,7 @@
# EXE linking stuff
$link="link";
@@ -240,7 +240,7 @@
@@ -281,7 +281,7 @@
$tmp_def='tmp32dll_$(TARGETCPU)';
}

7624
openssl/openssllnx.patch
View File

File diff suppressed because it is too large Load Diff

8
openssl/opensslmacosx.patch
View File

@@ -1,5 +1,5 @@
--- misc/build/openssl-0.9.8g/libcrypto_OOo_0_9_8e.map 1970-01-01 01:00:00.000000000 +0100
+++ misc/build/openssl-0.9.8g/libcrypto_OOo_0_9_8e.map 2007-10-16 15:44:13.000000000 +0200
--- misc/build/openssl-0.9.8k/libcrypto_OOo_0_9_8k.map 1970-01-01 01:00:00.000000000 +0100
+++ misc/build/openssl-0.9.8k/libcrypto_OOo_0_9_8k.map 2007-10-16 15:44:13.000000000 +0200
@@ -0,0 +1,3303 @@
+LIBCRYPTO_OOO_0_9_8e{
+ global:
@@ -3304,8 +3304,8 @@
+ local:
+ *;
+};
--- misc/build/openssl-0.9.8g/libssl_OOo_0_9_8e.map 1970-01-01 01:00:00.000000000 +0100
+++ misc/build/openssl-0.9.8g/libssl_OOo_0_9_8e.map 2007-10-16 15:44:13.000000000 +0200
--- misc/build/openssl-0.9.8k/libssl_OOo_0_9_8e.map 1970-01-01 01:00:00.000000000 +0100
+++ misc/build/openssl-0.9.8k/libssl_OOo_0_9_8e.map 2007-10-16 15:44:13.000000000 +0200
@@ -0,0 +1,442 @@
+LIBSSL_OOO_0_9_8e{
+ global:

195
openssl/opensslmingw.patch
View File

@@ -1,117 +1,78 @@
*** misc/openssl-0.9.8g/Makefile.shared Sun Sep 16 23:11:51 2007
--- misc/build/openssl-0.9.8g/Makefile.shared Sat Feb 9 09:46:23 2008
***************
*** 254,266 ****
base=-Wl,--enable-auto-image-base; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
SHLIB=$(LIBNAME)eay32; \
! base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
fi; \
SHLIB_SUFFIX=.dll; \
! SHLIB_SOVER=-$(LIBVERSION); \
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
! SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
$(LINK_SO_A) || exit 1; \
--- 254,270 ----
base=-Wl,--enable-auto-image-base; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
SHLIB=$(LIBNAME)eay32; \
! base=; \
! if test $(LIBNAME) = "crypto"; then \
! SHLIB=libeay32; \
! base=-Wl,--image-base,0x63000000; \
! fi; \
fi; \
SHLIB_SUFFIX=.dll; \
! SHLIB_SOVER=; \
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
! SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
$(LINK_SO_A) || exit 1; \
*** misc/openssl-0.9.8g/ms/mingw32.bat Fri May 5 22:19:33 2006
--- misc/build/openssl-0.9.8g/ms/mingw32.bat Mon Feb 4 20:11:50 2008
***************
*** 79,91 ****
rem copy ms\tlhelp32.h outinc
echo Building the libraries
! mingw32-make -f ms/mingw32a.mak
if errorlevel 1 goto end
echo Generating the DLLs and input libraries
! dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32
if errorlevel 1 goto end
! dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
if errorlevel 1 goto end
echo Done compiling OpenSSL
--- 79,97 ----
rem copy ms\tlhelp32.h outinc
echo Building the libraries
! make -f ms/mingw32a.mak
if errorlevel 1 goto end
echo Generating the DLLs and input libraries
! mv out/libcrypto.a out/libcrypto_static.a
! mv out/libssl.a out/libssl_static.a
! dlltool --dllname libeay32.dll --output-lib out/libcrypto.a --input-def ms/libeay32.def
if errorlevel 1 goto end
! gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
! if errorlevel 1 goto end
! dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def
! if errorlevel 1 goto end
! gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
if errorlevel 1 goto end
echo Done compiling OpenSSL
*** misc/openssl-0.9.8g/util/pl/Mingw32.pl Fri May 5 22:19:35 2006
--- misc/build/openssl-0.9.8g/util/pl/Mingw32.pl Mon Feb 4 21:11:50 2008
***************
*** 6,16 ****
$o='/';
$cp='cp';
$rm='rm -f';
! $mkdir='gmkdir';
! $o='\\';
! $cp='copy';
! $rm='del';
$mkdir='mkdir';
# C compiler stuff
--- 6,16 ----
$o='/';
$cp='cp';
$rm='rm -f';
! #$mkdir='gmkdir';
! #$o='\\';
! #$cp='copy';
! #$rm='del';
$mkdir='mkdir';
# C compiler stuff
***************
*** 87,93 ****
($Name=$name) =~ tr/a-z/A-Z/;
$ret.="$target: \$(${Name}OBJ)\n";
! $ret.="\tif exist $target \$(RM) $target\n";
$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
$ret.="\t\$(RANLIB) $target\n\n";
}
--- 87,94 ----
($Name=$name) =~ tr/a-z/A-Z/;
$ret.="$target: \$(${Name}OBJ)\n";
! $ret.="\t\$(RM) $target\n";
! # $ret.="\tif exist $target \$(RM) $target\n";
$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
$ret.="\t\$(RANLIB) $target\n\n";
}
--- misc/openssl-0.9.8k/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
+++ misc/build/openssl-0.9.8k/Makefile.shared 2009-03-30 11:52:53.684538000 +0200
@@ -238,14 +238,19 @@
SHLIB=cyg$(LIBNAME); \
base=-Wl,--enable-auto-image-base; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
- SHLIB=$(LIBNAME)eay32; base=; \
+ SHLIB=$(LIBNAME)eay32; \
+ base=; \
+ if test $(LIBNAME) = "crypto"; then \
+ SHLIB=libeay32; \
+ base=-Wl,--image-base,0x63000000; \
+ fi; \
fi; \
SHLIB_SUFFIX=.dll; \
LIBVERSION="$(LIBVERSION)"; \
- SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
+ SHLIB_SOVER=\
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
$(LINK_SO_O)
link_a.cygwin:
@ $(CALC_VERSIONS); \
--- misc/openssl-0.9.8k/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
+++ misc/build/openssl-0.9.8k/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200
@@ -79,13 +79,19 @@
rem copy ms\tlhelp32.h outinc
echo Building the libraries
-mingw32-make -f ms/mingw32a.mak
+make -f ms/mingw32a.mak
if errorlevel 1 goto end
echo Generating the DLLs and input libraries
-dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32
+mv out/libcrypto.a out/libcrypto_static.a
+mv out/libssl.a out/libssl_static.a
+dlltool --dllname libeay32.dll --output-lib out/libcrypto.a --input-def ms/libeay32.def
if errorlevel 1 goto end
-dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
+if errorlevel 1 goto end
+dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def
+if errorlevel 1 goto end
+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
if errorlevel 1 goto end
echo Done compiling OpenSSL
--- misc/openssl-0.9.8k/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200
+++ misc/build/openssl-0.9.8k/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200
@@ -6,11 +6,11 @@
$o='/';
$cp='cp';
$rm='rm -f';
-$mkdir='gmkdir';
+#$mkdir='gmkdir';
-$o='\\';
-$cp='copy';
-$rm='del';
+#$o='\\';
+#$cp='copy';
+#$rm='del';
$mkdir='mkdir';
# C compiler stuff
@@ -87,7 +87,8 @@
($Name=$name) =~ tr/a-z/A-Z/;
$ret.="$target: \$(${Name}OBJ)\n";
- $ret.="\tif exist $target \$(RM) $target\n";
+ $ret.="\t\$(RM) $target\n";
+# $ret.="\tif exist $target \$(RM) $target\n";
$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
$ret.="\t\$(RANLIB) $target\n\n";
}

77
openssl/opensslsol.patch
View File

@@ -1,43 +1,44 @@
--- misc/openssl-0.9.8g/Configure Sun Sep 16 14:24:17 2007
+++ misc/build/openssl-0.9.8g/Configure Tue Jan 27 19:51:36 2009
@@ -194,8 +194,8 @@
--- misc/openssl-0.9.8k/Configure Mon Feb 16 09:44:22 2009
+++ misc/build/openssl-0.9.8k/Configure Mon Mar 30 08:17:56 2009
@@ -206,8 +206,8 @@
"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 BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}: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:${no_asm}: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 BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-x86-cc","cc:-O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-x86_64-cc","cc:-xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}: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:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--- misc/openssl-0.9.8g/Makefile.shared Sun Sep 16 16:11:51 2007
+++ misc/build/openssl-0.9.8g/Makefile.shared Tue Jan 27 19:51:03 2009
@@ -93,7 +93,6 @@
---- misc/openssl-0.9.8k/Makefile.shared Wed Sep 17 17:56:40 2008
+++ misc/build/openssl-0.9.8k/Makefile.shared Mon Mar 30 08:19:42 2009
@@ -93,7 +93,7 @@
LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+ LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
$${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
LINK_SO= \
@@ -104,7 +104,6 @@
nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \
@@ -103,7 +103,7 @@
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+ LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
$${SHAREDCMD} $${SHAREDFLAGS} \
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
--- misc/openssl-0.9.8g/config Wed Aug 1 13:21:35 2007
+++ misc/build/openssl-0.9.8g/config Tue Jan 27 19:51:03 2009
@@ -401,19 +401,23 @@
# figure out if gcc is available and if so we use it otherwise
# we fallback to whatever cc does on the system
---- misc/openssl-0.9.8k/config Mon Feb 16 09:43:41 2009
+++ misc/build/openssl-0.9.8k/config Mon Mar 30 08:22:05 2009
@@ -399,28 +399,25 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
-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 | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
@@ -46,10 +47,16 @@
- # major and minor version numbers.
- # peak single digit before and after first dot, e.g. 2.95.1 gives 29
- GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
-fi
-
-# Only set CC if not supplied already
-if [ -z "$CC" ]; then
-# figure out if gcc is available and if so we use it otherwise
-# we fallback to whatever cc does on the system
+if [ -z "$CC" ];then
+ GCCVER=`(gcc -dumpversion) 2>/dev/null`
+ if [ "$GCCVER" != "" ]; then
+ CC=gcc
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 | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
@@ -58,26 +65,18 @@
+ # major and minor version numbers.
+ # peak single digit before and after first dot, e.g. 2.95.1 gives 29
+ GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
+ else
+ CC=cc
+ fi
else
- CC=cc
+ CC=`echo $CC | sed 's/^[^ ]*\/\(..\).*/\1/'`
else
CC=cc
fi
+else
+ CC=`echo $CC | sed 's/^[^ ]*\/\(..\).*/\1/'`
fi
+
GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then
@@ -643,7 +647,7 @@
sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;;
*86*-*-solaris2)
- ISA64=`(isalist) 2>/dev/null | grep amd64`
+# ISA64=`(isalist) 2>/dev/null | grep amd64`
if [ "$ISA64" != "" ]; then
OUT="solaris64-x86_64-$CC"
else
--- misc/openssl-0.9.8g/libcrypto_OOo_0_9_8e.map Tue Jan 27 19:52:14 2009
+++ misc/build/openssl-0.9.8g/libcrypto_OOo_0_9_8e.map Tue Jan 27 19:51:04 2009
# By default gcc is a ILP32 compiler (with long long == 64).
--- misc/openssl-0.9.8k/libcrypto_OOo_0_9_8k.map Tue Jan 27 19:52:14 2009
+++ misc/build/openssl-0.9.8k/libcrypto_OOo_0_9_8k.map Tue Jan 27 19:51:04 2009
@@ -1,1 +1,3295 @@
-dummy
+LIBCRYPTO_OOO_0_9_8e {
@@ -3375,8 +3374,8 @@
+ local:
+ *;
+};
--- misc/openssl-0.9.8g/libssl_OOo_0_9_8e.map Tue Jan 27 19:52:14 2009
+++ misc/build/openssl-0.9.8g/libssl_OOo_0_9_8e.map Tue Jan 27 19:51:04 2009
--- misc/openssl-0.9.8k/libssl_OOo_0_9_8k.map Tue Jan 27 19:52:14 2009
+++ misc/build/openssl-0.9.8k/libssl_OOo_0_9_8k.map Tue Jan 27 19:51:04 2009
@@ -1,1 +1,445 @@
-dummy
+LIBSSL_OOO_0_9_8e {

2
openssl/version.mk
View File

@@ -33,5 +33,5 @@
OPENSSL_VERSION=0.9.8g
.IF "$(OS)" == "SOLARIS"
OPENSSL_NAME=openssl-0.9.8g
OPENSSL_NAME=openssl-0.9.8k
.ENDIF