From e8335cb9864165f033010474bf846b45774c2a1f5f3c626c3c5d6d0920ba64b9 Mon Sep 17 00:00:00 2001 From: Bruno Friedmann Date: Tue, 24 Mar 2020 15:08:48 +0000 Subject: [PATCH] Accepting request 787841 from home:bruno_friedmann:branches:server:database:postgresql - update to 2.24 version : Bugfix + Bug Fixes: - Prevent defunct processes in asynchronous archive commands. - Error when archive-get/archive-push/restore are not run on a PostgreSQL host. - Read HTTP content to eof when size/encoding not specified. - Fix resume when the resumable backup was created by Perl. In this case the resumable backup should be ignored, but the C code was not able to load the partial manifest written by Perl since the format differs slightly. Add validations to catch this case and continue gracefully. + Features: - Auto-select backup set on restore when time target is specified. Auto-selection is performed only when --set is not specified. If a backup set for the given target time cannot not be found, the latest (default) backup set will be used. + Improvements: - Skip pg_internal.init temp file during backup. - Add more validations to the manifest on backup. + Documentation Improvements: - Prevent lock-bot from adding comments to locked issues. - Packaging + use %autopatch + use a normalized name for source %name-%version.tar.gz + spec cleaning + Refresh patch libpq-fe.h_localisation.patch + Delete merged upstream_wrongly_bring_back_pg_config.patch OBS-URL: https://build.opensuse.org/request/show/787841 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/pgbackrest?expand=0&rev=30 --- 2.23.tar.gz | 3 -- libpq-fe.h_localisation.patch | 4 +-- pgbackrest-2.24.tar.gz | 3 ++ pgbackrest.changes | 31 +++++++++++++++++++++ pgbackrest.spec | 11 +++----- upstream_wrongly_bring_back_pg_config.patch | 24 ---------------- 6 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 2.23.tar.gz create mode 100644 pgbackrest-2.24.tar.gz delete mode 100644 upstream_wrongly_bring_back_pg_config.patch diff --git a/2.23.tar.gz b/2.23.tar.gz deleted file mode 100644 index f559591..0000000 --- a/2.23.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fb48d23622ea91d9381898bae040690df10995c06a4241d0e44a0f5462a0a1f -size 5280713 diff --git a/libpq-fe.h_localisation.patch b/libpq-fe.h_localisation.patch index a5d3c10..692cdf3 100644 --- a/libpq-fe.h_localisation.patch +++ b/libpq-fe.h_localisation.patch @@ -1,6 +1,6 @@ diff -rup a/src/postgres/client.c b/src/postgres/client.c ---- a/src/postgres/client.c 2019-08-05 18:03:04.000000000 +0200 -+++ b/src/postgres/client.c 2019-08-24 18:28:37.708798692 +0200 +--- a/src/postgres/client.c 2020-02-25 23:05:45.000000000 +0100 ++++ b/src/postgres/client.c 2020-03-24 15:30:19.361417162 +0100 @@ -3,7 +3,7 @@ Postgres Client ***********************************************************************************************************************************/ #include "build.auto.h" diff --git a/pgbackrest-2.24.tar.gz b/pgbackrest-2.24.tar.gz new file mode 100644 index 0000000..5823e2f --- /dev/null +++ b/pgbackrest-2.24.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ce1b059dee69039a8cfd0bd707394a88e9320a2519f02c09de45cfe85904fdb +size 5290197 diff --git a/pgbackrest.changes b/pgbackrest.changes index 84266fd..e9aca00 100644 --- a/pgbackrest.changes +++ b/pgbackrest.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Mar 24 14:34:27 UTC 2020 - Bruno Friedmann + +- update to 2.24 version : Bugfix + + Bug Fixes: + - Prevent defunct processes in asynchronous archive commands. + - Error when archive-get/archive-push/restore are not run on a + PostgreSQL host. + - Read HTTP content to eof when size/encoding not specified. + - Fix resume when the resumable backup was created by Perl. In + this case the resumable backup should be ignored, but the C + code was not able to load the partial manifest written by Perl + since the format differs slightly. + Add validations to catch this case and continue gracefully. + + Features: + - Auto-select backup set on restore when time target is specified. + Auto-selection is performed only when --set is not specified. + If a backup set for the given target time cannot not be found, + the latest (default) backup set will be used. + + Improvements: + - Skip pg_internal.init temp file during backup. + - Add more validations to the manifest on backup. + + Documentation Improvements: + - Prevent lock-bot from adding comments to locked issues. +- Packaging + + use %autopatch + + use a normalized name for source %name-%version.tar.gz + + spec cleaning + + Refresh patch libpq-fe.h_localisation.patch + + Delete merged upstream_wrongly_bring_back_pg_config.patch + ------------------------------------------------------------------- Mon Jan 27 20:27:02 UTC 2020 - Bruno Friedmann diff --git a/pgbackrest.spec b/pgbackrest.spec index 3d87c84..9a5b13c 100644 --- a/pgbackrest.spec +++ b/pgbackrest.spec @@ -22,21 +22,19 @@ %define make_build %{_bindir}/make %{?_smp_mflags} %endif Name: pgbackrest -Version: 2.23 +Version: 2.24 Release: 0 Summary: Reliable PostgreSQL Backup & Restore License: MIT Group: Productivity/Databases/Tools URL: http://www.pgbackrest.org -Source: https://github.com/pgbackrest/pgbackrest/archive/release/%{version}.tar.gz +Source: https://github.com/pgbackrest/pgbackrest/archive/release/%{version}/%{name}-%{version}.tar.gz Source1: pgbackrest-conf.patch Patch0: libpq-fe.h_localisation.patch -# Upstream issue #920 -Patch1: upstream_wrongly_bring_back_pg_config.patch BuildRequires: openssl-devel BuildRequires: pkgconfig -BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libpq) +BuildRequires: pkgconfig(libxml-2.0) %{perl_requires} %if %{_arch} == "i586" ExclusiveArch: do_not_build @@ -65,8 +63,7 @@ The following features are available: %prep %setup -q -n %{name}-release-%{version} -%patch0 -p1 -%patch1 -p1 +%autopatch -p1 pushd src %configure popd diff --git a/upstream_wrongly_bring_back_pg_config.patch b/upstream_wrongly_bring_back_pg_config.patch deleted file mode 100644 index 206a595..0000000 --- a/upstream_wrongly_bring_back_pg_config.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -rup a/src/configure b/src/configure ---- a/src/configure 2020-01-27 06:38:21.000000000 +0100 -+++ b/src/configure 2020-01-27 22:15:58.271233890 +0100 -@@ -3050,7 +3050,7 @@ CINCLUDE="-I." - - - # Check required pq library --LIBS="$LIBS -L`pg_config --libdir`" -+# LIBS="$LIBS -L`pg_config --libdir`" - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5 -diff -rup a/src/configure.ac b/src/configure.ac ---- a/src/configure.ac 2020-01-27 06:38:21.000000000 +0100 -+++ b/src/configure.ac 2020-01-27 22:15:18.822787029 +0100 -@@ -34,7 +34,7 @@ fi - AC_SUBST(CINCLUDE, "-I.") - - # Check required pq library --AC_SUBST(LIBS, "$LIBS -L`pg_config --libdir`") -+# AC_SUBST(LIBS, "$LIBS -L`pg_config --libdir`") - AC_CHECK_LIB([pq], [PQconnectdb], [], [AC_MSG_ERROR([library 'pq' is required])]) - AC_SUBST(CINCLUDE, "$CINCLUDE -I`pg_config --includedir`") -