Control: tags 1009395 + patch Control: tags 1009395 + pending Dear maintainer,
I've prepared an NMU for fprintd (versioned as 1.94.2-1.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru fprintd-1.94.2/debian/changelog fprintd-1.94.2/debian/changelog --- fprintd-1.94.2/debian/changelog 2022-02-25 02:44:22.000000000 +0200 +++ fprintd-1.94.2/debian/changelog 2022-05-26 17:08:07.000000000 +0300 @@ -1,3 +1,10 @@ +fprintd (1.94.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream fix for FTBFS with new dbusmock. (Closes: #1009395) + + -- Adrian Bunk <b...@debian.org> Thu, 26 May 2022 17:08:07 +0300 + fprintd (1.94.2-1) unstable; urgency=medium * New upstream release: diff -Nru fprintd-1.94.2/debian/patches/0001-tests-Fix-dbusmock-AddDevice-calls-to-include-option.patch fprintd-1.94.2/debian/patches/0001-tests-Fix-dbusmock-AddDevice-calls-to-include-option.patch --- fprintd-1.94.2/debian/patches/0001-tests-Fix-dbusmock-AddDevice-calls-to-include-option.patch 1970-01-01 02:00:00.000000000 +0200 +++ fprintd-1.94.2/debian/patches/0001-tests-Fix-dbusmock-AddDevice-calls-to-include-option.patch 2022-05-26 17:08:07.000000000 +0300 @@ -0,0 +1,66 @@ +From ae04fa989720279e5558c3b8ff9ebe1959b1cf36 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg <bb...@redhat.com> +Date: Tue, 3 May 2022 12:01:37 +0200 +Subject: tests: Fix dbusmock AddDevice calls to include optional argument + +The dbusmock code checks that all parameters wanted by the dbus +signature are given. As such, pass them, even though the parameters is +optional on the python side. +--- + tests/pam/test_pam_fprintd.py | 8 ++++---- + tests/test_fprintd_utils.py | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tests/pam/test_pam_fprintd.py b/tests/pam/test_pam_fprintd.py +index 99f8259..bd43497 100644 +--- a/tests/pam/test_pam_fprintd.py ++++ b/tests/pam/test_pam_fprintd.py +@@ -82,7 +82,7 @@ class TestPamFprintd(dbusmock.DBusTestCase): + self.p_mock.wait() + + def setup_device(self): +- device_path = self.obj_fprintd_mock.AddDevice('FDO Trigger Finger Laser Reader', 3, 'swipe') ++ device_path = self.obj_fprintd_mock.AddDevice('FDO Trigger Finger Laser Reader', 3, 'swipe', False) + self.device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path) + self.device_mock.SetEnrolledFingers('toto', ['left-little-finger', 'right-little-finger']) + +@@ -232,7 +232,7 @@ class TestPamFprintd(dbusmock.DBusTestCase): + self.assertRegex(res.errors[0], r'Failed to match fingerprint') + + def test_pam_fprintd_dual_reader_auth(self): +- device_path = self.obj_fprintd_mock.AddDevice('FDO Sandpaper Reader', 3, 'press') ++ device_path = self.obj_fprintd_mock.AddDevice('FDO Sandpaper Reader', 3, 'press', False) + sandpaper_device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path) + sandpaper_device_mock.SetEnrolledFingers('toto', ['left-middle-finger', 'right-middle-finger']) + script = [ +@@ -251,12 +251,12 @@ class TestPamFprintd(dbusmock.DBusTestCase): + + def test_pam_fprintd_multi_reader_not_all_enrolled(self): + # Add a 1st device with actual enrolled prints +- device_path = self.obj_fprintd_mock.AddDevice('FDO Empty reader', 3, 'press') ++ device_path = self.obj_fprintd_mock.AddDevice('FDO Empty reader', 3, 'press', False) + empty_reader = self.dbus_con.get_object('net.reactivated.Fprint', device_path) + empty_reader.SetEnrolledFingers('toto', dbus.Array(set([]), signature='s')) + + # Add a 2nd device with actual enrolled prints +- device_path = self.obj_fprintd_mock.AddDevice('FDO Most Used Reader', 3, 'press') ++ device_path = self.obj_fprintd_mock.AddDevice('FDO Most Used Reader', 3, 'press', False) + sandpaper_device_mock = self.dbus_con.get_object('net.reactivated.Fprint', device_path) + sandpaper_device_mock.SetEnrolledFingers('toto', ['left-middle-finger', 'right-middle-finger']) + script = [ +diff --git a/tests/test_fprintd_utils.py b/tests/test_fprintd_utils.py +index f10d4b0..efa5893 100755 +--- a/tests/test_fprintd_utils.py ++++ b/tests/test_fprintd_utils.py +@@ -88,7 +88,7 @@ class TestFprintdUtilsBase(dbusmock.DBusTestCase): + + def setup_device(self): + self.device_path = self.obj_fprintd_mock.AddDevice( +- 'FDO Trigger Finger Laser Reader', 3, 'swipe') ++ 'FDO Trigger Finger Laser Reader', 3, 'swipe', False) + self.device_mock = self.dbus_con.get_object('net.reactivated.Fprint', + self.device_path) + self.set_enrolled_fingers(['left-little-finger', 'right-little-finger']) +-- +2.20.1 + diff -Nru fprintd-1.94.2/debian/patches/series fprintd-1.94.2/debian/patches/series --- fprintd-1.94.2/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ fprintd-1.94.2/debian/patches/series 2022-05-26 17:08:07.000000000 +0300 @@ -0,0 +1 @@ +0001-tests-Fix-dbusmock-AddDevice-calls-to-include-option.patch