View | Details | Raw Unified | Return to bug 281387 | Differences between
and this patch

Collapse All | Expand All

(-)b/security/libfprint/Makefile (-7 / +13 lines)
Lines 1-8 Link Here
1
PORTNAME=	libfprint
1
PORTNAME=	libfprint
2
PORTVERSION=	0.7.0
2
DISTVERSION=	1.94.8
3
PORTREVISION=	2
3
DISTVERSIONPREFIX=	v
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
Lines 11-26 WWW= http://www.reactivated.net/fprint/wiki/Libfprint Link Here
11
LICENSE=	LGPL21
10
LICENSE=	LGPL21
12
LICENSE_FILE=	${WRKSRC}/COPYING
11
LICENSE_FILE=	${WRKSRC}/COPYING
13
12
13
USE_GITLAB=	yes
14
GL_SITE=	https://gitlab.freedesktop.org
15
14
LIB_DEPENDS=	libnss3.so:security/nss \
16
LIB_DEPENDS=	libnss3.so:security/nss \
15
		libnspr4.so:devel/nspr
17
		libnspr4.so:devel/nspr \
18
		libgusb.so:devel/libgusb
16
19
17
GNU_CONFIGURE=	yes
20
USES=		gnome libtool magick:7 meson pathfix pkgconfig python \
18
USES=		gnome libtool magick:6 pathfix pkgconfig tar:xz xorg
21
		shebangfix tar:xz xorg
19
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
20
USE_GNOME=	glib20
23
USE_GNOME=	cairo glib20
21
USE_XORG=	pixman
24
USE_XORG=	pixman
25
MESON_ARGS=	-Dudev_rules=disabled
22
INSTALL_TARGET=	install-strip
26
INSTALL_TARGET=	install-strip
23
27
28
SHEBANG_GLOB=	*.py
29
24
CPPFLAGS+=	-DHAVE_MEMMEM
30
CPPFLAGS+=	-DHAVE_MEMMEM
25
MAKE_JOBS_UNSAFE=yes
31
MAKE_JOBS_UNSAFE=yes
26
32
(-)b/security/libfprint/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1532525845
1
TIMESTAMP = 1726159517
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
(-)a/security/libfprint/files/patch-config.h.in (-11 lines)
Removed Link Here
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
(-)a/security/libfprint/files/patch-libfprint-drivers-vfs301.c (-11 lines)
Removed Link Here
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>
(-)a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c (-11 lines)
Removed Link Here
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"
(-)a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h (-11 lines)
Removed Link Here
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,
(-)a/security/libfprint/files/patch-libfprint_Makefile.in (-11 lines)
Removed Link Here
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
 
(-)b/security/libfprint/files/patch-meson.build (+40 lines)
Added Link Here
1
--- meson.build.orig	2024-09-02 20:14:11.000000000 -0700
2
+++ meson.build	2024-09-12 10:39:12.265811000 -0700
3
@@ -288,7 +288,6 @@
4
 if install_udev_rules
5
     udev_rules_dir = get_option('udev_rules_dir')
6
     if udev_rules_dir == 'auto'
7
-        udev_dep = dependency('udev')
8
         udev_rules_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/rules.d'
9
     endif
10
 endif
11
@@ -310,28 +309,8 @@
12
 root_inc = include_directories('.')
13
 
14
 udev_hwdb = get_option('udev_hwdb')
15
-if not udev_hwdb.disabled()
16
-    # systemd v248 includes our autosuspend rules
17
-    udev_versioned_dep = dependency('udev', version: '>= 248', required: false)
18
-    udev_hwdb_dir = get_option('udev_hwdb_dir')
19
-    if udev_hwdb.auto()
20
-        if udev_versioned_dep.found()
21
-            udev_hwdb_dir = ''
22
-        endif
23
-    else
24
-        if udev_versioned_dep.found()
25
-            warning('udev hwdb will be installed by both systemd and libfprint')
26
-        endif
27
-    endif
28
+udev_hwdb_dir = ''
29
 
