Merge remote-tracking branch 'origin/dev' into bookworm

debian/changelog

@@ -3,7 +3,20 @@ yunohost (12.0.0) unstable; urgency=low
   - Tmp changelog to prepare Bookworm
 
  -- Alexandre Aubin <alex.aubin@mailoo.org>  Thu, 04 May 2023 20:30:19 +0200
- 
+
+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 <alex.aubin@mailoo.org>  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)
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  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))

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"

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

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"

src/migrations/0027_migrate_to_bookworm.py

@@ -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: