You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2021/11/16 21:12:33 UTC
[openoffice] branch serf created (now 6156ca3)
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a change to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
at 6156ca3 Latest OpenSSL seems to require pthread
This branch includes the following new commits:
new cd52d89 Using openssl 1.1.1
new dc2a9fa typo
new f3aa7b6 Allow compilation of oox with latest OpenSSL
new 2b0b520 This is not needed any more with latest OpenSSL
new c1c6d5b Switch to serf-1.3.9
new 6156ca3 Latest OpenSSL seems to require pthread
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[openoffice] 02/06: typo
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit dc2a9fafcb17d5035835a36dd36164df19acb690
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Tue Nov 9 13:06:40 2021 -0500
typo
---
main/openssl/makefile.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/openssl/makefile.mk b/main/openssl/makefile.mk
index 45f164f..e195bdd 100644
--- a/main/openssl/makefile.mk
+++ b/main/openssl/makefile.mk
@@ -42,7 +42,7 @@ TARGET=openssl
@echo "openssl disabled...."
.ENDIF
-OPENSSL_NAME=openssl-1.1.11
+OPENSSL_NAME=openssl-1.1.1l
TARFILE_NAME=$(OPENSSL_NAME)
TARFILE_MD5=ac0d4387f3ba0ad741b0580dd45f6ff3
[openoffice] 03/06: Allow compilation of oox with latest OpenSSL
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f3aa7b625b438836ffb3d068f5cd25b19d13b10f
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Tue Nov 16 22:02:45 2021 +0100
Allow compilation of oox with latest OpenSSL
---
main/oox/Library_oox.mk | 3 +++
main/oox/source/core/filterdetect.cxx | 33 +++++++++++++++------------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/main/oox/Library_oox.mk b/main/oox/Library_oox.mk
index 7bd2cf9..2dafb81 100644
--- a/main/oox/Library_oox.mk
+++ b/main/oox/Library_oox.mk
@@ -58,6 +58,9 @@ $(eval $(call gb_Library_add_linked_libs,oox,\
))
$(call gb_Library_use_external,oox,openssl)
+ifeq ($(OS),LINUX)
+$(call gb_Library_add_libs,oox,-lpthread)
+endif
# object files ----------------------------------------------------------------
diff --git a/main/oox/source/core/filterdetect.cxx b/main/oox/source/core/filterdetect.cxx
index fc44947..37450d8 100644
--- a/main/oox/source/core/filterdetect.cxx
+++ b/main/oox/source/core/filterdetect.cxx
@@ -355,25 +355,23 @@ bool lclCheckEncryptionData( const sal_uInt8* pnKey, sal_uInt32 nKeySize, const
if ( nKeySize == 16 && nVerifierSize == 16 && nVerifierHashSize == 32 )
{
// check password
- EVP_CIPHER_CTX aes_ctx;
- EVP_CIPHER_CTX_init( &aes_ctx );
- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+ EVP_CIPHER_CTX *aes_ctx = EVP_CIPHER_CTX_new();
+ EVP_DecryptInit_ex( aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
+ EVP_CIPHER_CTX_set_padding( aes_ctx, 0 );
int nOutLen = 0;
sal_uInt8 pnTmpVerifier[ 16 ];
(void) memset( pnTmpVerifier, 0, sizeof(pnTmpVerifier) );
- /*int*/ EVP_DecryptUpdate( &aes_ctx, pnTmpVerifier, &nOutLen, pnVerifier, nVerifierSize );
- EVP_CIPHER_CTX_cleanup( &aes_ctx );
+ /*int*/ EVP_DecryptUpdate( aes_ctx, pnTmpVerifier, &nOutLen, pnVerifier, nVerifierSize );
- EVP_CIPHER_CTX_init( &aes_ctx );
- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+ EVP_CIPHER_CTX_reset( aes_ctx );
+ EVP_DecryptInit_ex( aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
+ EVP_CIPHER_CTX_set_padding( aes_ctx, 0 );
sal_uInt8 pnTmpVerifierHash[ 32 ];
(void) memset( pnTmpVerifierHash, 0, sizeof(pnTmpVerifierHash) );
- /*int*/ EVP_DecryptUpdate( &aes_ctx, pnTmpVerifierHash, &nOutLen, pnVerifierHash, nVerifierHashSize );
- EVP_CIPHER_CTX_cleanup( &aes_ctx );
+ /*int*/ EVP_DecryptUpdate( aes_ctx, pnTmpVerifierHash, &nOutLen, pnVerifierHash, nVerifierHashSize );
+ EVP_CIPHER_CTX_free( aes_ctx );
rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
rtlDigestError aError = rtl_digest_update( aDigest, pnTmpVerifier, sizeof( pnTmpVerifier ) );
@@ -562,10 +560,9 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript
BinaryXOutputStream aDecryptedPackage( xDecryptedPackage, true );
BinaryXInputStream aEncryptedPackage( xEncryptedPackage, true );
- EVP_CIPHER_CTX aes_ctx;
- EVP_CIPHER_CTX_init( &aes_ctx );
- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 );
- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+ EVP_CIPHER_CTX *aes_ctx = EVP_CIPHER_CTX_new();
+ EVP_DecryptInit_ex( aes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 );
+ EVP_CIPHER_CTX_set_padding( aes_ctx, 0 );
sal_uInt8 pnInBuffer[ 1024 ];
sal_uInt8 pnOutBuffer[ 1024 ];
@@ -574,13 +571,13 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript
aEncryptedPackage.skip( 8 ); // decrypted size
while( (nInLen = aEncryptedPackage.readMemory( pnInBuffer, sizeof( pnInBuffer ) )) > 0 )
{
- EVP_DecryptUpdate( &aes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen );
+ EVP_DecryptUpdate( aes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen );
aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
}
- EVP_DecryptFinal_ex( &aes_ctx, pnOutBuffer, &nOutLen );
+ EVP_DecryptFinal_ex( aes_ctx, pnOutBuffer, &nOutLen );
aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
- EVP_CIPHER_CTX_cleanup( &aes_ctx );
+ EVP_CIPHER_CTX_free( aes_ctx );
xDecryptedPackage->flush();
aDecryptedPackage.seekToStart();
[openoffice] 05/06: Switch to serf-1.3.9
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit c1c6d5ba89c46fb48f161738f108389617b09eb1
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Tue Nov 16 22:08:16 2021 +0100
Switch to serf-1.3.9
Scons is required as an external dependency
---
ext_libraries/serf/makefile.mk | 46 +++++++++++--------------------
ext_libraries/serf/serf-1.3.9.scons.patch | 20 ++++++++++++++
ext_libraries/serf/serf_version.mk | 4 +--
main/external_deps.lst | 6 ++--
main/scp2/source/ooo/file_library_ooo.scp | 4 +--
main/scp2/source/ooo/shortcut_ooo.scp | 4 +--
6 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/ext_libraries/serf/makefile.mk b/ext_libraries/serf/makefile.mk
index d3f7c55..d4cb40e 100644
--- a/ext_libraries/serf/makefile.mk
+++ b/ext_libraries/serf/makefile.mk
@@ -44,9 +44,9 @@ LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINOR).$(SERF_MICRO)
TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
# This is the SHA1 checksum, not MD5 but tg_ext.mk does not now about this and,
# thankfully, does not care.
-TARFILE_MD5=f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
+TARFILE_MD5=26015c63e3bbb108c1689bf2090e4c26351db674
-PATCH_FILES=NULbytes.patch
+PATCH_FILES+=$(TARFILE_NAME).scons.patch
.IF "$(OS)"=="WNT"
@@ -65,17 +65,6 @@ BUILD_FLAGS+= -f ../../../../win/Makefile -j$(EXTMAXPROCESS)
.ELSE
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="LINUX"
-# Do not link against expat. It is not necessary (apr-util is already linked against it)
-# and does not work (we use a different expat library schema.)
-PATCH_FILES+=$(TARFILE_NAME).libs.patch
-.ENDIF
-
-.IF "$(OS)"=="LINUX"
-# Add -ldl as last library so that the linker has no trouble resolving dependencies.
-PATCH_FILES+=$(TARFILE_NAME).ldl.patch
-.ENDIF
-
# Export ENABLE_SERF_LOGGING=YES to enable serf logging
.IF "$(ENABLE_SERF_LOGGING)" == "YES"
PATCH_FILES+=$(TARFILE_NAME).logging.patch
@@ -83,33 +72,30 @@ CDEFS+=-DENABLE_SERF_VERBOSE -DSERF_VERBOSE
.ENDIF
CONFIGURE_DIR=
-CONFIGURE_ACTION=autoconf && .$/configure
+CONFIGURE_ACTION=
+CONFIGURE_FLAGS=
+SCONS_FLAGS=
-.IF "$(OS)"=="LINUX"
-.IF "$(SYSTEM_OPENSSL)"=="YES"
-CDEFS+=$(OPENSSL_CFLAGS)
-.ELSE
+.IF "$(SYSTEM_OPENSSL)"!="YES"
OPENSSLINCDIR=external
-CDEFS+=-I$(SOLARINCDIR)$/$(OPENSSLINCDIR)
-.ENDIF
+SCONS_FLAGS+=OPENSSL=$(SOLARINCDIR)/$(OPENSSLINCDIR)
.ENDIF
-# On Linux/Mac we need the content of CDEFS in CFLAGS so that the ssl headers are searched for
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="LINUX"
-# in a directory that corresponds to the directory that is searched for the ssl library.
-CONFIGURE_FLAGS='CFLAGS=$(CDEFS)'
+.IF "$(SYSTEM_APR)"!="YES"
+SCONS_FLAGS+=APR=$(OUTDIR)
+SCONS_FLAGS+=APU=$(OUTDIR)
.ENDIF
BUILD_DIR=$(CONFIGURE_DIR)
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_ACTION=scons
+BUILD_FLAGS=$(SCONS_FLAGS)
.IF "$(OS)"=="MACOSX"
# Serf names its library only with the major number.
# We are using minor and micro as well. Fix that here
# by creating a copy with the right name.
-SERF_ORIGINAL_LIB=.libs/libserf-$(SERF_MAJOR).0.dylib
-SERF_FIXED_LIB=.libs/libserf-$(LIBSERFVERSION).0.dylib
+SERF_ORIGINAL_LIB=libserf-$(SERF_MAJOR).0.dylib
+SERF_FIXED_LIB=libserf-$(LIBSERFVERSION).0.dylib
INSTALL_ACTION=if [ -f "$(SERF_ORIGINAL_LIB)" -a ! -f "$(SERF_FIXED_LIB)" ]; then cp $(SERF_ORIGINAL_LIB) $(SERF_FIXED_LIB); fi
.ENDIF
@@ -118,9 +104,9 @@ OUT2INC_SUBDIR=serf
.IF "$(OS)"=="MACOSX"
OUT2LIB+=$(SERF_FIXED_LIB)
-OUT2LIB+=.libs/libserf-1.*dylib
+OUT2LIB+=/libserf-1.*dylib
.ELSE
-OUT2LIB=.libs/libserf-1.so*
+OUT2LIB=libserf-1.so*
.ENDIF
.ENDIF
diff --git a/ext_libraries/serf/serf-1.3.9.scons.patch b/ext_libraries/serf/serf-1.3.9.scons.patch
new file mode 100644
index 0000000..c082fab
--- /dev/null
+++ b/ext_libraries/serf/serf-1.3.9.scons.patch
@@ -0,0 +1,20 @@
+--- misc/serf-1.3.9.orig/SConstruct 2015-09-17 14:46:24.000000000 +0200
++++ misc/build/serf-1.3.9/SConstruct 2021-11-13 15:55:56.978550449 +0100
+@@ -166,7 +166,7 @@
+ match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+ 'SERF_MINOR_VERSION ([0-9]+).*'
+ 'SERF_PATCH_VERSION ([0-9]+)',
+- env.File('serf.h').get_contents(),
++ env.File('serf.h').get_contents().decode("utf-8"),
+ re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+ env.Append(MAJOR=str(MAJOR))
+@@ -183,7 +183,7 @@
+
+ unknown = opts.UnknownVariables()
+ if unknown:
+- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++ print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+
+ apr = str(env['APR'])
+ apu = str(env['APU'])
diff --git a/ext_libraries/serf/serf_version.mk b/ext_libraries/serf/serf_version.mk
index 4cf1379..b667e97 100644
--- a/ext_libraries/serf/serf_version.mk
+++ b/ext_libraries/serf/serf_version.mk
@@ -20,5 +20,5 @@
#**************************************************************
SERF_MAJOR=1
-SERF_MINOR=2
-SERF_MICRO=1
+SERF_MINOR=3
+SERF_MICRO=9
diff --git a/main/external_deps.lst b/main/external_deps.lst
index d39f8d5..176694b 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -127,9 +127,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- SHA1 = f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
- name = serf-1.2.1.tar.bz2
- URL1 = https://archive.apache.org/dist/serf/serf-1.2.1.tar.bz2
+ SHA1 = 26015c63e3bbb108c1689bf2090e4c26351db674
+ name = serf-1.3.9.tar.bz2
+ URL1 = https://archive.apache.org/dist/serf/serf-1.3.9.tar.bz2
URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
diff --git a/main/scp2/source/ooo/file_library_ooo.scp b/main/scp2/source/ooo/file_library_ooo.scp
index d8eda0b..2aac7c4 100644
--- a/main/scp2/source/ooo/file_library_ooo.scp
+++ b/main/scp2/source/ooo/file_library_ooo.scp
@@ -2056,9 +2056,9 @@ File gid_File_Lib_Serf
#ifdef MACOSX
Name = STRING(CONCAT3(libserf-,SERF_MAJOR,UNXSUFFIX));
#elif FREEBSD
- Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
+ Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.1));
#else
- Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0.0.0));
+ Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.1.3.0));
#endif
#endif
PACKED_LIB_FILE_BODY;
diff --git a/main/scp2/source/ooo/shortcut_ooo.scp b/main/scp2/source/ooo/shortcut_ooo.scp
index 9fbc33f..132461a 100644
--- a/main/scp2/source/ooo/shortcut_ooo.scp
+++ b/main/scp2/source/ooo/shortcut_ooo.scp
@@ -142,9 +142,9 @@ Shortcut gid_Shortcut_Lib_Serf
FileID = gid_File_Lib_Serf;
Dir = SCP2_OOO_BIN_DIR;
#ifdef MACOSX
- Name = STRING(CONCAT2(libserf-1.0,UNXSUFFIX));
+ Name = STRING(CONCAT2(libserf-1.1,UNXSUFFIX));
#else
- Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
+ Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.1));
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
[openoffice] 04/06: This is not needed any more with latest OpenSSL
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2b0b520d573e38130e39d34b6fe43ea70770196a
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Tue Nov 16 22:04:01 2021 +0100
This is not needed any more with latest OpenSSL
---
main/openssl/openssllnx.patch | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/main/openssl/openssllnx.patch b/main/openssl/openssllnx.patch
index 0779f7b..e69de29 100644
--- a/main/openssl/openssllnx.patch
+++ b/main/openssl/openssllnx.patch
@@ -1,25 +0,0 @@
-diff -ur misc/openssl-1.1.1l/Configure misc/build/openssl-1.1.1l/Configure
---- misc/openssl-1.1.1l/Configure 2018-08-14 05:49:04.000000000 -0700
-+++ misc/build/openssl-1.1.1l/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)",
-
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- "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.1.1l/Makefile.org misc/build/openssl-1.1.1l/Makefile.org
---- misc/openssl-1.1.1l/Makefile.org 2018-08-14 05:48:56.000000000 -0700
-+++ misc/build/openssl-1.1.1l/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)' \
[openoffice] 01/06: Using openssl 1.1.1
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit cd52d89839a60f1d622ea10c7cf95f22e80e19bf
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Tue Nov 9 13:01:10 2021 -0500
Using openssl 1.1.1
(cherry picked from commit b86e16e6b6a3d6837f70d8d07088d00ba1238de2)
---
main/external_deps.lst | 9 +++---
main/openssl/makefile.mk | 5 +--
main/openssl/openssl.patch | 70 ++++++++++++++++++++---------------------
main/openssl/openssllnx.patch | 18 +++++------
main/openssl/opensslmacos.patch | 26 +++++++++++++++
5 files changed, 78 insertions(+), 50 deletions(-)
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 0886a4d..d39f8d5 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -151,10 +151,11 @@ if (SOLAR_JAVA==TRUE)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
- 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)
+ MD5 = ac0d4387f3ba0ad741b0580dd45f6ff3
+ name = openssl-1.1.1l.tar.gz
+ URL1 = https://www.openssl.org/source/openssl-1.1.1l.tar.gz
+ URL2 = https://www.openssl.org/source/old/1.1.1/$(name)
+# URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
MD5 = 0759294408daace192c935b7c9e76e04
diff --git a/main/openssl/makefile.mk b/main/openssl/makefile.mk
index 6d8afa2..45f164f 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.2u
+OPENSSL_NAME=openssl-1.1.11
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=cdc2638f789ecc2db2c91488265686c1
+TARFILE_MD5=ac0d4387f3ba0ad741b0580dd45f6ff3
CONFIGURE_DIR=.
CONFIGURE_ACTION=config
@@ -111,6 +111,7 @@ UNAME=$(shell uname)
.ENDIF
.IF "$(OS)" == "MACOSX"
+ PATCH_FILES=opensslmacos.patch
CONFIGURE_ACTION=Configure darwin64-x86_64-cc no-dso no-shared $(NO_ASM)
.ENDIF
diff --git a/main/openssl/openssl.patch b/main/openssl/openssl.patch
index fb48031..26dcb45 100644
--- a/main/openssl/openssl.patch
+++ b/main/openssl/openssl.patch
@@ -1,9 +1,9 @@
-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
+diff -ur misc/openssl-1.1.1l/Configure misc/build/openssl-1.1.1l/Configure
+--- misc/openssl-1.1.1l/Configure 2018-08-14 05:49:04.000000000 -0700
++++ misc/build/openssl-1.1.1l/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!]
-"BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"BSD-x86", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -15,7 +15,7 @@ diff -ur misc/openssl-1.0.2u/Configure misc/build/openssl-1.0.2u/Configure
+"BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
+"debug-BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall -g $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
+"BSD-sparcv8", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -O3 -mcpu=v8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-
+
-"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"BSD-generic64","$ENV{'FREEBSDCC'}:-O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
# -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
@@ -28,9 +28,9 @@ diff -ur misc/openssl-1.0.2u/Configure misc/build/openssl-1.0.2u/Configure
+"BSD-ia64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
+"BSD-x86_64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
+"BSD-alpha", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-
+
"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)",
-
+
@@ -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
@@ -41,7 +41,7 @@ diff -ur misc/openssl-1.0.2u/Configure misc/build/openssl-1.0.2u/Configure
-"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@^/@) {
@@ -56,9 +56,9 @@ diff -ur misc/openssl-1.0.2u/Configure misc/build/openssl-1.0.2u/Configure
}
if ($depflags ne $default_depflags && !$make_depend) {
$warn_make_depend++;
-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
+diff -ur misc/openssl-1.1.1l/config misc/build/openssl-1.1.1l/config
+--- misc/openssl-1.1.1l/config 2018-08-14 05:48:56.000000000 -0700
++++ misc/build/openssl-1.1.1l/config 2018-08-26 14:49:34.431584000 -0700
@@ -762,14 +762,8 @@
sparc64-*-*bsd*) OUT="BSD-sparc64" ;;
ia64-*-*bsd*) OUT="BSD-ia64" ;;
@@ -71,16 +71,16 @@ diff -ur misc/openssl-1.0.2u/config misc/build/openssl-1.0.2u/config
- libc=`(ls /usr/lib/libc.so.* /lib/libc.so.* | tail -1) 2>/dev/null`
- fi
- case "`(file -L $libc) 2>/dev/null`" in
-+ *86*-*-*bsd*)
++ *86*-*-*bsd*)
+ case "`(file -L /bin/sh) 2>/dev/null`" in
*ELF*) OUT="BSD-x86-elf" ;;
*) OUT="BSD-x86"; options="$options no-sse2" ;;
esac ;;
-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
+diff -ur misc/openssl-1.1.1l/ms/do_ms.bat misc/build/openssl-1.1.1l/ms/do_ms.bat
+--- misc/openssl-1.1.1l/ms/do_ms.bat 2018-08-14 05:48:59.000000000 -0700
++++ misc/build/openssl-1.1.1l/ms/do_ms.bat 2018-08-26 14:49:34.432106000 -0700
@@ -1,11 +1,11 @@
-
+
-perl util\mkfiles.pl >MINFO
-perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
-perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
@@ -93,56 +93,56 @@ diff -ur misc/openssl-1.0.2u/ms/do_ms.bat misc/build/openssl-1.0.2u/ms/do_ms.bat
+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
:skipce
-
+
-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.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
+diff -ur misc/openssl-1.1.1l/ms/do_win64a.bat misc/build/openssl-1.1.1l/ms/do_win64a.bat
+--- misc/openssl-1.1.1l/ms/do_win64a.bat 2018-08-14 05:48:59.000000000 -0700
++++ misc/build/openssl-1.1.1l/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.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
+diff -ur misc/openssl-1.1.1l/util/mk1mf.pl misc/build/openssl-1.1.1l/util/mk1mf.pl
+--- misc/openssl-1.1.1l/util/mk1mf.pl 2018-08-14 05:48:59.000000000 -0700
++++ misc/build/openssl-1.1.1l/util/mk1mf.pl 2018-08-26 14:49:34.433421000 -0700
@@ -163,7 +163,7 @@
$inc_def="outinc";
$tmp_def="tmp";
-
+
-$perl="perl" unless defined $perl;
+$perl="$ENV{PERL}" unless defined $perl;
$mkdir="-mkdir" unless defined $mkdir;
-
+
($ssl,$crypto)=("ssl","crypto");
@@ -346,6 +346,11 @@
s/\s*$//; # was chop, didn't work in mixture of perls for Windows...
-
+
($key,$val)=/^([^=]+)=(.*)/;
+
+ # On some Windows machines, $val has linefeeds at the end, which confuses
@@ -152,12 +152,12 @@ diff -ur misc/openssl-1.0.2u/util/mk1mf.pl misc/build/openssl-1.0.2u/util/mk1mf.
if ($key eq "RELATIVE_DIRECTORY")
{
if ($lib ne "")
-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
+diff -ur misc/openssl-1.1.1l/util/pl/VC-32.pl misc/build/openssl-1.1.1l/util/pl/VC-32.pl
+--- misc/openssl-1.1.1l/util/pl/VC-32.pl 2018-08-14 05:48:59.000000000 -0700
++++ misc/build/openssl-1.1.1l/util/pl/VC-32.pl 2018-08-26 14:49:57.553776000 -0700
@@ -30,7 +30,7 @@
my $ff = "";
-
+
# C compiler stuff
-$cc='cl';
+$cc=$ENV{'CC'};
diff --git a/main/openssl/openssllnx.patch b/main/openssl/openssllnx.patch
index 9a20d22..0779f7b 100644
--- a/main/openssl/openssllnx.patch
+++ b/main/openssl/openssllnx.patch
@@ -1,19 +1,19 @@
-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
+diff -ur misc/openssl-1.1.1l/Configure misc/build/openssl-1.1.1l/Configure
+--- misc/openssl-1.1.1l/Configure 2018-08-14 05:49:04.000000000 -0700
++++ misc/build/openssl-1.1.1l/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)",
-
+
+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
"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.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
+
+diff -ur misc/openssl-1.1.1l/Makefile.org misc/build/openssl-1.1.1l/Makefile.org
+--- misc/openssl-1.1.1l/Makefile.org 2018-08-14 05:48:56.000000000 -0700
++++ misc/build/openssl-1.1.1l/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/opensslmacos.patch b/main/openssl/opensslmacos.patch
new file mode 100644
index 0000000..e406243
--- /dev/null
+++ b/main/openssl/opensslmacos.patch
@@ -0,0 +1,26 @@
+diff -u -r misc/openssl-1.1.1l/crypto/rand/rand_unix.c misc/build/openssl-1.1.1l/crypto/rand/rand_unix.c
+--- misc/openssl-1.1.1l/crypto/rand/rand_unix.c 2021-08-24 09:38:47.000000000 -0400
++++ misc/build/openssl-1.1.1l/crypto/rand/rand_unix.c 2021-11-09 11:17:48.000000000 -0500
+@@ -34,9 +34,6 @@
+ #if defined(__OpenBSD__)
+ # include <sys/param.h>
+ #endif
+-#if defined(__APPLE__)
+-# include <CommonCrypto/CommonRandom.h>
+-#endif
+
+ #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
+ # include <sys/types.h>
+@@ -381,11 +378,6 @@
+ if (errno != ENOSYS)
+ return -1;
+ }
+-# elif defined(__APPLE__)
+- if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
+- return (ssize_t)buflen;
+-
+- return -1;
+ # else
+ union {
+ void *p;
+Only in openssl-1.1.1l: pod2htmd.tmp
[openoffice] 06/06: Latest OpenSSL seems to require pthread
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6156ca37a3e81378957bd7530c84239426910c13
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Tue Nov 16 22:09:15 2021 +0100
Latest OpenSSL seems to require pthread
---
main/solenv/inc/libs.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/solenv/inc/libs.mk b/main/solenv/inc/libs.mk
index 2da44a8..d99c244 100644
--- a/main/solenv/inc/libs.mk
+++ b/main/solenv/inc/libs.mk
@@ -91,7 +91,7 @@ UCBHELPERLIB=-lucbhelper$(COMID)
OPENSSLLIB=$(OPENSSL_LIBS)
OPENSSLLIBST=$(STATIC) $(OPENSSL_LIBS) $(DYNAMIC)
.ELSE # "$(SYSTEM_OPENSSL)" == "YES
-OPENSSLLIB=-lssl -lcrypto
+OPENSSLLIB=-lssl -lcrypto -lpthread
.IF "$(GUI)$(COM)"=="WNTGCC"
OPENSSLLIBST=-lssl_static -lcrypto_static
.ELSE # "$(GUI)$(COM)"=="WNTGCC"