From a454bd7d63e1329b2c46db6a71aa263ac7621cc6 Mon Sep 17 00:00:00 2001
From: "Mikhail A. Kulagin" <m.kulagin@postgrespro.ru>
Date: Sun, 26 Dec 2021 21:24:15 +0300
Subject: [PATCH] [ci skip] improve packaging: * adding testing of packages for
 PG-14 * updating postgres versions * adding reprepro config and rpmmacros to
 git * fixing forgotten rhel repo signing and package testing * adding alt-8
 package testing * removing debian-8, ubuntu-14.04 and ubuntu-16.04 packaging
 * s/PGPRO Standart/PGPRO Standard/g

---
 packaging/Makefile.pkg                        |  24 +-
 packaging/Makefile.repo                       |  18 +-
 packaging/Makefile.test                       |  59 ++---
 packaging/Readme.md                           |   6 +-
 packaging/pkg/Makefile.alt                    |  36 +--
 packaging/pkg/Makefile.centos                 |  24 +-
 packaging/pkg/Makefile.debian                 |  65 ++---
 packaging/pkg/Makefile.oraclelinux            |  36 +--
 packaging/pkg/Makefile.rhel                   |  24 +-
 packaging/pkg/Makefile.suse                   |  24 +-
 packaging/pkg/Makefile.ubuntu                 |  82 +-----
 packaging/pkg/scripts/alt.sh                  |  13 +-
 packaging/pkg/scripts/rpm.sh                  |  12 +-
 .../rpmbuild/SOURCES/pg_probackup-forks.repo  |   2 +-
 .../SPECS/pg_probackup-repo-forks.spec        |   2 +-
 packaging/repo/reprepro-conf/changelog.script | 246 ++++++++++++++++++
 packaging/repo/reprepro-conf/distributions    | 179 +++++++++++++
 packaging/repo/rpm-conf/rpmmacros             |   5 +
 packaging/repo/scripts/deb.sh                 |   4 +-
 packaging/repo/scripts/rpm.sh                 |   9 +-
 packaging/repo/scripts/suse.sh                |   2 +-
 packaging/test/Makefile.alt                   |  40 ++-
 packaging/test/Makefile.centos                |  28 +-
 packaging/test/Makefile.debian                |  42 +--
 packaging/test/Makefile.oraclelinux           |  28 +-
 packaging/test/Makefile.rhel                  |  28 +-
 packaging/test/Makefile.suse                  |  28 +-
 packaging/test/Makefile.ubuntu                |  49 ++--
 packaging/test/scripts/deb.sh                 |  10 +-
 packaging/test/scripts/deb_forks.sh           |   6 +-
 packaging/test/scripts/rpm.sh                 |  22 +-
 packaging/test/scripts/rpm_forks.sh           |   7 +-
 32 files changed, 771 insertions(+), 389 deletions(-)
 create mode 100755 packaging/repo/reprepro-conf/changelog.script
 create mode 100644 packaging/repo/reprepro-conf/distributions
 create mode 100644 packaging/repo/rpm-conf/rpmmacros

diff --git a/packaging/Makefile.pkg b/packaging/Makefile.pkg
index fc92ae40..e1724361 100644
--- a/packaging/Makefile.pkg
+++ b/packaging/Makefile.pkg
@@ -1,6 +1,6 @@
 ifeq ($(PBK_EDITION),std)
 	PBK_PKG_REPO = pg_probackup-forks
-	PBK_EDITION_FULL = Standart
+	PBK_EDITION_FULL = Standard
 	PKG_NAME_SUFFIX = std-
 else ifeq ($(PBK_EDITION),ent)
 	PBK_PKG_REPO = pg_probackup-forks
@@ -42,12 +42,9 @@ build/all: build/debian build/ubuntu build/centos build/oraclelinux build/alt bu
 	@echo Packaging is done
 
 ### DEBIAN
-build/debian: build/debian_8 build/debian_9 build/debian_10 build/debian_11
+build/debian: build/debian_9 build/debian_10 build/debian_11
 	@echo Debian: done
 
-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.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
 
@@ -58,15 +55,9 @@ build/debian_11: build/debian_11_9.6 build/debian_11_10 build/debian_11_11 build
 	@echo Debian 11: done
 
 ### UBUNTU
-build/ubuntu: build/ubuntu_14.04 build/ubuntu_16.04 build/ubuntu_18.04 build/ubuntu_20.04
+build/ubuntu: build/ubuntu_18.04 build/ubuntu_20.04
 	@echo Ubuntu: done
 
-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.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.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
 
@@ -95,7 +86,8 @@ build/centos: build/centos_7 build/centos_8 #build/rpm_repo_package_centos
 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.6 build/centos_8_10 build/centos_8_11 build/centos_8_12 build/centos_8_13 build/centos_8_14
+# pgpro-9.6@centos-8 doesn't exist
+build/centos_8: build/centos_8_10 build/centos_8_11 build/centos_8_12 build/centos_8_13 build/centos_8_14 #build/centos_8_9.6
 	@echo Centos 8: done
 
 # Oracle Linux
@@ -108,7 +100,8 @@ build/oraclelinux_6: build/oraclelinux_6_9.6 build/oraclelinux_6_10 build/oracle
 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.6 build/oraclelinux_8_10 build/oraclelinux_8_11 build/oraclelinux_8_12 build/oraclelinux_8_13 build/oraclelinux_8_14
+# pgpro-9.6@oraclelinux-8 doesn't exist
+build/oraclelinux_8: build/oraclelinux_8_10 build/oraclelinux_8_11 build/oraclelinux_8_12 build/oraclelinux_8_13 build/oraclelinux_8_14 #build/oraclelinux_8_9.6
 	@echo Oraclelinux 8: done
 
 # RHEL
@@ -170,7 +163,8 @@ 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.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
+# there is no PG-14 in suse-15.1 repositories (test fails)
+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
 	@echo Rhel 15.1: done
 
 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
diff --git a/packaging/Makefile.repo b/packaging/Makefile.repo
index 8186bfd8..10fb2713 100644
--- a/packaging/Makefile.repo
+++ b/packaging/Makefile.repo
@@ -1,15 +1,11 @@
 #### REPO BUILD ####
-repo: check_env repo/debian repo/ubuntu repo/centos repo/oraclelinux repo/alt repo/suse repo_finish #repo/rhel
+repo: check_env repo/debian repo/ubuntu repo/centos repo/oraclelinux repo/rhel repo/alt repo/suse repo_finish
 	@echo Build repo for all platform: done
 
 # Debian
-repo/debian: build/repo_debian_8 build/repo_debian_9 build/repo_debian_10 build/repo_debian_11
+repo/debian: build/repo_debian_9 build/repo_debian_10 build/repo_debian_11
 	@echo Build repo for debian platforms: done
 
-build/repo_debian_8:
-	$(call build_repo_deb,debian,8,jessie)
-	touch build/repo_debian_8
-
 build/repo_debian_9:
 	$(call build_repo_deb,debian,9,stretch)
 	touch build/repo_debian_9
@@ -23,17 +19,9 @@ build/repo_debian_11:
 	touch build/repo_debian_11
 
 # Ubuntu
-repo/ubuntu: build/repo_ubuntu_14.04 build/repo_ubuntu_16.04 build/repo_ubuntu_18.04 build/repo_ubuntu_20.04
+repo/ubuntu: build/repo_ubuntu_18.04 build/repo_ubuntu_20.04
 	@echo Build repo for ubuntu platforms: done
 
-build/repo_ubuntu_14.04:
-	$(call build_repo_deb,ubuntu,14.04,trusty)
-	touch build/repo_ubuntu_14.04
-
-build/repo_ubuntu_16.04:
-	$(call build_repo_deb,ubuntu,16.04,xenial)
-	touch build/repo_ubuntu_16.04
-
 build/repo_ubuntu_18.04:
 	$(call build_repo_deb,ubuntu,18.04,bionic)
 	touch build/repo_ubuntu_18.04
diff --git a/packaging/Makefile.test b/packaging/Makefile.test
index 21e850cc..f5e004f0 100644
--- a/packaging/Makefile.test
+++ b/packaging/Makefile.test
@@ -9,33 +9,30 @@ endif
 test: build/test_all
 	@echo Test for all platform: done
 
-build/test_all: build/test_debian build/test_ubuntu build/test_centos build/test_oraclelinux build/test_alt build/test_suse # build/test_rhel
+build/test_all: build/test_debian build/test_ubuntu build/test_centos build/test_oraclelinux build/test_alt build/test_suse #build/test_rhel
 	@echo Package testing is done
 
 ### DEBIAN
-build/test_debian: build/test_debian_9 build/test_debian_10 #build/test_debian_11
+build/test_debian: build/test_debian_9 build/test_debian_10 build/test_debian_11
 	@echo Debian: done
 
-build/test_debian_9: build/test_debian_9_9.6 build/test_debian_9_10 build/test_debian_9_11 build/test_debian_9_12 build/test_debian_9_13
+build/test_debian_9: build/test_debian_9_9.6 build/test_debian_9_10 build/test_debian_9_11 build/test_debian_9_12 build/test_debian_9_13 build/test_debian_9_14
 	@echo Debian 9: done
 
-build/test_debian_10: build/test_debian_10_9.6 build/test_debian_10_10 build/test_debian_10_11 build/test_debian_10_12 build/test_debian_10_13
+build/test_debian_10: build/test_debian_10_9.6 build/test_debian_10_10 build/test_debian_10_11 build/test_debian_10_12 build/test_debian_10_13 build/test_debian_10_14
 	@echo Debian 10: done
 
-build/test_debian_11: build/test_debian_11_9.6 build/test_debian_11_10 build/test_debian_11_11 build/test_debian_11_12 build/test_debian_11_13
+build/test_debian_11: build/test_debian_11_9.6 build/test_debian_11_10 build/test_debian_11_11 build/test_debian_11_12 build/test_debian_11_13 build/test_debian_11_14
 	@echo Debian 11: done
 
 ### UBUNTU
-build/test_ubuntu: build/test_ubuntu_16.04 build/test_ubuntu_18.04 build/test_ubuntu_20.04
+build/test_ubuntu: build/test_ubuntu_18.04 build/test_ubuntu_20.04
 	@echo Ubuntu: done
 
-build/test_ubuntu_16.04: build/test_ubuntu_16.04_9.6 build/test_ubuntu_16.04_10 build/test_ubuntu_16.04_11 build/test_ubuntu_16.04_12 build/test_ubuntu_16.04_13
-	@echo Ubuntu 16.04: done
-
-build/test_ubuntu_18.04: build/test_ubuntu_18.04_9.6 build/test_ubuntu_18.04_10 build/test_ubuntu_18.04_11 build/test_ubuntu_18.04_12 build/test_ubuntu_18.04_13
+build/test_ubuntu_18.04: build/test_ubuntu_18.04_9.6 build/test_ubuntu_18.04_10 build/test_ubuntu_18.04_11 build/test_ubuntu_18.04_12 build/test_ubuntu_18.04_13 build/test_ubuntu_18.04_14
 	@echo Ubuntu 18.04: done
 
