From 67fd7475885bf099fc6fa42261e6fd619b494abb Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 15 Jan 2025 14:58:07 -0800 Subject: [PATCH] firewall, networks, storage: Drop polkit pkla files Closes: Debian bug #1093065. These files were only present to serve polkit = 105 in Debian bullseye. Alternate files .rules already being shipped for polkit > 105. Tests: - Install infinoted and enable/disable firewalld. infinoted ports have been enabled/disabled in the firewall as noticed using firewall-cmd. - Creating/deleting network manager connections works well. nmcli shows the updates. - Add backup location page shows list of disks properly. Signed-off-by: Sunil Mohan Adapa Reviewed-by: Veiko Aasa --- .../usr/share/polkit-1/rules.d/50-freedombox-firewalld.rules | 5 ----- .../10-vendor.d/org.freedombox.FirewallD1.pkla | 4 ---- .../polkit-1/rules.d/50-freedombox-network-manager.rules | 5 ----- .../10-vendor.d/org.freedombox.NetworkManager.pkla | 4 ---- .../usr/share/polkit-1/rules.d/50-freedombox-udisks2.rules | 5 ----- .../localauthority/10-vendor.d/org.freedombox.UDisks2.pkla | 4 ---- 6 files changed, 27 deletions(-) delete mode 100644 plinth/modules/firewall/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.FirewallD1.pkla delete mode 100644 plinth/modules/networks/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla delete mode 100644 plinth/modules/storage/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.UDisks2.pkla diff --git a/plinth/modules/firewall/data/usr/share/polkit-1/rules.d/50-freedombox-firewalld.rules b/plinth/modules/firewall/data/usr/share/polkit-1/rules.d/50-freedombox-firewalld.rules index aa0da8b93..6612e90cd 100644 --- a/plinth/modules/firewall/data/usr/share/polkit-1/rules.d/50-freedombox-firewalld.rules +++ b/plinth/modules/firewall/data/usr/share/polkit-1/rules.d/50-freedombox-firewalld.rules @@ -1,10 +1,5 @@ /* # SPDX-License-Identifier: AGPL-3.0-or-later - -This file is used only by policykit-1 version > 0.105. A corresponding .pkla -file is used by policykit-1 <= 0.105. See: -https://davidz25.blogspot.com/2012/06/authorization-rules-in-polkit.html - */ polkit.addRule(function(action, subject) { diff --git a/plinth/modules/firewall/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.FirewallD1.pkla b/plinth/modules/firewall/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.FirewallD1.pkla deleted file mode 100644 index 9fbef974c..000000000 --- a/plinth/modules/firewall/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.FirewallD1.pkla +++ /dev/null @@ -1,4 +0,0 @@ -[Allow FreedomBox to manage firewalld] -Identity=unix-user:plinth -Action=org.fedoraproject.FirewallD1.config.info;org.fedoraproject.FirewallD1.config;org.fedoraproject.FirewallD1.direct.info;org.fedoraproject.FirewallD1.direct; -ResultAny=yes diff --git a/plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-freedombox-network-manager.rules b/plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-freedombox-network-manager.rules index 795cdf81b..b5c3b8867 100644 --- a/plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-freedombox-network-manager.rules +++ b/plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-freedombox-network-manager.rules @@ -1,10 +1,5 @@ /* # SPDX-License-Identifier: AGPL-3.0-or-later - -This file is used only by policykit-1 version > 0.105. A corresponding .pkla -file is used by policykit-1 <= 0.105. See: -https://davidz25.blogspot.com/2012/06/authorization-rules-in-polkit.html - */ polkit.addRule(function(action, subject) { diff --git a/plinth/modules/networks/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla b/plinth/modules/networks/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla deleted file mode 100644 index 5b7071c26..000000000 --- a/plinth/modules/networks/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla +++ /dev/null @@ -1,4 +0,0 @@ -[Allow Plinth to manage NetworkManager connections] -Identity=unix-user:plinth -Action=org.freedesktop.NetworkManager.* -ResultAny=yes diff --git a/plinth/modules/storage/data/usr/share/polkit-1/rules.d/50-freedombox-udisks2.rules b/plinth/modules/storage/data/usr/share/polkit-1/rules.d/50-freedombox-udisks2.rules index 89e521108..5e5adb581 100644 --- a/plinth/modules/storage/data/usr/share/polkit-1/rules.d/50-freedombox-udisks2.rules +++ b/plinth/modules/storage/data/usr/share/polkit-1/rules.d/50-freedombox-udisks2.rules @@ -1,10 +1,5 @@ /* # SPDX-License-Identifier: AGPL-3.0-or-later - -This file is used only by policykit-1 version > 0.105. A corresponding .pkla -file is used by policykit-1 <= 0.105. See: -https://davidz25.blogspot.com/2012/06/authorization-rules-in-polkit.html - */ polkit.addRule(function(action, subject) { diff --git a/plinth/modules/storage/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.UDisks2.pkla b/plinth/modules/storage/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.UDisks2.pkla deleted file mode 100644 index acb5350f5..000000000 --- a/plinth/modules/storage/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.UDisks2.pkla +++ /dev/null @@ -1,4 +0,0 @@ -[Allow FreedomBox to manage UDisks2] -Identity=unix-user:plinth -Action=org.freedesktop.udisks2.filesystem-mount;org.freedesktop.udisks2.filesystem-mount-system;org.freedesktop.udisks2.filesystem-mount-other-seat;org.freedesktop.udisks2.filesystem-fstab -ResultAny=yes