postgresql: updated to 13.4, 12.8, 11.13, 10.18, 9.6.23

PostgreSQL 13.4, 12.8, 11.13, 10.18, 9.6.23

Security Issues

CVE-2021-3677: Memory disclosure in certain queries

Versions Affected: 11 - 13.

A purpose-crafted query can read arbitrary bytes of server memory. In the default configuration, any authenticated database user can complete this attack at will. The attack does not require the ability to create objects. If server settings include max_worker_processes=0, the known versions of this attack are infeasible. However, undiscovered variants of the attack may be independent of that setting.

Bug Fixes and Improvements

This update also fixes over 75 bugs that were reported in the last several months. Some of these issues affect only version 13, but many affect all supported versions.

Some of these fixes include:

Completely disable TLS/SSL renegotiation. This was previously disabled, but the server would still execute a client-initiated renegotiation request.
Restore the Portal-level snapshot after COMMIT or ROLLBACK within a procedure. This change fixes cases where an attempt to fetch a toasted value immediately after COMMIT/ROLLBACK would fail with errors like "no known snapshots" or "missing chunk number 0 for toast value".
Avoid misbehavior when persisting the output of a cursor that's reading a volatile query.
Reject cases where a query in WITH rewrites to just NOTIFY, which would cause a crash.
Several corner-case fixes for numeric types.
ALTER EXTENSION now locks the extension when adding or removing a member object.
The "enabled" status is now copied when a partitioned table's triggers are cloned to a new partition.
Avoid alias conflicts in queries generated for REFRESH MATERIALIZED VIEW CONCURRENTLY. This command failed on materialized views containing columns with certain names, notably mv and newdata.
Disallow whole-row variables in GENERATED expressions.
Several fixes for DROP OWNED BY behavior in relation to row-level security (RLS) policies.
Re-allow old-style Windows locale names in CREATE COLLATION commands.
walsenders now show their latest replication command in pg_stat_activity, instead of just showing the latest SQL command.
pg_settings.pending_restart now shows as true when a pertinent entry in postgresql.conf is removed.
On 64-bit Windows, allow the effective value of work_mem * hash_mem_multiplier to exceed 2GB.
Update minimum recovery point when WAL replay of a transaction abort record causes file truncation.
Advance oldest-required-WAL-segment horizon properly after a replication slot is invalidated. This fixes an issue where the server's WAL storage could run out of space.
Improve progress reporting for the sort phase of a parallel B-tree index build.
Fix assorted crash cases in logical replication of partitioned-table updates and when firing AFTER triggers of partitioned tables.
Prevent infinite loops in SP-GiST index insertion.
Ensure that SP-GiST index insertion can be terminated by a query cancel request.
In psql and other client programs, avoid overrunning the ends of strings when dealing with invalidly-encoded data.
Fix pg_dump to correctly handle triggers on partitioned tables whose enabled status is different from their parent triggers' status.
Avoid "invalid creation date in header" warnings when running pg_restore on a file created in a different time zone.
pg_upgrade now carries forward the old installation's oldestXID value and no longer forces an anti-wraparound VACUUM."
Extend pg_upgrade to detect and warn about extensions that should be upgraded.
Fix contrib/postgres_fdw to better work with generated columns, so long as a generated column in a foreign table represents a generated column in the remote table.

55 files changed, 97 insertions, 120 deletions

diff --git a/databases/postgresql10-client/Makefile b/databases/postgresql10-client/Makefile
index 92558eed116..c4fd94a4181 100644
--- a/databases/postgresql10-client/Makefile
+++ b/databases/postgresql10-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2021/05/24 19:49:45 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2021/08/13 11:54:43 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-client-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql10/Makefile.common"
diff --git a/databases/postgresql10-contrib/Makefile b/databases/postgresql10-contrib/Makefile
index acd44e6d0e8..953a16828e9 100644
--- a/databases/postgresql10-contrib/Makefile
+++ b/databases/postgresql10-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2021/05/24 19:49:45 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2021/08/13 11:54:44 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql10/Makefile.common"
diff --git a/databases/postgresql10-docs/Makefile b/databases/postgresql10-docs/Makefile
index 177ac0488e2..3112ed51df4 100644
--- a/databases/postgresql10-docs/Makefile
+++ b/databases/postgresql10-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2021/05/24 19:49:45 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2021/08/13 11:54:44 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql10/Makefile.common"
diff --git a/databases/postgresql10-docs/PLIST b/databases/postgresql10-docs/PLIST
index 1fd7730b0c1..e282365476a 100644
--- a/databases/postgresql10-docs/PLIST
+++ b/databases/postgresql10-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2021/05/18 11:56:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2021/08/13 11:54:44 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -616,6 +616,9 @@ share/doc/postgresql/html/gist-implementation.html
 share/doc/postgresql/html/gist-intro.html
 share/doc/postgresql/html/gist.html
 share/doc/postgresql/html/git.html
