* [gentoo-commits] repo/gentoo:master commit in: sys-auth/fprintd/files/, sys-auth/fprintd/
@ 2021-01-12 9:37 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2021-01-12 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 989f5747c6845c252e893686086f4452df94d9c5
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Tue Jan 12 09:36:53 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 09:36:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=989f5747
sys-auth/fprintd: Fix build with gcc-10
* Disable static-libs
Closes: https://github.com/gentoo/gentoo/pull/18965
Closes: https://bugs.gentoo.org/764077
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../fprintd/files/fprintd-0.8.1-fno-common.patch | 44 ++++++++++++++++++++++
sys-auth/fprintd/fprintd-0.8.1-r3.ebuild | 21 ++++++-----
2 files changed, 56 insertions(+), 9 deletions(-)
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
new file mode 100644
index 00000000000..ba4574fce60
--- /dev/null
+++ b/sys-auth/fprintd/files/fprintd-0.8.1-fno-common.patch
@@ -0,0 +1,44 @@
+--- 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/fprintd-0.8.1-r3.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
index 897c45965ff..42c82b1510e 100644
--- a/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
+++ b/sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,25 +13,28 @@ SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc pam static-libs"
+IUSE="doc pam"
RDEPEND="
dev-libs/dbus-glib
dev-libs/glib:2
sys-auth/libfprint:0
sys-auth/polkit
- pam? ( sys-libs/pam )
-"
+ 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 )
-"
+ doc? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ )"
-S=${WORKDIR}/${MY_PV}
+S="${WORKDIR}"/${MY_PV}
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_prepare() {
default
@@ -42,8 +45,8 @@ src_prepare() {
src_configure() {
econf \
+ --disable-static \
$(use_enable pam) \
- $(use_enable static-libs static) \
$(use_enable doc gtk-doc-html) \
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
}
@@ -54,7 +57,7 @@ src_install() {
keepdir /var/lib/fprint
- find "${ED}" -type f -name "*.la" -delete || die
+ find "${ED}" -name '*.la' -delete || die
dodoc AUTHORS NEWS README{,.transifex} TODO
newdoc pam/README README.pam_fprintd
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-auth/fprintd/files/, sys-auth/fprintd/
@ 2024-06-03 5:53 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-06-03 5:53 UTC (permalink / raw
To: gentoo-commits
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 <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
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 <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
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."
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-auth/fprintd/files/, sys-auth/fprintd/
@ 2022-09-17 18:24 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-09-17 18:24 UTC (permalink / raw
To: gentoo-commits
commit: eec9cbb0fb0073fd1c407f98e5307ff3bfcf01c9
Author: matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Sep 17 17:56:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 18:24:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec9cbb0
sys-auth/fprintd: fix tests
No revbump since this affects tests only.
See: https://bugs.launchpad.net/ubuntu/+source/fprintd/+bug/1976256
See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009395
See: https://salsa.debian.org/debian/fprintd/-/blob/debian/debian/patches/tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch
See: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa98
Bug: https://bugs.gentoo.org/764554
Closes: https://github.com/gentoo/gentoo/pull/27309
Signed-off-by: Sam James <sam <AT> gentoo.org>
...ck-AddDevice-calls-to-include-optional-ar.patch | 68 ++++++++++++++++++++++
sys-auth/fprintd/fprintd-1.94.1.ebuild | 1 +
2 files changed, 69 insertions(+)
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}"
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-auth/fprintd/files/, sys-auth/fprintd/
@ 2022-01-21 17:11 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-01-21 17:11 UTC (permalink / raw
To: gentoo-commits
commit: a7920d91042220f86a5673fa5aab3028024d8f01
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 17:11:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 17:11:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7920d91
sys-auth/fprintd: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831753
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../fprintd-1.94.1-fix-meson-0.61-build.patch | 121 +++++++++++++++++++++
sys-auth/fprintd/fprintd-1.94.1.ebuild | 1 +
2 files changed, 122 insertions(+)
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/fprintd-1.94.1.ebuild b/sys-auth/fprintd/fprintd-1.94.1.ebuild
index 8a0c86a78391..1cf6326d13f2 100644
--- a/sys-auth/fprintd/fprintd-1.94.1.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.1.ebuild
@@ -53,6 +53,7 @@ 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"
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-auth/fprintd/files/, sys-auth/fprintd/
@ 2021-01-08 17:09 Matthew Thode
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Thode @ 2021-01-08 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 7c1b363ca1aecbe5c0c878d5d6583d869b01d073
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 8 17:09:07 2021 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 17:09:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c1b363c
sys-auth/fprintd: 1.90.8 bump
tested locally, seems fine
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
sys-auth/fprintd/Manifest | 1 +
...-add-test-feature-and-make-tests-optional.patch | 75 +++++++++++++++++++++
...-configure-option-for-libsystemd-provider.patch | 24 +++++++
sys-auth/fprintd/fprintd-1.90.8.ebuild | 76 ++++++++++++++++++++++
4 files changed, 176 insertions(+)
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index c0a22b06a9d..7995d31c2be 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1 +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
diff --git a/sys-auth/fprintd/files/fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch b/sys-auth/fprintd/files/fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch
new file mode 100644
index 00000000000..95428184c2f
--- /dev/null
+++ b/sys-auth/fprintd/files/fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch
@@ -0,0 +1,75 @@
+From 7820465f078e9655af70036d8c570fd644b38f22 Mon Sep 17 00:00:00 2001
+From: Martin Gysel <me@bearsh.org>
+Date: Thu, 19 Nov 2020 07:04:10 +0100
+Subject: [PATCH 1/2] add test feature and make tests optional
+
+---
+ meson.build | 14 ++++++++++----
+ meson_options.txt | 4 ++++
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 66aa2f7..ba44788 100644
+--- a/meson.build
++++ b/meson.build
+@@ -125,7 +125,7 @@ endif
+ polkit_policy_directory = polkit_gobject_dep.get_pkgconfig_variable('policydir')
+
+ # Tests dependencies
+-pam_wrapper_dep = dependency('pam_wrapper', required: get_option('pam'))
++pam_wrapper_dep = dependency('pam_wrapper', required: get_option('pam') and get_option('test').enabled() )
+
+ xmllint = find_program('xmllint', required: false)
+ python3 = find_program('python3') # No meson without it!
+@@ -139,11 +139,13 @@ python3_test_modules = {
+ }
+ python3_available_modules = []
+
++if get_option('test').enabled()
+ foreach module, required : python3_test_modules
+ if required and run_command(python3, '-c', 'import @0@'.format(module)).returncode() != 0
+ error('Python3 module \'' + module + '\' required by test suite not found')
+ endif
+ endforeach
++endif
+
+ cdata = configuration_data()
+ cdata.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+@@ -167,7 +169,9 @@ endif
+ if get_option('gtk_doc')
+ subdir('doc')
+ endif
+-subdir('tests')
++if get_option('test').enabled()
++ subdir('tests')
++endif
+ subdir('po')
+
+ output = []
+@@ -189,7 +193,9 @@ output += ' PAM module: ' + pam_dep.found().to_string()
+ output += ' Manuals: ' + get_option('man').to_string()
+ output += ' GTK Doc: ' + get_option('gtk_doc').to_string()
+ output += ' XML Linter ' + xmllint.found().to_string()
+-output += '\nTest setup:\n'
+-output += ' With address sanitizer: ' + address_sanitizer.to_string()
++if get_option('test').enabled()
++ output += '\nTest setup:\n'
++ output += ' With address sanitizer: ' + address_sanitizer.to_string()
++endif
+
+ message('\n'+'\n'.join(output)+'\n')
+diff --git a/meson_options.txt b/meson_options.txt
+index be31fe1..92c01cd 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -19,3 +19,7 @@ option('gtk_doc',
+ type: 'boolean',
+ value: false,
+ description: 'Use gtk-doc to build documentation')
++option('test',
++ type: 'feature',
++ value: 'disabled',
++ description: 'Enable tests')
+--
+2.29.2
+
diff --git a/sys-auth/fprintd/files/fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch b/sys-auth/fprintd/files/fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch
new file mode 100644
index 00000000000..a10026f3346
--- /dev/null
+++ b/sys-auth/fprintd/files/fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch
@@ -0,0 +1,24 @@
+--- fprintd-v1.90.8/meson.build.orig 2020-12-13 08:08:13.886367478 +0100
++++ fprintd-v1.90.8/meson.build 2020-12-13 08:30:16.056756878 +0100
+@@ -84,7 +84,7 @@
+ libfprint_dep = dependency('libfprint-2', version: '>=' + libfprint_min_version)
+ polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.91')
+ dbus_dep = dependency('dbus-1', required: false)
+-libsystemd_dep = dependency('libsystemd', required: get_option('pam'))
++libsystemd_dep = dependency(get_option('libsystemd'), required: get_option('pam'))
+ pam_dep = cc.find_library('pam',
+ required: get_option('pam'),
+ has_headers: 'security/pam_modules.h',
+--- fprintd-v1.90.8/meson_options.txt.orig 2020-12-13 08:08:13.886367478 +0100
++++ fprintd-v1.90.8/meson_options.txt 2020-12-13 08:26:57.111919403 +0100
+@@ -10,6 +10,10 @@
+ description: 'Install system service files',
+ type: 'boolean',
+ value: true)
++option('libsystemd',
++ description: 'Libsystemd provider (libsystemd or libelogind)',
++ type: 'string',
++ value: 'libsystemd')
+ option('systemd_system_unit_dir',
+ description: 'Directory for systemd service files',
+ type: 'string')
diff --git a/sys-auth/fprintd/fprintd-1.90.8.ebuild b/sys-auth/fprintd/fprintd-1.90.8.ebuild
new file mode 100644
index 00000000000..1dcc64b3e95
--- /dev/null
+++ b/sys-auth/fprintd/fprintd-1.90.8.ebuild
@@ -0,0 +1,76 @@
+# 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 ~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/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."
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-03 5:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-12 9:37 [gentoo-commits] repo/gentoo:master commit in: sys-auth/fprintd/files/, sys-auth/fprintd/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-06-03 5:53 Sam James
2022-09-17 18:24 Sam James
2022-01-21 17:11 Sam James
2021-01-08 17:09 Matthew Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox