From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37421) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inQrl-000779-4a for guix-patches@gnu.org; Fri, 03 Jan 2020 12:36:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1inQri-00035A-Q6 for guix-patches@gnu.org; Fri, 03 Jan 2020 12:36:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35435) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1inQri-00033z-Jd for guix-patches@gnu.org; Fri, 03 Jan 2020 12:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1inQri-0008Ga-HU for guix-patches@gnu.org; Fri, 03 Jan 2020 12:36:02 -0500 Subject: [bug#38902] [PATCH 1/9] gnu: nfs-utils: Update to 2.4.2. References: <20200103173238.9598-1-rekado@elephly.net> In-Reply-To: <20200103173238.9598-1-rekado@elephly.net> Resent-Message-ID: From: Ricardo Wurmus Message-ID: <20200103173506.9779-1-rekado@elephly.net> Date: Fri, 3 Jan 2020 18:34:58 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: 38902@debbugs.gnu.org Cc: Ricardo Wurmus * gnu/packages/nfs.scm (nfs-utils): Update to 2.4.2. [source]: Remove patch. [arguments]: Update configure flags, remove fix-glibc-compatability phase, update substitutions. [inputs]: Add keyutils and rpcsvc-proto. * gnu/packages/patches/nfs-utils-missing-headers.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/nfs.scm | 45 ++++++++++--------- .../patches/nfs-utils-missing-headers.patch | 19 -------- 3 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/nfs-utils-missing-headers.patch diff --git a/gnu/local.mk b/gnu/local.mk index c7dcc65082..bfdaba2761 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1198,7 +1198,6 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/netsurf-system-utf8proc.patch=09=09\ %D%/packages/patches/netsurf-y2038-tests.patch=09=09\ %D%/packages/patches/netsurf-longer-test-timeout.patch=09\ - %D%/packages/patches/nfs-utils-missing-headers.patch=09=09\ %D%/packages/patches/ngircd-handle-zombies.patch=09=09\ %D%/packages/patches/nm-plugin-path.patch=09=09=09\ %D%/packages/patches/nsis-env-passthru.patch=09=09=09\ diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index 9d7acc3592..a3d5383c4d 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2016 John Darrington ;;; Copyright =C2=A9 2017, 2018 Leo Famulari ;;; Copyright =C2=A9 2018 Efraim Flashner +;;; Copyright =C2=A9 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ =20 (define-module (gnu packages nfs) #:use-module (gnu packages) + #:use-module (gnu packages crypto) #:use-module (gnu packages linux) #:use-module (gnu packages libevent) #:use-module (gnu packages kerberos) @@ -42,32 +44,27 @@ (define-public nfs-utils (package (name "nfs-utils") - (version "2.1.1") + (version "2.4.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/nfs-utils/" version "/nfs-utils-" version ".tar.xz")) - (patches (search-patches "nfs-utils-missing-headers.patch")) (sha256 (base32 - "1vqrqzhg9nh2wj1icp7k8v9dibgnn521b45np79nnkmqf16bbbhg")))) + "0f0hm8jq1p5gra55v621qpbb3mryakaikzpy5znkvxym0dx76r24")))) (build-system gnu-build-system) (arguments `(#:configure-flags `("--without-tcp-wrappers" ,(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"))) + ,(string-append "--with-krb5=3D" (assoc-ref %build-inputs "mit-kr= b5")) + ,(string-append "--with-pluginpath=3D" + (assoc-ref %outputs "out") + "/lib/libnfsidmap")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-glibc-compatability - (lambda _ - (substitute* '("utils/blkmapd/device-discovery.c" - "utils/blkmapd/dm-device.c") - (("") - "\n#include ")) - #t)) (add-before 'configure 'adjust-command-file-names (lambda _ ;; Remove assumptions of FHS from start-statd script @@ -81,6 +78,11 @@ (string-append "exec " (assoc-ref %outputs "out") "/sbin/rpc.statd"))) =20 + ;; find rpcgen + (substitute* "configure" + (("/usr/local/bin/rpcgen") + (which "rpcgen"))) + ;; This hook tries to write to /var ;; That needs to be done by a service too. (substitute* `("Makefile.in") @@ -96,20 +98,23 @@ (substitute* `("utils/statd/statd.c") (("/usr/sbin/") (string-append (assoc-ref %outputs "out") "/sbin/"))) - (substitute* `("utils/osd_login/Makefile.in" - "utils/mount/Makefile.in" + (substitute* `("utils/mount/Makefile.in" + "utils/nfsdcld/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) - ("lvm2" ,lvm2) - ("util-linux" ,util-linux) - ("mit-krb5" ,mit-krb5) - ("libtirpc" ,libtirpc))) + (inputs + `(("keyutils" ,keyutils) + ("libevent" ,libevent) + ("libnfsidmap" ,libnfsidmap) + ("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen' + ("sqlite" ,sqlite) + ("lvm2" ,lvm2) + ("util-linux" ,util-linux) + ("mit-krb5" ,mit-krb5) + ("libtirpc" ,libtirpc))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.kernel.org/pub/linux/utils/nfs-utils/") diff --git a/gnu/packages/patches/nfs-utils-missing-headers.patch b/gnu/pac= kages/patches/nfs-utils-missing-headers.patch deleted file mode 100644 index 7f0542836e..0000000000 --- a/gnu/packages/patches/nfs-utils-missing-headers.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix compilation failure with glibc 2.26 caused by missing type -declarations: - ------- -rpc.c: In function =E2=80=98nsm_recv_getport=E2=80=99: -rpc.c:469:13: error: =E2=80=98UINT16_MAX=E2=80=99 undeclared (first use in= this function) - if (port > UINT16_MAX) { ------- - ---- a/support/nsm/rpc.c.orig=092016-08-03 20:25:15.000000000 +0200 -+++ b/support/nsm/rpc.c=092017-08-26 07:41:11.884000000 +0200 -@@ -40,6 +40,7 @@ -=20 - #include - #include -+#include - #include - #include - #include --=20 2.24.1