+share/doc/postgresql/html/hash-implementation.html
+share/doc/postgresql/html/hash-index.html
+share/doc/postgresql/html/hash-intro.html
 share/doc/postgresql/html/high-availability.html
 share/doc/postgresql/html/history.html
 share/doc/postgresql/html/hot-standby.html
@@ -923,6 +926,7 @@ share/doc/postgresql/html/release-10-14.html
 share/doc/postgresql/html/release-10-15.html
 share/doc/postgresql/html/release-10-16.html
 share/doc/postgresql/html/release-10-17.html
+share/doc/postgresql/html/release-10-18.html
 share/doc/postgresql/html/release-10-2.html
 share/doc/postgresql/html/release-10-3.html
 share/doc/postgresql/html/release-10-4.html
diff --git a/databases/postgresql10-plperl/Makefile b/databases/postgresql10-plperl/Makefile
index e48f1069c94..df2d860df5f 100644
--- a/databases/postgresql10-plperl/Makefile
+++ b/databases/postgresql10-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.15 2021/05/24 19:49:46 wiz Exp $
+#$ $NetBSD: Makefile,v 1.16 2021/08/13 11:54:44 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server
diff --git a/databases/postgresql10-plpython/Makefile b/databases/postgresql10-plpython/Makefile
index 61ddca212dd..9988d37a9c3 100644
--- a/databases/postgresql10-plpython/Makefile
+++ b/databases/postgresql10-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2021/05/24 19:49:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2021/08/13 11:54:44 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-plpython-/}
-PKGREVISION=	1
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server
diff --git a/databases/postgresql10-pltcl/Makefile b/databases/postgresql10-pltcl/Makefile
index ed3446e5eaa..0f6f789317d 100644
--- a/databases/postgresql10-pltcl/Makefile
+++ b/databases/postgresql10-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2021/05/24 19:49:46 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2021/08/13 11:54:44 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server
diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
index 61e9595b41f..e03d2616d4c 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2021/05/24 19:49:46 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2021/08/13 11:54:44 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql10/Makefile b/databases/postgresql10/Makefile
index 89170b3b8c9..511940cde35 100644
--- a/databases/postgresql10/Makefile
+++ b/databases/postgresql10/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2021/05/24 19:49:45 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2021/08/13 11:54:43 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql10-client>=${PKGVERSION_NOREV}:../../databases/postgresql10-client
diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common
index 8adf509e698..0c8fc2ef2cc 100644
--- a/databases/postgresql10/Makefile.common
+++ b/databases/postgresql10/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2021/06/13 08:56:26 nia Exp $
+# $NetBSD: Makefile.common,v 1.30 2021/08/13 11:54:43 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql10-pltcl/Makefile
 # used by databases/postgresql10-server/Makefile
 
-DISTNAME=	postgresql-10.17
+DISTNAME=	postgresql-10.18
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql10/distinfo b/databases/postgresql10/distinfo
index 32a67654c22..1ab35a31318 100644
--- a/databases/postgresql10/distinfo
+++ b/databases/postgresql10/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2021/07/12 09:06:21 mlelstv Exp $
+$NetBSD: distinfo,v 1.22 2021/08/13 11:54:43 adam Exp $
 
