update and fix nfs-utils with kerberos support

16 files changed, 17 insertions, 424 deletions

diff --git a/package/Config.in b/package/Config.in
index 63ae10491..a7ad7fe12 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -432,6 +432,7 @@ source "package/libgd/Config.in.lib"
 source "package/gdbm/Config.in"
 source "package/gdbm/Config.in.lib"
 source "package/libgssglue/Config.in"
+source "package/libgssglue/Config.in.lib"
 source "package/gmp/Config.in" 
 source "package/gmp/Config.in.lib" 
 source "package/gnutls/Config.in"
@@ -502,6 +503,7 @@ source "package/speex/Config.in"
 source "package/openssl/Config.in.lib"
 source "package/sqlite/Config.in.lib"
 source "package/librpcsecgss/Config.in"
+source "package/librpcsecgss/Config.in.lib"
 source "package/libshout/Config.in"
 source "package/libshout/Config.in.lib"
 source "package/libsigc++/Config.in"
diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile
index d5f893a80..c239cc54f 100644
--- a/package/libgssglue/Makefile
+++ b/package/libgssglue/Makefile
@@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBGSSGLUE,libgssglue,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBGSSGLUE)/usr/lib
diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile
index ed47b9cd5..50b856deb 100644
--- a/package/librpcsecgss/Makefile
+++ b/package/librpcsecgss/Makefile
@@ -4,23 +4,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		librpcsecgss
-PKG_VERSION:=		0.18
+PKG_VERSION:=		0.19
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f2c4a69c5a32f62b762a569b8d962156
+PKG_MD5SUM:=		b45ed565bdc3099023aa35830ec92997
 PKG_DESCR:=		Secure RPC library for NFSv4
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		libgssglue
+PKG_BUILDDEP+=		libgssglue
 PKG_SITES:=		http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autotool gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
-
-post-extract:
-	$(CP) ./files/librpcsecgss.pc* $(WRKSRC)/
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBRPCSECGSS)/usr/lib
diff --git a/package/librpcsecgss/files/librpcsecgss.pc.in.gssglue b/package/librpcsecgss/files/librpcsecgss.pc.in
index d67b7e4b6..d67b7e4b6 100644
--- a/package/librpcsecgss/files/librpcsecgss.pc.in.gssglue
+++ b/package/librpcsecgss/files/librpcsecgss.pc.in
diff --git a/package/librpcsecgss/patches/patch-configure_in b/package/librpcsecgss/patches/patch-configure_in
deleted file mode 100644
index a57facbc6..000000000
--- a/package/librpcsecgss/patches/patch-configure_in
+++ /dev/null
@@ -1,25 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- librpcsecgss-0.18.orig/configure.in	2008-04-09 00:05:40.000000000 +0200
-+++ librpcsecgss-0.18/configure.in	2009-01-30 16:11:01.000000000 +0100
-@@ -10,12 +10,17 @@ AM_PROG_LIBTOOL
- # Checks for programs.
- AC_PROG_CC
- AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- 
- # Checks for libraries.
--PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1], [],
--  [AC_MSG_ERROR([Unable to locate information required to use libgssglue.
--  If you have pkgconfig installed, you might try setting environment
--  variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])
-+PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1],
-+  [echo GSSGLUE found; cp librpcsecgss.pc.in.gssglue librpcsecgss.pc.in],
-+  [PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi],
-+    [echo HEIMDAL found; cp librpcsecgss.pc.in.heimdal librpcsecgss.pc.in],
-+    [AC_MSG_ERROR([Unable to locate information required to use libgssglue.
-+    If you have pkgconfig installed, you might try setting environment
-+    variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])])
-+
- 
- # Checks for header files.
- AC_HEADER_STDC
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 8b48c0818..987051b3e 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtirpc
-PKG_VERSION:=		0.2.0
+PKG_VERSION:=		0.2.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libgssglue
-PKG_MD5SUM:=		b3b513a8825aa227deac63ea38c64f41
+PKG_MD5SUM:=		d77eb15f464bf9d6e66259eaf78b2a4e
 PKG_DESCR:=		a transport independent RPC library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libgssglue
+PKG_BUILDDEP+=		libgssglue
 PKG_URL:=		http://sourceforge.net/projects/libtirpc
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libtirpc/}
 
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTIRPC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autotool gnu
+CONFIGURE_STYLE:=	gnu
 
 ifneq (${ADK_COMPILE_NFS_UTILS_WITH_KERBEROS},y)
 CONFIGURE_ARGS+=	--disable-gss
