git: 4f53b9995818 - main - x11/swaylock: simplify PAM config after ca20c3923e51
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 26 Jul 2023 16:22:37 UTC
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f53b9995818ef74754578c352061dc8418d43de commit 4f53b9995818ef74754578c352061dc8418d43de 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:01 +0000 x11/swaylock: simplify PAM config after ca20c3923e51 --- x11/swaylock-effects/Makefile | 2 +- x11/swaylock/Makefile | 5 +---- x11/swaylock/files/patch-pam_swaylock | 5 ++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/x11/swaylock-effects/Makefile b/x11/swaylock-effects/Makefile index b7d6cd6e5d5c..571c15d732ac 100644 --- a/x11/swaylock-effects/Makefile +++ b/x11/swaylock-effects/Makefile @@ -1,6 +1,6 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.6.11 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -effects COMMENT= Screen locker for Wayland with fancy effects diff --git a/x11/swaylock/Makefile b/x11/swaylock/Makefile index aef0628feb1a..a14765f1b5b9 100644 --- a/x11/swaylock/Makefile +++ b/x11/swaylock/Makefile @@ -1,7 +1,7 @@ PORTNAME= swaylock DISTVERSIONPREFIX?= v DISTVERSION?= 1.7.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -44,8 +44,5 @@ post-patch: @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build -# Respect LOCALBASE for unix-selfauth-helper - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ - ${WRKSRC}/pam/${PORTNAME} .include <bsd.port.mk> diff --git a/x11/swaylock/files/patch-pam_swaylock b/x11/swaylock/files/patch-pam_swaylock index 19908bfed564..baff8e6b5776 100644 --- a/x11/swaylock/files/patch-pam_swaylock +++ b/x11/swaylock/files/patch-pam_swaylock @@ -6,7 +6,7 @@ so try authenticating via setuid helper first. --- pam/swaylock.orig 2019-01-29 19:48:00 UTC +++ pam/swaylock -@@ -1,6 +1,7 @@ +@@ -1,6 +1,6 @@ # -# PAM configuration file for the swaylock screen locker. By default, it includes -# the 'login' configuration file (see /etc/pam.d/login) @@ -15,5 +15,4 @@ so try authenticating via setuid helper first. # -auth include login -+auth sufficient pam_exec.so return_prog_exit_status expose_authtok /usr/local/libexec/unix-selfauth-helper -+auth include system ++auth include unix-selfauth