Accepting request 1178161 from server:database:postgresql

OBS-URL: https://build.opensuse.org/request/show/1178161
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pgbackrest?expand=0&rev=12
This commit is contained in:
Ana Guerrero 2024-06-03 15:43:58 +00:00 committed by Git OBS Bridge
commit 4b6c243841
6 changed files with 60 additions and 48 deletions

View File

@ -1,7 +1,7 @@
Index: pgbackrest-release-2.51/src/postgres/client.c Index: pgbackrest-release-2.52/src/postgres/client.c
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/src/postgres/client.c --- pgbackrest-release-2.52.orig/src/postgres/client.c
+++ pgbackrest-release-2.51/src/postgres/client.c +++ pgbackrest-release-2.52/src/postgres/client.c
@@ -3,7 +3,7 @@ Postgres Client @@ -3,7 +3,7 @@ Postgres Client
***********************************************************************************************************************************/ ***********************************************************************************************************************************/
#include "build.auto.h" #include "build.auto.h"
@ -11,10 +11,10 @@ Index: pgbackrest-release-2.51/src/postgres/client.c
#include "common/debug.h" #include "common/debug.h"
#include "common/log.h" #include "common/log.h"
Index: pgbackrest-release-2.51/src/configure Index: pgbackrest-release-2.52/src/configure
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/src/configure --- pgbackrest-release-2.52.orig/src/configure
+++ pgbackrest-release-2.51/src/configure +++ pgbackrest-release-2.52/src/configure
@@ -3655,12 +3655,12 @@ else $as_nop @@ -3655,12 +3655,12 @@ else $as_nop
as_fn_error $? "library 'pq' is required" "$LINENO" 5 as_fn_error $? "library 'pq' is required" "$LINENO" 5
fi fi

View File

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

3
pgbackrest-2.52.tar.gz Normal file
View File

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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri May 31 13:27:30 UTC 2024 - Andrea Manzini <andrea.manzini@suse.com>
- update to version 2.52
* Add GCS batch delete support
* S3 SSE-C encryption support
* PostgreSQL 17 support
* Update start/stop documentation to reflect actual functionality.
- switch rpm build to meson build system
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 29 09:05:56 UTC 2024 - Andrea Manzini <andrea.manzini@suse.com> Fri Mar 29 09:05:56 UTC 2024 - Andrea Manzini <andrea.manzini@suse.com>

View File

@ -19,7 +19,7 @@
%define services pgbackrest.target pgbackrest-diff@.service pgbackrest-full@.service pgbackrest-incr@.service pgbackrest.service pgbackrest-diff@.timer pgbackrest-full@.timer pgbackrest-incr@.timer %define services pgbackrest.target pgbackrest-diff@.service pgbackrest-full@.service pgbackrest-incr@.service pgbackrest.service pgbackrest-diff@.timer pgbackrest-full@.timer pgbackrest-incr@.timer
Name: pgbackrest Name: pgbackrest
Version: 2.51 Version: 2.52
Release: 0 Release: 0
Summary: Reliable PostgreSQL Backup & Restore Summary: Reliable PostgreSQL Backup & Restore
License: MIT License: MIT
@ -40,12 +40,15 @@ Source98: README.SUSE
Source99: series Source99: series
Patch0: libpq-fe.h_localisation.patch Patch0: libpq-fe.h_localisation.patch
Patch1: use-run-pgbackrest.patch Patch1: use-run-pgbackrest.patch
BuildRequires: libbacktrace-devel
BuildRequires: libyaml-devel BuildRequires: libyaml-devel
BuildRequires: openssl-devel BuildRequires: meson
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libpq)
BuildRequires: pkgconfig(libssh2)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
# This is a bit awkward as we only need this for directory ownership # This is a bit awkward as we only need this for directory ownership
Requires(pre): postgresql-server Requires(pre): postgresql-server
@ -82,14 +85,11 @@ The following features are available:
%build %build
cp %{SOURCE98} . cp %{SOURCE98} .
pushd src %meson
%configure %meson_build
# make_build doesn't work on sle12, as long we want to support that we can not use the macro here
%make_build
popd
%install %install
%make_install -C src %meson_install
install -D -d -m 0700 \ install -D -d -m 0700 \
%{buildroot}%{_localstatedir}/lib/%{name} \ %{buildroot}%{_localstatedir}/lib/%{name} \
@ -120,6 +120,7 @@ install -D -m 0644 \
# Tests are only available with Vagrant # Tests are only available with Vagrant
# We just test that the binary works. # We just test that the binary works.
%{buildroot}/%{_bindir}/%{name} version || exit 1 %{buildroot}/%{_bindir}/%{name} version || exit 1
%meson_test
%pre %pre
%service_add_pre %{services} %service_add_pre %{services}

