From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IHSlGxGGl2EJUQAAgWs5BA (envelope-from ) for ; Fri, 19 Nov 2021 12:10:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id IPtuFhGGl2HgDgAAbx9fmQ (envelope-from ) for ; Fri, 19 Nov 2021 11:10:09 +0000 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 1986A36F4A for ; Fri, 19 Nov 2021 12:10:08 +0100 (CET) Received: from localhost ([::1]:50854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mo1mR-0005OC-BV for larch@yhetil.org; Fri, 19 Nov 2021 06:10:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo1mM-0005O2-Hg for guix-patches@gnu.org; Fri, 19 Nov 2021 06:10:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mo1mM-000597-7e for guix-patches@gnu.org; Fri, 19 Nov 2021 06:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mo1mM-0005Fc-1l for guix-patches@gnu.org; Fri, 19 Nov 2021 06:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51972] [PATCH core-updates-frozen] gnu: elogind: Revert changes to polkit build time detection. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Nov 2021 11:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51972 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51972@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163732019920168 (code B ref -1); Fri, 19 Nov 2021 11:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2021 11:09:59 +0000 Received: from localhost ([127.0.0.1]:38213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mo1mI-0005FE-U0 for submit@debbugs.gnu.org; Fri, 19 Nov 2021 06:09:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:52510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mo1mH-0005F7-JK for submit@debbugs.gnu.org; Fri, 19 Nov 2021 06:09:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo1mH-0005Np-GZ for guix-patches@gnu.org; Fri, 19 Nov 2021 06:09:57 -0500 Received: from jpoiret.xyz ([206.189.101.64]:49500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo1mG-00057v-0G for guix-patches@gnu.org; Fri, 19 Nov 2021 06:09:57 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 05C24184BF8; Fri, 19 Nov 2021 11:09:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1637320194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9PpgqZdBAi2q+BpWd+a+WSmTWcSWqQLzKj52p3YPKGQ=; b=geuF9EDkvVgxseUqE1K2Rb+Nrbl4O8Cmw6fwVvYIwbJUW99k8zc/OW6/WZHHCnZpIlzrIv P5ytXNrz8+oPHUo8VcGzSqU1hhnHNiTubcGuJLdNI/vBgV4nr5hO4cw2O8/SvnGnv/RcpO Dm+Q5TfxnnbRh11T6UmAsuRaLuVtt/qNZH38fHOH0MVo4C0rAE7SjgLcy/wohaz6njtF8g UMmzlRZPtpN6rRnVB8jghAcgn0aAJjkQUkF4eVXe909IS2YTBbgjXgLSHjeaPgo9WQJ8D8 QlL/TXBNZ4Fbf/hQGmsYBTGVbahCqCqB03k3M79cD7C7yAWSBJixQJQXuSKQsA== Date: Fri, 19 Nov 2021 11:09:49 +0000 Message-Id: <20211119110949.4608-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++ Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.001, FROM_SUSPICIOUS_NTLD_FP=1.997, PDS_OTHER_BAD_TLD=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches From: Josselin Poiret via Guix-patches via 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=1637320208; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=9PpgqZdBAi2q+BpWd+a+WSmTWcSWqQLzKj52p3YPKGQ=; b=kO81xHA0KXR2RGkZiu1mq8MIcV+WqYhnpael+lJcTf05EDKGJM6VLicMNYyn6GQWVk/fff xzWFmB+uKMvJnT4D0SNvVB/XrGLHY3IA8gEUltQeT9W+tIio/0ydwkQqD9ZwOtnASn56d3 KKXoE2Mxp47cHkdldsKI6dKcOQcww0vltIMRCiWmi75UWTl4QRAcfrSzvftIw4612XlCcQ WrlhZzUai7Z83rZXLWuYUwi5OJMvzSeX8oTpjwBozDIL/Vd5N5GOktfU5dRvcU0NIwtFoL Ml6QbWQxZRy9Yf7BerK83Kh4xD8LNG5oc0pptjqpP38uEDWidpmqFnO4Y1tpew== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637320208; a=rsa-sha256; cv=none; b=uH/9L84atN8y0xoO2UeXERjhVXaqcJ2xZWT/9aYFRxVX4RKm2PpUpZHtKGwifiPBBNFAsQ NMhTz1HUjY01Pq8tHwsfrYFNdbwSRUCfew7gNJzqrK258ShAvz0B9mMCtCElPrFDUM8qrM eyjXmCkbxFfeZg+7YCJ8yljNB+wcZ+cEUlPGeTRYd3MmIAK4jwVidTdosVDjw20Hl8cv7j WYGg1QiceW+VkKnX5q4oINTyVC1Z6nfr7ERvnMJv2gpwvyWMdAQx0SBaPtQF1G0c3isIOv 33DvdPYvQkEIyDmniGd/d5z11lXOPKoZn5c1uFAyVMDvHZjMFgwvhUIk5lDP0w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=geuF9EDk; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.56 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=geuF9EDk; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 1986A36F4A X-Spam-Score: -1.56 X-Migadu-Scanner: scn0.migadu.com X-TUID: tP2BL7fz1rdQ * gnu/packages/patches/elogind-revert-polkit-detection.patch: Add it. * gnu/packages/freedesktop.scm (elogind): Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 4 +- .../elogind-revert-polkit-detection.patch | 41 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/elogind-revert-polkit-detection.patch diff --git a/gnu/local.mk b/gnu/local.mk index cc6d4fab7b..521142148f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1009,6 +1009,7 @@ dist_patch_DATA = \ %D%/packages/patches/elixir-path-length.patch \ %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/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 06b1fc952c..f2b92036e9 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -591,7 +591,9 @@ (define-public elogind (file-name (git-file-name name version)) (sha256 (base32 - "16045bhpwjq2nqgswln67ipg1zrz2djxlgkfngqng3jqpwagmnzq")))) + "16045bhpwjq2nqgswln67ipg1zrz2djxlgkfngqng3jqpwagmnzq")) + (patches (search-patches + "elogind-revert-polkit-detection.patch")))) (build-system meson-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/elogind-revert-polkit-detection.patch b/gnu/packages/patches/elogind-revert-polkit-detection.patch new file mode 100644 index 0000000000..43dd1684b6 --- /dev/null +++ b/gnu/packages/patches/elogind-revert-polkit-detection.patch @@ -0,0 +1,41 @@ +From 715ce0a6459e418f92e74c7ce52df3244c18f383 Mon Sep 17 00:00:00 2001 +From: Sven Eden +Date: Mon, 8 Mar 2021 08:40:08 +0100 +Subject: [PATCH] Revert "Disable polkit support if libpolkit is not installed" + +This reverts commit 1194dec4f8f2d1b8bd14e1625f34418ecfce817e. + +Removing polkit support with -Dpolkit=auto when libpolkit is not +installed, removes the whole interface. This makes it impossible to +add polkit support as a runtime dependency. + +Bug: #167 +Closes: #206 +Signed-off-by: Sven Eden +--- + meson.build | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/meson.build b/meson.build +index 2dd05db3c..f38551f55 100644 +--- a/meson.build ++++ b/meson.build +@@ -1157,15 +1157,6 @@ if want_polkit != 'false' and not skip_deps + message('Old polkit detected, will install pkla files') + install_polkit_pkla = true + endif +-#if 1 /// Disable polkit completely if libpolkit is not there. See elogind issue #167 +- if not libpolkit.found() +- if want_polkit != 'auto' +- error('Polkit requested but libpolkit was not found.') +- endif +- install_polkit = false +- want_polkit = false +- endif +-#endif // 1 + endif + conf.set10('ENABLE_POLKIT', install_polkit) + +-- +2.33.1 + -- 2.33.1