fix for owncloud synchronisation issues
authorMatthias Förste <foerste@schlittermann.de>
Mon, 14 Dec 2015 16:57:39 +0100
changeset 30 c6769d3b86aa
parent 29 afbfa83fd7a6
child 31 e3b1977b55ab
fix for owncloud synchronisation issues
owncloud/16862.patch
owncloud/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/owncloud/16862.patch	Mon Dec 14 16:57:39 2015 +0100
@@ -0,0 +1,32 @@
+From 14c760124fd0eb92684297c587769cea1d11f2f2 Mon Sep 17 00:00:00 2001
+From: Lukas Reschke <lukas@owncloud.com>
+Date: Wed, 10 Jun 2015 14:46:42 +0200
+Subject: [PATCH] Don't use command concatenation
+
+Possibly fixes https://github.com/owncloud/core/issues/16853
+---
+ apps/files_external/3rdparty/smb4php/smb.php | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php
+index 7ffdb42..5db663b 100644
+--- a/apps/files_external/3rdparty/smb4php/smb.php
++++ b/apps/files_external/3rdparty/smb4php/smb.php
+@@ -324,14 +324,14 @@ function rename ($url_from, $url_to) {
+ 			trigger_error('rename(): error in URL', E_USER_ERROR);
+ 		}
+ 		smb::clearstatcache ($url_from);
+-		$cmd = '';
+ 		// check if target file exists
+ 		if (smb::url_stat($url_to)) {
+ 			// delete target file first
+-			$cmd = 'del "' . $to['path'] . '"; ';
++			$cmd = 'del "' . $to['path'] . '"';
++			smb::execute($cmd, $to);
+ 			$replace = true;
+ 		}
+-		$cmd .= 'rename "' . $from['path'] . '" "' . $to['path'] . '"';
++		$cmd = 'rename "' . $from['path'] . '" "' . $to['path'] . '"';
+ 		$result = smb::execute($cmd, $to);
+ 		if ($replace) {
+ 			// clear again, else the cache will return the info
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/owncloud/README	Mon Dec 14 16:57:39 2015 +0100
@@ -0,0 +1,5 @@
+owncloud-<version>$ quilt import <path>/owncloud/16862.patch
+owncloud-<version>$ dch -i 'Backport upstream patch to fix problems with https://github.com/owncloud/core/issues/16853 for seilerforstmann architekten'
+owncloud-<version>$ dch -l~ius ''
+owncloud-<version>$ dch -D stable ''
+owncloud-<version>$ $FAVOURITE-PACKAGE-BUILDER