Author: pfg
Date: Tue Dec 29 19:07:20 2015
New Revision: 1722228

URL: http://svn.apache.org/viewvc?rev=1722228&view=rev
Log:
Update OpenSSL to version 0.9.8zh

Changes ar really small but this may be the last version in
the 0.9.8 series. Newer versions are bigger and consequently
have a bad security record. We should probably consider alternatives
for future updates.

Added:
    openoffice/trunk/main/openssl/openssl-0.9.8zh-clang.patch
Removed:
    openoffice/trunk/main/openssl/openssl-0.9.8zg-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=1722228&r1=1722227&r2=1722228&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Tue Dec 29 19:07:20 2015
@@ -156,9 +156,9 @@ if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
-    MD5 = 0a912b6623ac95a8627ea2bd0e0abf1b
-    name = openssl-0.9.8zg.tar.gz
-    URL1 = http://www.openssl.org/source/openssl-0.9.8zg.tar.gz
+    MD5 = c813c065dd53d7bd0a560a870ddd0af5
+    name = openssl-0.9.8zh.tar.gz
+    URL1 = http://www.openssl.org/source/openssl-0.9.8zh.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=1722228&r1=1722227&r2=1722228&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/makefile.mk (original)
+++ openoffice/trunk/main/openssl/makefile.mk Tue Dec 29 19:07:20 2015
@@ -42,10 +42,10 @@ TARGET=openssl
        @echo "openssl disabled...."
 .ENDIF
 
-OPENSSL_NAME=openssl-0.9.8zg
+OPENSSL_NAME=openssl-0.9.8zh
 
 TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=0a912b6623ac95a8627ea2bd0e0abf1b
+TARFILE_MD5=c813c065dd53d7bd0a560a870ddd0af5
 
 CONFIGURE_DIR=.
 CONFIGURE_ACTION=config
@@ -159,7 +159,7 @@ OUT2BIN += out/libeay32.dll
        .ENDIF
 .ENDIF
 
-PATCH_FILES += openssl-0.9.8zg-clang.patch
+PATCH_FILES += openssl-0.9.8zh-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 &&
 

Added: openoffice/trunk/main/openssl/openssl-0.9.8zh-clang.patch
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/openssl-0.9.8zh-clang.patch?rev=1722228&view=auto
==============================================================================
--- openoffice/trunk/main/openssl/openssl-0.9.8zh-clang.patch (added)
+++ openoffice/trunk/main/openssl/openssl-0.9.8zh-clang.patch Tue Dec 29 
19:07:20 2015
@@ -0,0 +1,11 @@
+--- misc/openssl-0.9.8zh/crypto/md32_common.h  2015-09-20 11:10:48.263008317 
-0500
++++ misc/build/openssl-0.9.8zh/crypto/md32_common.h    2015-09-20 
11:11:50.047002757 -0500
+@@ -165,7 +165,7 @@
+                                 asm (                   \
+                                 "roll %1,%0"            \
+                                 : "=r"(ret)             \
+-                                : "I"(n), "0"(a)        \
++                                : "I"(n), "0"((unsigned int)a)        \
+                                 : "cc");                \
+                            ret;                         \
+                         })

Modified: openoffice/trunk/main/openssl/openssl.patch
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/openssl.patch?rev=1722228&r1=1722227&r2=1722228&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/openssl.patch (original)
+++ openoffice/trunk/main/openssl/openssl.patch Tue Dec 29 19:07:20 2015
@@ -1,5 +1,5 @@
---- 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
+--- misc/openssl-0.9.8zh/crypto/x509v3/v3_pci.c        2007-03-05 
01:06:47.000000000 +0100
++++ misc/build/openssl-0.9.8zh/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,8 +9,8 @@
   * (Royal Institute of Technology, Stockholm, Sweden).
   * All rights reserved.
   *
---- 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
+--- misc/openssl-0.9.8zh/crypto/x509v3/v3_pcia.c       2004-12-28 
01:21:33.000000000 +0100
++++ misc/build/openssl-0.9.8zh/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.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
+--- misc/openssl-0.9.8zh/ms/do_ms.bat  2009-07-28 14:51:19.000000000 +0200
++++ misc/build/openssl-0.9.8zh/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.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
+--- misc/openssl-0.9.8zh/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200
++++ misc/build/openssl-0.9.8zh/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.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
+--- misc/openssl-0.9.8zh/util/pl/VC-32.pl      2010-02-04 02:10:24.000000000 
+0100
++++ misc/build/openssl-0.9.8zh/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=1722228&r1=1722227&r2=1722228&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/openssllnx.patch (original)
+++ openoffice/trunk/main/openssl/openssllnx.patch Tue Dec 29 19:07:20 2015
@@ -1,5 +1,5 @@
---- 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
+--- misc/build/openssl-0.9.8zh/Configure-old   2010-04-17 13:51:42.000000000 
+0200
++++ misc/build/openssl-0.9.8zh/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.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
+--- misc/build/openssl-0.9.8zh/Makefile.org    2010-01-27 17:06:36.000000000 
+0100
++++ misc/build/openssl-0.9.8zh/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.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
+--- misc/openssl-0.9.8zh/config        2009-02-16 09:43:41.000000000 +0100
++++ misc/build/openssl-0.9.8zh/config  2009-03-30 08:59:09.588448000 +0200
 @@ -399,27 +399,21 @@
  # this is where the translation occurs into SSLeay terms
  # ---------------------------------------------------------------------------