30
-    if udev_hwdb_dir == 'auto'
31
-        udev_dep = dependency('udev')
32
-        udev_hwdb_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/hwdb.d'
33
-    endif
34
-else
35
-    udev_hwdb_dir = ''
36
-endif
37
-
38
 if get_option('gtk-examples')
39
     gtk_dep = dependency('gtk+-3.0', required: false)
40
     if not gtk_dep.found()
(-)b/security/libfprint/pkg-plist (-7 / +171 lines)
Lines 1-6 Link Here
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/girepository-1.0/FPrint-2.0.typelib
9
lib/libfprint-2.so
10
lib/libfprint-2.so.2
11
lib/libfprint-2.so.2.0.0
12
libdata/pkgconfig/libfprint-2.pc
13
libexec/installed-tests/libfprint-2/capture.py
14
libexec/installed-tests/libfprint-2/test-fpi-assembling
15
libexec/installed-tests/libfprint-2/test-fpi-device
16
libexec/installed-tests/libfprint-2/test-fpi-ssm
17
libexec/installed-tests/libfprint-2/umockdev-test.py
18
share/gir-1.0/FPrint-2.0.gir
19
share/gtk-doc/html/libfprint-2/FpContext.html
20
share/gtk-doc/html/libfprint-2/FpDevice.html
21
share/gtk-doc/html/libfprint-2/FpImage.html
22
share/gtk-doc/html/libfprint-2/FpImageDevice.html
23
share/gtk-doc/html/libfprint-2/FpPrint.html
24
share/gtk-doc/html/libfprint-2/advanced-topics.html
25
share/gtk-doc/html/libfprint-2/api-index.html
26
share/gtk-doc/html/libfprint-2/deprecated-api-index.html
27
share/gtk-doc/html/libfprint-2/driver-dev.html
28
share/gtk-doc/html/libfprint-2/driver-helpers.html
29
share/gtk-doc/html/libfprint-2/driver-img.html
30
share/gtk-doc/html/libfprint-2/driver-misc.html
31
share/gtk-doc/html/libfprint-2/driver-print.html
32
share/gtk-doc/html/libfprint-2/getting-started.html
33
share/gtk-doc/html/libfprint-2/home.png
34
share/gtk-doc/html/libfprint-2/index.html
35
share/gtk-doc/html/libfprint-2/intro.html
36
share/gtk-doc/html/libfprint-2/left-insensitive.png
37
share/gtk-doc/html/libfprint-2/left.png
38
share/gtk-doc/html/libfprint-2/libfprint-2-Image-frame-assembly.html
39
share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpDevice.html
40
share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpImage.html
41
share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpImageDevice.html
42
share/gtk-doc/html/libfprint-2/libfprint-2-Internal-FpPrint.html
43
share/gtk-doc/html/libfprint-2/libfprint-2-Logging.html
44
share/gtk-doc/html/libfprint-2/libfprint-2-SPI-transfer-helpers.html
45
share/gtk-doc/html/libfprint-2/libfprint-2-Sequential-state-machine.html
46
share/gtk-doc/html/libfprint-2/libfprint-2-USB-transfer-helpers.html
47
share/gtk-doc/html/libfprint-2/libfprint-2-fpi-context.html
48
share/gtk-doc/html/libfprint-2/libfprint-2.devhelp2
49
share/gtk-doc/html/libfprint-2/pt01.html
50
share/gtk-doc/html/libfprint-2/pt02.html
51
share/gtk-doc/html/libfprint-2/pt03.html
52
share/gtk-doc/html/libfprint-2/right-insensitive.png
53
share/gtk-doc/html/libfprint-2/right.png
54
share/gtk-doc/html/libfprint-2/style.css
55
share/gtk-doc/html/libfprint-2/up-insensitive.png
56
share/gtk-doc/html/libfprint-2/up.png
57
share/installed-tests/libfprint-2/aes2501/capture.pcapng
58
share/installed-tests/libfprint-2/aes2501/capture.png
59
share/installed-tests/libfprint-2/aes2501/device
60
share/installed-tests/libfprint-2/aes3500/capture.ioctl
61
share/installed-tests/libfprint-2/aes3500/capture.png
62
share/installed-tests/libfprint-2/aes3500/device
63
share/installed-tests/libfprint-2/driver-aes2501.test
64
share/installed-tests/libfprint-2/driver-aes3500.test
65
share/installed-tests/libfprint-2/driver-egis0570.test
66
share/installed-tests/libfprint-2/driver-egismoc-0586.test
67
share/installed-tests/libfprint-2/driver-egismoc-0587.test
68
share/installed-tests/libfprint-2/driver-egismoc-05a1.test
69
share/installed-tests/libfprint-2/driver-egismoc.test
70
share/installed-tests/libfprint-2/driver-elan-cobo.test
71
share/installed-tests/libfprint-2/driver-elan.test
72
share/installed-tests/libfprint-2/driver-elanmoc.test
73
share/installed-tests/libfprint-2/driver-focaltech_moc.test
74
share/installed-tests/libfprint-2/driver-fpcmoc.test
75
share/installed-tests/libfprint-2/driver-goodixmoc.test
76
share/installed-tests/libfprint-2/driver-nb1010.test
77
share/installed-tests/libfprint-2/driver-realtek-5816.test
78
share/installed-tests/libfprint-2/driver-realtek.test
79
share/installed-tests/libfprint-2/driver-synaptics.test
80
share/installed-tests/libfprint-2/driver-upektc_img-tcs1s.test
81
share/installed-tests/libfprint-2/driver-upektc_img.test
82
share/installed-tests/libfprint-2/driver-uru4000-4500.test
83
share/installed-tests/libfprint-2/driver-uru4000-msv2.test
84
share/installed-tests/libfprint-2/driver-vfs0050.test
85
share/installed-tests/libfprint-2/driver-vfs301.test
86
share/installed-tests/libfprint-2/driver-vfs5011.test
87
share/installed-tests/libfprint-2/driver-vfs7552.test
88
share/installed-tests/libfprint-2/egis0570/capture.pcapng
89
share/installed-tests/libfprint-2/egis0570/capture.png
90
share/installed-tests/libfprint-2/egis0570/device
91
share/installed-tests/libfprint-2/egismoc-0586/custom.pcapng
92
share/installed-tests/libfprint-2/egismoc-0586/custom.py
93
share/installed-tests/libfprint-2/egismoc-0586/device
94
share/installed-tests/libfprint-2/egismoc-0587/custom.pcapng
95
share/installed-tests/libfprint-2/egismoc-0587/custom.py
96
share/installed-tests/libfprint-2/egismoc-0587/device
97
share/installed-tests/libfprint-2/egismoc-05a1/custom.pcapng
98
share/installed-tests/libfprint-2/egismoc-05a1/custom.py
99
share/installed-tests/libfprint-2/egismoc-05a1/device
100
share/installed-tests/libfprint-2/egismoc/custom.pcapng
101
share/installed-tests/libfprint-2/egismoc/custom.py
102
share/installed-tests/libfprint-2/egismoc/device
103
share/installed-tests/libfprint-2/elan-cobo/capture.pcapng
104
share/installed-tests/libfprint-2/elan-cobo/capture.png
105
share/installed-tests/libfprint-2/elan-cobo/device
106
share/installed-tests/libfprint-2/elan/capture.ioctl
107
share/installed-tests/libfprint-2/elan/capture.ioctl-recording
108
share/installed-tests/libfprint-2/elan/capture.png
109
share/installed-tests/libfprint-2/elan/device
110
share/installed-tests/libfprint-2/elanmoc/custom.pcapng
111
share/installed-tests/libfprint-2/elanmoc/custom.py
112
share/installed-tests/libfprint-2/elanmoc/device
113
share/installed-tests/libfprint-2/focaltech_moc/custom.pcapng
114
share/installed-tests/libfprint-2/focaltech_moc/custom.py
115
share/installed-tests/libfprint-2/focaltech_moc/device
116
share/installed-tests/libfprint-2/fpcmoc/custom.pcapng
117
share/installed-tests/libfprint-2/fpcmoc/custom.py
118
share/installed-tests/libfprint-2/fpcmoc/device
119
share/installed-tests/libfprint-2/fpi-assembling.test
120
share/installed-tests/libfprint-2/fpi-device.test
121
share/installed-tests/libfprint-2/fpi-ssm.test
122
share/installed-tests/libfprint-2/goodixmoc/custom.pcapng
123
share/installed-tests/libfprint-2/goodixmoc/custom.py
124
share/installed-tests/libfprint-2/goodixmoc/device
125
share/installed-tests/libfprint-2/nb1010/capture.ioctl
126
share/installed-tests/libfprint-2/nb1010/capture.png
127
share/installed-tests/libfprint-2/nb1010/device
128
share/installed-tests/libfprint-2/prints/README
129
share/installed-tests/libfprint-2/prints/arch.jpg
130
share/installed-tests/libfprint-2/prints/arch.png
131
share/installed-tests/libfprint-2/prints/loop-right.jpg
132
share/installed-tests/libfprint-2/prints/loop-right.png
133
share/installed-tests/libfprint-2/prints/tented_arch.jpg
134
share/installed-tests/libfprint-2/prints/tented_arch.png
135
share/installed-tests/libfprint-2/prints/whorl.jpg
136
share/installed-tests/libfprint-2/prints/whorl.png
137
share/installed-tests/libfprint-2/realtek-5816/custom.pcapng
138
share/installed-tests/libfprint-2/realtek-5816/custom.py
139
share/installed-tests/libfprint-2/realtek-5816/device
140
share/installed-tests/libfprint-2/realtek/custom.pcapng
141
share/installed-tests/libfprint-2/realtek/custom.py
142
share/installed-tests/libfprint-2/realtek/device
143
share/installed-tests/libfprint-2/synaptics/custom.pcapng
144
share/installed-tests/libfprint-2/synaptics/custom.py
145
share/installed-tests/libfprint-2/synaptics/device
146
share/installed-tests/libfprint-2/upektc_img-tcs1s/capture.pcapng
147
share/installed-tests/libfprint-2/upektc_img-tcs1s/capture.png
148
share/installed-tests/libfprint-2/upektc_img-tcs1s/device
149
share/installed-tests/libfprint-2/upektc_img/capture.pcapng
150
share/installed-tests/libfprint-2/upektc_img/capture.png
151
share/installed-tests/libfprint-2/upektc_img/device
152
share/installed-tests/libfprint-2/uru4000-4500/capture.pcapng
153
share/installed-tests/libfprint-2/uru4000-4500/capture.png
154
share/installed-tests/libfprint-2/uru4000-4500/device
155
share/installed-tests/libfprint-2/uru4000-msv2/capture.pcapng
156
share/installed-tests/libfprint-2/uru4000-msv2/capture.png
157
share/installed-tests/libfprint-2/uru4000-msv2/device
158
share/installed-tests/libfprint-2/vfs0050/capture-recorded.ioctl
159
share/installed-tests/libfprint-2/vfs0050/capture.ioctl
160
share/installed-tests/libfprint-2/vfs0050/capture.png
161
share/installed-tests/libfprint-2/vfs0050/device
162
share/installed-tests/libfprint-2/vfs301/capture-recorded.ioctl
163
share/installed-tests/libfprint-2/vfs301/capture.ioctl
164
share/installed-tests/libfprint-2/vfs301/capture.png
165
share/installed-tests/libfprint-2/vfs301/device
166
share/installed-tests/libfprint-2/vfs5011/capture.ioctl
167
share/installed-tests/libfprint-2/vfs5011/capture.png
168
share/installed-tests/libfprint-2/vfs5011/device
169
share/installed-tests/libfprint-2/vfs7552/capture.ioctl
170
share/installed-tests/libfprint-2/vfs7552/capture.png
171
share/installed-tests/libfprint-2/vfs7552/device
7
- 

Return to bug 281387