Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Oct 2022 13:34:39 GMT
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 4c69af0fae53 - 2022Q4 - x11/lightdm: Fix autologin
Message-ID:  <202210081334.298DYda8000406@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2022Q4 has been updated by madpilot:

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

commit 4c69af0fae5304884a6abeeea859e55bc8b152e0
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2022-10-08 13:30:56 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2022-10-08 13:34:18 +0000

    x11/lightdm: Fix autologin
    
    Upstreaam added a pam directive using a pam module not present in FreeBSD:
    
    https://github.com/canonical/lightdm/commit/0c21d986ff3c9ec1568b681c746e30b6fd25d5cb
    
    Fix by updating the patch to remove this addition.
    
    PR:             266899
    MFH:            2022Q4
    (cherry picked from commit 6cd9fcbb0f03e95189a5eba168af7fcaead34dc1)
---
 x11/lightdm/Makefile                               | 1 +
 x11/lightdm/files/patch-data_pam_lightdm-autologin | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index f182a07e3f6a..a1bef078c1a5 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	lightdm
 PORTVERSION=	1.32.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/canonical/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 
diff --git a/x11/lightdm/files/patch-data_pam_lightdm-autologin b/x11/lightdm/files/patch-data_pam_lightdm-autologin
index e2dba909866b..a6eb4874c705 100644
--- a/x11/lightdm/files/patch-data_pam_lightdm-autologin
+++ b/x11/lightdm/files/patch-data_pam_lightdm-autologin
@@ -1,8 +1,10 @@
---- data/pam/lightdm-autologin.orig	2015-08-09 23:30:00 UTC
+--- data/pam/lightdm-autologin.orig	2022-07-04 03:28:22 UTC
 +++ data/pam/lightdm-autologin
-@@ -1,20 +1,19 @@
+@@ -1,22 +1,18 @@
  #%PAM-1.0
- 
+-# Block login if shell in nologin or false
+-auth      required pam_succeed_if.so shell notin /sbin/nologin:/usr/sbin/nologin:/bin/false:/usr/bin/false
+-
  # Block login if they are globally disabled
 -auth      required pam_nologin.so
 +account      required pam_nologin.so



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