adamwill pushed to owncloud (f21). "fix patch backported in previous build (upstream made a booboo)"

[notifications at fedoraproject.org]

adamwill pushed to owncloud (f21).  "fix patch backported in previous build (upstream made a booboo)"

>From e6f7d7e2790638bc8ba641968a3cad7f5510e4db Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam at redhat.com>
Date: Tue, 24 Mar 2015 10:07:53 -0700
Subject: fix patch backported in previous build (upstream made a booboo)


diff --git a/c716776a90da02e463040c507ea8a3f34d871cfd.patch b/c716776a90da02e463040c507ea8a3f34d871cfd.patch
deleted file mode 100644
index 84ea9c6..0000000
--- a/c716776a90da02e463040c507ea8a3f34d871cfd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c716776a90da02e463040c507ea8a3f34d871cfd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller at tmit.eu>
-Date: Thu, 12 Mar 2015 21:03:26 +0100
-Subject: [PATCH] cron shall not operate in case we are in maintenance mode -
- fixes #14843
-
----
- cron.php | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/cron.php b/cron.php
-index 5c2cb20..8a3240d 100644
---- a/cron.php
-+++ b/cron.php
-@@ -50,7 +50,11 @@ function handleUnexpectedShutdown() {
- 
- 	if (\OCP\Util::needUpgrade()) {
- 		\OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG);
--		exit();
-+		exit;
-+	}
-+	if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) {
-+		\OCP\Util::writeLog('cron', 'We are in maintenance mode, skipping cron', \OCP\Util::DEBUG);
-+		exit;
- 	}
- 
- 	// load all apps to get all api routes properly setup
diff --git a/owncloud-7.0.5-cron_maintenance.patch b/owncloud-7.0.5-cron_maintenance.patch
new file mode 100644
index 0000000..55f6a71
--- /dev/null
+++ b/owncloud-7.0.5-cron_maintenance.patch
@@ -0,0 +1,27 @@
+From c716776a90da02e463040c507ea8a3f34d871cfd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller at tmit.eu>
+Date: Thu, 12 Mar 2015 21:03:26 +0100
+Subject: [PATCH] cron shall not operate in case we are in maintenance mode -
+ fixes #14843
+
+---
+ cron.php | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/cron.php b/cron.php
+index 5c2cb20..8a3240d 100644
+--- a/cron.php
++++ b/cron.php
+@@ -50,7 +50,11 @@ function handleUnexpectedShutdown() {
+ 
+ 	if (\OCP\Util::needUpgrade()) {
+ 		\OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG);
+-		exit();
++		exit;
++	}
++	if (\OC_Config::getValue('maintenance', false)) {
++		\OCP\Util::writeLog('cron', 'We are in maintenance mode, skipping cron', \OCP\Util::DEBUG);
++		exit;
+ 	}
+ 
+ 	// load all apps to get all api routes properly setup
diff --git a/owncloud.spec b/owncloud.spec
index b6bf252..0b95af0 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
 Name:           owncloud
 Version:        7.0.5
-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
@@ -65,7 +65,10 @@ Patch15:        %{name}-7.0.3-opcache_invalidate.patch
 Patch16:        %{name}-7.0.4-google1.patch
 # Backported fix (from stable7) for 'critical' issue #14843
 # "cron shall not operate in case we are in maintenance mode"
-Patch17:        https://github.com/owncloud/core/commit/c716776a90da02e463040c507ea8a3f34d871cfd.patch
+# https://github.com/owncloud/core/commit/c716776a90da02e463040c507ea8a3f34d871cfd.patch ,
+# but edited to fix the issue I pointed out at:
+# https://github.com/owncloud/core/pull/14846#issuecomment-85597279
+Patch17:        owncloud-7.0.5-cron_maintenance.patch
 
 
 BuildArch:      noarch
@@ -454,6 +457,9 @@ fi
 
 
 %changelog
+* Tue Mar 24 2015 Adam Williamson <awilliam at redhat.com> - 7.0.5-2
+- fix patch backported in previous build (upstream made a booboo)
+
 * Mon Mar 23 2015 Adam Williamson <awilliam at redhat.com> - 7.0.5-1
 - new release 7.0.5 (fixes yet-undisclosed vulns, #1204821 #1204823)
 - also backport fix for 'severe' upstream issue #14843
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/owncloud.git/commit/?h=f21&id=e6f7d7e2790638bc8ba641968a3cad7f5510e4db

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390