download.lst | 4 ++--
external/postgresql/arm64.patch.1 | 2 +-
external/postgresql/postgres-msvc-build.patch.1 | 8 ++++----
external/postgresql/postgresql.exit.patch.0 | 4 ++--
external/postgresql/windows.patch.0 | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 096e2ba8e4fce64c04a7d7e842dd1dbab8699801
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Sep 22 21:06:06 2022 +0900
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Sep 23 11:35:22 2022 +0200
postgresql: upgrade to release 13.8
Fixes CVE-2022-1552 and CVE-2022-2625.
Change-Id: I4964c43fefc94f12a16c45d8727ae41cf1ce278b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140458
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/download.lst b/download.lst
index 94277ad5f4ba..ba7a987f907f 100644
--- a/download.lst
+++ b/download.lst
@@ -214,8 +214,8 @@ export POPPLER_SHA256SUM :=
d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb3
export POPPLER_TARBALL := poppler-22.09.0.tar.xz
export POPPLER_DATA_SHA256SUM :=
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
-export POSTGRESQL_SHA256SUM :=
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
-export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
+export POSTGRESQL_SHA256SUM :=
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
+export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
export PYTHON_SHA256SUM :=
5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3
export PYTHON_TARBALL := Python-3.8.14.tar.xz
export QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
diff --git a/external/postgresql/arm64.patch.1
b/external/postgresql/arm64.patch.1
index 7f8f2d6e4137..891212b18f5a 100644
--- a/external/postgresql/arm64.patch.1
+++ b/external/postgresql/arm64.patch.1
@@ -40,7 +40,7 @@ diff -ur postgresql.org/src/tools/msvc/Solution.pm
postgresql/src/tools/msvc/Sol
--- postgresql.org/src/tools/msvc/Solution.pm 2021-03-14 02:09:15.288060770
+0100
+++ postgresql/src/tools/msvc/Solution.pm 2021-03-14 02:12:22.351726582
+0100
@@ -62,10 +62,7 @@
- if (1) #($^O eq "MSWin32")
+ if ($^O eq "MSWin32")
{
# Examine CL help output to determine if we are in 32 or 64-bit
mode.
- my $output = `cl /? 2>&1`;
diff --git a/external/postgresql/postgres-msvc-build.patch.1
b/external/postgresql/postgres-msvc-build.patch.1
index c217a755918b..dec31742238e 100644
--- a/external/postgresql/postgres-msvc-build.patch.1
+++ b/external/postgresql/postgres-msvc-build.patch.1
@@ -42,7 +42,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32,
and why even check
{
# Examine CL help output to determine if we are in 32 or 64-bit
mode.
my $output = `cl /? 2>&1`;
-@@ -1081,7 +1081,7 @@
+@@ -1100,7 +1100,7 @@
}
if ($fld ne "")
{
@@ -53,7 +53,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32,
and why even check
EndProject
--- postgresql/src/tools/msvc/VSObjectFactory.pm.orig 2021-01-19
18:06:42.633421700 +0100
+++ postgresql/src/tools/msvc/VSObjectFactory.pm 2021-01-19
18:06:28.663523200 +0100
-@@ -111,7 +111,7 @@
+@@ -131,7 +131,7 @@
sub DetermineVisualStudioVersion
{
@@ -85,7 +85,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32,
and why even check
my $sslout = `$opensslcmd`;
$? >> 8 == 0
-@@ -964,8 +964,8 @@
+@@ -967,8 +967,8 @@
# On both Win32 and Win64 the same library
# names are used without a debugging context.
$dbgsuffix = 0;
@@ -96,7 +96,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32,
and why even check
}
$proj->AddLibrary($self->{options}->{openssl} .
$libsslpath,
-@@ -990,9 +990,9 @@
+@@ -993,9 +993,9 @@
# to be here, so don't ask for it in last
# parameter.
$proj->AddLibrary(
diff --git a/external/postgresql/postgresql.exit.patch.0
b/external/postgresql/postgresql.exit.patch.0
index 77912038e88e..bd14d16e0ed6 100644
--- a/external/postgresql/postgresql.exit.patch.0
+++ b/external/postgresql/postgresql.exit.patch.0
@@ -1,7 +1,7 @@
# error: implicitly declaring library function 'exit' with type 'void (int)
__attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
--- configure
+++ configure
-@@ -24565,6 +24565,7 @@
+@@ -16821,6 +16821,7 @@
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -9,7 +9,7 @@
typedef long int ac_int64;
/*
-@@ -24702,6 +24702,7 @@
+@@ -16905,6 +16905,7 @@
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
diff --git a/external/postgresql/windows.patch.0
b/external/postgresql/windows.patch.0
index dbac548d4659..28fc9046c298 100644
--- a/external/postgresql/windows.patch.0
+++ b/external/postgresql/windows.patch.0
@@ -1,6 +1,6 @@
--- src/port/chklocale.c
+++ src/port/chklocale.c
-@@ -211,7 +211,7 @@
+@@ -220,7 +220,7 @@
{
r = malloc(16); /* excess */
if (r != NULL)
