From owner-dev-commits-ports-all@freebsd.org Tue May 4 22:38:55 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0387D625BD5; Tue, 4 May 2021 22:38:55 +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 4FZZWf6lqgz4b6t; Tue, 4 May 2021 22:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DB5B519D02; Tue, 4 May 2021 22:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 144McsiJ041773; Tue, 4 May 2021 22:38:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 144Mcs4G041772; Tue, 4 May 2021 22:38:54 GMT (envelope-from git) Date: Tue, 4 May 2021 22:38:54 GMT Message-Id: <202105042238.144Mcs4G041772@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: d255158645da - main - sysutils/pam_xdg: add new port 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: d255158645dae682063e973978f2f6843b9c4dd4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2021 22:38:55 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d255158645dae682063e973978f2f6843b9c4dd4 commit d255158645dae682063e973978f2f6843b9c4dd4 Author: Jan Beich AuthorDate: 2021-03-29 22:50:34 +0000 Commit: Jan Beich CommitDate: 2021-05-04 22:35:50 +0000 sysutils/pam_xdg: add new port Complete XDG Base Directories support via PAM, including injection of according environment variables into user sessions, as well as creation support for per-user $XDG_RUNTIME_DIR. https://www.sdaoden.eu/code.html#s-toolbox --- sysutils/Makefile | 1 + sysutils/pam_xdg/Makefile | 34 +++++++++++++++++++++++++ sysutils/pam_xdg/distinfo | 3 +++ sysutils/pam_xdg/files/patch-pam__xdg.8 | 32 ++++++++++++++++++++++++ sysutils/pam_xdg/files/patch-pam__xdg.c | 44 +++++++++++++++++++++++++++++++++ sysutils/pam_xdg/pkg-descr | 5 ++++ sysutils/pam_xdg/pkg-message | 13 ++++++++++ 7 files changed, 132 insertions(+) diff --git a/sysutils/Makefile b/sysutils/Makefile index 09d8933c5171..dd753d7c5e2d 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -891,6 +891,7 @@ SUBDIR += paicc SUBDIR += paladin SUBDIR += pam_mount + SUBDIR += pam_xdg SUBDIR += panicmail SUBDIR += parafly SUBDIR += parallel diff --git a/sysutils/pam_xdg/Makefile b/sysutils/pam_xdg/Makefile new file mode 100644 index 000000000000..c7e107f1018c --- /dev/null +++ b/sysutils/pam_xdg/Makefile @@ -0,0 +1,34 @@ +PORTNAME= pam_xdg +PORTVERSION= s20210329 +CATEGORIES= sysutils + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= PAM module to manage XDG Base Directories + +LICENSE= ISCL + +USES= uidfix +USE_GITHUB= yes +GH_ACCOUNT= jbeich # mirror +GH_PROJECT= s-toolbox +GH_TAGNAME= 2433f8b +PLIST_FILES= lib/${PORTNAME}.so \ + share/man/man8/${PORTNAME}.8.gz + +# pam_xdg.makefile is too crufty, so roll our own +MAKEFILE= bsd.lib.mk +MAKE_ARGS+= SHLIB_NAME="${PORTNAME}.so" MAN="${PORTNAME}.8" \ + SRCS="${PORTNAME}.c" LDADD="-lpam" \ + LIBDIR="${PREFIX}/lib" SHAREDIR="${PREFIX}/share" +LDFLAGS+= -Wl,-z,defs + +post-patch: + @${REINPLACE_CMD} \ + -e '/#define/ { \ + s,/etc,${PREFIX}&,; \ + s,/usr/local,${PREFIX},; \ + s,/run,/var&,; \ + }' \ + ${WRKSRC}/${PORTNAME}.c + +.include diff --git a/sysutils/pam_xdg/distinfo b/sysutils/pam_xdg/distinfo new file mode 100644 index 000000000000..cd9a5a2a68c9 --- /dev/null +++ b/sysutils/pam_xdg/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1617058234 +SHA256 (jbeich-s-toolbox-s20210329-2433f8b_GH0.tar.gz) = c7797a449e98bf32a82f60555bc3e63bf60b4636e264d651d59cfe7c8347c7b4 +SIZE (jbeich-s-toolbox-s20210329-2433f8b_GH0.tar.gz) = 97722 diff --git a/sysutils/pam_xdg/files/patch-pam__xdg.8 b/sysutils/pam_xdg/files/patch-pam__xdg.8 new file mode 100644 index 000000000000..27faf14757ea --- /dev/null +++ b/sysutils/pam_xdg/files/patch-pam__xdg.8 @@ -0,0 +1,32 @@ +- Chase option name used in the source +- Switch to OpenPAM include for local sessions + +--- pam_xdg.8.orig 2021-03-29 22:50:34 UTC ++++ pam_xdg.8 +@@ -28,7 +28,7 @@ + .Sh SYNOPSIS + . + .Nm +-.Op Ar rundir ++.Op Ar runtime + .Op Ar notroot + . + . +@@ -47,7 +47,7 @@ into user sessions. + When linked into the PAM session system the runtime directory will be + created once a user creates his or her first login session. + Unless +-.Ar rundir ++.Ar runtime + was given all XDG related environment variables will be created in all + user sessions with their default or computed values, otherwise only + .Ev XDG_RUNTIME_DIR . +@@ -61,7 +61,7 @@ In order to make use of this script, place the followi + file of desire under + .Pa /etc/pam.d , + best maybe +-.Pa /etc/pam.d/common-session ++.Pa /etc/pam.d/system + if that exists (possibly adjusting paths): + . + .Bd -literal -offset indent diff --git a/sysutils/pam_xdg/files/patch-pam__xdg.c b/sysutils/pam_xdg/files/patch-pam__xdg.c new file mode 100644 index 000000000000..417d054f009d --- /dev/null +++ b/sysutils/pam_xdg/files/patch-pam__xdg.c @@ -0,0 +1,44 @@ +- Prefer system PATH_MAX +- Add OpenPAM support +- Relax O_PATH optimization + +--- pam_xdg.c.orig 2021-03-29 22:50:34 UTC ++++ pam_xdg.c +@@ -52,6 +52,7 @@ + + #include + #include ++#include /* PATH_MAX */ + #include + #include + #include +@@ -60,11 +61,29 @@ + #include + + #include ++#if __has_include() + #include ++#else ++#include ++/* From freebsd-src/sys/contrib/openzfs/contrib/pam_zfs_key/pam_zfs_key.c */ ++static void ++pam_syslog(pam_handle_t *pamh __unused, int loglevel, const char *fmt, ...) ++{ ++ va_list args; ++ va_start(args, fmt); ++ vsyslog(loglevel, fmt, args); ++ va_end(args); ++} ++#endif + + /* _XOPEN_PATH_MAX POSIX 2008/Cor 1-2013 */ + #ifndef PATH_MAX + # define PATH_MAX 1024 ++#endif ++ ++/* Linux extension adopted by FreeBSD 13.1 */ ++#ifndef O_PATH ++# define O_PATH 0 + #endif + + static int a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, diff --git a/sysutils/pam_xdg/pkg-descr b/sysutils/pam_xdg/pkg-descr new file mode 100644 index 000000000000..547ecba2419c --- /dev/null +++ b/sysutils/pam_xdg/pkg-descr @@ -0,0 +1,5 @@ +Complete XDG Base Directories support via PAM, including injection of +according environment variables into user sessions, as well as creation +support for per-user $XDG_RUNTIME_DIR. + +WWW: https://www.sdaoden.eu/code.html#s-toolbox diff --git a/sysutils/pam_xdg/pkg-message b/sysutils/pam_xdg/pkg-message new file mode 100644 index 000000000000..9834b6e76b46 --- /dev/null +++ b/sysutils/pam_xdg/pkg-message @@ -0,0 +1,13 @@ +[ +{ type: install + message: <>/etc/fstab + # mkdir -p /var/run/user + # mount -a +EOM +} +]