postgresql: updated to 13.1, 12.5, 11.10, 10.15, 9.6.20, and 9.5.24

PostgreSQL 13.1, 12.5, 11.10, 10.15, 9.6.20, and 9.5.24

Security Issues

* CVE-2020-25695: Multiple features escape "security restricted operation" sandbox
* CVE-2020-25694: Reconnection can downgrade connection security settings
* CVE-2020-25696: psql's \gset allows overwriting specially treated variables

Bug Fixes and Improvements

This update also fixes over 65 bugs that were reported in the last several months. Some of these issues only affect version 13, but may also apply to other supported versions.

Some of these fixes include:

Fix a breakage in the replication protocol by ensuring that two "command completion" events are expected for START_REPLICATION.
Ensure fsync is called on the SLRU caches that PostgreSQL maintains. This prevents potential data loss due to an operating system crash.
Fix ALTER ROLE usage for users with the BYPASSRLS permission.
ALTER TABLE ONLY ... DROP EXPRESSION is disallowed on partitioned tables when there are child tables.
Ensure that ALTER TABLE ONLY ... ENABLE/DISABLE TRIGGER does not apply to child tables.
Fix for ALTER TABLE ... SET NOT NULL on partitioned tables to avoid a potential deadlock in parallel pg_restore.
Fix handling of expressions in CREATE TABLE LIKE with inheritance.
DROP INDEX CONCURRENTLY is disallowed on partitioned tables.
Allow LOCK TABLE to succeed on a self-referential view instead of throwing an error.
Several fixes around statistics collection and progress reporting for REINDEX CONCURRENTLY.
Ensure that GENERATED columns are updated when any columns they depend on are updated via a rule or an updatable view.
Support hash partitioning with text array columns as partition keys.
Allow the jsonpath .datetime() method to accept ISO 8601-format timestamps.
During a "smart" shutdown, ensure background processes are not terminated until all foreground client sessions are completed, fixing an issue that broke the processing of parallel queries.
Several fixes for the query planner and optimizer.
Ensure that data is de-toasted before being inserted into a BRIN index. This could manifest itself with errors like "missing chunk number 0 for toast value NNN". If you have seen a similar error in an existing BRIN index, you should be able to correct it by using REINDEX on the index.
Fix the output of EXPLAIN to have the correct XML tag nesting for incremental sort plans.
Several fixes for memory leaks, including ones involving RLS policies, using CALL with PL/pgSQL, SIGHUP processing a configuration parameter that cannot be applied without a restart, and an edge-case for index lookup for a partition.
libpq can now support arbitrary-length lines in the .pgpass file.
On Windows, psql now reads the output of a backtick command in text mode, not binary mode, so it can now properly handle newlines.
Fix how pg_dump, pg_restore, clusterdb, reindexdb, and vacuumdb use complex connection-string parameters.
When the \connect command of psql reuses connection parameters, ensure that all non-overridden parameters from a previous connection string are also re-used.
Ensure that pg_dump collects per-column information about extension configuration tables, avoiding crashes when specifying --inserts.
Ensure that parallel pg_restore processes foreign keys referencing partitioned tables in the correct order.
Several fixes for contrib/pgcrypto, including a memory leak fix.

73 files changed, 144 insertions, 157 deletions

diff --git a/databases/postgresql10-client/Makefile b/databases/postgresql10-client/Makefile
index c8c03bc4153..2ffe65c74d5 100644
--- a/databases/postgresql10-client/Makefile
+++ b/databases/postgresql10-client/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2020/11/05 09:07:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2020/11/16 12:15:02 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql10/Makefile.common"
 
-USE_TOOLS+=		gzip tar
+USE_TOOLS+=		gzip msgfmt tar
 TOOLS_BROKEN+=		perl
 CONFIGURE_ARGS+=	--with-openssl
 CONFIGURE_ARGS+=	--with-zlib
diff --git a/databases/postgresql10-contrib/Makefile b/databases/postgresql10-contrib/Makefile
index 93c3847ae85..9958253e83c 100644
--- a/databases/postgresql10-contrib/Makefile
+++ b/databases/postgresql10-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2020/11/05 09:07:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2020/11/16 12:15:02 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-contrib-/}
-PKGREVISION=	2
 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 1f6ab40a1c0..066565305b8 100644
--- a/databases/postgresql10-docs/Makefile
+++ b/databases/postgresql10-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/11/05 09:07:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/16 12:15:02 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-docs-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql10/Makefile.common"
diff --git a/databases/postgresql10-docs/PLIST b/databases/postgresql10-docs/PLIST
index a03a3e6b6c3..6fd22d247ed 100644
--- a/databases/postgresql10-docs/PLIST
+++ b/databases/postgresql10-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2020/08/14 06:56:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2020/11/16 12:15:02 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -915,6 +915,7 @@ share/doc/postgresql/html/release-10-11.html
 share/doc/postgresql/html/release-10-12.html
 share/doc/postgresql/html/release-10-13.html
 share/doc/postgresql/html/release-10-14.html
+share/doc/postgresql/html/release-10-15.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 6bbcd3ab2ba..4b24113e748 100644
--- a/databases/postgresql10-plperl/Makefile
+++ b/databases/postgresql10-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.9 2020/11/05 09:07:43 ryoon Exp $
+#$ $NetBSD: Makefile,v 1.10 2020/11/16 12:15:02 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-plperl-/}
-PKGREVISION=	2
 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 b051974f1d8..8ff787b0d80 100644
