Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Jul 2023 16:22:38 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: 65fb3e5e126e - main - x11/waylock: simplify PAM config after ca20c3923e51
Message-ID:  <202307261622.36QGMcTc020728@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=65fb3e5e126e1699915fd271ae06b437065a3c64

commit 65fb3e5e126e1699915fd271ae06b437065a3c64
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-07-26 16:13:12 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
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



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