From nobody Mon Aug 21 07:37:33 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 4RTkpP62NCz4qNT4; Mon, 21 Aug 2023 07:37:33 +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 4RTkpP5T4Zz3b5C; Mon, 21 Aug 2023 07:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692603453; 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=i5uiJwQKJjYDlAaQUljmgIE0V43yGJ1T7eoNgyb7zTw=; b=fJaZP25vRJdnlPGspkzdtmv1sUl9/0yCP5mYyKIBwC4nT7XcILyNqP2aLNN99riB51aawT FJAcXbCcZT1AfOgDM2FF82ZD4QZe1dh6jYfEv+pJ3X/uvoQqyUSHkVALrd5fp3aRTWV9FZ siYB0rVOeqlL30pW5nFDGPPYBIfVZT6HEB8hZH2fb8M+gzjjslk+UoqmBXt9OT7PJ9NcvK QCPKEW9sy3cMR81RPCh4PH2Q6zualE5W6RnwPgauDvBMOis5UdTzKTeKrr86nxU4K5RA1c EVgml7UhaKmYaVNZOH/PbRYsJbe8oOCR0/Bjoo9HMjLLA/Pde0TW1nB4xlGHug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692603453; 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=i5uiJwQKJjYDlAaQUljmgIE0V43yGJ1T7eoNgyb7zTw=; b=tIZ23Pbj693Y5WfWWvIhIsAXWImGJWC5GDsw5LbU/Y1GQadvXThe3602N8ktsTFTEqZxSK jzISI36k/b9Z90p/RUR/3nz4+tkAc9SvXfok6XGMgyHrWpcNSfPxZP9R6jVvXJ1M8FfTkG Z4XsJhbxKteUEPZ9jjs98LYkQ/XRRPVu4Wwfa6RfwP8++iXx257PqCWtCdJTnOkT3WZ7eP OsNv7DpSNdiy1sJrRThpBpxJsKneMNZz9zZWn7Id0U0jtaDMD167Rn6GXfkZlD+Yaid72x UvHZoZFCuOLUlGn6VcR7bkzm8vDTLITEVDgl0pRyDpjlSAfOwoI8JKyf/FqCDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692603453; a=rsa-sha256; cv=none; b=hSPTFBDi94hipR/p2ozPeukZDeUj/qlG3QqOMr+qchnH/UZLa3g9EUlt1zh0qa4TR3J6YV WPe5l19HXLU4pXmrmko66o/+Ql00MD2NGy3Iol+Dyt6R82B1z4jyRKEiLY785IDqS+sbwX Zh7wKY5lKgolofLxUhr2DDLJs6ZJXbQCddMmnYmplryXb/Of1uxx7Cy5QOnXZ6JPS3MRXG q/c0Y0xfqNy5s50KaS/BLRWmrGmTJiw6gPya7Enm1rtVqVXJOtbTSzsiFkMpAVlMgL9Ap0 65/RXUaDxzFaDPc7scwjy6Ae9OaN2PNBssQtWsgRwhhrBWqVPkiXrsdRpML7BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTkpP4X43z1B9x; Mon, 21 Aug 2023 07:37:33 +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 37L7bXdB034267; Mon, 21 Aug 2023 07:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L7bXKF034264; Mon, 21 Aug 2023 07:37:33 GMT (envelope-from git) Date: Mon, 21 Aug 2023 07:37:33 GMT Message-Id: <202308210737.37L7bXKF034264@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: ceb11769e969 - main - deskutils/i3lock: 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: ceb11769e96905c5f3a669ef997fa4812176bc67 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ceb11769e96905c5f3a669ef997fa4812176bc67 commit ceb11769e96905c5f3a669ef997fa4812176bc67 Author: Jan Beich AuthorDate: 2023-08-11 13:55:04 +0000 Commit: Jan Beich CommitDate: 2023-08-21 07:36:46 +0000 deskutils/i3lock: simplify PAM config after ca20c3923e51 PR: 273073 Approved by: bapt (maintainer) --- deskutils/i3lock/Makefile | 5 ++--- deskutils/i3lock/files/i3lock.pam.in | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/deskutils/i3lock/Makefile b/deskutils/i3lock/Makefile index a269e22cd3cc..f87c77ee6437 100644 --- a/deskutils/i3lock/Makefile +++ b/deskutils/i3lock/Makefile @@ -30,8 +30,6 @@ PLIST_FILES= bin/i3lock \ man/man1/i3lock.1.gz \ etc/pam.d/i3lock -SUB_FILES= i3lock.pam - USES= gmake iconv localbase pkgconfig tar:bzip2 xorg LDFLAGS+= ${ICONV_LIB} USE_XORG= x11 xcb xt xorgproto xext @@ -47,7 +45,8 @@ OPTIONS_DEFINE= DOCS post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/i3lock @${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/i3lock - @${INSTALL_DATA} ${WRKDIR}/i3lock.pam ${STAGEDIR}${PREFIX}/etc/pam.d/i3lock + @${LN} -s ${LOCALBASE}/etc/pam.d/unix-selfauth \ + ${STAGEDIR}${PREFIX}/etc/pam.d/i3lock post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/deskutils/i3lock/files/i3lock.pam.in b/deskutils/i3lock/files/i3lock.pam.in deleted file mode 100644 index 942be88359ac..000000000000 --- a/deskutils/i3lock/files/i3lock.pam.in +++ /dev/null @@ -1,7 +0,0 @@ -# -# PAM configuration for the "i3lock" service. i3lock(1) only uses -# auth facilities. -# - -auth sufficient pam_exec.so return_prog_exit_status expose_authtok %%LOCALBASE%%/libexec/unix-selfauth-helper -auth include system