!68 [sync] PR-66: License compliance rectification

From: @openeuler-sync-bot 
Reviewed-by: @wu-leilei 
Signed-off-by: @wu-leilei

0012-Translated-using-Weblate-Hungarian.patch

@@ -0,0 +1,96 @@
+From 5ee0da62449c15e611706a1196cd2aa373cd702d Mon Sep 17 00:00:00 2001
+From: Weblate <noreply@weblate.org>
+Date: Tue, 16 Aug 2022 13:19:22 +0200
+Subject: [PATCH 12/14] Translated using Weblate (Hungarian)
+
+Currently translated at 98.3% (59 of 60 strings)
+
+Co-authored-by: Acs Zoltan <acszoltan111@gmail.com>
+Translate-URL: https://translate.fedoraproject.org/projects/fprintd/fprintd/hu/
+Translation: fprintd/fprintd
+---
+ po/hu.po | 31 ++++++++++++++-----------------
+ 1 file changed, 14 insertions(+), 17 deletions(-)
+
+diff --git a/po/hu.po b/po/hu.po
+index 80e3545..d155425 100644
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -4,20 +4,22 @@
+ #
+ # Translators:
+ # Gabor Kelemen <kelemeng at gnome dot hu>, 2012
++# Acs Zoltan <acszoltan111@gmail.com>, 2022.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: fprintd\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2021-12-02 10:58+0100\n"
+-"PO-Revision-Date: 2017-09-19 09:08+0000\n"
+-"Last-Translator: kelemeng <kelemeng@ubuntu.com>\n"
+-"Language-Team: Hungarian (http://www.transifex.com/freedesktop/fprintd/"
+-"language/hu/)\n"
++"PO-Revision-Date: 2022-08-16 11:19+0000\n"
++"Last-Translator: Acs Zoltan <acszoltan111@gmail.com>\n"
++"Language-Team: Hungarian <https://translate.fedoraproject.org/projects/"
++"fprintd/fprintd/hu/>\n"
+ "Language: hu\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"Plural-Forms: nplurals=2; plural=n != 1;\n"
++"X-Generator: Weblate 4.13\n"
+ 
+ #: data/net.reactivated.fprint.device.policy.in:13
+ msgid "Verify a fingerprint"
+@@ -28,25 +30,21 @@ msgid "Privileges are required to verify fingerprints."
+ msgstr "Jogosultság szükséges az ujjlenyomatok ellenőrzéséhez."
+ 
+ #: data/net.reactivated.fprint.device.policy.in:23
+-#, fuzzy
+ msgid "Enroll or Delete fingerprints"
+-msgstr "Új ujjlenyomatok felvétele"
++msgstr "Ujjlenyomatok felvétele vagy törlése"
+ 
+ #: data/net.reactivated.fprint.device.policy.in:24
+-#, fuzzy
+ msgid "Privileges are required to enroll or delete fingerprints."
+-msgstr "Jogosultság szükséges új ujjlenyomatok felvételéhez."
++msgstr "Jogosultság szükséges ujjlenyomatok felvételéhez vagy törléséhez."
+ 
+ #: data/net.reactivated.fprint.device.policy.in:33
+ #, fuzzy
+ msgid "Select a user to manage fingerprints for"
+-msgstr "Válassza ki a felveendő felhasználót"
++msgstr "Válassza ki a felhasználót, aki kezeli az ujjlenyomatokat"
+ 
+ #: data/net.reactivated.fprint.device.policy.in:34
+-#, fuzzy
+ msgid "Privileges are required to manage fingerprints for other users."
+-msgstr ""
+-"Jogosultság szükséges új ujjlenyomatok felvételéhez más felhasználóknak."
++msgstr "Jogosultság szükséges az ujjlenyomatok kezeléséhez más felhasználóknak."
+ 
+ #: src/device.c:783
+ #, c-format
+@@ -278,13 +276,12 @@ msgstr "Vegye el az ujját és próbálja újra lehúzni"
+ 
+ #: pam/pam_fprintd.c:537
+ msgid "Verification timed out"
+-msgstr ""
++msgstr "Az ellenőrzés kifutott az időből"
+ 
+ #: pam/pam_fprintd.c:542
+-#, fuzzy
+ msgid "Failed to match fingerprint"
+-msgstr "Ujjlenyomat ellenőrzése"
++msgstr "Nem sikerült felismerni az ujjlenyomatot"
+ 
+ #: pam/pam_fprintd.c:580
+ msgid "An unknown error occurred"
+-msgstr ""
++msgstr "Egy ismeretlen hiba történt"
+-- 
+2.37.1.windows.1
+

