From nobody Tue Jul 26 15:43:29 2022 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 4Lsh5Y5lbkz4XM1k; Tue, 26 Jul 2022 15:43:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lsh5Y5Fq3z3PS9; Tue, 26 Jul 2022 15:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658850209; 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=/y6/7xXVmBIlF+IYrAbrSNq6DqJeT1c6oh7J8UCcAUo=; b=j+TYWNK89llYjqf8bzcoqkLAolcj5qRvsEIJ8r6+xOvTISCH2ri2EyD2sR7wpDe81/dt7I AN6qHnR3iy9m8i/zMxooEKxZXG0WSMX1FAL1kxOED6R25hwj7JdmpSTsI31SO4qYmZy6Un HNjmUikpeOGxG9gkDrWRk5RPxbwy/hBpTUmY14BWO4VG4URXCxDVTijDGMcaClXsHC1zVn 1klPhMsDRL2/HxHQ6/7lb2upKP4mZEfrmouCYbPKUEYy2XJcSwaycEu17GB/VA5BgB+Rep LJwQLylPHLhkFqQ6n1zO+a0NLEnkgyoNgUOcPD/mnFDM1IWSy6QjmNPVxky6cw== 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 4Lsh5Y4Hv1zjR1; Tue, 26 Jul 2022 15:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26QFhTwU019486; Tue, 26 Jul 2022 15:43:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QFhTKG019485; Tue, 26 Jul 2022 15:43:29 GMT (envelope-from git) Date: Tue, 26 Jul 2022 15:43:29 GMT Message-Id: <202207261543.26QFhTKG019485@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 6a2a18f6deee - main - security/fprintd: fix build 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a2a18f6deee89e0f232ca762b50dc94db438751 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658850209; 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=/y6/7xXVmBIlF+IYrAbrSNq6DqJeT1c6oh7J8UCcAUo=; b=A03vJNu1uwfLnEszYxo6J3PHvWHAfJWsLlw47HqvbuBX2Il+bLSJ1xaEGSoMOpZhhyQu+U AV6gnvVJLfghLGOwuvw4ef+rgDBbkCUbh1i+Cnpwm/k3LRNrcRk68N6T6g7uibd0wB/vs3 7oxhoF4vOh0qxHM2trM5UCuzi58HWShef2BPHJwq0mv7ieDdd3L7kI6bq5KoPOF1NvZe4I mEzmI6OWOVvTBfUlTt7TN2/fVg+DTYEe/f8cU5u44XiVylVYgZOSvhVfnLw3HzxsbxQaRM fbPhloG+p+q9B6aAGPNAywKW5P6zFObyEnwCq7qQxlTI39kG+RU3pqppObpmrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658850209; a=rsa-sha256; cv=none; b=MSjS+vep5t86N2Y3GKC8IOW/a7TSqqzKcI0slVAnCrFPAeieRAnPB7KnpnczHcQwRoiTCk lddpVU3lAXEeUHOc2/fGLUaHci4r83T1qV+Tfz/DAQ8xP9XxOmrLhhgNlOWyOO3c0GvD5o 5r0lJJPle5vkAuaWLxPtgHOh1PJ3yTfBUrbv4wm3RJuZPVT+y/wkuWn4ITIJXi9iQg45pU SMSNrPp7BWxmzXTv/trYAsURi60u/AAmlvRXuuXxz4UmtkW7k/eCG8yDfSWiDAzCyC/pPW um+mTerYn2ql+A43kET+3FY6nepTWKU0G1jZQAuthUTT1C1oj+m6G1L48RhDKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a2a18f6deee89e0f232ca762b50dc94db438751 commit 6a2a18f6deee89e0f232ca762b50dc94db438751 Author: Dmitry Marakasov AuthorDate: 2022-07-26 15:40:13 +0000 Commit: Dmitry Marakasov CommitDate: 2022-07-26 15:43:24 +0000 security/fprintd: fix build - Don't allow to run configure from autogen.sh, where no necessary configure args/env is passed - Fix manpage location in plist and treat optional files as such --- security/fprintd/Makefile | 7 +------ security/fprintd/pkg-plist | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile index 2d6591b0ecc1..03812ec61231 100644 --- a/security/fprintd/Makefile +++ b/security/fprintd/Makefile @@ -31,17 +31,12 @@ OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls PAM_CONFIGURE_ENABLE= pam -do-configure: - (cd ${WRKSRC} ; ${SH} autogen.sh) - # 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 - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/security/pam_fprintd.so + (cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ${SH} autogen.sh) .include diff --git a/security/fprintd/pkg-plist b/security/fprintd/pkg-plist index be2cca9b31f7..4e3a01d8bd40 100644 --- a/security/fprintd/pkg-plist +++ b/security/fprintd/pkg-plist @@ -4,8 +4,8 @@ bin/fprintd-list bin/fprintd-verify %%ETCDIR%%/dbus-1/system.d/net.reactivated.Fprint.conf %%ETCDIR%%/fprintd.conf -lib/security/pam_fprintd.a -lib/security/pam_fprintd.so +%%PAM%%lib/security/pam_fprintd.a +%%PAM%%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 @@ -81,5 +81,5 @@ share/dbus-1/system-services/net.reactivated.Fprint.service %%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/man/man1/fprintd.1.gz +man/man1/fprintd.1.gz share/polkit-1/actions/net.reactivated.fprint.device.policy