[depends] bump libnfs to v1.9.6

4 files changed, 49 insertions, 21 deletions

diff --git a/tools/depends/target/libnfs/Makefile b/tools/depends/target/libnfs/Makefile
index e39d00ceb1..642fba8f8a 100644
--- a/tools/depends/target/libnfs/Makefile
+++ b/tools/depends/target/libnfs/Makefile
@@ -3,12 +3,12 @@ DEPS= ../../Makefile.include Makefile
 
 # lib name, version
 LIBNAME=libnfs
-VERSION=1.6.0
+VERSION=1.9.6
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
 # configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX)
+CONFIGURE=CFLAGS="-DHAVE_NET_IF_H" ./configure --prefix=$(PREFIX)
 
 LIBDYLIB=$(PLATFORM)/lib/.libs/$(LIBNAME).a
 
@@ -23,7 +23,8 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	-rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(PLATFORM); ./bootstrap
-	cd $(PLATFORM); patch -p0 < ../timeval.patch
+	cd $(PLATFORM); patch -p0 < ../utils.patch
+	cd $(PLATFORM); patch -p1 < ../readahead.patch
 	cd $(PLATFORM); $(CONFIGURE)
 
 $(LIBDYLIB): $(PLATFORM)
@@ -32,9 +33,9 @@ $(LIBDYLIB): $(PLATFORM)
 .installed-$(PLATFORM): $(LIBDYLIB)
 	$(MAKE) -C $(PLATFORM) install
 ifeq ($(OS),android)
-	rm -f $(PREFIX)/lib/libnfs.la $(PREFIX)/lib/libnfs.so $(PREFIX)/lib/libnfs.so.1
-	mv -f $(PREFIX)/lib/libnfs.so.1.0.6 $(PREFIX)/lib/libnfs.so
-	$(RPL) -e "libnfs.so.1" "libnfs.so\x00\x00" $(PREFIX)/lib/libnfs.so
+	rm -f $(PREFIX)/lib/libnfs.la $(PREFIX)/lib/libnfs.so $(PREFIX)/lib/libnfs.so.4
+	mv -f $(PREFIX)/lib/libnfs.so.4.3.0 $(PREFIX)/lib/libnfs.so
+	$(RPL) -e "libnfs.so.4" "libnfs.so\x00\x00" $(PREFIX)/lib/libnfs.so
 	-$(READELF) --dynamic $(PREFIX)/lib/libnfs.so | grep ibrary
 endif
 	touch $@
diff --git a/tools/depends/target/libnfs/readahead.patch b/tools/depends/target/libnfs/readahead.patch
new file mode 100644
index 0000000000..ae7ec4ac0a
--- /dev/null
+++ b/tools/depends/target/libnfs/readahead.patch
@@ -0,0 +1,23 @@
+From 5f6442d1b24dfe98a7134ffdb5c47490f140e6e3 Mon Sep 17 00:00:00 2001
+From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
+Date: Fri, 5 Dec 2014 08:44:15 -0800
+Subject: [PATCH] libnfs.c: fix typo, it is readahead not readahaed
+
+Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
+---
+ lib/libnfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/libnfs.c b/lib/libnfs.c
+index 2bacd91..8a81a94 100644
+--- a/lib/libnfs.c
++++ b/lib/libnfs.c
+@@ -248,7 +248,7 @@ static int nfs_set_context_args(struct nfs_context *nfs, char *arg, char *val)
+ 		rpc_set_uid(nfs_get_rpc_context(nfs), atoi(val));
+ 	} else if (!strcmp(arg, "gid")) {
+ 		rpc_set_gid(nfs_get_rpc_context(nfs), atoi(val));
+-	} else if (!strcmp(arg, "readahaed")) {
++	} else if (!strcmp(arg, "readahead")) {
+ 		rpc_set_readahead(nfs_get_rpc_context(nfs), atoi(val));
+ 	}
+ 	return 0;
diff --git a/tools/depends/target/libnfs/timeval.patch b/tools/depends/target/libnfs/timeval.patch
deleted file mode 100644
index 7f453d6c6f..0000000000
--- a/tools/depends/target/libnfs/timeval.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/nfsc/libnfs.h.orig	2013-05-28 21:59:32.000000000 +0200
-+++ include/nfsc/libnfs.h	2013-05-28 21:59:56.000000000 +0200
-@@ -18,12 +18,7 @@
-  * This is the highlevel interface to access NFS resources using a posix-like interface
-  */
- #include <stdint.h>
--#if defined(ANDROID)
- #include <sys/time.h>
--#endif
--#if defined(AROS)
--#include <sys/time.h>
--#endif
- 
- struct nfs_context;
- struct rpc_context;
diff --git a/tools/depends/target/libnfs/utils.patch b/tools/depends/target/libnfs/utils.patch
new file mode 100644
index 0000000000..9b0d21cb9a
--- /dev/null
+++ b/tools/depends/target/libnfs/utils.patch
@@ -0,0 +1,19 @@
+--- utils/nfs-ls.c.orig	2014-12-30 13:50:44.225840102 +0100
++++ utils/nfs-ls.c	2014-12-30 13:51:03.753840180 +0100
+@@ -35,11 +35,15 @@
+ #include <inttypes.h>
+ #include <string.h>
+ #include <sys/stat.h>
+-#include <sys/statvfs.h>
+ #ifndef AROS
++#ifdef ANDROID
++#define statvfs statfs
++#include <sys/vfs.h>
++#else
+ #include <sys/statvfs.h>
+ #endif
+ #endif
++#endif
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>