diff --git a/libpq-fe.h_localisation.patch b/libpq-fe.h_localisation.patch index e00e998..1516233 100644 --- a/libpq-fe.h_localisation.patch +++ b/libpq-fe.h_localisation.patch @@ -1,7 +1,7 @@ -Index: pgbackrest-release-2.47/src/configure +Index: pgbackrest-release-2.48/src/configure =================================================================== ---- pgbackrest-release-2.47.orig/src/configure -+++ pgbackrest-release-2.47/src/configure +--- pgbackrest-release-2.48.orig/src/configure ++++ pgbackrest-release-2.48/src/configure @@ -3603,12 +3603,12 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h @@ -17,10 +17,10 @@ Index: pgbackrest-release-2.47/src/configure fi -Index: pgbackrest-release-2.47/src/postgres/client.c +Index: pgbackrest-release-2.48/src/postgres/client.c =================================================================== ---- pgbackrest-release-2.47.orig/src/postgres/client.c -+++ pgbackrest-release-2.47/src/postgres/client.c +--- pgbackrest-release-2.48.orig/src/postgres/client.c ++++ pgbackrest-release-2.48/src/postgres/client.c @@ -3,7 +3,7 @@ Postgres Client ***********************************************************************************************************************************/ #include "build.auto.h" diff --git a/pgbackrest-2.47.tar.gz b/pgbackrest-2.47.tar.gz deleted file mode 100644 index fec14c1..0000000 --- a/pgbackrest-2.47.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7712c26b41a969cf487abb4a8075f77943fe6d30aba49ab8edb1ac596cd1ee0e -size 6093123 diff --git a/pgbackrest-2.48.tar.gz b/pgbackrest-2.48.tar.gz new file mode 100644 index 0000000..69c7ad6 --- /dev/null +++ b/pgbackrest-2.48.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec470e8dc401f746bfe6dd65f5b720e53ca4db0d9310537f0efc6ee54edb649d +size 6148866 diff --git a/pgbackrest.changes b/pgbackrest.changes index 6fd7128..fcd13f6 100644 --- a/pgbackrest.changes +++ b/pgbackrest.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Sep 28 07:31:44 UTC 2023 - Andrea Manzini + +- update to version 2.48 + * Bug Fixes: + + Fix issue restoring block incremental without a block list. + + [doc] Fix configuration reference example for the tls-server-address option. + + [doc] Fix command reference example for the filter option. + + * Features: + + Add --repo-storage-tag option to create object tags. + + Add known hosts checking for SFTP storage driver. + + Support for dual stack connections. + + Add backup size completed/total to info command JSON output. + + * Improvements: + + Multi-stanza check command. + + Retry reads of pg_control until checksum is valid. + + Optimize WAL segment check after successful backup. + + Improve GCS multi-part performance. + + Allow archive-get command to run when stanza is stopped. + + Accept leading tilde in paths for SFTP public/private keys. + + Reload GCS credentials before renewing authentication token. + + * Test Suite Improvements + +- refreshed patches; release.xml has been splitted into individual files + ------------------------------------------------------------------- Mon Aug 7 06:11:25 UTC 2023 - Andrea Manzini diff --git a/pgbackrest.spec b/pgbackrest.spec index d4f0193..d73648c 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.47 +Version: 2.48 Release: 0 Summary: Reliable PostgreSQL Backup & Restore License: MIT diff --git a/use-run-pgbackrest.patch b/use-run-pgbackrest.patch index 3ba4923..9dfbb61 100644 --- a/use-run-pgbackrest.patch +++ b/use-run-pgbackrest.patch @@ -1,8 +1,7 @@ -Index: pgbackrest-release-2.47/CODING.md -=================================================================== ---- pgbackrest-release-2.47.orig/CODING.md -+++ pgbackrest-release-2.47/CODING.md -@@ -268,11 +268,11 @@ Continuation characters should be aligne +diff --color -ur pgbackrest-release-2.48.orig/CODING.md pgbackrest-release-2.48/CODING.md +--- pgbackrest-release-2.48.orig/CODING.md 2023-09-25 15:32:15.000000000 +0200 ++++ pgbackrest-release-2.48/CODING.md 2023-09-28 09:22:26.157150420 +0200 +@@ -268,11 +268,11 @@ This function can be called without variable parameters: ```c @@ -16,11 +15,10 @@ Index: pgbackrest-release-2.47/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.47/doc/resource/git-history.cache -=================================================================== ---- pgbackrest-release-2.47.orig/doc/resource/git-history.cache -+++ pgbackrest-release-2.47/doc/resource/git-history.cache -@@ -6792,7 +6792,7 @@ +diff --color -ur pgbackrest-release-2.48.orig/doc/resource/git-history.cache pgbackrest-release-2.48/doc/resource/git-history.cache +--- pgbackrest-release-2.48.orig/doc/resource/git-history.cache 2023-09-25 15:32:15.000000000 +0200 ++++ pgbackrest-release-2.48/doc/resource/git-history.cache 2023-09-28 09:23:13.150991027 +0200 +@@ -7030,7 +7030,7 @@ { "commit": "a1365b26d4c2383eaacea3714eeb521435ca79aa", "date": "2021-01-18 23:41:09 -0500", @@ -29,7 +27,7 @@ Index: pgbackrest-release-2.47/doc/resource/git-history.cache }, { "commit": "8322dfd7af97e307b952cfb37e6a65b65f55be0f", -@@ -9608,8 +9608,8 @@ +@@ -9846,8 +9846,8 @@ { "commit": "3fbfcba811499a59b943dd893eef9ff52090f7b6", "date": "2020-03-16 17:27:01 -0400", @@ -40,7 +38,7 @@ Index: pgbackrest-release-2.47/doc/resource/git-history.cache }, { "commit": "46911c64c19dc8ff76d2a6ff4548fc01647043e0", -@@ -11509,7 +11509,7 @@ +@@ -11747,7 +11747,7 @@ "commit": "45881c74aeff4bb25559ec0254fa7fc1960d9cab", "date": "2019-10-08 12:06:30 -0400", "subject": "Allow most unit tests to run outside of a container.", @@ -49,7 +47,7 @@ Index: pgbackrest-release-2.47/doc/resource/git-history.cache }, { "commit": "77b0c6c993a0e6ff45a6a99f343c3709a016d152", -@@ -19996,7 +19996,7 @@ +@@ -20234,7 +20234,7 @@ "commit": "18fd25233b1db7b3197f5d8dc537d239dcfc7aba", "date": "2016-04-14 09:30:54 -0400", "subject": "New simpler configuration and consistent project/exe/path naming.", @@ -58,11 +56,10 @@ Index: pgbackrest-release-2.47/doc/resource/git-history.cache }, { "commit": "885797e4b58a675487a3531ba16908c1d1e9f970", -Index: pgbackrest-release-2.47/doc/xml/coding.xml -=================================================================== ---- pgbackrest-release-2.47.orig/doc/xml/coding.xml -+++ pgbackrest-release-2.47/doc/xml/coding.xml -@@ -365,13 +365,13 @@ void storagePathCreate(const Storage *th +diff --color -ur pgbackrest-release-2.48.orig/doc/xml/coding.xml pgbackrest-release-2.48/doc/xml/coding.xml +--- pgbackrest-release-2.48.orig/doc/xml/coding.xml 2023-09-25 15:32:15.000000000 +0200 ++++ pgbackrest-release-2.48/doc/xml/coding.xml 2023-09-28 09:24:48.345351857 +0200 +@@ -365,13 +365,13 @@

