[package] update nfs-kernel-server to 1.1.5 (#4882)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@15136 3c298f89-4303-0410-b956-a3cf2f4a3e73

net/nfs-kernel-server/Makefile

@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfs-kernel-server
-PKG_VERSION:=1.0.7
+PKG_VERSION:=1.1.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=8f863120261cd572ad320a9152581e11
+PKG_MD5SUM:=2848072a5e53840b9bc520fbb6782b57
 
 PKG_SOURCE_URL:=@SF/nfs
-PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/nfs-utils-$(PKG_VERSION)
 
@@ -19,7 +19,7 @@ SECTION:=net
 CATEGORY:=Network
 TITLE:=Kernel NFS server support
 URL:=http://nfs.sourceforge.net/
-DEPENDS:=+kmod-fs-nfsd +kmod-fs-nfs +portmap
+DEPENDS:=+kmod-fs-nfsd +kmod-fs-nfs +portmap +libwrap +libevent +libblkid
 endef
 
 define Package/nfs-kernel-server/description
@@ -31,7 +31,7 @@ SECTION:=net
 CATEGORY:=Network
 TITLE:=NFS server utils
 URL:=http://nfs.sourceforge.net
-DEPENDS:=nfs-kernel-server
+DEPENDS:=+nfs-kernel-server
 endef
 
 define Package/nfs-kernel-server-utils/description
@@ -42,26 +42,24 @@ define Package/nfs-kernel-server/conffiles
 /etc/exports
 endef
 
-define Build/Configure
+CONFIGURE_ARGS += --disable-gss --disable-nfsv4 --enable-static --enable-shared
-	$(call Build/Configure/Default, \
+
-		--enable-static \
+TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib 
-		--enable-shared \
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib 
-		--disable-nfsv4 \
-		--disable-gss \
-	)
-endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
+        $(call Build/Compile/Default, \
-	mkdir -p $(PKG_INSTALL_DIR)
+                OPT="$(TARGET_CFLAGS)" \
-	$(MAKE) -C $(PKG_BUILD_DIR)
+                INSTALLSUID="install -m 4755" \
+                DESTDIR="$(PKG_INSTALL_DIR)" \
+                all install \
+        )
 endef
 
 define Package/nfs-kernel-server/install
 	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
 	$(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports
 	$(INSTALL_BIN) ./files/nfsd.init $(1)/etc/init.d/nfsd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/lockd/lockd $(1)/usr/sbin/rpc.lockd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/statd/statd $(1)/usr/sbin/rpc.statd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsd/nfsd $(1)/usr/sbin/rpc.nfsd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/mountd/mountd $(1)/usr/sbin/rpc.mountd

net/nfs-kernel-server/patches/001-nfs_utils_1.0.6_uclibc.patch

@@ -1,24 +1,39 @@
-Index: nfs-utils-1.0.7/support/nfs/svc_socket.c
+diff -urN nfs-utils-1.1.5/support/nfs/svc_socket.c nfs-utils-1.1.5.new/support/nfs/svc_socket.c
-===================================================================
+--- nfs-utils-1.1.5/support/nfs/svc_socket.c	2009-03-05 12:42:56.000000000 +0100
---- nfs-utils-1.0.7.orig/support/nfs/svc_socket.c	2007-12-30 16:52:24.647893048 +0100
++++ nfs-utils-1.1.5.new/support/nfs/svc_socket.c	2009-04-07 16:04:54.000000000 +0200
-+++ nfs-utils-1.0.7/support/nfs/svc_socket.c	2007-12-30 16:53:46.880579218 +0100
+@@ -66,7 +66,7 @@
-@@ -63,9 +63,10 @@
- 	}
-     }
  
--  __bzero ((char *) &addr, sizeof (addr));
+   memset (&addr, 0, sizeof (addr));
-+  memset((char *) &addr, 0, sizeof (addr));
    addr.sin_family = AF_INET;
- 
+-
-+#ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
++#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
    ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
  			  &rpcp);
    if (ret == 0 && rpcp != NULL)
-@@ -99,6 +100,7 @@
+@@ -100,6 +100,7 @@
  	}
      }
    else
-+#endif /* ! __UCLIBC__ */
++#endif /* __UCLIBC__ */
      {
-       if (bindresvport (sock, &addr))
+ 	  addr.sin_port = 0;
- 	{
+ 	  if (bind (sock, (struct sockaddr *) &addr, len) < 0)
+diff -urN nfs-utils-1.1.5/utils/mountd/cache.c nfs-utils-1.1.5.new/utils/mountd/cache.c
+--- nfs-utils-1.1.5/utils/mountd/cache.c	2009-03-05 12:42:56.000000000 +0100
++++ nfs-utils-1.1.5.new/utils/mountd/cache.c	2009-04-07 16:11:09.000000000 +0200
+@@ -142,6 +142,7 @@
+ 	pw = getpwuid(uid);
+ 	if (!pw)
+ 		rv = -1;
++#ifndef __UCLIBC__
+ 	else {
+ 		rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
+ 		if (rv == -1 && ngroups >= 100) {
+@@ -153,6 +154,7 @@
+ 						  groups, &ngroups);
+ 		}
+ 	}
++#endif /* __UCLIBC__ */
+ 	qword_printint(f, uid);
+ 	qword_printint(f, time(0)+30*60);
+ 	if (rv >= 0) {

net/nfs-kernel-server/patches/004-linux_version_code.patch

@@ -1,14 +0,0 @@
-diff -urN nfs-utils-1.0.7/tools/getkversion/getkversion.c nfs-utils-1.0.7.new/tools/getkversion/getkversion.c
---- nfs-utils-1.0.7/tools/getkversion/getkversion.c	1999-10-19 01:21:12.000000000 +0200
-+++ nfs-utils-1.0.7.new/tools/getkversion/getkversion.c	2007-01-05 23:25:14.000000000 +0100
-@@ -12,6 +12,10 @@
- int
- main(void)	/* This is for Dan Popp ;) */
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+        printf("%s\n", LINUX_VERSION_CODE);
-+#else
- 	printf("%s\n", UTS_RELEASE);
-+#endif  
- 	return 0;
- }