Index | Thread | Search

From:
Jeremy Evans <jeremy@openbsd.org>
Subject:
For Early Testing: PostgreSQL 18
To:
OpenBSD ports <ports@openbsd.org>
Date:
Thu, 25 Sep 2025 17:41:48 -0700

Download raw body.

Thread
This is for early testing and not intended for commit. It updates to the
latest version of PostgreSQL, released today. I've been testing all 
betas and rc1 on amd64, without problems. 
 
As in previous PostgreSQL major releases, we don't plan to update the 
tree until PostgreSQL 18.1. 

If someone could run a bulk with this and let me know about breakage,
I'll work on fixing the related ports.
 
Thanks, 
Jeremy

Index: postgresql/Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.310
diff -u -p -r1.310 Makefile
--- postgresql/Makefile	13 May 2025 01:19:35 -0000	1.310
+++ postgresql/Makefile	25 Sep 2025 16:24:12 -0000
@@ -5,8 +5,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	17.5
-PREV_MAJOR=	16
+VERSION=	18.0
+PREV_MAJOR=	17
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 
@@ -16,7 +16,7 @@ CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.10 \
 		ecpg_compat	4.10 \
 		pgtypes		4.9 \
-		pq		6.16
+		pq		6.17
 
 HOMEPAGE=	https://www.postgresql.org/
 
Index: postgresql/distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.105
diff -u -p -r1.105 distinfo
--- postgresql/distinfo	13 May 2025 01:19:35 -0000	1.105
+++ postgresql/distinfo	25 Sep 2025 16:24:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (postgresql-17.5.tar.gz) = cwv+80sDglwFGuD8N1Qsi+JrVaRORyNpIhr9OXGW4wM=
-SIZE (postgresql-17.5.tar.gz) = 28082580
+SHA256 (postgresql-18.0.tar.gz) = MOl/wfFZSnImWA6lEIDT2IP0oPtv9xbb960J6ffpOrI=
+SIZE (postgresql-18.0.tar.gz) = 29262032
Index: postgresql/patches/patch-src_bin_initdb_initdb_c
===================================================================
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_bin_initdb_initdb_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_bin_initdb_initdb_c
--- postgresql/patches/patch-src_bin_initdb_initdb_c	23 Nov 2024 06:54:15 -0000	1.4
+++ postgresql/patches/patch-src_bin_initdb_initdb_c	25 Sep 2025 16:24:12 -0000
@@ -4,7 +4,7 @@ script handles.
 Index: src/bin/initdb/initdb.c
 --- src/bin/initdb/initdb.c.orig
 +++ src/bin/initdb/initdb.c
-@@ -3502,6 +3502,16 @@ main(int argc, char *argv[])
+@@ -3525,6 +3525,16 @@ main(int argc, char *argv[])
  
  	if (!noinstructions)
  	{
@@ -21,7 +21,7 @@ Index: src/bin/initdb/initdb.c
  		/*
  		 * Build up a shell command to tell the user how to start the server
  		 */
-@@ -3533,6 +3543,7 @@ main(int argc, char *argv[])
+@@ -3556,6 +3566,7 @@ main(int argc, char *argv[])
  			   start_db_cmd->data);
  
  		destroyPQExpBuffer(start_db_cmd);
Index: postgresql/patches/patch-src_include_storage_s_lock_h
===================================================================
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_include_storage_s_lock_h,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_include_storage_s_lock_h
--- postgresql/patches/patch-src_include_storage_s_lock_h	23 Nov 2024 06:54:15 -0000	1.12
+++ postgresql/patches/patch-src_include_storage_s_lock_h	25 Sep 2025 16:24:12 -0000
@@ -1,7 +1,7 @@
 Index: src/include/storage/s_lock.h
 --- src/include/storage/s_lock.h.orig
 +++ src/include/storage/s_lock.h
-@@ -651,6 +651,29 @@ tas(volatile slock_t *lock)
+@@ -583,6 +583,29 @@ tas(volatile slock_t *lock)
  	do { __asm__ __volatile__("" : : : "memory");  *(lock) = 0; } while (0)
  #endif
  
Index: postgresql/patches/patch-src_interfaces_libpq_Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_interfaces_libpq_Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 patch-src_interfaces_libpq_Makefile
--- postgresql/patches/patch-src_interfaces_libpq_Makefile	29 Nov 2023 23:41:15 -0000	1.18
+++ postgresql/patches/patch-src_interfaces_libpq_Makefile	25 Sep 2025 16:24:12 -0000
@@ -1,7 +1,7 @@
 Index: src/interfaces/libpq/Makefile
 --- src/interfaces/libpq/Makefile.orig
 +++ src/interfaces/libpq/Makefile
-@@ -19,8 +19,8 @@ PGFILEDESC = "PostgreSQL Access Library"
+@@ -21,8 +21,8 @@ PGFILEDESC = "PostgreSQL Access Library"
  
  # shared library parameters
  NAME= pq
@@ -10,5 +10,5 @@ Index: src/interfaces/libpq/Makefile
 +SO_MAJOR_VERSION= ${LIBpq_MAJOR}
 +SO_MINOR_VERSION= ${LIBpq_MINOR}
  
- override CPPFLAGS :=  -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port -I$(top_srcdir)/src/port
+ override CPPFLAGS := -I$(srcdir) -I$(top_builddir)/src/port -I$(top_srcdir)/src/port $(CPPFLAGS)
  ifneq ($(PORTNAME), win32)
Index: postgresql/pkg/PLIST-contrib
===================================================================
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-contrib,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST-contrib
--- postgresql/pkg/PLIST-contrib	22 Feb 2025 03:15:44 -0000	1.30
+++ postgresql/pkg/PLIST-contrib	25 Sep 2025 16:24:12 -0000
@@ -36,6 +36,8 @@
 @so lib/postgresql/passwordcheck.so
 @so lib/postgresql/pg_buffercache.so
 @so lib/postgresql/pg_freespacemap.so
+@so lib/postgresql/pg_logicalinspect.so
+@so lib/postgresql/pg_overexplain.so
 @so lib/postgresql/pg_prewarm.so
 @so lib/postgresql/pg_stat_statements.so
 @so lib/postgresql/pg_surgery.so
@@ -68,6 +70,7 @@ share/postgresql/extension/amcheck--1.0.
 share/postgresql/extension/amcheck--1.1--1.2.sql
 share/postgresql/extension/amcheck--1.2--1.3.sql
 share/postgresql/extension/amcheck--1.3--1.4.sql
+share/postgresql/extension/amcheck--1.4--1.5.sql
 share/postgresql/extension/amcheck.control
 share/postgresql/extension/autoinc--1.0.sql
 share/postgresql/extension/autoinc.control
@@ -90,6 +93,7 @@ share/postgresql/extension/btree_gist--1
 share/postgresql/extension/btree_gist--1.4--1.5.sql
 share/postgresql/extension/btree_gist--1.5--1.6.sql
 share/postgresql/extension/btree_gist--1.6--1.7.sql
