From nobody Sat Oct 8 13:34:39 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ml5kl6pGlz4fP79; Sat, 8 Oct 2022 13:34:39 +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 4Ml5kl62WMz3gq1; Sat, 8 Oct 2022 13:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665236079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MMAsoutL4JcMcDJUN8A0saYu8zGv5iz/Nq3JgJYpbj0=; b=Vi67cIhuIzeOKLkLl7tc7lhMibLiVsaSwMwXRw/smkE/ytVOI2nLv3DqoQpTvZ20KYfT/l +gAXmPP4FtRxFttiaCSJeY3DNmX4puurJrM8cYmj6gV4qTD5Z7MYvdtP6AjcjapwuCJxHp VhnVK6DOc3bRx3CRj7n/EhAfeQ9vi9eqpbG1QQieQaDX0dpdQ/WcKV9xW9ikm17049+oHA 4mu13v+ot8njKqaP3W8JfVynEaYw5q3ocUrAdxhtXUnR4k8Nkp6fWAG5EjVKkWFKBFaMMD k6EcPOrYlQj4JwdQxJRlH2EoLBRuVTe0ya2VWK2ScSQBz9yx9f3iSUzZKGGHQA== 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 4Ml5kl3rcKzxqj; Sat, 8 Oct 2022 13:34:39 +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 298DYdlK000407; Sat, 8 Oct 2022 13:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 298DYda8000406; Sat, 8 Oct 2022 13:34:39 GMT (envelope-from git) Date: Sat, 8 Oct 2022 13:34:39 GMT Message-Id: <202210081334.298DYda8000406@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: 4c69af0fae53 - 2022Q4 - x11/lightdm: Fix autologin List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 4c69af0fae5304884a6abeeea859e55bc8b152e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665236079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MMAsoutL4JcMcDJUN8A0saYu8zGv5iz/Nq3JgJYpbj0=; b=O5DqYZNpPr+7bmpduIifI6N5CA97NhUx1F2xDUUzm1lU3NYEh8X98Fz369ORwlg7EyP+rw OxPrl8sRvW9oLvJzAzWAgGocnapB3v0503QdTfLiJvFGJk6NG7XkfCQvi9fMCNkDnc7QZO Z1YA/dhLfzL5502c37nQXEW3IXSfdOTplphSAifF9D0sm0NkuIlDh62dzcSrbS1XyGp3WC 2fMTMBV/h9Ev1VHmbVGo96KVbZD3fvzms3lVwWAbxJqqIlTCUkIEAMApQ/ZHs19EeHxG/w Ko0UmYVcpdqdV1PuPS9mOQoAbhYhL755cUkxkiS+FVwYT1uWX4UEfyc6gGmaoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665236079; a=rsa-sha256; cv=none; b=dw2hLJQ5oM54hP+9Xrq5nsUzGTg3T3ZiBZLC3f4di+BFSSicjawQlt1CKhu5Z090TryuyJ xesxRXWvfe/2JEteMXzOgp4HWb9K6RuTs9Ygz7qpCBJc/1+uA4SOgMa6KRQ1ZSgKuK48Ri Lu0+0sfzc/yjeiVJ//ZWD7soqWrbsgS4FbAvI4/kXpBBQox6ibUoD5smmpR+WlH/HzmI8B mti9oKIGceeDb60LVvYGrvhnFDZFpxxFImPHZbnpv17Cg/C5MSHukECK7GAeBFiy8ElP+y Kd1eQjJe/6D++V1sT84pP2GVNXf/9AIFc9uqFcLOotWj//qRHsVLx4kqNYDYkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c69af0fae5304884a6abeeea859e55bc8b152e0 commit 4c69af0fae5304884a6abeeea859e55bc8b152e0 Author: Guido Falsi AuthorDate: 2022-10-08 13:30:56 +0000 Commit: Guido Falsi 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