--- a/databases/postgresql10-plpython/Makefile
+++ b/databases/postgresql10-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2020/11/05 09:07:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2020/11/16 12:15:02 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-plpython-/}
-PKGREVISION=	2
 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 62bbf3b44bd..b84a23a2a8a 100644
--- a/databases/postgresql10-pltcl/Makefile
+++ b/databases/postgresql10-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/11/05 09:07:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2020/11/16 12:15:02 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-pltcl-/}
-PKGREVISION=	2
 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 72f4a30ef5f..948fa1daba0 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2020/11/05 09:07:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/16 12:15:02 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-server-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql10/Makefile b/databases/postgresql10/Makefile
index 4678d0cb2e2..9b9a33a28be 100644
--- a/databases/postgresql10/Makefile
+++ b/databases/postgresql10/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2020/11/05 09:07:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2020/11/16 12:15:02 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/10-/}
-PKGREVISION=	2
 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 ed03d439bbc..1d9dc479dfc 100644
--- a/databases/postgresql10/Makefile.common
+++ b/databases/postgresql10/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2020/08/14 06:56:22 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2020/11/16 12:15:02 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.14
+DISTNAME=	postgresql-10.15
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -68,6 +68,9 @@ CONFIGURE_ARGS+=	--without-perl
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-tcl
 
+# avoid pointing to a wrapper
+CONFIGURE_ENV+=		MSGFMT=${TOOLS_PATH.msgfmt}
+
 # sys/ucred.h shouldn't be included on Solaris, causes conflicts between
 # procfs and largefile.
 CONFIGURE_ENV.SunOS+=	ac_cv_header_sys_ucred_h=no
diff --git a/databases/postgresql10/distinfo b/databases/postgresql10/distinfo
index b84f97eb4e7..0f92768db2e 100644
--- a/databases/postgresql10/distinfo
+++ b/databases/postgresql10/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2020/08/14 06:56:22 adam Exp $
+$NetBSD: distinfo,v 1.17 2020/11/16 12:15:02 adam Exp $
 
-SHA1 (postgresql-10.14.tar.bz2) = db230e62422673814419e76508708164a2cbfb09
-RMD160 (postgresql-10.14.tar.bz2) = 7f73551d98a67bbfd285be9185e529a43755da50
-SHA512 (postgresql-10.14.tar.bz2) = eecd2aa8df7e4779606ec547b7bf0207ebb2be10a4b332f06c3b72116f0619fe27fb651f2fd4504c73b740ab7f92468919244a615d460bb9c35085174a0dbc78
-Size (postgresql-10.14.tar.bz2) = 19042154 bytes
+SHA1 (postgresql-10.15.tar.bz2) = 3d688f05d2de7c9ed89ef6be8d33906a4e7a833d
+RMD160 (postgresql-10.15.tar.bz2) = d913c1f991c16bae10db941d9b9fdb0d31f92ebe
+SHA512 (postgresql-10.15.tar.bz2) = 88fe322a8691692f8c1b8ca7f7a5a035c399c1d2a0e6276b60863f2c0cb8e4857b041d7364641e0738438aee0836688e712b9c176ac454ee98386dfd18754636
+Size (postgresql-10.15.tar.bz2) = 19089779 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 ef38a087bb9..c9df6bc40a8 100644
--- a/databases/postgresql11-client/Makefile
+++ b/databases/postgresql11-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/11/05 09:07:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/16 12:15:03 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql11/Makefile.common"
diff --git a/databases/postgresql11-contrib/Makefile b/databases/postgresql11-contrib/Makefile
index d0f900ffcb5..69f1cee7d09 100644
--- a/databases/postgresql11-contrib/Makefile
+++ b/databases/postgresql11-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/11/05 09:07:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2020/11/16 12:15:03 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-contrib-/}
-PKGREVISION=	2
 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 d4faa5b4934..0b242b24a96 100644
--- a/databases/postgresql11-docs/Makefile
+++ b/databases/postgresql11-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2020/11/05 09:07:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2020/11/16 12:15:03 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-docs-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql11/Makefile.common"
diff --git a/databases/postgresql11-docs/PLIST b/databases/postgresql11-docs/PLIST
index 5e52776b71e..03902d2612d 100644
--- a/databases/postgresql11-docs/PLIST
+++ b/databases/postgresql11-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2020/08/14 06:56:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/11/16 12:15:03 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -946,6 +946,7 @@ 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-11-1.html
+share/doc/postgresql/html/release-11-10.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 fe9e46dce99..6f2cff8d55b 100644
--- a/databases/postgresql11-plperl/Makefile
+++ b/databases/postgresql11-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.7 2020/11/05 09:07:44 ryoon Exp $
+#$ $NetBSD: Makefile,v 1.8 2020/11/16 12:15:03 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-plperl-/}
-PKGREVISION=	2
 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 e1dc4b94e33..5fb9e4f7ecb 100644
--- a/databases/postgresql11-plpython/Makefile
+++ b/databases/postgresql11-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/11/05 09:07:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2020/11/16 12:15:03 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-plpython-/}
-PKGREVISION=	2
 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 223cbd95717..42917a0913f 100644
