From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sat, 19 Jul 2014 22:58:30 +0000 (-0700)
Subject: Merge pull request #86 from rosslagerwall/75-create
X-Git-Tag: upstream/1.9.6^2~19
X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=commitdiff_plain;h=fda800dc022ff08e4f7a1447b8d2e1599b2aa60c;hp=037a1061ddfa9ee5192daa4485794bee7657aa31

Merge pull request #86 from rosslagerwall/75-create

libnfs.c: add nfs_create
---

diff --git a/configure.ac b/configure.ac
index 2cb979e..b84a8c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([libnfs], [1.9.4], [ronniesahlberg@gmail.com])
+AC_INIT([libnfs], [1.9.5], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1f9a55a..2f12325 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,9 +18,9 @@ libnfs_la_SOURCES = \
 	pdu.c \
 	socket.c
 
-SOCURRENT=5
+SOCURRENT=6
 SOREVISION=0
-SOAGE=1
+SOAGE=2
 libnfs_la_LDFLAGS = -version-info $(SOCURRENT):$(SOREVISION):$(SOAGE)
 libnfs_la_LIBADD = \
 	../mount/libmount.la \
diff --git a/lib/socket.c b/lib/socket.c
index f973f01..3f7f89f 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -506,7 +506,7 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
 					((struct sockaddr_in6 *)&ss)->sin6_port = port;
 					((struct sockaddr_in6 *)&ss)->sin6_family      = AF_INET6;
 #ifdef HAVE_SOCKADDR_LEN
-					((struct sockaddr_in6 *)&ss)->sin6_len = sizeof(struct sockaddr6_in);
+					((struct sockaddr_in6 *)&ss)->sin6_len = sizeof(struct sockaddr_in6);
 #endif
 					break;
 				}
diff --git a/packaging/RPM/libnfs.spec.in b/packaging/RPM/libnfs.spec.in
index 8b34636..0535743 100644
--- a/packaging/RPM/libnfs.spec.in
+++ b/packaging/RPM/libnfs.spec.in
@@ -108,6 +108,8 @@ Utility programs for LibNFS
 %{_mandir}/man1/nfs-ls.1.gz
 
 %changelog
+* Sat Jul 19 2014 : Version 1.9.5
+ - Remove old ONC-RPC symbols
 * Wed Mar 19 2014 : Version 1.9.3
  - Add O_TRUNC support to nfs_open()
  - Add a simple but incomplete LD_PRELOAD tool