Skip to content

C
core
Kaydet (Commit) 957cb927 authored tarafından Petr Mladek's avatar Petr Mladek
Dosyalara gözat
Seçenekler

update internal openssl to version 0.9.8v 

including important bug fixes
üst f3480645
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 69 deletions
ooo.lst.in
Dosyayı görüntüle @ 957cb927
http://dev-www.libreoffice.org/src http://dev-www.libreoffice.org/src
86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz 86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz
63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
......
openssl/makefile.mk
Dosyayı görüntüle @ 957cb927
...@@ -46,10 +46,10 @@ TARGET=openssl ...@@ -46,10 +46,10 @@ TARGET=openssl
@echo "openssl disabled...." @echo "openssl disabled...."
.ENDIF .ENDIF
OPENSSL_NAME=openssl-0.9.8o OPENSSL_NAME=openssl-0.9.8v
TARFILE_NAME=$(OPENSSL_NAME) TARFILE_NAME=$(OPENSSL_NAME)
TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce
PATCH_FILES=openssl-asm-fix.patch PATCH_FILES=openssl-asm-fix.patch
CONFIGURE_DIR=. CONFIGURE_DIR=.
...@@ -86,8 +86,8 @@ UNAME=$(shell uname) ...@@ -86,8 +86,8 @@ UNAME=$(shell uname)
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID" .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID"
PATCH_FILES+=openssllnx.patch PATCH_FILES+=openssllnx.patch
ADDITIONAL_FILES:= \ ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8o.map \ libcrypto_OOo_0_9_8v.map \
libssl_OOo_0_9_8o.map libssl_OOo_0_9_8v.map
.IF "$(CPU)" == "I" .IF "$(CPU)" == "I"
.IF "$(UNAME)" == "GNU/kFreeBSD" .IF "$(UNAME)" == "GNU/kFreeBSD"
CONFIGURE_ACTION=Configure debian-kfreebsd-i386 CONFIGURE_ACTION=Configure debian-kfreebsd-i386
...@@ -104,15 +104,15 @@ UNAME=$(shell uname) ...@@ -104,15 +104,15 @@ UNAME=$(shell uname)
CONFIGURE_ACTION=Configure linux-generic32 CONFIGURE_ACTION=Configure linux-generic32
.ENDIF .ENDIF
# if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \" # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8v.map'
.ENDIF .ENDIF
.IF "$(OS)" == "SOLARIS" .IF "$(OS)" == "SOLARIS"
PATCH_FILES+=opensslsol.patch PATCH_FILES+=opensslsol.patch
ADDITIONAL_FILES:= \ ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8o.map \ libcrypto_OOo_0_9_8v.map \
libssl_OOo_0_9_8o.map libssl_OOo_0_9_8v.map
#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map' #BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8v.map'
# Use BUILD64 when 1 to select new specific 64bit Configurations if necessary # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
......
openssl/openssl-asm-fix.patch
Dosyayı görüntüle @ 957cb927
--- misc/build/openssl-0.9.8o/crypto/md32_common.h.sav 2010-03-29 13:23:11.000000000 +0200 --- misc/build/openssl-0.9.8v/crypto/md32_common.h.sav 2010-03-29 13:23:11.000000000 +0200
+++ misc/build/openssl-0.9.8o/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100 +++ misc/build/openssl-0.9.8v/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100
@@ -165,7 +165,7 @@ @@ -165,7 +165,7 @@
asm ( \ asm ( \
"roll %1,%0" \ "roll %1,%0" \
......
openssl/openssl.patch
Dosyayı görüntüle @ 957cb927
--- misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100 --- misc/openssl-0.9.8v/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/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004 /* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard@levitte.org) * by Richard Levitte (richard@levitte.org)
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
--- misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100 --- misc/openssl-0.9.8v/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 +++ misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004 /* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard@levitte.org) * by Richard Levitte (richard@levitte.org)
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
--- misc/openssl-0.9.8o/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200 --- misc/openssl-0.9.8v/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/build/openssl-0.9.8v/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
-perl util\mkfiles.pl >MINFO -perl util\mkfiles.pl >MINFO
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+%1 util\mkdef.pl 32 libeay > ms\libeay32.def +%1 util\mkdef.pl 32 libeay > ms\libeay32.def
+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.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/openssl-0.9.8v/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/build/openssl-0.9.8v/util/mk1mf.pl 2010-03-26 12:04:20.977172300 +0100
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
$inc_def="outinc"; $inc_def="outinc";
$tmp_def="tmp"; $tmp_def="tmp";
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
#define PLATFORM "$platform" #define PLATFORM "$platform"
EOF EOF
printf OUT " #define DATE \"%s\"\n", scalar gmtime(); 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/openssl-0.9.8v/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/build/openssl-0.9.8v/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300 +0100
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
$l_flags =~ s/-L(\S+)/\/libpath:$1/g; $l_flags =~ s/-L(\S+)/\/libpath:$1/g;
...@@ -134,8 +134,8 @@ ...@@ -134,8 +134,8 @@
sub do_lib_rule sub do_lib_rule
{ {
--- misc/build/openssl-0.9.8o/ms/uplink.c --- misc/build/openssl-0.9.8v/ms/uplink.c
+++ misc/build/openssl-0.9.8o/ms/uplink.c +++ misc/build/openssl-0.9.8v/ms/uplink.c
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
#if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE) #if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE)
#define UNICODE #define UNICODE
......
openssl/opensslios.patch
Dosyayı görüntüle @ 957cb927
--- misc/openssl-0.9.8o/Configure --- misc/openssl-0.9.8v/Configure
+++ misc/build/openssl-0.9.8o/Configure +++ misc/build/openssl-0.9.8v/Configure
@@ -530,6 +530,9 @@ @@ -530,6 +530,9 @@
"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
......
openssl/openssllnx.patch
Dosyayı görüntüle @ 957cb927
--- misc/build/openssl-0.9.8o/Configure-old 2010-04-17 13:51:42.000000000 +0200 --- misc/build/openssl-0.9.8v/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 +++ misc/build/openssl-0.9.8v/Configure 2010-04-17 13:52:03.000000000 +0200
@@ -388,6 +388,9 @@ @@ -388,6 +388,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)", "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 @@ ...@@ -10,8 +10,8 @@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", "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}:::", "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.8v/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.8v/Makefile.org 2010-09-20 09:24:00.000000000 +0100
@@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \
INSTALL_PREFIX='${INSTALL_PREFIX}' \ INSTALL_PREFIX='${INSTALL_PREFIX}' \
--- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100 --- misc/openssl-0.9.8v/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/build/openssl-0.9.8v/config 2009-03-30 08:59:09.588448000 +0200
@@ -399,27 +399,21 @@ @@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms # this is where the translation occurs into SSLeay terms
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -66,11 +66,11 @@ ...@@ -66,11 +66,11 @@
fi fi
GCCVER=${GCCVER:-0} GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then 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/openssl-0.9.8v/libcrypto_OOo_0_9_8v.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/build/openssl-0.9.8v/libcrypto_OOo_0_9_8v.map 2010-03-26 15:31:38.019501422 +0100
@@ -1 +1,3295 @@ @@ -1 +1,3295 @@
-dummy -dummy
+LIBCRYPTO_OOO_0_9_8o { +LIBCRYPTO_OOO_0_9_8v {
+ global: + global:
+ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it; +ACCESS_DESCRIPTION_it;
...@@ -1389,7 +1389,7 @@ ...@@ -1389,7 +1389,7 @@
+KRB5_TKTBODY_free; +KRB5_TKTBODY_free;
+KRB5_TKTBODY_it; +KRB5_TKTBODY_it;
+KRB5_TKTBODY_new; +KRB5_TKTBODY_new;
+LIBCRYPTO_OOO_0_9_8o; +LIBCRYPTO_OOO_0_9_8v;
+LONG_it; +LONG_it;
+MD2; +MD2;
+MD2_Final; +MD2_Final;
...@@ -3365,11 +3365,11 @@ ...@@ -3365,11 +3365,11 @@
+ local: + local:
+ *; + *;
+}; +};
--- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:26:55.966057991 +0100 --- misc/openssl-0.9.8v/libssl_OOo_0_9_8v.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/build/openssl-0.9.8v/libssl_OOo_0_9_8v.map 2010-03-26 15:31:58.552966503 +0100
@@ -1 +1,445 @@ @@ -1 +1,445 @@
-dummy -dummy
+LIBSSL_OOO_0_9_8o { +LIBSSL_OOO_0_9_8v {
+ global: + global:
+BIO_f_ssl; +BIO_f_ssl;
+BIO_new_buffer_ssl_connect; +BIO_new_buffer_ssl_connect;
...@@ -3382,7 +3382,7 @@ ...@@ -3382,7 +3382,7 @@
+DTLSv1_method; +DTLSv1_method;
+DTLSv1_server_method; +DTLSv1_server_method;
+ERR_load_SSL_strings; +ERR_load_SSL_strings;
+LIBSSL_OOO_0_9_8o; +LIBSSL_OOO_0_9_8v;
+SSL_CIPHER_description; +SSL_CIPHER_description;
+SSL_CIPHER_get_bits; +SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name; +SSL_CIPHER_get_name;
......
openssl/opensslmacosx.patch
Dosyayı görüntüle @ 957cb927
--- 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.8v/libcrypto_OOo_0_9_8v.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.8v/libcrypto_OOo_0_9_8v.map 2007-10-16 15:44:13.000000000 +0200
@@ -0,1 +1,3304 @@ @@ -0,1 +1,3304 @@
+LIBCRYPTO_OOO_0_9_8o{ +LIBCRYPTO_OOO_0_9_8v{
+ global: + global:
+ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it; +ACCESS_DESCRIPTION_it;
...@@ -3304,10 +3304,10 @@ ...@@ -3304,10 +3304,10 @@
+ local: + 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.8v/libssl_OOo_0_9_8v.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.8v/libssl_OOo_0_9_8v.map 2007-10-16 15:44:13.000000000 +0200
@@ -0,0 +1,442 @@ @@ -0,0 +1,442 @@
+LIBSSL_OOO_0_9_8o{ +LIBSSL_OOO_0_9_8v{
+ global: + global:
+BIO_f_ssl; +BIO_f_ssl;
+BIO_new_buffer_ssl_connect; +BIO_new_buffer_ssl_connect;
......
openssl/opensslmingw.patch
Dosyayı görüntüle @ 957cb927
--- misc/openssl-0.9.8o/Makefile.shared 2008-09-17 17:56:40.000000000 +0200 --- misc/openssl-0.9.8v/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/build/openssl-0.9.8v/Makefile.shared 2009-03-30 11:52:53.684538000 +0200
@@ -254,13 +254,17 @@ @@ -254,13 +254,17 @@
base=-Wl,--enable-auto-image-base; \ base=-Wl,--enable-auto-image-base; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \ if expr $(PLATFORM) : 'mingw' > /dev/null; then \
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \ [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \ [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
$(LINK_SO_A) || exit 1; \ $(LINK_SO_A) || exit 1; \
--- misc/openssl-0.9.8o/e_os2.h 2005-12-19 03:57:07.000000000 +0900 --- misc/openssl-0.9.8v/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/build/openssl-0.9.8v/e_os2.h 2009-04-04 23:07:15.324250000 +0900
@@ -264,7 +264,7 @@ @@ -264,7 +264,7 @@
# define OPENSSL_IMPLEMENT_GLOBAL(type,name) \ # define OPENSSL_IMPLEMENT_GLOBAL(type,name) \
extern type _hide_##name; \ extern type _hide_##name; \
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void) # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name())) # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
#else #else
--- misc/openssl-0.9.8o/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200 --- misc/openssl-0.9.8v/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/build/openssl-0.9.8v/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200
@@ -79,15 +79,41 @@ @@ -79,15 +79,41 @@
rem copy ms\tlhelp32.h outinc rem copy ms\tlhelp32.h outinc
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
echo Done compiling OpenSSL echo Done compiling OpenSSL
:end :end
--- misc/openssl-0.9.8o/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200 --- misc/openssl-0.9.8v/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/build/openssl-0.9.8v/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200
@@ -6,11 +6,11 @@ @@ -6,11 +6,11 @@
$o='/'; $o='/';
$cp='cp'; $cp='cp';
......
openssl/opensslsol.patch
Dosyayı görüntüle @ 957cb927
--- misc/openssl-0.9.8o/Configure Mon Nov 9 15:14:26 2009 --- misc/openssl-0.9.8v/Configure Mon Nov 9 15:14:26 2009
+++ misc/build/openssl-0.9.8o/Configure Fri Mar 26 16:01:32 2010 +++ misc/build/openssl-0.9.8v/Configure Fri Mar 26 16:01:32 2010
@@ -212,8 +212,8 @@ @@ -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)", "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 @@ ...@@ -11,8 +11,8 @@
#### SPARC Solaris with GNU C setups #### 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)", "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/openssl-0.9.8v/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/build/openssl-0.9.8v/Makefile.shared Fri Mar 26 16:04:41 2010
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ 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`; \ 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 @@ ...@@ -31,8 +31,8 @@
$${SHAREDCMD} $${SHAREDFLAGS} \ $${SHAREDCMD} $${SHAREDFLAGS} \
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
--- misc/openssl-0.9.8o/config Tue Mar 9 18:08:24 2010 --- misc/openssl-0.9.8v/config Tue Mar 9 18:08:24 2010
+++ misc/build/openssl-0.9.8o/config Fri Mar 26 16:07:55 2010 +++ misc/build/openssl-0.9.8v/config Fri Mar 26 16:07:55 2010
@@ -399,28 +399,25 @@ @@ -399,28 +399,25 @@
# this is where the translation occurs into SSLeay terms # this is where the translation occurs into SSLeay terms
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -79,11 +79,11 @@ ...@@ -79,11 +79,11 @@
GCCVER=${GCCVER:-0} GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then if [ "$SYSTEM" = "HP-UX" ];then
# By default gcc is a ILP32 compiler (with long long == 64). # 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/openssl-0.9.8v/libcrypto_OOo_0_9_8v.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/build/openssl-0.9.8v/libcrypto_OOo_0_9_8v.map Fri Mar 26 16:10:09 2010
@@ -1,1 +1,3296 @@ @@ -1,1 +1,3296 @@
-dummy -dummy
+LIBCRYPTO_OOO_0_9_8o { +LIBCRYPTO_OOO_0_9_8v {
+ global: + global:
+ACCESS_DESCRIPTION_free; +ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it; +ACCESS_DESCRIPTION_it;
...@@ -1402,7 +1402,7 @@ ...@@ -1402,7 +1402,7 @@
+KRB5_TKTBODY_free; +KRB5_TKTBODY_free;
+KRB5_TKTBODY_it; +KRB5_TKTBODY_it;
+KRB5_TKTBODY_new; +KRB5_TKTBODY_new;
+LIBCRYPTO_OOO_0_9_8o; +LIBCRYPTO_OOO_0_9_8v;
+LONG_it; +LONG_it;
+MD2; +MD2;
+MD2_Final; +MD2_Final;
...@@ -3379,11 +3379,11 @@ ...@@ -3379,11 +3379,11 @@
+ *; + *;
+}; +};
+ +
--- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map Fri Mar 26 16:13:54 2010 --- misc/openssl-0.9.8v/libssl_OOo_0_9_8v.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/build/openssl-0.9.8v/libssl_OOo_0_9_8v.map Fri Mar 26 16:11:27 2010
@@ -1,1 +1,446 @@ @@ -1,1 +1,446 @@
-dummy -dummy
+LIBSSL_OOO_0_9_8o { +LIBSSL_OOO_0_9_8v {
+ global: + global:
+BIO_f_ssl; +BIO_f_ssl;
+BIO_new_buffer_ssl_connect; +BIO_new_buffer_ssl_connect;
...@@ -3396,7 +3396,7 @@ ...@@ -3396,7 +3396,7 @@
+DTLSv1_method; +DTLSv1_method;
+DTLSv1_server_method; +DTLSv1_server_method;
+ERR_load_SSL_strings; +ERR_load_SSL_strings;
+LIBSSL_OOO_0_9_8o; +LIBSSL_OOO_0_9_8v;
+SSL_CIPHER_description; +SSL_CIPHER_description;
+SSL_CIPHER_get_bits; +SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name; +SSL_CIPHER_get_name;
......
openssl/version.mk
Dosyayı görüntüle @ 957cb927
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#************************************************************************* #*************************************************************************
OPENSSL_VERSION=0.9.8o OPENSSL_VERSION=0.9.8v
.IF "$(OS)" == "SOLARIS" .IF "$(OS)" == "SOLARIS"
OPENSSL_NAME=openssl-0.9.8o OPENSSL_NAME=openssl-0.9.8v
.ENDIF .ENDIF
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment