From dae6dfe73a3272849268f7b7bfd2ddcb78423ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 3 Nov 2021 17:28:44 +0100 Subject: [PATCH 01/29] New upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 624965a0..1df64a6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libfprint (1:1.94.2-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Marco Trevisan (Treviño) Wed, 03 Nov 2021 17:28:44 +0100 + libfprint (1:1.94.1-1) unstable; urgency=medium * New upstream release From 8217d33581a7af1618396bd772f4552bee2e14ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 3 Nov 2021 17:28:45 +0100 Subject: [PATCH 02/29] debian/libfprint-2-2.postinst: Devices triggers updated --- debian/changelog | 1 + debian/libfprint-2-2.postinst | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1df64a6e..e35359d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libfprint (1:1.94.2-1) UNRELEASED; urgency=medium * New upstream release + * debian/libfprint-2-2.postinst: Devices triggers updated -- Marco Trevisan (Treviño) Wed, 03 Nov 2021 17:28:44 +0100 diff --git a/debian/libfprint-2-2.postinst b/debian/libfprint-2-2.postinst index 701db972..111641e4 100644 --- a/debian/libfprint-2-2.postinst +++ b/debian/libfprint-2-2.postinst @@ -199,6 +199,7 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5843 udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5844 udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5845 + udevadm trigger --action=add --attr-match=idVendor=0bda --attr-match=idProduct=5812 udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=0007 udevadm trigger --action=add --attr-match=idVendor=1188 --attr-match=idProduct=9545 udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0007 From 7461f1846602223da0a12354c4a8fef2485582a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 28 Oct 2021 18:27:16 +0200 Subject: [PATCH 03/29] debian/libfprint-2-*.install: Use more restrictive rules to reduce ubuntu delta --- debian/libfprint-2-2.install | 2 +- debian/libfprint-2-dev.install | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/libfprint-2-2.install b/debian/libfprint-2-2.install index dd71de2b..be3d230c 100644 --- a/debian/libfprint-2-2.install +++ b/debian/libfprint-2-2.install @@ -1,3 +1,3 @@ lib/udev/hwdb.d/ lib/udev/rules.d/ -usr/lib/${DEB_HOST_MULTIARCH}/libfprint-*.so.* +usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9].so.* diff --git a/debian/libfprint-2-dev.install b/debian/libfprint-2-dev.install index f33095e9..377615d7 100644 --- a/debian/libfprint-2-dev.install +++ b/debian/libfprint-2-dev.install @@ -1,4 +1,4 @@ -usr/include/libfprint-* -usr/lib/${DEB_HOST_MULTIARCH}/libfprint-*.so -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/libfprint-*.pc +usr/include/libfprint-[0-9]/*.h +usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9].so +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/libfprint-[0-9].pc usr/share/gir-1.0/FPrint-*.gir From e7b6cfec6d699bbfbe56550a1d12fbf89253bbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 28 Oct 2021 18:27:52 +0200 Subject: [PATCH 04/29] debian/update-udev-triggers: Ignore errors on udevadm trigger These are not fatal for package installation and rebuild postinst script --- debian/libfprint-2-2.postinst | 458 ++++++++++++++++----------------- debian/update-udev-triggers.sh | 2 +- 2 files changed, 230 insertions(+), 230 deletions(-) diff --git a/debian/libfprint-2-2.postinst b/debian/libfprint-2-2.postinst index 111641e4..c8de3b90 100644 --- a/debian/libfprint-2-2.postinst +++ b/debian/libfprint-2-2.postinst @@ -11,235 +11,235 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 # adds stuff there # The devices ID list is auto-generated using the gbp postimport hook # see debian/README.sources for more details. - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1600 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1660 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1680 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1681 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1682 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1683 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1684 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1685 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1686 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1687 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1688 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1689 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168a - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168b - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168c - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168d - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168e - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168f - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2500 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2580 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2550 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2810 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2660 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2680 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2681 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2682 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2683 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2684 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2685 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2686 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2687 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2688 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2689 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268a - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268b - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268c - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268d - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268e - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268f - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2691 - udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=5731 - udevadm trigger --action=add --attr-match=idVendor=5501 --attr-match=idProduct=08ff - udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0570 - udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0571 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0903 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0907 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c01 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c02 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c03 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c04 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c05 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c06 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c07 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c08 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c09 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0a - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0b - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0c - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0d - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0e - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0f - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c10 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c11 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c12 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c13 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c14 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c15 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c16 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c17 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c18 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c19 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1a - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1b - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1c - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1d - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1e - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1f - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c20 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c21 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c22 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c23 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c24 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c25 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c26 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c27 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c28 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c29 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2a - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2b - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2c - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2d - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2e - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2f - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c30 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c31 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c32 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c33 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c3d - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c42 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4d - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4f - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c63 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c6e - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c58 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c7d - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c7e - udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0603 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5840 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=609c - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=60a2 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=639c - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63ac - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63bc - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63cc - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6496 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6584 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=658c - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6592 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6594 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=659c - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6a94 - udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=1010 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00bd - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00df - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f9 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00fc - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c2 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c9 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0100 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f0 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0103 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0123 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0126 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0129 - udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=2016 - udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1000 - udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1001 - udevadm trigger --action=add --attr-match=idVendor=0483 --attr-match=idProduct=2015 - udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=3001 - udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=2020 - udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00bc - udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00bd - udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00ca - udevadm trigger --action=add --attr-match=idVendor=05ba --attr-match=idProduct=0007 - udevadm trigger --action=add --attr-match=idVendor=05ba --attr-match=idProduct=0008 - udevadm trigger --action=add --attr-match=idVendor=05ba --attr-match=idProduct=000a - udevadm trigger --action=add --attr-match=idVendor=061a --attr-match=idProduct=0110 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0050 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0001 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0005 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0008 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0010 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0011 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0015 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0017 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0018 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0091 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=036b - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c00 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4b - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4c - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c57 - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c5e - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=2706 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0081 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0088 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=008a - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=009a - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=009b - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00a2 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00b7 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00bb - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00be - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c4 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00cb - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00d8 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00da - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e7 - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e9 - udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5801 - udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5805 - udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5834 - udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5840 - udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5841 - udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5842 - udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5843 - udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5844 - udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5845 - udevadm trigger --action=add --attr-match=idVendor=0bda --attr-match=idProduct=5812 - udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=0007 - udevadm trigger --action=add --attr-match=idVendor=1188 --attr-match=idProduct=9545 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0007 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003a - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003c - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003d - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003f - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0090 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0092 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0094 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0097 - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=009d - udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=00ab - udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1002 - udevadm trigger --action=add --attr-match=idVendor=1491 --attr-match=idProduct=0088 - udevadm trigger --action=add --attr-match=idVendor=16d1 --attr-match=idProduct=1027 - udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0300 - udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0575 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5042 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5110 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5117 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5201 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=521d - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5301 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=530c - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=532d - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=533c - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5381 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5385 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=538c - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=538d - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5395 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5584 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55a2 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55a4 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55b4 - udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5740 - udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=9338 - udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=2033 - udevadm trigger --action=add --attr-match=idVendor=3538 --attr-match=idProduct=0930 + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1600 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1660 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1680 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1681 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1682 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1683 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1684 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1685 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1686 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1687 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1688 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=1689 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168a || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168b || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168c || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168d || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168e || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=168f || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2500 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2580 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2550 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2810 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2660 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2680 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2681 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2682 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2683 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2684 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2685 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2686 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2687 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2688 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2689 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268a || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268b || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268c || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268d || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268e || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268f || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2691 || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=5731 || true + udevadm trigger --action=add --attr-match=idVendor=5501 --attr-match=idProduct=08ff || true + udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0570 || true + udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0571 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0903 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0907 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c01 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c02 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c03 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c04 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c05 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c06 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c07 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c08 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c09 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0a || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0b || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0c || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0d || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0e || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c0f || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c10 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c11 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c12 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c13 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c14 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c15 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c16 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c17 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c18 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c19 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1a || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1b || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1c || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1d || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1e || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c1f || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c20 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c21 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c22 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c23 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c24 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c25 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c26 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c27 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c28 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c29 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2a || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2b || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2c || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2d || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2e || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c2f || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c30 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c31 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c32 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c33 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c3d || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c42 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4d || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4f || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c63 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c6e || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c58 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c7d || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c7e || true + udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0603 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5840 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=609c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=60a2 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=639c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63ac || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63bc || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63cc || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6496 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6584 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=658c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6592 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6594 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=659c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6a94 || true + udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=1010 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00bd || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00df || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f9 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00fc || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c2 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c9 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0100 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f0 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0103 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0123 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0126 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0129 || true + udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=2016 || true + udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1000 || true + udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1001 || true + udevadm trigger --action=add --attr-match=idVendor=0483 --attr-match=idProduct=2015 || true + udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=3001 || true + udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=2020 || true + udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00bc || true + udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00bd || true + udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00ca || true + udevadm trigger --action=add --attr-match=idVendor=05ba --attr-match=idProduct=0007 || true + udevadm trigger --action=add --attr-match=idVendor=05ba --attr-match=idProduct=0008 || true + udevadm trigger --action=add --attr-match=idVendor=05ba --attr-match=idProduct=000a || true + udevadm trigger --action=add --attr-match=idVendor=061a --attr-match=idProduct=0110 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0050 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0001 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0005 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0008 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0010 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0011 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0015 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0017 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0018 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0091 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=036b || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c00 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4b || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4c || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c57 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c5e || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=2706 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0081 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0088 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=008a || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=009a || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=009b || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00a2 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00b7 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00bb || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00be || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c4 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00cb || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00d8 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00da || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e7 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e9 || true + udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5801 || true + udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5805 || true + udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5834 || true + udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5840 || true + udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5841 || true + udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5842 || true + udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5843 || true + udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5844 || true + udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5845 || true + udevadm trigger --action=add --attr-match=idVendor=0bda --attr-match=idProduct=5812 || true + udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=0007 || true + udevadm trigger --action=add --attr-match=idVendor=1188 --attr-match=idProduct=9545 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0007 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003a || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003c || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003d || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003f || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0090 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0092 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0094 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0097 || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=009d || true + udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=00ab || true + udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1002 || true + udevadm trigger --action=add --attr-match=idVendor=1491 --attr-match=idProduct=0088 || true + udevadm trigger --action=add --attr-match=idVendor=16d1 --attr-match=idProduct=1027 || true + udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0300 || true + udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0575 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5042 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5110 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5117 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5201 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=521d || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5301 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=530c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=532d || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=533c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5381 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5385 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=538c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=538d || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5395 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5584 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55a2 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55a4 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55b4 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5740 || true + udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=9338 || true + udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=2033 || true + udevadm trigger --action=add --attr-match=idVendor=3538 --attr-match=idProduct=0930 || true fi diff --git a/debian/update-udev-triggers.sh b/debian/update-udev-triggers.sh index b4881f2a..db2ee813 100755 --- a/debian/update-udev-triggers.sh +++ b/debian/update-udev-triggers.sh @@ -10,7 +10,7 @@ while IFS= read -r line; do if [[ $line =~ ^usb:v([A-Fa-f0-9]{4})p([A-Fa-f0-9]{4}) ]]; then vendor="$(echo "${BASH_REMATCH[1]}" | tr '[:upper:]' '[:lower:]')" product="$(echo "${BASH_REMATCH[2]}" | tr '[:upper:]' '[:lower:]')" - commands_lines+=("\tudevadm trigger --action=add --attr-match=idVendor=$vendor --attr-match=idProduct=$product") + commands_lines+=("\tudevadm trigger --action=add --attr-match=idVendor=$vendor --attr-match=idProduct=$product || true") fi done < "$autosuspend_file" From d4f1365d8116135e3ebe6019da82601d6dc45364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 28 Oct 2021 18:28:58 +0200 Subject: [PATCH 05/29] debian/watch: Use @PACKAGE@ --- debian/watch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/watch b/debian/watch index 9457c373..46a0137b 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=4 -https://gitlab.freedesktop.org/libfprint/libfprint/tags?sort=updated_desc \ - archive/v(?:[^/]*)/libfprint-v(\d\S*)@ARCHIVE_EXT@ +https://gitlab.freedesktop.org/libfprint/@PACKAGE@/tags?sort=updated_desc \ + archive/v(?:[^/]*)/@PACKAGE@-v(\d\S*)@ARCHIVE_EXT@ From e1dd1de32072f4927157de7b202232ee3c3fd4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 3 Nov 2021 17:37:19 +0100 Subject: [PATCH 06/29] debian/patches: Drop, all applied upstream --- debian/patches/elanmoc-add-PID-0x0c7d.patch | 36 - ...e-struct-for-required-length-calcula.patch | 47 - debian/patches/goodixmoc-add-PID-63CC.patch | 43 - debian/patches/series | 4 - ...iling-new-lines-on-devices-attribute.patch | 984 ------------------ 5 files changed, 1114 deletions(-) delete mode 100644 debian/patches/elanmoc-add-PID-0x0c7d.patch delete mode 100644 debian/patches/goodixmoc-Fix-template-struct-for-required-length-calcula.patch delete mode 100644 debian/patches/goodixmoc-add-PID-63CC.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/tests-Add-missing-trailing-new-lines-on-devices-attribute.patch diff --git a/debian/patches/elanmoc-add-PID-0x0c7d.patch b/debian/patches/elanmoc-add-PID-0x0c7d.patch deleted file mode 100644 index 37e678c2..00000000 --- a/debian/patches/elanmoc-add-PID-0x0c7d.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: hermanlin -Date: Tue, 12 Oct 2021 14:02:48 +0800 -Subject: elanmoc: add PID 0x0c7d - -Signed-off-by: hermanlin - -Origin: https://gitlab.freedesktop.org/libfprint/libfprint/libfprint/-/commit/5d0a3eab ---- - data/autosuspend.hwdb | 1 + - libfprint/drivers/elanmoc/elanmoc.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb -index 8b1527d..42d22ca 100644 ---- a/data/autosuspend.hwdb -+++ b/data/autosuspend.hwdb -@@ -142,6 +142,7 @@ usb:v04F3p0C58* - ID_PERSIST=0 - - # Supported by libfprint driver elanmoc -+usb:v04F3p0C7D* - usb:v04F3p0C7E* - ID_AUTOSUSPEND=1 - ID_PERSIST=0 -diff --git a/libfprint/drivers/elanmoc/elanmoc.c b/libfprint/drivers/elanmoc/elanmoc.c -index aef386c..69700a0 100644 ---- a/libfprint/drivers/elanmoc/elanmoc.c -+++ b/libfprint/drivers/elanmoc/elanmoc.c -@@ -25,6 +25,7 @@ - G_DEFINE_TYPE (FpiDeviceElanmoc, fpi_device_elanmoc, FP_TYPE_DEVICE) - - static const FpIdEntry id_table[] = { -+ { .vid = 0x04f3, .pid = 0x0c7d, }, - { .vid = 0x04f3, .pid = 0x0c7e, }, - { .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */ - }; diff --git a/debian/patches/goodixmoc-Fix-template-struct-for-required-length-calcula.patch b/debian/patches/goodixmoc-Fix-template-struct-for-required-length-calcula.patch deleted file mode 100644 index 21dc246d..00000000 --- a/debian/patches/goodixmoc-Fix-template-struct-for-required-length-calcula.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Benjamin Berg -Date: Mon, 25 Oct 2021 18:38:38 +0200 -Subject: goodixmoc: Fix template struct for required length calculation - -The length is only a single byte in the transfer. However, the struct -had a uint32_t in that place, breaking the sizeof() calculation and -seemingly creating issues for certain lengths of user id strings (which -depend on the username). - -Fix this by changing the type to uint8_t. Also add the initial 0x43 -prefix byte and a byte of apparent padding that the struct contains. -Leave the two reserved bytes at the end, as they seem to actually have a -meaning (i.e. they are seemingly send in listings). - -This effectively makes the struct one byte smaller, bringing it down to -127 bytes from 128 bytes. - -Closes: #428, #404 - -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfprint/+bug/1945296 ---- - libfprint/drivers/goodixmoc/goodix_proto.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libfprint/drivers/goodixmoc/goodix_proto.h b/libfprint/drivers/goodixmoc/goodix_proto.h -index bcd1cdd..000be2f 100644 ---- a/libfprint/drivers/goodixmoc/goodix_proto.h -+++ b/libfprint/drivers/goodixmoc/goodix_proto.h -@@ -113,14 +113,16 @@ typedef struct _gxfp_enroll_init - #pragma pack(push, 1) - typedef struct _template_format - { -+ uint8_t _0x43_byte; - uint8_t type; - uint8_t finger_index; -+ uint8_t pad0; - uint8_t accountid[32]; - uint8_t tid[32]; - struct - { -- uint32_t size; -- uint8_t data[56]; -+ uint8_t size; -+ uint8_t data[56]; - } payload; - uint8_t reserve[2]; - } template_format_t, *ptemplate_format_t; diff --git a/debian/patches/goodixmoc-add-PID-63CC.patch b/debian/patches/goodixmoc-add-PID-63CC.patch deleted file mode 100644 index 0b955c22..00000000 --- a/debian/patches/goodixmoc-add-PID-63CC.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: boger -Date: Wed, 20 Oct 2021 20:11:05 +0800 -Subject: goodixmoc: add PID 63CC 63CC: Dell Latitude series fingerprint - sensor - -Origin: https://gitlab.freedesktop.org/libfprint/libfprint/libfprint/-/commit/5e934a4f ---- - data/autosuspend.hwdb | 1 + - libfprint/drivers/goodixmoc/goodix.c | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb -index f3ee8fc..8b1527d 100644 ---- a/data/autosuspend.hwdb -+++ b/data/autosuspend.hwdb -@@ -158,6 +158,7 @@ usb:v27C6p60A2* - usb:v27C6p639C* - usb:v27C6p63AC* - usb:v27C6p63BC* -+usb:v27C6p63CC* - usb:v27C6p6496* - usb:v27C6p6584* - usb:v27C6p658C* -diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c -index eb5e67a..15a8532 100644 ---- a/libfprint/drivers/goodixmoc/goodix.c -+++ b/libfprint/drivers/goodixmoc/goodix.c -@@ -1282,6 +1282,7 @@ gx_fp_probe (FpDevice *device) - case 0x639C: - case 0x63AC: - case 0x63BC: -+ case 0x63CC: - case 0x6A94: - self->max_enroll_stage = 12; - break; -@@ -1505,6 +1506,7 @@ static const FpIdEntry id_table[] = { - { .vid = 0x27c6, .pid = 0x639C, }, - { .vid = 0x27c6, .pid = 0x63AC, }, - { .vid = 0x27c6, .pid = 0x63BC, }, -+ { .vid = 0x27c6, .pid = 0x63CC, }, - { .vid = 0x27c6, .pid = 0x6496, }, - { .vid = 0x27c6, .pid = 0x6584, }, - { .vid = 0x27c6, .pid = 0x658C, }, diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index f2a4e37a..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -goodixmoc-Fix-template-struct-for-required-length-calcula.patch -goodixmoc-add-PID-63CC.patch -elanmoc-add-PID-0x0c7d.patch -tests-Add-missing-trailing-new-lines-on-devices-attribute.patch diff --git a/debian/patches/tests-Add-missing-trailing-new-lines-on-devices-attribute.patch b/debian/patches/tests-Add-missing-trailing-new-lines-on-devices-attribute.patch deleted file mode 100644 index 91aaef38..00000000 --- a/debian/patches/tests-Add-missing-trailing-new-lines-on-devices-attribute.patch +++ /dev/null @@ -1,984 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 27 Oct 2021 01:59:14 +0200 -Subject: tests: Add missing trailing new lines on devices attributes - -This as per the same reasons of commit 63bfaf4, and without trailing new -lines such attributes aren't picked by umockdev in ubuntu and debian. - -Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/335 ---- - tests/egis0570/device | 298 ++++++++++++++++++++++++------------------------- - tests/elanmoc/device | 296 ++++++++++++++++++++++++------------------------ - tests/goodixmoc/device | 278 ++++++++++++++++++++++----------------------- - 3 files changed, 436 insertions(+), 436 deletions(-) - -diff --git a/tests/egis0570/device b/tests/egis0570/device -index e22dcf1..5247b78 100644 ---- a/tests/egis0570/device -+++ b/tests/egis0570/device -@@ -25,63 +25,63 @@ E: ID_VENDOR_FROM_DATABASE=LighTuning Technology Inc. - E: ID_PATH=pci-0000:00:14.0-usb-0:9 - E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_9 - E: LIBFPRINT_DRIVER=Hardcoded whitelist --A: authorized=1 --A: avoid_reset_quirk=0 --A: bConfigurationValue=1 --A: bDeviceClass=00 --A: bDeviceProtocol=00 --A: bDeviceSubClass=00 --A: bMaxPacketSize0=8 --A: bMaxPower=100mA --A: bNumConfigurations=1 --A: bNumInterfaces= 1 --A: bcdDevice=1041 --A: bmAttributes=a0 --A: busnum=1 --A: configuration= -+A: authorized=1\n -+A: avoid_reset_quirk=0\n -+A: bConfigurationValue=1\n -+A: bDeviceClass=00\n -+A: bDeviceProtocol=00\n -+A: bDeviceSubClass=00\n -+A: bMaxPacketSize0=8\n -+A: bMaxPower=100mA\n -+A: bNumConfigurations=1\n -+A: bNumInterfaces= 1\n -+A: bcdDevice=1041\n -+A: bmAttributes=a0\n -+A: busnum=1\n -+A: configuration=\n - H: descriptors=12011001000000087A1C700541100102030109022000010100A0320904000002FF0000000705830240000007050402400003 --A: dev=189:4 --A: devnum=5 --A: devpath=9 -+A: dev=189:4\n -+A: devnum=5\n -+A: devpath=9\n - L: driver=../../../../../bus/usb/drivers/usb --A: idProduct=0570 --A: idVendor=1c7a --A: ltm_capable=no --A: manufacturer=EgisTec --A: maxchild=0 -+A: idProduct=0570\n -+A: idVendor=1c7a\n -+A: ltm_capable=no\n -+A: manufacturer=EgisTec\n -+A: maxchild=0\n - L: port=../1-0:1.0/usb1-port9 --A: power/active_duration=362352 --A: power/async=enabled --A: power/autosuspend=2 --A: power/autosuspend_delay_ms=2000 --A: power/connected_duration=5526124 --A: power/control=auto --A: power/level=auto --A: power/persist=1 --A: power/runtime_active_kids=0 --A: power/runtime_active_time=365097 --A: power/runtime_enabled=enabled --A: power/runtime_status=active --A: power/runtime_suspended_time=5160752 --A: power/runtime_usage=0 --A: power/wakeup=disabled --A: power/wakeup_abort_count= --A: power/wakeup_active= --A: power/wakeup_active_count= --A: power/wakeup_count= --A: power/wakeup_expire_count= --A: power/wakeup_last_time_ms= --A: power/wakeup_max_time_ms= --A: power/wakeup_total_time_ms= --A: product=EgisTec Touch Fingerprint Sensor --A: quirks=0x0 --A: removable=fixed --A: rx_lanes=1 --A: serial=W700B41B --A: speed=12 --A: tx_lanes=1 --A: urbnum=8040 --A: version= 1.10 -+A: power/active_duration=362352\n -+A: power/async=enabled\n -+A: power/autosuspend=2\n -+A: power/autosuspend_delay_ms=2000\n -+A: power/connected_duration=5526124\n -+A: power/control=auto\n -+A: power/level=auto\n -+A: power/persist=1\n -+A: power/runtime_active_kids=0\n -+A: power/runtime_active_time=365097\n -+A: power/runtime_enabled=enabled\n -+A: power/runtime_status=active\n -+A: power/runtime_suspended_time=5160752\n -+A: power/runtime_usage=0\n -+A: power/wakeup=disabled\n -+A: power/wakeup_abort_count=\n -+A: power/wakeup_active=\n -+A: power/wakeup_active_count=\n -+A: power/wakeup_count=\n -+A: power/wakeup_expire_count=\n -+A: power/wakeup_last_time_ms=\n -+A: power/wakeup_max_time_ms=\n -+A: power/wakeup_total_time_ms=\n -+A: product=EgisTec Touch Fingerprint Sensor\n -+A: quirks=0x0\n -+A: removable=fixed\n -+A: rx_lanes=1\n -+A: serial=W700B41B\n -+A: speed=12\n -+A: tx_lanes=1\n -+A: urbnum=8040\n -+A: version= 1.10\n - - P: /devices/pci0000:00/0000:00:14.0/usb1 - N: bus/usb/001/001=12010002090001406B1D020008050302010109021900010100E0000904000001090000000705810304000C -@@ -112,63 +112,63 @@ E: ID_PATH=pci-0000:00:14.0 - E: ID_PATH_TAG=pci-0000_00_14_0 - E: ID_FOR_SEAT=usb-pci-0000_00_14_0 - E: TAGS=:seat: --A: authorized=1 --A: authorized_default=1 --A: avoid_reset_quirk=0 --A: bConfigurationValue=1 --A: bDeviceClass=09 --A: bDeviceProtocol=01 --A: bDeviceSubClass=00 --A: bMaxPacketSize0=64 --A: bMaxPower=0mA --A: bNumConfigurations=1 --A: bNumInterfaces= 1 --A: bcdDevice=0508 --A: bmAttributes=e0 --A: busnum=1 --A: configuration= -+A: authorized=1\n -+A: authorized_default=1\n -+A: avoid_reset_quirk=0\n -+A: bConfigurationValue=1\n -+A: bDeviceClass=09\n -+A: bDeviceProtocol=01\n -+A: bDeviceSubClass=00\n -+A: bMaxPacketSize0=64\n -+A: bMaxPower=0mA\n -+A: bNumConfigurations=1\n -+A: bNumInterfaces= 1\n -+A: bcdDevice=0508\n -+A: bmAttributes=e0\n -+A: busnum=1\n -+A: configuration=\n - H: descriptors=12010002090001406B1D020008050302010109021900010100E0000904000001090000000705810304000C --A: dev=189:0 --A: devnum=1 --A: devpath=0 -+A: dev=189:0\n -+A: devnum=1\n -+A: devpath=0\n - L: driver=../../../../bus/usb/drivers/usb --A: idProduct=0002 --A: idVendor=1d6b --A: interface_authorized_default=1 --A: ltm_capable=no --A: manufacturer=Linux 5.8.0-59-generic xhci-hcd --A: maxchild=12 --A: power/active_duration=378024 --A: power/async=enabled --A: power/autosuspend=0 --A: power/autosuspend_delay_ms=0 --A: power/connected_duration=5527220 --A: power/control=auto --A: power/level=auto --A: power/runtime_active_kids=1 --A: power/runtime_active_time=377962 --A: power/runtime_enabled=enabled --A: power/runtime_status=active --A: power/runtime_suspended_time=5149253 --A: power/runtime_usage=0 --A: power/wakeup=disabled --A: power/wakeup_abort_count= --A: power/wakeup_active= --A: power/wakeup_active_count= --A: power/wakeup_count= --A: power/wakeup_expire_count= --A: power/wakeup_last_time_ms= --A: power/wakeup_max_time_ms= --A: power/wakeup_total_time_ms= --A: product=xHCI Host Controller --A: quirks=0x0 --A: removable=unknown --A: rx_lanes=1 --A: serial=0000:00:14.0 --A: speed=480 --A: tx_lanes=1 --A: urbnum=956 --A: version= 2.00 -+A: idProduct=0002\n -+A: idVendor=1d6b\n -+A: interface_authorized_default=1\n -+A: ltm_capable=no\n -+A: manufacturer=Linux 5.8.0-59-generic xhci-hcd\n -+A: maxchild=12\n -+A: power/active_duration=378024\n -+A: power/async=enabled\n -+A: power/autosuspend=0\n -+A: power/autosuspend_delay_ms=0\n -+A: power/connected_duration=5527220\n -+A: power/control=auto\n -+A: power/level=auto\n -+A: power/runtime_active_kids=1\n -+A: power/runtime_active_time=377962\n -+A: power/runtime_enabled=enabled\n -+A: power/runtime_status=active\n -+A: power/runtime_suspended_time=5149253\n -+A: power/runtime_usage=0\n -+A: power/wakeup=disabled\n -+A: power/wakeup_abort_count=\n -+A: power/wakeup_active=\n -+A: power/wakeup_active_count=\n -+A: power/wakeup_count=\n -+A: power/wakeup_expire_count=\n -+A: power/wakeup_last_time_ms=\n -+A: power/wakeup_max_time_ms=\n -+A: power/wakeup_total_time_ms=\n -+A: product=xHCI Host Controller\n -+A: quirks=0x0\n -+A: removable=unknown\n -+A: rx_lanes=1\n -+A: serial=0000:00:14.0\n -+A: speed=480\n -+A: tx_lanes=1\n -+A: urbnum=956\n -+A: version= 2.00\n - - P: /devices/pci0000:00/0000:00:14.0 - E: DRIVER=xhci_hcd -@@ -183,46 +183,46 @@ E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller - E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI - E: ID_VENDOR_FROM_DATABASE=Intel Corporation - E: ID_MODEL_FROM_DATABASE=Sunrise Point-LP USB 3.0 xHCI Controller --A: ari_enabled=0 --A: broken_parity_status=0 --A: class=0x0c0330 -+A: ari_enabled=0\n -+A: broken_parity_status=0\n -+A: class=0x0c0330\n - H: config=86802F9D060490022130030C00008000040021A400000000000000000000000000000000000000000000000025108E11000000007000000000000000FF010000 --A: consistent_dma_mask_bits=64 --A: d3cold_allowed=1 --A: dbc=disabled --A: device=0x9d2f --A: dma_mask_bits=64 -+A: consistent_dma_mask_bits=64\n -+A: d3cold_allowed=1\n -+A: dbc=disabled\n -+A: device=0x9d2f\n -+A: dma_mask_bits=64\n - L: driver=../../../bus/pci/drivers/xhci_hcd --A: driver_override=(null) --A: enable=1 --A: irq=127 --A: local_cpulist=0-7 --A: local_cpus=ff --A: modalias=pci:v00008086d00009D2Fsv00001025sd0000118Ebc0Csc03i30 --A: msi_bus=1 --A: msi_irqs/127=msi --A: numa_node=-1 --A: pools=poolinfo - 0.1\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 0 0 128 0\nbuffer-32 0 0 32 0\nxHCI 1KB stream ctx arrays 0 0 1024 0\nxHCI 256 byte stream ctx arrays 0 0 256 0\nxHCI input/output contexts 9 10 2112 10\nxHCI ring segments 32 36 4096 36\nbuffer-2048 1 2 2048 1\nbuffer-512 0 0 512 0\nbuffer-128 0 0 128 0\nbuffer-32 0 0 32 0 --A: power/async=enabled --A: power/control=on --A: power/runtime_active_kids=1 --A: power/runtime_active_time=5524703 --A: power/runtime_enabled=forbidden --A: power/runtime_status=active --A: power/runtime_suspended_time=3373 --A: power/runtime_usage=1 --A: power/wakeup=enabled --A: power/wakeup_abort_count=0 --A: power/wakeup_active=0 --A: power/wakeup_active_count=0 --A: power/wakeup_count=0 --A: power/wakeup_expire_count=0 --A: power/wakeup_last_time_ms=0 --A: power/wakeup_max_time_ms=0 --A: power/wakeup_total_time_ms=0 --A: resource=0x00000000a4210000 0x00000000a421ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000 --A: revision=0x21 --A: subsystem_device=0x118e --A: subsystem_vendor=0x1025 --A: vendor=0x8086 -+A: driver_override=(null)\n -+A: enable=1\n -+A: irq=127\n -+A: local_cpulist=0-7\n -+A: local_cpus=ff\n -+A: modalias=pci:v00008086d00009D2Fsv00001025sd0000118Ebc0Csc03i30\n -+A: msi_bus=1\n -+A: msi_irqs/127=msi\n -+A: numa_node=-1\n -+A: pools=poolinfo - 0.1\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 0 0 128 0\nbuffer-32 0 0 32 0\nxHCI 1KB stream ctx arrays 0 0 1024 0\nxHCI 256 byte stream ctx arrays 0 0 256 0\nxHCI input/output contexts 9 10 2112 10\nxHCI ring segments 32 36 4096 36\nbuffer-2048 1 2 2048 1\nbuffer-512 0 0 512 0\nbuffer-128 0 0 128 0\nbuffer-32 0 0 32 0\n -+A: power/async=enabled\n -+A: power/control=on\n -+A: power/runtime_active_kids=1\n -+A: power/runtime_active_time=5524703\n -+A: power/runtime_enabled=forbidden\n -+A: power/runtime_status=active\n -+A: power/runtime_suspended_time=3373\n -+A: power/runtime_usage=1\n -+A: power/wakeup=enabled\n -+A: power/wakeup_abort_count=0\n -+A: power/wakeup_active=0\n -+A: power/wakeup_active_count=0\n -+A: power/wakeup_count=0\n -+A: power/wakeup_expire_count=0\n -+A: power/wakeup_last_time_ms=0\n -+A: power/wakeup_max_time_ms=0\n -+A: power/wakeup_total_time_ms=0\n -+A: resource=0x00000000a4210000 0x00000000a421ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n -+A: revision=0x21\n -+A: subsystem_device=0x118e\n -+A: subsystem_vendor=0x1025\n -+A: vendor=0x8086\n - -diff --git a/tests/elanmoc/device b/tests/elanmoc/device -index 8d47c2d..ef3400d 100644 ---- a/tests/elanmoc/device -+++ b/tests/elanmoc/device -@@ -23,62 +23,62 @@ E: ID_USB_INTERFACES=:ff0000: - E: ID_VENDOR_FROM_DATABASE=Elan Microelectronics Corp. - E: ID_PATH=pci-0000:00:14.0-usb-0:1 - E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_1 --A: authorized=1 --A: avoid_reset_quirk=0 --A: bConfigurationValue=1 --A: bDeviceClass=00 --A: bDeviceProtocol=00 --A: bDeviceSubClass=00 --A: bMaxPacketSize0=64 --A: bMaxPower=100mA --A: bNumConfigurations=1 --A: bNumInterfaces= 1 --A: bcdDevice=0305 --A: bmAttributes=a0 --A: busnum=1 --A: configuration=add909c9-e67e-4126-a6f7-1e31179e27d9 -+A: authorized=1\n -+A: avoid_reset_quirk=0\n -+A: bConfigurationValue=1\n -+A: bDeviceClass=00\n -+A: bDeviceProtocol=00\n -+A: bDeviceSubClass=00\n -+A: bMaxPacketSize0=64\n -+A: bMaxPower=100mA\n -+A: bNumConfigurations=1\n -+A: bNumInterfaces= 1\n -+A: bcdDevice=0305\n -+A: bmAttributes=a0\n -+A: busnum=1\n -+A: configuration=add909c9-e67e-4126-a6f7-1e31179e27d9\n - H: descriptors=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001 --A: dev=189:9 --A: devnum=10 --A: devpath=1 -+A: dev=189:9\n -+A: devnum=10\n -+A: devpath=1\n - L: driver=../../../../../bus/usb/drivers/usb --A: idProduct=0c7e --A: idVendor=04f3 --A: ltm_capable=no --A: manufacturer=ELAN --A: maxchild=0 -+A: idProduct=0c7e\n -+A: idVendor=04f3\n -+A: ltm_capable=no\n -+A: manufacturer=ELAN\n -+A: maxchild=0\n - L: port=../1-0:1.0/usb1-port1 --A: power/active_duration=94712 --A: power/async=enabled --A: power/autosuspend=2 --A: power/autosuspend_delay_ms=2000 --A: power/connected_duration=94712 --A: power/control=on --A: power/level=on --A: power/persist=1 --A: power/runtime_active_kids=0 --A: power/runtime_active_time=94436 --A: power/runtime_enabled=forbidden --A: power/runtime_status=active --A: power/runtime_suspended_time=0 --A: power/runtime_usage=1 --A: power/wakeup=disabled --A: power/wakeup_abort_count= --A: power/wakeup_active= --A: power/wakeup_active_count= --A: power/wakeup_count= --A: power/wakeup_expire_count= --A: power/wakeup_last_time_ms= --A: power/wakeup_max_time_ms= --A: power/wakeup_total_time_ms= --A: product=ELAN:ARM-M4 --A: quirks=0x0 --A: removable=removable --A: rx_lanes=1 --A: speed=12 --A: tx_lanes=1 --A: urbnum=12 --A: version= 2.00 -+A: power/active_duration=94712\n -+A: power/async=enabled\n -+A: power/autosuspend=2\n -+A: power/autosuspend_delay_ms=2000\n -+A: power/connected_duration=94712\n -+A: power/control=on\n -+A: power/level=on\n -+A: power/persist=1\n -+A: power/runtime_active_kids=0\n -+A: power/runtime_active_time=94436\n -+A: power/runtime_enabled=forbidden\n -+A: power/runtime_status=active\n -+A: power/runtime_suspended_time=0\n -+A: power/runtime_usage=1\n -+A: power/wakeup=disabled\n -+A: power/wakeup_abort_count=\n -+A: power/wakeup_active=\n -+A: power/wakeup_active_count=\n -+A: power/wakeup_count=\n -+A: power/wakeup_expire_count=\n -+A: power/wakeup_last_time_ms=\n -+A: power/wakeup_max_time_ms=\n -+A: power/wakeup_total_time_ms=\n -+A: product=ELAN:ARM-M4\n -+A: quirks=0x0\n -+A: removable=removable\n -+A: rx_lanes=1\n -+A: speed=12\n -+A: tx_lanes=1\n -+A: urbnum=12\n -+A: version= 2.00\n - - P: /devices/pci0000:00/0000:00:14.0/usb1 - N: bus/usb/001/001=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C -@@ -109,63 +109,63 @@ E: ID_PATH=pci-0000:00:14.0 - E: ID_PATH_TAG=pci-0000_00_14_0 - E: ID_FOR_SEAT=usb-pci-0000_00_14_0 - E: TAGS=:seat: --A: authorized=1 --A: authorized_default=1 --A: avoid_reset_quirk=0 --A: bConfigurationValue=1 --A: bDeviceClass=09 --A: bDeviceProtocol=01 --A: bDeviceSubClass=00 --A: bMaxPacketSize0=64 --A: bMaxPower=0mA --A: bNumConfigurations=1 --A: bNumInterfaces= 1 --A: bcdDevice=0504 --A: bmAttributes=e0 --A: busnum=1 --A: configuration= -+A: authorized=1\n -+A: authorized_default=1\n -+A: avoid_reset_quirk=0\n -+A: bConfigurationValue=1\n -+A: bDeviceClass=09\n -+A: bDeviceProtocol=01\n -+A: bDeviceSubClass=00\n -+A: bMaxPacketSize0=64\n -+A: bMaxPower=0mA\n -+A: bNumConfigurations=1\n -+A: bNumInterfaces= 1\n -+A: bcdDevice=0504\n -+A: bmAttributes=e0\n -+A: busnum=1\n -+A: configuration=\n - H: descriptors=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C --A: dev=189:0 --A: devnum=1 --A: devpath=0 -+A: dev=189:0\n -+A: devnum=1\n -+A: devpath=0\n - L: driver=../../../../bus/usb/drivers/usb --A: idProduct=0002 --A: idVendor=1d6b --A: interface_authorized_default=1 --A: ltm_capable=no --A: manufacturer=Linux 5.4.0-42-generic xhci-hcd --A: maxchild=12 --A: power/active_duration=74604360 --A: power/async=enabled --A: power/autosuspend=0 --A: power/autosuspend_delay_ms=0 --A: power/connected_duration=74606456 --A: power/control=auto --A: power/level=auto --A: power/runtime_active_kids=4 --A: power/runtime_active_time=74605838 --A: power/runtime_enabled=enabled --A: power/runtime_status=active --A: power/runtime_suspended_time=0 --A: power/runtime_usage=0 --A: power/wakeup=disabled --A: power/wakeup_abort_count= --A: power/wakeup_active= --A: power/wakeup_active_count= --A: power/wakeup_count= --A: power/wakeup_expire_count= --A: power/wakeup_last_time_ms= --A: power/wakeup_max_time_ms= --A: power/wakeup_total_time_ms= --A: product=xHCI Host Controller --A: quirks=0x0 --A: removable=unknown --A: rx_lanes=1 --A: serial=0000:00:14.0 --A: speed=480 --A: tx_lanes=1 --A: urbnum=490 --A: version= 2.00 -+A: idProduct=0002\n -+A: idVendor=1d6b\n -+A: interface_authorized_default=1\n -+A: ltm_capable=no\n -+A: manufacturer=Linux 5.4.0-42-generic xhci-hcd\n -+A: maxchild=12\n -+A: power/active_duration=74604360\n -+A: power/async=enabled\n -+A: power/autosuspend=0\n -+A: power/autosuspend_delay_ms=0\n -+A: power/connected_duration=74606456\n -+A: power/control=auto\n -+A: power/level=auto\n -+A: power/runtime_active_kids=4\n -+A: power/runtime_active_time=74605838\n -+A: power/runtime_enabled=enabled\n -+A: power/runtime_status=active\n -+A: power/runtime_suspended_time=0\n -+A: power/runtime_usage=0\n -+A: power/wakeup=disabled\n -+A: power/wakeup_abort_count=\n -+A: power/wakeup_active=\n -+A: power/wakeup_active_count=\n -+A: power/wakeup_count=\n -+A: power/wakeup_expire_count=\n -+A: power/wakeup_last_time_ms=\n -+A: power/wakeup_max_time_ms=\n -+A: power/wakeup_total_time_ms=\n -+A: product=xHCI Host Controller\n -+A: quirks=0x0\n -+A: removable=unknown\n -+A: rx_lanes=1\n -+A: serial=0000:00:14.0\n -+A: speed=480\n -+A: tx_lanes=1\n -+A: urbnum=490\n -+A: version= 2.00\n - - P: /devices/pci0000:00/0000:00:14.0 - E: DRIVER=xhci_hcd -@@ -180,46 +180,46 @@ E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller - E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI - E: ID_VENDOR_FROM_DATABASE=Intel Corporation - E: ID_MODEL_FROM_DATABASE=Cannon Point-LP USB 3.1 xHCI Controller --A: ari_enabled=0 --A: broken_parity_status=0 --A: class=0x0c0330 -+A: ari_enabled=0\n -+A: broken_parity_status=0\n -+A: class=0x0c0330\n - H: config=8680ED9D060490023030030C00008000040030A10000000000000000000000000000000000000000000000003C10EF85000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000181C030400000000316000000000000000000000000000000180C2C1080000000000000000000000059087007802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000B50F300112000000 --A: consistent_dma_mask_bits=64 --A: d3cold_allowed=1 --A: dbc=disabled --A: device=0x9ded --A: dma_mask_bits=64 -+A: consistent_dma_mask_bits=64\n -+A: d3cold_allowed=1\n -+A: dbc=disabled\n -+A: device=0x9ded\n -+A: dma_mask_bits=64\n - L: driver=../../../bus/pci/drivers/xhci_hcd --A: driver_override=(null) --A: enable=1 --A: irq=124 --A: local_cpulist=0-3 --A: local_cpus=f --A: modalias=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30 --A: msi_bus=1 --A: msi_irqs/124=msi --A: numa_node=-1 --A: pools=poolinfo - 0.1\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 0 32 128 1\nbuffer-32 0 0 32 0\nxHCI 1KB stream ctx arrays 0 0 1024 0\nxHCI 256 byte stream ctx arrays 0 0 256 0\nxHCI input/output contexts 11 12 2112 12\nxHCI ring segments 54 54 4096 54\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 9 32 128 1\nbuffer-32 0 0 32 0 --A: power/async=enabled --A: power/control=auto --A: power/runtime_active_kids=1 --A: power/runtime_active_time=74606194 --A: power/runtime_enabled=enabled --A: power/runtime_status=active --A: power/runtime_suspended_time=0 --A: power/runtime_usage=0 --A: power/wakeup=enabled --A: power/wakeup_abort_count=0 --A: power/wakeup_active=0 --A: power/wakeup_active_count=0 --A: power/wakeup_count=0 --A: power/wakeup_expire_count=0 --A: power/wakeup_last_time_ms=0 --A: power/wakeup_max_time_ms=0 --A: power/wakeup_total_time_ms=0 --A: resource=0x00000000a1300000 0x00000000a130ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000 --A: revision=0x30 --A: subsystem_device=0x85ef --A: subsystem_vendor=0x103c --A: vendor=0x8086 -+A: driver_override=(null)\n -+A: enable=1\n -+A: irq=124\n -+A: local_cpulist=0-3\n -+A: local_cpus=f\n -+A: modalias=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30\n -+A: msi_bus=1\n -+A: msi_irqs/124=msi\n -+A: numa_node=-1\n -+A: pools=poolinfo - 0.1\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 0 32 128 1\nbuffer-32 0 0 32 0\nxHCI 1KB stream ctx arrays 0 0 1024 0\nxHCI 256 byte stream ctx arrays 0 0 256 0\nxHCI input/output contexts 11 12 2112 12\nxHCI ring segments 54 54 4096 54\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 9 32 128 1\nbuffer-32 0 0 32 0\n -+A: power/async=enabled\n -+A: power/control=auto\n -+A: power/runtime_active_kids=1\n -+A: power/runtime_active_time=74606194\n -+A: power/runtime_enabled=enabled\n -+A: power/runtime_status=active\n -+A: power/runtime_suspended_time=0\n -+A: power/runtime_usage=0\n -+A: power/wakeup=enabled\n -+A: power/wakeup_abort_count=0\n -+A: power/wakeup_active=0\n -+A: power/wakeup_active_count=0\n -+A: power/wakeup_count=0\n -+A: power/wakeup_expire_count=0\n -+A: power/wakeup_last_time_ms=0\n -+A: power/wakeup_max_time_ms=0\n -+A: power/wakeup_total_time_ms=0\n -+A: resource=0x00000000a1300000 0x00000000a130ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n -+A: revision=0x30\n -+A: subsystem_device=0x85ef\n -+A: subsystem_vendor=0x103c\n -+A: vendor=0x8086\n - -diff --git a/tests/goodixmoc/device b/tests/goodixmoc/device -index e92ffbb..9fb39e5 100644 ---- a/tests/goodixmoc/device -+++ b/tests/goodixmoc/device -@@ -25,60 +25,60 @@ E: ID_VENDOR_FROM_DATABASE=Shenzhen Goodix Technology Co.,Ltd. - E: ID_AUTOSUSPEND=1 - E: ID_PATH=pci-0000:00:14.0-usb-0:3 - E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_3 --A: authorized=1 --A: avoid_reset_quirk=0 --A: bConfigurationValue=1 --A: bDeviceClass=ef --A: bDeviceProtocol=00 --A: bDeviceSubClass=00 --A: bMaxPacketSize0=64 --A: bMaxPower=100mA --A: bNumConfigurations=1 --A: bNumInterfaces= 1 --A: bcdDevice=0100 --A: bmAttributes=a0 --A: busnum=1 --A: configuration=XXXX_MOC_B0 -+A: authorized=1\n -+A: avoid_reset_quirk=0\n -+A: bConfigurationValue=1\n -+A: bDeviceClass=ef\n -+A: bDeviceProtocol=00\n -+A: bDeviceSubClass=00\n -+A: bMaxPacketSize0=64\n -+A: bMaxPower=100mA\n -+A: bNumConfigurations=1\n -+A: bNumInterfaces= 1\n -+A: bcdDevice=0100\n -+A: bmAttributes=a0\n -+A: busnum=1\n -+A: configuration=XXXX_MOC_B0\n - H: descriptors=12010002EF000040C627966400010102030109022000010103A0320904000002FF0000040705830240000007050102400000 --A: dev=189:52 --A: devnum=53 --A: devpath=3 -+A: dev=189:52\n -+A: devnum=53\n -+A: devpath=3\n - L: driver=../../../../../bus/usb/drivers/usb - L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d/device:20 --A: idProduct=6496 --A: idVendor=27c6 --A: ltm_capable=no --A: manufacturer=Goodix Technology Co., Ltd. --A: maxchild=0 -+A: idProduct=6496\n -+A: idVendor=27c6\n -+A: ltm_capable=no\n -+A: manufacturer=Goodix Technology Co., Ltd.\n -+A: maxchild=0\n - L: port=../1-0:1.0/usb1-port3 --A: power/active_duration=29262 --A: power/autosuspend=2 --A: power/autosuspend_delay_ms=2000 --A: power/connected_duration=57399 --A: power/control=auto --A: power/level=auto --A: power/persist=1 --A: power/runtime_active_time=29308 --A: power/runtime_status=active --A: power/runtime_suspended_time=27850 --A: power/wakeup=disabled --A: power/wakeup_abort_count= --A: power/wakeup_active= --A: power/wakeup_active_count= --A: power/wakeup_count= --A: power/wakeup_expire_count= --A: power/wakeup_last_time_ms= --A: power/wakeup_max_time_ms= --A: power/wakeup_total_time_ms= --A: product=Goodix USB2.0 MISC --A: quirks=0x0 --A: removable=removable --A: rx_lanes=1 --A: serial=XXXX_MOC_B0 --A: speed=12 --A: tx_lanes=1 --A: urbnum=394 --A: version= 2.00 -+A: power/active_duration=29262\n -+A: power/autosuspend=2\n -+A: power/autosuspend_delay_ms=2000\n -+A: power/connected_duration=57399\n -+A: power/control=auto\n -+A: power/level=auto\n -+A: power/persist=1\n -+A: power/runtime_active_time=29308\n -+A: power/runtime_status=active\n -+A: power/runtime_suspended_time=27850\n -+A: power/wakeup=disabled\n -+A: power/wakeup_abort_count=\n -+A: power/wakeup_active=\n -+A: power/wakeup_active_count=\n -+A: power/wakeup_count=\n -+A: power/wakeup_expire_count=\n -+A: power/wakeup_last_time_ms=\n -+A: power/wakeup_max_time_ms=\n -+A: power/wakeup_total_time_ms=\n -+A: product=Goodix USB2.0 MISC\n -+A: quirks=0x0\n -+A: removable=removable\n -+A: rx_lanes=1\n -+A: serial=XXXX_MOC_B0\n -+A: speed=12\n -+A: tx_lanes=1\n -+A: urbnum=394\n -+A: version= 2.00\n - - P: /devices/pci0000:00/0000:00:14.0/usb1 - N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C -@@ -111,66 +111,66 @@ E: ID_PATH_TAG=pci-0000_00_14_0 - E: ID_FOR_SEAT=usb-pci-0000_00_14_0 - E: TAGS=:seat: - E: CURRENT_TAGS=:seat: --A: authorized=1 --A: authorized_default=1 --A: avoid_reset_quirk=0 --A: bConfigurationValue=1 --A: bDeviceClass=09 --A: bDeviceProtocol=01 --A: bDeviceSubClass=00 --A: bMaxPacketSize0=64 --A: bMaxPower=0mA --A: bNumConfigurations=1 --A: bNumInterfaces= 1 --A: bcdDevice=0513 --A: bmAttributes=e0 --A: busnum=1 --A: configuration= -+A: authorized=1\n -+A: authorized_default=1\n -+A: avoid_reset_quirk=0\n -+A: bConfigurationValue=1\n -+A: bDeviceClass=09\n -+A: bDeviceProtocol=01\n -+A: bDeviceSubClass=00\n -+A: bMaxPacketSize0=64\n -+A: bMaxPower=0mA\n -+A: bNumConfigurations=1\n -+A: bNumInterfaces= 1\n -+A: bcdDevice=0513\n -+A: bmAttributes=e0\n -+A: busnum=1\n -+A: configuration=\n - H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C --A: dev=189:0 --A: devnum=1 --A: devpath=0 -+A: dev=189:0\n -+A: devnum=1\n -+A: devpath=0\n - L: driver=../../../../bus/usb/drivers/usb - L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d --A: idProduct=0002 --A: idVendor=1d6b --A: interface_authorized_default=1 --A: ltm_capable=no --A: manufacturer=Linux 5.13.15-200.fc34.x86_64 xhci-hcd --A: maxchild=12 --A: power/active_duration=219578717 --A: power/autosuspend=0 --A: power/autosuspend_delay_ms=0 --A: power/connected_duration=219649620 --A: power/control=auto --A: power/level=auto --A: power/runtime_active_time=219589127 --A: power/runtime_status=active --A: power/runtime_suspended_time=0 --A: power/wakeup=disabled --A: power/wakeup_abort_count= --A: power/wakeup_active= --A: power/wakeup_active_count= --A: power/wakeup_count= --A: power/wakeup_expire_count= --A: power/wakeup_last_time_ms= --A: power/wakeup_max_time_ms= --A: power/wakeup_total_time_ms= --A: product=xHCI Host Controller --A: quirks=0x0 --A: removable=unknown --A: rx_lanes=1 --A: serial=0000:00:14.0 --A: speed=480 --A: tx_lanes=1 --A: urbnum=4325 --A: version= 2.00 -+A: idProduct=0002\n -+A: idVendor=1d6b\n -+A: interface_authorized_default=1\n -+A: ltm_capable=no\n -+A: manufacturer=Linux 5.13.15-200.fc34.x86_64 xhci-hcd\n -+A: maxchild=12\n -+A: power/active_duration=219578717\n -+A: power/autosuspend=0\n -+A: power/autosuspend_delay_ms=0\n -+A: power/connected_duration=219649620\n -+A: power/control=auto\n -+A: power/level=auto\n -+A: power/runtime_active_time=219589127\n -+A: power/runtime_status=active\n -+A: power/runtime_suspended_time=0\n -+A: power/wakeup=disabled\n -+A: power/wakeup_abort_count=\n -+A: power/wakeup_active=\n -+A: power/wakeup_active_count=\n -+A: power/wakeup_count=\n -+A: power/wakeup_expire_count=\n -+A: power/wakeup_last_time_ms=\n -+A: power/wakeup_max_time_ms=\n -+A: power/wakeup_total_time_ms=\n -+A: product=xHCI Host Controller\n -+A: quirks=0x0\n -+A: removable=unknown\n -+A: rx_lanes=1\n -+A: serial=0000:00:14.0\n -+A: speed=480\n -+A: tx_lanes=1\n -+A: urbnum=4325\n -+A: version= 2.00\n - - P: /devices/pci0000:00/0000:00:14.0 - E: DRIVER=xhci_hcd - E: PCI_CLASS=C0330 - E: PCI_ID=8086:9DED --E: PCI_SUBSYS_ID=17AA:2292 -+E: PCI_SUBSYS_ID=17AA:2292\n - E: PCI_SLOT_NAME=0000:00:14.0 - E: MODALIAS=pci:v00008086d00009DEDsv000017AAsd00002292bc0Csc03i30 - E: SUBSYSTEM=pci -@@ -180,44 +180,44 @@ E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI - E: ID_VENDOR_FROM_DATABASE=Intel Corporation - E: ID_AUTOSUSPEND=1 - E: ID_MODEL_FROM_DATABASE=Cannon Point-LP USB 3.1 xHCI Controller --A: ari_enabled=0 --A: broken_parity_status=0 --A: class=0x0c0330 -+A: ari_enabled=0\n -+A: broken_parity_status=0\n -+A: class=0x0c0330\n - H: config=8680ED9D060490021130030C00008000040022EA000000000000000000000000000000000000000000000000AA179222000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F000000004C084B0100000000316000000000000000000000000000000180C2C1080000000000000000000000059087001803E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000000000000000000008000000040000000000000000000000000000000000000000000000000000000800000004000000000000000000000000000000000000000000000000000000B50F320112000000 --A: consistent_dma_mask_bits=64 --A: d3cold_allowed=1 --A: dbc=disabled --A: device=0x9ded --A: dma_mask_bits=64 -+A: consistent_dma_mask_bits=64\n -+A: d3cold_allowed=1\n -+A: dbc=disabled\n -+A: device=0x9ded\n -+A: dma_mask_bits=64\n - L: driver=../../../bus/pci/drivers/xhci_hcd --A: driver_override=(null) --A: enable=1 -+A: driver_override=(null)\n -+A: enable=1\n - L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c --A: irq=128 --A: local_cpulist=0-7 --A: local_cpus=ff --A: modalias=pci:v00008086d00009DEDsv000017AAsd00002292bc0Csc03i30 --A: msi_bus=1 --A: msi_irqs/128=msi --A: numa_node=-1 --A: pools=poolinfo - 0.1\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 0 0 128 0\nbuffer-32 0 0 32 0\nxHCI 1KB stream ctx arrays 0 0 1024 0\nxHCI 256 byte stream ctx arrays 0 0 256 0\nxHCI input/output contexts 11 12 2112 12\nxHCI ring segments 46 50 4096 50\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 6 32 128 1\nbuffer-32 0 0 32 0 --A: power/control=on --A: power/runtime_active_time=219589302 --A: power/runtime_status=active --A: power/runtime_suspended_time=0 --A: power/wakeup=enabled --A: power/wakeup_abort_count=0 --A: power/wakeup_active=0 --A: power/wakeup_active_count=0 --A: power/wakeup_count=0 --A: power/wakeup_expire_count=0 --A: power/wakeup_last_time_ms=0 --A: power/wakeup_max_time_ms=0 --A: power/wakeup_total_time_ms=0 --A: power_state=D0 --A: resource=0x00000000ea220000 0x00000000ea22ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000 --A: revision=0x11 --A: subsystem_device=0x2292 --A: subsystem_vendor=0x17aa --A: vendor=0x8086 -+A: irq=128\n -+A: local_cpulist=0-7\n -+A: local_cpus=ff\n -+A: modalias=pci:v00008086d00009DEDsv000017AAsd00002292bc0Csc03i30\n -+A: msi_bus=1\n -+A: msi_irqs/128=msi\n -+A: numa_node=-1\n -+A: pools=poolinfo - 0.1\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 0 0 128 0\nbuffer-32 0 0 32 0\nxHCI 1KB stream ctx arrays 0 0 1024 0\nxHCI 256 byte stream ctx arrays 0 0 256 0\nxHCI input/output contexts 11 12 2112 12\nxHCI ring segments 46 50 4096 50\nbuffer-2048 0 0 2048 0\nbuffer-512 0 0 512 0\nbuffer-128 6 32 128 1\nbuffer-32 0 0 32 0\n -+A: power/control=on\n -+A: power/runtime_active_time=219589302\n -+A: power/runtime_status=active\n -+A: power/runtime_suspended_time=0\n -+A: power/wakeup=enabled\n -+A: power/wakeup_abort_count=0\n -+A: power/wakeup_active=0\n -+A: power/wakeup_active_count=0\n -+A: power/wakeup_count=0\n -+A: power/wakeup_expire_count=0\n -+A: power/wakeup_last_time_ms=0\n -+A: power/wakeup_max_time_ms=0\n -+A: power/wakeup_total_time_ms=0\n -+A: power_state=D0\n -+A: resource=0x00000000ea220000 0x00000000ea22ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n -+A: revision=0x11\n -+A: subsystem_device=0x2292\n -+A: subsystem_vendor=0x17aa\n -+A: vendor=0x8086\n - From 683b882f97849b81323fa7f6c498f85649e66b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 3 Nov 2021 17:39:22 +0100 Subject: [PATCH 07/29] Update changelog --- debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e35359d4..d8f2cca6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,14 @@ libfprint (1:1.94.2-1) UNRELEASED; urgency=medium * New upstream release * debian/libfprint-2-2.postinst: Devices triggers updated + * debian/libfprint-2-*.install: Use more restrictive rules to reduce ubuntu + delta + * debian/update-udev-triggers: Ignore errors on udevadm trigger. + These are not fatal for package installation and rebuild postinst script + * debian/watch: Use @PACKAGE@ + * debian/patches: Drop, all applied upstream - -- Marco Trevisan (Treviño) Wed, 03 Nov 2021 17:28:44 +0100 + -- Marco Trevisan (Treviño) Wed, 03 Nov 2021 17:37:40 +0100 libfprint (1:1.94.1-1) unstable; urgency=medium From 8772056484c8f63a5fd1af1dc9fdbc671e247bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 3 Nov 2021 17:39:27 +0100 Subject: [PATCH 08/29] Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8f2cca6..a383739f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libfprint (1:1.94.2-1) UNRELEASED; urgency=medium +libfprint (1:1.94.2-1) unstable; urgency=medium * New upstream release * debian/libfprint-2-2.postinst: Devices triggers updated @@ -9,7 +9,7 @@ libfprint (1:1.94.2-1) UNRELEASED; urgency=medium * debian/watch: Use @PACKAGE@ * debian/patches: Drop, all applied upstream - -- Marco Trevisan (Treviño) Wed, 03 Nov 2021 17:37:40 +0100 + -- Marco Trevisan (Treviño) Wed, 03 Nov 2021 17:39:27 +0100 libfprint (1:1.94.1-1) unstable; urgency=medium From 42c823205bcf76c2cd0a757c629f5acc2773a3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Oct 2022 00:55:31 +0200 Subject: [PATCH 09/29] New upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a383739f..2caacb7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libfprint (1:1.94.5-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Marco Trevisan (Treviño) Fri, 14 Oct 2022 00:55:31 +0200 + libfprint (1:1.94.2-1) unstable; urgency=medium * New upstream release From 81230b793c01a3f063881381d877df24bb291163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Oct 2022 00:55:33 +0200 Subject: [PATCH 10/29] debian/libfprint-2-2.postinst: Devices triggers updated --- debian/changelog | 1 + debian/libfprint-2-2.postinst | 47 +++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2caacb7d..35500779 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libfprint (1:1.94.5-1) UNRELEASED; urgency=medium * New upstream release + * debian/libfprint-2-2.postinst: Devices triggers updated -- Marco Trevisan (Treviño) Fri, 14 Oct 2022 00:55:31 +0200 diff --git a/debian/libfprint-2-2.postinst b/debian/libfprint-2-2.postinst index c8de3b90..52f4152d 100644 --- a/debian/libfprint-2-2.postinst +++ b/debian/libfprint-2-2.postinst @@ -110,6 +110,7 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c33 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c3d || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c42 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4b || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4d || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4f || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c63 || true @@ -117,10 +118,24 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c58 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c7d || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c7e || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c82 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c88 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c8c || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c8d || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0603 || true + udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=ffe0 || true + udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=a305 || true + udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=da04 || true + udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=d805 || true + udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=d205 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5840 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6014 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6094 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=609c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=60a2 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=631c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=634c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6384 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=639c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63ac || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=63bc || true @@ -130,6 +145,7 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=658c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6592 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6594 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=659a || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=659c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6a94 || true udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=1010 || true @@ -138,17 +154,20 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f9 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00fc || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c2 || true - udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c9 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0100 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00f0 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0103 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0123 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0126 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0129 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0168 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=015f || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0104 || true udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=2016 || true udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1000 || true udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=1001 || true udevadm trigger --action=add --attr-match=idVendor=0483 --attr-match=idProduct=2015 || true + udevadm trigger --action=add --attr-match=idVendor=0483 --attr-match=idProduct=2017 || true udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=3001 || true udevadm trigger --action=add --attr-match=idVendor=147e --attr-match=idProduct=2020 || true udevadm trigger --action=add --attr-match=idVendor=045e --attr-match=idProduct=00bc || true @@ -168,28 +187,39 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0017 || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0018 || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0091 || true + udevadm trigger --action=add --attr-match=idVendor=04e8 --attr-match=idProduct=730b || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=036b || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c00 || true - udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4b || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c4c || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c57 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c5e || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c5a || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c70 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c72 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=2706 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3057 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=3104 || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=310d || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0081 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=0088 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=008a || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=009a || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=009b || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00a2 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00a8 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00b7 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00bb || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00be || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c4 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00cb || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00c9 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00d8 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00da || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00dc || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e4 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e7 || true udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00e9 || true + udevadm trigger --action=add --attr-match=idVendor=06cb --attr-match=idProduct=00fd || true udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5801 || true udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5805 || true udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5834 || true @@ -201,6 +231,8 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=0a5c --attr-match=idProduct=5845 || true udevadm trigger --action=add --attr-match=idVendor=0bda --attr-match=idProduct=5812 || true udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=0007 || true + udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=9200 || true + udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=9800 || true udevadm trigger --action=add --attr-match=idVendor=1188 --attr-match=idProduct=9545 || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=0007 || true udevadm trigger --action=add --attr-match=idVendor=138a --attr-match=idProduct=003a || true @@ -218,26 +250,37 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=16d1 --attr-match=idProduct=1027 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0300 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0575 || true + udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0576 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5042 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5110 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5117 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5120 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5125 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5201 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=521d || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5301 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=530c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=532d || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5335 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=533c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5381 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5385 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=538c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=538d || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5395 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5503 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=550a || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=550c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5584 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55a2 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55a4 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=55b4 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5740 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5e0a || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=581a || true udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=9338 || true + udevadm trigger --action=add --attr-match=idVendor=2808 --attr-match=idProduct=93a9 || true + udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=2020 || true udevadm trigger --action=add --attr-match=idVendor=298d --attr-match=idProduct=2033 || true udevadm trigger --action=add --attr-match=idVendor=3538 --attr-match=idProduct=0930 || true From 73ceb9e39c4de8b7f4875ae778d0ae24f3c9bbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Oct 2022 00:59:50 +0200 Subject: [PATCH 11/29] debian/patches: Cherry-pick post-release upstream cleanups --- ...ce-private-functions-to-public-libra.patch | 116 ++++++++++++++ ...ove-config.h-inclusion-in-fpi-header.patch | 81 ++++++++++ ...heck-for-PIXMAN-presency-using-ifdef.patch | 33 ++++ ...-Actually-bump-the-version-to-1.94.5.patch | 19 +++ debian/patches/series | 5 + ...more-logging-showing-the-current-dev.patch | 145 ++++++++++++++++++ 6 files changed, 399 insertions(+) create mode 100644 debian/patches/fp-device-Move-FpDevice-private-functions-to-public-libra.patch create mode 100644 debian/patches/fp-image-Remove-config.h-inclusion-in-fpi-header.patch create mode 100644 debian/patches/fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch create mode 100644 debian/patches/meson-Actually-bump-the-version-to-1.94.5.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/test-device-fake-Add-more-logging-showing-the-current-dev.patch diff --git a/debian/patches/fp-device-Move-FpDevice-private-functions-to-public-libra.patch b/debian/patches/fp-device-Move-FpDevice-private-functions-to-public-libra.patch new file mode 100644 index 00000000..e5894d99 --- /dev/null +++ b/debian/patches/fp-device-Move-FpDevice-private-functions-to-public-libra.patch @@ -0,0 +1,116 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Thu, 13 Oct 2022 19:42:50 +0200 +Subject: fp-device: Move FpDevice private functions to public library + +This these functions are not really needed by anything else than +FpDevice, so move them back to the cpp file, so that we don't expose +them in the private library, given that we don't need them +--- + libfprint/fp-device-private.h | 3 --- + libfprint/fp-device.c | 26 ++++++++++++++++++++++++++ + libfprint/fpi-device.c | 27 --------------------------- + 3 files changed, 26 insertions(+), 30 deletions(-) + +diff --git a/libfprint/fp-device-private.h b/libfprint/fp-device-private.h +index 9b2ea27..759a678 100644 +--- a/libfprint/fp-device-private.h ++++ b/libfprint/fp-device-private.h +@@ -111,8 +111,6 @@ typedef struct + GDestroyNotify enroll_progress_destroy; + } FpEnrollData; + +-void enroll_data_free (FpEnrollData *enroll_data); +- + typedef struct + { + FpPrint *enrolled_print; /* verify */ +@@ -128,7 +126,6 @@ typedef struct + GDestroyNotify match_destroy; + } FpMatchData; + +-void match_data_free (FpMatchData *match_data); + + void fpi_device_suspend (FpDevice *device); + void fpi_device_resume (FpDevice *device); +diff --git a/libfprint/fp-device.c b/libfprint/fp-device.c +index 17178d1..c143644 100644 +--- a/libfprint/fp-device.c ++++ b/libfprint/fp-device.c +@@ -1088,6 +1088,15 @@ fp_device_resume_finish (FpDevice *device, + return g_task_propagate_boolean (G_TASK (result), error); + } + ++static void ++enroll_data_free (FpEnrollData *data) ++{ ++ if (data->enroll_progress_destroy) ++ data->enroll_progress_destroy (data->enroll_progress_data); ++ data->enroll_progress_data = NULL; ++ g_clear_object (&data->print); ++ g_free (data); ++} + + /** + * fp_device_enroll: +@@ -1217,6 +1226,23 @@ fp_device_enroll_finish (FpDevice *device, + return g_task_propagate_pointer (G_TASK (result), error); + } + ++static void ++match_data_free (FpMatchData *data) ++{ ++ g_clear_object (&data->print); ++ g_clear_object (&data->match); ++ g_clear_error (&data->error); ++ ++ if (data->match_destroy) ++ data->match_destroy (data->match_data); ++ data->match_data = NULL; ++ ++ g_clear_object (&data->enrolled_print); ++ g_clear_pointer (&data->gallery, g_ptr_array_unref); ++ ++ g_free (data); ++} ++ + /** + * fp_device_verify: + * @device: a #FpDevice +diff --git a/libfprint/fpi-device.c b/libfprint/fpi-device.c +index ba75065..1b9fa8f 100644 +--- a/libfprint/fpi-device.c ++++ b/libfprint/fpi-device.c +@@ -522,33 +522,6 @@ fpi_device_get_driver_data (FpDevice *device) + return priv->driver_data; + } + +-void +-enroll_data_free (FpEnrollData *data) +-{ +- if (data->enroll_progress_destroy) +- data->enroll_progress_destroy (data->enroll_progress_data); +- data->enroll_progress_data = NULL; +- g_clear_object (&data->print); +- g_free (data); +-} +- +-void +-match_data_free (FpMatchData *data) +-{ +- g_clear_object (&data->print); +- g_clear_object (&data->match); +- g_clear_error (&data->error); +- +- if (data->match_destroy) +- data->match_destroy (data->match_data); +- data->match_data = NULL; +- +- g_clear_object (&data->enrolled_print); +- g_clear_pointer (&data->gallery, g_ptr_array_unref); +- +- g_free (data); +-} +- + /** + * fpi_device_get_enroll_data: + * @device: The #FpDevice diff --git a/debian/patches/fp-image-Remove-config.h-inclusion-in-fpi-header.patch b/debian/patches/fp-image-Remove-config.h-inclusion-in-fpi-header.patch new file mode 100644 index 00000000..759c6405 --- /dev/null +++ b/debian/patches/fp-image-Remove-config.h-inclusion-in-fpi-header.patch @@ -0,0 +1,81 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Tue, 17 Dec 2019 04:33:20 +0100 +Subject: fp-image: Remove config.h inclusion in fpi-header + +And also avoid defining a function we expose depending on it's presency. +--- + libfprint/fp-image.c | 1 + + libfprint/fpi-image.c | 9 +++++++-- + libfprint/fpi-image.h | 3 --- + 3 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/libfprint/fp-image.c b/libfprint/fp-image.c +index f19c5df..8870cfa 100644 +--- a/libfprint/fp-image.c ++++ b/libfprint/fp-image.c +@@ -24,6 +24,7 @@ + #include "fpi-image.h" + #include "fpi-log.h" + ++#include + #include + + /** +diff --git a/libfprint/fpi-image.c b/libfprint/fpi-image.c +index b21982e..98f412a 100644 +--- a/libfprint/fpi-image.c ++++ b/libfprint/fpi-image.c +@@ -24,6 +24,7 @@ + #include "fpi-log.h" + + #include ++#include + + #ifdef HAVE_PIXMAN + #include +@@ -107,12 +108,12 @@ fpi_mean_sq_diff_norm (const guint8 *buf1, + return res / size; + } + +-#ifdef HAVE_PIXMAN + FpImage * + fpi_image_resize (FpImage *orig_img, + guint w_factor, + guint h_factor) + { ++#ifdef HAVE_PIXMAN + int new_width = orig_img->width * w_factor; + int new_height = orig_img->height * h_factor; + pixman_image_t *orig, *resized; +@@ -145,5 +146,9 @@ fpi_image_resize (FpImage *orig_img, + pixman_image_unref (resized); + + return newimg; +-} ++#else ++ fp_err ("Libfprint compiled without pixman support, impossible to resize"); ++ ++ return g_object_ref (orig_img); + #endif ++} +diff --git a/libfprint/fpi-image.h b/libfprint/fpi-image.h +index fcd62b8..3554bb7 100644 +--- a/libfprint/fpi-image.h ++++ b/libfprint/fpi-image.h +@@ -20,7 +20,6 @@ + + #pragma once + +-#include + #include "fp-image.h" + + /** +@@ -77,8 +76,6 @@ gint fpi_mean_sq_diff_norm (const guint8 *buf1, + const guint8 *buf2, + gint size); + +-#if HAVE_PIXMAN + FpImage *fpi_image_resize (FpImage *orig, + guint w_factor, + guint h_factor); +-#endif diff --git a/debian/patches/fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch b/debian/patches/fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch new file mode 100644 index 00000000..dcd3eb0d --- /dev/null +++ b/debian/patches/fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch @@ -0,0 +1,33 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Thu, 13 Oct 2022 12:03:31 +0200 +Subject: fpi-image: Check for PIXMAN presency using #ifdef + +That's a defined variable that may be there or not, and currently we +warn with: + - fpi-image.c:29:5: warning: "HAVE_PIXMAN" is not defined, evaluates to 0 +--- + libfprint/fpi-image.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfprint/fpi-image.c b/libfprint/fpi-image.c +index 47aac8d..b21982e 100644 +--- a/libfprint/fpi-image.c ++++ b/libfprint/fpi-image.c +@@ -25,7 +25,7 @@ + + #include + +-#if HAVE_PIXMAN ++#ifdef HAVE_PIXMAN + #include + #endif + +@@ -107,7 +107,7 @@ fpi_mean_sq_diff_norm (const guint8 *buf1, + return res / size; + } + +-#if HAVE_PIXMAN ++#ifdef HAVE_PIXMAN + FpImage * + fpi_image_resize (FpImage *orig_img, + guint w_factor, diff --git a/debian/patches/meson-Actually-bump-the-version-to-1.94.5.patch b/debian/patches/meson-Actually-bump-the-version-to-1.94.5.patch new file mode 100644 index 00000000..31775299 --- /dev/null +++ b/debian/patches/meson-Actually-bump-the-version-to-1.94.5.patch @@ -0,0 +1,19 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Thu, 13 Oct 2022 22:25:23 +0200 +Subject: meson: Actually bump the version to 1.94.5 + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e25a173..7bcd978 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ + project('libfprint', [ 'c', 'cpp' ], +- version: '1.94.4', ++ version: '1.94.5', + license: 'LGPLv2.1+', + default_options: [ + 'buildtype=debugoptimized', diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..332e214e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,5 @@ +meson-Actually-bump-the-version-to-1.94.5.patch +fp-device-Move-FpDevice-private-functions-to-public-libra.patch +test-device-fake-Add-more-logging-showing-the-current-dev.patch +fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch +fp-image-Remove-config.h-inclusion-in-fpi-header.patch diff --git a/debian/patches/test-device-fake-Add-more-logging-showing-the-current-dev.patch b/debian/patches/test-device-fake-Add-more-logging-showing-the-current-dev.patch new file mode 100644 index 00000000..5f2b3997 --- /dev/null +++ b/debian/patches/test-device-fake-Add-more-logging-showing-the-current-dev.patch @@ -0,0 +1,145 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Thu, 13 Oct 2022 19:46:58 +0200 +Subject: test-device-fake: Add more logging showing the current device action + +--- + tests/test-device-fake.c | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/tests/test-device-fake.c b/tests/test-device-fake.c +index 321bfe5..558ea91 100644 +--- a/tests/test-device-fake.c ++++ b/tests/test-device-fake.c +@@ -20,6 +20,7 @@ + + #define FP_COMPONENT "fake_test_dev" + ++#include "fpi-log.h" + #include "test-device-fake.h" + + G_DEFINE_TYPE (FpiDeviceFake, fpi_device_fake, FP_TYPE_DEVICE) +@@ -29,12 +30,28 @@ static const FpIdEntry driver_ids[] = { + { .virtual_envvar = NULL } + }; + ++static void ++ (debug_action) (FpDevice * device, ++ const gchar *func) ++{ ++ g_autofree char *action_str = NULL; ++ ++ action_str = g_enum_to_string (FPI_TYPE_DEVICE_ACTION, ++ fpi_device_get_current_action (device)); ++ ++ fp_dbg ("%s: Device %s in action %s\n", ++ func, fp_device_get_name (device), action_str); ++} ++ ++#define debug_action(d) (debug_action) ((d), G_STRFUNC) ++ + static void + fpi_device_fake_probe (FpDevice *device) + { + FpDeviceClass *dev_class = FP_DEVICE_GET_CLASS (device); + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_probe; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_PROBE); + +@@ -55,6 +72,7 @@ fpi_device_fake_open (FpDevice *device) + { + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_open; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_OPEN); + +@@ -72,6 +90,7 @@ fpi_device_fake_close (FpDevice *device) + { + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_close; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CLOSE); + +@@ -90,6 +109,7 @@ fpi_device_fake_enroll (FpDevice *device) + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + FpPrint *print = fake_dev->ret_print; + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_enroll; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_ENROLL); + +@@ -118,6 +138,7 @@ fpi_device_fake_verify (FpDevice *device) + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + FpPrint *print = fake_dev->ret_print; + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_verify; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_VERIFY); + +@@ -149,6 +170,7 @@ fpi_device_fake_identify (FpDevice *device) + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + FpPrint *match = fake_dev->ret_match; + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_identify; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_IDENTIFY); + +@@ -197,6 +219,7 @@ fpi_device_fake_capture (FpDevice *device) + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + gboolean wait_for_finger; + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_capture; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CAPTURE); + +@@ -216,6 +239,7 @@ fpi_device_fake_list (FpDevice *device) + { + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_list; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_LIST); + +@@ -233,6 +257,7 @@ fpi_device_fake_delete (FpDevice *device) + { + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_delete; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_DELETE); + +@@ -251,6 +276,7 @@ fpi_device_fake_clear_storage (FpDevice *device) + { + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_clear_storage; + g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CLEAR_STORAGE); + +@@ -268,6 +294,7 @@ fpi_device_fake_cancel (FpDevice *device) + { + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_cancel; + g_assert_cmpuint (fpi_device_get_current_action (device), !=, FPI_DEVICE_ACTION_NONE); + } +@@ -277,6 +304,7 @@ fpi_device_fake_suspend (FpDevice *device) + { + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_suspend; + + fpi_device_suspend_complete (device, g_steal_pointer (&fake_dev->ret_suspend)); +@@ -287,6 +315,7 @@ fpi_device_fake_resume (FpDevice *device) + { + FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); + ++ debug_action (device); + fake_dev->last_called_function = fpi_device_fake_resume; + + fpi_device_resume_complete (device, g_steal_pointer (&fake_dev->ret_resume)); From 01a462580bc0e8d9b81285fbae2281d88e15e805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Oct 2022 01:03:06 +0200 Subject: [PATCH 12/29] debian/docs: Update reference to README.md and remove TODO --- debian/docs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/docs b/debian/docs index 5502ed8f..8913f468 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,2 @@ NEWS -README -TODO +README.md From 3d6d5901a9f5843019f2982946c24e5e7af6d18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Oct 2022 01:03:33 +0200 Subject: [PATCH 13/29] Update changelog --- debian/changelog | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 35500779..816b9171 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,19 @@ libfprint (1:1.94.5-1) UNRELEASED; urgency=medium - * New upstream release + * New upstream release: + - New driver: fpcmoc, supporting various FPC MOC Fingerprint Sensors + - goodixmoc: + + New PIDs 0x6014, 0x6094, 0x631C, 0x634C, 0x6384, 0x659A. + + Support resetting device on firmware failure due to corrupted DB. + - elanmoc: New PIDs 0x0c88, 0x0c8c, 0x0c8d. + - synaptics: New PID 0x0104. + - upektc: New PID 0x2017. + - Fixed various memory leaks * debian/libfprint-2-2.postinst: Devices triggers updated + * debian/patches: Cherry-pick post-release upstream cleanups + * debian/docs: Update reference to README.md and remove TODO - -- Marco Trevisan (Treviño) Fri, 14 Oct 2022 00:55:31 +0200 + -- Marco Trevisan (Treviño) Fri, 14 Oct 2022 01:03:17 +0200 libfprint (1:1.94.2-1) unstable; urgency=medium From 673aba6846881b73d69858a16c7d32d5e3722be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Oct 2022 01:09:06 +0200 Subject: [PATCH 14/29] Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 816b9171..7cfbd02f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libfprint (1:1.94.5-1) UNRELEASED; urgency=medium +libfprint (1:1.94.5-1) unstable; urgency=medium * New upstream release: - New driver: fpcmoc, supporting various FPC MOC Fingerprint Sensors @@ -13,7 +13,7 @@ libfprint (1:1.94.5-1) UNRELEASED; urgency=medium * debian/patches: Cherry-pick post-release upstream cleanups * debian/docs: Update reference to README.md and remove TODO - -- Marco Trevisan (Treviño) Fri, 14 Oct 2022 01:03:17 +0200 + -- Marco Trevisan (Treviño) Fri, 14 Oct 2022 01:09:06 +0200 libfprint (1:1.94.2-1) unstable; urgency=medium From 2c6578e4d9af34931ac5503de5df6954ef2e353e Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Fri, 14 Oct 2022 18:05:28 +0000 Subject: [PATCH 15/29] Apply multi-arch hints. + libfprint-2-2: Drop Multi-Arch: same. Changes-By: apply-multiarch-hints --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 420bff79..8c1c5c0c 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,6 @@ Vcs-Git: https://salsa.debian.org/debian/libfprint.git Package: libfprint-2-2 Architecture: any -Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Description: async fingerprint library of fprint project, shared libraries From 16c690e8f20033fa389640a847d08787bdf7caef Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Mon, 21 Nov 2022 15:21:55 +0000 Subject: [PATCH 16/29] Trim trailing whitespace. Changes-By: lintian-brush Fixes: lintian: trailing-whitespace See-also: https://lintian.debian.org/tags/trailing-whitespace.html --- debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7cfbd02f..e6a75f3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -379,7 +379,7 @@ libfprint (1:0.5.0-6) unstable; urgency=low [ Jeremy Bicha ] * Fix underlinking against glib - thanks to Julian Taylor - (Closes: #710381, #713466) + (Closes: #710381, #713466) [ Didier Raboud ] * Run udevadm trigger on 147e:2020 too @@ -487,8 +487,8 @@ libfprint (20110418git-1) unstable; urgency=low * New upstream release. * Removing resigned uploader from the Uploaders filed (Closes: #595719). * Cleaning out 'dependency_libs' for multiarch support (Closes: #620447). - * Added libnss as build-depend for uru4000. - * Added Validity VFS101 device support. + * Added libnss as build-depend for uru4000. + * Added Validity VFS101 device support. * Bump Standard-version up to 3.9.2.0 (no changes needed). -- Ulises Vitulli Tue, 19 Apr 2011 14:58:27 -0300 @@ -496,7 +496,7 @@ libfprint (20110418git-1) unstable; urgency=low libfprint (20100820git-1) unstable; urgency=low * New upstream snapshot. - * Remove local patches, reported and applied on upstream side, + * Remove local patches, reported and applied on upstream side, thanks BastienNocera: - Check-return-code-from-img2print-conversion.patch. - Add-some-corrective-action-if-there-are-missing-pack.patch. From b83f65bf6172659b4a0b812963520d1a7206f69d Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Mon, 21 Nov 2022 15:22:07 +0000 Subject: [PATCH 17/29] Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse. Changes-By: lintian-brush Fixes: lintian: upstream-metadata-file-is-missing See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html Fixes: lintian: upstream-metadata-missing-bug-tracking See-also: https://lintian.debian.org/tags/upstream-metadata-missing-bug-tracking.html --- debian/upstream/metadata | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 debian/upstream/metadata diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 00000000..dfcbfd29 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,4 @@ +--- +Bug-Database: https://gitlab.freedesktop.org/libfprint/libfprint/-/issues +Bug-Submit: https://gitlab.freedesktop.org/libfprint/libfprint/-/issues/new +Repository-Browse: https://gitlab.freedesktop.org/libfprint/libfprint From 6008222761d35c2d9893f6ebbe1dccea41148009 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Mon, 21 Nov 2022 15:22:08 +0000 Subject: [PATCH 18/29] Update standards version to 4.6.1, no changes needed. Changes-By: lintian-brush Fixes: lintian: out-of-date-standards-version See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 8c1c5c0c..02afeb23 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper-compat (= 13), python3-gi , umockdev Build-Depends-Indep: libglib2.0-doc , libgusb-doc -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Homepage: https://www.freedesktop.org/wiki/Software/fprint/libfprint Vcs-Browser: https://salsa.debian.org/debian/libfprint Vcs-Git: https://salsa.debian.org/debian/libfprint.git From 20b97dba8d4fc557b25efb0bfe873119fda593bc Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Wed, 23 Nov 2022 21:01:33 +0000 Subject: [PATCH 19/29] Remove constraints unnecessary since buster (oldstable) * Build-Depends: Drop versioned constraint on libglib2.0-dev, libgusb-dev and meson. Changes-By: deb-scrub-obsolete --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 02afeb23..297d2814 100644 --- a/debian/control +++ b/debian/control @@ -9,12 +9,12 @@ Build-Depends: debhelper-compat (= 13), gtk-doc-tools, libcairo-dev , libgirepository1.0-dev, - libglib2.0-dev (>= 2.56), + libglib2.0-dev, libgudev-1.0-dev, - libgusb-dev (>= 0.3.0), + libgusb-dev, libnss3-dev, libpixman-1-dev, - meson (>= 0.49.0), + meson, python3 , python3-cairo , python3-gi , From 1b4dbf28f2742645ec7d72111888a5d01b4ec3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 23 Aug 2023 00:43:41 +0200 Subject: [PATCH 20/29] New upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e6a75f3d..eceeff7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libfprint (1:1.94.6-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Marco Trevisan (Treviño) Wed, 23 Aug 2023 00:43:40 +0200 + libfprint (1:1.94.5-1) unstable; urgency=medium * New upstream release: From 196f8a9ea44438f01ca56c77ad389582d979fd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 23 Aug 2023 00:43:43 +0200 Subject: [PATCH 21/29] debian/libfprint-2-2.postinst: Devices triggers updated --- debian/changelog | 1 + debian/libfprint-2-2.postinst | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eceeff7d..c5a7b7fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libfprint (1:1.94.6-1) UNRELEASED; urgency=medium * New upstream release + * debian/libfprint-2-2.postinst: Devices triggers updated -- Marco Trevisan (Treviño) Wed, 23 Aug 2023 00:43:40 +0200 diff --git a/debian/libfprint-2-2.postinst b/debian/libfprint-2-2.postinst index 52f4152d..74792f0d 100644 --- a/debian/libfprint-2-2.postinst +++ b/debian/libfprint-2-2.postinst @@ -52,7 +52,7 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=268f || true udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=2691 || true udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=5731 || true - udevadm trigger --action=add --attr-match=idVendor=5501 --attr-match=idProduct=08ff || true + udevadm trigger --action=add --attr-match=idVendor=08ff --attr-match=idProduct=5501 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0570 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0571 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0903 || true @@ -122,6 +122,7 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c88 || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c8c || true udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c8d || true + udevadm trigger --action=add --attr-match=idVendor=04f3 --attr-match=idProduct=0c99 || true udevadm trigger --action=add --attr-match=idVendor=1c7a --attr-match=idProduct=0603 || true udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=ffe0 || true udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=a305 || true @@ -130,10 +131,15 @@ if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2 udevadm trigger --action=add --attr-match=idVendor=10a5 --attr-match=idProduct=d205 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=5840 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6014 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6092 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6094 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=609c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=60a2 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=60a4 || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=60bc || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6304 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=631c || true + udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=633c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=634c || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=6384 || true udevadm trigger --action=add --attr-match=idVendor=27c6 --attr-match=idProduct=639c || true From c676c281ba500dd4e992a635c5af4b2eee7c7c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 17 Aug 2023 20:00:31 +0200 Subject: [PATCH 22/29] debian/patches: Drop, applied upstream --- ...ce-private-functions-to-public-libra.patch | 116 -------------- ...ove-config.h-inclusion-in-fpi-header.patch | 81 ---------- ...heck-for-PIXMAN-presency-using-ifdef.patch | 33 ---- ...-Actually-bump-the-version-to-1.94.5.patch | 19 --- debian/patches/series | 5 - ...more-logging-showing-the-current-dev.patch | 145 ------------------ 6 files changed, 399 deletions(-) delete mode 100644 debian/patches/fp-device-Move-FpDevice-private-functions-to-public-libra.patch delete mode 100644 debian/patches/fp-image-Remove-config.h-inclusion-in-fpi-header.patch delete mode 100644 debian/patches/fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch delete mode 100644 debian/patches/meson-Actually-bump-the-version-to-1.94.5.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/test-device-fake-Add-more-logging-showing-the-current-dev.patch diff --git a/debian/patches/fp-device-Move-FpDevice-private-functions-to-public-libra.patch b/debian/patches/fp-device-Move-FpDevice-private-functions-to-public-libra.patch deleted file mode 100644 index e5894d99..00000000 --- a/debian/patches/fp-device-Move-FpDevice-private-functions-to-public-libra.patch +++ /dev/null @@ -1,116 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Thu, 13 Oct 2022 19:42:50 +0200 -Subject: fp-device: Move FpDevice private functions to public library - -This these functions are not really needed by anything else than -FpDevice, so move them back to the cpp file, so that we don't expose -them in the private library, given that we don't need them ---- - libfprint/fp-device-private.h | 3 --- - libfprint/fp-device.c | 26 ++++++++++++++++++++++++++ - libfprint/fpi-device.c | 27 --------------------------- - 3 files changed, 26 insertions(+), 30 deletions(-) - -diff --git a/libfprint/fp-device-private.h b/libfprint/fp-device-private.h -index 9b2ea27..759a678 100644 ---- a/libfprint/fp-device-private.h -+++ b/libfprint/fp-device-private.h -@@ -111,8 +111,6 @@ typedef struct - GDestroyNotify enroll_progress_destroy; - } FpEnrollData; - --void enroll_data_free (FpEnrollData *enroll_data); -- - typedef struct - { - FpPrint *enrolled_print; /* verify */ -@@ -128,7 +126,6 @@ typedef struct - GDestroyNotify match_destroy; - } FpMatchData; - --void match_data_free (FpMatchData *match_data); - - void fpi_device_suspend (FpDevice *device); - void fpi_device_resume (FpDevice *device); -diff --git a/libfprint/fp-device.c b/libfprint/fp-device.c -index 17178d1..c143644 100644 ---- a/libfprint/fp-device.c -+++ b/libfprint/fp-device.c -@@ -1088,6 +1088,15 @@ fp_device_resume_finish (FpDevice *device, - return g_task_propagate_boolean (G_TASK (result), error); - } - -+static void -+enroll_data_free (FpEnrollData *data) -+{ -+ if (data->enroll_progress_destroy) -+ data->enroll_progress_destroy (data->enroll_progress_data); -+ data->enroll_progress_data = NULL; -+ g_clear_object (&data->print); -+ g_free (data); -+} - - /** - * fp_device_enroll: -@@ -1217,6 +1226,23 @@ fp_device_enroll_finish (FpDevice *device, - return g_task_propagate_pointer (G_TASK (result), error); - } - -+static void -+match_data_free (FpMatchData *data) -+{ -+ g_clear_object (&data->print); -+ g_clear_object (&data->match); -+ g_clear_error (&data->error); -+ -+ if (data->match_destroy) -+ data->match_destroy (data->match_data); -+ data->match_data = NULL; -+ -+ g_clear_object (&data->enrolled_print); -+ g_clear_pointer (&data->gallery, g_ptr_array_unref); -+ -+ g_free (data); -+} -+ - /** - * fp_device_verify: - * @device: a #FpDevice -diff --git a/libfprint/fpi-device.c b/libfprint/fpi-device.c -index ba75065..1b9fa8f 100644 ---- a/libfprint/fpi-device.c -+++ b/libfprint/fpi-device.c -@@ -522,33 +522,6 @@ fpi_device_get_driver_data (FpDevice *device) - return priv->driver_data; - } - --void --enroll_data_free (FpEnrollData *data) --{ -- if (data->enroll_progress_destroy) -- data->enroll_progress_destroy (data->enroll_progress_data); -- data->enroll_progress_data = NULL; -- g_clear_object (&data->print); -- g_free (data); --} -- --void --match_data_free (FpMatchData *data) --{ -- g_clear_object (&data->print); -- g_clear_object (&data->match); -- g_clear_error (&data->error); -- -- if (data->match_destroy) -- data->match_destroy (data->match_data); -- data->match_data = NULL; -- -- g_clear_object (&data->enrolled_print); -- g_clear_pointer (&data->gallery, g_ptr_array_unref); -- -- g_free (data); --} -- - /** - * fpi_device_get_enroll_data: - * @device: The #FpDevice diff --git a/debian/patches/fp-image-Remove-config.h-inclusion-in-fpi-header.patch b/debian/patches/fp-image-Remove-config.h-inclusion-in-fpi-header.patch deleted file mode 100644 index 759c6405..00000000 --- a/debian/patches/fp-image-Remove-config.h-inclusion-in-fpi-header.patch +++ /dev/null @@ -1,81 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 17 Dec 2019 04:33:20 +0100 -Subject: fp-image: Remove config.h inclusion in fpi-header - -And also avoid defining a function we expose depending on it's presency. ---- - libfprint/fp-image.c | 1 + - libfprint/fpi-image.c | 9 +++++++-- - libfprint/fpi-image.h | 3 --- - 3 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/libfprint/fp-image.c b/libfprint/fp-image.c -index f19c5df..8870cfa 100644 ---- a/libfprint/fp-image.c -+++ b/libfprint/fp-image.c -@@ -24,6 +24,7 @@ - #include "fpi-image.h" - #include "fpi-log.h" - -+#include - #include - - /** -diff --git a/libfprint/fpi-image.c b/libfprint/fpi-image.c -index b21982e..98f412a 100644 ---- a/libfprint/fpi-image.c -+++ b/libfprint/fpi-image.c -@@ -24,6 +24,7 @@ - #include "fpi-log.h" - - #include -+#include - - #ifdef HAVE_PIXMAN - #include -@@ -107,12 +108,12 @@ fpi_mean_sq_diff_norm (const guint8 *buf1, - return res / size; - } - --#ifdef HAVE_PIXMAN - FpImage * - fpi_image_resize (FpImage *orig_img, - guint w_factor, - guint h_factor) - { -+#ifdef HAVE_PIXMAN - int new_width = orig_img->width * w_factor; - int new_height = orig_img->height * h_factor; - pixman_image_t *orig, *resized; -@@ -145,5 +146,9 @@ fpi_image_resize (FpImage *orig_img, - pixman_image_unref (resized); - - return newimg; --} -+#else -+ fp_err ("Libfprint compiled without pixman support, impossible to resize"); -+ -+ return g_object_ref (orig_img); - #endif -+} -diff --git a/libfprint/fpi-image.h b/libfprint/fpi-image.h -index fcd62b8..3554bb7 100644 ---- a/libfprint/fpi-image.h -+++ b/libfprint/fpi-image.h -@@ -20,7 +20,6 @@ - - #pragma once - --#include - #include "fp-image.h" - - /** -@@ -77,8 +76,6 @@ gint fpi_mean_sq_diff_norm (const guint8 *buf1, - const guint8 *buf2, - gint size); - --#if HAVE_PIXMAN - FpImage *fpi_image_resize (FpImage *orig, - guint w_factor, - guint h_factor); --#endif diff --git a/debian/patches/fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch b/debian/patches/fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch deleted file mode 100644 index dcd3eb0d..00000000 --- a/debian/patches/fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Thu, 13 Oct 2022 12:03:31 +0200 -Subject: fpi-image: Check for PIXMAN presency using #ifdef - -That's a defined variable that may be there or not, and currently we -warn with: - - fpi-image.c:29:5: warning: "HAVE_PIXMAN" is not defined, evaluates to 0 ---- - libfprint/fpi-image.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfprint/fpi-image.c b/libfprint/fpi-image.c -index 47aac8d..b21982e 100644 ---- a/libfprint/fpi-image.c -+++ b/libfprint/fpi-image.c -@@ -25,7 +25,7 @@ - - #include - --#if HAVE_PIXMAN -+#ifdef HAVE_PIXMAN - #include - #endif - -@@ -107,7 +107,7 @@ fpi_mean_sq_diff_norm (const guint8 *buf1, - return res / size; - } - --#if HAVE_PIXMAN -+#ifdef HAVE_PIXMAN - FpImage * - fpi_image_resize (FpImage *orig_img, - guint w_factor, diff --git a/debian/patches/meson-Actually-bump-the-version-to-1.94.5.patch b/debian/patches/meson-Actually-bump-the-version-to-1.94.5.patch deleted file mode 100644 index 31775299..00000000 --- a/debian/patches/meson-Actually-bump-the-version-to-1.94.5.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Thu, 13 Oct 2022 22:25:23 +0200 -Subject: meson: Actually bump the version to 1.94.5 - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index e25a173..7bcd978 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project('libfprint', [ 'c', 'cpp' ], -- version: '1.94.4', -+ version: '1.94.5', - license: 'LGPLv2.1+', - default_options: [ - 'buildtype=debugoptimized', diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 332e214e..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,5 +0,0 @@ -meson-Actually-bump-the-version-to-1.94.5.patch -fp-device-Move-FpDevice-private-functions-to-public-libra.patch -test-device-fake-Add-more-logging-showing-the-current-dev.patch -fpi-image-Check-for-PIXMAN-presency-using-ifdef.patch -fp-image-Remove-config.h-inclusion-in-fpi-header.patch diff --git a/debian/patches/test-device-fake-Add-more-logging-showing-the-current-dev.patch b/debian/patches/test-device-fake-Add-more-logging-showing-the-current-dev.patch deleted file mode 100644 index 5f2b3997..00000000 --- a/debian/patches/test-device-fake-Add-more-logging-showing-the-current-dev.patch +++ /dev/null @@ -1,145 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Thu, 13 Oct 2022 19:46:58 +0200 -Subject: test-device-fake: Add more logging showing the current device action - ---- - tests/test-device-fake.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -diff --git a/tests/test-device-fake.c b/tests/test-device-fake.c -index 321bfe5..558ea91 100644 ---- a/tests/test-device-fake.c -+++ b/tests/test-device-fake.c -@@ -20,6 +20,7 @@ - - #define FP_COMPONENT "fake_test_dev" - -+#include "fpi-log.h" - #include "test-device-fake.h" - - G_DEFINE_TYPE (FpiDeviceFake, fpi_device_fake, FP_TYPE_DEVICE) -@@ -29,12 +30,28 @@ static const FpIdEntry driver_ids[] = { - { .virtual_envvar = NULL } - }; - -+static void -+ (debug_action) (FpDevice * device, -+ const gchar *func) -+{ -+ g_autofree char *action_str = NULL; -+ -+ action_str = g_enum_to_string (FPI_TYPE_DEVICE_ACTION, -+ fpi_device_get_current_action (device)); -+ -+ fp_dbg ("%s: Device %s in action %s\n", -+ func, fp_device_get_name (device), action_str); -+} -+ -+#define debug_action(d) (debug_action) ((d), G_STRFUNC) -+ - static void - fpi_device_fake_probe (FpDevice *device) - { - FpDeviceClass *dev_class = FP_DEVICE_GET_CLASS (device); - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_probe; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_PROBE); - -@@ -55,6 +72,7 @@ fpi_device_fake_open (FpDevice *device) - { - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_open; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_OPEN); - -@@ -72,6 +90,7 @@ fpi_device_fake_close (FpDevice *device) - { - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_close; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CLOSE); - -@@ -90,6 +109,7 @@ fpi_device_fake_enroll (FpDevice *device) - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - FpPrint *print = fake_dev->ret_print; - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_enroll; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_ENROLL); - -@@ -118,6 +138,7 @@ fpi_device_fake_verify (FpDevice *device) - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - FpPrint *print = fake_dev->ret_print; - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_verify; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_VERIFY); - -@@ -149,6 +170,7 @@ fpi_device_fake_identify (FpDevice *device) - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - FpPrint *match = fake_dev->ret_match; - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_identify; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_IDENTIFY); - -@@ -197,6 +219,7 @@ fpi_device_fake_capture (FpDevice *device) - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - gboolean wait_for_finger; - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_capture; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CAPTURE); - -@@ -216,6 +239,7 @@ fpi_device_fake_list (FpDevice *device) - { - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_list; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_LIST); - -@@ -233,6 +257,7 @@ fpi_device_fake_delete (FpDevice *device) - { - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_delete; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_DELETE); - -@@ -251,6 +276,7 @@ fpi_device_fake_clear_storage (FpDevice *device) - { - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_clear_storage; - g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CLEAR_STORAGE); - -@@ -268,6 +294,7 @@ fpi_device_fake_cancel (FpDevice *device) - { - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_cancel; - g_assert_cmpuint (fpi_device_get_current_action (device), !=, FPI_DEVICE_ACTION_NONE); - } -@@ -277,6 +304,7 @@ fpi_device_fake_suspend (FpDevice *device) - { - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_suspend; - - fpi_device_suspend_complete (device, g_steal_pointer (&fake_dev->ret_suspend)); -@@ -287,6 +315,7 @@ fpi_device_fake_resume (FpDevice *device) - { - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -+ debug_action (device); - fake_dev->last_called_function = fpi_device_fake_resume; - - fpi_device_resume_complete (device, g_steal_pointer (&fake_dev->ret_resume)); From 4c1b3b4da31701a6a337663cdf5513e912d008ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 17 Aug 2023 19:59:28 +0200 Subject: [PATCH 23/29] debian: Add libfprint-2-tests package --- debian/control | 27 +++++++++++++++++++++++++++ debian/libfprint-2-tests.install | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 debian/libfprint-2-tests.install diff --git a/debian/control b/debian/control index 297d2814..91273c3b 100644 --- a/debian/control +++ b/debian/control @@ -116,3 +116,30 @@ Description: async fingerprint library of fprint project, gir bindings . This package can be used by other packages using the GIRepository format to generate dynamic bindings. + +Package: libfprint-2-tests +Architecture: any +Depends: gir1.2-fprint-2.0 (= ${binary:Version}), + libfprint-2-2 (= ${binary:Version}), + python3, + python3-cairo, + python3-gi, + umockdev, + ${misc:Depends}, ${shlibs:Depends} +Description: Tests for async fingerprint library of fprint project + The fprint project aims to support for consumer fingerprint reader devices. + . + Previously, Linux support for such devices has been scattered amongst different + projects (many incomplete) and inconsistent in that application developers + would have to implement support for each type of fingerprint reader separately. + The idea is to change that by providing a central system to support all the + fingerprint readers as it's possible to get hands on. + . + libfprint is the centre of efforts, this component does the dirty job of + talking to fingerprint reading devices, and processing fingerprint data. + . + This library depends on the new libusb, which performs asynchronous callbacks, + allowing fprint to perform non-blocking device tasks. + . + This package contains test programs, designed to be run as part of a + regression testsuite. diff --git a/debian/libfprint-2-tests.install b/debian/libfprint-2-tests.install new file mode 100644 index 00000000..8b3d0ba4 --- /dev/null +++ b/debian/libfprint-2-tests.install @@ -0,0 +1,2 @@ +usr/libexec/installed-tests/libfprint-[0-9] +usr/share/installed-tests/libfprint-[0-9] From 8c238c83f2c8646270ff0d8be443475a1c93f3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 17 Aug 2023 21:25:40 +0200 Subject: [PATCH 24/29] debian/patches: Use assets from correct paths --- debian/patches/series | 1 + ...GTest-utils-to-generate-assets-names.patch | 77 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 debian/patches/series create mode 100644 debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..c496f068 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +tests-Use-native-GTest-utils-to-generate-assets-names.patch diff --git a/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch b/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch new file mode 100644 index 00000000..7663197f --- /dev/null +++ b/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch @@ -0,0 +1,77 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Thu, 17 Aug 2023 21:17:26 +0200 +Subject: tests: Use native GTest utils to generate assets names + +--- + tests/meson.build | 14 +++++++++----- + tests/test-fpi-assembling.c | 4 +--- + 2 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 5058ae3..2832158 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -6,6 +6,8 @@ envs.set('G_MESSAGES_DEBUG', 'all') + # Setup paths + envs.set('MESON_SOURCE_ROOT', meson.project_source_root()) + envs.set('MESON_BUILD_ROOT', meson.project_build_root()) ++envs.set('G_TEST_SRCDIR', meson.current_source_dir()) ++envs.set('G_TEST_BUILDDIR', meson.current_build_dir()) + envs.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libfprint') + + # Set FP_DEVICE_EMULATION so that drivers can adapt (e.g. to use fixed +@@ -71,6 +73,12 @@ envs_str = run_command(python3, '-c', env_parser_cmd, + env: envs, + check: installed_tests).stdout().strip() + ++envs_str = ' '.join([ ++ envs_str, ++ 'G_TEST_SRCDIR=' + installed_tests_testdir, ++ 'G_TEST_BUILDDIR=' + installed_tests_execdir, ++]) ++ + if get_option('introspection') + envs.prepend('GI_TYPELIB_PATH', meson.project_build_root() / 'libfprint') + virtual_devices_tests = [ +@@ -247,10 +255,6 @@ endif + + unit_tests_deps = { 'fpi-assembling' : [cairo_dep] } + +-test_config = configuration_data() +-test_config.set_quoted('SOURCE_ROOT', meson.project_source_root()) +-test_config_h = configure_file(output: 'test-config.h', configuration: test_config) +- + foreach test_name: unit_tests + if unit_tests_deps.has_key(test_name) + missing_deps = false +@@ -278,7 +282,7 @@ foreach test_name: unit_tests + + basename = 'test-' + test_name + test_exe = executable(basename, +- sources: [basename + '.c', test_config_h], ++ sources: basename + '.c', + dependencies: [ libfprint_private_dep ] + extra_deps, + c_args: common_cflags, + link_whole: test_utils, +diff --git a/tests/test-fpi-assembling.c b/tests/test-fpi-assembling.c +index 94b8fe5..c6dae6f 100644 +--- a/tests/test-fpi-assembling.c ++++ b/tests/test-fpi-assembling.c +@@ -22,7 +22,6 @@ + #include + #include "fpi-assembling.h" + #include "fpi-image.h" +-#include "test-config.h" + + typedef struct + { +@@ -67,8 +66,7 @@ test_frame_assembling (void) + g_autoptr(FpImage) fp_img = NULL; + GSList *frames = NULL; + +- g_assert_false (SOURCE_ROOT == NULL); +- path = g_build_path (G_DIR_SEPARATOR_S, SOURCE_ROOT, "tests", "vfs5011", "capture.png", NULL); ++ path = g_test_build_filename (G_TEST_DIST, "vfs5011", "capture.png", NULL); + + img = cairo_image_surface_create_from_png (path); + data = cairo_image_surface_get_data (img); From 9ea3bba1169f700655246d85038e1e3a9f7710a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 23 Aug 2023 00:24:29 +0200 Subject: [PATCH 25/29] debian/rules: Always force building udev hwdb We are more updated than systemd, so let's use libfprint own rules Closes: #1024309 --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index b5ac43bb..6cd36b5a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,7 @@ BUILDDIR = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) # Configuration arguments CONFIG_ARGS = \ + -Dudev_hwdb=enabled \ -Dudev_hwdb_dir=/lib/udev/hwdb.d \ -Dudev_rules_dir=/lib/udev/rules.d \ -Ddrivers=all \ From fcbabf6cbdbd10e0d1e55580f9c5181f56fc9589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 23 Aug 2023 01:10:16 +0200 Subject: [PATCH 26/29] fixup! debian/patches: Use assets from correct paths --- ...tests-Use-native-GTest-utils-to-generate-assets-names.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch b/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch index 7663197f..5c38c511 100644 --- a/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch +++ b/debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch @@ -2,13 +2,14 @@ From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= Date: Thu, 17 Aug 2023 21:17:26 +0200 Subject: tests: Use native GTest utils to generate assets names +Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/1372d6f08 --- tests/meson.build | 14 +++++++++----- tests/test-fpi-assembling.c | 4 +--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/meson.build b/tests/meson.build -index 5058ae3..2832158 100644 +index b172c1a..31040d1 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -6,6 +6,8 @@ envs.set('G_MESSAGES_DEBUG', 'all') From 381ea2292defe8fd3d91797b7c82b2fc84fdd86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 23 Aug 2023 01:10:23 +0200 Subject: [PATCH 27/29] debian/patches: Remove execution bit from test asset --- debian/patches/series | 1 + ...capture.pcapng-Remove-execution-permission.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch diff --git a/debian/patches/series b/debian/patches/series index c496f068..2c8bc6c8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ tests-Use-native-GTest-utils-to-generate-assets-names.patch +tests-egis0570-capture.pcapng-Remove-execution-permission.patch diff --git a/debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch b/debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch new file mode 100644 index 00000000..62706ec1 --- /dev/null +++ b/debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch @@ -0,0 +1,13 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Wed, 23 Aug 2023 01:04:33 +0200 +Subject: tests/egis0570/capture.pcapng: Remove execution permission + +Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/445 +--- + tests/egis0570/capture.pcapng | Bin + 1 file changed, 0 insertions(+), 0 deletions(-) + mode change 100755 => 100644 tests/egis0570/capture.pcapng + +diff --git a/tests/egis0570/capture.pcapng b/tests/egis0570/capture.pcapng +old mode 100755 +new mode 100644 From d057cc311ff87787d290a09b8147c064c26725c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 23 Aug 2023 01:11:05 +0200 Subject: [PATCH 28/29] Update changelog --- debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c5a7b7fd..5aa93fa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,14 @@ libfprint (1:1.94.6-1) UNRELEASED; urgency=medium * New upstream release * debian/libfprint-2-2.postinst: Devices triggers updated + * debian/patches: Drop, applied upstream + * debian: Add libfprint-2-tests package + * debian/patches: Use assets from correct paths + * debian/rules: Always force building udev hwdb (Closes: #1024309) + * fixup! debian/patches: Use assets from correct paths + * debian/patches: Remove execution bit from test asset - -- Marco Trevisan (Treviño) Wed, 23 Aug 2023 00:43:40 +0200 + -- Marco Trevisan (Treviño) Wed, 23 Aug 2023 01:10:57 +0200 libfprint (1:1.94.5-1) unstable; urgency=medium From a530bb66b06968011c2e0235bde367fdbe9702bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 23 Aug 2023 01:11:51 +0200 Subject: [PATCH 29/29] Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5aa93fa5..bbcdd2be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libfprint (1:1.94.6-1) UNRELEASED; urgency=medium +libfprint (1:1.94.6-1) unstable; urgency=medium * New upstream release * debian/libfprint-2-2.postinst: Devices triggers updated @@ -9,7 +9,7 @@ libfprint (1:1.94.6-1) UNRELEASED; urgency=medium * fixup! debian/patches: Use assets from correct paths * debian/patches: Remove execution bit from test asset - -- Marco Trevisan (Treviño) Wed, 23 Aug 2023 01:10:57 +0200 + -- Marco Trevisan (Treviño) Wed, 23 Aug 2023 01:11:51 +0200 libfprint (1:1.94.5-1) unstable; urgency=medium