Author: pescetti
Date: Fri Oct 9 01:04:24 2015
New Revision: 1707642
URL: http://svn.apache.org/viewvc?rev=1707642&view=rev
Log:
#i126572# Update OpenSSL to 0.9.8zg.
Patch by: pfg
Removed:
openoffice/trunk/main/openssl/openssl-0.9.8o-clang.patch
Modified:
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/openssl/makefile.mk
openoffice/trunk/main/openssl/openssl.patch
openoffice/trunk/main/openssl/openssllnx.patch
openoffice/trunk/main/openssl/opensslmacosx.patch
openoffice/trunk/main/openssl/opensslmingw.patch
openoffice/trunk/main/openssl/opensslsol.patch
openoffice/trunk/main/openssl/version.mk
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1707642&r1=1707641&r2=1707642&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Fri Oct 9 01:04:24 2015
@@ -156,9 +156,9 @@ if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
- MD5 = 63ddc5116488985e820075e65fbe6aa4
- name = openssl-0.9.8o.tar.gz
- URL1 = http://www.openssl.org/source/openssl-0.9.8o.tar.gz
+ MD5 = 0a912b6623ac95a8627ea2bd0e0abf1b
+ name = openssl-0.9.8zg.tar.gz
+ URL1 = http://www.openssl.org/source/openssl-0.9.8zg.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
Modified: openoffice/trunk/main/openssl/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/makefile.mk?rev=1707642&r1=1707641&r2=1707642&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/makefile.mk (original)
+++ openoffice/trunk/main/openssl/makefile.mk Fri Oct 9 01:04:24 2015
@@ -42,10 +42,10 @@ TARGET=openssl
@echo "openssl disabled...."
.ENDIF
-OPENSSL_NAME=openssl-0.9.8o
+OPENSSL_NAME=openssl-0.9.8zg
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4
+TARFILE_MD5=0a912b6623ac95a8627ea2bd0e0abf1b
CONFIGURE_DIR=.
CONFIGURE_ACTION=config
@@ -63,8 +63,8 @@ UNAME=$(shell uname)
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8o.map \
- libssl_OOo_0_9_8o.map
+ libcrypto_OOo_0_9_8zg.map \
+ libssl_OOo_0_9_8zg.map
.IF "$(CPU)" == "I"
.IF "$(UNAME)" == "GNU/kFreeBSD"
CONFIGURE_ACTION=Configure debian-kfreebsd-i386
@@ -87,8 +87,8 @@ UNAME=$(shell uname)
.IF "$(OS)" == "SOLARIS"
PATCH_FILES=opensslsol.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8o.map \
- libssl_OOo_0_9_8o.map
+ libcrypto_OOo_0_9_8zg.map \
+ libssl_OOo_0_9_8zg.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
@@ -159,7 +159,7 @@ OUT2BIN += out/libeay32.dll
.ENDIF
.ENDIF
-PATCH_FILES += openssl-0.9.8o-clang.patch
+PATCH_FILES += openssl-0.9.8zg-clang.patch
#set
INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\
&& set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin &&
Modified: openoffice/trunk/main/openssl/openssl.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/openssl.patch?rev=1707642&r1=1707641&r2=1707642&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/openssl.patch (original)
+++ openoffice/trunk/main/openssl/openssl.patch Fri Oct 9 01:04:24 2015
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000
+0100
-+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26
12:04:20.961547300 +0100
+--- misc/openssl-0.9.8zg/crypto/x509v3/v3_pci.c 2007-03-05
01:06:47.000000000 +0100
++++ misc/build/openssl-0.9.8zg/crypto/x509v3/v3_pci.c 2010-03-26
12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (rich...@levitte.org)
@@ -9,9 +9,9 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
---- misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2004-12-28
01:21:33.000000000 +0100
-+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26
12:04:20.961547300 +0100
-@@ -2,7 +2,7 @@
+--- misc/openssl-0.9.8zg/crypto/x509v3/v3_pcia.c 2004-12-28
01:21:33.000000000 +0100
++++ misc/build/openssl-0.9.8zg/crypto/x509v3/v3_pcia.c 2010-03-26
12:04:20.961547300 +0100
+@@ -3,7 +3,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (rich...@levitte.org)
*/
@@ -20,8 +20,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
---- misc/openssl-0.9.8o/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200
-+++ misc/build/openssl-0.9.8o/ms/do_ms.bat 2010-03-26 12:19:19.399047300
+0100
+--- misc/openssl-0.9.8zg/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200
++++ misc/build/openssl-0.9.8zg/ms/do_ms.bat 2010-03-26 12:19:19.399047300
+0100
@@ -1,11 +1,11 @@
-perl util\mkfiles.pl >MINFO
@@ -41,8 +41,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.8o/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200
-+++ misc/build/openssl-0.9.8o/util/mk1mf.pl 2010-03-26 12:04:20.977172300
+0100
+--- misc/openssl-0.9.8zg/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200
++++ misc/build/openssl-0.9.8zg/util/mk1mf.pl 2010-03-26 12:04:20.977172300
+0100
@@ -128,7 +128,7 @@
$inc_def="outinc";
$tmp_def="tmp";
@@ -73,8 +73,8 @@
#define PLATFORM "$platform"
EOF
printf OUT " #define DATE \"%s\"\n", scalar gmtime();
---- misc/openssl-0.9.8o/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000
+0100
-+++ misc/build/openssl-0.9.8o/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300
+0100
+--- misc/openssl-0.9.8zg/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000
+0100
++++ misc/build/openssl-0.9.8zg/util/pl/VC-32.pl 2010-03-26
12:04:20.977172300 +0100
@@ -32,7 +32,7 @@
$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
Modified: openoffice/trunk/main/openssl/openssllnx.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/openssllnx.patch?rev=1707642&r1=1707641&r2=1707642&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/openssllnx.patch (original)
+++ openoffice/trunk/main/openssl/openssllnx.patch Fri Oct 9 01:04:24 2015
@@ -1,6 +1,6 @@
---- misc/build/openssl-0.9.8o/Configure-old 2010-04-17 13:51:42.000000000
+0200
-+++ misc/build/openssl-0.9.8o/Configure 2010-04-17 13:52:03.000000000
+0200
-@@ -388,6 +388,9 @@
+--- misc/build/openssl-0.9.8zg/Configure-old 2010-04-17 13:51:42.000000000
+0200
++++ misc/build/openssl-0.9.8zg/Configure 2010-04-17 13:52:03.000000000
+0200
+@@ -392,6 +392,9 @@
"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3
-march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -10,8 +10,8 @@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG
${x86_gcc_des} ${x86_gcc_opts}:::",
---- misc/build/openssl-0.9.8o/Makefile.org 2010-01-27 17:06:36.000000000
+0100
-+++ misc/build/openssl-0.9.8o/Makefile.org 2010-09-20 09:24:00.000000000
+0100
+--- misc/build/openssl-0.9.8zg/Makefile.org 2010-01-27 17:06:36.000000000
+0100
++++ misc/build/openssl-0.9.8zg/Makefile.org 2010-09-20 09:24:00.000000000
+0100
@@ -199,7 +199,7 @@
BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
@@ -21,8 +21,8 @@
AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \
INSTALL_PREFIX='${INSTALL_PREFIX}' \
---- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
+--- misc/openssl-0.9.8zg/config 2009-02-16 09:43:41.000000000 +0100
++++ misc/build/openssl-0.9.8zg/config 2009-03-30 08:59:09.588448000 +0200
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
@@ -66,11 +66,11 @@
fi
GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then
---- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26
15:26:55.958495757 +0100
-+++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26
15:31:38.019501422 +0100
+--- misc/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 2010-03-26
15:26:55.958495757 +0100
++++ misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 2010-03-26
15:31:38.019501422 +0100
@@ -1 +1,3295 @@
-dummy
-+LIBCRYPTO_OOO_0_9_8o {
++libcrypto_OOo_0_9_8zg {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1389,7 +1389,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8o;
++libcrypto_OOo_0_9_8zg;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3365,11 +3365,11 @@
+ local:
+ *;
+};
---- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:26:55.966057991
+0100
-+++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26
15:31:58.552966503 +0100
+--- misc/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 2010-03-26
15:26:55.966057991 +0100
++++ misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 2010-03-26
15:31:58.552966503 +0100
@@ -1 +1,445 @@
-dummy
-+LIBSSL_OOO_0_9_8o {
++LIBSSL_OOO_0_9_8zg {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
@@ -3382,7 +3382,7 @@
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8o;
++LIBSSL_OOO_0_9_8zg;
+SSL_CIPHER_description;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name;
Modified: openoffice/trunk/main/openssl/opensslmacosx.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/opensslmacosx.patch?rev=1707642&r1=1707641&r2=1707642&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/opensslmacosx.patch (original)
+++ openoffice/trunk/main/openssl/opensslmacosx.patch Fri Oct 9 01:04:24 2015
@@ -1,7 +1,7 @@
---- misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 1970-01-01
01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2007-10-16
15:44:13.000000000 +0200
+--- misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 1970-01-01
01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 2007-10-16
15:44:13.000000000 +0200
@@ -0,1 +1,3304 @@
-+LIBCRYPTO_OOO_0_9_8o{
++LIBCRYPTO_OOO_0_9_8zg{
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -3304,10 +3304,10 @@
+ local:
+ *;
+};
---- misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 1970-01-01
01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2007-10-16
15:44:13.000000000 +0200
+--- misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 1970-01-01
01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 2007-10-16
15:44:13.000000000 +0200
@@ -0,0 +1,442 @@
-+LIBSSL_OOO_0_9_8o{
++LIBSSL_OOO_0_9_8zg{
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
Modified: openoffice/trunk/main/openssl/opensslmingw.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/opensslmingw.patch?rev=1707642&r1=1707641&r2=1707642&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/opensslmingw.patch (original)
+++ openoffice/trunk/main/openssl/opensslmingw.patch Fri Oct 9 01:04:24 2015
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8o/Makefile.shared 2008-09-17 17:56:40.000000000
+0200
-+++ misc/build/openssl-0.9.8o/Makefile.shared 2009-03-30 11:52:53.684538000
+0200
+--- misc/openssl-0.9.8zg/Makefile.shared 2008-09-17 17:56:40.000000000
+0200
++++ misc/build/openssl-0.9.8zg/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.8o/e_os2.h 2005-12-19 03:57:07.000000000 +0900
-+++ misc/build/openssl-0.9.8o/e_os2.h 2009-04-04 23:07:15.324250000 +0900
+--- misc/openssl-0.9.8zg/e_os2.h 2005-12-19 03:57:07.000000000 +0900
++++ misc/build/openssl-0.9.8zg/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; \
@@ -32,8 +32,8 @@
# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
#else
---- misc/openssl-0.9.8o/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
-+++ misc/build/openssl-0.9.8o/ms/mingw32.bat 2009-03-30 11:54:10.000000000
+0200
+--- misc/openssl-0.9.8zg/ms/mingw32.bat 2006-05-05 15:19:32.000000000
+0200
++++ misc/build/openssl-0.9.8zg/ms/mingw32.bat 2009-03-30 11:54:10.000000000
+0200
@@ -79,15 +79,41 @@
rem copy ms\tlhelp32.h outinc
@@ -79,8 +79,8 @@
echo Done compiling OpenSSL
:end
---- misc/openssl-0.9.8o/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000
+0200
-+++ misc/build/openssl-0.9.8o/util/pl/Mingw32.pl 2009-03-30
11:55:04.000000000 +0200
+--- misc/openssl-0.9.8zg/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000
+0200
++++ misc/build/openssl-0.9.8zg/util/pl/Mingw32.pl 2009-03-30
11:55:04.000000000 +0200
@@ -6,11 +6,11 @@
$o='/';
$cp='cp';
Modified: openoffice/trunk/main/openssl/opensslsol.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/opensslsol.patch?rev=1707642&r1=1707641&r2=1707642&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/opensslsol.patch (original)
+++ openoffice/trunk/main/openssl/opensslsol.patch Fri Oct 9 01:04:24 2015
@@ -1,6 +1,6 @@
---- 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 @@
+--- misc/openssl-0.9.8zg/Configure Mon Nov 9 15:14:26 2009
++++ misc/build/openssl-0.9.8zg/Configure Fri Mar 26 16:01:32 2010
+@@ -213,8 +213,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
@@ -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.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
+--- misc/openssl-0.9.8zg/Makefile.shared Wed Sep 17 17:56:40 2008
++++ misc/build/openssl-0.9.8zg/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`; \
@@ -31,8 +31,8 @@
$${SHAREDCMD} $${SHAREDFLAGS} \
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
---- 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
+--- misc/openssl-0.9.8zg/config Tue Mar 9 18:08:24 2010
++++ misc/build/openssl-0.9.8zg/config Fri Mar 26 16:07:55 2010
@@ -399,28 +399,25 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
@@ -79,11 +79,11 @@
GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then
# 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
+--- misc/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map Fri Mar 26
16:10:09 2010
@@ -1,1 +1,3296 @@
-dummy
-+LIBCRYPTO_OOO_0_9_8o {
++LIBCRYPTO_OOO_0_9_8zg {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1402,7 +1402,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8o;
++LIBCRYPTO_OOO_0_9_8zg;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3379,11 +3379,11 @@
+ *;
+};
+
---- 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
+--- misc/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map Fri Mar 26 16:11:27 2010
@@ -1,1 +1,446 @@
-dummy
-+LIBSSL_OOO_0_9_8o {
++LIBSSL_OOO_0_9_8zg {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
@@ -3396,7 +3396,7 @@
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8o;
++LIBSSL_OOO_0_9_8zg;
+SSL_CIPHER_description;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name;
Modified: openoffice/trunk/main/openssl/version.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/version.mk?rev=1707642&r1=1707641&r2=1707642&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/version.mk (original)
+++ openoffice/trunk/main/openssl/version.mk Fri Oct 9 01:04:24 2015
@@ -22,8 +22,8 @@
-OPENSSL_VERSION=0.9.8o
+OPENSSL_VERSION=0.9.8zg
.IF "$(OS)" == "SOLARIS"
-OPENSSL_NAME=openssl-0.9.8o
-.ENDIF
\ No newline at end of file
+OPENSSL_NAME=openssl-0.9.8zg
+.ENDIF