-SHA1 (postgresql-10.17.tar.bz2) = 479ec3bf2882a3188dd16ec92169c67e78995400
-RMD160 (postgresql-10.17.tar.bz2) = eb2c2dd55f6515b5a2d27f36f9c87625a7d6c2f5
-SHA512 (postgresql-10.17.tar.bz2) = 4989abe56cf631b367252c62f15c9f4a22a864a75d607fa29c2116c95e29f95bc3855df6b2fc88dbedcfc7b238d6732d13629fc967f09bbd3ea4d5c328cb925f
-Size (postgresql-10.17.tar.bz2) = 19153278 bytes
+SHA1 (postgresql-10.18.tar.bz2) = a9f6d96343cc5dcf8b28e6fce5a2955041b14003
+RMD160 (postgresql-10.18.tar.bz2) = fe43854c91bf98c44c22eee2f9b014691d86bf5f
+SHA512 (postgresql-10.18.tar.bz2) = 8a564256b0a5f6375a817cc5db14e56f7f7ee831881a2dc78759e7f2cf708d95fb61ad75a01f13fb05517ab165c991794d837bbb93f60d54f4fb33ca0ac45729
+Size (postgresql-10.18.tar.bz2) = 19197042 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql11-client/Makefile b/databases/postgresql11-client/Makefile
index 9b3f96fc1ca..40ab6b32ed8 100644
--- a/databases/postgresql11-client/Makefile
+++ b/databases/postgresql11-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2021/05/24 19:49:46 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2021/08/13 11:54:45 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-client-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql11/Makefile.common"
diff --git a/databases/postgresql11-contrib/Makefile b/databases/postgresql11-contrib/Makefile
index fbc57e70009..8abc68fc93b 100644
--- a/databases/postgresql11-contrib/Makefile
+++ b/databases/postgresql11-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2021/05/24 19:49:46 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2021/08/13 11:54:45 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql11/Makefile.common"
diff --git a/databases/postgresql11-docs/Makefile b/databases/postgresql11-docs/Makefile
index 6c1bf6597f1..619771f7926 100644
--- a/databases/postgresql11-docs/Makefile
+++ b/databases/postgresql11-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2021/05/24 19:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2021/08/13 11:54:45 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql11/Makefile.common"
diff --git a/databases/postgresql11-docs/PLIST b/databases/postgresql11-docs/PLIST
index 667d472f66b..097685ebde3 100644
--- a/databases/postgresql11-docs/PLIST
+++ b/databases/postgresql11-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2021/05/18 11:56:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2021/08/13 11:54:45 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -643,6 +643,9 @@ share/doc/postgresql/html/gist-intro.html
 share/doc/postgresql/html/gist.html
 share/doc/postgresql/html/git.html
 share/doc/postgresql/html/gssapi-auth.html
+share/doc/postgresql/html/hash-implementation.html
+share/doc/postgresql/html/hash-index.html
+share/doc/postgresql/html/hash-intro.html
 share/doc/postgresql/html/high-availability.html
 share/doc/postgresql/html/history.html
 share/doc/postgresql/html/hot-standby.html
@@ -954,6 +957,7 @@ share/doc/postgresql/html/release-11-1.html
 share/doc/postgresql/html/release-11-10.html
 share/doc/postgresql/html/release-11-11.html
 share/doc/postgresql/html/release-11-12.html
+share/doc/postgresql/html/release-11-13.html
 share/doc/postgresql/html/release-11-2.html
 share/doc/postgresql/html/release-11-3.html
 share/doc/postgresql/html/release-11-4.html