-build/test_ubuntu_20.04: build/test_ubuntu_20.04_9.6 build/test_ubuntu_20.04_10 build/test_ubuntu_20.04_11 build/test_ubuntu_20.04_12 build/test_ubuntu_20.04_13
+build/test_ubuntu_20.04: build/test_ubuntu_20.04_9.6 build/test_ubuntu_20.04_10 build/test_ubuntu_20.04_11 build/test_ubuntu_20.04_12 build/test_ubuntu_20.04_13 build/test_ubuntu_20.04_14
 	@echo Ubuntu 20.04: done
 
 define test_deb
@@ -57,42 +54,32 @@ include packaging/test/Makefile.ubuntu
 build/test_centos: build/test_centos_7 build/test_centos_8
 	@echo Centos: done
 
-build/test_centos_7: build/test_centos_7_9.6 build/test_centos_7_10 build/test_centos_7_11 build/test_centos_7_12 build/test_centos_7_13
-# pgpro
-#build/test_centos_7: build/test_centos_7_9.6 build/test_centos_7_10 build/test_centos_7_11 build/test_centos_7_12
+build/test_centos_7: build/test_centos_7_9.6 build/test_centos_7_10 build/test_centos_7_11 build/test_centos_7_12 build/test_centos_7_13 #build/test_centos_7_14
 	@echo Centos 7: done
 
-build/test_centos_8: build/test_centos_8_9.6 build/test_centos_8_10 build/test_centos_8_11 build/test_centos_8_12 build/test_centos_8_13
-# pgpro
-#build/test_centos_8: build/test_centos_8_10 build/test_centos_8_11 build/test_centos_8_12
+# pgpro-9.6@centos-8 doesn't exist
+build/test_centos_8: build/test_centos_8_10 build/test_centos_8_11 build/test_centos_8_12 build/test_centos_8_13 #build/test_centos_8_14 build/test_centos_8_9.6
 	@echo Centos 8: done
 
 # Oracle Linux
 build/test_oraclelinux: build/test_oraclelinux_7 build/test_oraclelinux_8
 	@echo Oraclelinux: done
 
-build/test_oraclelinux_7: build/test_oraclelinux_7_9.6 build/test_oraclelinux_7_10 build/test_oraclelinux_7_11 build/test_oraclelinux_7_12 build/test_oraclelinux_7_13
-# pgpro
-#build/test_oraclelinux_7: build/test_oraclelinux_7_9.6 build/test_oraclelinux_7_10 build/test_oraclelinux_7_11 build/test_oraclelinux_7_12
+build/test_oraclelinux_7: build/test_oraclelinux_7_9.6 build/test_oraclelinux_7_10 build/test_oraclelinux_7_11 build/test_oraclelinux_7_12 build/test_oraclelinux_7_13 #build/test_oraclelinux_7_14
 	@echo Oraclelinux 7: done
 
-build/test_oraclelinux_8: build/test_oraclelinux_8_9.6 build/test_oraclelinux_8_10 build/test_oraclelinux_8_11 build/test_oraclelinux_8_12 build/test_oraclelinux_8_13
-# pgpro
-#build/test_oraclelinux_8: build/test_oraclelinux_8_10 build/test_oraclelinux_8_11 build/test_oraclelinux_8_12
+# pgpro-9.6@oraclelinux-8 doesn't exist
+build/test_oraclelinux_8: build/test_oraclelinux_8_10 build/test_oraclelinux_8_11 build/test_oraclelinux_8_12 build/test_oraclelinux_8_13 #build/test_oraclelinux_8_14 build/test_oraclelinux_8_9.6
 	@echo Oraclelinux 8: done
 
 # RHEL
-build/test_rhel: build/test_rhel_7 build/test_rhel_8
+build/test_rhel: build/test_rhel_7 #build/test_rhel_8
 	@echo Rhel: done
 
-build/test_rhel_7: build/test_rhel_7_9.5 build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12 build/test_rhel_7_13
-# pgpro
-#build/test_rhel_7: build/test_rhel_7_9.5 build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12
+build/test_rhel_7: build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12 build/test_rhel_7_13 #build/test_rhel_7_14
 	@echo Rhel 7: done
 
-build/test_rhel_8: build/test_rhel_8_9.5 build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12 build/test_rhel_8_13
-# pgpro
-#build/test_rhel_8: build/test_rhel_8_9.5 build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12
+build/test_rhel_8: build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12 build/test_rhel_8_13 build/test_rhel_8_14
 	@echo Rhel 8: done
 
 define test_rpm
@@ -112,10 +99,16 @@ include packaging/test/Makefile.rhel
 include packaging/test/Makefile.oraclelinux
 
 # Alt Linux
-build/test_alt: build/test_alt_9
+build/test_alt: build/test_alt_8 build/test_alt_9
 	@echo Alt Linux: done
 
-build/test_alt_9: build/test_alt_9_9.6 build/test_alt_9_10 build/test_alt_9_11 build/test_alt_9_12 build/test_alt_9_13
+# nginx@alt7 fall with 'nginx: [alert] sysctl(KERN_RTSIGMAX) failed (1: Operation not permitted)'
+# within docker on modern host linux kernels (this nginx build require Linux between 2.2.19 and 2.6.17)
+
+build/test_alt_8: build/test_alt_8_9.6 build/test_alt_8_10 build/test_alt_8_11 build/test_alt_8_12 build/test_alt_8_13 build/test_alt_8_14
+	@echo Alt Linux 8: done
+
+build/test_alt_9: build/test_alt_9_9.6 build/test_alt_9_10 build/test_alt_9_11 build/test_alt_9_12 build/test_alt_9_13 build/test_alt_9_14
 	@echo Alt Linux 9: done
 
 define test_alt
@@ -139,7 +132,7 @@ build/test_suse: build/test_suse_15.1 build/test_suse_15.2
 build/test_suse_15.1: build/test_suse_15.1_9.6 build/test_suse_15.1_10 build/test_suse_15.1_11 build/test_suse_15.1_12 build/test_suse_15.1_13
 	@echo Rhel 15.1: done
 
-build/test_suse_15.2: build/test_suse_15.2_9.6 build/test_suse_15.2_10 build/test_suse_15.2_11 build/test_suse_15.2_12 build/test_suse_15.2_13
+build/test_suse_15.2: build/test_suse_15.2_9.6 build/test_suse_15.2_10 build/test_suse_15.2_11 build/test_suse_15.2_12 build/test_suse_15.2_13 build/test_suse_15.2_14
 	@echo Rhel 15.1: done
 
 define test_suse
diff --git a/packaging/Readme.md b/packaging/Readme.md
index 6fe38f27..f4437d83 100644
--- a/packaging/Readme.md
+++ b/packaging/Readme.md
@@ -4,10 +4,10 @@ export PBK_VERSION=2.4.17
 export PBK_HASH=57f871accce2604
 export PBK_RELEASE=1
 export PBK_EDITION=std|ent
-make pkg
+make --keep-going pkg
 ```
 
-To build binaries for PostgresPro Standart or Enterprise, a pgpro.tar.bz2 with latest git tree must be preset in `packaging/pkg/tarballs` directory:
+To build binaries for PostgresPro Standard or Enterprise, a pgpro.tar.bz2 with latest git tree must be preset in `packaging/pkg/tarballs` directory:
 ```
 cd packaging/pkg/tarballs
 git clone pgpro_repo pgpro
@@ -19,3 +19,5 @@ Repo must be build using 1 thread (due to debian bullshit):
 ```
 make repo -j1
 ```
+
+
diff --git a/packaging/pkg/Makefile.alt b/packaging/pkg/Makefile.alt
index 919d3f58..28eabf53 100644
--- a/packaging/pkg/Makefile.alt
+++ b/packaging/pkg/Makefile.alt
@@ -4,27 +4,27 @@ 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.23)
+	$(call build_alt,alt,7,,9.6,9.6.24)
 	touch build/alt_7_9.6
 
 build/alt_7_10:
-	$(call build_alt,alt,7,,10,10.18)
+	$(call build_alt,alt,7,,10,10.19)
 	touch build/alt_7_10
 
 build/alt_7_11:
-	$(call build_alt,alt,7,,11,11.13)
+	$(call build_alt,alt,7,,11,11.14)
 	touch build/alt_7_11
 
 build/alt_7_12:
-	$(call build_alt,alt,7,,12,12.8)
+	$(call build_alt,alt,7,,12,12.9)
 	touch build/alt_7_12
 
 build/alt_7_13:
-	$(call build_alt,alt,7,,13,13.4)
+	$(call build_alt,alt,7,,13,13.5)
 	touch build/alt_7_13
 
 build/alt_7_14:
-	$(call build_alt,alt,7,,14,14.0)
+	$(call build_alt,alt,7,,14,14.1)
 	touch build/alt_7_14
 
 # ALT 8
@@ -33,27 +33,27 @@ build/alt_8_9.5:
 	touch build/alt_8_9.5
 
 build/alt_8_9.6:
-	$(call build_alt,alt,8,,9.6,9.6.23)
+	$(call build_alt,alt,8,,9.6,9.6.24)
 	touch build/alt_8_9.6
 
 build/alt_8_10:
-	$(call build_alt,alt,8,,10,10.18)
+	$(call build_alt,alt,8,,10,10.19)
 	touch build/alt_8_10
 
 build/alt_8_11:
-	$(call build_alt,alt,8,,11,11.13)
+	$(call build_alt,alt,8,,11,11.14)
 	touch build/alt_8_11
 
 build/alt_8_12:
-	$(call build_alt,alt,8,,12,12.8)
+	$(call build_alt,alt,8,,12,12.9)
 	touch build/alt_8_12
 
 build/alt_8_13:
-	$(call build_alt,alt,8,,13,13.4)
+	$(call build_alt,alt,8,,13,13.5)
 	touch build/alt_8_13
 
 build/alt_8_14:
-	$(call build_alt,alt,8,,14,14.0)
+	$(call build_alt,alt,8,,14,14.1)
 	touch build/alt_8_14
 
 # ALT 9
@@ -62,26 +62,26 @@ build/alt_9_9.5:
 	touch build/alt_9_9.5
 
 build/alt_9_9.6:
-	$(call build_alt,alt,9,,9.6,9.6.23)
+	$(call build_alt,alt,9,,9.6,9.6.24)
 	touch build/alt_9_9.6
 
 build/alt_9_10:
-	$(call build_alt,alt,9,,10,10.18)
+	$(call build_alt,alt,9,,10,10.19)
 	touch build/alt_9_10
 
 build/alt_9_11:
-	$(call build_alt,alt,9,,11,11.13)
+	$(call build_alt,alt,9,,11,11.14)
 	touch build/alt_9_11
 
 build/alt_9_12:
-	$(call build_alt,alt,9,,12,12.8)
+	$(call build_alt,alt,9,,12,12.9)
 	touch build/alt_9_12
 
 build/alt_9_13:
-	$(call build_alt,alt,9,,13,13.4)
+	$(call build_alt,alt,9,,13,13.5)
 	touch build/alt_9_13
 
 build/alt_9_14:
-	$(call build_alt,alt,9,,14,14.0)
+	$(call build_alt,alt,9,,14,14.1)
 	touch build/alt_9_14
 
