From c1a02dbc911b09b7658d3acf34d37392bba94f56 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 7 Jun 2022 23:27:41 +0000 Subject: [PATCH 1/6] Upgrade to v2.22 --- conf/app.src | 6 +++--- manifest.json | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0c6258f..7294eba 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://download.dotclear.org/latest/dotclear-2.22.zip -SOURCE_SUM=94895d2479654c233f9b269a007ebb36bcf8cba34f4c1071424957f79b90ad6f +SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.22.tar.gz +SOURCE_SUM=0f704078c5c35e70b96d15ca44ace5bc1566b252adc37d2642d7bdd7c9d1a76c SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip +SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index fa1f015..11183e8 100644 --- a/manifest.json +++ b/manifest.json @@ -7,6 +7,7 @@ "fr": "Moteur de blog" }, "version": "2.22~ynh1", + "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "upstream": { "license": "GPL-2.0-or-later", From 1c350b24df794ab28f4b4e143e62b8961ef63396 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 Aug 2022 10:28:12 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d3b1550..339b405 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Blog publishing application **Shipped version:** 2.22~ynh1 + **Demo:** https://www.softaculous.com/demos/Dotclear ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1219eb0..d6baaa6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Moteur de blog -**Version incluse :** 2.22~ynh1 +**Version incluse :** 2.22~ynh1 + **Démo :** https://www.softaculous.com/demos/Dotclear From b5e5cfbd031d11d720acb37264382d7ebf2c1097 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 31 Aug 2022 12:27:31 +0000 Subject: [PATCH 3/6] Upgrade to v2.23.1 --- conf/app.src | 6 +++--- manifest.json | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7294eba..a6b420c 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.22.tar.gz -SOURCE_SUM=0f704078c5c35e70b96d15ca44ace5bc1566b252adc37d2642d7bdd7c9d1a76c +SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.23.1.zip +SOURCE_SUM=cf41664920e6023c4a25185d723d71ef524c021d93c774ab9c4b9d28bf024d4d SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz +SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 11183e8..6a1da37 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Blog publishing application", "fr": "Moteur de blog" }, - "version": "2.22~ynh1", + "version": "2.23.1~ynh1", "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "upstream": { @@ -16,7 +16,6 @@ "admindoc": "https://dotclear.org/documentation/2.0", "code": "https://git.dotclear.org/dev/dotclear" }, - "license": "GPL-2.0-or-later", "maintainer": { "name": "kay0u", "email": "pierre@kayou.io" From 079c7932291496636844b97223e9552e2d83eb67 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 31 Aug 2022 12:27:35 +0000 Subject: [PATCH 4/6] 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 339b405..3e534e2 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 Blog publishing application -**Shipped version:** 2.22~ynh1 +**Shipped version:** 2.23.1~ynh1 **Demo:** https://www.softaculous.com/demos/Dotclear diff --git a/README_fr.md b/README_fr.md index d6baaa6..9a135f2 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) pour Moteur de blog -**Version incluse :** 2.22~ynh1 +**Version incluse :** 2.23.1~ynh1 **Démo :** https://www.softaculous.com/demos/Dotclear From 698f9394266dc923399939abfd7ccad7aaf9e99a Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 31 Aug 2022 14:30:16 +0200 Subject: [PATCH 5/6] fix patch --- sources/patches/app-00-password_length.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/patches/app-00-password_length.patch b/sources/patches/app-00-password_length.patch index 09b9a91..92b4fa3 100644 --- a/sources/patches/app-00-password_length.patch +++ b/sources/patches/app-00-password_length.patch @@ -1,8 +1,8 @@ diff --git a/inc/core/class.dc.core.php b/inc/core/class.dc.core.php -index e9c0ac2..0c6f2e5 100644 +index 317434b..2d1e6f8 100644 --- a/inc/core/class.dc.core.php +++ b/inc/core/class.dc.core.php -@@ -941,8 +941,8 @@ class dcCore +@@ -1056,8 +1056,8 @@ final class dcCore } if ($cur->isField('user_pwd')) { From 8b3dfc1b3bc65669967b042a913f30d0a160604e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 31 Aug 2022 12:31:24 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8bd7dd6..3e534e2 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ Blog publishing application **Shipped version:** 2.23.1~ynh1 - **Demo:** https://www.softaculous.com/demos/Dotclear ## Screenshots