update libtirpc to latest upstream, fix dependency for nfs-utils

package/libtirpc/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtirpc
-PKG_VERSION:=		0.2.2
+PKG_VERSION:=		0.2.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		74c41c15c2909f7d11d9c7bfa7db6273
+PKG_MD5SUM:=		b70e6c12a369a91e69fcc3b9feb23d61
 PKG_DESCR:=		a transport independent RPC library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libgssglue

package/libtirpc/patches/patch-src_Makefile_in

@@ -1,47 +1,34 @@
---- libtirpc-0.2.2.orig/src/Makefile.in	2011-05-02 14:31:55.000000000 +0200
-+++ libtirpc-0.2.2/src/Makefile.in	2012-03-27 22:24:03.971238587 +0200
-@@ -81,8 +81,8 @@ am__libtirpc_la_SOURCES_DIST = auth_none
- 	rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \
+--- 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
  	rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \
- 	svc_dg.c svc_auth_unix.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 des_crypt.c xdr.c xdr_rec.c xdr_array.c \
-+	svc_simple.c svc_vc.c getpeereid.c \
-+	des_crypt.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 svc_auth_none.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
  @GSS_TRUE@am__objects_1 = libtirpc_la-auth_gss.lo \
-@@ -110,8 +110,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut
- 	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-des_crypt.lo \
-+	libtirpc_la-des_crypt.lo \
+@@ -130,8 +130,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-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 \
-@@ -291,7 +290,7 @@ lib_LTLIBRARIES = libtirpc.la
- # release number of your package. This is an abuse that only fosters
- # misunderstanding of the purpose of library versions."
- #
--libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 \
-+libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 \
- 	$(am__append_2)
- libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \
- 	bindresvport.c clnt_bcast.c clnt_dg.c clnt_generic.c \
-@@ -302,8 +301,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u
- 	rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \
+@@ -327,7 +326,7 @@ 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_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 des_crypt.c xdr.c xdr_rec.c xdr_array.c \
-+	svc_simple.c svc_vc.c getpeereid.c \
-+	des_crypt.c xdr.c xdr_rec.c xdr_array.c \
- 	xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.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)
-@@ -381,12 +380,9 @@ mostlyclean-compile:
+@@ -408,10 +407,8 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -50,7 +37,33 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_none.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_time.Plo@am__quote@
  @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-authdes_prot.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authgss_prot.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authunix_prot.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-bindresvport.Plo@am__quote@
+@@ -779,27 +776,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
+ 
+-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@
+-@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
+-
+-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@
+-@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
+-
+-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

package/libtirpc/patches/patch-src_des_crypt_c

@@ -1,6 +1,6 @@
---- libtirpc-0.2.2.orig/src/des_crypt.c	2011-05-02 14:10:40.000000000 +0200
-+++ libtirpc-0.2.2/src/des_crypt.c	2012-03-22 19:23:01.213747585 +0100
-@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)des_crypt.c	
+--- libtirpc-0.2.3.orig/src/des_crypt.c	2013-02-13 16:13:59.000000000 +0100
++++ libtirpc-0.2.3/src/des_crypt.c	2013-08-12 16:47:07.000000000 +0200
+@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)des_crypt.c
  
  static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
  int (*__des_crypt_LOCAL)() = 0;
@@ -9,7 +9,7 @@
  /*
   * Copy 8 bytes
   */
-@@ -145,10 +145,6 @@ common_crypt(key, buf, len, mode, desp)	
+@@ -145,10 +145,6 @@ common_crypt(key, buf, len, mode, desp)
  		if (!__des_crypt_LOCAL(buf, len, desp)) {
  			return (DESERR_HWERROR);
  		}

package/libtirpc/patches/patch-src_rpc_soc_c

@@ -1,6 +1,6 @@
---- libtirpc-0.2.2.orig/src/rpc_soc.c	2011-05-02 14:10:40.000000000 +0200
-+++ libtirpc-0.2.2/src/rpc_soc.c	2012-03-22 19:20:37.849747561 +0100
-@@ -515,37 +515,6 @@ clnt_broadcast(prog, vers, proc, xargs, 
+--- libtirpc-0.2.3.orig/src/rpc_soc.c	2013-02-13 16:13:59.000000000 +0100
++++ libtirpc-0.2.3/src/rpc_soc.c	2013-08-12 16:47:07.000000000 +0200
+@@ -520,37 +520,6 @@ clnt_broadcast(prog, vers, proc, xargs,
  	    (resultproc_t) rpc_wrap_bcast, "udp");
  }
  

package/nfs-utils/Makefile

@@ -10,6 +10,7 @@ PKG_MD5SUM:=		8395ac770720b83c5c469f88306d7765
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		kmod-nfsd keyutils libtirpc rpcbind libdevmapper
+PKG_DEPENDS+=		libpthread
 PKG_BUILDDEP:=		keyutils libtirpc lvm
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}

package/nfs-utils/files/nfs.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	test x"${portmap:-NO}" = x"NO" && test x"${rpcbind:-NO}" = x"NO" && exit 0
+	test x"${rpcbind:-NO}" = x"NO" && exit 0
 	test x"${nfs_client:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;

package/nfs-utils/files/nfsd.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	test x"${portmap:-NO}" = x"NO" && test x"${rpcbind:-NO}" = x"NO" && exit 0
+	test x"${rpcbind:-NO}" = x"NO" && exit 0
 	test x"${nfs_server:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;