Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 May 2024 23:47:40 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: dc00cc36009a - 2024Q2 - sysutils/pam_xdg: restore -CURRENT support
Message-ID:  <202405012347.441Nlemv088892@gitrepo.freebsd.org>

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

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

commit dc00cc36009a3a48da4e8e8c18b45ab177e88c1d
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-05-01 23:21:46 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-05-01 23:47:34 +0000

    sysutils/pam_xdg: restore -CURRENT support
    
    Can be useful to skip root or directory cleanup on logout as base
    implementation isn't configurable.
    
    (cherry picked from commit b8b843a34a42a8d430e4ec9ccf3f118dca4fa05a)
---
 sysutils/pam_xdg/Makefile                              | 6 ++----
 sysutils/pam_xdg/{pkg-message => files/pkg-message.in} | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sysutils/pam_xdg/Makefile b/sysutils/pam_xdg/Makefile
index bad901d1b4a3..7a663e6c97ee 100644
--- a/sysutils/pam_xdg/Makefile
+++ b/sysutils/pam_xdg/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pam_xdg
 DISTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	sysutils wayland
 MASTER_SITES=	https://ftp.sdaoden.eu/
 
@@ -10,13 +11,10 @@ WWW=		https://www.sdaoden.eu/code.html#s-toolbox
 LICENSE=	ISCL
 
 USES=		uidfix
+SUB_FILES=	pkg-message
 PLIST_FILES=	lib/${PORTNAME}.so \
 		share/man/man8/${PORTNAME}.8.gz
 
-.if exists(/usr/lib/pam_xdg.so)
-IGNORE=		module name conflict with a different implementation in base system
-.endif
-
 # makefile is too crufty, so roll our own
 MAKEFILE=	bsd.lib.mk
 MAKE_ARGS+=	SHLIB_NAME="${PORTNAME}.so" MAN="${PORTNAME}.8" \
diff --git a/sysutils/pam_xdg/pkg-message b/sysutils/pam_xdg/files/pkg-message.in
similarity index 80%
rename from sysutils/pam_xdg/pkg-message
rename to sysutils/pam_xdg/files/pkg-message.in
index d45ab26f46b5..3340bc4b6e78 100644
--- a/sysutils/pam_xdg/pkg-message
+++ b/sysutils/pam_xdg/files/pkg-message.in
@@ -2,6 +2,8 @@
 { type: install
   message: <<EOM
 Read pam_xdg(8) manpage for instructions how to configure PAM.
+On FreeBSD >= 14.1 replace pam_xdg.so in /etc/pam/* with
+%%PREFIX%%/lib/pam_xdg.so (absolute path).
 
 XDG_RUNTIME_DIR on Wayland maybe used as a fallback for anonymous
 shared memory. For better performance and to avoid posix_fallocate(2)



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