From 6623fd4551e2fbe918b31d6f2392bfc2b8224603 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 10 Feb 2015 13:00:39 -0600 Subject: update to latest upstream version --- package/libtirpc/patches/patch-configure_ac | 6 +- package/libtirpc/patches/patch-src_Makefile_am | 8 +- package/libtirpc/patches/patch-src_auth_des_c | 8 +- package/libtirpc/patches/patch-src_auth_unix_c | 12 +- package/libtirpc/patches/patch-src_clnt_bcast_c | 12 +- package/libtirpc/patches/patch-src_debug_h | 10 ++ package/libtirpc/patches/patch-src_des_crypt_c | 6 +- package/libtirpc/patches/patch-src_rpc_soc_c | 6 +- package/libtirpc/patches/patch-tirpc_rpc_auth_h | 192 --------------------- package/libtirpc/patches/patch-tirpc_rpc_rpc_h | 6 +- package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h | 6 +- .../libtirpc/patches/patch-tirpc_rpc_svc_auth_h | 20 --- package/libtirpc/patches/patch-tirpc_rpc_svc_h | 6 +- 13 files changed, 56 insertions(+), 242 deletions(-) create mode 100644 package/libtirpc/patches/patch-src_debug_h delete mode 100644 package/libtirpc/patches/patch-tirpc_rpc_auth_h delete mode 100644 package/libtirpc/patches/patch-tirpc_rpc_svc_auth_h (limited to 'package/libtirpc/patches') diff --git a/package/libtirpc/patches/patch-configure_ac b/package/libtirpc/patches/patch-configure_ac index 87f8bb75e..63a3410f1 100644 --- a/package/libtirpc/patches/patch-configure_ac +++ b/package/libtirpc/patches/patch-configure_ac @@ -1,6 +1,6 @@ ---- libtirpc-0.2.4.orig/configure.ac 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/configure.ac 2014-05-18 08:04:03.214884953 +0200 -@@ -25,14 +25,16 @@ if test "x$enable_ipv6" != xno; then +--- libtirpc-0.2.5.orig/configure.ac 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/configure.ac 2015-02-10 11:20:21.483005131 -0600 +@@ -24,14 +24,16 @@ if test "x$enable_ipv6" != xno; then fi AC_PROG_CC diff --git a/package/libtirpc/patches/patch-src_Makefile_am b/package/libtirpc/patches/patch-src_Makefile_am index 87ec56107..f2a448829 100644 --- a/package/libtirpc/patches/patch-src_Makefile_am +++ b/package/libtirpc/patches/patch-src_Makefile_am @@ -1,11 +1,11 @@ ---- libtirpc-0.2.4.orig/src/Makefile.am 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/src/Makefile.am 2014-05-10 17:57:29.466593077 +0200 +--- libtirpc-0.2.5.orig/src/Makefile.am 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/src/Makefile.am 2015-02-10 11:38:08.670995360 -0600 @@ -51,7 +51,7 @@ libtirpc_la_SOURCES = auth_none.c auth_u rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.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 -+ authdes_prot.c +- auth_time.c auth_des.c authdes_prot.c debug.c ++ authdes_prot.c debug.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 diff --git a/package/libtirpc/patches/patch-src_auth_des_c b/package/libtirpc/patches/patch-src_auth_des_c index d91177fdc..09c48bb7e 100644 --- a/package/libtirpc/patches/patch-src_auth_des_c +++ b/package/libtirpc/patches/patch-src_auth_des_c @@ -1,5 +1,5 @@ ---- libtirpc-0.2.3.orig/src/auth_des.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/auth_des.c 2014-03-22 13:20:52.000000000 +0100 +--- libtirpc-0.2.5.orig/src/auth_des.c 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/src/auth_des.c 2015-02-10 11:20:21.499005133 -0600 @@ -38,7 +38,6 @@ #include #include @@ -14,5 +14,5 @@ #endif -#include - #define USEC_PER_SEC 1000000 - #define RTIME_TIMEOUT 5 /* seconds to wait for sync */ + #include "debug.h" + diff --git a/package/libtirpc/patches/patch-src_auth_unix_c b/package/libtirpc/patches/patch-src_auth_unix_c index 3d5fb990e..a1ba7b587 100644 --- a/package/libtirpc/patches/patch-src_auth_unix_c +++ b/package/libtirpc/patches/patch-src_auth_unix_c @@ -1,5 +1,5 @@ ---- libtirpc-0.2.3.orig/src/auth_unix.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/auth_unix.c 2014-03-22 13:20:53.000000000 +0100 +--- libtirpc-0.2.5.orig/src/auth_unix.c 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/src/auth_unix.c 2015-02-10 11:22:29.687003959 -0600 @@ -26,7 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ @@ -8,3 +8,11 @@ /* * auth_unix.c, Implements UNIX style authentication parameters. +@@ -45,6 +44,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/package/libtirpc/patches/patch-src_clnt_bcast_c b/package/libtirpc/patches/patch-src_clnt_bcast_c index d16ea9ea2..f4776e5b1 100644 --- a/package/libtirpc/patches/patch-src_clnt_bcast_c +++ b/package/libtirpc/patches/patch-src_clnt_bcast_c @@ -1,5 +1,5 @@ ---- libtirpc-0.2.4.orig/src/clnt_bcast.c 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/src/clnt_bcast.c 2014-05-10 21:05:18.273730610 +0200 +--- libtirpc-0.2.5.orig/src/clnt_bcast.c 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/src/clnt_bcast.c 2015-02-10 11:27:39.523001122 -0600 @@ -28,7 +28,6 @@ /* * Copyright (c) 1986-1991 by Sun Microsystems Inc. @@ -17,3 +17,11 @@ #include #include +@@ -57,6 +56,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/libtirpc/patches/patch-src_debug_h b/package/libtirpc/patches/patch-src_debug_h new file mode 100644 index 000000000..c6cfa5dc1 --- /dev/null +++ b/package/libtirpc/patches/patch-src_debug_h @@ -0,0 +1,10 @@ +--- libtirpc-0.2.5.orig/src/debug.h 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/src/debug.h 2015-02-10 11:32:36.946998399 -0600 +@@ -21,6 +21,7 @@ + + #ifndef _DEBUG_H + #define _DEBUG_H ++#include + #include + + extern int libtirpc_debug_level; diff --git a/package/libtirpc/patches/patch-src_des_crypt_c b/package/libtirpc/patches/patch-src_des_crypt_c index 8a23f3c1a..6bb81e176 100644 --- a/package/libtirpc/patches/patch-src_des_crypt_c +++ b/package/libtirpc/patches/patch-src_des_crypt_c @@ -1,5 +1,5 @@ ---- libtirpc-0.2.4.orig/src/des_crypt.c 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/src/des_crypt.c 2014-09-28 17:10:35.000000000 +0200 +--- libtirpc-0.2.5.orig/src/des_crypt.c 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/src/des_crypt.c 2015-02-10 11:20:21.587005130 -0600 @@ -39,11 +39,10 @@ static char sccsid[] = "@(#)des_crypt.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI"; #endif @@ -13,7 +13,7 @@ /* * Copy 8 bytes */ -@@ -145,10 +144,6 @@ common_crypt(key, buf, len, mode, desp) +@@ -145,10 +144,6 @@ common_crypt(key, buf, len, mode, desp) if (!__des_crypt_LOCAL(buf, len, desp)) { return (DESERR_HWERROR); } diff --git a/package/libtirpc/patches/patch-src_rpc_soc_c b/package/libtirpc/patches/patch-src_rpc_soc_c index 4055e95bb..c671b9085 100644 --- a/package/libtirpc/patches/patch-src_rpc_soc_c +++ b/package/libtirpc/patches/patch-src_rpc_soc_c @@ -1,6 +1,6 @@ ---- libtirpc-0.2.4.orig/src/rpc_soc.c 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/src/rpc_soc.c 2014-09-28 17:10:35.000000000 +0200 -@@ -520,37 +520,6 @@ clnt_broadcast(prog, vers, proc, xargs, +--- libtirpc-0.2.5.orig/src/rpc_soc.c 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/src/rpc_soc.c 2015-02-10 11:20:21.731005128 -0600 +@@ -520,37 +520,6 @@ clnt_broadcast(prog, vers, proc, xargs, (resultproc_t) rpc_wrap_bcast, "udp"); } diff --git a/package/libtirpc/patches/patch-tirpc_rpc_auth_h b/package/libtirpc/patches/patch-tirpc_rpc_auth_h deleted file mode 100644 index f1437b10d..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_auth_h +++ /dev/null @@ -1,192 +0,0 @@ ---- libtirpc-0.2.4.orig/tirpc/rpc/auth.h 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/tirpc/rpc/auth.h 2014-05-10 17:56:08.722483212 +0200 -@@ -48,7 +48,6 @@ - - #include - #include --#include - #include - #include - -@@ -164,9 +163,13 @@ union des_block { - char c[8]; - }; - typedef union des_block des_block; --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t xdr_des_block(XDR *, des_block *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Authentication info. Opaque to client. -@@ -277,9 +280,13 @@ auth_put(AUTH *auth) - xfunc, xwhere)) - - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern struct opaque_auth _null_auth; --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Any style authentication. These routines can be used by any -@@ -300,11 +307,15 @@ int authany_wrap(void), authany_unwrap(v - * int len; - * int *aup_gids; - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern AUTH *authunix_create(char *, uid_t, uid_t, int, uid_t *); - extern AUTH *authunix_create_default(void); /* takes no parameters */ - extern AUTH *authnone_create(void); /* takes no parameters */ --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - /* - * DES style authentication - * AUTH *authsecdes_create(servername, window, timehost, ckey) -@@ -313,15 +324,23 @@ __END_DECLS - * const char *timehost; - optional hostname to sync with - * des_block *ckey; - optional conversation key to use - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern AUTH *authdes_create (char *, u_int, struct sockaddr *, des_block *); - extern AUTH *authdes_seccreate (const char *, const u_int, const char *, - const des_block *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t xdr_opaque_auth (XDR *, struct opaque_auth *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #define authsys_create(c,i1,i2,i3,ip) authunix_create((c),(i1),(i2),(i3),(ip)) - #define authsys_create_default() authunix_create_default() -@@ -329,36 +348,48 @@ __END_DECLS - /* - * Netname manipulation routines. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern int getnetname(char *); - extern int host2netname(char *, const char *, const char *); - extern int user2netname(char *, const uid_t, const char *); - extern int netname2user(char *, uid_t *, gid_t *, int *, gid_t *); - extern int netname2host(char *, char *, const int); - extern void passwd2des ( char *, char * ); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * - * These routines interface to the keyserv daemon - * - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern int key_decryptsession(const char *, des_block *); - extern int key_encryptsession(const char *, des_block *); - extern int key_gendes(des_block *); - extern int key_setsecret(const char *); - extern int key_secretkey_is_set(void); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Publickey routines. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern int getpublickey (const char *, char *); - extern int getpublicandprivatekey (char *, char *); - extern int getsecretkey (char *, char *, char *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #ifdef KERBEROS - /* -@@ -371,10 +402,14 @@ __END_DECLS - * const char *timehost; - optional hostname to sync with - * int *status; - kerberos status returned - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern AUTH *authkerb_seccreate(const char *, const char *, const char *, - const u_int, const char *, int *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Map a kerberos credential into a unix cred. -@@ -387,19 +422,27 @@ __END_DECLS - * int *groups; - * - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern int authkerb_getucred(/* struct svc_req *, uid_t *, gid_t *, - short *, int * */); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - #endif /* KERBEROS */ - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - struct svc_req; - struct rpc_msg; - enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #define AUTH_NONE 0 /* no authentication */ - #define AUTH_NULL 0 /* backward compatibility */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_rpc_h b/package/libtirpc/patches/patch-tirpc_rpc_rpc_h index 3ec297d82..bdfad8563 100644 --- a/package/libtirpc/patches/patch-tirpc_rpc_rpc_h +++ b/package/libtirpc/patches/patch-tirpc_rpc_rpc_h @@ -1,5 +1,5 @@ ---- libtirpc-0.2.4.orig/tirpc/rpc/rpc.h 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/tirpc/rpc/rpc.h 2014-09-28 17:10:36.000000000 +0200 +--- libtirpc-0.2.5.orig/tirpc/rpc/rpc.h 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/tirpc/rpc/rpc.h 2015-02-10 11:20:21.919005127 -0600 @@ -79,9 +79,11 @@ #define UDPMSGSIZE 8800 #endif @@ -14,7 +14,7 @@ extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]), xdrproc_t, xdrproc_t); extern int callrpc(const char *, int, int, int, xdrproc_t, void *, -@@ -93,18 +95,24 @@ struct netbuf *uaddr2taddr(const struct +@@ -93,18 +95,24 @@ struct netbuf *uaddr2taddr(const struct struct sockaddr; extern int bindresvport_sa(int, struct sockaddr *); diff --git a/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h b/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h index cd79e72a1..5e16c2dd6 100644 --- a/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h +++ b/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h @@ -1,5 +1,5 @@ ---- libtirpc-0.2.4.orig/tirpc/rpc/rpc_msg.h 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/tirpc/rpc/rpc_msg.h 2014-09-28 17:10:36.000000000 +0200 +--- libtirpc-0.2.5.orig/tirpc/rpc/rpc_msg.h 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/tirpc/rpc/rpc_msg.h 2015-02-10 11:20:21.923005126 -0600 @@ -161,7 +161,9 @@ struct rpc_msg { #define acpted_rply ru.RM_rmb.ru.RP_ar #define rjcted_rply ru.RM_rmb.ru.RP_dr @@ -11,7 +11,7 @@ /* * XDR routine to handle a rpc message. * xdr_callmsg(xdrs, cmsg) -@@ -210,6 +212,8 @@ extern bool_t xdr_rejected_reply(XDR *, +@@ -210,6 +212,8 @@ extern bool_t xdr_rejected_reply(XDR *, * struct rpc_err *error; */ extern void _seterr_reply(struct rpc_msg *, struct rpc_err *); diff --git a/package/libtirpc/patches/patch-tirpc_rpc_svc_auth_h b/package/libtirpc/patches/patch-tirpc_rpc_svc_auth_h deleted file mode 100644 index 1abf29cde..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_svc_auth_h +++ /dev/null @@ -1,20 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/svc_auth.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/svc_auth.h 2014-03-22 13:20:52.000000000 +0100 -@@ -65,11 +65,15 @@ typedef struct SVCAUTH { - /* - * Server side authenticator - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *); - extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *, - struct rpc_msg *)); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_RPC_SVC_AUTH_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_svc_h b/package/libtirpc/patches/patch-tirpc_rpc_svc_h index 7e0623573..28b6e32d0 100644 --- a/package/libtirpc/patches/patch-tirpc_rpc_svc_h +++ b/package/libtirpc/patches/patch-tirpc_rpc_svc_h @@ -1,5 +1,5 @@ ---- libtirpc-0.2.4.orig/tirpc/rpc/svc.h 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/tirpc/rpc/svc.h 2014-09-28 17:10:36.000000000 +0200 +--- libtirpc-0.2.5.orig/tirpc/rpc/svc.h 2014-08-08 11:24:34.000000000 -0500 ++++ libtirpc-0.2.5/tirpc/rpc/svc.h 2015-02-10 11:20:21.939005129 -0600 @@ -40,7 +40,6 @@ #ifndef _TIRPC_SVC_H @@ -139,7 +139,7 @@ /* * Transport independent svc_create routine. */ -@@ -427,7 +456,9 @@ int svc_dg_enablecache(SVCXPRT *, const +@@ -427,7 +456,9 @@ int svc_dg_enablecache(SVCXPRT *, const int __rpc_get_local_uid(SVCXPRT *_transp, uid_t *_uid); -- cgit v1.2.3