From 2a4b13d3d6dd72902e33f61ee19e0e41e901ca64 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 22 Feb 2022 13:34:10 +0000 Subject: [PATCH 1/4] Upgrade to v2.21.1 --- conf/app.src | 6 +++--- manifest.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0aff2cf..b7fb7f0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.20.1.zip -SOURCE_SUM=fdd919ac1d1499987bb6707a585f9e5eae34d3cdf9f62db9852ea9cd6f8e17a9 +SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.21.1.tar.gz +SOURCE_SUM=a48c7332bc31d32a6a8d8339bc74199497b9a8b9824c98e06c6aa1cffff0c7dc 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 cf266d8..e893e49 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Blog publishing application", "fr": "Moteur de blog" }, - "version": "2.20.1~ynh2", + "version": "2.21.1~ynh1", "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "maintainer": { @@ -23,7 +23,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain", From 6cf78f759e8f8bd681f5b31b32b9348b96d35df5 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 22 Feb 2022 15:23:08 +0100 Subject: [PATCH 2/4] 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 b020960..09b9a91 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 3d0c45d..98a70a6 100644 +index e9c0ac2..0c6f2e5 100644 --- a/inc/core/class.dc.core.php +++ b/inc/core/class.dc.core.php -@@ -839,8 +839,8 @@ class dcCore +@@ -941,8 +941,8 @@ class dcCore } if ($cur->isField('user_pwd')) { From 1b685055ec8e5e530765307505995773f64da153 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 22 Feb 2022 16:01:53 +0100 Subject: [PATCH 3/4] Fix install --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index b7fb7f0..69c50ff 100644 --- a/conf/app.src +++ b/conf/app.src @@ -2,6 +2,6 @@ SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.21.1.tar.gz SOURCE_SUM=a48c7332bc31d32a6a8d8339bc74199497b9a8b9824c98e06c6aa1cffff0c7dc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true +SOURCE_IN_SUBDIR=2 SOURCE_FILENAME= SOURCE_EXTRACT=true From cb42ac31f643d72ad218d4f5bdc8f4f81a2ddf94 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 22 Feb 2022 16:31:54 +0100 Subject: [PATCH 4/4] Needs bullseye --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index e893e49..08210a4 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 4.3.2" + "yunohost": ">= 11.0.0" }, "multi_instance": true, "services": [