+share/postgresql/extension/btree_gist--1.7--1.8.sql
 share/postgresql/extension/btree_gist.control
 share/postgresql/extension/citext--1.0--1.1.sql
 share/postgresql/extension/citext--1.1--1.2.sql
@@ -98,6 +102,8 @@ share/postgresql/extension/citext--1.3--
 share/postgresql/extension/citext--1.4--1.5.sql
 share/postgresql/extension/citext--1.4.sql
 share/postgresql/extension/citext--1.5--1.6.sql
+share/postgresql/extension/citext--1.6--1.7.sql
+share/postgresql/extension/citext--1.7--1.8.sql
 share/postgresql/extension/citext.control
 share/postgresql/extension/cube--1.0--1.1.sql
 share/postgresql/extension/cube--1.1--1.2.sql
@@ -152,12 +158,14 @@ share/postgresql/extension/intarray.cont
 share/postgresql/extension/isn--1.0--1.1.sql
 share/postgresql/extension/isn--1.1--1.2.sql
 share/postgresql/extension/isn--1.1.sql
+share/postgresql/extension/isn--1.2--1.3.sql
 share/postgresql/extension/isn.control
 share/postgresql/extension/jsonb_plperl--1.0.sql
 share/postgresql/extension/jsonb_plperl.control
 share/postgresql/extension/jsonb_plperlu--1.0.sql
 share/postgresql/extension/jsonb_plperlu.control
 share/postgresql/extension/lo--1.0--1.1.sql
+share/postgresql/extension/lo--1.1--1.2.sql
 share/postgresql/extension/lo--1.1.sql
 share/postgresql/extension/lo.control
 share/postgresql/extension/ltree--1.0--1.1.sql
@@ -171,6 +179,7 @@ share/postgresql/extension/pageinspect--
 share/postgresql/extension/pageinspect--1.1--1.2.sql
 share/postgresql/extension/pageinspect--1.10--1.11.sql
 share/postgresql/extension/pageinspect--1.11--1.12.sql
+share/postgresql/extension/pageinspect--1.12--1.13.sql
 share/postgresql/extension/pageinspect--1.2--1.3.sql
 share/postgresql/extension/pageinspect--1.3--1.4.sql
 share/postgresql/extension/pageinspect--1.4--1.5.sql
@@ -187,11 +196,15 @@ share/postgresql/extension/pg_buffercach
 share/postgresql/extension/pg_buffercache--1.2.sql
 share/postgresql/extension/pg_buffercache--1.3--1.4.sql
 share/postgresql/extension/pg_buffercache--1.4--1.5.sql
+share/postgresql/extension/pg_buffercache--1.5--1.6.sql
 share/postgresql/extension/pg_buffercache.control
 share/postgresql/extension/pg_freespacemap--1.0--1.1.sql
 share/postgresql/extension/pg_freespacemap--1.1--1.2.sql
 share/postgresql/extension/pg_freespacemap--1.1.sql
+share/postgresql/extension/pg_freespacemap--1.2--1.3.sql
 share/postgresql/extension/pg_freespacemap.control
+share/postgresql/extension/pg_logicalinspect--1.0.sql
+share/postgresql/extension/pg_logicalinspect.control
 share/postgresql/extension/pg_prewarm--1.0--1.1.sql
 share/postgresql/extension/pg_prewarm--1.1--1.2.sql
 share/postgresql/extension/pg_prewarm--1.1.sql
@@ -199,6 +212,7 @@ share/postgresql/extension/pg_prewarm.co
 share/postgresql/extension/pg_stat_statements--1.0--1.1.sql
 share/postgresql/extension/pg_stat_statements--1.1--1.2.sql
 share/postgresql/extension/pg_stat_statements--1.10--1.11.sql
+share/postgresql/extension/pg_stat_statements--1.11--1.12.sql
 share/postgresql/extension/pg_stat_statements--1.2--1.3.sql
 share/postgresql/extension/pg_stat_statements--1.3--1.4.sql
 share/postgresql/extension/pg_stat_statements--1.4--1.5.sql
@@ -229,6 +243,7 @@ share/postgresql/extension/pg_walinspect
 share/postgresql/extension/pgcrypto--1.0--1.1.sql
 share/postgresql/extension/pgcrypto--1.1--1.2.sql
 share/postgresql/extension/pgcrypto--1.2--1.3.sql
+share/postgresql/extension/pgcrypto--1.3--1.4.sql
 share/postgresql/extension/pgcrypto--1.3.sql
 share/postgresql/extension/pgcrypto.control
 share/postgresql/extension/pgrowlocks--1.0--1.1.sql
@@ -244,6 +259,7 @@ share/postgresql/extension/pgstattuple--
 share/postgresql/extension/pgstattuple.control
 share/postgresql/extension/postgres_fdw--1.0--1.1.sql
 share/postgresql/extension/postgres_fdw--1.0.sql
+share/postgresql/extension/postgres_fdw--1.1--1.2.sql
 share/postgresql/extension/postgres_fdw.control
 share/postgresql/extension/refint--1.0.sql
 share/postgresql/extension/refint.control
@@ -272,5 +288,6 @@ share/postgresql/extension/uuid-ossp--1.
 share/postgresql/extension/uuid-ossp--1.1.sql
 share/postgresql/extension/uuid-ossp.control
 share/postgresql/extension/xml2--1.0--1.1.sql
+share/postgresql/extension/xml2--1.1--1.2.sql
 share/postgresql/extension/xml2--1.1.sql
 share/postgresql/extension/xml2.control
Index: postgresql/pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.118
diff -u -p -r1.118 PLIST-docs
--- postgresql/pkg/PLIST-docs	13 May 2025 01:19:35 -0000	1.118
+++ postgresql/pkg/PLIST-docs	25 Sep 2025 16:24:12 -0000
@@ -56,6 +56,7 @@ share/doc/postgresql/html/auth-delay.htm
 share/doc/postgresql/html/auth-ident.html
 share/doc/postgresql/html/auth-ldap.html
 share/doc/postgresql/html/auth-methods.html
+share/doc/postgresql/html/auth-oauth.html
 share/doc/postgresql/html/auth-pam.html
 share/doc/postgresql/html/auth-password.html
 share/doc/postgresql/html/auth-peer.html
@@ -305,7 +306,6 @@ share/doc/postgresql/html/event-trigger-
 share/doc/postgresql/html/event-trigger-definition.html
 share/doc/postgresql/html/event-trigger-example.html
 share/doc/postgresql/html/event-trigger-interface.html
-share/doc/postgresql/html/event-trigger-matrix.html
 share/doc/postgresql/html/event-trigger-table-rewrite-example.html
 share/doc/postgresql/html/event-triggers.html
 share/doc/postgresql/html/executor.html
