Accepting request 960068 from home:darix:branches:server:database:postgresql
- Move lock file default to /run/pgbackrest and make sure it gets created with user and group postgres - Add use-run-pgbackrest.patch - Add README.SUSE - Track series file to make quilt setup easier - refresh libpq-fe.h_localisation.patch OBS-URL: https://build.opensuse.org/request/show/960068 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/pgbackrest?expand=0&rev=45
This commit is contained in:
Git OBS Bridge
parent
588c5b791e
commit
17c261ba26
3
README.SUSE
Normal file
3
README.SUSE
Normal file
@ -0,0 +1,3 @@
|
||||
SUSE Changes to pgbackrest
|
||||
|
||||
move the lock file to /run/pgbackrest and make sure that it gets created with the postgres user and group.
|
||||
@ -1,7 +1,8 @@
|
||||
diff -rup a/src/configure b/src/configure
|
||||
--- a/src/configure 2020-04-20 21:44:31.000000000 +0200
|
||||
+++ b/src/configure 2020-05-01 18:04:29.395666444 +0200
|
||||
@@ -3746,11 +3746,11 @@ fi
|
||||
Index: pgbackrest-release-2.37/src/configure
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/src/configure
|
||||
+++ pgbackrest-release-2.37/src/configure
|
||||
@@ -3678,11 +3678,11 @@ fi
|
||||
done
|
||||
|
||||
|
||||
@ -15,9 +16,10 @@ diff -rup a/src/configure b/src/configure
|
||||
fi
|
||||
|
||||
|
||||
diff -rup a/src/postgres/client.c b/src/postgres/client.c
|
||||
--- a/src/postgres/client.c 2020-04-20 21:44:31.000000000 +0200
|
||||
+++ b/src/postgres/client.c 2020-05-01 18:05:20.732221835 +0200
|
||||
Index: pgbackrest-release-2.37/src/postgres/client.c
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/src/postgres/client.c
|
||||
+++ pgbackrest-release-2.37/src/postgres/client.c
|
||||
@@ -3,7 +3,7 @@ Postgres Client
|
||||
***********************************************************************************************************************************/
|
||||
#include "build.auto.h"
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 7 21:41:10 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
|
||||
|
||||
- Move lock file default to /run/pgbackrest and make sure it gets
|
||||
created with user and group postgres
|
||||
- Add use-run-pgbackrest.patch
|
||||
- Add README.SUSE
|
||||
- Track series file to make quilt setup easier
|
||||
- refresh libpq-fe.h_localisation.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 18 18:01:39 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
|
||||
|
||||
|
||||
@ -36,8 +36,13 @@ Source14: pgbackrest-incr@.service
|
||||
Source15: pgbackrest-incr@.timer
|
||||
Source16: pgbackrest.service
|
||||
Source17: pgbackrest.target
|
||||
Source18: pgbackrest.tmpfiles.d
|
||||
|
||||
Source98: README.SUSE
|
||||
Source99: series
|
||||
|
||||
Patch0: libpq-fe.h_localisation.patch
|
||||
Patch1: use-run-pgbackrest.patch
|
||||
BuildRequires: libyaml-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkgconfig
|
||||
@ -80,6 +85,7 @@ The following features are available:
|
||||
%autosetup -p1 -n %{name}-release-%{version}
|
||||
|
||||
%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
|
||||
@ -110,6 +116,11 @@ install -m 0644 \
|
||||
%{SOURCE17} \
|
||||
%{buildroot}%{_unitdir}
|
||||
|
||||
install -D -m 0644 \
|
||||
%{SOURCE18} \
|
||||
%{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||
|
||||
|
||||
%check
|
||||
# Tests are only available with Vagrant
|
||||
# We just test that the binary works.
|
||||
@ -119,6 +130,7 @@ install -m 0644 \
|
||||
%service_add_pre %{services}
|
||||
|
||||
%post
|
||||
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
|
||||
%service_add_post %{services}
|
||||
|
||||
%preun
|
||||
@ -128,13 +140,14 @@ install -m 0644 \
|
||||
%service_del_postun %{services}
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%doc README.md README.SUSE
|
||||
%license LICENSE
|
||||
%config(noreplace) %attr (640,root,postgres) %{_sysconfdir}/%{name}.conf
|
||||
# We still can do that as postgres user is system fixed
|
||||
%attr(-,postgres,postgres) %{_localstatedir}/log/%{name}
|
||||
%attr(-,postgres,postgres) %{_localstatedir}/lib/%{name}
|
||||
%attr(-,postgres,postgres) %{_localstatedir}/spool/%{name}
|
||||
%ghost %dir %attr(750,postgres,postgres) /run/pgbackrest
|
||||
%{_bindir}/%{name}
|
||||
%{_unitdir}/pgbackrest-diff@.service
|
||||
%{_unitdir}/pgbackrest-diff@.timer
|
||||
@ -144,5 +157,6 @@ install -m 0644 \
|
||||
%{_unitdir}/pgbackrest-incr@.timer
|
||||
%{_unitdir}/pgbackrest.service
|
||||
%{_unitdir}/pgbackrest.target
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
|
||||
%changelog
|
||||
%changelog
|
||||
|
||||
2
pgbackrest.tmpfiles.d
Normal file
2
pgbackrest.tmpfiles.d
Normal file
@ -0,0 +1,2 @@
|
||||
# Type Path Mode UID GID Age Argument
|
||||
d /run/pgbackrest 0750 postgres postgres - -
|
||||
2
series
Normal file
2
series
Normal file
@ -0,0 +1,2 @@
|
||||
libpq-fe.h_localisation.patch
|
||||
use-run-pgbackrest.patch
|
||||
169
use-run-pgbackrest.patch
Normal file
169
use-run-pgbackrest.patch
Normal file
@ -0,0 +1,169 @@
|
||||
Index: pgbackrest-release-2.37/CODING.md
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/CODING.md
|
||||
+++ pgbackrest-release-2.37/CODING.md
|
||||
@@ -260,11 +260,11 @@ Continuation characters should be aligne
|
||||
|
||||
This function can be called without variable parameters:
|
||||
```c
|
||||
-storagePathCreateP(storageLocal(), "/tmp/pgbackrest");
|
||||
+storagePathCreateP(storageLocal(), "/run/pgbackrest");
|
||||
```
|
||||
Or with variable parameters:
|
||||
```c
|
||||
-storagePathCreateP(storageLocal(), "/tmp/pgbackrest", .errorOnExists = true, .mode = 0777);
|
||||
+storagePathCreateP(storageLocal(), "/run/pgbackrest", .errorOnExists = true, .mode = 0777);
|
||||
```
|
||||
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.37/doc/resource/git-history.cache
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/doc/resource/git-history.cache
|
||||
+++ pgbackrest-release-2.37/doc/resource/git-history.cache
|
||||
@@ -3311,7 +3311,7 @@
|
||||
{
|
||||
"commit": "a1365b26d4c2383eaacea3714eeb521435ca79aa",
|
||||
"date": "2021-01-18 23:41:09 -0500",
|
||||
- "subject": "Remove duplicate mkdir for /tmp/pgbackrest in Vagrantfile."
|
||||
+ "subject": "Remove duplicate mkdir for /run/pgbackrest in Vagrantfile."
|
||||
},
|
||||
{
|
||||
"commit": "8322dfd7af97e307b952cfb37e6a65b65f55be0f",
|
||||
@@ -6127,8 +6127,8 @@
|
||||
{
|
||||
"commit": "3fbfcba811499a59b943dd893eef9ff52090f7b6",
|
||||
"date": "2020-03-16 17:27:01 -0400",
|
||||
- "subject": "Forbid access to /tmp/pgbackrest in the Vagrantfile.",
|
||||
- "body": "This matches the error that will be thrown in the vm=none test on Travis CI if a unit test writes to /tmp/pgbackrest."
|
||||
+ "subject": "Forbid access to /run/pgbackrest in the Vagrantfile.",
|
||||
+ "body": "This matches the error that will be thrown in the vm=none test on Travis CI if a unit test writes to /run/pgbackrest."
|
||||
},
|
||||
{
|
||||
"commit": "46911c64c19dc8ff76d2a6ff4548fc01647043e0",
|
||||
@@ -8028,7 +8028,7 @@
|
||||
"commit": "45881c74aeff4bb25559ec0254fa7fc1960d9cab",
|
||||
"date": "2019-10-08 12:06:30 -0400",
|
||||
"subject": "Allow most unit tests to run outside of a container.",
|
||||
- "body": "Three major changes were required to get this working:\n\n1) Provide the path to pgbackrest in the build directory when running outside a container. Tests in a container will continue to install and run against /usr/bin/pgbackrest.\n\n1) Set a per-test lock path so tests don't conflict on the default /tmp/pgbackrest path. Also set a per-test log-path while we are at it.\n\n2) Use localhost instead of a custom host for TLS test connections. Tests in containers will continue to update /etc/hosts and use the custom host.\n\nAdd infrastructure and update harnessCfgLoad*() to get the correct exe and paths loaded for testing.\n\nSince new tests are required to verify that running outside a container works, also rework the tests in Travis CI to provide coverage within a reasonable amount of time. Mainly, break up to doc tests by VM and run an abbreviated unit test suite on co6 and co7."
|
||||
+ "body": "Three major changes were required to get this working:\n\n1) Provide the path to pgbackrest in the build directory when running outside a container. Tests in a container will continue to install and run against /usr/bin/pgbackrest.\n\n1) Set a per-test lock path so tests don't conflict on the default /run/pgbackrest path. Also set a per-test log-path while we are at it.\n\n2) Use localhost instead of a custom host for TLS test connections. Tests in containers will continue to update /etc/hosts and use the custom host.\n\nAdd infrastructure and update harnessCfgLoad*() to get the correct exe and paths loaded for testing.\n\nSince new tests are required to verify that running outside a container works, also rework the tests in Travis CI to provide coverage within a reasonable amount of time. Mainly, break up to doc tests by VM and run an abbreviated unit test suite on co6 and co7."
|
||||
},
|
||||
{
|
||||
"commit": "77b0c6c993a0e6ff45a6a99f343c3709a016d152",
|
||||
@@ -16515,7 +16515,7 @@
|
||||
"commit": "18fd25233b1db7b3197f5d8dc537d239dcfc7aba",
|
||||
"date": "2016-04-14 09:30:54 -0400",
|
||||
"subject": "New simpler configuration and consistent project/exe/path naming.",
|
||||
- "body": "* The repo-path option now always refers to the repository where backups and archive are stored, whether local or remote, so the repo-remote-path option has been removed. The new spool-path option can be used to define a location for queueing WAL segments when archiving asynchronously. Otherwise, a local repository is no longer required.\n\n* Implemented a new config format which should be far simpler to use. See the User Guide and Configuration Reference for details but for a simple configuration all options can now be placed in the stanza section. Options that are shared between stanzas can be placed in the [global] section. More complex configurations can still make use of command sections though this should be a rare use case.\n\n* The default configuration filename is now pgbackrest.conf instead of pg_backrest.conf. This was done for consistency with other naming changes but also to prevent old config files from being loaded accidentally.\n\n* The default repository name was changed from /var/lib/backup to /var/lib/pgbackrest.\n\n* Lock files are now stored in /tmp/pgbackrest by default. These days /run/pgbackrest would be 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.\n\n* Log files are now stored in /var/log/pgbackrest by default and no longer have the date appended so they can be managed with logrotate. The log-path option can be used to configure the lock directory.\n\n* Executable filename changed from pg_backrest to pgbackrest."
|
||||
+ "body": "* The repo-path option now always refers to the repository where backups and archive are stored, whether local or remote, so the repo-remote-path option has been removed. The new spool-path option can be used to define a location for queueing WAL segments when archiving asynchronously. Otherwise, a local repository is no longer required.\n\n* Implemented a new config format which should be far simpler to use. See the User Guide and Configuration Reference for details but for a simple configuration all options can now be placed in the stanza section. Options that are shared between stanzas can be placed in the [global] section. More complex configurations can still make use of command sections though this should be a rare use case.\n\n* The default configuration filename is now pgbackrest.conf instead of pg_backrest.conf. This was done for consistency with other naming changes but also to prevent old config files from being loaded accidentally.\n\n* The default repository name was changed from /var/lib/backup to /var/lib/pgbackrest.\n\n* Lock files are now stored in /run/pgbackrest by default. These days /run/pgbackrest would be 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.\n\n* Log files are now stored in /var/log/pgbackrest by default and no longer have the date appended so they can be managed with logrotate. The log-path option can be used to configure the lock directory.\n\n* Executable filename changed from pg_backrest to pgbackrest."
|
||||
},
|
||||
{
|
||||
"commit": "885797e4b58a675487a3531ba16908c1d1e9f970",
|
||||
Index: pgbackrest-release-2.37/doc/xml/coding.xml
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/doc/xml/coding.xml
|
||||
+++ pgbackrest-release-2.37/doc/xml/coding.xml
|
||||
@@ -331,13 +331,13 @@ void storagePathCreate(const Storage *th
|
||||
<p>This function can be called without variable parameters:</p>
|
||||
|
||||
<code-block type="c">
|
||||
-storagePathCreateP(storageLocal(), "/tmp/pgbackrest");
|
||||
+storagePathCreateP(storageLocal(), "/run/pgbackrest");
|
||||
</code-block>
|
||||
|
||||
<p>Or with variable parameters:</p>
|
||||
|
||||
<code-block type="c">
|
||||
-storagePathCreateP(storageLocal(), "/tmp/pgbackrest", .errorOnExists = true, .mode = 0777);
|
||||
+storagePathCreateP(storageLocal(), "/run/pgbackrest", .errorOnExists = true, .mode = 0777);
|
||||
</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>
|
||||
Index: pgbackrest-release-2.37/doc/xml/release.xml
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/doc/xml/release.xml
|
||||
+++ pgbackrest-release-2.37/doc/xml/release.xml
|
||||
@@ -9425,7 +9425,7 @@
|
||||
<release-item-contributor id="david.steele"/>
|
||||
</release-item-contributor-list> -->
|
||||
|
||||
- <p>Lock files are now stored in <path>/tmp/pgbackrest</path> by default. These days <path>/run/pgbackrest</path> is the preferred location but that would require init scripts which are not part of this release. The <setting>lock-path</setting> option can be used to configure the lock directory.</p>
|
||||
+ <p>Lock files are now stored in <path>/run/pgbackrest</path> by default. These days <path>/run/pgbackrest</path> is the preferred location but that would require init scripts which are not part of this release. The <setting>lock-path</setting> option can be used to configure the lock directory.</p>
|
||||
</release-item>
|
||||
|
||||
<release-item>
|
||||
Index: pgbackrest-release-2.37/src/build/config/config.yaml
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/src/build/config/config.yaml
|
||||
+++ pgbackrest-release-2.37/src/build/config/config.yaml
|
||||
@@ -766,7 +766,7 @@ option:
|
||||
lock-path:
|
||||
section: global
|
||||
type: path
|
||||
- default: /tmp/pgbackrest
|
||||
+ default: /run/pgbackrest
|
||||
command:
|
||||
archive-get: {}
|
||||
archive-push: {}
|
||||
Index: pgbackrest-release-2.37/src/config/parse.auto.c
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/src/config/parse.auto.c
|
||||
+++ pgbackrest-release-2.37/src/config/parse.auto.c
|
||||
@@ -11,7 +11,7 @@ Rule Strings
|
||||
|
||||
static const StringPub parseRuleValueStr[] =
|
||||
{
|
||||
- PARSE_RULE_STRPUB("/tmp/pgbackrest"),
|
||||
+ PARSE_RULE_STRPUB("/run/pgbackrest"),
|
||||
PARSE_RULE_STRPUB("/var/lib/pgbackrest"),
|
||||
PARSE_RULE_STRPUB("/var/log/pgbackrest"),
|
||||
PARSE_RULE_STRPUB("/var/spool/pgbackrest"),
|
||||
Index: pgbackrest-release-2.37/test/Vagrantfile
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/test/Vagrantfile
|
||||
+++ pgbackrest-release-2.37/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
|
||||
|
||||
- # Create /tmp/pgbackrest and give ownership to root so we know unit tests are not writing there
|
||||
+ # Create /run/pgbackrest and give ownership to root so we know unit tests are not writing there
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
- echo 'Create /tmp/pgbackrest owned by root' && date
|
||||
- sudo mkdir -p /tmp/pgbackrest
|
||||
- sudo chown root:root /tmp/pgbackrest
|
||||
- sudo chmod 700 /tmp/pgbackrest
|
||||
+ echo 'Create /run/pgbackrest owned by root' && date
|
||||
+ sudo mkdir -p /run/pgbackrest
|
||||
+ sudo chown root:root /run/pgbackrest
|
||||
+ sudo chmod 700 /run/pgbackrest
|
||||
|
||||
# Mount tmpfs at /home/vagrant/test for faster testing
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
Index: pgbackrest-release-2.37/test/ci.pl
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/test/ci.pl
|
||||
+++ pgbackrest-release-2.37/test/ci.pl
|
||||
@@ -206,8 +206,8 @@ eval
|
||||
$strPackage .= " libdbd-pg-perl";
|
||||
}
|
||||
|
||||
- processBegin('/tmp/pgbackrest owned by root so tests cannot use it');
|
||||
- processExec('sudo mkdir -p /tmp/pgbackrest && sudo chown root:root /tmp/pgbackrest && sudo chmod 700 /tmp/pgbackrest');
|
||||
+ processBegin('/run/pgbackrest owned by root so tests cannot use it');
|
||||
+ processExec('sudo mkdir -p /run/pgbackrest && sudo chown root:root /run/pgbackrest && sudo chmod 700 /run/pgbackrest');
|
||||
processEnd();
|
||||
|
||||
processBegin('install test packages');
|
||||
Index: pgbackrest-release-2.37/test/src/module/command/helpTest.c
|
||||
===================================================================
|
||||
--- pgbackrest-release-2.37.orig/test/src/module/command/helpTest.c
|
||||
+++ pgbackrest-release-2.37/test/src/module/command/helpTest.c
|
||||
@@ -227,7 +227,7 @@ testRun(void)
|
||||
" --delta restore or backup using checksums [default=n]\n"
|
||||
" --io-timeout I/O timeout [default=60]\n"
|
||||
" --lock-path path where lock files are stored\n"
|
||||
- " [default=/tmp/pgbackrest]\n"
|
||||
+ " [default=/run/pgbackrest]\n"
|
||||
" --neutral-umask use a neutral umask [default=y]\n"
|
||||
" --process-max max processes to use for compress/transfer\n"
|
||||
" [default=1]\n"
|
||||
Loading…
Reference in New Issue
Block a user