libtirpc: Update to version 1.3.1

Fixes compiling with recent gcc.

Signed-off-by: Phil Sutter <phil@nwl.cc>

5 files changed, 2 insertions, 114 deletions

diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 165217fc5..2fe3e4a05 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		libtirpc
-PKG_VERSION:=		1.0.3
+PKG_VERSION:=		1.3.1
 PKG_RELEASE:=		1
-PKG_HASH:=		86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e
+PKG_HASH:=		245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17
 PKG_DESCR:=		transport independent rpc library
 PKG_SECTION:=		libs/net
 PKG_URL:=		http://sourceforge.net/projects/libtirpc/
@@ -26,7 +26,6 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 MAKE_ENV+=		V=1
-AUTOTOOL_STYLE:=	autoreconf
 HOST_CPPFLAGS+=		-I/usr/include/tirpc
 
 ifeq (${ADK_PACKAGE_LIBTIRPC_WITH_GSS},y)
@@ -42,10 +41,6 @@ else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
-post-extract:
-	rm $(WRKBUILD)/tirpc/rpcsvc/crypt.h
-	rm $(WRKBUILD)/tirpc/rpc/rpcb_prot.h
-
 libtirpc-install:
 	${INSTALL_DIR} ${IDIR_LIBTIRPC}/usr/lib ${IDIR_LIBTIRPC}/etc
 	${CP} ${WRKINST}/usr/lib/libtirpc*.so* ${IDIR_LIBTIRPC}/usr/lib/
diff --git a/package/libtirpc/patches/patch-Makefile_am b/package/libtirpc/patches/patch-Makefile_am
deleted file mode 100644
index 80bc6991c..000000000
--- a/package/libtirpc/patches/patch-Makefile_am
+++ /dev/null
@@ -1,54 +0,0 @@
---- libtirpc-1.0.1.orig/Makefile.am	2015-10-30 16:15:14.000000000 +0100
-+++ libtirpc-1.0.1/Makefile.am	2015-11-29 16:38:58.340674483 +0100
-@@ -1,6 +1,12 @@
--SUBDIRS = src man doc
-+SUBDIRS = src man doc rpcgen
- ACLOCAL_AMFLAGS = -I m4
- 
-+GENFILES	       = tirpc/rpcsvc/crypt.h \
-+			 tirpc/rpcsvc/mount.h \
-+			 tirpc/rpcsvc/nfs_prot.h \
-+			 tirpc/rpcsvc/rquota.h \
-+			 tirpc/rpc/rpcb_prot.h
-+
- noinst_HEADERS	       = tirpc/reentrant.h \
- 			 tirpc/getpeereid.h \
- 			 tirpc/libc_private.h \
-@@ -8,7 +14,9 @@ noinst_HEADERS	       = tirpc/reentrant.
- 
- nobase_include_HEADERS = tirpc/netconfig.h \
- 			 tirpc/rpcsvc/crypt.x \
--			 tirpc/rpcsvc/crypt.h \
-+			 tirpc/rpcsvc/mount.x \
-+			 tirpc/rpcsvc/nfs_prot.x \
-+			 tirpc/rpcsvc/rquota.x \
- 			 tirpc/rpc/xdr.h \
- 			 tirpc/rpc/types.h \
- 			 tirpc/rpc/svc_soc.h \
-@@ -21,7 +29,6 @@ nobase_include_HEADERS = tirpc/netconfig
- 			 tirpc/rpc/rpcent.h \
- 			 tirpc/rpc/rpc_com.h \
- 			 tirpc/rpc/rpcb_prot.x \
--			 tirpc/rpc/rpcb_prot.h \
- 			 tirpc/rpc/rpcb_clnt.h \
- 			 tirpc/rpc/raw.h \
- 			 tirpc/rpc/pmap_rmt.h \
-@@ -48,5 +55,17 @@ endif
- pkgconfigdir=$(libdir)/pkgconfig
- pkgconfig_DATA = libtirpc.pc
- 
--CLEANFILES	       = cscope.* *~
-+nobase_nodist_include_HEADERS = $(GENFILES)
-+BUILT_SOURCES = $(GENFILES)
-+
-+$(GENFILES): %.h: %.x $(top_builddir)/rpcgen/rpcgen
-+	mkdir -p $(dir $@)
-+	$(top_builddir)/rpcgen/rpcgen -h -o $@ $<
-+
-+$(top_builddir)/rpcgen/rpcgen: force
-+	cd rpcgen && $(MAKE)
-+
-+force:
-+
-+CLEANFILES	       = cscope.* *~ $(GENFILES)
- DISTCLEANFILES	       = Makefile.in libtirpc*.tar.gz
diff --git a/package/libtirpc/patches/patch-configure_ac b/package/libtirpc/patches/patch-configure_ac
deleted file mode 100644
index 659bdad8c..000000000
--- a/package/libtirpc/patches/patch-configure_ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- libtirpc-1.0.1.orig/configure.ac	2015-10-30 16:15:14.000000000 +0100
-+++ libtirpc-1.0.1/configure.ac	2015-11-29 16:38:38.817971632 +0100
-@@ -89,7 +89,19 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h li
- AC_CHECK_LIB([pthread], [pthread_create])
- AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
- 
--AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
-+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-+
-+AC_MSG_CHECKING([for a C compiler for build tools])
-+if test $cross_compiling = yes; then
-+   AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
-+else
-+   CC_FOR_BUILD=$CC
-+fi
-+AC_MSG_RESULT([$CC_FOR_BUILD])
-+AC_SUBST(CC_FOR_BUILD)
-+
-+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile rpcgen/Makefile])
-+
- AC_OUTPUT(libtirpc.pc)
- 
- 
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 d2dd1a38c..000000000
--- a/package/libtirpc/patches/patch-src_clnt_bcast_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libtirpc-1.0.1.orig/src/clnt_bcast.c	2015-10-30 16:15:14.000000000 +0100
-+++ libtirpc-1.0.1/src/clnt_bcast.c	2016-01-28 15:46:15.322676441 +0100
-@@ -40,7 +40,6 @@
-  */
- #include <sys/socket.h>
- #include <sys/types.h>
--#include <sys/queue.h>
- 
- #include <net/if.h>
- #include <netinet/in.h>
-@@ -62,6 +61,7 @@
- #include <err.h>
- #include <string.h>
- 
-+#include "queue.h"
- #include "rpc_com.h"
- #include "debug.h"
- 
diff --git a/package/libtirpc/patches/patch-src_svc_auth_c b/package/libtirpc/patches/patch-src_svc_auth_c
deleted file mode 100644
index 05436f3b7..000000000
--- a/package/libtirpc/patches/patch-src_svc_auth_c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libtirpc-1.0.1.orig/src/svc_auth.c	2015-10-30 16:15:14.000000000 +0100
-+++ libtirpc-1.0.1/src/svc_auth.c	2015-11-29 16:39:17.807381054 +0100
-@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch
- 	case AUTH_SHORT:
- 		dummy = _svcauth_short(rqst, msg);
- 		return (dummy);
--	case AUTH_DES:
--		dummy = _svcauth_des(rqst, msg);
--		return (dummy);
- #ifdef HAVE_RPCSEC_GSS
- 	case RPCSEC_GSS:
- 		dummy = _svcauth_gss(rqst, msg, no_dispatch);