@@ -508,6 +508,7 @@ share/doc/postgresql/html/libpq-ldap.htm
 share/doc/postgresql/html/libpq-misc.html
 share/doc/postgresql/html/libpq-notice-processing.html
 share/doc/postgresql/html/libpq-notify.html
+share/doc/postgresql/html/libpq-oauth.html
 share/doc/postgresql/html/libpq-pgpass.html
 share/doc/postgresql/html/libpq-pgservice.html
 share/doc/postgresql/html/libpq-pipeline-mode.html
@@ -531,6 +532,7 @@ share/doc/postgresql/html/logical-replic
 share/doc/postgresql/html/logical-replication-config.html
 share/doc/postgresql/html/logical-replication-conflicts.html
 share/doc/postgresql/html/logical-replication-failover.html
+share/doc/postgresql/html/logical-replication-gencols.html
 share/doc/postgresql/html/logical-replication-monitoring.html
 share/doc/postgresql/html/logical-replication-publication.html
 share/doc/postgresql/html/logical-replication-quick-setup.html
@@ -538,6 +540,7 @@ share/doc/postgresql/html/logical-replic
 share/doc/postgresql/html/logical-replication-row-filter.html
 share/doc/postgresql/html/logical-replication-security.html
 share/doc/postgresql/html/logical-replication-subscription.html
+share/doc/postgresql/html/logical-replication-upgrade.html
 share/doc/postgresql/html/logical-replication.html
 share/doc/postgresql/html/logicaldecoding-catalogs.html
 share/doc/postgresql/html/logicaldecoding-example.html
@@ -574,6 +577,10 @@ share/doc/postgresql/html/nls-translator
 share/doc/postgresql/html/nls.html
 share/doc/postgresql/html/non-durability.html
 share/doc/postgresql/html/notation.html
+share/doc/postgresql/html/oauth-validator-callbacks.html
+share/doc/postgresql/html/oauth-validator-design.html
+share/doc/postgresql/html/oauth-validator-init.html
+share/doc/postgresql/html/oauth-validators.html
 share/doc/postgresql/html/oid2name.html
 share/doc/postgresql/html/overview.html
 share/doc/postgresql/html/pageinspect.html
@@ -590,6 +597,8 @@ share/doc/postgresql/html/pgbench.html
 share/doc/postgresql/html/pgbuffercache.html
 share/doc/postgresql/html/pgcrypto.html
 share/doc/postgresql/html/pgfreespacemap.html
+share/doc/postgresql/html/pglogicalinspect.html
+share/doc/postgresql/html/pgoverexplain.html
 share/doc/postgresql/html/pgprewarm.html
 share/doc/postgresql/html/pgrowlocks.html
 share/doc/postgresql/html/pgstatstatements.html
@@ -695,12 +704,7 @@ share/doc/postgresql/html/regress-run.ht
 share/doc/postgresql/html/regress-tap.html
 share/doc/postgresql/html/regress-variant.html
 share/doc/postgresql/html/regress.html
-share/doc/postgresql/html/release-17-1.html
-share/doc/postgresql/html/release-17-2.html
-share/doc/postgresql/html/release-17-3.html
-share/doc/postgresql/html/release-17-4.html
-share/doc/postgresql/html/release-17-5.html
-share/doc/postgresql/html/release-17.html
+share/doc/postgresql/html/release-18.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
@@ -720,7 +724,6 @@ share/doc/postgresql/html/rules-triggers
 share/doc/postgresql/html/rules-update.html
 share/doc/postgresql/html/rules-views.html
 share/doc/postgresql/html/rules.html
-share/doc/postgresql/html/runtime-config-autovacuum.html
 share/doc/postgresql/html/runtime-config-client.html
 share/doc/postgresql/html/runtime-config-compatible.html
 share/doc/postgresql/html/runtime-config-connection.html
@@ -736,6 +739,7 @@ share/doc/postgresql/html/runtime-config
 share/doc/postgresql/html/runtime-config-resource.html
 share/doc/postgresql/html/runtime-config-short.html
 share/doc/postgresql/html/runtime-config-statistics.html
+share/doc/postgresql/html/runtime-config-vacuum.html
 share/doc/postgresql/html/runtime-config-wal.html
 share/doc/postgresql/html/runtime-config.html
 share/doc/postgresql/html/runtime.html
@@ -1084,6 +1088,7 @@ share/doc/postgresql/html/user-manag.htm
 share/doc/postgresql/html/using-explain.html
 share/doc/postgresql/html/uuid-ossp.html
 share/doc/postgresql/html/vacuumlo.html
+share/doc/postgresql/html/view-pg-aios.html
 share/doc/postgresql/html/view-pg-available-extension-versions.html
 share/doc/postgresql/html/view-pg-available-extensions.html
 share/doc/postgresql/html/view-pg-backend-memory-contexts.html
@@ -1108,6 +1113,7 @@ share/doc/postgresql/html/view-pg-seclab
 share/doc/postgresql/html/view-pg-sequences.html
 share/doc/postgresql/html/view-pg-settings.html
 share/doc/postgresql/html/view-pg-shadow.html
+share/doc/postgresql/html/view-pg-shmem-allocations-numa.html
 share/doc/postgresql/html/view-pg-shmem-allocations.html
 share/doc/postgresql/html/view-pg-stats-ext-exprs.html
 share/doc/postgresql/html/view-pg-stats-ext.html
Index: postgresql/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-main,v
retrieving revision 1.36
diff -u -p -r1.36 PLIST-main
--- postgresql/pkg/PLIST-main	16 Nov 2022 02:59:23 -0000	1.36
+++ postgresql/pkg/PLIST-main	25 Sep 2025 16:24:12 -0000
@@ -41,7 +41,6 @@ include/postgresql/libpq-events.h
 include/postgresql/libpq-fe.h
 include/postgresql/libpq/libpq-fs.h
 include/postgresql/pg_config.h
-include/postgresql/pg_config_ext.h
 include/postgresql/pg_config_manual.h
 include/postgresql/pg_config_os.h
 include/postgresql/pgtypes.h
Index: postgresql/pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
retrieving revision 1.52
diff -u -p -r1.52 PLIST-server
--- postgresql/pkg/PLIST-server	23 Nov 2024 06:54:15 -0000	1.52
+++ postgresql/pkg/PLIST-server	25 Sep 2025 16:24:12 -0000
@@ -47,12 +47,14 @@ include/postgresql/server/access/brin_tu
 include/postgresql/server/access/brin_xlog.h
 include/postgresql/server/access/bufmask.h
 include/postgresql/server/access/clog.h
+include/postgresql/server/access/cmptype.h
 include/postgresql/server/access/commit_ts.h
 include/postgresql/server/access/detoast.h
 include/postgresql/server/access/genam.h
 include/postgresql/server/access/generic_xlog.h
 include/postgresql/server/access/gin.h
 include/postgresql/server/access/gin_private.h