This function can be called without variable parameters:

@@ -78,24 +75,22 @@ Index: pgbackrest-release-2.47/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.47/doc/xml/release.xml -=================================================================== ---- pgbackrest-release-2.47.orig/doc/xml/release.xml -+++ pgbackrest-release-2.47/doc/xml/release.xml -@@ -11285,7 +11285,7 @@ - - --> +diff --color -ur pgbackrest-release-2.48.orig/doc/xml/release/2016/1.00.xml pgbackrest-release-2.48/doc/xml/release/2016/1.00.xml +--- pgbackrest-release-2.48.orig/doc/xml/release/2016/1.00.xml 2023-09-25 15:32:15.000000000 +0200 ++++ pgbackrest-release-2.48/doc/xml/release/2016/1.00.xml 2023-09-28 09:25:26.135759754 +0200 +@@ -43,7 +43,7 @@ + + --> --

Lock files are now stored in /tmp/pgbackrest by default. These days /run/pgbackrest is the preferred location but that would require init scripts which are not part of this release. The lock-path option can be used to configure the lock directory.

-+

Lock files are now stored in /run/pgbackrest by default. These days /run/pgbackrest is the preferred location but that would require init scripts which are not part of this release. The lock-path option can be used to configure the lock directory.

- +-

Lock files are now stored in /tmp/pgbackrest by default. These days /run/pgbackrest is the preferred location but that would require init scripts which are not part of this release. The lock-path option can be used to configure the lock directory.

++

Lock files are now stored in /run/pgbackrest by default. These days /run/pgbackrest is the preferred location but that would require init scripts which are not part of this release. The lock-path option can be used to configure the lock directory.