diff --git a/databases/postgresql11-plperl/Makefile b/databases/postgresql11-plperl/Makefile
index dbf61452c59..b447b9f95d7 100644
--- a/databases/postgresql11-plperl/Makefile
+++ b/databases/postgresql11-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.13 2021/05/24 19:49:47 wiz Exp $
+#$ $NetBSD: Makefile,v 1.14 2021/08/13 11:54:45 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server
diff --git a/databases/postgresql11-plpython/Makefile b/databases/postgresql11-plpython/Makefile
index 214d010bb93..5a70f26fb2f 100644
--- a/databases/postgresql11-plpython/Makefile
+++ b/databases/postgresql11-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2021/05/24 19:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2021/08/13 11:54:45 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-plpython-/}
-PKGREVISION=	1
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server
diff --git a/databases/postgresql11-pltcl/Makefile b/databases/postgresql11-pltcl/Makefile
index f277d8a512d..d65c5cd072d 100644
--- a/databases/postgresql11-pltcl/Makefile
+++ b/databases/postgresql11-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2021/05/24 19:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2021/08/13 11:54:45 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server
diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile
index 69225194c1f..0ef68ef02a4 100644
--- a/databases/postgresql11-server/Makefile
+++ b/databases/postgresql11-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2021/05/24 19:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2021/08/13 11:54:45 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql11/Makefile b/databases/postgresql11/Makefile
index eaced7bfdec..a92326309df 100644
--- a/databases/postgresql11/Makefile
+++ b/databases/postgresql11/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2021/05/24 19:49:46 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2021/08/13 11:54:44 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql11-client>=${PKGVERSION_NOREV}:../../databases/postgresql11-client
diff --git a/databases/postgresql11/Makefile.common b/databases/postgresql11/Makefile.common
index c60e81bc99a..bfe934f0598 100644
--- a/databases/postgresql11/Makefile.common
+++ b/databases/postgresql11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2021/06/13 08:56:26 nia Exp $
+# $NetBSD: Makefile.common,v 1.23 2021/08/13 11:54:44 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql11-pltcl/Makefile
 # used by databases/postgresql11-server/Makefile
 
-DISTNAME=	postgresql-11.12
+DISTNAME=	postgresql-11.13
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql11/distinfo b/databases/postgresql11/distinfo
index 1c364336c60..989c73f46d2 100644
--- a/databases/postgresql11/distinfo
+++ b/databases/postgresql11/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2021/07/12 09:06:21 mlelstv Exp $
+$NetBSD: distinfo,v 1.17 2021/08/13 11:54:44 adam Exp $
 
-SHA1 (postgresql-11.12.tar.bz2) = 4058af97fde72064c5fd18a508eda6a5526359df
-RMD160 (postgresql-11.12.tar.bz2) = cd4a28a42b4828df710502b2bc8c9a5da0eaf2d3
-SHA512 (postgresql-11.12.tar.bz2) = 668914424e1dbe09a66d5272e5b0a17fa24c90d3d099f8161f1420eaa76675ea1c622e4d149bdfcb31f07af19602a500913cb97c49d717df23e374de09dc0274
-Size (postgresql-11.12.tar.bz2) = 20075485 bytes
+SHA1 (postgresql-11.13.tar.bz2) = 7c0b06bdbe2bd3d966fb7d875843f022694e9b1a
+RMD160 (postgresql-11.13.tar.bz2) = d682247742b45048c4f30f977a2402ee79396cf7
+SHA512 (postgresql-11.13.tar.bz2) = 1b2061d505a7460e0aaae53818e77fc99fa7b73eea119033a98a3d7dd3d70d00403998654990b03bbf6eb2df383e2f44791137c8922ea4015715f8bf49c5837f
+Size (postgresql-11.13.tar.bz2) = 20123787 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql12-client/Makefile b/databases/postgresql12-client/Makefile
index 535b69c3179..8162e39c51e 100644
--- a/databases/postgresql12-client/Makefile
+++ b/databases/postgresql12-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2021/05/24 19:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2021/08/13 11:54:45 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-client-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql12/Makefile.common"
diff --git a/databases/postgresql12-contrib/Makefile b/databases/postgresql12-contrib/Makefile
index 7d4440c9fbc..f5e87c838ed 100644
--- a/databases/postgresql12-contrib/Makefile
+++ b/databases/postgresql12-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2021/05/24 19:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2021/08/13 11:54:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql12/Makefile.common"
diff --git a/databases/postgresql12-docs/Makefile b/databases/postgresql12-docs/Makefile
index 3ba2ac71cca..9b52bad6e97 100644
--- a/databases/postgresql12-docs/Makefile
+++ b/databases/postgresql12-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2021/05/24 19:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2021/08/13 11:54:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql12/Makefile.common"
diff --git a/databases/postgresql12-docs/PLIST b/databases/postgresql12-docs/PLIST
index e1bd9555dbf..94e98a822b8 100644
--- a/databases/postgresql12-docs/PLIST
+++ b/databases/postgresql12-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2021/05/18 11:56:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/08/13 11:54:46 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -650,6 +650,9 @@ share/doc/postgresql/html/gist.html
 share/doc/postgresql/html/git.html
 share/doc/postgresql/html/gssapi-auth.html
 share/doc/postgresql/html/gssapi-enc.html