+include/postgresql/server/access/gin_tuple.h
 include/postgresql/server/access/ginblock.h
 include/postgresql/server/access/ginxlog.h
 include/postgresql/server/access/gist.h
@@ -287,6 +289,7 @@ include/postgresql/server/commands/colla
 include/postgresql/server/commands/comment.h
 include/postgresql/server/commands/conversioncmds.h
 include/postgresql/server/commands/copy.h
+include/postgresql/server/commands/copyapi.h
 include/postgresql/server/commands/copyfrom_internal.h
 include/postgresql/server/commands/createas.h
 include/postgresql/server/commands/dbcommands.h
@@ -295,6 +298,9 @@ include/postgresql/server/commands/defre
 include/postgresql/server/commands/discard.h
 include/postgresql/server/commands/event_trigger.h
 include/postgresql/server/commands/explain.h
+include/postgresql/server/commands/explain_dr.h
+include/postgresql/server/commands/explain_format.h
+include/postgresql/server/commands/explain_state.h
 include/postgresql/server/commands/extension.h
 include/postgresql/server/commands/lockcmds.h
 include/postgresql/server/commands/matview.h
@@ -340,6 +346,7 @@ include/postgresql/server/common/kwlooku
 include/postgresql/server/common/link-canary.h
 include/postgresql/server/common/logging.h
 include/postgresql/server/common/md5.h
+include/postgresql/server/common/oauth-common.h
 include/postgresql/server/common/openssl.h
 include/postgresql/server/common/parse_manifest.h
 include/postgresql/server/common/percentrepl.h
@@ -372,6 +379,7 @@ include/postgresql/server/executor/execA
 include/postgresql/server/executor/execExpr.h
 include/postgresql/server/executor/execParallel.h
 include/postgresql/server/executor/execPartition.h
+include/postgresql/server/executor/execScan.h
 include/postgresql/server/executor/execdebug.h
 include/postgresql/server/executor/execdesc.h
 include/postgresql/server/executor/executor.h
@@ -440,6 +448,7 @@ include/postgresql/server/extension/seg/
 include/postgresql/server/extension/seg/segdata.h
 include/postgresql/server/fe_utils/
 include/postgresql/server/fe_utils/archive.h
+include/postgresql/server/fe_utils/astreamer.h
 include/postgresql/server/fe_utils/cancel.h
 include/postgresql/server/fe_utils/conditional.h
 include/postgresql/server/fe_utils/connect_utils.h
@@ -492,6 +501,8 @@ include/postgresql/server/libpq/libpq-be
 include/postgresql/server/libpq/libpq-be.h
 include/postgresql/server/libpq/libpq-fs.h
 include/postgresql/server/libpq/libpq.h
+include/postgresql/server/libpq/oauth.h
+include/postgresql/server/libpq/pg-gssapi.h
 include/postgresql/server/libpq/pqcomm.h
 include/postgresql/server/libpq/pqformat.h
 include/postgresql/server/libpq/pqmq.h
@@ -586,7 +597,6 @@ include/postgresql/server/partitioning/p
 include/postgresql/server/partitioning/partdesc.h
 include/postgresql/server/partitioning/partprune.h
 include/postgresql/server/pg_config.h
-include/postgresql/server/pg_config_ext.h
 include/postgresql/server/pg_config_manual.h
 include/postgresql/server/pg_config_os.h
 include/postgresql/server/pg_getopt.h
@@ -614,7 +624,6 @@ include/postgresql/server/port.h
 include/postgresql/server/port/atomics/
 include/postgresql/server/port/atomics.h
 include/postgresql/server/port/atomics/arch-arm.h
-include/postgresql/server/port/atomics/arch-hppa.h
 include/postgresql/server/port/atomics/arch-ppc.h
 include/postgresql/server/port/atomics/arch-x86.h
 include/postgresql/server/port/atomics/fallback.h
@@ -633,6 +642,7 @@ include/postgresql/server/port/pg_bswap.
 include/postgresql/server/port/pg_crc32c.h
 include/postgresql/server/port/pg_iovec.h
 include/postgresql/server/port/pg_lfind.h
+include/postgresql/server/port/pg_numa.h
 include/postgresql/server/port/pg_pthread.h
 include/postgresql/server/port/simd.h
 include/postgresql/server/port/solaris.h
@@ -691,6 +701,7 @@ include/postgresql/server/regex/regex.h
 include/postgresql/server/regex/regexport.h
 include/postgresql/server/regex/regguts.h
 include/postgresql/server/replication/
+include/postgresql/server/replication/conflict.h
 include/postgresql/server/replication/decode.h
 include/postgresql/server/replication/logical.h
 include/postgresql/server/replication/logicallauncher.h
@@ -705,6 +716,7 @@ include/postgresql/server/replication/re
 include/postgresql/server/replication/slot.h
 include/postgresql/server/replication/slotsync.h
 include/postgresql/server/replication/snapbuild.h
+include/postgresql/server/replication/snapbuild_internal.h
 include/postgresql/server/replication/syncrep.h
 include/postgresql/server/replication/walreceiver.h
 include/postgresql/server/replication/walsender.h
@@ -741,7 +753,6 @@ include/postgresql/server/snowball/libst
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_spanish.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_swedish.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_hungarian.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_romanian.h
 include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_arabic.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_armenian.h
@@ -750,6 +761,7 @@ include/postgresql/server/snowball/libst
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_danish.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_dutch.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_english.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_estonian.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_french.h
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_german.h
@@ -774,8 +786,13 @@ include/postgresql/server/snowball/libst
 include/postgresql/server/snowball/libstemmer/stem_UTF_8_yiddish.h
 include/postgresql/server/statistics/
 include/postgresql/server/statistics/extended_stats_internal.h
+include/postgresql/server/statistics/stat_utils.h
 include/postgresql/server/statistics/statistics.h
 include/postgresql/server/storage/
+include/postgresql/server/storage/aio.h
+include/postgresql/server/storage/aio_internal.h
+include/postgresql/server/storage/aio_subsys.h
+include/postgresql/server/storage/aio_types.h
 include/postgresql/server/storage/barrier.h
 include/postgresql/server/storage/block.h
 include/postgresql/server/storage/buf.h
@@ -796,6 +813,7 @@ include/postgresql/server/storage/filese
 include/postgresql/server/storage/freespace.h
 include/postgresql/server/storage/fsm_internals.h
 include/postgresql/server/storage/indexfsm.h
+include/postgresql/server/storage/io_worker.h
 include/postgresql/server/storage/ipc.h
 include/postgresql/server/storage/item.h
 include/postgresql/server/storage/itemid.h
@@ -836,6 +854,7 @@ include/postgresql/server/storage/spin.h
 include/postgresql/server/storage/standby.h
 include/postgresql/server/storage/standbydefs.h
 include/postgresql/server/storage/sync.h
+include/postgresql/server/storage/waiteventset.h
 include/postgresql/server/tcop/
 include/postgresql/server/tcop/backend_startup.h
 include/postgresql/server/tcop/cmdtag.h
