guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#29970] [PATCH 4/4] gnu: nfs-utils: Adapt to changes in glibc 2.26.


From: Leo Famulari
Subject: [bug#29970] [PATCH 4/4] gnu: nfs-utils: Adapt to changes in glibc 2.26.
Date: Wed, 3 Jan 2018 19:30:56 -0500

* 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 <address@hidden>
-;;; Copyright © 2017 Leo Famulari <address@hidden>
+;;; Copyright © 2017, 2018 Leo Famulari <address@hidden>
 ;;;
 ;;; 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 <time.h>
+ #include <stdbool.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
-- 
2.15.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]