update to latest upstream version

9 files changed, 48 insertions, 61 deletions

diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index c16fada78..04adb4910 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.2.5
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		8395ac770720b83c5c469f88306d7765
+PKG_VERSION:=		1.2.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		fb48630b7c145fb9d6602a79c6eaab11
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		kmod-nfsd keyutils libtirpc rpcbind libdevmapper
@@ -48,6 +48,7 @@ endif
 CONFIGURE_ENV+=		knfsd_cv_bsd_signals=no \
 			ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--without-tcp-wrappers \
+			--disable-nfsdcltrack \
 			--with-rpcgen=internal \
 			--enable-tirpc \
 			--with-tirpcinclude=${TIRPCINC} \
diff --git a/package/nfs-utils/patches/patch-support_include_sockaddr_h b/package/nfs-utils/patches/patch-support_include_sockaddr_h
deleted file mode 100644
index 129b83e5a..000000000
--- a/package/nfs-utils/patches/patch-support_include_sockaddr_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.2.3.orig/support/include/sockaddr.h	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3/support/include/sockaddr.h	2011-01-03 12:12:10.000000000 +0100
-@@ -20,7 +20,7 @@
- #ifndef NFS_UTILS_SOCKADDR_H
- #define NFS_UTILS_SOCKADDR_H
- 
--#include <libio.h>
-+#include <stddef.h>
- #include <stdbool.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in
index 5f9b975f7..cea868b4e 100644
--- a/package/nfs-utils/patches/patch-tools_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_Makefile_in
@@ -1,6 +1,6 @@
---- nfs-utils-1.2.5.orig/tools/Makefile.in	2011-09-24 14:13:16.000000000 +0200
-+++ nfs-utils-1.2.5/tools/Makefile.in	2012-02-27 17:39:34.000000000 +0100
-@@ -78,7 +78,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
+--- nfs-utils-1.2.8.orig/tools/Makefile.in	2013-04-22 18:48:22.000000000 +0200
++++ nfs-utils-1.2.8/tools/Makefile.in	2013-08-13 10:46:17.000000000 +0200
+@@ -95,7 +95,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
  	distdir
  ETAGS = etags
  CTAGS = ctags
@@ -9,7 +9,7 @@
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
-@@ -270,7 +270,7 @@ top_build_prefix = @top_build_prefix@
+@@ -299,7 +299,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  OPTDIRS = $(am__append_1)
diff --git a/package/nfs-utils/patches/patch-tools_locktest_Makefile_in b/package/nfs-utils/patches/patch-tools_locktest_Makefile_in
index 7f8ca34b0..56d14b860 100644
--- a/package/nfs-utils/patches/patch-tools_locktest_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_locktest_Makefile_in
@@ -1,6 +1,6 @@
---- nfs-utils-1.2.5.orig/tools/locktest/Makefile.in	2011-09-24 14:13:16.000000000 +0200
-+++ nfs-utils-1.2.5/tools/locktest/Makefile.in	2012-02-27 17:39:34.000000000 +0100
-@@ -68,20 +68,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE
+--- nfs-utils-1.2.8.orig/tools/locktest/Makefile.in	2013-04-22 18:48:22.000000000 +0200
++++ nfs-utils-1.2.8/tools/locktest/Makefile.in	2013-08-13 10:46:17.000000000 +0200
+@@ -81,20 +81,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE
  testlk_OBJECTS = $(am_testlk_OBJECTS)
  testlk_LDADD = $(LDADD)
  testlk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -26,7 +26,7 @@
  	$(LDFLAGS) -o $@
  SOURCES = $(testlk_SOURCES)
  DIST_SOURCES = $(testlk_SOURCES)
