update to latest upstream version

package/libtirpc/Makefile

@@ -4,32 +4,45 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtirpc
-PKG_VERSION:=		0.2.3
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		b70e6c12a369a91e69fcc3b9feb23d61
-PKG_DESCR:=		a transport independent RPC library
+PKG_VERSION:=		0.2.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		847995e8d002cbf1387bda05947be086
+PKG_DESCR:=		transport independent RPC library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libgssglue
-PKG_BUILDDEP:=		libgssglue
+PKG_BUILDDEP:=		autotool libgssglue
 PKG_URL:=		http://sourceforge.net/projects/libtirpc/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libtirpc/}
 PKG_OPTS:=		dev
 
+PKG_FLAVOURS_LIBTIRPC:=	WITH_IPV6 WITH_GSS
+PKGFD_WITH_IPV6:=	enable IPv6 support
+PKGFD_WITH_GSS:=	enable GSS support
+
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-ifneq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
+AUTOTOOL_STYLE:=	autoreconf
+
+ifeq (${ADK_PACKAGE_LIBTIRPC_WITH_GSS},y)
+CONFIGURE_ARGS+=	--enable-gss
+else
 CONFIGURE_ARGS+=	--disable-gss
+endif
+
+ifeq (${ADK_PACKAGE_LIBTIRPC_WITH_IPV6},y)
+CONFIGURE_ARGS+=	--enable-ipv6
+CFG:=			.ipv6
 else
-CONFIGURE_ARGS+=	--enable-gss
+CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
 libtirpc-install:
 	${INSTALL_DIR} ${IDIR_LIBTIRPC}/usr/lib ${IDIR_LIBTIRPC}/etc
 	${CP} ${WRKINST}/usr/lib/libtirpc*.so* ${IDIR_LIBTIRPC}/usr/lib/
-	${CP} ./files/netconfig ${IDIR_LIBTIRPC}/etc
+	${CP} ./files/netconfig$(CFG) ${IDIR_LIBTIRPC}/etc/netconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libtirpc/files/netconfig

@@ -1,7 +1,5 @@
 udp        tpi_clts      v     inet     udp     -       -
 tcp        tpi_cots_ord  v     inet     tcp     -       -
-udp6       tpi_clts      v     inet6    udp     -       -
-tcp6       tpi_cots_ord  v     inet6    tcp     -       -
 rawip      tpi_raw       -     inet      -      -       -
 local      tpi_cots_ord  -     loopback  -      -       -
 unix       tpi_cots_ord  -     loopback  -      -       -

package/libtirpc/patches/patch-src_Makefile_in

@@ -1,34 +1,41 @@
---- libtirpc-0.2.3.orig/src/Makefile.in	2013-02-13 16:15:08.000000000 +0100
-+++ libtirpc-0.2.3/src/Makefile.in	2013-08-12 18:41:07.000000000 +0200
-@@ -103,7 +103,7 @@ am__libtirpc_la_SOURCES_DIST = auth_none
+--- libtirpc-0.2.4.orig/src/Makefile.in	2014-05-10 21:05:39.825812663 +0200
++++ libtirpc-0.2.4/src/Makefile.in	2014-05-10 20:41:09.916621417 +0200
+@@ -106,9 +106,9 @@ am__libtirpc_la_SOURCES_DIST = auth_none
  	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 xdr.c xdr_rec.c \
-+	xdr.c xdr_rec.c \
- 	xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
- 	auth_gss.c authgss_prot.c svc_auth_gss.c
+-	xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
+-	auth_gss.c authgss_prot.c svc_auth_gss.c
++	authdes_prot.c xdr.c xdr_rec.c xdr_array.c xdr_float.c \
++	xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \
++	authgss_prot.c svc_auth_gss.c
  @GSS_TRUE@am__objects_1 = libtirpc_la-auth_gss.lo \
-@@ -130,8 +130,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut
+ @GSS_TRUE@	libtirpc_la-authgss_prot.lo \
+ @GSS_TRUE@	libtirpc_la-svc_auth_gss.lo
+@@ -133,8 +133,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut
  	libtirpc_la-svc_auth_none.lo libtirpc_la-svc_generic.lo \
  	libtirpc_la-svc_raw.lo libtirpc_la-svc_run.lo \
  	libtirpc_la-svc_simple.lo libtirpc_la-svc_vc.lo \
 -	libtirpc_la-getpeereid.lo libtirpc_la-auth_time.lo \
 -	libtirpc_la-auth_des.lo libtirpc_la-authdes_prot.lo \
-+	libtirpc_la-getpeereid.lo \
++	libtirpc_la-getpeereid.lo libtirpc_la-authdes_prot.lo \
  	libtirpc_la-xdr.lo libtirpc_la-xdr_rec.lo \
  	libtirpc_la-xdr_array.lo libtirpc_la-xdr_float.lo \
  	libtirpc_la-xdr_mem.lo libtirpc_la-xdr_reference.lo \
