From af18a72addfd2fa7408978e0acecded396d30516 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 17 Jan 2023 21:13:07 +0000 Subject: [PATCH 1/4] Upgrade to v2.5.0 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index ad400ff..e76b57e 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/224375/artifacts/download?file_type=archive -SOURCE_SUM=6e2d055795f1f59bbdadf82bfd4ae291e89ac6a65a71091657359cd7eae783d4 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/226602/artifacts/download?file_type=archive +SOURCE_SUM=0a8a64ee9642349976ec83be3649d607115b3819a99f7d056135fbe3a5d58480 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index 842af44..7c6d393 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/224379/artifacts/download?file_type=archive -SOURCE_SUM=4c98198401787797681bbc755450a23eb8113420cd4f55f27b980d11378c884e +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/226606/artifacts/download?file_type=archive +SOURCE_SUM=9b7092566d2279c0911d86f8641a2a08aef67d5f76563939459e6c1fb1144279 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/armhf.src b/conf/armhf.src index e3fd01f..62d2402 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/224377/artifacts/download?file_type=archive -SOURCE_SUM=f64d43f86f962fa4a03a2a3108c0cf353ec8f80a5e8b59098470356048a6fdd0 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/226604/artifacts/download?file_type=archive +SOURCE_SUM=90ca77fd63ebe849659864e95af194bb8b7d268f9e5aa13756c4d6a07257a692 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index a64f1fd..205eaeb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Federated social networking server built on open protocols", "fr": "Serveur de réseautage social fédéré basé sur des protocoles ouverts" }, - "version": "2.4.5~ynh2", + "version": "2.5.0~ynh1", "url": "https://pleroma.social/", "upstream": { "license": "AGPL-3.0-only", From 30082755c30ce3eee545832ce39b18445fd3c6fd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 17 Jan 2023 21:13:12 +0000 Subject: [PATCH 2/4] 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 a0aa076..babdd7b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web -**Shipped version:** 2.4.5~ynh2 +**Shipped version:** 2.5.0~ynh1 **Demo:** http://distsn.org/pleroma-instances.html diff --git a/README_fr.md b/README_fr.md index 439ae32..91438f5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web -**Version incluse :** 2.4.5~ynh2 +**Version incluse :** 2.5.0~ynh1 **Démo :** http://distsn.org/pleroma-instances.html From 2e62367ccbac8f37c0051dd7aceb599ef08aa086 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 22 Jan 2023 17:57:02 +0100 Subject: [PATCH 3/4] Fix strip-uploads --- scripts/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index f6adcbf..e16ba54 100755 --- a/scripts/install +++ b/scripts/install @@ -201,7 +201,8 @@ pushd $final_path/live --static-dir $datadir/static \ --listen-ip 127.0.0.1 \ --listen-port $port \ - --strip-uploads Y \ + --strip-uploads-location Y \ + --read-uploads-description Y \ --anonymize-uploads Y \ --dedupe-uploads Y" popd From c6ee2b95963578d6587739c377f559a1f7c021b6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 22 Jan 2023 16:57:08 +0000 Subject: [PATCH 4/4] 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 babdd7b..6cfecea 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Pleroma for YunoHost -[![Integration level](https://dash.yunohost.org/integration/pleroma.svg)](https://dash.yunohost.org/appci/app/pleroma) ![Working status](https://ci-apps.yunohost.org/ci/badges/pleroma.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pleroma.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/pleroma.svg)](https://dash.yunohost.org/appci/app/pleroma) ![Working status](https://ci-apps.yunohost.org/ci/badges/pleroma.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pleroma.maintain.svg) [![Install Pleroma with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pleroma) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 91438f5..9c983f5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Pleroma pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/pleroma.svg)](https://dash.yunohost.org/appci/app/pleroma) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pleroma.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pleroma.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/pleroma.svg)](https://dash.yunohost.org/appci/app/pleroma) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pleroma.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pleroma.maintain.svg) [![Installer Pleroma avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pleroma) *[Read this readme in english.](./README.md)*