diff --git a/package/libtirpc/patches/patch-Makefile_in b/package/libtirpc/patches/patch-Makefile_in
deleted file mode 100644
index 21dd59d0c..000000000
--- a/package/libtirpc/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtirpc-0.2.0.orig/Makefile.in	2009-05-29 00:13:40.000000000 +0200
-+++ libtirpc-0.2.0/Makefile.in	2009-05-31 05:10:59.000000000 +0200
-@@ -196,7 +196,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = src man
diff --git a/package/libtirpc/patches/patch-aclocal_m4 b/package/libtirpc/patches/patch-aclocal_m4
deleted file mode 100644
index 563851f33..000000000
--- a/package/libtirpc/patches/patch-aclocal_m4
+++ /dev/null
@@ -1,162 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtirpc-0.2.0.orig/aclocal.m4	2009-05-29 00:13:37.000000000 +0200
-+++ libtirpc-0.2.0/aclocal.m4	2009-05-31 05:10:54.000000000 +0200
-@@ -13,15 +13,15 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(AC_AUTOCONF_VERSION, [2.63],,
--[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# serial 52 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
- 
- 
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -645,7 +645,6 @@ s390*-*linux*|sparc*-*linux*)
-       esac
-       ;;
-     *64-bit*)
--      libsuff=64
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -1708,13 +1707,11 @@ linux* | k*bsd*-gnu)
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -1726,6 +1723,18 @@ linux* | k*bsd*-gnu)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -2507,7 +2516,7 @@ linux* | k*bsd*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -3514,7 +3523,7 @@ case $host_os in
- 	;;
-     esac
-     ;;
--  netbsd*)
-+  netbsd* | netbsdelf*-gnu)
-     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-       wlarc=
-@@ -5206,7 +5215,7 @@ AC_MSG_CHECKING([for $compiler option to
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
-@@ -5583,6 +5592,9 @@ ifelse([$1],[CXX],[
-   cygwin* | mingw*)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-   *)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -5791,12 +5803,13 @@ EOF
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -6227,7 +6240,7 @@ _LT_EOF
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -6726,14 +6739,16 @@ fi])
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$$1"; then
--    pkg_cv_[]$1="$$1"
-- elif test -n "$PKG_CONFIG"; then
--    PKG_CHECK_EXISTS([$3],
--                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
--		     [pkg_failed=yes])
-- else
--    pkg_failed=untried
-+[if test -n "$PKG_CONFIG"; then
-+    if test -n "$$1"; then
-+        pkg_cv_[]$1="$$1"
-+    else
-+        PKG_CHECK_EXISTS([$3],
-+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+			 [pkg_failed=yes])
-+    fi
-+else
-+	pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
- 
-@@ -6777,9 +6792,9 @@ See the pkg-config man page for more det
- if test $pkg_failed = yes; then
-         _PKG_SHORT_ERRORS_SUPPORTED
-         if test $_pkg_short_errors_supported = yes; then
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-         else 
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff --git a/package/libtirpc/patches/patch-config_h_in b/package/libtirpc/patches/patch-config_h_in
deleted file mode 100644
index 55ce8ed1a..000000000
--- a/package/libtirpc/patches/patch-config_h_in
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtirpc-0.2.0.orig/config.h.in	2009-05-29 00:13:39.000000000 +0200
-+++ libtirpc-0.2.0/config.h.in	2009-05-29 20:19:05.186861644 +0200
-@@ -90,6 +90,10 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
- /* Name of package */
- #undef PACKAGE
- 
diff --git a/package/libtirpc/patches/patch-doc_Makefile_in b/package/libtirpc/patches/patch-doc_Makefile_in
deleted file mode 100644
index 8c00af02b..000000000
--- a/package/libtirpc/patches/patch-doc_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtirpc-0.2.0.orig/doc/Makefile.in	2009-05-29 00:13:40.000000000 +0200
-+++ libtirpc-0.2.0/doc/Makefile.in	2009-05-31 05:10:59.000000000 +0200
-@@ -153,7 +153,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- all: all-am
diff --git a/package/libtirpc/patches/patch-man_Makefile_in b/package/libtirpc/patches/patch-man_Makefile_in
deleted file mode 100644
index 1621713f5..000000000
--- a/package/libtirpc/patches/patch-man_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtirpc-0.2.0.orig/man/Makefile.in	2009-05-29 00:13:40.000000000 +0200
-+++ libtirpc-0.2.0/man/Makefile.in	2009-05-31 05:10:59.000000000 +0200
-@@ -158,7 +158,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- man5_MANS = netconfig.5
diff --git a/package/libtirpc/patches/patch-src_Makefile_am b/package/libtirpc/patches/patch-src_Makefile_am
deleted file mode 100644
index 6be307560..000000000
--- a/package/libtirpc/patches/patch-src_Makefile_am
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtirpc-0.2.0.orig/src/Makefile.am	2009-05-28 21:25:26.000000000 +0200
-+++ libtirpc-0.2.0/src/Makefile.am	2009-05-29 20:21:57.173677835 +0200
-@@ -49,8 +49,7 @@ libtirpc_la_SOURCES = auth_none.c auth_u
-         pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \
-         rpc_callmsg.c rpc_generic.c rpc_soc.c 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
-+        svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c
- 
- ## XDR
- libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
diff --git a/package/libtirpc/patches/patch-src_Makefile_in b/package/libtirpc/patches/patch-src_Makefile_in
deleted file mode 100644
index 9aa2129c1..000000000
--- a/package/libtirpc/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,94 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtirpc-0.2.0.orig/src/Makefile.in	2009-05-29 00:13:40.000000000 +0200
-+++ libtirpc-0.2.0/src/Makefile.in	2009-05-31 05:10:59.000000000 +0200
-@@ -64,9 +64,8 @@ am__libtirpc_la_SOURCES_DIST = auth_none
- 	rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \
- 	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 xdr.c xdr_rec.c xdr_array.c xdr_float.c \
--	xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \
-+	svc_simple.c svc_vc.c getpeereid.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
- @GSS_TRUE@am__objects_1 = libtirpc_la-auth_gss.lo \
- @GSS_TRUE@	libtirpc_la-authgss_prot.lo \
-@@ -93,12 +92,10 @@ 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-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 libtirpc_la-xdr_stdio.lo \
--	$(am__objects_1)
-+	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 \
-+	libtirpc_la-xdr_stdio.lo $(am__objects_1)
- libtirpc_la_OBJECTS = $(am_libtirpc_la_OBJECTS)
- libtirpc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtirpc_la_CFLAGS) \
-@@ -230,7 +227,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I../tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
-@@ -278,9 +274,9 @@ libtirpc_la_SOURCES = auth_none.c auth_u
- 	rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \
- 	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 xdr.c xdr_rec.c xdr_array.c xdr_float.c \
--	xdr_mem.c xdr_reference.c xdr_stdio.c $(am__append_1)
-+	svc_simple.c svc_vc.c getpeereid.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)
- all: all-am
- 
-@@ -351,12 +347,9 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_des.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_gss.Plo@am__quote@
- @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-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@
-@@ -715,27 +708,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@	mv -f $(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@	mv -f $(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@	mv -f $(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@	mv -f $(DEPDIR)/libtirpc_la-xdr.Tpo $(DEPDIR)/libtirpc_la-xdr.Plo
diff --git a/package/libtirpc/patches/patch-src_rpc_soc_c b/package/libtirpc/patches/patch-src_rpc_soc_c
deleted file mode 100644
index 9450d73e6..000000000
--- a/package/libtirpc/patches/patch-src_rpc_soc_c
+++ /dev/null
@@ -1,41 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtirpc-0.2.0.orig/src/rpc_soc.c	2009-05-28 21:25:26.000000000 +0200
-+++ libtirpc-0.2.0/src/rpc_soc.c	2009-05-31 06:11:27.000000000 +0200
-@@ -479,37 +479,6 @@ clnt_broadcast(prog, vers, proc, xargs, 
- 	    (resultproc_t) rpc_wrap_bcast, "udp");
- }
- 
--/*
-- * Create the client des authentication object. Obsoleted by
-- * authdes_seccreate().
-- */
--AUTH *
--authdes_create(servername, window, syncaddr, ckey)
--	char *servername;		/* network name of server */
--	u_int window;			/* time to live */
--	struct sockaddr *syncaddr;	/* optional hostaddr to sync with */
--	des_block *ckey;		/* optional conversation key to use */
--{
--	AUTH *dummy;
--	AUTH *nauth;
--	char hostname[NI_MAXHOST];
--
--	if (syncaddr) {
--		/*
--		 * Change addr to hostname, because that is the way
--		 * new interface takes it.
--		 */
--		if (getnameinfo(syncaddr, sizeof(syncaddr), hostname,
--		    sizeof hostname, NULL, 0, 0) != 0)
--			goto fallback;
--
--		nauth = authdes_seccreate(servername, window, hostname, ckey);
--		return (nauth);
--	}
--fallback:
--	dummy = authdes_seccreate(servername, window, NULL, ckey);
--	return (dummy);
--}
- 
- /*
-  * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
diff --git a/package/libtirpc/patches/patch-src_svc_c b/package/libtirpc/patches/patch-src_svc_c
deleted file mode 100644
index 48f84da1c..000000000
--- a/package/libtirpc/patches/patch-src_svc_c
+++ /dev/null
@@ -1,26 +0,0 @@
---- libtirpc-0.2.0.orig/src/svc.c	2009-05-28 21:25:26.000000000 +0200
-+++ libtirpc-0.2.0/src/svc.c	2009-06-27 10:18:05.491935140 +0200
-@@ -77,7 +77,9 @@ static struct svc_callout
- 
- extern rwlock_t svc_lock;
- extern rwlock_t svc_fd_lock;
-+#ifdef HAVE_RPCSEC_GSS
- extern struct svc_auth_ops svc_auth_gss_ops;
-+#endif
- 
- static struct svc_callout *svc_find (rpcprog_t, rpcvers_t,
- 				     struct svc_callout **, char *);
-@@ -715,11 +717,13 @@ svc_getreq_common (fd)
- 	  SVC_DESTROY (xprt);
- 	  break;
- 	}
-+#ifdef HAVE_RPCSEC_GSS
-       else if ((xprt->xp_auth != NULL) &&
- 	       (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops))
- 	{
- 	  xprt->xp_auth = NULL;
- 	}
-+#endif
-     }
-   while (stat == XPRT_MOREREQS);
- }
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index b2c2c216f..76c7e66cc 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -34,7 +34,7 @@ TCPPFLAGS+=		-I${LINUX_DIR}/include
 
 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"
 else