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

- Include upstream patch 2cd204f.patch to fix issue#677 

- Update to 2.10 version bug fixes
  + Add unimplemented S3 driver method required for archive-get.
  + Fix check for improperly configured pg-path. 
- Packaging:
  + Fix trailing space in changes (jengelh)
  + Use a factual description (jengelh)

- Packaging: remove comments/remark fixed and merged issue #659
- Update to 2.08 version : bug fixes and improvement
- Update spec (date and order)
  is ported to C

OBS-URL: https://build.opensuse.org/request/show/677608
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/pgbackrest?expand=0&rev=21

2.09.tar.gz

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

2.10.tar.gz

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

2cd204f.patch

@@ -0,0 +1,61 @@
+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);
+ 
+ /***********************************************************************************************************************************

pgbackrest.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Feb 20 08:15:24 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
+
+- 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. 
+- Packaging:
+  + Fix trailing space in changes (jengelh)
+  + Use a factual description (jengelh)
+
 -------------------------------------------------------------------
 Fri Feb  8 20:02:00 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
 
@@ -9,7 +24,7 @@ Fri Feb  8 20:02:00 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
   + Add _DARWIN_C_SOURCE flag to Makefile for MacOS builds.
   + Update address lookup in C TLS client to use modern methods.
   + Include Posix-compliant header for strcasecmp() and fd_set.
-- Packaging : remove comments/remark fixed and merged issue #659
+- Packaging: remove comments/remark fixed and merged issue #659
 
 -------------------------------------------------------------------
 Sat Jan 26 10:00:00 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>

pgbackrest.spec

@@ -2,6 +2,7 @@
 # spec file for package pgbackrest
 #
 # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 Ioda-Net Sàrl, Charmoille, Switzerland.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,8 +23,7 @@
 %endif
 
 Name:           pgbackrest
-# Nobody can stop upstream to be too creative !
+Version:        2.10
-Version:        2.09
 Release:        0
 Summary:        Reliable PostgreSQL Backup & Restore
 License:        MIT
@@ -31,6 +31,9 @@ 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
@@ -50,18 +53,29 @@ ExclusiveArch:  do_not_build
 %endif
 
 %description
-pgBackRest aims to be a simple, reliable backup and restore system that can
+pgBackRest aims to be a simple, reliable backup and restore system for
-seamlessly scale up to the largest databases and workloads.
+PostgreSQL that can seamlessly scale up to the largest databases and
+workloads.
 
-Instead of relying on traditional backup tools like tar and rsync, pgBackRest
+The following features are available:
-implements all backup features internally and uses a custom protocol for
+- Parallel backup & restore
-communicating with remote systems. Removing reliance on tar and rsync allows
+- Local or remote operation
-for better solutions to database-specific backup challenges. The custom remote
+- Full, incremental, differential backups
-protocol allows for more flexibility and limits the types of connections that
+- Backup rotation & archive expiration
-are required to perform a backup which increases security.
+- Backup integrity
+- Page checksums
+- Backup resume
+- Streaming compression & checksums
+- Delta restore
+- Parallel, asynchronous WAL push & get
+- Tablespace & link support
+- Amazon S3 support
+- Encryption
+- Compatibility with PostgreSQL >= 8.3
 
 %prep
 %setup -q -n %{name}-release-%{version}
+%patch0 -p1
 
 %build
 # TODO upstream doesn't care about RPM_OPT_FLAGS
@@ -80,7 +94,7 @@ make install -C src DESTDIR=%{buildroot}
 %check
 # Tests are only available with Vagrant
 # We just test that the binary works.
-%{buildroot}/%{_bindir}/%{name} version
+%{buildroot}/%{_bindir}/%{name} version || exit 1
 
 %files
 %defattr(-,root,root)