Attachment 253543 Details for Bug 281387 – Update libfprint to 1.94.8.

[patch] Update libfprint to 1.94.8.

0001-security-libfprint-Update-from-0.7.0-to-1.94.8.patch (text/plain), 16.52 KB, created by Cy Schubert on 2024-09-13 15:25:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2024-09-13 15:25:06 UTC

Size: 16.52 KB

patch

obsolete

>From 401cd7353326a93c8f54409a93a0cc9a5269d816 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Thu, 12 Sep 2024 11:21:14 -0700
>Subject: [PATCH 1/2] security/libfprint: Update from 0.7.0 to 1.94.8
>
>This necessitated switch of distfile from people.freebsd.org to
>freedesktop.org's gitlab server.
>---
> security/libfprint/Makefile                   |  20 +-
> security/libfprint/distinfo                   |   6 +-
> security/libfprint/files/patch-config.h.in    |  11 --
> .../files/patch-libfprint-drivers-vfs301.c    |  11 --
> .../patch-libfprint-drivers-vfs301_proto.c    |  11 --
> .../patch-libfprint-drivers-vfs301_proto.h    |  11 --
> .../files/patch-libfprint_Makefile.in         |  11 --
> security/libfprint/files/patch-meson.build    |  40 ++++
> security/libfprint/pkg-plist                  | 177 +++++++++++++++++-
> 9 files changed, 227 insertions(+), 71 deletions(-)
> delete mode 100644 security/libfprint/files/patch-config.h.in
> delete mode 100644 security/libfprint/files/patch-libfprint-drivers-vfs301.c
> delete mode 100644 security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c
> delete mode 100644 security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h
> delete mode 100644 security/libfprint/files/patch-libfprint_Makefile.in
> create mode 100644 security/libfprint/files/patch-meson.build
>
>diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile
>index 320523b4efa1..d6a727b6360a 100644
>--- a/security/libfprint/Makefile
>+++ b/security/libfprint/Makefile
>@@ -1,8 +1,7 @@
> PORTNAME=	libfprint
>-PORTVERSION=	0.7.0
>-PORTREVISION=	2
>+DISTVERSION=	1.94.8
>+DISTVERSIONPREFIX=	v
> CATEGORIES=	security
>-MASTER_SITES=	https://people.freedesktop.org/~anarsoul/
> 
> MAINTAINER=	danfe@FreeBSD.org
> COMMENT=	Library for fingerprint reader devices
>@@ -11,16 +10,23 @@ WWW=		http://www.reactivated.net/fprint/wiki/Libfprint
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+USE_GITLAB=	yes
>+GL_SITE=	https://gitlab.freedesktop.org
>+
> LIB_DEPENDS=	libnss3.so:security/nss \
>-		libnspr4.so:devel/nspr
>+		libnspr4.so:devel/nspr \
>+		libgusb.so:devel/libgusb
> 
>-GNU_CONFIGURE=	yes
>-USES=		gnome libtool magick:6 pathfix pkgconfig tar:xz xorg
>+USES=		gnome libtool magick:7 meson pathfix pkgconfig python \
>+		shebangfix tar:xz xorg
> USE_LDCONFIG=	yes
>-USE_GNOME=	glib20
>+USE_GNOME=	cairo glib20
> USE_XORG=	pixman
>+MESON_ARGS=	-Dudev_rules=disabled
> INSTALL_TARGET=	install-strip
> 
>+SHEBANG_GLOB=	*.py
>+
> CPPFLAGS+=	-DHAVE_MEMMEM
> MAKE_JOBS_UNSAFE=yes
> 
>diff --git a/security/libfprint/distinfo b/security/libfprint/distinfo
>index 666ea86bdf21..74a9567de984 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 = 1726159517
>+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 <stdio.h>
>- #include <assert.h>
>- #include <stdlib.h>
>--#include <libusb-1.0/libusb.h>
>-+#include <libusb.h>
>- 
>- #include "vfs301_proto.h"
>- #include <unistd.h>
>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 <stdio.h>
>- #include <assert.h>
>- #include <stdlib.h>
>--#include <libusb-1.0/libusb.h>
>-+#include <libusb.h>
>- 
>- #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 <libusb-1.0/libusb.h>
>-+#include <libusb.h>
>- 
>- 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-meson.build b/security/libfprint/files/patch-meson.build
>new file mode 100644
>index 000000000000..914e251798e0
>--- /dev/null
>+++ b/security/libfprint/files/patch-meson.build
>@@ -0,0 +1,40 @@
>+--- meson.build.orig	2024-09-02 20:14:11.000000000 -0700
>++++ meson.build	2024-09-12 10:39:12.265811000 -0700
>+@@ -288,7 +288,6 @@
>+ if install_udev_rules
>+     udev_rules_dir = get_option('udev_rules_dir')
>+     if udev_rules_dir == 'auto'
>+-        udev_dep = dependency('udev')
>+         udev_rules_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/rules.d'
>+     endif
>+ endif
>+@@ -310,28 +309,8 @@
>+ root_inc = include_directories('.')
>+ 
>+ udev_hwdb = get_option('udev_hwdb')
>+-if not udev_hwdb.disabled()
>+-    # systemd v248 includes our autosuspend rules
>+-    udev_versioned_dep = dependency('udev', version: '>= 248', required: false)
>+-    udev_hwdb_dir = get_option('udev_hwdb_dir')
>+-    if udev_hwdb.auto()
>+-        if udev_versioned_dep.found()
>+-            udev_hwdb_dir = ''
>+-        endif
>+-    else
>+-        if udev_versioned_dep.found()
>+-            warning('udev hwdb will be installed by both systemd and libfprint')
>+-        endif
>+-    endif
>++udev_hwdb_dir = ''
>+ 
>+-    if udev_hwdb_dir == 'auto'
>+-        udev_dep = dependency('udev')
>+-        udev_hwdb_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/hwdb.d'
>+-    endif
>+-else
>+-    udev_hwdb_dir = ''
>+-endif
>+-
>+ if get_option('gtk-examples')
>+     gtk_dep = dependency('gtk+-3.0', required: false)
>+     if not gtk_dep.found()
>diff --git a/security/libfprint/pkg-plist b/security/libfprint/pkg-plist
>index 80f34b387247..d5683624aeb8 100644
>--- a/security/libfprint/pkg-plist
>+++ b/security/libfprint/pkg-plist
>@@ -1,6 +1,171 @@
>-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/girepository-1.0/FPrint-2.0.typelib
>+lib/libfprint-2.so
>+lib/libfprint-2.so.2
>+lib/libfprint-2.so.2.0.0
>+libdata/pkgconfig/libfprint-2.pc
>+libexec/installed-tests/libfprint-2/capture.py
>+libexec/installed-tests/libfprint-2/test-fpi-assembling
>+libexec/installed-tests/libfprint-2/test-fpi-device
>+libexec/installed-tests/libfprint-2/test-fpi-ssm
>+libexec/installed-tests/libfprint-2/umockdev-test.py
>+share/gir-1.0/FPrint-2.0.gir
>+share/gtk-doc/html/libfprint-2/FpContext.html
>+share/gtk-doc/html/libfprint-2/FpDevice.html
>+share/gtk-doc/html/libfprint-2/FpImage.html
>+share/gtk-doc/html/libfprint-2/FpImageDevice.html
>+share/gtk-doc/html/libfprint-2/FpPrint.html
>+share/gtk-doc/html/libfprint-2/advanced-topics.html
>+share/gtk-doc/html/libfprint-2/api-index.html
>+share/gtk-doc/html/libfprint-2/deprecated-api-index.html
>+share/gtk-doc/html/libfprint-2/driver-dev.html
>+share/gtk-doc/html/libfprint-2/driver-helpers.html
>+share/gtk-doc/html/libfprint-2/driver-img.html
>+share/gtk-doc/html/libfprint-2/driver-misc.html
>+share/gtk-doc/html/libfprint-2/driver-print.html
>+share/gtk-doc/html/libfprint-2/getting-started.html
>+share/gtk-doc/html/libfprint-2/home.png
>+share/gtk-doc/html/libfprint-2/index.html
>+share/gtk-doc/html/libfprint-2/intro.html
>+share/gtk-doc/html/libfprint-2/left-insensitive.png
>+share/gtk-doc/html/libfprint-2/left.png
>+share/gtk-doc/html/libfprint-2/libfprint-2-Image-frame-assembly.html
>+share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpDevice.html
>+share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpImage.html
>+share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpImageDevice.html
>+share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpPrint.html
>+share/gtk-doc/html/libfprint-2/libfprint-2-Logging.html
>+share/gtk-doc/html/libfprint-2/libfprint-2-SPI-transfer-helpers.html
>+share/gtk-doc/html/libfprint-2/libfprint-2-Sequential-state-machine.html
>+share/gtk-doc/html/libfprint-2/libfprint-2-USB-transfer-helpers.html
>+share/gtk-doc/html/libfprint-2/libfprint-2-fpi-context.html
>+share/gtk-doc/html/libfprint-2/libfprint-2.devhelp2
>+share/gtk-doc/html/libfprint-2/pt01.html
>+share/gtk-doc/html/libfprint-2/pt02.html
>+share/gtk-doc/html/libfprint-2/pt03.html
>+share/gtk-doc/html/libfprint-2/right-insensitive.png
>+share/gtk-doc/html/libfprint-2/right.png
>+share/gtk-doc/html/libfprint-2/style.css
>+share/gtk-doc/html/libfprint-2/up-insensitive.png
>+share/gtk-doc/html/libfprint-2/up.png
>+share/installed-tests/libfprint-2/aes2501/capture.pcapng
>+share/installed-tests/libfprint-2/aes2501/capture.png
>+share/installed-tests/libfprint-2/aes2501/device
>+share/installed-tests/libfprint-2/aes3500/capture.ioctl
>+share/installed-tests/libfprint-2/aes3500/capture.png
>+share/installed-tests/libfprint-2/aes3500/device
>+share/installed-tests/libfprint-2/driver-aes2501.test
>+share/installed-tests/libfprint-2/driver-aes3500.test
>+share/installed-tests/libfprint-2/driver-egis0570.test
>+share/installed-tests/libfprint-2/driver-egismoc-0586.test
>+share/installed-tests/libfprint-2/driver-egismoc-0587.test
>+share/installed-tests/libfprint-2/driver-egismoc-05a1.test
>+share/installed-tests/libfprint-2/driver-egismoc.test
>+share/installed-tests/libfprint-2/driver-elan-cobo.test
>+share/installed-tests/libfprint-2/driver-elan.test
>+share/installed-tests/libfprint-2/driver-elanmoc.test
>+share/installed-tests/libfprint-2/driver-focaltech_moc.test
>+share/installed-tests/libfprint-2/driver-fpcmoc.test
>+share/installed-tests/libfprint-2/driver-goodixmoc.test
>+share/installed-tests/libfprint-2/driver-nb1010.test
>+share/installed-tests/libfprint-2/driver-realtek-5816.test
>+share/installed-tests/libfprint-2/driver-realtek.test
>+share/installed-tests/libfprint-2/driver-synaptics.test
>+share/installed-tests/libfprint-2/driver-upektc_img-tcs1s.test
>+share/installed-tests/libfprint-2/driver-upektc_img.test
>+share/installed-tests/libfprint-2/driver-uru4000-4500.test
>+share/installed-tests/libfprint-2/driver-uru4000-msv2.test
>+share/installed-tests/libfprint-2/driver-vfs0050.test
>+share/installed-tests/libfprint-2/driver-vfs301.test
>+share/installed-tests/libfprint-2/driver-vfs5011.test
>+share/installed-tests/libfprint-2/driver-vfs7552.test
>+share/installed-tests/libfprint-2/egis0570/capture.pcapng
>+share/installed-tests/libfprint-2/egis0570/capture.png
>+share/installed-tests/libfprint-2/egis0570/device
>+share/installed-tests/libfprint-2/egismoc-0586/custom.pcapng
>+share/installed-tests/libfprint-2/egismoc-0586/custom.py
>+share/installed-tests/libfprint-2/egismoc-0586/device
>+share/installed-tests/libfprint-2/egismoc-0587/custom.pcapng
>+share/installed-tests/libfprint-2/egismoc-0587/custom.py
>+share/installed-tests/libfprint-2/egismoc-0587/device
>+share/installed-tests/libfprint-2/egismoc-05a1/custom.pcapng
>+share/installed-tests/libfprint-2/egismoc-05a1/custom.py
>+share/installed-tests/libfprint-2/egismoc-05a1/device
>+share/installed-tests/libfprint-2/egismoc/custom.pcapng
>+share/installed-tests/libfprint-2/egismoc/custom.py
>+share/installed-tests/libfprint-2/egismoc/device
>+share/installed-tests/libfprint-2/elan-cobo/capture.pcapng
>+share/installed-tests/libfprint-2/elan-cobo/capture.png
>+share/installed-tests/libfprint-2/elan-cobo/device
>+share/installed-tests/libfprint-2/elan/capture.ioctl
>+share/installed-tests/libfprint-2/elan/capture.ioctl-recording
>+share/installed-tests/libfprint-2/elan/capture.png
>+share/installed-tests/libfprint-2/elan/device
>+share/installed-tests/libfprint-2/elanmoc/custom.pcapng
>+share/installed-tests/libfprint-2/elanmoc/custom.py
>+share/installed-tests/libfprint-2/elanmoc/device
>+share/installed-tests/libfprint-2/focaltech_moc/custom.pcapng
>+share/installed-tests/libfprint-2/focaltech_moc/custom.py
>+share/installed-tests/libfprint-2/focaltech_moc/device
>+share/installed-tests/libfprint-2/fpcmoc/custom.pcapng
>+share/installed-tests/libfprint-2/fpcmoc/custom.py
>+share/installed-tests/libfprint-2/fpcmoc/device
>+share/installed-tests/libfprint-2/fpi-assembling.test
>+share/installed-tests/libfprint-2/fpi-device.test
>+share/installed-tests/libfprint-2/fpi-ssm.test
>+share/installed-tests/libfprint-2/goodixmoc/custom.pcapng
>+share/installed-tests/libfprint-2/goodixmoc/custom.py
>+share/installed-tests/libfprint-2/goodixmoc/device
>+share/installed-tests/libfprint-2/nb1010/capture.ioctl
>+share/installed-tests/libfprint-2/nb1010/capture.png
>+share/installed-tests/libfprint-2/nb1010/device
>+share/installed-tests/libfprint-2/prints/README
>+share/installed-tests/libfprint-2/prints/arch.jpg
>+share/installed-tests/libfprint-2/prints/arch.png
>+share/installed-tests/libfprint-2/prints/loop-right.jpg
>+share/installed-tests/libfprint-2/prints/loop-right.png
>+share/installed-tests/libfprint-2/prints/tented_arch.jpg
>+share/installed-tests/libfprint-2/prints/tented_arch.png
>+share/installed-tests/libfprint-2/prints/whorl.jpg
>+share/installed-tests/libfprint-2/prints/whorl.png
>+share/installed-tests/libfprint-2/realtek-5816/custom.pcapng
>+share/installed-tests/libfprint-2/realtek-5816/custom.py
>+share/installed-tests/libfprint-2/realtek-5816/device
>+share/installed-tests/libfprint-2/realtek/custom.pcapng
>+share/installed-tests/libfprint-2/realtek/custom.py
>+share/installed-tests/libfprint-2/realtek/device
>+share/installed-tests/libfprint-2/synaptics/custom.pcapng
>+share/installed-tests/libfprint-2/synaptics/custom.py
>+share/installed-tests/libfprint-2/synaptics/device
>+share/installed-tests/libfprint-2/upektc_img-tcs1s/capture.pcapng
>+share/installed-tests/libfprint-2/upektc_img-tcs1s/capture.png
>+share/installed-tests/libfprint-2/upektc_img-tcs1s/device
>+share/installed-tests/libfprint-2/upektc_img/capture.pcapng
>+share/installed-tests/libfprint-2/upektc_img/capture.png
>+share/installed-tests/libfprint-2/upektc_img/device
>+share/installed-tests/libfprint-2/uru4000-4500/capture.pcapng
>+share/installed-tests/libfprint-2/uru4000-4500/capture.png
>+share/installed-tests/libfprint-2/uru4000-4500/device
>+share/installed-tests/libfprint-2/uru4000-msv2/capture.pcapng
>+share/installed-tests/libfprint-2/uru4000-msv2/capture.png
>+share/installed-tests/libfprint-2/uru4000-msv2/device
>+share/installed-tests/libfprint-2/vfs0050/capture-recorded.ioctl
>+share/installed-tests/libfprint-2/vfs0050/capture.ioctl
>+share/installed-tests/libfprint-2/vfs0050/capture.png
>+share/installed-tests/libfprint-2/vfs0050/device
>+share/installed-tests/libfprint-2/vfs301/capture-recorded.ioctl
>+share/installed-tests/libfprint-2/vfs301/capture.ioctl
>+share/installed-tests/libfprint-2/vfs301/capture.png
>+share/installed-tests/libfprint-2/vfs301/device
>+share/installed-tests/libfprint-2/vfs5011/capture.ioctl
>+share/installed-tests/libfprint-2/vfs5011/capture.png
>+share/installed-tests/libfprint-2/vfs5011/device
>+share/installed-tests/libfprint-2/vfs7552/capture.ioctl
>+share/installed-tests/libfprint-2/vfs7552/capture.png
>+share/installed-tests/libfprint-2/vfs7552/device
>-- 
>2.46.0
>

Actions: View | Diff

Attachments on bug 281387: 253454 | 253483 | 253543