Date: Sun, 13 Aug 2023 11:58:24 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 493a1a00b744 - main - x11/sddm: Fix sddm-autologin PAM service. Message-ID: <202308131158.37DBwOCb068875@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=493a1a00b7447310444b1596d30d27307ef076d2 commit 493a1a00b7447310444b1596d30d27307ef076d2 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-08-07 18:00:11 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2023-08-13 11:57:40 +0000 x11/sddm: Fix sddm-autologin PAM service. While there, remove patching in favor of a CMake variable. PR: 272649 Sponsored by: Serenity Cybersecurity, LLC --- x11/sddm/Makefile | 4 ++-- x11/sddm/files/patch-services_sddm-autologin.pam | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile index 553e9c4288b5..25556e3135bb 100644 --- a/x11/sddm/Makefile +++ b/x11/sddm/Makefile @@ -1,5 +1,6 @@ PORTNAME= sddm PORTVERSION= 0.20.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= x11 @@ -36,6 +37,7 @@ CMAKE_ON= BUILD_MAN_PAGES CMAKE_ARGS= -DUID_MIN=1000 \ -DUID_MAX=65000 \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc \ + -DACCOUNTSSERVICE_DATA_DIR:PATH=/var/db/AccountsService \ -DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man.py-${PYTHON_VER} \ -DSDDM_INITIAL_VT=7 @@ -51,8 +53,6 @@ post-patch: -e 's#/usr/share/#${LOCALBASE}/share/#' \ ${WRKSRC}/data/scripts/Xsession \ ${WRKSRC}/src/common/Configuration.h - @${REINPLACE_CMD} -e 's|/var/lib/AccountsService|/var/db/AccountsService|' \ - ${WRKSRC}/src/greeter/UserModel.cpp post-install: # Install xsession.desktop to launch .xinitrc via sddm. diff --git a/x11/sddm/files/patch-services_sddm-autologin.pam b/x11/sddm/files/patch-services_sddm-autologin.pam index 6bbe10335f32..c479bb0d7080 100644 --- a/x11/sddm/files/patch-services_sddm-autologin.pam +++ b/x11/sddm/files/patch-services_sddm-autologin.pam @@ -1,9 +1,9 @@ ---- services/sddm-autologin.pam.orig 2021-10-03 13:28:23 UTC +--- services/sddm-autologin.pam.orig 2023-06-23 12:28:38 UTC +++ services/sddm-autologin.pam -@@ -1,13 +1,10 @@ +@@ -1,13 +1,12 @@ #%PAM-1.0 -auth required pam_env.so - auth required pam_faillock.so preauth +-auth required pam_faillock.so preauth -auth required pam_shells.so -auth required pam_nologin.so auth required pam_permit.so @@ -16,8 +16,11 @@ --session optional pam_kwallet5.so auto_start +#auth optional pam_gnome_keyring.so +#auth optional pam_kwallet5.so ++ +account include login ++ +password required pam_deny.so ++ +session include login +#session optional pam_gnome_keyring.so auto_start +#session optional pam_kwallet5.so auto_starthome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308131158.37DBwOCb068875>