0013-Translated-using-Weblate-Croatian.patch

@@ -0,0 +1,77 @@
+From a83c6a594c421c72ec4c867ec318edebf51af389 Mon Sep 17 00:00:00 2001
+From: Weblate <noreply@weblate.org>
+Date: Tue, 16 Aug 2022 13:19:22 +0200
+Subject: [PATCH] Translated using Weblate (Croatian)
+
+Currently translated at 100.0% (60 of 60 strings)
+
+Co-authored-by: Gogo Gogsi <linux.hr@protonmail.com>
+Co-authored-by: Weblate <noreply@weblate.org>
+Translate-URL: https://translate.fedoraproject.org/projects/fprintd/fprintd/hr/
+Translation: fprintd/fprintd
+---
+ po/hr.po | 19 +++++++------------
+ 1 file changed, 7 insertions(+), 12 deletions(-)
+
+diff --git a/po/hr.po b/po/hr.po
+index 0d4185e..3b25877 100644
+--- a/po/hr.po
++++ b/po/hr.po
+@@ -4,13 +4,13 @@
+ #
+ # Translators:
+ # Tomislav Krznar <tomislav.krznar@gmail.com>, 2012
+-# Gogo Gogsi <linux.hr@protonmail.com>, 2021.
++# Gogo Gogsi <linux.hr@protonmail.com>, 2021, 2022.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: fprintd\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2021-12-02 10:58+0100\n"
+-"PO-Revision-Date: 2021-10-03 15:05+0000\n"
++"PO-Revision-Date: 2022-06-25 16:18+0000\n"
+ "Last-Translator: Gogo Gogsi <linux.hr@protonmail.com>\n"
+ "Language-Team: Croatian <https://translate.fedoraproject.org/projects/"
+ "fprintd/fprintd/hr/>\n"
+@@ -20,7 +20,7 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+ "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+-"X-Generator: Weblate 4.8\n"
++"X-Generator: Weblate 4.13\n"
+ 
+ #: data/net.reactivated.fprint.device.policy.in:13
+ msgid "Verify a fingerprint"
+@@ -31,25 +31,20 @@ msgid "Privileges are required to verify fingerprints."
+ msgstr "Potrebne su ovlasti za provjeru otisaka prstiju."
+ 
+ #: data/net.reactivated.fprint.device.policy.in:23
+-#, fuzzy
+ msgid "Enroll or Delete fingerprints"
+-msgstr "Unesi nove otiske prstiju"
++msgstr "Unesite ili obrišite otiske prstiju"
+ 
+ #: data/net.reactivated.fprint.device.policy.in:24
+-#, fuzzy
+ msgid "Privileges are required to enroll or delete fingerprints."
+-msgstr "Potrebne su ovlasti za unošenje novih otisaka prstiju."
++msgstr "Potrebne su ovlasti za unošenje ili brisanje otisaka prstiju."
+ 
+ #: data/net.reactivated.fprint.device.policy.in:33
+-#, fuzzy
+ msgid "Select a user to manage fingerprints for"
+-msgstr "Odaberite korisnika za unos"
++msgstr "Odaberite korisnika za upravljanje otiscima prstiju za"
+ 
+ #: data/net.reactivated.fprint.device.policy.in:34
+-#, fuzzy
+ msgid "Privileges are required to manage fingerprints for other users."
+-msgstr ""
+-"Potrebne su ovlasti za unošenje novih otisaka prstiju za druge korisnike."
++msgstr "Potrebne su ovlasti za upravljanjem otisaka prstiju za druge korisnike."
+ 
+ #: src/device.c:783
+ #, c-format
+-- 
+2.37.1.windows.1
+

