Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Aug 2023 07:37:33 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ceb11769e969 - main - deskutils/i3lock: simplify PAM config after ca20c3923e51
Message-ID:  <202308210737.37L7bXKF034264@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ceb11769e96905c5f3a669ef997fa4812176bc67

commit ceb11769e96905c5f3a669ef997fa4812176bc67
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-08-11 13:55:04 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308210737.37L7bXKF034264>