Attachment #253453 for bug #281386




PORTNAME=	libfprint
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=		https://fprint.freedesktop.org/

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libnss3.so:security/nss \
		libgusb.so:devel/libgusb \
		libpixman-1.so:x11/pixman

USES=		gnome libtool meson pkgconfig python:env shebangfix

USE_GITLAB=	yes
GL_SITE=	https://gitlab.freedesktop.org
GL_ACCOUNT=	libfprint
GL_PROJECT=	libfprint

GNU_CONFIGURE=	yes
USES=		gnome libtool magick:6 pathfix pkgconfig tar:xz xorg
USE_LDCONFIG=	yes
USE_GNOME=	glib20
USE_XORG=	pixman
SHEBANG_GLOB=	*.py

MESON_ARGS=	-Dudev_hwdb=disabled -Dudev_rules=disabled -Dinstalled-tests=

OPTIONS_DEFINE=	DOCS GTK_EXAMPLES GIR TEST
OPTIONS_SUB=	yes

GTK_EXAMPLES_DESC=	Install GTK examples
GIR_DESC=	Install glib introspection support

DOCS_MESON_TRUE=	doc
DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
GTK_EXAMPLES_MESON_TRUE=	gtk-examples
GIR_MESON_TRUE=	introspection
TEST_MESON_TRUE= installed-tests

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MGTK_EXAMPLES}
USE_GNOME+= gtk30
.endif

INSTALL_TARGET=	install-strip

CPPFLAGS+=	-DHAVE_MEMMEM
MAKE_JOBS_UNSAFE=yes

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/security/libfprint/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1532525845	1	TIMESTAMP = 1725354736
2	SHA256 (libfprint-0.7.0.tar.xz) = 863eee8cf4cbc56776cf08e5b98e30e130f3394b6db95bf8e01addb6bf08f1f3	2	SHA256 (libfprint-v1.94.8.tar.bz2) = 50c54514b40b4252cc02460a369af44a6542fbdf772dda5c9c7a699022d29a5d
3	SIZE (libfprint-0.7.0.tar.xz) = 550484	3	SIZE (libfprint-v1.94.8.tar.bz2) = 9055204

Removed Link Here

(-)a/security/libfprint/files/patch-config.h.in (-11 lines)
1	--- config.h.in.orig 2017-05-14 16:27:23 UTC
2	+++ config.h.in
3	@@ -140,3 +140,8 @@
4	#ifndef __cplusplus
5	#undef inline
6	#endif
7	+
8	+/* FreeBSD >=8 */
9	+#ifndef ETIME
10	+#define ETIME ETIMEDOUT
11	+#endif

Removed Link Here

(-)a/security/libfprint/files/patch-libfprint-drivers-vfs301.c (-11 lines)
1	--- libfprint/drivers/vfs301.c.orig 2017-01-05 17:18:55 UTC
2	+++ libfprint/drivers/vfs301.c
3	@@ -27,7 +27,7 @@
4	#include <stdio.h>
5	#include <assert.h>
6	#include <stdlib.h>
7	-#include <libusb-1.0/libusb.h>
8	+#include <libusb.h>
9
10	#include "vfs301_proto.h"
11	#include <unistd.h>

Removed Link Here

(-)a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c (-11 lines)
1	--- libfprint/drivers/vfs301_proto.c.orig 2013-01-12 13:18:37 UTC
2	+++ libfprint/drivers/vfs301_proto.c
3	@@ -33,7 +33,7 @@
4	#include <stdio.h>
5	#include <assert.h>
6	#include <stdlib.h>
7	-#include <libusb-1.0/libusb.h>
8	+#include <libusb.h>
9
10	#include "vfs301_proto.h"
11	#include "vfs301_proto_fragments.h"

Removed Link Here

