From 33c2c7f8740307b6fbb79c1252c158cd84fb7461 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 6 Jul 2019 22:41:03 +0200
Subject: [PATCH] Upgrade to upstream version 15.0.9

---
 README.md                                     |  2 +-
 manifest.json                                 |  2 +-
 scripts/upgrade.d/upgrade.last.sh             |  4 +-
 .../app-00-add-logout_url-conf.patch          | 58 ++-----------------
 4 files changed, 10 insertions(+), 56 deletions(-)

diff --git a/README.md b/README.md
index 16a8a7c..2ee59a9 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 own data. A personal cloud which run on your own server. With Nextcloud
 you can synchronize your files over your devices.
 
-**Shipped version:** 15.0.7
+**Shipped version:** 15.0.9
 
 ## Screenshots
 
diff --git a/manifest.json b/manifest.json
index da51998..07e7cac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms",
         "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions"
     },
-    "version": "15.0.7~ynh1",
+    "version": "15.0.9~ynh1",
     "url": "https://nextcloud.com",
     "license": "AGPL-3.0",
     "maintainer": {
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index b576bdc..f0da93d 100755
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="15.0.7"
+next_version="15.0.9"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="3e6158951fa72010ccd50dbeac05d8df162183f7bbc62a1c6c89ed7081fa9d49"
+nextcloud_source_sha256="7b33e210f64fb94c9a92aa31f087136db73bdacd1aaa7df2905bc7c0887edd5c"
 
 # This function will only be executed upon applying the last upgrade referenced above
 last_upgrade_operations () {
diff --git a/sources/patches_last_version/app-00-add-logout_url-conf.patch b/sources/patches_last_version/app-00-add-logout_url-conf.patch
index 2e70ba7..07a9531 100644
--- a/sources/patches_last_version/app-00-add-logout_url-conf.patch
+++ b/sources/patches_last_version/app-00-add-logout_url-conf.patch
@@ -1,62 +1,16 @@
- core/Controller/LoginController.php | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
 diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
-index 182d2bc106..82523e306e 100644
+index f83b03bc90..568e20dcd7 100644
 --- a/core/Controller/LoginController.php
 +++ b/core/Controller/LoginController.php
-@@ -95,13 +95,13 @@ class LoginController extends Controller {
- 	 * @param Throttler $throttler
- 	 */
- 	public function __construct($appName,
--								IRequest $request,
--								IUserManager $userManager,
--								IConfig $config,
--								ISession $session,
--								IUserSession $userSession,
--								IURLGenerator $urlGenerator,
--								ILogger $logger,
-+						 IRequest $request,
-+						 IUserManager $userManager,
-+						 IConfig $config,
-+						 ISession $session,
-+						 IUserSession $userSession,
-+						 IURLGenerator $urlGenerator,
-+						 ILogger $logger,
- 								Manager $twoFactorManager,
- 								Defaults $defaults,
- 								Throttler $throttler) {
 @@ -130,7 +130,10 @@ class LoginController extends Controller {
  		}
  		$this->userSession->logout();
- 
+
 -		$response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 +		$redirectUrl = $this->config->getSystemValue('logout_url',
-+		$this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')
-+		);
++			$this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
++
 +		$response = new RedirectResponse($redirectUrl);
+ 		$this->session->set('clearingExecutionContexts', '1');
+ 		$this->session->close();
  		$response->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
- 		return $response;
- 	}
-@@ -303,10 +306,10 @@ class LoginController extends Controller {
- 				$previousUser = $user;
- 				$user = $users[0]->getUID();
- 				if($user !== $previousUser) {
--					$loginResult = $this->userManager->checkPassword($user, $password);
--				}
-+				$loginResult = $this->userManager->checkPassword($user, $password);
- 			}
- 		}
-+		}
- 
- 		if ($loginResult === false) {
- 			$this->logger->warning('Login failed: \''. $user .
-@@ -314,7 +317,7 @@ class LoginController extends Controller {
- 				['app' => 'core']);
- 			return $this->createLoginFailedResponse($user, $originalUser,
- 				$redirect_url, self::LOGIN_MSG_INVALIDPASSWORD);
--		}
-+			}
- 
- 		// TODO: remove password checks from above and let the user session handle failures
- 		// requires https://github.com/owncloud/core/pull/24616