From patchwork Tue Dec 4 21:02:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 388 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A855D16822; Tue, 4 Dec 2018 21:03:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 1EAD916821 for ; Tue, 4 Dec 2018 21:03:12 +0000 (GMT) Received: from localhost ([::1]:58964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUHqZ-0007rF-CD for patchwork@mira.cbaines.net; Tue, 04 Dec 2018 16:03:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUHqR-0007r7-UF for guix-patches@gnu.org; Tue, 04 Dec 2018 16:03:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUHqQ-0005IN-K9 for guix-patches@gnu.org; Tue, 04 Dec 2018 16:03:03 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:56772) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUHqQ-0005IH-Fv for guix-patches@gnu.org; Tue, 04 Dec 2018 16:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gUHqQ-0003gW-7M for guix-patches@gnu.org; Tue, 04 Dec 2018 16:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33471] [PATCH] gnu: elogind: Update to 239.2. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Dec 2018 21:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Stefan =?utf-8?q?Stefanovi=C4=87?= Received: via spool by 33471-submit@debbugs.gnu.org id=B33471.154395738014157 (code B ref 33471); Tue, 04 Dec 2018 21:03:02 +0000 Received: (at 33471) by debbugs.gnu.org; 4 Dec 2018 21:03:00 +0000 Received: from localhost ([127.0.0.1]:32797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gUHqO-0003gH-96 for submit@debbugs.gnu.org; Tue, 04 Dec 2018 16:03:00 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gUHqM-0003g4-Eu for 33471@debbugs.gnu.org; Tue, 04 Dec 2018 16:02:58 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4E82220FDC; Tue, 4 Dec 2018 16:02:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 04 Dec 2018 16:02:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm1; bh=z7pSrdBzzXzwSPFCKuZpoQaIi1 oYjjFPtBw9AcS9WhE=; b=MeubBp31uws3zacUXlqmfsSj0uDBESDu16rk5pb3l8 CWJpUtF1FDwihVNXq90k/IfmLD6rfRfNLZdR7a0fMvW4TB+tHwP00L3aFW8zCZ8U uJT0Fgb7w8qN3r+MjVZxRfd6trblbW972eBEss4QCYq9VAPPYrOE0Jd07gpC3BUW q8XdmrIL6FezrduFBkUV/g4P14KB2gq1pHtW5d41ku3OVnpExUr4qHu7AhUM8Li/ cVMzJrzcHgvkF1Oq6YGJvJ3+49y0DbILQzF9UpKHeeAHUNKLS3o9erbUXrhpJZBL r9qSgd/IAYHJ2H+uQ2U8SwmFHdIjcywTKcdpQs0W6VZA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=z7pSrd BzzXzwSPFCKuZpoQaIi1oYjjFPtBw9AcS9WhE=; b=FTdvbwBDBgR/AS49GWKPAP EtIaCswTgCRSuOMtFubcJiMh7taSeszfKA8/T1Cs6CZIOKmA0iP6suoC04CMD4mp Aw3owEcR0Rcc6pBrCN/baUWCV7UCK02fKFefpVRq8X66bFtKZuE416ojh7WINM9w r6YBZZ5/ckRbkUGbQWMMD2NgfgG59stPAuNjC899OaBj/izfpoAnJBsE5fFQpJb3 /G74dMrwNIVXJoCJ419FyYP+5YqRyjkpKV/egki5n37OKc6niR+x8sI+sNvxuDth S9k4xKHgix1WX1bmyEqfAX7NaXsn/+NmlPnrCVR2uZfi0ZyjMtq9kWLGHymyUGuw == X-ME-Sender: X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 33080E469F; Tue, 4 Dec 2018 16:02:52 -0500 (EST) From: Marius Bakke In-Reply-To: References: <871s7bockp.fsf@fastmail.com> User-Agent: Notmuch/0.28 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Tue, 04 Dec 2018 22:02:50 +0100 Message-ID: <87zhtluhs5.fsf@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Wingo , 33471@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Stefan Stefanović writes: > Hello, > Marius. > > Thanks to your input and suggestions I managed to simplify the original patch. > I will attach the second patch to this e-mail. > > I tried to stick to the suggestions you gave me, > and tried to make this patch as small as possible. > The "--novalid" option is not necessary for this build so, I removed it. > Please comment on this patch, and point out other areas I need to improve. > > I will try to test this patch on my main system. > I expect it to work, we will see. ;) Thanks! I can confirm that this patch works for me. I've applied these changes in my local branch: The 'clean-runpath' phase should be unnecessary now. The other changes are mostly adjustments to make the final diff clearer (i.e. no sorting of regular inputs, or synopsis change). I will push this to 'master' tomorrow unless there are objections :-) 1 file changed, 9 insertions(+), 17 deletions(-) gnu/packages/freedesktop.scm | 26 +++++++++----------------- modified gnu/packages/freedesktop.scm @@ -239,16 +239,14 @@ the freedesktop.org XDG Base Directory specification.") "17khwbzqmkfd3hcscs51kzdpvq9p2llm08vbpsdhy9yxgwfzlfa6")))) (build-system meson-build-system) (arguments - `(#:tests? #t - #:configure-flags + `(#:configure-flags (let* ((out (assoc-ref %outputs "out")) (sysconf (string-append out "/etc")) (libexec (string-append out "/libexec/elogind")) (dbuspolicy (string-append out "/etc/dbus-1/system.d")) (shepherd (assoc-ref %build-inputs "shepherd")) (halt-path (string-append shepherd "/sbin/halt")) - (kexec-path "") ;; NOTE: We need to package kexec-tools, - ;; or support kexec with shepherd. + (kexec-path "") ;not available in Guix yet (poweroff-path (string-append shepherd "/sbin/shutdown")) (reboot-path (string-append shepherd "/sbin/reboot"))) (list @@ -268,11 +266,6 @@ the freedesktop.org XDG Base Directory specification.") "-Dslow-tests=false")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'clean-runpath - (lambda _ - (substitute* "meson.build" - (("install_rpath :") "#install_rpath :")) - #t)) (add-after 'unpack 'fix-pkttyagent-path (lambda _ (substitute* "meson.build" @@ -290,22 +283,21 @@ the freedesktop.org XDG Base Directory specification.") ("docbook-xsl" ,docbook-xsl) ("gettext" ,gettext-minimal) ("gperf" ,gperf) - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("m4" ,m4) ("pkg-config" ,pkg-config) ("python" ,python) ("xsltproc" ,libxslt))) (inputs - `(("acl" ,acl) ;to add individual users to ACLs on /dev nodes + `(("linux-pam" ,linux-pam) + ("libcap" ,libcap) + ("shepherd" ,shepherd) ;for 'halt' and 'reboot', invoked + ;when pressing the power button ("dbus" ,dbus) ("eudev" ,eudev) - ("libcap" ,libcap) - ("linux-pam" ,linux-pam) - ("shepherd" ,shepherd) ;for 'halt' and 'reboot', invoked - ;when pressing the power button - )) + ("acl" ,acl))) ;to add individual users to ACLs on /dev nodes (home-page "https://github.com/elogind/elogind") - (synopsis "Elogind provides user, seat, and session management service") + (synopsis "User, seat, and session management service") (description "Elogind is the systemd project's \"logind\" service, extracted out as a separate project. Elogind integrates with PAM to provide the org.freedesktop.login1 interface over the system bus, allowing other parts [back]