0014-Fix-loading-external-modules.patch

@@ -0,0 +1,38 @@
+From eeaacececf6ebbc3437594ee883bfc459a735a4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
+ <zboszor@gmail.com>
+Date: Fri, 14 Oct 2022 13:12:11 +0200
+Subject: [PATCH 14/14] Fix loading external modules
+
+The module function pointer for discover_users() was not
+detected and was left as NULL.
+---
+ src/main.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index f2328da..44feb6f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -64,14 +64,17 @@ load_storage_module (const char *module_name)
+   if (module == NULL)
+     return FALSE;
+ 
++  g_debug ("About to load module '%s'", filename);
+   if (!g_module_symbol (module, "init", (gpointer *) &store.init) ||
+       !g_module_symbol (module, "deinit", (gpointer *) &store.deinit) ||
+       !g_module_symbol (module, "print_data_save", (gpointer *) &store.print_data_save) ||
+       !g_module_symbol (module, "print_data_load", (gpointer *) &store.print_data_load) ||
+       !g_module_symbol (module, "print_data_delete", (gpointer *) &store.print_data_delete) ||
+-      !g_module_symbol (module, "discover_prints", (gpointer *) &store.discover_prints))
++      !g_module_symbol (module, "discover_prints", (gpointer *) &store.discover_prints) ||
++      !g_module_symbol (module, "discover_users", (gpointer *) &store.discover_users))
+     {
+       g_module_close (module);
++      g_debug ("Failed to load module. Please update your code.");
+       return FALSE;
+     }
+ 
+-- 
+2.37.1.windows.1
+

fprintd.spec

@@ -1,9 +1,9 @@
 Name:		fprintd
 Version:	1.94.2
-Release:	12
+Release:	16
 Summary:	D-Bus service for Fingerprint reader access
 
-License:	GPLv2+
+License:	GPL-2.0-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
@@ -18,6 +18,9 @@ Patch0008:	0008-Translated-using-Weblate-Chinese-Simplified-zh_CN.patch
 Patch0009:	0009-scripts-Update-uncrustify-configuration.patch
 Patch0010:	0010-Translated-using-Weblate-Thai.patch
 Patch0011:	0011-Translated-using-Weblate-Georgian.patch
+Patch0012:	0012-Translated-using-Weblate-Hungarian.patch
+Patch0013:	0013-Translated-using-Weblate-Croatian.patch
+Patch0014:	0014-Fix-loading-external-modules.patch
 
 BuildRequires:	meson
 BuildRequires:	gcc
@@ -45,7 +48,7 @@ The fprint project aims to add support for consumer fingerprint reader devices,
 %package devel
 Summary:          Development package for %{name}
 Requires:         %{name} = %{version}-%{release}
-License:          GFDLv1.1+
+License:          GPL-2.0-or-later AND GFDL-1.1-or-later
 BuildArch:        noarch
 
 %description devel
@@ -104,6 +107,18 @@ fi
 %{_mandir}/man8/pam_fprintd.8.gz
 
 %changelog
+* Thu Jun 13 2024 yao_xin <yao_xin001@hoperun.com> - 1.94.2-16
+- License compliance rectification
+
+* Fri Jan 06 2023 xuxinyu <xuxinyu@xfusion.com> - 1.94.2-15
+- Fix loading external modules
+
+* Fri Jan 06 2023 xuxinyu <xuxinyu@xfusion.com> - 1.94.2-14
+- Translated using Weblate (Croatian)
+
+* Fri Jan 06 2023 xuxinyu <xuxinyu@xfusion.com> - 1.94.2-13
+- Translated using Weblate (Hungarian)
+
 * Fri Jan 06 2023 xuxinyu <xuxinyu@xfusion.com> - 1.94.2-12
 - Translated using Weblate (Georgian)