The PostgreSQL Global Development Group has released an update to all

supported versions of our database system, including 12.3, 11.8, 10.13,
9.6.18, and 9.5.22.  This release fixes one security issue found in the
PostgreSQL server and over 75 bugs reported over the last three months.

Please plan to update at your earliest convenience.

Update the backup warning text. [1]

Add plpython and plperl libs for hstore, jsonb and ltree for the versions where
they exist. These libs are added to the postgresql??-plpython and -plperl
ports, inspired by [2].

PR:		237910 [1], 245246 [2]
Submitted by:	Francesco [1], Loïc Bartoletti [2]

7 files changed, 46 insertions, 7 deletions

diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index 64f8e7191324..5f968888024e 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	12.2
+DISTVERSION?=	12.3
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	2
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
@@ -78,7 +78,6 @@ SUB_FILES+=	502.pgsql
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=LIBEDIT DOCS
 LIBEDIT_DESC=	Use non-GPL libedit instead of readline
-USES+=		perl5
 .else
 MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
diff --git a/databases/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo
index 61f6a6f0d5db..38a554dc813c 100644
--- a/databases/postgresql12-server/distinfo
+++ b/databases/postgresql12-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581419817
-SHA256 (postgresql/postgresql-12.2.tar.bz2) = ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de
-SIZE (postgresql/postgresql-12.2.tar.bz2) = 20363545
+TIMESTAMP = 1589458709
+SHA256 (postgresql/postgresql-12.3.tar.bz2) = 94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41
+SIZE (postgresql/postgresql-12.3.tar.bz2) = 20439892
diff --git a/databases/postgresql12-server/pkg-install-server b/databases/postgresql12-server/pkg-install-server
index dff2f434764f..d4dcb95ca9a4 100644
--- a/databases/postgresql12-server/pkg-install-server
+++ b/databases/postgresql12-server/pkg-install-server
@@ -10,9 +10,10 @@ cat <<EOF
   =========== BACKUP YOUR DATA! =============
   As always, backup your data before
   upgrading. If the upgrade leads to a higher
-  minor revision (e.g. 8.3.x -> 8.4), a dump
+  major revision (e.g. 9.6 -> 10), a dump
   and restore of all databases is
   required. This is *NOT* done by the port!
+  See https://www.postgresql.org/docs/current/upgrading.html
   ===========================================
 EOF
 }
diff --git a/databases/postgresql12-server/pkg-plist-client b/databases/postgresql12-server/pkg-plist-client
index cc15abac37de..11d5e6227a0d 100644
--- a/databases/postgresql12-server/pkg-plist-client
+++ b/databases/postgresql12-server/pkg-plist-client
@@ -1199,6 +1199,8 @@ man/man7/WITH.7.gz
 %%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/libpq5-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/psql-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/ecpg-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-12.mo
diff --git a/databases/postgresql12-server/pkg-plist-plperl b/databases/postgresql12-server/pkg-plist-plperl
index d2923d23d6d6..93081938fd08 100644
--- a/databases/postgresql12-server/pkg-plist-plperl
+++ b/databases/postgresql12-server/pkg-plist-plperl
@@ -9,3 +9,13 @@ include/postgresql/server/ppport.h
 %%DATADIR%%/extension/plperl--unpackaged--1.0.sql
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
+lib/postgresql/hstore_plperl.so
+lib/postgresql/jsonb_plperl.so
+%%DATADIR%%/extension/hstore_plperl--1.0.sql
+%%DATADIR%%/extension/hstore_plperl.control
+%%DATADIR%%/extension/hstore_plperlu--1.0.sql
+%%DATADIR%%/extension/hstore_plperlu.control
+%%DATADIR%%/extension/jsonb_plperl--1.0.sql
+%%DATADIR%%/extension/jsonb_plperl.control
+%%DATADIR%%/extension/jsonb_plperlu--1.0.sql
+%%DATADIR%%/extension/jsonb_plperlu.control
diff --git a/databases/postgresql12-server/pkg-plist-plpython b/databases/postgresql12-server/pkg-plist-plpython
index da847844d322..8ecdbbea15a3 100644
--- a/databases/postgresql12-server/pkg-plist-plpython
+++ b/databases/postgresql12-server/pkg-plist-plpython
@@ -24,3 +24,24 @@ lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
 %%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
 %%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
 %%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+lib/postgresql/hstore_plpython3.so
+lib/postgresql/jsonb_plpython3.so
+lib/postgresql/ltree_plpython3.so
+%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython2u.control
+%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython3u.control
+%%DATADIR%%/extension/hstore_plpythonu--1.0.sql
+%%DATADIR%%/extension/hstore_plpythonu.control
+%%DATADIR%%/extension/jsonb_plpython2u--1.0.sql
+%%DATADIR%%/extension/jsonb_plpython2u.control
+%%DATADIR%%/extension/jsonb_plpython3u--1.0.sql
+%%DATADIR%%/extension/jsonb_plpython3u.control
+%%DATADIR%%/extension/jsonb_plpythonu--1.0.sql
+%%DATADIR%%/extension/jsonb_plpythonu.control
+%%DATADIR%%/extension/ltree_plpython2u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython2u.control
+%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython3u.control
+%%DATADIR%%/extension/ltree_plpythonu--1.0.sql
+%%DATADIR%%/extension/ltree_plpythonu.control
diff --git a/databases/postgresql12-server/pkg-plist-server b/databases/postgresql12-server/pkg-plist-server
index f1f69cab2fe7..05c50650e5c0 100644
--- a/databases/postgresql12-server/pkg-plist-server
+++ b/databases/postgresql12-server/pkg-plist-server
@@ -873,10 +873,15 @@ lib/libpgcommon.a
 %%NLS%%share/locale/tr/LC_MESSAGES/postgres-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/initdb-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-12.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/pg_controldata-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-12.mo
@@ -1071,6 +1076,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
 %%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
 %%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk
 %%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
 %%TZDATA%%%%DATADIR%%/timezone/America/Panama
 %%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung