From 0e94bfd34fda1b641e983fbe53cc8c480d09ff23 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 18 Oct 2020 09:33:19 +0100
Subject: [PATCH] no-openssl

don't add -lssl etc if not needed (because we use system-postgresql)


Gbp-Pq: Name no-openssl.diff
---
 RepositoryExternal.mk                        |  72 +------------------
 config_host.mk.in                            |   4 --
 configure.ac                                 | Bin 484022 -> 481477 bytes
 connectivity/Library_postgresql-sdbc-impl.mk |   1 -
 external/Module_external.mk                  |   1 -
 oox/CppunitTest_oox_tokenmap.mk              |   9 ---
 oox/Library_oox.mk                           |   9 ---
 ucb/CppunitTest_ucb_webdav_local_neon.mk     |   1 -
 ucb/CppunitTest_ucb_webdav_neon_opts.mk      |   1 -
 ucb/CppunitTest_ucb_webdav_propfindcache.mk  |   1 -
 ucb/CppunitTest_ucb_webdav_res_access.mk     |   1 -
 ucb/Library_ucpdav1.mk                       |   2 -
 12 files changed, 2 insertions(+), 100 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e361683bcf1..86e457bba25 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1558,75 +1558,6 @@ endef
 
 endif # SYSTEM_HARFBUZZ
 
