Attachment 253454 Details for Bug 281387 – Patch updating security/fprintd to version 1.94.4 (including pam module)

[patch] Patch updating security/fprintd to version 1.94.4 (including pam module)

fprintd.diff (text/plain), 11.50 KB, created by Harald Eilertsen on 2024-09-09 10:38:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Eilertsen

Created: 2024-09-09 10:38:29 UTC

Size: 11.50 KB

patch

obsolete

>diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile
>index 93291c0076b3..df109e8ed38d 100644
>--- a/security/fprintd/Makefile
>+++ b/security/fprintd/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	fprintd
>-DISTVERSIONPREFIX=	V_
>-DISTVERSION=	0_8_1
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	1.94.4
> CATEGORIES=	security
> 
> MAINTAINER=	danfe@FreeBSD.org
>@@ -10,35 +10,20 @@ WWW=		https://www.freedesktop.org/wiki/Software/fprint/fprintd/
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libfprint.so:security/libfprint \
>-		libdbus-1.so:devel/dbus \
>-		libdbus-glib-1.so:devel/dbus-glib \
>-		libpolkit-gobject-1.so:sysutils/polkit
>+LIB_DEPENDS=	libfprint-2.so:security/libfprint \
>+		libpolkit-gobject-1.so:sysutils/polkit \
>+		libbasu.so:devel/basu
> 
>-USES=		autoreconf:build gettext gmake gnome libtool pkgconfig
>+USES=		gettext gnome libtool meson pkgconfig
> USE_GNOME=	intltool glib20
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	freedesktop
>-GH_PROJECT=	libfprint-${PORTNAME}
>+USE_GITLAB=	yes
>+GL_SITE=	https://gitlab.freedesktop.org
>+GL_ACCOUNT=	libfprint
>+GL_PROJECT=	${PORTNAME}
> 
>-GNU_CONFIGURE=	yes
>-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
>-INSTALL_TARGET=	install-strip
>-MAKE_ARGS=	sysconfdir="${ETCDIR}/"
>-
>-OPTIONS_DEFINE=	NLS PAM
>-OPTIONS_SUB=	yes
>+MESON_ARGS=	-Dlibsystemd=basu -Dsystemd=false
> 
>-NLS_CONFIGURE_ENABLE=	nls
>-PAM_CONFIGURE_ENABLE=	pam
>-
>-# Remove doc build ;  Doesn't install with/without
>-# Also less deps needed
>-pre-configure:
>-	${REINPLACE_CMD} -e '/pushd/d ; /docize/d ; /popd/d' ${WRKSRC}/autogen.sh
>-	${REINPLACE_CMD} -e '73,81d' ${WRKSRC}/doc/Makefile.am
>-	${REINPLACE_CMD} -e '/DOC_CHECK/d' ${WRKSRC}/configure.ac
>-	(cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ${SH} autogen.sh)
>+INSTALL_TARGET=	install-strip
> 
> .include <bsd.port.mk>
>diff --git a/security/fprintd/distinfo b/security/fprintd/distinfo
>index 253ff54631a1..ef5fe896f8cd 100644
>--- a/security/fprintd/distinfo
>+++ b/security/fprintd/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1549285491
>-SHA256 (freedesktop-libfprint-fprintd-V_0_8_1_GH0.tar.gz) = 7370e500ad9228194c575f915e215668d5d42958decc0485024f8dbfd646d21a
>-SIZE (freedesktop-libfprint-fprintd-V_0_8_1_GH0.tar.gz) = 92276
>+TIMESTAMP = 1725624566
>+SHA256 (fprintd-v1.94.4.tar.bz2) = dfcd6c748e95773fbfcbe07e8cb145b6e31868e9a360d48a13eb34739bf23560
>+SIZE (fprintd-v1.94.4.tar.bz2) = 664460
>diff --git a/security/fprintd/files/patch-git_06bab8 b/security/fprintd/files/patch-git_06bab8
>deleted file mode 100644
>index 963cb988a2a6..000000000000
>--- a/security/fprintd/files/patch-git_06bab8
>+++ /dev/null
>@@ -1,46 +0,0 @@
>-Obtained from:
>-	https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/0c6bab8640b3586ac8e1b8c35d87aa49b79719d0.patch
>-
>-From 0c6bab8640b3586ac8e1b8c35d87aa49b79719d0 Mon Sep 17 00:00:00 2001
>-From: Bastien Nocera <hadess@hadess.net>
>-Date: Thu, 23 Jan 2020 17:37:33 +0100
>-Subject: [PATCH] main: Fix redeclaration linking error
>-
>-Fix linking error as the "store" global variable gets redeclared in
>-each C file that includes the header. Move the actual declaration to
>-main.c.
>-
>-Fixes:
>- /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
>----
>- src/main.c    | 2 ++
>- src/storage.h | 2 +-
>- 2 files changed, 3 insertions(+), 1 deletion(-)
>-
>-diff --git a/src/main.c b/src/main.c
>-index 8f7e19c..ce1a47d 100644
>---- src/main.c
>-+++ src/main.c
>-@@ -33,6 +33,8 @@
>- #include "storage.h"
>- #include "file_storage.h"
>- 
>-+fp_storage store;
>-+
>- extern DBusGConnection *fprintd_dbus_conn;
>- static gboolean no_timeout = FALSE;
>- static gboolean g_fatal_warnings = FALSE;
>-diff --git a/src/storage.h b/src/storage.h
>-index d908c59..28ed2b6 100644
>---- src/storage.h
>-+++ src/storage.h
>-@@ -46,4 +46,4 @@ struct storage {
>- typedef struct storage fp_storage;
>- 
>- /* The currently setup store */
>--fp_storage store;
>-+extern fp_storage store;
>--- 
>-GitLab
>-
>-
>diff --git a/security/fprintd/files/patch-pam_meson.build b/security/fprintd/files/patch-pam_meson.build
>new file mode 100644
>index 000000000000..6dbce16a76cc
>--- /dev/null
>+++ b/security/fprintd/files/patch-pam_meson.build
>@@ -0,0 +1,11 @@
>+--- pam/meson.build.orig	2024-09-06 13:30:15.135401000 +0200
>++++ pam/meson.build	2024-09-06 13:23:22.960281000 +0200
>+@@ -25,7 +25,7 @@
>+     ],
>+     link_args: [
>+         '-Wl,--version-script,@0@/@1@'.format(meson.source_root(), mapfile[0]),
>+-        '-Wl,--unresolved-symbols=report-all',
>++        #'-Wl,--unresolved-symbols=report-all',
>+     ],
>+     link_depends: mapfile,
>+     install: true,
>diff --git a/security/fprintd/pkg-plist b/security/fprintd/pkg-plist
>index e682483d73d2..fc1a0e30b3d3 100644
>--- a/security/fprintd/pkg-plist
>+++ b/security/fprintd/pkg-plist
>@@ -2,84 +2,86 @@ bin/fprintd-delete
> bin/fprintd-enroll
> bin/fprintd-list
> bin/fprintd-verify
>-%%ETCDIR%%/dbus-1/system.d/net.reactivated.Fprint.conf
>-%%ETCDIR%%/fprintd.conf
>-%%PAM%%lib/security/pam_fprintd.a
>-%%PAM%%lib/security/pam_fprintd.so
>+%%ETCDIR%%.conf
>+lib/security/pam_fprintd.so
> libexec/fprintd
> share/dbus-1/interfaces/net.reactivated.Fprint.Device.xml
> share/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
> share/dbus-1/system-services/net.reactivated.Fprint.service
>-%%NLS%%share/locale/ar/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/as/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ast/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/az/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/be/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/bg/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/bn_IN/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ca/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ca@valencia/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/cs/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/cy/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/da/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/de/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/el/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/en_GB/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/eo/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/es/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/et/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/eu/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/fa/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/fi/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/fo/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/fr/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/fur/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ga/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/gl/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/gu/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/he/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/hi/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/hr/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/hu/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ia/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/id/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/it/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ja/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ka/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/kk/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/kn/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ko/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/lt/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/lv/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ml/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/mr/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ms/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/nb/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/nl/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/nn/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/oc/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/or/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/pa/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/pl/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/pt/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/pt_BR/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ro/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ru/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/sk/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/sl/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/sq/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/sr/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/sr@latin/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/sv/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/ta/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/te/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/th/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/tr/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/uk/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/vi/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/wa/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/zh_CN/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/zh_HK/LC_MESSAGES/fprintd.mo
>-%%NLS%%share/locale/zh_TW/LC_MESSAGES/fprintd.mo
>+share/dbus-1/system.d/net.reactivated.Fprint.conf
>+share/locale/af/LC_MESSAGES/fprintd.mo
>+share/locale/ar/LC_MESSAGES/fprintd.mo
>+share/locale/as/LC_MESSAGES/fprintd.mo
>+share/locale/ast/LC_MESSAGES/fprintd.mo
>+share/locale/az/LC_MESSAGES/fprintd.mo
>+share/locale/be/LC_MESSAGES/fprintd.mo
>+share/locale/bg/LC_MESSAGES/fprintd.mo
>+share/locale/bn_IN/LC_MESSAGES/fprintd.mo
>+share/locale/ca/LC_MESSAGES/fprintd.mo
>+share/locale/ca@valencia/LC_MESSAGES/fprintd.mo
>+share/locale/cs/LC_MESSAGES/fprintd.mo
>+share/locale/cy/LC_MESSAGES/fprintd.mo
>+share/locale/da/LC_MESSAGES/fprintd.mo
>+share/locale/de/LC_MESSAGES/fprintd.mo
>+share/locale/el/LC_MESSAGES/fprintd.mo
>+share/locale/en_GB/LC_MESSAGES/fprintd.mo
>+share/locale/eo/LC_MESSAGES/fprintd.mo
>+share/locale/es/LC_MESSAGES/fprintd.mo
>+share/locale/et/LC_MESSAGES/fprintd.mo
>+share/locale/eu/LC_MESSAGES/fprintd.mo
>+share/locale/fa/LC_MESSAGES/fprintd.mo
>+share/locale/fi/LC_MESSAGES/fprintd.mo
>+share/locale/fo/LC_MESSAGES/fprintd.mo
>+share/locale/fr/LC_MESSAGES/fprintd.mo
>+share/locale/fur/LC_MESSAGES/fprintd.mo
>+share/locale/ga/LC_MESSAGES/fprintd.mo
>+share/locale/gl/LC_MESSAGES/fprintd.mo
>+share/locale/gu/LC_MESSAGES/fprintd.mo
>+share/locale/he/LC_MESSAGES/fprintd.mo
>+share/locale/hi/LC_MESSAGES/fprintd.mo
>+share/locale/hr/LC_MESSAGES/fprintd.mo
>+share/locale/hu/LC_MESSAGES/fprintd.mo
>+share/locale/ia/LC_MESSAGES/fprintd.mo
>+share/locale/id/LC_MESSAGES/fprintd.mo
>+share/locale/it/LC_MESSAGES/fprintd.mo
>+share/locale/ja/LC_MESSAGES/fprintd.mo
>+share/locale/ka/LC_MESSAGES/fprintd.mo
>+share/locale/kk/LC_MESSAGES/fprintd.mo
>+share/locale/kn/LC_MESSAGES/fprintd.mo
>+share/locale/ko/LC_MESSAGES/fprintd.mo
>+share/locale/ky/LC_MESSAGES/fprintd.mo
>+share/locale/lt/LC_MESSAGES/fprintd.mo
>+share/locale/lv/LC_MESSAGES/fprintd.mo
>+share/locale/ml/LC_MESSAGES/fprintd.mo
>+share/locale/mr/LC_MESSAGES/fprintd.mo
>+share/locale/ms/LC_MESSAGES/fprintd.mo
>+share/locale/nb/LC_MESSAGES/fprintd.mo
>+share/locale/nl/LC_MESSAGES/fprintd.mo
>+share/locale/nn/LC_MESSAGES/fprintd.mo
>+share/locale/oc/LC_MESSAGES/fprintd.mo
>+share/locale/or/LC_MESSAGES/fprintd.mo
>+share/locale/pa/LC_MESSAGES/fprintd.mo
>+share/locale/pl/LC_MESSAGES/fprintd.mo
>+share/locale/pt/LC_MESSAGES/fprintd.mo
>+share/locale/pt_BR/LC_MESSAGES/fprintd.mo
>+share/locale/ro/LC_MESSAGES/fprintd.mo
>+share/locale/ru/LC_MESSAGES/fprintd.mo
>+share/locale/sk/LC_MESSAGES/fprintd.mo
>+share/locale/sl/LC_MESSAGES/fprintd.mo
>+share/locale/sq/LC_MESSAGES/fprintd.mo
>+share/locale/sr/LC_MESSAGES/fprintd.mo
>+share/locale/sr@latin/LC_MESSAGES/fprintd.mo
>+share/locale/sv/LC_MESSAGES/fprintd.mo
>+share/locale/ta/LC_MESSAGES/fprintd.mo
>+share/locale/te/LC_MESSAGES/fprintd.mo
>+share/locale/th/LC_MESSAGES/fprintd.mo
>+share/locale/tr/LC_MESSAGES/fprintd.mo
>+share/locale/uk/LC_MESSAGES/fprintd.mo
>+share/locale/vi/LC_MESSAGES/fprintd.mo
>+share/locale/wa/LC_MESSAGES/fprintd.mo
>+share/locale/zh_CN/LC_MESSAGES/fprintd.mo
>+share/locale/zh_HK/LC_MESSAGES/fprintd.mo
>+share/locale/zh_TW/LC_MESSAGES/fprintd.mo
> share/man/man1/fprintd.1.gz
>+share/man/man8/pam_fprintd.8.gz
> share/polkit-1/actions/net.reactivated.fprint.device.policy

Actions: View | Diff

Attachments on bug 281387: 253454 | 253483 | 253543