From patchwork Fri Jan 3 17:34:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 19560 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 E957C179EA; Fri, 3 Jan 2020 17:36:38 +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=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6B89F17979 for ; Fri, 3 Jan 2020 17:36:38 +0000 (GMT) Received: from localhost ([::1]:55246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inQsH-0007RL-Pd for patchwork@mira.cbaines.net; Fri, 03 Jan 2020 12:36:37 -0500 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 X-Loop: help-debbugs@gnu.org 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-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Jan 2020 17:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38902 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38902@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 38902-submit@debbugs.gnu.org id=B38902.157807292931640 (code B ref 38902); Fri, 03 Jan 2020 17:36:02 +0000 Received: (at 38902) by debbugs.gnu.org; 3 Jan 2020 17:35:29 +0000 Received: from localhost ([127.0.0.1]:41384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1inQr5-0008E0-Pd for submit@debbugs.gnu.org; Fri, 03 Jan 2020 12:35:28 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1inQr2-0008Dp-9j for 38902@debbugs.gnu.org; Fri, 03 Jan 2020 12:35:22 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1578072917; cv=none; d=zohomail.com; s=zohoarc; b=jqF67Nuhs47T1+Ohp2NMGqPVCCOJnMsxvMMrr/Y2a5sQLWMg54dv36zn5lcXZaRFngS9X4koRtqyjaIRg6TUHjdaVr/CqbRNGsD4zqLXdd3h/nVzi9hhftouarjipl8DlaXTMEJO+tGeS3IShyUn+zX559VlWTM5OtOd9Guzo1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578072917; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=TTh39Rh8/1I+egVgOSMjSZc8uiPJxW/NDtZB1AoGxx8=; b=HDYgkIgFZae1HgM7Wdab6DTYNkQFmZtrzD0iyaa9YJuZPAd9rCMrfc2O3BJ2YP9nNbTDi5SfjifkqTPaUKwRAuHLxThcxN0zD5YMGJrf/AuzsDT3dNU/EnZiCpWpsC/hHy8KDnGc9XgK4NVFTqvg1hy7a4TdjZzTPAj2r/ALSKo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1578072917; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=TTh39Rh8/1I+egVgOSMjSZc8uiPJxW/NDtZB1AoGxx8=; b=JFs/ykj3eQsU9i1kn7nwL2krh22Ncutt1zfnDJDbDUbe8I6iGP4kFgPIn+C/9wga i9QWZ2M2JoGqaogpn69bk2KFY1bzz4bMbMiGzrGWEoHYCTZrdrsxyLZ/UMx9uaCnxxG JeAR1ua+6l+EsPoKAPPEbfLSE0GEvWoaCEwjMelU= Received: from localhost (p54AD4FBF.dip0.t-ipconnect.de [84.173.79.191]) by mx.zohomail.com with SMTPS id 1578072913825720.9531185890306; Fri, 3 Jan 2020 09:35:13 -0800 (PST) From: Ricardo Wurmus Message-ID: <20200103173506.9779-1-rekado@elephly.net> Date: Fri, 3 Jan 2020 18:34:58 +0100 X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-ZohoMailClient: External 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: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 = \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ - %D%/packages/patches/nfs-utils-missing-headers.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ 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 © 2016 John Darrington ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (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=" (assoc-ref %outputs "out") "/sbin/start-statd") - ,(string-append "--with-krb5=" (assoc-ref %build-inputs "mit-krb5"))) + ,(string-append "--with-krb5=" (assoc-ref %build-inputs "mit-krb5")) + ,(string-append "--with-pluginpath=" + (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"))) + ;; 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 = /sbin") (string-append "sbindir = " (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/packages/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 ‘nsm_recv_getport’: -rpc.c:469:13: error: ‘UINT16_MAX’ undeclared (first use in this function) - if (port > UINT16_MAX) { ------- - ---- a/support/nsm/rpc.c.orig 2016-08-03 20:25:15.000000000 +0200 -+++ b/support/nsm/rpc.c 2017-08-26 07:41:11.884000000 +0200 -@@ -40,6 +40,7 @@ - - #include - #include -+#include - #include - #include - #include