@@ -886,6 +905,7 @@ include/postgresql/server/utils/fmgrprot
 include/postgresql/server/utils/fmgrtab.h
 include/postgresql/server/utils/formatting.h
 include/postgresql/server/utils/freepage.h
+include/postgresql/server/utils/funccache.h
 include/postgresql/server/utils/geo_decls.h
 include/postgresql/server/utils/guc.h
 include/postgresql/server/utils/guc_hooks.h
@@ -915,6 +935,7 @@ include/postgresql/server/utils/pg_local
 include/postgresql/server/utils/pg_lsn.h
 include/postgresql/server/utils/pg_rusage.h
 include/postgresql/server/utils/pgstat_internal.h
+include/postgresql/server/utils/pgstat_kind.h
 include/postgresql/server/utils/pidfile.h
 include/postgresql/server/utils/plancache.h
 include/postgresql/server/utils/portal.h
@@ -935,6 +956,7 @@ include/postgresql/server/utils/ruleutil
 include/postgresql/server/utils/sampling.h
 include/postgresql/server/utils/selfuncs.h
 include/postgresql/server/utils/sharedtuplestore.h
+include/postgresql/server/utils/skipsupport.h
 include/postgresql/server/utils/snapmgr.h
 include/postgresql/server/utils/snapshot.h
 include/postgresql/server/utils/sortsupport.h
@@ -950,6 +972,7 @@ include/postgresql/server/utils/usercont
 include/postgresql/server/utils/uuid.h
 include/postgresql/server/utils/varbit.h
 include/postgresql/server/utils/varlena.h
+include/postgresql/server/utils/wait_classes.h
 include/postgresql/server/utils/wait_event.h
 include/postgresql/server/utils/wait_event_types.h
 include/postgresql/server/utils/xid8.h
Index: postgresql-previous/Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql-previous/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- postgresql-previous/Makefile	23 Nov 2024 06:55:02 -0000	1.28
+++ postgresql-previous/Makefile	25 Sep 2025 16:24:12 -0000
@@ -1,6 +1,6 @@
 COMMENT=	PostgreSQL RDBMS (previous version, for pg_upgrade)
 
-VERSION=	16.6
+VERSION=	17.6
 DISTNAME=	postgresql-${VERSION}
 PKGNAME=	postgresql-previous-${VERSION}
 
@@ -8,7 +8,7 @@ CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.10 \
 		ecpg_compat	4.10 \
 		pgtypes		4.9 \
-		pq		6.15
+		pq		6.16
 
 HOMEPAGE=	https://www.postgresql.org/
 
Index: postgresql-previous/distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql-previous/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- postgresql-previous/distinfo	23 Nov 2024 06:55:02 -0000	1.12
+++ postgresql-previous/distinfo	25 Sep 2025 16:24:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (postgresql-16.6.tar.gz) = Ug0XNjLpNQfybrZnE9lTtofPul5yxGfTrbyOxNu4FI8=
-SIZE (postgresql-16.6.tar.gz) = 32715613
+SHA256 (postgresql-17.6.tar.gz) = KRC4UoNnTaLa5qwT/l67qvPEgkRjlsujLmco08xzbYY=
+SIZE (postgresql-17.6.tar.gz) = 28141372
Index: postgresql-previous/patches/patch-src_include_storage_s_lock_h
===================================================================
RCS file: /cvs/ports/databases/postgresql-previous/patches/patch-src_include_storage_s_lock_h,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_include_storage_s_lock_h
--- postgresql-previous/patches/patch-src_include_storage_s_lock_h	23 Nov 2024 06:55:02 -0000	1.8
+++ postgresql-previous/patches/patch-src_include_storage_s_lock_h	25 Sep 2025 16:24:12 -0000
@@ -1,7 +1,7 @@
 Index: src/include/storage/s_lock.h
 --- src/include/storage/s_lock.h.orig
 +++ src/include/storage/s_lock.h
-@@ -655,6 +655,29 @@ tas(volatile slock_t *lock)
+@@ -651,6 +651,29 @@ tas(volatile slock_t *lock)
  	do { __asm__ __volatile__("" : : : "memory");  *(lock) = 0; } while (0)
  #endif
  
Index: postgresql-previous/patches/patch-src_interfaces_libpq_Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql-previous/patches/patch-src_interfaces_libpq_Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_interfaces_libpq_Makefile
--- postgresql-previous/patches/patch-src_interfaces_libpq_Makefile	23 Nov 2024 06:55:02 -0000	1.7
+++ postgresql-previous/patches/patch-src_interfaces_libpq_Makefile	25 Sep 2025 16:24:12 -0000
@@ -10,5 +10,5 @@ Index: src/interfaces/libpq/Makefile
 +SO_MAJOR_VERSION= ${LIBpq_MAJOR}
 +SO_MINOR_VERSION= ${LIBpq_MINOR}
  
- override CPPFLAGS :=  -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port -I$(top_srcdir)/src/port
+ override CPPFLAGS := -I$(srcdir) -I$(top_builddir)/src/port -I$(top_srcdir)/src/port $(CPPFLAGS)
  ifneq ($(PORTNAME), win32)
Index: postgresql-previous/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/postgresql-previous/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- postgresql-previous/pkg/PLIST	23 Nov 2024 06:55:03 -0000	1.11
+++ postgresql-previous/pkg/PLIST	25 Sep 2025 16:24:12 -0000
@@ -11,8 +11,10 @@ bin/${POSTGRESQL_DIR}/
 @bin bin/${POSTGRESQL_DIR}/pg_archivecleanup
 @bin bin/${POSTGRESQL_DIR}/pg_basebackup
 @bin bin/${POSTGRESQL_DIR}/pg_checksums
+@bin bin/${POSTGRESQL_DIR}/pg_combinebackup
 @bin bin/${POSTGRESQL_DIR}/pg_config
 @bin bin/${POSTGRESQL_DIR}/pg_controldata
+@bin bin/${POSTGRESQL_DIR}/pg_createsubscriber
 @bin bin/${POSTGRESQL_DIR}/pg_ctl
 @bin bin/${POSTGRESQL_DIR}/pg_dump
 @bin bin/${POSTGRESQL_DIR}/pg_dumpall
@@ -27,6 +29,7 @@ bin/${POSTGRESQL_DIR}/
 @bin bin/${POSTGRESQL_DIR}/pg_upgrade
 @bin bin/${POSTGRESQL_DIR}/pg_verifybackup
 @bin bin/${POSTGRESQL_DIR}/pg_waldump
+@bin bin/${POSTGRESQL_DIR}/pg_walsummary
 @bin bin/${POSTGRESQL_DIR}/pgbench
 @bin bin/${POSTGRESQL_DIR}/postgres
 @bin bin/${POSTGRESQL_DIR}/psql
