Merge pull request #148 from nath5394/testing

Update to 15.0.0

README.md

@@ -5,10 +5,10 @@ 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:** 14.0.4
+**Shipped version:** 15.0.0
 
 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
-![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png)
+![](https://raw.githubusercontent.com/nextcloud/screenshots/master/files/Files%20Overview.png)
 
 ## Features
 

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": "14.0.4~ynh1",
+    "version": "15.0.0~ynh1",
     "url": "https://nextcloud.com",
     "license": "AGPL-3.0",
     "maintainer": {

scripts/upgrade

@@ -176,6 +176,8 @@ do
     # then it's the last upgrade to do
     if [ "$major_version" -eq "$current_major_version" ]; then
       current_major_version=last
+      # Execute the commands dedicated to the last upgrade
+      last_upgrade_operations
     fi
 
     # Load the value for this version

scripts/upgrade.d/upgrade.14.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Last available nextcloud version
+next_version="15.0.0"
+
+# Nextcloud tarball checksum sha256
+nextcloud_source_sha256="5bb0c58171353da844019b64080c21078002a59ab956ab72adb958844a98eb78"

scripts/upgrade.d/upgrade.last.sh

@@ -1,13 +1,16 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="14.0.4"
+next_version="15.0.0"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="4f5dd15a71694bd2f15fba0d2f942e5a5b1f5aba13511c507a23324d746b40e8"
+nextcloud_source_sha256="5bb0c58171353da844019b64080c21078002a59ab956ab72adb958844a98eb78"
 
-# Patch nextcloud files only for the last version
+# This function will only be executed upon applying the last upgrade referenced above
-cp -a ../sources/patches_last_version/* ../sources/patches
+last_upgrade_operations () {
+  # Patch nextcloud files only for the last version
+  cp -a ../sources/patches_last_version/* ../sources/patches
 
-# Execute post-upgrade operations later on
+  # Execute post-upgrade operations later on
-(cd /tmp ; at now + 10 minutes <<< "(cd $final_path ; sudo -u nextcloud php occ db:add-missing-indices ; sudo -u nextcloud php occ db:convert-filecache-bigint -n) > /tmp/nextcloud_maintenance.log")
+  (cd /tmp ; at now + 10 minutes <<< "(cd $final_path ; sudo -u nextcloud php occ db:add-missing-indices ; sudo -u nextcloud php occ db:convert-filecache-bigint -n) > /tmp/nextcloud_maintenance.log")
+}

sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch

@@ -1,9 +1,9 @@
- lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php | 4 ++++
+ .../Security/CSP/ContentSecurityPolicyNonceManager.php        | 4 ++++
  lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php   | 3 ++-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php
-index 088fb2d859..15b05b75d1 100644
+index 795d8cc864..5f3c961445 100644
 --- a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php
 +++ b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php
 @@ -70,6 +70,10 @@ class ContentSecurityPolicyNonceManager {
@@ -18,10 +18,10 @@ index 088fb2d859..15b05b75d1 100644
  			Request::USER_AGENT_CHROME,
  			// Firefox 45+
 diff --git a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
-index 6397d32cb9..32281a1734 100644
+index 3fcef1d0ef..7ce01a68fc 100644
 --- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
 +++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
-@@ -406,7 +406,8 @@ class EmptyContentSecurityPolicy {
+@@ -449,7 +449,8 @@ class EmptyContentSecurityPolicy {
 
  		if(!empty($this->allowedFontDomains)) {
  			$policy .= 'font-src ' . implode(' ', $this->allowedFontDomains);

sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch

@@ -0,0 +1,17 @@
+ lib/public/AppFramework/Http/ContentSecurityPolicy.php | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/public/AppFramework/Http/ContentSecurityPolicy.php b/lib/public/AppFramework/Http/ContentSecurityPolicy.php
+index e9ecf00036..8e69c8d2dc 100644
+--- a/lib/public/AppFramework/Http/ContentSecurityPolicy.php
++++ b/lib/public/AppFramework/Http/ContentSecurityPolicy.php
+@@ -44,7 +44,8 @@ class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
+ 	/** @var bool Whether inline JS snippets are allowed */
+ 	protected $inlineScriptAllowed = false;
+ 	/** @var bool Whether eval in JS scripts is allowed */
+-	protected $evalScriptAllowed = false;
++	// YunoHost patch: allow for eval in JS scripts for YunoHost tile
++	protected $evalScriptAllowed = true;
+ 	/** @var array Domains from which scripts can get loaded */
+ 	protected $allowedScriptDomains = [
+ 		'\'self\'',