--- a/databases/postgresql11-pltcl/Makefile
+++ b/databases/postgresql11-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/11/05 09:07:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/16 12:15:03 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-pltcl-/}
-PKGREVISION=	2
 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 0cdb817464f..5c2ce6f8f51 100644
--- a/databases/postgresql11-server/Makefile
+++ b/databases/postgresql11-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2020/11/05 09:07:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/16 12:15:03 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-server-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql11/Makefile b/databases/postgresql11/Makefile
index 939024d7ae5..491adf7308a 100644
--- a/databases/postgresql11/Makefile
+++ b/databases/postgresql11/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2020/11/05 09:07:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2020/11/16 12:15:03 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/11-/}
-PKGREVISION=	2
 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 0dc03046b46..8fb2f8d042c 100644
--- a/databases/postgresql11/Makefile.common
+++ b/databases/postgresql11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2020/08/14 06:56:23 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2020/11/16 12:15:03 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.9
+DISTNAME=	postgresql-11.10
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -45,7 +45,7 @@ PKG_SYSCONFSUBDIR=	postgresql
 PG_TEMPLATE.SunOS=	solaris
 PG_TEMPLATE.IRIX=	irix5
 PG_TEMPLATE.MirBSD=	openbsd
-PG_TEMPLATE.DragonFly=  freebsd
+PG_TEMPLATE.DragonFly=	freebsd
 .if !defined(PG_TEMPLATE.${OPSYS})
 PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
diff --git a/databases/postgresql11/distinfo b/databases/postgresql11/distinfo
index c4fc46095fc..f5cda17030d 100644
--- a/databases/postgresql11/distinfo
+++ b/databases/postgresql11/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2020/11/06 21:38:30 otis Exp $
+$NetBSD: distinfo,v 1.12 2020/11/16 12:15:03 adam Exp $
 
-SHA1 (postgresql-11.9.tar.bz2) = aedb423d7f42a46fccf64ff1411fd8f5180f51e7
-RMD160 (postgresql-11.9.tar.bz2) = 8a1afd0d5d4e5f3d6e27d30c268dabf66a0db51c
-SHA512 (postgresql-11.9.tar.bz2) = 2c5c2f51aa01f02af4aa0849441767383e30fef69dd52efa442892f39d2456bfa8bf01f633a265e00eca0745e792609d2c1d33f77d8f29a02f5f374c84f2bf6e
-Size (postgresql-11.9.tar.bz2) = 19959019 bytes
+SHA1 (postgresql-11.10.tar.bz2) = 97bc8d07d30229b52bac57241cd48bcf6116ef44
+RMD160 (postgresql-11.10.tar.bz2) = 112aaba727ec5639ab8e284d55eba2c7cd12e939
+SHA512 (postgresql-11.10.tar.bz2) = 0cc0e9b0f76e00727dc699ea59a45d760d37d91ec736a62cbc9bda3e38eb1ef1565e4e399dd3ae96bad87f866e56e364f916de7740d8be6e1cfc2bf654dfbb68
+Size (postgresql-11.10.tar.bz2) = 20003842 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 762c1005f93..9756bd9e4e4 100644
--- a/databases/postgresql12-client/Makefile
+++ b/databases/postgresql12-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/11/05 09:07:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2020/11/16 12:15:04 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql12/Makefile.common"
@@ -15,8 +14,6 @@ CONFIGURE_ARGS+=	--with-zlib
 # leaking into the binary package
 CONFIGURE_ARGS+=	INSTALL=${INSTALL:Q}\ -c
 