diff --git a/packaging/pkg/Makefile.centos b/packaging/pkg/Makefile.centos
index 9542a520..fb537d0a 100644
--- a/packaging/pkg/Makefile.centos
+++ b/packaging/pkg/Makefile.centos
@@ -4,27 +4,27 @@ 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.23)
+	$(call build_rpm,centos,7,,9.6,9.6.24)
 	touch build/centos_7_9.6
 
 build/centos_7_10:
-	$(call build_rpm,centos,7,,10,10.18)
+	$(call build_rpm,centos,7,,10,10.19)
 	touch build/centos_7_10
 
 build/centos_7_11:
-	$(call build_rpm,centos,7,,11,11.13)
+	$(call build_rpm,centos,7,,11,11.14)
 	touch build/centos_7_11
 
 build/centos_7_12:
-	$(call build_rpm,centos,7,,12,12.8)
+	$(call build_rpm,centos,7,,12,12.9)
 	touch build/centos_7_12
 
 build/centos_7_13:
-	$(call build_rpm,centos,7,,13,13.4)
+	$(call build_rpm,centos,7,,13,13.5)
 	touch build/centos_7_13
 
 build/centos_7_14:
-	$(call build_rpm,centos,7,,14,14.0)
+	$(call build_rpm,centos,7,,14,14.1)
 	touch build/centos_7_14
 
 # CENTOS 8
@@ -33,25 +33,25 @@ build/centos_8_9.5:
 	touch build/centos_8_9.5
 
 build/centos_8_9.6:
-	$(call build_rpm,centos,8,,9.6,9.6.23)
+	$(call build_rpm,centos,8,,9.6,9.6.24)
 	touch build/centos_8_9.6
 
 build/centos_8_10:
-	$(call build_rpm,centos,8,,10,10.18)
+	$(call build_rpm,centos,8,,10,10.19)
 	touch build/centos_8_10
 
 build/centos_8_11:
-	$(call build_rpm,centos,8,,11,11.13)
+	$(call build_rpm,centos,8,,11,11.14)
 	touch build/centos_8_11
 
 build/centos_8_12:
-	$(call build_rpm,centos,8,,12,12.8)
+	$(call build_rpm,centos,8,,12,12.9)
 	touch build/centos_8_12
 
 build/centos_8_13:
-	$(call build_rpm,centos,8,,13,13.4)
+	$(call build_rpm,centos,8,,13,13.5)
 	touch build/centos_8_13
 
 build/centos_8_14:
-	$(call build_rpm,centos,8,,14,14.0)
+	$(call build_rpm,centos,8,,14,14.1)
 	touch build/centos_8_14
diff --git a/packaging/pkg/Makefile.debian b/packaging/pkg/Makefile.debian
index 7c82a412..d9c885d3 100644
--- a/packaging/pkg/Makefile.debian
+++ b/packaging/pkg/Makefile.debian
@@ -1,59 +1,30 @@
-# DEBIAN 8
-build/debian_8_9.5:
-	$(call build_deb,debian,8,jessie,9.5,9.5.25)
-	touch build/debian_8_9.5
-
-build/debian_8_9.6:
-	$(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.18)
-	touch build/debian_8_10
-
-build/debian_8_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.8)
-	touch build/debian_8_12
-
-build/debian_8_13:
-	$(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.23)
+	$(call build_deb,debian,9,stretch,9.6,9.6.24)
 	touch build/debian_9_9.6
 
 build/debian_9_10:
-	$(call build_deb,debian,9,stretch,10,10.18)
+	$(call build_deb,debian,9,stretch,10,10.19)
 	touch build/debian_9_10
 
 build/debian_9_11:
-	$(call build_deb,debian,9,stretch,11,11.13)
+	$(call build_deb,debian,9,stretch,11,11.14)
 	touch build/debian_9_11
 
 build/debian_9_12:
-	$(call build_deb,debian,9,stretch,12,12.8)
+	$(call build_deb,debian,9,stretch,12,12.9)
 	touch build/debian_9_12
 
 build/debian_9_13:
-	$(call build_deb,debian,9,stretch,13,13.4)
+	$(call build_deb,debian,9,stretch,13,13.5)
 	touch build/debian_9_13
 
 build/debian_9_14:
-	$(call build_deb,debian,9,stretch,14,14.0)
+	$(call build_deb,debian,9,stretch,14,14.1)
 	touch build/debian_9_14
 
 # DEBIAN 10
@@ -62,27 +33,27 @@ build/debian_10_9.5:
 	touch build/debian_10_9.5
 
 build/debian_10_9.6:
-	$(call build_deb,debian,10,buster,9.6,9.6.23)
+	$(call build_deb,debian,10,buster,9.6,9.6.24)
 	touch build/debian_10_9.6
 
 build/debian_10_10:
-	$(call build_deb,debian,10,buster,10,10.18)
+	$(call build_deb,debian,10,buster,10,10.19)
 	touch build/debian_10_10
 
 build/debian_10_11:
-	$(call build_deb,debian,10,buster,11,11.13)
+	$(call build_deb,debian,10,buster,11,11.14)
 	touch build/debian_10_11
 
 build/debian_10_12:
-	$(call build_deb,debian,10,buster,12,12.8)
+	$(call build_deb,debian,10,buster,12,12.9)
 	touch build/debian_10_12
 
 build/debian_10_13:
-	$(call build_deb,debian,10,buster,13,13.4)
+	$(call build_deb,debian,10,buster,13,13.5)
 	touch build/debian_10_13
 
 build/debian_10_14:
-	$(call build_deb,debian,10,buster,14,14.0)
+	$(call build_deb,debian,10,buster,14,14.1)
 	touch build/debian_10_14
 
 # DEBIAN 11
@@ -91,25 +62,25 @@ build/debian_11_9.5:
 	touch build/debian_11_9.5
 
 build/debian_11_9.6:
-	$(call build_deb,debian,11,bullseye,9.6,9.6.23)
+	$(call build_deb,debian,11,bullseye,9.6,9.6.24)
 	touch build/debian_11_9.6
 
 build/debian_11_10:
-	$(call build_deb,debian,11,bullseye,10,10.18)
+	$(call build_deb,debian,11,bullseye,10,10.19)
 	touch build/debian_11_10
 
 build/debian_11_11:
-	$(call build_deb,debian,11,bullseye,11,11.13)
+	$(call build_deb,debian,11,bullseye,11,11.14)
 	touch build/debian_11_11
 
 build/debian_11_12:
-	$(call build_deb,debian,11,bullseye,12,12.8)
+	$(call build_deb,debian,11,bullseye,12,12.9)
 	touch build/debian_11_12
 
 build/debian_11_13:
-	$(call build_deb,debian,11,bullseye,13,13.4)
+	$(call build_deb,debian,11,bullseye,13,13.5)
 	touch build/debian_11_13
 
 build/debian_11_14:
-	$(call build_deb,debian,11,bullseye,14,14.0)
+	$(call build_deb,debian,11,bullseye,14,14.1)
 	touch build/debian_11_14
diff --git a/packaging/pkg/Makefile.oraclelinux b/packaging/pkg/Makefile.oraclelinux
index 3dbdbd42..127a578f 100644
--- a/packaging/pkg/Makefile.oraclelinux
+++ b/packaging/pkg/Makefile.oraclelinux
@@ -4,27 +4,27 @@ 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.23)
+	$(call build_rpm,oraclelinux,6,,9.6,9.6.24)
 	touch build/oraclelinux_6_9.6
 
 build/oraclelinux_6_10:
-	$(call build_rpm,oraclelinux,6,,10,10.18)
+	$(call build_rpm,oraclelinux,6,,10,10.19)
 	touch build/oraclelinux_6_10
 
 build/oraclelinux_6_11:
-	$(call build_rpm,oraclelinux,6,,11,11.13)
+	$(call build_rpm,oraclelinux,6,,11,11.14)
 	touch build/oraclelinux_6_11
 
 build/oraclelinux_6_12:
-	$(call build_rpm,oraclelinux,6,,12,12.8)
+	$(call build_rpm,oraclelinux,6,,12,12.9)
 	touch build/oraclelinux_6_12
 
 build/oraclelinux_6_13:
-	$(call build_rpm,oraclelinux,6,,13,13.4)
+	$(call build_rpm,oraclelinux,6,,13,13.5)
 	touch build/oraclelinux_6_13
 
 build/oraclelinux_6_14:
-	$(call build_rpm,oraclelinux,6,,14,14.0)
+	$(call build_rpm,oraclelinux,6,,14,14.1)
 	touch build/oraclelinux_6_14
 
 # ORACLE LINUX 7
@@ -33,27 +33,27 @@ build/oraclelinux_7_9.5:
 	touch build/oraclelinux_7_9.5
 
 build/oraclelinux_7_9.6:
-	$(call build_rpm,oraclelinux,7,,9.6,9.6.23)
+	$(call build_rpm,oraclelinux,7,,9.6,9.6.24)
 	touch build/oraclelinux_7_9.6
 
 build/oraclelinux_7_10:
-	$(call build_rpm,oraclelinux,7,,10,10.18)
+	$(call build_rpm,oraclelinux,7,,10,10.19)
 	touch build/oraclelinux_7_10
 
 build/oraclelinux_7_11:
-	$(call build_rpm,oraclelinux,7,,11,11.13)
+	$(call build_rpm,oraclelinux,7,,11,11.14)
 	touch build/oraclelinux_7_11
 
 build/oraclelinux_7_12:
-	$(call build_rpm,oraclelinux,7,,12,12.8)
+	$(call build_rpm,oraclelinux,7,,12,12.9)
 	touch build/oraclelinux_7_12
 
 build/oraclelinux_7_13:
-	$(call build_rpm,oraclelinux,7,,13,13.4)
+	$(call build_rpm,oraclelinux,7,,13,13.5)
 	touch build/oraclelinux_7_13
 
 build/oraclelinux_7_14:
-	$(call build_rpm,oraclelinux,7,,14,14.0)
+	$(call build_rpm,oraclelinux,7,,14,14.1)
 	touch build/oraclelinux_7_14
 
 # ORACLE LINUX 8
@@ -62,26 +62,26 @@ build/oraclelinux_8_9.5:
 	touch build/oraclelinux_8_9.5
 
 build/oraclelinux_8_9.6:
-	$(call build_rpm,oraclelinux,8,,9.6,9.6.23)
+	$(call build_rpm,oraclelinux,8,,9.6,9.6.24)
 	touch build/oraclelinux_8_9.6
 
 build/oraclelinux_8_10:
-	$(call build_rpm,oraclelinux,8,,10,10.18)
+	$(call build_rpm,oraclelinux,8,,10,10.19)
 	touch build/oraclelinux_8_10
 
 build/oraclelinux_8_11:
-	$(call build_rpm,oraclelinux,8,,11,11.13)
+	$(call build_rpm,oraclelinux,8,,11,11.14)
 	touch build/oraclelinux_8_11
 
 build/oraclelinux_8_12:
-	$(call build_rpm,oraclelinux,8,,12,12.8)
+	$(call build_rpm,oraclelinux,8,,12,12.9)
 	touch build/oraclelinux_8_12
 
 build/oraclelinux_8_13:
