From e4d3e4beb3e3b1fe3190420fe9e53a339c84454b Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 14 Mar 2020 12:55:28 +0100
Subject: [PATCH 1/2] Upgrade to upstream version 18.0.2

---
 README.md                         | 2 +-
 manifest.json                     | 2 +-
 scripts/upgrade.d/upgrade.last.sh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1a824fc..f0153fe 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ own data. A personal cloud which run on your own server. With Nextcloud
 you can synchronize your files over your devices.
 
 
-**Shipped version:** 18.0.1
+**Shipped version:** 18.0.2
 
 ## Screenshots
 
diff --git a/manifest.json b/manifest.json
index 152293a..9976a6e 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": "18.0.1~ynh1",
+    "version": "18.0.2~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 02fa0cb..24a1692 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="18.0.1"
+next_version="18.0.2"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="770faf34b8f0d81273623daed4d64ec7919c38dfeb07328b613058addbed19c0"
+nextcloud_source_sha256="d033660923dd27106ec64bff0e3afa2f595bd1b9661b7ea7882a1a33006ecb81"
 
 # This function will only be executed upon applying the last upgrade referenced above
 last_upgrade_operations () {

From 062f8b739916e683073e31135130af981792b98a Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 14 Mar 2020 12:55:58 +0100
Subject: [PATCH 2/2] Fix PHP memory limit warning

---
 conf/extra_php-fpm.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
index 66334c5..4b0d12d 100644
--- a/conf/extra_php-fpm.conf
+++ b/conf/extra_php-fpm.conf
@@ -1,6 +1,7 @@
 
 ; Additional php.ini defines, specific to this pool of workers.
 env[PATH] = $PATH
+php_admin_value[memory_limit] = 512M
 php_value[upload_max_filesize] = 10G
 php_value[post_max_size] = 10G
 php_value[default_charset] = UTF-8