[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.3debian-1-24-g62be0d6

[Thomas Mueller]

The following commit has been merged in the master branch:
commit 62be0d6e3f7ad4de1029ba3ce2f4fd7440f9a947
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Thu Aug 9 23:48:37 2012 +0200

        - Added fix_writing_to_shared_readonly.diff to fix WebDAV write access to
          shared files (Closes: #684426)
        - Remove experimental feature 'files_external'

diff --git a/debian/changelog b/debian/changelog
index ebe124e..d74a99a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+owncloud (4.0.5debian2-2) unstable; urgency=high
+
+  * debian/patches:
+    - Added fix_writing_to_shared_readonly.diff to fix WebDAV write access to 
+      shared files (Closes: #684426)
+  * debian/rules:
+    - Remove experimental feature 'files_external'
+
+ -- Thomas Mueller <thomas.mueller at tmit.eu>  Thu, 09 Aug 2012 23:29:25 +0200
+
 owncloud (4.0.5debian2-1) unstable; urgency=low
 
   * debian/repack.sh:
diff --git a/debian/patches/fix_writing_to_shared_readonly.diff b/debian/patches/fix_writing_to_shared_readonly.diff
new file mode 100644
index 0000000..4e42a9f
--- /dev/null
+++ b/debian/patches/fix_writing_to_shared_readonly.diff
@@ -0,0 +1,34 @@
+Origin: upstream, http://gitorious.org/owncloud/owncloud/commit/05648dac619942dfccc76180d30fcd79364355ec
+Author: Michael Gapczynski <mtgap at owncloud.com>
+Bug-Debian: http://bugs.debian.org/684426
+Last-Update: 2012-08-08
+
+--- owncloud-4.0.5debian2.orig/apps/files_sharing/sharedstorage.php
++++ owncloud-4.0.5debian2/apps/files_sharing/sharedstorage.php
+@@ -416,6 +416,25 @@ class OC_Filestorage_Shared extends OC_F
+ 	public function fopen($path, $mode) {
+ 		$source = $this->getSource($path);
+ 		if ($source) {
++			switch ($mode) {
++				case 'r+':
++				case 'rb+':
++				case 'w+':
++				case 'wb+':
++				case 'x+':
++				case 'xb+':
++				case 'a+':
++				case 'ab+':
++				case 'w':
++				case 'wb':
++				case 'x':
++				case 'xb':
++				case 'a':
++				case 'ab':
++					if (!$this->is_writable($path)) {
++						return false;
++					}
++			}
+ 			$storage = OC_Filesystem::getStorage($source);
+ 			return $storage->fopen($this->getInternalPath($source), $mode);
+ 		}
+
diff --git a/debian/patches/series b/debian/patches/series
index 11f55fe..f9e4be2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 fix_tar_require.diff
 fix_sabre_requires.diff
 fix_config.php_mode.diff
+fix_writing_to_shared_readonly.diff
diff --git a/debian/rules b/debian/rules
index c85bb36..6f2164b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,9 @@
 override_dh_install:
 	dh_install
 
+	# Remove experimental feature external storage
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/
+
 	# Remove redundant license files as it is already captured in debian/copyright.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/LICENSE.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
@@ -33,7 +36,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_archive/tests
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_encryption/tests
-	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/tests
 	rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
 	rm -r debian/owncloud/usr/share/owncloud/l10n/templates # translation templates are not needed to run the app
 	

-- 
owncloud.git