diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-02-24 17:49:23 +0900 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-03-01 14:36:39 +0000 |
| commit | 98483f4e7850c9bf977a20450a94c1fd144f4402 (patch) | |
| tree | 93be67e0dcd7523b2b198318cd837d4d42c8f5f0 | |
| parent | 268ab12ef987f0c1d34db78060ac6b80f25d9408 (diff) | |
postgresql: upgrade to release 13.10
Fixes CVE-2022-41862
Reference: https://www.postgresql.org/support/security/CVE-2022-41862/
Change-Id: I6075838972fec1c091f3150b19c5da4dc80ad6d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147982
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/postgresql/arm64.patch.1 | 2 | ||||
| -rw-r--r-- | external/postgresql/postgresql.exit.patch.0 | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/download.lst b/download.lst index a154668b78a6..27d555a3ad7b 100644 --- a/download.lst +++ b/download.lst @@ -481,8 +481,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -POSTGRESQL_SHA256SUM := 73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded -POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2 +POSTGRESQL_SHA256SUM := 5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2 +POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/postgresql/arm64.patch.1 b/external/postgresql/arm64.patch.1 index 7f8f2d6e4137..db8a3ad0a069 100644 --- a/external/postgresql/arm64.patch.1 +++ b/external/postgresql/arm64.patch.1 @@ -28,7 +28,7 @@ diff -ur postgresql.org/src/tools/msvc/MSBuildProject.pm postgresql/src/tools/ms my $includes = $self->{includes}; unless ($includes eq '' or $includes =~ /;$/) -@@ -347,7 +347,6 @@ +@@ -347,7 +346,6 @@ <ProgramDatabaseFile>.\\$cfgname\\$self->{name}\\$self->{name}.pdb</ProgramDatabaseFile> <GenerateMapFile>false</GenerateMapFile> <MapFileName>.\\$cfgname\\$self->{name}\\$self->{name}.map</MapFileName> diff --git a/external/postgresql/postgresql.exit.patch.0 b/external/postgresql/postgresql.exit.patch.0 index bd14d16e0ed6..8eaa1ea52ebb 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 -@@ -16821,6 +16821,7 @@ +@@ -16997,6 +16997,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9,7 +9,7 @@ typedef long int ac_int64; /* -@@ -16905,6 +16905,7 @@ +@@ -17081,6 +17082,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ |