From nobody Wed Jul 26 16:22:38 2023 X-Original-To: dev-commits-ports-main@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 4R9zhH2PmYz4pXft; Wed, 26 Jul 2023 16:22:39 +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 4R9zhH1CPrz4Ntp; Wed, 26 Jul 2023 16:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690388559; 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=HYAUPyt5JUydoY0is1ttnDx8C+Vp3iQ7jjDXqFzkdVg=; b=X4s//nUOmRon2/y8mGfwCjdmlLzDp3i7/Il3lQLbxJQXh8uwvCDS9A+TDs9aC6tH6gK5FB IGd+7fhLOVbMwGwInKtM83NerosdkHzdvuug2M7hLBoBuEupYvZq8Nlk+Nc3uXDMB20zAd h9S24aZgNrFmO/WRazoPBXDyjMegK2MTbtJ952Sr9Dv5OlG1gD3E4a8tsRVHD46njeTCec MJ93qfvIrzebxei9luTASk/IVKF0BAxZovNWgRkaQGTQPJhtqdVblIMT+mYihTiRPufHRx NSIHGqJ6tM9IK9CQhFKVKPXp2LkmSTAqc+pPtdzf3dno+UDATCvuIADwssrwsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690388559; 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=HYAUPyt5JUydoY0is1ttnDx8C+Vp3iQ7jjDXqFzkdVg=; b=b+lYSN648gTciaIyk2QGbIPE+i2/j09oHNMaEzOHkXaXlNTnkOMQB8wlLgSnaMn1ry+Vgq pKtTOVjHCYuGgtGiaURAPx7Va/6DkNRRdwnwbA8wwy38ZTaZ0AWPYU7/gBYrXpTWwPtl3S E90aOkNF4d73H+tFkTOROFmp1RK2G2fv2mj1HnOlw2D5sSFG/1SmEKfXv36/gkN6UjspN2 GpYiDRqEpuyavQJwfC+0ap9HjtA47zbpQdb1MLwKHUv4YCI0UldGRwwgXs9FSqPxoqv5zC D1p2UZyUKdjpSL3xoeBnZWyjwg8LrVw2JBa1Z5Ik2Vo9mYCSHLrz5hHPDbgMMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690388559; a=rsa-sha256; cv=none; b=oWMd+6L/6tytOC2WILhHh+EdF63PFJDB6ZyaOA4nmjKE2lRYx5rrF2qmBPRcXRLwWQdUzI 9NhfjXqtKJXyLLQKZ+Hy6IMiHZikfGXYvNhcr/h2wVXYUJl0vPlPZM2uRU+FADNyyKG8kw 7xqMR0mLmkSqOmbDDhcb4ALITYjC1WJu6I00SQihmGftaAbdOOrgHpBnkziwpOGh8oKL01 zE+3uXJXvhlzeejAdZQhnjGS+VSsDUJeyuV+UPGVSPH2Qk6BqMPZ5xOHF7MRDAIY9N/Qmd yzB2UUgqmOL3vPBNj4H1u6B/ogFUOJ7EZbo7pTmwqBJ49TxsvdKjO3hKyTvYhg== 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 4R9zhH0K1BzpsM; Wed, 26 Jul 2023 16:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36QGMc1b020729; Wed, 26 Jul 2023 16:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QGMcTc020728; Wed, 26 Jul 2023 16:22:38 GMT (envelope-from git) Date: Wed, 26 Jul 2023 16:22:38 GMT Message-Id: <202307261622.36QGMcTc020728@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 65fb3e5e126e - main - x11/waylock: simplify PAM config after ca20c3923e51 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65fb3e5e126e1699915fd271ae06b437065a3c64 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=65fb3e5e126e1699915fd271ae06b437065a3c64 commit 65fb3e5e126e1699915fd271ae06b437065a3c64 Author: Jan Beich AuthorDate: 2023-07-26 16:13:12 +0000 Commit: Jan Beich CommitDate: 2023-07-26 16:21:02 +0000 x11/waylock: simplify PAM config after ca20c3923e51 --- x11/waylock/Makefile | 6 +----- x11/waylock/files/patch-pam.d_waylock | 5 ++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/x11/waylock/Makefile b/x11/waylock/Makefile index 6a08bc704b21..1d6b4381ccff 100644 --- a/x11/waylock/Makefile +++ b/x11/waylock/Makefile @@ -1,6 +1,7 @@ PORTNAME= waylock DISTVERSIONPREFIX= v DISTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -40,11 +41,6 @@ MANPAGES_CONFIGURE_ON= -Dman-pages=true MANPAGES_CONFIGURE_OFF= -Dman-pages=false MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz -post-patch: -# Respect LOCALBASE for unix-selfauth-helper - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ - ${WRKSRC}/pam.d/${PORTNAME} - do-build: @(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS}) diff --git a/x11/waylock/files/patch-pam.d_waylock b/x11/waylock/files/patch-pam.d_waylock index ed32e2c01a3f..155be40d5486 100644 --- a/x11/waylock/files/patch-pam.d_waylock +++ b/x11/waylock/files/patch-pam.d_waylock @@ -5,7 +5,6 @@ so try authenticating via setuid helper first. --- pam.d/waylock.orig 2023-01-08 18:59:32 UTC +++ pam.d/waylock -@@ -1 +1,2 @@ +@@ -1 +1 @@ -auth include system-auth -+auth sufficient pam_exec.so return_prog_exit_status expose_authtok /usr/local/libexec/unix-selfauth-helper -+auth include system ++auth include unix-selfauth