(-)a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h (-11 lines)
1	--- libfprint/drivers/vfs301_proto.h.orig 2013-01-12 13:18:37 UTC
2	+++ libfprint/drivers/vfs301_proto.h
3	@@ -18,7 +18,7 @@
4	* License along with this library; if not, write to the Free Software
5	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6	*/
7	-#include <libusb-1.0/libusb.h>
8	+#include <libusb.h>
9
10	enum {
11	VFS301_DEFAULT_WAIT_TIMEOUT = 300,

Removed Link Here

(-)a/security/libfprint/files/patch-libfprint_Makefile.in (-11 lines)
1	--- libfprint/Makefile.in.orig 2017-05-14 16:27:17 UTC
2	+++ libfprint/Makefile.in
3	@@ -1578,7 +1578,7 @@ info: info-am
4
5	info-am:
6
7	-install-data-am: install-pkgincludeHEADERS install-udev_rulesDATA
8	+install-data-am: install-pkgincludeHEADERS
9
10	install-dvi: install-dvi-am
11




--- 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);




--- 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);
 




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%%bin/gtk-libfprint-test
%%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

Return to bug 281386

Lines 1-27 Link Here

(-)b/security/libfprint/Makefile (-8 / +34 lines)
1	PORTNAME= libfprint	1	PORTNAME= libfprint
2	PORTVERSION= 0.7.0	2	DISTVERSIONPREFIX=v
3	PORTREVISION= 2	3	DISTVERSION= 1.94.8
4	CATEGORIES= security	4	CATEGORIES= security
5	MASTER_SITES= https://people.freedesktop.org/~anarsoul/
6		5
7	MAINTAINER= danfe@FreeBSD.org	6	MAINTAINER= danfe@FreeBSD.org
8	COMMENT= Library for fingerprint reader devices	7	COMMENT= Library for fingerprint reader devices
9	WWW= http://www.reactivated.net/fprint/wiki/Libfprint	8	WWW= https://fprint.freedesktop.org/
10		9
11	LICENSE= LGPL21	10	LICENSE= LGPL21
12	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
13		12
14	LIB_DEPENDS= libnss3.so:security/nss \	13	LIB_DEPENDS= libnss3.so:security/nss \
15	libnspr4.so:devel/nspr	14	libgusb.so:devel/libgusb \
		15	libpixman-1.so:x11/pixman
		16
		17	USES= gnome libtool meson pkgconfig python:env shebangfix
		18
		19	USE_GITLAB= yes
		20	GL_SITE= https://gitlab.freedesktop.org
		21	GL_ACCOUNT= libfprint
		22	GL_PROJECT= libfprint
16		23
17	GNU_CONFIGURE= yes
18	USES= gnome libtool magick:6 pathfix pkgconfig tar:xz xorg
19	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
20	USE_GNOME= glib20	25	USE_GNOME= glib20
21	USE_XORG= pixman	26	USE_XORG= pixman
		27	SHEBANG_GLOB= *.py
		28
		29	MESON_ARGS= -Dudev_hwdb=disabled -Dudev_rules=disabled -Dinstalled-tests=
		30
		31	OPTIONS_DEFINE= DOCS GTK_EXAMPLES GIR TEST
		32	OPTIONS_SUB= yes
		33
		34	GTK_EXAMPLES_DESC= Install GTK examples
		35	GIR_DESC= Install glib introspection support
		36
		37	DOCS_MESON_TRUE= doc
		38	DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
		39	GTK_EXAMPLES_MESON_TRUE= gtk-examples
		40	GIR_MESON_TRUE= introspection
		41	TEST_MESON_TRUE= installed-tests
		42
		43	.include <bsd.port.options.mk>
		44
		45	.if ${PORT_OPTIONS:MGTK_EXAMPLES}
		46	USE_GNOME+= gtk30
		47	.endif
		48
22	INSTALL_TARGET= install-strip	49	INSTALL_TARGET= install-strip
23		50
24	CPPFLAGS+= -DHAVE_MEMMEM
25	MAKE_JOBS_UNSAFE=yes	51	MAKE_JOBS_UNSAFE=yes
26		52
27	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Added Link Here

