Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

13 files changed, 140 insertions, 339 deletions

diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
deleted file mode 100644
index 0b400090a..000000000
--- a/package/nfs-utils/Config.in
+++ /dev/null
@@ -1,43 +0,0 @@
-config ADK_PACKAGE_NFS_UTILS
-	prompt "nfs-utils......................... NFS server utilities"
-	tristate
-	default n
-	select ADK_PACKAGE_PORTMAP
-	select ADK_KPACKAGE_KMOD_NFSD
-	select ADK_KPACKAGE_KMOD_NFS_FS
-	select ADK_PACKAGE_LIBTIRPC if ADK_IPV6
-	depends on !ADK_TARGET_ROOTFS_NFSROOT
-	help
-	  NFS server utilities (namely, exportfs), and an NFS server.
-
-config ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
-	prompt "Enable Kerberos and NFSv4"
-	bool
-	select ADK_PACKAGE_LIBEVENT
-	select ADK_PACKAGE_LIBNFSIDMAP
-	select ADK_PACKAGE_LIBRPCSECGSS
-	select ADK_PACKAGE_LIBCOM_ERR
-	select ADK_KERNEL_NFSD_V4
-	default n
-	depends on ADK_PACKAGE_NFS_UTILS
-
-choice
-prompt "Kerberos implementation"
-depends on ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
-config ADK_COMPILE_NFS_UTILS_WITH_KRB5
-	prompt "MIT"
-	bool
-	select ADK_COMPILE_KRB5
-	select ADK_PACKAGE_KRB5_LIBS
-	select ADK_PACKAGE_LIBGSSGLUE
-	help
-	  use MIT kerberos libraries
-
-config ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL
-	prompt "Heimdal"
-	bool
-	select ADK_PACKAGE_HEIMDAL_LIBS
-	help 
-	  Use heimdal kerberos libraries (experimental)
-
-endchoice
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 425810fc5..78017c615 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -4,82 +4,78 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.2.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		779cf81044e92cb51ad590960e7b3671
+PKG_VERSION:=		1.2.1
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		c3ccd16c147befd49fe4541a506dd177
 PKG_DESCR:= 		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-nfsd
+
+ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
+PKG_DEPENDS+=		libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
+PKG_BUILDDEP+=		libnfsidmap krb5 libevent libgssglue librpcsecgss
+endif
+
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y)
+PKG_DEPENDS+=		libtirpc rpcbind
+PKG_BUILDDEP+=		libtirpc rpcbind
+else
 PKG_DEPENDS:=		portmap
+endif
+
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include ${TOPDIR}/mk/package.mk
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y)
-PKG_DEPENDS+=		krb5-libs libevent libnfsidmap librpcsecgss libcom_err libgssglue
-endif
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y)
-PKG_DEPENDS+=		heimdal-libs libevent libnfsidmap librpcsecgss libcom_err
-endif
+PKG_FLAVOURS:=		WITH_KERBEROS WITH_TIRPC
+PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
+PKGFD_WITH_TIRPC:=	enable Transport Independent RPC
 
-ifeq (${ADK_IPV6},y)
-PKG_DEPENDS+=		libtirpc
-endif
+include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autotool gnu
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y)
-CONFIGURE_ARGS+=	--enable-nfsv4 \
-			--with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \
-			--enable-gss
-CONFIGURE_ENV+=		LIBS="-lrpcsecgss"
-endif
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y)
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
 CONFIGURE_ARGS+=	--enable-nfsv4 \
-			--with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \
+			--with-krb5=${STAGING_DIR}/usr/ \
 			--enable-gss
 CONFIGURE_ENV+=		LIBS="-lrpcsecgss"
