From 87e546090ddb65c3b98cf632b788b43de4815e8f Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 10 Oct 2021 11:37:28 +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 488334 -> 485789 bytes
 connectivity/Library_mysqlc.mk               |   1 -
 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 -
 13 files changed, 2 insertions(+), 101 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 36d39eda7fc..f5fa682549c 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 6344eb9d4dc..b8e812f32d8 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@
@@ -596,7 +593,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 76776c4cef98cdc7a66b685ac0ba1cc5aee2701e..03010e7a94e63f408f25e7dd827f1ee09379c20f 100644
GIT binary patch
delta 29
lcmeBsE<5+KY(ooU3sVbo3(FSPslDxO(^<E-O=sh{0|2*T3;X~8

delta 1563
zcmbVMPi)&{6qj8)*)naFNRw=XZEqP=4b1sN+l5kPlJlosN0&}@Cm3DiI`-Gb)U`d^
zRTgPtLn`9bsUx6wnAkXQ0}c~N2=&C36R4*N367j#pa~(NN#jf6q*9k1AcrLS-uK@7
zz2E!&zE5_J-TL*|%?)OQ-5A*5zUDvPMEHvf1}&SIu4|z9K07m5oRP%*Y)PKGSSm}>
zEHdZ$2rhla?2l=>t5gjFbM!imz`CofkV*nGSJ)x^<vbt6N8fTMaqB~7KTcof2H(y>
zQE}?J36tQ}h#3O^bE;QDcR?ezLsZ2h8r10}sIKdVrkg9UY&nogC$m6*4H|cny9MyG
zFPY?Ib}W5nV(d(+UTX-tD=4;Y5TRR-mJs~G1l<(Y6xDKtOj^hahHjbd0;Acn?D#}x
zEM@3b)oIwC)ypQDV6~G3nsseAFN8M*HhQQ-SkAQCkZ|iBcl@~Dta5tMr;h&Xo+Uyk
z{=prdDibd+72_aS5Pwm&+&JVQ-s1D=)1srSSmu<`h{KiM;4K1&hf&n|NWfp({V(_-
zw0~wfe0Yc9@s_~uQ+;?1;`TD7%hE#WLU*gVh51XRUd+cU7p7*#X({*A`Rq(y%EbkP
zY6JwM!&LL?D`EWT9(VNl?u>orMsYkC!=)s9a93jq{&4ftmxBm@bI-;6TyWQI+j2Y?
zq;ukU=2g79${)pdwgU&Su^mW_`qxr!O-a_yRw%KHJ&-L*I$3gI;Vn=t(<9fsNqoE=
zNT2N1_bdx6LrX%LP@SF4K{`2+d@V`E`{zg?#ugIz<L5kJI>Lrt+GBtYRqb}CpsqM3
z)w1F>AO04(;Tu9b4Q|8r$Qn=`If|nb7uJ+UOWDNKz%oJi+WBHZz93D@Z;JEfk;OS0
zY`LhWxKJfj_}yw0q(#Tj2>n{Kb%O$~5r;rsHw;>Ll~Cgmu$JM5?oqdR{hO-}p`HQV
z)O2bu&j&+Hm7=R8+He$2lUoC|%+?m+e}q%pgXjOkiHDZ;P>7NvUCK)fBa3?$K$rC0
zXfT{rb(``a`zw{Jin>baZ8?bQoVo%$;(F9pd(!dtZ6=JrzdI1ZM=BGJ_Ai6>HWQ_~
z9K?e=14GU9g9xT~2BML^J@I~lf1$bM2AjhVPT=Dw-0RKE^)N26fpC#NbiLQjhuD6}
z9M4E~S|@9i|5CaA$QEWUo-56FT`A|q!W*S>5ygK3&jkA3=D-pB;d}lNF3mFsqR*&s
e;s~E=UYGX8`o}BOVO;ftyPNzscQ*r1e)<<rNCDaa

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index f765fb1e305..0999b46d3ee 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,mysqlc))
 $(eval $(call gb_Library_use_externals,mysqlc,\
 	boost_headers \
 	mariadb-connector-c \
-	openssl \
 ))
 
 $(eval $(call gb_Library_set_include,mysqlc,\
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