Changeset 28743


Ignore:
Timestamp:
2011-11-04T00:25:15+01:00 (6 years ago)
Author:
tripolar
Message:

[packages] update nfs-kernel-server and nfs-utils to v1.2.5
rename patches and remove 002-no_ttycom_h.patch - it not needed anymore

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

Legend:

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

    r25842 r28743  
    88 
    99PKG_NAME:=nfs-kernel-server 
    10 PKG_VERSION:=1.1.6 
     10PKG_VERSION:=1.2.5 
    1111PKG_RELEASE:=1 
    12 PKG_MD5SUM:=b0d1b8ec5c8c081a340cfc77bb8670cd 
     12PKG_MD5SUM:=8395ac770720b83c5c469f88306d7765 
    1313 
    1414PKG_SOURCE_URL:=@SF/nfs 
     
    7474        --disable-gss \ 
    7575        --disable-nfsv4 \ 
     76        --disable-nfsv41 \ 
    7677        --enable-static \ 
    7778        --enable-shared 
     
    8990        --disable-gss \ 
    9091        --disable-nfsv4 \ 
     92        --disable-nfsv41 \ 
    9193        --without-tcp-wrappers 
    9294 
  • packages/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch

    r28742 r28743  
     1--- a/support/include/sockaddr.h 
     2+++ b/support/include/sockaddr.h 
     3@@ -20,7 +20,10 @@ 
     4 #ifndef NFS_UTILS_SOCKADDR_H 
     5 #define NFS_UTILS_SOCKADDR_H 
     6  
     7+/* uClibc doesn't have/need libio.h */ 
     8+#ifndef __UCLIBC__ 
     9 #include <libio.h> 
     10+#endif 
     11 #include <stdbool.h> 
     12 #include <sys/socket.h> 
     13 #include <netinet/in.h> 
     14--- a/support/nfs/svc_socket.c 
     15+++ b/support/nfs/svc_socket.c 
     16@@ -40,10 +40,13 @@ int getservport(u_long number, const cha 
     17        char rpcdata[1024], servdata[1024]; 
     18        struct rpcent rpcbuf, *rpcp; 
     19        struct servent servbuf, *servp = NULL; 
     20-       int ret; 
     21- 
     22+       int ret=0; 
     23+#ifndef __UCLIBC__ 
     24        ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata, 
     25                                &rpcp); 
     26+#else 
     27+       rpcp = getrpcbynumber (number); 
     28+#endif 
     29        if (ret == 0 && rpcp != NULL) { 
     30                /* First try name.  */ 
     31                ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, 
    132--- a/utils/mountd/cache.c 
    233+++ b/utils/mountd/cache.c 
    3 @@ -142,6 +142,7 @@ void auth_unix_gid(FILE *f) 
     34@@ -162,6 +162,7 @@ static void auth_unix_gid(FILE *f) 
    435        pw = getpwuid(uid); 
    536        if (!pw) 
     
    839        else { 
    940                rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); 
    10                 if (rv == -1 && ngroups >= 100) { 
    11 @@ -153,6 +154,7 @@ void auth_unix_gid(FILE *f) 
    12                                                   groups, &ngroups); 
     41                if (rv == -1 && ngroups >= groups_len) { 
     42@@ -176,6 +177,7 @@ static void auth_unix_gid(FILE *f) 
     43                        } 
    1344                } 
    1445        } 
    15 +#endif /* __UCLIBC__ */ 
    16         qword_printint(f, uid); 
    17         qword_printint(f, time(0)+30*60); 
     46+#endif 
     47        qword_printuint(f, uid); 
     48        qword_printuint(f, time(0) + DEFAULT_TTL); 
    1849        if (rv >= 0) { 
    19 --- a/support/nfs/svc_socket.c 
    20 +++ b/support/nfs/svc_socket.c 
    21 @@ -66,9 +66,13 @@ svc_socket (u_long number, int type, int 
    22   
    23    memset (&addr, 0, sizeof (addr)); 
    24    addr.sin_family = AF_INET; 
    25 - 
    26 +#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ 
    27    ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata, 
    28                           &rpcp); 
    29 +#else 
    30 +  rpcp = getrpcbynumber (number); 
    31 +  ret = 0; 
    32 +#endif 
    33    if (ret == 0 && rpcp != NULL) 
    34      { 
    35        /* First try name.  */ 
  • packages/net/nfs-kernel-server/patches/101-no_malloc_h.patch

    r28742 r28743  
    11--- a/tools/rpcgen/rpc_cout.c 
    22+++ b/tools/rpcgen/rpc_cout.c 
    3 @@ -38,7 +38,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1 
     3@@ -36,7 +36,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1 
    44 #include <stdio.h> 
    55 #include <string.h> 
Note: See TracChangeset for help on using the changeset viewer.