Merge master into REL_2_5

Author: postgres-dev

Diff for: LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2020, Postgres Professional
+Copyright (c) 2015-2023, Postgres Professional
 Portions Copyright (c) 2009-2013, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
 
 Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group

Diff for: README.md

@@ -6,7 +6,7 @@
 `pg_probackup` is a utility to manage backup and recovery of PostgreSQL database clusters. It is designed to perform periodic backups of the PostgreSQL instance that enable you to restore the server in case of a failure.
 
 The utility is compatible with:
-* PostgreSQL 9.6, 10, 11, 12, 13, 14, 15, 16
+* PostgreSQL 11, 12, 13, 14, 15, 16;
 
 As compared to other backup solutions, `pg_probackup` offers the following benefits that can help you implement different backup strategies and deal with large amounts of data:
 * Incremental backup: page-level incremental backup allows you to save disk space, speed up backup and restore. With three different incremental modes, you can plan the backup strategy in accordance with your data flow.
@@ -74,113 +74,68 @@ Installers are available in release **assets**. [Latests](https://github.com/pos
 #DEB Ubuntu|Debian Packages
 sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list'
 sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
-sudo apt-get install pg-probackup-{16,15,14,13,12,11,10}
-sudo apt-get install pg-probackup-{16,15,14,13,12,11,10}-dbg
+sudo apt-get install pg-probackup-{16,15,14,13,12,11}
+sudo apt-get install pg-probackup-{16,15,14,13,12,11}-dbg
 
 #DEB-SRC Packages
 sudo sh -c 'echo "deb-src [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
   /etc/apt/sources.list.d/pg_probackup.list' && sudo apt-get update
-sudo apt-get source pg-probackup-{16,15,14,13,12,11,10}
+sudo apt-get source pg-probackup-{16,15,14,13,12,11}
 
 #DEB Astra Linix Orel
 sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ stretch main-stretch" > /etc/apt/sources.list.d/pg_probackup.list'
 sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
-sudo apt-get install pg-probackup-{16,15,14,13,12,11,10}{-dbg,}
+sudo apt-get install pg-probackup-{16,15,14,13,12,11}{-dbg,}
 
 #RPM Centos Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
-yum install pg_probackup-{16,15,14,13,12,11,10}
-yum install pg_probackup-{16,15,14,13,12,11,10}-debuginfo
+yum install pg_probackup-{16,15,14,13,12,11}
+yum install pg_probackup-{16,15,14,13,12,11}-debuginfo
 
 #RPM RHEL Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-rhel.noarch.rpm
-yum install pg_probackup-{16,15,14,13,12,11,10}
-yum install pg_probackup-{16,15,14,13,12,11,10}-debuginfo
+yum install pg_probackup-{16,15,14,13,12,11}
+yum install pg_probackup-{16,15,14,13,12,11}-debuginfo
 
 #RPM Oracle Linux Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-oraclelinux.noarch.rpm
-yum install pg_probackup-{16,15,14,13,12,11,10}
-yum install pg_probackup-{16,15,14,13,12,11,10}-debuginfo
+yum install pg_probackup-{16,15,14,13,12,11}
+yum install pg_probackup-{16,15,14,13,12,11}-debuginfo
 
 #SRPM Centos|RHEL|OracleLinux Packages
-yumdownloader --source pg_probackup-{16,15,14,13,12,11,10}
+yumdownloader --source pg_probackup-{16,15,14,13,12,11}
 
 #RPM SUSE|SLES Packages
 zypper install --allow-unsigned-rpm -y https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-suse.noarch.rpm
-zypper --gpg-auto-import-keys install -y pg_probackup-{16,15,14,13,12,11,10}
-zypper install pg_probackup-{16,15,14,13,12,11,10}-debuginfo
+zypper --gpg-auto-import-keys install -y pg_probackup-{16,15,14,13,12,11}
+zypper install pg_probackup-{16,15,14,13,12,11}-debuginfo
 
 #SRPM SUSE|SLES Packages
-zypper si pg_probackup-{16,15,14,13,12,11,10}
+zypper si pg_probackup-{16,15,14,13,12,11}
 
 #RPM ALT Linux 8
 sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p8 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
 sudo apt-get update
-sudo apt-get install pg_probackup-{16,15,14,13,12,11,10}
-sudo apt-get install pg_probackup-{16,15,14,13,12,11,10}-debuginfo
+sudo apt-get install pg_probackup-{16,15,14,13,12,11}
+sudo apt-get install pg_probackup-{16,15,14,13,12,11}-debuginfo
 
 #RPM ALT Linux 9
 sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p9 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
 sudo apt-get update
-sudo apt-get install pg_probackup-{16,15,14,13,12,11,10}
-sudo apt-get install pg_probackup-{16,15,14,13,12,11,10}-debuginfo
+sudo apt-get install pg_probackup-{16,15,14,13,12,11}
+sudo apt-get install pg_probackup-{16,15,14,13,12,11}-debuginfo
 
 #RPM ALT Linux 10
 sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p10 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
 sudo apt-get update
-sudo apt-get install pg_probackup-{16,15,14,13,12,11,10}
-sudo apt-get install pg_probackup-{16,15,14,13,12,11,10}-debuginfo
-```
-
-#### pg_probackup for PostgresPro Standard and Enterprise
-```shell
-#DEB Ubuntu|Debian Packages
-sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup-forks/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup-forks.list'
-sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
-sudo apt-get install pg-probackup-{std,ent}-{14,13,12,11,10,9.6}
-sudo apt-get install pg-probackup-{std,ent}-{14,13,12,11,10,9.6}-dbg
-
-#DEB Astra Linix Orel
-sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup-forks/deb/ stretch main-stretch" > /etc/apt/sources.list.d/pg_probackup.list'
-sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
-sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}{-dbg,}
-
-
-#RPM Centos Packages
-rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-centos.noarch.rpm
-yum install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}
-yum install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}-debuginfo
-
-#RPM RHEL Packages
-rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-rhel.noarch.rpm
-yum install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}
-yum install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}-debuginfo
-
-#RPM Oracle Linux Packages
-rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-oraclelinux.noarch.rpm
-yum install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}
-yum install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}-debuginfo
-
-#RPM ALT Linux 7
-sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p7 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list'
-sudo apt-get update
-sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}
-sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}-debuginfo
-
-#RPM ALT Linux 8
-sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p8 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list'
-sudo apt-get update
-sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}
-sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}-debuginfo
-
-#RPM ALT Linux 9
-sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p9 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list' && sudo apt-get update
-sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}
-sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10,9.6}-debuginfo
+sudo apt-get install pg_probackup-{16,15,14,13,12,11}
+sudo apt-get install pg_probackup-{16,15,14,13,12,11}-debuginfo
 ```
 
 Once you have `pg_probackup` installed, complete [the setup](https://postgrespro.github.io/pg_probackup/#pbk-install-and-setup).
 
+For users of Postgres Pro products, commercial editions of pg_probackup are available for installation from the corresponding Postgres Pro product repository.
+
 ## Building from source
 ### Linux