From e62a54aa649f187c541d38d31c76f5c35a9765efe6a26f9339bfd12e4c030c3c Mon Sep 17 00:00:00 2001
From: Andrea Manzini <andrea.manzini@suse.com>
Date: Wed, 29 Nov 2023 07:21:23 +0000
Subject: [PATCH] Accepting request 1129645 from
 home:amanzini:branches:server:database:postgresql

- update to version 2.49
  * Bug Fixes:
    + Fix regression in retries
    + Fix recursive path remove in SFTP storage driver
  * Improvements:
    + Remove support for PostgreSQL 9.3
  * Documentation Features:
    + Document maintainer options
    + Update point-in-time recovery documentation for PostgreSQL >= 13
  * Test Suite Improvements

OBS-URL: https://build.opensuse.org/request/show/1129645
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/pgbackrest?expand=0&rev=63
---
 libpq-fe.h_localisation.patch | 12 ++---
 pgbackrest-2.48.tar.gz        |  3 --
 pgbackrest-2.49.tar.gz        |  3 ++
 pgbackrest.changes            | 17 +++++++
 pgbackrest.spec               |  2 +-
 use-run-pgbackrest.patch      | 85 +++++++++++++++++++----------------
 6 files changed, 74 insertions(+), 48 deletions(-)
 delete mode 100644 pgbackrest-2.48.tar.gz
 create mode 100644 pgbackrest-2.49.tar.gz

diff --git a/libpq-fe.h_localisation.patch b/libpq-fe.h_localisation.patch
index 1516233..ee6c001 100644
--- a/libpq-fe.h_localisation.patch
+++ b/libpq-fe.h_localisation.patch
@@ -1,7 +1,7 @@
-Index: pgbackrest-release-2.48/src/configure
+Index: pgbackrest-release-2.49/src/configure
 ===================================================================
---- pgbackrest-release-2.48.orig/src/configure
-+++ pgbackrest-release-2.48/src/configure
+--- pgbackrest-release-2.49.orig/src/configure
++++ pgbackrest-release-2.49/src/configure
 @@ -3603,12 +3603,12 @@ then :
  printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
  
@@ -17,10 +17,10 @@ Index: pgbackrest-release-2.48/src/configure
  fi
  
  
-Index: pgbackrest-release-2.48/src/postgres/client.c
+Index: pgbackrest-release-2.49/src/postgres/client.c
 ===================================================================
---- pgbackrest-release-2.48.orig/src/postgres/client.c
-+++ pgbackrest-release-2.48/src/postgres/client.c
+--- pgbackrest-release-2.49.orig/src/postgres/client.c
++++ pgbackrest-release-2.49/src/postgres/client.c
 @@ -3,7 +3,7 @@ Postgres Client
  ***********************************************************************************************************************************/
  #include "build.auto.h"
diff --git a/pgbackrest-2.48.tar.gz b/pgbackrest-2.48.tar.gz
deleted file mode 100644
index 69c7ad6..0000000
--- a/pgbackrest-2.48.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ec470e8dc401f746bfe6dd65f5b720e53ca4db0d9310537f0efc6ee54edb649d
-size 6148866
diff --git a/pgbackrest-2.49.tar.gz b/pgbackrest-2.49.tar.gz
new file mode 100644
index 0000000..8e35d33
--- /dev/null
+++ b/pgbackrest-2.49.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32a2d1bd504cc13f6e01533811104da39e2e842cdd8a7ba87293021cf03162f3
+size 6162457
diff --git a/pgbackrest.changes b/pgbackrest.changes
index fcd13f6..481cd4a 100644
--- a/pgbackrest.changes
+++ b/pgbackrest.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Nov 28 16:20:55 UTC 2023 - Andrea Manzini <andrea.manzini@suse.com>
+
+- update to version 2.49
+  * Bug Fixes:
+    + Fix regression in retries 
+    + Fix recursive path remove in SFTP storage driver
+
+  * Improvements:
+    + Remove support for PostgreSQL 9.3
+
+  * Documentation Features:
+    + Document maintainer options
+    + Update point-in-time recovery documentation for PostgreSQL >= 13
+
+  * Test Suite Improvements
+
 -------------------------------------------------------------------
 Thu Sep 28 07:31:44 UTC 2023 - Andrea Manzini <andrea.manzini@suse.com>
 
diff --git a/pgbackrest.spec b/pgbackrest.spec
index d73648c..20d1a6f 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.48
+Version:        2.49
 Release:        0
 Summary:        Reliable PostgreSQL Backup & Restore
 License:        MIT
diff --git a/use-run-pgbackrest.patch b/use-run-pgbackrest.patch
index 9dfbb61..a131bab 100644
--- a/use-run-pgbackrest.patch
+++ b/use-run-pgbackrest.patch
@@ -1,7 +1,8 @@
-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 @@
+Index: pgbackrest-release-2.49/CODING.md
+===================================================================
+--- pgbackrest-release-2.49.orig/CODING.md
++++ pgbackrest-release-2.49/CODING.md
+@@ -268,11 +268,11 @@ Continuation characters should be aligne
  
  This function can be called without variable parameters:
  ```c
@@ -15,10 +16,11 @@ diff --color -ur pgbackrest-release-2.48.orig/CODING.md pgbackrest-release-2.48/
  ```
  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.
  
