commit rsnapshot for openSUSE:Factory

2020-09-21 Thread root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2020-09-21 17:20:43

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new.4249 (New)


Package is "rsnapshot"

Mon Sep 21 17:20:43 2020 rev:26 rq:835275 version:1.4.3

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2019-08-09 
16:54:36.769451029 +0200
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new.4249/rsnapshot.changes
2020-09-21 17:24:09.087962518 +0200
@@ -1,0 +2,14 @@
+Mon Aug 24 18:57:26 UTC 2020 - Dirk Mueller 
+
+- update to 1.4.3:
+  - Fixes and minor updates to Pod / man page.
+  - Adds more tests.
+  - Restore rsync error code 23 as an important warning.
+  - Fixes shortargs appending.
+  - Non-LVM backup source breaks after LVM backup source.
+  - Update rsnapreport.pl utility script to work with rsync >= 3.1.0 stats and 
bytes changes.
+- remove rsnapreport_rsync_output.patch, rsnapshot-lvm-undef.patch: upstream
+- add skip-ssh-test.patch (ignore ssh test failure on envs without network)
+- tighten find/sed on usr/local to not touch automake related files
+
+---

Old:

  rsnapreport_rsync_output.patch
  rsnapshot-1.4.2.tar.gz
  rsnapshot-lvm-undef.patch

New:

  rsnapshot-1.4.3.tar.gz
  skip-ssh-test.patch



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.bKz4HF/_old  2020-09-21 17:24:11.579964440 +0200
+++ /var/tmp/diff_new_pack.bKz4HF/_new  2020-09-21 17:24:11.58396 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rsnapshot
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   rsnapshot
-Version:1.4.2
+Version:1.4.3
 Release:0
 Summary:Backup program using hardlinks
 License:GPL-2.0-or-later
@@ -26,10 +26,9 @@
 Source0:
https://github.com/rsnapshot/rsnapshot/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:rsnapshot.logrotate
 Patch1: rsnapshot-config.patch
-Patch2: rsnapshot-lvm-undef.patch
+Patch2: skip-ssh-test.patch
 Patch3: remove-dead-external-css-link.patch
-Patch4: rsnapreport_rsync_output.patch
-Patch5: backup_pgsql.patch
+Patch4: backup_pgsql.patch
 BuildRequires:  logrotate
 BuildRequires:  openssh
 BuildRequires:  perl
@@ -59,7 +58,8 @@
 
 %build
 # replace hardcoded /usr/local
-find . -type f -exec sed -i "s|usr/local|usr|g" {} +
+find docs utils *pl *md *in -type f -exec sed -i "s|usr/local|usr|g" {} +
+
 %configure
 make %{?_smp_mflags}
 

++ rsnapshot-1.4.2.tar.gz -> rsnapshot-1.4.3.tar.gz ++
 10097 lines of diff (skipped)

++ skip-ssh-test.patch ++
>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");
 }

commit rsnapshot for openSUSE:Factory

2019-08-09 Thread root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2019-08-09 16:54:27

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new.9556 (New)


Package is "rsnapshot"

Fri Aug  9 16:54:27 2019 rev:25 rq:721950 version:1.4.2

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2018-06-29 
22:25:08.150540801 +0200
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new.9556/rsnapshot.changes
2019-08-09 16:54:36.769451029 +0200
@@ -1,0 +2,13 @@
+Thu Aug  8 17:59:59 UTC 2019 - Hans-Peter Jansen 
+
+- Apply backup_pgsql.patch, forgotten before...
+
+---
+Wed Aug  7 19:22:05 UTC 2019 - Hans-Peter Jansen 
+
+- Add a couple of patches from debian/upstream
+  rsnapshot-lvm-undef.patch
+  remove-dead-external-css-link.patch
+  rsnapreport_rsync_output.patch
+
+---

New:

  backup_pgsql.patch
  remove-dead-external-css-link.patch
  rsnapreport_rsync_output.patch
  rsnapshot-lvm-undef.patch



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.Q5JSm9/_old  2019-08-09 16:54:37.565450838 +0200
+++ /var/tmp/diff_new_pack.Q5JSm9/_new  2019-08-09 16:54:37.569450837 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rsnapshot
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -26,6 +26,10 @@
 Source0:
