external_deps.lst | 6 +- openssl/makefile.mk | 4 - openssl/openssl.patch | 112 ++++++++++++++++++++++++++--------------------- openssl/openssllnx.patch | 18 +++---- 4 files changed, 76 insertions(+), 64 deletions(-)
New commits: commit f1293fc1719a7dca21c17ac4ffc9a00ab135a3ab Author: Don Lewis <truck...@apache.org> AuthorDate: Thu Aug 30 23:08:51 2018 +0000 Commit: Don Lewis <truck...@apache.org> CommitDate: Thu Aug 30 23:08:51 2018 +0000 Upgrade bundled openssl to version 1.0.2p. diff --git a/external_deps.lst b/external_deps.lst index d88a0f37b128..441cc11209de 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -152,9 +152,9 @@ if (SOLAR_JAVA==TRUE) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE) - MD5 = 9392e65072ce4b614c1392eefc1f23d0 - name = openssl-1.0.2h.tar.gz - URL1 = http://www.openssl.org/source/openssl-1.0.2h.tar.gz + MD5 = ac5eb30bf5798aa14b1ae6d0e7da58df + name = openssl-1.0.2p.tar.gz + URL1 = http://www.openssl.org/source/openssl-1.0.2p.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) diff --git a/openssl/makefile.mk b/openssl/makefile.mk index dc97bb1c7459..64249e01487f 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -42,10 +42,10 @@ TARGET=openssl @echo "openssl disabled...." .ENDIF -OPENSSL_NAME=openssl-1.0.2h +OPENSSL_NAME=openssl-1.0.2p TARFILE_NAME=$(OPENSSL_NAME) -TARFILE_MD5=9392e65072ce4b614c1392eefc1f23d0 +TARFILE_MD5=ac5eb30bf5798aa14b1ae6d0e7da58df CONFIGURE_DIR=. CONFIGURE_ACTION=config diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 27a01adffaa2..1a6da3720b13 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,7 +1,7 @@ -diff -ur misc/openssl-1.0.2h/Configure misc/build/openssl-1.0.2h/Configure ---- misc/openssl-1.0.2h/Configure 2016-05-03 06:44:42.000000000 -0700 -+++ misc/build/openssl-1.0.2h/Configure 2016-08-14 23:51:42.672229000 -0700 -@@ -475,19 +475,20 @@ +diff -ur misc/openssl-1.0.2p/Configure misc/build/openssl-1.0.2p/Configure +--- misc/openssl-1.0.2p/Configure 2018-08-14 05:49:04.000000000 -0700 ++++ misc/build/openssl-1.0.2p/Configure 2018-08-26 14:51:25.397910000 -0700 +@@ -477,19 +477,20 @@ "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### *BSD [do see comment about ${BSDthreads} above!] @@ -31,7 +31,19 @@ diff -ur misc/openssl-1.0.2h/Configure misc/build/openssl-1.0.2h/Configure "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)", -@@ -2031,10 +2032,12 @@ +@@ -592,9 +593,9 @@ + "debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32", + # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement + # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE' +-"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"VC-WIN32","cl:-W3 -w44129 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + # Unified CE target +-"debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"debug-VC-WIN32","cl:-W3 -W44129 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32", + + # Borland C++ 4.5 +@@ -2065,10 +2066,12 @@ if ( $perl =~ m@^/@) { &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); &dofile("apps/CA.pl",$perl,'^#!/', '#!%s'); @@ -43,11 +55,11 @@ diff -ur misc/openssl-1.0.2h/Configure misc/build/openssl-1.0.2h/Configure + &dofile("apps/tsget",'/usr/local/bin/perl',,'^#!/', '#!%s'); } if ($depflags ne $default_depflags && !$make_depend) { - $warn_make_depend++; -diff -ur misc/openssl-1.0.2h/config misc/build/openssl-1.0.2h/config ---- misc/openssl-1.0.2h/config 2016-05-03 06:44:42.000000000 -0700 -+++ misc/build/openssl-1.0.2h/config 2016-08-15 00:25:50.870874000 -0700 -@@ -753,14 +753,8 @@ + $warn_make_depend++; +diff -ur misc/openssl-1.0.2p/config misc/build/openssl-1.0.2p/config +--- misc/openssl-1.0.2p/config 2018-08-14 05:48:56.000000000 -0700 ++++ misc/build/openssl-1.0.2p/config 2018-08-26 14:49:34.431584000 -0700 +@@ -762,14 +762,8 @@ sparc64-*-*bsd*) OUT="BSD-sparc64" ;; ia64-*-*bsd*) OUT="BSD-ia64" ;; amd64-*-*bsd*) OUT="BSD-x86_64" ;; @@ -64,9 +76,9 @@ diff -ur misc/openssl-1.0.2h/config misc/build/openssl-1.0.2h/config *ELF*) OUT="BSD-x86-elf" ;; *) OUT="BSD-x86"; options="$options no-sse2" ;; esac ;; -diff -ur misc/openssl-1.0.2h/ms/do_ms.bat misc/build/openssl-1.0.2h/ms/do_ms.bat ---- misc/openssl-1.0.2h/ms/do_ms.bat 2016-05-03 06:44:42.000000000 -0700 -+++ misc/build/openssl-1.0.2h/ms/do_ms.bat 2016-08-14 23:49:39.418111000 -0700 +diff -ur misc/openssl-1.0.2p/ms/do_ms.bat misc/build/openssl-1.0.2p/ms/do_ms.bat +--- misc/openssl-1.0.2p/ms/do_ms.bat 2018-08-14 05:48:59.000000000 -0700 ++++ misc/build/openssl-1.0.2p/ms/do_ms.bat 2018-08-26 14:49:34.432106000 -0700 @@ -1,11 +1,11 @@ -perl util\mkfiles.pl >MINFO @@ -86,9 +98,39 @@ diff -ur misc/openssl-1.0.2h/ms/do_ms.bat misc/build/openssl-1.0.2h/ms/do_ms.bat -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 -diff -ur misc/openssl-1.0.2h/util/mk1mf.pl misc/build/openssl-1.0.2h/util/mk1mf.pl ---- misc/openssl-1.0.2h/util/mk1mf.pl 2016-05-03 06:44:42.000000000 -0700 -+++ misc/build/openssl-1.0.2h/util/mk1mf.pl 2016-08-14 23:49:39.419397000 -0700 +diff -ur misc/openssl-1.0.2p/ms/do_win64a.bat misc/build/openssl-1.0.2p/ms/do_win64a.bat +--- misc/openssl-1.0.2p/ms/do_win64a.bat 2018-08-14 05:48:59.000000000 -0700 ++++ misc/build/openssl-1.0.2p/ms/do_win64a.bat 2018-08-26 14:49:34.432647000 -0700 +@@ -1,19 +1,19 @@ +-perl util\mkfiles.pl >MINFO ++%1 util\mkfiles.pl >MINFO + + cmd /c "nasm -f win64 -v" >NUL 2>&1 + if %errorlevel% neq 0 goto ml64 + +-perl ms\uplink-x86_64.pl nasm > ms\uptable.asm ++%1 ms\uplink-x86_64.pl nasm > ms\uptable.asm + nasm -f win64 -o ms\uptable.obj ms\uptable.asm + goto proceed + + :ml64 +-perl ms\uplink-x86_64.pl masm > ms\uptable.asm ++%1 ms/uplink-x86_64.pl masm > ms/uptable.asm + ml64 -c -Foms\uptable.obj ms\uptable.asm + + :proceed +-perl util\mk1mf.pl VC-WIN64A >ms\nt.mak +-perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak ++%1 util\mk1mf.pl VC-WIN64A >ms\nt.mak ++%1 util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak + +-perl util\mkdef.pl 32 libeay > ms\libeay32.def +-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 +diff -ur misc/openssl-1.0.2p/util/mk1mf.pl misc/build/openssl-1.0.2p/util/mk1mf.pl +--- misc/openssl-1.0.2p/util/mk1mf.pl 2018-08-14 05:48:59.000000000 -0700 ++++ misc/build/openssl-1.0.2p/util/mk1mf.pl 2018-08-26 14:49:34.433421000 -0700 @@ -163,7 +163,7 @@ $inc_def="outinc"; $tmp_def="tmp"; @@ -98,7 +140,7 @@ diff -ur misc/openssl-1.0.2h/util/mk1mf.pl misc/build/openssl-1.0.2h/util/mk1mf. $mkdir="-mkdir" unless defined $mkdir; ($ssl,$crypto)=("ssl","crypto"); -@@ -345,6 +345,11 @@ +@@ -346,6 +346,11 @@ s/\s*$//; # was chop, didn't work in mixture of perls for Windows... ($key,$val)=/^([^=]+)=(.*)/; @@ -110,9 +152,9 @@ diff -ur misc/openssl-1.0.2h/util/mk1mf.pl misc/build/openssl-1.0.2h/util/mk1mf. if ($key eq "RELATIVE_DIRECTORY") { if ($lib ne "") -diff -ur misc/openssl-1.0.2h/util/pl/VC-32.pl misc/build/openssl-1.0.2h/util/pl/VC-32.pl ---- misc/openssl-1.0.2h/util/pl/VC-32.pl 2016-05-03 06:44:42.000000000 -0700 -+++ misc/build/openssl-1.0.2h/util/pl/VC-32.pl 2016-08-14 23:49:39.420331000 -0700 +diff -ur misc/openssl-1.0.2p/util/pl/VC-32.pl misc/build/openssl-1.0.2p/util/pl/VC-32.pl +--- misc/openssl-1.0.2p/util/pl/VC-32.pl 2018-08-14 05:48:59.000000000 -0700 ++++ misc/build/openssl-1.0.2p/util/pl/VC-32.pl 2018-08-26 14:49:57.553776000 -0700 @@ -30,7 +30,7 @@ my $ff = ""; @@ -122,33 +164,3 @@ diff -ur misc/openssl-1.0.2h/util/pl/VC-32.pl misc/build/openssl-1.0.2h/util/pl/ if ($FLAVOR =~ /WIN64/) { # Note that we currently don't have /WX on Win64! There is a lot of -diff -Nur misc/build/openssl-1.0.2h/ms/do_win64a.bat misc/build/openssl-1.0.2h/ms/do_win64a.bat ---- misc/build/openssl-1.0.2h/ms/do_win64a.bat 2016-05-03 15:44:42.000000000 +0200 -+++ misc/build/openssl-1.0.2h/ms/do_win64a.bat 2018-03-07 07:59:41.870638000 +0200 -@@ -1,19 +1,19 @@ --perl util\mkfiles.pl >MINFO -+%1 util\mkfiles.pl >MINFO - - cmd /c "nasm -f win64 -v" >NUL 2>&1 - if %errorlevel% neq 0 goto ml64 - --perl ms\uplink-x86_64.pl nasm > ms\uptable.asm -+%1 ms\uplink-x86_64.pl nasm > ms\uptable.asm - nasm -f win64 -o ms\uptable.obj ms\uptable.asm - goto proceed - - :ml64 --perl ms\uplink-x86_64.pl masm > ms\uptable.asm -+%1 ms/uplink-x86_64.pl masm > ms/uptable.asm - ml64 -c -Foms\uptable.obj ms\uptable.asm - - :proceed --perl util\mk1mf.pl VC-WIN64A >ms\nt.mak --perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak -+%1 util\mk1mf.pl VC-WIN64A >ms\nt.mak -+%1 util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak - --perl util\mkdef.pl 32 libeay > ms\libeay32.def --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 diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch index 869014b5d179..c4c09de46b24 100644 --- a/openssl/openssllnx.patch +++ b/openssl/openssllnx.patch @@ -1,7 +1,7 @@ -diff -ur misc/openssl-1.0.2h/Configure misc/build/openssl-1.0.2h/Configure ---- misc/openssl-1.0.2h/Configure 2016-05-03 06:44:42.000000000 -0700 -+++ misc/build/openssl-1.0.2h/Configure 2016-08-14 22:07:21.328189000 -0700 -@@ -491,6 +491,9 @@ +diff -ur misc/openssl-1.0.2p/Configure misc/build/openssl-1.0.2p/Configure +--- misc/openssl-1.0.2p/Configure 2018-08-14 05:49:04.000000000 -0700 ++++ misc/build/openssl-1.0.2p/Configure 2018-08-26 13:35:54.485021000 -0700 +@@ -493,6 +493,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)", @@ -11,15 +11,15 @@ diff -ur misc/openssl-1.0.2h/Configure misc/build/openssl-1.0.2h/Configure "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}:::", -diff -ur misc/openssl-1.0.2h/Makefile.org misc/build/openssl-1.0.2h/Makefile.org ---- misc/openssl-1.0.2h/Makefile.org 2016-05-03 06:44:42.000000000 -0700 -+++ misc/build/openssl-1.0.2h/Makefile.org 2016-08-14 22:09:02.144742000 -0700 -@@ -206,7 +206,7 @@ +diff -ur misc/openssl-1.0.2p/Makefile.org misc/build/openssl-1.0.2p/Makefile.org +--- misc/openssl-1.0.2p/Makefile.org 2018-08-14 05:48:56.000000000 -0700 ++++ misc/build/openssl-1.0.2p/Makefile.org 2018-08-26 13:35:54.485813000 -0700 +@@ -208,7 +208,7 @@ # same language for uniform treatment. BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ CC='$(CC)' CFLAG='$(CFLAG)' \ - AS='$(CC)' ASFLAG='$(CFLAG) -c' \ + AS='$(CC)' ASFLAG='$(CFLAG) -c -Wa,--noexecstack' \ AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ + RC='$(RC)' \ CROSS_COMPILE='$(CROSS_COMPILE)' \ - PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits