From 330259b3470d90cbf135af98e82713a30065d55b Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 22 Nov 2022 14:09:02 +0100 Subject: [PATCH 01/15] Add upstreamed patch --- ...ar-storage-on-devices-without-intern.patch | 28 +++++++++++++++++++ fprintd.spec | 1 + 2 files changed, 29 insertions(+) create mode 100644 0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch diff --git a/0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch b/0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch new file mode 100644 index 0000000..4c1dd6e --- /dev/null +++ b/0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch @@ -0,0 +1,28 @@ +From 3633dbaa630d4734f3c63721eecbf935315cb80d Mon Sep 17 00:00:00 2001 +From: Julian +Date: Sun, 1 May 2022 00:29:09 +0200 +Subject: [PATCH] Don't try to clear storage on devices without internal + storage This change prevents warnings like 'Failed to clear storage before + first enrollment: Device has no storage.'. + +--- + src/device.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/device.c b/src/device.c +index df1e782..b9de3ee 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -2209,7 +2209,8 @@ fprint_device_enroll_start (FprintDBusDevice *dbus_dev, + priv->enroll_data = finger; + priv->current_action = ACTION_ENROLL; + +- if (!fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) && ++ if (fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE) && ++ !fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) && + is_first_enrollment (rdev)) + { + g_autoptr(GError) clear_err = NULL; +-- +2.38.1 + diff --git a/fprintd.spec b/fprintd.spec index 737a5cd..4ec0eff 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -22,6 +22,7 @@ BuildRequires: systemd-devel BuildRequires: python3-dbusmock BuildRequires: python3-libpamtest +Patch0: 0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch %description D-Bus service to access fingerprint readers. From 69e9c4257c353322118c604fe32ddabdc064bbcf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:48:59 +0000 Subject: [PATCH 02/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f0cbca6acab6212eb115829c1828416355f12312 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 24 Jan 2023 21:17:36 +0000 Subject: [PATCH 03/15] Fix systemd BuildRequires The build looks for both libsystemd.pc (in systemd-devel, for compile and link flags) and systemd.pc (in systemd itself, for directory layout). systemd-devel previously pulled in systemd (indirectly, through systemd-pam), but no longer. --- fprintd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fprintd.spec b/fprintd.spec index 4ec0eff..a5667ca 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -18,7 +18,8 @@ BuildRequires: polkit-devel BuildRequires: gtk-doc BuildRequires: gettext BuildRequires: perl-podlators -BuildRequires: systemd-devel +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) BuildRequires: python3-dbusmock BuildRequires: python3-libpamtest From 49dd6db3fafb8c7614e87787c323cd7379e2c685 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 15 Feb 2023 12:03:22 +0100 Subject: [PATCH 04/15] Fix /var/lib/fprint permissions --- fprintd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fprintd.spec b/fprintd.spec index a5667ca..383ea6d 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -81,7 +81,7 @@ fi %{_datadir}/dbus-1/system-services/net.reactivated.Fprint.service %{_unitdir}/fprintd.service %{_datadir}/polkit-1/actions/net.reactivated.fprint.device.policy -%{_localstatedir}/lib/fprint +%attr(0700, -, -) %{_localstatedir}/lib/fprint %{_mandir}/man1/fprintd.1.gz %files pam From 564f658f857883b57e74392448a28571538d0cc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:08:47 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 76a743061108bcca12fe5bba75024fc66beb9e33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:42:26 +0000 Subject: [PATCH 06/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9bd9c8186a281db5104708d5631423f22d57ee20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 8 Jan 2024 05:52:59 +0000 Subject: [PATCH 07/15] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_3 --- fprintd.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fprintd.spec b/fprintd.spec index 383ea6d..cd55c16 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -3,7 +3,8 @@ Version: 1.94.2 Release: %autorelease Summary: D-Bus service for Fingerprint reader access -License: GPLv2+ +# man page is GFDL-1.1-or-later +License: GPL-2.0-or-later AND GFDL-1.1-or-later Source0: https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v%{version}/fprintd-v%{version}.tar.gz Url: http://www.freedesktop.org/wiki/Software/fprint/fprintd ExcludeArch: s390 s390x @@ -37,7 +38,7 @@ Provides: pam_fprint = %{version}-%{release} Obsoletes: pam_fprint < 0.2-3 Requires(postun): authselect >= 0.3 -License: GPLv2+ +License: GPL-2.0-or-later %description pam PAM module that uses the fprintd D-Bus service for fingerprint @@ -46,7 +47,9 @@ authentication. %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} -License: GFDL +# dbus interfaces are GPL-2.0-or-later +# documentation is GFDL-1.1-or-later +License: GPL-2.0-or-later AND GFDL-1.1-or-later BuildArch: noarch %description devel From ee17d21d4372e953bdba51103f25cfb1d687d345 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:57:41 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f909a3500c0e24d2958341fb664723136a691c6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:32:50 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d86e872c3edba818ae851976fa21be931ebfdd09 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Thu, 21 Nov 2024 16:07:42 +0800 Subject: [PATCH 10/15] Update to the upstream release 1.94.4 Resolves: #2273291 --- .gitignore | 1 + ...ar-storage-on-devices-without-intern.patch | 28 ------------------- fprintd.spec | 3 +- sources | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch diff --git a/.gitignore b/.gitignore index fffe587..977fc3c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ fprintd-0.1-04fd09cfa.tar.bz2 /fprintd-v1.94.0.tar.gz /fprintd-v1.94.1.tar.gz /fprintd-v1.94.2.tar.gz +/fprintd-v1.94.4.tar.gz diff --git a/0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch b/0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch deleted file mode 100644 index 4c1dd6e..0000000 --- a/0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3633dbaa630d4734f3c63721eecbf935315cb80d Mon Sep 17 00:00:00 2001 -From: Julian -Date: Sun, 1 May 2022 00:29:09 +0200 -Subject: [PATCH] Don't try to clear storage on devices without internal - storage This change prevents warnings like 'Failed to clear storage before - first enrollment: Device has no storage.'. - ---- - src/device.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/device.c b/src/device.c -index df1e782..b9de3ee 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -2209,7 +2209,8 @@ fprint_device_enroll_start (FprintDBusDevice *dbus_dev, - priv->enroll_data = finger; - priv->current_action = ACTION_ENROLL; - -- if (!fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) && -+ if (fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE) && -+ !fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) && - is_first_enrollment (rdev)) - { - g_autoptr(GError) clear_err = NULL; --- -2.38.1 - diff --git a/fprintd.spec b/fprintd.spec index cd55c16..6aa699b 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -1,5 +1,5 @@ Name: fprintd -Version: 1.94.2 +Version: 1.94.4 Release: %autorelease Summary: D-Bus service for Fingerprint reader access @@ -24,7 +24,6 @@ BuildRequires: pkgconfig(systemd) BuildRequires: python3-dbusmock BuildRequires: python3-libpamtest -Patch0: 0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch %description D-Bus service to access fingerprint readers. diff --git a/sources b/sources index cf4d6aa..180429a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fprintd-v1.94.2.tar.gz) = 2fd9e03446b923b29a2a915d395dc85afe10589ea5d78f047e0d3ae2a96255178589d6072c1e10ed8ac607515e410b343aef62ea551baf272999bd012c33f8e0 +SHA512 (fprintd-v1.94.4.tar.gz) = f8d0859d901da2ed419cb57a21dd51bab1b08057e60c555bac129e1f37777d946fc46752b27fc99a52040ef95529728f2936b65de7751ace0bba5c1c5787908d From e67f63765d580d7549f2b012cb1703cf09da5882 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:43:53 +0000 Subject: [PATCH 11/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 23b948e3a1c6876cc765abfe9b30533f3e8fa682 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Wed, 9 Apr 2025 14:26:27 +0800 Subject: [PATCH 12/15] UPdate to the upstream version 1.94.5 --- .gitignore | 1 + fprintd.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 977fc3c..f9433f0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ fprintd-0.1-04fd09cfa.tar.bz2 /fprintd-v1.94.1.tar.gz /fprintd-v1.94.2.tar.gz /fprintd-v1.94.4.tar.gz +/fprintd-v1.94.5.tar.gz diff --git a/fprintd.spec b/fprintd.spec index 6aa699b..b76ab7c 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -1,5 +1,5 @@ Name: fprintd -Version: 1.94.4 +Version: 1.94.5 Release: %autorelease Summary: D-Bus service for Fingerprint reader access diff --git a/sources b/sources index 180429a..61cac3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fprintd-v1.94.4.tar.gz) = f8d0859d901da2ed419cb57a21dd51bab1b08057e60c555bac129e1f37777d946fc46752b27fc99a52040ef95529728f2936b65de7751ace0bba5c1c5787908d +SHA512 (fprintd-v1.94.5.tar.gz) = ee71d1d8cfea99fb6711bd4039011702a1f31c59a23d13423fca8be17b43b29bf7a7434e0baf598f2d4bfefd42c08f2f7e3c6ebdf371d53aa9d6b7963d4732dc From 71e3a01a9302cb38714b3bbd275d8bf88a1a83cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:45:00 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3de4a1f80e122765508f33281a7ee69a9c8d893d Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 21 Aug 2025 21:52:10 +0200 Subject: [PATCH 14/15] Convert STI tests to TMT (rhbz#2382901) --- .fmf/version | 1 + plans.fmf | 19 +++++++++++++++++++ tests/main.fmf | 10 ++++++++++ tests/run.sh | 4 ++-- tests/tests.yml | 24 ------------------------ 5 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 .fmf/version create mode 100644 plans.fmf create mode 100644 tests/main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..c195230 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,19 @@ +summary: Run all tests +discover: + how: fmf + dist-git-source: true + dist-git-merge: true +prepare: + - name: Disable installing everything from srpm + how: install + exclude: ".*" + - name: Install the main package + how: install + package: + - fprintd + - name: "%prep requires git" + how: install + package: + - git +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..ebe3556 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,10 @@ +/fprintd: + summary: Run fprintd.py + test: ./run.sh ./fprintd.py + require: + - python3-gobject-base + - python3-dbus + - python3-cairo + - dbus-daemon + - python3-dbusmock + duration: 10m diff --git a/tests/run.sh b/tests/run.sh index ffd03db..9a6f061 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -10,7 +10,7 @@ if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then fi # Switch into the tests directory -cd source/tests || exit 1 +cd ../fprintd-*/tests || exit 1 # Run actual test -exec python3 "$@" \ No newline at end of file +exec python3 "$@" diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 1a2a318..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-source - tags: - - always - required_packages: - - git - - role: standard-test-basic - tags: - - atomic - - classic - required_packages: - - fprintd - - python3-gobject-base - - python3-dbus - - python3-cairo - - dbus-daemon - - python3-dbusmock - tests: - - fprintd: - dir: . - run: run.sh ./fprintd.py - timeout: 10m From a3a25acdb28d13e551d7a0778fe1ca007ae51209 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 15 Dec 2025 12:13:15 -0500 Subject: [PATCH 15/15] Drop ExcludeArch for IBM Z to allow building there for COSMIC --- fprintd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/fprintd.spec b/fprintd.spec index b76ab7c..183fadb 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -7,7 +7,6 @@ Summary: D-Bus service for Fingerprint reader access License: GPL-2.0-or-later AND GFDL-1.1-or-later Source0: https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v%{version}/fprintd-v%{version}.tar.gz Url: http://www.freedesktop.org/wiki/Software/fprint/fprintd -ExcludeArch: s390 s390x BuildRequires: meson BuildRequires: gcc