From 2394b03ef67730934782be02c3cf18e1e907d06e Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 20 May 2025 16:54:50 +0800 Subject: postgresql: upgrade 17.4 -> 17.5 0003-configure.ac-bypass-autoconf-2.69-version-check.patch 0004-config_info.c-not-expose-build-info.patch not-check-libperl.patch refreshed for 17.5 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...onfigure.ac-bypass-autoconf-2.69-version-check.patch | 9 +++------ .../0004-config_info.c-not-expose-build-info.patch | 13 +++++-------- .../postgresql/files/not-check-libperl.patch | 9 +++------ meta-oe/recipes-dbs/postgresql/postgresql_17.4.bb | 17 ----------------- meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb | 17 +++++++++++++++++ 5 files changed, 28 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_17.4.bb create mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb diff --git a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch index 92ac335a7b..4382741da9 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -1,4 +1,4 @@ -From 5ce7d8398f6aff41eee8c8c80eeaad2fcb3da1fc Mon Sep 17 00:00:00 2001 +From 84febaf9330fe99802f75bcd0606ac7d86c35b25 Mon Sep 17 00:00:00 2001 From: Yi Fan Yu Date: Fri, 5 Feb 2021 17:15:42 -0500 Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check @@ -13,12 +13,12 @@ Signed-off-by: Yi Fan Yu 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac -index a8a61c5..27c2760 100644 +index 493d5cd..f0fa973 100644 --- a/configure.ac +++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [17.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [17.5], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not @@ -27,6 +27,3 @@ index a8a61c5..27c2760 100644 AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) --- -2.34.1 - diff --git a/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch b/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch index ff0582ab80..d94f028036 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch @@ -1,7 +1,7 @@ -From 5be3ffdf767c1efcbfd2d1be87aa83f2e37e348e Mon Sep 17 00:00:00 2001 +From 62733bdc9346651637d9e5ac7cbf8d7311ef5d97 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Mon, 1 Aug 2022 15:44:38 +0800 -Subject: [PATCH 4/5] config_info.c: not expose build info +Subject: [PATCH] config_info.c: not expose build info Don't collect the build information to fix the buildpaths issue. @@ -14,10 +14,10 @@ Signed-off-by: Mingli Yu 2 files changed, 2 insertions(+), 70 deletions(-) diff --git a/configure.ac b/configure.ac -index 27f382d..3dd6bb1 100644 +index f0fa973..8ccd8bc 100644 --- a/configure.ac +++ b/configure.ac -@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2023, PostgreSQL Global Development Group]) +@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) AC_PREFIX_DEFAULT(/usr/local/pgsql) @@ -27,7 +27,7 @@ index 27f382d..3dd6bb1 100644 [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`] [PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`] diff --git a/src/common/config_info.c b/src/common/config_info.c -index 09e78a6..86e4230 100644 +index 89c1ccb..a2206de 100644 --- a/src/common/config_info.c +++ b/src/common/config_info.c @@ -38,7 +38,7 @@ get_configdata(const char *my_exec_path, size_t *configdata_len) @@ -114,6 +114,3 @@ index 09e78a6..86e4230 100644 configdata[i].name = pstrdup("VERSION"); configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION); i++; --- -2.25.1 - diff --git a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index 1f735f322b..a2f0500a8c 100644 --- a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch @@ -1,4 +1,4 @@ -From 56b830edecff1cac5f8a8a956e7a7eeef2aa7c17 Mon Sep 17 00:00:00 2001 +From 1a9416bae71aa935797add3fa11407732ad010c0 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 27 Nov 2018 13:25:15 +0800 Subject: [PATCH] not check libperl under cross compiling @@ -20,10 +20,10 @@ Signed-off-by: Changqing Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index fba79ee..7170f26 100644 +index f398184..493d5cd 100644 --- a/configure.ac +++ b/configure.ac -@@ -2297,7 +2297,7 @@ Use --without-tcl to disable building PL/Tcl.]) +@@ -2336,7 +2336,7 @@ Use --without-tcl to disable building PL/Tcl.]) fi # check for @@ -32,6 +32,3 @@ index fba79ee..7170f26 100644 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $perl_includespec" AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file is required for Perl])], --- -2.34.1 - diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_17.4.bb b/meta-oe/recipes-dbs/postgresql/postgresql_17.4.bb deleted file mode 100644 index b1c95ed244..0000000000 --- a/meta-oe/recipes-dbs/postgresql/postgresql_17.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d5dd73e90ee1a572679460ee67233fcc" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0002-Improve-reproducibility.patch \ - file://0003-configure.ac-bypass-autoconf-2.69-version-check.patch \ - file://0004-config_info.c-not-expose-build-info.patch \ - file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \ - file://0001-tcl.m4-Recognize-tclsh9.patch \ -" - -SRC_URI[sha256sum] = "c4605b73fea11963406699f949b966e5d173a7ee0ccaef8938dec0ca8a995fe7" - -CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb b/meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb new file mode 100644 index 0000000000..b7fce886f8 --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb @@ -0,0 +1,17 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d5dd73e90ee1a572679460ee67233fcc" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0002-Improve-reproducibility.patch \ + file://0003-configure.ac-bypass-autoconf-2.69-version-check.patch \ + file://0004-config_info.c-not-expose-build-info.patch \ + file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \ + file://0001-tcl.m4-Recognize-tclsh9.patch \ +" + +SRC_URI[sha256sum] = "fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8" + +CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." -- cgit v1.2.3-54-g00ecf