From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWtS4-0005WC-79 for guix-patches@gnu.org; Wed, 03 Jan 2018 19:32:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWtS1-0007Ro-6Q for guix-patches@gnu.org; Wed, 03 Jan 2018 19:32:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54366) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWtS1-0007RO-2f for guix-patches@gnu.org; Wed, 03 Jan 2018 19:32:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eWtS0-0002YA-Qv for guix-patches@gnu.org; Wed, 03 Jan 2018 19:32:04 -0500 Subject: [bug#29970] [PATCH 4/4] gnu: nfs-utils: Adapt to changes in glibc 2.26. Resent-Message-ID: From: Leo Famulari Date: Wed, 3 Jan 2018 19:30:56 -0500 Message-Id: <3fc311ef0844c692bb4ffce53b133a553abdf0cc.1515025855.git.leo@famulari.name> In-Reply-To: References: MIME-Version: 1.0 In-Reply-To: References: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 29970@debbugs.gnu.org * gnu/packages/patches/nfs-utils-missing-headers.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/nfs.scm (nfs-utils)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/nfs.scm | 3 ++- gnu/packages/patches/nfs-utils-missing-headers.patch | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/nfs-utils-missing-headers.patch diff --git a/gnu/local.mk b/gnu/local.mk index 90b6ea6bb..963c24d21 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -891,6 +891,7 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ %D%/packages/patches/newsbeuter-CVE-2017-12904.patch \ %D%/packages/patches/newsbeuter-CVE-2017-14500.patch \ + %D%/packages/patches/nfs-utils-missing-headers.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ninja-zero-mtime.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index 28751c400..f6bb5b3b7 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington -;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2017, 2018 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +47,7 @@ (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")))) diff --git a/gnu/packages/patches/nfs-utils-missing-headers.patch b/gnu/packages/patches/nfs-utils-missing-headers.patch new file mode 100644 index 000000000..7f0542836 --- /dev/null +++ b/gnu/packages/patches/nfs-utils-missing-headers.patch @@ -0,0 +1,19 @@ +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 -- 2.15.1