https://github.com/rsnapshot/rsnapshot/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:rsnapshot.logrotate
 Patch1: rsnapshot-config.patch
+Patch2: rsnapshot-lvm-undef.patch
+Patch3: remove-dead-external-css-link.patch
+Patch4: rsnapreport_rsync_output.patch
+Patch5: backup_pgsql.patch
 BuildRequires:  logrotate
 BuildRequires:  openssh
 BuildRequires:  perl
@@ -51,7 +55,7 @@
 
 %prep
 %setup -q
-%patch1
+%autopatch -p1
 
 %build
 # replace hardcoded /usr/local
@@ -71,7 +75,7 @@
 
 %files
 %license COPYING
-%doc AUTHORS ChangeLog README.md docs
+%doc AUTHORS ChangeLog README.md docs utils
 %{_bindir}/rsnapshot
 %{_bindir}/rsnapshot-diff
 %config(noreplace) %{_sysconfdir}/rsnapshot.conf

++ backup_pgsql.patch ++
From: Guillaume Delacour 
Subject: Fix path call pg_dumpall
Bug-Debian: http:/bugs.debian.org/500082
Forwarded: not-needed
Last-Update: 2013-07-31

Index: b/utils/backup_pgsql.sh
===
--- a/utils/backup_pgsql.sh
+++ b/utils/backup_pgsql.sh
@@ -9,12 +9,8 @@
 # This is a simple shell script to backup a PostgreSQL database with rsnapshot.
 #
 # The assumption is that this will be invoked from rsnapshot. Also, since it
-# will run unattended, the user that runs rsnapshot (probably root) should have
-# a .pgpass file in their home directory that contains the password for the
-# postgres user. For example:
-#
-# /root/.pgpass (chmod 0600)
-#   *:*:*:postgres:thepassword
+# will run unattended, the user that runs rsnapshot (probably root) must su
+# to the postgres user.
 #
 # This script simply needs to dump a file into the current working directory.
 # rsnapshot handles everything else.
@@ -25,7 +21,12 @@
 umask 0077
 
 # backup the database
-/usr/local/pgsql/bin/pg_dumpall -Upostgres > pg_dumpall.sql
+su -l -c 'pg_dumpall > ~/pg_dumpall.sql' postgres
 
 # make the backup readable only by root
-/bin/chmod 600 pg_dumpall.sql
+chown root.root ~postgres/pg_dumpall.sql
+chmod 600 ~postgres/pg_dumpall.sql
+
+# Move the backup to current working directory
+mv ~postgres/pg_dumpall.sql `pwd`
+
++ remove-dead-external-css-link.patch ++
From: Hans-Christoph Steiner 
Subject: remove link to dead CSS on external site
Description:
 This is a pointless privacy leak since the external page in question
 does not even exist anymore.

Index: b/docs/HOWTOs/rsnapshot-HOWTO.en.html
===
--- a/docs/HOWTOs/rsnapshot-HOWTO.en.html
+++ b/docs/HOWTOs/rsnapshot-HOWTO.en.html
@@ -4,8 +4,6 @@
   
   rsnapshot HOWTO
-  http://www.xml-dev.com/blog/new.css; rel="stylesheet"
-  type="text/css" />
   
   
Description: Rsync >= 3.1.0 stats and bytes

commit rsnapshot for openSUSE:Factory

2018-06-29 Thread root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2018-06-29 22:25:03

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new (New)


Package is "rsnapshot"

Fri Jun 29 22:25:03 2018 rev:24 rq:616022 version:1.4.2

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2016-07-12 
23:51:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new/rsnapshot.changes 2018-06-29 
22:25:08.150540801 +0200
@@ -1,0 +2,5 @@
+Mon Jun 11 12:23:21 UTC 2018 - mplus...@suse.com
+
+- Modernise spec file with spec-cleaner
+
+---



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.iM63aw/_old  2018-06-29 22:25:08.678540404 +0200
+++ /var/tmp/diff_new_pack.iM63aw/_new  2018-06-29 22:25:08.678540404 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rsnapshot
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,9 +20,9 @@
 Version:1.4.2
 Release:0
 Summary:Backup program using hardlinks
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Productivity/Archiving/Backup
-Url:http://www.rsnapshot.org/
+URL:http://www.rsnapshot.org/
 Source0:
