From facd3b5f12f8058e60b107ab240161b28090d97d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 18 Sep 2020 08:33:08 +0700
Subject: [PATCH 1/4] New package: libfprint2-1.90.2

---
 common/shlibs                                 |  1 +
 srcpkgs/libfprint-udev-rules                  |  1 +
 srcpkgs/libfprint2-devel                      |  1 +
 .../files/60-fprint-autosuspend.rules         | 88 +++++++++++++++++++
 .../patches/fix-stderr-redefinition.patch     | 12 +++
 srcpkgs/libfprint2/template                   | 38 ++++++++
 6 files changed, 141 insertions(+)
 create mode 120000 srcpkgs/libfprint-udev-rules
 create mode 120000 srcpkgs/libfprint2-devel
 create mode 100644 srcpkgs/libfprint2/files/60-fprint-autosuspend.rules
 create mode 100644 srcpkgs/libfprint2/patches/fix-stderr-redefinition.patch
 create mode 100644 srcpkgs/libfprint2/template

diff --git a/common/shlibs b/common/shlibs
index 1bd87ad9f22..e97dd50db6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1580,6 +1580,7 @@ libaio.so.1 libaio-0.3.109_1
 libofx.so.7 libofx-0.9.11_1
 libsigsegv.so.2 libsigsegv-2.10_2
 libfprint.so.0 libfprint-0.5.1_1
+libfprint-2.so.2 libfprint2-1.90.2_1
 libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1
 libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1
 libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1