@@ -66,8 +66,8 @@
  fi
  GCCVER=${GCCVER:-0}
  if [ "$SYSTEM" = "HP-UX" ];then
---- 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
+--- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map     2010-03-26 
15:26:55.958495757 +0100
++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map       2010-03-26 
15:31:38.019501422 +0100
 @@ -1 +1,3295 @@
 -dummy
 +libcrypto_OOo_0_9_8zg {
@@ -3365,8 +3365,8 @@
 +      local:
 +              *;
 +};
---- 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
+--- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map        2010-03-26 
15:26:55.966057991 +0100
++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map  2010-03-26 
15:31:58.552966503 +0100
 @@ -1 +1,445 @@
 -dummy
 +LIBSSL_OOO_0_9_8zg {

Modified: openoffice/trunk/main/openssl/opensslmacosx.patch
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/opensslmacosx.patch?rev=1722228&r1=1722227&r2=1722228&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/opensslmacosx.patch (original)
+++ openoffice/trunk/main/openssl/opensslmacosx.patch Tue Dec 29 19:07:20 2015
@@ -1,5 +1,5 @@
---- 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
+--- misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map       1970-01-01 
01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map       2007-10-16 
15:44:13.000000000 +0200
 @@ -0,1 +1,3304 @@
 +LIBCRYPTO_OOO_0_9_8zg{
 +      global:
@@ -3304,8 +3304,8 @@
 +      local:
 +              *;
 +};
---- 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
+--- misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map  1970-01-01 
01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map  2007-10-16 
15:44:13.000000000 +0200
 @@ -0,0 +1,442 @@
 +LIBSSL_OOO_0_9_8zg{
 +      global:

Modified: openoffice/trunk/main/openssl/opensslmingw.patch
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/opensslmingw.patch?rev=1722228&r1=1722227&r2=1722228&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/opensslmingw.patch (original)
+++ openoffice/trunk/main/openssl/opensslmingw.patch Tue Dec 29 19:07:20 2015
@@ -1,5 +1,5 @@
---- 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
+--- misc/openssl-0.9.8zh/Makefile.shared       2008-09-17 17:56:40.000000000 
+0200
++++ misc/build/openssl-0.9.8zh/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.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
+--- misc/openssl-0.9.8zh/e_os2.h       2005-12-19 03:57:07.000000000 +0900
++++ misc/build/openssl-0.9.8zh/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.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
+--- misc/openssl-0.9.8zh/ms/mingw32.bat        2006-05-05 15:19:32.000000000 
+0200
++++ misc/build/openssl-0.9.8zh/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.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
+--- misc/openssl-0.9.8zh/util/pl/Mingw32.pl    2006-05-05 15:19:34.000000000 
+0200
++++ misc/build/openssl-0.9.8zh/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=1722228&r1=1722227&r2=1722228&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/opensslsol.patch (original)
+++ openoffice/trunk/main/openssl/opensslsol.patch Tue Dec 29 19:07:20 2015
@@ -1,5 +1,5 @@
---- 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
+--- misc/openssl-0.9.8zh/Configure     Mon Nov  9 15:14:26 2009
++++ misc/build/openssl-0.9.8zh/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)",
   
@@ -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.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
+--- misc/openssl-0.9.8zh/Makefile.shared       Wed Sep 17 17:56:40 2008
++++ misc/build/openssl-0.9.8zh/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.8zg/config        Tue Mar  9 18:08:24 2010
-+++ misc/build/openssl-0.9.8zg/config  Fri Mar 26 16:07:55 2010
+--- misc/openssl-0.9.8zh/config        Tue Mar  9 18:08:24 2010
++++ misc/build/openssl-0.9.8zh/config  Fri Mar 26 16:07:55 2010
 @@ -399,28 +399,25 @@
  # this is where the translation occurs into SSLeay terms
  # ---------------------------------------------------------------------------
@@ -79,8 +79,8 @@
  GCCVER=${GCCVER:-0}
  if [ "$SYSTEM" = "HP-UX" ];then
    # By default gcc is a ILP32 compiler (with long long == 64).
---- 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
+--- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map     Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map       Fri Mar 26 
16:10:09 2010
 @@ -1,1 +1,3296 @@
 -dummy
 +LIBCRYPTO_OOO_0_9_8zg {
@@ -3379,8 +3379,8 @@
 +              *;
 +};
 +
---- 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
+--- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map        Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map  Fri Mar 26 16:11:27 2010
 @@ -1,1 +1,446 @@
 -dummy
 +LIBSSL_OOO_0_9_8zg {

Modified: openoffice/trunk/main/openssl/version.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/version.mk?rev=1722228&r1=1722227&r2=1722228&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/version.mk (original)
+++ openoffice/trunk/main/openssl/version.mk Tue Dec 29 19:07:20 2015
@@ -22,8 +22,8 @@
 
 
 
-OPENSSL_VERSION=0.9.8zg
+OPENSSL_VERSION=0.9.8zh
 
 .IF "$(OS)" == "SOLARIS"
-OPENSSL_NAME=openssl-0.9.8zg
+OPENSSL_NAME=openssl-0.9.8zh
 .ENDIF


Reply via email to