(-)b/security/libfprint/files/patch-libfprint_fp-device.c (+17 lines)
1	--- libfprint/fp-device.c.orig 2024-09-06 12:19:55.705243000 +0200
2	+++ libfprint/fp-device.c 2024-09-06 12:22:36.396895000 +0200
3	@@ -362,12 +362,14 @@
4	static void
5	device_idle_probe_cb (FpDevice *self, gpointer user_data)
6	{
7	+#if defined(__linux)
8	/* This should not be an idle handler, see comment where it is registered.
9	*
10	* This effectively disables USB "persist" for us, and possibly turns off
11	* USB wakeup if it was enabled for some reason.
12	*/
13	fpi_device_configure_wakeup (self, FALSE);
14	+#endif
15
16	if (!FP_DEVICE_GET_CLASS (self)->probe)
17	fpi_device_probe_complete (self, NULL, NULL, NULL);

Added Link Here

(-)b/security/libfprint/files/patch-libfprint_fpi-device.c (+40 lines)
1	--- libfprint/fpi-device.c.orig 2024-09-05 16:24:40.482243000 +0200
2	+++ libfprint/fpi-device.c 2024-09-06 12:13:49.123856000 +0200
3	@@ -1690,6 +1690,7 @@
4	}
5	}
6
7	+#if defined(__linux)
8	void
9	fpi_device_configure_wakeup (FpDevice *device, gboolean enabled)
10	{
11	@@ -1757,6 +1758,7 @@
12	return;
13	}
14	}
15	+#endif
16
17	static void
18	fpi_device_suspend_completed (FpDevice *device)
19	@@ -1764,9 +1766,11 @@
20	g_autoptr(GTask) task = NULL;
21	FpDevicePrivate *priv = fp_device_get_instance_private (device);
22
23	+#if defined(__linux)
24	/* We have an ongoing operation, allow the device to wake up the machine. */
25	if (priv->current_action != FPI_DEVICE_ACTION_NONE)
26	fpi_device_configure_wakeup (device, TRUE);
27	+#endif
28
29	if (priv->critical_section)
30	g_warning ("Driver was in a critical section at suspend time. It likely deadlocked!");
31	@@ -1848,7 +1852,9 @@
32	g_return_if_fail (priv->suspend_resume_task);
33
34	priv->is_suspended = FALSE;
35	+#if defined(__linux)
36	fpi_device_configure_wakeup (device, FALSE);
37	+#endif
38
39	task = g_steal_pointer (&priv->suspend_resume_task);
40

Lines 1-6 Link Here