https://github.com/rsnapshot/rsnapshot/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:rsnapshot.logrotate
 Patch1: rsnapshot-config.patch
@@ -30,16 +30,13 @@
 BuildRequires:  openssh
 BuildRequires:  perl
 BuildRequires:  rsync
+BuildRequires:  util-linux-systemd
 Requires:   logrotate
 Requires:   openssh
 Requires:   perl
 Requires:   rsync
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildArch:  noarch
-%if 0%{?suse_version} >= 1320
-BuildRequires:  util-linux-systemd
 Requires:   util-linux-systemd
-%endif
+BuildArch:  noarch
 
 %description
 rsnapshot is a filesystem snapshot utility for making backups of local
@@ -66,21 +63,21 @@
 make %{?_smp_mflags} test
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 install -d "%{buildroot}/%{_sysconfdir}"
 install -m 644 rsnapshot.conf.default 
"%{buildroot}/%{_sysconfdir}/rsnapshot.conf.default"
 install -m 600 rsnapshot.conf.default 
"%{buildroot}/%{_sysconfdir}/rsnapshot.conf"
-install -m 644 -D %{S:1} "%{buildroot}/%{_sysconfdir}/logrotate.d/rsnapshot"
+install -m 644 -D %{SOURCE1} 
"%{buildroot}/%{_sysconfdir}/logrotate.d/rsnapshot"
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README.md docs
+%license COPYING
+%doc AUTHORS ChangeLog README.md docs
 %{_bindir}/rsnapshot
 %{_bindir}/rsnapshot-diff
 %config(noreplace) %{_sysconfdir}/rsnapshot.conf
 %config %{_sysconfdir}/rsnapshot.conf.default
 %config(noreplace) %{_sysconfdir}/logrotate.d/rsnapshot
-%{_mandir}/man1/rsnapshot.1.gz
-%{_mandir}/man1/rsnapshot-diff.1.gz
+%{_mandir}/man1/rsnapshot.1%{?ext_man}
+%{_mandir}/man1/rsnapshot-diff.1%{?ext_man}
 
 %changelog

commit rsnapshot for openSUSE:Factory

2016-07-12 Thread h_root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2016-07-12 23:51:49

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new (New)


