diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-19 15:38:05 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-25 11:18:48 +0100 |
commit | 88f7563e51442773bd8b3fe35e8800b135e08262 (patch) | |
tree | 91b20505575b271e1a3ef475b3756e0ebb20f006 /external/postgresql/internal-zlib.patch.1 | |
parent | 12403996d2356bc40c89c37a9fbe2a727180bf83 (diff) |
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
Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109640
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 234833f7823a1424b62c93e145f0cfe2c6b6efd5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109698
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit 1362bf7fa2957d34a7cef18dd95ede22cc42787f)
Diffstat (limited to 'external/postgresql/internal-zlib.patch.1')
-rw-r--r-- | external/postgresql/internal-zlib.patch.1 | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/external/postgresql/internal-zlib.patch.1 b/external/postgresql/internal-zlib.patch.1 deleted file mode 100644 index ac2b728e1314..000000000000 --- a/external/postgresql/internal-zlib.patch.1 +++ /dev/null @@ -1,29 +0,0 @@ -diff -up postgresql/configure.dt postgresql/configure ---- postgresql/configure.dt 2016-11-03 17:34:17.282388226 +0100 -+++ postgresql/configure 2016-11-03 17:34:35.004202484 +0100 -@@ -8566,13 +8566,13 @@ fi - - if test "$with_zlib" = yes; then - --{ $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5 --$as_echo_n "checking for inflate in -lz... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking for inflate in -lzlib" >&5 -+$as_echo_n "checking for inflate in -lzlib... " >&6; } - if test "${ac_cv_lib_z_inflate+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lz $LIBS" -+LIBS="-lzlib $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -8636,7 +8636,7 @@ if test "x$ac_cv_lib_z_inflate" = x""yes - #define HAVE_LIBZ 1 - _ACEOF - -- LIBS="-lz $LIBS" -+ LIBS="-lzlib $LIBS" - - else - { { $as_echo "$as_me:$LINENO: error: zlib library not found |