Author: pfg
Date: Tue Dec 29 21:47:35 2015
New Revision: 1722239
URL: http://svn.apache.org/viewvc?rev=1722239&view=rev
Log:
Update OpenSSL to version 0.9.8zh
Missing changes -- slight mess here :-/.
Modified:
openoffice/trunk/main/openssl/makefile.mk
openoffice/trunk/main/openssl/openssllnx.patch
openoffice/trunk/main/openssl/opensslmacosx.patch
Modified: openoffice/trunk/main/openssl/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/makefile.mk?rev=1722239&r1=1722238&r2=1722239&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/makefile.mk (original)
+++ openoffice/trunk/main/openssl/makefile.mk Tue Dec 29 21:47:35 2015
@@ -63,8 +63,8 @@ UNAME=$(shell uname)
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8zg.map \
- libssl_OOo_0_9_8zg.map
+ libcrypto_OOo_0_9_8zh.map \
+ libssl_OOo_0_9_8zh.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_8zg.map \
- libssl_OOo_0_9_8zg.map
+ libcrypto_OOo_0_9_8zh.map \
+ libssl_OOo_0_9_8zh.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
Modified: openoffice/trunk/main/openssl/openssllnx.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/openssllnx.patch?rev=1722239&r1=1722238&r2=1722239&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/openssllnx.patch (original)
+++ openoffice/trunk/main/openssl/openssllnx.patch Tue Dec 29 21:47:35 2015
@@ -66,11 +66,11 @@
fi
GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then
---- 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
+--- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 2010-03-26
15:26:55.958495757 +0100
++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 2010-03-26
15:31:38.019501422 +0100
@@ -1 +1,3295 @@
-dummy
-+libcrypto_OOo_0_9_8zg {
++libcrypto_OOo_0_9_8zh {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1389,7 +1389,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+libcrypto_OOo_0_9_8zg;
++libcrypto_OOo_0_9_8zh;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3365,11 +3365,11 @@
+ local:
+ *;
+};
---- 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
+--- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map 2010-03-26
15:26:55.966057991 +0100
++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map 2010-03-26
15:31:58.552966503 +0100
@@ -1 +1,445 @@
-dummy
-+LIBSSL_OOO_0_9_8zg {
++LIBSSL_OOO_0_9_8zh {
+ 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_8zg;
++LIBSSL_OOO_0_9_8zh;
+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=1722239&r1=1722238&r2=1722239&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/opensslmacosx.patch (original)
+++ openoffice/trunk/main/openssl/opensslmacosx.patch Tue Dec 29 21:47:35 2015
@@ -1,7 +1,7 @@
---- 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
+--- misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 1970-01-01
01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 2007-10-16
15:44:13.000000000 +0200
@@ -0,1 +1,3304 @@
-+LIBCRYPTO_OOO_0_9_8zg{
++LIBCRYPTO_OOO_0_9_8zh{
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -3304,10 +3304,10 @@
+ local:
+ *;
+};
---- 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
+--- misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map 1970-01-01
01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map 2007-10-16
15:44:13.000000000 +0200
@@ -0,0 +1,442 @@
-+LIBSSL_OOO_0_9_8zg{
++LIBSSL_OOO_0_9_8zh{
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
