From 13bda64f2efda4c8d7358cf5836f51a2a3c396d2 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Wed, 8 Jul 2020 23:08:13 +0800
Subject: [PATCH] nfs-kernel-server: switch to v2.3.4

---
 net/nfs-kernel-server/Makefile                      |  6 +++---
 net/nfs-kernel-server/patches/100-no_malloc_h.patch | 10 ++++++++++
 .../patches/102-uclibc-ns-maxmsg.patch              | 13 -------------
 3 files changed, 13 insertions(+), 16 deletions(-)
 create mode 100644 net/nfs-kernel-server/patches/100-no_malloc_h.patch
 delete mode 100644 net/nfs-kernel-server/patches/102-uclibc-ns-maxmsg.patch

diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile
index be5f9ab9..38947704 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:=2.5.1
-PKG_RELEASE:=1
-PKG_HASH:=446ff6d2b039dedb0de96b88a3677516c9314613fc6f28b7b6e94c51fb375195
+PKG_VERSION:=2.3.4
+PKG_RELEASE:=2
+PKG_HASH:=8a6bafd5a33c4259e6e5093d126384cbe33acb10135578b5faa60c40f2f5e995
 
 PKG_SOURCE_URL:=@SF/nfs
 PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.xz
diff --git a/net/nfs-kernel-server/patches/100-no_malloc_h.patch b/net/nfs-kernel-server/patches/100-no_malloc_h.patch
new file mode 100644
index 00000000..afe4c98e
--- /dev/null
+++ b/net/nfs-kernel-server/patches/100-no_malloc_h.patch
@@ -0,0 +1,10 @@
+--- a/tools/rpcgen/rpc_cout.c
++++ b/tools/rpcgen/rpc_cout.c
+@@ -36,7 +36,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include <ctype.h>
+ #include "rpc_parse.h"
+ #include "rpc_util.h"
diff --git a/net/nfs-kernel-server/patches/102-uclibc-ns-maxmsg.patch b/net/nfs-kernel-server/patches/102-uclibc-ns-maxmsg.patch
deleted file mode 100644
index 98d77250..00000000
--- a/net/nfs-kernel-server/patches/102-uclibc-ns-maxmsg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/support/nfsidmap/libnfsidmap.c
-+++ b/support/nfsidmap/libnfsidmap.c
-@@ -89,6 +89,10 @@ gid_t nobody_gid = (gid_t)-1;
- #define NFS4DNSTXTREC "_nfsv4idmapdomain"
- #endif
- 
-+#ifndef NS_MAXMSG
-+#define NS_MAXMSG 65535
-+#endif
-+
- /* Default logging fuction */
- static void default_logger(const char *fmt, ...)
- {