Hi, Le 21/08/2015 16:34, Adam D. Barratt a écrit : > > The package in unstable and testing appears to have been fixed now. > >> In either case, when it comes to an update in stable we'll need a source >> debdiff of the proposed updated package, built and tested in a Jessie >> environment, rather than pointers to online patches. > > This is still true, however. Please find attached a debdiff that fix the problem in Jessie. I've tested the fix by defining ssh_args in /etc/rsnapshot.conf and it's works well after the fix (before applying the update rsnapshot fails with "rsync: Failed to exec /usr/bin/ssh -p222: No such file or directory"). > > Regards, > > Adam > -- Guillaume Delacour
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-10-25 23:39:03.000000000 +0100
@@ -1,3 +1,13 @@
+rsnapshot (1.3.1-4+deb8u1) jessie; urgency=medium
+
+ * debian/patches/14_fix_rsh_args: 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. Thanks Jonas Genannt for the
+ help.
+
+ -- Guillaume Delacour <gui@iroqwa.org> Sun, 25 Oct 2015 23:33:28 +0100
+
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.diff rsnapshot-1.3.1/debian/patches/14_fix_rsh_args.diff
--- rsnapshot-1.3.1/debian/patches/14_fix_rsh_args.diff 1970-01-01 01:00:00.000000000 +0100
+++ rsnapshot-1.3.1/debian/patches/14_fix_rsh_args.diff 2015-10-25 23:38:18.000000000 +0100
@@ -0,0 +1,18 @@
+From: Edwin Mons <git@home.mons.net>
+Date: Wed, 18 Sep 2013 22:39:11 +0200
+Subject: Fix rsync --rsh command line arguments with quotes
+Bug: https://github.com/rsnapshot/rsnapshot/commit/30380587aeab201311af9428f7c47621ade691c8
+
+diff --git a/rsnapshot-program.pl b/rsnapshot-program.pl
+index 85972fd..5a20d0b 100755
+--- a/rsnapshot-program.pl
++++ b/rsnapshot-program.pl
+@@ -3412,7 +3412,7 @@ sub rsync_backup_point {
+
+ # 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-10-25 23:33:09.000000000 +0100
@@ -8,3 +8,4 @@
11_lvm_snapshots.diff
12_include_conf_with_arguments.diff
13_print_warn.diff
+14_fix_rsh_args.diff
Attachment:
signature.asc
Description: OpenPGP digital signature