Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/, net-fs/nfs-utils/files/
Date: Sat, 20 Apr 2019 23:24:10
Message-Id: 1555785270.3bac589455e4c1d815a27cbe41bd2171698a65d0.polynomial-c@gentoo
1 commit: 3bac589455e4c1d815a27cbe41bd2171698a65d0
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 20 18:33:40 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 20 18:34:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bac5894
7
8 net-fs/nfs-utils: Added another musl build fix.
9
10 Closes: https://bugs.gentoo.org/651080
11 Package-Manager: Portage-2.3.64, Repoman-2.3.12
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 .../nfs-utils/files/nfs-utils-2.3.1-limits.patch | 105 +++++++++++++++++++++
15 net-fs/nfs-utils/nfs-utils-2.3.3.ebuild | 1 +
16 2 files changed, 106 insertions(+)
17
18 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch
19 new file mode 100644
20 index 00000000000..b322b6fb17c
21 --- /dev/null
22 +++ b/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch
23 @@ -0,0 +1,105 @@
24 +Required for successful build on musl
25 +https://bugs.gentoo.org/651080#c5
26 +
27 +Thanks-to: Robert Bridge <robert@××××××××.com>
28 +
29 +--- nfs-utils-2.3.1/support/export/export.c
30 ++++ nfs-utils-2.3.1/support/export/export.c
31 +@@ -17,6 +17,7 @@
32 + #include <stdlib.h>
33 + #include <dirent.h>
34 + #include <errno.h>
35 ++#include <limits.h>
36 + #include "xmalloc.h"
37 + #include "nfslib.h"
38 + #include "exportfs.h"
39 +--- nfs-utils-2.3.1/support/export/xtab.c
40 ++++ nfs-utils-2.3.1/support/export/xtab.c
41 +@@ -18,6 +18,7 @@
42 + #include <sys/stat.h>
43 + #include <errno.h>
44 + #include <libgen.h>
45 ++#include <limits.h>
46 +
47 + #include "nfslib.h"
48 + #include "exportfs.h"
49 +--- nfs-utils-2.3.1/support/misc/file.c
50 ++++ nfs-utils-2.3.1/support/misc/file.c
51 +@@ -27,6 +27,7 @@
52 + #include <dirent.h>
53 + #include <stdlib.h>
54 + #include <stdbool.h>
55 ++#include <limits.h>
56 +
57 + #include "xlog.h"
58 + #include "misc.h"
59 +--- nfs-utils-2.3.1/support/nfs/xcommon.c
60 ++++ nfs-utils-2.3.1/support/nfs/xcommon.c
61 +@@ -16,6 +16,7 @@
62 + #include <stdio.h>
63 + #include <stdlib.h>
64 + #include <string.h>
65 ++#include <limits.h>
66 +
67 + #include "xcommon.h"
68 + #include "nls.h" /* _() */
69 +--- nfs-utils-2.3.1/support/nsm/file.c
70 ++++ nfs-utils-2.3.1/support/nsm/file.c
71 +@@ -85,6 +85,7 @@
72 + #include <fcntl.h>
73 + #include <dirent.h>
74 + #include <grp.h>
75 ++#include <limits.h>
76 +
77 + #include "xlog.h"
78 + #include "nsm.h"
79 +--- nfs-utils-2.3.1/utils/blkmapd/device-discovery.c
80 ++++ nfs-utils-2.3.1/utils/blkmapd/device-discovery.c
81 +@@ -49,6 +49,7 @@
82 + #include <unistd.h>
83 + #include <libgen.h>
84 + #include <errno.h>
85 ++#include <limits.h>
86 + #include <libdevmapper.h>
87 +
88 + #ifdef HAVE_CONFIG_H
89 +--- nfs-utils-2.3.1/utils/gssd/krb5_util.c
90 ++++ nfs-utils-2.3.1/utils/gssd/krb5_util.c
91 +@@ -120,6 +120,7 @@
92 + #endif
93 + #include <krb5.h>
94 + #include <rpc/auth_gss.h>
95 ++#include <limits.h>
96 +
97 + #include "gssd.h"
98 + #include "err_util.h"
99 +--- nfs-utils-2.3.1/utils/mountd/cache.c
100 ++++ nfs-utils-2.3.1/utils/mountd/cache.c
101 +@@ -26,6 +26,7 @@
102 + #include <pwd.h>
103 + #include <grp.h>
104 + #include <mntent.h>
105 ++#include <limits.h>
106 + #include "misc.h"
107 + #include "nfslib.h"
108 + #include "exportfs.h"
109 +--- nfs-utils-2.3.1/utils/mountd/mountd.c
110 ++++ nfs-utils-2.3.1/utils/mountd/mountd.c
111 +@@ -22,6 +22,7 @@
112 + #include <fcntl.h>
113 + #include <sys/resource.h>
114 + #include <sys/wait.h>
115 ++#include <limits.h>
116 +
117 + #include "conffile.h"
118 + #include "xmalloc.h"
119 +--- nfs-utils-2.3.1/utils/mountd/rmtab.c
120 ++++ nfs-utils-2.3.1/utils/mountd/rmtab.c
121 +@@ -16,6 +16,7 @@
122 + #include <netinet/in.h>
123 + #include <arpa/inet.h>
124 + #include <netdb.h>
125 ++#include <limits.h>
126 +
127 + #include "misc.h"
128 + #include "exportfs.h"
129
130 diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
131 index 18852036dc2..07216af6e21 100644
132 --- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
133 +++ b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
134 @@ -68,6 +68,7 @@ PATCHES=(
135 "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
136 "${FILESDIR}"/${PN}-2.3.2-junction_libs.patch
137 "${FILESDIR}"/${PN}-2.3.2-no-werror.patch
138 + "${FILESDIR}"/${PN}-2.3.1-limits.patch #651080
139 "${FILESDIR}"/${PN}-2.3.4_rc2-improved_res_querydomain_check.patch #651080
140 )