From c1f9405755ffffbf1ac2be52c759204e2f4b2829f3ae411393558e4ef7923e88 Mon Sep 17 00:00:00 2001 From: Andrea Manzini Date: Sun, 2 Jun 2024 14:02:38 +0000 Subject: [PATCH] Accepting request 1177950 from home:amanzini:branches:server:database:postgresql - 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 OBS-URL: https://build.opensuse.org/request/show/1177950 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/pgbackrest?expand=0&rev=69 --- libpq-fe.h_localisation.patch | 12 +++---- pgbackrest-2.51.tar.gz | 3 -- pgbackrest-2.52.tar.gz | 3 ++ pgbackrest.changes | 11 +++++++ pgbackrest.spec | 17 +++++----- use-run-pgbackrest.patch | 62 +++++++++++++++++------------------ 6 files changed, 60 insertions(+), 48 deletions(-) delete mode 100644 pgbackrest-2.51.tar.gz create mode 100644 pgbackrest-2.52.tar.gz diff --git a/libpq-fe.h_localisation.patch b/libpq-fe.h_localisation.patch index 75f0f4a..17538a3 100644 --- a/libpq-fe.h_localisation.patch +++ b/libpq-fe.h_localisation.patch @@ -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.51/src/postgres/client.c +--- pgbackrest-release-2.52.orig/src/postgres/client.c ++++ pgbackrest-release-2.52/src/postgres/client.c @@ -3,7 +3,7 @@ Postgres Client ***********************************************************************************************************************************/ #include "build.auto.h" @@ -11,10 +11,10 @@ Index: pgbackrest-release-2.51/src/postgres/client.c #include "common/debug.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.51/src/configure +--- pgbackrest-release-2.52.orig/src/configure ++++ pgbackrest-release-2.52/src/configure @@ -3655,12 +3655,12 @@ else $as_nop as_fn_error $? "library 'pq' is required" "$LINENO" 5 fi diff --git a/pgbackrest-2.51.tar.gz b/pgbackrest-2.51.tar.gz deleted file mode 100644 index a5c8dfa..0000000 --- a/pgbackrest-2.51.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fa6760032927de448251fb1e5b824e2d17caf560796e74947275b72dc20ed2a -size 6119922 diff --git a/pgbackrest-2.52.tar.gz b/pgbackrest-2.52.tar.gz new file mode 100644 index 0000000..3096183 --- /dev/null +++ b/pgbackrest-2.52.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ceac28184780d56201a7ef645eaade48fa5e42f06c6aab10d599d315c4d04f63 +size 2678821 diff --git a/pgbackrest.changes b/pgbackrest.changes index 84b3ec8..c544cb9 100644 --- a/pgbackrest.changes +++ b/pgbackrest.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri May 31 13:27:30 UTC 2024 - Andrea Manzini + +- 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 diff --git a/pgbackrest.spec b/pgbackrest.spec index 6f4f63a..fcdca2b 100644 --- a/pgbackrest.spec +++ b/pgbackrest.spec @@ -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 Name: pgbackrest -Version: 2.51 +Version: 2.52 Release: 0 Summary: Reliable PostgreSQL Backup & Restore License: MIT @@ -40,12 +40,15 @@ Source98: README.SUSE Source99: series Patch0: libpq-fe.h_localisation.patch Patch1: use-run-pgbackrest.patch +BuildRequires: libbacktrace-devel BuildRequires: libyaml-devel -BuildRequires: openssl-devel +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libpq) +BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(systemd) # This is a bit awkward as we only need this for directory ownership Requires(pre): postgresql-server @@ -82,14 +85,11 @@ The following features are available: %build cp %{SOURCE98} . -pushd src -%configure -# make_build doesn't work on sle12, as long we want to support that we can not use the macro here -%make_build -popd +%meson +%meson_build %install -%make_install -C src +%meson_install install -D -d -m 0700 \ %{buildroot}%{_localstatedir}/lib/%{name} \ @@ -120,6 +120,7 @@ install -D -m 0644 \ # Tests are only available with Vagrant # We just test that the binary works. %{buildroot}/%{_bindir}/%{name} version || exit 1 +%meson_test %pre %service_add_pre %{services} diff --git a/use-run-pgbackrest.patch b/use-run-pgbackrest.patch index 1ba045f..92e6cba 100644 --- a/use-run-pgbackrest.patch +++ b/use-run-pgbackrest.patch @@ -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.51/CODING.md +--- pgbackrest-release-2.52.orig/CODING.md ++++ pgbackrest-release-2.52/CODING.md @@ -268,11 +268,11 @@ Continuation characters should be aligne 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. -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.51/doc/resource/git-history.cache -@@ -7586,7 +7586,7 @@ +--- pgbackrest-release-2.52.orig/doc/resource/git-history.cache ++++ pgbackrest-release-2.52/doc/resource/git-history.cache +@@ -7784,7 +7784,7 @@ { "commit": "a1365b26d4c2383eaacea3714eeb521435ca79aa", "date": "2021-01-18 23:41:09 -0500", @@ -29,7 +29,7 @@ Index: pgbackrest-release-2.51/doc/resource/git-history.cache }, { "commit": "8322dfd7af97e307b952cfb37e6a65b65f55be0f", -@@ -10402,8 +10402,8 @@ +@@ -10600,8 +10600,8 @@ { "commit": "3fbfcba811499a59b943dd893eef9ff52090f7b6", "date": "2020-03-16 17:27:01 -0400", @@ -40,7 +40,7 @@ Index: pgbackrest-release-2.51/doc/resource/git-history.cache }, { "commit": "46911c64c19dc8ff76d2a6ff4548fc01647043e0", -@@ -12303,7 +12303,7 @@ +@@ -12501,7 +12501,7 @@ "commit": "45881c74aeff4bb25559ec0254fa7fc1960d9cab", "date": "2019-10-08 12:06:30 -0400", "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", -@@ -20790,7 +20790,7 @@ +@@ -20988,7 +20988,7 @@ "commit": "18fd25233b1db7b3197f5d8dc537d239dcfc7aba", "date": "2016-04-14 09:30:54 -0400", "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", -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.51/doc/xml/coding.xml +--- pgbackrest-release-2.52.orig/doc/xml/coding.xml ++++ pgbackrest-release-2.52/doc/xml/coding.xml @@ -365,13 +365,13 @@ void storagePathCreate(const Storage *th

