Support Debian 13 / Trixie

.gitlab-ci.yml

@@ -46,7 +46,7 @@ workflow:
 variables:
   GIT_CLONE_PATH: '$CI_BUILDS_DIR/$CI_COMMIT_SHA/$CI_JOB_ID'
   YNH_SOURCE: "https://github.com/yunohost"
-  YNH_DEBIAN: "bookworm"
+  YNH_DEBIAN: "trixie"
   YNH_SKIP_DIAGNOSIS_DURING_UPGRADE: "true"
 
 include:

.gitlab/ci/build.gitlab-ci.yml

@@ -2,7 +2,7 @@
   stage: build
   needs:
     - job: actionsmap
-    - job: invalidcode311
+    - job: invalidcode312
   image: "build-and-lint"
   variables:
     YNH_BUILD_DIR: "$GIT_CLONE_PATH/build"

.gitlab/ci/lint.gitlab-ci.yml

@@ -11,27 +11,27 @@ actionsmap:
     - python3 -c 'import yaml; yaml.safe_load(open("share/actionsmap.yml"))'
     - python3 -c 'import yaml; yaml.safe_load(open("share/actionsmap-portal.yml"))'
 
-lint311:
+lint312:
   stage: lint
   image: "build-and-lint"
   needs: []
   allow_failure: true
   script:
-    - tox -e py311-lint
+    - tox -e py312-lint
 
-invalidcode311:
+invalidcode312:
   stage: lint
   image: "build-and-lint"
   needs: []
   script:
-    - tox -e py311-invalidcode
+    - tox -e py312-invalidcode
 
 mypy:
   stage: lint
   image: "build-and-lint"
   needs: []
   script:
-    - tox -e py311-mypy
+    - tox -e py312-mypy
 
 i18n-keys:
   stage: lint

conf/nginx/global.conf

@@ -1 +0,0 @@
-server_tokens off;

debian/control

@@ -16,7 +16,7 @@ Depends: python3-all (>= 3.11),
  , python3-toml, python3-packaging, python3-publicsuffix2
  , python3-ldap, python3-zeroconf (>= 0.47), python3-lexicon,
  , python3-cryptography, python3-jwt, python3-passlib, python3-magic
- , python-is-python3, python3-pydantic, python3-email-validator
+ , python-is-python3, python3-email-validator, python3-pydantic, python3-pydantic-extra-types
  , nginx, nginx-extras (>=1.22)
  , apt, apt-transport-https, apt-utils, aptitude, dirmngr
  , openssh-server, iptables, fail2ban, bind9-dnsutils
@@ -39,12 +39,13 @@ Conflicts: iptables-persistent
  , bind9
  , openresolv
  , systemd-resolved
- , nginx-extras (>= 1.23)
- , openssl (>= 3.1)
- , slapd (>= 2.6)
- , dovecot-core (>= 1:2.4)
- , fail2ban (>= 1.1)
- , iptables (>= 1.8.10)
+# FIXME: Those version should be updated to trixie-backports versions
+#  , nginx-extras (>= 1.23)
+#  , openssl (>= 3.1)
+#  , slapd (>= 2.6)
+#  , dovecot-core (>= 1:2.4)
+#  , fail2ban (>= 1.1)
+#  , iptables (>= 1.8.10)
 Description: manageable and configured self-hosting server
  YunoHost aims to make self-hosting accessible to everyone. It configures
  an email, Web and IM server alongside a LDAP base. It also provides

helpers/helpers.v1.d/mysql

