From dd3fc2f64af6943123cfc3075deed72582190785 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Tue, 4 Apr 2023 17:29:41 +0200
Subject: [PATCH 01/12] Remove FILESYSTEM_DRIVER=local

See https://github.com/pixelfed/pixelfed/pull/4278/commits/573c88d7b505d0e482a71bd902654c8bf080f97c : this config line as to be removed, it might broke S3 storage.
And #208
---
 conf/.env | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/.env b/conf/.env
index 5b00f43c..71627f31 100644
--- a/conf/.env
+++ b/conf/.env
@@ -94,7 +94,6 @@ NODEINFO=true
 WEBFINGER=true
 
 ## S3
-FILESYSTEM_DRIVER=local
 FILESYSTEM_CLOUD=s3
 PF_ENABLE_CLOUD=false
 #AWS_ACCESS_KEY_ID=

From 78dc01d2412abb80abec1df3132e2137bd355112 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Tue, 4 Apr 2023 17:31:26 +0200
Subject: [PATCH 02/12] Bump version - fix S3 config

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 4e415afc..e75a78d6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "ActivityPub Federated Image Sharing",
         "fr": "Logiciel de partage d'image fédéré via ActivityPub"
     },
-    "version": "0.11.5~ynh1",
+    "version": "0.11.5~ynh2",
     "url": "https://pixelfed.org/",
     "upstream": {
         "license": "AGPL-3.0-or-later",

From 1973456e5a1a46ba12b168c314ddf0839280244a Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 4 Apr 2023 15:31:29 +0000
Subject: [PATCH 03/12] 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 ccff66de..f5167d3f 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi
 
 It is also possible to import your data from Instagram. 
 
-**Shipped version:** 0.11.5~ynh1
+**Shipped version:** 0.11.5~ynh2
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index e0907faa..51f4fabc 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe
 Il est également possible d'importer ses données depuis Instagram.
 
 
-**Version incluse :** 0.11.5~ynh1
+**Version incluse :** 0.11.5~ynh2
 
 ## Captures d’écran
 

From 1577708715db7205f928e40c499c876272e2aff0 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Tue, 4 Apr 2023 17:55:09 +0200
Subject: [PATCH 04/12] v0.11.5 fixes

Exceptionally using a commit number for testing purpose (and maybe real fix)
---
 conf/app.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 02688026..ace5a0ee 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.5.tar.gz
-SOURCE_SUM=ad126bd8da7178172744be72d715988520fbb18807c527a31be77e66677cb844
+SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/21714eec342d079c169210c49099b2988bbb205b.tar.gz
+SOURCE_SUM=eff6d2e4d93af1ef05d01fab2c55ebe6f55bf82866edcdc9af3a72767976a52d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

From 4dd05ad50ff0431e6817535510dee1cf06ab5be2 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Tue, 4 Apr 2023 17:56:07 +0200
Subject: [PATCH 05/12] Bump version - v0.11.5 with fixes (04/04/2023)

See https://github.com/YunoHost-Apps/pixelfed_ynh/pull/209/commits/1577708715db7205f928e40c499c876272e2aff0 and related discussion https://github.com/YunoHost-Apps/pixelfed_ynh/pull/209
---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index e75a78d6..70aa95fa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "ActivityPub Federated Image Sharing",
         "fr": "Logiciel de partage d'image fédéré via ActivityPub"
     },
-    "version": "0.11.5~ynh2",
+    "version": "0.11.5~ynh3",
     "url": "https://pixelfed.org/",
     "upstream": {
         "license": "AGPL-3.0-or-later",

From 50c94c0d2fc07ac478c7bf110352a1fd5342dad3 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 4 Apr 2023 15:56:11 +0000
Subject: [PATCH 06/12] 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 f5167d3f..08ce1f29 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi
 
 It is also possible to import your data from Instagram. 
 
-**Shipped version:** 0.11.5~ynh2
+**Shipped version:** 0.11.5~ynh3
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 51f4fabc..647a70fa 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe
 Il est également possible d'importer ses données depuis Instagram.
 
 
-**Version incluse :** 0.11.5~ynh2
+**Version incluse :** 0.11.5~ynh3
 
 ## Captures d’écran
 

From fba54a488401d27c23b764481312963c465b62b8 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Wed, 3 May 2023 09:25:53 +0200
Subject: [PATCH 07/12] v0.11.6

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 70aa95fa..71496591 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "ActivityPub Federated Image Sharing",
         "fr": "Logiciel de partage d'image fédéré via ActivityPub"
     },
-    "version": "0.11.5~ynh3",
+    "version": "0.11.6~ynh1",
     "url": "https://pixelfed.org/",
     "upstream": {
         "license": "AGPL-3.0-or-later",

From 6949b860a5f5002175d82bc035f9cf5ae81edb1e Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 3 May 2023 07:25:56 +0000
Subject: [PATCH 08/12] 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 08ce1f29..10cffdfc 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi
 
 It is also possible to import your data from Instagram. 
 
-**Shipped version:** 0.11.5~ynh3
+**Shipped version:** 0.11.6~ynh1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 647a70fa..795db7c2 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe
 Il est également possible d'importer ses données depuis Instagram.
 
 
-**Version incluse :** 0.11.5~ynh3
+**Version incluse :** 0.11.6~ynh1
 
 ## Captures d’écran
 

From b64b855b4f2081997911aee7bccb5e4bc4b22761 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Wed, 3 May 2023 09:26:47 +0200
Subject: [PATCH 09/12] v0.11.6

---
 conf/app.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index ace5a0ee..a3d25fa9 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/21714eec342d079c169210c49099b2988bbb205b.tar.gz
-SOURCE_SUM=eff6d2e4d93af1ef05d01fab2c55ebe6f55bf82866edcdc9af3a72767976a52d
+SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.6.tar.gz
+SOURCE_SUM=da498b0e93308ac501c3c97b41af6d695b29811807aeb8c1071e06fec385d967
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

From f361a3661db29c3bd7b779008c013d1d59f0ee1f Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Wed, 3 May 2023 09:48:21 +0200
Subject: [PATCH 10/12] bump to php8.2

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 71496591..705867c3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -30,7 +30,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php8.1-fpm"
+        "php8.2-fpm"
     ],
     "arguments": {
         "install": [

From c4cb2f77be5914ff94fd4b3a7f8fb00e9982f48f Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Wed, 3 May 2023 09:50:14 +0200
Subject: [PATCH 11/12] php8.2 / composer 2.2

---
 scripts/_common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ec0b5b76..0c4701c8 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,9 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="8.1"
+YNH_PHP_VERSION="8.2"
 
-YNH_COMPOSER_VERSION="2.1.5"
+YNH_COMPOSER_VERSION="2.2"
 
 pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-ctype php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-iconv php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-imagick"
 

From fbea37e3b6a1bde2f85dbb7e970f8fce5833e0a3 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Wed, 3 May 2023 10:05:29 +0200
Subject: [PATCH 12/12] Fix composer version (2.2.21)

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 0c4701c8..a0bb3d0d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 
 YNH_PHP_VERSION="8.2"
 
-YNH_COMPOSER_VERSION="2.2"
+YNH_COMPOSER_VERSION="2.2.21"
 
 pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-ctype php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-iconv php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-imagick"