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

Collapse All | Expand All

(-)b/security/fprintd/Makefile (-27 / +12 lines)
Lines 1-6 Link Here
1
PORTNAME=	fprintd
1
PORTNAME=	fprintd
2
DISTVERSIONPREFIX=	V_
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	0_8_1
3
DISTVERSION=	1.94.4
4
CATEGORIES=	security
4
CATEGORIES=	security
5
5
6
MAINTAINER=	danfe@FreeBSD.org
6
MAINTAINER=	danfe@FreeBSD.org
Lines 10-44 WWW= https://www.freedesktop.org/wiki/Software/fprint/fprintd/ Link Here
10
LICENSE=	GPLv2
10
LICENSE=	GPLv2
11
LICENSE_FILE=	${WRKSRC}/COPYING
11
LICENSE_FILE=	${WRKSRC}/COPYING
12
12
13
LIB_DEPENDS=	libfprint.so:security/libfprint \
13
LIB_DEPENDS=	libfprint-2.so:security/libfprint \
14
		libdbus-1.so:devel/dbus \
14
		libpolkit-gobject-1.so:sysutils/polkit \
15
		libdbus-glib-1.so:devel/dbus-glib \
15
		libbasu.so:devel/basu
16
		libpolkit-gobject-1.so:sysutils/polkit
17
16
18
USES=		autoreconf:build gettext gmake gnome libtool pkgconfig
17
USES=		gettext gnome libtool meson pkgconfig
19
USE_GNOME=	intltool glib20
18
USE_GNOME=	intltool glib20
20
19
21
USE_GITHUB=	yes
20
USE_GITLAB=	yes
22
GH_ACCOUNT=	freedesktop
21
GL_SITE=	https://gitlab.freedesktop.org
23
GH_PROJECT=	libfprint-${PORTNAME}
22
GL_ACCOUNT=	libfprint
23
GL_PROJECT=	${PORTNAME}
24
24
25
GNU_CONFIGURE=	yes
25
MESON_ARGS=	-Dlibsystemd=basu -Dsystemd=false
26
GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
27
INSTALL_TARGET=	install-strip
28
MAKE_ARGS=	sysconfdir="${ETCDIR}/"
29
30
OPTIONS_DEFINE=	NLS PAM
31
OPTIONS_SUB=	yes
32
26
33
NLS_CONFIGURE_ENABLE=	nls
27
INSTALL_TARGET=	install-strip
34
PAM_CONFIGURE_ENABLE=	pam
35
36
# Remove doc build ;  Doesn't install with/without
37
# Also less deps needed
38
pre-configure:
39
	${REINPLACE_CMD} -e '/pushd/d ; /docize/d ; /popd/d' ${WRKSRC}/autogen.sh
40
	${REINPLACE_CMD} -e '73,81d' ${WRKSRC}/doc/Makefile.am
41
	${REINPLACE_CMD} -e '/DOC_CHECK/d' ${WRKSRC}/configure.ac
42
	(cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ${SH} autogen.sh)
43
28
44
.include <bsd.port.mk>
29
.include <bsd.port.mk>
(-)b/security/fprintd/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1549285491
1
TIMESTAMP = 1725624566
2
SHA256 (freedesktop-libfprint-fprintd-V_0_8_1_GH0.tar.gz) = 7370e500ad9228194c575f915e215668d5d42958decc0485024f8dbfd646d21a
2
SHA256 (fprintd-v1.94.4.tar.bz2) = dfcd6c748e95773fbfcbe07e8cb145b6e31868e9a360d48a13eb34739bf23560
3
SIZE (freedesktop-libfprint-fprintd-V_0_8_1_GH0.tar.gz) = 92276
3
SIZE (fprintd-v1.94.4.tar.bz2) = 664460
(-)a/security/fprintd/files/patch-git_06bab8 (-46 lines)
Removed Link Here
1
Obtained from:
2
	https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/0c6bab8640b3586ac8e1b8c35d87aa49b79719d0.patch
