From 401971dd09cf9d97f1d929a40924edc6b6c56a7d Mon Sep 17 00:00:00 2001 From: ikmaak Date: Tue, 6 Dec 2022 09:17:25 +0000 Subject: [PATCH 01/20] Translated using Weblate (Dutch) Currently translated at 100.0% (1484 of 1484 strings) --- plinth/locale/nl/LC_MESSAGES/django.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plinth/locale/nl/LC_MESSAGES/django.po b/plinth/locale/nl/LC_MESSAGES/django.po index 248fe53cc..a42be8bc9 100644 --- a/plinth/locale/nl/LC_MESSAGES/django.po +++ b/plinth/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-12-05 21:13-0500\n" -"PO-Revision-Date: 2022-10-14 10:25+0000\n" +"PO-Revision-Date: 2022-12-07 20:48+0000\n" "Last-Translator: ikmaak \n" "Language-Team: Dutch \n" @@ -6462,10 +6462,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Secure Shell (SSH) Server" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Secure Shell (SSH)" +msgstr "Op afstand inloggen met Secure Shell (SSH)" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6483,7 +6481,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Alle gebruikers toestaan om op afstand in te loggen" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6491,6 +6489,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Sta alle gebruikers met een geldig account toe om op afstand in te loggen " +"via SSH. Als dit is uitgeschakeld, kunnen alleen gebruikers van de groepen " +"root, admin en freedombox-ssh inloggen via SSH." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" From bd50874a20472984fab408d99a3720d3c88346d5 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Tue, 6 Dec 2022 05:19:07 +0000 Subject: [PATCH 02/20] Translated using Weblate (Turkish) Currently translated at 100.0% (1484 of 1484 strings) --- plinth/locale/tr/LC_MESSAGES/django.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plinth/locale/tr/LC_MESSAGES/django.po b/plinth/locale/tr/LC_MESSAGES/django.po index aa5ce25aa..af73b5026 100644 --- a/plinth/locale/tr/LC_MESSAGES/django.po +++ b/plinth/locale/tr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-12-05 21:13-0500\n" -"PO-Revision-Date: 2022-10-14 10:25+0000\n" +"PO-Revision-Date: 2022-12-07 20:48+0000\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \n" @@ -6428,10 +6428,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Güvenli Kabuk (SSH) Sunucusu" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Güvenli Kabuk (SSH)" +msgstr "Güvenli Kabuk (SSH) kullanarak uzaktan oturum açın" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6449,7 +6447,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Tüm kullanıcıların uzaktan oturum açmasına izin ver" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6457,6 +6455,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Geçerli bir hesabı olan tüm kullanıcıların SSH aracılığıyla uzaktan oturum " +"açmasını sağlar. Etkisizleştirildiğinde, sadece root, admin ve freedombox-" +"ssh gruplarının kullanıcıları SSH aracılığıyla oturum açabilir." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" From c59a84fd417550f23c5286bed725b009f5e93d71 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Dec 2022 03:25:01 +0000 Subject: [PATCH 03/20] Translated using Weblate (Chinese (Simplified)) Currently translated at 68.5% (1018 of 1484 strings) --- plinth/locale/zh_Hans/LC_MESSAGES/django.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plinth/locale/zh_Hans/LC_MESSAGES/django.po b/plinth/locale/zh_Hans/LC_MESSAGES/django.po index 10815e080..fe29540d9 100644 --- a/plinth/locale/zh_Hans/LC_MESSAGES/django.po +++ b/plinth/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Plinth\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-12-05 21:13-0500\n" -"PO-Revision-Date: 2022-10-14 10:25+0000\n" -"Last-Translator: Eric \n" +"PO-Revision-Date: 2022-12-07 20:48+0000\n" +"Last-Translator: Eric \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -5818,10 +5818,8 @@ msgid "Secure Shell (SSH) Server" msgstr "安全 Shell（SSH）服务器" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "安全 Shell（SSH）" +msgstr "使用 Secure Shell（SSH 远程登录" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" From dbe03a0e7b6c396fe211c166846a3db43199c27a Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Tue, 6 Dec 2022 20:05:31 +0000 Subject: [PATCH 04/20] Translated using Weblate (Ukrainian) Currently translated at 100.0% (1484 of 1484 strings) --- plinth/locale/uk/LC_MESSAGES/django.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plinth/locale/uk/LC_MESSAGES/django.po b/plinth/locale/uk/LC_MESSAGES/django.po index 522685748..afd1e26a7 100644 --- a/plinth/locale/uk/LC_MESSAGES/django.po +++ b/plinth/locale/uk/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-12-05 21:13-0500\n" -"PO-Revision-Date: 2022-10-16 14:35+0000\n" -"Last-Translator: Tymofii Lytvynenko \n" +"PO-Revision-Date: 2022-12-07 20:48+0000\n" +"Last-Translator: Ihor Hordiichuk \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -6425,10 +6425,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Сервер захищеної оболонки (SSH)" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Захищена оболонка (SSH)" +msgstr "Віддалений вхід за допомогою Secure Shell (SSH)" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6446,7 +6444,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Дозволити всім користувачам входити віддалено" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6454,6 +6452,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Дозволити всім користувачам, які мають дійсний обліковий запис, віддалено " +"входити через SSH. Якщо вимкнено, лише користувачі груп root, admin і " +"freedombox-ssh можуть увійти через SSH." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" From 327754cbf061047d420c7af022c96d89f6172aeb Mon Sep 17 00:00:00 2001 From: 109247019824 Date: Tue, 6 Dec 2022 05:43:52 +0000 Subject: [PATCH 05/20] Translated using Weblate (Bulgarian) Currently translated at 41.6% (618 of 1484 strings) --- plinth/locale/bg/LC_MESSAGES/django.po | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plinth/locale/bg/LC_MESSAGES/django.po b/plinth/locale/bg/LC_MESSAGES/django.po index ebe2135b4..707531a29 100644 --- a/plinth/locale/bg/LC_MESSAGES/django.po +++ b/plinth/locale/bg/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-12-05 21:13-0500\n" -"PO-Revision-Date: 2022-11-03 21:05+0000\n" +"PO-Revision-Date: 2022-12-07 20:48+0000\n" "Last-Translator: 109247019824 \n" "Language-Team: Bulgarian \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.14.2-dev\n" +"X-Generator: Weblate 4.15-dev\n" #: doc/dev/_templates/layout.html:11 msgid "Page source" @@ -5772,7 +5772,7 @@ msgstr "" #: plinth/modules/ssh/__init__.py:61 msgid "Remotely login using Secure Shell (SSH)" -msgstr "" +msgstr "Отдалечен вход през SSH" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -5787,7 +5787,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Разрешаване на отдалечен вход на всички потребители" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -5795,6 +5795,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Дава разрешение на всички потребители, които имат валиден профил, да влизат " +"отдалечено през SSH. Когато не е отметнато, само потребителите от групите " +"root, admin и freedombox-ssh могат да влизат през SSH." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" From a2f24c30f180e21a6a428527aedec11d6be4a66e Mon Sep 17 00:00:00 2001 From: Johannes Keyser Date: Fri, 9 Dec 2022 19:02:36 +0000 Subject: [PATCH 06/20] Translated using Weblate (German) Currently translated at 100.0% (1484 of 1484 strings) --- plinth/locale/de/LC_MESSAGES/django.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plinth/locale/de/LC_MESSAGES/django.po b/plinth/locale/de/LC_MESSAGES/django.po index 21fd1af5d..b81793e64 100644 --- a/plinth/locale/de/LC_MESSAGES/django.po +++ b/plinth/locale/de/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: FreedomBox UI\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-12-05 21:13-0500\n" -"PO-Revision-Date: 2022-10-30 11:00+0000\n" +"PO-Revision-Date: 2022-12-11 17:47+0000\n" "Last-Translator: Johannes Keyser \n" "Language-Team: German \n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.14.2-dev\n" +"X-Generator: Weblate 4.15-dev\n" #: doc/dev/_templates/layout.html:11 msgid "Page source" @@ -6526,10 +6526,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Secure Shell (SSH) Server" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Secure Shell (SSH)" +msgstr "Remote-Anmeldung mit Secure Shell (SSH)" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6547,7 +6545,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Allen Benutzern Remote-Anmeldung erlauben" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6555,6 +6553,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Erlaubt allen Benutzern, die ein gültiges Konto haben, sich per SSH " +"anzumelden. Falls deaktiviert, können sich nur Benutzer der Gruppen root, " +"admin und freedombox-ssh über SSH anmelden." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" From 777ab626c48face07de0e3bd2beb0d532e028595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Podhoreck=C3=BD?= Date: Sat, 10 Dec 2022 16:54:25 +0000 Subject: [PATCH 07/20] Translated using Weblate (Czech) Currently translated at 100.0% (1484 of 1484 strings) --- plinth/locale/cs/LC_MESSAGES/django.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plinth/locale/cs/LC_MESSAGES/django.po b/plinth/locale/cs/LC_MESSAGES/django.po index f1caac183..6dcc786bd 100644 --- a/plinth/locale/cs/LC_MESSAGES/django.po +++ b/plinth/locale/cs/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-12-05 21:13-0500\n" -"PO-Revision-Date: 2022-10-16 14:35+0000\n" +"PO-Revision-Date: 2022-12-11 17:47+0000\n" "Last-Translator: Jiří Podhorecký \n" "Language-Team: Czech \n" @@ -6402,10 +6402,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Server zabezpečeného shellu (SSH)" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Zabezpečený shell (SSH)" +msgstr "Vzdálené přihlášení pomocí Secure Shell (SSH)" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6423,7 +6421,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Povolit všem uživatelům vzdálené přihlášení" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6431,6 +6429,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Povolte všem uživatelům, kteří mají platný účet, vzdálené přihlášení přes " +"SSH. Pokud je vypnuto, mohou se přes SSH přihlásit pouze uživatelé skupin " +"root, admin a freedombox-ssh." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" From 344c491f7b3c640566c60525425f92870b9b6778 Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Sun, 11 Dec 2022 15:57:57 +0530 Subject: [PATCH 08/20] container: Drop free tag from image URLs Signed-off-by: Joseph Nuthalapati Reviewed-by: James Valleroy --- container | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container b/container index bf031ca8f..cbb1fadc1 100755 --- a/container +++ b/container @@ -132,9 +132,9 @@ URLS = { 'stable': 'https://ftp.freedombox.org/pub/freedombox/hardware/' 'amd64/bullseye/freedombox-bullseye-free_all-amd64.img.xz', 'testing': 'https://ftp.freedombox.org/pub/freedombox/hardware/' - 'amd64/testing/freedombox-testing-free_dev_all-amd64.img.xz', + 'amd64/testing/freedombox-testing_dev_all-amd64.img.xz', 'unstable': 'https://ftp.freedombox.org/pub/freedombox/hardware/' - 'amd64/nightly/freedombox-unstable-free_dev_all-amd64.img.xz', + 'amd64/nightly/freedombox-unstable_dev_all-amd64.img.xz', } TRUSTED_KEYS = ['013D86D8BA32EAB4A6691BF85D4153D6FE188FC8'] From aa2992b82689bbf9940c6a6a624aaf060dba79f4 Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Sun, 11 Dec 2022 16:03:42 +0530 Subject: [PATCH 09/20] tests: functional: Set timeout to 3 hours This commit alone doesn't fix the problem of our functional tests timing out. It is harmless to increase the timeout. The maximum timeout for shared runners in Salsa is 3h according to this: https://salsa.debian.org/salsa-ci-team/pipeline/-/blob/master/README.md#set-build-timeout Signed-off-by: Joseph Nuthalapati Reviewed-by: James Valleroy --- .ci/functional-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/functional-tests.yml b/.ci/functional-tests.yml index 3089ce1ad..18651dae3 100644 --- a/.ci/functional-tests.yml +++ b/.ci/functional-tests.yml @@ -21,7 +21,7 @@ .run-functional-tests: stage: functional-tests - timeout: 150m + timeout: 3h # Need to find a way of running the cleanup step even on failure allow_failure: true when: delayed From 7e0b72849805a952779d3b555108e673a7ec8ebe Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 13 Dec 2022 12:08:09 -0800 Subject: [PATCH 10/20] users: tests: Fix privileged tests Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/users/tests/test_privileged.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plinth/modules/users/tests/test_privileged.py b/plinth/modules/users/tests/test_privileged.py index 268a48aba..0852b01f9 100644 --- a/plinth/modules/users/tests/test_privileged.py +++ b/plinth/modules/users/tests/test_privileged.py @@ -246,7 +246,7 @@ def test_change_other_users_password_as_non_admin(): username2, _ = _create_user() new_password = 'pass $123' - with pytest.raises(subprocess.CalledProcessError): + with pytest.raises(PermissionError): privileged.set_user_password(username2, new_password, username1, password1) @@ -326,8 +326,7 @@ def test_groups(): groupname = _random_string() _create_group(groupname) - with pytest.raises(subprocess.CalledProcessError): - subprocess.run(['ldapgid', groupname], check=True) + subprocess.run(['ldapgid', groupname], check=True) # create-group is idempotent privileged.create_group(groupname) From 740609c339ff37649a0ffafbe6b6cb6d49d439c7 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 14 Dec 2022 17:04:54 -0800 Subject: [PATCH 11/20] minidlna: Fix incorrect marking for firewall local protection MiniDLNA's TCP service has been incorrectly marked as needing to be protected from local users. This leads to service not being accessible from local network. Fix this by removing local protection. As reported on https://discuss.freedombox.org/t/minidlna-on-22-26/2386 Tests: - With MiniDLNA installed, apply the changes and restart service. 'nft list ruleset ip', 'nft list ruleset ip6' and 'cat /etc/firewalld/direct.xml' confirm that port 8200 is no longer protected as a local service. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/minidlna/__init__.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/plinth/modules/minidlna/__init__.py b/plinth/modules/minidlna/__init__.py index 514033995..dbb1b9e8f 100644 --- a/plinth/modules/minidlna/__init__.py +++ b/plinth/modules/minidlna/__init__.py @@ -7,10 +7,10 @@ from django.utils.translation import gettext_lazy as _ from plinth import app as app_module from plinth import frontpage, menu from plinth.daemon import Daemon +from plinth.modules import firewall from plinth.modules.apache.components import Webserver from plinth.modules.backups.components import BackupRestore -from plinth.modules.firewall.components import (Firewall, - FirewallLocalProtection) +from plinth.modules.firewall.components import Firewall from plinth.modules.users.components import UsersAndGroups from plinth.package import Packages, install from plinth.utils import Version @@ -34,7 +34,7 @@ class MiniDLNAApp(app_module.App): app_id = 'minidlna' - _version = 3 + _version = 4 def __init__(self): """Initialize the app components.""" @@ -75,10 +75,6 @@ class MiniDLNAApp(app_module.App): is_external=False) self.add(firewall) - firewall_local_protection = FirewallLocalProtection( - 'firewall-local-protection-minidlna', ['8200']) - self.add(firewall_local_protection) - webserver = Webserver('webserver-minidlna', 'minidlna-freedombox', urls=['https://{host}/_minidlna/']) self.add(webserver) @@ -98,6 +94,14 @@ class MiniDLNAApp(app_module.App): """Install and configure the app.""" super().setup(old_version) privileged.setup() + if old_version == 3: + # Version 3 of the app incorrectly declared port 8200 for firewall + # local protection. + firewall.remove_passthrough('ipv6', '-A', 'INPUT', '-p', 'tcp', + '--dport', '8200', '-j', 'REJECT') + firewall.remove_passthrough('ipv4', '-A', 'INPUT', '-p', 'tcp', + '--dport', '8200', '-j', 'REJECT') + if not old_version: self.enable() From bcb0823e7c49bbb9c0bdbaded20c19eb800d603b Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 15 Dec 2022 15:15:23 -0800 Subject: [PATCH 12/20] snapshot: Fix showing unsupported message on non-btrfs filesystems This is a regression from commit 9b6774f279e2c8af588609c2413aa9804fd48cfa. When change the view to use AppView, the condition to check for non-btrfs filesystems and show an unsupported message instead of the actual view was accidentally removed. Restore the check and show a different view when on non-btrfs filesystems. Fixes: #2268. Tests: - On non-btrfs filesystem, snapshots view is shown as expected. - On ext4 filesystem, a message that snapshots are not supported is shown. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/snapshot/views.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plinth/modules/snapshot/views.py b/plinth/modules/snapshot/views.py index 86f892f76..8fc4c5b6c 100644 --- a/plinth/modules/snapshot/views.py +++ b/plinth/modules/snapshot/views.py @@ -58,6 +58,13 @@ class SnapshotAppView(AppView): template_name = 'snapshot.html' form_class = SnapshotForm + def dispatch(self, request, *args, **kwargs): + """If snapshots are not supported, use a different view.""" + if not snapshot_module.is_supported(): + return not_supported_view(request) + + return super().dispatch(request, *args, **kwargs) + def get_initial(self): """Return the values to fill in the form.""" initial = super().get_initial() From bb527673fb384b8a1130db808be8eeb694f12e1d Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 15 Dec 2022 15:46:37 -0800 Subject: [PATCH 13/20] d/control: Don't recommend libpam-tmpdir - Use of libpam-tmpdir leads to problems installing MariaDB[1][2][3]. A fix for the serious issues may not be available for next stable release. - Services run by systemd don't benefit from libpam-tmpdir[4]. So it's effect is limited to PAM sessions opened with a terminal. Terminal access is mostly for debugging in FreedomBox and not a primary use case. - Services are (or will be) protected with PrivateTmp=yes in case of services running on FreedomBox. This is better protection compared to what libpam-tmpdir offers. Links: 1) https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1022994 2) https://jira.mariadb.org/browse/MDEV-29910 3) https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/23 4) https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1022994#32 Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- debian/control | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/control b/debian/control index 4a8c95d6e..86f43c6ce 100644 --- a/debian/control +++ b/debian/control @@ -156,8 +156,6 @@ Recommends: libnss-mdns, # Resolve current hostname without /etc/hosts libnss-myhostname, -# Tighter $TMPDIR permissions - libpam-tmpdir, # Block repeated failed PAM login attempts libpam-abl, # Priority: standard From 0b9d56749331c2cba235ca2ada26c5c83b6acf6e Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 15 Dec 2022 16:46:18 -0800 Subject: [PATCH 14/20] package, email: Move conflicting package removal to framework - Warning that exim4 will be removed is incorrectly not shown during email app installation. Fix that. Tests: - Unit tests pass. - On a fresh testing container, trying to install email app shows the warning message that exim will be removed. Installing the email app succeeds. exim is removed during installation. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/email/__init__.py | 14 ++------------ plinth/package.py | 7 +++++++ plinth/tests/test_package.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/plinth/modules/email/__init__.py b/plinth/modules/email/__init__.py index 33832622b..e9dd2a2a0 100644 --- a/plinth/modules/email/__init__.py +++ b/plinth/modules/email/__init__.py @@ -15,7 +15,7 @@ from plinth.modules.config import get_domainname from plinth.modules.firewall.components import (Firewall, FirewallLocalProtection) from plinth.modules.letsencrypt.components import LetsEncrypt -from plinth.package import Packages, uninstall +from plinth.package import Packages from plinth.privileged import service as service_privileged from plinth.signals import domain_added, domain_removed from plinth.utils import format_lazy @@ -97,7 +97,7 @@ class EmailApp(plinth.app.App): 'dovecot-lmtpd', 'dovecot-managesieved', 'dovecot-ldap', 'rspamd', 'redis-server', 'openssl' ], conflicts=['exim4-base', 'exim4-config', 'exim4-daemon-light'], - conflicts_action=Packages.ConflictsAction.IGNORE) + conflicts_action=Packages.ConflictsAction.REMOVE) self.add(packages) listen_ports = [(25, 'tcp4'), (25, 'tcp6'), (465, 'tcp4'), @@ -171,17 +171,7 @@ class EmailApp(plinth.app.App): def setup(self, old_version): """Install and configure the app.""" - - def _clear_conflicts(): - component = self.get_component('packages-email') - packages_to_remove = component.find_conflicts() - if packages_to_remove: - logger.info('Removing conflicting packages: %s', - packages_to_remove) - uninstall(packages_to_remove) - # Install - _clear_conflicts() super().setup(old_version) # Setup diff --git a/plinth/package.py b/plinth/package.py index c4e2a80dc..6ed4d2245 100644 --- a/plinth/package.py +++ b/plinth/package.py @@ -170,6 +170,13 @@ class Packages(app.FollowerComponent): def setup(self, old_version): """Install the packages.""" + packages_to_remove = self.find_conflicts() + if packages_to_remove and \ + self.conflicts_action not in (None, self.ConflictsAction.IGNORE): + logger.info('Removing conflicting packages: %s', + packages_to_remove) + uninstall(packages_to_remove) + install(self.get_actual_packages(), skip_recommends=self.skip_recommends) diff --git a/plinth/tests/test_package.py b/plinth/tests/test_package.py index 66ddafb15..3b40ae535 100644 --- a/plinth/tests/test_package.py +++ b/plinth/tests/test_package.py @@ -114,6 +114,36 @@ def test_packages_setup(install): install.assert_has_calls([call(['python3'], skip_recommends=False)]) +@patch('plinth.package.packages_installed') +@patch('plinth.package.uninstall') +@patch('plinth.package.install') +def test_packages_setup_with_conflicts(install, uninstall, packages_installed): + """Test setting up packages with conflicts.""" + packages_installed.return_value = ['exim4-base'] + + component = Packages('test-component', ['bash'], conflicts=['exim4-base'], + conflicts_action=Packages.ConflictsAction.REMOVE) + component.setup(old_version=0) + uninstall.assert_has_calls([call(['exim4-base'])]) + install.assert_has_calls([call(['bash'], skip_recommends=False)]) + + uninstall.reset_mock() + install.reset_mock() + component = Packages('test-component', ['bash'], conflicts=['exim4-base']) + component.setup(old_version=0) + uninstall.assert_not_called() + install.assert_has_calls([call(['bash'], skip_recommends=False)]) + + uninstall.reset_mock() + install.reset_mock() + component = Packages('test-component', ['bash'], + conflicts=['exim4-base', 'not-installed-package'], + conflicts_action=Packages.ConflictsAction.IGNORE) + component.setup(old_version=0) + uninstall.assert_not_called() + install.assert_has_calls([call(['bash'], skip_recommends=False)]) + + @patch('plinth.package.uninstall') def test_packages_uninstall(uninstall): """Test uninstalling packages component.""" From b056f5829cc367fdf8367c661819398612828e37 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sat, 17 Dec 2022 14:16:08 -0800 Subject: [PATCH 15/20] zoph, wordpress: Add conflicts on libpam-tmpdir Closes: #2239. - Adding Conflicts in freedombox Debian package seems to cause unattended-upgrade to not upgrade the package to next version. This approach seems be an alternative. Tests: - Install libpam-tmpdir. Go to Zoph page, see that conflicts messages is shown. Install succeeds. libpam-tmpdir is removed. - Install libpam-tmpdir. Go to WordPress page, see that conflicts messages is shown. Install succeeds. libpam-tmpdir is removed. - Remove libpam-tmpdir. Go to Zoph page, see that conflicts message is not shown. Install succeeds. - Remove libpam-tmpdir. Go to WordPress page, see that conflicts message is not shown. Install succeeds. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/wordpress/__init__.py | 4 +++- plinth/modules/zoph/__init__.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plinth/modules/wordpress/__init__.py b/plinth/modules/wordpress/__init__.py index 7b933a79c..f63bdd238 100644 --- a/plinth/modules/wordpress/__init__.py +++ b/plinth/modules/wordpress/__init__.py @@ -81,7 +81,9 @@ class WordPressApp(app_module.App): 'php-zip', # WordPress only supports MySQL/MariaDB as DB 'default-mysql-server', - ]) + ], + conflicts=['libpam-tmpdir'], + conflicts_action=Packages.ConflictsAction.REMOVE) self.add(packages) firewall = Firewall('firewall-wordpress', info.name, diff --git a/plinth/modules/zoph/__init__.py b/plinth/modules/zoph/__init__.py index 7ec541429..7d4b7f6c1 100644 --- a/plinth/modules/zoph/__init__.py +++ b/plinth/modules/zoph/__init__.py @@ -67,7 +67,9 @@ class ZophApp(app_module.App): login_required=True) self.add(shortcut) - packages = Packages('packages-zoph', ['zoph']) + packages = Packages('packages-zoph', ['zoph'], + conflicts=['libpam-tmpdir'], + conflicts_action=Packages.ConflictsAction.REMOVE) self.add(packages) firewall = Firewall('firewall-zoph', info.name, From 331e6f33d8f904470a7c1359a1c225d011c108a8 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sat, 17 Dec 2022 20:32:01 -0500 Subject: [PATCH 16/20] upgrades: dist-upgrade: Don't change apt security line This change was only needed for upgrade to bullseye. Closes: #2302. Tests: - Run a dist upgrade in a bullseye vagrant box. Apt sources has expected content and apt-get does not produce an error. Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- plinth/modules/upgrades/privileged.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plinth/modules/upgrades/privileged.py b/plinth/modules/upgrades/privileged.py index 17c044603..1573b3006 100644 --- a/plinth/modules/upgrades/privileged.py +++ b/plinth/modules/upgrades/privileged.py @@ -379,16 +379,12 @@ def _check_dist_upgrade(test_upgrade=False) -> Tuple[bool, str]: with open(SOURCES_LIST, 'w', encoding='utf-8') as sources_list: for line in lines: - # E.g. replace 'buster' with 'bullseye'. + # E.g. replace 'bullseye' with 'bookworm'. new_line = line.replace(dist, codename) if check_dist == 'testing': - # E.g. replace 'stable' with 'bullseye'. + # E.g. replace 'stable' with 'bookworm'. new_line = new_line.replace('stable', codename) - # Security suite name renamed starting with bullseye - if 'security' in new_line: - new_line = new_line.replace('/updates', '-security') - sources_list.write(new_line) logging.info('Dist upgrade in progress. Setting flag.') From 9736d426cb182a2fc98f9f246519a4e3bd0e7906 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Fri, 16 Dec 2022 08:23:07 -0500 Subject: [PATCH 17/20] wordpress: Redirect Webfinger queries Needed by ActivityPub plugin. Closes: #2257. Signed-off-by: James Valleroy --- .../data/etc/apache2/conf-available/wordpress-freedombox.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plinth/modules/wordpress/data/etc/apache2/conf-available/wordpress-freedombox.conf b/plinth/modules/wordpress/data/etc/apache2/conf-available/wordpress-freedombox.conf index 24ea002c4..c93ea1c49 100644 --- a/plinth/modules/wordpress/data/etc/apache2/conf-available/wordpress-freedombox.conf +++ b/plinth/modules/wordpress/data/etc/apache2/conf-available/wordpress-freedombox.conf @@ -8,6 +8,9 @@ ## mod_auth_pubtkt ## +# Redirect Webfinger queries, needed by ActivityPub plugin +RedirectMatch "^\/\.well-known\/webfinger(.*)$" "\/wordpress\/\.well-known\/webfinger$1" + # Match longer aliases first to meet expectations Alias /wordpress/wp-content /var/lib/wordpress/wp-content Alias /wordpress /usr/share/wordpress From 8618c49c26e3b5119dc71e76e79a0975647a0612 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Mon, 19 Dec 2022 20:15:39 -0500 Subject: [PATCH 18/20] locale: Update translation strings Signed-off-by: James Valleroy --- plinth/locale/ar/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/ar_SA/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/bg/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/bn/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/cs/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/da/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/de/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/django.pot | 34 ++++++++++----------- plinth/locale/el/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/es/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/fa/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/fake/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/fr/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/gl/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/gu/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/hi/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/hu/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/id/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/it/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/ja/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/kn/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/lt/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/lv/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/nb/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/nl/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/pl/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/pt/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/ru/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/si/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/sl/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/sq/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/sr/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/sv/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/ta/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/te/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/tr/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/uk/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/vi/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/zh_Hans/LC_MESSAGES/django.po | 34 ++++++++++----------- plinth/locale/zh_Hant/LC_MESSAGES/django.po | 34 ++++++++++----------- 40 files changed, 680 insertions(+), 680 deletions(-) diff --git a/plinth/locale/ar/LC_MESSAGES/django.po b/plinth/locale/ar/LC_MESSAGES/django.po index 3c733af25..b9ea1f256 100644 --- a/plinth/locale/ar/LC_MESSAGES/django.po +++ b/plinth/locale/ar/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2022-03-31 09:12+0000\n" "Last-Translator: abidin toumi \n" "Language-Team: Arabic \n" "Language-Team: Arabic (Saudi Arabia) \n" "Language-Team: Bulgarian \n" "Language-Team: Bengali \n" "Language-Team: Czech \n" "Language-Team: Danish \n" "Language-Team: German \n" "Language-Team: LANGUAGE \n" @@ -5476,7 +5476,7 @@ msgstr "" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "" @@ -5540,37 +5540,37 @@ msgstr "" msgid "Manage Snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "" -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "" -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "" -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 msgid "The system must be restarted to complete the rollback." msgstr "" -#: plinth/modules/snapshot/views.py:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "" @@ -7029,34 +7029,34 @@ msgstr "" msgid "Finished: {name}" msgstr "" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "" diff --git a/plinth/locale/el/LC_MESSAGES/django.po b/plinth/locale/el/LC_MESSAGES/django.po index 59067217d..f129dcdf8 100644 --- a/plinth/locale/el/LC_MESSAGES/django.po +++ b/plinth/locale/el/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2022-09-14 17:20+0000\n" "Last-Translator: ikmaak \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Persian \n" "Language-Team: Plinth Developers \n" "Language-Team: French \n" "Language-Team: Galician \n" "Language-Team: Gujarati \n" "Language-Team: Hindi \n" "Language-Team: Hungarian \n" "Language-Team: Indonesian \n" "Language-Team: Italian \n" "Language-Team: Japanese \n" "Language-Team: Kannada \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" "Language-Team: Norwegian Bokmål \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese \n" "Language-Team: Russian \n" "Language-Team: Sinhala \n" "Language-Team: Slovenian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: LANGUAGE \n" @@ -5477,7 +5477,7 @@ msgstr "" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "" @@ -5541,37 +5541,37 @@ msgstr "" msgid "Manage Snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "" -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "" -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "" -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 msgid "The system must be restarted to complete the rollback." msgstr "" -#: plinth/modules/snapshot/views.py:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "" @@ -7030,34 +7030,34 @@ msgstr "" msgid "Finished: {name}" msgstr "" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "" diff --git a/plinth/locale/te/LC_MESSAGES/django.po b/plinth/locale/te/LC_MESSAGES/django.po index abe324465..040a5e20e 100644 --- a/plinth/locale/te/LC_MESSAGES/django.po +++ b/plinth/locale/te/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: FreedomBox UI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2022-03-02 12:27+0000\n" "Last-Translator: James Valleroy \n" "Language-Team: Telugu \n" "Language-Team: Turkish \n" "Language-Team: Ukrainian \n" "Language-Team: Vietnamese \n" "Language-Team: Chinese (Simplified) \n" "Language-Team: Chinese (Traditional) Date: Mon, 19 Dec 2022 20:58:57 -0500 Subject: [PATCH 19/20] doc: Fetch latest manual Signed-off-by: James Valleroy --- doc/manual/en/ReleaseNotes.raw.wiki | 19 +++++++++++++++++++ doc/manual/es/ReleaseNotes.raw.wiki | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/doc/manual/en/ReleaseNotes.raw.wiki b/doc/manual/en/ReleaseNotes.raw.wiki index 1b4cc859f..b5f6e8a3c 100644 --- a/doc/manual/en/ReleaseNotes.raw.wiki +++ b/doc/manual/en/ReleaseNotes.raw.wiki @@ -8,6 +8,25 @@ For more technical details, see the [[https://salsa.debian.org/freedombox-team/f The following are the release notes for each !FreedomBox version. +== FreedomBox 22.27 (2022-12-19) == + +=== Highlights === + + * minidlna: Fix incorrect marking for firewall local protection + * zoph, wordpress: Add conflicts on libpam-tmpdir + +=== Other Changes === + + * container: Drop free tag from image URLs + * d/control: Don't recommend libpam-tmpdir + * locale: Update translations for Bulgarian, Chinese (Simplified), Czech, Dutch, German, Turkish, Ukrainian + * package, email: Move conflicting package removal to framework + * snapshot: Fix showing unsupported message on non-btrfs filesystems + * tests: functional: Set timeout to 3 hours + * upgrades: dist-upgrade: Don't change apt security line + * users: tests: Fix privileged tests + * wordpress: Redirect Webfinger queries + == FreedomBox 22.26 (2022-12-05) == === Highlights === diff --git a/doc/manual/es/ReleaseNotes.raw.wiki b/doc/manual/es/ReleaseNotes.raw.wiki index 1b4cc859f..b5f6e8a3c 100644 --- a/doc/manual/es/ReleaseNotes.raw.wiki +++ b/doc/manual/es/ReleaseNotes.raw.wiki @@ -8,6 +8,25 @@ For more technical details, see the [[https://salsa.debian.org/freedombox-team/f The following are the release notes for each !FreedomBox version. +== FreedomBox 22.27 (2022-12-19) == + +=== Highlights === + + * minidlna: Fix incorrect marking for firewall local protection + * zoph, wordpress: Add conflicts on libpam-tmpdir + +=== Other Changes === + + * container: Drop free tag from image URLs + * d/control: Don't recommend libpam-tmpdir + * locale: Update translations for Bulgarian, Chinese (Simplified), Czech, Dutch, German, Turkish, Ukrainian + * package, email: Move conflicting package removal to framework + * snapshot: Fix showing unsupported message on non-btrfs filesystems + * tests: functional: Set timeout to 3 hours + * upgrades: dist-upgrade: Don't change apt security line + * users: tests: Fix privileged tests + * wordpress: Redirect Webfinger queries + == FreedomBox 22.26 (2022-12-05) == === Highlights === From d1fc0d6b78fa2760b1ff7f40b7127604b8a01bc4 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Mon, 19 Dec 2022 21:00:36 -0500 Subject: [PATCH 20/20] Release v22.27 to unstable Signed-off-by: James Valleroy --- debian/changelog | 43 +++++++++++++++++++++++++++++++++++++++++++ plinth/__init__.py | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a1aaf6629..3a936bf51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,46 @@ +freedombox (22.27) unstable; urgency=medium + + [ ikmaak ] + * Translated using Weblate (Dutch) + + [ Burak Yavuz ] + * Translated using Weblate (Turkish) + + [ Eric ] + * Translated using Weblate (Chinese (Simplified)) + + [ Ihor Hordiichuk ] + * Translated using Weblate (Ukrainian) + + [ 109247019824 ] + * Translated using Weblate (Bulgarian) + + [ Johannes Keyser ] + * Translated using Weblate (German) + + [ Jiří Podhorecký ] + * Translated using Weblate (Czech) + + [ Joseph Nuthalapati ] + * container: Drop free tag from image URLs + * tests: functional: Set timeout to 3 hours + + [ Sunil Mohan Adapa ] + * users: tests: Fix privileged tests + * minidlna: Fix incorrect marking for firewall local protection + * snapshot: Fix showing unsupported message on non-btrfs filesystems + * d/control: Don't recommend libpam-tmpdir + * package, email: Move conflicting package removal to framework + * zoph, wordpress: Add conflicts on libpam-tmpdir + + [ James Valleroy ] + * upgrades: dist-upgrade: Don't change apt security line + * wordpress: Redirect Webfinger queries + * locale: Update translation strings + * doc: Fetch latest manual + + -- James Valleroy Mon, 19 Dec 2022 20:59:17 -0500 + freedombox (22.26) unstable; urgency=medium [ Sunil Mohan Adapa ] diff --git a/plinth/__init__.py b/plinth/__init__.py index 1a9afaa47..957f0e485 100644 --- a/plinth/__init__.py +++ b/plinth/__init__.py @@ -3,4 +3,4 @@ Package init file. """ -__version__ = '22.26' +__version__ = '22.27'