For Early Testing: PostgreSQL 17

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.

This requires updating the docbook dependency with the diff in the email
I recently sent to ports@.

Included here is an update to postgresql-previous, since that is
necessary for building. I have not tested fallout in any other
dependencies. There is always fallout, if someone could test this diff
and the docbook diff in a bulk and post the failures in the
dependencies, I can start working on fixing them.

As in previous PostgreSQL major releases, we don't plan to update the
tree until 17.1.

Thanks,
Jeremy

Index: postgresql/Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql/Makefile,v
diff -u -p -u -p -r1.306 Makefile
--- postgresql/Makefile 27 Aug 2024 06:51:18 -0000 1.306
+++ postgresql/Makefile 26 Sep 2024 17:29:58 -0000
@@ -5,11 +5,10 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version

-VERSION= 16.4
-PREV_MAJOR= 15
+VERSION= 17.0
+PREV_MAJOR= 16
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
-REVISION= 0

DPB_PROPERTIES= parallel

@@ -17,7 +16,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/

@@ -26,7 +25,7 @@ MAINTAINER= Jeremy Evans <jeremy@openbsd
# BSD
PERMIT_PACKAGE= Yes

-WANTLIB += c curses crypto m readline ssl z
+WANTLIB += c curses crypto m readline ssl z pthread

SITES= https://ftp.postgresql.org/pub/source/v${VERSION}/ \
ftp://ftp.postgresql.org/pub/source/v${VERSION}/
@@ -82,6 +81,10 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/conf
ALL_TARGET= world
INSTALL_TARGET= install-world

+BUILD_DEPENDS= textproc/docbook \
+ textproc/docbook-xsl \
+ textproc/xmlto
+
LIB_DEPENDS-main= textproc/libxml
WANTLIB-main= ${WANTLIB} execinfo xml2

@@ -110,7 +113,6 @@ RUN_DEPENDS-plpython= databases/postgres
WANTLIB-docs=
PKG_ARCH-docs= *

-
MAKE_ENV= LIBpq_MAJOR=${LIBpq_VERSION:R} \
LIBpq_MINOR=${LIBpq_VERSION:E} \
LIBecpg_MAJOR=${LIBecpg_VERSION:R} \
@@ -118,11 +120,12 @@ MAKE_ENV= LIBpq_MAJOR=${LIBpq_VERSION:R}
LIBecpg_compat_MAJOR=${LIBecpg_compat_VERSION:R} \
LIBecpg_compat_MINOR=${LIBecpg_compat_VERSION:E} \
LIBpgtypes_MAJOR=${LIBpgtypes_VERSION:R} \
- LIBpgtypes_MINOR=${LIBpgtypes_VERSION:E}
+ LIBpgtypes_MINOR=${LIBpgtypes_VERSION:E} \
+ XML_CATALOG_FILES="${LOCALBASE}/share/xml/docbook/4.5/catalog.xml \
+ ${LOCALBASE}/share/xsl/docbook/catalog.xml"

DOCS= ${WRKSRC}/COPYRIGHT ${WRKSRC}/HISTORY \
- ${WRKSRC}/INSTALL ${WRKSRC}/README \
- ${WRKSRC}/doc/TODO
+ ${WRKSRC}/README.md ${WRKSRC}/doc/TODO

# Work around Makefile issue where it attempts to rebuild
# the documentation even if it is not necessary.
Index: postgresql/distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql/distinfo,v
diff -u -p -u -p -r1.102 distinfo
--- postgresql/distinfo 12 Aug 2024 17:32:01 -0000 1.102
+++ postgresql/distinfo 26 Sep 2024 17:31:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (postgresql-16.4.tar.gz) = LhepAGJAPhXWVASA/exQyLAF60hympHLSYn/6wTfGTw=
-SIZE (postgresql-16.4.tar.gz) = 32660355
+SHA256 (postgresql-17.0.tar.gz) = v4HAxRYeRWqIbt5fH0Ez9DrwAGN+N3FWoC5+g1aQga0=
+SIZE (postgresql-17.0.tar.gz) = 27865263
Index: postgresql/patches/patch-src_bin_initdb_initdb_c
===================================================================
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_bin_initdb_initdb_c,v
diff -u -p -u -p -r1.3 patch-src_bin_initdb_initdb_c
--- postgresql/patches/patch-src_bin_initdb_initdb_c 12 Aug 2024 17:32:01 -0000 1.3
+++ postgresql/patches/patch-src_bin_initdb_initdb_c 3 Sep 2024 23:58:31 -0000
@@ -4,7 +4,7 @@ script handles.
Index: src/bin/initdb/initdb.c
--- src/bin/initdb/initdb.c.orig
+++ src/bin/initdb/initdb.c
-@@ -3416,6 +3416,16 @@ main(int argc, char *argv[])
+@@ -3449,6 +3449,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
*/
-@@ -3447,6 +3457,7 @@ main(int argc, char *argv[])
+@@ -3480,6 +3490,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
diff -u -p -u -p -r1.11 patch-src_include_storage_s_lock_h
--- postgresql/patches/patch-src_include_storage_s_lock_h 29 Nov 2023 23:41:15 -0000 1.11
+++ postgresql/patches/patch-src_include_storage_s_lock_h 23 May 2024 16:08:08 -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)