@@ -50,6 +53,7 @@ include/${POSTGRESQL_DIR}/internal/fe-au
 include/${POSTGRESQL_DIR}/internal/libpq/
 include/${POSTGRESQL_DIR}/internal/libpq-int.h
 include/${POSTGRESQL_DIR}/internal/libpq/pqcomm.h
+include/${POSTGRESQL_DIR}/internal/libpq/protocol.h
 include/${POSTGRESQL_DIR}/internal/port.h
 include/${POSTGRESQL_DIR}/internal/postgres_fe.h
 include/${POSTGRESQL_DIR}/internal/pqexpbuffer.h
@@ -118,6 +122,7 @@ include/${POSTGRESQL_DIR}/server/access/
 include/${POSTGRESQL_DIR}/server/access/rmgrdesc_utils.h
 include/${POSTGRESQL_DIR}/server/access/rmgrlist.h
 include/${POSTGRESQL_DIR}/server/access/sdir.h
+include/${POSTGRESQL_DIR}/server/access/sequence.h
 include/${POSTGRESQL_DIR}/server/access/session.h
 include/${POSTGRESQL_DIR}/server/access/skey.h
 include/${POSTGRESQL_DIR}/server/access/slru.h
@@ -130,6 +135,7 @@ include/${POSTGRESQL_DIR}/server/access/
 include/${POSTGRESQL_DIR}/server/access/sysattr.h
 include/${POSTGRESQL_DIR}/server/access/table.h
 include/${POSTGRESQL_DIR}/server/access/tableam.h
+include/${POSTGRESQL_DIR}/server/access/tidstore.h
 include/${POSTGRESQL_DIR}/server/access/timeline.h
 include/${POSTGRESQL_DIR}/server/access/toast_compression.h
 include/${POSTGRESQL_DIR}/server/access/toast_helper.h
@@ -309,6 +315,8 @@ include/${POSTGRESQL_DIR}/server/catalog
 include/${POSTGRESQL_DIR}/server/catalog/schemapg.h
 include/${POSTGRESQL_DIR}/server/catalog/storage.h
 include/${POSTGRESQL_DIR}/server/catalog/storage_xlog.h
+include/${POSTGRESQL_DIR}/server/catalog/syscache_ids.h
+include/${POSTGRESQL_DIR}/server/catalog/syscache_info.h
 include/${POSTGRESQL_DIR}/server/catalog/system_fk_info.h
 include/${POSTGRESQL_DIR}/server/catalog/toasting.h
 include/${POSTGRESQL_DIR}/server/commands/
@@ -350,6 +358,7 @@ include/${POSTGRESQL_DIR}/server/command
 include/${POSTGRESQL_DIR}/server/common/
 include/${POSTGRESQL_DIR}/server/common/archive.h
 include/${POSTGRESQL_DIR}/server/common/base64.h
+include/${POSTGRESQL_DIR}/server/common/blkreftable.h
 include/${POSTGRESQL_DIR}/server/common/checksum_helper.h
 include/${POSTGRESQL_DIR}/server/common/compression.h
 include/${POSTGRESQL_DIR}/server/common/config_info.h
@@ -360,6 +369,7 @@ include/${POSTGRESQL_DIR}/server/common/
 include/${POSTGRESQL_DIR}/server/common/file_perm.h
 include/${POSTGRESQL_DIR}/server/common/file_utils.h
 include/${POSTGRESQL_DIR}/server/common/hashfn.h
+include/${POSTGRESQL_DIR}/server/common/hashfn_unstable.h
 include/${POSTGRESQL_DIR}/server/common/hmac.h
 include/${POSTGRESQL_DIR}/server/common/int.h
 include/${POSTGRESQL_DIR}/server/common/int128.h
@@ -371,6 +381,7 @@ include/${POSTGRESQL_DIR}/server/common/
 include/${POSTGRESQL_DIR}/server/common/logging.h
 include/${POSTGRESQL_DIR}/server/common/md5.h
 include/${POSTGRESQL_DIR}/server/common/openssl.h
+include/${POSTGRESQL_DIR}/server/common/parse_manifest.h
 include/${POSTGRESQL_DIR}/server/common/percentrepl.h
 include/${POSTGRESQL_DIR}/server/common/pg_lzcompress.h
 include/${POSTGRESQL_DIR}/server/common/pg_prng.h
@@ -382,12 +393,17 @@ include/${POSTGRESQL_DIR}/server/common/
 include/${POSTGRESQL_DIR}/server/common/sha2.h
 include/${POSTGRESQL_DIR}/server/common/shortest_dec.h
 include/${POSTGRESQL_DIR}/server/common/string.h
+include/${POSTGRESQL_DIR}/server/common/unicode_case.h
+include/${POSTGRESQL_DIR}/server/common/unicode_case_table.h
+include/${POSTGRESQL_DIR}/server/common/unicode_category.h
+include/${POSTGRESQL_DIR}/server/common/unicode_category_table.h
 include/${POSTGRESQL_DIR}/server/common/unicode_east_asian_fw_table.h
 include/${POSTGRESQL_DIR}/server/common/unicode_nonspacing_table.h
 include/${POSTGRESQL_DIR}/server/common/unicode_norm.h
 include/${POSTGRESQL_DIR}/server/common/unicode_norm_hashfunc.h
 include/${POSTGRESQL_DIR}/server/common/unicode_norm_table.h
 include/${POSTGRESQL_DIR}/server/common/unicode_normprops_table.h
+include/${POSTGRESQL_DIR}/server/common/unicode_version.h
 include/${POSTGRESQL_DIR}/server/common/username.h
 include/${POSTGRESQL_DIR}/server/datatype/
 include/${POSTGRESQL_DIR}/server/datatype/timestamp.h
@@ -500,6 +516,7 @@ include/${POSTGRESQL_DIR}/server/lib/int
 include/${POSTGRESQL_DIR}/server/lib/knapsack.h
 include/${POSTGRESQL_DIR}/server/lib/pairingheap.h
 include/${POSTGRESQL_DIR}/server/lib/qunique.h
+include/${POSTGRESQL_DIR}/server/lib/radixtree.h
 include/${POSTGRESQL_DIR}/server/lib/rbtree.h
 include/${POSTGRESQL_DIR}/server/lib/simplehash.h
 include/${POSTGRESQL_DIR}/server/lib/sort_template.h
@@ -519,6 +536,7 @@ include/${POSTGRESQL_DIR}/server/libpq/p
 include/${POSTGRESQL_DIR}/server/libpq/pqformat.h
 include/${POSTGRESQL_DIR}/server/libpq/pqmq.h
 include/${POSTGRESQL_DIR}/server/libpq/pqsignal.h
+include/${POSTGRESQL_DIR}/server/libpq/protocol.h
 include/${POSTGRESQL_DIR}/server/libpq/sasl.h
 include/${POSTGRESQL_DIR}/server/libpq/scram.h
 include/${POSTGRESQL_DIR}/server/mb/
