Compare commits
2 Commits
8954cea871
...
288411f88a
| Author | SHA1 | Date | |
|---|---|---|---|
| 288411f88a | |||
| cc8a5e6bde |
@ -1,15 +0,0 @@
|
||||
diff -Naur a/src/editor/spell.c b/src/editor/spell.c
|
||||
--- a/src/editor/spell.c 2024-08-08 13:49:18.000000000 +0600
|
||||
+++ b/src/editor/spell.c 2024-10-03 16:07:15.840030146 +0600
|
||||
@@ -174,8 +174,9 @@
|
||||
|
||||
spell_module = g_module_open ("libaspell", G_MODULE_BIND_LAZY);
|
||||
|
||||
- if (spell_module != NULL
|
||||
- && ASPELL_FUNCTION_AVAILABLE (new_aspell_config)
|
||||
+ if (spell_module == NULL)
|
||||
+ return FALSE;
|
||||
+ if (ASPELL_FUNCTION_AVAILABLE (new_aspell_config)
|
||||
&& ASPELL_FUNCTION_AVAILABLE (aspell_dict_info_list_elements)
|
||||
&& ASPELL_FUNCTION_AVAILABLE (aspell_dict_info_enumeration_next)
|
||||
&& ASPELL_FUNCTION_AVAILABLE (new_aspell_speller)
|
||||
@ -1,28 +1,30 @@
|
||||
diff -Naur a/contrib/mc-wrapper.csh.in b/contrib/mc-wrapper.csh.in
|
||||
--- a/contrib/mc-wrapper.csh.in 2024-08-08 13:49:18.000000000 +0600
|
||||
+++ b/contrib/mc-wrapper.csh.in 2024-08-25 08:34:15.121295453 +0600
|
||||
--- a/contrib/mc-wrapper.csh.in 2025-01-11 23:51:01.000000000 +0600
|
||||
+++ b/contrib/mc-wrapper.csh.in 2025-01-24 16:52:12.797670399 +0600
|
||||
@@ -3,7 +3,7 @@
|
||||
if ($?TMPDIR) then
|
||||
setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$
|
||||
else if ($?TMPDIR) then
|
||||
setenv MC_PWD_FILE "`mktemp '$TMPDIR/mc.pwd.XXXXXX'`"
|
||||
else
|
||||
- setenv MC_PWD_FILE /tmp/mc-$MC_USER/mc.pwd.$$
|
||||
+ setenv MC_PWD_FILE /var/tmp/mc-$MC_USER/mc.pwd.$$
|
||||
- setenv MC_PWD_FILE "`mktemp '/tmp/mc.pwd.XXXXXX'`"
|
||||
+ setenv MC_PWD_FILE "`mktemp '/var/tmp/mc.pwd.XXXXXX'`"
|
||||
endif
|
||||
|
||||
@bindir@/mc -P "$MC_PWD_FILE" $*
|
||||
diff -Naur a/contrib/mc-wrapper.sh.in b/contrib/mc-wrapper.sh.in
|
||||
--- a/contrib/mc-wrapper.sh.in 2024-08-08 13:49:18.000000000 +0600
|
||||
+++ b/contrib/mc-wrapper.sh.in 2024-08-25 08:34:03.489374384 +0600
|
||||
@@ -1,5 +1,5 @@
|
||||
MC_USER=`whoami`
|
||||
-MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
|
||||
+MC_PWD_FILE="${TMPDIR-/var/tmp}/mc-$MC_USER/mc.pwd.$$"
|
||||
@bindir@/mc -P "$MC_PWD_FILE" "$@"
|
||||
--- a/contrib/mc-wrapper.sh.in 2025-01-11 23:51:01.000000000 +0600
|
||||
+++ b/contrib/mc-wrapper.sh.in 2025-01-24 16:52:01.293741145 +0600
|
||||
@@ -3,7 +3,7 @@
|
||||
elif test -n "$TMPDIR"; then
|
||||
MC_PWD_FILE="`mktemp "${TMPDIR}/mc.pwd.XXXXXX"`"
|
||||
else
|
||||
- MC_PWD_FILE="`mktemp "/tmp/mc.pwd.XXXXXX"`"
|
||||
+ MC_PWD_FILE="`mktemp "/var/tmp/mc.pwd.XXXXXX"`"
|
||||
fi
|
||||
|
||||
if test -r "$MC_PWD_FILE"; then
|
||||
@bindir@/mc -P "$MC_PWD_FILE" "$@"
|
||||
diff -Naur a/lib/unixcompat.h b/lib/unixcompat.h
|
||||
--- a/lib/unixcompat.h 2024-08-08 13:49:18.000000000 +0600
|
||||
+++ b/lib/unixcompat.h 2024-08-25 08:35:59.689585879 +0600
|
||||
--- a/lib/unixcompat.h 2025-01-11 23:51:01.000000000 +0600
|
||||
+++ b/lib/unixcompat.h 2025-01-24 16:56:14.605185482 +0600
|
||||
@@ -108,7 +108,7 @@
|
||||
#define PATH_SEP_STR "/"
|
||||
#define IS_PATH_SEP(c) ((c) == PATH_SEP)
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
Summary: User-friendly text console file manager and visual shell
|
||||
Name: mc
|
||||
Version: 4.8.32
|
||||
Release: 2%{?dist}
|
||||
Version: 4.8.33
|
||||
Release: 1%{?dist}
|
||||
Epoch: 2
|
||||
License: GPLv3+
|
||||
Group: System Environment/Shells
|
||||
@ -18,7 +18,6 @@ Patch2: %{name}-python3.patch
|
||||
Patch3: %{name}-default_setup.patch
|
||||
Patch4: %{name}-tmpdir.patch
|
||||
Patch5: %{name}-use-glib-older-than-2.40.patch
|
||||
Patch6: 0001-Ticket-4576-fix-visual-glitches-by-avoiding-g_module.patch
|
||||
|
||||
URL: http://www.midnight-commander.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -68,7 +67,6 @@ specific files.
|
||||
%if 0%{?rhel} <= 7
|
||||
%patch5 -p1 -b .glib2
|
||||
%endif
|
||||
%patch6 -p1 -b .glib2
|
||||
|
||||
%build
|
||||
export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing"
|
||||
@ -136,13 +134,13 @@ rm -rf %{buildroot}
|
||||
%lang(ru) %{_mandir}/ru/man1/mc.1*
|
||||
%lang(sr) %{_mandir}/sr/man1/mc.1*
|
||||
%{_sysconfdir}/profile.d/*
|
||||
#%config(noreplace) %{_sysconfdir}/mc/mc.ext
|
||||
%config(noreplace) %{_sysconfdir}/mc/*edit*
|
||||
%config(noreplace) %{_sysconfdir}/mc/mc.keymap*
|
||||
%config(noreplace) %{_sysconfdir}/mc/mc.menu*
|
||||
%config(noreplace) %{_sysconfdir}/mc/*.ini
|
||||
%config(noreplace) %{_sysconfdir}/mc/mc.default.keymap*
|
||||
%config(noreplace) %{_sysconfdir}/mc/mc.emacs.keymap*
|
||||
%config(noreplace) %{_sysconfdir}/mc/mc.vim.keymap*
|
||||
%dir %{_datadir}/mc
|
||||
%dir %{_sysconfdir}/mc
|
||||
%dir %{_libexecdir}/mc
|
||||
@ -151,6 +149,9 @@ rm -rf %{buildroot}
|
||||
%dir %{_libexecdir}/mc/ext.d
|
||||
|
||||
%changelog
|
||||
* Fri Jan 24 2025 Raven <raven@sysadmins.ws> 4.8.33-1
|
||||
- update to 4.8.33
|
||||
|
||||
* Thu Oct 3 2024 Raven <raven@sysadmins.ws> 4.8.32-2
|
||||
- import patch to fix #4576
|
||||
|
||||
|
||||
15
base/pgbackrest/pgbackrest-diff@.service
Normal file
15
base/pgbackrest/pgbackrest-diff@.service
Normal file
@ -0,0 +1,15 @@
|
||||
[Unit]
|
||||
Description=pgbackrest backup diff for %i
|
||||
Documentation=https://pgbackrest.org/configuration.html
|
||||
Documentation=man:pgbackrest(1) man:pgbackrest.conf(5)
|
||||
ConditionACPower=true
|
||||
PartOf=pgbackrest.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
User=postgres
|
||||
Group=postgres
|
||||
ExecStart=/usr/bin/pgbackrest --log-level-console=info --stanza=%i --type=diff backup
|
||||
# Give a reasonable amount of time for job to finish
|
||||
TimeoutSec=7200
|
||||
|
||||
14
base/pgbackrest/pgbackrest-diff@.timer
Normal file
14
base/pgbackrest/pgbackrest-diff@.timer
Normal file
@ -0,0 +1,14 @@
|
||||
[Unit]
|
||||
Description=Weekly pgbackrest diff backup (wed)
|
||||
Documentation=https://pgbackrest.org/configuration.html
|
||||
Documentation=man:pgbackrest(1) man:pgbackrest.conf(5)
|
||||
PartOf=pgbackrest.target
|
||||
|
||||
[Timer]
|
||||
#OnCalendar=Sun *-*-8..31 05:05:05
|
||||
OnCalendar=Wed *-*-* 05:05:05
|
||||
AccuracySec=1h
|
||||
Persistent=true
|
||||
|
||||
[Install]
|
||||
WantedBy=timers.target
|
||||
15
base/pgbackrest/pgbackrest-full@.service
Normal file
15
base/pgbackrest/pgbackrest-full@.service
Normal file
@ -0,0 +1,15 @@
|
||||
[Unit]
|
||||
Description=pgbackrest backup full for %i
|
||||
Documentation=https://pgbackrest.org/configuration.html
|
||||
Documentation=man:pgbackrest(1) man:pgbackrest.conf(5)
|
||||
ConditionACPower=true
|
||||
PartOf=pgbackrest.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
User=postgres
|
||||
Group=postgres
|
||||
ExecStart=/usr/bin/pgbackrest --log-level-console=info --stanza=%i --type=full backup
|
||||
# Give a reasonable amount of time for the job to run before timeout
|
||||
TimeoutSec=7200
|
||||
|
||||
14
base/pgbackrest/pgbackrest-full@.timer
Normal file
14
base/pgbackrest/pgbackrest-full@.timer
Normal file
@ -0,0 +1,14 @@
|
||||
[Unit]
|
||||
Description=Monthly pgbackrest full backup (1st sun)
|
||||
Documentation=https://pgbackrest.org/configuration.html
|
||||
Documentation=man:pgbackrest(1) man:pgbackrest.conf(5)
|
||||
PartOf=pgbackrest.target
|
||||
|
||||
[Timer]
|
||||
#OnCalendar=Sun *-*-1..7 05:05:05
|
||||
OnCalendar=Sun *-*-* 05:05:05
|
||||
AccuracySec=1h
|
||||
Persistent=true
|
||||
|
||||
[Install]
|
||||
WantedBy=timers.target
|
||||
15
base/pgbackrest/pgbackrest-incr@.service
Normal file
15
base/pgbackrest/pgbackrest-incr@.service
Normal file
@ -0,0 +1,15 @@
|
||||
[Unit]
|
||||
Description=pgbackrest backup incremental for %i
|
||||
Documentation=https://pgbackrest.org/configuration.html
|
||||
Documentation=man:pgbackrest(1) man:pgbackrest.conf(5)
|
||||
ConditionACPower=true
|
||||
PartOf=pgbackrest.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
User=postgres
|
||||
Group=postgres
|
||||
ExecStart=/usr/bin/pgbackrest --log-level-console=info --stanza=%i --type=incr backup
|
||||
# Give a reasonable amount of time for the job to finish
|
||||
TimeoutSec=7200
|
||||
|
||||
13
base/pgbackrest/pgbackrest-incr@.timer
Normal file
13
base/pgbackrest/pgbackrest-incr@.timer
Normal file
@ -0,0 +1,13 @@
|
||||
[Unit]
|
||||
Description=Daily pgbackrest incremental backup (mon-sat)
|
||||
Documentation=https://pgbackrest.org/configuration.html
|
||||
Documentation=man:pgbackrest(1) man:pgbackrest.conf(5)
|
||||
PartOf=pgbackrest.target
|
||||
|
||||
[Timer]
|
||||
OnCalendar=Mon..Sat *-*-* 05:05:05
|
||||
AccuracySec=1h
|
||||
Persistent=true
|
||||
|
||||
[Install]
|
||||
WantedBy=timers.target
|
||||
5
base/pgbackrest/pgbackrest.conf
Normal file
5
base/pgbackrest/pgbackrest.conf
Normal file
@ -0,0 +1,5 @@
|
||||
[global]
|
||||
repo-path=/var/lib/pgbackrest
|
||||
|
||||
#[main]
|
||||
#pg-path=/var/lib/pgsql/data
|
||||
18
base/pgbackrest/pgbackrest.service
Normal file
18
base/pgbackrest/pgbackrest.service
Normal file
@ -0,0 +1,18 @@
|
||||
[Unit]
|
||||
Description=pgBackRest Server
|
||||
Documentation=https://pgbackrest.org/configuration.html
|
||||
Documentation=man:pgbackrest(1) man:pgbackrest.conf(5)
|
||||
After=network.target
|
||||
StartLimitIntervalSec=0
|
||||
PartOf=pgbackrest.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
Restart=always
|
||||
RestartSec=1
|
||||
User=postgres
|
||||
ExecStart=/usr/bin/pgbackrest server
|
||||
ExecReload=kill -HUP $MAINPID
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
135
base/pgbackrest/pgbackrest.spec
Normal file
135
base/pgbackrest/pgbackrest.spec
Normal file
@ -0,0 +1,135 @@
|
||||
|
||||
%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.2
|
||||
Release: 1%{dist}
|
||||
Summary: Reliable PostgreSQL Backup & Restore
|
||||
License: MIT
|
||||
URL: https://www.pgbackrest.org
|
||||
Source: https://github.com/%{name}/%{name}/archive/release/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
Source1: pgbackrest.conf
|
||||
Source10: pgbackrest-diff@.service
|
||||
Source11: pgbackrest-diff@.timer
|
||||
Source12: pgbackrest-full@.service
|
||||
Source13: pgbackrest-full@.timer
|
||||
Source14: pgbackrest-incr@.service
|
||||
Source15: pgbackrest-incr@.timer
|
||||
Source16: pgbackrest.service
|
||||
Source17: pgbackrest.target
|
||||
Source18: pgbackrest.tmpfiles.d
|
||||
|
||||
Patch1: use-run-pgbackrest.patch
|
||||
|
||||
BuildRequires: libyaml-devel
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(libpq)
|
||||
BuildRequires: pkgconfig(bzip2)
|
||||
BuildRequires: pkgconfig(liblz4)
|
||||
BuildRequires: pkgconfig(libpq)
|
||||
BuildRequires: pkgconfig(libssh2)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(libzstd)
|
||||
|
||||
# This is a bit awkward as we only need this for directory ownership
|
||||
Requires(pre): postgresql-server
|
||||
|
||||
%description
|
||||
pgBackRest aims to be a simple, reliable backup and restore system for
|
||||
PostgreSQL that can seamlessly scale up to the largest databases and
|
||||
workloads.
|
||||
|
||||
The following features are available:
|
||||
- Parallel backup & restore
|
||||
- Local or remote operation
|
||||
- Full, incremental, differential backups
|
||||
- Backup rotation & archive expiration
|
||||
- Backup integrity
|
||||
- Page checksums
|
||||
- Backup resume
|
||||
- Streaming compression & checksums
|
||||
- Delta restore
|
||||
- Parallel, asynchronous WAL push & get
|
||||
- Tablespace & link support
|
||||
- Amazon S3 support
|
||||
- Encryption
|
||||
- Compatibility with PostgreSQL >= 8.3
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-release-%{version}
|
||||
|
||||
%build
|
||||
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
install -D -d -m 0700 \
|
||||
%{buildroot}%{_localstatedir}/lib/%{name} \
|
||||
%{buildroot}%{_localstatedir}/log/%{name} \
|
||||
%{buildroot}%{_localstatedir}/spool/%{name}
|
||||
|
||||
install -D -d -m 0755 \
|
||||
%{buildroot}%{_sysconfdir} \
|
||||
%{buildroot}%{_unitdir}
|
||||
|
||||
install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}.conf
|
||||
install -m 0644 \
|
||||
%{SOURCE10} \
|
||||
%{SOURCE11} \
|
||||
%{SOURCE12} \
|
||||
%{SOURCE13} \
|
||||
%{SOURCE14} \
|
||||
%{SOURCE15} \
|
||||
%{SOURCE16} \
|
||||
%{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.
|
||||
%{buildroot}/%{_bindir}/%{name} version || exit 1
|
||||
%meson_test
|
||||
|
||||
%pre
|
||||
%systemd_pre %{services}
|
||||
|
||||
%post
|
||||
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
|
||||
%systemd_post %{services}
|
||||
|
||||
%preun
|
||||
%systemd_preun %{services}
|
||||
|
||||
%postun
|
||||
%systemd_postun %{services}
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%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
|
||||
%{_unitdir}/pgbackrest-full@.service
|
||||
%{_unitdir}/pgbackrest-full@.timer
|
||||
%{_unitdir}/pgbackrest-incr@.service
|
||||
%{_unitdir}/pgbackrest-incr@.timer
|
||||
%{_unitdir}/pgbackrest.service
|
||||
%{_unitdir}/pgbackrest.target
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
3
base/pgbackrest/pgbackrest.target
Normal file
3
base/pgbackrest/pgbackrest.target
Normal file
@ -0,0 +1,3 @@
|
||||
[Unit]
|
||||
Description=Target to restart/stop all parts of pgbackrest
|
||||
|
||||
2
base/pgbackrest/pgbackrest.tmpfiles.d
Normal file
2
base/pgbackrest/pgbackrest.tmpfiles.d
Normal file
@ -0,0 +1,2 @@
|
||||
# Type Path Mode UID GID Age Argument
|
||||
d /run/pgbackrest 0750 postgres postgres - -
|
||||
169
base/pgbackrest/use-run-pgbackrest.patch
Normal file
169
base/pgbackrest/use-run-pgbackrest.patch
Normal file
@ -0,0 +1,169 @@
|
||||
Index: pgbackrest-release-2.54.1/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:
|
||||
```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.54.1/doc/resource/git-history.cache
|
||||
===================================================================
|
||||
--- 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",
|
||||
- "subject": "Remove duplicate mkdir for /tmp/pgbackrest in Vagrantfile."
|
||||
+ "subject": "Remove duplicate mkdir for /run/pgbackrest in Vagrantfile."
|
||||
},
|
||||
{
|
||||
"commit": "8322dfd7af97e307b952cfb37e6a65b65f55be0f",
|
||||
@@ -11249,8 +11249,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",
|
||||
@@ -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.",
|
||||
- "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",
|
||||
@@ -21637,7 +21637,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.54.1/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
|
||||
<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.54.1/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 @@
|
||||
<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.54.1/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
|
||||
type: path
|
||||
- default: /tmp/pgbackrest
|
||||
+ default: /run/pgbackrest
|
||||
command:
|
||||
annotate: {}
|
||||
archive-get: {}
|
||||
Index: pgbackrest-release-2.54.1/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[] =
|
||||
{
|
||||
- PARSE_RULE_STRPUB("/tmp/pgbackrest"), // val/str
|
||||
+ PARSE_RULE_STRPUB("/run/pgbackrest"), // val/str
|
||||
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.1/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";
|
||||
}
|
||||
|
||||
- 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.54.1/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"
|
||||
" --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\n"
|
||||
" compress/transfer [default=1]\n"
|
||||
Index: pgbackrest-release-2.54.1/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
|
||||
|
||||
- # 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
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
Loading…
x
Reference in New Issue
Block a user
