LP1937294: Update Prerequisite Installation for PostgreSQL Server

Add targets to install PostgreSQL server version 11 through 14 via the
Makefile.install prerequisite installer.

Drop PostgreSQL version 9.6 as an installation target.

Use PostgreSQL 14 client as it should be backwards compatible and is
required if using the PostgreSQL 14 server.

Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 2906654..d46c022 100644 (file)
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -5,7 +5,7 @@
 # Makefile to install prerequisites for OpenSRF and Evergreen
 #
 # Currently supports Debian (bullseye, buster, stretch),
-# Ubuntu (16.04), Ubuntu (18.04).
+# Ubuntu (18.04), Ubuntu (20.04).
 #
 # Installs Perl prereqs, libdbi, libdbi-drivers, and libyaz
 #
@@ -77,26 +77,56 @@ ubuntu-focal:
 fedora:
        @make -f $(DIR)/Makefile.fedora
 
-postgres-server-debian-bullseye:
-       @make -f $(DIR)/Makefile.debian-bullseye install_postgres_server
 postgres-server-debian-bullseye-10:
        @make -f $(DIR)/Makefile.debian-bullseye install_postgres_server_10
-postgres-server-debian-buster:
-       @make -f $(DIR)/Makefile.debian-buster install_postgres_server
+postgres-server-debian-bullseye-11:
+       @make -f $(DIR)/Makefile.debian-bullseye install_postgres_server_11
+postgres-server-debian-bullseye-12:
+       @make -f $(DIR)/Makefile.debian-bullseye install_postgres_server_12
+postgres-server-debian-bullseye-13:
+       @make -f $(DIR)/Makefile.debian-bullseye install_postgres_server_13
+postgres-server-debian-bullseye-14:
+       @make -f $(DIR)/Makefile.debian-bullseye install_postgres_server_14
 postgres-server-debian-buster-10:
        @make -f $(DIR)/Makefile.debian-buster install_postgres_server_10
-postgres-server-debian-stretch:
-       @make -f $(DIR)/Makefile.debian-stretch install_postgres_server
+postgres-server-debian-buster-11:
+       @make -f $(DIR)/Makefile.debian-buster install_postgres_server_11
+postgres-server-debian-buster-12:
+       @make -f $(DIR)/Makefile.debian-buster install_postgres_server_12
+postgres-server-debian-buster-13:
+       @make -f $(DIR)/Makefile.debian-buster install_postgres_server_13
+postgres-server-debian-buster-14:
+       @make -f $(DIR)/Makefile.debian-buster install_postgres_server_14
 postgres-server-debian-stretch-10:
        @make -f $(DIR)/Makefile.debian-stretch install_postgres_server_10
-postgres-server-ubuntu-bionic:
-       @make -f $(DIR)/Makefile.ubuntu-bionic install_postgres_server
+postgres-server-debian-stretch-11:
+       @make -f $(DIR)/Makefile.debian-stretch install_postgres_server_11
+postgres-server-debian-stretch-12:
+       @make -f $(DIR)/Makefile.debian-stretch install_postgres_server_12
+postgres-server-debian-stretch-13:
+       @make -f $(DIR)/Makefile.debian-stretch install_postgres_server_13
+postgres-server-debian-stretch-14:
+       @make -f $(DIR)/Makefile.debian-stretch install_postgres_server_14
 postgres-server-ubuntu-bionic-10:
        @make -f $(DIR)/Makefile.ubuntu-bionic install_postgres_server_10
-postgres-server-ubuntu-focal:
-       @make -f $(DIR)/Makefile.ubuntu-focal install_postgres_server
+postgres-server-ubuntu-bionic-11:
+       @make -f $(DIR)/Makefile.ubuntu-bionic install_postgres_server_11
+postgres-server-ubuntu-bionic-12:
+       @make -f $(DIR)/Makefile.ubuntu-bionic install_postgres_server_12
+postgres-server-ubuntu-bionic-13:
+       @make -f $(DIR)/Makefile.ubuntu-bionic install_postgres_server_13
+postgres-server-ubuntu-bionic-14:
+       @make -f $(DIR)/Makefile.ubuntu-bionic install_postgres_server_14
 postgres-server-ubuntu-focal-10:
        @make -f $(DIR)/Makefile.ubuntu-focal install_postgres_server_10
