diff --git a/README.md b/README.md index 0f55f72..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:** 12.0.5 +**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) 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& diff --git a/manifest.json b/manifest.json index aa601ed..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": "12.0.5-1", + "version": "13.0.1~ynh1", "url": "https://nextcloud.com", "license": "AGPL-3.0", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 4b9828c..f4085a7 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-redis php5-imagick imagemagick acl tar smbclient" +pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-redis php5-ldap php5-imagick imagemagick acl tar smbclient" #================================================= # COMMON HELPERS 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/scripts/upgrade.d/upgrade.12.sh b/scripts/upgrade.d/upgrade.12.sh new file mode 100755 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" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 92b7b2b..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="12.0.5" +next_version="13.0.1" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="c8be29ace6821079e881818266fe49d28812b5aa0c7d2e76511173d48828ca43" +nextcloud_source_sha256="5743314a71e972ae46a14b36b37394d4545915aa5f32d9e12ba786d04c1f1d11" 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