diff options
Diffstat (limited to 'sys-auth/fprintd')
| -rw-r--r-- | sys-auth/fprintd/Manifest | 7 | ||||
| -rw-r--r-- | sys-auth/fprintd/files/fprintd-0.8.1-fno-common.patch | 44 | ||||
| -rw-r--r-- | sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch | 121 | ||||
| -rw-r--r-- | sys-auth/fprintd/files/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch | 68 | ||||
| -rw-r--r-- | sys-auth/fprintd/fprintd-0.8.1-r3.ebuild | 74 | ||||
| -rw-r--r-- | sys-auth/fprintd/fprintd-1.90.8.ebuild | 76 | ||||
| -rw-r--r-- | sys-auth/fprintd/fprintd-1.90.9.ebuild | 76 | ||||
| -rw-r--r-- | sys-auth/fprintd/fprintd-1.94.1.ebuild (renamed from sys-auth/fprintd/fprintd-1.94.0.ebuild) | 11 | ||||
| -rw-r--r-- | sys-auth/fprintd/fprintd-1.94.2.ebuild (renamed from sys-auth/fprintd/fprintd-1.92.0.ebuild) | 49 | ||||
| -rw-r--r-- | sys-auth/fprintd/metadata.xml | 1 |
10 files changed, 226 insertions, 301 deletions
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest index 9360412d9a69..be1f143b213a 100644 --- a/sys-auth/fprintd/Manifest +++ b/sys-auth/fprintd/Manifest @@ -1,5 +1,2 @@ -DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252 -DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489 -DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f -DIST fprintd-v1.92.0.tar.bz2 651377 BLAKE2B 39db660e3203b08c1233b9711f56c5b4539f1dff4f8cd9554dce4ce055e2fd2a63dc5e8792808232f86906bf1b7d15a7f155e67ddd49a98ff92ac75b4bd712f4 SHA512 e3fcf948321bf82398f06cca33cb29745c7fc38421025c9340dc85ba2ffb87e63f9546aae721ae72ad0c6f4268a856d60cd57089238d5c92e14b31de215f17d1 -DIST fprintd-v1.94.0.tar.bz2 656308 BLAKE2B f64f92af51f2d3eda059640cdfa88b26ca12326b3082e9489f6d807ec566aced86e1d19a59ad247ec2aaa6e6a90dd3d030c18e062e39143a1d4110e62e7ad03d SHA512 1ab8cf93d10317201c3f83880b9e6de4a391c2a12afe29725ae3556a7b0108a374eb96f6b2b5be69c01c386f62e3543e3f9a974867256c99e690dd19bdd5778d +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-0.8.1-fno-common.patch b/sys-auth/fprintd/files/fprintd-0.8.1-fno-common.patch deleted file mode 100644 index ba4574fce60d..000000000000 --- a/sys-auth/fprintd/files/fprintd-0.8.1-fno-common.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/src/device.c -+++ b/src/device.c -@@ -47,6 +47,7 @@ static char *fingers[] = { - "right-little-finger" - }; - -+extern struct storage store; - extern DBusGConnection *fprintd_dbus_conn; - - static void fprint_device_claim(FprintDevice *rdev, ---- a/src/file_storage.c -+++ b/src/file_storage.c -@@ -44,6 +44,7 @@ - #define FP_FINGER_IS_VALID(finger) \ - ((finger) >= LEFT_THUMB && (finger) <= RIGHT_LITTLE) - -+extern struct storage store; - static char *get_path_to_storedir(uint16_t driver_id, uint32_t devtype, char *base_store) - { - char idstr[5]; ---- a/src/main.c -+++ b/src/main.c -@@ -34,6 +34,7 @@ - #include "storage.h" - #include "file_storage.h" - -+struct storage store; - extern DBusGConnection *fprintd_dbus_conn; - static gboolean no_timeout = FALSE; - static gboolean g_fatal_warnings = FALSE; ---- a/src/storage.h -+++ b/src/storage.h -@@ -41,10 +41,7 @@ struct storage { - storage_discover_prints discover_prints; - }; - --typedef struct storage fp_storage; -- --/* The currently setup store */ --fp_storage store; -+extern struct storage store; - - #endif - 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 new file mode 100644 index 000000000000..e7f78320d1b9 --- /dev/null +++ b/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch @@ -0,0 +1,121 @@ +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 <eschwartz@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 <eschwartz@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 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-0.8.1-r3.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild deleted file mode 100644 index cd5fba5f403f..000000000000 --- a/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools pam systemd - -DESCRIPTION="D-Bus service to access fingerprint readers" -HOMEPAGE="https://cgit.freedesktop.org/libfprint/fprintd/" -MY_PV="V_$(ver_rs 0- _)" -SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" -IUSE="doc pam" - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - sys-auth/libfprint:0 - sys-auth/polkit - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/dbus-glib - dev-util/gtk-doc - dev-util/gtk-doc-am - dev-util/intltool - doc? ( - dev-libs/libxml2 - dev-libs/libxslt - )" - -S="${WORKDIR}"/${MY_PV} - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) - -src_prepare() { - default - - sed -i 's#@localstatedir@/lib/fprint#@localstatedir@/fprint#g' data/fprintd.service.in || die "sed failed" - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable pam) \ - $(use_enable doc gtk-doc-html) \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" -} - -src_install() { - emake DESTDIR="${D}" install \ - pammoddir=$(getpam_mod_dir) - - keepdir /var/lib/fprint - - find "${ED}" -name '*.la' -delete || die - - dodoc AUTHORS NEWS README{,.transifex} TODO - newdoc pam/README README.pam_fprintd - if use doc ; then - docinto html - dodoc doc/{fprintd-docs,version}.xml - docinto html/dbus - dodoc doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml - fi -} - -pkg_postinst() { - elog "Please take a look at README.pam_fprintd for integration docs." -} diff --git a/sys-auth/fprintd/fprintd-1.90.8.ebuild b/sys-auth/fprintd/fprintd-1.90.8.ebuild deleted file mode 100644 index 6ff76f434904..000000000000 --- a/sys-auth/fprintd/fprintd-1.90.8.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson pam systemd - -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}/${PN}-v${PV}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ia64 x86" -IUSE="doc pam systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - sys-auth/libfprint:2 - sys-auth/polkit - pam? ( - systemd? ( sys-apps/systemd ) - !systemd? ( sys-auth/elogind ) - sys-libs/pam - ) -" -DEPEND="${RDEPEND}" - -BDEPEND=" - dev-lang/perl - doc? ( - dev-libs/libxml2 - dev-libs/libxslt - dev-util/gtk-doc - ) - test? ( - dev-python/python-dbusmock - dev-python/dbus-python - dev-python/pycairo - pam? ( sys-libs/pam_wrapper ) - ) - virtual/pkgconfig -" - -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" -) - -S="${WORKDIR}/${PN}-v${PV}" - -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." -} diff --git a/sys-auth/fprintd/fprintd-1.90.9.ebuild b/sys-auth/fprintd/fprintd-1.90.9.ebuild deleted file mode 100644 index b9ae19a9a316..000000000000 --- a/sys-auth/fprintd/fprintd-1.90.9.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson pam systemd - -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}/${PN}-v${PV}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86" -IUSE="doc pam systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - sys-auth/libfprint:2 - sys-auth/polkit - pam? ( - systemd? ( sys-apps/systemd ) - !systemd? ( sys-auth/elogind ) - sys-libs/pam - ) -" -DEPEND="${RDEPEND}" - -BDEPEND=" - dev-lang/perl - doc? ( - dev-libs/libxml2 - dev-libs/libxslt - dev-util/gtk-doc - ) - test? ( - dev-python/python-dbusmock - dev-python/dbus-python - dev-python/pycairo - pam? ( sys-libs/pam_wrapper ) - ) - virtual/pkgconfig -" - -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" -) - -S="${WORKDIR}/${PN}-v${PV}" - -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." -} diff --git a/sys-auth/fprintd/fprintd-1.94.0.ebuild b/sys-auth/fprintd/fprintd-1.94.1.ebuild index d3f73d28d4f4..726954ce8249 100644 --- a/sys-auth/fprintd/fprintd-1.94.0.ebuild +++ b/sys-auth/fprintd/fprintd-1.94.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit meson pam python-any-r1 systemd @@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P} LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="doc pam systemd test" RESTRICT="!test? ( test )" @@ -42,6 +42,7 @@ DEPEND=" BDEPEND=" dev-lang/perl + dev-util/gdbus-codegen virtual/pkgconfig doc? ( dev-libs/libxml2 @@ -52,6 +53,8 @@ BDEPEND=" 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}" diff --git a/sys-auth/fprintd/fprintd-1.92.0.ebuild b/sys-auth/fprintd/fprintd-1.94.2.ebuild index cdabc2ee675b..452126569d70 100644 --- a/sys-auth/fprintd/fprintd-1.92.0.ebuild +++ b/sys-auth/fprintd/fprintd-1.94.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit meson pam python-any-r1 systemd @@ -15,21 +15,21 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P} LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc ~x86" -IUSE="doc pam systemd test" - +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +IUSE="doc pam selinux systemd test" RESTRICT="!test? ( test )" RDEPEND=" dev-libs/dbus-glib dev-libs/glib:2 - sys-auth/libfprint:2 + >=sys-auth/libfprint-1.94.0:2 sys-auth/polkit pam? ( sys-libs/pam - systemd? ( sys-apps/systemd ) - !systemd? ( sys-auth/elogind ) - )" + systemd? ( sys-apps/systemd:= ) + !systemd? ( sys-auth/elogind:= ) + ) +" DEPEND=" ${RDEPEND} @@ -40,16 +40,21 @@ DEPEND=" 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 - )" + ) +" + +RDEPEND+=" selinux? ( sec-policy/selinux-fprintd )" PATCHES=( "${FILESDIR}/${PN}-1.90.7_0001-add-test-feature-and-make-tests-optional.patch" @@ -73,16 +78,16 @@ 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 + 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() { diff --git a/sys-auth/fprintd/metadata.xml b/sys-auth/fprintd/metadata.xml index 2dd1dd51ecd7..6f3cd5046e3e 100644 --- a/sys-auth/fprintd/metadata.xml +++ b/sys-auth/fprintd/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> + <remote-id type="freedesktop-gitlab">libfprint/fprintd</remote-id> <bugs-to>https://gitlab.freedesktop.org/libfprint/fprintd/issues</bugs-to> </upstream> </pkgmetadata> |