@@ -621,7 +639,6 @@ include/${POSTGRESQL_DIR}/server/plperl_
 include/${POSTGRESQL_DIR}/server/plpgsql.h
 include/${POSTGRESQL_DIR}/server/port/
 include/${POSTGRESQL_DIR}/server/port.h
-include/${POSTGRESQL_DIR}/server/port/aix.h
 include/${POSTGRESQL_DIR}/server/port/atomics/
 include/${POSTGRESQL_DIR}/server/port/atomics.h
 include/${POSTGRESQL_DIR}/server/port/atomics/arch-arm.h
@@ -692,6 +709,7 @@ include/${POSTGRESQL_DIR}/server/postmas
 include/${POSTGRESQL_DIR}/server/postmaster/postmaster.h
 include/${POSTGRESQL_DIR}/server/postmaster/startup.h
 include/${POSTGRESQL_DIR}/server/postmaster/syslogger.h
+include/${POSTGRESQL_DIR}/server/postmaster/walsummarizer.h
 include/${POSTGRESQL_DIR}/server/postmaster/walwriter.h
 include/${POSTGRESQL_DIR}/server/ppport.h
 include/${POSTGRESQL_DIR}/server/regex/
@@ -713,6 +731,7 @@ include/${POSTGRESQL_DIR}/server/replica
 include/${POSTGRESQL_DIR}/server/replication/pgoutput.h
 include/${POSTGRESQL_DIR}/server/replication/reorderbuffer.h
 include/${POSTGRESQL_DIR}/server/replication/slot.h
+include/${POSTGRESQL_DIR}/server/replication/slotsync.h
 include/${POSTGRESQL_DIR}/server/replication/snapbuild.h
 include/${POSTGRESQL_DIR}/server/replication/syncrep.h
 include/${POSTGRESQL_DIR}/server/replication/walreceiver.h
@@ -785,7 +804,6 @@ include/${POSTGRESQL_DIR}/server/statist
 include/${POSTGRESQL_DIR}/server/statistics/extended_stats_internal.h
 include/${POSTGRESQL_DIR}/server/statistics/statistics.h
 include/${POSTGRESQL_DIR}/server/storage/
-include/${POSTGRESQL_DIR}/server/storage/backendid.h
 include/${POSTGRESQL_DIR}/server/storage/barrier.h
 include/${POSTGRESQL_DIR}/server/storage/block.h
 include/${POSTGRESQL_DIR}/server/storage/buf.h
@@ -793,12 +811,14 @@ include/${POSTGRESQL_DIR}/server/storage
 include/${POSTGRESQL_DIR}/server/storage/buffile.h
 include/${POSTGRESQL_DIR}/server/storage/bufmgr.h
 include/${POSTGRESQL_DIR}/server/storage/bufpage.h
+include/${POSTGRESQL_DIR}/server/storage/bulk_write.h
 include/${POSTGRESQL_DIR}/server/storage/checksum.h
 include/${POSTGRESQL_DIR}/server/storage/checksum_impl.h
 include/${POSTGRESQL_DIR}/server/storage/condition_variable.h
 include/${POSTGRESQL_DIR}/server/storage/copydir.h
 include/${POSTGRESQL_DIR}/server/storage/dsm.h
 include/${POSTGRESQL_DIR}/server/storage/dsm_impl.h
+include/${POSTGRESQL_DIR}/server/storage/dsm_registry.h
 include/${POSTGRESQL_DIR}/server/storage/fd.h
 include/${POSTGRESQL_DIR}/server/storage/fileset.h
 include/${POSTGRESQL_DIR}/server/storage/freespace.h
@@ -814,6 +834,7 @@ include/${POSTGRESQL_DIR}/server/storage
 include/${POSTGRESQL_DIR}/server/storage/lock.h
 include/${POSTGRESQL_DIR}/server/storage/lockdefs.h
 include/${POSTGRESQL_DIR}/server/storage/lwlock.h
+include/${POSTGRESQL_DIR}/server/storage/lwlocklist.h
 include/${POSTGRESQL_DIR}/server/storage/lwlocknames.h
 include/${POSTGRESQL_DIR}/server/storage/md.h
 include/${POSTGRESQL_DIR}/server/storage/off.h
@@ -826,7 +847,9 @@ include/${POSTGRESQL_DIR}/server/storage
 include/${POSTGRESQL_DIR}/server/storage/procarray.h
 include/${POSTGRESQL_DIR}/server/storage/proclist.h
 include/${POSTGRESQL_DIR}/server/storage/proclist_types.h
+include/${POSTGRESQL_DIR}/server/storage/procnumber.h
 include/${POSTGRESQL_DIR}/server/storage/procsignal.h
+include/${POSTGRESQL_DIR}/server/storage/read_stream.h
 include/${POSTGRESQL_DIR}/server/storage/reinit.h
 include/${POSTGRESQL_DIR}/server/storage/relfilelocator.h
 include/${POSTGRESQL_DIR}/server/storage/s_lock.h
@@ -842,6 +865,7 @@ include/${POSTGRESQL_DIR}/server/storage
 include/${POSTGRESQL_DIR}/server/storage/standbydefs.h
 include/${POSTGRESQL_DIR}/server/storage/sync.h
 include/${POSTGRESQL_DIR}/server/tcop/
+include/${POSTGRESQL_DIR}/server/tcop/backend_startup.h
 include/${POSTGRESQL_DIR}/server/tcop/cmdtag.h
 include/${POSTGRESQL_DIR}/server/tcop/cmdtaglist.h
 include/${POSTGRESQL_DIR}/server/tcop/deparse_utility.h
@@ -898,6 +922,7 @@ include/${POSTGRESQL_DIR}/server/utils/h
 include/${POSTGRESQL_DIR}/server/utils/hsearch.h
 include/${POSTGRESQL_DIR}/server/utils/index_selfuncs.h
 include/${POSTGRESQL_DIR}/server/utils/inet.h
+include/${POSTGRESQL_DIR}/server/utils/injection_point.h
 include/${POSTGRESQL_DIR}/server/utils/inval.h
 include/${POSTGRESQL_DIR}/server/utils/json.h
 include/${POSTGRESQL_DIR}/server/utils/jsonb.h
@@ -911,7 +936,6 @@ include/${POSTGRESQL_DIR}/server/utils/m
 include/${POSTGRESQL_DIR}/server/utils/memutils_memorychunk.h
 include/${POSTGRESQL_DIR}/server/utils/multirangetypes.h
 include/${POSTGRESQL_DIR}/server/utils/numeric.h
-include/${POSTGRESQL_DIR}/server/utils/old_snapshot.h
 include/${POSTGRESQL_DIR}/server/utils/palloc.h
 include/${POSTGRESQL_DIR}/server/utils/partcache.h
 include/${POSTGRESQL_DIR}/server/utils/pg_crc.h