+ - -Index: pgbackrest-release-2.47/src/build/config/config.yaml -=================================================================== ---- pgbackrest-release-2.47.orig/src/build/config/config.yaml -+++ pgbackrest-release-2.47/src/build/config/config.yaml -@@ -834,7 +834,7 @@ option: + +diff --color -ur pgbackrest-release-2.48.orig/src/build/config/config.yaml pgbackrest-release-2.48/src/build/config/config.yaml +--- pgbackrest-release-2.48.orig/src/build/config/config.yaml 2023-09-25 15:32:15.000000000 +0200 ++++ pgbackrest-release-2.48/src/build/config/config.yaml 2023-09-28 09:26:03.226162015 +0200 +@@ -844,7 +844,7 @@ lock-path: section: global type: path @@ -104,11 +99,10 @@ Index: pgbackrest-release-2.47/src/build/config/config.yaml command: annotate: {} archive-get: {} -Index: pgbackrest-release-2.47/src/config/parse.auto.c.inc -=================================================================== ---- pgbackrest-release-2.47.orig/src/config/parse.auto.c.inc -+++ pgbackrest-release-2.47/src/config/parse.auto.c.inc -@@ -11,7 +11,7 @@ Rule Strings +diff --color -ur pgbackrest-release-2.48.orig/src/config/parse.auto.c.inc pgbackrest-release-2.48/src/config/parse.auto.c.inc +--- pgbackrest-release-2.48.orig/src/config/parse.auto.c.inc 2023-09-25 15:32:15.000000000 +0200 ++++ pgbackrest-release-2.48/src/config/parse.auto.c.inc 2023-09-28 09:26:36.286522454 +0200 +@@ -11,7 +11,7 @@ static const StringPub parseRuleValueStr[] = { @@ -117,11 +111,10 @@ Index: pgbackrest-release-2.47/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.47/test/ci.pl -=================================================================== ---- pgbackrest-release-2.47.orig/test/ci.pl -+++ pgbackrest-release-2.47/test/ci.pl -@@ -202,8 +202,8 @@ eval +diff --color -ur pgbackrest-release-2.48.orig/test/ci.pl pgbackrest-release-2.48/test/ci.pl +--- pgbackrest-release-2.48.orig/test/ci.pl 2023-09-25 15:32:15.000000000 +0200 ++++ pgbackrest-release-2.48/test/ci.pl 2023-09-28 09:27:15.690285382 +0200 +@@ -202,8 +202,8 @@ $strPackage .= " libdbd-pg-perl"; } @@ -132,11 +125,10 @@ Index: pgbackrest-release-2.47/test/ci.pl processEnd(); processBegin('install test packages'); -Index: pgbackrest-release-2.47/test/src/module/command/helpTest.c -=================================================================== ---- pgbackrest-release-2.47.orig/test/src/module/command/helpTest.c -+++ pgbackrest-release-2.47/test/src/module/command/helpTest.c -@@ -244,7 +244,7 @@ testRun(void) +diff --color -ur pgbackrest-release-2.48.orig/test/src/module/command/helpTest.c pgbackrest-release-2.48/test/src/module/command/helpTest.c +--- pgbackrest-release-2.48.orig/test/src/module/command/helpTest.c 2023-09-25 15:32:15.000000000 +0200 ++++ pgbackrest-release-2.48/test/src/module/command/helpTest.c 2023-09-28 09:27:41.610567970 +0200 +@@ -244,7 +244,7 @@ " [default=n]\n" " --io-timeout I/O timeout [default=60]\n" " --lock-path path where lock files are stored\n" @@ -145,11 +137,10 @@ Index: pgbackrest-release-2.47/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.47/test/Vagrantfile -=================================================================== ---- pgbackrest-release-2.47.orig/test/Vagrantfile -+++ pgbackrest-release-2.47/test/Vagrantfile -@@ -54,12 +54,12 @@ Vagrant.configure(2) do |config| +diff --color -ur pgbackrest-release-2.48.orig/test/Vagrantfile pgbackrest-release-2.48/test/Vagrantfile +--- pgbackrest-release-2.48.orig/test/Vagrantfile 2023-09-25 15:32:15.000000000 +0200 ++++ pgbackrest-release-2.48/test/Vagrantfile 2023-09-28 09:28:30.327765777 +0200 +@@ -54,12 +54,12 @@ sudo /etc/init.d/virtualbox-guest-utils stop sudo /usr/sbin/VBoxService --timesync-set-on-restore --timesync-interval 5000 --timesync-set-threshold 1