+postgres-server-ubuntu-focal-11:
+       @make -f $(DIR)/Makefile.ubuntu-focal install_postgres_server_11
+postgres-server-ubuntu-focal-12:
+       @make -f $(DIR)/Makefile.ubuntu-focal install_postgres_server_12
+postgres-server-ubuntu-focal-13:
+       @make -f $(DIR)/Makefile.ubuntu-focal install_postgres_server_13
+postgres-server-ubuntu-focal-14:
+       @make -f $(DIR)/Makefile.ubuntu-focal install_postgres_server_14
 postgres-server-fedora:
        @make -f $(DIR)/Makefile.fedora install_postgres_server
 

diff --git a/Open-ILS/src/extras/install/Makefile.debian-bullseye b/Open-ILS/src/extras/install/Makefile.debian-bullseye
index 60476e0..cbdf035 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-bullseye
+++ b/Open-ILS/src/extras/install/Makefile.debian-bullseye
@@ -70,7 +70,7 @@ export DEBS = \
        libuniversal-require-perl\
        libunix-syslog-perl\
        libyaz-dev\
-       postgresql-client-9.6\
+       postgresql-client-14\
        libsoap-lite-perl\
        libbz2-dev\
        libparse-recdescent-perl\
@@ -111,20 +111,36 @@ export CPAN_MODULES_PGSQL = \
        String::KeyboardDistance \
        Text::Levenshtein::Damerau::XS
 
-PGSQL_SERVER_DEBS_96 = \
-       $(DEB_PGSQL_COMMON_MODS) \
-       postgresql-9.6 \
-       postgresql-contrib-9.6 \
-       postgresql-plperl-9.6 \
-       postgresql-server-dev-9.6
-
 PGSQL_SERVER_DEBS_10 = \
        $(DEB_PGSQL_COMMON_MODS) \
        postgresql-10 \
-       postgresql-contrib-10 \
        postgresql-plperl-10 \
        postgresql-server-dev-10
 
+PGSQL_SERVER_DEBS_11 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-11 \
+       postgresql-plperl-11 \
+       postgresql-server-dev-11
+
+PGSQL_SERVER_DEBS_12 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-12 \
+       postgresql-plperl-12 \
+       postgresql-server-dev-12
+
+PGSQL_SERVER_DEBS_13 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-13 \
+       postgresql-plperl-13 \
+       postgresql-server-dev-13
+
+PGSQL_SERVER_DEBS_14 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-14 \
+       postgresql-plperl-14 \
+       postgresql-server-dev-14
+
 # note: some prereqs are repeated in the developer/packager 
 # sections to support building Evergreen packages on servers
 # where Evergreen and its prereqs are not installed.
@@ -161,16 +177,34 @@ all:
        make -f $(DIR)/Makefile.common install_cpan_force
        make -f $(DIR)/Makefile.debian debian_sys_config
 
-install_postgres_server:
+install_postgres_server_10:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
-install_postgres_server_10:
+install_postgres_server_11:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_11)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_12:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_12)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_13:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_13)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_14:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_14)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 # note: if/when grunt-cli is available as a

diff --git a/Open-ILS/src/extras/install/Makefile.debian-buster b/Open-ILS/src/extras/install/Makefile.debian-buster
index 1a9ac16..f5d743d 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-buster
+++ b/Open-ILS/src/extras/install/Makefile.debian-buster
@@ -70,7 +70,7 @@ export DEBS = \
        libuniversal-require-perl\
        libunix-syslog-perl\
        libyaz-dev\
-       postgresql-client-9.6\
+       postgresql-client-14\
        libsoap-lite-perl\
        libbz2-dev\
        libparse-recdescent-perl\
@@ -110,20 +110,36 @@ export CPAN_MODULES_PGSQL = \
        String::KeyboardDistance \
        Text::Levenshtein::Damerau::XS
 
-PGSQL_SERVER_DEBS_96 = \
-       $(DEB_PGSQL_COMMON_MODS) \
-       postgresql-9.6 \
-       postgresql-contrib-9.6 \
-       postgresql-plperl-9.6 \
-       postgresql-server-dev-9.6
-
 PGSQL_SERVER_DEBS_10 = \
        $(DEB_PGSQL_COMMON_MODS) \
        postgresql-10 \
-       postgresql-contrib-10 \
        postgresql-plperl-10 \
        postgresql-server-dev-10
 
