commit: 81e0fd6e0dab9eb50b1236985c2eedd6dd4a57a5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jun 3 05:31:11 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 3 05:31:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e0fd6e
sys-auth/fprintd: drop 1.94.1 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-auth/fprintd/Manifest | 1 - .../fprintd-1.94.1-fix-meson-0.61-build.patch | 121 --------------------- ...ck-AddDevice-calls-to-include-optional-ar.patch | 68 ------------ sys-auth/fprintd/fprintd-1.94.1.ebuild | 98 ----------------- 4 files changed, 288 deletions(-) diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest index be1f143b213a..151bfb56ca35 100644 --- a/sys-auth/fprintd/Manifest +++ b/sys-auth/fprintd/Manifest @@ -1,2 +1 @@ -DIST fprintd-v1.94.1.tar.bz2 658149 BLAKE2B 734da268e308b08b04cbc661d889f52c4e8b2dd61d7a67961eaba5a6aa130f6972525820a17e8b6dd53d38508629139a5a0be20b69eaea45430cc60da5cd9a27 SHA512 ff22087e09ab9f75e458e71f595d611ea97240596a25bd96f41a0fb1de865336f8c2edbd49d5e7c8132a7e554d8311337ec02991dde358cba1962d4cb182447d DIST fprintd-v1.94.2.tar.bz2 657989 BLAKE2B 5855ab453ae6d73e08c60c699a95609262fd121ab020f9ffeafb8d1891a60f761f47e4acd11554179b6d9cbed8a734aafb012a4b6de3e9ad67d4160534a0e6c6 SHA512 0b5ebc595b617fbe9167c41a80e31ae74e7bdc87350b0420839e1a6229d7709e51ff2836858c46d8d30549a1f0811b0f697034fcdd09512b5c1099f0f0a3b112 diff --git a/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch b/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch deleted file mode 100644 index e7f78320d1b9..000000000000 --- a/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch +++ /dev/null @@ -1,121 +0,0 @@ -https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch -https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch -https://bugs.gentoo.org/831753 - -From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwa...@archlinux.org> -Date: Tue, 11 Jan 2022 21:06:35 -0500 -Subject: [PATCH] use more idiomatic/correct embedded shell scripting - -Formatting arguments into code is fragile, and meson natively knows how -to pass files as arguments via argv. So pass them as arguments to the -shell. ---- - doc/dbus/meson.build | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build -index 802938e..861da64 100644 ---- a/doc/dbus/meson.build -+++ b/doc/dbus/meson.build -@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files - capture: true, - command: [ - bash, '-c', -- 'cat @INPUT@;' + -- xsltproc.path() + ' @0@/@1@ '.format( -- meson.source_root(), -- files('spec-to-docbook.xsl')[0]) + -- interface_file.full_path() + '| tail -n +2;', -+ 'cat "$1"; "$2" "$3" "$4" | tail -n +2', -+ '_', # argv0 ignored -+ '@INPUT@', -+ xsltproc, files('spec-to-docbook.xsl')[0], interface_file - ], - ) - endforeach --- -GitLab - -From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwa...@archlinux.org> -Date: Tue, 11 Jan 2022 20:46:29 -0500 -Subject: [PATCH] remove pointless copying of files into build directory - -I'm not entirely sure what this did, but it seems to be obsoleted by -commit 93bad825406d13ed5eb2cf27541dc58194bef8f3. ---- - doc/dbus/meson.build | 6 +++--- - src/meson.build | 20 ++++++------------- - ....xml => net.reactivated.Fprint.Device.xml} | 0 - ...xml => net.reactivated.Fprint.Manager.xml} | 0 - 4 files changed, 9 insertions(+), 17 deletions(-) - rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%) - rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%) - -diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build -index 861da64..431127d 100644 ---- a/doc/dbus/meson.build -+++ b/doc/dbus/meson.build -@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header', - ) - - dbus_interfaces_refs = [] --foreach interface_file: dbus_interfaces_files -- basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip() -+foreach interface_file: dbus_interfaces -+ basename = run_command('basename', interface_file, '.xml').stdout().strip() - dbus_interfaces_refs += custom_target(basename + '_ref', - input: docbook_xml_header, - output: basename + '.ref.xml', - build_by_default: true, -- depends: interface_file, -+ depend_files: interface_file, - capture: true, - command: [ - bash, '-c', -diff --git a/src/meson.build b/src/meson.build -index 1df6216..a7ce3fe 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,22 +1,14 @@ - bash = find_program('bash') --dbus_interfaces = ['Manager', 'Device'] --dbus_interfaces_files = [] -+dbus_interfaces = files( -+ 'net.reactivated.Fprint.Manager.xml', -+ 'net.reactivated.Fprint.Device.xml', -+) - --foreach interface_name: dbus_interfaces -- interface = interface_name.to_lower() -- interface_file = interface + '.xml' -- dbus_interfaces_files += custom_target('dbus_interface_' + interface, -- input: interface_file, -- output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name), -- command: ['cp', '@INPUT@', '@OUTPUT@'], -- install: true, -- install_dir: dbus_interfaces_dir, -- ) --endforeach -+install_data(dbus_interfaces, install_dir: dbus_interfaces_dir) - - # NOTE: We should pass "--glib-min-required 2.64" but cannot - fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus', -- sources: dbus_interfaces_files, -+ sources: dbus_interfaces, - autocleanup: 'all', - interface_prefix: 'net.reactivated.Fprint.', - namespace: 'FprintDBus', -diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml -similarity index 100% -rename from src/device.xml -rename to src/net.reactivated.Fprint.Device.xml -diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml -similarity index 100% -rename from src/manager.xml -rename to src/net.reactivated.Fprint.Manager.xml --- -GitLab - - 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 deleted file mode 100644 index 409c18ea0d7b..000000000000 --- a/sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch +++ /dev/null @@ -1,68 +0,0 @@ -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 <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. - -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 deleted file mode 100644 index 726954ce8249..000000000000 --- a/sys-auth/fprintd/fprintd-1.94.1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit meson pam python-any-r1 systemd - -MY_P="${PN}-v${PV}" -DESCRIPTION="D-Bus service to access fingerprint readers" -HOMEPAGE="https://gitlab.freedesktop.org/libfprint/fprintd"; -SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2"; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" -IUSE="doc pam systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - >=sys-auth/libfprint-1.94.0:2 - sys-auth/polkit - pam? ( - sys-libs/pam - systemd? ( sys-apps/systemd ) - !systemd? ( sys-auth/elogind ) - )" - -DEPEND=" - ${RDEPEND} - test? ( - $(python_gen_any_dep ' - dev-python/python-dbusmock[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - pam? ( sys-libs/pam_wrapper[${PYTHON_USEDEP}] ) - ') - )" - -BDEPEND=" - dev-lang/perl - dev-util/gdbus-codegen - virtual/pkgconfig - doc? ( - dev-libs/libxml2 - dev-libs/libxslt - dev-util/gtk-doc - )" - -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}" - -python_check_deps() { - if use test; then - has_version -d "sys-libs/pam_wrapper[${PYTHON_USEDEP}]" - fi - - has_version -d "dev-python/python-dbusmock[${PYTHON_USEDEP}]" && - has_version -d "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version -d "dev-python/pycairo[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_configure() { - local emesonargs=( - $(meson_feature test) - $(meson_use pam) - -Dgtk_doc=$(usex doc true false) - -Dman=true - -Dsystemd_system_unit_dir=$(systemd_get_systemunitdir) - -Dpam_modules_dir=$(getpam_mod_dir) - -Dlibsystemd=$(usex systemd libsystemd libelogind) - ) - meson_src_configure -} - -src_install() { - meson_src_install - - dodoc AUTHORS NEWS README TODO - newdoc pam/README README.pam_fprintd -} - -pkg_postinst() { - elog "Please take a look at README.pam_fprintd for integration docs." -}
