[debian-edu-commits] debian-edu/slbackup-php.git (#10) - edu-wheezy (branch) updated: debian/0.3-2.2-9-g730316e

Mike Gabriel sunweaver at alioth.debian.org
Fri Aug 9 10:05:28 UTC 2013


The branch, edu-wheezy has been updated
       via  730316e8db53c1254e9db8430c484284e9b833ec (commit)
      from  ee23f46f15af9a632b6af9850617261221c8560c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    3 +
 ...02_slbackup-php_restore-paths-with-blanks.patch |  145 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 149 insertions(+)
 create mode 100644 debian/patches/002_slbackup-php_restore-paths-with-blanks.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9c5af20..02b29b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ slbackup-php (0.3-2.3) UNRELEASED; urgency=low
   * Add patch: 101_slbackup-php_i18n-de.patch, German translation for SL-Backup
     (WebGuI).
   * Update patch: 001_slbackup-php_cookie+request-merge.patch. Add sanity checks.
+  * Add patch: 002_slbackup-php_restore-paths-with-blanks.patch. Allows restore
+    of files with blanks in their name. Closes: #565181.
+    Patch provided by Cyril ETCHEVERRIA <cyril.e at wanadoo.fr> -> thanks!
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 15 Jan 2012 13:40:20 +0100
 
diff --git a/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch b/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
new file mode 100644
index 0000000..97fe0b2
--- /dev/null
+++ b/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
@@ -0,0 +1,145 @@
+Description: Fix restoring files with blanks in their name.
+ Fix restoring files with blanks in their name.
+ 
+ This patches closes Debian BTS issue #565181.
+Forwarded: not-needed
+Author: Cyril ETCHEVERRIA <cyril.e at wanadoo.fr>
+--- a/templates/restore.tpl
++++ b/templates/restore.tpl
+@@ -42,13 +42,13 @@
+ 	        <IMG SRC="/icons/generic.gif" alt="[   ]">
+ 	    {/if}    
+ 	    {if $dir.type == "file"}
+-		<A HREF=index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}</A>
++		<A HREF="index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}"</A>
+ 	    {elseif $dir.type == "delfile"}
+-		<A HREF=index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}(deleted)</A>
++		<A HREF="index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}(deleted)"</A>
+ 	    {elseif $dir.type == deldir}
+-		<A HREF=index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name} ({t}Deleted{/t})</A>
++		<A HREF="index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name} ({t}Deleted{/t})"</A>
+ 	    {else}
+-		<A HREF=index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}</A>
++		<A HREF="index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}"</A>
+ 	    {/if}    
+ 	    <BR>
+ 	{/foreach}
+@@ -59,13 +59,13 @@
+ 	        <IMG SRC="/icons/transfer.gif" alt="[   ]">
+ 	    {/if}    
+ 	    {if $version.type == "parent"}
+-		<A HREF=index.php?restorelocation&client={$client}&sub={$version.sub}&location={$location}>{$version.name}</A>
++		<A HREF="index.php?restorelocation&client={$client}&sub={$version.sub}&location={$location}>{$version.name}"</A>
+ 	    {elseif $version.type == "currentfile"}
+-		<A HREF=index.php?restorefile&client={$client}&file={$version.sub}&location={$location}&revision=current>current</A>
++		<A HREF="index.php?restorefile&client={$client}&file={$version.sub}&location={$location}&revision=current">current</A>
+ 	    {elseif $version.type == "diff.gz"}
+-		<A HREF=index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}</A>
++		<A HREF="index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}"</A>
+ 	    {elseif $version.type == "snapshot.gz"}
+-		<A HREF=index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}</A>
++		<A HREF="index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}"</A>
+ 	    {else}
+ 		unknown snapshot type $version.type
+ 	    {/if}    
+--- a/src/index.php
++++ b/src/index.php
+@@ -71,7 +71,7 @@
+ function removesnapshots ($passwd, $clientdir, $snapshot) {
+ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
+ 
+-    $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force --remove-older-than %s %s'", 
++    $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force --remove-older-than %s \"%s\"'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $snapshot, $clientdir) ; 
+ 
+@@ -98,7 +98,7 @@
+ function listsnapshots ($passwd, $clientdir) {
+ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
+ 
+-    $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data -maxdepth 1 -name \"increments.*\" -printf %s'", 
++    $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data\" -maxdepth 1 -name \"increments.*\" -printf %s'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $clientdir, '"%P\n"') ; 
+ 
+@@ -126,7 +126,7 @@
+ function fetchfile ($passwd, $clientdir, $location, $file) {
+ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
+ 
+-    $cmd = sprintf ("ssh %s %s@%s 'cat %s%s/%s'", 
++    $cmd = sprintf ("ssh %s %s@%s 'cat \"%s%s/%s\"'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $clientdir, $location, $file ) ; 
+ 
+@@ -169,7 +169,7 @@
+     } else unset ($tempfile) ; 
+     if (empty($tempfile))
+         return ; 
+-    $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force %s/rdiff-backup-data/increments%s/%s %s'", 
++    $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force \"%s/rdiff-backup-data/increments%s/%s %s\"'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $clientdir, $location, $file, $tempfile ) ; 
+ 
+@@ -180,7 +180,7 @@
+ 	fclose ($pipes[1]) ; 
+ 	proc_close ($proc) ; 
+     } 
+-    $cmd = sprintf ("ssh %s %s@%s 'cat %s && rm %s'", 
++    $cmd = sprintf ("ssh %s %s@%s 'cat \"%s\" && rm \"%s\"'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $tempfile, $tempfile) ; 
+     $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ; 
+@@ -213,7 +213,7 @@
+ 
+     $env = array ('SSH_ASKPASS' => $ssh_askpass, 
+ 		  'DISPLAY' => ':nowhere') ; 
+-    $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type f -name %s'", 
++    $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"%s\"'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $clientdir, $location, $parent, $base ) ; 
+     $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ; 
+@@ -230,7 +230,7 @@
+ 	proc_close ($proc) ; 
+     }
+     $baselen= strlen ($base) ; 
+-    $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type f -name \"%s*.gz\"'", 
++    $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"%s*.gz\"'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $clientdir, $location, $parent, $base ) ; 
+ 
+@@ -283,7 +283,7 @@
+ 
+     $env = array ('SSH_ASKPASS' => $ssh_askpass, 
+ 		  'DISPLAY' => ':nowhere') ; 
+-    $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type d'", 
++    $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type d'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $clientdir, $location, $sub ) ; 
+     $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ; 
+@@ -299,7 +299,7 @@
+ 	fclose ($pipes[1]) ; 
+ 	proc_close ($proc) ; 
+     }
+-    $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type d'", 
++    $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type d'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $clientdir, $location, $sub ) ; 
+     $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ; 
+@@ -322,7 +322,7 @@
+ 	fclose ($pipes[1]) ; 
+ 	proc_close ($proc) ; 
+     }
+-    $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type f'", 
++    $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type f'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $clientdir, $location, $sub ) ; 
+ 
+@@ -339,7 +339,7 @@
+ 	fclose ($pipes[1]) ; 
+ 	proc_close ($proc) ; 
+     }
+-    $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type f -name \"*.snapshot.gz\"'", 
++    $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"*.snapshot.gz\"'",
+    		     $ssh_options, $backupuser, 
+ 		     $backuphost, $clientdir, $location, $sub ) ; 
+     $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ; 
diff --git a/debian/patches/series b/debian/patches/series
index 1e38aff..3797a49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 001_slbackup-php_cookie+request-merge.patch
+002_slbackup-php_restore-paths-with-blanks.patch
 101_slbackup-php_i18n-de.patch


hooks/post-receive
-- 
slbackup-php.git (Debian package slbackup-php)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).




More information about the debian-edu-commits mailing list