3
4
From 0c6bab8640b3586ac8e1b8c35d87aa49b79719d0 Mon Sep 17 00:00:00 2001
5
From: Bastien Nocera <hadess@hadess.net>
6
Date: Thu, 23 Jan 2020 17:37:33 +0100
7
Subject: [PATCH] main: Fix redeclaration linking error
8
9
Fix linking error as the "store" global variable gets redeclared in
10
each C file that includes the header. Move the actual declaration to
11
main.c.
12
13
Fixes:
14
 /usr/bin/ld: ./.libs/libfprintd.a(device.o):/builds/libfprint/fprintd/src/storage.h:51: multiple definition of `store'; main.o:/builds/libfprint/fprintd/src/storage.h:51: first defined here
15
---
16
 src/main.c    | 2 ++
17
 src/storage.h | 2 +-
18
 2 files changed, 3 insertions(+), 1 deletion(-)
19
20
diff --git a/src/main.c b/src/main.c
21
index 8f7e19c..ce1a47d 100644
22
--- src/main.c
23
+++ src/main.c
24
@@ -33,6 +33,8 @@
25
 #include "storage.h"
26
 #include "file_storage.h"
27
 
28
+fp_storage store;
29
+
30
 extern DBusGConnection *fprintd_dbus_conn;
31
 static gboolean no_timeout = FALSE;
32
 static gboolean g_fatal_warnings = FALSE;
33
diff --git a/src/storage.h b/src/storage.h
34
index d908c59..28ed2b6 100644
35
--- src/storage.h
36
+++ src/storage.h
37
@@ -46,4 +46,4 @@ struct storage {
38
 typedef struct storage fp_storage;
39
 
40
 /* The currently setup store */
41
-fp_storage store;
42
+extern fp_storage store;
43
-- 
44
GitLab
45
46
(-)b/security/fprintd/files/patch-pam_meson.build (+11 lines)
Added Link Here
1
--- pam/meson.build.orig	2024-09-06 13:30:15.135401000 +0200
2
+++ pam/meson.build	2024-09-06 13:23:22.960281000 +0200
3
@@ -25,7 +25,7 @@
4
     ],
5
     link_args: [
6
         '-Wl,--version-script,@0@/@1@'.format(meson.source_root(), mapfile[0]),
7
-        '-Wl,--unresolved-symbols=report-all',
8
+        #'-Wl,--unresolved-symbols=report-all',
9
     ],
10
     link_depends: mapfile,
11
     install: true,
(-)b/security/fprintd/pkg-plist (-75 / +77 lines)
Lines 2-85 bin/fprintd-delete Link Here
2
bin/fprintd-enroll
2
bin/fprintd-enroll
3
bin/fprintd-list
3
bin/fprintd-list
4
bin/fprintd-verify
4
bin/fprintd-verify
5
%%ETCDIR%%/dbus-1/system.d/net.reactivated.Fprint.conf
5
%%ETCDIR%%.conf
6
%%ETCDIR%%/fprintd.conf
6
lib/security/pam_fprintd.so
7
%%PAM%%lib/security/pam_fprintd.a
8
%%PAM%%lib/security/pam_fprintd.so
9
libexec/fprintd
7
libexec/fprintd
10
share/dbus-1/interfaces/net.reactivated.Fprint.Device.xml
8
share/dbus-1/interfaces/net.reactivated.Fprint.Device.xml
11
share/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
9
share/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
12
share/dbus-1/system-services/net.reactivated.Fprint.service
10
share/dbus-1/system-services/net.reactivated.Fprint.service
13
%%NLS%%share/locale/ar/LC_MESSAGES/fprintd.mo
11
share/dbus-1/system.d/net.reactivated.Fprint.conf
14
%%NLS%%share/locale/as/LC_MESSAGES/fprintd.mo
12
share/locale/af/LC_MESSAGES/fprintd.mo
15
%%NLS%%share/locale/ast/LC_MESSAGES/fprintd.mo
13
share/locale/ar/LC_MESSAGES/fprintd.mo
16
%%NLS%%share/locale/az/LC_MESSAGES/fprintd.mo
14
share/locale/as/LC_MESSAGES/fprintd.mo
17
%%NLS%%share/locale/be/LC_MESSAGES/fprintd.mo
15
share/locale/ast/LC_MESSAGES/fprintd.mo
18
%%NLS%%share/locale/bg/LC_MESSAGES/fprintd.mo
16
share/locale/az/LC_MESSAGES/fprintd.mo
19
%%NLS%%share/locale/bn_IN/LC_MESSAGES/fprintd.mo
17
share/locale/be/LC_MESSAGES/fprintd.mo
20
%%NLS%%share/locale/ca/LC_MESSAGES/fprintd.mo
18
share/locale/bg/LC_MESSAGES/fprintd.mo
21
%%NLS%%share/locale/ca@valencia/LC_MESSAGES/fprintd.mo
19
share/locale/bn_IN/LC_MESSAGES/fprintd.mo
22
%%NLS%%share/locale/cs/LC_MESSAGES/fprintd.mo
20
share/locale/ca/LC_MESSAGES/fprintd.mo
23
%%NLS%%share/locale/cy/LC_MESSAGES/fprintd.mo
21
share/locale/ca@valencia/LC_MESSAGES/fprintd.mo
24
%%NLS%%share/locale/da/LC_MESSAGES/fprintd.mo
22
share/locale/cs/LC_MESSAGES/fprintd.mo
25
%%NLS%%share/locale/de/LC_MESSAGES/fprintd.mo
23
share/locale/cy/LC_MESSAGES/fprintd.mo
26
%%NLS%%share/locale/el/LC_MESSAGES/fprintd.mo
24
share/locale/da/LC_MESSAGES/fprintd.mo
27
%%NLS%%share/locale/en_GB/LC_MESSAGES/fprintd.mo
25
share/locale/de/LC_MESSAGES/fprintd.mo
28
%%NLS%%share/locale/eo/LC_MESSAGES/fprintd.mo
26
share/locale/el/LC_MESSAGES/fprintd.mo
29
%%NLS%%share/locale/es/LC_MESSAGES/fprintd.mo
27
share/locale/en_GB/LC_MESSAGES/fprintd.mo
30
%%NLS%%share/locale/et/LC_MESSAGES/fprintd.mo
28
share/locale/eo/LC_MESSAGES/fprintd.mo
31
%%NLS%%share/locale/eu/LC_MESSAGES/fprintd.mo
29
share/locale/es/LC_MESSAGES/fprintd.mo
32
%%NLS%%share/locale/fa/LC_MESSAGES/fprintd.mo
30
share/locale/et/LC_MESSAGES/fprintd.mo
33
%%NLS%%share/locale/fi/LC_MESSAGES/fprintd.mo
31
share/locale/eu/LC_MESSAGES/fprintd.mo
34
%%NLS%%share/locale/fo/LC_MESSAGES/fprintd.mo
32
share/locale/fa/LC_MESSAGES/fprintd.mo
35
%%NLS%%share/locale/fr/LC_MESSAGES/fprintd.mo
33
share/locale/fi/LC_MESSAGES/fprintd.mo
36
%%NLS%%share/locale/fur/LC_MESSAGES/fprintd.mo
34
share/locale/fo/LC_MESSAGES/fprintd.mo
37
%%NLS%%share/locale/ga/LC_MESSAGES/fprintd.mo
35
share/locale/fr/LC_MESSAGES/fprintd.mo
38
%%NLS%%share/locale/gl/LC_MESSAGES/fprintd.mo
36
share/locale/fur/LC_MESSAGES/fprintd.mo
39
%%NLS%%share/locale/gu/LC_MESSAGES/fprintd.mo
37
share/locale/ga/LC_MESSAGES/fprintd.mo
40
%%NLS%%share/locale/he/LC_MESSAGES/fprintd.mo
38
share/locale/gl/LC_MESSAGES/fprintd.mo
41
%%NLS%%share/locale/hi/LC_MESSAGES/fprintd.mo
39
share/locale/gu/LC_MESSAGES/fprintd.mo
42
%%NLS%%share/locale/hr/LC_MESSAGES/fprintd.mo
40
share/locale/he/LC_MESSAGES/fprintd.mo
43
%%NLS%%share/locale/hu/LC_MESSAGES/fprintd.mo
41
share/locale/hi/LC_MESSAGES/fprintd.mo
44
%%NLS%%share/locale/ia/LC_MESSAGES/fprintd.mo
42
share/locale/hr/LC_MESSAGES/fprintd.mo
45
%%NLS%%share/locale/id/LC_MESSAGES/fprintd.mo
43
share/locale/hu/LC_MESSAGES/fprintd.mo
46
%%NLS%%share/locale/it/LC_MESSAGES/fprintd.mo
44
share/locale/ia/LC_MESSAGES/fprintd.mo
47
%%NLS%%share/locale/ja/LC_MESSAGES/fprintd.mo
45
share/locale/id/LC_MESSAGES/fprintd.mo
48
%%NLS%%share/locale/ka/LC_MESSAGES/fprintd.mo
46
share/locale/it/LC_MESSAGES/fprintd.mo
49
%%NLS%%share/locale/kk/LC_MESSAGES/fprintd.mo
47
share/locale/ja/LC_MESSAGES/fprintd.mo
50
%%NLS%%share/locale/kn/LC_MESSAGES/fprintd.mo
48
share/locale/ka/LC_MESSAGES/fprintd.mo
51
%%NLS%%share/locale/ko/LC_MESSAGES/fprintd.mo
49
share/locale/kk/LC_MESSAGES/fprintd.mo
52
%%NLS%%share/locale/lt/LC_MESSAGES/fprintd.mo
50
share/locale/kn/LC_MESSAGES/fprintd.mo
53
%%NLS%%share/locale/lv/LC_MESSAGES/fprintd.mo
51
share/locale/ko/LC_MESSAGES/fprintd.mo
54
%%NLS%%share/locale/ml/LC_MESSAGES/fprintd.mo
52
share/locale/ky/LC_MESSAGES/fprintd.mo
55
%%NLS%%share/locale/mr/LC_MESSAGES/fprintd.mo
53
share/locale/lt/LC_MESSAGES/fprintd.mo
56
%%NLS%%share/locale/ms/LC_MESSAGES/fprintd.mo
54
share/locale/lv/LC_MESSAGES/fprintd.mo
57
%%NLS%%share/locale/nb/LC_MESSAGES/fprintd.mo
55
share/locale/ml/LC_MESSAGES/fprintd.mo
58
%%NLS%%share/locale/nl/LC_MESSAGES/fprintd.mo
56
share/locale/mr/LC_MESSAGES/fprintd.mo
59
%%NLS%%share/locale/nn/LC_MESSAGES/fprintd.mo
57
share/locale/ms/LC_MESSAGES/fprintd.mo
60
%%NLS%%share/locale/oc/LC_MESSAGES/fprintd.mo
58
share/locale/nb/LC_MESSAGES/fprintd.mo
61
%%NLS%%share/locale/or/LC_MESSAGES/fprintd.mo
59
share/locale/nl/LC_MESSAGES/fprintd.mo
62
%%NLS%%share/locale/pa/LC_MESSAGES/fprintd.mo
60
share/locale/nn/LC_MESSAGES/fprintd.mo
63
%%NLS%%share/locale/pl/LC_MESSAGES/fprintd.mo
61
share/locale/oc/LC_MESSAGES/fprintd.mo
64
%%NLS%%share/locale/pt/LC_MESSAGES/fprintd.mo
62
share/locale/or/LC_MESSAGES/fprintd.mo
65
%%NLS%%share/locale/pt_BR/LC_MESSAGES/fprintd.mo
63
share/locale/pa/LC_MESSAGES/fprintd.mo
66
%%NLS%%share/locale/ro/LC_MESSAGES/fprintd.mo
64
share/locale/pl/LC_MESSAGES/fprintd.mo
67
%%NLS%%share/locale/ru/LC_MESSAGES/fprintd.mo
65
share/locale/pt/LC_MESSAGES/fprintd.mo
68
%%NLS%%share/locale/sk/LC_MESSAGES/fprintd.mo
66
share/locale/pt_BR/LC_MESSAGES/fprintd.mo
69
%%NLS%%share/locale/sl/LC_MESSAGES/fprintd.mo
67
share/locale/ro/LC_MESSAGES/fprintd.mo
70
%%NLS%%share/locale/sq/LC_MESSAGES/fprintd.mo
68
share/locale/ru/LC_MESSAGES/fprintd.mo
71
%%NLS%%share/locale/sr/LC_MESSAGES/fprintd.mo
69
share/locale/sk/LC_MESSAGES/fprintd.mo
72
%%NLS%%share/locale/sr@latin/LC_MESSAGES/fprintd.mo
70
share/locale/sl/LC_MESSAGES/fprintd.mo
73
%%NLS%%share/locale/sv/LC_MESSAGES/fprintd.mo
71
share/locale/sq/LC_MESSAGES/fprintd.mo
74
%%NLS%%share/locale/ta/LC_MESSAGES/fprintd.mo
72
share/locale/sr/LC_MESSAGES/fprintd.mo
75
%%NLS%%share/locale/te/LC_MESSAGES/fprintd.mo
73
share/locale/sr@latin/LC_MESSAGES/fprintd.mo
76
%%NLS%%share/locale/th/LC_MESSAGES/fprintd.mo
74
share/locale/sv/LC_MESSAGES/fprintd.mo
77
%%NLS%%share/locale/tr/LC_MESSAGES/fprintd.mo
75
share/locale/ta/LC_MESSAGES/fprintd.mo
78
%%NLS%%share/locale/uk/LC_MESSAGES/fprintd.mo
76
share/locale/te/LC_MESSAGES/fprintd.mo
79
%%NLS%%share/locale/vi/LC_MESSAGES/fprintd.mo
77
share/locale/th/LC_MESSAGES/fprintd.mo
80
%%NLS%%share/locale/wa/LC_MESSAGES/fprintd.mo
78
share/locale/tr/LC_MESSAGES/fprintd.mo
81
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fprintd.mo
79
share/locale/uk/LC_MESSAGES/fprintd.mo
82
%%NLS%%share/locale/zh_HK/LC_MESSAGES/fprintd.mo
80
share/locale/vi/LC_MESSAGES/fprintd.mo
83
%%NLS%%share/locale/zh_TW/LC_MESSAGES/fprintd.mo
81
share/locale/wa/LC_MESSAGES/fprintd.mo
82
share/locale/zh_CN/LC_MESSAGES/fprintd.mo
83
share/locale/zh_HK/LC_MESSAGES/fprintd.mo
84
share/locale/zh_TW/LC_MESSAGES/fprintd.mo
84
share/man/man1/fprintd.1.gz
85
share/man/man1/fprintd.1.gz
86
share/man/man8/pam_fprintd.8.gz
85
share/polkit-1/actions/net.reactivated.fprint.device.policy
87
share/polkit-1/actions/net.reactivated.fprint.device.policy

Return to bug 281387