Accepting request 683736 from home:bruno_friedmann:branches:server:database:postgresql

- Update to 2.11 release
  + C Implementation of Archive Get
  + Bug Fixes:
    - Fix possible truncated WAL segments when an error occurs
      mid-write.
    - Fix info command missing WAL min/max when stanza specified.
    - Fix non-compliant JSON for options passed from C to Perl.
  + Improvements:
    - The archive-get command is implemented entirely in C.
    - Enable socket keep-alive on older Perl versions.
    - Error when parameters are passed to a command that does not
      accept parameters.
    - Add hints when unable to find a WAL segment in the archive.
    - Improve error when hostname cannot be found in a
      certificate.
    - Add additional options to backup.manifest for debugging
      purposes.
  + Documentation Improvements:
    - Update default documentation version to PostgreSQL 10.
- Packaging:
  + Remove merge upstream patch (2cd204f.patch)
  + Fix install destination to %{_bindir}

- Include upstream patch 2cd204f.patch to fix issue#677
  + Fix check for improperly configured pg-path.

OBS-URL: https://build.opensuse.org/request/show/683736
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/pgbackrest?expand=0&rev=22
This commit is contained in:
Bruno Friedmann 2019-03-11 09:38:07 +00:00 committed by Git OBS Bridge
parent b04d05504d
commit 3a065299f5
5 changed files with 33 additions and 72 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8d04d2bb69842236a0394fbc54963b4af7d3ab6c3124bdf1e6692f6a7b0fc204
size 6426455

3
2.11.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5e1ea542682345b0cec9d47abb7ce5a39963e1221777f5afdab074af5a4000ac
size 6389098

View File

@ -1,61 +0,0 @@
From 2cd204f38037f1465c84bb4e6b55893204ee8f93 Mon Sep 17 00:00:00 2001
From: Stephen Frost <sfrost@snowman.net>
Date: Tue, 12 Feb 2019 14:59:51 +0200
Subject: [PATCH] Change execRead() to return a size_t.
execRead() should be returning a size_t, not a void. Thankfully, this isn't actually used and therefore shouldn't be an issue, but we should fix it anyway.
Contributed by Stephen Frost.
---
src/common/exec.c | 8 +++++---
src/common/exec.h | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/common/exec.c b/src/common/exec.c
index 84b1107ea..31d3dc444 100644
--- a/src/common/exec.c
+++ b/src/common/exec.c
@@ -214,7 +214,7 @@ execCheck(Exec *this)
/***********************************************************************************************************************************
Read from the process
***********************************************************************************************************************************/
-void
+size_t
execRead(Exec *this, Buffer *buffer, bool block)
{
FUNCTION_LOG_BEGIN(logLevelTrace);
@@ -226,9 +226,11 @@ execRead(Exec *this, Buffer *buffer, bool block)
ASSERT(this != NULL);
ASSERT(buffer != NULL);
+ size_t result = 0;
+
TRY_BEGIN()
{
- ioHandleRead(this->ioReadHandle, buffer, block);
+ result = ioHandleRead(this->ioReadHandle, buffer, block);
}
CATCH_ANY()
{
@@ -237,7 +239,7 @@ execRead(Exec *this, Buffer *buffer, bool block)
}
TRY_END();
- FUNCTION_LOG_RETURN_VOID();
+ FUNCTION_LOG_RETURN(SIZE, result);
}
/***********************************************************************************************************************************
diff --git a/src/common/exec.h b/src/common/exec.h
index df7574010..2064c284c 100644
--- a/src/common/exec.h
+++ b/src/common/exec.h
@@ -28,7 +28,7 @@ Exec *execNew(const String *command, const StringList *param, const String *name
Functions
***********************************************************************************************************************************/
void execOpen(Exec *this);
-void execRead(Exec *this, Buffer *buffer, bool block);
+size_t execRead(Exec *this, Buffer *buffer, bool block);
void execWrite(Exec *this, Buffer *buffer);
/***********************************************************************************************************************************

View File

@ -1,14 +1,40 @@
-------------------------------------------------------------------
Mon Mar 11 09:10:56 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to 2.11 release
+ C Implementation of Archive Get
+ Bug Fixes:
- Fix possible truncated WAL segments when an error occurs
mid-write.
- Fix info command missing WAL min/max when stanza specified.
- Fix non-compliant JSON for options passed from C to Perl.
+ Improvements:
- The archive-get command is implemented entirely in C.
- Enable socket keep-alive on older Perl versions.
- Error when parameters are passed to a command that does not
accept parameters.
- Add hints when unable to find a WAL segment in the archive.
- Improve error when hostname cannot be found in a
certificate.
- Add additional options to backup.manifest for debugging
purposes.
+ Documentation Improvements:
- Update default documentation version to PostgreSQL 10.
- Packaging:
+ Remove merge upstream patch (2cd204f.patch)
+ Fix install destination to %{_bindir}
-------------------------------------------------------------------
Wed Feb 20 08:15:24 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
- Include upstream patch 2cd204f.patch to fix issue#677
- Include upstream patch 2cd204f.patch to fix issue#677
-------------------------------------------------------------------
Sun Feb 17 10:02:49 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to 2.10 version bug fixes
+ Add unimplemented S3 driver method required for archive-get.
+ Fix check for improperly configured pg-path.
+ Fix check for improperly configured pg-path.
- Packaging:
+ Fix trailing space in changes (jengelh)
+ Use a factual description (jengelh)

View File

@ -23,7 +23,7 @@
%endif
Name: pgbackrest
Version: 2.10
Version: 2.11
Release: 0
Summary: Reliable PostgreSQL Backup & Restore
License: MIT
@ -31,9 +31,6 @@ Group: Productivity/Databases/Tools
URL: http://www.pgbackrest.org
Source: https://github.com/pgbackrest/pgbackrest/archive/release/%{version}.tar.gz
Source1: pgbackrest-conf.patch
# Trimmed Upstream patch fix return void (remove doc part)
# https://github.com/pgbackrest/pgbackrest/commit/2cd204f.patch
Patch0: 2cd204f.patch
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
BuildRequires: perl
@ -75,7 +72,6 @@ The following features are available:
%prep
%setup -q -n %{name}-release-%{version}
%patch0 -p1
%build
# TODO upstream doesn't care about RPM_OPT_FLAGS
@ -89,7 +85,7 @@ install -D -d -m 0700 %{buildroot}%{_localstatedir}/log/%{name}
install -D -d -m 0700 %{buildroot}%{_localstatedir}/spool/%{name}
install -D -d -m 0755 %{buildroot}%{_sysconfdir}
install %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}.conf
make install -C src DESTDIR=%{buildroot}
make install -C src DESTDIR=%{buildroot}%{_bindir}
%check
# Tests are only available with Vagrant