-MAKE_JOBS_SAFE=		no
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Cygwin"
diff --git a/databases/postgresql12-client/PLIST b/databases/postgresql12-client/PLIST
index 82bb320f960..9066733aed0 100644
--- a/databases/postgresql12-client/PLIST
+++ b/databases/postgresql12-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/08/14 06:56:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/11/16 12:15:04 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createuser
@@ -1055,6 +1055,7 @@ ${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_resetwal-12.mo
 ${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_rewind-12.mo
 ${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_test_fsync-12.mo
 ${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_upgrade-12.mo
 ${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_waldump-12.mo
 ${PLIST.nls}share/locale/uk/LC_MESSAGES/pgscripts-12.mo
 ${PLIST.nls}share/locale/uk/LC_MESSAGES/psql-12.mo
diff --git a/databases/postgresql12-contrib/Makefile b/databases/postgresql12-contrib/Makefile
index b23decdb4a0..b69492ef44d 100644
--- a/databases/postgresql12-contrib/Makefile
+++ b/databases/postgresql12-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/11/05 09:07:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2020/11/16 12:15:04 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-contrib-/}
-PKGREVISION=	2
 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 96334d52348..87e8e8daf15 100644
--- a/databases/postgresql12-docs/Makefile
+++ b/databases/postgresql12-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2020/11/05 09:07:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2020/11/16 12:15:04 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-docs-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql12/Makefile.common"
diff --git a/databases/postgresql12-docs/PLIST b/databases/postgresql12-docs/PLIST
index 6706010fd7d..f9bedcdc590 100644
--- a/databases/postgresql12-docs/PLIST
+++ b/databases/postgresql12-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/08/14 06:56:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/11/16 12:15:04 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -956,6 +956,7 @@ share/doc/postgresql/html/release-12-1.html
 share/doc/postgresql/html/release-12-2.html
 share/doc/postgresql/html/release-12-3.html
 share/doc/postgresql/html/release-12-4.html
+share/doc/postgresql/html/release-12-5.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 f6263a7f7be..4a94a7b9182 100644
--- a/databases/postgresql12-plperl/Makefile
+++ b/databases/postgresql12-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.7 2020/11/05 09:07:45 ryoon Exp $
+#$ $NetBSD: Makefile,v 1.8 2020/11/16 12:15:04 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-plperl-/}
-PKGREVISION=	2
 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 90d15f61b3d..71e9c99c92d 100644
--- a/databases/postgresql12-plpython/Makefile
+++ b/databases/postgresql12-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/11/05 09:07:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/16 12:15:04 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-plpython-/}
-PKGREVISION=	2
 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 b0eda125d29..c1f6cccee0f 100644
--- a/databases/postgresql12-pltcl/Makefile
+++ b/databases/postgresql12-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/11/05 09:07:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/16 12:15:04 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-pltcl-/}
-PKGREVISION=	2
 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 8edba7fd2cf..b1249362c9e 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/11/05 09:07:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2020/11/16 12:15:04 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-server-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql12/Makefile b/databases/postgresql12/Makefile
index 613c782165b..f5e287e33b4 100644
--- a/databases/postgresql12/Makefile
+++ b/databases/postgresql12/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2020/11/05 09:07:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/16 12:15:04 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/12-/}
-PKGREVISION=	2
 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 7e7814eed08..1edddab4e35 100644
--- a/databases/postgresql12/Makefile.common
+++ b/databases/postgresql12/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2020/08/14 06:56:23 adam Exp $
+# $NetBSD: Makefile.common,v 1.9 2020/11/16 12:15:04 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.4
+DISTNAME=	postgresql-12.5
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -45,7 +45,7 @@ PKG_SYSCONFSUBDIR=	postgresql
 PG_TEMPLATE.SunOS=	solaris
 PG_TEMPLATE.IRIX=	irix5
 PG_TEMPLATE.MirBSD=	openbsd
-PG_TEMPLATE.DragonFly=  freebsd
+PG_TEMPLATE.DragonFly=	freebsd
 .if !defined(PG_TEMPLATE.${OPSYS})
 PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
diff --git a/databases/postgresql12/distinfo b/databases/postgresql12/distinfo
index 0f8f0a733cf..9eb1b0349fe 100644
--- a/databases/postgresql12/distinfo
+++ b/databases/postgresql12/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2020/08/14 06:56:23 adam Exp $
+$NetBSD: distinfo,v 1.6 2020/11/16 12:15:04 adam Exp $
 
-SHA1 (postgresql-12.4.tar.bz2) = 5a64e3916a42547227f2afec359d1c9ddc3eba8e
-RMD160 (postgresql-12.4.tar.bz2) = e469f58fe8261ad0739adaa94e56b16f4af8b9a0
-SHA512 (postgresql-12.4.tar.bz2) = 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3
-Size (postgresql-12.4.tar.bz2) = 20669776 bytes
+SHA1 (postgresql-12.5.tar.bz2) = 031c42b26df6aa91351c02c336b9aa6111bf6c7e
+RMD160 (postgresql-12.5.tar.bz2) = d974cdb8fcf8e960fca824786b8121cfffc60c05
+SHA512 (postgresql-12.5.tar.bz2) = 9895bcb1bb26206500666ab4441e663ef83702d428b85a6ff177a4eaf44b0ae06b35d5c4da2672ccb4ec18296649af95bf2f0aed526afaa6a216a8c2d2c5627e
+Size (postgresql-12.5.tar.bz2) = 20729654 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
@@ -11,6 +11,7 @@ SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-src_Makefile.global.in) = 335b57afff23a9684ab0a09257665810c1ba2d1e
 SHA1 (patch-src_Makefile.shlib) = 4e093c79345add008a56c10d1c1bc8574f7a38e1
 SHA1 (patch-src_backend_Makefile) = 209f4cfb1670381838e7f25ead7ab9f0f671f89c
