gentoo auto-resync : 17:09:2022 - 23:18:12

4 files changed, 71 insertions, 1 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 3805fc6807ab..8663d4bee6ee 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 6036034a404a..81695a1836d7 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -2,8 +2,9 @@ AUX fprintd-0.8.1-fno-common.patch 1053 BLAKE2B a1cec2d6317ac0bffd131bf305c5ad0b
 AUX fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch 2426 BLAKE2B 838b56e110fdf670816fb59e7ad30b908c54b8ee1cbbe4fda0334ac068265c8cdcb7e48200796b0872718099dea918554641dc02670e32e5f9369f7cc05fb95b SHA512 553e6baa7d1a90971627e3e1303488734596f83fea4413d2a4ce2688f003cded95182b652622f758f4e347b54a1294837a2014a9e36badc25e8b254947a54736
 AUX fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch 1144 BLAKE2B f417baf7a6d686a753381501ef2e6df6bc867c4a938d47b70def205b92a3ea20adb2ab55a1ff26d921ef433d846c150bb24d9a4102a39e61c2e424b53effe66e SHA512 4a234200e9a03ba3acb710857a64d35d84a4b954d9289a8fc400355dd27cc8cdf5da6d2dc11e60add57aae04e93e4c890b8a75e4984516fad14f9236acf0f699
 AUX fprintd-1.94.1-fix-meson-0.61-build.patch 4544 BLAKE2B 321971f95833db2d6957ccee1f67907e8590d91da24d684bda7ca95b50028e721b28e887a90b101c311813df0d7ca4870f12801ae91e280f00b2567c7fddc874 SHA512 73836daf2366f47bd2c69d6d50a70150778cedf04d946123be72c73f976fcd674173b0f349d9df197d06afec5190c742e8b0726380215e3dc95dcba1a49f33bf
+AUX tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch 3749 BLAKE2B d5253703954ecdb0fdb2889dd4f1dc5f5d8e32c4bb29abd22351f6c52cb0261c3bedac8b1b5c5a9c63fb097b1429067f7e56b2e7f2e196fbf8546cc09cac6c00 SHA512 79f366ada055b9348ec620646e0ec91a7c960585e0087920f0b56b9d6466613a43ed8f80b3842a56f2b626e903ed0e1db9bdc219bb7bfbb86a898b86761180aa
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
 DIST fprintd-v1.94.1.tar.bz2 658149 BLAKE2B 734da268e308b08b04cbc661d889f52c4e8b2dd61d7a67961eaba5a6aa130f6972525820a17e8b6dd53d38508629139a5a0be20b69eaea45430cc60da5cd9a27 SHA512 ff22087e09ab9f75e458e71f595d611ea97240596a25bd96f41a0fb1de865336f8c2edbd49d5e7c8132a7e554d8311337ec02991dde358cba1962d4cb182447d
 EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c5223ada65faf93dc543faaed2a1916e85441f4f27d67c1f46e797d9fb6a09ee16596f94052a689fc3f5f7d107d37ea SHA512 0c02ceca9be196fb9d9f92b8929a64a96b34fa4c6e40c73931aa5ab61a8979f543729f7f9d43e5ca33afe2cfc1c4d6ea00774ff2cd5fb67ba4673a70bb1e4d1c
-EBUILD fprintd-1.94.1.ebuild 2234 BLAKE2B c08486660d81a22b4c3230e2bc3b2486288089413724c4121cddbba5344dacb9a7ba3401063d732ef4c7fd4e716746c10bcb6a483b0a9ac6401ef506a19c4d94 SHA512 c14aa3ba9d14393c136fcc63420b250c1c2fb69d933e956049aa555ae3bb63a74aa8acbd6ffeeea24695a049156412f27e8b57f778f1644ea5898a2bd46af0fa
+EBUILD fprintd-1.94.1.ebuild 2313 BLAKE2B 127a6cb98108cd69ac7f50cb73a08d895c056b06483cfe4b4b445b4960eb24a730d52666d6414e36a1c91ae3b25af869d81d8c90d8084820130618a20913811e SHA512 aaa66e4ecfdf81346700201de933a9e4e3c24e42885e4375668ccd00d08666ab05c44caede568e1bce367ddead608e034a85a34c70bd110a7b6998b89ce398fc
 MISC metadata.xml 270 BLAKE2B 0f6d61908167c717898b4ba7602bf3b429736afea65a4367231066bb481a2923d25760b31741774b37727f3dcf41ea748340899e7b4a865901036d9bdf52cf0e SHA512 f93613d657594e747e743541df6df87ef7152ccf381f343bc30ac55966bc7ea212697e350d454ddc2f7c91d9485aace053084a668a69a20d6ee74340cbfe1f25
diff --git a/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch b/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch
new file mode 100644
index 000000000000..409c18ea0d7b
--- /dev/null
+++ b/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch
@@ -0,0 +1,68 @@
+https://bugs.launchpad.net/ubuntu/+source/fprintd/+bug/1976256
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009395
+https://salsa.debian.org/debian/fprintd/-/blob/debian/debian/patches/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch
+
+From: Benjamin Berg <bberg@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.
+
+Origin: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa98
+---
+ 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'])
diff --git a/sys-auth/fprintd/fprintd-1.94.1.ebuild b/sys-auth/fprintd/fprintd-1.94.1.ebuild
index af41129c2d67..cca15ee2f37a 100644
--- a/sys-auth/fprintd/fprintd-1.94.1.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.90.7_0001-add-test-feature-and-make-tests-optional.patch"
 	"${FILESDIR}/${PN}-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch"
 	"${FILESDIR}/${P}-fix-meson-0.61-build.patch"
+	"${FILESDIR}/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch"
 )
 
 S="${WORKDIR}/${MY_P}"