diff options
author | Tobias Krause <tkr@openoffice.org> | 2010-06-07 13:32:25 +0200 |
---|---|---|
committer | Tobias Krause <tkr@openoffice.org> | 2010-06-07 13:32:25 +0200 |
commit | dd5df7786a6601733ac5a6f68a7a484084394d74 (patch) | |
tree | 331cedf23cb2d92af0166bb996f2ce9a0c899dd0 /openssl/opensslsol.patch | |
parent | ecc335ffb70ba20d8a97291c4ded8075917a7639 (diff) |
jl153: #111875# Update OpenSSL to version 0.9.8o on all platforms except MacOSX (here we are using system openssl)
Diffstat (limited to 'openssl/opensslsol.patch')
-rw-r--r-- | openssl/opensslsol.patch | 78 |
1 files changed, 42 insertions, 36 deletions
diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch index 5ca83a1d6aae..cd2d93a12f53 100644 --- a/openssl/opensslsol.patch +++ b/openssl/opensslsol.patch @@ -1,18 +1,18 @@ ---- 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)", - +--- misc/openssl-0.9.8o/Configure Mon Nov 9 15:14:26 2009 ++++ misc/build/openssl-0.9.8o/Configure Fri Mar 26 16:01:32 2010 +@@ -212,8 +212,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 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)", +-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK 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.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 +--- misc/openssl-0.9.8o/Makefile.shared Wed Sep 17 17:56:40 2008 ++++ misc/build/openssl-0.9.8o/Makefile.shared Fri Mar 26 16:04:41 2010 @@ -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`; \ @@ -20,7 +20,7 @@ - LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \ $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) - + LINK_SO= \ @@ -103,7 +103,7 @@ SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ @@ -31,12 +31,12 @@ $${SHAREDCMD} $${SHAREDFLAGS} \ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ ----- 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 +--- misc/openssl-0.9.8o/config Tue Mar 9 18:08:24 2010 ++++ misc/build/openssl-0.9.8o/config Fri Mar 26 16:07:55 2010 @@ -399,28 +399,25 @@ # this is where the translation occurs into SSLeay terms # --------------------------------------------------------------------------- - + -GCCVER=`(gcc -dumpversion) 2>/dev/null` -if [ "$GCCVER" != "" ]; then - # then strip off whatever prefix egcs prepends the number with... @@ -47,16 +47,10 @@ - # 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]*\-//'` @@ -65,21 +59,31 @@ + # 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 ++ fi +else + CC=`echo $CC | sed 's/^[^ ]*\/\(..\).*/\1/'` 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 [ "$GCCVER" != "" ]; then +- CC=gcc +- else +- CC=cc +- fi +-fi GCCVER=${GCCVER:-0} if [ "$SYSTEM" = "HP-UX" ];then - # By default gcc is a ILP32 compiler (with long long == 64). ---- 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 @@ + # By default gcc is a ILP32 compiler (with long long == 64). +--- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map Fri Mar 26 16:13:54 2010 ++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map Fri Mar 26 16:10:09 2010 +@@ -1,1 +1,3296 @@ -dummy -+LIBCRYPTO_OOO_0_9_8l { ++LIBCRYPTO_OOO_0_9_8o { + global: +ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_it; @@ -1398,7 +1402,7 @@ +KRB5_TKTBODY_free; +KRB5_TKTBODY_it; +KRB5_TKTBODY_new; -+LIBCRYPTO_OOO_0_9_8l; ++LIBCRYPTO_OOO_0_9_8o; +LONG_it; +MD2; +MD2_Final; @@ -3374,11 +3378,12 @@ + local: + *; +}; ---- 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 @@ ++ +--- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map Fri Mar 26 16:13:54 2010 ++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map Fri Mar 26 16:11:27 2010 +@@ -1,1 +1,446 @@ -dummy -+LIBSSL_OOO_0_9_8l { ++LIBSSL_OOO_0_9_8o { + global: +BIO_f_ssl; +BIO_new_buffer_ssl_connect; @@ -3391,7 +3396,7 @@ +DTLSv1_method; +DTLSv1_server_method; +ERR_load_SSL_strings; -+LIBSSL_OOO_0_9_8l; ++LIBSSL_OOO_0_9_8o; +SSL_CIPHER_description; +SSL_CIPHER_get_bits; +SSL_CIPHER_get_name; @@ -3823,3 +3828,4 @@ + *; +}; + ++ |