+SHA1 (patch-src_backend_commands_collationcmds.c) = afd137be89f3f487a82711a350dd940b89999ab3
 SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
 SHA1 (patch-src_makefiles_Makefile.solaris) = 10bf43bee54a6a1b6086c1652076544b05bf0192
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 161a8f7af61b3a33b255fdee9fa7d4918decde7d
diff --git a/databases/postgresql12/patches/patch-src_backend_commands_collationcmds.c b/databases/postgresql12/patches/patch-src_backend_commands_collationcmds.c
new file mode 100644
index 00000000000..259ea48ed71
--- /dev/null
+++ b/databases/postgresql12/patches/patch-src_backend_commands_collationcmds.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_backend_commands_collationcmds.c,v 1.1 2020/11/16 12:15:04 adam Exp $
+
+Fix for ICU 68.1.
+
+--- src/backend/commands/collationcmds.c.orig	2020-11-13 08:22:04.000000000 +0000
++++ src/backend/commands/collationcmds.c
+@@ -463,7 +463,7 @@ get_icu_language_tag(const char *localen
+ 	UErrorCode	status;
+ 
+ 	status = U_ZERO_ERROR;
+-	uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
++	uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
+ 	if (U_FAILURE(status))
+ 		ereport(ERROR,
+ 				(errmsg("could not convert locale name \"%s\" to language tag: %s",
diff --git a/databases/postgresql13-client/Makefile b/databases/postgresql13-client/Makefile
index b9ca09a816f..a52f8717984 100644
--- a/databases/postgresql13-client/Makefile
+++ b/databases/postgresql13-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/05 09:07:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/16 12:15:05 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/13-client-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql13/Makefile.common"
diff --git a/databases/postgresql13-client/PLIST b/databases/postgresql13-client/PLIST
index 15f0cc3f551..c2444b41307 100644
--- a/databases/postgresql13-client/PLIST
+++ b/databases/postgresql13-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/10/18 09:24:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/16 12:15:05 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createuser
@@ -989,6 +989,7 @@ ${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_rewind-13.mo
 ${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_test_fsync-13.mo
 ${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_test_timing-13.mo
 ${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_upgrade-13.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_verifybackup-13.mo
 ${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_waldump-13.mo
 ${PLIST.nls}share/locale/ko/LC_MESSAGES/pgscripts-13.mo
 ${PLIST.nls}share/locale/ko/LC_MESSAGES/psql-13.mo
diff --git a/databases/postgresql13-contrib/Makefile b/databases/postgresql13-contrib/Makefile
index 02131b5d3b2..1604a591c14 100644
--- a/databases/postgresql13-contrib/Makefile
+++ b/databases/postgresql13-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/05 09:07:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/16 12:15:05 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 b36fd5042b2..8e6830d00df 100644
--- a/databases/postgresql13-docs/Makefile
+++ b/databases/postgresql13-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/05 09:07:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/16 12:15:05 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 ad27a29b481..1700952f537 100644
--- a/databases/postgresql13-docs/PLIST
+++ b/databases/postgresql13-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/10/18 09:24:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/16 12:15:05 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -960,6 +960,7 @@ share/doc/postgresql/html/regress-run.html
 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-13-1.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 76feae5240a..288336a9063 100644
--- a/databases/postgresql13-plperl/Makefile
+++ b/databases/postgresql13-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.2 2020/11/05 09:07:46 ryoon Exp $
+#$ $NetBSD: Makefile,v 1.3 2020/11/16 12:15:05 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 c3c9b8d163e..f0fa31a83cc 100644
--- a/databases/postgresql13-plpython/Makefile
+++ b/databases/postgresql13-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/05 09:07:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/16 12:15:05 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 625ceeccd89..0b39323f525 100644
--- a/databases/postgresql13-pltcl/Makefile
+++ b/databases/postgresql13-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/05 09:07:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/16 12:15:05 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 83a68174c2b..8815e2a57d1 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/05 09:07:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/16 12:15:05 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 0376a13654e..508280b1694 100644
--- a/databases/postgresql13/Makefile
+++ b/databases/postgresql13/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/05 09:07:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/16 12:15:05 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 ecae4276a1f..f302198139b 100644
--- a/databases/postgresql13/Makefile.common
+++ b/databases/postgresql13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2020/10/18 09:24:02 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2020/11/16 12:15:05 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.0
+DISTNAME=	postgresql-13.1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -45,7 +45,7 @@ PKG_SYSCONFSUBDIR=	postgresql
 PG_TEMPLATE.SunOS=	solaris
 PG_TEMPLATE.IRIX=	irix5
 PG_TEMPLATE.MirBSD=	openbsd
-PG_TEMPLATE.DragonFly=  freebsd
+PG_TEMPLATE.DragonFly=	freebsd
 .if !defined(PG_TEMPLATE.${OPSYS})
 PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
diff --git a/databases/postgresql13/distinfo b/databases/postgresql13/distinfo
index 119a1c61816..dd54dc1336b 100644
--- a/databases/postgresql13/distinfo
+++ b/databases/postgresql13/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2020/10/18 09:24:02 adam Exp $
+$NetBSD: distinfo,v 1.2 2020/11/16 12:15:05 adam Exp $
 
-SHA1 (postgresql-13.0.tar.bz2) = f580717bc2872be532d43307b9d5319c5c1838c3
-RMD160 (postgresql-13.0.tar.bz2) = 9cb050ed5c5e384795de41b68607a3fd40017a01
-SHA512 (postgresql-13.0.tar.bz2) = 1fde89487c3e50a7a07e1d42fba60d415645ea89c5d4c5c7fcc93fbd5330feca7ec991d5b274f6ab757d5d04667ca1a7efdf4eaaa760add19d2e02437465f8f5
-Size (postgresql-13.0.tar.bz2) = 20999465 bytes
+SHA1 (postgresql-13.1.tar.bz2) = 3760c704f4d195100a28a983c0bc5331076259ee
+RMD160 (postgresql-13.1.tar.bz2) = 886f62c368ac83cdb598c347e970f85c42de616b
+SHA512 (postgresql-13.1.tar.bz2) = b7bd378db1dcb74ebcd5fffba03b82d8117d182029e4caca48eef62d8bcdbeef2c2e10f18eef0cdafb9d7acf21aa164d040e56687709f97b08c51540a786eeca
+Size (postgresql-13.1.tar.bz2) = 21034192 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql95-client/Makefile b/databases/postgresql95-client/Makefile
index 97af72a289b..2ab1a998503 100644
--- a/databases/postgresql95-client/Makefile
+++ b/databases/postgresql95-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2020/11/05 09:07:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2020/11/16 12:15:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/95-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql95/Makefile.common"
diff --git a/databases/postgresql95-client/PLIST b/databases/postgresql95-client/PLIST
index 1ef6c1da8ac..8ad82766bf9 100644
--- a/databases/postgresql95-client/PLIST
+++ b/databases/postgresql95-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/08/10 11:56:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/11/16 12:15:06 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -804,12 +804,19 @@ share/locale/ru/LC_MESSAGES/pg_resetxlog-9.5.mo
 share/locale/ru/LC_MESSAGES/pg_rewind-9.5.mo
 share/locale/ru/LC_MESSAGES/pgscripts-9.5.mo
 share/locale/ru/LC_MESSAGES/psql-9.5.mo
+share/locale/sv/LC_MESSAGES/ecpg-9.5.mo
+share/locale/sv/LC_MESSAGES/ecpglib6-9.5.mo
 share/locale/sv/LC_MESSAGES/initdb-9.5.mo
+share/locale/sv/LC_MESSAGES/libpq5-9.5.mo
+share/locale/sv/LC_MESSAGES/pg_basebackup-9.5.mo
 share/locale/sv/LC_MESSAGES/pg_config-9.5.mo
 share/locale/sv/LC_MESSAGES/pg_controldata-9.5.mo
 share/locale/sv/LC_MESSAGES/pg_ctl-9.5.mo
+share/locale/sv/LC_MESSAGES/pg_dump-9.5.mo
 share/locale/sv/LC_MESSAGES/pg_resetxlog-9.5.mo
+share/locale/sv/LC_MESSAGES/pg_rewind-9.5.mo
 share/locale/sv/LC_MESSAGES/pgscripts-9.5.mo
+share/locale/sv/LC_MESSAGES/psql-9.5.mo
 share/locale/ta/LC_MESSAGES/pg_config-9.5.mo
 share/locale/tr/LC_MESSAGES/ecpg-9.5.mo
 share/locale/tr/LC_MESSAGES/ecpglib6-9.5.mo
diff --git a/databases/postgresql95-contrib/Makefile b/databases/postgresql95-contrib/Makefile
index 51222956e9f..2b0c323f402 100644
--- a/databases/postgresql95-contrib/Makefile
+++ b/databases/postgresql95-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2020/11/05 09:07:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2020/11/16 12:15:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/95-contrib-/}
-PKGREVISION=	2
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql95/Makefile.common"
diff --git a/databases/postgresql95-docs/Makefile b/databases/postgresql95-docs/Makefile
index 03e21b34867..da8b1a72d62 100644
--- a/databases/postgresql95-docs/Makefile
+++ b/databases/postgresql95-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/11/05 09:07:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2020/11/16 12:15:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/95-docs-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql95/Makefile.common"
diff --git a/databases/postgresql95-docs/PLIST b/databases/postgresql95-docs/PLIST
index bb3bf00d19d..364871acb6d 100644
--- a/databases/postgresql95-docs/PLIST
+++ b/databases/postgresql95-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2020/08/14 06:56:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2020/11/16 12:15:06 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -884,6 +884,7 @@ share/doc/postgresql/html/release-9-5-20.html
 share/doc/postgresql/html/release-9-5-21.html
 share/doc/postgresql/html/release-9-5-22.html
 share/doc/postgresql/html/release-9-5-23.html
+share/doc/postgresql/html/release-9-5-24.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
 share/doc/postgresql/html/release-9-5-5.html
diff --git a/databases/postgresql95-plperl/Makefile b/databases/postgresql95-plperl/Makefile
index 8118134652c..8815a8c501f 100644
--- a/databases/postgresql95-plperl/Makefile
+++ b/databases/postgresql95-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.13 2020/11/05 09:07:47 ryoon Exp $
+#$ $NetBSD: Makefile,v 1.14 2020/11/16 12:15:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/95-plperl-/}
-PKGREVISION=	2
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server
diff --git a/databases/postgresql95-plpython/Makefile b/databases/postgresql95-plpython/Makefile
index d512d5b329a..9ec39904a9f 100644
--- a/databases/postgresql95-plpython/Makefile
+++ b/databases/postgresql95-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2020/11/05 09:07:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/16 12:15:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/95-plpython-/}
-PKGREVISION=	2
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server
diff --git a/databases/postgresql95-plpython/PLIST b/databases/postgresql95-plpython/PLIST
index f6be4ded2a4..8048d0e3d68 100644
--- a/databases/postgresql95-plpython/PLIST
+++ b/databases/postgresql95-plpython/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/02/25 21:37:36 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/16 12:15:06 adam Exp $
 include/postgresql/server/plpy_util.h
 include/postgresql/server/plpython.h
 ${PLIST.py2x}lib/postgresql/hstore_plpython2.so
@@ -15,8 +15,8 @@ share/locale/ko/LC_MESSAGES/plpython-9.5.mo
 share/locale/pl/LC_MESSAGES/plpython-9.5.mo
 share/locale/pt_BR/LC_MESSAGES/plpython-9.5.mo
 share/locale/ru/LC_MESSAGES/plpython-9.5.mo
+share/locale/sv/LC_MESSAGES/plpython-9.5.mo
 share/locale/zh_CN/LC_MESSAGES/plpython-9.5.mo
-@comment as of 9.5.1 installation of these is not dependent on python version
 share/postgresql/extension/hstore_plpython2u--1.0.sql
 share/postgresql/extension/hstore_plpython2u.control
 share/postgresql/extension/hstore_plpython3u--1.0.sql
diff --git a/databases/postgresql95-pltcl/Makefile b/databases/postgresql95-pltcl/Makefile
index db6aa1332ca..f24a60e0c7f 100644
--- a/databases/postgresql95-pltcl/Makefile
+++ b/databases/postgresql95-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2020/11/05 09:07:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2020/11/16 12:15:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/95-pltcl-/}
-PKGREVISION=	2
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server
diff --git a/databases/postgresql95-pltcl/PLIST b/databases/postgresql95-pltcl/PLIST
index 4e58836b8e6..4e74a829afe 100644
--- a/databases/postgresql95-pltcl/PLIST
+++ b/databases/postgresql95-pltcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/02/25 21:37:36 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/16 12:15:06 adam Exp $
 bin/pltcl_delmod
 bin/pltcl_listmod
 bin/pltcl_loadmod
@@ -14,6 +14,7 @@ share/locale/pl/LC_MESSAGES/pltcl-9.5.mo
 share/locale/pt_BR/LC_MESSAGES/pltcl-9.5.mo
 share/locale/ro/LC_MESSAGES/pltcl-9.5.mo
 share/locale/ru/LC_MESSAGES/pltcl-9.5.mo
+share/locale/sv/LC_MESSAGES/pltcl-9.5.mo
 share/locale/tr/LC_MESSAGES/pltcl-9.5.mo
 share/locale/zh_CN/LC_MESSAGES/pltcl-9.5.mo
 share/locale/zh_TW/LC_MESSAGES/pltcl-9.5.mo
diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile
index 778bed0cced..36c54de9454 100644
--- a/databases/postgresql95-server/Makefile
+++ b/databases/postgresql95-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2020/11/05 09:07:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2020/11/16 12:15:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/95-server-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql95-server/PLIST b/databases/postgresql95-server/PLIST
index 359105c7f56..c2e36409186 100644
--- a/databases/postgresql95-server/PLIST
+++ b/databases/postgresql95-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2020/05/19 07:05:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/11/16 12:15:06 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -51,6 +51,8 @@ share/locale/pt_BR/LC_MESSAGES/postgres-9.5.mo
 share/locale/ro/LC_MESSAGES/plpgsql-9.5.mo
 share/locale/ru/LC_MESSAGES/plpgsql-9.5.mo
 share/locale/ru/LC_MESSAGES/postgres-9.5.mo
+share/locale/sv/LC_MESSAGES/plpgsql-9.5.mo
+share/locale/sv/LC_MESSAGES/postgres-9.5.mo
 share/locale/zh_CN/LC_MESSAGES/plpgsql-9.5.mo
 share/locale/zh_CN/LC_MESSAGES/postgres-9.5.mo
 share/locale/zh_TW/LC_MESSAGES/plpgsql-9.5.mo
diff --git a/databases/postgresql95/Makefile b/databases/postgresql95/Makefile
index bcaa55cc82f..7eb592e9e51 100644
--- a/databases/postgresql95/Makefile
+++ b/databases/postgresql95/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2020/11/05 09:07:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2020/11/16 12:15:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/95-/}
-PKGREVISION=	2
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql95-client>=${PKGVERSION_NOREV}:../../databases/postgresql95-client
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common
index 64fe02c0212..1f446f6e621 100644
--- a/databases/postgresql95/Makefile.common
+++ b/databases/postgresql95/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2020/08/14 06:56:24 adam Exp $
+# $NetBSD: Makefile.common,v 1.34 2020/11/16 12:15:06 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/postgresql95-pltcl/Makefile
 # used by databases/postgresql95-server/Makefile
 
-DISTNAME=	postgresql-9.5.23
+DISTNAME=	postgresql-9.5.24
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql95/distinfo b/databases/postgresql95/distinfo
index ce7561a432c..3d85c143c9c 100644
--- a/databases/postgresql95/distinfo
+++ b/databases/postgresql95/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2020/08/14 06:56:24 adam Exp $
+$NetBSD: distinfo,v 1.26 2020/11/16 12:15:06 adam Exp $
 
-SHA1 (postgresql-9.5.23.tar.bz2) = fb20ae72f83a5dc7b3a3473f725ebbead3d622bd
-RMD160 (postgresql-9.5.23.tar.bz2) = a1656262117211e31e2699e8269de1379419f518
-SHA512 (postgresql-9.5.23.tar.bz2) = b7a1e936a0043b57b3ece79610855820d2ea6a86e4a4be0c4c8358bf3e1ef8fa88bc60106d6b865d86231d16b5e3c098b4dbd93125a125b3cc5d468ffea64db1
-Size (postgresql-9.5.23.tar.bz2) = 17682366 bytes
+SHA1 (postgresql-9.5.24.tar.bz2) = 9d1efcdb439172c37f7fbb10e5e0836f6ba9d710
+RMD160 (postgresql-9.5.24.tar.bz2) = a1ad64d2feb0fcd5f16ce5a35879d2d8eb63a680
+SHA512 (postgresql-9.5.24.tar.bz2) = 6e649cd31f2761e2d070d8028b59a690ad76ff3d83a3aa982c4b222c8ea2927fda5e8f473330526673e27ad4b3cc99e8c66810e097c3dfc6517571405c6aede3
+Size (postgresql-9.5.24.tar.bz2) = 17881872 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = 18dd4af7f043b090beda157dfd52531b551eafd0
diff --git a/databases/postgresql96-client/Makefile b/databases/postgresql96-client/Makefile
index 77c464aa351..a35b298ae9a 100644
--- a/databases/postgresql96-client/Makefile
+++ b/databases/postgresql96-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2020/11/05 09:07:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/16 12:15:07 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-client-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql96/Makefile.common"
diff --git a/databases/postgresql96-contrib/Makefile b/databases/postgresql96-contrib/Makefile
index 8423fc55e16..58e9d008c65 100644
--- a/databases/postgresql96-contrib/Makefile
+++ b/databases/postgresql96-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2020/11/05 09:07:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2020/11/16 12:15:07 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-contrib-/}
-PKGREVISION=	2
 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 a82875b80cf..9378a055045 100644
--- a/databases/postgresql96-docs/Makefile
+++ b/databases/postgresql96-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/11/05 09:07:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/16 12:15:07 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-docs-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql96/Makefile.common"
diff --git a/databases/postgresql96-docs/PLIST b/databases/postgresql96-docs/PLIST
index faad5f78b4d..f93a6840ef0 100644
--- a/databases/postgresql96-docs/PLIST
+++ b/databases/postgresql96-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2020/08/14 06:56:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2020/11/16 12:15:07 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -894,6 +894,7 @@ share/doc/postgresql/html/release-9-6-17.html
 share/doc/postgresql/html/release-9-6-18.html
 share/doc/postgresql/html/release-9-6-19.html
 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-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 57265bf5dab..c12a6dc7b1f 100644
--- a/databases/postgresql96-plperl/Makefile
+++ b/databases/postgresql96-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.9 2020/11/05 09:07:48 ryoon Exp $
+#$ $NetBSD: Makefile,v 1.10 2020/11/16 12:15:07 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-plperl-/}
-PKGREVISION=	2
 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 45be4d9668a..ad6a5e40ba9 100644
--- a/databases/postgresql96-plpython/Makefile
+++ b/databases/postgresql96-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2020/11/05 09:07:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2020/11/16 12:15:07 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-plpython-/}
-PKGREVISION=	2
 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 5205757212a..c7b700e9faa 100644
--- a/databases/postgresql96-pltcl/Makefile
+++ b/databases/postgresql96-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/11/05 09:07:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2020/11/16 12:15:07 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-pltcl-/}
-PKGREVISION=	2
 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 b5eb94fe5c5..fb837325ce5 100644
--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2020/11/05 09:07:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2020/11/16 12:15:07 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-server-/}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql96/Makefile b/databases/postgresql96/Makefile
index 6304f25638b..85cde96d8bc 100644
--- a/databases/postgresql96/Makefile
+++ b/databases/postgresql96/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/11/05 09:07:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2020/11/16 12:15:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/96-/}
-PKGREVISION=	2
 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 17dbf5442e3..c1709a36831 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2020/08/14 06:56:25 adam Exp $
