This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 74e9e84 Upgrade to openssl-1.0.2u. Remove unused version.mk.
74e9e84 is described below
commit 74e9e84faca423e9c18b00fafc230bc97bb285c0
Author: Don Lewis <truck...@apache.org>
AuthorDate: Fri Aug 21 20:39:53 2020 -0700
Upgrade to openssl-1.0.2u. Remove unused version.mk.
(cherry picked from commit 5988caad9a0dac8ef57950ff3aeb2b6fa8267fc6)
---
main/external_deps.lst | 4 ++--
main/openssl/makefile.mk | 4 ++--
main/openssl/openssl.patch | 36 ++++++++++++++++++------------------
main/openssl/openssllnx.patch | 12 ++++++------
main/openssl/prj/d.lst | 1 -
main/openssl/version.mk | 29 -----------------------------
6 files changed, 28 insertions(+), 58 deletions(-)
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 592c80d..9b0fdfc 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -151,8 +151,8 @@ if (SOLAR_JAVA==TRUE)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
- MD5 = ef66581b80f06eae42f5268bc0b50c6d
- name = openssl-1.0.2t.tar.gz
+ MD5 = cdc2638f789ecc2db2c91488265686c1
+ name = openssl-1.0.2u.tar.gz
URL1 = https://www.openssl.org/source/old/1.0.2/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
diff --git a/main/openssl/makefile.mk b/main/openssl/makefile.mk
index 7280aa2..b387562 100644
--- a/main/openssl/makefile.mk
+++ b/main/openssl/makefile.mk
@@ -42,10 +42,10 @@ TARGET=openssl
@echo "openssl disabled...."
.ENDIF
-OPENSSL_NAME=openssl-1.0.2t
+OPENSSL_NAME=openssl-1.0.2u
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=ef66581b80f06eae42f5268bc0b50c6d
+TARFILE_MD5=cdc2638f789ecc2db2c91488265686c1
CONFIGURE_DIR=.
CONFIGURE_ACTION=config
diff --git a/main/openssl/openssl.patch b/main/openssl/openssl.patch
index 54fae43..fb48031 100644
--- a/main/openssl/openssl.patch
+++ b/main/openssl/openssl.patch
@@ -1,6 +1,6 @@
-diff -ur misc/openssl-1.0.2t/Configure misc/build/openssl-1.0.2t/Configure
---- misc/openssl-1.0.2t/Configure 2018-08-14 05:49:04.000000000 -0700
-+++ misc/build/openssl-1.0.2t/Configure 2018-08-26 14:51:25.397910000
-0700
+diff -ur misc/openssl-1.0.2u/Configure misc/build/openssl-1.0.2u/Configure
+--- misc/openssl-1.0.2u/Configure 2018-08-14 05:49:04.000000000 -0700
++++ misc/build/openssl-1.0.2u/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)",
@@ -56,9 +56,9 @@ diff -ur misc/openssl-1.0.2t/Configure
misc/build/openssl-1.0.2t/Configure
}
if ($depflags ne $default_depflags && !$make_depend) {
$warn_make_depend++;
-diff -ur misc/openssl-1.0.2t/config misc/build/openssl-1.0.2t/config
---- misc/openssl-1.0.2t/config 2018-08-14 05:48:56.000000000 -0700
-+++ misc/build/openssl-1.0.2t/config 2018-08-26 14:49:34.431584000 -0700
+diff -ur misc/openssl-1.0.2u/config misc/build/openssl-1.0.2u/config
+--- misc/openssl-1.0.2u/config 2018-08-14 05:48:56.000000000 -0700
++++ misc/build/openssl-1.0.2u/config 2018-08-26 14:49:34.431584000 -0700
@@ -762,14 +762,8 @@
sparc64-*-*bsd*) OUT="BSD-sparc64" ;;
ia64-*-*bsd*) OUT="BSD-ia64" ;;
@@ -76,9 +76,9 @@ diff -ur misc/openssl-1.0.2t/config
misc/build/openssl-1.0.2t/config
*ELF*) OUT="BSD-x86-elf" ;;
*) OUT="BSD-x86"; options="$options no-sse2" ;;
esac ;;
-diff -ur misc/openssl-1.0.2t/ms/do_ms.bat
misc/build/openssl-1.0.2t/ms/do_ms.bat
---- misc/openssl-1.0.2t/ms/do_ms.bat 2018-08-14 05:48:59.000000000 -0700
-+++ misc/build/openssl-1.0.2t/ms/do_ms.bat 2018-08-26 14:49:34.432106000
-0700
+diff -ur misc/openssl-1.0.2u/ms/do_ms.bat
misc/build/openssl-1.0.2u/ms/do_ms.bat
+--- misc/openssl-1.0.2u/ms/do_ms.bat 2018-08-14 05:48:59.000000000 -0700
++++ misc/build/openssl-1.0.2u/ms/do_ms.bat 2018-08-26 14:49:34.432106000
-0700
@@ -1,11 +1,11 @@
-perl util\mkfiles.pl >MINFO
@@ -98,9 +98,9 @@ diff -ur misc/openssl-1.0.2t/ms/do_ms.bat
misc/build/openssl-1.0.2t/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.2t/ms/do_win64a.bat
misc/build/openssl-1.0.2t/ms/do_win64a.bat
---- misc/openssl-1.0.2t/ms/do_win64a.bat 2018-08-14 05:48:59.000000000
-0700
-+++ misc/build/openssl-1.0.2t/ms/do_win64a.bat 2018-08-26 14:49:34.432647000
-0700
+diff -ur misc/openssl-1.0.2u/ms/do_win64a.bat
misc/build/openssl-1.0.2u/ms/do_win64a.bat
+--- misc/openssl-1.0.2u/ms/do_win64a.bat 2018-08-14 05:48:59.000000000
-0700
++++ misc/build/openssl-1.0.2u/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
@@ -128,9 +128,9 @@ diff -ur misc/openssl-1.0.2t/ms/do_win64a.bat
misc/build/openssl-1.0.2t/ms/do_wi
-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.2t/util/mk1mf.pl
misc/build/openssl-1.0.2t/util/mk1mf.pl
---- misc/openssl-1.0.2t/util/mk1mf.pl 2018-08-14 05:48:59.000000000 -0700
-+++ misc/build/openssl-1.0.2t/util/mk1mf.pl 2018-08-26 14:49:34.433421000
-0700
+diff -ur misc/openssl-1.0.2u/util/mk1mf.pl
misc/build/openssl-1.0.2u/util/mk1mf.pl
+--- misc/openssl-1.0.2u/util/mk1mf.pl 2018-08-14 05:48:59.000000000 -0700
++++ misc/build/openssl-1.0.2u/util/mk1mf.pl 2018-08-26 14:49:34.433421000
-0700
@@ -163,7 +163,7 @@
$inc_def="outinc";
$tmp_def="tmp";
@@ -152,9 +152,9 @@ diff -ur misc/openssl-1.0.2t/util/mk1mf.pl
misc/build/openssl-1.0.2t/util/mk1mf.
if ($key eq "RELATIVE_DIRECTORY")
{
if ($lib ne "")
-diff -ur misc/openssl-1.0.2t/util/pl/VC-32.pl
misc/build/openssl-1.0.2t/util/pl/VC-32.pl
---- misc/openssl-1.0.2t/util/pl/VC-32.pl 2018-08-14 05:48:59.000000000
-0700
-+++ misc/build/openssl-1.0.2t/util/pl/VC-32.pl 2018-08-26 14:49:57.553776000
-0700
+diff -ur misc/openssl-1.0.2u/util/pl/VC-32.pl
misc/build/openssl-1.0.2u/util/pl/VC-32.pl
+--- misc/openssl-1.0.2u/util/pl/VC-32.pl 2018-08-14 05:48:59.000000000
-0700
++++ misc/build/openssl-1.0.2u/util/pl/VC-32.pl 2018-08-26 14:49:57.553776000
-0700
@@ -30,7 +30,7 @@
my $ff = "";
diff --git a/main/openssl/openssllnx.patch b/main/openssl/openssllnx.patch
index b4257ce..9a20d22 100644
--- a/main/openssl/openssllnx.patch
+++ b/main/openssl/openssllnx.patch
@@ -1,6 +1,6 @@
-diff -ur misc/openssl-1.0.2t/Configure misc/build/openssl-1.0.2t/Configure
---- misc/openssl-1.0.2t/Configure 2018-08-14 05:49:04.000000000 -0700
-+++ misc/build/openssl-1.0.2t/Configure 2018-08-26 13:35:54.485021000
-0700
+diff -ur misc/openssl-1.0.2u/Configure misc/build/openssl-1.0.2u/Configure
+--- misc/openssl-1.0.2u/Configure 2018-08-14 05:49:04.000000000 -0700
++++ misc/build/openssl-1.0.2u/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,9 +11,9 @@ diff -ur misc/openssl-1.0.2t/Configure
misc/build/openssl-1.0.2t/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.2t/Makefile.org
misc/build/openssl-1.0.2t/Makefile.org
---- misc/openssl-1.0.2t/Makefile.org 2018-08-14 05:48:56.000000000 -0700
-+++ misc/build/openssl-1.0.2t/Makefile.org 2018-08-26 13:35:54.485813000
-0700
+diff -ur misc/openssl-1.0.2u/Makefile.org
misc/build/openssl-1.0.2u/Makefile.org
+--- misc/openssl-1.0.2u/Makefile.org 2018-08-14 05:48:56.000000000 -0700
++++ misc/build/openssl-1.0.2u/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)'\
diff --git a/main/openssl/prj/d.lst b/main/openssl/prj/d.lst
index 7206585..6b67f0f 100644
--- a/main/openssl/prj/d.lst
+++ b/main/openssl/prj/d.lst
@@ -1,6 +1,5 @@
mkdir: %_DEST%\inc%_EXT%\external
mkdir: %_DEST%\inc%_EXT%\external\openssl
-..\version.mk %_DEST%\inc%_EXT%\external\openssl\version.mk
..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\openssl
..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib
..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll
diff --git a/main/openssl/version.mk b/main/openssl/version.mk
deleted file mode 100644
index 3a98d9f..0000000
--- a/main/openssl/version.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-
-OPENSSL_VERSION=1.0.2t
-
-.IF "$(OS)" == "SOLARIS"
-OPENSSL_NAME=openssl-1.0.2t
-.ENDIF
