From f65a9b28ba355a05df908d0d13af28342ec1907d Mon Sep 17 00:00:00 2001 From: anmol26s Date: Thu, 2 Nov 2017 16:07:22 +0530 Subject: [PATCH 01/13] Added the "php-ldap" dependency ## Problem - *Issue https://github.com/YunoHost-Apps/nextcloud_ynh/issues/69* ``` Warning: [Exception] Warning: App "LDAP user and group backend" cannot be installed because the following dependencies are not fulfilled: The library ldap is not available. ``` Dependency not installed : LDAP plugin of PHP. ## Solution - *Install missing dependencies "php-ldap"* ## PR Status To be reviewed. ## Validation --- *Minor decision* - [ ] **Upgrade previous version** : - [ ] **Code review** : - [ ] **Approval (LGTM)** : - [ ] **Approval (LGTM)** : - [ ] **CI succeeded** : When the PR is mark as ready to merge, you have to wait for 3 days before really merge it. --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 3e7127d..eb4d1fc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,7 @@ # COMMON VARIABLES #================================================= -pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-imagick acl tar smbclient" +pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-imagick php-ldap acl tar smbclient" #================================================= # COMMON HELPERS From 1904a1e7599d6e2877fe6c8491f5474576be6743 Mon Sep 17 00:00:00 2001 From: frju365 Date: Wed, 7 Feb 2018 11:04:39 +0100 Subject: [PATCH 02/13] New Version 13 --- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 92b7b2b..dfc90dc 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available nextcloud version -next_version="12.0.5" +next_version="13.0.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="c8be29ace6821079e881818266fe49d28812b5aa0c7d2e76511173d48828ca43" +nextcloud_source_sha256="38e6064432a2d1a044f219028d3fd46cb7a943a47e11eef346810bd289705aec" From 64e3a092119b6d4c8c09db4ea4982f50853402a3 Mon Sep 17 00:00:00 2001 From: frju365 Date: Wed, 7 Feb 2018 11:06:45 +0100 Subject: [PATCH 03/13] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index aa601ed..782c24f 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": "12.0.5-1", + "version": "13.0.0-1", "url": "https://nextcloud.com", "license": "AGPL-3.0", "maintainer": { From 2e461f51657de8365a50e04a5e18d1cceb6a6b09 Mon Sep 17 00:00:00 2001 From: frju365 Date: Wed, 7 Feb 2018 11:07:09 +0100 Subject: [PATCH 04/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f55f72..4bdf2a7 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:** 12.0.5 +**Shipped version:** 13.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) From 1f332d6fc2490068779b50f739581c9b5794e4fa Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 11 Feb 2018 22:09:52 +0100 Subject: [PATCH 05/13] [Fix] Upgrade from version to another --- scripts/upgrade.d/upgrade.12.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 scripts/upgrade.d/upgrade.12.sh diff --git a/scripts/upgrade.d/upgrade.12.sh b/scripts/upgrade.d/upgrade.12.sh new file mode 100644 index 0000000..7069cc2 --- /dev/null +++ b/scripts/upgrade.d/upgrade.12.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Version cible de la mise à jour de Nextcloud +next_version="13.0.0" + +# Nextcloud tarball checksum +nextcloud_source_sha256="38e6064432a2d1a044f219028d3fd46cb7a943a47e11eef346810bd289705aec" From 6263a28954b170265b8938785d73fa38026c2d83 Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 11 Feb 2018 22:18:00 +0100 Subject: [PATCH 06/13] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index eb4d1fc..3ea7420 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,7 @@ # COMMON VARIABLES #================================================= -pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-imagick php-ldap acl tar smbclient" +pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-imagick php5-ldap acl tar smbclient" #================================================= # COMMON HELPERS From 96ab688f6a07af2c484ef33552a17e92be025cfc Mon Sep 17 00:00:00 2001 From: Rafi594 Date: Tue, 13 Feb 2018 20:32:06 +0000 Subject: [PATCH 07/13] [fix] make script executable --- scripts/upgrade.d/upgrade.12.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/upgrade.d/upgrade.12.sh diff --git a/scripts/upgrade.d/upgrade.12.sh b/scripts/upgrade.d/upgrade.12.sh old mode 100644 new mode 100755 From f27c384dcb09f2e362216f75ee122a50c924c3a5 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Fri, 16 Mar 2018 18:41:32 +0100 Subject: [PATCH 08/13] Update upgrade.last.sh --- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index dfc90dc..f19c2e2 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available nextcloud version -next_version="13.0.0" +next_version="13.0.1" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="38e6064432a2d1a044f219028d3fd46cb7a943a47e11eef346810bd289705aec" +nextcloud_source_sha256="5743314a71e972ae46a14b36b37394d4545915aa5f32d9e12ba786d04c1f1d11" From 0268a5c47931472f4e2e629d3f7018d71e7f94bb Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Fri, 16 Mar 2018 18:42:08 +0100 Subject: [PATCH 09/13] [enh] Upgrade to 13.0.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4bdf2a7..05205e1 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:** 13.0.0 +**Shipped version:** 13.0.1 [![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) From 06d5434e6437832c0d274127e2f782938bf05847 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Fri, 16 Mar 2018 18:42:52 +0100 Subject: [PATCH 10/13] [enh] Upgrade to 13.0.1 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 782c24f..fdfccb5 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": "13.0.0-1", + "version": "13.0.1-1", "url": "https://nextcloud.com", "license": "AGPL-3.0", "maintainer": { From 0e56a2f8b43a04f999248028e86bdf7495615200 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 18 Mar 2018 08:59:10 +0100 Subject: [PATCH 11/13] Fix upgrade old version (#99) * Fix upgrade old version * Move to an existing if --- scripts/upgrade | 2 ++ .../app-00-add-logout_url-conf.patch | 0 .../app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch | 0 3 files changed, 2 insertions(+) rename sources/{patches => patches_last_version}/app-00-add-logout_url-conf.patch (100%) rename sources/{patches => patches_last_version}/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch (100%) diff --git a/scripts/upgrade b/scripts/upgrade index a156b9f..099d842 100755 --- a/scripts/upgrade +++ b/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 + # Patch nexcloud files only for the last upgrade. + cp -a ../sources/patches_last_version ../sources/patches fi # Load the value for this version diff --git a/sources/patches/app-00-add-logout_url-conf.patch b/sources/patches_last_version/app-00-add-logout_url-conf.patch similarity index 100% rename from sources/patches/app-00-add-logout_url-conf.patch rename to sources/patches_last_version/app-00-add-logout_url-conf.patch diff --git a/sources/patches/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch b/sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch similarity index 100% rename from sources/patches/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch rename to sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch From b508c536550304030720e0dd5ca487915ba720e0 Mon Sep 17 00:00:00 2001 From: JimboJoe Date: Sun, 18 Mar 2018 09:02:35 +0100 Subject: [PATCH 12/13] Use new version formatting --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index fdfccb5..7021b04 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": "13.0.1-1", + "version": "13.0.1~ynh1", "url": "https://nextcloud.com", "license": "AGPL-3.0", "maintainer": { From d0075712a928567fd68217fa9b27189d5dcb8f61 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Mon, 16 Apr 2018 18:35:54 +0200 Subject: [PATCH 13/13] Add upgrade from a previous commit (#104) * Add upgrade from a previous commit * Use another commit for upgrade from commit --- check_process | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/check_process b/check_process index dc17706..df67e3a 100644 --- a/check_process +++ b/check_process @@ -12,6 +12,7 @@ setup_private=0 setup_public=0 upgrade=1 + upgrade=1 from_commit=68c2f41da6b33bd8c949e5ba624bedba08c448be backup_restore=1 multi_instance=0 incorrect_path=1 @@ -33,3 +34,7 @@ ;;; Options Email= Notification=none +;;; Upgrade options + ; commit=68c2f41da6b33bd8c949e5ba624bedba08c448be + name=Move patches to the right folder + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1&