Package is "rsnapshot"

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2015-12-23 
09:57:32.0 +0100
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new/rsnapshot.changes 2016-07-12 
23:51:50.0 +0200
@@ -1,0 +2,5 @@
+Tue Jul  5 23:55:50 UTC 2016 - greg.freem...@gmail.com
+
+- Add the docs subfolder to %doc
+
+---
@@ -6,0 +12 @@
+(bnc#987643)



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.KzOLAI/_old  2016-07-12 23:51:51.0 +0200
+++ /var/tmp/diff_new_pack.KzOLAI/_new  2016-07-12 23:51:51.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rsnapshot
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -74,7 +74,7 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README.md
+%doc AUTHORS COPYING ChangeLog README.md docs
 %{_bindir}/rsnapshot
 %{_bindir}/rsnapshot-diff
 %config(noreplace) %{_sysconfdir}/rsnapshot.conf

commit rsnapshot for openSUSE:Factory

2015-12-23 Thread h_root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2015-12-23 09:57:30

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new (New)


Package is "rsnapshot"

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2015-10-06 
13:26:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new/rsnapshot.changes 2015-12-23 
09:57:32.0 +0100
@@ -1,0 +2,7 @@
+Tue Dec 22 23:21:04 UTC 2015 - nico.kru...@gmail.com
+
+- Update to 1.4.2
+  * Fix double 8 bit shift bug introduced with github issue #65.
+Refs github issues #102, #103, #114, #118
+
+---

Old:

  rsnapshot-1.4.1.tar.gz

New:

  rsnapshot-1.4.2.tar.gz



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.jZWwaF/_old  2015-12-23 09:57:33.0 +0100
+++ /var/tmp/diff_new_pack.jZWwaF/_new  2015-12-23 09:57:33.0 +0100
@@ -17,13 +17,13 @@
 
 
 Name:   rsnapshot
-Version:1.4.1
+Version:1.4.2
 Release:0
 Summary:Backup program using hardlinks
 License:GPL-2.0+
 Group:  Productivity/Archiving/Backup
 Url:http://www.rsnapshot.org/
-Source0:http://rsnapshot.org/downloads/%{name}-%{version}.tar.gz
+Source0:
https://github.com/rsnapshot/rsnapshot/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:rsnapshot.logrotate
 Patch1: rsnapshot-config.patch
 BuildRequires:  logrotate

++ rsnapshot-1.4.1.tar.gz -> rsnapshot-1.4.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/rsnapshot-1.4.1/ChangeLog 
new/rsnapshot-1.4.2/ChangeLog
--- old/rsnapshot-1.4.1/ChangeLog   2015-08-17 17:05:32.0 +0200
+++ new/rsnapshot-1.4.2/ChangeLog   2015-12-12 00:55:44.0 +0100
@@ -3,8 +3,11 @@
 http://www.rsnapshot.org/
 --
 
-VERSION 1.4.1
+current master
 --
+- Display warning, when the verbosity is set multiple times (e.g. on
+  command-line and logfile at the same time)
+- Changed maintainership in all files.
 - Capture rsync's output right (Github issue 102)
 
 VERSION 1.4.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/rsnapshot-1.4.1/Makefile.am 
new/rsnapshot-1.4.2/Makefile.am
--- old/rsnapshot-1.4.1/Makefile.am 2015-08-17 17:05:32.0 +0200
+++ new/rsnapshot-1.4.2/Makefile.am 2015-12-12 00:55:44.0 +0100
@@ -9,11 +9,11 @@
 rsnapshot.1 : rsnapshot
@# perl 5.8 for this
pod2man -c 'rsnapshot-tools' -n 'rsnapshot' -r 'rsnapshot-tools' 
rsnapshot > rsnapshot.1
-   
+
 rsnapshot-diff.1 : rsnapshot-diff
@# perl 5.8 for this
pod2man -c 'rsnapshot-tools' -n 'rsnapshot-diff' -r 'rsnapshot-tools' 
rsnapshot-diff > rsnapshot-diff.1
-   
+
 html: rsnapshot.html
 rsnapshot.html: rsnapshot
pod2html rsnapshot | grep -v 'link rev' > rsnapshot.html
@@ -35,40 +35,40 @@
rm -f t/support/etc/*.conf
rm -f t/support/files/a/{1,2}
rm -rf t/support/snapshots/*.*
-   
-   
+
+
 tar: rsnapshot-$(VERSION).tar.gz
@touch tar
 
 rsnapshot-$(VERSION).tar.gz: $(man_MANS) Makefile $(bin_SCRIPTS) 
$(sysconf_DATA)
-   @echo building tar file 
+   @echo building tar file
mkdir rsnapshot-$(VERSION)/
-   
+
@# core files
-   cp -apr AUTHORS ChangeLog COPYING INSTALL.md Makefile.am README.md \
+   cp -a AUTHORS ChangeLog COPYING INSTALL.md Makefile.am README.md \
rsnapshot.conf.default.in rsnapshot-diff.pl 
rsnapshot-program.pl \
rsnapshot-$(VERSION)
 
@# autoconf files
-   cp -apr configure.ac Makefile.am \
+   cp -a configure.ac Makefile.am \
aclocal.m4 autom4te.cache configure install-sh Makefile.in 
missing \
rsnapshot-$(VERSION)/
 
@# documentation files
-   cp -apr docs \
+   cp -a docs \
rsnapshot-$(VERSION)/
 
@# utils
-   cp -apr utils/ \
+   cp -a utils/ \
rsnapshot-$(VERSION)/
 
@# testsuite
-   cp -apr t/ \
+   cp -a t/ \
rsnapshot-$(VERSION)/
 
@# remove git-files
find rsnapshot-$(VERSION)/ -depth -name .gitignore -exec rm -rf {} \;
-   
+
@# change ownership to root, and delete build dir
fakeroot chown -R root:root rsnapshot-$(VERSION)/
rm -f rsnapshot-$(VERSION).tar.gz
@@ -89,4 +89,3

commit rsnapshot for openSUSE:Factory

2015-10-06 Thread h_root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2015-10-06 13:26:05

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new (New)


Package is "rsnapshot"

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2015-09-27 
08:39:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new/rsnapshot.changes 2015-10-06 
13:26:07.0 +0200
@@ -1,0 +2,5 @@
+Fri Oct  2 18:38:17 UTC 2015 - h...@urpla.net
+
+- add logrotate config and dependency for /var/log/rsnapshot
+
+---

New:

  rsnapshot.logrotate



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.u4gacw/_old  2015-10-06 13:26:08.0 +0200
+++ /var/tmp/diff_new_pack.u4gacw/_new  2015-10-06 13:26:08.0 +0200
@@ -24,10 +24,13 @@
 Group:  Productivity/Archiving/Backup
 Url:http://www.rsnapshot.org/
 Source0:http://rsnapshot.org/downloads/%{name}-%{version}.tar.gz
+Source1:rsnapshot.logrotate
 Patch1: rsnapshot-config.patch
+BuildRequires:  logrotate
 BuildRequires:  openssh
 BuildRequires:  perl
 BuildRequires:  rsync
+Requires:   logrotate
 Requires:   openssh
 Requires:   perl
 Requires:   rsync
@@ -67,6 +70,7 @@
 install -d "%{buildroot}/%{_sysconfdir}"
 install -m 644 rsnapshot.conf.default 
"%{buildroot}/%{_sysconfdir}/rsnapshot.conf.default"
 install -m 600 rsnapshot.conf.default 
"%{buildroot}/%{_sysconfdir}/rsnapshot.conf"
+install -m 644 -D %{S:1} "%{buildroot}/%{_sysconfdir}/logrotate.d/rsnapshot"
 
 %files
 %defattr(-,root,root)
@@ -75,6 +79,7 @@
 %{_bindir}/rsnapshot-diff
 %config(noreplace) %{_sysconfdir}/rsnapshot.conf
 %config %{_sysconfdir}/rsnapshot.conf.default
+%config(noreplace) %{_sysconfdir}/logrotate.d/rsnapshot
 %{_mandir}/man1/rsnapshot.1.gz
 %{_mandir}/man1/rsnapshot-diff.1.gz
 

++ rsnapshot.logrotate ++
/var/log/rsnapshot {
compress
dateext
maxage 365
rotate 99
size=+1024k
notifempty
missingok
copytruncate
}

commit rsnapshot for openSUSE:Factory

2015-09-27 Thread h_root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2015-09-27 08:39:41

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new (New)


Package is "rsnapshot"

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2015-04-13 
20:30:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new/rsnapshot.changes 2015-09-27 
08:39:03.0 +0200
@@ -1,0 +2,44 @@
+Mon Sep 21 09:21:47 UTC 2015 - mplus...@suse.com
+
+- Update to 1.4.1
+  * Capture rsync's output right (Github issue 102)
+- Changes for 1.4.0
+  * Tidy the code with perltidy
+  * Fix --rsh command line option
+  * The --rsh option of rsync got errornously quoted (Debian Bug #743310)
+  *  Define traps to unmount LVM parts after fail If you use LVM 
+snapshots and rsnapshot fails, rsnapshot will unmount and 
+remove the snapshot, too.
+  * cd to home before executing a command
+  * if($use_lazy_deletes): remove lockfile in any case
+  * Bail on failing cmd_(pre|post)exec If one of those commands 
+fails, rsnapshot will exit with exit code != 0
+  * Capture output from rsync and print/log if level is >=4
+  * Print rsnpashot's PID when logging to syslog, instead of the 
+logger's PID.
+  * make script uses pod2man instead of /usr/bin/pod2man
+  * rsnapshot-diff: Fixed removed files reported as addition (+ mark)
+  * Introduction of backup_exec resource for running unix commands
+interspersed with backup and backup_script jobs.
+  * check for SIGPIPE, mainly in case cron fails when trying to mail
+(this is probably why rsnapshot dies mysteriously if it outputs when
+called by cron on a system which does not have mail working).
+  * add test case for -t showing --link-dest when there is only one snapshot
+  * if gnu_cp_al fails, test out a simple cp -al command before suggesting
+that the cp does not support -al.
+  * When snapshot_root does not exist, check existence of parent directories.
+  * include_conf `command` now strips backticks before execution (bug fix
+based on suggestion from David Osborn).
+  * Ignore extraneous output from lvremove command.  (patch by Tim Connors)
+  * Update current maintainer status in Authors section of man page.
+(David Cantrell stepped down between 1.3.0 and 1.3.1.)
+  * Remove some old (1.1.x -> 1.2.0) upgrade notices from man page.
+  * Allow linux_lvm_cmd_* in config file to have options also.
+  * Allow `backticks with options` in include_conf.
+  * Fix inaccurate omission of --link-dest in test-mode output
+  * rsnapshot-diff: Add -s option to show size of each file.
+- Drop no longer needed patches 
+  * rsnapshot-1.3.1-perl5.18.patch
+  * rsnapshot-1.3.1-no_usr_local.patch
+
+---

Old:

  rsnapshot-1.3.1-no_usr_local.patch
  rsnapshot-1.3.1-perl5.18.patch
  rsnapshot-1.3.1.tar.gz

New:

  rsnapshot-1.4.1.tar.gz



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.QkRUn5/_old  2015-09-27 08:39:04.0 +0200
+++ /var/tmp/diff_new_pack.QkRUn5/_new  2015-09-27 08:39:04.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   rsnapshot
-Version:1.3.1
+Version:1.4.1
 Release:0
 Summary:Backup program using hardlinks
 License:GPL-2.0+
@@ -25,8 +25,6 @@
 Url:http://www.rsnapshot.org/
 Source0:http://rsnapshot.org/downloads/%{name}-%{version}.tar.gz
 Patch1: rsnapshot-config.patch
-Patch2: rsnapshot-1.3.1-no_usr_local.patch
-Patch3: rsnapshot-1.3.1-perl5.18.patch
 BuildRequires:  openssh
 BuildRequires:  perl
 BuildRequires:  rsync
@@ -54,10 +52,10 @@
 %prep
 %setup -q
 %patch1
-%patch2
-%patch3
 
 %build
+# replace hardcoded /usr/local
+find . -type f -exec sed -i "s|usr/local|usr|g" {} +
 %configure
 make %{?_smp_mflags}
 
@@ -72,11 +70,11 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog README.md
 %{_bindir}/rsnapshot
 %{_bindir}/rsnapshot-diff
 %config(noreplace) %{_sysconfdir}/rsnapshot.conf
 %config %{_sysconfdir}/rsnapshot.conf.default
-%doc AUTHORS COPYING ChangeLog README TODO
 %{_mandir}/man1/rsnapshot.1.gz
 %{_mandir}/man1/rsnapshot-diff.1.gz
 

++ rsnapshot-1.3.1.tar.gz -> rsnapshot-1.4.1.tar.gz ++
 38759 lines of diff (skipped)

++ rsnapshot-config.patch ++
--- /var/tmp/diff_new_pack.QkRUn5/_old  2015-09-27 08:39:04.0 +0200
+++ /var/tmp/diff_new_pack.QkRUn5/_new  2015-09-27 08:39:04.0 +0200
@@ -1,6 +1,8 @@
 rsnapshot.conf.default.in
+Index: rsnapshot.conf.default.in
+===
+---

commit rsnapshot for openSUSE:Factory

2015-04-13 Thread h_root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2015-04-13 20:30:42

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new (New)


Package is rsnapshot

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2014-12-30 
00:49:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new/rsnapshot.changes 2015-04-13 
20:30:44.0 +0200
@@ -1,0 +2,7 @@
+Sun Apr 12 12:33:07 UTC 2015 - mplus...@suse.com
+
+- Use url for source
+- Cleanup spec file with spec-cleaner
+- Update dependencies
+
+---

Old:

  rsnapshot-1.3.1.tar.bz2

New:

  rsnapshot-1.3.1.tar.gz



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.ikKRQY/_old  2015-04-13 20:30:44.0 +0200
+++ /var/tmp/diff_new_pack.ikKRQY/_new  2015-04-13 20:30:44.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rsnapshot
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,28 @@
 
 
 Name:   rsnapshot
-Url:http://www.rsnapshot.org/
 Version:1.3.1
 Release:0
 Summary:Backup program using hardlinks
 License:GPL-2.0+
 Group:  Productivity/Archiving/Backup
-Source: %name-%version.tar.bz2
+Url:http://www.rsnapshot.org/
+Source0:http://rsnapshot.org/downloads/%{name}-%{version}.tar.gz
 Patch1: rsnapshot-config.patch
 Patch2: rsnapshot-1.3.1-no_usr_local.patch
 Patch3: rsnapshot-1.3.1-perl5.18.patch
+BuildRequires:  openssh
 BuildRequires:  perl
 BuildRequires:  rsync
+Requires:   openssh
 Requires:   perl
 Requires:   rsync
-BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+BuildArch:  noarch
+%if 0%{?suse_version} = 1320
+BuildRequires:  util-linux-systemd
+Requires:   util-linux-systemd
+%endif
 
 %description
 rsnapshot is a filesystem snapshot utility for making backups of local
@@ -45,16 +51,6 @@
 change, so once it's set up, you may never need to think about it
 again.
 
-
-
-Authors:
-
-Anthony Ettinger ch...@users.sourceforge.net
-David Keegel dj...@users.sourceforge.net
-David Cantrell drh...@users.sourceforge.net
-Nathan Rosenquist scubani...@users.sourceforge.net
-Teodor Zlatanov t...@users.sourceforge.net
-
 %prep
 %setup -q
 %patch1
@@ -63,16 +59,16 @@
 
 %build
 %configure
-%__make
+make %{?_smp_mflags}
 
 %check
-%__make test
+make %{?_smp_mflags} test
 
 %install
-%makeinstall
-%__install -d %{buildroot}/%{_sysconfdir}
-%__install -m 644 rsnapshot.conf.default 
%{buildroot}/%{_sysconfdir}/rsnapshot.conf.default
-%__install -m 600 rsnapshot.conf.default 
%{buildroot}/%{_sysconfdir}/rsnapshot.conf
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+install -d %{buildroot}/%{_sysconfdir}
+install -m 644 rsnapshot.conf.default 
%{buildroot}/%{_sysconfdir}/rsnapshot.conf.default
+install -m 600 rsnapshot.conf.default 
%{buildroot}/%{_sysconfdir}/rsnapshot.conf
 
 %files
 %defattr(-,root,root)

commit rsnapshot for openSUSE:Factory

2014-12-29 Thread h_root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2014-12-30 00:49:49

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new (New)


Package is rsnapshot

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2013-07-25 
20:32:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new/rsnapshot.changes 2014-12-30 
00:49:58.0 +0100
@@ -1,0 +2,6 @@
+Sun Dec 28 05:31:18 UTC 2014 - bwiedem...@suse.com
+
+- use explicit pathes for logger and ssh
+  as autodetection at build-time goes wrong
+
+---



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.BRgqhG/_old  2014-12-30 00:50:00.0 +0100
+++ /var/tmp/diff_new_pack.BRgqhG/_new  2014-12-30 00:50:00.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package rsnapshot
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ rsnapshot-config.patch ++
--- /var/tmp/diff_new_pack.BRgqhG/_old  2014-12-30 00:50:00.0 +0100
+++ /var/tmp/diff_new_pack.BRgqhG/_new  2014-12-30 00:50:00.0 +0100
@@ -9,16 +9,19 @@
  
  # uncomment this to use the rm program instead of the built-in perl routine.
  #
-@@ -54,7 +54,7 @@
+@@ -54,21 +54,21 @@
  
  # Uncomment this to enable remote ssh backups over rsync.
  #
 -#@CMD_SSH@
-+@CMD_SSH@
++cmd_ssh   /usr/bin/ssh
  
  # Comment this out to disable syslog support.
  #
-@@ -64,11 +64,11 @@
+-@CMD_LOGGER@
++cmd_logger/usr/bin/logger
+ 
+ # Uncomment this to specify the path to du for disk usage checks.
  # If you have an older version of du, you may also want to check the
  # du_args parameter below.
  #

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rsnapshot for openSUSE:Factory

2013-07-25 Thread h_root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2013-07-25 20:32:15

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new (New)


Package is rsnapshot

Changes:

--- /work/SRC/openSUSE:Factory/rsnapshot/rsnapshot.changes  2011-09-23 
12:44:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.rsnapshot.new/rsnapshot.changes 2013-07-25 
20:32:16.0 +0200
@@ -1,0 +2,14 @@
+Thu Jul 25 13:28:52 UTC 2013 - tchva...@suse.com
+
+- Split test phase to check one.
+- Remove useless clean phase.
+- Silence some rpmlint macros.
+
+---
+Wed Jun 26 22:45:40 UTC 2013 - greg.freem...@gmail.com
+
+- Add a patch to correct syntax needed by perl 5.18:
+rsnapshot-1.3.1-perl5.18.patch
+- Get rid of changelog entries form specfile
+
+---

New:

  rsnapshot-1.3.1-perl5.18.patch



Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.Xnnubk/_old  2013-07-25 20:32:16.0 +0200
+++ /var/tmp/diff_new_pack.Xnnubk/_new  2013-07-25 20:32:16.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package rsnapshot (Version 1.3.1)
+# spec file for package rsnapshot
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,22 +15,22 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:   rsnapshot
 Url:http://www.rsnapshot.org/
-License:GPL-2.0+
-Group:  Productivity/Archiving/Backup
 Version:1.3.1
-Release:5
+Release:0
 Summary:Backup program using hardlinks
+License:GPL-2.0+
+Group:  Productivity/Archiving/Backup
 Source: %name-%version.tar.bz2
 Patch1: rsnapshot-config.patch
 Patch2: rsnapshot-1.3.1-no_usr_local.patch
-BuildRequires:  perl rsync
-Requires:   perl rsync
-AutoReqProv:on
+Patch3: rsnapshot-1.3.1-perl5.18.patch
+BuildRequires:  perl
+BuildRequires:  rsync
+Requires:   perl
+Requires:   rsync
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -59,10 +59,13 @@
 %setup -q
 %patch1
 %patch2
+%patch3
 
 %build
 %configure
 %__make
+
+%check
 %__make test
 
 %install
@@ -71,16 +74,13 @@
 %__install -m 644 rsnapshot.conf.default 
%{buildroot}/%{_sysconfdir}/rsnapshot.conf.default
 %__install -m 600 rsnapshot.conf.default 
%{buildroot}/%{_sysconfdir}/rsnapshot.conf
 
-%clean
-[ %{buildroot} != / ]  [ -d %{buildroot} ]  %__rm -rf %{buildroot};
-
 %files
 %defattr(-,root,root)
 %{_bindir}/rsnapshot
 %{_bindir}/rsnapshot-diff
 %config(noreplace) %{_sysconfdir}/rsnapshot.conf
 %config %{_sysconfdir}/rsnapshot.conf.default
-%doc AUTHORS COPYING ChangeLog README INSTALL TODO
+%doc AUTHORS COPYING ChangeLog README TODO
 %{_mandir}/man1/rsnapshot.1.gz
 %{_mandir}/man1/rsnapshot-diff.1.gz
 

++ rsnapshot-1.3.1-perl5.18.patch ++
--- rsnapshot-program.pl.orig   2008-08-31 11:17:07.0 +
+++ rsnapshot-program.pl
@@ -6716,6 +6716,8 @@ Putting it all together (an example file
 
 =back
 
+=back
+
 =head1 USAGE
 
 Brsnapshot can be used by any user, but for system-wide backups

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rsnapshot for openSUSE:Factory

2011-12-06 Thread h_root 
Hello community,

here is the log from the commit of package rsnapshot for openSUSE:Factory 
checked in at 2011-12-06 19:00:43

Comparing /work/SRC/openSUSE:Factory/rsnapshot (Old)
 and  /work/SRC/openSUSE:Factory/.rsnapshot.new (New)


Package is rsnapshot, Maintainer is hvo...@suse.com

Changes:




Other differences:
--
++ rsnapshot.spec ++
--- /var/tmp/diff_new_pack.lkwF1B/_old  2011-12-06 19:33:23.0 +0100
+++ /var/tmp/diff_new_pack.lkwF1B/_new  2011-12-06 19:33:23.0 +0100
@@ -20,7 +20,7 @@
 
 Name:   rsnapshot
 Url:http://www.rsnapshot.org/
-License:GPL v2 or later
+License:GPL-2.0+
 Group:  Productivity/Archiving/Backup
 Version:1.3.1
 Release:5

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org