From da3b7412a479ece3f55ccbc60676696d686b96b9 Mon Sep 17 00:00:00 2001 From: Tobias Krause Date: Mon, 16 Nov 2009 08:20:46 +0000 Subject: #i106876# update of OpenSSL from 0.9.8k to 0.9.8l --- openssl/makefile.mk | 10 +++++----- openssl/openssl.patch | 20 ++++++++++---------- openssl/openssllnx.patch | 28 ++++++++++++++-------------- openssl/opensslmacosx.patch | 12 ++++++------ openssl/opensslmingw.patch | 24 ++++++++++++------------ openssl/opensslsol.patch | 28 ++++++++++++++-------------- openssl/version.mk | 2 +- 7 files changed, 62 insertions(+), 62 deletions(-) (limited to 'openssl') diff --git a/openssl/makefile.mk b/openssl/makefile.mk index f33c26a19b58..6fb48b7ac352 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -50,7 +50,7 @@ TARGET=openssl @echo "openssl disabled...." .ENDIF -OPENSSL_NAME=openssl-0.9.8k +OPENSSL_NAME=openssl-0.9.8l TARFILE_NAME=$(OPENSSL_NAME) @@ -68,8 +68,8 @@ OUT2INC += include/openssl/* .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ - libcrypto_OOo_0_9_8k.map \ - libssl_OOo_0_9_8k.map + libcrypto_OOo_0_9_8l.map \ + libssl_OOo_0_9_8l.map .IF "$(CPU)" == "I" CONFIGURE_ACTION=Configure linux-elf .ELIF "$(BUILD64)" == "1" @@ -84,8 +84,8 @@ OUT2INC += include/openssl/* .IF "$(OS)" == "SOLARIS" PATCH_FILES=opensslsol.patch ADDITIONAL_FILES:= \ - libcrypto_OOo_0_9_8k.map \ - libssl_OOo_0_9_8k.map + libcrypto_OOo_0_9_8l.map \ + libssl_OOo_0_9_8l.map #BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map' # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 90e9db0e2526..4b976ae832c4 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,5 +1,5 @@ ---- 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 +--- misc/openssl-0.9.8l/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100 ++++ misc/build/openssl-0.9.8l/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.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 +--- misc/openssl-0.9.8l/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100 ++++ misc/build/openssl-0.9.8l/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.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 +--- misc/openssl-0.9.8l/ms/do_ms.bat 2005-05-17 02:07:13.000000000 +0200 ++++ misc/build/openssl-0.9.8l/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.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 +--- misc/openssl-0.9.8l/util/mk1mf.pl 2007-08-13 00:31:14.000000000 +0200 ++++ misc/build/openssl-0.9.8l/util/mk1mf.pl 2008-03-20 13:27:06.000000000 +0100 @@ -115,7 +115,7 @@ $inc_def="outinc"; $tmp_def="tmp"; @@ -71,8 +71,8 @@ #define PLATFORM "$platform" EOF printf OUT " #define DATE \"%s\"\n", scalar gmtime(); ---- 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 +--- misc/openssl-0.9.8l/util/pl/VC-32.pl 2007-07-19 19:39:07.000000000 +0200 ++++ misc/build/openssl-0.9.8l/util/pl/VC-32.pl 2008-03-20 13:27:06.000000000 +0100 @@ -28,7 +28,7 @@ $zlib_lib="zlib1.lib"; diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch index 05c4f98ad2ee..5101bc5d6a28 100644 --- a/openssl/openssllnx.patch +++ b/openssl/openssllnx.patch @@ -1,5 +1,5 @@ ---- misc/openssl-0.9.8k/test/Makefile 2009-03-25 11:59:22.000000000 +0100 -+++ misc/build/openssl-0.9.8k/test/Makefile 2009-03-30 12:51:00.210108929 +0200 +--- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100 ++++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200 @@ -408,7 +408,7 @@ LIBRARIES="$(LIBCRYPTO)"; \ fi; \ @@ -18,8 +18,8 @@ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} ---- misc/openssl-0.9.8k/apps/Makefile 2008-11-19 17:03:48.000000000 +0100 -+++ misc/build/openssl-0.9.8k/apps/Makefile 2009-03-30 12:50:56.332719825 +0200 +--- misc/openssl-0.9.8l/apps/Makefile 2008-11-19 17:03:48.000000000 +0100 ++++ misc/build/openssl-0.9.8l/apps/Makefile 2009-03-30 12:50:56.332719825 +0200 @@ -158,7 +158,7 @@ LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ @@ -29,8 +29,8 @@ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} -(cd ..; \ ---- misc/openssl-0.9.8k/config 2009-02-16 09:43:41.000000000 +0100 -+++ misc/build/openssl-0.9.8k/config 2009-03-30 08:59:09.588448000 +0200 +--- misc/openssl-0.9.8l/config 2009-02-16 09:43:41.000000000 +0100 ++++ misc/build/openssl-0.9.8l/config 2009-03-30 08:59:09.588448000 +0200 @@ -399,27 +399,21 @@ # this is where the translation occurs into SSLeay terms # --------------------------------------------------------------------------- @@ -74,11 +74,11 @@ fi GCCVER=${GCCVER:-0} if [ "$SYSTEM" = "HP-UX" ];then ---- 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 +--- misc/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009 ++++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009 @@ -1,1 +1,3295 @@ -dummy -+LIBCRYPTO_OOO_0_9_8e { ++LIBCRYPTO_OOO_0_9_8l { + global: +ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_it; @@ -1397,7 +1397,7 @@ +KRB5_TKTBODY_free; +KRB5_TKTBODY_it; +KRB5_TKTBODY_new; -+LIBCRYPTO_OOO_0_9_8e; ++LIBCRYPTO_OOO_0_9_8k; +LONG_it; +MD2; +MD2_Final; @@ -3373,11 +3373,11 @@ + local: + *; +}; ---- 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 +--- misc/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009 ++++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009 @@ -1,1 +1,445 @@ -dummy -+LIBSSL_OOO_0_9_8e { ++LIBSSL_OOO_0_9_8l { + global: +BIO_f_ssl; +BIO_new_buffer_ssl_connect; @@ -3390,7 +3390,7 @@ +DTLSv1_method; +DTLSv1_server_method; +ERR_load_SSL_strings; -+LIBSSL_OOO_0_9_8e; ++LIBSSL_OOO_0_9_8l; +SSL_CIPHER_description; +SSL_CIPHER_get_bits; +SSL_CIPHER_get_name; diff --git a/openssl/opensslmacosx.patch b/openssl/opensslmacosx.patch index 98c5c9005109..fb6bf48dd91d 100644 --- a/openssl/opensslmacosx.patch +++ b/openssl/opensslmacosx.patch @@ -1,7 +1,7 @@ ---- 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 +--- misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map 2007-10-16 15:44:13.000000000 +0200 @@ -0,0 +1,3303 @@ -+LIBCRYPTO_OOO_0_9_8e{ ++LIBCRYPTO_OOO_0_9_8l{ + global: +ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_it; @@ -3304,10 +3304,10 @@ + local: + *; +}; ---- 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 +--- misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map 2007-10-16 15:44:13.000000000 +0200 @@ -0,0 +1,442 @@ -+LIBSSL_OOO_0_9_8e{ ++LIBSSL_OOO_0_9_8l{ + global: +BIO_f_ssl; +BIO_new_buffer_ssl_connect; diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch index abfe14363d23..144376388c59 100755 --- a/openssl/opensslmingw.patch +++ b/openssl/opensslmingw.patch @@ -1,5 +1,5 @@ ---- 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 +--- misc/openssl-0.9.8l/Makefile.shared 2008-09-17 17:56:40.000000000 +0200 ++++ misc/build/openssl-0.9.8l/Makefile.shared 2009-03-30 11:52:53.684538000 +0200 @@ -254,13 +254,17 @@ base=-Wl,--enable-auto-image-base; \ if expr $(PLATFORM) : 'mingw' > /dev/null; then \ @@ -21,8 +21,8 @@ [ -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.8k/apps/Makefile 2008-11-20 01:03:48.000000000 +0900 -+++ misc/build/openssl-0.9.8k/apps/Makefile 2009-04-10 19:49:37.006875000 +0900 +--- misc/openssl-0.9.8l/apps/Makefile 2008-11-20 01:03:48.000000000 +0900 ++++ misc/build/openssl-0.9.8l/apps/Makefile 2009-04-10 19:49:37.006875000 +0900 @@ -153,12 +153,12 @@ shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ shlib_target="$(SHLIB_TARGET)"; \ @@ -38,8 +38,8 @@ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} -(cd ..; \ ---- misc/openssl-0.9.8k/e_os2.h 2005-12-19 03:57:07.000000000 +0900 -+++ misc/build/openssl-0.9.8k/e_os2.h 2009-04-04 23:07:15.324250000 +0900 +--- misc/openssl-0.9.8l/e_os2.h 2005-12-19 03:57:07.000000000 +0900 ++++ misc/build/openssl-0.9.8l/e_os2.h 2009-04-04 23:07:15.324250000 +0900 @@ -264,7 +264,7 @@ # define OPENSSL_IMPLEMENT_GLOBAL(type,name) \ extern type _hide_##name; \ @@ -49,8 +49,8 @@ # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void) # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name())) #else ---- 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 +--- misc/openssl-0.9.8l/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200 ++++ misc/build/openssl-0.9.8l/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200 @@ -79,15 +79,41 @@ rem copy ms\tlhelp32.h outinc @@ -96,8 +96,8 @@ echo Done compiling OpenSSL :end ---- misc/openssl-0.9.8k/test/Makefile 2009-03-25 19:59:22.000000000 +0900 -+++ misc/build/openssl-0.9.8k/test/Makefile 2009-04-10 20:07:21.522500000 +0900 +--- misc/openssl-0.9.8l/test/Makefile 2009-03-25 19:59:22.000000000 +0900 ++++ misc/build/openssl-0.9.8l/test/Makefile 2009-04-10 20:07:21.522500000 +0900 @@ -402,13 +402,13 @@ if [ "$(FIPSCANLIB)" = "libfips" ]; then \ LIBRARIES="-L$(TOP) -lfips"; \ @@ -128,8 +128,8 @@ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} ---- 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 +--- misc/openssl-0.9.8l/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200 ++++ misc/build/openssl-0.9.8l/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200 @@ -6,11 +6,11 @@ $o='/'; $cp='cp'; diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch index 79e9e19a561c..5ca83a1d6aae 100644 --- a/openssl/opensslsol.patch +++ b/openssl/opensslsol.patch @@ -1,5 +1,5 @@ ---- 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 +--- misc/openssl-0.9.8l/Configure Mon Feb 16 09:44:22 2009 ++++ misc/build/openssl-0.9.8l/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)", @@ -11,8 +11,8 @@ #### 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.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 +---- misc/openssl-0.9.8l/Makefile.shared Wed Sep 17 17:56:40 2008 ++++ misc/build/openssl-0.9.8l/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`; \ @@ -31,8 +31,8 @@ $${SHAREDCMD} $${SHAREDFLAGS} \ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ ----- 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 +---- misc/openssl-0.9.8l/config Mon Feb 16 09:43:41 2009 ++++ misc/build/openssl-0.9.8l/config Mon Mar 30 08:22:05 2009 @@ -399,28 +399,25 @@ # this is where the translation occurs into SSLeay terms # --------------------------------------------------------------------------- @@ -75,11 +75,11 @@ GCCVER=${GCCVER:-0} if [ "$SYSTEM" = "HP-UX" ];then # 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 +--- misc/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009 ++++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009 @@ -1,1 +1,3295 @@ -dummy -+LIBCRYPTO_OOO_0_9_8e { ++LIBCRYPTO_OOO_0_9_8l { + global: +ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_it; @@ -1398,7 +1398,7 @@ +KRB5_TKTBODY_free; +KRB5_TKTBODY_it; +KRB5_TKTBODY_new; -+LIBCRYPTO_OOO_0_9_8e; ++LIBCRYPTO_OOO_0_9_8l; +LONG_it; +MD2; +MD2_Final; @@ -3374,11 +3374,11 @@ + local: + *; +}; ---- 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 +--- misc/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009 ++++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009 @@ -1,1 +1,445 @@ -dummy -+LIBSSL_OOO_0_9_8e { ++LIBSSL_OOO_0_9_8l { + global: +BIO_f_ssl; +BIO_new_buffer_ssl_connect; @@ -3391,7 +3391,7 @@ +DTLSv1_method; +DTLSv1_server_method; +ERR_load_SSL_strings; -+LIBSSL_OOO_0_9_8e; ++LIBSSL_OOO_0_9_8l; +SSL_CIPHER_description; +SSL_CIPHER_get_bits; +SSL_CIPHER_get_name; diff --git a/openssl/version.mk b/openssl/version.mk index f923f9cf6703..cd3b96709509 100644 --- a/openssl/version.mk +++ b/openssl/version.mk @@ -33,5 +33,5 @@ OPENSSL_VERSION=0.9.8g .IF "$(OS)" == "SOLARIS" -OPENSSL_NAME=openssl-0.9.8k +OPENSSL_NAME=openssl-0.9.8l .ENDIF \ No newline at end of file -- cgit