+share/doc/postgresql/html/hash-implementation.html
+share/doc/postgresql/html/hash-index.html
+share/doc/postgresql/html/hash-intro.html
 share/doc/postgresql/html/high-availability.html
 share/doc/postgresql/html/history.html
 share/doc/postgresql/html/hot-standby.html
@@ -965,6 +968,7 @@ share/doc/postgresql/html/release-12-4.html
 share/doc/postgresql/html/release-12-5.html
 share/doc/postgresql/html/release-12-6.html
 share/doc/postgresql/html/release-12-7.html
+share/doc/postgresql/html/release-12-8.html
 share/doc/postgresql/html/release-12.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
diff --git a/databases/postgresql12-plperl/Makefile b/databases/postgresql12-plperl/Makefile
index cf74f42d710..c0aa35d4666 100644
--- a/databases/postgresql12-plperl/Makefile
+++ b/databases/postgresql12-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.13 2021/05/24 19:49:48 wiz Exp $
+#$ $NetBSD: Makefile,v 1.14 2021/08/13 11:54:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server
diff --git a/databases/postgresql12-plpython/Makefile b/databases/postgresql12-plpython/Makefile
index eecea7a583e..949b4bc7b18 100644
--- a/databases/postgresql12-plpython/Makefile
+++ b/databases/postgresql12-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2021/05/24 19:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2021/08/13 11:54:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-plpython-/}
-PKGREVISION=	1
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server
diff --git a/databases/postgresql12-pltcl/Makefile b/databases/postgresql12-pltcl/Makefile
index 000d6ed8eb5..65b2ed2b8de 100644
--- a/databases/postgresql12-pltcl/Makefile
+++ b/databases/postgresql12-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2021/05/24 19:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2021/08/13 11:54:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index af437e0e4ef..c6b79299957 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2021/05/24 19:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2021/08/13 11:54:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql12/Makefile b/databases/postgresql12/Makefile
index 183e7e1e7a5..20683c28cc6 100644
--- a/databases/postgresql12/Makefile
+++ b/databases/postgresql12/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2021/05/24 19:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2021/08/13 11:54:45 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql12-client>=${PKGVERSION_NOREV}:../../databases/postgresql12-client
diff --git a/databases/postgresql12/Makefile.common b/databases/postgresql12/Makefile.common
index 5560f952c4a..3b38dcce6d6 100644
--- a/databases/postgresql12/Makefile.common
+++ b/databases/postgresql12/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2021/06/13 08:56:26 nia Exp $
+# $NetBSD: Makefile.common,v 1.16 2021/08/13 11:54:45 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql12-pltcl/Makefile
 # used by databases/postgresql12-server/Makefile
 
-DISTNAME=	postgresql-12.7
+DISTNAME=	postgresql-12.8
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql12/distinfo b/databases/postgresql12/distinfo
index 3570517a983..805ca9e7a4d 100644
--- a/databases/postgresql12/distinfo
+++ b/databases/postgresql12/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2021/07/12 09:06:21 mlelstv Exp $
+$NetBSD: distinfo,v 1.11 2021/08/13 11:54:45 adam Exp $
 