-	$(call build_rpm,oraclelinux,8,,13,13.4)
+	$(call build_rpm,oraclelinux,8,,13,13.5)
 	touch build/oraclelinux_8_13
 
 build/oraclelinux_8_14:
-	$(call build_rpm,oraclelinux,8,,14,14.0)
+	$(call build_rpm,oraclelinux,8,,14,14.1)
 	touch build/oraclelinux_8_14
 
diff --git a/packaging/pkg/Makefile.rhel b/packaging/pkg/Makefile.rhel
index b604a990..8c1b0687 100644
--- a/packaging/pkg/Makefile.rhel
+++ b/packaging/pkg/Makefile.rhel
@@ -4,27 +4,27 @@ 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.23)
+	$(call build_rpm,rhel,7,7Server,9.6,9.6.24)
 	touch build/rhel_7_9.6
 
 build/rhel_7_10:
-	$(call build_rpm,rhel,7,7Server,10,10.18)
+	$(call build_rpm,rhel,7,7Server,10,10.19)
 	touch build/rhel_7_10
 
 build/rhel_7_11:
-	$(call build_rpm,rhel,7,7Server,11,11.13)
+	$(call build_rpm,rhel,7,7Server,11,11.14)
 	touch build/rhel_7_11
 
 build/rhel_7_12:
-	$(call build_rpm,rhel,7,7Server,12,12.8)
+	$(call build_rpm,rhel,7,7Server,12,12.9)
 	touch build/rhel_7_12
 
 build/rhel_7_13:
-	$(call build_rpm,rhel,7,7Server,13,13.4)
+	$(call build_rpm,rhel,7,7Server,13,13.5)
 	touch build/rhel_7_13
 
 build/rhel_7_14:
-	$(call build_rpm,rhel,7,7Server,14,14.0)
+	$(call build_rpm,rhel,7,7Server,14,14.1)
 	touch build/rhel_7_14
 
 # RHEL 8
@@ -33,25 +33,25 @@ build/rhel_8_9.5:
 	touch build/rhel_8_9.5
 
 build/rhel_8_9.6:
-	$(call build_rpm,rhel,8,8Server,9.6,9.6.23)
+	$(call build_rpm,rhel,8,8Server,9.6,9.6.24)
 	touch build/rhel_8_9.6
 
 build/rhel_8_10:
-	$(call build_rpm,rhel,8,8Server,10,10.18)
+	$(call build_rpm,rhel,8,8Server,10,10.19)
 	touch build/rhel_8_10
 
 build/rhel_8_11:
-	$(call build_rpm,rhel,8,8Server,11,11.13)
+	$(call build_rpm,rhel,8,8Server,11,11.14)
 	touch build/rhel_8_11
 
 build/rhel_8_12:
-	$(call build_rpm,rhel,8,8Server,12,12.8)
+	$(call build_rpm,rhel,8,8Server,12,12.9)
 	touch build/rhel_8_12
 
 build/rhel_8_13:
-	$(call build_rpm,rhel,8,8Server,13,13.4)
+	$(call build_rpm,rhel,8,8Server,13,13.5)
 	touch build/rhel_8_13
 
 build/rhel_8_14:
-	$(call build_rpm,rhel,8,8Server,14,14.0)
+	$(call build_rpm,rhel,8,8Server,14,14.1)
 	touch build/rhel_8_14
diff --git a/packaging/pkg/Makefile.suse b/packaging/pkg/Makefile.suse
index 5af22c5d..c71ebd38 100644
--- a/packaging/pkg/Makefile.suse
+++ b/packaging/pkg/Makefile.suse
@@ -4,27 +4,27 @@ 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.23)
+	$(call build_suse,suse,15.1,,9.6,9.6.24)
 	touch build/suse_15.1_9.6
 
 build/suse_15.1_10:
-	$(call build_suse,suse,15.1,,10,10.18)
+	$(call build_suse,suse,15.1,,10,10.19)
 	touch build/suse_15.1_10
 
 build/suse_15.1_11:
-	$(call build_suse,suse,15.1,,11,11.13)
+	$(call build_suse,suse,15.1,,11,11.14)
 	touch build/suse_15.1_11
 
 build/suse_15.1_12:
-	$(call build_suse,suse,15.1,,12,12.8)
+	$(call build_suse,suse,15.1,,12,12.9)
 	touch build/suse_15.1_12
 
 build/suse_15.1_13:
-	$(call build_suse,suse,15.1,,13,13.4)
+	$(call build_suse,suse,15.1,,13,13.5)
 	touch build/suse_15.1_13
 
 build/suse_15.1_14:
-	$(call build_suse,suse,15.1,,14,14.0)
+	$(call build_suse,suse,15.1,,14,14.1)
 	touch build/suse_15.1_14
 
 # Suse 15.2
@@ -33,25 +33,25 @@ build/suse_15.2_9.5:
 	touch build/suse_15.2_9.5
 
 build/suse_15.2_9.6:
-	$(call build_suse,suse,15.2,,9.6,9.6.23)
+	$(call build_suse,suse,15.2,,9.6,9.6.24)
 	touch build/suse_15.2_9.6
 
 build/suse_15.2_10:
-	$(call build_suse,suse,15.2,,10,10.18)
+	$(call build_suse,suse,15.2,,10,10.19)
 	touch build/suse_15.2_10
 
 build/suse_15.2_11:
-	$(call build_suse,suse,15.2,,11,11.13)
+	$(call build_suse,suse,15.2,,11,11.14)
 	touch build/suse_15.2_11
 
 build/suse_15.2_12:
-	$(call build_suse,suse,15.2,,12,12.8)
+	$(call build_suse,suse,15.2,,12,12.9)
 	touch build/suse_15.2_12
 
 build/suse_15.2_13:
-	$(call build_suse,suse,15.2,,13,13.4)
+	$(call build_suse,suse,15.2,,13,13.5)
 	touch build/suse_15.2_13
 
 build/suse_15.2_14:
-	$(call build_suse,suse,15.2,,14,14.0)
+	$(call build_suse,suse,15.2,,14,14.1)
 	touch build/suse_15.2_14
diff --git a/packaging/pkg/Makefile.ubuntu b/packaging/pkg/Makefile.ubuntu
index 88803c64..02acd6c6 100644
--- a/packaging/pkg/Makefile.ubuntu
+++ b/packaging/pkg/Makefile.ubuntu
@@ -4,27 +4,27 @@ 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.23)
+	$(call build_deb,ubuntu,20.04,focal,9.6,9.6.24)
 	touch build/ubuntu_20.04_9.6
 
 build/ubuntu_20.04_10:
-	$(call build_deb,ubuntu,20.04,focal,10,10.18)
+	$(call build_deb,ubuntu,20.04,focal,10,10.19)
 	touch build/ubuntu_20.04_10
 
 build/ubuntu_20.04_11:
-	$(call build_deb,ubuntu,20.04,focal,11,11.13)
+	$(call build_deb,ubuntu,20.04,focal,11,11.14)
 	touch build/ubuntu_20.04_11
 
 build/ubuntu_20.04_12:
-	$(call build_deb,ubuntu,20.04,focal,12,12.8)
+	$(call build_deb,ubuntu,20.04,focal,12,12.9)
 	touch build/ubuntu_20.04_12
 
 build/ubuntu_20.04_13:
-	$(call build_deb,ubuntu,20.04,focal,13,13.4)
+	$(call build_deb,ubuntu,20.04,focal,13,13.5)
 	touch build/ubuntu_20.04_13
 
 build/ubuntu_20.04_14:
-	$(call build_deb,ubuntu,20.04,focal,14,14.0)
+	$(call build_deb,ubuntu,20.04,focal,14,14.1)
 	touch build/ubuntu_20.04_14
 
 # UBUNTU 18.04
@@ -33,84 +33,26 @@ build/ubuntu_18.04_9.5:
 	touch build/ubuntu_18.04_9.5
 
 build/ubuntu_18.04_9.6:
-	$(call build_deb,ubuntu,18.04,bionic,9.6,9.6.23)
+	$(call build_deb,ubuntu,18.04,bionic,9.6,9.6.24)
 	touch build/ubuntu_18.04_9.6
 
 build/ubuntu_18.04_10:
-	$(call build_deb,ubuntu,18.04,bionic,10,10.18)
+	$(call build_deb,ubuntu,18.04,bionic,10,10.19)
 	touch build/ubuntu_18.04_10
 
 build/ubuntu_18.04_11:
-	$(call build_deb,ubuntu,18.04,bionic,11,11.13)
+	$(call build_deb,ubuntu,18.04,bionic,11,11.14)
 	touch build/ubuntu_18.04_11
 
 build/ubuntu_18.04_12:
-	$(call build_deb,ubuntu,18.04,bionic,12,12.8)
+	$(call build_deb,ubuntu,18.04,bionic,12,12.9)
 	touch build/ubuntu_18.04_12
 
 build/ubuntu_18.04_13:
-	$(call build_deb,ubuntu,18.04,bionic,13,13.4)
+	$(call build_deb,ubuntu,18.04,bionic,13,13.5)
 	touch build/ubuntu_18.04_13
 
 build/ubuntu_18.04_14:
-	$(call build_deb,ubuntu,18.04,bionic,14,14.0)
+	$(call build_deb,ubuntu,18.04,bionic,14,14.1)
 	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.23)
