summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-02-07 11:30:35 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-02-07 11:30:39 +0100
commit00a75f56edaa30442b604a0ed44bc2522bab3dd9 (patch)
treedca21d8d59202bd70edbe6ae2377dc5c54002333 /patches
parent5879b788430da6c82642002201e6330ea2d446e1 (diff)
downloadptxdist-00a75f56edaa30442b604a0ed44bc2522bab3dd9.tar.gz
ptxdist-00a75f56edaa30442b604a0ed44bc2522bab3dd9.tar.xz
nfsutils: add upstream patch to fix building with gcc 7.x
Otherwise building fails with: rpc.c: In function 'nsm_recv_getport': rpc.c:469:13: error: 'UINT16_MAX' undeclared (first use in this function); did you mean 'UINT_MAX'? if (port > UINT16_MAX) { ^~~~~~~~~~ UINT_MAX Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/nfs-utils-1.3.3/0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch21
-rw-r--r--patches/nfs-utils-1.3.3/0100-rpcgen-don-t-link-to-libtirpc.patch (renamed from patches/nfs-utils-1.3.3/0002-rpcgen-don-t-link-to-libtirpc.patch)0
-rw-r--r--patches/nfs-utils-1.3.3/0101-allow-installing-all-tools-in-usr.patch (renamed from patches/nfs-utils-1.3.3/0003-allow-installing-all-tools-in-usr.patch)0
-rw-r--r--patches/nfs-utils-1.3.3/series9
4 files changed, 27 insertions, 3 deletions
diff --git a/patches/nfs-utils-1.3.3/0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch b/patches/nfs-utils-1.3.3/0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch
new file mode 100644
index 000000000..1242abbd2
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch
@@ -0,0 +1,21 @@
+From: Steve Dickson <steved@redhat.com>
+Date: Thu, 22 Jun 2017 12:56:41 -0400
+Subject: [PATCH] rpc.c: added include file so UINT16_MAX is defined.
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ support/nsm/rpc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
+index 4e5f40e79d8f..0a8e56f0ca51 100644
+--- a/support/nsm/rpc.c
++++ b/support/nsm/rpc.c
+@@ -38,6 +38,7 @@
+ #include <sys/socket.h>
+ #include <sys/time.h>
+
++#include <stdint.h>
+ #include <time.h>
+ #include <stdbool.h>
+ #include <string.h>
diff --git a/patches/nfs-utils-1.3.3/0002-rpcgen-don-t-link-to-libtirpc.patch b/patches/nfs-utils-1.3.3/0100-rpcgen-don-t-link-to-libtirpc.patch
index efc8ef80a..efc8ef80a 100644
--- a/patches/nfs-utils-1.3.3/0002-rpcgen-don-t-link-to-libtirpc.patch
+++ b/patches/nfs-utils-1.3.3/0100-rpcgen-don-t-link-to-libtirpc.patch
diff --git a/patches/nfs-utils-1.3.3/0003-allow-installing-all-tools-in-usr.patch b/patches/nfs-utils-1.3.3/0101-allow-installing-all-tools-in-usr.patch
index 8796f35d2..8796f35d2 100644
--- a/patches/nfs-utils-1.3.3/0003-allow-installing-all-tools-in-usr.patch
+++ b/patches/nfs-utils-1.3.3/0101-allow-installing-all-tools-in-usr.patch
diff --git a/patches/nfs-utils-1.3.3/series b/patches/nfs-utils-1.3.3/series
index 9f1525885..22cb3322f 100644
--- a/patches/nfs-utils-1.3.3/series
+++ b/patches/nfs-utils-1.3.3/series
@@ -1,6 +1,9 @@
# generated by git-ptx-patches
#tag:base --start-number 1
+#tag:upstream --start-number 1
0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
-0002-rpcgen-don-t-link-to-libtirpc.patch
-0003-allow-installing-all-tools-in-usr.patch
-# 6b8cb3c12a86cacc5d50dda0a41a1544 - git-ptx-patches magic
+0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch
+#tag:ptxdist --start-number 100
+0100-rpcgen-don-t-link-to-libtirpc.patch
+0101-allow-installing-all-tools-in-usr.patch
+# 9e2fa6772abb1fdd36012b23950e5d18 - git-ptx-patches magic