-SHA1 (postgresql-12.7.tar.bz2) = e7071caed1f31a0b6d7579ea66e00342e8ebe146
-RMD160 (postgresql-12.7.tar.bz2) = 7a8e2a19b372076498782ae7f8285826d5f5fdc7
-SHA512 (postgresql-12.7.tar.bz2) = 47ca347df63a441e52e52442074e85d0ebd3a89f7eb037022c4690cbe88b21a6a959092a812b79bb30db47b5975a5d7908318c73b2685683d48b4789d4ae6a44
-Size (postgresql-12.7.tar.bz2) = 20819005 bytes
+SHA1 (postgresql-12.8.tar.bz2) = f3f4ae778036795bdc8f493cc7d0d15d409061e9
+RMD160 (postgresql-12.8.tar.bz2) = 10e70f2d366d6d52e6b33a8685f2e3721705ffcc
+SHA512 (postgresql-12.8.tar.bz2) = 970fe1041e427ac1c8a786c93e2079b0a9c8b3fcaf9d38877894eb02e8a9afc7cd73d7ac28078c455845a922a1b7d9c1e22cb7990d8d523dd6496af9442fba01
+Size (postgresql-12.8.tar.bz2) = 20849478 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql13-client/Makefile b/databases/postgresql13-client/Makefile
index 050678a01f3..c41249d825e 100644
--- a/databases/postgresql13-client/Makefile
+++ b/databases/postgresql13-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2021/05/24 19:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2021/08/13 11:54:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-client-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql13/Makefile.common"
diff --git a/databases/postgresql13-contrib/Makefile b/databases/postgresql13-contrib/Makefile
index 2fc08b1b889..b837a0a619d 100644
--- a/databases/postgresql13-contrib/Makefile
+++ b/databases/postgresql13-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2021/05/24 19:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2021/08/13 11:54:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql13/Makefile.common"
diff --git a/databases/postgresql13-docs/Makefile b/databases/postgresql13-docs/Makefile
index ab13af7f908..dbc468f9a55 100644
--- a/databases/postgresql13-docs/Makefile
+++ b/databases/postgresql13-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2021/05/24 19:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/13 11:54:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql13/Makefile.common"
diff --git a/databases/postgresql13-docs/PLIST b/databases/postgresql13-docs/PLIST
index 7c642cf2052..19af706b4be 100644
--- a/databases/postgresql13-docs/PLIST
+++ b/databases/postgresql13-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/05/18 11:56:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/08/13 11:54:47 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -661,6 +661,9 @@ share/doc/postgresql/html/git.html
 share/doc/postgresql/html/glossary.html
 share/doc/postgresql/html/gssapi-auth.html
 share/doc/postgresql/html/gssapi-enc.html
+share/doc/postgresql/html/hash-implementation.html
+share/doc/postgresql/html/hash-index.html
+share/doc/postgresql/html/hash-intro.html
 share/doc/postgresql/html/high-availability.html
 share/doc/postgresql/html/history.html
 share/doc/postgresql/html/hot-standby.html
@@ -969,6 +972,7 @@ share/doc/postgresql/html/regress.html
 share/doc/postgresql/html/release-13-1.html
 share/doc/postgresql/html/release-13-2.html
 share/doc/postgresql/html/release-13-3.html
+share/doc/postgresql/html/release-13-4.html
 share/doc/postgresql/html/release-13.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
diff --git a/databases/postgresql13-plperl/Makefile b/databases/postgresql13-plperl/Makefile
index 3868b05cb86..9e07c4558b5 100644
--- a/databases/postgresql13-plperl/Makefile
+++ b/databases/postgresql13-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.8 2021/05/24 19:49:49 wiz Exp $
+#$ $NetBSD: Makefile,v 1.9 2021/08/13 11:54:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql13-server>=${PKGVERSION_NOREV}:../../databases/postgresql13-server
diff --git a/databases/postgresql13-plpython/Makefile b/databases/postgresql13-plpython/Makefile
index 3186dc7742c..8a8b5c1d133 100644
--- a/databases/postgresql13-plpython/Makefile
+++ b/databases/postgresql13-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2021/05/24 19:49:49 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2021/08/13 11:54:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-plpython-/}
-PKGREVISION=	1
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql13-server>=${PKGVERSION_NOREV}:../../databases/postgresql13-server
diff --git a/databases/postgresql13-pltcl/Makefile b/databases/postgresql13-pltcl/Makefile
index 5bd37919670..75cb520a11c 100644
--- a/databases/postgresql13-pltcl/Makefile
+++ b/databases/postgresql13-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2021/05/24 19:49:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/13 11:54:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql13-server>=${PKGVERSION_NOREV}:../../databases/postgresql13-server
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index 089e7e5bf22..58b71875b78 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2021/05/24 19:49:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/13 11:54:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql13/Makefile b/databases/postgresql13/Makefile
index 5dd93478911..df1a954ebea 100644
--- a/databases/postgresql13/Makefile
+++ b/databases/postgresql13/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2021/05/24 19:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/13 11:54:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql13-client>=${PKGVERSION_NOREV}:../../databases/postgresql13-client
diff --git a/databases/postgresql13/Makefile.common b/databases/postgresql13/Makefile.common
index 1c57de860df..96c253c654b 100644
--- a/databases/postgresql13/Makefile.common
+++ b/databases/postgresql13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2021/06/13 08:56:26 nia Exp $
+# $NetBSD: Makefile.common,v 1.9 2021/08/13 11:54:46 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql13-pltcl/Makefile
 # used by databases/postgresql13-server/Makefile
 
