update to latest upstream

5 files changed, 49 insertions, 48 deletions

diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index 38d2cd45a..3befb43a3 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -4,13 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cifs-utils
-PKG_VERSION:=		6.1
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		f83ef48ab1154aa74dd4cf1c1202bf04
-PKG_DESCR:=		CIFS utilities
+PKG_VERSION:=		6.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		93697dbc043cb4d5c66e15e281f872e5
+PKG_DESCR:=		CIFS network filesystem utilities
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		kmod-cifs kmod-nls-utf8
-PKG_BUILDDEP:=		autotool keyutils
+PKG_BUILDDEP:=		autotool
 PKG_URL:=		https://wiki.samba.org/index.php/LinuxCIFS_utils
 PKG_SITES:=		ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/
 
diff --git a/package/cifs-utils/files/cifs.init b/package/cifs-utils/files/cifs.init
new file mode 100644
index 000000000..8cc5783e2
--- /dev/null
+++ b/package/cifs-utils/files/cifs.init
@@ -0,0 +1,36 @@
+#!/bin/sh
+#PKG cifs-utils
+#INIT 60
+
+case $1 in
+autostop) ;;
+autostart)
+	exec sh $0 start
+	;;
+start)
+	grep cifs /proc/filesystems >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1
+		if [ $? -eq 0 ];then
+			mount -a -t cifs
+		fi
+	else
+		logger -t cifs -s "No cifs support in kernel"
+	fi
+	;;
+stop)
+	grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		umount -a -t cifs
+	fi
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/cifs-utils/patches/patch-Makefile_am b/package/cifs-utils/patches/patch-Makefile_am
index 4f7b9dc74..81f21cd5a 100644
--- a/package/cifs-utils/patches/patch-Makefile_am
+++ b/package/cifs-utils/patches/patch-Makefile_am
@@ -1,5 +1,5 @@
---- cifs-utils-6.1.orig/Makefile.am	2013-07-02 21:13:33.000000000 +0200
-+++ cifs-utils-6.1/Makefile.am	2013-10-28 07:33:27.000000000 +0100
+--- cifs-utils-6.3.orig/Makefile.am	2014-01-09 17:19:53.000000000 +0100
++++ cifs-utils-6.3/Makefile.am	2014-05-06 13:53:28.814703381 +0200
 @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I aclocal
  root_sbindir = $(ROOTSBINDIR)
  root_sbin_PROGRAMS = mount.cifs
@@ -9,38 +9,3 @@
  
  man_MANS = mount.cifs.8
  include_HEADERS = cifsidmap.h
-@@ -16,7 +16,7 @@ clean-local: clean-local-upcall clean-lo
- if CONFIG_CIFSUPCALL
- sbin_PROGRAMS += cifs.upcall
- cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c
--cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD)
-+cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD) $(LIBOBJS)
- man_MANS += cifs.upcall.8
- 
- #
-@@ -35,14 +35,14 @@ endif
- if CONFIG_CIFSCREDS
- bin_PROGRAMS += cifscreds
- cifscreds_SOURCES = cifscreds.c resolve_host.c util.c
--cifscreds_LDADD = -lkeyutils
-+cifscreds_LDADD = -lkeyutils $(LIBOBJS)
- man_MANS += cifscreds.1
- endif
- 
- if CONFIG_CIFSIDMAP
- sbin_PROGRAMS += cifs.idmap
- cifs_idmap_SOURCES = cifs.idmap.c idmap_plugin.c
--cifs_idmap_LDADD = -lkeyutils -ldl
-+cifs_idmap_LDADD = -lkeyutils -ldl $(LIBOBJS)
- man_MANS += cifs.idmap.8
- 
- cifs.idmap.8: cifs.idmap.8.in
-@@ -57,7 +57,7 @@ endif
- if CONFIG_CIFSACL
- bin_PROGRAMS += getcifsacl
- getcifsacl_SOURCES = getcifsacl.c idmap_plugin.c
--getcifsacl_LDADD = -ldl
-+getcifsacl_LDADD = -ldl $(LIBOBJS)
- man_MANS += getcifsacl.1
- 
- getcifsacl.1: getcifsacl.1.in
diff --git a/package/cifs-utils/patches/patch-cifscreds_c b/package/cifs-utils/patches/patch-cifscreds_c
index 0548e515f..23135e231 100644
--- a/package/cifs-utils/patches/patch-cifscreds_c
+++ b/package/cifs-utils/patches/patch-cifscreds_c
@@ -1,5 +1,5 @@
---- cifs-utils-6.1.orig/cifscreds.c	2013-07-02 21:13:33.000000000 +0200
-+++ cifs-utils-6.1/cifscreds.c	2013-10-28 07:33:27.000000000 +0100
+--- cifs-utils-6.3.orig/cifscreds.c	2014-01-09 17:19:53.000000000 +0100
++++ cifs-utils-6.3/cifscreds.c	2014-05-06 13:52:11.778306692 +0200
 @@ -27,7 +27,13 @@
  #include <string.h>
  #include <ctype.h>
@@ -12,5 +12,5 @@
 +#define option gnu_option
 +#endif
  #include <errno.h>
+ #include "cifskey.h"
  #include "mount.h"
- #include "resolve_host.h"
diff --git a/package/cifs-utils/patches/patch-configure_ac b/package/cifs-utils/patches/patch-configure_ac
index ac5835776..bcda90f3c 100644
--- a/package/cifs-utils/patches/patch-configure_ac
+++ b/package/cifs-utils/patches/patch-configure_ac
@@ -1,6 +1,6 @@
---- cifs-utils-6.1.orig/configure.ac	2013-07-02 21:13:33.000000000 +0200
-+++ cifs-utils-6.1/configure.ac	2013-10-28 07:33:27.000000000 +0100
-@@ -90,13 +90,25 @@ AC_CHECK_TYPES([ptrdiff_t, ssize_t, uint
+--- cifs-utils-6.3.orig/configure.ac	2014-01-09 17:19:53.000000000 +0100
++++ cifs-utils-6.3/configure.ac	2014-05-06 13:52:11.790306753 +0200
+@@ -87,13 +87,25 @@ AC_CHECK_TYPES([ptrdiff_t, ssize_t, uint
  
  # Checks for library functions.
  AC_FUNC_GETMNTENT