openssl/makefile.mk | 4 ++--
openssl/openssl-asm-fix.patch | 4 ++--
openssl/openssl.patch | 24 ++++++++++++------------
openssl/opensslios.patch | 4 ++--
openssl/openssllnx.patch | 20 ++++++++++----------
openssl/opensslmacosx.patch | 8 ++++----
openssl/opensslmingw.patch | 16 ++++++++--------
openssl/opensslsol.patch | 20 ++++++++++----------
openssl/version.mk | 4 ++--
9 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 93260d8a53abf4e55920c0722f7438a58f2b5565
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Jun 12 03:31:07 2014 -0700
openssl-0.9.8za -- fixes multiple CVEs
Change-Id: I99595b4de670b42497cb2bf7a19f6a53237c8168
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 286e424..255432e 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -46,10 +46,10 @@ TARGET=openssl
@echo "openssl disabled...."
.ENDIF
-OPENSSL_NAME=openssl-0.9.8v
+OPENSSL_NAME=openssl-0.9.8za
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce
+TARFILE_MD5=2f989915f8fea49aa1bc37aa58500cce
PATCH_FILES=openssl-asm-fix.patch
CONFIGURE_DIR=.
diff --git a/openssl/openssl-asm-fix.patch b/openssl/openssl-asm-fix.patch
index 76013eb..23da4e7 100644
--- a/openssl/openssl-asm-fix.patch
+++ b/openssl/openssl-asm-fix.patch
@@ -1,5 +1,5 @@
---- misc/build/openssl-0.9.8v/crypto/md32_common.h.sav 2010-03-29
13:23:11.000000000 +0200
-+++ misc/build/openssl-0.9.8v/crypto/md32_common.h 2012-03-16
12:39:14.986941958 +0100
+--- misc/build/openssl-0.9.8za/crypto/md32_common.h.sav 2010-03-29
13:23:11.000000000 +0200
++++ misc/build/openssl-0.9.8za/crypto/md32_common.h 2012-03-16
12:39:14.986941958 +0100
@@ -165,7 +165,7 @@
asm ( \
"roll %1,%0" \
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 4bf7761..5dd94a1 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000
+0100
-+++ misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2010-03-26
12:04:20.961547300 +0100
+--- misc/openssl-0.9.8za/crypto/x509v3/v3_pci.c 2007-03-05
01:06:47.000000000 +0100
++++ misc/build/openssl-0.9.8za/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.8v/crypto/x509v3/v3_pcia.c 2004-12-28
01:21:33.000000000 +0100
-+++ misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26
12:04:20.961547300 +0100
+--- misc/openssl-0.9.8za/crypto/x509v3/v3_pcia.c 2004-12-28
01:21:33.000000000 +0100
++++ misc/build/openssl-0.9.8za/crypto/x509v3/v3_pcia.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)
@@ -20,8 +20,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
---- misc/openssl-0.9.8v/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200
-+++ misc/build/openssl-0.9.8v/ms/do_ms.bat 2010-03-26 12:19:19.399047300
+0100
+--- misc/openssl-0.9.8za/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200
++++ misc/build/openssl-0.9.8za/ms/do_ms.bat 2010-03-26 12:19:19.399047300
+0100
@@ -1,11 +1,11 @@
-perl util\mkfiles.pl >MINFO
@@ -43,8 +43,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.8v/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200
-+++ misc/build/openssl-0.9.8v/util/mk1mf.pl 2010-03-26 12:04:20.977172300
+0100
+--- misc/openssl-0.9.8za/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200
++++ misc/build/openssl-0.9.8za/util/mk1mf.pl 2010-03-26 12:04:20.977172300
+0100
@@ -128,7 +128,7 @@
$inc_def="outinc";
$tmp_def="tmp";
@@ -75,8 +75,8 @@
#define PLATFORM "$platform"
EOF
printf OUT " #define DATE \"%s\"\n", scalar gmtime();
---- misc/openssl-0.9.8v/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000
+0100
-+++ misc/build/openssl-0.9.8v/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300
+0100
+--- misc/openssl-0.9.8za/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000
+0100
++++ misc/build/openssl-0.9.8za/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;
@@ -134,8 +134,8 @@
sub do_lib_rule
{
---- misc/build/openssl-0.9.8v/ms/uplink.c
-+++ misc/build/openssl-0.9.8v/ms/uplink.c
+--- misc/build/openssl-0.9.8za/ms/uplink.c
++++ misc/build/openssl-0.9.8za/ms/uplink.c
@@ -1,5 +1,6 @@
#if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE)
#define UNICODE
diff --git a/openssl/opensslios.patch b/openssl/opensslios.patch
index 1f44089..f53ad77 100644
--- a/openssl/opensslios.patch
+++ b/openssl/opensslios.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8v/Configure
-+++ misc/build/openssl-0.9.8v/Configure
+--- misc/openssl-0.9.8za/Configure
++++ misc/build/openssl-0.9.8za/Configure
@@ -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",
"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",
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index bd17c84..5195f58 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -1,5 +1,5 @@
---- misc/build/openssl-0.9.8v/Configure-old 2010-04-17 13:51:42.000000000
+0200
-+++ misc/build/openssl-0.9.8v/Configure 2010-04-17 13:52:03.000000000
+0200
+--- misc/build/openssl-0.9.8za/Configure-old 2010-04-17 13:51:42.000000000
+0200
++++ misc/build/openssl-0.9.8za/Configure 2010-04-17 13:52:03.000000000
+0200
@@ -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)",
@@ -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.8v/Makefile.org 2010-01-27 17:06:36.000000000
+0100
-+++ misc/build/openssl-0.9.8v/Makefile.org 2010-09-20 09:24:00.000000000
+0100
+--- misc/build/openssl-0.9.8za/Makefile.org 2010-01-27 17:06:36.000000000
+0100
++++ misc/build/openssl-0.9.8za/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.8v/config 2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8v/config 2009-03-30 08:59:09.588448000 +0200
+--- misc/openssl-0.9.8za/config 2009-02-16 09:43:41.000000000 +0100
++++ misc/build/openssl-0.9.8za/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.8v/libcrypto_OOo_0_9_8v.map 2010-03-26
15:26:55.958495757 +0100
-+++ misc/build/openssl-0.9.8v/libcrypto_OOo_0_9_8v.map 2010-03-26
15:31:38.019501422 +0100
+--- misc/openssl-0.9.8za/libcrypto_OOo_0_9_8v.map 2010-03-26
15:26:55.958495757 +0100
++++ misc/build/openssl-0.9.8za/libcrypto_OOo_0_9_8v.map 2010-03-26
15:31:38.019501422 +0100
@@ -1 +1,3295 @@
-dummy
+LIBCRYPTO_OOO_0_9_8v {
@@ -3365,8 +3365,8 @@
+ local:
+ *;
+};
---- misc/openssl-0.9.8v/libssl_OOo_0_9_8v.map 2010-03-26 15:26:55.966057991
+0100
-+++ misc/build/openssl-0.9.8v/libssl_OOo_0_9_8v.map 2010-03-26
15:31:58.552966503 +0100
+--- misc/openssl-0.9.8za/libssl_OOo_0_9_8v.map 2010-03-26 15:26:55.966057991
+0100
++++ misc/build/openssl-0.9.8za/libssl_OOo_0_9_8v.map 2010-03-26
15:31:58.552966503 +0100
@@ -1 +1,445 @@
-dummy
+LIBSSL_OOO_0_9_8v {
diff --git a/openssl/opensslmacosx.patch b/openssl/opensslmacosx.patch
index ca777b4..c1f94c2 100644
--- a/openssl/opensslmacosx.patch
+++ b/openssl/opensslmacosx.patch
@@ -1,5 +1,5 @@
---- 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.8v/libcrypto_OOo_0_9_8v.map 2007-10-16
15:44:13.000000000 +0200
+--- misc/build/openssl-0.9.8za/libcrypto_OOo_0_9_8v.map 1970-01-01
01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8za/libcrypto_OOo_0_9_8v.map 2007-10-16
15:44:13.000000000 +0200
@@ -0,1 +1,3304 @@
+LIBCRYPTO_OOO_0_9_8v{
+ global:
@@ -3304,8 +3304,8 @@
+ local:
+ *;
+};
---- 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.8v/libssl_OOo_0_9_8v.map 2007-10-16
15:44:13.000000000 +0200
+--- misc/build/openssl-0.9.8za/libssl_OOo_0_9_8v.map 1970-01-01
01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8za/libssl_OOo_0_9_8v.map 2007-10-16
15:44:13.000000000 +0200
@@ -0,0 +1,442 @@
+LIBSSL_OOO_0_9_8v{
+ global:
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch
index e0dc960..78d63c8 100644
--- a/openssl/opensslmingw.patch
+++ b/openssl/opensslmingw.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8v/Makefile.shared 2008-09-17 17:56:40.000000000
+0200
-+++ misc/build/openssl-0.9.8v/Makefile.shared 2009-03-30 11:52:53.684538000
+0200
+--- misc/openssl-0.9.8za/Makefile.shared 2008-09-17 17:56:40.000000000
+0200
++++ misc/build/openssl-0.9.8za/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.8v/e_os2.h 2005-12-19 03:57:07.000000000 +0900
-+++ misc/build/openssl-0.9.8v/e_os2.h 2009-04-04 23:07:15.324250000 +0900
+--- misc/openssl-0.9.8za/e_os2.h 2005-12-19 03:57:07.000000000 +0900
++++ misc/build/openssl-0.9.8za/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.8v/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
-+++ misc/build/openssl-0.9.8v/ms/mingw32.bat 2009-03-30 11:54:10.000000000
+0200
+--- misc/openssl-0.9.8za/ms/mingw32.bat 2006-05-05 15:19:32.000000000
+0200
++++ misc/build/openssl-0.9.8za/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.8v/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000
+0200
-+++ misc/build/openssl-0.9.8v/util/pl/Mingw32.pl 2009-03-30
11:55:04.000000000 +0200
+--- misc/openssl-0.9.8za/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000
+0200
++++ misc/build/openssl-0.9.8za/util/pl/Mingw32.pl 2009-03-30
11:55:04.000000000 +0200
@@ -6,11 +6,11 @@
$o='/';
$cp='cp';
diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch
index c13f63f..cbe86e9 100644
--- a/openssl/opensslsol.patch
+++ b/openssl/opensslsol.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8v/Configure Mon Nov 9 15:14:26 2009
-+++ misc/build/openssl-0.9.8v/Configure Fri Mar 26 16:01:32 2010
+--- misc/openssl-0.9.8za/Configure Mon Nov 9 15:14:26 2009
++++ misc/build/openssl-0.9.8za/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)",
@@ -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.8v/Makefile.shared Wed Sep 17 17:56:40 2008
-+++ misc/build/openssl-0.9.8v/Makefile.shared Fri Mar 26 16:04:41 2010
+--- misc/openssl-0.9.8za/Makefile.shared Wed Sep 17 17:56:40 2008
++++ misc/build/openssl-0.9.8za/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.8v/config Tue Mar 9 18:08:24 2010
-+++ misc/build/openssl-0.9.8v/config Fri Mar 26 16:07:55 2010
+--- misc/openssl-0.9.8za/config Tue Mar 9 18:08:24 2010
++++ misc/build/openssl-0.9.8za/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.8v/libcrypto_OOo_0_9_8v.map Fri Mar 26 16:13:54 2010
-+++ misc/build/openssl-0.9.8v/libcrypto_OOo_0_9_8v.map Fri Mar 26 16:10:09 2010
+--- misc/openssl-0.9.8za/libcrypto_OOo_0_9_8v.map Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8za/libcrypto_OOo_0_9_8v.map Fri Mar 26
16:10:09 2010
@@ -1,1 +1,3296 @@
-dummy
+LIBCRYPTO_OOO_0_9_8v {
@@ -3379,8 +3379,8 @@
+ *;
+};
+
---- misc/openssl-0.9.8v/libssl_OOo_0_9_8v.map Fri Mar 26 16:13:54 2010
-+++ misc/build/openssl-0.9.8v/libssl_OOo_0_9_8v.map Fri Mar 26 16:11:27 2010
+--- misc/openssl-0.9.8za/libssl_OOo_0_9_8v.map Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8za/libssl_OOo_0_9_8v.map Fri Mar 26 16:11:27 2010
@@ -1,1 +1,446 @@
-dummy
+LIBSSL_OOO_0_9_8v {
diff --git a/openssl/version.mk b/openssl/version.mk
index 164feab..50313ed 100644
--- a/openssl/version.mk
+++ b/openssl/version.mk
@@ -26,8 +26,8 @@
#*************************************************************************
-OPENSSL_VERSION=0.9.8v
+OPENSSL_VERSION=0.9.8za
.IF "$(OS)" == "SOLARIS"
-OPENSSL_NAME=openssl-0.9.8v
+OPENSSL_NAME=openssl-0.9.8za
.ENDIF
\ No newline at end of file
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