-DISTNAME=	postgresql-13.3
+DISTNAME=	postgresql-13.4
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql13/distinfo b/databases/postgresql13/distinfo
index cef6425a778..1d843baecf7 100644
--- a/databases/postgresql13/distinfo
+++ b/databases/postgresql13/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2021/07/12 09:06:22 mlelstv Exp $
+$NetBSD: distinfo,v 1.7 2021/08/13 11:54:46 adam Exp $
 
-SHA1 (postgresql-13.3.tar.bz2) = 7a775f95367613ed5f7e4cd632586f9628475a92
-RMD160 (postgresql-13.3.tar.bz2) = 40e9645e8c1cd2776daaa70fa54ea62024d34527
-SHA512 (postgresql-13.3.tar.bz2) = 1560cc766982a9ea9d33c77835b20e33e11b03acb77fc75d905c565883935a7dbcd27b9b2ab6a0ecdb815261f7c259865cb3dac85c10a3181c3fcaeb4d28bf60
-Size (postgresql-13.3.tar.bz2) = 21119109 bytes
+SHA1 (postgresql-13.4.tar.bz2) = 92146ec62ad80e8f5d2959b5cc1766311dc00d64
+RMD160 (postgresql-13.4.tar.bz2) = 8766ce228491c11629096da54dd5fd4d1c46f9ef
+SHA512 (postgresql-13.4.tar.bz2) = f1faf676ffdcee3e7f2c3b78f4badf44770d6be58090036d119d8fb0688e2b9f9159dd44fe850c179b8e23f256942c05edb8fcc385f0e852d16b37eace785b5a
+Size (postgresql-13.4.tar.bz2) = 21157443 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = 142ba9dc85a2408802e4b9e4943b775312d577c9
diff --git a/databases/postgresql96-client/Makefile b/databases/postgresql96-client/Makefile
index 867ef58250b..9cc01fd9c7d 100644
--- a/databases/postgresql96-client/Makefile
+++ b/databases/postgresql96-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2021/05/24 19:49:49 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2021/08/13 11:54:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-client-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql96/Makefile.common"
diff --git a/databases/postgresql96-contrib/Makefile b/databases/postgresql96-contrib/Makefile
index 5802b8a36ed..7ed3611a314 100644
--- a/databases/postgresql96-contrib/Makefile
+++ b/databases/postgresql96-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2021/05/24 19:49:49 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2021/08/13 11:54:48 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql96/Makefile.common"
diff --git a/databases/postgresql96-docs/Makefile b/databases/postgresql96-docs/Makefile
index 4f27812ea98..21cfa900e15 100644
--- a/databases/postgresql96-docs/Makefile
+++ b/databases/postgresql96-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2021/05/24 19:49:49 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2021/08/13 11:54:48 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql96/Makefile.common"
diff --git a/databases/postgresql96-docs/PLIST b/databases/postgresql96-docs/PLIST
index 3fa744b1045..19e7b7fdd8d 100644
--- a/databases/postgresql96-docs/PLIST
+++ b/databases/postgresql96-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2021/05/18 11:56:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2021/08/13 11:54:48 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -898,6 +898,7 @@ share/doc/postgresql/html/release-9-6-2.html
 share/doc/postgresql/html/release-9-6-20.html
 share/doc/postgresql/html/release-9-6-21.html
 share/doc/postgresql/html/release-9-6-22.html
