From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#33471] [PATCH] gnu: elogind: Update to 239.2. Resent-Message-ID: From: Marius Bakke In-Reply-To: References: <871s7bockp.fsf@fastmail.com> Date: Tue, 04 Dec 2018 22:02:50 +0100 Message-ID: <87zhtluhs5.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Stefan =?UTF-8?Q?Stefanovi=C4=87?= Cc: Andy Wingo , 33471@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Stefan Stefanovi=C4=87 writes: > Hello, > Marius. > > Thanks to your input and suggestions I managed to simplify the original p= atch. > 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: --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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] --=-=-= Content-Type: text/plain 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 :-) --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlwG63oACgkQoqBt8qM6 VPoGigf/U/Rq1nHHRSTejOQIvUgvVnRqJmJp/InDlBrgHJGfqLnZ1iWQQcJKBm7+ ufzkTTd0t9JMvvcIBIVePQx8xuKiSiOFWTNmOvwLP7JwjlrzD370/cvn8NRi8jRd 651R/khWus4O6rgDIhwf3MsSXKULMFiEx+xgUGJzfaruS+OnER2X8KJuQL70C+SI SBnhzPWP8m/8eWT4Vv3HR7nN9yK3dnp4Gt7d/04KC5jnygW+CRILLGwq7/pkwzn+ NPIbyzvTDTdqfYk5USXoQrvO7H80qlsTuHDskr3t3V4MkCHuyom7sa8GQyvqDud5 hS4q/GNEtAMfVxKIsaeYErkR2RLJmA== =E0aE -----END PGP SIGNATURE----- --==-=-=--