diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 7cddca53a..7350d70bf 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -12,6 +12,9 @@ + + +

IMPORTANT NOTE: The new TLS/SSL implementation forbids dots in S3 bucket names per RFC-2818. This security fix is required for compliant hostname verification.

diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml index d6a3ac8be..a286b8e13 100644 --- a/doc/xml/user-guide.xml +++ b/doc/xml/user-guide.xml @@ -263,15 +263,8 @@ ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key # Install PostgreSQL - RUN rpm -ivh http://yum.postgresql.org/9.0/redhat/rhel-6-x86_64/pgdg-centos90-9.0-5.noarch.rpm \ - http://yum.postgresql.org/9.1/redhat/rhel-6-x86_64/pgdg-centos91-9.1-6.noarch.rpm \ - http://yum.postgresql.org/9.2/redhat/rhel-6-x86_64/pgdg-centos92-9.2-8.noarch.rpm \ - http://yum.postgresql.org/9.3/redhat/rhel-6-x86_64/pgdg-centos93-9.3-3.noarch.rpm \ - http://yum.postgresql.org/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-3.noarch.rpm \ - http://yum.postgresql.org/9.5/redhat/rhel-6-x86_64/pgdg-centos95-9.5-3.noarch.rpm \ - http://yum.postgresql.org/9.6/redhat/rhel-6-x86_64/pgdg-centos96-9.6-3.noarch.rpm \ - http://yum.postgresql.org/10/redhat/rhel-6-x86_64/pgdg-centos10-10-2.noarch.rpm \ - http://yum.postgresql.org/11/redhat/rhel-6-x86_64/pgdg-centos11-11-2.noarch.rpm && \ + RUN rpm --import http://yum.postgresql.org/RPM-GPG-KEY-PGDG-10 && \ + rpm -ivh https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm && \ yum install -y postgresql{[pg-version-nodot]}-server postgresql{[pg-version-upgrade-nodot]}-server # Create an ssh key for root so all hosts can ssh to each other as root @@ -309,13 +302,8 @@ ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key # Install PostgreSQL - RUN rpm -ivh http://yum.postgresql.org/9.2/redhat/rhel-7-x86_64/pgdg-centos92-9.2-3.noarch.rpm \ - http://yum.postgresql.org/9.3/redhat/rhel-7-x86_64/pgdg-centos93-9.3-3.noarch.rpm \ - http://yum.postgresql.org/9.4/redhat/rhel-7-x86_64/pgdg-centos94-9.4-3.noarch.rpm \ - http://yum.postgresql.org/9.5/redhat/rhel-7-x86_64/pgdg-centos95-9.5-3.noarch.rpm \ - http://yum.postgresql.org/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm \ - http://yum.postgresql.org/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm \ - http://yum.postgresql.org/11/redhat/rhel-7-x86_64/pgdg-centos11-11-2.noarch.rpm && \ + RUN rpm --import http://yum.postgresql.org/RPM-GPG-KEY-PGDG-10 && \ + rpm -ivh https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm && \ yum install -y postgresql{[pg-version-nodot]}-server postgresql{[pg-version-upgrade-nodot]}-server # Create an ssh key for root so all hosts can ssh to each other as root diff --git a/lib/pgBackRest/Version.pm b/lib/pgBackRest/Version.pm index 3cee0c4c8..2b3519f28 100644 --- a/lib/pgBackRest/Version.pm +++ b/lib/pgBackRest/Version.pm @@ -39,7 +39,7 @@ push @EXPORT, qw(projectBin projectBinSet); # Defines the current version of the BackRest executable. The version number is used to track features but does not affect what # repositories or manifests can be read - that's the job of the format number. #----------------------------------------------------------------------------------------------------------------------------------- -use constant PROJECT_VERSION => '2.12'; +use constant PROJECT_VERSION => '2.13dev'; push @EXPORT, qw(PROJECT_VERSION); # Repository Format Number diff --git a/src/perl/embed.auto.c b/src/perl/embed.auto.c index 9ef3dc9d8..42b7955a5 100644 --- a/src/perl/embed.auto.c +++ b/src/perl/embed.auto.c @@ -19902,7 +19902,7 @@ static const EmbeddedModule embeddedModule[] = "\n" "push @EXPORT, qw(projectBin projectBinSet);\n" "\n\n\n\n\n\n" - "use constant PROJECT_VERSION => '2.12';\n" + "use constant PROJECT_VERSION => '2.13dev';\n" "push @EXPORT, qw(PROJECT_VERSION);\n" "\n\n\n\n\n\n" "use constant REPOSITORY_FORMAT => 5;\n" diff --git a/src/version.h b/src/version.h index 22a3f9e6f..f1feb6dc2 100644 --- a/src/version.h +++ b/src/version.h @@ -23,6 +23,6 @@ repository will be invalid unless migration functions are written. /*********************************************************************************************************************************** Software version. Currently this value is maintained in Version.pm and updated by test.pl. ***********************************************************************************************************************************/ -#define PROJECT_VERSION "2.12" +#define PROJECT_VERSION "2.13dev" #endif