From dbd59c0ef59162307f0a1ce86d50d0ef50060267 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 5 Oct 2023 12:17:38 -0700 Subject: [PATCH] upgrades: Allow matrix-synapse to be installed from bookworm - Update the outdated apt preferences file that still refers to bullseye-backports instead of bookworm-backports. - Perform matching using n= instead of a= for matching distribution codename. - Drop preferences for libraries that were only required in bullseye-backports and not in bookworm-backports. Tests: - Install matrix-synapse app in testing container and stable container. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/upgrades/__init__.py | 2 +- plinth/modules/upgrades/privileged.py | 35 +++------------------------ 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/plinth/modules/upgrades/__init__.py b/plinth/modules/upgrades/__init__.py index 88c908d18..e4ee45869 100644 --- a/plinth/modules/upgrades/__init__.py +++ b/plinth/modules/upgrades/__init__.py @@ -53,7 +53,7 @@ class UpgradesApp(app_module.App): app_id = 'upgrades' - _version = 17 + _version = 18 can_be_disabled = False diff --git a/plinth/modules/upgrades/privileged.py b/plinth/modules/upgrades/privileged.py index 966002ee2..8193d8154 100644 --- a/plinth/modules/upgrades/privileged.py +++ b/plinth/modules/upgrades/privileged.py @@ -44,39 +44,10 @@ APT_PREFERENCES_APPS = \ Explanation: matrix-synapse shall not be available in Debian stable but Explanation: only in backports. Upgrade priority of packages that have needed Explanation: versions only in backports. -Explanation: matrix-synapse >= 1.47.0-2 requires python3-frozendict >= 1.2-3 -Package: python3-frozendict -Pin: release a=bullseye-backports -Pin-Priority: 500 - -Explanation: matrix-synapse >= 1.55.0-1 requires -Explanation: python3-typing-extensions >= 3.10 -Package: python3-typing-extensions -Pin: release a=bullseye-backports -Pin-Priority: 500 - -Explanation: matrix-synapse >= 1.55.0-2 requires -Explanation: python3-jinja2 >= 3.0~ -Package: python3-jinja2 -Pin: release a=bullseye-backports -Pin-Priority: 500 - -Explanation: python3-jinja2 >= 3.0~ requires -Explanation: python3-markupsafe >= 2.0 -Package: python3-markupsafe -Pin: release a=bullseye-backports -Pin-Priority: 500 - -Explanation: matrix-synapse >= 1.59.1-1 requires -Explanation: python3-unpaddedbase64 >= 2.1.0~ -Package: python3-unpaddedbase64 -Pin: release a=bullseye-backports -Pin-Priority: 500 - -Explanation: matrix-synapse >= 1.65.0-1 requires -Explanation: python3-canonicaljson >= 1.6.2~ +Explanation: matrix-synapse >= 1.92.0-3 requires +Explanation: python3-canonicaljson >= 2.0.0~ Package: python3-canonicaljson -Pin: release a=bullseye-backports +Pin: release n=bookworm-backports Pin-Priority: 500 '''