+PGSQL_SERVER_DEBS_11 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-11 \
+       postgresql-plperl-11 \
+       postgresql-server-dev-11
+
+PGSQL_SERVER_DEBS_12 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-12 \
+       postgresql-plperl-12 \
+       postgresql-server-dev-12
+
+PGSQL_SERVER_DEBS_13 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-13 \
+       postgresql-plperl-13 \
+       postgresql-server-dev-13
+
+PGSQL_SERVER_DEBS_14 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-14 \
+       postgresql-plperl-14 \
+       postgresql-server-dev-14
+
 # note: some prereqs are repeated in the developer/packager 
 # sections to support building Evergreen packages on servers
 # where Evergreen and its prereqs are not installed.
@@ -160,16 +176,34 @@ all:
        make -f $(DIR)/Makefile.common install_cpan_force
        make -f $(DIR)/Makefile.debian debian_sys_config
 
-install_postgres_server:
+install_postgres_server_10:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
-install_postgres_server_10:
+install_postgres_server_11:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_11)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_12:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_12)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_13:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_13)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_14:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_14)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 # note: if/when grunt-cli is available as a

diff --git a/Open-ILS/src/extras/install/Makefile.debian-stretch b/Open-ILS/src/extras/install/Makefile.debian-stretch
index 656025e..c7f62eb 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-stretch
+++ b/Open-ILS/src/extras/install/Makefile.debian-stretch
@@ -70,7 +70,7 @@ export DEBS = \
        libuniversal-require-perl\
        libunix-syslog-perl\
        libyaz-dev\
-       postgresql-client-9.6\
+       postgresql-client-14\
        libsoap-lite-perl\
        libbz2-dev\
        libparse-recdescent-perl\
@@ -110,19 +110,35 @@ export CPAN_MODULES_PGSQL = \
        String::KeyboardDistance \
        Text::Levenshtein::Damerau::XS
 
-PGSQL_SERVER_DEBS_96 = \
+PGSQL_SERVER_DEBS_10 = \
        $(DEB_PGSQL_COMMON_MODS) \
-       postgresql-9.6 \
-       postgresql-contrib-9.6 \
-       postgresql-plperl-9.6 \
-       postgresql-server-dev-9.6
+       postgresql-10 \
+       postgresql-plperl-10 \
+       postgresql-server-dev-10
 
-PGSQL_SERVER_DEBS_10 = \
-        $(DEB_PGSQL_COMMON_MODS) \
-        postgresql-10 \
-        postgresql-contrib-10 \
-        postgresql-plperl-10 \
-        postgresql-server-dev-10
+PGSQL_SERVER_DEBS_11 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-11 \
+       postgresql-plperl-11 \
+       postgresql-server-dev-11
+
+PGSQL_SERVER_DEBS_12 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-12 \
+       postgresql-plperl-12 \
+       postgresql-server-dev-12
+
+PGSQL_SERVER_DEBS_13 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-13 \
+       postgresql-plperl-13 \
+       postgresql-server-dev-13
+
+PGSQL_SERVER_DEBS_14 = \
+       $(DEB_PGSQL_COMMON_MODS) \
+       postgresql-14 \
+       postgresql-plperl-14 \
+       postgresql-server-dev-14
 
 # note: some prereqs are repeated in the developer/packager 
 # sections to support building Evergreen packages on servers
@@ -160,16 +176,34 @@ all:
        make -f $(DIR)/Makefile.common install_cpan_force
        make -f $(DIR)/Makefile.debian debian_sys_config
 
-install_postgres_server:
+install_postgres_server_10:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
-install_postgres_server_10:
+install_postgres_server_11:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_11)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_12:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_12)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_13:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_13)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_14:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_14)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 # note: if/when grunt-cli is available as a

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
index 96557bc..8430b0e 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
@@ -67,7 +67,7 @@ export DEBS = \
        libuniversal-require-perl\
        libunix-syslog-perl\
        libyaz-dev\
-       postgresql-client-9.6\
+       postgresql-client-14\
        libsoap-lite-perl\
        libbz2-dev\
        libparse-recdescent-perl\
@@ -113,20 +113,36 @@ PGSQL_APT_REPO_DEBS = \
         wget \
         ca-certificates
 
-PGSQL_SERVER_DEBS_96 = \
-       $(DEB_PGSQL_COMMON_MODS) \
-       postgresql-9.6 \
-       postgresql-contrib-9.6 \
-       postgresql-plperl-9.6 \
-       postgresql-server-dev-9.6
-
 PGSQL_SERVER_DEBS_10 = \
         $(DEB_PGSQL_COMMON_MODS) \
         postgresql-10 \
