diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile index 320523b4efa1..2c84695dd52c 100644 --- a/security/libfprint/Makefile +++ b/security/libfprint/Makefile @@ -1,27 +1,41 @@ PORTNAME= libfprint -PORTVERSION= 0.7.0 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 1.94.8 CATEGORIES= security -MASTER_SITES= https://people.freedesktop.org/~anarsoul/ MAINTAINER= danfe@FreeBSD.org COMMENT= Library for fingerprint reader devices -WWW= http://www.reactivated.net/fprint/wiki/Libfprint +WWW= https://fprint.freedesktop.org/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libnss3.so:security/nss \ - libnspr4.so:devel/nspr +LIB_DEPENDS= libgusb.so:devel/libgusb \ + libnss3.so:security/nss \ + libpixman-1.so:x11/pixman -GNU_CONFIGURE= yes -USES= gnome libtool magick:6 pathfix pkgconfig tar:xz xorg -USE_LDCONFIG= yes +USES= gnome libtool meson pkgconfig python:env shebangfix +USE_GITLAB= yes +GL_SITE= https://gitlab.freedesktop.org USE_GNOME= glib20 -USE_XORG= pixman +USE_LDCONFIG= yes +SHEBANG_GLOB= *.py +MESON_ARGS= -Dinstalled-tests= \ + -Dudev_hwdb=disabled \ + -Dudev_rules=disabled + INSTALL_TARGET= install-strip -CPPFLAGS+= -DHAVE_MEMMEM -MAKE_JOBS_UNSAFE=yes +OPTIONS_DEFINE= DOCS GIR GTK_EXAMPLES TEST +OPTIONS_SUB= yes +GIR_DESC= Install glib introspection support +GTK_EXAMPLES_DESC= Install GTK examples + +DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc +DOCS_MESON_TRUE= doc +GIR_MESON_TRUE= introspection +GTK_EXAMPLES_USE= GNOME=gtk30 +GTK_EXAMPLES_MESON_TRUE= gtk-examples +TEST_MESON_TRUE= installed-tests .include diff --git a/security/libfprint/distinfo b/security/libfprint/distinfo index 666ea86bdf21..1a7ba8dbb4b5 100644 --- a/security/libfprint/distinfo +++ b/security/libfprint/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532525845 -SHA256 (libfprint-0.7.0.tar.xz) = 863eee8cf4cbc56776cf08e5b98e30e130f3394b6db95bf8e01addb6bf08f1f3 -SIZE (libfprint-0.7.0.tar.xz) = 550484 +TIMESTAMP = 1725354736 +SHA256 (libfprint-v1.94.8.tar.bz2) = 50c54514b40b4252cc02460a369af44a6542fbdf772dda5c9c7a699022d29a5d +SIZE (libfprint-v1.94.8.tar.bz2) = 9055204 diff --git a/security/libfprint/files/patch-config.h.in b/security/libfprint/files/patch-config.h.in deleted file mode 100644 index 814e89ce9eb1..000000000000 --- a/security/libfprint/files/patch-config.h.in +++ /dev/null @@ -1,11 +0,0 @@ ---- config.h.in.orig 2017-05-14 16:27:23 UTC -+++ config.h.in -@@ -140,3 +140,8 @@ - #ifndef __cplusplus - #undef inline - #endif -+ -+/* FreeBSD >=8 */ -+#ifndef ETIME -+#define ETIME ETIMEDOUT -+#endif diff --git a/security/libfprint/files/patch-libfprint-drivers-vfs301.c b/security/libfprint/files/patch-libfprint-drivers-vfs301.c deleted file mode 100644 index 05f356f43001..000000000000 --- a/security/libfprint/files/patch-libfprint-drivers-vfs301.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libfprint/drivers/vfs301.c.orig 2017-01-05 17:18:55 UTC -+++ libfprint/drivers/vfs301.c -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - - #include "vfs301_proto.h" - #include diff --git a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c b/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c deleted file mode 100644 index 0191a418eda7..000000000000 --- a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libfprint/drivers/vfs301_proto.c.orig 2013-01-12 13:18:37 UTC -+++ libfprint/drivers/vfs301_proto.c -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - - #include "vfs301_proto.h" - #include "vfs301_proto_fragments.h" diff --git a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h b/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h deleted file mode 100644 index af027d5be8bb..000000000000 --- a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libfprint/drivers/vfs301_proto.h.orig 2013-01-12 13:18:37 UTC -+++ libfprint/drivers/vfs301_proto.h -@@ -18,7 +18,7 @@ - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ --#include -+#include - - enum { - VFS301_DEFAULT_WAIT_TIMEOUT = 300, diff --git a/security/libfprint/files/patch-libfprint_Makefile.in b/security/libfprint/files/patch-libfprint_Makefile.in deleted file mode 100644 index 1421223d5249..000000000000 --- a/security/libfprint/files/patch-libfprint_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libfprint/Makefile.in.orig 2017-05-14 16:27:17 UTC -+++ libfprint/Makefile.in -@@ -1578,7 +1578,7 @@ info: info-am - - info-am: - --install-data-am: install-pkgincludeHEADERS install-udev_rulesDATA -+install-data-am: install-pkgincludeHEADERS - - install-dvi: install-dvi-am - diff --git a/security/libfprint/files/patch-libfprint_fp-device.c b/security/libfprint/files/patch-libfprint_fp-device.c new file mode 100644 index 000000000000..b3933580fe59 --- /dev/null +++ b/security/libfprint/files/patch-libfprint_fp-device.c @@ -0,0 +1,17 @@ +--- libfprint/fp-device.c.orig 2024-09-06 12:19:55.705243000 +0200 ++++ libfprint/fp-device.c 2024-09-06 12:22:36.396895000 +0200 +@@ -362,12 +362,14 @@ + static void + device_idle_probe_cb (FpDevice *self, gpointer user_data) + { ++#if defined(__linux) + /* This should not be an idle handler, see comment where it is registered. + * + * This effectively disables USB "persist" for us, and possibly turns off + * USB wakeup if it was enabled for some reason. + */ + fpi_device_configure_wakeup (self, FALSE); ++#endif + + if (!FP_DEVICE_GET_CLASS (self)->probe) + fpi_device_probe_complete (self, NULL, NULL, NULL); diff --git a/security/libfprint/files/patch-libfprint_fpi-device.c b/security/libfprint/files/patch-libfprint_fpi-device.c new file mode 100644 index 000000000000..06551b869843 --- /dev/null +++ b/security/libfprint/files/patch-libfprint_fpi-device.c @@ -0,0 +1,40 @@ +--- libfprint/fpi-device.c.orig 2024-09-05 16:24:40.482243000 +0200 ++++ libfprint/fpi-device.c 2024-09-06 12:13:49.123856000 +0200 +@@ -1690,6 +1690,7 @@ + } + } + ++#if defined(__linux) + void + fpi_device_configure_wakeup (FpDevice *device, gboolean enabled) + { +@@ -1757,6 +1758,7 @@ + return; + } + } ++#endif + + static void + fpi_device_suspend_completed (FpDevice *device) +@@ -1764,9 +1766,11 @@ + g_autoptr(GTask) task = NULL; + FpDevicePrivate *priv = fp_device_get_instance_private (device); + ++#if defined(__linux) + /* We have an ongoing operation, allow the device to wake up the machine. */ + if (priv->current_action != FPI_DEVICE_ACTION_NONE) + fpi_device_configure_wakeup (device, TRUE); ++#endif + + if (priv->critical_section) + g_warning ("Driver was in a critical section at suspend time. It likely deadlocked!"); +@@ -1848,7 +1852,9 @@ + g_return_if_fail (priv->suspend_resume_task); + + priv->is_suspended = FALSE; ++#if defined(__linux) + fpi_device_configure_wakeup (device, FALSE); ++#endif + + task = g_steal_pointer (&priv->suspend_resume_task); + diff --git a/security/libfprint/pkg-plist b/security/libfprint/pkg-plist index 80f34b387247..53421e78e96f 100644 --- a/security/libfprint/pkg-plist +++ b/security/libfprint/pkg-plist @@ -1,6 +1,175 @@ -include/libfprint/fprint.h -lib/libfprint.a -lib/libfprint.so -lib/libfprint.so.0 -lib/libfprint.so.0.0.0 -libdata/pkgconfig/libfprint.pc +include/libfprint-2/fp-context.h +include/libfprint-2/fp-device.h +include/libfprint-2/fp-enums.h +include/libfprint-2/fp-image-device.h +include/libfprint-2/fp-image.h +include/libfprint-2/fp-print.h +include/libfprint-2/fprint.h +lib/libfprint-2.so +lib/libfprint-2.so.2 +lib/libfprint-2.so.2.0.0 +libdata/pkgconfig/libfprint-2.pc +%%GIR%%lib/girepository-1.0/FPrint-2.0.typelib +%%GIR%%share/gir-1.0/FPrint-2.0.gir +%%GTK_EXAMPLES%%bin/gtk-libfprint-test +%%GTK_EXAMPLES%%share/applications/org.freedesktop.libfprint.Demo.desktop +%%GTK_EXAMPLES%%share/icons/org.freedesktop.libfprint.Demo.png +%%GTK_EXAMPLES%%share/metainfo/org.freedesktop.libfprint.Demo.appdata.xml +%%DOCS%%share/gtk-doc/html/libfprint-2/FpContext.html +%%DOCS%%share/gtk-doc/html/libfprint-2/FpDevice.html +%%DOCS%%share/gtk-doc/html/libfprint-2/FpImage.html +%%DOCS%%share/gtk-doc/html/libfprint-2/FpImageDevice.html +%%DOCS%%share/gtk-doc/html/libfprint-2/FpPrint.html +%%DOCS%%share/gtk-doc/html/libfprint-2/advanced-topics.html +%%DOCS%%share/gtk-doc/html/libfprint-2/api-index.html +%%DOCS%%share/gtk-doc/html/libfprint-2/deprecated-api-index.html +%%DOCS%%share/gtk-doc/html/libfprint-2/driver-dev.html +%%DOCS%%share/gtk-doc/html/libfprint-2/driver-helpers.html +%%DOCS%%share/gtk-doc/html/libfprint-2/driver-img.html +%%DOCS%%share/gtk-doc/html/libfprint-2/driver-misc.html +%%DOCS%%share/gtk-doc/html/libfprint-2/driver-print.html +%%DOCS%%share/gtk-doc/html/libfprint-2/getting-started.html +%%DOCS%%share/gtk-doc/html/libfprint-2/home.png +%%DOCS%%share/gtk-doc/html/libfprint-2/index.html +%%DOCS%%share/gtk-doc/html/libfprint-2/intro.html +%%DOCS%%share/gtk-doc/html/libfprint-2/left-insensitive.png +%%DOCS%%share/gtk-doc/html/libfprint-2/left.png +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Image-frame-assembly.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpDevice.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpImage.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpImageDevice.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpPrint.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Logging.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-SPI-transfer-helpers.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Sequential-state-machine.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-USB-transfer-helpers.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-fpi-context.html +%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2.devhelp2 +%%DOCS%%share/gtk-doc/html/libfprint-2/pt01.html +%%DOCS%%share/gtk-doc/html/libfprint-2/pt02.html +%%DOCS%%share/gtk-doc/html/libfprint-2/pt03.html +%%DOCS%%share/gtk-doc/html/libfprint-2/right-insensitive.png +%%DOCS%%share/gtk-doc/html/libfprint-2/right.png +%%DOCS%%share/gtk-doc/html/libfprint-2/style.css +%%DOCS%%share/gtk-doc/html/libfprint-2/up-insensitive.png +%%DOCS%%share/gtk-doc/html/libfprint-2/up.png +%%TEST%%libexec/installed-tests/libfprint-2/capture.py +%%TEST%%libexec/installed-tests/libfprint-2/test-fpi-assembling +%%TEST%%libexec/installed-tests/libfprint-2/test-fpi-device +%%TEST%%libexec/installed-tests/libfprint-2/test-fpi-ssm +%%TEST%%libexec/installed-tests/libfprint-2/umockdev-test.py +%%TEST%%share/installed-tests/libfprint-2/aes2501/capture.pcapng +%%TEST%%share/installed-tests/libfprint-2/aes2501/capture.png +%%TEST%%share/installed-tests/libfprint-2/aes2501/device +%%TEST%%share/installed-tests/libfprint-2/aes3500/capture.ioctl +%%TEST%%share/installed-tests/libfprint-2/aes3500/capture.png +%%TEST%%share/installed-tests/libfprint-2/aes3500/device +%%TEST%%share/installed-tests/libfprint-2/driver-aes2501.test +%%TEST%%share/installed-tests/libfprint-2/driver-aes3500.test +%%TEST%%share/installed-tests/libfprint-2/driver-egis0570.test +%%TEST%%share/installed-tests/libfprint-2/driver-egismoc-0586.test +%%TEST%%share/installed-tests/libfprint-2/driver-egismoc-0587.test +%%TEST%%share/installed-tests/libfprint-2/driver-egismoc-05a1.test +%%TEST%%share/installed-tests/libfprint-2/driver-egismoc.test +%%TEST%%share/installed-tests/libfprint-2/driver-elan-cobo.test +%%TEST%%share/installed-tests/libfprint-2/driver-elan.test +%%TEST%%share/installed-tests/libfprint-2/driver-elanmoc.test +%%TEST%%share/installed-tests/libfprint-2/driver-focaltech_moc.test +%%TEST%%share/installed-tests/libfprint-2/driver-fpcmoc.test +%%TEST%%share/installed-tests/libfprint-2/driver-goodixmoc.test +%%TEST%%share/installed-tests/libfprint-2/driver-nb1010.test +%%TEST%%share/installed-tests/libfprint-2/driver-realtek-5816.test +%%TEST%%share/installed-tests/libfprint-2/driver-realtek.test +%%TEST%%share/installed-tests/libfprint-2/driver-synaptics.test +%%TEST%%share/installed-tests/libfprint-2/driver-upektc_img-tcs1s.test +%%TEST%%share/installed-tests/libfprint-2/driver-upektc_img.test +%%TEST%%share/installed-tests/libfprint-2/driver-uru4000-4500.test +%%TEST%%share/installed-tests/libfprint-2/driver-uru4000-msv2.test +%%TEST%%share/installed-tests/libfprint-2/driver-vfs0050.test +%%TEST%%share/installed-tests/libfprint-2/driver-vfs301.test +%%TEST%%share/installed-tests/libfprint-2/driver-vfs5011.test +%%TEST%%share/installed-tests/libfprint-2/driver-vfs7552.test +%%TEST%%share/installed-tests/libfprint-2/egis0570/capture.pcapng +%%TEST%%share/installed-tests/libfprint-2/egis0570/capture.png +%%TEST%%share/installed-tests/libfprint-2/egis0570/device +%%TEST%%share/installed-tests/libfprint-2/egismoc-0586/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/egismoc-0586/custom.py +%%TEST%%share/installed-tests/libfprint-2/egismoc-0586/device +%%TEST%%share/installed-tests/libfprint-2/egismoc-0587/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/egismoc-0587/custom.py +%%TEST%%share/installed-tests/libfprint-2/egismoc-0587/device +%%TEST%%share/installed-tests/libfprint-2/egismoc-05a1/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/egismoc-05a1/custom.py +%%TEST%%share/installed-tests/libfprint-2/egismoc-05a1/device +%%TEST%%share/installed-tests/libfprint-2/egismoc/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/egismoc/custom.py +%%TEST%%share/installed-tests/libfprint-2/egismoc/device +%%TEST%%share/installed-tests/libfprint-2/elan-cobo/capture.pcapng +%%TEST%%share/installed-tests/libfprint-2/elan-cobo/capture.png +%%TEST%%share/installed-tests/libfprint-2/elan-cobo/device +%%TEST%%share/installed-tests/libfprint-2/elan/capture.ioctl +%%TEST%%share/installed-tests/libfprint-2/elan/capture.ioctl-recording +%%TEST%%share/installed-tests/libfprint-2/elan/capture.png +%%TEST%%share/installed-tests/libfprint-2/elan/device +%%TEST%%share/installed-tests/libfprint-2/elanmoc/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/elanmoc/custom.py +%%TEST%%share/installed-tests/libfprint-2/elanmoc/device +%%TEST%%share/installed-tests/libfprint-2/focaltech_moc/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/focaltech_moc/custom.py +%%TEST%%share/installed-tests/libfprint-2/focaltech_moc/device +%%TEST%%share/installed-tests/libfprint-2/fpcmoc/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/fpcmoc/custom.py +%%TEST%%share/installed-tests/libfprint-2/fpcmoc/device +%%TEST%%share/installed-tests/libfprint-2/fpi-assembling.test +%%TEST%%share/installed-tests/libfprint-2/fpi-device.test +%%TEST%%share/installed-tests/libfprint-2/fpi-ssm.test +%%TEST%%share/installed-tests/libfprint-2/goodixmoc/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/goodixmoc/custom.py +%%TEST%%share/installed-tests/libfprint-2/goodixmoc/device +%%TEST%%share/installed-tests/libfprint-2/nb1010/capture.ioctl +%%TEST%%share/installed-tests/libfprint-2/nb1010/capture.png +%%TEST%%share/installed-tests/libfprint-2/nb1010/device +%%TEST%%share/installed-tests/libfprint-2/prints/README +%%TEST%%share/installed-tests/libfprint-2/prints/arch.jpg +%%TEST%%share/installed-tests/libfprint-2/prints/arch.png +%%TEST%%share/installed-tests/libfprint-2/prints/loop-right.jpg +%%TEST%%share/installed-tests/libfprint-2/prints/loop-right.png +%%TEST%%share/installed-tests/libfprint-2/prints/tented_arch.jpg +%%TEST%%share/installed-tests/libfprint-2/prints/tented_arch.png +%%TEST%%share/installed-tests/libfprint-2/prints/whorl.jpg +%%TEST%%share/installed-tests/libfprint-2/prints/whorl.png +%%TEST%%share/installed-tests/libfprint-2/realtek-5816/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/realtek-5816/custom.py +%%TEST%%share/installed-tests/libfprint-2/realtek-5816/device +%%TEST%%share/installed-tests/libfprint-2/realtek/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/realtek/custom.py +%%TEST%%share/installed-tests/libfprint-2/realtek/device +%%TEST%%share/installed-tests/libfprint-2/synaptics/custom.pcapng +%%TEST%%share/installed-tests/libfprint-2/synaptics/custom.py +%%TEST%%share/installed-tests/libfprint-2/synaptics/device +%%TEST%%share/installed-tests/libfprint-2/upektc_img-tcs1s/capture.pcapng +%%TEST%%share/installed-tests/libfprint-2/upektc_img-tcs1s/capture.png +%%TEST%%share/installed-tests/libfprint-2/upektc_img-tcs1s/device +%%TEST%%share/installed-tests/libfprint-2/upektc_img/capture.pcapng +%%TEST%%share/installed-tests/libfprint-2/upektc_img/capture.png +%%TEST%%share/installed-tests/libfprint-2/upektc_img/device +%%TEST%%share/installed-tests/libfprint-2/uru4000-4500/capture.pcapng +%%TEST%%share/installed-tests/libfprint-2/uru4000-4500/capture.png +%%TEST%%share/installed-tests/libfprint-2/uru4000-4500/device +%%TEST%%share/installed-tests/libfprint-2/uru4000-msv2/capture.pcapng +%%TEST%%share/installed-tests/libfprint-2/uru4000-msv2/capture.png +%%TEST%%share/installed-tests/libfprint-2/uru4000-msv2/device +%%TEST%%share/installed-tests/libfprint-2/vfs0050/capture-recorded.ioctl +%%TEST%%share/installed-tests/libfprint-2/vfs0050/capture.ioctl +%%TEST%%share/installed-tests/libfprint-2/vfs0050/capture.png +%%TEST%%share/installed-tests/libfprint-2/vfs0050/device +%%TEST%%share/installed-tests/libfprint-2/vfs301/capture-recorded.ioctl +%%TEST%%share/installed-tests/libfprint-2/vfs301/capture.ioctl +%%TEST%%share/installed-tests/libfprint-2/vfs301/capture.png +%%TEST%%share/installed-tests/libfprint-2/vfs301/device +%%TEST%%share/installed-tests/libfprint-2/vfs5011/capture.ioctl +%%TEST%%share/installed-tests/libfprint-2/vfs5011/capture.png +%%TEST%%share/installed-tests/libfprint-2/vfs5011/device +%%TEST%%share/installed-tests/libfprint-2/vfs7552/capture.ioctl +%%TEST%%share/installed-tests/libfprint-2/vfs7552/capture.png +%%TEST%%share/installed-tests/libfprint-2/vfs7552/device