From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7T74-00053T-4E for guix-patches@gnu.org; Sun, 07 May 2017 16:49:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7T70-0003BA-TP for guix-patches@gnu.org; Sun, 07 May 2017 16:49:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34389) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d7T70-0003Aj-5P for guix-patches@gnu.org; Sun, 07 May 2017 16:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d7T6z-0004mC-Nc for guix-patches@gnu.org; Sun, 07 May 2017 16:49:01 -0400 Subject: bug#26788: [PATCH] gnu: nfs-utils: Update to 2.1.1. Resent-Message-ID: Date: Sun, 7 May 2017 16:48:40 -0400 From: Leo Famulari Message-ID: <20170507204840.GA3936@jasmine> References: <5428680f851c8b41de6b3c4a0acafd4a75fbff89.1494012908.git.leo@famulari.name> <87bmr5hprl.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="i0/AhcQY5QxfSsSZ" Content-Disposition: inline In-Reply-To: <87bmr5hprl.fsf@openmailbox.org> 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: Kei Kebreau Cc: 26788@debbugs.gnu.org, Ricardo Wurmus --i0/AhcQY5QxfSsSZ Content-Type: multipart/mixed; boundary="NzB8fVQJ5HfG6fxh" Content-Disposition: inline --NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, May 06, 2017 at 01:13:50PM -0400, Kei Kebreau wrote: > Leo Famulari writes: >=20 > > * gnu/packages/nfs.scm (nfs-utils): Update to 2.1.1. >=20 > LGTM. Thanks! I poked around some more and found that our nfs-utils package does not keep a reference to gss. So, I'm removing gss in this update. I also verified that all of the substitutions in the 'adjust-command-file-names' phase still have an effect. I'll push these updated patches soon if there are no more comments. --NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-nfs-utils-Update-to-2.1.1.patch" Content-Transfer-Encoding: quoted-printable =46rom 633f9ba6139d6a721d47b1662a72c0efbae95268 Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Thu, 4 May 2017 21:17:07 -0400 Subject: [PATCH 1/2] gnu: nfs-utils: Update to 2.1.1. * gnu/packages/nfs.scm (nfs-utils): Update to 2.1.1. [inputs]: Remove gss. --- gnu/packages/nfs.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index f18fe6cb5..03ac841e4 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =A9 2016 John Darrington +;;; Copyright =A9 2017 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +21,6 @@ #:use-module (gnu packages) #:use-module (gnu packages linux) #:use-module (gnu packages databases) - #:use-module (gnu packages gsasl) #:use-module (gnu packages libevent) #:use-module (gnu packages kerberos) #:use-module (gnu packages onc-rpc) @@ -41,7 +41,7 @@ (define-public nfs-utils (package (name "nfs-utils") - (version "1.3.4") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append @@ -49,7 +49,7 @@ "/nfs-utils-" version ".tar.xz")) (sha256 (base32 - "0xarqhwy757vazv9gqhyrgxsrx083yhvkkih01jh83fqm305naml")))) + "1vqrqzhg9nh2wj1icp7k8v9dibgnn521b45np79nnkmqf16bbbhg")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -98,7 +98,6 @@ ("libnfsidmap" ,libnfsidmap) ("sqlite" ,sqlite) ("lvm2" ,lvm2) - ("gss" ,gss) ("util-linux" ,util-linux) ("mit-krb5" ,mit-krb5) ("libtirpc" ,libtirpc))) --=20 2.12.2 --NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-nfs-utils-Adjust-indentation.patch" Content-Transfer-Encoding: quoted-printable =46rom b39ebdb434140ae654199ca6df0d35b5aa8fe4ca Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Sun, 7 May 2017 16:33:06 -0400 Subject: [PATCH 2/2] gnu: nfs-utils: Adjust indentation. * gnu/packages/nfs.scm (nfs-utils): Re-indent. --- gnu/packages/nfs.scm | 70 ++++++++++++++++++++++++++----------------------= ---- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index 03ac841e4..28751c400 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -57,43 +57,43 @@ ,(string-append "--with-start-statd=3D" (assoc-ref %outputs "out") "/sbin/start-statd") ,(string-append "--with-krb5=3D" (assoc-ref %build-inputs "mit-kr= b5"))) - #:phases (modify-phases %standard-phases - (add-before - 'configure 'adjust-command-file-names - (lambda _ - ;; Remove assumptions of FHS from start-statd script - (substitute* `("utils/statd/start-statd") - (("^PATH=3D.*") "") - (("^flock") - (string-append - (assoc-ref %build-inputs "util-linux") - "/bin/flock")) - (("^exec rpc.statd") - (string-append "exec " - (assoc-ref %outputs "out") "/sbin/rpc.statd"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'adjust-command-file-names + (lambda _ + ;; Remove assumptions of FHS from start-statd script + (substitute* `("utils/statd/start-statd") + (("^PATH=3D.*") "") + (("^flock") + (string-append + (assoc-ref %build-inputs "util-linux") + "/bin/flock")) + (("^exec rpc.statd") + (string-append "exec " + (assoc-ref %outputs "out") "/sbin/rpc.statd"))) =20 - ;; This hook tries to write to /var - ;; That needs to be done by a service too. - (substitute* `("Makefile.in") - (("^install-data-hook:") - "install-data-hook-disabled-for-guix:")) + ;; This hook tries to write to /var + ;; That needs to be done by a service too. + (substitute* `("Makefile.in") + (("^install-data-hook:") + "install-data-hook-disabled-for-guix:")) =20 - ;; Replace some hard coded paths. - (substitute* `("utils/nfsd/nfssvc.c") - (("/bin/mount") - (string-append - (assoc-ref %build-inputs "util-linux") - "/bin/mount"))) - (substitute* `("utils/statd/statd.c") - (("/usr/sbin/") - (string-append (assoc-ref %outputs "out") "/sbin/= "))) - (substitute* `("utils/osd_login/Makefile.in" - "utils/mount/Makefile.in" - "utils/nfsdcltrack/Makefile.in") - (("^sbindir =3D /sbin") - (string-append "sbindir =3D " - (assoc-ref %outputs "out") "/sbin"= ))) - #t))))) + ;; Replace some hard coded paths. + (substitute* `("utils/nfsd/nfssvc.c") + (("/bin/mount") + (string-append + (assoc-ref %build-inputs "util-linux") + "/bin/mount"))) + (substitute* `("utils/statd/statd.c") + (("/usr/sbin/") + (string-append (assoc-ref %outputs "out") "/sbin/"))) + (substitute* `("utils/osd_login/Makefile.in" + "utils/mount/Makefile.in" + "utils/nfsdcltrack/Makefile.in") + (("^sbindir =3D /sbin") + (string-append "sbindir =3D " + (assoc-ref %outputs "out") "/sbin"))) + #t))))) (inputs `(("libevent" ,libevent) ("libnfsidmap" ,libnfsidmap) ("sqlite" ,sqlite) --=20 2.12.2 --NzB8fVQJ5HfG6fxh-- --i0/AhcQY5QxfSsSZ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlkPiCQACgkQJkb6MLrK fwhxXRAAvOgiUI3h+n1nDp27638G9ineaX6V+0OAh/syG6VeZIIszj2QfgSAtAkp Wb60uUDJXEak0A+MaFZqKM3VcyeR/k8eGlHr+L9L5HPafL+LTC88dT/PwSdDsZsL AAJNPRSLWE/lEF3hYSH2cJiLgvSSCemWhqgRPyJ7Pvk7lEGdjc9zjbdLKSFJ5uKd tPAOxL32sExIp2OFY2fRnnLBWSdIR97ZEieZw0NacAqN+wm+v5JqoCn7SrAjW7RB 69IX7bUgJpgdWVRyamm7nyknaUPoOZxbh8t/m9O6nR4FSy38fh0t5VooTkL32SB7 ltUrNFK7qaKsQHTwrUcAYyMOcgeKV4Rw1NOPAGImUAr05Sg5Y/iI6tYicxAOMW5s a4cRRLKSIAgTick3MUy+EGCpUdcWgAVhEaVPkJGoS1uTS1EMdBndFx6726ySyW8h aDxNRgp67urmFgZShTxHpwwWRpZWC5tYK1rIASEPaGh5CI3KdKDCU66hJBFgsu41 C/ZlbDDaDemDGXQICAqjjpzDT4XPy1WncRJ2i0evM6QxZkXiFh2s5K5Wm6EYoJGg hMCFLfsilHXEO7u3BfqeHwTMWskU4HWBxe+Sas81Z4TKoO3PQp+ejMs8tNABHbvu 47r2GQh4t1l3EwwViGs764S9p89EtsG5xnFtPq/v7CpBjS1Lj2U= =0wkG -----END PGP SIGNATURE----- --i0/AhcQY5QxfSsSZ--