Merge tag 'libnfs-1.9.6' of https://github.com/sahlberg/libnfs into upstream

Tag for 1.9.6

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
Conflicts:
	README
	configure.ac
	examples/fuse_nfs.c
	include/nfsc/libnfs-zdr.h
	include/nfsc/libnfs.h
	lib/Makefile.am
	lib/libnfs-sync.c
	lib/libnfs-zdr.c
	lib/libnfs.c
	lib/socket.c
	nfs/Makefile.am
	nfs/libnfs-raw-nfs.c
	nfs/libnfs-raw-nfs.h
	nfs/nfs.c
	nfs/nfs.x
	nlm/libnfs-raw-nlm.c
	nlm/libnfs-raw-nlm.h
	nlm/nlm.x
	packaging/RPM/libnfs.spec.in

diff --git a/README.win32.txt b/README.win32.txt
new file mode 100644 (file)
index 0000000..298045e
--- /dev/null
+++ b/README.win32.txt
@@ -0,0 +1,10 @@
+LibNFS requires a oncrpc library and rpcgen compiler that can handle
+64 bit types. Link below for one such package, but any 64bit capable oncrpc
+package should work with some effort.
+
+
+1. checkout git://github.com/Memphiz/oncrpc-win32.git project (branch hyper!)
+2. build oncrpc-win32 project (see README.libnfs in the projects dir)
+3. checkout libnfs ("parallel" to oncrpc-win32)
+4. load vs2010 project from win32/libnfs/libnfs.sln
+5. build libnfs and nfsclient-sync