Adapt to changed polkit package on Debian

policykit-1 has been renamed to polkitd, with exeception of pkexec
which was spun off. The mapping we have is tracking the presence
of the pkcheck binary, so rename it & fix the mapping for Debian
changes.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

14 files changed, 19 insertions, 18 deletions

diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index 23f4055..7ba39a5 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -1635,6 +1635,12 @@ mappings:
     cross-mingw64-rpm: mingw64-pixman
     cross-policy-default: foreign
 
+  pkcheck:
+    default: polkit
+    deb: polkitd
+    MacOS:
+    Debian11: policykit-1
+
   pkg-config:
     default: pkgconf
     rpm: pkgconfig
@@ -1643,11 +1649,6 @@ mappings:
     cross-mingw64-rpm: mingw64-pkg-config
     cross-policy-rpm: foreign
 
-  polkit:
-    default: polkit
-    deb: policykit-1
-    MacOS:
-
   portablexdr:
     cross-mingw32-rpm: mingw32-portablexdr
     cross-mingw64-rpm: mingw64-portablexdr
diff --git a/tests/data/formatters/out/libvirt-debian-sid-s390x-cross-aarch64-combined.Dockerfile b/tests/data/formatters/out/libvirt-debian-sid-s390x-cross-aarch64-combined.Dockerfile
index 2c45ad8..c039632 100644
--- a/tests/data/formatters/out/libvirt-debian-sid-s390x-cross-aarch64-combined.Dockerfile
+++ b/tests/data/formatters/out/libvirt-debian-sid-s390x-cross-aarch64-combined.Dockerfile
@@ -35,7 +35,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       open-iscsi \
                       perl-base \
                       pkgconf \
-                      policykit-1 \
+                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
diff --git a/tests/data/formatters/out/libvirt-debian-sid-s390x.Dockerfile b/tests/data/formatters/out/libvirt-debian-sid-s390x.Dockerfile
index 950509d..0be4ba4 100644
--- a/tests/data/formatters/out/libvirt-debian-sid-s390x.Dockerfile
+++ b/tests/data/formatters/out/libvirt-debian-sid-s390x.Dockerfile
@@ -68,7 +68,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       open-iscsi \
                       perl-base \
                       pkgconf \
-                      policykit-1 \
+                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
diff --git a/tests/data/formatters/out/libvirt-debian-sid-s390x.json b/tests/data/formatters/out/libvirt-debian-sid-s390x.json
index 4d34e0a..b86e8ab 100644
--- a/tests/data/formatters/out/libvirt-debian-sid-s390x.json
+++ b/tests/data/formatters/out/libvirt-debian-sid-s390x.json
@@ -70,7 +70,7 @@
     "open-iscsi",
     "perl-base",
     "pkgconf",
-    "policykit-1",
+    "polkitd",
     "python3",
     "python3-docutils",
     "python3-pytest",
