[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 2 commits: libvirt-daemon-system: Depend on polkitd instead of policykit-1

[Andrea Bolognani (@abologna)]

Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt


Commits:
b9b2923a by Andrea Bolognani at 2023-01-03T23:33:47+00:00
libvirt-daemon-system: Depend on polkitd instead of policykit-1

The polkit package has been made more modular, and libvirt only
needs the daemon part.

Note that we explicitly ask for support for the legacy pkla
format to be present because, while Debian now contains a version
of polkit recent enough to support the JavaScript-based rules
that upstream includes, Ubuntu still doesn't.

We also don't include a fallback dependency on policykit-1
because, with Debian 12 just a few months away, backports to
Debian 11 don't seem like something that we should concern
ourselves with. Ubuntu 22.04, which we still consider a valid
backport target, implements the polkit package split.

Closes: #1025578

- - - - -
c62b8b27 by Andrea Bolognani at 2023-01-03T23:33:47+00:00
libvirt-daemon-system: Drop polkit rules in legacy pkla format

The version of polkit that is going to be in Debian 12 supports
JavaScript rules, so we no longer need to carry around our
downstream-only rule.

Ubuntu only supports pkla rules still, so they'll need to revert
this change in order to keep things working.

- - - - -


4 changed files:

- debian/control
- debian/libvirt-daemon-system.install
- − debian/polkit/60-libvirt.pkla
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -356,7 +356,7 @@ Depends:
  libvirt-daemon-config-nwfilter (= ${source:Version}),
  libvirt-daemon-system-systemd (= ${source:Version}) | libvirt-daemon-system-sysv (= ${source:Version}),
  logrotate,
- policykit-1 [linux-any],
+ polkitd (>= 121+compat0.1-2) [linux-any],
  ${misc:Depends},
 Recommends:
  dmidecode,


=====================================
debian/libvirt-daemon-system.install
=====================================
@@ -16,4 +16,3 @@ usr/lib/firewalld/zones/libvirt.xml
 usr/share/polkit-1/actions/org.libvirt.api.policy
 usr/share/polkit-1/actions/org.libvirt.unix.policy
 usr/share/polkit-1/rules.d/60-libvirt.rules
-var/lib/polkit-1/localauthority/10-vendor.d/60-libvirt.pkla


=====================================
debian/polkit/60-libvirt.pkla deleted
=====================================
@@ -1,6 +0,0 @@
-[Allow group libvirt management permissions]
-Identity=unix-group:libvirt
-Action=org.libvirt.unix.manage
-ResultAny=yes
-ResultInactive=yes
-ResultActive=yes


=====================================
debian/rules
=====================================
@@ -229,14 +229,8 @@ execute_after_dh_auto_install:
 	cp NEWS.rst \
 	   $(DEB_DESTDIR)/usr/share/doc/libvirt/NEWS
 
-	# Add our backward compat polkit rule
-	mkdir -p $(DEB_DESTDIR)/var/lib/polkit-1/localauthority/10-vendor.d/
-	cp debian/polkit/60-libvirt.pkla \
-	   $(DEB_DESTDIR)/var/lib/polkit-1/localauthority/10-vendor.d/
-
 	# Rename the upstream polkit rule so that it matches the name used
-	# historically in Debian, as well as that of the backwards compat
-	# rules we just installed
+	# historically in Debian
 	mv $(DEB_DESTDIR)/usr/share/polkit-1/rules.d/50-libvirt.rules \
 	   $(DEB_DESTDIR)/usr/share/polkit-1/rules.d/60-libvirt.rules
 



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/91d9ac0ebd74c7e29b9dd3d234cc218a61aca172...c62b8b27161bf69d6a8a47131450de3f81b1fe9d

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/91d9ac0ebd74c7e29b9dd3d234cc218a61aca172...c62b8b27161bf69d6a8a47131450de3f81b1fe9d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20230104/febd5122/attachment-0001.htm>