+# $NetBSD: Makefile.common,v 1.28 2020/11/16 12:15:06 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.19
+DISTNAME=	postgresql-9.6.20
 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 dd16ce69763..3e64c2f8a08 100644
--- a/databases/postgresql96/distinfo
+++ b/databases/postgresql96/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2020/08/14 06:56:25 adam Exp $
+$NetBSD: distinfo,v 1.22 2020/11/16 12:15:06 adam Exp $
 
-SHA1 (postgresql-9.6.19.tar.bz2) = 72cde73fffd187bbd2e6c1de6d473cf5578754d2
-RMD160 (postgresql-9.6.19.tar.bz2) = 5efcd29859fefa41cb880ef28b6b5fb082e1d67d
-SHA512 (postgresql-9.6.19.tar.bz2) = 4d8d4a0e4645d71683a5fccb9cd88917e1870ba139f102e0ea82da9c8d1ad669f029e0feb6d409e2016dfd247229ec7daf04f7f2de3ab6c5b4053834ac244a26
-Size (postgresql-9.6.19.tar.bz2) = 18880036 bytes
+SHA1 (postgresql-9.6.20.tar.bz2) = 13aa206da020a550e56dbf524ca227bc2191fa48
+RMD160 (postgresql-9.6.20.tar.bz2) = 4f50e8fdb848b00e67d62638cf4a198477eee05a
+SHA512 (postgresql-9.6.20.tar.bz2) = 6d247e5640a515fa6e6a4c68a992c83aeb19e35924b8e3d21191b3289200766588d1426c5863a13bfc4a11944da3202df9efebc94460d16454c29e5a79384c75
+Size (postgresql-9.6.20.tar.bz2) = 18944478 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = db34614cef013a91dc229be319e5f09c657c3f24