From 7dc69e306ff007db649ca8347e0da9398147a167 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 7 Sep 2022 19:25:23 +0100 Subject: [PATCH] postgresql: update to version 14.5 Release date: 2022-08-11 Adresses CVE-2022-2625. For more details, please see the release notes[1]. [1]: https://www.postgresql.org/docs/release/14.5/ Signed-off-by: Daniel Golle (cherry picked from commit ead096d6dd6805f9c8dfa24611b7152618c502c8) --- libs/postgresql/Makefile | 4 ++-- .../patches/700-no-arm-crc-march-change.patch | 2 +- libs/postgresql/patches/900-pg_ctl-setuid.patch | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 466391111..a4bba598b 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=14.2 +PKG_VERSION:=14.5 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\ http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \ ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION) -PKG_HASH:=2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a +PKG_HASH:=d4f72cb5fb857c9a9f75ec8cf091a1771272802f2178f0b2e65b7b6ff64f4a30 PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf diff --git a/libs/postgresql/patches/700-no-arm-crc-march-change.patch b/libs/postgresql/patches/700-no-arm-crc-march-change.patch index 1f4449236..05d3198c2 100644 --- a/libs/postgresql/patches/700-no-arm-crc-march-change.patch +++ b/libs/postgresql/patches/700-no-arm-crc-march-change.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2127,9 +2127,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +@@ -2141,9 +2141,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ # flags. If not, check if adding -march=armv8-a+crc flag helps. # CFLAGS_ARMV8_CRC32C is set if the extra flag is required. PGAC_ARMV8_CRC32C_INTRINSICS([]) diff --git a/libs/postgresql/patches/900-pg_ctl-setuid.patch b/libs/postgresql/patches/900-pg_ctl-setuid.patch index 8f86c35d7..d114a820e 100644 --- a/libs/postgresql/patches/900-pg_ctl-setuid.patch +++ b/libs/postgresql/patches/900-pg_ctl-setuid.patch @@ -8,7 +8,7 @@ static char *argv0 = NULL; static bool allow_core_files = false; static time_t start_time; -@@ -2049,6 +2050,9 @@ do_help(void) +@@ -2081,6 +2082,9 @@ do_help(void) #endif printf(_(" -s, --silent only print errors, no informational messages\n")); printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n")); @@ -18,7 +18,7 @@ printf(_(" -V, --version output version information, then exit\n")); printf(_(" -w, --wait wait until operation completes (default)\n")); printf(_(" -W, --no-wait do not wait until operation completes\n")); -@@ -2261,6 +2265,7 @@ main(int argc, char **argv) +@@ -2293,6 +2297,7 @@ main(int argc, char **argv) {"options", required_argument, NULL, 'o'}, {"silent", no_argument, NULL, 's'}, {"timeout", required_argument, NULL, 't'}, @@ -26,7 +26,7 @@ {"core-files", no_argument, NULL, 'c'}, {"wait", no_argument, NULL, 'w'}, {"no-wait", no_argument, NULL, 'W'}, -@@ -2301,20 +2306,6 @@ main(int argc, char **argv) +@@ -2333,20 +2338,6 @@ main(int argc, char **argv) } } @@ -47,7 +47,7 @@ env_wait = getenv("PGCTLTIMEOUT"); if (env_wait != NULL) -@@ -2400,11 +2391,15 @@ main(int argc, char **argv) +@@ -2432,11 +2423,15 @@ main(int argc, char **argv) wait_seconds_arg = true; break; case 'U': @@ -63,7 +63,7 @@ break; case 'w': do_wait = true; -@@ -2486,6 +2481,41 @@ main(int argc, char **argv) +@@ -2518,6 +2513,41 @@ main(int argc, char **argv) exit(1); }