-@@ -327,7 +326,7 @@ libtirpc_la_SOURCES = auth_none.c auth_u
+@@ -355,9 +354,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u
  	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 xdr.c xdr_rec.c \
-+	xdr.c xdr_rec.c \
- 	xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
- 	$(am__append_1)
- @GSS_TRUE@libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS)
-@@ -408,10 +407,8 @@ mostlyclean-compile:
+-	xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
+-	$(am__append_1)
++	authdes_prot.c xdr.c xdr_rec.c xdr_array.c xdr_float.c \
++	xdr_mem.c xdr_reference.c xdr_stdio.c $(am__append_1)
+ @GSS_TRUE@libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
+ CLEANFILES = cscope.* *~
+ DISTCLEANFILES = Makefile.in
+@@ -438,10 +436,8 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -39,31 +46,24 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_unix.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authdes_prot.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authgss_prot.Plo@am__quote@
-@@ -779,27 +776,6 @@ libtirpc_la-getpeereid.lo: getpeereid.c
+@@ -809,20 +805,6 @@ libtirpc_la-getpeereid.lo: getpeereid.c
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-getpeereid.lo `test -f 'getpeereid.c' || echo '$(srcdir)/'`getpeereid.c
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-getpeereid.lo `test -f 'getpeereid.c' || echo '$(srcdir)/'`getpeereid.c
  
 -libtirpc_la-auth_time.lo: auth_time.c
--@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_time.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_time.Tpo -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
--@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtirpc_la-auth_time.Tpo $(DEPDIR)/libtirpc_la-auth_time.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth_time.c' object='libtirpc_la-auth_time.lo' libtool=yes @AMDEPBACKSLASH@
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_time.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_time.Tpo -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtirpc_la-auth_time.Tpo $(DEPDIR)/libtirpc_la-auth_time.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='auth_time.c' object='libtirpc_la-auth_time.lo' libtool=yes @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
 -
 -libtirpc_la-auth_des.lo: auth_des.c
--@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_des.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_des.Tpo -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
--@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtirpc_la-auth_des.Tpo $(DEPDIR)/libtirpc_la-auth_des.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth_des.c' object='libtirpc_la-auth_des.lo' libtool=yes @AMDEPBACKSLASH@
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_des.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_des.Tpo -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtirpc_la-auth_des.Tpo $(DEPDIR)/libtirpc_la-auth_des.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='auth_des.c' object='libtirpc_la-auth_des.lo' libtool=yes @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
 -
--libtirpc_la-authdes_prot.lo: authdes_prot.c
--@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-authdes_prot.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-authdes_prot.Tpo -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c
--@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtirpc_la-authdes_prot.Tpo $(DEPDIR)/libtirpc_la-authdes_prot.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='authdes_prot.c' object='libtirpc_la-authdes_prot.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c
--
- libtirpc_la-xdr.lo: xdr.c
- @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-xdr.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-xdr.Tpo -c -o libtirpc_la-xdr.lo `test -f 'xdr.c' || echo '$(srcdir)/'`xdr.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtirpc_la-xdr.Tpo $(DEPDIR)/libtirpc_la-xdr.Plo
+ libtirpc_la-authdes_prot.lo: authdes_prot.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-authdes_prot.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-authdes_prot.Tpo -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtirpc_la-authdes_prot.Tpo $(DEPDIR)/libtirpc_la-authdes_prot.Plo

package/libtirpc/patches/patch-src_clnt_bcast_c

@@ -1,5 +1,5 @@
---- libtirpc-0.2.3.orig/src/clnt_bcast.c	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/src/clnt_bcast.c	2014-03-22 14:19:29.000000000 +0100
+--- 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
 @@ -28,7 +28,6 @@
  /*
   * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
@@ -8,14 +8,11 @@
  
  /*
   * clnt_bcast.c
-@@ -41,10 +40,8 @@
+@@ -41,7 +40,7 @@
   */
  #include <sys/socket.h>
  #include <sys/types.h>
 -#include <sys/queue.h>
- 
--/* new queue functions */
--#include <misc/queue.h>
 +#include "queue.h"
  
  #include <net/if.h>

package/libtirpc/patches/patch-src_xdr_sizeof_c

@@ -1,10 +1,10 @@
---- libtirpc-0.2.3.orig/src/xdr_sizeof.c	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/src/xdr_sizeof.c	2014-03-22 13:20:53.000000000 +0100
+--- 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 "namespace.h"
  #include <rpc/types.h>
+ #include <rpc/xdr.h>

package/libtirpc/patches/patch-tirpc_misc_event_h

