diff --git a/bz1388209.patch b/bz1388209.patch deleted file mode 100644 index 7ab9902..0000000 --- a/bz1388209.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/rsnapshot-program.pl b/rsnapshot-program.pl -index e6215f4..a131517 100755 ---- a/rsnapshot-program.pl -+++ b/rsnapshot-program.pl -@@ -3947,13 +3947,13 @@ sub rsync_backup_point { - # delte the traps manually - # umount LVM Snapshot if it is mounted - if (1 == $traps{"linux_lvm_mountpoint"}) { -- undef $traps{"linux_lvm_mountpoint"}; -+ $traps{"linux_lvm_mountpoint"} = 0; - linux_lvm_unmount(); - } - - # destroy snapshot created by rsnapshot - if (0 ne $traps{"linux_lvm_snapshot"}) { -- undef $traps{"linux_lvm_snapshot"}; -+ $traps{"linux_lvm_snapshot"} = 0; - linux_lvm_snapshot_del(linux_lvm_parseurl($lvm_src)); - } - } diff --git a/lvm-quiet.patch b/lvm-quiet.patch deleted file mode 100644 index fc2e645..0000000 --- a/lvm-quiet.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up rsnapshot-1.3.1/rsnapshot-program.pl.lvm-quiet rsnapshot-1.3.1/rsnapshot-program.pl ---- rsnapshot-1.3.1/rsnapshot-program.pl.lvm-quiet 2013-09-09 22:16:12.177041378 -0700 -+++ rsnapshot-1.3.1/rsnapshot-program.pl 2013-09-10 22:06:46.193923280 -0700 -@@ -3728,9 +3728,7 @@ sub rsync_backup_point { - - print_cmd(@cmd_stack); - if (0 == $test) { -- # silence gratuitous lvremove output -- #$result = system(@cmd_stack); -- $result = system(join " ", @cmd_stack, ">/dev/null"); -+ $result = system(@cmd_stack); - - if ($result != 0) { - bail("Unmount LVM snapshot failed: $result"); -@@ -3745,7 +3743,9 @@ sub rsync_backup_point { - - print_cmd(@cmd_stack); - if (0 == $test) { -- $result = system(@cmd_stack); -+ # silence gratuitous lvremove output -+ #$result = system(@cmd_stack); -+ $result = system(join " ", @cmd_stack, ">/dev/null"); - - if ($result != 0) { - bail("Removal of LVM snapshot failed: $result"); diff --git a/pod2man.patch b/pod2man.patch deleted file mode 100644 index d9ec257..0000000 --- a/pod2man.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up rsnapshot-1.3.1/rsnapshot-program.pl.pod2man rsnapshot-1.3.1/rsnapshot-program.pl ---- rsnapshot-1.3.1/rsnapshot-program.pl.pod2man 2013-07-06 00:39:44.500520483 -0700 -+++ rsnapshot-1.3.1/rsnapshot-program.pl 2013-07-06 00:43:17.696767540 -0700 -@@ -6666,6 +6666,8 @@ additional disk space will be taken up. - - =back - -+=back -+ - Remember that tabs must separate all elements, and that - there must be a trailing slash on the end of every directory. - diff --git a/rsnapshot-1.4.3-autoconf-2.63.patch b/rsnapshot-1.4.3-autoconf-2.63.patch new file mode 100644 index 0000000..5fdfc8a --- /dev/null +++ b/rsnapshot-1.4.3-autoconf-2.63.patch @@ -0,0 +1,21 @@ +From 07baa163b8d4a778be9d51a49c0ae2cdeb60049e Mon Sep 17 00:00:00 2001 +From: Robert Scheck +Date: Wed, 11 Dec 2019 01:51:36 +0100 +Subject: [PATCH] Emulate m4_esyscmd_s for autoconf 2.63 (RHEL/CentOS 6) + +--- + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index ea69b82..449c085 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,3 +1,7 @@ ++dnl Emulate m4_esyscmd_s for autoconf 2.63 (RHEL/CentOS 6) ++m4_ifndef([m4_esyscmd_s], [m4_define([m4_chomp_all], [m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [/], [/ ]), [/*$]), [$1])])]) ++m4_ifndef([m4_esyscmd_s], [m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))])]) ++ + AC_INIT([rsnapshot],[m4_esyscmd_s([git describe --tags --always --dirty])],[rsnapshot-discuss@lists.sourceforge.net]) + AM_INIT_AUTOMAKE([foreign]) + AC_PROG_MAKE_SET diff --git a/rsnapshot-1.4.3-skip-ssh-test.patch b/rsnapshot-1.4.3-skip-ssh-test.patch new file mode 100644 index 0000000..390c198 --- /dev/null +++ b/rsnapshot-1.4.3-skip-ssh-test.patch @@ -0,0 +1,23 @@ +From b708125c2f7e4cf005117e9db4d1633af14f6c2e Mon Sep 17 00:00:00 2001 +From: Robert Scheck +Date: Wed, 11 Dec 2019 00:55:33 +0100 +Subject: [PATCH] Skip both SSH tests (rather one) if SSH doesn't work + +Bug was introduced with PR #231 (in order to address issue #212) +--- + t/ssh_args/ssh_args.t.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/ssh_args/ssh_args.t.in b/t/ssh_args/ssh_args.t.in +index e30b87e..3772d6e 100644 +--- a/t/ssh_args/ssh_args.t.in ++++ b/t/ssh_args/ssh_args.t.in +@@ -11,7 +11,7 @@ ok(! remove_snapshot_root(), + SKIP: { + my $ssh_test = "@SSH@ -p 22 -o StrictHostKeyChecking=no @TEST_SSH_USER@\@localhost true"; + my $cant_ssh = system("$ssh_test"); +- skip("Cant SSH with \"$ssh_test\"", 1) if ($cant_ssh); ++ skip("Cant SSH with \"$ssh_test\"", 2) if ($cant_ssh); + ok(!rsnapshot("-c @TEST@/ssh_args/conf/ssh_args.conf hourly"), "ssh_args parsed"); + ok(!rsnapshot("-c @TEST@/ssh_args/conf/ssh_args_inline.conf hourly"), "ssh_args_inline parsed"); + } diff --git a/rsnapshot-fix-include-conf.patch b/rsnapshot-fix-include-conf.patch deleted file mode 100644 index 993230b..0000000 --- a/rsnapshot-fix-include-conf.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up rsnapshot-1.3.1/rsnapshot-program.pl.orig rsnapshot-1.3.1/rsnapshot-program.pl ---- rsnapshot-1.3.1/rsnapshot-program.pl.orig 2009-09-06 16:28:38.000000000 +0200 -+++ rsnapshot-1.3.1/rsnapshot-program.pl 2009-09-06 16:27:51.000000000 +0200 -@@ -504,8 +504,8 @@ sub parse_config_file { - # open the config file - my $config_file = shift() || $config_file; - my $CONFIG; -- if($config_file =~ /^`.*`$/) { -- open($CONFIG, "$config_file|") || -+ if($config_file =~ /^`(.*)`$/) { -+ open($CONFIG, "$1|") || - bail("Couldn't execute \"$config_file\" to get config information\nAre you sure you have permission?"); - } else { - $CONFIG = IO::File->new($config_file) diff --git a/rsnapshot.conf.patch b/rsnapshot.conf.patch deleted file mode 100644 index 33ed2c2..0000000 --- a/rsnapshot.conf.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- rsnapshot.conf.default.in.orig 2006-06-13 22:48:01.000000000 -0700 -+++ rsnapshot.conf.default.in 2007-05-28 13:25:46.000000000 -0700 -@@ -41,7 +41,7 @@ - # - # See the README file or the man page for more details. - # --#@CMD_CP@ -+@CMD_CP@ - - # uncomment this to use the rm program instead of the built-in perl routine. - # -@@ -64,7 +64,7 @@ - # If you have an older version of "du", you may also want to check the - # "du_args" parameter below. - # --#@CMD_DU@ -+@CMD_DU@ - - # Uncomment this to specify the path to rsnapshot-diff. - # -@@ -113,7 +113,7 @@ - # If you enable this, data will be written to the file you specify. The - # amount of data written is controlled by the "loglevel" parameter. - # --#logfile /var/log/rsnapshot -+logfile /var/log/rsnapshot - - # If enabled, rsnapshot will write a lockfile to prevent two instances - # from running simultaneously (and messing up the snapshot_root). diff --git a/rsnapshot.spec b/rsnapshot.spec index cc956cc..b87ec60 100644 --- a/rsnapshot.spec +++ b/rsnapshot.spec @@ -1,13 +1,16 @@ - Name: rsnapshot -Version: 1.4.2 -Release: 8%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: Local and remote filesystem snapshot utility License: GPLv2+ -URL: http://www.rsnapshot.org/ -Source: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz +URL: https://rsnapshot.org/ +Source: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch -Patch0: bz1388209.patch + +# Skip both SSH tests (rather one) if SSH doesn't work, https://github.com/rsnapshot/rsnapshot/pull/244 +Patch0: rsnapshot-1.4.3-skip-ssh-test.patch +# Emulate m4_esyscmd_s for autoconf 2.63 (RHEL/CentOS 6), https://github.com/rsnapshot/rsnapshot/pull/245 +Patch1: rsnapshot-1.4.3-autoconf-2.63.patch BuildRequires: /usr/bin/pod2man BuildRequires: perl-generators @@ -15,26 +18,34 @@ BuildRequires: rsync BuildRequires: openssh-clients BuildRequires: lvm2 +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: git + # For running %%check BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) Requires: openssh-clients Requires: rsync +Requires: perl(Lchown) %description This is a remote backup program that uses rsync to take backup snapshots of filesystems. It uses hard links to save space on disk. %prep -%autosetup +%autosetup -p1 + +# No configure in 1.4.3 +./autogen.sh %build %configure \ --with-perl="%{__perl}" \ --with-rsync="%{_bindir}/rsync" \ - --with-cp="%{_bindir}/cp" \ - --with-rm="%{_bindir}/rm" \ + --with-cp="%{__cp}" \ + --with-rm="%{__rm}" \ --with-ssh="%{_bindir}/ssh" \ --with-logger="%{_bindir}/logger" \ --with-du="%{_bindir}/du" @@ -49,7 +60,6 @@ mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf find utils/ -type f -print0 | xargs -r0 chmod 644 %check - %{__make} test %files @@ -63,6 +73,11 @@ find utils/ -type f -print0 | xargs -r0 chmod 644 %{_mandir}/man1/rsnapshot* %changelog +* Wed Dec 11 2019 Robert Scheck - 1.4.3-1 +- Upgrade to 1.4.3 (#1443553, #1646191, #1741427) +- Extend spec file compatibility to cover RHEL/CentOS 6 +- Add run-time requirement for perl(Lchown) (#1494775) + * Fri Jul 26 2019 Fedora Release Engineering - 1.4.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 1c69186..40f1c63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -860382f19e38fc649f9447397b54e442 rsnapshot-1.4.2.tar.gz +SHA512 (rsnapshot-1.4.3.tar.gz) = 72afe9fd5bd63f3884cf20f549a08c83f112f07266f3d8bb1f3b8f1dbd6c0e5110f865ca4d446ecf42a9b5f48769f5ead987ac852be350757982cee06672407a