From 6406e295a373fe193d71f03cbec9dffa32184194 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Wed, 15 Dec 2021 14:01:22 +0100
Subject: [PATCH 01/10] Change php version to 7.4

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

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 5ffdb6ac..af462313 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="7.4"
 
 YNH_COMPOSER_VERSION="2.1.5"
 

From 3325ac72f740963f455b208359e04286c5003375 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Mon, 10 Jan 2022 10:54:24 +0100
Subject: [PATCH 02/10] v0.11.2 + change php version to 7.4

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

diff --git a/manifest.json b/manifest.json
index f6e332a6..c81ffa95 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.1~ynh2",
+    "version": "0.11.2~ynh1",
     "url": "https://pixelfed.org/",
     "upstream": {
         "license": "AGPL-3.0-or-later",

From eac30fda900a99a198c45dc64e25051fade65c45 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Mon, 10 Jan 2022 09:54:27 +0000
Subject: [PATCH 03/10] 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 2460d271..5849fbe9 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,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.1~ynh2
+**Shipped version:** 0.11.2~ynh1
 
 
 
diff --git a/README_fr.md b/README_fr.md
index 064b2b37..9c315afc 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -21,7 +21,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.1~ynh2
+**Version incluse :** 0.11.2~ynh1
 
 
 

From 12b4eacf4ee401d65dcb598e3da403d80397b336 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Mon, 10 Jan 2022 10:54:54 +0100
Subject: [PATCH 04/10] v0.11.2 + change php version to 7.4

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

diff --git a/conf/app.src b/conf/app.src
index 282dda7c..e4a4d124 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/v0.11.1.tar.gz
-SOURCE_SUM=132dfceac3c0ea27dd54198d145d2d84f1714b4aa333c8b6f5141d259a77e9cb
+SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/v0.11.2.tar.gz
+SOURCE_SUM=04eca99fa8a725ae97cf01ad8c8b26b28f02a2b579dcff9320a172433afe0de2
 OURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

From 9f255da5a4a21a7597d6405479fe9cbad18a1e31 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 11 Jan 2022 20:07:25 +0100
Subject: [PATCH 05/10] Adding a check from actual 0.11.1~ynh2

---
 check_process | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/check_process b/check_process
index 10b17c2e..f2a27629 100644
--- a/check_process
+++ b/check_process
@@ -32,6 +32,8 @@
 		upgrade=1	from_commit=c7181d1c7cb6cba53bb65e622c78b0309a53b76a
 		# 0.11.0~ynh2
 		upgrade=1	from_commit=d85b0b112afd19313dbf4cfba954e255789dfb88
+		# 0.11.1~ynh2
+		upgrade=1	from_commit=f8ecb9a95fe6430fb9d93ca674e4f0d475ecd332
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
@@ -58,3 +60,5 @@ Notification=all
 		name=0.11.0~ynh1
 	; commit=d85b0b112afd19313dbf4cfba954e255789dfb88
 		name=0.11.0~ynh2
+	; commit=f8ecb9a95fe6430fb9d93ca674e4f0d475ecd332
+		name=0.11.1~ynh2

From 268246612b5f25eda6e721553d888ab7e02f3482 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 11 Jan 2022 20:12:24 +0100
Subject: [PATCH 06/10] reorder php-fpm

---
 scripts/restore | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index 1b93b2e1..ea328c1b 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -74,16 +74,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring PHP-FPM configuration..."
-
-ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
-
-# Recreate a dedicated php-fpm config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
-
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
@@ -94,6 +84,16 @@ ynh_script_progression --message="Reinstalling dependencies..."
 # Define and install dependencies
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring PHP-FPM configuration..."
+
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+
+# Recreate a dedicated php-fpm config
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
+
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
 #=================================================

From 28061066d8d0a24abf16fd0b9cecb4339d9641d5 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 14 Jan 2022 20:02:28 +0100
Subject: [PATCH 07/10] Fix phpversion

---
 scripts/upgrade | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 59ed3950..33493a0a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -25,7 +25,6 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 app_key=$(ynh_app_setting_get --app=$app --key=app_key)
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)
 
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
@@ -186,7 +185,7 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -195,7 +194,7 @@ ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_
 #=================================================
 ynh_script_progression --message="Updating composer dependencies..."
 
-ynh_exec_warn_less ynh_composer_exec --phpversion="$phpversion" --workdir="$final_path" --commands="update"
+ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="update"
 
 #=================================================
 # UPDATE A CONFIG FILE

From 10b43bcc8e0ca6b3ac79b9c37397716bdcc7c150 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 14 Jan 2022 21:38:18 +0100
Subject: [PATCH 08/10] Switching steps

---
 scripts/upgrade | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 33493a0a..1ab60879 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -172,13 +172,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..."
-
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -187,6 +180,13 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..."
+
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================

From d15e6b6289ef4ee0fd0dc2bce3426bd33440dcf6 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 14 Jan 2022 22:06:43 +0100
Subject: [PATCH 09/10] Switch setps

---
 scripts/upgrade | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 1ab60879..33493a0a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -172,6 +172,13 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..."
+
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -180,13 +187,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..."
-
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================

From 4c1cc4281c6069842ff5ce12de6dce4000211a3e Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 14 Jan 2022 22:22:34 +0100
Subject: [PATCH 10/10] Go back to extra_php_dependencies

---
 scripts/_common.sh | 4 +++-
 scripts/config     | 2 +-
 scripts/install    | 2 +-
 scripts/restore    | 3 ++-
 scripts/upgrade    | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 67ed66b2..48d67afe 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,7 +8,9 @@ YNH_PHP_VERSION="7.4"
 
 YNH_COMPOSER_VERSION="2.1.5"
 
-pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor 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}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-redis 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"
+pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor"
+
+extra_php_dependencies="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}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-redis 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"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/config b/scripts/config
index 3440bd2f..c808244e 100644
--- a/scripts/config
+++ b/scripts/config
@@ -89,7 +89,7 @@ ynh_app_config_validate() {
 ynh_app_config_apply() {
     _ynh_app_config_apply
 
-    ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
+    ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies"
 }
 
 ynh_app_config_run $1
diff --git a/scripts/install b/scripts/install
index 2ec24270..68e7eb48 100644
--- a/scripts/install
+++ b/scripts/install
@@ -115,7 +115,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index ea328c1b..490f1d2e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -92,7 +92,8 @@ ynh_script_progression --message="Restoring PHP-FPM configuration..."
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated php-fpm config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion --package="$extra_php_dependencies"
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index 33493a0a..f2933c51 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -185,7 +185,8 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies"
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # SPECIFIC UPGRADE