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 @@
<meta name="generator" content=
"HTML Tidy for Linux/x86 (vers 12 April 2005), see www.w3.org" />
<title>rsnapshot HOWTO</title>
- http://www.xml-dev.com/blog/new.css" rel="stylesheet"
- type="text/css" />
<meta content="DocBook XSL Stylesheets V1.64.1" name=
"generator" />
Description: Rsync >= 3.1.0 stats and bytes output changes
Forwarded: https://github.com/rsnapshot/rsnapshot/pull/95
Bug-Debian: https://bugs.debian.org/784650
Index: rsnapshot/utils/rsnapreport.pl
===================================================================
--- rsnapshot.orig/utils/rsnapreport.pl
+++ rsnapshot/utils/rsnapreport.pl
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
# this script prints a pretty report from rsnapshot output
# in the rsnapshot.conf you must set
-# verbose >= 3
+# verbose >= 4
# and add --stats to rsync_long_args
# then setup crontab 'rsnapshot daily 2>&1 | rsnapreport.pl | mail -s"SUBJECT" backupadm@adm.com
# don't forget the 2>&1 or your errors will be lost to stderr
@@ -90,17 +90,23 @@ while (my $line = nextLine(\@rsnapout)){
}
# stat record
if($line =~ /^total size is\s+\d+/){ last; } # this ends the rsync stats record
- elsif($line =~ /Number of files:\s+(\d+)/){
+ # Number of files: 1,325 (reg: 387, dir: 139, link: 799)
+ elsif($line =~ /Number of files:\s+(.+) \(/){
$bkdata{$source}{'files'}=$1;
+ $bkdata{$source}{'files'}=~ s/,//g;
}
- elsif($line =~ /Number of files transferred:\s+(\d+)/){
- $bkdata{$source}{'files_tran'}=$1;
+ # Number of regular files transferred: 1
+ elsif($line =~ /Number of (regular )?files transferred:\s+(\d+)/){
+ $bkdata{$source}{'files_tran'}=$2;
}
- elsif($line =~ /Total file size:\s+(\d+)/){
+ # Total file size: 1,865,857 bytes
+ elsif($line =~ /Total file size:\s+(.+) bytes/){
$bkdata{$source}{'file_size'}=$1;
+ $bkdata{$source}{'file_size'}=~ s/,//g;
}
- elsif($line =~ /Total transferred file size:\s+(\d+)/){
+ elsif($line =~ /Total transferred file size:\s+(.+) bytes/){
$bkdata{$source}{'file_tran_size'}=$1;
+ $bkdata{$source}{'file_tran_size'}=~ s/,//g;
}
elsif($line =~ /File list generation time:\s+(.+)/){
$bkdata{$source}{'file_list_gen_time'}=$1;
++++++ rsnapshot-config.patch ++++++
--- /var/tmp/diff_new_pack.Q5JSm9/_old 2019-08-09 16:54:37.601450830 +0200
+++ /var/tmp/diff_new_pack.Q5JSm9/_new 2019-08-09 16:54:37.601450830 +0200
@@ -1,7 +1,7 @@
-Index: rsnapshot.conf.default.in
+Index: b/rsnapshot.conf.default.in
===================================================================
---- rsnapshot.conf.default.in.orig
-+++ rsnapshot.conf.default.in
+--- a/rsnapshot.conf.default.in
++++ b/rsnapshot.conf.default.in
@@ -37,7 +37,7 @@ snapshot_root /.snapshots/
#
# See the README file or the man page for more details.
@@ -37,7 +37,14 @@
# Specify the path to a script (and any optional arguments) to run right
# before rsnapshot syncs files
-@@ -117,7 +117,7 @@ loglevel 3
+@@ -111,13 +111,14 @@ verbose 2
+
+ # Same as "verbose" above, but controls the amount of data sent to the
+ # logfile, if one is being used. The default is 3.
++# If you want rsync output, you have to set this to 4.
+ #
+ loglevel 3
+
# If you enable this, data will be written to the file you specify. The
# amount of data written is controlled by the "loglevel" parameter.
#
@@ -46,7 +53,7 @@
# If enabled, rsnapshot will write a lockfile to prevent two instances
# from running simultaneously (and messing up the snapshot_root).
-@@ -168,7 +168,7 @@ lockfile /var/run/rsnapshot.pid
+@@ -174,7 +175,7 @@ lockfile /var/run/rsnapshot.pid
# This is the best way to support special files (FIFOs, etc) cross-platform.
# The default is 0 (off).
#
@@ -55,7 +62,7 @@
# When sync_first is enabled, it changes the default behaviour of rsnapshot.
# Normally, when rsnapshot is called with its lowest interval
-@@ -183,7 +183,7 @@ lockfile /var/run/rsnapshot.pid
+@@ -189,7 +190,7 @@ lockfile /var/run/rsnapshot.pid
# to [interval_name].delete, then it will remove the lockfile and delete
# that directory just before it exits. The default is 0 (off).
#
++++++ rsnapshot-lvm-undef.patch ++++++
Author: Michel Dänzer https://bugs.debian.org/794046
Forwarded: https://github.com/rsnapshot/rsnapshot/pull/111
Index: b/rsnapshot-program.pl
===================================================================
--- 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));
}
}