diff --git a/srcpkgs/libfprint-udev-rules b/srcpkgs/libfprint-udev-rules
new file mode 120000
index 00000000000..840cfa58916
--- /dev/null
+++ b/srcpkgs/libfprint-udev-rules
@@ -0,0 +1 @@
+libfprint2
\ No newline at end of file
diff --git a/srcpkgs/libfprint2-devel b/srcpkgs/libfprint2-devel
new file mode 120000
index 00000000000..840cfa58916
--- /dev/null
+++ b/srcpkgs/libfprint2-devel
@@ -0,0 +1 @@
+libfprint2
\ No newline at end of file
diff --git a/srcpkgs/libfprint2/files/60-fprint-autosuspend.rules b/srcpkgs/libfprint2/files/60-fprint-autosuspend.rules
new file mode 100644
index 00000000000..058ba8fa721
--- /dev/null
+++ b/srcpkgs/libfprint2/files/60-fprint-autosuspend.rules
@@ -0,0 +1,88 @@
+# UPEK Eikon 2
+SUBSYSTEM=="usb", ATTRS{idVendor}=="147e", ATTRS{idProduct}=="2016", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="147e", ATTRS{idProduct}=="2020", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# AuthenTec AES4000
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="5501", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# AuthenTec AES2501
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2500", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2580", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# AuthenTec AES2550/AES2810
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2550", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2810", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# Digital Persona U.are.U 4000/4000B/4500
+SUBSYSTEM=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bb", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bc", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bd", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00ca", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="0007", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="0008", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="000a", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# Veridicom 5thSense
+SUBSYSTEM=="usb", ATTRS{idVendor}=="061a", ATTRS{idProduct}=="0110", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# UPEK TouchStrip Sensor-Only
+SUBSYSTEM=="usb", ATTRS{idVendor}=="147e", ATTRS{idProduct}=="1000", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# AuthenTec AES1610
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1600", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# AuthenTec AES1660
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1660", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1680", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1681", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1682", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1683", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1684", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1685", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1686", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1687", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1688", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1689", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168a", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168b", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168c", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168d", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168e", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168f", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# AuthenTec AES2660
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2660", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2680", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2681", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2682", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2683", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2684", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2685", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2686", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2687", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2688", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2689", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268a", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268b", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268c", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268d", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268e", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268f", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2691", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# Validity VFS101
+SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0001", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# Validity VFS301
+SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0005", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0008", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# Validity VFS5011
+SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0011", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0017", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0018", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
+# UPEK TouchChip/Eikon Touch 300
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="2015", ATTRS{dev}=="*", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="147e", ATTRS{idProduct}=="3001", ATTRS{dev}=="*", ATTR{power/control}="auto"
+
diff --git a/srcpkgs/libfprint2/patches/fix-stderr-redefinition.patch b/srcpkgs/libfprint2/patches/fix-stderr-redefinition.patch
new file mode 100644
index 00000000000..3784ccba869
--- /dev/null
+++ b/srcpkgs/libfprint2/patches/fix-stderr-redefinition.patch
@@ -0,0 +1,12 @@
+--- libfprint/nbis/include/bozorth.h.orig	2019-08-11 15:17:26.878344708 +0200
++++ libfprint/nbis/include/bozorth.h	2019-08-11 15:17:10.303132150 +0200
+@@ -218,7 +218,9 @@ struct xytq_struct {
+ /* Globals supporting command line options */
+ extern int verbose_threshold;
+ /* Global supporting error reporting */
++#ifdef __GLIBC__
+ extern FILE *stderr;
++#endif
+ 
+ /**************************************************************************/
+ /* In: BZ_GBLS.C */
diff --git a/srcpkgs/libfprint2/template b/srcpkgs/libfprint2/template
new file mode 100644
index 00000000000..823adafbdd2
--- /dev/null
+++ b/srcpkgs/libfprint2/template
@@ -0,0 +1,38 @@
+# Template file for 'libfprint2'
+pkgname=libfprint2
+version=1.90.2
+revision=1
+wrksrc=libfprint-$version
+build_style=meson
+build_helper=gir
+configure_args="-Dudev_rules=false -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+hostmakedepends="pkg-config"
+makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
+ libgusb-devel libglib-devel"
+depends="libfprint-udev-rules>=${version}_${revision}"
+short_desc="Support for consumer fingerprint reader devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+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/uploads/1d4b4f34c074567e9fd7572631c31c2a/libfprint-$version.tar.xz"
+checksum=f126b37c036ead4b4711d1a305bbd75de4041ec95b3fa376a2d1a95a40eab578
+
+libfprint2-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
+libfprint-udev-rules_package() {
+	short_desc+=" - udev rules"
+	conflicts="libfprint<=1.0.1"
+	pkg_install() {
+		vmkdir usr/lib/udev/rules.d
+		vinstall $FILESDIR/60-fprint-autosuspend.rules 644 usr/lib/udev/rules.d
+	}
+}

From f62a79a3fb7986f8c8300b2f8c07a27aabf937a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 22:56:15 +0700
Subject: [PATCH 2/4] New package: pam_wrapper-1.1.3

---
 common/shlibs                |  1 +
 srcpkgs/pam_wrapper/template | 24 ++++++++++++++++++++++++
 srcpkgs/python3-pypamtest    |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/pam_wrapper/template
 create mode 120000 srcpkgs/python3-pypamtest

diff --git a/common/shlibs b/common/shlibs
index e97dd50db6d..3c3c87a1125 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
 libtdjson.so.1.6.0 libtd-1.6.0_1
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libpamtest.so.0 pam_wrapper-1.1.3_1
diff --git a/srcpkgs/pam_wrapper/template b/srcpkgs/pam_wrapper/template
new file mode 100644
index 00000000000..85f1d498611
--- /dev/null
+++ b/srcpkgs/pam_wrapper/template
@@ -0,0 +1,24 @@
+# Template file for 'pam_wrapper'
+pkgname=pam_wrapper
+version=1.1.3
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DUNIT_TESTING=ON"
+hostmakedepends="cmake"
+makedepends="python3-devel pam-devel cmocka-devel"
+short_desc="Tool to test PAM applications and modules"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://cwrap.org/pam_wrapper.html"
+distfiles="https://www.samba.org/ftp/cwrap/pam_wrapper-${version}.tar.gz"
+checksum=4feedd788c6fa36516f6d6060482cd86455998d72849eb5f539de48915bdc5f3
+lib32disabled=yes
+
+python3-pypamtest_package() {
+	lib32disabled=yes
+	short_desc+=" - Python 3 bindings"
+	depends="${sourcepkg}-${version}_${revision} python3"
+	pkg_install() {
+		vmove usr/lib/python*
+	}
+}
diff --git a/srcpkgs/python3-pypamtest b/srcpkgs/python3-pypamtest
new file mode 120000
index 00000000000..3ea00f9d1ad
--- /dev/null
+++ b/srcpkgs/python3-pypamtest
@@ -0,0 +1 @@
+pam_wrapper
\ No newline at end of file

From bf84062d79dd20941e1c7b0d01127e5769363252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 20:54:57 +0700
Subject: [PATCH 3/4] fprintd: update to 1.90.1.

---
 srcpkgs/fprintd/patches/musl.patch | 10 +++++++++
 srcpkgs/fprintd/template           | 36 +++++++++++++-----------------
 2 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/fprintd/patches/musl.patch

diff --git a/srcpkgs/fprintd/patches/musl.patch b/srcpkgs/fprintd/patches/musl.patch
new file mode 100644
index 00000000000..38757e0f369
--- /dev/null
+++ b/srcpkgs/fprintd/patches/musl.patch
@@ -0,0 +1,10 @@
+--- src/main.c	2020-02-10 21:08:32.000000000 +0700
++++ src/main.c	2020-09-10 23:02:33.834763912 +0700
+@@ -19,6 +19,7 @@
+ 
+ #include "config.h"
+ 
++#include <locale.h>
+ #include <poll.h>
+ #include <stdlib.h>
+ 
diff --git a/srcpkgs/fprintd/template b/srcpkgs/fprintd/template
index 11e0922ea43..be1213fc023 100644
--- a/srcpkgs/fprintd/template
+++ b/srcpkgs/fprintd/template
@@ -1,36 +1,30 @@
 # Template file for 'fprintd'
 pkgname=fprintd
-version=0.9.0
-revision=3
-wrksrc="fprintd-V_${version//./_}"
-build_style=gnu-configure
-configure_args="--sysconfdir=/etc/${pkgname} --disable-static --without-systemdsystemunitdir"
+version=1.90.1
+revision=1
+build_style=meson
+configure_args="--sysconfdir=/etc/fprintd -Dman=true -Dgtk_doc=false
+ -Dpam_modules_dir=/usr/lib/security -Dsystemd_system_unit_dir=/not-systemd"
 conf_files="/etc/fprintd/fprintd.conf"
-hostmakedepends="autoconf automake dbus-glib-devel gettext-devel glib-devel gtk-doc intltool libtool m4 pkg-config"
-makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel libfprint-devel pam-devel polkit-devel"
+hostmakedepends="meson dbus-glib-devel gettext-devel glib-devel intltool
+ pkg-config perl"
+makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel
+ libfprint2-devel pam-devel polkit-devel cairo-devel elogind-devel
+ pam_wrapper python3-cairo python3-pypamtest python3-dbus python3-dbusmock"
 short_desc="Daemon that provides fingerprint scanning functionality"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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=3bfbf870a3c333a0a1f08287b2b8501c34fd347faac8c1d52bd0d64ab3474d8e
+distfiles="https://gitlab.freedesktop.org/libfprint/fprintd/uploads/a47c31c844e23e070665a8a85dae0144/fprintd-$version.tar.xz"
+checksum=b4940b1dfb052a3641f1bb9bc7685b649aaa26220016dd793871d4f421c8a30d
 lib32disabled=yes
 
 CFLAGS="-fcommon"
 
-pre_configure() {
-	glib-gettextize -c -f
-	gtkdocize --copy
-	intltoolize -c -f
-	libtoolize -c
-	aclocal
-	autoconf
-	autoheader
-	automake -a -c
+post_patch() {
+	vsed -i -e "/^systemd_dep *=/d" meson.build
 }
 
 post_install() {
-	mv $DESTDIR/etc/$pkgname/dbus-1 $DESTDIR/usr/share/dbus-1
-	vmkdir usr/share/dbus-1/system.d
-	mv $DESTDIR/usr/share/dbus-1/dbus-1/system.d/net.reactivated.Fprint.conf $DESTDIR/usr/share/dbus-1/system.d/
+	rm -rf $DESTDIR/not-systemd
 }

From 6440baf47a6d99941d82892286950a42bf5d61ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 18 Sep 2020 08:35:51 +0700
Subject: [PATCH 4/4] libfprint: depends on same udev rules of libfprint2

---
 .../files/60-fprint-autosuspend.rules         | 88 -------------------
 srcpkgs/libfprint/template                    |  8 +-
 2 files changed, 2 insertions(+), 94 deletions(-)
 delete mode 100644 srcpkgs/libfprint/files/60-fprint-autosuspend.rules

diff --git a/srcpkgs/libfprint/files/60-fprint-autosuspend.rules b/srcpkgs/libfprint/files/60-fprint-autosuspend.rules
deleted file mode 100644
index 058ba8fa721..00000000000
--- a/srcpkgs/libfprint/files/60-fprint-autosuspend.rules
+++ /dev/null
@@ -1,88 +0,0 @@
-# UPEK Eikon 2
-SUBSYSTEM=="usb", ATTRS{idVendor}=="147e", ATTRS{idProduct}=="2016", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="147e", ATTRS{idProduct}=="2020", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# AuthenTec AES4000
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="5501", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# AuthenTec AES2501
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2500", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2580", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# AuthenTec AES2550/AES2810
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2550", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2810", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# Digital Persona U.are.U 4000/4000B/4500
-SUBSYSTEM=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bb", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bc", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bd", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00ca", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="0007", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="0008", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="000a", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# Veridicom 5thSense
-SUBSYSTEM=="usb", ATTRS{idVendor}=="061a", ATTRS{idProduct}=="0110", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# UPEK TouchStrip Sensor-Only
-SUBSYSTEM=="usb", ATTRS{idVendor}=="147e", ATTRS{idProduct}=="1000", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# AuthenTec AES1610
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1600", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# AuthenTec AES1660
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1660", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1680", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1681", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1682", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1683", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1684", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1685", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1686", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1687", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1688", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1689", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168a", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168b", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168c", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168d", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168e", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="168f", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# AuthenTec AES2660
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2660", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2680", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2681", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2682", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2683", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2684", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2685", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2686", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2687", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2688", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2689", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268a", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268b", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268c", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268d", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268e", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="268f", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2691", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# Validity VFS101
-SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0001", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# Validity VFS301
-SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0005", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0008", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# Validity VFS5011
-SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0011", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0017", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0018", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
-# UPEK TouchChip/Eikon Touch 300
-SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="2015", ATTRS{dev}=="*", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="147e", ATTRS{idProduct}=="3001", ATTRS{dev}=="*", ATTR{power/control}="auto"
-
diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index ae22b871f3d..3837ddcc60b 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -1,12 +1,13 @@
 # Template file for 'libfprint'
 pkgname=libfprint
 version=1.0
-revision=1
+revision=2
 wrksrc="libfprint-V_${version//./_}"
 build_style=meson
 configure_args="-Dudev_rules=false -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
 hostmakedepends="pkg-config"
 makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel"
+depends="libfprint-udev-rules"
 short_desc="Support for consumer fingerprint reader devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -15,11 +16,6 @@ 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=22777a1d202ef912395b94842ae6b531338c8d48a8a813616e846b1bc96c5ad9
 
-post_install() {
-	vmkdir usr/lib/udev/rules.d
-	vinstall $FILESDIR/60-fprint-autosuspend.rules 644 usr/lib/udev/rules.d
-}
-
 libfprint-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"