From bb20020c5a58f79258777b5be0def44b20eb5bfd Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 Jul 2024 22:13:20 +0200 Subject: [PATCH 1/5] helpers2.1: forgot to patch ynh_remove_fpm_config -> ynh_config_remove_phpfpm --- helpers/helpers.v2.1.d/apt | 2 +- helpers/helpers.v2.1.d/logrotate | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/helpers.v2.1.d/apt b/helpers/helpers.v2.1.d/apt index b03daac88..4999f179c 100644 --- a/helpers/helpers.v2.1.d/apt +++ b/helpers/helpers.v2.1.d/apt @@ -54,7 +54,7 @@ ynh_apt_install_dependencies() { if [[ -f "/etc/php/$php_version/fpm/pool.d/$app.conf" ]] then ynh_backup_if_checksum_is_different "/etc/php/$php_version/fpm/pool.d/$app.conf" - ynh_remove_fpm_config + ynh_config_remove_phpfpm fi fi # Store php_version into the config of this app diff --git a/helpers/helpers.v2.1.d/logrotate b/helpers/helpers.v2.1.d/logrotate index 4f2d063b1..e431841c5 100644 --- a/helpers/helpers.v2.1.d/logrotate +++ b/helpers/helpers.v2.1.d/logrotate @@ -67,7 +67,7 @@ EOF # Remove the app's logrotate config. # -# usage: ynh_remove_logrotate +# usage:ynh_config_remove_logrotate ynh_config_remove_logrotate() { if [ -e "/etc/logrotate.d/$app" ]; then rm "/etc/logrotate.d/$app" From 22201863a18e6c79c0401454fdb3805ee7435403 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 Jul 2024 22:14:32 +0200 Subject: [PATCH 2/5] Update changelog for 11.2.21.1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 368befdff..adbd070af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yunohost (11.2.21.1) stable; urgency=low + + - helpers2.1: forgot to patch ynh_remove_fpm_config -> ynh_config_remove_phpfpm (bb20020c) + + -- Alexandre Aubin Mon, 15 Jul 2024 22:13:39 +0200 + yunohost (11.2.21) stable; urgency=low - log: optimize log list perf by creating a 'cache' symlink pointing to the log's parent ([#1907](http://github.com/YunoHost/yunohost/pull/1907)) From 64c8d9e853e89a7469faa78b73021a6af0c41bb6 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 Jul 2024 22:29:30 +0200 Subject: [PATCH 3/5] bullseye->bookworm migration: tweak message to reflect the fact that metronome and rspamd will be applications starting with bookworm --- src/migrations/0027_migrate_to_bookworm.py.disabled | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/migrations/0027_migrate_to_bookworm.py.disabled b/src/migrations/0027_migrate_to_bookworm.py.disabled index 17b252871..d61ca2d3e 100644 --- a/src/migrations/0027_migrate_to_bookworm.py.disabled +++ b/src/migrations/0027_migrate_to_bookworm.py.disabled @@ -356,7 +356,7 @@ class MyMigration(Migration): "N.B.: This migration has been tested by the community over the last few months but has only been declared stable recently. If your server hosts critical services and if you are not too confident with debugging possible issues, we recommend you to wait a little bit more while we gather more feedback and polish things up. If on the other hand you are relatively confident with debugging small issues that may arise, you are encouraged to run this migration ;)! You can read about remaining known issues and feedback from the community here: https://forum.yunohost.org/t/?? FIXME ?? \n\n" + message + "\n\n" - + "Packages 'metronome' (xmpp server) and 'rspamd' (mail antispam) are now optional dependencies and may get uninstalled during the upgrade. Make sure to explicitly re-install those using 'apt install' after the upgrade if you care about those!" + + "Packages 'metronome' (xmpp server) and 'rspamd' (mail antispam) are now separate applications available in the catalog, and will be uninstalled during the upgrade. Make sure to explicitly install the corresponding new apps after the upgrade if you care about those!" ) if problematic_apps: From 8a65053a59bc452206343e9578a554e8b8042055 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 Jul 2024 23:06:05 +0200 Subject: [PATCH 4/5] helpers/apt: zzzz did this break everything? --- helpers/helpers.v1.d/apt | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers/helpers.v1.d/apt b/helpers/helpers.v1.d/apt index 522c0381d..a9aca8d93 100644 --- a/helpers/helpers.v1.d/apt +++ b/helpers/helpers.v1.d/apt @@ -580,6 +580,7 @@ ynh_add_repo() { ynh_handle_getopts_args "$@" name="${name:-$app}" append=${append:-0} + trusted=${trusted:-0} if [ $append -eq 1 ]; then append="tee --append" From 14312a9ec4a584352a7ab0f5e2ab658ade6f890c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 Jul 2024 23:07:42 +0200 Subject: [PATCH 5/5] Update changelog for 11.2.21.2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index adbd070af..f7840751c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +yunohost (11.2.21.2) stable; urgency=low + + - bullseye->bookworm migration: tweak message to reflect the fact that metronome and rspamd will be applications starting with bookworm (64c8d9e8) + - helpers/apt: unbound variable (8a65053a) + + -- Alexandre Aubin Mon, 15 Jul 2024 23:07:08 +0200 + yunohost (11.2.21.1) stable; urgency=low - helpers2.1: forgot to patch ynh_remove_fpm_config -> ynh_config_remove_phpfpm (bb20020c)