From ace0703bbe0bd218364761573bb560f292646f65 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Sat, 16 Sep 2023 16:37:46 -0500
Subject: [PATCH] Update to postgresql-16.0

---
 introduction/welcome/changelog.xml |  4 ++++
 packages.ent                       |  2 +-
 server/databases/postgresql.xml    | 14 +++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4ef6a95aa6..24af52db13 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,10 @@
     <listitem>
       <para>September 16th, 2023</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to postgresql-16.0. Fixes
+          <ulink url="&blfs-ticket-root;18559">#18559</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to cmake-3.27.5. Fixes
           <ulink url="&blfs-ticket-root;18558">#18558</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index e7b33be57f..aff77d9071 100644
--- a/packages.ent
+++ b/packages.ent
@@ -745,7 +745,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY db-version                   "5.3.28">
 <!ENTITY lmdb-version                 "0.9.31">
 <!ENTITY mariadb-version              "10.11.5">
-<!ENTITY postgresql-version           "15.4">
+<!ENTITY postgresql-version           "16.0">
 <!ENTITY sqlite-version               "3.43.1">
 <!ENTITY sqlite-year                  "2023">
 <!ENTITY sqlite-dl-version            "3430100">
diff --git a/server/databases/postgresql.xml b/server/databases/postgresql.xml
index 7b27765338..3691250eea 100644
--- a/server/databases/postgresql.xml
+++ b/server/databases/postgresql.xml
@@ -7,10 +7,10 @@
   <!ENTITY postgresql-download-http "https://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
   <!--  <!ENTITY postgresql-download-ftp  "ftp://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2"> -->
   <!ENTITY postgresql-download-ftp  " ">
-  <!ENTITY postgresql-md5sum        "f2f861fb99d742cb9c2f8aa46a8a947d">
-  <!ENTITY postgresql-size          "22 MB">
-  <!ENTITY postgresql-buildsize     "229 MB (add 42 MB for tests)">
-  <!ENTITY postgresql-time          "0.6 SBU (with parallelism=4, add 0.2 SBU for tests)">
+  <!ENTITY postgresql-md5sum        "f5319191df114e2361d938687216cc9b">
+  <!ENTITY postgresql-size          "23 MB">
+  <!ENTITY postgresql-buildsize     "245 MB (add 25 MB for tests)">
+  <!ENTITY postgresql-time          "0.8 SBU (with parallelism=4, add 0.2 SBU for tests)">
 ]>
 
 <sect1 id="postgresql" xreflabel="PostgreSQL-&postgresql-version;">
@@ -72,7 +72,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <!-- <xref linkend="tcl"/>, (is in LFS core) -->
       <xref linkend="icu"/>,
       <xref linkend="libxml2"/>,
       <xref linkend="libxslt"/>,
@@ -437,8 +436,7 @@ echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')</userinput></
           pg_config, pg_controldata, pg_ctl, pg_dump, pg_dumpall, pg_isready,
           pg_receivewal, pg_recvlogical, pg_resetwal, pg_restore, pg_rewind,
           pg_test_fsync, pg_test_timing, pg_upgrade, pg_verifybackup,
-          pg_waldump, pgbench,
-          postgres, postmaster (deprecated), psql, reindexdb, vacuumdb,
+          pg_waldump, pgbench, postgres, psql, reindexdb, vacuumdb,
           optionally, if Tcl support has been built, pltcl_delmod,
           pltcl_listmod, pltcl_loadmod, and optionally (in contrib/) oid2name,
           pg_standby, vacuumlo, and many others
@@ -898,6 +896,7 @@ echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')</userinput></
         </listitem>
       </varlistentry>
 
+<!-- Removed in 16.0
       <varlistentry id="postmaster">
         <term><command>postmaster</command></term>
         <listitem>
@@ -910,6 +909,7 @@ echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')</userinput></
           </indexterm>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry id="psql">
         <term><command>psql</command></term>