From e32303600722e212a70c1fa6958d6c5c42fa5bdd Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 3 Sep 2022 19:26:13 +0200 Subject: [PATCH 1/3] Simpler sha1 computation (#80) * Simple sha1 computation * Auto-update README Co-authored-by: yunohost-bot --- README.md | 1 + README_fr.md | 3 ++- scripts/install | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 46da2a6..c149d92 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i **Shipped version:** 0.12.1~ynh4 + **Demo:** https://demo.shaarli.org/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index 795a922..7c23138 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,8 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i - feed other blogs, aggregators, social networks... -**Version incluse :** 0.12.1~ynh4 +**Version incluse :** 0.12.1~ynh4 + **Démo :** https://demo.shaarli.org/ diff --git a/scripts/install b/scripts/install index f0dc3e6..c1be818 100644 --- a/scripts/install +++ b/scripts/install @@ -110,7 +110,7 @@ timezone=$(cat /etc/timezone) salt=$(php$phpversion -r 'echo sha1(uniqid("", true) ."_". mt_rand());') # Generate the hash with the password -hash=$(php$phpversion -r "echo sha1('${password}'.'${admin}'.'${salt}');") +hash=$(echo -n "${password}${admin}${salt}" | sha1sum | awk '{print $1}') # Generate the API secret secret=$(php${YNH_PHP_VERSION} -r "echo str_shuffle(substr(hash_hmac('sha512', uniqid('${salt}'), '${admin}'), 10, 12));") From 16623228dc4cbe04a2d06662538426dfb936a416 Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 5 Sep 2022 18:04:16 +0200 Subject: [PATCH 2/3] Bump version number to 0.12.1~ynh5 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a002ecd..771fb2a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "The personal, minimalist, super-fast, no-database delicious clone", "fr": "Clone de delicious, rapide, simple et sans base de données" }, - "version": "0.12.1~ynh4", + "version": "0.12.1~ynh5", "url": "https://github.com/shaarli/Shaarli", "upstream": { "license": "MIT", From 658745c1834695856b1919830b55e888a6f7106b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 5 Sep 2022 16:04:18 +0000 Subject: [PATCH 3/3] 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 c149d92..9e8ae69 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i - feed other blogs, aggregators, social networks... -**Shipped version:** 0.12.1~ynh4 +**Shipped version:** 0.12.1~ynh5 **Demo:** https://demo.shaarli.org/ diff --git a/README_fr.md b/README_fr.md index 7c23138..06badff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i - feed other blogs, aggregators, social networks... -**Version incluse :** 0.12.1~ynh4 +**Version incluse :** 0.12.1~ynh5 **Démo :** https://demo.shaarli.org/