(-)b/security/libfprint/pkg-plist (-6 / +176 lines)
1	include/libfprint/fprint.h	1	include/libfprint-2/fp-context.h
2	lib/libfprint.a	2	include/libfprint-2/fp-device.h
3	lib/libfprint.so	3	include/libfprint-2/fp-enums.h
4	lib/libfprint.so.0	4	include/libfprint-2/fp-image-device.h
5	lib/libfprint.so.0.0.0	5	include/libfprint-2/fp-image.h
6	libdata/pkgconfig/libfprint.pc	6	include/libfprint-2/fp-print.h
		7	include/libfprint-2/fprint.h
		8	lib/libfprint-2.so
		9	lib/libfprint-2.so.2
		10	lib/libfprint-2.so.2.0.0
		11	libdata/pkgconfig/libfprint-2.pc
		12	%%GIR%%lib/girepository-1.0/FPrint-2.0.typelib
		13	%%GIR%%share/gir-1.0/FPrint-2.0.gir
		14	%%GTK_EXAMPLES%%bin/gtk-libfprint-test
		15	%%GTK_EXAMPLES%%share/applications/org.freedesktop.libfprint.Demo.desktop
		16	%%GTK_EXAMPLES%%share/icons/org.freedesktop.libfprint.Demo.png
		17	%%GTK_EXAMPLES%%share/metainfo/org.freedesktop.libfprint.Demo.appdata.xml
		18	%%DOCS%%share/gtk-doc/html/libfprint-2/FpContext.html
		19	%%DOCS%%share/gtk-doc/html/libfprint-2/FpDevice.html
		20	%%DOCS%%share/gtk-doc/html/libfprint-2/FpImage.html
		21	%%DOCS%%share/gtk-doc/html/libfprint-2/FpImageDevice.html
		22	%%DOCS%%share/gtk-doc/html/libfprint-2/FpPrint.html
		23	%%DOCS%%share/gtk-doc/html/libfprint-2/advanced-topics.html
		24	%%DOCS%%share/gtk-doc/html/libfprint-2/api-index.html
		25	%%DOCS%%share/gtk-doc/html/libfprint-2/deprecated-api-index.html
		26	%%DOCS%%share/gtk-doc/html/libfprint-2/driver-dev.html
		27	%%DOCS%%share/gtk-doc/html/libfprint-2/driver-helpers.html
		28	%%DOCS%%share/gtk-doc/html/libfprint-2/driver-img.html
		29	%%DOCS%%share/gtk-doc/html/libfprint-2/driver-misc.html
		30	%%DOCS%%share/gtk-doc/html/libfprint-2/driver-print.html
		31	%%DOCS%%share/gtk-doc/html/libfprint-2/getting-started.html
		32	%%DOCS%%share/gtk-doc/html/libfprint-2/home.png
		33	%%DOCS%%share/gtk-doc/html/libfprint-2/index.html
		34	%%DOCS%%share/gtk-doc/html/libfprint-2/intro.html
		35	%%DOCS%%share/gtk-doc/html/libfprint-2/left-insensitive.png
		36	%%DOCS%%share/gtk-doc/html/libfprint-2/left.png
		37	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Image-frame-assembly.html
		38	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpDevice.html
		39	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpImage.html
		40	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpImageDevice.html
		41	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpPrint.html
		42	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Logging.html
		43	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-SPI-transfer-helpers.html
		44	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-Sequential-state-machine.html
		45	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-USB-transfer-helpers.html
		46	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2-fpi-context.html
		47	%%DOCS%%share/gtk-doc/html/libfprint-2/libfprint-2.devhelp2
		48	%%DOCS%%share/gtk-doc/html/libfprint-2/pt01.html
		49	%%DOCS%%share/gtk-doc/html/libfprint-2/pt02.html
		50	%%DOCS%%share/gtk-doc/html/libfprint-2/pt03.html
		51	%%DOCS%%share/gtk-doc/html/libfprint-2/right-insensitive.png
		52	%%DOCS%%share/gtk-doc/html/libfprint-2/right.png
		53	%%DOCS%%share/gtk-doc/html/libfprint-2/style.css
		54	%%DOCS%%share/gtk-doc/html/libfprint-2/up-insensitive.png
		55	%%DOCS%%share/gtk-doc/html/libfprint-2/up.png
		56	%%TEST%%libexec/installed-tests/libfprint-2/capture.py
		57	%%TEST%%libexec/installed-tests/libfprint-2/test-fpi-assembling
		58	%%TEST%%libexec/installed-tests/libfprint-2/test-fpi-device
		59	%%TEST%%libexec/installed-tests/libfprint-2/test-fpi-ssm
		60	%%TEST%%libexec/installed-tests/libfprint-2/umockdev-test.py
		61	%%TEST%%bin/gtk-libfprint-test
		62	%%TEST%%share/installed-tests/libfprint-2/aes2501/capture.pcapng
		63	%%TEST%%share/installed-tests/libfprint-2/aes2501/capture.png
		64	%%TEST%%share/installed-tests/libfprint-2/aes2501/device
		65	%%TEST%%share/installed-tests/libfprint-2/aes3500/capture.ioctl
		66	%%TEST%%share/installed-tests/libfprint-2/aes3500/capture.png
		67	%%TEST%%share/installed-tests/libfprint-2/aes3500/device
		68	%%TEST%%share/installed-tests/libfprint-2/driver-aes2501.test
		69	%%TEST%%share/installed-tests/libfprint-2/driver-aes3500.test
		70	%%TEST%%share/installed-tests/libfprint-2/driver-egis0570.test