-ifeq ($(DISABLE_OPENSSL),TRUE)
-
-gb_ExternalProject__use_openssl:=
-gb_LinkTarget__use_openssl_headers:=
-gb_LinkTarget__use_openssl:=
-
-else # !DISABLE_OPENSSL
-
-ifneq ($(SYSTEM_OPENSSL),)
-
-gb_LinkTarget__use_openssl_headers:=
-gb_ExternalProject__use_openssl:=
-
-define gb_LinkTarget__use_openssl
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(OPENSSL_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
-
-endef
-
-else # !SYSTEM_OPENSSL
-
-$(eval $(call gb_Helper_register_packages_for_install,ooo, \
-	openssl \
-))
-
-define gb_ExternalProject__use_openssl
-$(call gb_ExternalProject_use_package,$(1),openssl)
-
-endef
-
-define gb_LinkTarget__use_openssl_headers
-$(call gb_LinkTarget_use_external_project,$(1),openssl)
-$(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
-	$$(INCLUDE) \
-)
-
-endef
-
-define gb_LinkTarget__use_openssl
-$(call gb_LinkTarget_use_package,$(1),openssl)
-ifeq ($(OS),WNT)
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \
-	$(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \
-)
-else
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \
-	$(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \
-)
-$(call gb_LinkTarget_use_external_project,$(1),openssl)
-ifeq ($(OS),SOLARIS)
-$(call gb_LinkTarget_add_libs,$(1),\
-	-lnsl \
-	-lsocket \
-)
-endif
-endif
-
-endef
-
-endif # SYSTEM_OPENSSL
-endif # DISABLE_OPENSSL
-
-
 ifeq ($(DISABLE_OPENSSL),TRUE)
 
 define gb_LinkTarget__use_gnutls
@@ -3076,9 +3007,10 @@ $(call gb_LinkTarget_add_libs,$(1),\
 	$(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
 )
 
-ifeq ($(OS),WNT)
 $(call gb_LinkTarget_use_external,$(1),openssl)
 
+ifeq ($(OS),WNT)
+
 $(call gb_LinkTarget_use_system_win32_libs,$(1),\
 	secur32 \
 	ws2_32 \
diff --git a/config_host.mk.in b/config_host.mk.in
index 06bd4f8588e..a7e6e4df34c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -131,7 +131,6 @@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
-export DISABLE_OPENSSL=@DISABLE_OPENSSL@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
 export DLOPEN_LIBS=@DLOPEN_LIBS@
 export DLLTOOL=@DLLTOOL@
@@ -453,8 +452,6 @@ export OFFICEOTRON=@OFFICEOTRON@
 export BFFVALIDATOR=@BFFVALIDATOR@
 export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_VENDOR=@OOO_VENDOR@
-export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
-export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
 export OPENSYMBOL_TTF=@OPENSYMBOL_TTF@
 export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
 export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
@@ -595,7 +592,6 @@ export SYSTEM_NSS=@SYSTEM_NSS@
 export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
 export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@
 export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
-export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
 export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@
 export SYSTEM_POPPLER=@SYSTEM_POPPLER@
 export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
diff --git a/configure.ac b/configure.ac
index a943b4810014a5cd3c31b41ce03a7f3b911f25c2..4f46b46a35b357b6e2d5ff219b59a5f26dc65590 100644
GIT binary patch
delta 29
lcmdmXRQBjb*@hOz7N!>F7M3lnR~y@pb+c|i*3I_e8UVm14Tb;!

delta 1544
zcmcgs&u`mg7?zzlSps5oX-e8rc;jvD26dXSwpl0{%CBwJvNWwT0V=_A;;)UVYkRh<
zG!m#(s<abmQ#ZYW%h-Vnw<5$&lX{tu&<-3Z5)wj8@CWR`i3@y5oJ^FCBR*Kx=kIyH
z=Y8Ji`5x?!e)C}TqitrJ-S%vIzvlM0@Ohr|`wf%mwyoi#%go%-{G6D{77NmRxlj_t
zB5vilFn<3j8we|^E!Q*x^K?7?1M9ZDLU8v>b`XniasmA9D>jOI88(2CaqobTm#wC%
z!z?%rq6fi!PW0ib4GJ+WQkNZ~;KKV%D3XZBl3-Y%(IqSP1cN_+!Ng{hQ}LP9)XZeF
z(GpZ!kWEt~La&6XuLy1*f~pH^a^0|nL|jM;nri5s0%wy`$>~&LYEn~cb*p7MMjuTS
z!RUYlirRRB3*yajHhk1AoYsvFC;V&2`_gfDu{yEjN=3iiHN5%I7s9>Yy+?*i#L0?z
z9s~pUlagWckOqF9Du~g0Txi6SR}B4v*5cvae!Fd@#>Q~>6g$`-&9(155&UeNeOBpl
zX%V}R5Z@6ig)6<0r7Me93;lmCIVpFcn7JsX|FvG6%Zh1U(5L}G(7L+pTzfTyo?G6L
z(f??&dIlH9SiVm&dYy^veEy0b_dZ~bz2E}DUN=p{a%>PUWu_CaVdiDu2>!a^iQ^|f
zc>>dKxcesUh8%00uTl+{`V`wjbYW7i@;1~B-60#!Y!L4<tPq`m-WiTzfT1ZdC=sH-
z`8331so1#~md|>InH=6o`J#B^V<xzHz}sD+I>()Wrflids<H#J<}{4;mBv4u+V#FN
z0d~uF$Qn=&S+b=P8`k7j+sH&$z|cW;I`uL+>56z!dMmS7I=wXS24=G%+fXA!2RBM>
z$_DLAA@sFosv4!=AQpk9s%f<FDxo1GU@X(JP+NBnKfG=cnio)YMWtzSTrxzjQ+Cxe
z9Xhh2NKF|(yvzDGdu;xHGJJ4Z4IU3tZN#ftv2uFpz&xt>sK^ec>Z(aaklg7?HMzb@
z#cc<NdY&c&9AY~(O$X3C;C-)e7@zyrGc<Tu30$bKAuLC@XYjoN?g;)OF`=EI{UN+V
z5#hrS3c@+=#oNI8@lJ{jbT+U4;eDN5Rx$GfcQQ|}w!TYTp0G?WFw4;<yKTf8bOeP`
z=St1Zl`j<*doh)=ncU?<DUUMvL*YZ4?lO-5$-&T5u!#x(7@D`d15eu^&oE_toaTbp
O_qVuv`&+)pKmHAqD)pNH

diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index c372f3f0c6f..0343adb24bd 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
 	boost_headers \
 	postgresql \
 	$(if $(filter-out MSC,$(COM)), \
-		openssl \
 		$(if $(ENABLE_LDAP),openldap) \
 		nss3 \
 		plc4 \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 28675992778..50d017038ca 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,NSS,nss) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
-	$(call gb_Helper_optional,OPENSSL,openssl) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \
 	$(call gb_Helper_optional,PAGEMAKER,libpagemaker) \
diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
index 8019da7a230..0c6ab952a81 100644
--- a/oox/CppunitTest_oox_tokenmap.mk
+++ b/oox/CppunitTest_oox_tokenmap.mk
@@ -20,19 +20,10 @@ $(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap))
 
 $(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox))
 
-ifeq ($(TLS),OPENSSL)
-$(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\
-	openssl \
-	openssl_headers \
-))
-else
-ifeq ($(TLS),NSS)
 $(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\
        plc4 \
        nss3 \
 ))
-endif
-endif
 
 $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
     avmedia \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 287a4bb7000..fc1e3d4d3cd 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -67,19 +67,10 @@ $(eval $(call gb_Library_use_externals,oox,\
 	boost_headers \
 ))
 
-ifeq ($(TLS),OPENSSL)
-$(eval $(call gb_Library_use_externals,oox,\
-	openssl \
-	openssl_headers \
-))
-else
-ifeq ($(TLS),NSS)
 $(eval $(call gb_Library_use_externals,oox,\
        plc4 \
        nss3 \
 ))
-endif
-endif
 
 $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
 
diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk
index 2e920f4ca03..a4ea2358d2f 100644
--- a/ucb/CppunitTest_ucb_webdav_local_neon.mk
+++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_local_neon,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_local_neon,\
diff --git a/ucb/CppunitTest_ucb_webdav_neon_opts.mk b/ucb/CppunitTest_ucb_webdav_neon_opts.mk
index df670ed7afd..020d9f9b6dd 100644
--- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk
+++ b/ucb/CppunitTest_ucb_webdav_neon_opts.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_neon_opts,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_neon_opts,\
diff --git a/ucb/CppunitTest_ucb_webdav_propfindcache.mk b/ucb/CppunitTest_ucb_webdav_propfindcache.mk
index 8d4a12d32ad..8504a0200ae 100644
--- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk
+++ b/ucb/CppunitTest_ucb_webdav_propfindcache.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_propfindcache,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_propfindcache,\
diff --git a/ucb/CppunitTest_ucb_webdav_res_access.mk b/ucb/CppunitTest_ucb_webdav_res_access.mk
index fa0669987bd..ad25d29f945 100644
--- a/ucb/CppunitTest_ucb_webdav_res_access.mk
+++ b/ucb/CppunitTest_ucb_webdav_res_access.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_res_access,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_res_access,\
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index c76489bd484..2496b80c769 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,ucpdav1,\
@@ -73,7 +72,6 @@ else # WITH_WEBDAV == serf
 $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
 	apr \
-	openssl \
 	serf \
 	zlib \
 ))
-- 
2.30.2