use nfsnobody for user/group

8 files changed, 44 insertions, 25 deletions

diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index cc168fc12..35c7adc78 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
 PKG_VERSION:=		1.2.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8395ac770720b83c5c469f88306d7765
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
diff --git a/package/nfs-utils/files/nfs-utils.postinst b/package/nfs-utils/files/nfs-utils.postinst
index 0334fcb40..6f89e0ae4 100644
--- a/package/nfs-utils/files/nfs-utils.postinst
+++ b/package/nfs-utils/files/nfs-utils.postinst
@@ -8,3 +8,6 @@ add_service nfs 2049/udp
 gid=$(get_next_gid)
 add_group nfs $gid
 add_user nfs $(get_next_uid) $gid /var/lib/nfs
+gid=$(get_next_gid)
+add_group nfsnobody $gid
+add_user nfsnobody $(get_next_uid) $gid /var/lib/nfs
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 65c51fcc9..a6a6ce545 100644
--- a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
+++ b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
@@ -1,5 +1,5 @@
---- 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
+--- nfs-utils-1.2.5.orig/support/nfs/nfs_mntent.c	2011-09-24 13:55:15.000000000 +0200
++++ nfs-utils-1.2.5/support/nfs/nfs_mntent.c	2012-02-27 17:39:34.000000000 +0100
 @@ -9,7 +9,7 @@
   */
  
@@ -8,8 +8,8 @@
 +#include <string.h>		/* for strchr */
  #include <ctype.h>		/* for isdigit */
  #include <sys/stat.h>		/* for umask */
- 
-@@ -163,7 +163,7 @@ nfs_getmntent (mntFILE *mfp) {
+ #include <unistd.h>		/* for ftruncate */
+@@ -172,7 +172,7 @@ nfs_getmntent (mntFILE *mfp) {
  			return NULL;
  
  		mfp->mntent_lineno++;
@@ -18,7 +18,7 @@
  		if (s == NULL) {
  			/* Missing final newline?  Otherwise extremely */
  			/* long line - assume file was corrupted */
-@@ -171,7 +171,7 @@ nfs_getmntent (mntFILE *mfp) {
+@@ -180,7 +180,7 @@ nfs_getmntent (mntFILE *mfp) {
  				fprintf(stderr, _("[mntent]: warning: no final "
  					"newline at the end of %s\n"),
  					mfp->mntent_file);
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in
index b6a50e54e..5f9b975f7 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.3.orig/tools/Makefile.in	2010-09-28 14:32:32.000000000 +0200
-+++ nfs-utils-1.2.3/tools/Makefile.in	2010-12-24 15:48:13.000000000 +0100
-@@ -77,7 +77,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
+--- 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
  	distdir
  ETAGS = etags
  CTAGS = ctags
@@ -9,7 +9,7 @@
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
-@@ -266,7 +266,7 @@ top_build_prefix = @top_build_prefix@
+@@ -270,7 +270,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 9e8eb3f6d..7f8ca34b0 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.3.orig/tools/locktest/Makefile.in	2010-09-28 14:32:32.000000000 +0200
-+++ nfs-utils-1.2.3/tools/locktest/Makefile.in	2010-12-24 15:40:35.000000000 +0100
-@@ -67,20 +67,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE
+--- 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
  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)
-@@ -101,15 +101,15 @@ AWK = @AWK@
+@@ -102,15 +102,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 eae3c5041..3c75f201d 100644
--- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
@@ -1,6 +1,6 @@
---- nfs-utils-1.2.3.orig/tools/rpcgen/Makefile.in	2010-09-28 14:32:33.000000000 +0200
-+++ nfs-utils-1.2.3/tools/rpcgen/Makefile.in	2011-02-06 16:48:47.000000000 +0100
-@@ -72,21 +72,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
+--- 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)
  rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -29,7 +29,7 @@
  SOURCES = $(rpcgen_SOURCES)
  DIST_SOURCES = $(rpcgen_SOURCES)
  ETAGS = etags
-@@ -97,7 +97,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+@@ -98,7 +98,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
  ALLOCA = @ALLOCA@
  AMTAR = @AMTAR@
  AM_CFLAGS = @AM_CFLAGS@
@@ -38,7 +38,7 @@
  AR = @AR@
  AUTOCONF = @AUTOCONF@
  AUTOHEADER = @AUTOHEADER@
-@@ -106,10 +106,10 @@ AWK = @AWK@
+@@ -107,10 +107,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@
-@@ -142,10 +142,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+@@ -143,10 +143,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
  K5VERS = @K5VERS@
  KRBCFLAGS = @KRBCFLAGS@
  KRBDIR = @KRBDIR@
@@ -64,7 +64,7 @@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LIBBLKID = @LIBBLKID@
  LIBBSD = @LIBBSD@
-@@ -308,7 +308,7 @@ clean-noinstPROGRAMS:
+@@ -312,7 +312,7 @@ clean-noinstPROGRAMS:
  	rm -f $$list
  rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) 
  	@rm -f rpcgen$(EXEEXT)
diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
index 7c9f3039e..5b77024e6 100644
--- a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
+++ b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
@@ -1,6 +1,6 @@
---- nfs-utils-1.2.3.orig/utils/gssd/Makefile.in	2010-09-28 14:32:33.000000000 +0200
-+++ nfs-utils-1.2.3/utils/gssd/Makefile.in	2011-01-21 17:35:20.288658843 +0100
-@@ -351,7 +351,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a 
+--- 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	2012-02-27 17:39:34.000000000 +0100
+@@ -355,7 +355,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a 
  		$(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
  
  gssd_LDFLAGS = $(KRBLDFLAGS)
@@ -9,7 +9,7 @@
  	      $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
  
  svcgssd_SOURCES = \
-@@ -369,11 +369,11 @@ svcgssd_LDADD = \
+@@ -375,11 +375,11 @@ svcgssd_LDADD = \
  	$(KRBLIBS)
  
  svcgssd_LDFLAGS = $(KRBLDFLAGS)
diff --git a/package/nfs-utils/patches/patch-utils_idmapd_idmapd_c b/package/nfs-utils/patches/patch-utils_idmapd_idmapd_c
new file mode 100644
index 000000000..b4f7e2ca6
--- /dev/null
+++ b/package/nfs-utils/patches/patch-utils_idmapd_idmapd_c
@@ -0,0 +1,16 @@
+--- nfs-utils-1.2.5.orig/utils/idmapd/idmapd.c	2011-09-24 13:55:15.000000000 +0200
++++ nfs-utils-1.2.5/utils/idmapd/idmapd.c	2012-02-29 14:09:32.000000000 +0100
+@@ -83,11 +83,11 @@
+ #endif
+ 
+ #ifndef NFS4NOBODY_USER
+-#define NFS4NOBODY_USER "nobody"
++#define NFS4NOBODY_USER "nfsnobody"
+ #endif
+ 
+ #ifndef NFS4NOBODY_GROUP
+-#define NFS4NOBODY_GROUP "nobody"
++#define NFS4NOBODY_GROUP "nfsnobody"
+ #endif
+ 
+ /* From Niels */