From f7a81aa5fd07e6dc38192d1af6c896e4c7d61a9c Mon Sep 17 00:00:00 2001
From: "Mikhail A. Kulagin" <m.kulagin@postgrespro.ru>
Date: Wed, 13 Oct 2021 13:48:53 +0300
Subject: [PATCH] [Issue #413] packaging: bump postgres versions, add 14,
 remove 9.5, some workarounds (caused by old docker images)

---
 Makefile                           |  2 +-
 packaging/Makefile.pkg             | 42 +++++++++++-----------
 packaging/pkg/Makefile.alt         | 43 ++++++++++++++--------
 packaging/pkg/Makefile.centos      | 28 +++++++++------
 packaging/pkg/Makefile.debian      | 56 ++++++++++++++++++-----------
 packaging/pkg/Makefile.oraclelinux | 43 ++++++++++++++--------
 packaging/pkg/Makefile.rhel        | 28 +++++++++------
 packaging/pkg/Makefile.suse        | 28 +++++++++------
 packaging/pkg/Makefile.ubuntu      | 57 +++++++++++++++++++-----------
 packaging/pkg/scripts/deb.sh       |  6 ++--
 packaging/pkg/scripts/rpm.sh       | 19 ++++++----
 11 files changed, 220 insertions(+), 132 deletions(-)

diff --git a/Makefile b/Makefile
index 4e463bf7..aca1df35 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PROGRAM = pg_probackup
 WORKDIR ?= $(CURDIR)
 BUILDDIR = $(WORKDIR)/build/
-PBK_GIT_REPO = http://github.com/postgrespro/pg_probackup
+PBK_GIT_REPO = https://github.com/postgrespro/pg_probackup
 
 # utils
 OBJS = src/utils/configuration.o src/utils/json.o src/utils/logger.o \
diff --git a/packaging/Makefile.pkg b/packaging/Makefile.pkg
index bfe2043c..fc92ae40 100644
--- a/packaging/Makefile.pkg
+++ b/packaging/Makefile.pkg
@@ -38,39 +38,39 @@ build/prepare:
 build/clean: build/prepare
 	find $(BUILDDIR) -maxdepth 1 -type f -exec rm -f {} \;
 
-build/all: build/debian build/ubuntu build/centos build/oraclelinux build/alt build/suse # build/rhel
+build/all: build/debian build/ubuntu build/centos build/oraclelinux build/alt build/suse build/rhel
 	@echo Packaging is done
 
 ### DEBIAN
 build/debian: build/debian_8 build/debian_9 build/debian_10 build/debian_11
 	@echo Debian: done
 
-build/debian_8: build/debian_8_9.5 build/debian_8_9.6 build/debian_8_10 build/debian_8_11 build/debian_8_12 build/debian_8_13
+build/debian_8: build/debian_8_9.6 build/debian_8_10 build/debian_8_11 build/debian_8_12 build/debian_8_13 build/debian_8_14
 	@echo Debian 8: done
 
-build/debian_9: build/debian_9_9.5 build/debian_9_9.6 build/debian_9_10 build/debian_9_11 build/debian_9_12 build/debian_9_13
+build/debian_9: build/debian_9_9.6 build/debian_9_10 build/debian_9_11 build/debian_9_12 build/debian_9_13 build/debian_9_14
 	@echo Debian 9: done
 
-build/debian_10: build/debian_10_9.5 build/debian_10_9.6 build/debian_10_10 build/debian_10_11 build/debian_10_12 build/debian_10_13
+build/debian_10: build/debian_10_9.6 build/debian_10_10 build/debian_10_11 build/debian_10_12 build/debian_10_13 build/debian_10_14
 	@echo Debian 10: done
 
-build/debian_11: build/debian_11_9.5 build/debian_11_9.6 build/debian_11_10 build/debian_11_11 build/debian_11_12 build/debian_11_13
+build/debian_11: build/debian_11_9.6 build/debian_11_10 build/debian_11_11 build/debian_11_12 build/debian_11_13 build/debian_11_14
 	@echo Debian 11: done
 
 ### UBUNTU
 build/ubuntu: build/ubuntu_14.04 build/ubuntu_16.04 build/ubuntu_18.04 build/ubuntu_20.04
 	@echo Ubuntu: done
 
-build/ubuntu_14.04: build/ubuntu_14.04_9.5 build/ubuntu_14.04_9.6 build/ubuntu_14.04_10 build/ubuntu_14.04_11 build/ubuntu_14.04_12 build/ubuntu_14.04_13
+build/ubuntu_14.04: build/ubuntu_14.04_9.6 build/ubuntu_14.04_10 build/ubuntu_14.04_11 build/ubuntu_14.04_12 build/ubuntu_14.04_13 build/ubuntu_14.04_14
 	@echo Ubuntu 14.04: done
 
-build/ubuntu_16.04: build/ubuntu_16.04_9.5 build/ubuntu_16.04_9.6 build/ubuntu_16.04_10 build/ubuntu_16.04_11 build/ubuntu_16.04_12 build/ubuntu_16.04_13
+build/ubuntu_16.04: build/ubuntu_16.04_9.6 build/ubuntu_16.04_10 build/ubuntu_16.04_11 build/ubuntu_16.04_12 build/ubuntu_16.04_13 build/ubuntu_16.04_14
 	@echo Ubuntu 16.04: done
 
-build/ubuntu_18.04: build/ubuntu_18.04_9.5 build/ubuntu_18.04_9.6 build/ubuntu_18.04_10 build/ubuntu_18.04_11 build/ubuntu_18.04_12 build/ubuntu_18.04_13
+build/ubuntu_18.04: build/ubuntu_18.04_9.6 build/ubuntu_18.04_10 build/ubuntu_18.04_11 build/ubuntu_18.04_12 build/ubuntu_18.04_13 build/ubuntu_18.04_14
 	@echo Ubuntu 18.04: done
 
-build/ubuntu_20.04: build/ubuntu_20.04_9.5 build/ubuntu_20.04_9.6 build/ubuntu_20.04_10 build/ubuntu_20.04_11 build/ubuntu_20.04_12 build/ubuntu_20.04_13
+build/ubuntu_20.04: build/ubuntu_20.04_9.6 build/ubuntu_20.04_10 build/ubuntu_20.04_11 build/ubuntu_20.04_12 build/ubuntu_20.04_13 build/ubuntu_20.04_14
 	@echo Ubuntu 20.04: done
 
 define build_deb
@@ -92,33 +92,33 @@ include packaging/pkg/Makefile.ubuntu
 build/centos: build/centos_7 build/centos_8 #build/rpm_repo_package_centos
 	@echo Centos: done
 
-build/centos_7: build/centos_7_9.5 build/centos_7_9.6 build/centos_7_10 build/centos_7_11 build/centos_7_12 build/centos_7_13
+build/centos_7: build/centos_7_9.6 build/centos_7_10 build/centos_7_11 build/centos_7_12 build/centos_7_13 build/centos_7_14
 	@echo Centos 7: done
 
-build/centos_8: build/centos_8_9.5 build/centos_8_9.6 build/centos_8_10 build/centos_8_11 build/centos_8_12 build/centos_8_13
+build/centos_8: build/centos_8_9.6 build/centos_8_10 build/centos_8_11 build/centos_8_12 build/centos_8_13 build/centos_8_14
 	@echo Centos 8: done
 
 # Oracle Linux
 build/oraclelinux: build/oraclelinux_6 build/oraclelinux_7 build/oraclelinux_8 #build/rpm_repo_package_oraclelinux
 	@echo Oraclelinux: done
 
-build/oraclelinux_6: build/oraclelinux_6_9.5 build/oraclelinux_6_9.6 build/oraclelinux_6_10 build/oraclelinux_6_11 build/oraclelinux_6_12 build/oraclelinux_6_13
+build/oraclelinux_6: build/oraclelinux_6_9.6 build/oraclelinux_6_10 build/oraclelinux_6_11 build/oraclelinux_6_12 build/oraclelinux_6_13 build/oraclelinux_6_14
 	@echo Oraclelinux 6: done
 
-build/oraclelinux_7: build/oraclelinux_7_9.5 build/oraclelinux_7_9.6 build/oraclelinux_7_10 build/oraclelinux_7_11 build/oraclelinux_7_12 build/oraclelinux_7_13
+build/oraclelinux_7: build/oraclelinux_7_9.6 build/oraclelinux_7_10 build/oraclelinux_7_11 build/oraclelinux_7_12 build/oraclelinux_7_13 build/oraclelinux_7_14
 	@echo Oraclelinux 7: done
 
-build/oraclelinux_8: build/oraclelinux_8_9.5 build/oraclelinux_8_9.6 build/oraclelinux_8_10 build/oraclelinux_8_11 build/oraclelinux_8_12 build/oraclelinux_8_13
+build/oraclelinux_8: build/oraclelinux_8_9.6 build/oraclelinux_8_10 build/oraclelinux_8_11 build/oraclelinux_8_12 build/oraclelinux_8_13 build/oraclelinux_8_14
 	@echo Oraclelinux 8: done
 
 # RHEL
 build/rhel: build/rhel_7 build/rhel_8 #build/rpm_repo_package_rhel
 	@echo Rhel: done
 
-build/rhel_7: build/rhel_7_9.5 build/rhel_7_9.6 build/rhel_7_10 build/rhel_7_11 build/rhel_7_12 build/rhel_7_13
+build/rhel_7: build/rhel_7_9.6 build/rhel_7_10 build/rhel_7_11 build/rhel_7_12 build/rhel_7_13 build/rhel_7_14
 	@echo Rhel 7: done
 
-build/rhel_8: build/rhel_8_9.5 build/rhel_8_9.6 build/rhel_8_10 build/rhel_8_11 build/rhel_8_12 build/rhel_8_13
+build/rhel_8: build/rhel_8_9.6 build/rhel_8_10 build/rhel_8_11 build/rhel_8_12 build/rhel_8_13 build/rhel_8_14
 	@echo Rhel 8: done
 
 
@@ -143,13 +143,13 @@ include packaging/pkg/Makefile.oraclelinux
 build/alt: build/alt_7 build/alt_8 build/alt_9
 	@echo Alt Linux: done
 
-build/alt_7: build/alt_7_9.5 build/alt_7_9.6 build/alt_7_10 build/alt_7_11 build/alt_7_12 build/alt_7_13
+build/alt_7: build/alt_7_9.6 build/alt_7_10 build/alt_7_11 build/alt_7_12 build/alt_7_13 build/alt_7_14
 	@echo Alt Linux 7: done
 
-build/alt_8: build/alt_8_9.5 build/alt_8_9.6 build/alt_8_10 build/alt_8_11 build/alt_8_12 build/alt_8_13
+build/alt_8: build/alt_8_9.6 build/alt_8_10 build/alt_8_11 build/alt_8_12 build/alt_8_13 build/alt_8_14
 	@echo Alt Linux 8: done
 
-build/alt_9: build/alt_9_9.5 build/alt_9_9.6 build/alt_9_10 build/alt_9_11 build/alt_9_12 build/alt_9_13
+build/alt_9: build/alt_9_9.6 build/alt_9_10 build/alt_9_11 build/alt_9_12 build/alt_9_13 build/alt_9_14
 	@echo Alt Linux 9: done
 
 define build_alt
@@ -170,10 +170,10 @@ include packaging/pkg/Makefile.alt
 build/suse: build/suse_15.1 build/suse_15.2
 	@echo Suse: done
 
-build/suse_15.1: build/suse_15.1_9.5 build/suse_15.1_9.6 build/suse_15.1_10 build/suse_15.1_11 build/suse_15.1_12 build/suse_15.1_13
+build/suse_15.1: build/suse_15.1_9.6 build/suse_15.1_10 build/suse_15.1_11 build/suse_15.1_12 build/suse_15.1_13 build/suse_15.1_14
 	@echo Rhel 15.1: done
 
-build/suse_15.2: build/suse_15.2_9.5 build/suse_15.2_9.6 build/suse_15.2_10 build/suse_15.2_11 build/suse_15.2_12 build/suse_15.2_13
+build/suse_15.2: build/suse_15.2_9.6 build/suse_15.2_10 build/suse_15.2_11 build/suse_15.2_12 build/suse_15.2_13 build/suse_15.2_14
 	@echo Rhel 15.1: done
 
 define build_suse
diff --git a/packaging/pkg/Makefile.alt b/packaging/pkg/Makefile.alt
index e3fbae26..919d3f58 100644
--- a/packaging/pkg/Makefile.alt
+++ b/packaging/pkg/Makefile.alt
@@ -4,71 +4,84 @@ build/alt_7_9.5:
 	touch build/alt_7_9.5
 
 build/alt_7_9.6:
-	$(call build_alt,alt,7,,9.6,9.6.21)
+	$(call build_alt,alt,7,,9.6,9.6.23)
 	touch build/alt_7_9.6
 
 build/alt_7_10:
-	$(call build_alt,alt,7,,10,10.17)
+	$(call build_alt,alt,7,,10,10.18)
 	touch build/alt_7_10
 
 build/alt_7_11:
-	$(call build_alt,alt,7,,11,11.11)
+	$(call build_alt,alt,7,,11,11.13)
 	touch build/alt_7_11
 
 build/alt_7_12:
-	$(call build_alt,alt,7,,12,12.6)
+	$(call build_alt,alt,7,,12,12.8)
 	touch build/alt_7_12
 
 build/alt_7_13:
-	$(call build_alt,alt,7,,13,13.2)
+	$(call build_alt,alt,7,,13,13.4)
 	touch build/alt_7_13
 
+build/alt_7_14:
+	$(call build_alt,alt,7,,14,14.0)
+	touch build/alt_7_14
+
 # ALT 8
 build/alt_8_9.5:
 	$(call build_alt,alt,8,,9.5,9.5.25)
 	touch build/alt_8_9.5
 
 build/alt_8_9.6:
-	$(call build_alt,alt,8,,9.6,9.6.21)
+	$(call build_alt,alt,8,,9.6,9.6.23)
 	touch build/alt_8_9.6
 
 build/alt_8_10:
-	$(call build_alt,alt,8,,10,10.17)
+	$(call build_alt,alt,8,,10,10.18)
 	touch build/alt_8_10
 
 build/alt_8_11:
-	$(call build_alt,alt,8,,11,11.11)
+	$(call build_alt,alt,8,,11,11.13)
 	touch build/alt_8_11
 
 build/alt_8_12:
-	$(call build_alt,alt,8,,12,12.6)
+	$(call build_alt,alt,8,,12,12.8)
 	touch build/alt_8_12
 
 build/alt_8_13:
-	$(call build_alt,alt,8,,13,13.2)
+	$(call build_alt,alt,8,,13,13.4)
 	touch build/alt_8_13
 
+build/alt_8_14:
+	$(call build_alt,alt,8,,14,14.0)
+	touch build/alt_8_14
+
 # ALT 9
 build/alt_9_9.5:
 	$(call build_alt,alt,9,,9.5,9.5.25)
 	touch build/alt_9_9.5
 
 build/alt_9_9.6:
-	$(call build_alt,alt,9,,9.6,9.6.21)
+	$(call build_alt,alt,9,,9.6,9.6.23)
 	touch build/alt_9_9.6
 
 build/alt_9_10:
-	$(call build_alt,alt,9,,10,10.17)
+	$(call build_alt,alt,9,,10,10.18)
 	touch build/alt_9_10
 
 build/alt_9_11:
-	$(call build_alt,alt,9,,11,11.11)
+	$(call build_alt,alt,9,,11,11.13)
 	touch build/alt_9_11
 
 build/alt_9_12:
-	$(call build_alt,alt,9,,12,12.6)
+	$(call build_alt,alt,9,,12,12.8)
 	touch build/alt_9_12
 
 build/alt_9_13:
-	$(call build_alt,alt,9,,13,13.2)
+	$(call build_alt,alt,9,,13,13.4)
 	touch build/alt_9_13
+
+build/alt_9_14:
+	$(call build_alt,alt,9,,14,14.0)
+	touch build/alt_9_14
+
diff --git a/packaging/pkg/Makefile.centos b/packaging/pkg/Makefile.centos
index 9353b2cd..9542a520 100644
--- a/packaging/pkg/Makefile.centos
+++ b/packaging/pkg/Makefile.centos
@@ -4,46 +4,54 @@ build/centos_7_9.5:
 	touch build/centos_7_9.5
 
 build/centos_7_9.6:
-	$(call build_rpm,centos,7,,9.6,9.6.21)
+	$(call build_rpm,centos,7,,9.6,9.6.23)
 	touch build/centos_7_9.6
 
 build/centos_7_10:
-	$(call build_rpm,centos,7,,10,10.16)
+	$(call build_rpm,centos,7,,10,10.18)
 	touch build/centos_7_10
 
 build/centos_7_11:
-	$(call build_rpm,centos,7,,11,11.11)
+	$(call build_rpm,centos,7,,11,11.13)
 	touch build/centos_7_11
 
 build/centos_7_12:
-	$(call build_rpm,centos,7,,12,12.6)
+	$(call build_rpm,centos,7,,12,12.8)
 	touch build/centos_7_12
 
 build/centos_7_13:
-	$(call build_rpm,centos,7,,13,13.2)
+	$(call build_rpm,centos,7,,13,13.4)
 	touch build/centos_7_13
 
+build/centos_7_14:
+	$(call build_rpm,centos,7,,14,14.0)
+	touch build/centos_7_14
+
 # CENTOS 8
 build/centos_8_9.5:
 	$(call build_rpm,centos,8,,9.5,9.5.25)
 	touch build/centos_8_9.5
 
 build/centos_8_9.6:
-	$(call build_rpm,centos,8,,9.6,9.6.21)
+	$(call build_rpm,centos,8,,9.6,9.6.23)
 	touch build/centos_8_9.6
 
 build/centos_8_10:
-	$(call build_rpm,centos,8,,10,10.16)
+	$(call build_rpm,centos,8,,10,10.18)
 	touch build/centos_8_10
 
 build/centos_8_11:
-	$(call build_rpm,centos,8,,11,11.11)
+	$(call build_rpm,centos,8,,11,11.13)
 	touch build/centos_8_11
 
 build/centos_8_12:
-	$(call build_rpm,centos,8,,12,12.6)
+	$(call build_rpm,centos,8,,12,12.8)
 	touch build/centos_8_12
 
 build/centos_8_13:
-	$(call build_rpm,centos,8,,13,13.2)
+	$(call build_rpm,centos,8,,13,13.4)
 	touch build/centos_8_13
+
+build/centos_8_14:
+	$(call build_rpm,centos,8,,14,14.0)
+	touch build/centos_8_14
diff --git a/packaging/pkg/Makefile.debian b/packaging/pkg/Makefile.debian
index 9625a14e..7c82a412 100644
--- a/packaging/pkg/Makefile.debian
+++ b/packaging/pkg/Makefile.debian
@@ -4,96 +4,112 @@ build/debian_8_9.5:
 	touch build/debian_8_9.5
 
 build/debian_8_9.6:
-	$(call build_deb,debian,8,jessie,9.6,9.6.21)
+	$(call build_deb,debian,8,jessie,9.6,9.6.23)
 	touch build/debian_8_9.6
 
 build/debian_8_10:
-	$(call build_deb,debian,8,jessie,10,10.16)
+	$(call build_deb,debian,8,jessie,10,10.18)
 	touch build/debian_8_10
 
 build/debian_8_11:
-	$(call build_deb,debian,8,jessie,11,11.11)
+	$(call build_deb,debian,8,jessie,11,11.13)
 	touch build/debian_8_11
 
 build/debian_8_12:
-	$(call build_deb,debian,8,jessie,12,12.6)
+	$(call build_deb,debian,8,jessie,12,12.8)
 	touch build/debian_8_12
 
 build/debian_8_13:
-	$(call build_deb,debian,8,jessie,13,13.2)
+	$(call build_deb,debian,8,jessie,13,13.4)
 	touch build/debian_8_13
 
+build/debian_8_14:
+	$(call build_deb,debian,8,jessie,14,14.0)
+	touch build/debian_8_14
+
 # DEBIAN 9
 build/debian_9_9.5:
 	$(call build_deb,debian,9,stretch,9.5,9.5.25)
 	touch build/debian_9_9.5
 
 build/debian_9_9.6:
-	$(call build_deb,debian,9,stretch,9.6,9.6.21)
+	$(call build_deb,debian,9,stretch,9.6,9.6.23)
 	touch build/debian_9_9.6
 
 build/debian_9_10:
-	$(call build_deb,debian,9,stretch,10,10.16)
+	$(call build_deb,debian,9,stretch,10,10.18)
 	touch build/debian_9_10
 
 build/debian_9_11:
-	$(call build_deb,debian,9,stretch,11,11.11)
+	$(call build_deb,debian,9,stretch,11,11.13)
 	touch build/debian_9_11
 
 build/debian_9_12:
-	$(call build_deb,debian,9,stretch,12,12.6)
+	$(call build_deb,debian,9,stretch,12,12.8)
 	touch build/debian_9_12
 
 build/debian_9_13:
-	$(call build_deb,debian,9,stretch,13,13.2)
+	$(call build_deb,debian,9,stretch,13,13.4)
 	touch build/debian_9_13
 
+build/debian_9_14:
+	$(call build_deb,debian,9,stretch,14,14.0)
+	touch build/debian_9_14
+
 # DEBIAN 10
 build/debian_10_9.5:
 	$(call build_deb,debian,10,buster,9.5,9.5.25)
 	touch build/debian_10_9.5
 
 build/debian_10_9.6:
-	$(call build_deb,debian,10,buster,9.6,9.6.21)
+	$(call build_deb,debian,10,buster,9.6,9.6.23)
 	touch build/debian_10_9.6
 
 build/debian_10_10:
-	$(call build_deb,debian,10,buster,10,10.16)
+	$(call build_deb,debian,10,buster,10,10.18)
 	touch build/debian_10_10
 
 build/debian_10_11:
-	$(call build_deb,debian,10,buster,11,11.11)
+	$(call build_deb,debian,10,buster,11,11.13)
 	touch build/debian_10_11
 
 build/debian_10_12:
-	$(call build_deb,debian,10,buster,12,12.6)
+	$(call build_deb,debian,10,buster,12,12.8)
 	touch build/debian_10_12
 
 build/debian_10_13:
-	$(call build_deb,debian,10,buster,13,13.2)
+	$(call build_deb,debian,10,buster,13,13.4)
 	touch build/debian_10_13
 
+build/debian_10_14:
+	$(call build_deb,debian,10,buster,14,14.0)
+	touch build/debian_10_14
+
 # DEBIAN 11
 build/debian_11_9.5:
 	$(call build_deb,debian,11,bullseye,9.5,9.5.25)
 	touch build/debian_11_9.5
 
 build/debian_11_9.6:
-	$(call build_deb,debian,11,bullseye,9.6,9.6.21)
+	$(call build_deb,debian,11,bullseye,9.6,9.6.23)
 	touch build/debian_11_9.6
 
 build/debian_11_10:
-	$(call build_deb,debian,11,bullseye,10,10.16)
+	$(call build_deb,debian,11,bullseye,10,10.18)
 	touch build/debian_11_10
 
 build/debian_11_11:
-	$(call build_deb,debian,11,bullseye,11,11.11)
+	$(call build_deb,debian,11,bullseye,11,11.13)
 	touch build/debian_11_11
 
 build/debian_11_12:
-	$(call build_deb,debian,11,bullseye,12,12.6)
+	$(call build_deb,debian,11,bullseye,12,12.8)
 	touch build/debian_11_12
 
 build/debian_11_13:
-	$(call build_deb,debian,11,bullseye,13,13.2)
+	$(call build_deb,debian,11,bullseye,13,13.4)
 	touch build/debian_11_13
+
+build/debian_11_14:
+	$(call build_deb,debian,11,bullseye,14,14.0)
+	touch build/debian_11_14
diff --git a/packaging/pkg/Makefile.oraclelinux b/packaging/pkg/Makefile.oraclelinux
index f4eada23..3dbdbd42 100644
--- a/packaging/pkg/Makefile.oraclelinux
+++ b/packaging/pkg/Makefile.oraclelinux
@@ -4,71 +4,84 @@ build/oraclelinux_6_9.5:
 	touch build/oraclelinux_6_9.5
 
 build/oraclelinux_6_9.6:
-	$(call build_rpm,oraclelinux,6,,9.6,9.6.21)
+	$(call build_rpm,oraclelinux,6,,9.6,9.6.23)
 	touch build/oraclelinux_6_9.6
 
 build/oraclelinux_6_10:
-	$(call build_rpm,oraclelinux,6,,10,10.16)
+	$(call build_rpm,oraclelinux,6,,10,10.18)
 	touch build/oraclelinux_6_10
 
 build/oraclelinux_6_11:
-	$(call build_rpm,oraclelinux,6,,11,11.11)
+	$(call build_rpm,oraclelinux,6,,11,11.13)
 	touch build/oraclelinux_6_11
 
 build/oraclelinux_6_12:
-	$(call build_rpm,oraclelinux,6,,12,12.6)
+	$(call build_rpm,oraclelinux,6,,12,12.8)
 	touch build/oraclelinux_6_12
 
 build/oraclelinux_6_13:
-	$(call build_rpm,oraclelinux,6,,13,13.2)
+	$(call build_rpm,oraclelinux,6,,13,13.4)
 	touch build/oraclelinux_6_13
 
+build/oraclelinux_6_14:
+	$(call build_rpm,oraclelinux,6,,14,14.0)
+	touch build/oraclelinux_6_14
+
 # ORACLE LINUX 7
 build/oraclelinux_7_9.5:
 	$(call build_rpm,oraclelinux,7,,9.5,9.5.25)
 	touch build/oraclelinux_7_9.5
 
 build/oraclelinux_7_9.6:
-	$(call build_rpm,oraclelinux,7,,9.6,9.6.21)
+	$(call build_rpm,oraclelinux,7,,9.6,9.6.23)
 	touch build/oraclelinux_7_9.6
 
 build/oraclelinux_7_10:
-	$(call build_rpm,oraclelinux,7,,10,10.16)
+	$(call build_rpm,oraclelinux,7,,10,10.18)
 	touch build/oraclelinux_7_10
 
 build/oraclelinux_7_11:
-	$(call build_rpm,oraclelinux,7,,11,11.11)
+	$(call build_rpm,oraclelinux,7,,11,11.13)
 	touch build/oraclelinux_7_11
 
 build/oraclelinux_7_12:
-	$(call build_rpm,oraclelinux,7,,12,12.6)
+	$(call build_rpm,oraclelinux,7,,12,12.8)
 	touch build/oraclelinux_7_12
 
 build/oraclelinux_7_13:
-	$(call build_rpm,oraclelinux,7,,13,13.2)
+	$(call build_rpm,oraclelinux,7,,13,13.4)
 	touch build/oraclelinux_7_13
 
+build/oraclelinux_7_14:
+	$(call build_rpm,oraclelinux,7,,14,14.0)
+	touch build/oraclelinux_7_14
+
 # ORACLE LINUX 8
 build/oraclelinux_8_9.5:
 	$(call build_rpm,oraclelinux,8,,9.5,9.5.25)
 	touch build/oraclelinux_8_9.5
 
 build/oraclelinux_8_9.6:
-	$(call build_rpm,oraclelinux,8,,9.6,9.6.21)
+	$(call build_rpm,oraclelinux,8,,9.6,9.6.23)
 	touch build/oraclelinux_8_9.6
 
 build/oraclelinux_8_10:
-	$(call build_rpm,oraclelinux,8,,10,10.16)
+	$(call build_rpm,oraclelinux,8,,10,10.18)
 	touch build/oraclelinux_8_10
 
 build/oraclelinux_8_11:
-	$(call build_rpm,oraclelinux,8,,11,11.11)
+	$(call build_rpm,oraclelinux,8,,11,11.13)
 	touch build/oraclelinux_8_11
 
 build/oraclelinux_8_12:
-	$(call build_rpm,oraclelinux,8,,12,12.6)
+	$(call build_rpm,oraclelinux,8,,12,12.8)
 	touch build/oraclelinux_8_12
 
 build/oraclelinux_8_13:
-	$(call build_rpm,oraclelinux,8,,13,13.2)
+	$(call build_rpm,oraclelinux,8,,13,13.4)
 	touch build/oraclelinux_8_13
+
+build/oraclelinux_8_14:
+	$(call build_rpm,oraclelinux,8,,14,14.0)
+	touch build/oraclelinux_8_14
+
diff --git a/packaging/pkg/Makefile.rhel b/packaging/pkg/Makefile.rhel
index f266966c..b604a990 100644
--- a/packaging/pkg/Makefile.rhel
+++ b/packaging/pkg/Makefile.rhel
@@ -4,46 +4,54 @@ build/rhel_7_9.5:
 	touch build/rhel_7_9.5
 
 build/rhel_7_9.6:
-	$(call build_rpm,rhel,7,7Server,9.6,9.6.21)
+	$(call build_rpm,rhel,7,7Server,9.6,9.6.23)
 	touch build/rhel_7_9.6
 
 build/rhel_7_10:
-	$(call build_rpm,rhel,7,7Server,10,10.16)
+	$(call build_rpm,rhel,7,7Server,10,10.18)
 	touch build/rhel_7_10
 
 build/rhel_7_11:
-	$(call build_rpm,rhel,7,7Server,11,11.11)
+	$(call build_rpm,rhel,7,7Server,11,11.13)
 	touch build/rhel_7_11
 
 build/rhel_7_12:
-	$(call build_rpm,rhel,7,7Server,12,12.6)
+	$(call build_rpm,rhel,7,7Server,12,12.8)
 	touch build/rhel_7_12
 
 build/rhel_7_13:
-	$(call build_rpm,rhel,7,7Server,13,13.2)
+	$(call build_rpm,rhel,7,7Server,13,13.4)
 	touch build/rhel_7_13
 
+build/rhel_7_14:
+	$(call build_rpm,rhel,7,7Server,14,14.0)
+	touch build/rhel_7_14
+
 # RHEL 8
 build/rhel_8_9.5:
 	$(call build_rpm,rhel,8,8Server,9.5,9.5.25)
 	touch build/rhel_8_9.5
 
 build/rhel_8_9.6:
-	$(call build_rpm,rhel,8,8Server,9.6,9.6.21)
+	$(call build_rpm,rhel,8,8Server,9.6,9.6.23)
 	touch build/rhel_8_9.6
 
 build/rhel_8_10:
-	$(call build_rpm,rhel,8,8Server,10,10.16)
+	$(call build_rpm,rhel,8,8Server,10,10.18)
 	touch build/rhel_8_10
 
 build/rhel_8_11:
-	$(call build_rpm,rhel,8,8Server,11,11.11)
+	$(call build_rpm,rhel,8,8Server,11,11.13)
 	touch build/rhel_8_11
 
 build/rhel_8_12:
-	$(call build_rpm,rhel,8,8Server,12,12.6)
+	$(call build_rpm,rhel,8,8Server,12,12.8)
 	touch build/rhel_8_12
 
 build/rhel_8_13:
-	$(call build_rpm,rhel,8,8Server,13,13.2)
+	$(call build_rpm,rhel,8,8Server,13,13.4)
 	touch build/rhel_8_13
+
+build/rhel_8_14:
+	$(call build_rpm,rhel,8,8Server,14,14.0)
+	touch build/rhel_8_14
diff --git a/packaging/pkg/Makefile.suse b/packaging/pkg/Makefile.suse
index a9f1eaa3..5af22c5d 100644
--- a/packaging/pkg/Makefile.suse
+++ b/packaging/pkg/Makefile.suse
@@ -4,46 +4,54 @@ build/suse_15.1_9.5:
 	touch build/suse_15.1_9.5
 
 build/suse_15.1_9.6:
-	$(call build_suse,suse,15.1,,9.6,9.6.21)
+	$(call build_suse,suse,15.1,,9.6,9.6.23)
 	touch build/suse_15.1_9.6
 
 build/suse_15.1_10:
-	$(call build_suse,suse,15.1,,10,10.16)
+	$(call build_suse,suse,15.1,,10,10.18)
 	touch build/suse_15.1_10
 
 build/suse_15.1_11:
-	$(call build_suse,suse,15.1,,11,11.11)
+	$(call build_suse,suse,15.1,,11,11.13)
 	touch build/suse_15.1_11
 
 build/suse_15.1_12:
-	$(call build_suse,suse,15.1,,12,12.6)
+	$(call build_suse,suse,15.1,,12,12.8)
 	touch build/suse_15.1_12
 
 build/suse_15.1_13:
-	$(call build_suse,suse,15.1,,13,13.2)
+	$(call build_suse,suse,15.1,,13,13.4)
 	touch build/suse_15.1_13
 
+build/suse_15.1_14:
+	$(call build_suse,suse,15.1,,14,14.0)
+	touch build/suse_15.1_14
+
 # Suse 15.2
 build/suse_15.2_9.5:
 	$(call build_suse,suse,15.2,,9.5,9.5.25)
 	touch build/suse_15.2_9.5
 
 build/suse_15.2_9.6:
-	$(call build_suse,suse,15.2,,9.6,9.6.21)
+	$(call build_suse,suse,15.2,,9.6,9.6.23)
 	touch build/suse_15.2_9.6
 
 build/suse_15.2_10:
-	$(call build_suse,suse,15.2,,10,10.16)
+	$(call build_suse,suse,15.2,,10,10.18)
 	touch build/suse_15.2_10
 
 build/suse_15.2_11:
-	$(call build_suse,suse,15.2,,11,11.11)
+	$(call build_suse,suse,15.2,,11,11.13)
 	touch build/suse_15.2_11
 
 build/suse_15.2_12:
-	$(call build_suse,suse,15.2,,12,12.6)
+	$(call build_suse,suse,15.2,,12,12.8)
 	touch build/suse_15.2_12
 
 build/suse_15.2_13:
-	$(call build_suse,suse,15.2,,13,13.2)
+	$(call build_suse,suse,15.2,,13,13.4)
 	touch build/suse_15.2_13
+
+build/suse_15.2_14:
+	$(call build_suse,suse,15.2,,14,14.0)
+	touch build/suse_15.2_14
diff --git a/packaging/pkg/Makefile.ubuntu b/packaging/pkg/Makefile.ubuntu
index 3f76de51..88803c64 100644
--- a/packaging/pkg/Makefile.ubuntu
+++ b/packaging/pkg/Makefile.ubuntu
@@ -4,96 +4,113 @@ build/ubuntu_20.04_9.5:
 	touch build/ubuntu_20.04_9.5
 
 build/ubuntu_20.04_9.6:
-	$(call build_deb,ubuntu,20.04,focal,9.6,9.6.21)
+	$(call build_deb,ubuntu,20.04,focal,9.6,9.6.23)
 	touch build/ubuntu_20.04_9.6
 
 build/ubuntu_20.04_10:
-	$(call build_deb,ubuntu,20.04,focal,10,10.16)
+	$(call build_deb,ubuntu,20.04,focal,10,10.18)
 	touch build/ubuntu_20.04_10
 
 build/ubuntu_20.04_11:
-	$(call build_deb,ubuntu,20.04,focal,11,11.11)
+	$(call build_deb,ubuntu,20.04,focal,11,11.13)
 	touch build/ubuntu_20.04_11
 
 build/ubuntu_20.04_12:
-	$(call build_deb,ubuntu,20.04,focal,12,12.6)
+	$(call build_deb,ubuntu,20.04,focal,12,12.8)
 	touch build/ubuntu_20.04_12
 
 build/ubuntu_20.04_13:
-	$(call build_deb,ubuntu,20.04,focal,13,13.2)
+	$(call build_deb,ubuntu,20.04,focal,13,13.4)
 	touch build/ubuntu_20.04_13
 
+build/ubuntu_20.04_14:
+	$(call build_deb,ubuntu,20.04,focal,14,14.0)
+	touch build/ubuntu_20.04_14
+
 # UBUNTU 18.04
 build/ubuntu_18.04_9.5:
 	$(call build_deb,ubuntu,18.04,bionic,9.5,9.5.25)
 	touch build/ubuntu_18.04_9.5
 
 build/ubuntu_18.04_9.6:
-	$(call build_deb,ubuntu,18.04,bionic,9.6,9.6.21)
+	$(call build_deb,ubuntu,18.04,bionic,9.6,9.6.23)
 	touch build/ubuntu_18.04_9.6
 
 build/ubuntu_18.04_10:
-	$(call build_deb,ubuntu,18.04,bionic,10,10.16)
+	$(call build_deb,ubuntu,18.04,bionic,10,10.18)
 	touch build/ubuntu_18.04_10
 
 build/ubuntu_18.04_11:
-	$(call build_deb,ubuntu,18.04,bionic,11,11.11)
+	$(call build_deb,ubuntu,18.04,bionic,11,11.13)
 	touch build/ubuntu_18.04_11
 
 build/ubuntu_18.04_12:
-	$(call build_deb,ubuntu,18.04,bionic,12,12.6)
+	$(call build_deb,ubuntu,18.04,bionic,12,12.8)
 	touch build/ubuntu_18.04_12
 
 build/ubuntu_18.04_13:
-	$(call build_deb,ubuntu,18.04,bionic,13,13.2)
+	$(call build_deb,ubuntu,18.04,bionic,13,13.4)
 	touch build/ubuntu_18.04_13
 
+build/ubuntu_18.04_14:
+	$(call build_deb,ubuntu,18.04,bionic,14,14.0)
+	touch build/ubuntu_18.04_14
+
 # UBUNTU 16.04
 build/ubuntu_16.04_9.5:
 	$(call build_deb,ubuntu,16.04,xenial,9.5,9.5.25)
 	touch build/ubuntu_16.04_9.5
 
 build/ubuntu_16.04_9.6:
-	$(call build_deb,ubuntu,16.04,xenial,9.6,9.6.21)
+	$(call build_deb,ubuntu,16.04,xenial,9.6,9.6.23)
 	touch build/ubuntu_16.04_9.6
 
 build/ubuntu_16.04_10:
-	$(call build_deb,ubuntu,16.04,xenial,10,10.16)
+	$(call build_deb,ubuntu,16.04,xenial,10,10.18)
 	touch build/ubuntu_16.04_10
 
 build/ubuntu_16.04_11:
-	$(call build_deb,ubuntu,16.04,xenial,11,11.11)
+	$(call build_deb,ubuntu,16.04,xenial,11,11.13)
 	touch build/ubuntu_16.04_11
 
 build/ubuntu_16.04_12:
-	$(call build_deb,ubuntu,16.04,xenial,12,12.6)
+	$(call build_deb,ubuntu,16.04,xenial,12,12.8)
 	touch build/ubuntu_16.04_12
 
 build/ubuntu_16.04_13:
-	$(call build_deb,ubuntu,16.04,xenial,13,13.2)
+	$(call build_deb,ubuntu,16.04,xenial,13,13.4)
 	touch build/ubuntu_16.04_13
 
+build/ubuntu_16.04_14:
+	$(call build_deb,ubuntu,16.04,xenial,14,14.0)
+	touch build/ubuntu_16.04_14
+
+
 # UBUNTU 14.04
 build/ubuntu_14.04_9.5:
 	$(call build_deb,ubuntu,14.04,trusty,9.5,9.5.25)
 	touch build/ubuntu_14.04_9.5
 
 build/ubuntu_14.04_9.6:
-	$(call build_deb,ubuntu,14.04,trusty,9.6,9.6.21)
+	$(call build_deb,ubuntu,14.04,trusty,9.6,9.6.23)
 	touch build/ubuntu_14.04_9.6
 
 build/ubuntu_14.04_10:
-	$(call build_deb,ubuntu,14.04,trusty,10,10.16)
+	$(call build_deb,ubuntu,14.04,trusty,10,10.18)
 	touch build/ubuntu_14.04_10
 
 build/ubuntu_14.04_11:
-	$(call build_deb,ubuntu,14.04,trusty,11,11.11)
+	$(call build_deb,ubuntu,14.04,trusty,11,11.13)
 	touch build/ubuntu_14.04_11
 
 build/ubuntu_14.04_12:
-	$(call build_deb,ubuntu,14.04,trusty,12,12.6)
+	$(call build_deb,ubuntu,14.04,trusty,12,12.8)
 	touch build/ubuntu_14.04_12
 
 build/ubuntu_14.04_13:
-	$(call build_deb,ubuntu,14.04,trusty,13,13.2)
+	$(call build_deb,ubuntu,14.04,trusty,13,13.4)
 	touch build/ubuntu_14.04_13
+
+build/ubuntu_14.04_14:
+	$(call build_deb,ubuntu,14.04,trusty,14,14.0)
+	touch build/ubuntu_14.04_14
diff --git a/packaging/pkg/scripts/deb.sh b/packaging/pkg/scripts/deb.sh
index 2fe2018b..6e134635 100755
--- a/packaging/pkg/scripts/deb.sh
+++ b/packaging/pkg/scripts/deb.sh
@@ -11,20 +11,20 @@ set -o pipefail
 # fix https://github.com/moby/moby/issues/23137
 ulimit -n 1024
 
-# THere is no std/ent packages for PG 9.5
+# There is no std/ent packages for PG 9.5
 if [[ ${PG_VERSION} == '9.5' ]] && [[ ${PBK_EDITION} != '' ]] ; then
     exit 0
 fi
 
 # PACKAGES NEEDED
-apt-get update -y && apt-get install -y git wget bzip2 devscripts equivs
+apt-get --allow-releaseinfo-change update -y && apt-get install -y git wget bzip2 devscripts equivs
 
 # Prepare
 export DEBIAN_FRONTEND=noninteractive
 echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 if [ ${CODENAME} == 'jessie' ]; then
-printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
+    printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
 fi
 
 apt-get -qq update -y
diff --git a/packaging/pkg/scripts/rpm.sh b/packaging/pkg/scripts/rpm.sh
index fc95bf7d..ffd681b7 100755
--- a/packaging/pkg/scripts/rpm.sh
+++ b/packaging/pkg/scripts/rpm.sh
@@ -23,6 +23,11 @@ if [[ ${PG_VERSION} == '9.5' ]] && [[ ${PBK_EDITION} != '' ]] ; then
     exit 0
 fi
 
+if [ -f /etc/centos-release ] ; then
+	sed -i 's|^baseurl=http://|baseurl=https://|g' /etc/yum.repos.d/*.repo
+	yum update -y
+fi
+
 # PACKAGES NEEDED
 yum install -y git wget bzip2 rpm-build
 
@@ -67,11 +72,11 @@ else
 	cd /root/rpmbuild/SOURCES/pgpro
 
 	PGPRO_TOC=$(echo ${PG_FULL_VERSION} | sed 's|\.|_|g')
-    if [[ ${PBK_EDITION} == 'std' ]] ; then
-        git checkout "PGPRO${PGPRO_TOC}_1"
-    else
-        git checkout "PGPROEE${PGPRO_TOC}_1"
-    fi
+	if [[ ${PBK_EDITION} == 'std' ]] ; then
+		git checkout "PGPRO${PGPRO_TOC}_1"
+	else
+		git checkout "PGPROEE${PGPRO_TOC}_1"
+	fi
 	rm -rf .git
 
 	cd /root/rpmbuild/SOURCES/
@@ -110,7 +115,7 @@ else
 	sed -i "s/@PG_FULL_VERSION@/${PG_FULL_VERSION}/" pg_probackup-pgpro.spec
 
 	if [ ${PG_VERSION} != '9.6' ]; then
-    	sed -i "s|@PREFIX@|/opt/pgpro/${EDITION}-${PG_VERSION}|g" pg_probackup-pgpro.spec
+		sed -i "s|@PREFIX@|/opt/pgpro/${EDITION}-${PG_VERSION}|g" pg_probackup-pgpro.spec
 	fi
 
 	sed -i "s/@PKG_VERSION@/${PKG_VERSION}/" pg_probackup-repo-forks.spec
@@ -145,4 +150,4 @@ else
 	# write artefacts to out directory
 	rm -rf /app/out/*
 	cp -arv /root/rpmbuild/RPMS /app/out
-fi 
+fi