From 780d925e269cdc37ef4ab564ef1272e9c3c5f8ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Sun, 28 Aug 2016 21:54:46 +0200
Subject: [PATCH] [enh] Update Nextcloud to v10.0.0 with logout patch

---
 README.md                            |  2 +-
 conf/nextcloud-deps.control          |  6 ++++--
 manifest.json                        |  4 ++--
 patches/00-add-logout_url-conf.patch | 29 ++++++++++++++--------------
 scripts/_common.sh                   |  4 ++--
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index d42e9d6..abfbece 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Nextcloud for YunoHost
 own data. A personal cloud which run on your own server. With Nextcloud
 you can synchronize your files over your devices.
 
-**Shipped version:** 9.0.52
+**Shipped version:** 10.0.0
 
 ![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png)
 
diff --git a/conf/nextcloud-deps.control b/conf/nextcloud-deps.control
index 107f28b..32c147d 100644
--- a/conf/nextcloud-deps.control
+++ b/conf/nextcloud-deps.control
@@ -4,8 +4,10 @@ Homepage: https://owncloud.org/
 Standards-Version: 3.9.2
 
 Package: nextcloud-deps
-Version: 9.0-1
-Depends: acl, php5-cli, php5-apcu, tar, smbclient
+Version: 10.0-1
+Depends: php5-gd, php5-json, php5-intl, php5-mcrypt
+ , php5-curl, php5-apcu, php5-imagick
+ , acl, tar, smbclient
 Architecture: all
 Description: meta package for nextcloud dependencies
  Nextcloud gives you universal access to your files through a web
diff --git a/manifest.json b/manifest.json
index fe1f456..0688e0a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,11 +4,11 @@
     "name": "Nextcloud",
     "description": {
         "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms",
-        "fr": "Accédez et partagez vos fichiers, calendriers, contacts, mail et bien plus depuis n'importe quel appareil, selon vos conditions"
+        "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions"
     },
     "url": "https://nextcloud.com",
     "license": "AGPL-3",
-    "version": "9.0.52",
+    "version": "10.0.0",
     "maintainer": {
         "name": "jerome",
         "email": "jerome@yunohost.org"
diff --git a/patches/00-add-logout_url-conf.patch b/patches/00-add-logout_url-conf.patch
index 54388e2..5565e21 100644
--- a/patches/00-add-logout_url-conf.patch
+++ b/patches/00-add-logout_url-conf.patch
@@ -1,15 +1,14 @@
---- a/lib/base.php	2016-04-04 21:26:47.281448433 +0200
-+++ b/lib/base.php	2016-04-04 21:27:16.034283534 +0200
-@@ -920,8 +920,10 @@
- 					\OC::$server->getConfig()->deleteUserValue(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
- 				}
- 				OC_User::logout();
--				// redirect to webroot and add slash if webroot is empty
--				header("Location: " . \OC::$server->getURLGenerator()->getAbsoluteURL('/'));
-+				// Use system config or redirect to webroot and add slash if webroot is empty
-+				$redirect_url = $systemConfig->getValue('logout_url',
-+					\OC::$server->getURLGenerator()->getAbsoluteURL('/'));
-+				header("Location: " . $redirect_url);
- 			} else {
- 				// Redirect to default application
- 				OC_Util::redirectToDefaultPage();
+--- a/core/Controller/LoginController.php
++++ b/core/Controller/LoginController.php
+@@ -100,7 +100,10 @@ class LoginController extends Controller {
+ 		}
+ 		$this->userSession->logout();
+ 
+-		return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
++		$redirectUrl = $this->config->getSystemValue('logout_url',
++			$this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')
++		);
++		return new RedirectResponse($redirectUrl);
+ 	}
+ 
+ 	/**
diff --git a/scripts/_common.sh b/scripts/_common.sh
index a0e6de8..2f3308e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 APPNAME="nextcloud"
 
 # Nextcloud version
-VERSION="9.0.52"
+VERSION="10.0.0"
 
 # Package name for Nextcloud dependencies
 DEPS_PKG_NAME="nextcloud-deps"
@@ -14,7 +14,7 @@ DEPS_PKG_NAME="nextcloud-deps"
 NEXTCLOUD_SOURCE_URL="https://download.nextcloud.com/server/releases/nextcloud-${VERSION}.tar.bz2"
 
 # Remote URL to fetch Nextcloud tarball checksum
-NEXTCLOUD_SOURCE_SHA256="70429565bb010e3a3d7bd16b43980fe7c08bfeffaa88ebaf528b96e4b2fe16c0"
+NEXTCLOUD_SOURCE_SHA256="1aaa177c0a00095fb97a3ca7eefb0b4236b652d58341e1cf3dbea9dc0787761f"
 
 # App package root directory should be the parent folder
 PKGDIR=$(cd ../; pwd)