-@@ -102,15 +102,15 @@ AWK = @AWK@
+@@ -120,15 +120,15 @@ AWK = @AWK@
  CC = $(CC_FOR_BUILD)
  CCDEPMODE = @CCDEPMODE@
  CC_FOR_BUILD = @CC_FOR_BUILD@
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
index 3c75f201d..5aa76ea22 100644
--- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
@@ -1,8 +1,8 @@
---- nfs-utils-1.2.5.orig/tools/rpcgen/Makefile.in	2011-09-24 14:13:16.000000000 +0200
-+++ nfs-utils-1.2.5/tools/rpcgen/Makefile.in	2012-02-27 17:39:34.000000000 +0100
-@@ -73,21 +73,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
- rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
- rpcgen_LDADD = $(LDADD)
+--- nfs-utils-1.2.8.orig/tools/rpcgen/Makefile.in	2013-04-22 18:48:22.000000000 +0200
++++ nfs-utils-1.2.8/tools/rpcgen/Makefile.in	2013-08-13 11:04:51.000000000 +0200
+@@ -87,21 +87,21 @@ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
+ am__DEPENDENCIES_1 =
+ rpcgen_DEPENDENCIES = $(am__DEPENDENCIES_1)
  rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 -	--mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
 -	$(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
@@ -28,8 +28,8 @@
 +	-o $@
  SOURCES = $(rpcgen_SOURCES)
  DIST_SOURCES = $(rpcgen_SOURCES)
- ETAGS = etags
-@@ -98,7 +98,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ am__can_run_installinfo = \
+@@ -117,7 +117,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
  ALLOCA = @ALLOCA@
  AMTAR = @AMTAR@
  AM_CFLAGS = @AM_CFLAGS@
@@ -38,7 +38,7 @@
  AR = @AR@
  AUTOCONF = @AUTOCONF@
  AUTOHEADER = @AUTOHEADER@
-@@ -107,10 +107,10 @@ AWK = @AWK@
+@@ -126,10 +126,10 @@ AWK = @AWK@
  CC = $(CC_FOR_BUILD)
  CCDEPMODE = @CCDEPMODE@
  CC_FOR_BUILD = @CC_FOR_BUILD@
@@ -51,7 +51,7 @@
  CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
  CXX = @CXX@
  CXXCPP = @CXXCPP@
-@@ -143,10 +143,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+@@ -167,10 +167,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
  K5VERS = @K5VERS@
  KRBCFLAGS = @KRBCFLAGS@
  KRBDIR = @KRBDIR@
@@ -64,9 +64,17 @@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LIBBLKID = @LIBBLKID@
  LIBBSD = @LIBBSD@
-@@ -312,7 +312,7 @@ clean-noinstPROGRAMS:
+@@ -296,7 +296,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.
+ rpcgen_CFLAGS = $(CFLAGS_FOR_BUILD)
+ rpcgen_CPPLAGS = $(CPPFLAGS_FOR_BUILD)
+ rpcgen_LDFLAGS = $(LDFLAGS_FOR_BUILD)
+-rpcgen_LDADD = $(LIBTIRPC)
+ MAINTAINERCLEANFILES = Makefile.in
+ EXTRA_DIST = rpcgen.new.1
+ all: all-am
+@@ -344,7 +343,7 @@ clean-noinstPROGRAMS:
  	rm -f $$list
- rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) 
+ rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) $(EXTRA_rpcgen_DEPENDENCIES) 
  	@rm -f rpcgen$(EXEEXT)
 -	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS)
 +	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD)
