From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GPx6KjZq3GETbgAAgWs5BA (envelope-from ) for ; Mon, 10 Jan 2022 18:17:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id uB4QIzZq3GF1AwEAG6o9tA (envelope-from ) for ; Mon, 10 Jan 2022 18:17:42 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 112DE16726 for ; Mon, 10 Jan 2022 18:17:42 +0100 (CET) Received: from localhost ([::1]:54948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6yIf-0005rE-7U for larch@yhetil.org; Mon, 10 Jan 2022 12:17:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6yI9-0005ot-GO for bug-guix@gnu.org; Mon, 10 Jan 2022 12:17:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6yI1-0000zj-UL for bug-guix@gnu.org; Mon, 10 Jan 2022 12:17:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6yI1-0003uG-Oq for bug-guix@gnu.org; Mon, 10 Jan 2022 12:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#52786: [aarch64] elogind 246.10 fails to start on ROCK64, breaking sway Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 10 Jan 2022 17:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52786 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 52786@debbugs.gnu.org Received: via spool by 52786-submit@debbugs.gnu.org id=B52786.164183497714956 (code B ref 52786); Mon, 10 Jan 2022 17:17:01 +0000 Received: (at 52786) by debbugs.gnu.org; 10 Jan 2022 17:16:17 +0000 Received: from localhost ([127.0.0.1]:53208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6yHI-0003tA-Ew for submit@debbugs.gnu.org; Mon, 10 Jan 2022 12:16:16 -0500 Received: from pelzflorian.de ([5.45.111.108]:50642 helo=mail.pelzflorian.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6yHG-0003t1-1Y for 52786@debbugs.gnu.org; Mon, 10 Jan 2022 12:16:15 -0500 Received: from pelzflorian.localdomain (unknown [5.45.111.108]) by mail.pelzflorian.de (Postfix) with ESMTPSA id 291F13606F5 for <52786@debbugs.gnu.org>; Mon, 10 Jan 2022 18:16:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1641834973; bh=7PIwA9coQAhEudt0mESR678DTFK1v0naLBRSKRpyOco=; h=Date:From:To:Subject:References:In-Reply-To; b=uICF9hNdg5HdVmvx9QLSwiq+3KaeepMRWumJm9Wf/0/oq1jeuA274t+HwgvvXFMD2 ziex5grv8w3/2eW1intheDzS+ZIhWrRnYlwubAFZRQ/8+Fi2ubk9qR8lV7CX5qimVO Ubk/bVRWlNBXDcsdpEyHQ7+0jc9bk+u3BCmO6x48= Date: Mon, 10 Jan 2022 18:16:03 +0100 From: "pelzflorian (Florian Pelz)" Message-ID: <20220110171603.6ihwny2xf5xaaa7g@pelzflorian.localdomain> References: <20211225083537.7tj3n7gxf5wexlip@pelzflorian.localdomain> <20211228153523.abeersugniwcjfvz@pelzflorian.localdomain> <20220101114704.sbq3bk3gvebrus65@pelzflorian.localdomain> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="um37wciensaotpde" Content-Disposition: inline In-Reply-To: <20220101114704.sbq3bk3gvebrus65@pelzflorian.localdomain> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641835062; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=8mXOg7d9MDUDzkj3ki0SmG7znUu1tC3+qQ1SmZ+g5wA=; b=LARaCTGxTnqb6Lf2EOeRtbaxBf0OwaP3d7y3pl0CA2/c4PIeeAxQN572vav/kP+vwAksQd LGiZ15dbGpTFpqTbuc6uEDEVaynOFYAnIoY4Ur3Bfi+C7RmJbNEY0sbCRBPC3ztoUhVBbT yIKAiz3Uvt+o9z9Fv5+lLN73Pjn4Uwozrn+/D0fxXUtECCWde9vkBgYxWddBgGwiHsSv05 zXlNYwoutmYXzlLBmvlfuy0H9G2EldTeF+wwTR3JYJalvDOR/dJxOBypj7VVCuRsGc2hKd oyKmDqruPqCmg/oTudm13LiAQ/wFOP6lrye+BqqHCYERJfMmtc2MeeD8D12WNQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641835062; a=rsa-sha256; cv=none; b=dg6SXA0aJeSOfiBLXZgO5AarP/cHlErlLP1FZXnGnrvwYAvyxOlS7GqeXjgcC8HPIl7WvO U1bGe6+sj4j2KN8F9TMCB9fBqHgAOLVc/bMYYqX//3RgqKmWzjduuyuo0sXphBhNfjWDxb Wq3akSlP+7TS3/tsbE1gYyZu0crgnutizQaw9BOJ89PRYINrhJRYSJDvVh2g+FjJ2CTJVB o2vpXcrgmQFTLO5qV7a5vkyhbeUpdNHlQwHDhGVeCJUcLfHfAacubJaQjZAUdcsqarPvVP aGLr2J1tgq3495AapYty4pS0j5j3owgz6wE5sKVCLj1TLqQNJwr/irVv+er2QQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pelzflorian.de header.s=mail header.b=uICF9hNd; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.11 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pelzflorian.de header.s=mail header.b=uICF9hNd; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 112DE16726 X-Spam-Score: -2.11 X-Migadu-Scanner: scn1.migadu.com X-TUID: nTipwG47UN40 --um37wciensaotpde Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Reverting elogind commit 150d7b05074f16db70a2872765edbb39066d80af makes sway start again. See attached patch. We could graft elogind or put it on core-updates, but I have not yet properly tested nor understood. I will test and try understanding now. Regards, Florian --um37wciensaotpde Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="gnu-elogind-Revert-changes-to-logind-waiting-for-pol.patch" From: Florian Pelz Date: Mon, 10 Jan 2022 17:24:50 +0100 Subject: [PATCH] gnu: elogind: Revert changes to logind waiting for polkit. * gnu/packages/patches/elogind-revert-logind-check-policykit.patch: New file. * gnu/packages/freedesktop.scm (elogind): Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 1 + ...logind-revert-logind-check-policykit.patch | 164 ++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 gnu/packages/patches/elogind-revert-logind-check-policykit.patch diff --git a/gnu/local.mk b/gnu/local.mk index a7106d5f77..f295e22924 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1017,6 +1017,7 @@ dist_patch_DATA = \ %D%/packages/patches/elm-compiler-disable-reactor.patch \ %D%/packages/patches/elm-compiler-fix-map-key.patch \ %D%/packages/patches/elogind-revert-polkit-detection.patch \ + %D%/packages/patches/elogind-revert-logind-check-policykit.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-ignore-empty-xim-styles.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a14fba862c..48f4fb11ce 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -576,6 +576,7 @@ (define-public elogind (base32 "16045bhpwjq2nqgswln67ipg1zrz2djxlgkfngqng3jqpwagmnzq")) (patches (search-patches + "elogind-revert-logind-check-policykit.patch" "elogind-revert-polkit-detection.patch")))) (build-system meson-build-system) (arguments diff --git a/gnu/packages/patches/elogind-revert-logind-check-policykit.patch b/gnu/packages/patches/elogind-revert-logind-check-policykit.patch new file mode 100644 index 0000000000..a589fa9591 --- /dev/null +++ b/gnu/packages/patches/elogind-revert-logind-check-policykit.patch @@ -0,0 +1,164 @@ +From 1c3f1db2f8a93957386813b1be4274f6ac8b851f Mon Sep 17 00:00:00 2001 +From: Florian Pelz +Date: Mon, 10 Jan 2022 17:12:40 +0100 +Subject: [PATCH] Revert "logind: check PolicyKit before allowing VT switch" + +This reverts commit 150d7b05074f16db70a2872765edbb39066d80af. +--- + src/login/logind-dbus.c | 16 --------- + src/login/logind-seat-dbus.c | 58 +-------------------------------- + src/login/logind-session-dbus.c | 14 -------- + 3 files changed, 1 insertion(+), 87 deletions(-) + +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index a9c954c43..ba30fa7c3 100644 +--- a/src/login/logind-dbus.c ++++ b/src/login/logind-dbus.c +@@ -1035,8 +1035,6 @@ static int method_activate_session(sd_bus_message *message, void *userdata, sd_b + if (r < 0) + return r; + +- /* PolicyKit is done by bus_session_method_activate() */ +- + return bus_session_method_activate(message, session, error); + } + +@@ -1068,20 +1066,6 @@ static int method_activate_session_on_seat(sd_bus_message *message, void *userda + return sd_bus_error_setf(error, BUS_ERROR_SESSION_NOT_ON_SEAT, + "Session %s not on seat %s", session_name, seat_name); + +- r = bus_verify_polkit_async( +- message, +- CAP_SYS_ADMIN, +- "org.freedesktop.login1.chvt", +- NULL, +- false, +- UID_INVALID, +- &m->polkit_registry, +- error); +- if (r < 0) +- return r; +- if (r == 0) +- return 1; /* Will call us back */ +- + r = session_activate(session); + if (r < 0) + return r; +diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c +index a91765205..01fc8ddf6 100644 +--- a/src/login/logind-seat-dbus.c ++++ b/src/login/logind-seat-dbus.c +@@ -179,20 +179,6 @@ static int method_activate_session(sd_bus_message *message, void *userdata, sd_b + if (session->seat != s) + return sd_bus_error_setf(error, BUS_ERROR_SESSION_NOT_ON_SEAT, "Session %s not on seat %s", name, s->id); + +- r = bus_verify_polkit_async( +- message, +- CAP_SYS_ADMIN, +- "org.freedesktop.login1.chvt", +- NULL, +- false, +- UID_INVALID, +- &s->manager->polkit_registry, +- error); +- if (r < 0) +- return r; +- if (r == 0) +- return 1; /* Will call us back */ +- + r = session_activate(session); + if (r < 0) + return r; +@@ -213,21 +199,7 @@ static int method_switch_to(sd_bus_message *message, void *userdata, sd_bus_erro + return r; + + if (to <= 0) +- return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid virtual terminal"); +- +- r = bus_verify_polkit_async( +- message, +- CAP_SYS_ADMIN, +- "org.freedesktop.login1.chvt", +- NULL, +- false, +- UID_INVALID, +- &s->manager->polkit_registry, +- error); +- if (r < 0) +- return r; +- if (r == 0) +- return 1; /* Will call us back */ ++ return -EINVAL; + + r = seat_switch_to(s, to); + if (r < 0) +@@ -243,20 +215,6 @@ static int method_switch_to_next(sd_bus_message *message, void *userdata, sd_bus + assert(message); + assert(s); + +- r = bus_verify_polkit_async( +- message, +- CAP_SYS_ADMIN, +- "org.freedesktop.login1.chvt", +- NULL, +- false, +- UID_INVALID, +- &s->manager->polkit_registry, +- error); +- if (r < 0) +- return r; +- if (r == 0) +- return 1; /* Will call us back */ +- + r = seat_switch_to_next(s); + if (r < 0) + return r; +@@ -271,20 +229,6 @@ static int method_switch_to_previous(sd_bus_message *message, void *userdata, sd + assert(message); + assert(s); + +- r = bus_verify_polkit_async( +- message, +- CAP_SYS_ADMIN, +- "org.freedesktop.login1.chvt", +- NULL, +- false, +- UID_INVALID, +- &s->manager->polkit_registry, +- error); +- if (r < 0) +- return r; +- if (r == 0) +- return 1; /* Will call us back */ +- + r = seat_switch_to_previous(s); + if (r < 0) + return r; +diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c +index beca34a33..9c223418e 100644 +--- a/src/login/logind-session-dbus.c ++++ b/src/login/logind-session-dbus.c +@@ -194,20 +194,6 @@ int bus_session_method_activate(sd_bus_message *message, void *userdata, sd_bus_ + assert(message); + assert(s); + +- r = bus_verify_polkit_async( +- message, +- CAP_SYS_ADMIN, +- "org.freedesktop.login1.chvt", +- NULL, +- false, +- UID_INVALID, +- &s->manager->polkit_registry, +- error); +- if (r < 0) +- return r; +- if (r == 0) +- return 1; /* Will call us back */ +- + r = session_activate(s); + if (r < 0) + return r; +-- +2.34.0 + base-commit: 87624540b486d710749ad00ef5aa427a9e5c1d0c -- 2.34.0 --um37wciensaotpde--