-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 @@
+Index: pgbackrest-release-2.49/doc/resource/git-history.cache
+===================================================================
+--- pgbackrest-release-2.49.orig/doc/resource/git-history.cache
++++ pgbackrest-release-2.49/doc/resource/git-history.cache
+@@ -7203,7 +7203,7 @@
      {
          "commit": "a1365b26d4c2383eaacea3714eeb521435ca79aa",
          "date": "2021-01-18 23:41:09 -0500",
@@ -27,7 +29,7 @@ diff --color -ur pgbackrest-release-2.48.orig/doc/resource/git-history.cache pgb
      },
      {
          "commit": "8322dfd7af97e307b952cfb37e6a65b65f55be0f",
-@@ -9846,8 +9846,8 @@
+@@ -10019,8 +10019,8 @@
      {
          "commit": "3fbfcba811499a59b943dd893eef9ff52090f7b6",
          "date": "2020-03-16 17:27:01 -0400",
@@ -38,7 +40,7 @@ diff --color -ur pgbackrest-release-2.48.orig/doc/resource/git-history.cache pgb
      },
      {
          "commit": "46911c64c19dc8ff76d2a6ff4548fc01647043e0",
-@@ -11747,7 +11747,7 @@
+@@ -11920,7 +11920,7 @@
          "commit": "45881c74aeff4bb25559ec0254fa7fc1960d9cab",
          "date": "2019-10-08 12:06:30 -0400",
          "subject": "Allow most unit tests to run outside of a container.",
@@ -47,7 +49,7 @@ diff --color -ur pgbackrest-release-2.48.orig/doc/resource/git-history.cache pgb
      },
      {
          "commit": "77b0c6c993a0e6ff45a6a99f343c3709a016d152",
-@@ -20234,7 +20234,7 @@
+@@ -20407,7 +20407,7 @@
          "commit": "18fd25233b1db7b3197f5d8dc537d239dcfc7aba",
          "date": "2016-04-14 09:30:54 -0400",
          "subject": "New simpler configuration and consistent project/exe/path naming.",
@@ -56,10 +58,11 @@ diff --color -ur pgbackrest-release-2.48.orig/doc/resource/git-history.cache pgb
      },
      {
          "commit": "885797e4b58a675487a3531ba16908c1d1e9f970",
-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 @@
+Index: pgbackrest-release-2.49/doc/xml/coding.xml
+===================================================================
+--- pgbackrest-release-2.49.orig/doc/xml/coding.xml
++++ pgbackrest-release-2.49/doc/xml/coding.xml
+@@ -365,13 +365,13 @@ void storagePathCreate(const Storage *th
              <p>This function can be called without variable parameters:</p>
  
              <code-block type="c">
@@ -75,9 +78,10 @@ diff --color -ur pgbackrest-release-2.48.orig/doc/xml/coding.xml pgbackrest-rele
              </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>
-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
+Index: pgbackrest-release-2.49/doc/xml/release/2016/1.00.xml
+===================================================================
+--- pgbackrest-release-2.49.orig/doc/xml/release/2016/1.00.xml
++++ pgbackrest-release-2.49/doc/xml/release/2016/1.00.xml
 @@ -43,7 +43,7 @@
                      <release-item-contributor id="david.steele"/>
                  </release-item-contributor-list> -->
@@ -87,10 +91,11 @@ diff --color -ur pgbackrest-release-2.48.orig/doc/xml/release/2016/1.00.xml pgba
              </release-item>
  
              <release-item>
-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 @@
+Index: pgbackrest-release-2.49/src/build/config/config.yaml
+===================================================================
+--- pgbackrest-release-2.49.orig/src/build/config/config.yaml
++++ pgbackrest-release-2.49/src/build/config/config.yaml
+@@ -844,7 +844,7 @@ option:
    lock-path:
      section: global
      type: path
@@ -99,10 +104,11 @@ diff --color -ur pgbackrest-release-2.48.orig/src/build/config/config.yaml pgbac
      command:
        annotate: {}
        archive-get: {}
-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 @@
+Index: pgbackrest-release-2.49/src/config/parse.auto.c.inc
+===================================================================
+--- pgbackrest-release-2.49.orig/src/config/parse.auto.c.inc
++++ pgbackrest-release-2.49/src/config/parse.auto.c.inc
+@@ -11,7 +11,7 @@ Rule Strings
  
  static const StringPub parseRuleValueStr[] =
  {
@@ -111,10 +117,11 @@ diff --color -ur pgbackrest-release-2.48.orig/src/config/parse.auto.c.inc pgback
      PARSE_RULE_STRPUB("/var/lib/pgbackrest"),                                                                             // val/str
      PARSE_RULE_STRPUB("/var/log/pgbackrest"),                                                                             // val/str
      PARSE_RULE_STRPUB("/var/spool/pgbackrest"),                                                                           // val/str
-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 @@
+Index: pgbackrest-release-2.49/test/ci.pl
+===================================================================
+--- pgbackrest-release-2.49.orig/test/ci.pl
++++ pgbackrest-release-2.49/test/ci.pl
+@@ -202,8 +202,8 @@ eval
              $strPackage .= " libdbd-pg-perl";
          }
  
@@ -125,10 +132,11 @@ diff --color -ur pgbackrest-release-2.48.orig/test/ci.pl pgbackrest-release-2.48
          processEnd();
  
          processBegin('install test packages');
-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 @@
+Index: pgbackrest-release-2.49/test/src/module/command/helpTest.c
+===================================================================
+--- pgbackrest-release-2.49.orig/test/src/module/command/helpTest.c
++++ pgbackrest-release-2.49/test/src/module/command/helpTest.c
+@@ -245,7 +245,7 @@ testRun(void)
              "                                      [default=n]\n"
              "  --io-timeout                        I/O timeout [default=60]\n"
              "  --lock-path                         path where lock files are stored\n"
@@ -137,10 +145,11 @@ diff --color -ur pgbackrest-release-2.48.orig/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"
-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 @@
+Index: pgbackrest-release-2.49/test/Vagrantfile
+===================================================================
+--- pgbackrest-release-2.49.orig/test/Vagrantfile
++++ pgbackrest-release-2.49/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