View File

@ -1,7 +1,7 @@
Index: pgbackrest-release-2.51/CODING.md Index: pgbackrest-release-2.52/CODING.md
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/CODING.md --- pgbackrest-release-2.52.orig/CODING.md
+++ pgbackrest-release-2.51/CODING.md +++ pgbackrest-release-2.52/CODING.md
@@ -268,11 +268,11 @@ Continuation characters should be aligne @@ -268,11 +268,11 @@ Continuation characters should be aligne
This function can be called without variable parameters: This function can be called without variable parameters:
@ -16,11 +16,11 @@ Index: pgbackrest-release-2.51/CODING.md
``` ```
If the majority of functions in a module or object are variadic it is best to provide macros for all functions even if they do not have variable parameters. Do not use the base function when variadic macros exist. If the majority of functions in a module or object are variadic it is best to provide macros for all functions even if they do not have variable parameters. Do not use the base function when variadic macros exist.
Index: pgbackrest-release-2.51/doc/resource/git-history.cache Index: pgbackrest-release-2.52/doc/resource/git-history.cache
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/doc/resource/git-history.cache --- pgbackrest-release-2.52.orig/doc/resource/git-history.cache
+++ pgbackrest-release-2.51/doc/resource/git-history.cache +++ pgbackrest-release-2.52/doc/resource/git-history.cache
@@ -7586,7 +7586,7 @@ @@ -7784,7 +7784,7 @@
{ {
"commit": "a1365b26d4c2383eaacea3714eeb521435ca79aa", "commit": "a1365b26d4c2383eaacea3714eeb521435ca79aa",
"date": "2021-01-18 23:41:09 -0500", "date": "2021-01-18 23:41:09 -0500",
@ -29,7 +29,7 @@ Index: pgbackrest-release-2.51/doc/resource/git-history.cache
}, },
{ {
"commit": "8322dfd7af97e307b952cfb37e6a65b65f55be0f", "commit": "8322dfd7af97e307b952cfb37e6a65b65f55be0f",
@@ -10402,8 +10402,8 @@ @@ -10600,8 +10600,8 @@
{ {
"commit": "3fbfcba811499a59b943dd893eef9ff52090f7b6", "commit": "3fbfcba811499a59b943dd893eef9ff52090f7b6",
"date": "2020-03-16 17:27:01 -0400", "date": "2020-03-16 17:27:01 -0400",
@ -40,7 +40,7 @@ Index: pgbackrest-release-2.51/doc/resource/git-history.cache
}, },
{ {
"commit": "46911c64c19dc8ff76d2a6ff4548fc01647043e0", "commit": "46911c64c19dc8ff76d2a6ff4548fc01647043e0",
@@ -12303,7 +12303,7 @@ @@ -12501,7 +12501,7 @@
"commit": "45881c74aeff4bb25559ec0254fa7fc1960d9cab", "commit": "45881c74aeff4bb25559ec0254fa7fc1960d9cab",
"date": "2019-10-08 12:06:30 -0400", "date": "2019-10-08 12:06:30 -0400",
"subject": "Allow most unit tests to run outside of a container.", "subject": "Allow most unit tests to run outside of a container.",
@ -49,7 +49,7 @@ Index: pgbackrest-release-2.51/doc/resource/git-history.cache
}, },
{ {
"commit": "77b0c6c993a0e6ff45a6a99f343c3709a016d152", "commit": "77b0c6c993a0e6ff45a6a99f343c3709a016d152",
@@ -20790,7 +20790,7 @@ @@ -20988,7 +20988,7 @@
"commit": "18fd25233b1db7b3197f5d8dc537d239dcfc7aba", "commit": "18fd25233b1db7b3197f5d8dc537d239dcfc7aba",
"date": "2016-04-14 09:30:54 -0400", "date": "2016-04-14 09:30:54 -0400",
"subject": "New simpler configuration and consistent project/exe/path naming.", "subject": "New simpler configuration and consistent project/exe/path naming.",
@ -58,10 +58,10 @@ Index: pgbackrest-release-2.51/doc/resource/git-history.cache
}, },
{ {
"commit": "885797e4b58a675487a3531ba16908c1d1e9f970", "commit": "885797e4b58a675487a3531ba16908c1d1e9f970",
Index: pgbackrest-release-2.51/doc/xml/coding.xml Index: pgbackrest-release-2.52/doc/xml/coding.xml
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/doc/xml/coding.xml --- pgbackrest-release-2.52.orig/doc/xml/coding.xml
+++ pgbackrest-release-2.51/doc/xml/coding.xml +++ pgbackrest-release-2.52/doc/xml/coding.xml
@@ -365,13 +365,13 @@ void storagePathCreate(const Storage *th @@ -365,13 +365,13 @@ void storagePathCreate(const Storage *th
<p>This function can be called without variable parameters:</p> <p>This function can be called without variable parameters:</p>
@ -78,10 +78,10 @@ Index: pgbackrest-release-2.51/doc/xml/coding.xml
</code-block> </code-block>
<p>If the majority of functions in a module or object are variadic it is best to provide macros for all functions even if they do not have variable parameters. Do not use the base function when variadic macros exist.</p> <p>If the majority of functions in a module or object are variadic it is best to provide macros for all functions even if they do not have variable parameters. Do not use the base function when variadic macros exist.</p>
Index: pgbackrest-release-2.51/doc/xml/release/2016/1.00.xml Index: pgbackrest-release-2.52/doc/xml/release/2016/1.00.xml
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/doc/xml/release/2016/1.00.xml --- pgbackrest-release-2.52.orig/doc/xml/release/2016/1.00.xml
+++ pgbackrest-release-2.51/doc/xml/release/2016/1.00.xml +++ pgbackrest-release-2.52/doc/xml/release/2016/1.00.xml
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
<release-item-contributor id="david.steele"/> <release-item-contributor id="david.steele"/>
</release-item-contributor-list> --> </release-item-contributor-list> -->
@ -91,10 +91,10 @@ Index: pgbackrest-release-2.51/doc/xml/release/2016/1.00.xml
</release-item> </release-item>
<release-item> <release-item>
Index: pgbackrest-release-2.51/src/build/config/config.yaml Index: pgbackrest-release-2.52/src/build/config/config.yaml
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/src/build/config/config.yaml --- pgbackrest-release-2.52.orig/src/build/config/config.yaml
+++ pgbackrest-release-2.51/src/build/config/config.yaml +++ pgbackrest-release-2.52/src/build/config/config.yaml
@@ -844,7 +844,7 @@ option: @@ -844,7 +844,7 @@ option:
lock-path: lock-path:
section: global section: global
@ -104,10 +104,10 @@ Index: pgbackrest-release-2.51/src/build/config/config.yaml
command: command:
annotate: {} annotate: {}
archive-get: {} archive-get: {}
Index: pgbackrest-release-2.51/src/config/parse.auto.c.inc Index: pgbackrest-release-2.52/src/config/parse.auto.c.inc
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/src/config/parse.auto.c.inc --- pgbackrest-release-2.52.orig/src/config/parse.auto.c.inc
+++ pgbackrest-release-2.51/src/config/parse.auto.c.inc +++ pgbackrest-release-2.52/src/config/parse.auto.c.inc
@@ -11,7 +11,7 @@ Rule Strings @@ -11,7 +11,7 @@ Rule Strings
static const StringPub parseRuleValueStr[] = static const StringPub parseRuleValueStr[] =
@ -117,10 +117,10 @@ Index: pgbackrest-release-2.51/src/config/parse.auto.c.inc
PARSE_RULE_STRPUB("/var/lib/pgbackrest"), // val/str PARSE_RULE_STRPUB("/var/lib/pgbackrest"), // val/str
PARSE_RULE_STRPUB("/var/log/pgbackrest"), // val/str PARSE_RULE_STRPUB("/var/log/pgbackrest"), // val/str
PARSE_RULE_STRPUB("/var/spool/pgbackrest"), // val/str PARSE_RULE_STRPUB("/var/spool/pgbackrest"), // val/str
Index: pgbackrest-release-2.51/test/ci.pl Index: pgbackrest-release-2.52/test/ci.pl
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/test/ci.pl --- pgbackrest-release-2.52.orig/test/ci.pl
+++ pgbackrest-release-2.51/test/ci.pl +++ pgbackrest-release-2.52/test/ci.pl
@@ -202,8 +202,8 @@ eval @@ -202,8 +202,8 @@ eval
$strPackage .= " libdbd-pg-perl"; $strPackage .= " libdbd-pg-perl";
} }
@ -132,10 +132,10 @@ Index: pgbackrest-release-2.51/test/ci.pl
processEnd(); processEnd();
processBegin('install test packages'); processBegin('install test packages');
Index: pgbackrest-release-2.51/test/src/module/command/helpTest.c Index: pgbackrest-release-2.52/test/src/module/command/helpTest.c
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/test/src/module/command/helpTest.c --- pgbackrest-release-2.52.orig/test/src/module/command/helpTest.c
+++ pgbackrest-release-2.51/test/src/module/command/helpTest.c +++ pgbackrest-release-2.52/test/src/module/command/helpTest.c
@@ -246,7 +246,7 @@ testRun(void) @@ -246,7 +246,7 @@ testRun(void)
" [default=n]\n" " [default=n]\n"
" --io-timeout I/O timeout [default=60]\n" " --io-timeout I/O timeout [default=60]\n"
@ -145,10 +145,10 @@ Index: pgbackrest-release-2.51/test/src/module/command/helpTest.c
" --neutral-umask use a neutral umask [default=y]\n" " --neutral-umask use a neutral umask [default=y]\n"
" --process-max max processes to use for\n" " --process-max max processes to use for\n"
" compress/transfer [default=1]\n" " compress/transfer [default=1]\n"
Index: pgbackrest-release-2.51/test/Vagrantfile Index: pgbackrest-release-2.52/test/Vagrantfile
=================================================================== ===================================================================
--- pgbackrest-release-2.51.orig/test/Vagrantfile --- pgbackrest-release-2.52.orig/test/Vagrantfile
+++ pgbackrest-release-2.51/test/Vagrantfile +++ pgbackrest-release-2.52/test/Vagrantfile
@@ -54,12 +54,12 @@ Vagrant.configure(2) do |config| @@ -54,12 +54,12 @@ Vagrant.configure(2) do |config|
sudo /etc/init.d/virtualbox-guest-utils stop sudo /etc/init.d/virtualbox-guest-utils stop
sudo /usr/sbin/VBoxService --timesync-set-on-restore --timesync-interval 5000 --timesync-set-threshold 1 sudo /usr/sbin/VBoxService --timesync-set-on-restore --timesync-interval 5000 --timesync-set-threshold 1