+share/doc/postgresql/html/release-9-6-23.html
 share/doc/postgresql/html/release-9-6-3.html
 share/doc/postgresql/html/release-9-6-4.html
 share/doc/postgresql/html/release-9-6-5.html
diff --git a/databases/postgresql96-plperl/Makefile b/databases/postgresql96-plperl/Makefile
index a6b7f421240..4867501fc72 100644
--- a/databases/postgresql96-plperl/Makefile
+++ b/databases/postgresql96-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.15 2021/05/24 19:49:50 wiz Exp $
+#$ $NetBSD: Makefile,v 1.16 2021/08/13 11:54:48 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql96-server>=${PKGVERSION_NOREV}:../../databases/postgresql96-server
diff --git a/databases/postgresql96-plpython/Makefile b/databases/postgresql96-plpython/Makefile
index 34057df977a..febc334a621 100644
--- a/databases/postgresql96-plpython/Makefile
+++ b/databases/postgresql96-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2021/05/24 19:49:50 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2021/08/13 11:54:48 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-plpython-/}
-PKGREVISION=	1
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql96-server>=${PKGVERSION_NOREV}:../../databases/postgresql96-server
diff --git a/databases/postgresql96-pltcl/Makefile b/databases/postgresql96-pltcl/Makefile
index 22fd6198116..ac2e16082e6 100644
--- a/databases/postgresql96-pltcl/Makefile
+++ b/databases/postgresql96-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2021/05/24 19:49:50 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2021/08/13 11:54:48 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-pltcl-/}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql96-server>=${PKGVERSION_NOREV}:../../databases/postgresql96-server
diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
index 2829bd0191d..f177f9f42d5 100644
--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2021/05/24 19:49:50 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2021/08/13 11:54:48 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-server-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql96/Makefile b/databases/postgresql96/Makefile
index 289081f7c6e..2170dc85010 100644
--- a/databases/postgresql96/Makefile
+++ b/databases/postgresql96/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2021/05/24 19:49:49 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2021/08/13 11:54:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql96-client>=${PKGVERSION_NOREV}:../../databases/postgresql96-client
diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common
index 70600b628b7..007fb2878b9 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2021/06/13 08:56:27 nia Exp $
+# $NetBSD: Makefile.common,v 1.35 2021/08/13 11:54:47 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql96-pltcl/Makefile
 # used by databases/postgresql96-server/Makefile
 
-DISTNAME=	postgresql-9.6.22
+DISTNAME=	postgresql-9.6.23
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql96/distinfo b/databases/postgresql96/distinfo
index 70cc83930c3..d9c7319678f 100644
--- a/databases/postgresql96/distinfo
+++ b/databases/postgresql96/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2021/05/18 11:56:21 adam Exp $
+$NetBSD: distinfo,v 1.26 2021/08/13 11:54:47 adam Exp $
 
-SHA1 (postgresql-9.6.22.tar.bz2) = e56f90d8c25443d61c09226c011ae53eaff58bd8
-RMD160 (postgresql-9.6.22.tar.bz2) = 061b411626270ecdb68c2459bd837433bbe9c850
-SHA512 (postgresql-9.6.22.tar.bz2) = 371f85f2d02a8a3b888396440149e9b432f91e106a7feb8a163b275a0586843683124281a0965abf3c1215cb68e2002976913f88c75e35e52ac5f78d4145fd7b
-Size (postgresql-9.6.22.tar.bz2) = 19003741 bytes
+SHA1 (postgresql-9.6.23.tar.bz2) = d7e09dc6cb551ac7893af44e701861d72821c373
+RMD160 (postgresql-9.6.23.tar.bz2) = 59a9ca18b3085a23654d491d91f12c6abd0b2d31
+SHA512 (postgresql-9.6.23.tar.bz2) = 205b47cf1c22519092f840a9b3bf6bdf95f455e5ba02a7e1bc1495f85bb25f8ccfe9f60c83dc2801f1366b88fc35e64c23eb9bdc89a4bb5d233243af4606d59c
+Size (postgresql-9.6.23.tar.bz2) = 19013235 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = db34614cef013a91dc229be319e5f09c657c3f24