postgresql: upgrade 17.10 -> 18.4

Major release. Dropped 0001-Add-missing-include-in-Cluster.pm.patch, which is no longer needed / no longer applies against 18.4's Cluster.pm. Rebased 0003-configure.ac-bypass-autoconf-2.69-version-check.patch and 0005-postgresql-fix-ptest-failure-of-sysviews.patch onto 18.4's shifted line numbers (context-only changes; same single-line edits as before). AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
2026-08-30 00:33:19 +00:00 · 2026-08-05 01:06:34 +00:00
parent 8ab6ce4255
commit dc3b11d81f
5 changed files with 18 additions and 53 deletions
@@ -1,38 +0,0 @@
-From eb5559b7df98581bd9a5142433122d1ba076d568 Mon Sep 17 00:00:00 2001
-From: Michael Paquier <michael@paquier.xyz>
-Date: Tue, 12 May 2026 16:44:28 +0900
-Subject: [PATCH] Add missing include in Cluster.pm
-
-The postmaster test 004_negotiate.pl could fail due to IO::Socket::INET
-gone missing, in environments that cannot use Unix sockets.
-
-Oversight in the backport done in 6dffaeb8e54c, so like the other commit
-this is applied across the v14~17 range.  Per buildfarm member drongo.
-
-Security: CVE-2026-6479
-Backpatch-through: 14
-
-CVE: CVE-2026-6479
-
-Upstream-Status: Backport [https://github.com/postgres/postgres/commit/eb5559b7df]
-
-Signed-off-by: Guocai He <guocai.he.cn@windriver.com>
---
- src/test/perl/PostgreSQL/Test/Cluster.pm | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm
-index a8635f4e6ad..4c2428a9247 100644
--- a/src/test/perl/PostgreSQL/Test/Cluster.pm
-+++ b/src/test/perl/PostgreSQL/Test/Cluster.pm
-@@ -104,6 +104,7 @@ use File::Path qw(rmtree mkpath);
- use File::Spec;
- use File::stat qw(stat);
- use File::Temp ();
-+use IO::Socket::INET;
- use IPC::Run;
- use PostgreSQL::Version;
- use PostgreSQL::Test::RecursiveCopy;
-- 
-2.34.1
-
@@ -13,17 +13,19 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
 1 file changed, 4 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index 856b091..646394c 100644
+index 636ba54..14dc382 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
- AC_INIT([PostgreSQL], [17.10], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [18.4], [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
 -recommended.  You can remove the check from 'configure.ac' but it is then
 -your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2025, PostgreSQL Global Development Group])
 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
 AC_CONFIG_AUX_DIR(config)
+-- 
+2.25.1
@@ -10,6 +10,8 @@ To fix it we need to reduce the count of parameters in sysviews test.
 Also we need to reduce the row count in expected result of sysview test
 to make the test output shown as pass.

+Rebased on 18.4: context shifted (offset only, same single-line change).
+
 Upstream-Status: Inappropriate [oe specific]

 Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
@@ -19,12 +21,11 @@ Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/src/test/regress/expected/sysviews.out b/src/test/regress/expected/sysviews.out
-index 2176a54..a84bc27 100644
 --- a/src/test/regress/expected/sysviews.out
 +++ b/src/test/regress/expected/sysviews.out
-@@ -52,7 +52,7 @@ from pg_backend_memory_contexts where name = 'Caller tuples';
- 
- rollback;
+@@ -66,7 +66,7 @@
+ (1 row)
+
 -- At introduction, pg_config had 23 entries; it may grow
 -select count(*) > 20 as ok from pg_config;
 +select count(*) > 13 as ok from pg_config;
@@ -32,15 +33,16 @@ index 2176a54..a84bc27 100644
 ----
  t
 diff --git a/src/test/regress/sql/sysviews.sql b/src/test/regress/sql/sysviews.sql
-index b047fb5..d1e3999 100644
 --- a/src/test/regress/sql/sysviews.sql
 +++ b/src/test/regress/sql/sysviews.sql
-@@ -33,7 +33,7 @@ from pg_backend_memory_contexts where name = 'Caller tuples';
- rollback;
- 
+@@ -43,7 +43,7 @@
+ and c1.path[c2.level] = c2.path[c2.level];
+
 -- At introduction, pg_config had 23 entries; it may grow
 -select count(*) > 20 as ok from pg_config;
 +select count(*) > 13 as ok from pg_config;
- 
+
 -- We expect no cursors in this test; see also portals.sql
 select count(*) = 0 as ok from pg_cursors;
+--
+2.43.0
@@ -244,7 +244,7 @@ INITSCRIPT_PARAMS = "start 64 . stop 36 0 1 2 3 4 5 6 ."
 do_install:append() {
    # install contrib
    oe_runmake DESTDIR=${D} -C contrib install
-    oe_multilib_header pg_config.h pg_config_ext.h ecpg_config.h postgresql/server/pg_config.h postgresql/server/pg_config_ext.h
+    oe_multilib_header pg_config.h ecpg_config.h postgresql/server/pg_config.h
    # install tutorial
    install -d -m 0755 ${D}${libdir}/${BPN}/tutorial
    install ${B}/src/tutorial/* ${D}${libdir}/${BPN}/tutorial
@@ -10,9 +10,8 @@ SRC_URI += "\
   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 \
-   file://0001-Add-missing-include-in-Cluster.pm.patch \
   "

-SRC_URI[sha256sum] = "078a03516dcdbdb705fecaf415ea3d13a956c589e46f09fed68a06fb00598c90"
+SRC_URI[sha256sum] = "81a81ec695fb0c7901407defaa1d2f7973617154cf27ba74e3a7ab8e64436094"

 CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Doesn't apply to our configuration of postgresql so we can safely ignore it."