-endif
-
-ifneq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y)
+else
 CONFIGURE_ARGS+=	--disable-nfsv4 \
 			--disable-gss
 endif
 
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y)
+CONFIGURE_ARGS+=	--enable-tirpc \
+			--with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc
+else
+CONFIGURE_ARGS+=	--disable-tirpc
+endif
+
 CONFIGURE_ENV+=		knfsd_cv_bsd_signals=no \
 			ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--without-tcp-wrappers \
 			--disable-uuid
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-TCPPFLAGS+=		-I${LINUX_DIR}/include
-
-ifeq (${ADK_IPV6},y)
-CONFIGURE_ARGS+=	--enable-tirpc \
-			--with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc
-endif
 
 post-install:
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc
+	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc
 	${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc
-	${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \
+		${IDIR_NFS_UTILS}/usr/sbin/
 	${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports
-	${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y)
+	${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd \
+		${IDIR_NFS_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd \
+		${IDIR_NFS_UTILS}/usr/sbin/
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
 	${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc
-	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd ${IDIR_NFS_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd \
+		${IDIR_NFS_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd \
+		${IDIR_NFS_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd \
+		${IDIR_NFS_UTILS}/usr/sbin/
 endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nfs-utils/files/nfs-utils.postinst b/package/nfs-utils/files/nfs-utils.postinst
index bfb7481d0..131ed1608 100644
--- a/package/nfs-utils/files/nfs-utils.postinst
+++ b/package/nfs-utils/files/nfs-utils.postinst
@@ -2,7 +2,7 @@
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf "kernel nfs server" nfs_server NO
 add_rcconf "kernel nfs server version" nfs_server_version 3
-add_service nfs 2049/tdp
+add_service nfs 2049/tcp
 add_service nfs 2049/udp
 gid=$(get_next_gid)
 add_group nfs $gid
diff --git a/package/nfs-utils/files/nfsd.init b/package/nfs-utils/files/nfsd.init
index af8a4b94a..8d438e219 100644
--- a/package/nfs-utils/files/nfsd.init
+++ b/package/nfs-utils/files/nfsd.init
@@ -21,7 +21,6 @@ start)
 	/usr/sbin/exportfs -r
 	/usr/sbin/mountd
 	/usr/sbin/nfsd
-	/usr/sbin/statd
 	if [ ${nfs_server_version} -eq 4 ];then
 		mkdir -p /var/lib/nfs/rpc_pipefs
 		mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
@@ -30,12 +29,11 @@ start)
 	fi
 	;;
 stop)
-	killall nfsd
-	killall mountd
-	killall statd
+	pkill nfsd
+	pkill mountd
 	if [ ${nfs_server_version} -eq 4 ];then
-		killall idmapd
-		killall svcgssd
+		pkill idmapd
+		pkill svcgssd
 	fi
 	;;
 restart)
diff --git a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4 b/package/nfs-utils/patches/patch-aclocal_kerberos5_m4
deleted file mode 100644
index 1a5ca00ba..000000000
--- a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4
+++ /dev/null
@@ -1,138 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.4.orig/aclocal/kerberos5.m4	2008-10-17 16:20:09.000000000 +0200
-+++ nfs-utils-1.1.4/aclocal/kerberos5.m4	2009-01-30 16:24:45.000000000 +0100
-@@ -1,112 +1,48 @@
--dnl Checks for Kerberos
--dnl NOTE: while we intend to do generic gss-api, currently we
--dnl have a requirement to get an initial Kerberos machine
--dnl credential.  Thus, the requirement for Kerberos.
--dnl The Kerberos gssapi library will be dynamically loaded?
- AC_DEFUN([AC_KERBEROS_V5],[
-+  K5CONFIG="krb5-config"
-   AC_MSG_CHECKING(for Kerberos v5)
--  AC_ARG_WITH(krb5,
--  [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])],
-+  AC_ARG_WITH(krb5-config,
-+  [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])],
-   [ case "$withval" in
-     yes|no)
--       krb5_with=""
-+       K5CONFIG="krb5-config"
-        ;;
-     *)
--       krb5_with="$withval"
-+       K5CONFIG="$withval"
-        ;;
-     esac ]
-   )
- 
--  for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \
--  	     /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do
--    dnl This ugly hack brought on by the split installation of
--    dnl MIT Kerberos on Fedora Core 1
--    K5CONFIG=""
--    if test -f $dir/bin/krb5-config; then
--      K5CONFIG=$dir/bin/krb5-config
--    elif test -f "/usr/kerberos/bin/krb5-config"; then
--      K5CONFIG="/usr/kerberos/bin/krb5-config"
--    elif test -f "/usr/lib/mit/bin/krb5-config"; then
--      K5CONFIG="/usr/lib/mit/bin/krb5-config"
--    fi
-     if test "$K5CONFIG" != ""; then
-       KRBCFLAGS=`$K5CONFIG --cflags`
-       KRBLIBS=`$K5CONFIG --libs gssapi`
--      K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
--      AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
--      if test -f $dir/include/gssapi/gssapi_krb5.h -a \
--                \( -f $dir/lib/libgssapi_krb5.a -o \
--                   -f $dir/lib64/libgssapi_krb5.a -o \
--                   -f $dir/lib64/libgssapi_krb5.so -o \
--                   -f $dir/lib/libgssapi_krb5.so \) ; then
-+    if $K5CONFIG --version | grep -q -e heimdal; then
-+      K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'`
-+      AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-+      gssapi_lib=gssapi
-+      KRBIMPL="heimdal"
-+    elif $K5CONFIG --version | grep -q -e Kerberos; then
-+      K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'`
-          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
--         KRBDIR="$dir"
--  dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the
--  dnl private function (gss_krb5_ccache_name) to get correct
--  dnl behavior of changing the ccache used by gssapi.
--  dnl Starting in 1.3.2, we *DO NOT* want to use
--  dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME
--  dnl to get gssapi to use a different ccache
-          if test $K5VERS -le 131; then
-            AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable])
-          fi
-          gssapi_lib=gssapi_krb5
--         break
--      dnl The following ugly hack brought on by the split installation
--      dnl of Heimdal Kerberos on SuSe
--      elif test \( -f $dir/include/heim_err.h -o\
--      		 -f $dir/include/heimdal/heim_err.h \) -a \
--                -f $dir/lib/libroken.a; then
--         AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
--         KRBDIR="$dir"
--         gssapi_lib=gssapi
--        break
--      fi
--    fi
--  done
--  dnl We didn't find a usable Kerberos environment
--  if test "x$KRBDIR" = "x"; then
--    if test "x$krb5_with" = "x"; then
--      AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=)
-+      KRBIMPL="mit-krb5"
-     else
--      AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with)
--    fi
-+      AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.)
-+      KRBIMPL="unknown"
-   fi
--  AC_MSG_RESULT($KRBDIR)
--
--  dnl Check if -rpath=$(KRBDIR)/lib is needed
--  echo "The current KRBDIR is $KRBDIR"
--  if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \
--       -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then
--    KRBLDFLAGS="";
--  elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then
--    KRBLDFLAGS="";
--  else
--    KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib"
-+    AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
-   fi
-+  AC_MSG_RESULT($KRBIMPL)
- 
--  dnl Now check for functions within gssapi library
--  AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context,
--    AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
--  AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes,
--    AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
--  AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name,
--    AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS)
--
--  dnl Check for newer error message facility
--  AC_CHECK_LIB($gssapi_lib, krb5_get_error_message,
--    AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS)
--
--  dnl Check for function to specify addressless tickets
--  AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless,
--    AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
--
--  dnl If they specified a directory and it didn't work, give them a warning
--  if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then
--    AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!)
--  fi
-+  AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
- 
--  AC_SUBST([KRBDIR])
-   AC_SUBST([KRBLIBS])
-   AC_SUBST([KRBCFLAGS])
-   AC_SUBST([KRBLDFLAGS])
diff --git a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
index 5097e0cf0..65c51fcc9 100644
--- a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
+++ b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.3.orig/support/nfs/nfs_mntent.c	2008-07-27 23:01:45.000000000 +0200
-+++ nfs-utils-1.1.3/support/nfs/nfs_mntent.c	2008-10-06 16:53:17.000000000 +0200
+--- nfs-utils-1.2.1.orig/support/nfs/nfs_mntent.c	2009-11-04 12:13:56.000000000 +0100
++++ nfs-utils-1.2.1/support/nfs/nfs_mntent.c	2009-12-25 19:33:24.000000000 +0100
 @@ -9,7 +9,7 @@
   */
  
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_am b/package/nfs-utils/patches/patch-tools_Makefile_am
deleted file mode 100644
index 073486f8d..000000000
--- a/package/nfs-utils/patches/patch-tools_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.4.orig/tools/Makefile.am	2008-10-17 16:20:09.000000000 +0200
-+++ nfs-utils-1.1.4/tools/Makefile.am	2009-01-03 14:12:09.000000000 +0100
-@@ -6,6 +6,6 @@ if CONFIG_RPCGEN
- OPTDIRS += rpcgen
- endif
- 
--SUBDIRS = locktest rpcdebug nlmtest $(OPTDIRS)
-+SUBDIRS = $(OPTDIRS)
- 
- MAINTAINERCLEANFILES = Makefile.in
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in
index ef12d1e52..a97226111 100644
--- a/package/nfs-utils/patches/patch-tools_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_Makefile_in
@@ -1,16 +1,15 @@
-$Id$
---- nfs-utils-1.1.4.orig/tools/Makefile.in	2008-10-17 16:23:52.000000000 +0200
-+++ nfs-utils-1.1.4/tools/Makefile.in	2009-01-03 13:46:50.000000000 +0100
-@@ -59,7 +59,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
-   distclean-recursive maintainer-clean-recursive
+--- nfs-utils-1.2.1.orig/tools/Makefile.in	2009-11-04 12:15:52.000000000 +0100
++++ nfs-utils-1.2.1/tools/Makefile.in	2009-12-25 19:25:33.000000000 +0100
+@@ -71,7 +71,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
+ 	distdir
  ETAGS = etags
  CTAGS = ctags
 -DIST_SUBDIRS = locktest rpcdebug nlmtest rpcgen
 +DIST_SUBDIRS = rpcgen
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-@@ -210,7 +210,7 @@ target_alias = @target_alias@
+ am__relativize = \
+   dir0=`pwd`; \
+@@ -257,7 +257,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_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
new file mode 100644
index 000000000..16af3373b
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
@@ -0,0 +1,66 @@
+--- nfs-utils-1.2.1.orig/tools/rpcgen/Makefile.in	2009-11-04 12:15:52.000000000 +0100
++++ nfs-utils-1.2.1/tools/rpcgen/Makefile.in	2010-01-16 11:01:44.015625000 +0100
+@@ -66,21 +66,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
+ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
+ rpcgen_LDADD = $(LDADD)
+ rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
+-	$(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
++	--mode=link $(CCLD) $(rpcgen_CFLAGS) \
++	$(rpcgen_LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CFLAGS) $(HOSTCFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
++	--mode=link $(CCLD) $(AM_CFLAGS) $(HOSTCFLAGS) \
++	-o $@
+ SOURCES = $(rpcgen_SOURCES)
+ DIST_SOURCES = $(rpcgen_SOURCES)
+ ETAGS = etags
+@@ -100,10 +100,10 @@ AWK = @AWK@
+ CC = $(CC_FOR_BUILD)
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS =
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = 
+ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+@@ -136,10 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+ K5VERS = @K5VERS@
+ KRBCFLAGS = @KRBCFLAGS@
+ KRBDIR = @KRBDIR@
+-KRBLDFLAGS = @KRBLDFLAGS@
++KRBLDFLAGS = 
+ KRBLIBS = @KRBLIBS@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS =
+ LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+ LIBBLKID = @LIBBLKID@
+ LIBBSD = @LIBBSD@
+@@ -299,7 +299,7 @@ clean-noinstPROGRAMS:
+ 	rm -f $$list
+ rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) 
+ 	@rm -f rpcgen$(EXEEXT)
+-	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS)
++	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
new file mode 100644
index 000000000..5bc54e758
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
@@ -0,0 +1,12 @@
+--- nfs-utils-1.2.1.orig/tools/rpcgen/rpc_main.c	2009-11-04 12:13:56.000000000 +0100
++++ nfs-utils-1.2.1/tools/rpcgen/rpc_main.c	2010-01-16 11:22:02.359375000 +0100
+@@ -562,9 +562,6 @@ s_output(int argc, char **argv, char *in
+ 	  f_print(fout, "#include <sys/types.h>\n");
+ 
+ 	f_print(fout, "#include <memory.h>\n");
+-#ifndef linux
+-	f_print(fout, "#include <stropts.h>\n");
+-#endif
+ 	if (inetdflag || !tirpcflag ) {
+ 		f_print(fout, "#include <sys/socket.h>\n");
+ 		f_print(fout, "#include <netinet/in.h>\n");
diff --git a/package/nfs-utils/patches/patch-utils_mount_error_c b/package/nfs-utils/patches/patch-utils_mount_error_c
index ab4590270..641a482f2 100644
--- a/package/nfs-utils/patches/patch-utils_mount_error_c
+++ b/package/nfs-utils/patches/patch-utils_mount_error_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.3.orig/utils/mount/error.c	2008-07-27 23:01:45.000000000 +0200
-+++ nfs-utils-1.1.3/utils/mount/error.c	2008-10-06 16:58:40.000000000 +0200
+--- 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
 @@ -62,7 +62,7 @@ static int rpc_strerror(int spos)
  	char *tmp;
  
diff --git a/package/nfs-utils/patches/patch-utils_mountd_cache_c b/package/nfs-utils/patches/patch-utils_mountd_cache_c
deleted file mode 100644
index 5f46d3116..000000000
--- a/package/nfs-utils/patches/patch-utils_mountd_cache_c
+++ /dev/null
@@ -1,75 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.4.orig/utils/mountd/cache.c	2008-10-17 16:20:09.000000000 +0200
-+++ nfs-utils-1.1.4/utils/mountd/cache.c	2009-01-03 13:48:33.000000000 +0100
-@@ -118,54 +118,6 @@ void auth_unix_ip(FILE *f)
- 	free(he);
- }
- 
--void auth_unix_gid(FILE *f)
--{
--	/* Request are
--	 *  uid
--	 * reply is
--	 *  uid expiry count list of group ids
--	 */
--	int uid;
--	struct passwd *pw;
--	gid_t glist[100], *groups = glist;
--	int ngroups = 100;
--	int rv, i;
--	char *cp;
--
--	if (readline(fileno(f), &lbuf, &lbuflen) != 1)
--		return;
--
--	cp = lbuf;
--	if (qword_get_int(&cp, &uid) != 0)
--		return;
--
--	pw = getpwuid(uid);
--	if (!pw)
--		rv = -1;
--	else {
--		rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
--		if (rv == -1 && ngroups >= 100) {
--			groups = malloc(sizeof(gid_t)*ngroups);
--			if (!groups)
--				rv = -1;
--			else
--				rv = getgrouplist(pw->pw_name, pw->pw_gid,
--						  groups, &ngroups);
--		}
--	}
--	qword_printint(f, uid);
--	qword_printint(f, time(0)+30*60);
--	if (rv >= 0) {
--		qword_printint(f, ngroups);
--		for (i=0; i<ngroups; i++)
--			qword_printint(f, groups[i]);
--	} else
--		qword_printint(f, 0);
--	qword_eol(f);
--
--	if (groups != glist)
--		free(groups);
--}
- 
- #if USE_BLKID
- static const char *get_uuid_blkdev(char *path)
-@@ -730,7 +682,6 @@ struct {
- 	FILE *f;
- } cachelist[] = {
- 	{ "auth.unix.ip", auth_unix_ip},
--	{ "auth.unix.gid", auth_unix_gid},
- 	{ "nfsd.export", nfsd_export},
- 	{ "nfsd.fh", nfsd_fh},
- 	{ NULL, NULL }
-@@ -742,8 +693,6 @@ void cache_open(void) 
- 	int i;
- 	for (i=0; cachelist[i].cache_name; i++ ) {
- 		char path[100];
--		if (!manage_gids && cachelist[i].cache_handle == auth_unix_gid)
--			continue;
- 		sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name);
- 		cachelist[i].f = fopen(path, "r+");
- 	}
diff --git a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
index 61e42a7c6..e5569c82f 100644
--- a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
+++ b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.3.orig/utils/mountd/fsloc.c	2008-07-27 23:01:45.000000000 +0200
-+++ nfs-utils-1.1.3/utils/mountd/fsloc.c	2008-10-06 16:46:49.000000000 +0200
+--- nfs-utils-1.2.1.orig/utils/mountd/fsloc.c	2009-11-04 12:13:56.000000000 +0100
++++ nfs-utils-1.2.1/utils/mountd/fsloc.c	2009-12-25 19:26:25.000000000 +0100
 @@ -126,7 +126,7 @@ static struct servers *method_list(char 
  	struct servers *rv=NULL;