diff --git a/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c b/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c
deleted file mode 100644
index b6536e14e..000000000
--- a/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.2.5.orig/utils/blkmapd/device-process.c	2011-09-24 13:55:15.000000000 +0200
-+++ nfs-utils-1.2.5/utils/blkmapd/device-process.c	2013-07-11 11:02:58.000000000 +0200
-@@ -296,7 +296,7 @@ decode_blk_volume(uint32_t **pp, uint32_
- 		off_t stripe_unit = vol->param.bv_stripe_unit;
- 		/* Check limitations imposed by device-mapper */
- 		if ((stripe_unit & (stripe_unit - 1)) != 0
--		    || stripe_unit < (off_t) (PAGE_SIZE >> 9))
-+		    || stripe_unit < (off_t) (sysconf(_SC_PAGE_SIZE) >> 9))
- 			return -EIO;
- 		BLK_READBUF(p, end, 4);
- 		READ32(vol->bv_vol_n);
diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
index 1c98ccb16..5499e21a9 100644
--- a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
+++ b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
@@ -1,25 +1,25 @@
---- nfs-utils-1.2.5.orig/utils/gssd/Makefile.in	2011-09-24 14:13:16.000000000 +0200
-+++ nfs-utils-1.2.5/utils/gssd/Makefile.in	2013-07-11 11:01:30.000000000 +0200
-@@ -355,7 +355,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a
- 		$(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
+--- nfs-utils-1.2.8.orig/utils/gssd/Makefile.in	2013-04-22 18:48:23.000000000 +0200
++++ nfs-utils-1.2.8/utils/gssd/Makefile.in	2013-08-13 10:59:43.000000000 +0200
+@@ -390,7 +390,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a
+ 		$(RPCSECGSS_LIBS) $(KRBLIBS) $(GSSAPI_LIBS)
  
- gssd_LDFLAGS = $(KRBLDFLAGS)
+ gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC)
 -gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
 +gssd_CFLAGS = $(AM_CFLAGS) \
- 	      $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ 	      $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
  
  svcgssd_SOURCES = \
-@@ -375,11 +375,11 @@ svcgssd_LDADD = \
- 	$(KRBLIBS)
+@@ -410,11 +410,11 @@ svcgssd_LDADD = \
+ 	$(KRBLIBS) $(GSSAPI_LIBS) $(LIBTIRPC)
  
  svcgssd_LDFLAGS = $(KRBLDFLAGS)
 -svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
 +svcgssd_CFLAGS = $(AM_CFLAGS) \
- 		 $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ 		 $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
  
  gss_clnt_send_err_SOURCES = gss_clnt_send_err.c
 -gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
 +gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) \
- 		 $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ 		 $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
  
  MAINTAINERCLEANFILES = Makefile.in
diff --git a/package/nfs-utils/patches/patch-utils_mount_error_c b/package/nfs-utils/patches/patch-utils_mount_error_c
index 641a482f2..8f841e672 100644
--- a/package/nfs-utils/patches/patch-utils_mount_error_c
+++ b/package/nfs-utils/patches/patch-utils_mount_error_c
@@ -1,5 +1,5 @@
---- nfs-utils-1.2.1.orig/utils/mount/error.c	2009-11-04 12:13:56.000000000 +0100
-+++ nfs-utils-1.2.1/utils/mount/error.c	2009-12-25 19:32:49.000000000 +0100
+--- nfs-utils-1.2.8.orig/utils/mount/error.c	2013-04-22 18:47:20.000000000 +0200
++++ nfs-utils-1.2.8/utils/mount/error.c	2013-08-13 10:46:19.000000000 +0200
 @@ -62,7 +62,7 @@ static int rpc_strerror(int spos)
  	char *tmp;
  
diff --git a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
index 4ec4d3813..36e7b6c29 100644
--- a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
+++ b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
@@ -1,9 +1,9 @@
---- nfs-utils-1.2.5.orig/utils/mountd/fsloc.c	2011-09-24 13:55:15.000000000 +0200
-+++ nfs-utils-1.2.5/utils/mountd/fsloc.c	2013-07-11 11:01:30.000000000 +0200
-@@ -126,7 +126,7 @@ static struct servers *method_list(char
- 	struct servers *rv=NULL;
+--- nfs-utils-1.2.8.orig/utils/mountd/fsloc.c	2013-04-22 18:47:20.000000000 +0200
++++ nfs-utils-1.2.8/utils/mountd/fsloc.c	2013-08-13 10:57:48.000000000 +0200
+@@ -127,7 +127,7 @@ static struct servers *method_list(char
+ 	bool v6esc = false;
  
- 	xlog(L_NOTICE, "method_list(%s)\n", data);
+ 	xlog(L_NOTICE, "method_list(%s)", data);
 -	for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
 +	for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
  		ptr++;