From bc80a7f4226f169368567a71509c31c9d3ace8119270a739fbaa926cf594e440 Mon Sep 17 00:00:00 2001 From: Bruno Friedmann Date: Tue, 24 Dec 2024 08:27:10 +0000 Subject: [PATCH] - update to version 2.54.1 * Fix issue with version/help commands attempting to load pgbackrest.conf * Stabilize async archiving in integration tests OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/pgbackrest?expand=0&rev=81 --- libpq-fe.h_localisation.patch | 12 +++---- pgbackrest-2.54.0.tar.gz | 3 -- pgbackrest-2.54.1.tar.gz | 3 ++ pgbackrest.changes | 7 ++++ pgbackrest.spec | 2 +- use-run-pgbackrest.patch | 62 +++++++++++++++++------------------ 6 files changed, 48 insertions(+), 41 deletions(-) delete mode 100644 pgbackrest-2.54.0.tar.gz create mode 100644 pgbackrest-2.54.1.tar.gz diff --git a/libpq-fe.h_localisation.patch b/libpq-fe.h_localisation.patch index 76bcd82..eaa9c7f 100644 --- a/libpq-fe.h_localisation.patch +++ b/libpq-fe.h_localisation.patch @@ -1,7 +1,7 @@ -Index: pgbackrest-release-2.54.0/src/postgres/client.c +Index: pgbackrest-release-2.54.1/src/postgres/client.c =================================================================== ---- pgbackrest-release-2.54.0.orig/src/postgres/client.c -+++ pgbackrest-release-2.54.0/src/postgres/client.c +--- pgbackrest-release-2.54.1.orig/src/postgres/client.c ++++ pgbackrest-release-2.54.1/src/postgres/client.c @@ -3,7 +3,7 @@ Postgres Client ***********************************************************************************************************************************/ #include "build.auto.h" @@ -11,10 +11,10 @@ Index: pgbackrest-release-2.54.0/src/postgres/client.c #include "common/debug.h" #include "common/io/fd.h" -Index: pgbackrest-release-2.54.0/src/configure +Index: pgbackrest-release-2.54.1/src/configure =================================================================== ---- pgbackrest-release-2.54.0.orig/src/configure -+++ pgbackrest-release-2.54.0/src/configure +--- pgbackrest-release-2.54.1.orig/src/configure ++++ pgbackrest-release-2.54.1/src/configure @@ -3655,12 +3655,12 @@ else $as_nop as_fn_error $? "library 'pq' is required" "$LINENO" 5 fi diff --git a/pgbackrest-2.54.0.tar.gz b/pgbackrest-2.54.0.tar.gz deleted file mode 100644 index cfd9822..0000000 --- a/pgbackrest-2.54.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b41872b9baeee1a7f0280e0c7745275a5b36e6737112b70c2a48a1cfdf3faa0 -size 2727332 diff --git a/pgbackrest-2.54.1.tar.gz b/pgbackrest-2.54.1.tar.gz new file mode 100644 index 0000000..83e687d --- /dev/null +++ b/pgbackrest-2.54.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33244127a341d54ebe6a9d2e13f7b313dbf80d4fd99eae998ca28572bd5cc622 +size 2730441 diff --git a/pgbackrest.changes b/pgbackrest.changes index 578e4a9..3030265 100644 --- a/pgbackrest.changes +++ b/pgbackrest.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 23 15:27:18 UTC 2024 - Andrea Manzini + +- update to version 2.54.1 + * Fix issue with version/help commands attempting to load pgbackrest.conf + * Stabilize async archiving in integration tests + ------------------------------------------------------------------- Sun Dec 15 23:52:24 UTC 2024 - Marcus Rueckert diff --git a/pgbackrest.spec b/pgbackrest.spec index d7c0d70..df5acdc 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.54.0 +Version: 2.54.1 Release: 0 Summary: Reliable PostgreSQL Backup & Restore License: MIT diff --git a/use-run-pgbackrest.patch b/use-run-pgbackrest.patch index bc79e79..54fad16 100644 --- a/use-run-pgbackrest.patch +++ b/use-run-pgbackrest.patch @@ -1,7 +1,7 @@ -Index: pgbackrest-release-2.54.0/CODING.md +Index: pgbackrest-release-2.54.1/CODING.md =================================================================== ---- pgbackrest-release-2.54.0.orig/CODING.md -+++ pgbackrest-release-2.54.0/CODING.md +--- pgbackrest-release-2.54.1.orig/CODING.md ++++ pgbackrest-release-2.54.1/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.54.0/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.54.0/doc/resource/git-history.cache +Index: pgbackrest-release-2.54.1/doc/resource/git-history.cache =================================================================== ---- pgbackrest-release-2.54.0.orig/doc/resource/git-history.cache -+++ pgbackrest-release-2.54.0/doc/resource/git-history.cache -@@ -8359,7 +8359,7 @@ +--- pgbackrest-release-2.54.1.orig/doc/resource/git-history.cache ++++ pgbackrest-release-2.54.1/doc/resource/git-history.cache +@@ -8433,7 +8433,7 @@ { "commit": "a1365b26d4c2383eaacea3714eeb521435ca79aa", "date": "2021-01-18 23:41:09 -0500", @@ -29,7 +29,7 @@ Index: pgbackrest-release-2.54.0/doc/resource/git-history.cache }, { "commit": "8322dfd7af97e307b952cfb37e6a65b65f55be0f", -@@ -11175,8 +11175,8 @@ +@@ -11249,8 +11249,8 @@ { "commit": "3fbfcba811499a59b943dd893eef9ff52090f7b6", "date": "2020-03-16 17:27:01 -0400", @@ -40,7 +40,7 @@ Index: pgbackrest-release-2.54.0/doc/resource/git-history.cache }, { "commit": "46911c64c19dc8ff76d2a6ff4548fc01647043e0", -@@ -13076,7 +13076,7 @@ +@@ -13150,7 +13150,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.54.0/doc/resource/git-history.cache }, { "commit": "77b0c6c993a0e6ff45a6a99f343c3709a016d152", -@@ -21563,7 +21563,7 @@ +@@ -21637,7 +21637,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.54.0/doc/resource/git-history.cache }, { "commit": "885797e4b58a675487a3531ba16908c1d1e9f970", -Index: pgbackrest-release-2.54.0/doc/xml/coding.xml +Index: pgbackrest-release-2.54.1/doc/xml/coding.xml =================================================================== ---- pgbackrest-release-2.54.0.orig/doc/xml/coding.xml -+++ pgbackrest-release-2.54.0/doc/xml/coding.xml +--- pgbackrest-release-2.54.1.orig/doc/xml/coding.xml ++++ pgbackrest-release-2.54.1/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.54.0/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.54.0/doc/xml/release/2016/1.00.xml +Index: pgbackrest-release-2.54.1/doc/xml/release/2016/1.00.xml =================================================================== ---- pgbackrest-release-2.54.0.orig/doc/xml/release/2016/1.00.xml -+++ pgbackrest-release-2.54.0/doc/xml/release/2016/1.00.xml +--- pgbackrest-release-2.54.1.orig/doc/xml/release/2016/1.00.xml ++++ pgbackrest-release-2.54.1/doc/xml/release/2016/1.00.xml @@ -43,7 +43,7 @@ --> @@ -91,10 +91,10 @@ Index: pgbackrest-release-2.54.0/doc/xml/release/2016/1.00.xml -Index: pgbackrest-release-2.54.0/src/build/config/config.yaml +Index: pgbackrest-release-2.54.1/src/build/config/config.yaml =================================================================== ---- pgbackrest-release-2.54.0.orig/src/build/config/config.yaml -+++ pgbackrest-release-2.54.0/src/build/config/config.yaml +--- pgbackrest-release-2.54.1.orig/src/build/config/config.yaml ++++ pgbackrest-release-2.54.1/src/build/config/config.yaml @@ -874,7 +874,7 @@ option: lock-path: section: global @@ -104,10 +104,10 @@ Index: pgbackrest-release-2.54.0/src/build/config/config.yaml command: annotate: {} archive-get: {} -Index: pgbackrest-release-2.54.0/src/config/parse.auto.c.inc +Index: pgbackrest-release-2.54.1/src/config/parse.auto.c.inc =================================================================== ---- pgbackrest-release-2.54.0.orig/src/config/parse.auto.c.inc -+++ pgbackrest-release-2.54.0/src/config/parse.auto.c.inc +--- pgbackrest-release-2.54.1.orig/src/config/parse.auto.c.inc ++++ pgbackrest-release-2.54.1/src/config/parse.auto.c.inc @@ -11,7 +11,7 @@ Rule Strings static const StringPub parseRuleValueStr[] = @@ -117,10 +117,10 @@ Index: pgbackrest-release-2.54.0/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.54.0/test/ci.pl +Index: pgbackrest-release-2.54.1/test/ci.pl =================================================================== ---- pgbackrest-release-2.54.0.orig/test/ci.pl -+++ pgbackrest-release-2.54.0/test/ci.pl +--- pgbackrest-release-2.54.1.orig/test/ci.pl ++++ pgbackrest-release-2.54.1/test/ci.pl @@ -196,8 +196,8 @@ eval $strPackage .= " libdbd-pg-perl"; } @@ -132,10 +132,10 @@ Index: pgbackrest-release-2.54.0/test/ci.pl processEnd(); processBegin('install test packages'); -Index: pgbackrest-release-2.54.0/test/src/module/command/helpTest.c +Index: pgbackrest-release-2.54.1/test/src/module/command/helpTest.c =================================================================== ---- pgbackrest-release-2.54.0.orig/test/src/module/command/helpTest.c -+++ pgbackrest-release-2.54.0/test/src/module/command/helpTest.c +--- pgbackrest-release-2.54.1.orig/test/src/module/command/helpTest.c ++++ pgbackrest-release-2.54.1/test/src/module/command/helpTest.c @@ -272,7 +272,7 @@ testRun(void) " [default=n]\n" " --io-timeout I/O timeout [default=1m]\n" @@ -145,10 +145,10 @@ Index: pgbackrest-release-2.54.0/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.54.0/test/Vagrantfile +Index: pgbackrest-release-2.54.1/test/Vagrantfile =================================================================== ---- pgbackrest-release-2.54.0.orig/test/Vagrantfile -+++ pgbackrest-release-2.54.0/test/Vagrantfile +--- pgbackrest-release-2.54.1.orig/test/Vagrantfile ++++ pgbackrest-release-2.54.1/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