diff --git a/tests/data/formatters/out/libvirt-debian-sid-s390x.sh b/tests/data/formatters/out/libvirt-debian-sid-s390x.sh
index 86e44b4..4fe94e0 100644
--- a/tests/data/formatters/out/libvirt-debian-sid-s390x.sh
+++ b/tests/data/formatters/out/libvirt-debian-sid-s390x.sh
@@ -66,7 +66,7 @@ function install_buildenv() {
             open-iscsi \
             perl-base \
             pkgconf \
-            policykit-1 \
+            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
diff --git a/tests/data/formatters/out/libvirt-debian-sid-s390x.vars b/tests/data/formatters/out/libvirt-debian-sid-s390x.vars
index b3c11c1..5d6728c 100644
--- a/tests/data/formatters/out/libvirt-debian-sid-s390x.vars
+++ b/tests/data/formatters/out/libvirt-debian-sid-s390x.vars
@@ -5,6 +5,6 @@ MAKE='/usr/bin/make'
 NINJA='/usr/bin/ninja'
 PACKAGING_COMMAND='apt-get'
 PIP3='/usr/bin/pip3'
-PKGS='augeas-lenses augeas-tools bash-completion black ca-certificates ccache clang codespell cpp diffutils dwarves ebtables flake8 gcc gettext git grep iproute2 iptables kmod libacl1-dev libapparmor-dev libattr1-dev libaudit-dev libblkid-dev libc6-dev libcap-ng-dev libcurl4-gnutls-dev libdevmapper-dev libfuse-dev libglib2.0-dev libglusterfs-dev libgnutls28-dev libiscsi-dev libnbd-dev libnl-3-dev libnl-route-3-dev libnuma-dev libparted-dev libpcap0.8-dev libpciaccess-dev librbd-dev libreadline-dev libsanlock-dev libsasl2-dev libselinux1-dev libssh-gcrypt-dev libssh2-1-dev libtirpc-dev libudev-dev libxml2-dev libxml2-utils libyajl-dev locales lvm2 make meson nfs-common ninja-build numad open-iscsi perl-base pkgconf policykit-1 python3 python3-docutils python3-pytest qemu-utils sed systemtap-sdt-dev wireshark-dev xsltproc'
+PKGS='augeas-lenses augeas-tools bash-completion black ca-certificates ccache clang codespell cpp diffutils dwarves ebtables flake8 gcc gettext git grep iproute2 iptables kmod libacl1-dev libapparmor-dev libattr1-dev libaudit-dev libblkid-dev libc6-dev libcap-ng-dev libcurl4-gnutls-dev libdevmapper-dev libfuse-dev libglib2.0-dev libglusterfs-dev libgnutls28-dev libiscsi-dev libnbd-dev libnl-3-dev libnl-route-3-dev libnuma-dev libparted-dev libpcap0.8-dev libpciaccess-dev librbd-dev libreadline-dev libsanlock-dev libsasl2-dev libselinux1-dev libssh-gcrypt-dev libssh2-1-dev libtirpc-dev libudev-dev libxml2-dev libxml2-utils libyajl-dev locales lvm2 make meson nfs-common ninja-build numad open-iscsi perl-base pkgconf polkitd python3 python3-docutils python3-pytest qemu-utils sed systemtap-sdt-dev wireshark-dev xsltproc'
 PYPI_PKGS=''
 PYTHON='/usr/bin/python3'
\ No newline at end of file
diff --git a/tests/data/formatters/out/libvirt-debian-sid-s390x.yaml b/tests/data/formatters/out/libvirt-debian-sid-s390x.yaml
index e1d6aeb..d04feda 100644
--- a/tests/data/formatters/out/libvirt-debian-sid-s390x.yaml
+++ b/tests/data/formatters/out/libvirt-debian-sid-s390x.yaml
@@ -62,7 +62,7 @@ packages:
   - open-iscsi
   - perl-base
   - pkgconf
-  - policykit-1
+  - polkitd
   - python3
   - python3-docutils
   - python3-pytest
diff --git a/tests/data/packages/in/packages.yml b/tests/data/packages/in/packages.yml
index a44ddd0..bb97e52 100644
--- a/tests/data/packages/in/packages.yml
+++ b/tests/data/packages/in/packages.yml
@@ -246,8 +246,8 @@ packages:
 - php
 - php-imagick
 - pixman
+- pkcheck
 - pkg-config
-- polkit
 - portablexdr
 - publican
 - pulseaudio
diff --git a/tests/data/packages/out/debian-12-cross-s390x.yml b/tests/data/packages/out/debian-12-cross-s390x.yml
index c6888be..ee9ae73 100644
--- a/tests/data/packages/out/debian-12-cross-s390x.yml
+++ b/tests/data/packages/out/debian-12-cross-s390x.yml
@@ -242,7 +242,7 @@ native:
 - php-dev
 - php-imagick
 - pkgconf
-- policykit-1
+- polkitd
 - publican
 - python3
 - python3-boto3
diff --git a/tests/data/packages/out/debian-12.yml b/tests/data/packages/out/debian-12.yml
index 8359f07..013ebab 100644
--- a/tests/data/packages/out/debian-12.yml
+++ b/tests/data/packages/out/debian-12.yml
@@ -240,7 +240,7 @@ native:
 - php-dev
 - php-imagick
 - pkgconf
-- policykit-1
+- polkitd
 - publican
 - python3
 - python3-boto3
diff --git a/tests/data/packages/out/debian-sid.yml b/tests/data/packages/out/debian-sid.yml
index 8359f07..013ebab 100644
--- a/tests/data/packages/out/debian-sid.yml
+++ b/tests/data/packages/out/debian-sid.yml
@@ -240,7 +240,7 @@ native:
 - php-dev
 - php-imagick
 - pkgconf
-- policykit-1
+- polkitd
 - publican
 - python3
 - python3-boto3
diff --git a/tests/data/packages/out/ubuntu-2204.yml b/tests/data/packages/out/ubuntu-2204.yml
index 230ab83..0e80133 100644
--- a/tests/data/packages/out/ubuntu-2204.yml
+++ b/tests/data/packages/out/ubuntu-2204.yml
@@ -238,7 +238,7 @@ native:
 - php-dev
 - php-imagick
 - pkgconf
-- policykit-1
+- polkitd
 - publican
 - python3
 - python3-boto3
diff --git a/tests/data/packages/out/ubuntu-2404.yml b/tests/data/packages/out/ubuntu-2404.yml
index 4bbb600..cf25451 100644
--- a/tests/data/packages/out/ubuntu-2404.yml
+++ b/tests/data/packages/out/ubuntu-2404.yml
@@ -240,7 +240,7 @@ native:
 - php-dev
 - php-imagick
 - pkgconf
-- policykit-1
+- polkitd
 - publican
 - python3
 - python3-boto3
diff --git a/tests/data/projects/libvirt.yml b/tests/data/projects/libvirt.yml
index 66c1fb6..ed44309 100644
--- a/tests/data/projects/libvirt.yml
+++ b/tests/data/projects/libvirt.yml
@@ -61,8 +61,8 @@ packages:
   - numad
   - openwsman
   - perl
+  - pkcheck
   - pkg-config
-  - polkit
   - portablexdr
   - python3
   - python3-docutils