From 0de3f4b9c422e8cd5b86eedb01d411a65a9ea089 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 19 Jan 2021 15:38:05 +0100 Subject: postgresql: upgrade to release 13.1 Fixes CVE-2020-25694, plus a bunch more CVE that don't look relevant. * --with-krb5 no longer exists, neither does --disable-shared * remove internal-zlib.patch.1: zlib is only used by pg_* tools / contrib/pgcrypto * remove postgresql-libs-leak.patch: some relic from pre-gbuild times, not clear what the point is for static libs * remove postgresql-9.2.1-libreoffice.patch: another dmake .mk file relic, and the win32 nmake build system was removed * add postgres-msvc-build.patch.1 to fix Cygwin perl and openssl * on WNT, libpq.dll is now built, no longer static lib postgresql: fix mistake in RepositoryExternal.mk Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109640 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 234833f7823a1424b62c93e145f0cfe2c6b6efd5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109698 Reviewed-by: Thorsten Behrens (cherry picked from commit 1362bf7fa2957d34a7cef18dd95ede22cc42787f) Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa --- RepositoryExternal.mk | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'RepositoryExternal.mk') diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bed2cf19725f..fc17b8e9d200 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3047,9 +3047,15 @@ endef else # !SYSTEM_POSTGRESQL +ifeq ($(OS),WNT) +$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ + postgresql \ +)) +endif # WNT + define gb_LinkTarget__use_postgresql -$(call gb_LinkTarget_use_external_project,$(1),postgresql) +$(call gb_LinkTarget_use_external_project,$(1),postgresql,full) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,postgresql)/src/include \ @@ -3057,19 +3063,21 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) +ifeq ($(OS),WNT) + $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,postgresql)/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/libpq/libpq.lib \ ) -ifeq ($(OS),WNT) -$(call gb_LinkTarget_use_external,$(1),openssl) +else # WNT -$(call gb_LinkTarget_use_system_win32_libs,$(1),\ - secur32 \ - ws2_32 \ +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,postgresql)/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,postgresql)/src/port/libpgport$(gb_StaticLibrary_PLAINEXT) \ ) -endif +endif # WNT endef -- cgit