Changeset 15136


Ignore:
Timestamp:
2009-04-07T16:14:25+02:00 (8 years ago)
Author:
florian
Message:

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

Location:
packages/net/nfs-kernel-server
Files:
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/nfs-kernel-server/Makefile

    r12175 r15136  
    44 
    55PKG_NAME:=nfs-kernel-server 
    6 PKG_VERSION:=1.0.7 
     6PKG_VERSION:=1.1.5 
    77PKG_RELEASE:=1 
    8 PKG_MD5SUM:=8f863120261cd572ad320a9152581e11 
     8PKG_MD5SUM:=2848072a5e53840b9bc520fbb6782b57 
    99 
    1010PKG_SOURCE_URL:=@SF/nfs 
    11 PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.gz 
     11PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2 
    1212 
    1313PKG_BUILD_DIR:=$(BUILD_DIR)/nfs-utils-$(PKG_VERSION) 
     
    2020TITLE:=Kernel NFS server support 
    2121URL:=http://nfs.sourceforge.net/ 
    22 DEPENDS:=+kmod-fs-nfsd +kmod-fs-nfs +portmap 
     22DEPENDS:=+kmod-fs-nfsd +kmod-fs-nfs +portmap +libwrap +libevent +libblkid 
    2323endef 
    2424 
     
    3232TITLE:=NFS server utils 
    3333URL:=http://nfs.sourceforge.net 
    34 DEPENDS:=nfs-kernel-server 
     34DEPENDS:=+nfs-kernel-server 
    3535endef 
    3636 
     
    4343endef 
    4444 
    45 define Build/Configure 
    46         $(call Build/Configure/Default, \ 
    47                 --enable-static \ 
    48                 --enable-shared \ 
    49                 --disable-nfsv4 \ 
    50                 --disable-gss \ 
    51         ) 
    52 endef 
     45CONFIGURE_ARGS += --disable-gss --disable-nfsv4 --enable-static --enable-shared 
     46 
     47TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib  
     48TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib  
    5349 
    5450define Build/Compile 
    55         rm -rf $(PKG_INSTALL_DIR) 
    56         mkdir -p $(PKG_INSTALL_DIR) 
    57         $(MAKE) -C $(PKG_BUILD_DIR) 
     51        $(call Build/Compile/Default, \ 
     52                OPT="$(TARGET_CFLAGS)" \ 
     53                INSTALLSUID="install -m 4755" \ 
     54                DESTDIR="$(PKG_INSTALL_DIR)" \ 
     55                all install \ 
     56        ) 
    5857endef 
    5958 
     
    6261        $(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports 
    6362        $(INSTALL_BIN) ./files/nfsd.init $(1)/etc/init.d/nfsd 
    64         $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/lockd/lockd $(1)/usr/sbin/rpc.lockd 
    6563        $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/statd/statd $(1)/usr/sbin/rpc.statd 
    6664        $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsd/nfsd $(1)/usr/sbin/rpc.nfsd 
  • packages/net/nfs-kernel-server/patches/001-nfs_utils_1.0.6_uclibc.patch

    r10055 r15136  
    1 Index: nfs-utils-1.0.7/support/nfs/svc_socket.c 
    2 =================================================================== 
    3 --- nfs-utils-1.0.7.orig/support/nfs/svc_socket.c       2007-12-30 16:52:24.647893048 +0100 
    4 +++ nfs-utils-1.0.7/support/nfs/svc_socket.c    2007-12-30 16:53:46.880579218 +0100 
    5 @@ -63,9 +63,10 @@ 
    6         } 
    7      } 
     1diff -urN nfs-utils-1.1.5/support/nfs/svc_socket.c nfs-utils-1.1.5.new/support/nfs/svc_socket.c 
     2--- nfs-utils-1.1.5/support/nfs/svc_socket.c    2009-03-05 12:42:56.000000000 +0100 
     3+++ nfs-utils-1.1.5.new/support/nfs/svc_socket.c        2009-04-07 16:04:54.000000000 +0200 
     4@@ -66,7 +66,7 @@ 
    85  
    9 -  __bzero ((char *) &addr, sizeof (addr)); 
    10 +  memset((char *) &addr, 0, sizeof (addr)); 
     6   memset (&addr, 0, sizeof (addr)); 
    117   addr.sin_family = AF_INET; 
    12   
    13 +#ifndef __UCLIBC__     /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ 
     8- 
     9+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ 
    1410   ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata, 
    1511                          &rpcp); 
    1612   if (ret == 0 && rpcp != NULL) 
    17 @@ -99,6 +100,7 @@ 
     13@@ -100,6 +100,7 @@ 
    1814        } 
    1915     } 
    2016   else 
    21 +#endif /* ! __UCLIBC__ */ 
     17+#endif /* __UCLIBC__ */ 
    2218     { 
    23        if (bindresvport (sock, &addr)) 
    24         { 
     19          addr.sin_port = 0; 
     20          if (bind (sock, (struct sockaddr *) &addr, len) < 0) 
     21diff -urN nfs-utils-1.1.5/utils/mountd/cache.c nfs-utils-1.1.5.new/utils/mountd/cache.c 
     22--- nfs-utils-1.1.5/utils/mountd/cache.c        2009-03-05 12:42:56.000000000 +0100 
     23+++ nfs-utils-1.1.5.new/utils/mountd/cache.c    2009-04-07 16:11:09.000000000 +0200 
     24@@ -142,6 +142,7 @@ 
     25        pw = getpwuid(uid); 
     26        if (!pw) 
     27                rv = -1; 
     28+#ifndef __UCLIBC__ 
     29        else { 
     30                rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); 
     31                if (rv == -1 && ngroups >= 100) { 
     32@@ -153,6 +154,7 @@ 
     33                                                  groups, &ngroups); 
     34                } 
     35        } 
     36+#endif /* __UCLIBC__ */ 
     37        qword_printint(f, uid); 
     38        qword_printint(f, time(0)+30*60); 
     39        if (rv >= 0) { 
Note: See TracChangeset for help on using the changeset viewer.