Merge branch 'master' into REL_2_5

funny-falcon · funny-falcon · commit 34af0255cd7d · 2022-11-02T17:24:03.000+03:00
diff --git a/packaging/Makefile.test b/packaging/Makefile.test
@@ -130,10 +130,10 @@ build/test_suse: build/test_suse_15.1 build/test_suse_15.2
 	@echo Suse: done
 
 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
+	@echo Suse 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_14
-	@echo Rhel 15.1: done
+	@echo Suse 15.2: done
 
 define test_suse
 	docker rm -f $1_$2_probackup_$(PKG_NAME_SUFFIX)$(PBK_VERSION) >> /dev/null 2>&1 ; \
diff --git a/packaging/test/scripts/rpm.sh b/packaging/test/scripts/rpm.sh
@@ -77,6 +77,12 @@ if [ ${DISTRIB} == 'centos' ] && [ ${DISTRIB_VERSION} == '8' ]; then
     dnf -qy module disable postgresql
 fi
 
+# PGDG doesn't support install of PG-9.6 from repo package anymore
+if [ ${PG_VERSION} == '9.6' ] && [ ${DISTRIB_VERSION} == '7' ]; then
+    # ugly hack: use repo settings from PG10
+    sed -i 's/10/9.6/' /etc/yum.repos.d/pgdg-redhat-all.repo
+fi
+
 yum install -y postgresql${PG_TOG}-server.x86_64
 export PGDATA=/var/lib/pgsql/${PG_VERSION}/data
 
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
@@ -345,7 +345,7 @@ typedef enum ShowFormat
 #define BYTES_INVALID		(-1) /* file didn`t changed since previous backup, DELTA backup do not rely on it */
 #define FILE_NOT_FOUND		(-2) /* file disappeared during backup */
 #define BLOCKNUM_INVALID	(-1)
-#define PROGRAM_VERSION	"2.5.8"
+#define PROGRAM_VERSION	"2.5.9"
 
 /* update when remote agent API or behaviour changes */
 #define AGENT_PROTOCOL_VERSION 20509
