From 79ac36bc280fc040f3358d7d102a88088e4d08be Mon Sep 17 00:00:00 2001
From: pp-r <64266134+pp-r@users.noreply.github.com>
Date: Tue, 31 Jan 2023 02:19:13 +0100
Subject: [PATCH 01/13] opcache.interned_strings_buffer higher 8 (#535)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* opcache.interned_strings_buffer > 8

Because I got a warning about it in the Nextcloud settings. The recommendation should be higher than 8 so randomly i've put 10, restart php-fpm and no more warning.

* [enh] Remove warning interned_strings_buffer

---------

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
Co-authored-by: ljf (zamentur) <zamentur@users.noreply.github.com>
---
 conf/extra_php-fpm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
index adfd579..5657e27 100644
--- a/conf/extra_php-fpm.conf
+++ b/conf/extra_php-fpm.conf
@@ -10,7 +10,7 @@ php_value[default_charset] = UTF-8
 ; The following parameters are nevertheless recommended for Nextcloud
 ; see here: https://docs.nextcloud.com/server/15/admin_manual/installation/server_tuning.html#enable-php-opcache
 php_value[opcache.enable_cli]=1
-php_value[opcache.interned_strings_buffer]=8
+php_value[opcache.interned_strings_buffer]=16
 php_value[opcache.max_accelerated_files]=10000
 php_value[opcache.memory_consumption]=128
 php_value[opcache.save_comments]=1

From 9f1312d30865082a2d919dbbfe5f0c3e740383e4 Mon Sep 17 00:00:00 2001
From: AlexF <alexander.frank@ruhr.agency>
Date: Sat, 12 Nov 2022 22:03:49 +0100
Subject: [PATCH 02/13] Fix backward upgrade compatibility

---
 scripts/upgrade | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 968c96d..573fb4f 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -207,10 +207,12 @@ ynh_add_nginx_config
 
 # Define a function to execute commands with `occ`
 exec_occ() {
-    # Backward compatibility to upgrade from NC14 or older version
-    if [ $current_major_version = "last" ] || [ $current_major_version -ge 15 ]
+    # Backward compatibility to upgrade from older versions
+    if [ $current_major_version = "last" ] || [ $current_major_version -ge 20 ]
     then
         NEXTCLOUD_PHP_VERSION=$phpversion
+    elif [ $current_major_version -ge 15 ]
+        NEXTCLOUD_PHP_VERSION="7.4"
     else
         NEXTCLOUD_PHP_VERSION="7.0"
     fi

From d94b85cbf5dec71140eadf45214c49048c8e6243 Mon Sep 17 00:00:00 2001
From: AlexF <alexander.frank@ruhr.agency>
Date: Sat, 12 Nov 2022 22:10:20 +0100
Subject: [PATCH 03/13] Fix backward upgrade compatibility

---
 scripts/upgrade | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 573fb4f..8763d22 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -212,6 +212,7 @@ exec_occ() {
     then
         NEXTCLOUD_PHP_VERSION=$phpversion
     elif [ $current_major_version -ge 15 ]
+    then
         NEXTCLOUD_PHP_VERSION="7.4"
     else
         NEXTCLOUD_PHP_VERSION="7.0"

From f86b5b78b4b57438cccf015d8292670a2490b6ed Mon Sep 17 00:00:00 2001
From: AlexF <alexander.frank@ruhr.agency>
Date: Sat, 12 Nov 2022 22:24:57 +0100
Subject: [PATCH 04/13] Fix backward upgrade compatibility

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8763d22..dfbcf73 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -208,7 +208,7 @@ ynh_add_nginx_config
 # Define a function to execute commands with `occ`
 exec_occ() {
     # Backward compatibility to upgrade from older versions
-    if [ $current_major_version = "last" ] || [ $current_major_version -ge 20 ]
+    if [ $current_major_version = "last" ] || [ $current_major_version -ge 21 ]
     then
         NEXTCLOUD_PHP_VERSION=$phpversion
     elif [ $current_major_version -ge 15 ]

From c0cd2b70988bd53bf65e973ebb3b88087647420d Mon Sep 17 00:00:00 2001
From: AlexF <alexander.frank@ruhr.agency>
Date: Sun, 13 Nov 2022 01:01:44 +0100
Subject: [PATCH 05/13] Fix v22 to v23 upgrade

---
 scripts/upgrade.d/upgrade.21.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade.d/upgrade.21.sh b/scripts/upgrade.d/upgrade.21.sh
index f617405..1be1435 100644
--- a/scripts/upgrade.d/upgrade.21.sh
+++ b/scripts/upgrade.d/upgrade.21.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="22.0.0"
+next_version="22.2.10"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="3911d3754c37aca7c9b5f3b2b37513c0f2b5bb979af00816c1117b1eedbc5d7a"
+nextcloud_source_sha256="8de167bfcfcaa661245a00a5ac36628e7961951b9fe2dfaf4f8a5aac6907ccdb"

From 771d79c9895f22454a77333cbe217464eca09b10 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Tue, 31 Jan 2023 03:02:28 +0100
Subject: [PATCH 06/13] [fix] PHP version to recommended value

---
 scripts/upgrade | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index dfbcf73..5ada4d1 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -208,9 +208,12 @@ ynh_add_nginx_config
 # Define a function to execute commands with `occ`
 exec_occ() {
     # Backward compatibility to upgrade from older versions
-    if [ $current_major_version = "last" ] || [ $current_major_version -ge 21 ]
+    if [ $current_major_version = "last" ] || [ $current_major_version -ge 25 ]
     then
         NEXTCLOUD_PHP_VERSION=$phpversion
+    elif [ $current_major_version -ge 21 ]
+    then
+        NEXTCLOUD_PHP_VERSION="8.0"
     elif [ $current_major_version -ge 15 ]
     then
         NEXTCLOUD_PHP_VERSION="7.4"

From 56cc5a2983a5cac2124782bc09a02233d78a2e64 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Tue, 31 Jan 2023 03:39:43 +0100
Subject: [PATCH 07/13] [fix] PHP version during upgrade

---
 scripts/upgrade | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 5ada4d1..11e0e2c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -208,12 +208,9 @@ ynh_add_nginx_config
 # Define a function to execute commands with `occ`
 exec_occ() {
     # Backward compatibility to upgrade from older versions
-    if [ $current_major_version = "last" ] || [ $current_major_version -ge 25 ]
+    if [ $current_major_version = "last" ] || [ $current_major_version -ge 24 ]
     then
         NEXTCLOUD_PHP_VERSION=$phpversion
-    elif [ $current_major_version -ge 21 ]
-    then
-        NEXTCLOUD_PHP_VERSION="8.0"
     elif [ $current_major_version -ge 15 ]
     then
         NEXTCLOUD_PHP_VERSION="7.4"

From e1e1be0a053418cd8a6c3327a27b858c924f27be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 22:20:48 +0100
Subject: [PATCH 08/13] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index fa5a113..6a95801 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Online storage, file sharing platform and various other applications",
         "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
     },
-    "version": "25.0.3~ynh1",
+    "version": "25.0.3~ynh2",
     "url": "https://nextcloud.com",
     "upstream": {
         "license": "AGPL-3.0",

From 795b4492d688c12bab6b5ac1c4b99961211fe351 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 3 Feb 2023 21:20:53 +0000
Subject: [PATCH 09/13] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d52ad1a..41c89dc 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Online storage, file sharing platform and various other applications
 
-**Shipped version:** 25.0.3~ynh1
+**Shipped version:** 25.0.3~ynh2
 
 **Demo:** https://demo.nextcloud.com/
 
diff --git a/README_fr.md b/README_fr.md
index b545aac..185c8c8 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
 
-**Version incluse :** 25.0.3~ynh1
+**Version incluse :** 25.0.3~ynh2
 
 **Démo :** https://demo.nextcloud.com/
 

From 41dac63c3a985b54c4eb96ce37e881a5433a3f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 22:50:18 +0100
Subject: [PATCH 10/13] Add description

---
 doc/DESCRIPTION.md    | 1 +
 doc/DESCRIPTION_fr.md | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 doc/DESCRIPTION.md
 create mode 100644 doc/DESCRIPTION_fr.md

diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
new file mode 100644
index 0000000..c3735cd
--- /dev/null
+++ b/doc/DESCRIPTION.md
@@ -0,0 +1 @@
+Nextcloud Hub is a fully open-source on-premises content collaboration platform. Teams access, share and edit their documents, chat and participate in video calls and manage their mail and calendar and projects across mobile, desktop and web interfaces.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..4b854b5
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1 @@
+Nextcloud Hub est la plate-forme de collaboration de contenu sur site entièrement open source. Les équipes accèdent, partagent et modifient leurs documents, discutent et participent à des appels vidéo et gèrent leur courrier, leur calendrier et leurs projets sur des interfaces mobiles, de bureau et Web.
\ No newline at end of file

From 654f71b62b73521f9ceab59bc29d487df9c2de7a Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 3 Feb 2023 21:50:23 +0000
Subject: [PATCH 11/13] Auto-update README

---
 README.md    | 3 ++-
 README_fr.md | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 41c89dc..603b805 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Online storage, file sharing platform and various other applications
+Nextcloud Hub is a fully open-source on-premises content collaboration platform. Teams access, share and edit their documents, chat and participate in video calls and manage their mail and calendar and projects across mobile, desktop and web interfaces.
+
 
 **Shipped version:** 25.0.3~ynh2
 
diff --git a/README_fr.md b/README_fr.md
index 185c8c8..9896326 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -15,7 +15,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
+Nextcloud Hub est la plate-forme de collaboration de contenu sur site entièrement open source. Les équipes accèdent, partagent et modifient leurs documents, discutent et participent à des appels vidéo et gèrent leur courrier, leur calendrier et leurs projets sur des interfaces mobiles, de bureau et Web.
 
 **Version incluse :** 25.0.3~ynh2
 

From 035a05d7fcf2e33e05e296e79bc502df42d52632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Feb 2023 19:19:39 +0100
Subject: [PATCH 12/13] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 6a95801..61893c8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Online storage, file sharing platform and various other applications",
         "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
     },
-    "version": "25.0.3~ynh2",
+    "version": "25.0.3~ynh3",
     "url": "https://nextcloud.com",
     "upstream": {
         "license": "AGPL-3.0",

From 5ae34e0d6378042591ad6d18afd3f3dbd8031302 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 5 Feb 2023 18:19:46 +0000
Subject: [PATCH 13/13] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 603b805..06ec283 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Nextcloud Hub is a fully open-source on-premises content collaboration platform. Teams access, share and edit their documents, chat and participate in video calls and manage their mail and calendar and projects across mobile, desktop and web interfaces.
 
 
-**Shipped version:** 25.0.3~ynh2
+**Shipped version:** 25.0.3~ynh3
 
 **Demo:** https://demo.nextcloud.com/
 
diff --git a/README_fr.md b/README_fr.md
index 9896326..ccd7e06 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Nextcloud Hub est la plate-forme de collaboration de contenu sur site entièrement open source. Les équipes accèdent, partagent et modifient leurs documents, discutent et participent à des appels vidéo et gèrent leur courrier, leur calendrier et leurs projets sur des interfaces mobiles, de bureau et Web.
 
-**Version incluse :** 25.0.3~ynh2
+**Version incluse :** 25.0.3~ynh3
 
 **Démo :** https://demo.nextcloud.com/