From 5cda98d215d8d0b993e353c6ab5ce3fd0cbd04d7 Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Wed, 8 Nov 2017 17:11:14 +0100 Subject: [PATCH] - update nfs-utils and companion libs/tools --- ...parts-of-TIRPC-requiring-NIS-support.patch | 6 +- ...t-and-musl-does-not-install-rpcent.h.patch | 4 +- ...Disable-DES-authentification-support.patch | 12 +- ...sing-rwlock_unlocks-in-xprt_register.patch | 63 ----- ...-0007-include-stdint.h-for-uintptr_t.patch | 31 +++ ...n-t-use-the-xp_auth-pointer-directly.patch | 42 --- ...0003-src-remove-use-of-the-__P-macro.patch | 243 ------------------ make/archives.mk | 6 +- make/system-libs.mk | 2 +- make/system-tools.mk | 6 +- 10 files changed, 47 insertions(+), 368 deletions(-) delete mode 100644 archive-patches/libtirpc-0007-Add-missing-rwlock_unlocks-in-xprt_register.patch create mode 100644 archive-patches/libtirpc-0007-include-stdint.h-for-uintptr_t.patch delete mode 100644 archive-patches/rpcbind-0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch delete mode 100644 archive-patches/rpcbind-0003-src-remove-use-of-the-__P-macro.patch diff --git a/archive-patches/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch b/archive-patches/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch index e51c5a44..eb1bef3d 100644 --- a/archive-patches/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch +++ b/archive-patches/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch @@ -13,6 +13,8 @@ Signed-off-by: "Yann E. MORIN" Signed-off-by: Jörg Krause [peda@axentia.se: update for 1.0.1] Signed-off-by: Peter Rosin +[bernd.kuhls@t-online.de: update for 1.0.2] +Signed-off-by: Bernd Kuhls --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -25,8 +27,8 @@ index 6cc567a..9834f9a 100644 rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ svc_auth_des.c \ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c debug.c -+ auth_des.c authdes_prot.c debug.c +- auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c ++ auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c ## XDR libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c diff --git a/archive-patches/libtirpc-0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch b/archive-patches/libtirpc-0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch index 643a57ed..51229a02 100644 --- a/archive-patches/libtirpc-0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch +++ b/archive-patches/libtirpc-0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch @@ -8,6 +8,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" [joerg.krause@embedded.rocks: musl fix] Signed-off-by: Jörg Krause +[bernd.kuhls@t-online.de: update for 1.0.2] +Signed-off-by: Bernd Kuhls --- tirpc/rpc/rpcent.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) @@ -21,7 +23,7 @@ index 147f909..4a58180 100644 #endif -/* These are defined in /usr/include/rpc/netdb.h */ --#if !defined(__GLIBC__) +-#if !defined(__GLIBC__) || defined(__UCLIBC__) +/* These are defined in /usr/include/rpc/netdb.h, unless we are using + the C library without RPC support. */ +#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__) diff --git a/archive-patches/libtirpc-0006-Disable-DES-authentification-support.patch b/archive-patches/libtirpc-0006-Disable-DES-authentification-support.patch index 59a77ffc..0c654724 100644 --- a/archive-patches/libtirpc-0006-Disable-DES-authentification-support.patch +++ b/archive-patches/libtirpc-0006-Disable-DES-authentification-support.patch @@ -11,6 +11,8 @@ uClibc and musl does not provide DES authentication. Signed-off-by: Jörg Krause [peda@axentia.se: update for 1.0.1] Signed-off-by: Peter Rosin +[bernd.kuhls@t-online.de: update for 1.0.2] +Signed-off-by: Bernd Kuhls --- src/Makefile.am | 2 +- src/rpc_soc.c | 32 -------------------------------- @@ -26,7 +28,7 @@ index 960a522..3a88e31 100644 rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ - svc_auth_des.c \ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_des.c authdes_prot.c debug.c +- auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c + debug.c ## XDR @@ -48,14 +50,6 @@ diff --git a/src/rpc_soc.c b/src/rpc_soc.c index e146ed4..161a1ec 100644 --- a/src/rpc_soc.c +++ b/src/rpc_soc.c -@@ -61,7 +61,6 @@ #ifdef PORTMAP - #include - #include - #include --#include - - #include "rpc_com.h" - @@ -522,86 +521,6 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) } diff --git a/archive-patches/libtirpc-0007-Add-missing-rwlock_unlocks-in-xprt_register.patch b/archive-patches/libtirpc-0007-Add-missing-rwlock_unlocks-in-xprt_register.patch deleted file mode 100644 index 56b5bf83..00000000 --- a/archive-patches/libtirpc-0007-Add-missing-rwlock_unlocks-in-xprt_register.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4f1503e84b2f7bd229a097335e52fb8203f5bb0b Mon Sep 17 00:00:00 2001 -From: Michael Forney -Date: Wed, 4 Nov 2015 13:58:06 -0500 -Subject: [PATCH] Add missing rwlock_unlocks in xprt_register - -It looks like in b2c9430f46c4ac848957fb8adaac176a3f6ac03f when svc_run -switched to poll, an early return was added, but the rwlock was not -unlocked. - -I observed that rpcbind built against libtirpc-1.0.1 would handle only -one request before hanging, and tracked it down to a missing -rwlock_unlock here. - -Fixes: b2c9430f46c4 ('Use poll() instead of select() in svc_run()') -Signed-off-by: Michael Forney -Signed-off-by: Steve Dickson -[peda@axentia.se: backport from upstream] -Signed-off-by: Peter Rosin ---- - src/svc.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/svc.c b/src/svc.c -index 9c41445..b59467b 100644 ---- a/src/svc.c -+++ b/src/svc.c -@@ -99,7 +99,7 @@ xprt_register (xprt) - { - __svc_xports = (SVCXPRT **) calloc (_rpc_dtablesize(), sizeof (SVCXPRT *)); - if (__svc_xports == NULL) -- return; -+ goto unlock; - } - if (sock < _rpc_dtablesize()) - { -@@ -120,14 +120,14 @@ xprt_register (xprt) - svc_pollfd[i].fd = sock; - svc_pollfd[i].events = (POLLIN | POLLPRI | - POLLRDNORM | POLLRDBAND); -- return; -+ goto unlock; - } - - new_svc_pollfd = (struct pollfd *) realloc (svc_pollfd, - sizeof (struct pollfd) - * (svc_max_pollfd + 1)); - if (new_svc_pollfd == NULL) /* Out of memory */ -- return; -+ goto unlock; - svc_pollfd = new_svc_pollfd; - ++svc_max_pollfd; - -@@ -135,6 +135,7 @@ xprt_register (xprt) - svc_pollfd[svc_max_pollfd - 1].events = (POLLIN | POLLPRI | - POLLRDNORM | POLLRDBAND); - } -+unlock: - rwlock_unlock (&svc_fd_lock); - } - --- -2.5.3 - diff --git a/archive-patches/libtirpc-0007-include-stdint.h-for-uintptr_t.patch b/archive-patches/libtirpc-0007-include-stdint.h-for-uintptr_t.patch new file mode 100644 index 00000000..62031613 --- /dev/null +++ b/archive-patches/libtirpc-0007-include-stdint.h-for-uintptr_t.patch @@ -0,0 +1,31 @@ +From 18f8a605e176f0362da22fd1203eb7cedb136aaf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 20 Jun 2017 22:06:35 +0200 +Subject: [PATCH] include stdint.h for uintptr_t + +Fixes +| ../../libtirpc-1.0.1/src/xdr_sizeof.c:93:13: error: 'uintptr_t' undeclared (first use in this function); did you mean '__intptr_t'? +| if (len < (uintptr_t)xdrs->x_base) { +| ^~~~~~~~~ + +Signed-off-by: Khem Raj +Signed-off-by: Dmitrii Kolesnichenko +--- + src/xdr_sizeof.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c +index d23fbd1..79d6707 100644 +--- a/src/xdr_sizeof.c ++++ b/src/xdr_sizeof.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include "un-namespace.h" + + /* ARGSUSED */ +-- +2.9.4 + diff --git a/archive-patches/rpcbind-0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch b/archive-patches/rpcbind-0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch deleted file mode 100644 index 6145514b..00000000 --- a/archive-patches/rpcbind-0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Mon, 2 Nov 2015 17:05:18 -0500 -Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly - -In the latest libtirpc version to access the xp_auth -one must use the SVC_XP_AUTH macro. To be backwards -compatible a couple ifdefs were added to use the -macro when it exists. - -Signed-off-by: Steve Dickson -[peda@axentia.se: backport from upstream] -Signed-off-by: Peter Rosin ---- - src/rpcb_svc_com.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index 4ae93f1..22d6c84 100644 ---- a/src/rpcb_svc_com.c -+++ b/src/rpcb_svc_com.c -@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) - a.rmt_localvers = fi->versnum; - - xprt_set_caller(xprt, fi); -+#if defined(SVC_XP_AUTH) -+ SVC_XP_AUTH(xprt) = svc_auth_none; -+#else - xprt->xp_auth = &svc_auth_none; -+#endif - svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); -+#if !defined(SVC_XP_AUTH) - SVCAUTH_DESTROY(xprt->xp_auth); - xprt->xp_auth = NULL; -+#endif -+ - done: - if (buffer) - free(buffer); --- -2.5.3 - diff --git a/archive-patches/rpcbind-0003-src-remove-use-of-the-__P-macro.patch b/archive-patches/rpcbind-0003-src-remove-use-of-the-__P-macro.patch deleted file mode 100644 index 72fda880..00000000 --- a/archive-patches/rpcbind-0003-src-remove-use-of-the-__P-macro.patch +++ /dev/null @@ -1,243 +0,0 @@ -From 2f7d15304e0544e4c693c86d8ab8b2f08b9e9886 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 15 Aug 2016 16:36:40 +0200 -Subject: [PATCH] src: remove use of the __P() macro - -The __P() macro is a legacy compatibility macro aimed making pre-ANSI -(i.e. K&R) compilers that do not support function prototypes happy, -while still allowing such prototypes for ANSI-compliant compilers. - -Since virtually all compilers have been ANSI-compliant for a few decades -now, use of __P() is totally useless. - -Furthermore, __P() is defined in the non-standard sys/cdefs.h header. -This header is present in glibc and uClibc, and both have it included -from many of their headers. So, sys/cdefs.h is automagically included in -most cases and its macros are available. - -However, the musl C library does not provide this sys/cdefs.h header. -Thus, the build breaks on musl. - -For all the above reasons, get rid of __P() wherever it is used; just -always declare real function prototypes. - -Signed-off-by: "Yann E. MORIN" -Cc: Chuck Lever -Cc: Steve Dickson ---- - src/check_bound.c | 2 +- - src/pmap_svc.c | 10 +++++----- - src/rpcb_svc.c | 10 +++++----- - src/rpcb_svc_4.c | 14 ++++++-------- - src/rpcb_svc_com.c | 46 +++++++++++++++++++++++----------------------- - src/rpcbind.c | 12 ++++++------ - src/util.c | 2 +- - src/warmstart.c | 4 ++-- - 8 files changed, 49 insertions(+), 51 deletions(-) - -diff --git a/src/check_bound.c b/src/check_bound.c -index c70b845..92bfd36 100644 ---- a/src/check_bound.c -+++ b/src/check_bound.c -@@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */ - static struct fdlist *fdtail; - static char *nullstring = ""; - --static bool_t check_bound __P((struct fdlist *, char *uaddr)); -+static bool_t check_bound(struct fdlist *, char *uaddr); - - /* - * Returns 1 if the given address is bound for the given addr & transport -diff --git a/src/pmap_svc.c b/src/pmap_svc.c -index ad28b93..4c744fe 100644 ---- a/src/pmap_svc.c -+++ b/src/pmap_svc.c -@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro"; - #include "rpcbind.h" - #include "xlog.h" - #include /* svc_getcaller routine definition */ --static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t, -- rpcprot_t)); --static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long)); --static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *)); --static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *)); -+static struct pmaplist *find_service_pmap(rpcprog_t, rpcvers_t, -+ rpcprot_t); -+static bool_t pmapproc_change(struct svc_req *, SVCXPRT *, u_long); -+static bool_t pmapproc_getport(struct svc_req *, SVCXPRT *); -+static bool_t pmapproc_dump(struct svc_req *, SVCXPRT *); - - /* - * Called for all the version 2 inquiries. -diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c -index bd92201..709e3fb 100644 ---- a/src/rpcb_svc.c -+++ b/src/rpcb_svc.c -@@ -53,10 +53,10 @@ - #include "rpcbind.h" - #include "xlog.h" - --static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *, -- rpcvers_t)); --static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *, -- rpcvers_t)); -+static void *rpcbproc_getaddr_3_local(void *, struct svc_req *, SVCXPRT *, -+ rpcvers_t); -+static void *rpcbproc_dump_3_local(void *, struct svc_req *, SVCXPRT *, -+ rpcvers_t); - - /* - * Called by svc_getreqset. There is a separate server handle for -@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp) - } argument; - char *result; - xdrproc_t xdr_argument, xdr_result; -- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -+ void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t); - rpcprog_t setprog = 0; - - rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc); -diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c -index b673452..5094879 100644 ---- a/src/rpcb_svc_4.c -+++ b/src/rpcb_svc_4.c -@@ -54,13 +54,11 @@ - #include "rpcbind.h" - #include "xlog.h" - --static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, -- rpcvers_t)); --static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); --static void *rpcbproc_getaddrlist_4_local -- __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); --static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *)); --static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -+static void *rpcbproc_getaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); -+static void *rpcbproc_getversaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); -+static void *rpcbproc_getaddrlist_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); -+static void free_rpcb_entry_list(rpcb_entry_list_ptr *); -+static void *rpcbproc_dump_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); - - /* - * Called by svc_getreqset. There is a separate server handle for -@@ -78,7 +76,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp) - } argument; - char *result; - xdrproc_t xdr_argument, xdr_result; -- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -+ void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t); - rpcprog_t setprog = 0; - - rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc); -diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index 148fe42..5862c26 100644 ---- a/src/rpcb_svc_com.c -+++ b/src/rpcb_svc_com.c -@@ -100,29 +100,29 @@ struct finfo { - static struct finfo FINFO[NFORWARD]; - - --static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *)); --static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *)); --static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *)); --static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *)); --static int find_rmtcallfd_by_netid __P((char *)); --static SVCXPRT *find_rmtcallxprt_by_fd __P((int)); --static int forward_register __P((u_int32_t, struct netbuf *, int, char *, -- rpcproc_t, rpcvers_t, u_int32_t *)); --static struct finfo *forward_find __P((u_int32_t)); --static int free_slot_by_xid __P((u_int32_t)); --static int free_slot_by_index __P((int)); --static int netbufcmp __P((struct netbuf *, struct netbuf *)); --static struct netbuf *netbufdup __P((struct netbuf *)); --static void netbuffree __P((struct netbuf *)); --static int check_rmtcalls __P((struct pollfd *, int)); --static void xprt_set_caller __P((SVCXPRT *, struct finfo *)); --static void send_svcsyserr __P((SVCXPRT *, struct finfo *)); --static void handle_reply __P((int, SVCXPRT *)); --static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *)); --static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *)); --static char *getowner __P((SVCXPRT *, char *, size_t)); --static int add_pmaplist __P((RPCB *)); --static int del_pmaplist __P((RPCB *)); -+static bool_t xdr_encap_parms(XDR *, struct encap_parms *); -+static bool_t xdr_rmtcall_args(XDR *, struct r_rmtcall_args *); -+static bool_t xdr_rmtcall_result(XDR *, struct r_rmtcall_args *); -+static bool_t xdr_opaque_parms(XDR *, struct r_rmtcall_args *); -+static int find_rmtcallfd_by_netid(char *); -+static SVCXPRT *find_rmtcallxprt_by_fd(int); -+static int forward_register(u_int32_t, struct netbuf *, int, char *, -+ rpcproc_t, rpcvers_t, u_int32_t *); -+static struct finfo *forward_find(u_int32_t); -+static int free_slot_by_xid(u_int32_t); -+static int free_slot_by_index(int); -+static int netbufcmp(struct netbuf *, struct netbuf *); -+static struct netbuf *netbufdup(struct netbuf *); -+static void netbuffree(struct netbuf *); -+static int check_rmtcalls(struct pollfd *, int); -+static void xprt_set_caller(SVCXPRT *, struct finfo *); -+static void send_svcsyserr(SVCXPRT *, struct finfo *); -+static void handle_reply(int, SVCXPRT *); -+static void find_versions(rpcprog_t, char *, rpcvers_t *, rpcvers_t *); -+static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *); -+static char *getowner(SVCXPRT *, char *, size_t); -+static int add_pmaplist(RPCB *); -+static int del_pmaplist(RPCB *); - - /* - * Set a mapping of program, version, netid -diff --git a/src/rpcbind.c b/src/rpcbind.c -index c4265cd..87ccdc2 100644 ---- a/src/rpcbind.c -+++ b/src/rpcbind.c -@@ -136,13 +136,13 @@ char *tcp_uaddr; /* Universal TCP address */ - static char servname[] = "rpcbind"; - static char superuser[] = "superuser"; - --int main __P((int, char *[])); -+int main(int, char *[]); - --static int init_transport __P((struct netconfig *)); --static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *, -- struct netbuf *)); --static void terminate __P((int)); --static void parseargs __P((int, char *[])); -+static int init_transport(struct netconfig *); -+static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *, -+ struct netbuf *); -+static void terminate(int); -+static void parseargs(int, char *[]); - - int - main(int argc, char *argv[]) -diff --git a/src/util.c b/src/util.c -index a6c835b..74b0284 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4; - static struct sockaddr_in6 *local_in6; - #endif - --static int bitmaskcmp __P((void *, void *, void *, int)); -+static int bitmaskcmp(void *, void *, void *, int); - - /* - * For all bits set in "mask", compare the corresponding bits in -diff --git a/src/warmstart.c b/src/warmstart.c -index b6eb73e..122a058 100644 ---- a/src/warmstart.c -+++ b/src/warmstart.c -@@ -58,8 +58,8 @@ - #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr" - #endif - --static bool_t write_struct __P((char *, xdrproc_t, void *)); --static bool_t read_struct __P((char *, xdrproc_t, void *)); -+static bool_t write_struct(char *, xdrproc_t, void *); -+static bool_t read_struct(char *, xdrproc_t, void *); - - static bool_t - write_struct(char *filename, xdrproc_t structproc, void *list) --- -2.7.4 - diff --git a/make/archives.mk b/make/archives.mk index 9987cf12..77e144da 100644 --- a/make/archives.mk +++ b/make/archives.mk @@ -24,15 +24,15 @@ LIBXML2_VER=2.9.7 $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz: $(WGET) ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VER).tar.gz -NFS-UTILS_VER=1.3.3 +NFS-UTILS_VER=2.2.1 $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2: $(WGET) http://sourceforge.net/projects/nfs/files/nfs-utils/$(NFS-UTILS_VER)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 -RPCBIND_VER=0.2.3 +RPCBIND_VER=0.2.4 $(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2: $(WGET) http://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIND_VER)/rpcbind-$(RPCBIND_VER).tar.bz2 -LIBTIRPC_VER=1.0.1 +LIBTIRPC_VER=1.0.2 $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2: $(WGET) http://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VER)/libtirpc-$(LIBTIRPC_VER).tar.bz2 diff --git a/make/system-libs.mk b/make/system-libs.mk index 592588b5..43dcd343 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -901,7 +901,7 @@ $(D)/libtirpc: $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2 | $(TARGETPREFIX) $(PATCH)/libtirpc-0004-Automatically-generate-XDR-header-files-from-.x-sour.patch && \ $(PATCH)/libtirpc-0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch && \ $(PATCH)/libtirpc-0006-Disable-DES-authentification-support.patch && \ - $(PATCH)/libtirpc-0007-Add-missing-rwlock_unlocks-in-xprt_register.patch && \ + $(PATCH)/libtirpc-0007-include-stdint.h-for-uintptr_t.patch && \ autoreconf -fi && \ $(CONFIGURE) \ --target=$(TARGET) \ diff --git a/make/system-tools.mk b/make/system-tools.mk index 4348e6d5..8f4daf7f 100644 --- a/make/system-tools.mk +++ b/make/system-tools.mk @@ -746,9 +746,9 @@ $(D)/dosfstools: $(DOSFSTOOLS_DEPS) $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar. $(REMOVE)/dosfstools-$(DOSFSTOOLS_VER) touch $@ -NFS-UTILS_IPV6="--enable-ipv6" +NFS-UTILS_IPV6=--enable-ipv6 ifeq ($(BOXSERIES), hd1) - NFS-UTILS_IPV6="--disable-ipv6" + NFS-UTILS_IPV6=--disable-ipv6 endif $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 | $(TARGETPREFIX) @@ -798,8 +798,6 @@ $(D)/rpcbind: $(D)/libtirpc $(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2 | $(TARGET $(UNTAR)/rpcbind-$(RPCBIND_VER).tar.bz2 cd $(BUILD_TMP)/rpcbind-$(RPCBIND_VER) && \ $(PATCH)/rpcbind-0001-Remove-yellow-pages-support.patch && \ - $(PATCH)/rpcbind-0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch && \ - $(PATCH)/rpcbind-0003-src-remove-use-of-the-__P-macro.patch && \ autoreconf -fi && \ $(CONFIGURE) \ --target=$(TARGET) \