From 31b4392104dcee21ee7e0a6c46b4096d4103efa8 Mon Sep 17 00:00:00 2001 From: ferris Date: Sun, 25 Sep 2022 02:53:33 +0200 Subject: [PATCH 1/2] libfprint: update to 1.94.2 --- srcpkgs/libfprint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template index 16e6b2ffa1e09b..6040fbd1d8fd0a 100644 --- a/srcpkgs/libfprint/template +++ b/srcpkgs/libfprint/template @@ -1,6 +1,6 @@ # Template file for 'libfprint' pkgname=libfprint -version=1.94.0 +version=1.94.2 revision=1 wrksrc=libfprint-v$version build_style=meson @@ -16,7 +16,7 @@ license="LGPL-2.1-or-later" homepage="http://www.freedesktop.org/wiki/Software/fprint/" changelog="https://gitlab.freedesktop.org/libfprint/libfprint/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v$version/libfprint-v$version.tar.bz2" -checksum=7abd57e6da353c657cfbf51f71954a119290c20745491cbdcc34e8728a7e7819 +checksum=80ee0f8761cdd4506c67eb27e447304f00e66d151d783deb1375634c3d1f3518 libfprint-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 765d46bf427d0cf5157cd5f489d5ce080d8a9263 Mon Sep 17 00:00:00 2001 From: ferris Date: Sun, 25 Sep 2022 02:54:49 +0200 Subject: [PATCH 2/2] fprintd: enable pam module with libbasu & update to 1,94.2 --- srcpkgs/fprintd/patches/libbasu.patch | 87 ++++++++++++++ srcpkgs/fprintd/patches/meson-0.61.patch | 146 ----------------------- srcpkgs/fprintd/template | 8 +- 3 files changed, 91 insertions(+), 150 deletions(-) create mode 100644 srcpkgs/fprintd/patches/libbasu.patch delete mode 100644 srcpkgs/fprintd/patches/meson-0.61.patch diff --git a/srcpkgs/fprintd/patches/libbasu.patch b/srcpkgs/fprintd/patches/libbasu.patch new file mode 100644 index 00000000000000..d0ba0f38043fce --- /dev/null +++ b/srcpkgs/fprintd/patches/libbasu.patch @@ -0,0 +1,87 @@ +diff --git a/meson.build b/meson.build +index b155a4a..90a089f 100644 +--- a/meson.build ++++ b/meson.build +@@ -92,7 +92,7 @@ gmodule_dep = dependency('gmodule-2.0', version: '>=' + glib_min_version) + 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')) ++libbasu_dep = dependency('basu', required: get_option('pam')) + pam_dep = cc.find_library('pam', + required: get_option('pam'), + has_headers: 'security/pam_modules.h', +@@ -102,16 +102,16 @@ pod2man = find_program('pod2man', required: get_option('man')) + xsltproc = find_program('xsltproc', required: get_option('gtk_doc')) + + # StateDirectory was introduced in systemd 235 +-systemd_dep = dependency('systemd', version: '>= 235', required: false) +-systemd_unit_dir = get_option('systemd_system_unit_dir') ++#systemd_dep = dependency('systemd', version: '>= 235', required: false) ++#systemd_unit_dir = get_option('systemd_system_unit_dir') + +-if systemd_unit_dir == '' and systemd_dep.found() +- systemd_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') +-endif ++#if systemd_unit_dir == '' and systemd_dep.found() ++# systemd_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') ++#endif + +-if get_option('systemd') and systemd_unit_dir == '' +- error('systemd development files or systemd_system_unit_dir is needed for systemd support.') +-endif ++#if get_option('systemd') and systemd_unit_dir == '' ++# error('systemd development files or systemd_system_unit_dir is needed for systemd support.') ++#endif + + dbus_service_dir = get_option('dbus_service_dir') + dbus_data_dir = datadir +@@ -192,7 +192,7 @@ output += ' DBus configuration directory: ' + dbus_conf_dir + output += ' DBus service directory: ' + dbus_service_dir + output += ' DBus interfaces directory: ' + dbus_interfaces_dir + output += ' Polkit policy directory: ' + polkit_policy_directory +-output += ' Systemd service directory: ' + systemd_unit_dir ++#output += ' Systemd service directory: ' + systemd_unit_dir + if get_option('pam') + output += ' PAM module directory: ' + pam_modules_dir + endif +diff --git a/pam/meson.build b/pam/meson.build +index e95bcde..cd12e64 100644 +--- a/pam/meson.build ++++ b/pam/meson.build +@@ -14,7 +14,7 @@ pam_fprintd = shared_module('pam_fprintd', + 'fingerprint-strings.h', + ], + dependencies: [ +- libsystemd_dep, ++ libbasu_dep, + pam_dep, + ], + c_args: [ +diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c +index 150872a..f3bd5eb 100644 +--- a/pam/pam_fprintd.c ++++ b/pam/pam_fprintd.c +@@ -30,10 +30,10 @@ + #include + #include + #include ++#include + + #include +-#include +-#include ++#include + #include + #include + #include +@@ -779,9 +779,6 @@ is_remote (pam_handle_t *pamh) + strcmp (rhost, "localhost") != 0) + return true; + +- if (sd_session_is_remote (NULL) > 0) +- return true; +- + return false; + } + diff --git a/srcpkgs/fprintd/patches/meson-0.61.patch b/srcpkgs/fprintd/patches/meson-0.61.patch deleted file mode 100644 index 836c7e036054b1..00000000000000 --- a/srcpkgs/fprintd/patches/meson-0.61.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 50943b1bd4f18d103c35233f0446ce7a31d1817e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Wed, 27 Oct 2021 15:44:31 +0200 -Subject: [PATCH] build: Do not use positional arguments in i18n.merge_file - -This was never really used and it's breaking meson 60. -While this may just become a warning in 60.1, it's just better to avoid -using it. - -See: https://github.com/mesonbuild/meson/issues/9441 ---- - data/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 92bfa2e..ece5fc6 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -24,7 +24,7 @@ if get_option('systemd') - endif - - polkit_policy = 'net.reactivated.fprint.device.policy' --polkit_policy_target = i18n.merge_file(polkit_policy, -+polkit_policy_target = i18n.merge_file( - input: '@0@.in'.format(polkit_policy), - output: polkit_policy, - po_dir: meson.source_root() / 'po', --- -GitLab - -From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -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 -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/srcpkgs/fprintd/template b/srcpkgs/fprintd/template index aaaf76ca555dc3..b8b9a15dab7bd2 100644 --- a/srcpkgs/fprintd/template +++ b/srcpkgs/fprintd/template @@ -1,6 +1,6 @@ # Template file for 'fprintd' pkgname=fprintd -version=1.94.0 +version=1.94.2 revision=1 wrksrc=fprintd-v$version build_style=meson @@ -9,13 +9,13 @@ configure_args="--sysconfdir=/etc/fprintd -Dman=true -Dgtk_doc=false conf_files="/etc/fprintd/fprintd.conf" hostmakedepends="meson dbus-glib-devel gettext-devel glib-devel intltool pkg-config perl python3-cairo python3-pypamtest python3-dbus - python3-dbusmock libxslt libfprint polkit" + python3-dbusmock libxslt libfprint polkit basu" makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel pam-devel - libfprint-devel polkit-devel cairo-devel elogind-devel pam_wrapper" + libfprint-devel polkit-devel cairo-devel elogind-devel pam_wrapper basu-devel" short_desc="Daemon that provides fingerprint scanning functionality" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/fprint/" distfiles="https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v$version/fprintd-v$version.tar.bz2" -checksum=380d8c8c29a49eee0063801b4fe0ab1bcbe6080404e8d4120040ae745c3c0ead +checksum=e388694c60322359c632386fa71c8e1e2cf2abe34363028f1046b0203d3fc640 lib32disabled=yes