-	touch build/ubuntu_16.04_9.6
-
-build/ubuntu_16.04_10:
-	$(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.13)
-	touch build/ubuntu_16.04_11
-
-build/ubuntu_16.04_12:
-	$(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.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.23)
-	touch build/ubuntu_14.04_9.6
-
-build/ubuntu_14.04_10:
-	$(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.13)
-	touch build/ubuntu_14.04_11
-
-build/ubuntu_14.04_12:
-	$(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.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/alt.sh b/packaging/pkg/scripts/alt.sh
index ae3c713f..7c3971d6 100755
--- a/packaging/pkg/scripts/alt.sh
+++ b/packaging/pkg/scripts/alt.sh
@@ -49,11 +49,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/
@@ -86,7 +86,7 @@ else
 	sed -i "s/@PG_FULL_VERSION@/${PG_FULL_VERSION}/" pg_probackup.alt.forks.spec
 
 	if [ ${PG_VERSION} != '9.6' ]; then
-	    sed -i "s|@PREFIX@|/opt/pgpro/${EDITION}-${PG_VERSION}|g" pg_probackup.alt.forks.spec
+		sed -i "s|@PREFIX@|/opt/pgpro/${EDITION}-${PG_VERSION}|g" pg_probackup.alt.forks.spec
 	fi
 fi
 
@@ -106,7 +106,6 @@ fi
 apt-get install -y flex libldap-devel libpam-devel libreadline-devel libssl-devel
 
 if [[ ${PBK_EDITION} == '' ]] ; then
-
 	# build pg_probackup
 	rpmbuild -bs pg_probackup.alt.spec
 	rpmbuild -ba pg_probackup.alt.spec #2>&1 | tee -ai /app/out/build.log
diff --git a/packaging/pkg/scripts/rpm.sh b/packaging/pkg/scripts/rpm.sh
index ffd681b7..d03915c2 100755
--- a/packaging/pkg/scripts/rpm.sh
+++ b/packaging/pkg/scripts/rpm.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Copyright Notice:
-# © (C) Postgres Professional 2015-2016 http://www.postgrespro.ru/
+# © (C) Postgres Professional 2015-2021 http://www.postgrespro.ru/
 # Distributed under Apache License 2.0
 # Распространяется по лицензии Apache 2.0
 
@@ -18,18 +18,16 @@ set -o pipefail
 # fix https://github.com/moby/moby/issues/23137
 ulimit -n 1024
 
-# THere is no std/ent packages for PG 9.5
-if [[ ${PG_VERSION} == '9.5' ]] && [[ ${PBK_EDITION} != '' ]] ; then
-    exit 0
-fi
-
-if [ -f /etc/centos-release ] ; then
+if [ ${DISTRIB} = 'centos' ] ; 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
+if [ ${DISTRIB} = 'oraclelinux' -a ${DISTRIB_VERSION} = '8' -a -n ${PBK_EDITION} ] ; then
+	yum install -y bison flex
+fi
 
 mkdir /root/build
 cd /root/build
diff --git a/packaging/pkg/specs/rpm/rpmbuild/SOURCES/pg_probackup-forks.repo b/packaging/pkg/specs/rpm/rpmbuild/SOURCES/pg_probackup-forks.repo
index fcef58a9..d26b058c 100644
--- a/packaging/pkg/specs/rpm/rpmbuild/SOURCES/pg_probackup-forks.repo
+++ b/packaging/pkg/specs/rpm/rpmbuild/SOURCES/pg_probackup-forks.repo
@@ -1,5 +1,5 @@
 [pg_probackup-forks]
-name=PG_PROBACKUP @SHORT_CODENAME@ packages for PostgresPro Standart and Enterprise - $basearch
+name=PG_PROBACKUP @SHORT_CODENAME@ packages for PostgresPro Standard and Enterprise - $basearch
 baseurl=https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/@DISTRIB@-$releasever-$basearch
 enabled=1
 gpgcheck=1
diff --git a/packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup-repo-forks.spec b/packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup-repo-forks.spec
index fd4a99f2..47adb250 100644
--- a/packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup-repo-forks.spec
+++ b/packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup-repo-forks.spec
@@ -16,7 +16,7 @@ BuildArch:     noarch
 
 %description
 This package contains yum configuration for @SHORT_CODENAME@, and also the GPG key
-for pg_probackup RPMs for PostgresPro Standart and Enterprise.
+for pg_probackup RPMs for PostgresPro Standard and Enterprise.
 
 %prep
 %setup -q  -c -T
diff --git a/packaging/repo/reprepro-conf/changelog.script b/packaging/repo/reprepro-conf/changelog.script
new file mode 100755
index 00000000..4ff1f178
--- /dev/null
+++ b/packaging/repo/reprepro-conf/changelog.script
@@ -0,0 +1,246 @@
+#!/bin/sh
+# This is an example script that can be hooked into reprepro
+# to either generate a hierachy like packages.debian.org/changelogs/
+# or to generate changelog files in the "third party sites"
+# location apt-get changelogs looks if it is not found in
+# Apt::Changelogs::Server.
+#
+# All you have to do is to:
+# - copy it into you conf/ directory,
+# - if you want "third party site" style changelogs, edit the
+#   CHANGELOGDIR variable below,
+# and
+# - add the following to any distribution in conf/distributions
+#   you want to have changelogs and copyright files extracted:
+#Log:
+# --type=dsc changelogs.example
+# (note the space at the beginning of the second line).
+# This will cause this script to extract changelogs for all
+# newly added source packages. (To generate them for already
+# existing packages, call "reprepro rerunnotifiers").
+
+# DEPENDENCIES: dpkg >= 1.13.9
+
+if test "x${REPREPRO_OUT_DIR:+set}" = xset ; then
+	# Note: due to cd, REPREPRO_*_DIR will no longer
+	# be usable. And only things relative to outdir will work...
+	cd "${REPREPRO_OUT_DIR}" || exit 1
+else
+	# this will also trigger if reprepro < 3.5.1 is used,
+	# in that case replace this with a manual cd to the
+	# correct directory...
+	cat "changelog.example needs to be run by reprepro!" >&2
+	exit 1
+fi
+
+# CHANGELOGDIR set means generate full hierachy
+# (clients need to set Apt::Changelogs::Server to use that)
+#CHANGELOGDIR=changelogs
+
+# CHANGELOGDIR empty means generate changelog (and only changelog) files
+# in the new "third party site" place apt-get changelog is using as fallback:
+#CHANGELOGDIR=
+
+# Set to avoid using some predefined TMPDIR or even /tmp as
+# tempdir:
+
+# TMPDIR=/var/cache/whateveryoucreated
+
+if test -z "$CHANGELOGDIR" ; then
+addsource() {
+	DSCFILE="$1"
+	CANONDSCFILE="$(readlink --canonicalize "$DSCFILE")"
+	CHANGELOGFILE="${DSCFILE%.dsc}.changelog"
+	BASEDIR="$(dirname "$CHANGELOGFILE")"
+	if ! [ -f "$CHANGELOGFILE" ] ; then
+		EXTRACTDIR="$(mktemp -d)"
+		(cd -- "$EXTRACTDIR" && dpkg-source --no-copy -x "$CANONDSCFILE" > /dev/null)
+		install --mode=644 -- "$EXTRACTDIR"/*/debian/changelog "$CHANGELOGFILE"
+		chmod -R u+rwX -- "$EXTRACTDIR"
+		rm -r -- "$EXTRACTDIR"
+	fi
+	if [ -L "$BASEDIR"/current."$CODENAME" ] ; then
+		# should not be there, just to be sure
+		rm -f -- "$BASEDIR"/current."$CODENAME"
+	fi
+	# mark this as needed by this distribution
+	ln -s -- "$(basename "$CHANGELOGFILE")" "$BASEDIR/current.$CODENAME"
+	JUSTADDED="$CHANGELOGFILE"
+}
+delsource() {
+	DSCFILE="$1"
+	CHANGELOGFILE="${DSCFILE%.dsc}.changelog"
+	BASEDIR="$(dirname "$CHANGELOGFILE")"
+	BASENAME="$(basename "$CHANGELOGFILE")"
+	if [ "x$JUSTADDED" = "x$CHANGELOGFILE" ] ; then
+		exit 0
+	fi
+#	echo "delete, basedir=$BASEDIR changelog=$CHANGELOGFILE, dscfile=$DSCFILE, "
+ 	if [ "x$(readlink "$BASEDIR/current.$CODENAME")" = "x$BASENAME" ] ; then
+ 		rm -- "$BASEDIR/current.$CODENAME"
+ 	fi
+ 	NEEDED=0
+ 	for c in "$BASEDIR"/current.* ; do
+ 		if [ "x$(readlink -- "$c")" = "x$BASENAME" ] ; then
+ 			NEEDED=1
+ 		fi
+ 	done
+ 	if [ "$NEEDED" -eq 0 -a -f "$CHANGELOGFILE" ] ; then
+ 		rm -r -- "$CHANGELOGFILE"
+		# to remove the directory if now empty
+		rmdir --ignore-fail-on-non-empty -- "$BASEDIR"
+ 	fi
+}
+
+else # "$CHANGELOGDIR" set:
+
+addsource() {
+	DSCFILE="$1"
+	CANONDSCFILE="$(readlink --canonicalize "$DSCFILE")"
+	TARGETDIR="${CHANGELOGDIR}/${DSCFILE%.dsc}"
+	SUBDIR="$(basename $TARGETDIR)"
+	BASEDIR="$(dirname $TARGETDIR)"
+	if ! [ -d "$TARGETDIR" ] ; then
+		echo "extract $CANONDSCFILE information to $TARGETDIR"
+		mkdir -p -- "$TARGETDIR"
+		EXTRACTDIR="$(mktemp -d)"
+		(cd -- "$EXTRACTDIR" && dpkg-source --no-copy -x "$CANONDSCFILE" > /dev/null)
+		install --mode=644 -- "$EXTRACTDIR"/*/debian/copyright "$TARGETDIR/copyright"
+		install --mode=644 -- "$EXTRACTDIR"/*/debian/changelog "$TARGETDIR/changelog"
+		chmod -R u+rwX -- "$EXTRACTDIR"
+		rm -r -- "$EXTRACTDIR"
+	fi
+	if [ -L "$BASEDIR"/current."$CODENAME" ] ; then
+		# should not be there, just to be sure
+		rm -f -- "$BASEDIR"/current."$CODENAME"
+	fi
+	# mark this as needed by this distribution
+	ln -s -- "$SUBDIR" "$BASEDIR/current.$CODENAME"
+	JUSTADDED="$TARGETDIR"
+}
+delsource() {
+	DSCFILE="$1"
+	TARGETDIR="${CHANGELOGDIR}/${DSCFILE%.dsc}"
+	SUBDIR="$(basename $TARGETDIR)"
+	BASEDIR="$(dirname $TARGETDIR)"
+	if [ "x$JUSTADDED" = "x$TARGETDIR" ] ; then
+		exit 0
+	fi
+#	echo "delete, basedir=$BASEDIR targetdir=$TARGETDIR, dscfile=$DSCFILE, "
+ 	if [ "x$(readlink "$BASEDIR/current.$CODENAME")" = "x$SUBDIR" ] ; then
+ 		rm -- "$BASEDIR/current.$CODENAME"
+ 	fi
+ 	NEEDED=0
+ 	for c in "$BASEDIR"/current.* ; do
+ 		if [ "x$(readlink -- "$c")" = "x$SUBDIR" ] ; then
+ 			NEEDED=1
+ 		fi
+ 	done
+ 	if [ "$NEEDED" -eq 0 -a -d "$TARGETDIR" ] ; then
+ 		rm -r -- "$TARGETDIR"
+		# to remove the directory if now empty
+		rmdir --ignore-fail-on-non-empty -- "$BASEDIR"
+ 	fi
+}
+fi # CHANGELOGDIR
+
+ACTION="$1"
+CODENAME="$2"
+PACKAGETYPE="$3"
+if [ "x$PACKAGETYPE" != "xdsc" ] ; then
+# the --type=dsc should cause this to never happen, but better safe than sorry.
+	exit 1
+fi
+COMPONENT="$4"
+ARCHITECTURE="$5"
+if [ "x$ARCHITECTURE" != "xsource" ] ; then
+	exit 1
+fi
+NAME="$6"
+shift 6
+JUSTADDED=""
+if [ "x$ACTION" = "xadd" -o "x$ACTION" = "xinfo" ] ; then
+	VERSION="$1"
+	shift
+	if [ "x$1" != "x--" ] ; then
+		exit 2
+	fi
+	shift
+	while [ "$#" -gt 0 ] ; do
+		case "$1" in
+			*.dsc)
+				addsource "$1"
+				;;
+			--)
+				exit 2
+				;;
+		esac
+		shift
+	done
+elif [ "x$ACTION" = "xremove" ] ; then
+	OLDVERSION="$1"
+	shift
+	if [ "x$1" != "x--" ] ; then
+		exit 2
+	fi
+	shift
+	while [ "$#" -gt 0 ] ; do
+		case "$1" in
+			*.dsc)
+				delsource "$1"
+				;;
+			--)
+				exit 2
+				;;
+		esac
+		shift
+	done
+elif [ "x$ACTION" = "xreplace" ] ; then
+	VERSION="$1"
+	shift
+	OLDVERSION="$1"
+	shift
+	if [ "x$1" != "x--" ] ; then
+		exit 2
+	fi
+	shift
+	while [ "$#" -gt 0 -a "x$1" != "x--" ] ; do
+		case "$1" in
+			*.dsc)
+				addsource "$1"
+			;;
+		esac
+		shift
+	done
+	if [ "x$1" != "x--" ] ; then
+		exit 2
+	fi
+	shift
+	while [ "$#" -gt 0 ] ; do
+		case "$1" in
+			*.dsc)
+				delsource "$1"
+				;;
+			--)
+				exit 2
+				;;
+		esac
+		shift
+	done
+fi
+
+exit 0
+# Copyright 2007,2008,2012 Bernhard R. Link <brlink@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02111-1301  USA
\ No newline at end of file
diff --git a/packaging/repo/reprepro-conf/distributions b/packaging/repo/reprepro-conf/distributions
new file mode 100644
index 00000000..7dce7e6d
--- /dev/null
+++ b/packaging/repo/reprepro-conf/distributions
@@ -0,0 +1,179 @@
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: squeeze
+Architectures: amd64 i386 source
+Components: main-squeeze
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: wheezy
+Architectures: amd64 i386 source
+Components: main-wheezy
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: jessie
+Architectures: amd64 i386 source
+Components: main-jessie
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: bullseye
+Architectures: amd64 i386 source
+Components: main-bullseye
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: wily
+Architectures: amd64 i386 source
+Components: main-wily
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: precise
+Architectures: amd64 i386 source
+Components: main-precise
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: vivid
+Architectures: amd64 i386 source
+Components: main-vivid
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: trusty
+Architectures: amd64 i386 source
+Components: main-trusty
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: lucid
+Architectures: amd64 i386 source
+Components: main-lucid
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: cosmic
+Architectures: amd64 i386 source
+Components: main-cosmic
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: xenial
+Architectures: amd64 i386 source
+Components: main-xenial
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: yakkety
+Architectures: amd64 i386 source
+Components: main-yakkety
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: zesty
+Architectures: amd64 i386 source
+Components: main-zesty
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: stretch
+Architectures: amd64 i386 source
+Components: main-stretch
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: buster
+Architectures: amd64 i386 source
+Components: main-buster
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: artful
+Architectures: amd64 i386 source
+Components: main-artful
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: bionic
+Architectures: amd64 i386 source
+Components: main-bionic
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
+
+Origin: repo.postgrespro.ru
+Label: PostgreSQL backup utility pg_probackup
+Codename: focal
+Architectures: amd64 i386 source
+Components: main-focal
+Description: PostgresPro pg_probackup repo
+SignWith: yes
+Log:
+ --type=dsc changelog.script
diff --git a/packaging/repo/rpm-conf/rpmmacros b/packaging/repo/rpm-conf/rpmmacros
new file mode 100644
index 00000000..e00a76d6
--- /dev/null
+++ b/packaging/repo/rpm-conf/rpmmacros
@@ -0,0 +1,5 @@
+%_signature gpg
+%_gpg_path /root/.gnupg
+%_gpg_name PostgreSQL Professional <dba@postgrespro.ru>
+%_gpgbin /usr/bin/gpg
+%_gpg_check_password_cmd /bin/true
diff --git a/packaging/repo/scripts/deb.sh b/packaging/repo/scripts/deb.sh
index 6515e6b4..31416972 100755
--- a/packaging/repo/scripts/deb.sh
+++ b/packaging/repo/scripts/deb.sh
@@ -20,7 +20,7 @@ cd $INPUT_DIR
 
 export DEB_DIR=$OUT_DIR/deb
 export KEYS_DIR=$OUT_DIR/keys
-export CONF=/app/repo/${PBK_PKG_REPO}/conf
+export CONF=/app/repo/reprepro-conf
 mkdir -p "$KEYS_DIR"
 cp -av /app/repo/${PBK_PKG_REPO}/gnupg /root/.gnupg
 
@@ -29,7 +29,7 @@ echo -e 'User-agent: *\nDisallow: /' > $OUT_DIR/robots.txt
 
 mkdir -p $DEB_DIR
 cd $DEB_DIR
-cp -av $CONF ./
+cp -av $CONF ./conf
 
 # make remove-debpkg tool
 echo -n "#!"        > remove-debpkg
diff --git a/packaging/repo/scripts/rpm.sh b/packaging/repo/scripts/rpm.sh
index d4e621c3..524789cb 100755
--- a/packaging/repo/scripts/rpm.sh
+++ b/packaging/repo/scripts/rpm.sh
@@ -20,24 +20,17 @@ export KEYS_DIR=$OUT_DIR/keys
 mkdir -p "$KEYS_DIR"
 rsync /app/repo/$PBK_PKG_REPO/gnupg/key.public $KEYS_DIR/GPG-KEY-PG_PROBACKUP
 chmod 755 $KEYS_DIR
-chmod +x /app/repo/$PBK_PKG_REPO/autosign.sh
 echo -e 'User-agent: *\nDisallow: /' > $OUT_DIR/robots.txt
 
 cd $INPUT_DIR
 
-cp -arv /app/repo/$PBK_PKG_REPO/rpmmacros /root/.rpmmacros
+cp -arv /app/repo/rpm-conf/rpmmacros /root/.rpmmacros
 cp -arv /app/repo/$PBK_PKG_REPO/gnupg /root/.gnupg
 chmod -R 0600 /root/.gnupg
 chown -R root:root /root/.gnupg
 
 for pkg in $(ls ${INPUT_DIR}); do
 	for pkg_full_version in $(ls ${INPUT_DIR}/$pkg); do
-
-		# THere is no std/ent packages for PG 9.5
-		if [[ ${pkg} == 'pg_probackup-std-9.5' ]] || [[ ${pkg} == 'pg_probackup-ent-9.5' ]] ; then
-    		continue;
-		fi
-
 		if [[ ${PBK_EDITION} == '' ]] ; then
 			cp $INPUT_DIR/$pkg/$pkg_full_version/RPMS/noarch/pg_probackup-repo-*.noarch.rpm \
 				$KEYS_DIR/pg_probackup-repo-$DISTRIB.noarch.rpm
diff --git a/packaging/repo/scripts/suse.sh b/packaging/repo/scripts/suse.sh
index 7253df70..c85e0ff1 100755
--- a/packaging/repo/scripts/suse.sh
+++ b/packaging/repo/scripts/suse.sh
@@ -33,7 +33,7 @@ rsync /app/repo/$PBK_PKG_REPO/gnupg/key.public $KEYS_DIR/GPG-KEY-PG_PROBACKUP
 
 echo -e 'User-agent: *\nDisallow: /' > $OUT_DIR/robots.txt
 
-cp -arv /app/repo/$PBK_PKG_REPO/rpmmacros /root/.rpmmacros
+cp -arv /app/repo/rpm-conf/rpmmacros /root/.rpmmacros
 cp -arv /app/repo/$PBK_PKG_REPO/gnupg /root/.gnupg
 chmod -R 0600 /root/.gnupg
 
diff --git a/packaging/test/Makefile.alt b/packaging/test/Makefile.alt
index 3c1899cb..bd00cef7 100644
--- a/packaging/test/Makefile.alt
+++ b/packaging/test/Makefile.alt
@@ -1,20 +1,50 @@
 # ALT 9
 build/test_alt_9_9.6:
-	$(call test_alt,alt,9,,9.6,9.6.21)
+	$(call test_alt,alt,9,,9.6,9.6.24)
 	touch build/test_alt_9_9.6
 
 build/test_alt_9_10:
-	$(call test_alt,alt,9,,10,10.17)
+	$(call test_alt,alt,9,,10,10.19)
 	touch build/test_alt_9_10
 
 build/test_alt_9_11:
-	$(call test_alt,alt,9,,11,11.11)
+	$(call test_alt,alt,9,,11,11.14)
 	touch build/test_alt_9_11
 
 build/test_alt_9_12:
-	$(call test_alt,alt,9,,12,12.6)
+	$(call test_alt,alt,9,,12,12.9)
 	touch build/test_alt_9_12
 
 build/test_alt_9_13:
-	$(call test_alt,alt,9,,13,13.2)
+	$(call test_alt,alt,9,,13,13.5)
 	touch build/test_alt_9_13
+
+build/test_alt_9_14:
+	$(call test_alt,alt,9,,14,14.1)
+	touch build/test_alt_9_14
+
+# ALT 8
+build/test_alt_8_9.6:
+	$(call test_alt,alt,8,,9.6,9.6.24)
+	touch build/test_alt_8_9.6
+
+build/test_alt_8_10:
+	$(call test_alt,alt,8,,10,10.19)
+	touch build/test_alt_8_10
+
+build/test_alt_8_11:
+	$(call test_alt,alt,8,,11,11.14)
+	touch build/test_alt_8_11
+
+build/test_alt_8_12:
+	$(call test_alt,alt,8,,12,12.9)
+	touch build/test_alt_8_12
+
+build/test_alt_8_13:
+	$(call test_alt,alt,8,,13,13.5)
+	touch build/test_alt_8_13
+
+build/test_alt_8_14:
+	$(call test_alt,alt,8,,14,14.1)
+	touch build/test_alt_8_14
+
diff --git a/packaging/test/Makefile.centos b/packaging/test/Makefile.centos
index e3787c61..9d30a324 100644
--- a/packaging/test/Makefile.centos
+++ b/packaging/test/Makefile.centos
@@ -1,41 +1,49 @@
 # CENTOS 7
 build/test_centos_7_9.6:
-	$(call test_rpm,centos,7,,9.6,9.6.21)
+	$(call test_rpm,centos,7,,9.6,9.6.24)
 	touch build/test_centos_7_9.6
 
 build/test_centos_7_10:
-	$(call test_rpm,centos,7,,10,10.16)
+	$(call test_rpm,centos,7,,10,10.19)
 	touch build/test_centos_7_10
 
 build/test_centos_7_11:
-	$(call test_rpm,centos,7,,11,11.11)
+	$(call test_rpm,centos,7,,11,11.14)
 	touch build/test_centos_7_11
 
 build/test_centos_7_12:
-	$(call test_rpm,centos,7,,12,12.6)
+	$(call test_rpm,centos,7,,12,12.9)
 	touch build/test_centos_7_12
 
 build/test_centos_7_13:
-	$(call test_rpm,centos,7,,13,13.2)
+	$(call test_rpm,centos,7,,13,13.5)
 	touch build/test_centos_7_13
 
+build/test_centos_7_14:
+	$(call test_rpm,centos,7,,14,14.1)
+	touch build/test_centos_7_14
+
 # CENTOS 8
 build/test_centos_8_9.6:
-	$(call test_rpm,centos,8,,9.6,9.6.21)
+	$(call test_rpm,centos,8,,9.6,9.6.24)
 	touch build/test_centos_8_9.6
 
 build/test_centos_8_10:
-	$(call test_rpm,centos,8,,10,10.16)
+	$(call test_rpm,centos,8,,10,10.19)
 	touch build/test_centos_8_10
 
 build/test_centos_8_11:
-	$(call test_rpm,centos,8,,11,11.11)
+	$(call test_rpm,centos,8,,11,11.14)
 	touch build/test_centos_8_11
 
 build/test_centos_8_12:
-	$(call test_rpm,centos,8,,12,12.6)
+	$(call test_rpm,centos,8,,12,12.9)
 	touch build/test_centos_8_12
 
 build/test_centos_8_13:
-	$(call test_rpm,centos,8,,13,13.2)
+	$(call test_rpm,centos,8,,13,13.5)
 	touch build/test_centos_8_13
+
+build/test_centos_8_14:
+	$(call test_rpm,centos,8,,14,14.1)
+	touch build/test_centos_8_14
diff --git a/packaging/test/Makefile.debian b/packaging/test/Makefile.debian
index 08474106..e4d904f6 100644
--- a/packaging/test/Makefile.debian
+++ b/packaging/test/Makefile.debian
@@ -1,62 +1,74 @@
 # DEBIAN 9
 build/test_debian_9_9.6:
-	$(call test_deb,debian,9,stretch,9.6,9.6.21)
+	$(call test_deb,debian,9,stretch,9.6,9.6.24)
 	touch build/test_debian_9_9.6
 
 build/test_debian_9_10:
-	$(call test_deb,debian,9,stretch,10,10.16)
+	$(call test_deb,debian,9,stretch,10,10.19)
 	touch build/test_debian_9_10
 
 build/test_debian_9_11:
-	$(call test_deb,debian,9,stretch,11,11.11)
+	$(call test_deb,debian,9,stretch,11,11.14)
 	touch build/test_debian_9_11
 
 build/test_debian_9_12:
-	$(call test_deb,debian,9,stretch,12,12.6)
+	$(call test_deb,debian,9,stretch,12,12.9)
 	touch build/test_debian_9_12
 
 build/test_debian_9_13:
-	$(call test_deb,debian,9,stretch,13,13.2)
+	$(call test_deb,debian,9,stretch,13,13.5)
 	touch build/test_debian_9_13
 
+build/test_debian_9_14:
+	$(call test_deb,debian,9,stretch,14,14.1)
+	touch build/test_debian_9_14
+
 # DEBIAN 10
 build/test_debian_10_9.6:
-	$(call test_deb,debian,10,buster,9.6,9.6.21)
+	$(call test_deb,debian,10,buster,9.6,9.6.24)
 	touch build/test_debian_10_9.6
 
 build/test_debian_10_10:
-	$(call test_deb,debian,10,buster,10,10.16)
+	$(call test_deb,debian,10,buster,10,10.19)
 	touch build/test_debian_10_10
 
 build/test_debian_10_11:
-	$(call test_deb,debian,10,buster,11,11.11)
+	$(call test_deb,debian,10,buster,11,11.14)
 	touch build/test_debian_10_11
 
 build/test_debian_10_12:
-	$(call test_deb,debian,10,buster,12,12.6)
+	$(call test_deb,debian,10,buster,12,12.9)
 	touch build/test_debian_10_12
 
 build/test_debian_10_13:
-	$(call test_deb,debian,10,buster,13,13.2)
+	$(call test_deb,debian,10,buster,13,13.5)
 	touch build/test_debian_10_13
 
+build/test_debian_10_14:
+	$(call test_deb,debian,10,buster,14,14.1)
+	touch build/test_debian_10_14
+
 # DEBIAN 11
 build/test_debian_11_9.6:
-	$(call test_deb,debian,11,bullseye,9.6,9.6.21)
+	$(call test_deb,debian,11,bullseye,9.6,9.6.24)
 	touch build/test_debian_11_9.6
 
 build/test_debian_11_10:
-	$(call test_deb,debian,11,bullseye,10,10.16)
+	$(call test_deb,debian,11,bullseye,10,10.19)
 	touch build/test_debian_11_10
 
 build/test_debian_11_11:
-	$(call test_deb,debian,11,bullseye,11,11.11)
+	$(call test_deb,debian,11,bullseye,11,11.14)
 	touch build/test_debian_11_11
 
 build/test_debian_11_12:
-	$(call test_deb,debian,11,bullseye,12,12.6)
+	$(call test_deb,debian,11,bullseye,12,12.9)
 	touch build/test_debian_11_12
 
 build/test_debian_11_13:
-	$(call test_deb,debian,11,bullseye,13,13.2)
+	$(call test_deb,debian,11,bullseye,13,13.5)
 	touch build/test_debian_11_13
+
+build/test_debian_11_14:
+	$(call test_deb,debian,11,bullseye,14,14.1)
+	touch build/test_debian_11_14
diff --git a/packaging/test/Makefile.oraclelinux b/packaging/test/Makefile.oraclelinux
index fdf44de8..0efe6574 100644
--- a/packaging/test/Makefile.oraclelinux
+++ b/packaging/test/Makefile.oraclelinux
@@ -1,41 +1,49 @@
 # ORACLE LINUX 7
 build/test_oraclelinux_7_9.6:
-	$(call test_rpm,oraclelinux,7,,9.6,9.6.21)
+	$(call test_rpm,oraclelinux,7,,9.6,9.6.24)
 	touch build/test_oraclelinux_7_9.6
 
 build/test_oraclelinux_7_10:
-	$(call test_rpm,oraclelinux,7,,10,10.16)
+	$(call test_rpm,oraclelinux,7,,10,10.19)
 	touch build/test_oraclelinux_7_10
 
 build/test_oraclelinux_7_11:
-	$(call test_rpm,oraclelinux,7,,11,11.11)
+	$(call test_rpm,oraclelinux,7,,11,11.14)
 	touch build/test_oraclelinux_7_11
 
 build/test_oraclelinux_7_12:
-	$(call test_rpm,oraclelinux,7,,12,12.6)
+	$(call test_rpm,oraclelinux,7,,12,12.9)
 	touch build/test_oraclelinux_7_12
 
 build/test_oraclelinux_7_13:
-	$(call test_rpm,oraclelinux,7,,13,13.2)
+	$(call test_rpm,oraclelinux,7,,13,13.5)
 	touch build/test_oraclelinux_7_13
 
+build/test_oraclelinux_7_14:
+	$(call test_rpm,oraclelinux,7,,14,14.1)
+	touch build/test_oraclelinux_7_14
+
 # ORACLE LINUX 8
 build/test_oraclelinux_8_9.6:
-	$(call test_rpm,oraclelinux,8,,9.6,9.6.21)
+	$(call test_rpm,oraclelinux,8,,9.6,9.6.24)
 	touch build/test_oraclelinux_8_9.6
 
 build/test_oraclelinux_8_10:
-	$(call test_rpm,oraclelinux,8,,10,10.16)
+	$(call test_rpm,oraclelinux,8,,10,10.19)
 	touch build/test_oraclelinux_8_10
 
 build/test_oraclelinux_8_11:
-	$(call test_rpm,oraclelinux,8,,11,11.11)
+	$(call test_rpm,oraclelinux,8,,11,11.14)
 	touch build/test_oraclelinux_8_11
 
 build/test_oraclelinux_8_12:
-	$(call test_rpm,oraclelinux,8,,12,12.6)
+	$(call test_rpm,oraclelinux,8,,12,12.9)
 	touch build/test_oraclelinux_8_12
 
 build/test_oraclelinux_8_13:
-	$(call test_rpm,oraclelinux,8,,13,13.2)
+	$(call test_rpm,oraclelinux,8,,13,13.5)
 	touch build/test_oraclelinux_8_13
+
+build/test_oraclelinux_8_14:
+	$(call test_rpm,oraclelinux,8,,14,14.1)
+	touch build/test_oraclelinux_8_14
diff --git a/packaging/test/Makefile.rhel b/packaging/test/Makefile.rhel
index 3169d11c..3b26c894 100644
--- a/packaging/test/Makefile.rhel
+++ b/packaging/test/Makefile.rhel
@@ -1,41 +1,49 @@
 # RHEL 7
 build/test_rhel_7_9.6:
-	$(call test_rpm,rhel,7,7Server,9.6,9.6.21)
+	$(call test_rpm,rhel,7,7Server,9.6,9.6.24)
 	touch build/test_rhel_7_9.6
 
 build/test_rhel_7_10:
-	$(call test_rpm,rhel,7,7Server,10,10.16)
+	$(call test_rpm,rhel,7,7Server,10,10.19)
 	touch build/test_rhel_7_10
 
 build/test_rhel_7_11:
-	$(call test_rpm,rhel,7,7Server,11,11.11)
+	$(call test_rpm,rhel,7,7Server,11,11.14)
 	touch build/test_rhel_7_11
 
 build/test_rhel_7_12:
-	$(call test_rpm,rhel,7,7Server,12,12.6)
+	$(call test_rpm,rhel,7,7Server,12,12.9)
 	touch build/test_rhel_7_12
 
 build/test_rhel_7_13:
-	$(call test_rpm,rhel,7,7Server,13,13.2)
+	$(call test_rpm,rhel,7,7Server,13,13.5)
 	touch build/test_rhel_7_13
 
+build/test_rhel_7_14:
+	$(call test_rpm,rhel,7,7Server,14,14.1)
+	touch build/test_rhel_7_14
+
 # RHEL 8
 build/test_rhel_8_9.6:
-	$(call test_rpm,rhel,8,8Server,9.6,9.6.21)
+	$(call test_rpm,rhel,8,8Server,9.6,9.6.24)
 	touch build/test_rhel_8_9.6
 
 build/test_rhel_8_10:
-	$(call test_rpm,rhel,8,8Server,10,10.16)
+	$(call test_rpm,rhel,8,8Server,10,10.19)
 	touch build/test_rhel_8_10
 
 build/test_rhel_8_11:
-	$(call test_rpm,rhel,8,8Server,11,11.11)
+	$(call test_rpm,rhel,8,8Server,11,11.14)
 	touch build/test_rhel_8_11
 
 build/test_rhel_8_12:
-	$(call test_rpm,rhel,8,8Server,12,12.6)
+	$(call test_rpm,rhel,8,8Server,12,12.9)
 	touch build/test_rhel_8_12
 
 build/test_rhel_8_13:
-	$(call test_rpm,rhel,8,8Server,13,13.2)
+	$(call test_rpm,rhel,8,8Server,13,13.5)
 	touch build/test_rhel_8_13
+
+build/test_rhel_8_14:
+	$(call test_rpm,rhel,8,8Server,14,14.1)
+	touch build/test_rhel_8_14
diff --git a/packaging/test/Makefile.suse b/packaging/test/Makefile.suse
index 9257bdbf..19e8d52d 100644
--- a/packaging/test/Makefile.suse
+++ b/packaging/test/Makefile.suse
@@ -1,41 +1,49 @@
 # Suse 15.1
 build/test_suse_15.1_9.6:
-	$(call test_suse,suse,15.1,,9.6,9.6.21)
+	$(call test_suse,suse,15.1,,9.6,9.6.24)
 	touch build/test_suse_15.1_9.6
 
 build/test_suse_15.1_10:
-	$(call test_suse,suse,15.1,,10,10.16)
+	$(call test_suse,suse,15.1,,10,10.19)
 	touch build/test_suse_15.1_10
 
 build/test_suse_15.1_11:
-	$(call test_suse,suse,15.1,,11,11.11)
+	$(call test_suse,suse,15.1,,11,11.14)
 	touch build/test_suse_15.1_11
 
 build/test_suse_15.1_12:
-	$(call test_suse,suse,15.1,,12,12.6)
+	$(call test_suse,suse,15.1,,12,12.9)
 	touch build/test_suse_15.1_12
 
 build/test_suse_15.1_13:
-	$(call test_suse,suse,15.1,,13,13.2)
+	$(call test_suse,suse,15.1,,13,13.5)
 	touch build/test_suse_15.1_13
 
+build/test_suse_15.1_14:
+	$(call test_suse,suse,15.1,,14,14.1)
+	touch build/test_suse_15.1_14
+
 # Suse 15.2
 build/test_suse_15.2_9.6:
-	$(call test_suse,suse,15.2,,9.6,9.6.21)
+	$(call test_suse,suse,15.2,,9.6,9.6.24)
 	touch build/test_suse_15.2_9.6
 
 build/test_suse_15.2_10:
-	$(call test_suse,suse,15.2,,10,10.16)
+	$(call test_suse,suse,15.2,,10,10.19)
 	touch build/test_suse_15.2_10
 
 build/test_suse_15.2_11:
-	$(call test_suse,suse,15.2,,11,11.11)
+	$(call test_suse,suse,15.2,,11,11.14)
 	touch build/test_suse_15.2_11
 
 build/test_suse_15.2_12:
-	$(call test_suse,suse,15.2,,12,12.6)
+	$(call test_suse,suse,15.2,,12,12.9)
 	touch build/test_suse_15.2_12
 
 build/test_suse_15.2_13:
-	$(call test_suse,suse,15.2,,13,13.2)
+	$(call test_suse,suse,15.2,,13,13.5)
 	touch build/test_suse_15.2_13
+
+build/test_suse_15.2_14:
+	$(call test_suse,suse,15.2,,14,14.1)
+	touch build/test_suse_15.2_14
diff --git a/packaging/test/Makefile.ubuntu b/packaging/test/Makefile.ubuntu
index 9e201a30..86a257b9 100644
--- a/packaging/test/Makefile.ubuntu
+++ b/packaging/test/Makefile.ubuntu
@@ -1,62 +1,49 @@
-# UBUNTU 16.04
-build/test_ubuntu_16.04_9.6:
-	$(call test_deb,ubuntu,16.04,xenial,9.6,9.6.21)
-	touch build/test_ubuntu_16.04_9.6
-
-build/test_ubuntu_16.04_10:
-	$(call test_deb,ubuntu,16.04,xenial,10,10.16)
-	touch build/test_ubuntu_16.04_10
-
-build/test_ubuntu_16.04_11:
-	$(call test_deb,ubuntu,16.04,xenial,11,11.11)
-	touch build/test_ubuntu_16.04_11
-
-build/test_ubuntu_16.04_12:
-	$(call test_deb,ubuntu,16.04,xenial,12,12.6)
-	touch build/test_ubuntu_16.04_12
-
-build/test_ubuntu_16.04_13:
-	$(call test_deb,ubuntu,16.04,xenial,13,13.2)
-	touch build/test_ubuntu_16.04_13
-
 # UBUNTU 18.04
 build/test_ubuntu_18.04_9.6:
-	$(call test_deb,ubuntu,18.04,bionic,9.6,9.6.21)
+	$(call test_deb,ubuntu,18.04,bionic,9.6,9.6.24)
 	touch build/test_ubuntu_18.04_9.6
 
 build/test_ubuntu_18.04_10:
-	$(call test_deb,ubuntu,18.04,bionic,10,10.16)
+	$(call test_deb,ubuntu,18.04,bionic,10,10.19)
 	touch build/test_ubuntu_18.04_10
 
 build/test_ubuntu_18.04_11:
-	$(call test_deb,ubuntu,18.04,bionic,11,11.11)
+	$(call test_deb,ubuntu,18.04,bionic,11,11.14)
 	touch build/test_ubuntu_18.04_11
 
 build/test_ubuntu_18.04_12:
-	$(call test_deb,ubuntu,18.04,bionic,12,12.6)
+	$(call test_deb,ubuntu,18.04,bionic,12,12.9)
 	touch build/test_ubuntu_18.04_12
 
 build/test_ubuntu_18.04_13:
-	$(call test_deb,ubuntu,18.04,bionic,13,13.2)
+	$(call test_deb,ubuntu,18.04,bionic,13,13.5)
 	touch build/test_ubuntu_18.04_13
 
+build/test_ubuntu_18.04_14:
+	$(call test_deb,ubuntu,18.04,bionic,14,14.1)
+	touch build/test_ubuntu_18.04_14
+
 # UBUNTU 20.04
 build/test_ubuntu_20.04_9.6:
-	$(call test_deb,ubuntu,20.04,focal,9.6,9.6.21)
+	$(call test_deb,ubuntu,20.04,focal,9.6,9.6.24)
 	touch build/test_ubuntu_20.04_9.6
 
 build/test_ubuntu_20.04_10:
-	$(call test_deb,ubuntu,20.04,focal,10,10.16)
+	$(call test_deb,ubuntu,20.04,focal,10,10.19)
 	touch build/test_ubuntu_20.04_10
 
 build/test_ubuntu_20.04_11:
-	$(call test_deb,ubuntu,20.04,focal,11,11.11)
+	$(call test_deb,ubuntu,20.04,focal,11,11.14)
 	touch build/test_ubuntu_20.04_11
 
 build/test_ubuntu_20.04_12:
-	$(call test_deb,ubuntu,20.04,focal,12,12.6)
+	$(call test_deb,ubuntu,20.04,focal,12,12.9)
 	touch build/test_ubuntu_20.04_12
 
 build/test_ubuntu_20.04_13:
-	$(call test_deb,ubuntu,20.04,focal,13,13.2)
+	$(call test_deb,ubuntu,20.04,focal,13,13.5)
 	touch build/test_ubuntu_20.04_13
+
+build/test_ubuntu_20.04_14:
+	$(call test_deb,ubuntu,20.04,focal,14,14.1)
+	touch build/test_ubuntu_20.04_14
diff --git a/packaging/test/scripts/deb.sh b/packaging/test/scripts/deb.sh
index d7b95719..fca9a23d 100755
--- a/packaging/test/scripts/deb.sh
+++ b/packaging/test/scripts/deb.sh
@@ -17,8 +17,14 @@ PG_TOG=$(echo $PG_VERSION | sed 's|\.||g')
 export DEBIAN_FRONTEND=noninteractive
 echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
-#apt-get -qq --allow-releaseinfo-change update
-apt-get -qq update
+if [ ${DISTRIB} = 'ubuntu' -a ${CODENAME} = 'xenial' ] ; then
+	apt-get -qq update
+elif [ ${DISTRIB} = 'debian' -a ${CODENAME} = 'stretch' ] ; then
+	apt-get -qq update
+else
+	apt-get -qq --allow-releaseinfo-change update
+fi
+
 apt-get -qq install -y wget nginx gnupg lsb-release
 #apt-get -qq install -y libterm-readline-gnu-perl dialog gnupg procps
 
diff --git a/packaging/test/scripts/deb_forks.sh b/packaging/test/scripts/deb_forks.sh
index 5175f38d..e0569560 100755
--- a/packaging/test/scripts/deb_forks.sh
+++ b/packaging/test/scripts/deb_forks.sh
@@ -31,7 +31,11 @@ echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 #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
+if [ ${DISTRIB} = 'debian' -a ${CODENAME} = 'stretch' ] ; then
+    apt-get -qq update
+else
+    apt-get -qq --allow-releaseinfo-change update
+fi
 apt-get -qq install -y wget nginx gnupg lsb-release apt-transport-https
 #apt-get -qq install -y libterm-readline-gnu-perl dialog gnupg procps
 
diff --git a/packaging/test/scripts/rpm.sh b/packaging/test/scripts/rpm.sh
index 320d459f..92804a7f 100755
--- a/packaging/test/scripts/rpm.sh
+++ b/packaging/test/scripts/rpm.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Copyright Notice:
-# © (C) Postgres Professional 2015-2016 http://www.postgrespro.ru/
+# © (C) Postgres Professional 2015-2021 http://www.postgrespro.ru/
 # Distributed under Apache License 2.0
 # Распространяется по лицензии Apache 2.0
 
@@ -13,23 +13,19 @@ ulimit -n 1024
 
 PG_TOG=$(echo $PG_VERSION | sed 's|\.||g')
 
-yum update -y
+if [ ${DISTRIB} != 'rhel' -o ${DISTRIB_VERSION} != '7' ]; then
+    # update of rpm package is broken in rhel-7 (26/12/2022)
+    yum update -y
+fi
 # yum upgrade -y || echo 'some packages in docker failed to upgrade'
 # yum install -y sudo
-if [ ${DISTRIB} == 'rhel' ] && [ ${PG_TOG} == '13' ]; then # no packages for PG13 on PGDG
-    exit 0
-fi
 
-#if [ ${DISTRIB} == 'oraclelinux' ] &&  [ ${DISTRIB_VERSION} == '6' ] && [ ${PG_TOG} == '13' ]; then # no packages for PG13 on PGDG
-#    exit 0
-#fi
-
-if [ ${DISTRIB_VERSION} == '6' ]; then
+if [ ${DISTRIB_VERSION} = '6' ]; then
     yum install -y https://nginx.org/packages/rhel/6/x86_64/RPMS/nginx-1.8.1-1.el6.ngx.x86_64.rpm
-elif [ ${DISTRIB} == 'oraclelinux' ] && [ ${DISTRIB_VERSION} == '8' ]; then
-    yum install -y nginx
-elif [ ${DISTRIB_VERSION} == '7' ]; then
+elif [ ${DISTRIB_VERSION} = '7' ]; then
     yum install -y https://nginx.org/packages/rhel/7/x86_64/RPMS/nginx-1.8.1-1.el7.ngx.x86_64.rpm
+elif [ ${DISTRIB_VERSION} = '8' -a \( ${DISTRIB} = 'rhel' -o ${DISTRIB} = 'oraclelinux' \) ]; then
+    yum install -y nginx
 else
     yum install epel-release -y
     yum install -y nginx
diff --git a/packaging/test/scripts/rpm_forks.sh b/packaging/test/scripts/rpm_forks.sh
index 8596f665..0d72040e 100755
--- a/packaging/test/scripts/rpm_forks.sh
+++ b/packaging/test/scripts/rpm_forks.sh
@@ -13,7 +13,12 @@ ulimit -n 1024
 
 PG_TOG=$(echo $PG_VERSION | sed 's|\.||g')
 
-if [ ${PBK_PBK_EDITION} == 'ent' ]; then
+if [ ${DISTRIB} != 'rhel' -o ${DISTRIB_VERSION} != '7' ]; then
+    # update of rpm package is broken in rhel-7 (26/12/2022)
+    yum update -y
+fi
+
+if [ ${PBK_EDITION} == 'ent' ]; then
     exit 0
 fi