Hello,

the current version in Jessie has got a regression then using ssh_args. This is 
a major
problem because most of our users are using extra ssh keys and this don't work 
at the
moment.

The patch that is working is backported from upstream to the version in Jessie:

https://github.com/hggh/rsnapshot-debian/compare/master...jessie.patch

The debdiff:

debdiff rsnapshot_1.3.1-4.dsc rsnapshot_1.3.1-4+deb8u1.dsc
(/tmp/build/rsnapshot_1.3.1-4+deb8u1.dsc) diff -Nru 
rsnapshot-1.3.1/debian/changelog
rsnapshot-1.3.1/debian/changelog --- rsnapshot-1.3.1/debian/changelog   
2013-07-08
22:54:57.000000000 +0200 +++ rsnapshot-1.3.1/debian/changelog   2015-09-06
12:45:22.000000000 +0200 @@ -1,3 +1,12 @@
+rsnapshot (1.3.1-4+deb8u1) jessie; urgency=medium
+
+  * Fix regression on --rsh with args: Applied patch from Upstream to fix --rsh
+    command line arguments with quotes.
+    The --rsh=... argument to rsync was erroneously quoted when added to the
+    @rsync_long_args_stack with options set.
+
+ -- Jonas Genannt <gena...@debian.org>  Sun, 06 Sep 2015 12:33:41 +0200
+
 rsnapshot (1.3.1-4) unstable; urgency=low
 
   * debian/patches/01_rsnapshot_conf: Refresh patch to fix path of rsnapshot in
diff -Nru rsnapshot-1.3.1/debian/patches/14_fix_rsh_args.patch
rsnapshot-1.3.1/debian/patches/14_fix_rsh_args.patch ---
rsnapshot-1.3.1/debian/patches/14_fix_rsh_args.patch    1970-01-01 
01:00:00.000000000
+0100 +++ rsnapshot-1.3.1/debian/patches/14_fix_rsh_args.patch  2015-09-06
12:45:22.000000000 +0200 @@ -0,0 +1,28 @@ +From 
f0b3b27d174257bf2a8ad29b8c36499bb7b2fb79
Mon Sep 17 00:00:00 2001 +From: Edwin Mons <g...@home.mons.net>
+Date: Wed, 18 Sep 2013 22:39:11 +0200
+Subject: [PATCH] Fix --rsh commandline option
+Bug:
https://github.com/rsnapshot/rsnapshot/commit/30380587aeab201311af9428f7c47621ade691c8
 +
+The --rsh=... argument to rsync was erroneously quoted when added to the
+@rsync_long_args_stack with options set.
+
+Test-Information:
+
+Unit tests pass.
+Tested and verified on Debian 7.0
+---
+ rsnapshot-program.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/rsnapshot-program.pl
++++ b/rsnapshot-program.pl
+@@ -3452,7 +3452,7 @@
+               
+               # if we have any args for SSH, add them
+               if ( defined($ssh_args) ) {
+-                      push( @rsync_long_args_stack, 
"--rsh=\"$config_vars{'cmd_ssh'}
$ssh_args\"" ); ++                      push( @rsync_long_args_stack,
"--rsh=$config_vars{'cmd_ssh'} $ssh_args" );
+                       
+               # no arguments is the default
+               } else {
diff -Nru rsnapshot-1.3.1/debian/patches/series 
rsnapshot-1.3.1/debian/patches/series
--- rsnapshot-1.3.1/debian/patches/series       2013-07-08 22:27:41.000000000 
+0200
+++ rsnapshot-1.3.1/debian/patches/series       2015-09-06 12:45:22.000000000 
+0200
@@ -8,3 +8,4 @@
 11_lvm_snapshots.diff
 12_include_conf_with_arguments.diff
 13_print_warn.diff
+14_fix_rsh_args.patch



Could you please provide a stable update?

Thanks,
        Jonas

Reply via email to