diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-06-23 21:15:37 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-06-24 20:56:01 +0200 |
| commit | f920132acf0d785d238388e1652b7023207c553c (patch) | |
| tree | 6a358b9531986b98f8fc5872787f8fdc86a24dc9 /package/libtirpc | |
| parent | 45483a482f5629a1a0b6f3e249c3534f6903568f (diff) | |
update to latest stable version
Diffstat (limited to 'package/libtirpc')
64 files changed, 24 insertions, 1569 deletions
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 97ffab482..dca48206d 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libtirpc -PKG_VERSION:= 0.2.5 +PKG_VERSION:= 0.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 62f9de7c2c8686c568757730e1fef66502a0e00d6cacf33546d0267984e002db +PKG_HASH:= 2008a379f37f2c5d5a87a568b06707422cc3e4f5da305f7fb71f3f4c6d473ffc PKG_DESCR:= transport independent rpc library PKG_SECTION:= libs/net PKG_URL:= http://sourceforge.net/projects/libtirpc/ diff --git a/package/libtirpc/patches/patch-Makefile_am b/package/libtirpc/patches/patch-Makefile_am deleted file mode 100644 index 31152a662..000000000 --- a/package/libtirpc/patches/patch-Makefile_am +++ /dev/null @@ -1,8 +0,0 @@ ---- libtirpc-0.2.4.orig/Makefile.am 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/Makefile.am 2014-05-10 17:56:58.282550787 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = src man doc -+SUBDIRS = src - ACLOCAL_AMFLAGS = -I m4 - - noinst_HEADERS = tirpc/reentrant.h \ diff --git a/package/libtirpc/patches/patch-configure_ac b/package/libtirpc/patches/patch-configure_ac deleted file mode 100644 index 63a3410f1..000000000 --- a/package/libtirpc/patches/patch-configure_ac +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 --m4_pattern_allow(AM_CONFIG_HEADERS(config.h)) -+AC_CONFIG_HEADERS([config.h]) - AC_PROG_LIBTOOL - AC_HEADER_DIRENT - AC_PREFIX_DEFAULT(/usr) - AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h]) - AC_CHECK_LIB([pthread], [pthread_create]) - AC_CHECK_LIB([nsl], [yp_get_default_domain]) -- -+AC_CHECK_FUNCS([getrpcbyname getrpcbynumber]) - - AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) - AC_OUTPUT(libtirpc.pc) -+ -+ diff --git a/package/libtirpc/patches/patch-src_Makefile_am b/package/libtirpc/patches/patch-src_Makefile_am index f2a448829..0c39f90b9 100644 --- a/package/libtirpc/patches/patch-src_Makefile_am +++ b/package/libtirpc/patches/patch-src_Makefile_am @@ -1,11 +1,20 @@ ---- 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 +--- libtirpc-0.3.2.orig/src/Makefile.am 2015-06-16 17:35:08.000000000 +0200 ++++ libtirpc-0.3.2/src/Makefile.am 2015-06-21 21:02:26.000000000 +0200 @@ -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 debug.c -+ authdes_prot.c debug.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 +@@ -68,7 +68,7 @@ if GSS + libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) + endif + +-libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c ++libtirpc_la_SOURCES += key_call.c key_prot_xdr.c + libtirpc_la_SOURCES += netname.c netnamer.c rtime.c + + CLEANFILES = cscope.* *~ diff --git a/package/libtirpc/patches/patch-src_auth_des_c b/package/libtirpc/patches/patch-src_auth_des_c deleted file mode 100644 index 09c48bb7e..000000000 --- a/package/libtirpc/patches/patch-src_auth_des_c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 <string.h> - #include <stdlib.h> - #include <unistd.h> --#include <sys/cdefs.h> - #include <rpc/des_crypt.h> - #include <syslog.h> - #include <rpc/types.h> -@@ -52,7 +51,6 @@ - - #if defined(LIBC_SCCS) && !defined(lint) - #endif --#include <sys/cdefs.h> - - #include "debug.h" - diff --git a/package/libtirpc/patches/patch-src_auth_none_c b/package/libtirpc/patches/patch-src_auth_none_c deleted file mode 100644 index d8fd74f3d..000000000 --- a/package/libtirpc/patches/patch-src_auth_none_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/auth_none.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/auth_none.c 2014-03-22 13:20:53.000000000 +0100 -@@ -31,7 +31,6 @@ - static char *sccsid = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro"; - static char *sccsid = "@(#)auth_none.c 2.1 88/07/29 4.0 RPCSRC"; - #endif --#include <sys/cdefs.h> - __FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.12 2002/03/22 23:18:35 obrien Exp $"); - */ - diff --git a/package/libtirpc/patches/patch-src_auth_time_c b/package/libtirpc/patches/patch-src_auth_time_c deleted file mode 100644 index b6319db96..000000000 --- a/package/libtirpc/patches/patch-src_auth_time_c +++ /dev/null @@ -1,32 +0,0 @@ ---- libtirpc-0.2.3.orig/src/auth_time.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/auth_time.c 2014-03-22 13:20:53.000000000 +0100 -@@ -25,7 +25,6 @@ - * needed to deal with TCP connections. - */ - --#include <sys/cdefs.h> - #include <stdio.h> - #include <syslog.h> - #include <string.h> -@@ -43,7 +42,7 @@ - //#include <clnt_soc.h> - #include <sys/select.h> - #undef NIS --#include <rpcsvc/nis.h> -+//#include <rpcsvc/nis.h> - - - #ifdef TESTING -@@ -138,6 +137,7 @@ free_eps(eps, num) - * NIS+ server will call __rpc_get_time_offset() with the nis_server - * structure already populated. - */ -+#ifdef 0 - static nis_server * - get_server(sin, host, srv, eps, maxep) - struct sockaddr_in *sin; -@@ -491,3 +491,4 @@ error: - - return (time_valid); - } -+#endif diff --git a/package/libtirpc/patches/patch-src_auth_unix_c b/package/libtirpc/patches/patch-src_auth_unix_c deleted file mode 100644 index a1ba7b587..000000000 --- a/package/libtirpc/patches/patch-src_auth_unix_c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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. - */ - --#include <sys/cdefs.h> - - /* - * auth_unix.c, Implements UNIX style authentication parameters. -@@ -45,6 +44,7 @@ - - #include <assert.h> - #include <err.h> -+#include <stdarg.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> diff --git a/package/libtirpc/patches/patch-src_authdes_prot_c b/package/libtirpc/patches/patch-src_authdes_prot_c deleted file mode 100644 index f829ed45e..000000000 --- a/package/libtirpc/patches/patch-src_authdes_prot_c +++ /dev/null @@ -1,7 +0,0 @@ ---- libtirpc-0.2.3.orig/src/authdes_prot.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/authdes_prot.c 2014-03-22 13:20:53.000000000 +0100 -@@ -1,4 +1,3 @@ --#include <sys/cdefs.h> - /* - * Copyright (c) 2009, Sun Microsystems, Inc. - * All rights reserved. diff --git a/package/libtirpc/patches/patch-src_authunix_prot_c b/package/libtirpc/patches/patch-src_authunix_prot_c deleted file mode 100644 index 178436474..000000000 --- a/package/libtirpc/patches/patch-src_authunix_prot_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/authunix_prot.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/authunix_prot.c 2014-03-22 13:20:53.000000000 +0100 -@@ -26,7 +26,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * authunix_prot.c diff --git a/package/libtirpc/patches/patch-src_bindresvport_c b/package/libtirpc/patches/patch-src_bindresvport_c deleted file mode 100644 index 4e828a005..000000000 --- a/package/libtirpc/patches/patch-src_bindresvport_c +++ /dev/null @@ -1,18 +0,0 @@ ---- libtirpc-0.2.3.orig/src/bindresvport.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/bindresvport.c 2014-03-22 13:24:36.000000000 +0100 -@@ -26,7 +26,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * Copyright (c) 1987 by Sun Microsystems, Inc. -@@ -38,6 +37,7 @@ - #include <sys/socket.h> - - #include <netinet/in.h> -+#include <netdb.h> - - #include <errno.h> - #include <string.h> diff --git a/package/libtirpc/patches/patch-src_clnt_bcast_c b/package/libtirpc/patches/patch-src_clnt_bcast_c deleted file mode 100644 index f4776e5b1..000000000 --- a/package/libtirpc/patches/patch-src_clnt_bcast_c +++ /dev/null @@ -1,27 +0,0 @@ ---- 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. - */ --#include <sys/cdefs.h> - - /* - * clnt_bcast.c -@@ -41,7 +40,7 @@ - */ - #include <sys/socket.h> - #include <sys/types.h> --#include <sys/queue.h> -+#include "queue.h" - - #include <net/if.h> - #include <netinet/in.h> -@@ -57,6 +56,7 @@ - #include <arpa/inet.h> - #include <stdio.h> - #include <errno.h> -+#include <stdarg.h> - #include <stdlib.h> - #include <unistd.h> - #include <netdb.h> diff --git a/package/libtirpc/patches/patch-src_clnt_perror_c b/package/libtirpc/patches/patch-src_clnt_perror_c deleted file mode 100644 index 5c3c9169a..000000000 --- a/package/libtirpc/patches/patch-src_clnt_perror_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/clnt_perror.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/clnt_perror.c 2014-03-22 13:20:53.000000000 +0100 -@@ -27,7 +27,6 @@ - */ - - /* --#include <sys/cdefs.h> - */ - /* - * clnt_perror.c diff --git a/package/libtirpc/patches/patch-src_clnt_simple_c b/package/libtirpc/patches/patch-src_clnt_simple_c deleted file mode 100644 index 8db2f1b8e..000000000 --- a/package/libtirpc/patches/patch-src_clnt_simple_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/clnt_simple.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/clnt_simple.c 2014-03-22 13:20:53.000000000 +0100 -@@ -29,7 +29,6 @@ - * Copyright (c) 1986-1991 by Sun Microsystems Inc. - */ - --#include <sys/cdefs.h> - - /* - * clnt_simple.c diff --git a/package/libtirpc/patches/patch-src_crypt_client_c b/package/libtirpc/patches/patch-src_crypt_client_c deleted file mode 100644 index 3768305f8..000000000 --- a/package/libtirpc/patches/patch-src_crypt_client_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/crypt_client.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/crypt_client.c 2014-03-22 13:20:53.000000000 +0100 -@@ -30,7 +30,6 @@ - * SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - #include <err.h> - #include <sys/types.h> diff --git a/package/libtirpc/patches/patch-src_debug_h b/package/libtirpc/patches/patch-src_debug_h deleted file mode 100644 index c6cfa5dc1..000000000 --- a/package/libtirpc/patches/patch-src_debug_h +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 <stdarg.h> - #include <syslog.h> - - 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 deleted file mode 100644 index 6bb81e176..000000000 --- a/package/libtirpc/patches/patch-src_des_crypt_c +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 - #endif --#include <sys/cdefs.h> - - static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * ); - int (*__des_crypt_LOCAL)() = 0; --extern int _des_crypt_call(char *, int, struct desparams *); -+//extern int _des_crypt_call(char *, int, struct desparams *); - /* - * Copy 8 bytes - */ -@@ -145,10 +144,6 @@ common_crypt(key, buf, len, mode, desp) - if (!__des_crypt_LOCAL(buf, len, desp)) { - return (DESERR_HWERROR); - } -- } else { -- if (!_des_crypt_call(buf, len, desp)) { -- return (DESERR_HWERROR); -- } -- } -+ } - return(desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE); - } diff --git a/package/libtirpc/patches/patch-src_des_soft_c b/package/libtirpc/patches/patch-src_des_soft_c deleted file mode 100644 index 675a6a265..000000000 --- a/package/libtirpc/patches/patch-src_des_soft_c +++ /dev/null @@ -1,9 +0,0 @@ ---- libtirpc-0.2.3.orig/src/des_soft.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/des_soft.c 2014-03-22 13:20:53.000000000 +0100 -@@ -1,5 +1,4 @@ --//#include <sys/cdefs.h> -- -+// - /* - * Copyright (c) 2009, Sun Microsystems, Inc. - * All rights reserved. diff --git a/package/libtirpc/patches/patch-src_getnetconfig_c b/package/libtirpc/patches/patch-src_getnetconfig_c deleted file mode 100644 index fb1f285a1..000000000 --- a/package/libtirpc/patches/patch-src_getnetconfig_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/getnetconfig.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/getnetconfig.c 2014-03-22 13:20:53.000000000 +0100 -@@ -32,7 +32,6 @@ - - #include <pthread.h> - #include <reentrant.h> --#include <sys/cdefs.h> - #include <stdio.h> - #include <errno.h> - #include <netconfig.h> diff --git a/package/libtirpc/patches/patch-src_getnetpath_c b/package/libtirpc/patches/patch-src_getnetpath_c deleted file mode 100644 index 73788ea04..000000000 --- a/package/libtirpc/patches/patch-src_getnetpath_c +++ /dev/null @@ -1,16 +0,0 @@ ---- libtirpc-0.2.3.orig/src/getnetpath.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/getnetpath.c 2014-03-22 13:20:53.000000000 +0100 -@@ -25,13 +25,11 @@ - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ --#include <sys/cdefs.h> - - /* - * Copyright (c) 1989 by Sun Microsystems, Inc. - */ - --#include <sys/cdefs.h> - #include <stdio.h> - #include <errno.h> - #include <netconfig.h> diff --git a/package/libtirpc/patches/patch-src_getpeereid_c b/package/libtirpc/patches/patch-src_getpeereid_c deleted file mode 100644 index 1af375563..000000000 --- a/package/libtirpc/patches/patch-src_getpeereid_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/getpeereid.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/getpeereid.c 2014-03-22 13:20:52.000000000 +0100 -@@ -24,7 +24,6 @@ - * SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - #include <sys/param.h> - #include <sys/socket.h> diff --git a/package/libtirpc/patches/patch-src_getpublickey_c b/package/libtirpc/patches/patch-src_getpublickey_c deleted file mode 100644 index a41eca54a..000000000 --- a/package/libtirpc/patches/patch-src_getpublickey_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/getpublickey.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/getpublickey.c 2014-03-22 13:20:53.000000000 +0100 -@@ -26,7 +26,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - /* --#include <sys/cdefs.h> - */ - - /* diff --git a/package/libtirpc/patches/patch-src_getrpcent_c b/package/libtirpc/patches/patch-src_getrpcent_c deleted file mode 100644 index 8e213ae54..000000000 --- a/package/libtirpc/patches/patch-src_getrpcent_c +++ /dev/null @@ -1,41 +0,0 @@ ---- libtirpc-0.2.4.orig/src/getrpcent.c 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/src/getrpcent.c 2014-05-18 08:04:03.462885748 +0200 -@@ -50,6 +50,10 @@ - #include <libc_private.h> - #endif - -+#if HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - /* - * Internet version. - */ -@@ -89,7 +93,7 @@ _rpcdata() - return (d); - } - --#ifdef GQ -+#if !HAVE_GETRPCBYNYMBER - struct rpcent * - getrpcbynumber(number) - int number; -@@ -135,7 +139,9 @@ no_yp: - endrpcent(); - return (p); - } -+#endif /* !HAVE_GETRPCBYNUMBER */ - -+#if !HAVE_GETRPCBYNAME - struct rpcent * - getrpcbyname(name) - const char *name; -@@ -158,7 +164,7 @@ done: - endrpcent(); - return (rpc); - } --#endif /* GQ */ -+#endif /* !HAVE_GETRPCBYNAME */ - - void - setrpcent(f) diff --git a/package/libtirpc/patches/patch-src_key_call_c b/package/libtirpc/patches/patch-src_key_call_c deleted file mode 100644 index f7e7fb44d..000000000 --- a/package/libtirpc/patches/patch-src_key_call_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/key_call.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/key_call.c 2014-03-22 13:20:52.000000000 +0100 -@@ -30,7 +30,6 @@ - */ - - --#include <sys/cdefs.h> - - /* - * key_call.c, Interface to keyserver diff --git a/package/libtirpc/patches/patch-src_key_prot_xdr_c b/package/libtirpc/patches/patch-src_key_prot_xdr_c deleted file mode 100644 index 5dcf3f0f8..000000000 --- a/package/libtirpc/patches/patch-src_key_prot_xdr_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/key_prot_xdr.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/key_prot_xdr.c 2014-03-22 13:20:53.000000000 +0100 -@@ -33,7 +33,6 @@ - */ - /* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ - --#include <sys/cdefs.h> - - /* - * Compiled from key_prot.x using rpcgen. diff --git a/package/libtirpc/patches/patch-src_mt_misc_c b/package/libtirpc/patches/patch-src_mt_misc_c deleted file mode 100644 index 27e711159..000000000 --- a/package/libtirpc/patches/patch-src_mt_misc_c +++ /dev/null @@ -1,8 +0,0 @@ ---- libtirpc-0.2.3.orig/src/mt_misc.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/mt_misc.c 2014-03-22 13:20:53.000000000 +0100 -@@ -1,5 +1,4 @@ - --#include <sys/cdefs.h> - #include <pthread.h> - #include <reentrant.h> - #include <rpc/rpc.h> diff --git a/package/libtirpc/patches/patch-src_pmap_clnt_c b/package/libtirpc/patches/patch-src_pmap_clnt_c deleted file mode 100644 index 30b5deb86..000000000 --- a/package/libtirpc/patches/patch-src_pmap_clnt_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/pmap_clnt.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/pmap_clnt.c 2014-03-22 13:20:53.000000000 +0100 -@@ -26,7 +26,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * pmap_clnt.c diff --git a/package/libtirpc/patches/patch-src_pmap_getmaps_c b/package/libtirpc/patches/patch-src_pmap_getmaps_c deleted file mode 100644 index 1d9c984be..000000000 --- a/package/libtirpc/patches/patch-src_pmap_getmaps_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/pmap_getmaps.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/pmap_getmaps.c 2014-03-22 13:20:53.000000000 +0100 -@@ -26,7 +26,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * pmap_getmap.c diff --git a/package/libtirpc/patches/patch-src_rpc_com_h b/package/libtirpc/patches/patch-src_rpc_com_h deleted file mode 100644 index c327a0152..000000000 --- a/package/libtirpc/patches/patch-src_rpc_com_h +++ /dev/null @@ -1,31 +0,0 @@ ---- libtirpc-0.2.3.orig/src/rpc_com.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/rpc_com.h 2014-03-22 13:20:53.000000000 +0100 -@@ -40,7 +40,6 @@ - #ifndef _TIRPC_RPCCOM_H - #define _TIRPC_RPCCOM_H - --#include <sys/cdefs.h> - - /* #pragma ident "@(#)rpc_com.h 1.11 93/07/05 SMI" */ - -@@ -54,7 +53,9 @@ - #define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \ - (u_int32_t)(now)->tv_usec) - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern u_int __rpc_get_a_size(int); - extern int __rpc_dtbsize(void); - extern struct netconfig * __rpcgettp(int); -@@ -90,6 +91,8 @@ void __xprt_set_raddr(SVCXPRT *, const s - SVCXPRT **__svc_xports; - int __svc_maxrec; - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _TIRPC_RPCCOM_H */ diff --git a/package/libtirpc/patches/patch-src_rpc_generic_c b/package/libtirpc/patches/patch-src_rpc_generic_c deleted file mode 100644 index aa567ce27..000000000 --- a/package/libtirpc/patches/patch-src_rpc_generic_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/rpc_generic.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/rpc_generic.c 2014-03-22 13:20:53.000000000 +0100 -@@ -29,7 +29,6 @@ - * Copyright (c) 1986-1991 by Sun Microsystems Inc. - */ - --#include <sys/cdefs.h> - - /* - * rpc_generic.c, Miscl routines for RPC. diff --git a/package/libtirpc/patches/patch-src_rpc_soc_c b/package/libtirpc/patches/patch-src_rpc_soc_c deleted file mode 100644 index c671b9085..000000000 --- a/package/libtirpc/patches/patch-src_rpc_soc_c +++ /dev/null @@ -1,40 +0,0 @@ ---- 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"); - } - --/* -- * Create the client des authentication object. Obsoleted by -- * authdes_seccreate(). -- */ --AUTH * --authdes_create(servername, window, syncaddr, ckey) -- char *servername; /* network name of server */ -- u_int window; /* time to live */ -- struct sockaddr *syncaddr; /* optional hostaddr to sync with */ -- des_block *ckey; /* optional conversation key to use */ --{ -- AUTH *dummy; -- AUTH *nauth; -- char hostname[NI_MAXHOST]; -- -- if (syncaddr) { -- /* -- * Change addr to hostname, because that is the way -- * new interface takes it. -- */ -- if (getnameinfo(syncaddr, sizeof(syncaddr), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- -- nauth = authdes_seccreate(servername, window, hostname, ckey); -- return (nauth); -- } --fallback: -- dummy = authdes_seccreate(servername, window, NULL, ckey); -- return (dummy); --} - - /* - * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() diff --git a/package/libtirpc/patches/patch-src_rpcb_st_xdr_c b/package/libtirpc/patches/patch-src_rpcb_st_xdr_c deleted file mode 100644 index 30eeeee9d..000000000 --- a/package/libtirpc/patches/patch-src_rpcb_st_xdr_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/rpcb_st_xdr.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/rpcb_st_xdr.c 2014-03-22 13:20:53.000000000 +0100 -@@ -35,7 +35,6 @@ - * routines used with the rpcbind stats facility. - */ - --#include <sys/cdefs.h> - - #include <rpc/rpc.h> - diff --git a/package/libtirpc/patches/patch-src_rpcdname_c b/package/libtirpc/patches/patch-src_rpcdname_c deleted file mode 100644 index b66b0a46f..000000000 --- a/package/libtirpc/patches/patch-src_rpcdname_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/rpcdname.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/rpcdname.c 2014-03-22 13:20:53.000000000 +0100 -@@ -25,7 +25,6 @@ - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ --#include <sys/cdefs.h> - - /* - * rpcdname.c diff --git a/package/libtirpc/patches/patch-src_svc_dg_c b/package/libtirpc/patches/patch-src_svc_dg_c deleted file mode 100644 index 88622d951..000000000 --- a/package/libtirpc/patches/patch-src_svc_dg_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/svc_dg.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/svc_dg.c 2014-03-22 13:20:52.000000000 +0100 -@@ -31,7 +31,6 @@ - * Copyright (c) 1986-1991 by Sun Microsystems Inc. - */ - --#include <sys/cdefs.h> - - /* - * svc_dg.c, Server side for connectionless RPC. diff --git a/package/libtirpc/patches/patch-src_svc_simple_c b/package/libtirpc/patches/patch-src_svc_simple_c deleted file mode 100644 index ed994e4f5..000000000 --- a/package/libtirpc/patches/patch-src_svc_simple_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/svc_simple.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/svc_simple.c 2014-03-22 13:20:53.000000000 +0100 -@@ -29,7 +29,6 @@ - * Copyright (c) 1986-1991 by Sun Microsystems Inc. - */ - --#include <sys/cdefs.h> - - /* - * svc_simple.c diff --git a/package/libtirpc/patches/patch-src_svc_vc_c b/package/libtirpc/patches/patch-src_svc_vc_c deleted file mode 100644 index 8e43f4b8d..000000000 --- a/package/libtirpc/patches/patch-src_svc_vc_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/svc_vc.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/svc_vc.c 2014-03-22 13:20:53.000000000 +0100 -@@ -27,7 +27,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * svc_vc.c, Server side for Connection Oriented based RPC. diff --git a/package/libtirpc/patches/patch-src_xdr_array_c b/package/libtirpc/patches/patch-src_xdr_array_c deleted file mode 100644 index dfa17d673..000000000 --- a/package/libtirpc/patches/patch-src_xdr_array_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/xdr_array.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/xdr_array.c 2014-03-22 13:20:53.000000000 +0100 -@@ -27,7 +27,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * xdr_array.c, Generic XDR routines impelmentation. diff --git a/package/libtirpc/patches/patch-src_xdr_c b/package/libtirpc/patches/patch-src_xdr_c deleted file mode 100644 index 22211757b..000000000 --- a/package/libtirpc/patches/patch-src_xdr_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/xdr.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/xdr.c 2014-03-22 13:20:53.000000000 +0100 -@@ -26,7 +26,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * xdr.c, Generic XDR routines implementation. diff --git a/package/libtirpc/patches/patch-src_xdr_float_c b/package/libtirpc/patches/patch-src_xdr_float_c deleted file mode 100644 index db18981e1..000000000 --- a/package/libtirpc/patches/patch-src_xdr_float_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/xdr_float.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/xdr_float.c 2014-03-22 13:20:53.000000000 +0100 -@@ -27,7 +27,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * xdr_float.c, Generic XDR routines implementation. diff --git a/package/libtirpc/patches/patch-src_xdr_mem_c b/package/libtirpc/patches/patch-src_xdr_mem_c deleted file mode 100644 index 670bba01e..000000000 --- a/package/libtirpc/patches/patch-src_xdr_mem_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/xdr_mem.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/xdr_mem.c 2014-03-22 13:20:53.000000000 +0100 -@@ -26,7 +26,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * xdr_mem.h, XDR implementation using memory buffers. diff --git a/package/libtirpc/patches/patch-src_xdr_rec_c b/package/libtirpc/patches/patch-src_xdr_rec_c deleted file mode 100644 index f4a2672d3..000000000 --- a/package/libtirpc/patches/patch-src_xdr_rec_c +++ /dev/null @@ -1,11 +0,0 @@ ---- libtirpc-0.2.3.orig/src/xdr_rec.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/xdr_rec.c 2014-03-22 13:20:53.000000000 +0100 -@@ -27,8 +27,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> --#include <sys/cdefs.h> - - /* - * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking" diff --git a/package/libtirpc/patches/patch-src_xdr_reference_c b/package/libtirpc/patches/patch-src_xdr_reference_c deleted file mode 100644 index a0b284380..000000000 --- a/package/libtirpc/patches/patch-src_xdr_reference_c +++ /dev/null @@ -1,11 +0,0 @@ ---- libtirpc-0.2.3.orig/src/xdr_reference.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/xdr_reference.c 2014-03-22 13:20:53.000000000 +0100 -@@ -26,8 +26,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> --#include <sys/cdefs.h> - - /* - * xdr_reference.c, Generic XDR routines impelmentation. diff --git a/package/libtirpc/patches/patch-src_xdr_sizeof_c b/package/libtirpc/patches/patch-src_xdr_sizeof_c deleted file mode 100644 index 6d6ebcea6..000000000 --- a/package/libtirpc/patches/patch-src_xdr_sizeof_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.4.orig/src/xdr_sizeof.c 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/src/xdr_sizeof.c 2014-05-10 17:56:08.694483175 +0200 -@@ -34,7 +34,6 @@ - * when serialized using XDR. - */ - --#include <sys/cdefs.h> - - #include <rpc/types.h> - #include <rpc/xdr.h> diff --git a/package/libtirpc/patches/patch-src_xdr_stdio_c b/package/libtirpc/patches/patch-src_xdr_stdio_c deleted file mode 100644 index 90dabf120..000000000 --- a/package/libtirpc/patches/patch-src_xdr_stdio_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libtirpc-0.2.3.orig/src/xdr_stdio.c 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/src/xdr_stdio.c 2014-03-22 13:20:53.000000000 +0100 -@@ -26,7 +26,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include <sys/cdefs.h> - - /* - * xdr_stdio.c, XDR implementation on standard i/o file. diff --git a/package/libtirpc/patches/patch-tirpc_netconfig_h b/package/libtirpc/patches/patch-tirpc_netconfig_h deleted file mode 100644 index 0aeb7ea0d..000000000 --- a/package/libtirpc/patches/patch-tirpc_netconfig_h +++ /dev/null @@ -1,33 +0,0 @@ ---- libtirpc-0.2.4.orig/tirpc/netconfig.h 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/tirpc/netconfig.h 2014-09-28 20:59:27.000000000 +0200 -@@ -1,7 +1,9 @@ - #ifndef _NETCONFIG_H_ - #define _NETCONFIG_H_ - -+#ifndef __APPLE__ - #include <features.h> -+#endif - - #define NETCONFIG "/etc/netconfig" - #define NETPATH "NETPATH" -@@ -74,7 +76,9 @@ typedef struct { - #define NC_UDP "udp" - #define NC_ICMP "icmp" - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - extern void *setnetconfig (void); - extern struct netconfig *getnetconfig (void *); -@@ -89,6 +93,8 @@ extern int endnetpath (void *); - extern void nc_perror (const char *); - extern char *nc_sperror (void); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _NETCONFIG_H_ */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_auth_des_h b/package/libtirpc/patches/patch-tirpc_rpc_auth_des_h deleted file mode 100644 index c072f8871..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_auth_des_h +++ /dev/null @@ -1,32 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/auth_des.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/auth_des.h 2014-03-22 13:20:52.000000000 +0100 -@@ -114,17 +114,25 @@ struct authdes_verf { - * Map a des credential into a unix cred. - * - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern int authdes_getucred( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * ); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t xdr_authdes_cred(XDR *, struct authdes_cred *); - extern bool_t xdr_authdes_verf(XDR *, struct authdes_verf *); - extern int rtime(dev_t, struct netbuf *, int, struct timeval *, - struct timeval *); - extern void kgetnetname(char *); - extern enum auth_stat _svcauth_des(struct svc_req *, struct rpc_msg *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* ndef _TI_AUTH_DES_ */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_auth_gss_h b/package/libtirpc/patches/patch-tirpc_rpc_auth_gss_h deleted file mode 100644 index 2d1a07987..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_auth_gss_h +++ /dev/null @@ -1,53 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/auth_gss.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/auth_gss.h 2014-03-22 13:20:52.000000000 +0100 -@@ -104,28 +104,32 @@ struct rpc_gss_init_res { - #define MAXSEQ 0x80000000 - - /* Prototypes. */ --__BEGIN_DECLS --bool_t xdr_rpc_gss_cred __P((XDR *xdrs, struct rpc_gss_cred *p)); --bool_t xdr_rpc_gss_init_args __P((XDR *xdrs, gss_buffer_desc *p)); --bool_t xdr_rpc_gss_init_res __P((XDR *xdrs, struct rpc_gss_init_res *p)); --bool_t xdr_rpc_gss_data __P((XDR *xdrs, xdrproc_t xdr_func, -+#ifdef __cplusplus -+extern "C" { -+#endif -+bool_t xdr_rpc_gss_cred (XDR *xdrs, struct rpc_gss_cred *p); -+bool_t xdr_rpc_gss_init_args (XDR *xdrs, gss_buffer_desc *p); -+bool_t xdr_rpc_gss_init_res (XDR *xdrs, struct rpc_gss_init_res *p); -+bool_t xdr_rpc_gss_data (XDR *xdrs, xdrproc_t xdr_func, - caddr_t xdr_ptr, gss_ctx_id_t ctx, - gss_qop_t qop, rpc_gss_svc_t svc, -- u_int seq)); -+ u_int seq); - --AUTH *authgss_create __P((CLIENT *, gss_name_t, -- struct rpc_gss_sec *)); --AUTH *authgss_create_default __P((CLIENT *, char *, struct rpc_gss_sec *)); --bool_t authgss_service __P((AUTH *auth, int svc)); --bool_t authgss_get_private_data __P((AUTH *auth, -- struct authgss_private_data *)); --bool_t authgss_free_private_data __P((struct authgss_private_data *)); -+AUTH *authgss_create (CLIENT *, gss_name_t, -+ struct rpc_gss_sec *); -+AUTH *authgss_create_default (CLIENT *, char *, struct rpc_gss_sec *); -+bool_t authgss_service (AUTH *auth, int svc); -+bool_t authgss_get_private_data (AUTH *auth, -+ struct authgss_private_data *); -+bool_t authgss_free_private_data (struct authgss_private_data *); - --void gss_log_debug __P((const char *fmt, ...)); --void gss_log_status __P((char *m, OM_uint32 major, -- OM_uint32 minor)); --void gss_log_hexdump __P((const u_char *buf, int len, int offset)); -+void gss_log_debug (const char *fmt, ...); -+void gss_log_status (char *m, OM_uint32 major, -+ OM_uint32 minor); -+void gss_log_hexdump (const u_char *buf, int len, int offset); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_TIRPC_AUTH_GSS_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_auth_unix_h b/package/libtirpc/patches/patch-tirpc_rpc_auth_unix_h deleted file mode 100644 index a0c70ece5..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_auth_unix_h +++ /dev/null @@ -1,26 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/auth_unix.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/auth_unix.h 2014-03-22 13:20:52.000000000 +0100 -@@ -45,7 +45,6 @@ - - #ifndef _TIRPC_AUTH_UNIX_H - #define _TIRPC_AUTH_UNIX_H --#include <sys/cdefs.h> - - /* The machine name is part of a credential; it may not exceed 255 bytes */ - #define MAX_MACHINE_NAME 255 -@@ -67,9 +66,13 @@ struct authunix_parms { - - #define authsys_parms authunix_parms - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t xdr_authunix_parms(XDR *, struct authunix_parms *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * If a response verifier has flavor AUTH_SHORT, diff --git a/package/libtirpc/patches/patch-tirpc_rpc_clnt_h b/package/libtirpc/patches/patch-tirpc_rpc_clnt_h deleted file mode 100644 index ddd1f73ae..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_clnt_h +++ /dev/null @@ -1,132 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/clnt.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/clnt.h 2014-03-22 13:20:52.000000000 +0100 -@@ -42,7 +42,6 @@ - #include <rpc/clnt_stat.h> - #include <rpc/auth.h> - --#include <sys/cdefs.h> - #include <netconfig.h> - #include <sys/un.h> - -@@ -267,7 +266,9 @@ struct rpc_timers { - * Generic client creation routine. Supported protocols are those that - * belong to the nettype namespace (/etc/netconfig). - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern CLIENT *clnt_create(const char *, const rpcprog_t, const rpcvers_t, - const char *); - /* -@@ -414,32 +415,46 @@ extern CLIENT *clnt_dg_create(const int, - */ - extern CLIENT *clnt_raw_create(rpcprog_t, rpcvers_t); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - - /* - * Print why creation failed - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void clnt_pcreateerror(const char *); /* stderr */ - extern char *clnt_spcreateerror(const char *); /* string */ --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Like clnt_perror(), but is more verbose in its output - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void clnt_perrno(enum clnt_stat); /* stderr */ - extern char *clnt_sperrno(enum clnt_stat); /* string */ --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Print an English error message, given the client error code - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void clnt_perror(CLIENT *, const char *); /* stderr */ - extern char *clnt_sperror(CLIENT *, const char *); /* string */ --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - - /* -@@ -450,9 +465,13 @@ struct rpc_createerr { - struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */ - }; - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern struct rpc_createerr *__rpc_createerr(void); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - #define get_rpc_createerr() (*(__rpc_createerr())) - #define rpc_createerr (*(__rpc_createerr())) - -@@ -469,12 +488,16 @@ __END_DECLS - * char *out; - * const char *nettype; - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern enum clnt_stat rpc_call(const char *, const rpcprog_t, - const rpcvers_t, const rpcproc_t, - const xdrproc_t, const char *, - const xdrproc_t, char *, const char *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * RPC broadcast interface -@@ -522,7 +545,9 @@ __END_DECLS - - typedef bool_t (*resultproc_t)(caddr_t, ...); - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t, - const rpcproc_t, const xdrproc_t, - caddr_t, const xdrproc_t, caddr_t, -@@ -532,7 +557,9 @@ extern enum clnt_stat rpc_broadcast_exp( - caddr_t, const xdrproc_t, caddr_t, - const resultproc_t, const int, - const int, const char *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* For backward compatibility */ - #include <rpc/clnt_soc.h> diff --git a/package/libtirpc/patches/patch-tirpc_rpc_clnt_soc_h b/package/libtirpc/patches/patch-tirpc_rpc_clnt_soc_h deleted file mode 100644 index 3112aeee5..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_clnt_soc_h +++ /dev/null @@ -1,78 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/clnt_soc.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/clnt_soc.h 2014-03-22 13:20:52.000000000 +0100 -@@ -46,7 +46,6 @@ - * with TS-RPC. - */ - --#include <sys/cdefs.h> - - #define UDPMSGSIZE 8800 /* rpc imposed limit on udp msg size */ - -@@ -61,27 +60,39 @@ - * u_int sendsz; - * u_int recvsz; - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *, - u_int, u_int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Raw (memory) rpc. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern CLIENT *clntraw_create(u_long, u_long); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - - /* - IPv6 socket version - */ - #ifdef INET6 --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern CLIENT *clnttcp6_create(struct sockaddr_in6 *, u_long, u_long, int *, - u_int, u_int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - #endif - - /* -@@ -105,7 +116,9 @@ __END_DECLS - * u_int sendsz; - * u_int recvsz; - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long, - struct timeval, int *); - extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long, -@@ -116,7 +129,9 @@ extern CLIENT *clntudp6_create(struct so - extern CLIENT *clntudp6_bufcreate(struct sockaddr_in6 *, u_long, u_long, - struct timeval, int *, u_int, u_int); - #endif --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - - #endif /* _RPC_CLNT_SOC_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_des_crypt_h b/package/libtirpc/patches/patch-tirpc_rpc_des_crypt_h deleted file mode 100644 index d55657f95..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_des_crypt_h +++ /dev/null @@ -1,52 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/des_crypt.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/des_crypt.h 2014-03-22 13:20:52.000000000 +0100 -@@ -43,7 +43,6 @@ - #ifndef _DES_DES_CRYPT_H - #define _DES_DES_CRYPT_H - --#include <sys/cdefs.h> - #include <rpc/rpc.h> - - #define DES_MAXDATA 8192 /* max bytes encrypted in one call */ -@@ -83,23 +82,35 @@ - /* - * Cipher Block Chaining mode - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - int cbc_crypt( char *, char *, unsigned int, unsigned int, char *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Electronic Code Book mode - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - int ecb_crypt( char *, char *, unsigned int, unsigned int ); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Set des parity for a key. - * DES parity is odd and in the low bit of each byte - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - void des_setparity( char *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _DES_DES_CRYPT_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_nettype_h b/package/libtirpc/patches/patch-tirpc_rpc_nettype_h deleted file mode 100644 index 60759caad..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_nettype_h +++ /dev/null @@ -1,20 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/nettype.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/nettype.h 2014-03-22 13:20:52.000000000 +0100 -@@ -53,11 +53,15 @@ - #define _RPC_TCP 7 - #define _RPC_UDP 8 - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void *__rpc_setconf(const char *); - extern void __rpc_endconf(void *); - extern struct netconfig *__rpc_getconf(void *); - extern struct netconfig *__rpc_getconfip(const char *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_TIRPC_NETTYPE_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_pmap_clnt_h b/package/libtirpc/patches/patch-tirpc_rpc_pmap_clnt_h deleted file mode 100644 index 7fda59939..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_pmap_clnt_h +++ /dev/null @@ -1,25 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/pmap_clnt.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/pmap_clnt.h 2014-03-22 13:20:52.000000000 +0100 -@@ -63,9 +63,10 @@ - - #ifndef _RPC_PMAP_CLNT_H_ - #define _RPC_PMAP_CLNT_H_ --#include <sys/cdefs.h> - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t pmap_set(u_long, u_long, int, int); - extern bool_t pmap_unset(u_long, u_long); - extern struct pmaplist *pmap_getmaps(struct sockaddr_in *); -@@ -80,6 +81,8 @@ extern enum clnt_stat clnt_broadcast(u_l - resultproc_t); - extern u_short pmap_getport(struct sockaddr_in *, - u_long, u_long, u_int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_RPC_PMAP_CLNT_H_ */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_pmap_prot_h b/package/libtirpc/patches/patch-tirpc_rpc_pmap_prot_h deleted file mode 100644 index 891991b98..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_pmap_prot_h +++ /dev/null @@ -1,27 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/pmap_prot.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/pmap_prot.h 2014-03-22 13:20:52.000000000 +0100 -@@ -71,7 +71,6 @@ - - #ifndef _RPC_PMAP_PROT_H - #define _RPC_PMAP_PROT_H --#include <sys/cdefs.h> - - #define PMAPPORT ((u_short)111) - #define PMAPPROG ((u_long)100000) -@@ -97,10 +96,14 @@ struct pmaplist { - struct pmaplist *pml_next; - }; - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t xdr_pmap(XDR *, struct pmap *); - extern bool_t xdr_pmaplist(XDR *, struct pmaplist **); - extern bool_t xdr_pmaplist_ptr(XDR *, struct pmaplist *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_RPC_PMAP_PROT_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_pmap_rmt_h b/package/libtirpc/patches/patch-tirpc_rpc_pmap_rmt_h deleted file mode 100644 index 98a494105..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_pmap_rmt_h +++ /dev/null @@ -1,26 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/pmap_rmt.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/pmap_rmt.h 2014-03-22 13:20:52.000000000 +0100 -@@ -41,7 +41,6 @@ - - #ifndef _RPC_PMAP_RMT_H - #define _RPC_PMAP_RMT_H --#include <sys/cdefs.h> - - struct rmtcallargs { - u_long prog, vers, proc, arglen; -@@ -56,9 +55,13 @@ struct rmtcallres { - xdrproc_t xdr_results; - }; - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t xdr_rmtcall_args(XDR *, struct rmtcallargs *); - extern bool_t xdr_rmtcallres(XDR *, struct rmtcallres *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_RPC_PMAP_RMT_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_rpc_com_h b/package/libtirpc/patches/patch-tirpc_rpc_rpc_com_h deleted file mode 100644 index 59f0283d3..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_rpc_com_h +++ /dev/null @@ -1,31 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/rpc_com.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/rpc_com.h 2014-03-22 13:20:52.000000000 +0100 -@@ -41,7 +41,6 @@ - #ifndef _RPC_RPCCOM_H - #define _RPC_RPCCOM_H - --#include <sys/cdefs.h> - - /* #pragma ident "@(#)rpc_com.h 1.11 93/07/05 SMI" */ - -@@ -55,7 +54,9 @@ - #define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \ - (u_int32_t)(now)->tv_usec) - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern u_int __rpc_get_a_size(int); - extern int __rpc_dtbsize(void); - extern int _rpc_dtablesize(void); -@@ -77,6 +78,8 @@ bool_t rpc_control(int,void *); - - char *_get_next_token(char *, int); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* _RPC_RPCCOM_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_rpc_h b/package/libtirpc/patches/patch-tirpc_rpc_rpc_h deleted file mode 100644 index bdfad8563..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_rpc_h +++ /dev/null @@ -1,44 +0,0 @@ ---- 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 - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern int get_myaddress(struct sockaddr_in *); --extern int bindresvport(int, struct sockaddr_in *) __THROW; -+extern int bindresvport(int, struct sockaddr_in *); - 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 - - struct sockaddr; - extern int bindresvport_sa(int, struct sockaddr *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * The following are not exported interfaces, they are for internal library - * and rpcbind use only. Do not use, they may change without notice. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - int __rpc_nconf2fd(const struct netconfig *); - int __rpc_nconf2fd_flags(const struct netconfig *, int); - int __rpc_nconf2sockinfo(const struct netconfig *, struct __rpc_sockinfo *); - int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *); - u_int __rpc_get_t_size(int, int, int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_RPC_RPC_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h b/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h deleted file mode 100644 index 5e16c2dd6..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_rpc_msg_h +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - /* - * XDR routine to handle a rpc message. - * xdr_callmsg(xdrs, cmsg) -@@ -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 *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_TIRPC_RPC_MSG_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_rpcb_clnt_h b/package/libtirpc/patches/patch-tirpc_rpc_rpcb_clnt_h deleted file mode 100644 index b0bc44ae6..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_rpcb_clnt_h +++ /dev/null @@ -1,23 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/rpcb_clnt.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/rpcb_clnt.h 2014-03-22 13:20:52.000000000 +0100 -@@ -59,7 +59,9 @@ - - #include <rpc/types.h> - #include <rpc/rpcb_prot.h> --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t rpcb_set(const rpcprog_t, const rpcvers_t, - const struct netconfig *, const struct netbuf *); - extern bool_t rpcb_unset(const rpcprog_t, const rpcvers_t, -@@ -78,6 +80,8 @@ extern bool_t rpcb_getaddr(const rpcprog - extern bool_t rpcb_gettime(const char *, time_t *); - extern char *rpcb_taddr2uaddr(struct netconfig *, struct netbuf *); - extern struct netbuf *rpcb_uaddr2taddr(struct netconfig *, char *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_RPC_RPCB_CLNT_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_rpcent_h b/package/libtirpc/patches/patch-tirpc_rpc_rpcent_h index 520442cf4..73c8ef727 100644 --- a/package/libtirpc/patches/patch-tirpc_rpc_rpcent_h +++ b/package/libtirpc/patches/patch-tirpc_rpc_rpcent_h @@ -1,31 +1,14 @@ ---- libtirpc-0.2.4.orig/tirpc/rpc/rpcent.h 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/tirpc/rpc/rpcent.h 2014-06-30 12:14:11.114614896 +0200 -@@ -44,10 +44,12 @@ - /* #pragma ident "@(#)rpcent.h 1.13 94/04/25 SMI" */ - /* @(#)rpcent.h 1.1 88/12/06 SMI */ - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif +--- libtirpc-0.3.1.orig/tirpc/rpc/rpcent.h 2015-06-01 14:13:24.000000000 +0200 ++++ libtirpc-0.3.1/tirpc/rpc/rpcent.h 2015-06-17 22:09:32.000000000 +0200 +@@ -48,8 +48,9 @@ + extern "C" { + #endif - /* These are defined in /usr/include/rpc/netdb.h */ --#if 0 -+#if !defined(__GLIBC__) || defined(__UCLIBC__) +-/* These are defined in /usr/include/rpc/netdb.h */ +-#if !defined(__GLIBC__) ++/* 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__) struct rpcent { char *r_name; /* name of server for this rpc program */ char **r_aliases; /* alias list */ -@@ -60,8 +62,10 @@ extern struct rpcent *getrpcbynumber(int - extern struct rpcent *getrpcent(void); - #endif - --extern void setrpcent(int) __THROW; --extern void endrpcent(void) __THROW; --__END_DECLS -+extern void setrpcent(int); -+extern void endrpcent(void); -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_RPC_CENT_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_svc_h b/package/libtirpc/patches/patch-tirpc_rpc_svc_h deleted file mode 100644 index 28b6e32d0..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_svc_h +++ /dev/null @@ -1,152 +0,0 @@ ---- 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 - #define _TIRPC_SVC_H --#include <sys/cdefs.h> - - /* - * This interface must manage two items concerning remote procedure calling: -@@ -200,11 +199,15 @@ struct svc_req { - * const struct netconfig *nconf; - */ - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t, - void (*)(struct svc_req *, SVCXPRT *), - const struct netconfig *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Service un-registration -@@ -214,9 +217,13 @@ __END_DECLS - * const rpcvers_t vers; - */ - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void svc_unreg(const rpcprog_t, const rpcvers_t); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Transport registration. -@@ -224,9 +231,13 @@ __END_DECLS - * xprt_register(xprt) - * SVCXPRT *xprt; - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void xprt_register(SVCXPRT *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Transport un-register -@@ -234,9 +245,13 @@ __END_DECLS - * xprt_unregister(xprt) - * SVCXPRT *xprt; - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void xprt_unregister(SVCXPRT *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - - /* -@@ -265,7 +280,9 @@ __END_DECLS - * deadlock the caller and server processes! - */ - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t svc_sendreply(SVCXPRT *, xdrproc_t, void *); - extern void svcerr_decode(SVCXPRT *); - extern void svcerr_weakauth(SVCXPRT *); -@@ -277,7 +294,9 @@ extern void svcerr_systemerr(SVCXPRT *); - extern int rpc_reg(rpcprog_t, rpcvers_t, rpcproc_t, - char *(*)(char *), xdrproc_t, xdrproc_t, - char *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Lowest level dispatching -OR- who owns this process anyway. -@@ -306,11 +325,17 @@ extern int svc_fds; - * a small program implemented by the svc_rpc implementation itself; - * also see clnt.h for protocol numbers. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void rpctest_service(void); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void svc_getreq(int); - extern void svc_getreqset(fd_set *); - extern void svc_getreq_common(int); -@@ -319,7 +344,9 @@ extern void svc_getreq_poll(struct pollf - - extern void svc_run(void); - extern void svc_exit(void); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Socket to use on svcxxx_create call to get default socket -@@ -331,7 +358,9 @@ __END_DECLS - * These are the existing service side transport implementations - */ - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - /* - * Transport independent svc_create routine. - */ -@@ -427,7 +456,9 @@ int svc_dg_enablecache(SVCXPRT *, const - - int __rpc_get_local_uid(SVCXPRT *_transp, uid_t *_uid); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - - /* for backward compatibility */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_svc_soc_h b/package/libtirpc/patches/patch-tirpc_rpc_svc_soc_h deleted file mode 100644 index 9f7c22259..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_svc_soc_h +++ /dev/null @@ -1,102 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpc/svc_soc.h 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpc/svc_soc.h 2014-03-22 13:20:52.000000000 +0100 -@@ -38,7 +38,6 @@ - - #ifndef _RPC_SVC_SOC_H - #define _RPC_SVC_SOC_H --#include <sys/cdefs.h> - - /* #pragma ident "@(#)svc_soc.h 1.11 94/04/25 SMI" */ - /* svc_soc.h 1.8 89/05/01 SMI */ -@@ -64,10 +63,14 @@ - * void (*dispatch)(); - * int protocol; like TCP or UDP, zero means do not register - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t svc_register(SVCXPRT *, u_long, u_long, - void (*)(struct svc_req *, SVCXPRT *), int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Service un-registration -@@ -76,44 +79,64 @@ __END_DECLS - * u_long prog; - * u_long vers; - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern void svc_unregister(u_long, u_long); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - - /* - * Memory based rpc for testing and timing. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern SVCXPRT *svcraw_create(void); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - - /* - * Udp based rpc. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern SVCXPRT *svcudp_create(int); - extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int); - extern int svcudp_enablecache(SVCXPRT *, u_long); - extern SVCXPRT *svcudp6_create(int); - extern SVCXPRT *svcudp6_bufcreate(int, u_int, u_int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - - /* - * Tcp based rpc. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern SVCXPRT *svctcp_create(int, u_int, u_int); - extern SVCXPRT *svctcp6_create(int, u_int, u_int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Fd based rpc. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern SVCXPRT *svcfd_create(int, u_int, u_int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_RPC_SVC_SOC_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpc_xdr_h b/package/libtirpc/patches/patch-tirpc_rpc_xdr_h deleted file mode 100644 index beef7ca4b..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpc_xdr_h +++ /dev/null @@ -1,53 +0,0 @@ ---- libtirpc-0.2.4.orig/tirpc/rpc/xdr.h 2013-12-09 21:59:51.000000000 +0100 -+++ libtirpc-0.2.4/tirpc/rpc/xdr.h 2014-05-10 17:56:08.818483343 +0200 -@@ -40,7 +40,6 @@ - - #ifndef _TIRPC_XDR_H - #define _TIRPC_XDR_H --#include <sys/cdefs.h> - #include <stdio.h> - #include <netinet/in.h> - -@@ -287,7 +286,9 @@ struct xdr_discrim { - /* - * These are the "generic" xdr routines. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - extern bool_t xdr_void(void); - extern bool_t xdr_int(XDR *, int *); - extern bool_t xdr_u_int(XDR *, u_int *); -@@ -330,7 +331,9 @@ extern bool_t xdr_hyper(XDR *, quad_t *) - extern bool_t xdr_u_hyper(XDR *, u_quad_t *); - extern bool_t xdr_longlong_t(XDR *, quad_t *); - extern bool_t xdr_u_longlong_t(XDR *, u_quad_t *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - /* - * Common opaque bytes objects used by many rpc protocols; -@@ -348,7 +351,9 @@ extern bool_t xdr_netobj(XDR *, struct - * These are the public routines for the various implementations of - * xdr streams. - */ --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - /* XDR using memory buffers */ - extern void xdrmem_create(XDR *, char *, u_int, enum xdr_op); - -@@ -369,6 +374,8 @@ extern bool_t xdrrec_skiprecord(XDR *); - /* true if no more input */ - extern bool_t xdrrec_eof(XDR *); - extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* !_TIRPC_XDR_H */ diff --git a/package/libtirpc/patches/patch-tirpc_rpcsvc_crypt_x b/package/libtirpc/patches/patch-tirpc_rpcsvc_crypt_x deleted file mode 100644 index 872800b1d..000000000 --- a/package/libtirpc/patches/patch-tirpc_rpcsvc_crypt_x +++ /dev/null @@ -1,12 +0,0 @@ ---- libtirpc-0.2.3.orig/tirpc/rpcsvc/crypt.x 2013-02-13 16:13:59.000000000 +0100 -+++ libtirpc-0.2.3/tirpc/rpcsvc/crypt.x 2014-03-22 13:20:52.000000000 +0100 -@@ -31,8 +31,7 @@ - */ - - #ifndef RPC_HDR --%#include <sys/cdefs.h> --%__FBSDID("$FreeBSD: src/include/rpcsvc/crypt.x,v 1.5 2003/05/04 02:51:42 obrien Exp $"); -+%%__FBSDID("$FreeBSD: src/include/rpcsvc/crypt.x,v 1.5 2003/05/04 02:51:42 obrien Exp $"); - #endif - - /* |