diff options
| author | Peter Wagner <tripolar@gmx.at> | 2014-10-18 15:34:22 +0200 |
|---|---|---|
| committer | Peter Wagner <tripolar@gmx.at> | 2014-10-18 15:34:22 +0200 |
| commit | ad4da82a8eca9d33b94edc600af7cba093c4f244 (patch) | |
| tree | 7bdd3ea491279a8b4a41b0e74a652073e9f96158 | |
| parent | a53a4631cf4e4a04fa2421a80c4734425fe6b195 (diff) | |
nfs-kernel-server: update to 1.3.1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
| -rw-r--r-- | net/nfs-kernel-server/Makefile | 4 | ||||
| -rw-r--r-- | net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch | 36 | ||||
| -rw-r--r-- | net/nfs-kernel-server/patches/100-no_malloc_h.patch (renamed from net/nfs-kernel-server/patches/101-no_malloc_h.patch) | 0 |
3 files changed, 2 insertions, 38 deletions
diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index b5cfcd757..1a3468f4a 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfs-kernel-server -PKG_VERSION:=1.3.0 +PKG_VERSION:=1.3.1 PKG_RELEASE:=1 -PKG_MD5SUM:=3ac3726eda563946d1f44ac3e5b61d56 +PKG_MD5SUM:=97f157f954edb6d4d4385a0c5986f36f PKG_SOURCE_URL:=@SF/nfs PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2 diff --git a/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch b/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch deleted file mode 100644 index 5e4877ef4..000000000 --- a/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/support/nfs/svc_socket.c -+++ b/support/nfs/svc_socket.c -@@ -40,10 +40,13 @@ int getservport(u_long number, const cha - char rpcdata[1024], servdata[1024]; - struct rpcent rpcbuf, *rpcp; - struct servent servbuf, *servp = NULL; -- int ret; -- -+ int ret=0; -+#ifndef __UCLIBC__ - ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata, - &rpcp); -+#else -+ rpcp = getrpcbynumber (number); -+#endif - if (ret == 0 && rpcp != NULL) { - /* First try name. */ - ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, ---- a/utils/mountd/cache.c -+++ b/utils/mountd/cache.c -@@ -166,6 +166,7 @@ static void auth_unix_gid(FILE *f) - pw = getpwuid(uid); - if (!pw) - rv = -1; -+#ifndef __UCLIBC__ - else { - rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); - if (rv == -1 && ngroups >= groups_len) { -@@ -180,6 +181,7 @@ static void auth_unix_gid(FILE *f) - } - } - } -+#endif - qword_printuint(f, uid); - qword_printtimefrom(f, DEFAULT_TTL); - if (rv >= 0) { diff --git a/net/nfs-kernel-server/patches/101-no_malloc_h.patch b/net/nfs-kernel-server/patches/100-no_malloc_h.patch index afe4c98e0..afe4c98e0 100644 --- a/net/nfs-kernel-server/patches/101-no_malloc_h.patch +++ b/net/nfs-kernel-server/patches/100-no_malloc_h.patch |