@@ -120,7 +120,7 @@ ynh_mysql_drop_db() {
 #
 # usage: ynh_mysql_dump_db --database=database
 # | arg: -d, --database=    - the database name to dump
-# | ret: The mysqldump output
+# | ret: The mariadb-dump output
 #
 # example: ynh_mysql_dump_db --database=roundcube > ./dump.sql
 #
@@ -133,7 +133,7 @@ ynh_mysql_dump_db() {
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
 
-    mysqldump --single-transaction --skip-dump-date --routines "$database"
+    mariadb-dump --single-transaction --skip-dump-date --routines "$database"
 }
 
 # Create a user
@@ -184,7 +184,7 @@ ynh_mysql_user_exists() {
 #
 ynh_mysql_database_exists() {
     local database=$1
-    mysqlshow | grep -qE "^|\s+$database\s+|"
+    mariadb-show | grep -qE "^|\s+$database\s+|"
 }
 
 # Drop a user

helpers/helpers.v2.1.d/mysql

@@ -58,13 +58,13 @@ ynh_mysql_drop_db() {
 #
 # usage: ynh_mysql_dump_db database
 # | arg: database   - the database name to dump (by default, $db_name)
-# | ret: The mysqldump output
+# | ret: The mariadb-dump output
 #
 # example: ynh_mysql_dump_db "roundcube" > ./dump.sql
 #
 ynh_mysql_dump_db() {
     local database=${1:-$db_name}
-    mysqldump --single-transaction --skip-dump-date --routines "$database"
+    mariadb-dump --single-transaction --skip-dump-date --routines "$database"
 }
 
 # Create a user
@@ -101,7 +101,7 @@ ynh_mysql_user_exists() {
 #
 ynh_mysql_database_exists() {
     local database=$1
-    mysqlshow | grep -q "^| $database "
+    mariadb-show | grep -q "^| $database "
 }
 
 # Drop a user

hooks/conf_regen/10-apt

@@ -11,7 +11,15 @@ do_pre_regen() {
 
     # Add sury
     mkdir -p ${pending_dir}/etc/apt/sources.list.d/
-    echo "deb [signed-by=/etc/apt/trusted.gpg.d/extra_php_version.gpg] https://packages.sury.org/php/ $(lsb_release --codename --short) main" > "${pending_dir}/etc/apt/sources.list.d/extra_php_version.list"
+
+    # FIXME: sury doesn't support trixie yet
+    case "$(lsb_release --codename --short)" in
+        bullseye) sury_distro=bullseye ;;
+        bookworm) sury_distro=bookworm ;;
+        trixie) sury_distro=bookworm ;;
+    esac
+
+    echo "deb [signed-by=/etc/apt/trusted.gpg.d/extra_php_version.gpg] https://packages.sury.org/php/ $sury_distro main" > "${pending_dir}/etc/apt/sources.list.d/extra_php_version.list"
 
     # Ban some packages from sury
     echo "

src/app.py

@@ -1121,7 +1121,7 @@ def app_install(
     # Retrieve arguments list for install script
     raw_options = manifest["install"]
     options, form = ask_questions_and_parse_answers(raw_options, prefilled_answers=args)
-    args = form.dict(exclude_none=True)
+    args = form.model_dump(exclude_none=True)
 
     # Validate domain / path availability for webapps
     # (ideally this should be handled by the resource system for manifest v >= 2
@@ -1892,7 +1892,7 @@ def _apply(
             previous_settings: dict[str, Any],
             exclude: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
         ) -> None:
-            env = {key: str(value) for key, value in form.dict().items()}
+            env = {key: str(value) for key, value in form.model_dump().items()}
             return_content = self._call_config_script("apply", env=env)
 
             # If the script returned validation error
@@ -1908,7 +1908,7 @@ def _apply(
                     )
 
         def _run_action(self, form: "FormModel", action_id: str) -> None:
-            env = {key: str(value) for key, value in form.dict().items()}
+            env = {key: str(value) for key, value in form.model_dump().items()}
             self._call_config_script(action_id, env=env)
 
         def _call_config_script(

src/domain.py

@@ -797,7 +797,9 @@ def _apply(
             exclude: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
         ) -> None:
             next_settings = {
-                k: v for k, v in form.dict().items() if previous_settings.get(k) != v
+                k: v
+                for k, v in form.model_dump().items()
+                if previous_settings.get(k) != v
             }
 
             if "default_app" in next_settings:
@@ -863,7 +865,7 @@ def _apply(
                 # that can be read by the portal API.
                 # FIXME remove those from the config panel saved values?
 
-                portal_values = form.dict(include=set(portal_options))
+                portal_values = form.model_dump(include=set(portal_options))
                 # Remove logo from values else filename will replace b64 content
                 if "portal_logo" in portal_values:
                     portal_values.pop("portal_logo")