@@ -934,7 +958,6 @@ include/${POSTGRESQL_DIR}/server/utils/r
 include/${POSTGRESQL_DIR}/server/utils/relptr.h
 include/${POSTGRESQL_DIR}/server/utils/reltrigger.h
 include/${POSTGRESQL_DIR}/server/utils/resowner.h
-include/${POSTGRESQL_DIR}/server/utils/resowner_private.h
 include/${POSTGRESQL_DIR}/server/utils/rls.h
 include/${POSTGRESQL_DIR}/server/utils/ruleutils.h
 include/${POSTGRESQL_DIR}/server/utils/sampling.h
@@ -956,6 +979,7 @@ include/${POSTGRESQL_DIR}/server/utils/u
 include/${POSTGRESQL_DIR}/server/utils/varbit.h
 include/${POSTGRESQL_DIR}/server/utils/varlena.h
 include/${POSTGRESQL_DIR}/server/utils/wait_event.h
+include/${POSTGRESQL_DIR}/server/utils/wait_event_types.h
 include/${POSTGRESQL_DIR}/server/utils/xid8.h
 include/${POSTGRESQL_DIR}/server/utils/xml.h
 include/${POSTGRESQL_DIR}/server/varatt.h
@@ -967,7 +991,6 @@ include/${POSTGRESQL_DIR}/sqlda-native.h
 include/${POSTGRESQL_DIR}/sqlda.h
 lib/${POSTGRESQL_DIR}/
 @so lib/${POSTGRESQL_DIR}/_int.so
-@so lib/${POSTGRESQL_DIR}/adminpack.so
 @so lib/${POSTGRESQL_DIR}/amcheck.so
 @so lib/${POSTGRESQL_DIR}/auth_delay.so
 @so lib/${POSTGRESQL_DIR}/auto_explain.so
@@ -1025,7 +1048,6 @@ lib/${POSTGRESQL_DIR}/libpq.so.6
 @so lib/${POSTGRESQL_DIR}/lo.so
 @so lib/${POSTGRESQL_DIR}/ltree.so
 @so lib/${POSTGRESQL_DIR}/moddatetime.so
-@so lib/${POSTGRESQL_DIR}/old_snapshot.so
 @so lib/${POSTGRESQL_DIR}/pageinspect.so
 @so lib/${POSTGRESQL_DIR}/passwordcheck.so
 @so lib/${POSTGRESQL_DIR}/pg_buffercache.so
@@ -1095,15 +1117,11 @@ lib/${POSTGRESQL_DIR}/pkgconfig/libpq.pc
 share/${POSTGRESQL_DIR}/
 share/${POSTGRESQL_DIR}/errcodes.txt
 share/${POSTGRESQL_DIR}/extension/
-share/${POSTGRESQL_DIR}/extension/adminpack--1.0--1.1.sql
-share/${POSTGRESQL_DIR}/extension/adminpack--1.0.sql
-share/${POSTGRESQL_DIR}/extension/adminpack--1.1--2.0.sql
-share/${POSTGRESQL_DIR}/extension/adminpack--2.0--2.1.sql
-share/${POSTGRESQL_DIR}/extension/adminpack.control
 share/${POSTGRESQL_DIR}/extension/amcheck--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/amcheck--1.0.sql
 share/${POSTGRESQL_DIR}/extension/amcheck--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/amcheck--1.2--1.3.sql
+share/${POSTGRESQL_DIR}/extension/amcheck--1.3--1.4.sql
 share/${POSTGRESQL_DIR}/extension/amcheck.control
 share/${POSTGRESQL_DIR}/extension/autoinc--1.0.sql
 share/${POSTGRESQL_DIR}/extension/autoinc.control
@@ -1151,6 +1169,7 @@ share/${POSTGRESQL_DIR}/extension/dict_i
 share/${POSTGRESQL_DIR}/extension/dict_xsyn--1.0.sql
 share/${POSTGRESQL_DIR}/extension/dict_xsyn.control
 share/${POSTGRESQL_DIR}/extension/earthdistance--1.0--1.1.sql
+share/${POSTGRESQL_DIR}/extension/earthdistance--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/earthdistance--1.1.sql
 share/${POSTGRESQL_DIR}/extension/earthdistance.control
 share/${POSTGRESQL_DIR}/extension/file_fdw--1.0.sql
@@ -1198,11 +1217,10 @@ share/${POSTGRESQL_DIR}/extension/lo.con
 share/${POSTGRESQL_DIR}/extension/ltree--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/ltree--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/ltree--1.1.sql
+share/${POSTGRESQL_DIR}/extension/ltree--1.2--1.3.sql
 share/${POSTGRESQL_DIR}/extension/ltree.control
 share/${POSTGRESQL_DIR}/extension/moddatetime--1.0.sql
 share/${POSTGRESQL_DIR}/extension/moddatetime.control
-share/${POSTGRESQL_DIR}/extension/old_snapshot--1.0.sql
-share/${POSTGRESQL_DIR}/extension/old_snapshot.control
 share/${POSTGRESQL_DIR}/extension/pageinspect--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pageinspect--1.1--1.2.sql
 share/${POSTGRESQL_DIR}/extension/pageinspect--1.10--1.11.sql
@@ -1222,6 +1240,7 @@ share/${POSTGRESQL_DIR}/extension/pg_buf
 share/${POSTGRESQL_DIR}/extension/pg_buffercache--1.2--1.3.sql
 share/${POSTGRESQL_DIR}/extension/pg_buffercache--1.2.sql
 share/${POSTGRESQL_DIR}/extension/pg_buffercache--1.3--1.4.sql
+share/${POSTGRESQL_DIR}/extension/pg_buffercache--1.4--1.5.sql
 share/${POSTGRESQL_DIR}/extension/pg_buffercache.control
 share/${POSTGRESQL_DIR}/extension/pg_freespacemap--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pg_freespacemap--1.1--1.2.sql
@@ -1233,6 +1252,7 @@ share/${POSTGRESQL_DIR}/extension/pg_pre
 share/${POSTGRESQL_DIR}/extension/pg_prewarm.control
 share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.1--1.2.sql
+share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.10--1.11.sql
 share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.2--1.3.sql
 share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.3--1.4.sql
 share/${POSTGRESQL_DIR}/extension/pg_stat_statements--1.4--1.5.sql
@@ -1314,7 +1334,6 @@ share/${POSTGRESQL_DIR}/extension/uuid-o
 share/${POSTGRESQL_DIR}/extension/xml2--1.0--1.1.sql
 share/${POSTGRESQL_DIR}/extension/xml2--1.1.sql
 share/${POSTGRESQL_DIR}/extension/xml2.control
-share/${POSTGRESQL_DIR}/fix-CVE-2024-4317.sql
 share/${POSTGRESQL_DIR}/information_schema.sql
 share/${POSTGRESQL_DIR}/pg_hba.conf.sample
 share/${POSTGRESQL_DIR}/pg_ident.conf.sample