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

Note for reviewer, could you check the build flags : it seems 
that what upstream use is not the quality of our normal C build.

- Packaging : 
  + modernize spec with spec-cleaner -m
  + remove pgbackrest-release-1.00_datadir.patch pgbackrest is now
    written in C
  + Build C binary and lib C
  + Adjust new parameter name in pgbackrest-conf.patch
- Update to new 2.0 version
  + Features:
    The archive-push command is now partially coded in C which 
    allows the PostgreSQL archive_command to run significantly 
    faster when processing status messages from the asynchronous 
    archive process. (Reviewed by Cynthia Shang.)
  + Improvements:
    - Improve check command to verify that the backup manifest can be
    built. (Contributed by Cynthia Shang.)
    - Improve performance of HTTPS client. Buffering now takes the 
    pending bytes on the socket into account (when present) rather
    than relying entirely on select(). In some instances the final
    bytes would not be flushed until the connection was closed.
    - Improve S3 delete performance. The constant S3_BATCH_MAX had 
    been replaced with a hard-coded value of 2, probably during 
    testing.
    - Allow any non-command-line option to be reset to default on 
    the command-line. This allows options in pgbackrest.conf to be 
    reset to default which reduces the need to write new config 
    files for specific needs.
    - The C library is now required. This eliminates conditional 
    loading and eases development of new library features.
    - The pgbackrest executable is now a C binary instead of Perl.
    This allows certain time-critical commands (like async

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

1.28.tar.gz

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

2.00.tar.gz

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

pgbackrest-conf.patch

@@ -2,4 +2,4 @@
 repo-path=/var/lib/pgbackrest
 
 #[main]
-#db-path=/var/lib/pgsql/10/data
+#pg-path=/var/lib/pgsql/data

pgbackrest-release-1.00_datadir.patch

@@ -1,13 +0,0 @@
-Index: pgbackrest-release-1.13/bin/pgbackrest
-===================================================================
---- pgbackrest-release-1.13.orig/bin/pgbackrest
-+++ pgbackrest-release-1.13/bin/pgbackrest
-@@ -16,7 +16,7 @@ $SIG{__DIE__} = sub { Carp::confess @_ }
- 
- use File::Basename qw(dirname);
- 
--use lib dirname($0) . '/../lib';
-+# use lib dirname($0) . '/../lib';
- 
- use pgBackRest::Common::Exception;
- use pgBackRest::Common::Exit;

pgbackrest.changes

@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Fri Mar  9 15:16:24 UTC 2018 - bruno@ioda-net.ch
+
+- Packaging : 
+  + modernize spec with spec-cleaner -m
+  + remove pgbackrest-release-1.00_datadir.patch pgbackrest is now
+    written in C
+  + Build C binary and lib C
+  + Adjust new parameter name in pgbackrest-conf.patch
+- Update to new 2.0 version
+  + Features:
+    The archive-push command is now partially coded in C which 
+    allows the PostgreSQL archive_command to run significantly 
+    faster when processing status messages from the asynchronous 
+    archive process. (Reviewed by Cynthia Shang.)
+  + Improvements:
+    - Improve check command to verify that the backup manifest can be
+    built. (Contributed by Cynthia Shang.)
+    - Improve performance of HTTPS client. Buffering now takes the 
+    pending bytes on the socket into account (when present) rather
+    than relying entirely on select(). In some instances the final
+    bytes would not be flushed until the connection was closed.
+    - Improve S3 delete performance. The constant S3_BATCH_MAX had 
+    been replaced with a hard-coded value of 2, probably during 
+    testing.
+    - Allow any non-command-line option to be reset to default on 
+    the command-line. This allows options in pgbackrest.conf to be 
+    reset to default which reduces the need to write new config 
+    files for specific needs.
+    - The C library is now required. This eliminates conditional 
+    loading and eases development of new library features.
+    - The pgbackrest executable is now a C binary instead of Perl.
+    This allows certain time-critical commands (like async 
+    archive-push) to run more quickly.
+    - Rename db-* options to pg-* and backup-* options to repo-* to
+    improve consistency. repo-* options are now indexed although 
+    currently only one is allowed.
+    ** This imply you need to revisit your pgbackrest.conf **
+ 
 -------------------------------------------------------------------
 Sun Feb  4 17:14:16 UTC 2018 - bruno@ioda-net.ch
 

pgbackrest.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pgbackrest
 #
- # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,28 +15,28 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           pgbackrest
-Version:        1.28
+# Nobody can stop upstream to be too creative !
+Version:        2.00
 Release:        0
-License:        MIT
 Summary:        Reliable PostgreSQL Backup & Restore
-Url:            http://www.pgbackrest.org/
+License:        MIT
 Group:          Productivity/Databases/Tools
+URL:            http://www.pgbackrest.org/
 Source:         https://github.com/pgbackrest/pgbackrest/archive/release/%{version}.tar.gz
 Source1:        pgbackrest-conf.patch
-Patch:          pgbackrest-release-1.00_datadir.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  openssl-devel
+BuildRequires:  perl-libxml-perl
+BuildRequires:  perl(DBD::Pg)
+BuildRequires:  perl(IO::Socket::SSL)
+Requires:       perl-libxml-perl
+Requires:       perl(DBD::Pg)
+Requires:       perl(IO::Socket::SSL)
+%{perl_requires}
 %if %{_arch} == "i586"
 ExclusiveArch:  do_not_build
 %endif
-BuildRequires:  openssl-devel
-BuildRequires:  perl(DBD::Pg)
-BuildRequires:  perl-libxml-perl
-BuildRequires:  perl(IO::Socket::SSL)
-%{perl_requires}
-Requires:  perl(DBD::Pg)
-Requires:  perl-libxml-perl
-Requires:  perl(IO::Socket::SSL)
 
 %description
 pgBackRest aims to be a simple, reliable backup and restore system that can
@@ -51,29 +51,32 @@ are required to perform a backup which increases security.
 
 %prep
 %setup -q -n %{name}-release-%{version}
-%patch -p1
 
 %build
+pushd src
+make V=1 %{?_smp_mflags}
+popd
+
 pushd libc
 perl Makefile.PL
 make V=1 %{?_smp_mflags}
 popd
 
 %install
-%{__install} -D -d -m 0755 %{buildroot}%{perl_vendorlib} %{buildroot}%{_bindir}
-%{__install} -D -d -m 0700 %{buildroot}/%{_localstatedir}/lib/%{name}
-%{__install} -D -d -m 0700 %{buildroot}/var/log/%{name}
-%{__install} -D -d -m 0700 %{buildroot}/var/spool/%{name}
-%{__install} -D -d -m 0755 %{buildroot}%{_sysconfdir}
-%{__install} %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}.conf
-%{__cp} -a lib/* %{buildroot}%{perl_vendorlib}/
-%{__cp} -a bin/%{name} %{buildroot}%{_bindir}/%{name}
-
+install -D -d -m 0755 %{buildroot}%{perl_vendorlib} %{buildroot}%{_bindir}
+install -D -d -m 0700 %{buildroot}/%{_localstatedir}/lib/%{name}
+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
+cp -a lib/* %{buildroot}%{perl_vendorlib}/
+# Upstream makefile is nonsense sudo so use install
+# make install -C src DESTDIR=%%{buildroot}
+install -m 0755 src/%{name} %{buildroot}%{_bindir}/%{name}
 make pure_vendor_install -C libc DESTDIR=%{buildroot}
 %perl_process_packlist
 %perl_gen_filelist
 
-
 %check
 pushd libc
 make test
@@ -85,11 +88,12 @@ popd
 %if 0%{?leap_version} >= 420200 || 0%{?suse_version} > 1320
 %license LICENSE
 %else
-%doc LICENSE
+%license LICENSE
 %endif
 %config(noreplace) %attr (644,root,root) %{_sysconfdir}/%{name}.conf
 # We still can do that as postgres user is system fixed
-%attr(-,postgres,postgres) /var/log/%{name}
+%attr(-,postgres,postgres) %{_localstatedir}/log/%{name}
 %attr(-,postgres,postgres) %{_localstatedir}/lib/%{name}
-%attr(-,postgres,postgres) /var/spool/%{name}
+%attr(-,postgres,postgres) %{_localstatedir}/spool/%{name}
 
+%changelog