From a443f84461d2314d4f36618e8766b6a96f13530d Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 1 Dec 2020 15:32:09 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/fprintd.git#931896c76ae256999762a9e409edb303ade5ed3a --- .gitignore | 2 ++ 0001-pam-Fix-rhost-string-length-check.patch | 25 -------------------- fprintd.spec | 12 ++++++---- gating.yaml | 14 +++++++++++ sources | 2 +- tests/run.sh | 16 +++++++++++++ tests/tests.yml | 24 +++++++++++++++++++ 7 files changed, 64 insertions(+), 31 deletions(-) delete mode 100644 0001-pam-Fix-rhost-string-length-check.patch create mode 100644 gating.yaml create mode 100755 tests/run.sh create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 0af9eba..91afe6e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ fprintd-0.1-04fd09cfa.tar.bz2 /fprintd-0.8.1.tar.xz /fprintd-0.9.0.tar.xz /fprintd-1.90.1.tar.xz +/fprintd-v1.90.4.tar.gz +/fprintd-v1.90.5.tar.gz diff --git a/0001-pam-Fix-rhost-string-length-check.patch b/0001-pam-Fix-rhost-string-length-check.patch deleted file mode 100644 index b349bad..0000000 --- a/0001-pam-Fix-rhost-string-length-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 96444b4156cbc5d0364ac45a7b3288ae28dfbb58 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Tue, 13 Aug 2019 14:16:11 +0200 -Subject: [PATCH] pam: Fix rhost string length check - ---- - pam/pam_fprintd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c -index 408b74c..b2eee4d 100644 ---- a/pam/pam_fprintd.c -+++ b/pam/pam_fprintd.c -@@ -481,7 +481,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, - * "localhost" if the host is local. - * We want to not run for known remote hosts */ - if (rhost != NULL && -- rhost != '\0' && -+ *rhost != '\0' && - strcmp (rhost, "localhost") != 0) { - return PAM_AUTHINFO_UNAVAIL; - } --- -2.21.0 - diff --git a/fprintd.spec b/fprintd.spec index 998b46f..9a5dc8f 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -1,10 +1,10 @@ Name: fprintd -Version: 1.90.1 -Release: 2%{?dist} +Version: 1.90.5 +Release: 1%{?dist} Summary: D-Bus service for Fingerprint reader access License: GPLv2+ -Source0: https://gitlab.freedesktop.org/libfprint/fprintd/uploads/a47c31c844e23e070665a8a85dae0144/%{name}-%{version}.tar.xz +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 @@ -12,7 +12,6 @@ BuildRequires: meson BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: git -BuildRequires: dbus-glib-devel BuildRequires: pam-devel BuildRequires: libfprint-devel >= 1.90.1 BuildRequires: polkit-devel @@ -52,7 +51,7 @@ Development documentation for fprintd, the D-Bus service for fingerprint readers access. %prep -%autosetup -S git -n %{name}-%{version} +%autosetup -S git -n %{name}-v%{version} %build %meson -Dgtk_doc=true -Dpam=true @@ -95,6 +94,9 @@ fi %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml %changelog +* Mon Dec 01 2020 Benjamin Berg - 1.90.5-1 +- Update to 1.90.5 (#1902255) + * Mon Jul 27 2020 Fedora Release Engineering - 1.90.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..c8a218f --- /dev/null +++ b/gating.yaml @@ -0,0 +1,14 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/sources b/sources index 5856d01..a55d82f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fprintd-1.90.1.tar.xz) = 9d1695e22701e22632baa2c0afe78ee1082dc325cdd96004909ceeadfa012ee05813d98e854d7933375b07a47dbb2c39dbe5a976c5d86942dc04f5de2b7f686f +SHA512 (fprintd-v1.90.5.tar.gz) = ccbea2769935ed48877ba5ef536c3e99e2cb3d6f3c349697027ef1bdfc785ca367fe3429e93db9813623074318a82a0e9e46068ad90e1b139e49ce3f986ce035 diff --git a/tests/run.sh b/tests/run.sh new file mode 100755 index 0000000..ffd03db --- /dev/null +++ b/tests/run.sh @@ -0,0 +1,16 @@ +#!/usr/bin/bash +set -u + +# check if we need to install additional packages +# which is the case if we are on RHEL 8 +source /etc/os-release || exit 1 + +if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then + pip3 install python-dbusmock +fi + +# Switch into the tests directory +cd source/tests || exit 1 + +# Run actual test +exec python3 "$@" \ No newline at end of file diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..1a2a318 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,24 @@ +--- +- 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