[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0debian-112-ga57b85f

[Thomas Mueller]

The following commit has been merged in the master branch:
commit 85d1afa464294bc65f0a7c713bbcdf302476f466
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Wed May 23 00:52:59 2012 +0200

    debian/patches/05_no_app_store.diff added

diff --git a/debian/TODO b/debian/TODO
index 9cf7133..c4b986a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -4,8 +4,6 @@ ownCloud packaging TODO list
 * Remove the MDB2 SQLite driver installed by owncloud-sqlite and depend
   on php-mdb2-driver-sqlite (still to be packaged).
 * Handle purging well (removing config, conformation for removing data).
-* Write patch to prevent installation of 3rd-party apps via the internet, 
-  because this is risky. Bad code can be injected.
 
 Low priority/later
 ------------------
diff --git a/debian/changelog b/debian/changelog
index 55b213e..10ae9f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,9 @@ owncloud (4.0.0debian-1) UNRELEASED; urgency=low
   * debian/postrm: remove /etc/owncloud/config.php.
   * debian/rules: remove fullcalendar.min.js & jquery.Jcrop.min.js; they
     are not used.
-  * debian/patches:04_fix_odfviewer.diff added
+  * debian/patches:
+    - 04_fix_odfviewer.diff added
+    - debian/patches/05_no_app_store.diff added
 
   [ Paul van Tilburg ]
   * debian/control:
diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
new file mode 100644
index 0000000..4eeff85
--- /dev/null
+++ b/debian/patches/05_no_app_store.diff
@@ -0,0 +1,15 @@
+Description: Disable the app store
+ Due to the potential injection of malicious code the app store is disabled
+Author: Thomas Mueller <thomas.mueller at tmit.eu>
+Forwarded: not-needed
+
+--- a/lib/setup.php
++++ b/lib/setup.php
+@@ -77,6 +77,7 @@ class OC_Setup {
+ 			OC_Config::setValue('datadirectory', $datadir);
+  			OC_Config::setValue('dbtype', $dbtype);
+  			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
++			OC_Config::setValue('appstoreenabled', false);
+ 			if($dbtype == 'mysql') {
+ 				$dbuser = $options['dbuser'];
+ 				$dbpass = $options['dbpass'];
diff --git a/debian/patches/series b/debian/patches/series
index 688fdcd..fff38c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_fix_crypt.diff
 03_fix_phpmailer.diff
 04_fix_odfviewer.diff
+05_no_app_store.diff

-- 
owncloud.git