From nobody Fri Oct 11 10:44:19 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ3CR3p3wz5YhFx; Fri, 11 Oct 2024 10:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ3CR2FlPz4K4W; Fri, 11 Oct 2024 10:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728643459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPzdlNlo/Grn8NXjxpRGAXafjygq0J2Fe56FP9roqQ4=; b=vEUiOJfXr1K9GEvyAkwciM3LcbTemPH601SUS3A4tkXnw5HsteBD77Jbl0LWcqxeVzLRam THp7Nnhj7uq27y/kd75H8jL7CpKjQC17LzuY2KAGRobYRMfL14rqKndIMFpmqa5zsldNdQ /YYRQ/zKJXbGLcObOK9jIZ4Rt/7p8dxlVX7v4l3gEoyLXmVdafK2yi+IVi2DetrecvM+R5 LRDqielnuvyPxHiXSh4oHwPk8ry9v5vcwojjrf4rRtIG73C6Od0ZshOoIGsvPUURetOh3v v7GFBNHYDY6K83ju1SH6J0Qhnd1u7Khv4nSc8ahUuSQRuPd8GMV9KclTdyrJIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728643459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPzdlNlo/Grn8NXjxpRGAXafjygq0J2Fe56FP9roqQ4=; b=X+uqHo/kyNDelPJKbbCScN2jh+dgiuq2J7ablHBer3aq0s+7iARbiSdEgWou84AoPFDxRv qsjxEoUmecm+UGUa0YO3QrzXZcxdzls1+A2WuEgdhrt46lpd6472g4BzOn65xjt/qiZKPr vxf8LKCMh/gqmDsrVIdseVoFHo/5UvSKGz++XXBJE6JTBv09FpDXyVTCv3s98PBnFes8o4 jV0iGCwF16o5tuoOdHksSZVq00JsvtaDOPHNCxnoESJYSF9L0yPU2oJ/Ii17EX5JjPhfNV mtQ86mdkq4n8KdSxVjwInMbFkYtRa1A+YfcOvrWTPSp+anmP417R+q5L0fWyVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728643459; a=rsa-sha256; cv=none; b=YNr5u4O2UpsWP+NkusWWjiQAaupWQpiNIYfaqTrmE3UqSFNKgl+4+3YO6wMsx14+rwL75z RfofJbwFhWYTKSW49/JqBAXuRppl3OdhuN/lPvj6I0mdBx6JJSmSZIlirggIzlH52O7NZN F10sxjn4h/4GCSRCSmAiOHS+Y9e2afvDILD7IHy7AEyFKUG4ZzdkKDazoDHWBeKwYy25WG mH37joxsOBqfq7CLv38PmMKEMfo7jb8BLS39f7Q3zkyWnwggBUBzZEhmxaYTNshz66OWF3 DOQmHwgDHOZLTGOl53PoBfY2pcmlcgGUjedpBg53WDdAHXbk/bA2v0C5+OVY6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XQ3CR1s0jzfcv; Fri, 11 Oct 2024 10:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BAiJQS062438; Fri, 11 Oct 2024 10:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BAiJRU062435; Fri, 11 Oct 2024 10:44:19 GMT (envelope-from git) Date: Fri, 11 Oct 2024 10:44:19 GMT Message-Id: <202410111044.49BAiJRU062435@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 406cda4aff0d - main - security/fprintd: Update to 1.94.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 406cda4aff0da933aadfa169c3d2ac13c0b858dc Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=406cda4aff0da933aadfa169c3d2ac13c0b858dc commit 406cda4aff0da933aadfa169c3d2ac13c0b858dc Author: Harald Eilertsen AuthorDate: 2024-10-10 12:50:58 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-11 10:42:18 +0000 security/fprintd: Update to 1.94.4 Upstream has changed to use devel/basu as a systemd/dbus alternative which makes it almost build cleanly. A small patch is included in the port to make the last remaining build issue disappear. This new port also includes the PAM module that previously was a separate port. PR: 281387 Reviewed by: 0mp Tested by: Eirik Øverby Approved by: maintainer timeout Sponsored by: Entersekt (previously Modirum MDpay) --- security/fprintd/Makefile | 38 +++----- security/fprintd/distinfo | 6 +- security/fprintd/files/patch-git_06bab8 | 46 ---------- security/fprintd/pkg-plist | 152 ++++++++++++++++---------------- 4 files changed, 91 insertions(+), 151 deletions(-) diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile index 93291c0076b3..ceee89d4cbd9 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,19 @@ 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 \ +LIB_DEPENDS= libbasu.so:devel/basu \ + libfprint-2.so:security/libfprint \ libpolkit-gobject-1.so:sysutils/polkit -USES= autoreconf:build gettext gmake gnome libtool pkgconfig -USE_GNOME= intltool glib20 +USES= gettext gnome libtool meson pkgconfig +USE_GITLAB= yes +GL_SITE= https://gitlab.freedesktop.org +GL_ACCOUNT= libfprint +USE_GNOME= glib20 intltool -USE_GITHUB= yes -GH_ACCOUNT= freedesktop -GH_PROJECT= libfprint-${PORTNAME} +MESON_ARGS= -Dlibsystemd=basu \ + -Dsystemd=false -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share INSTALL_TARGET= install-strip -MAKE_ARGS= sysconfdir="${ETCDIR}/" - -OPTIONS_DEFINE= NLS PAM -OPTIONS_SUB= yes - -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) .include 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 -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/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