@@ -1,24 +0,0 @@
---- libtirpc-0.2.3.orig/tirpc/misc/event.h	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/tirpc/misc/event.h	2014-03-22 13:20:52.000000000 +0100
-@@ -186,15 +186,18 @@ extern int	kqueue_del_filteropts(int fil
- 
- #else 	/* !_KERNEL */
- 
--#include <sys/cdefs.h>
- struct timespec;
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- int     kqueue(void);
- int     kevent(int kq, const struct kevent *changelist, int nchanges,
- 	    struct kevent *eventlist, int nevents,
- 	    const struct timespec *timeout);
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /* !_KERNEL */
- 

package/libtirpc/patches/patch-tirpc_rpc_auth_h

@@ -1,5 +1,5 @@
---- libtirpc-0.2.3.orig/tirpc/rpc/auth.h	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/tirpc/rpc/auth.h	2014-03-22 13:20:52.000000000 +0100
+--- 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 <rpc/xdr.h>
@@ -7,8 +7,8 @@
 -#include <sys/cdefs.h>
  #include <sys/socket.h>
  #include <sys/types.h>
- #include <stdio.h>
-@@ -165,9 +164,13 @@ union des_block {
+ 
+@@ -164,9 +163,13 @@ union des_block {
  	char c[8];
  };
  typedef union des_block des_block;
@@ -24,7 +24,7 @@
  
  /*
   * Authentication info.  Opaque to client.
-@@ -288,9 +291,13 @@ auth_put(AUTH *auth)
+@@ -277,9 +280,13 @@ auth_put(AUTH *auth)
  		xfunc, xwhere))
  
  
@@ -40,7 +40,7 @@
  
  /*
   * Any style authentication.  These routines can be used by any
-@@ -311,11 +318,15 @@ int authany_wrap(void), authany_unwrap(v
+@@ -300,11 +307,15 @@ int authany_wrap(void), authany_unwrap(v
   *	int len;
   *	int *aup_gids;
   */
@@ -58,7 +58,7 @@
  /*
   * DES style authentication
   * AUTH *authsecdes_create(servername, window, timehost, ckey)
-@@ -324,15 +335,23 @@ __END_DECLS
+@@ -313,15 +324,23 @@ __END_DECLS
   * 	const char *timehost;			- optional hostname to sync with
   * 	des_block *ckey;		- optional conversation key to use
   */
@@ -86,7 +86,7 @@
  
  #define authsys_create(c,i1,i2,i3,ip) authunix_create((c),(i1),(i2),(i3),(ip))
  #define authsys_create_default() authunix_create_default()
-@@ -340,36 +359,48 @@ __END_DECLS
+@@ -329,36 +348,48 @@ __END_DECLS
  /*
   * Netname manipulation routines.
   */
@@ -141,7 +141,7 @@
  
  #ifdef KERBEROS
  /*
-@@ -382,10 +413,14 @@ __END_DECLS
+@@ -371,10 +402,14 @@ __END_DECLS
   *	const char *timehost;			- optional hostname to sync with
   *	int *status;				- kerberos status returned
   */
@@ -158,7 +158,7 @@
  
  /*
   * Map a kerberos credential into a unix cred.
-@@ -398,19 +433,27 @@ __END_DECLS
+@@ -387,19 +422,27 @@ __END_DECLS
   *	int *groups;
   *
   */

package/libtirpc/patches/patch-tirpc_rpc_xdr_h

@@ -1,5 +1,5 @@
---- libtirpc-0.2.3.orig/tirpc/rpc/xdr.h	2013-02-13 16:13:59.000000000 +0100
-+++ libtirpc-0.2.3/tirpc/rpc/xdr.h	2014-03-22 13:20:52.000000000 +0100
+--- 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
@@ -19,7 +19,7 @@
  extern bool_t	xdr_void(void);
  extern bool_t	xdr_int(XDR *, int *);
  extern bool_t	xdr_u_int(XDR *, u_int *);
-@@ -322,7 +323,9 @@ extern bool_t	xdr_hyper(XDR *, quad_t *)
+@@ -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 *);
@@ -30,7 +30,7 @@
  
  /*
   * Common opaque bytes objects used by many rpc protocols;
-@@ -340,7 +343,9 @@ extern bool_t   xdr_netobj(XDR *, struct
+@@ -348,7 +351,9 @@ extern bool_t   xdr_netobj(XDR *, struct
   * These are the public routines for the various implementations of
   * xdr streams.
   */
@@ -41,7 +41,7 @@
  /* XDR using memory buffers */
  extern void   xdrmem_create(XDR *, char *, u_int, enum xdr_op);
  
-@@ -361,6 +366,8 @@ extern bool_t xdrrec_skiprecord(XDR *);
+@@ -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);