This function can be called without variable parameters:

@@ -78,10 +78,10 @@ Index: pgbackrest-release-2.51/doc/xml/coding.xml

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/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.51/doc/xml/release/2016/1.00.xml +--- pgbackrest-release-2.52.orig/doc/xml/release/2016/1.00.xml ++++ pgbackrest-release-2.52/doc/xml/release/2016/1.00.xml @@ -43,7 +43,7 @@ --> @@ -91,10 +91,10 @@ Index: pgbackrest-release-2.51/doc/xml/release/2016/1.00.xml -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.51/src/build/config/config.yaml +--- pgbackrest-release-2.52.orig/src/build/config/config.yaml ++++ pgbackrest-release-2.52/src/build/config/config.yaml @@ -844,7 +844,7 @@ option: lock-path: section: global @@ -104,10 +104,10 @@ Index: pgbackrest-release-2.51/src/build/config/config.yaml command: annotate: {} 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.51/src/config/parse.auto.c.inc +--- pgbackrest-release-2.52.orig/src/config/parse.auto.c.inc ++++ pgbackrest-release-2.52/src/config/parse.auto.c.inc @@ -11,7 +11,7 @@ Rule Strings 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/log/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.51/test/ci.pl +--- pgbackrest-release-2.52.orig/test/ci.pl ++++ pgbackrest-release-2.52/test/ci.pl @@ -202,8 +202,8 @@ eval $strPackage .= " libdbd-pg-perl"; } @@ -132,10 +132,10 @@ Index: pgbackrest-release-2.51/test/ci.pl processEnd(); 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.51/test/src/module/command/helpTest.c +--- pgbackrest-release-2.52.orig/test/src/module/command/helpTest.c ++++ pgbackrest-release-2.52/test/src/module/command/helpTest.c @@ -246,7 +246,7 @@ testRun(void) " [default=n]\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" " --process-max max processes to use for\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.51/test/Vagrantfile +--- pgbackrest-release-2.52.orig/test/Vagrantfile ++++ pgbackrest-release-2.52/test/Vagrantfile @@ -54,12 +54,12 @@ Vagrant.configure(2) do |config| sudo /etc/init.d/virtualbox-guest-utils stop sudo /usr/sbin/VBoxService --timesync-set-on-restore --timesync-interval 5000 --timesync-set-threshold 1