71	%%TEST%%share/installed-tests/libfprint-2/driver-egismoc-0586.test
72	%%TEST%%share/installed-tests/libfprint-2/driver-egismoc-0587.test
73	%%TEST%%share/installed-tests/libfprint-2/driver-egismoc-05a1.test
74	%%TEST%%share/installed-tests/libfprint-2/driver-egismoc.test
75	%%TEST%%share/installed-tests/libfprint-2/driver-elan-cobo.test
76	%%TEST%%share/installed-tests/libfprint-2/driver-elan.test
77	%%TEST%%share/installed-tests/libfprint-2/driver-elanmoc.test
78	%%TEST%%share/installed-tests/libfprint-2/driver-focaltech_moc.test
79	%%TEST%%share/installed-tests/libfprint-2/driver-fpcmoc.test
80	%%TEST%%share/installed-tests/libfprint-2/driver-goodixmoc.test
81	%%TEST%%share/installed-tests/libfprint-2/driver-nb1010.test
82	%%TEST%%share/installed-tests/libfprint-2/driver-realtek-5816.test
83	%%TEST%%share/installed-tests/libfprint-2/driver-realtek.test
84	%%TEST%%share/installed-tests/libfprint-2/driver-synaptics.test
85	%%TEST%%share/installed-tests/libfprint-2/driver-upektc_img-tcs1s.test
86	%%TEST%%share/installed-tests/libfprint-2/driver-upektc_img.test
87	%%TEST%%share/installed-tests/libfprint-2/driver-uru4000-4500.test
88	%%TEST%%share/installed-tests/libfprint-2/driver-uru4000-msv2.test
89	%%TEST%%share/installed-tests/libfprint-2/driver-vfs0050.test
90	%%TEST%%share/installed-tests/libfprint-2/driver-vfs301.test
91	%%TEST%%share/installed-tests/libfprint-2/driver-vfs5011.test
92	%%TEST%%share/installed-tests/libfprint-2/driver-vfs7552.test
93	%%TEST%%share/installed-tests/libfprint-2/egis0570/capture.pcapng
94	%%TEST%%share/installed-tests/libfprint-2/egis0570/capture.png
95	%%TEST%%share/installed-tests/libfprint-2/egis0570/device
96	%%TEST%%share/installed-tests/libfprint-2/egismoc-0586/custom.pcapng
97	%%TEST%%share/installed-tests/libfprint-2/egismoc-0586/custom.py
98	%%TEST%%share/installed-tests/libfprint-2/egismoc-0586/device
99	%%TEST%%share/installed-tests/libfprint-2/egismoc-0587/custom.pcapng
100	%%TEST%%share/installed-tests/libfprint-2/egismoc-0587/custom.py
101	%%TEST%%share/installed-tests/libfprint-2/egismoc-0587/device
102	%%TEST%%share/installed-tests/libfprint-2/egismoc-05a1/custom.pcapng
103	%%TEST%%share/installed-tests/libfprint-2/egismoc-05a1/custom.py
104	%%TEST%%share/installed-tests/libfprint-2/egismoc-05a1/device
105	%%TEST%%share/installed-tests/libfprint-2/egismoc/custom.pcapng
106	%%TEST%%share/installed-tests/libfprint-2/egismoc/custom.py
107	%%TEST%%share/installed-tests/libfprint-2/egismoc/device
108	%%TEST%%share/installed-tests/libfprint-2/elan-cobo/capture.pcapng
109	%%TEST%%share/installed-tests/libfprint-2/elan-cobo/capture.png
110	%%TEST%%share/installed-tests/libfprint-2/elan-cobo/device
111	%%TEST%%share/installed-tests/libfprint-2/elan/capture.ioctl
112	%%TEST%%share/installed-tests/libfprint-2/elan/capture.ioctl-recording
113	%%TEST%%share/installed-tests/libfprint-2/elan/capture.png
114	%%TEST%%share/installed-tests/libfprint-2/elan/device
115	%%TEST%%share/installed-tests/libfprint-2/elanmoc/custom.pcapng
116	%%TEST%%share/installed-tests/libfprint-2/elanmoc/custom.py
117	%%TEST%%share/installed-tests/libfprint-2/elanmoc/device
118	%%TEST%%share/installed-tests/libfprint-2/focaltech_moc/custom.pcapng
119	%%TEST%%share/installed-tests/libfprint-2/focaltech_moc/custom.py
120	%%TEST%%share/installed-tests/libfprint-2/focaltech_moc/device
121	%%TEST%%share/installed-tests/libfprint-2/fpcmoc/custom.pcapng
122	%%TEST%%share/installed-tests/libfprint-2/fpcmoc/custom.py
123	%%TEST%%share/installed-tests/libfprint-2/fpcmoc/device
124	%%TEST%%share/installed-tests/libfprint-2/fpi-assembling.test
125	%%TEST%%share/installed-tests/libfprint-2/fpi-device.test
126	%%TEST%%share/installed-tests/libfprint-2/fpi-ssm.test
127	%%TEST%%share/installed-tests/libfprint-2/goodixmoc/custom.pcapng
128	%%TEST%%share/installed-tests/libfprint-2/goodixmoc/custom.py
129	%%TEST%%share/installed-tests/libfprint-2/goodixmoc/device
130	%%TEST%%share/installed-tests/libfprint-2/nb1010/capture.ioctl
131	%%TEST%%share/installed-tests/libfprint-2/nb1010/capture.png
132	%%TEST%%share/installed-tests/libfprint-2/nb1010/device
133	%%TEST%%share/installed-tests/libfprint-2/prints/README
134	%%TEST%%share/installed-tests/libfprint-2/prints/arch.jpg
135	%%TEST%%share/installed-tests/libfprint-2/prints/arch.png
136	%%TEST%%share/installed-tests/libfprint-2/prints/loop-right.jpg
137	%%TEST%%share/installed-tests/libfprint-2/prints/loop-right.png
138	%%TEST%%share/installed-tests/libfprint-2/prints/tented_arch.jpg
139	%%TEST%%share/installed-tests/libfprint-2/prints/tented_arch.png
140	%%TEST%%share/installed-tests/libfprint-2/prints/whorl.jpg
141	%%TEST%%share/installed-tests/libfprint-2/prints/whorl.png
142	%%TEST%%share/installed-tests/libfprint-2/realtek-5816/custom.pcapng
143	%%TEST%%share/installed-tests/libfprint-2/realtek-5816/custom.py
144	%%TEST%%share/installed-tests/libfprint-2/realtek-5816/device
145	%%TEST%%share/installed-tests/libfprint-2/realtek/custom.pcapng
146	%%TEST%%share/installed-tests/libfprint-2/realtek/custom.py
147	%%TEST%%share/installed-tests/libfprint-2/realtek/device
148	%%TEST%%share/installed-tests/libfprint-2/synaptics/custom.pcapng
149	%%TEST%%share/installed-tests/libfprint-2/synaptics/custom.py
150	%%TEST%%share/installed-tests/libfprint-2/synaptics/device
151	%%TEST%%share/installed-tests/libfprint-2/upektc_img-tcs1s/capture.pcapng
152	%%TEST%%share/installed-tests/libfprint-2/upektc_img-tcs1s/capture.png
153	%%TEST%%share/installed-tests/libfprint-2/upektc_img-tcs1s/device
154	%%TEST%%share/installed-tests/libfprint-2/upektc_img/capture.pcapng
155	%%TEST%%share/installed-tests/libfprint-2/upektc_img/capture.png
156	%%TEST%%share/installed-tests/libfprint-2/upektc_img/device
157	%%TEST%%share/installed-tests/libfprint-2/uru4000-4500/capture.pcapng
158	%%TEST%%share/installed-tests/libfprint-2/uru4000-4500/capture.png
159	%%TEST%%share/installed-tests/libfprint-2/uru4000-4500/device
160	%%TEST%%share/installed-tests/libfprint-2/uru4000-msv2/capture.pcapng
161	%%TEST%%share/installed-tests/libfprint-2/uru4000-msv2/capture.png
162	%%TEST%%share/installed-tests/libfprint-2/uru4000-msv2/device
163	%%TEST%%share/installed-tests/libfprint-2/vfs0050/capture-recorded.ioctl
164	%%TEST%%share/installed-tests/libfprint-2/vfs0050/capture.ioctl
165	%%TEST%%share/installed-tests/libfprint-2/vfs0050/capture.png
166	%%TEST%%share/installed-tests/libfprint-2/vfs0050/device
167	%%TEST%%share/installed-tests/libfprint-2/vfs301/capture-recorded.ioctl
168	%%TEST%%share/installed-tests/libfprint-2/vfs301/capture.ioctl
169	%%TEST%%share/installed-tests/libfprint-2/vfs301/capture.png
170	%%TEST%%share/installed-tests/libfprint-2/vfs301/device
171	%%TEST%%share/installed-tests/libfprint-2/vfs5011/capture.ioctl
172	%%TEST%%share/installed-tests/libfprint-2/vfs5011/capture.png
173	%%TEST%%share/installed-tests/libfprint-2/vfs5011/device
174	%%TEST%%share/installed-tests/libfprint-2/vfs7552/capture.ioctl
175	%%TEST%%share/installed-tests/libfprint-2/vfs7552/capture.png
176	%%TEST%%share/installed-tests/libfprint-2/vfs7552/device