[owncloud] 10927.patch: backport fix for an upgrade bug (upstream #10762)

[Adam Williamson]

commit afb2b53fb49b9373de337724a117926265edec54
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Sep 9 12:13:19 2014 -0700

    10927.patch: backport fix for an upgrade bug (upstream #10762)

 owncloud-7.0.2-10927.patch |   25 +++++++++++++++++++++++++
 owncloud.spec              |   12 +++++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/owncloud-7.0.2-10927.patch b/owncloud-7.0.2-10927.patch
new file mode 100644
index 0000000..4b20d27
--- /dev/null
+++ b/owncloud-7.0.2-10927.patch
@@ -0,0 +1,25 @@
+From d6bfd90bf804f6d8bb4c651e6bcf8374dc6b94b4 Mon Sep 17 00:00:00 2001
+From: Vincent Petry <pvince81 at owncloud.com>
+Date: Mon, 8 Sep 2014 12:30:04 +0200
+Subject: [PATCH] Do not load extra user backends when an upgrade is due
+
+Whenever an upgrade is due, do not load extra user backends
+---
+ lib/base.php | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/base.php b/lib/base.php
+index fb44512..5d52db68 100644
+--- a/lib/base.php
++++ b/lib/base.php
+@@ -554,7 +554,9 @@ public static function init() {
+ 		OC_Group::useBackend(new OC_Group_Database());
+ 
+ 		//setup extra user backends
+-		OC_User::setupBackends();
++		if (!self::checkUpgrade(false)) {
++			OC_User::setupBackends();
++		}
+ 
+ 		self::registerCacheHooks();
+ 		self::registerFilesystemHooks();
diff --git a/owncloud.spec b/owncloud.spec
index 16aa3a0..1e319b2 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
 Name:           owncloud
 Version:        7.0.2
-Release:        1%{?dist}
+Release:        2%{?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
@@ -55,6 +55,12 @@ Patch13:        %{name}-7.0.0rc1-3rdparty_includes.patch
 # Avoids triggering a crash in php-opcache: https://github.com/owncloud/core/issues/9885
 # From Remi Collet, should be submitted upstream soon
 Patch14:        %{name}-7.0.0-opcache_invalidate.patch
+# Fix upgrade process when extra user_ backends are enabled
+# Backport of upstream https://github.com/owncloud/core/pull/10927 , to fix
+# https://github.com/owncloud/core/issues/10762
+# should be in 7.0.3
+# https://github.com/owncloud/core/pull/10927.patch
+Patch15:        owncloud-7.0.2-10927.patch
 
 
 BuildArch:      noarch
@@ -183,6 +189,7 @@ sed -i 's/\r$//' apps/files_encryption/lib/crypt.php
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # prepare package doc
 cp %{SOURCE3} README.fedora
@@ -389,6 +396,9 @@ fi
 
 
 %changelog
+* Tue Sep 09 2014 Adam Williamson <awilliam at redhat.com> - 7.0.2-2
+- 10927.patch: backport fix for an upgrade bug (upstream #10762)
+
 * Thu Aug 28 2014 Adam Williamson <awilliam at redhat.com> - 7.0.2-1
 - update to 7.0.2
 - update patch for using Composer autoloader with 3rdparty deps