[owncloud] drop OC_User_IMAP from config file (causes errors unless app is enabled)

Adam Williamson adamwill at fedoraproject.org
Sun Jan 5 06:56:17 UTC 2014


commit e8f4a32e52532cb158b234adeb78f53790c13ff4
Author: Adam Williamson <awilliam at redhat.com>
Date:   Sat Jan 4 22:55:56 2014 -0800

    drop OC_User_IMAP from config file (causes errors unless app is enabled)

 owncloud-6.0.0-config.patch |   16 +++++++++++-----
 owncloud.spec               |    5 ++++-
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/owncloud-6.0.0-config.patch b/owncloud-6.0.0-config.patch
index 8bc232a..c1ad269 100644
--- a/owncloud-6.0.0-config.patch
+++ b/owncloud-6.0.0-config.patch
@@ -1,5 +1,5 @@
---- config/config.sample.php.orig	2013-12-19 10:59:17.570527911 +0100
-+++ config/config.sample.php	2013-12-20 13:53:34.634715379 +0100
+--- config/config.sample.php.orig	2014-01-03 23:31:41.473242989 -0800
++++ config/config.sample.php	2014-01-03 23:32:32.416737063 -0800
 @@ -142,7 +142,7 @@
  "check_for_working_htaccess" => true,
  
@@ -18,7 +18,7 @@
  
  /* Enable maintenance mode to disable ownCloud
     If you want to prevent users to login to ownCloud before you start doing some maintenance work,
-@@ -204,11 +204,16 @@
+@@ -204,17 +204,16 @@
   applications paths. 'writable' indicates whether the user can install apps in this folder.
   You must have at least 1 app folder writable or you must set the parameter 'appstoreenabled' to false
  */
@@ -30,11 +30,17 @@
 -		'writable' => true,
 +		'writable' => false,
  	),
+-),
+-'user_backends'=>array(
+-	array(
+-		'class'=>'OC_User_IMAP',
+-		'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
+-	)
 +	1 => array(
 +		'path'=> '/var/lib/owncloud/apps',
 +		'url' => '/apps-appstore',
 +		'writable' => true,
 +    ),
  ),
- 'user_backends'=>array(
- 	array(
+ //links to custom clients
+ 'customclient_desktop' => '', //http://owncloud.org/sync-clients/
diff --git a/owncloud.spec b/owncloud.spec
index ae4bd4e..1b2428a 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
 Name:           owncloud
 Version:        6.0.0a
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Private file sync and share server
 
 License:        AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
@@ -361,6 +361,9 @@ fi
 
 
 %changelog
+* Fri Jan  3 2014 Adam Williamson <awilliam at redhat.com> - 6.0.0a-5
+- drop non-existent OC_User_IMAP from config file
+
 * Fri Jan  3 2014 Adam Williamson <awilliam at redhat.com> - 6.0.0a-4
 - apps_3rdparty_includes: fix more 3rdparty loading stuff
 - disable_irods: disable storage app's irods (it's broken)


More information about the scm-commits mailing list