-        postgresql-contrib-10 \
         postgresql-plperl-10 \
         postgresql-server-dev-10
 
+PGSQL_SERVER_DEBS_11 = \
+        $(DEB_PGSQL_COMMON_MODS) \
+        postgresql-11 \
+        postgresql-plperl-11 \
+        postgresql-server-dev-11
+
+PGSQL_SERVER_DEBS_12 = \
+        $(DEB_PGSQL_COMMON_MODS) \
+        postgresql-12 \
+        postgresql-plperl-12 \
+        postgresql-server-dev-12
+
+PGSQL_SERVER_DEBS_13 = \
+        $(DEB_PGSQL_COMMON_MODS) \
+        postgresql-13 \
+        postgresql-plperl-13 \
+        postgresql-server-dev-13
+
+PGSQL_SERVER_DEBS_14 = \
+        $(DEB_PGSQL_COMMON_MODS) \
+        postgresql-14 \
+        postgresql-plperl-14 \
+        postgresql-server-dev-14
+
 # note: some prereqs are repeated in the developer/packager 
 # sections to support building Evergreen packages on servers
 # where Evergreen and its prereqs are not installed.
@@ -164,16 +180,34 @@ all:
        make -f $(DIR)/Makefile.common install_cpan_pgsql
        make -f $(DIR)/Makefile.debian debian_sys_config
 
-install_postgres_server:
+install_postgres_server_10:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
-install_postgres_server_10:
+install_postgres_server_11:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_11)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_12:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_12)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_13:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_13)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_14:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_14)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 # note: if/when grunt-cli is available as a

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-focal b/Open-ILS/src/extras/install/Makefile.ubuntu-focal
index a7a7b2f..56df37a 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-focal
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-focal
@@ -67,7 +67,7 @@ export DEBS = \
        libuniversal-require-perl\
        libunix-syslog-perl\
        libyaz-dev\
-       postgresql-client-9.6\
+       postgresql-client-14\
        libsoap-lite-perl\
        libbz2-dev\
        libparse-recdescent-perl\
@@ -114,20 +114,36 @@ PGSQL_APT_REPO_DEBS = \
         wget \
         ca-certificates
 
-PGSQL_SERVER_DEBS_96 = \
-       $(DEB_PGSQL_COMMON_MODS) \
-       postgresql-9.6 \
-       postgresql-contrib-9.6 \
-       postgresql-plperl-9.6 \
-       postgresql-server-dev-9.6
-
 PGSQL_SERVER_DEBS_10 = \
         $(DEB_PGSQL_COMMON_MODS) \
         postgresql-10 \
-        postgresql-contrib-10 \
         postgresql-plperl-10 \
         postgresql-server-dev-10
 
+PGSQL_SERVER_DEBS_11 = \
+        $(DEB_PGSQL_COMMON_MODS) \
+        postgresql-11 \
+        postgresql-plperl-11 \
+        postgresql-server-dev-11
+
+PGSQL_SERVER_DEBS_12 = \
+        $(DEB_PGSQL_COMMON_MODS) \
+        postgresql-12 \
+        postgresql-plperl-12 \
+        postgresql-server-dev-12
+
+PGSQL_SERVER_DEBS_13 = \
+        $(DEB_PGSQL_COMMON_MODS) \
+        postgresql-13 \
+        postgresql-plperl-13 \
+        postgresql-server-dev-13
+
+PGSQL_SERVER_DEBS_14 = \
+        $(DEB_PGSQL_COMMON_MODS) \
+        postgresql-14 \
+        postgresql-plperl-14 \
+        postgresql-server-dev-14
+
 # note: some prereqs are repeated in the developer/packager 
 # sections to support building Evergreen packages on servers
 # where Evergreen and its prereqs are not installed.
@@ -165,16 +181,34 @@ all:
        make -f $(DIR)/Makefile.common install_cpan_pgsql
        make -f $(DIR)/Makefile.debian debian_sys_config
 
-install_postgres_server:
+install_postgres_server_10:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
-install_postgres_server_10:
+install_postgres_server_11:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_11)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_12:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_12)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_13:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_13)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
+
+install_postgres_server_14:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_14)"
        make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 # note: if/when grunt-cli is available as a