Merge branch '2.8' into 3.0

cifs-utils/.footprint

@@ -1,3 +1,6 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/rc.d/
+-rwxr-xr-x	root/root	etc/rc.d/cifs
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/mount.cifs
 drwxr-xr-x	root/root	usr/

cifs-utils/.md5sum

@@ -1 +1,3 @@
+24c6eded8b4023e946223862709baf6c  cifs
+53d12c13345008e6252017c2735b18e5  cifs-utils-5.9-got_user.patch
 7164ad6f7963a31fcbffbe4f14a7cfc6  cifs-utils-5.9.tar.bz2

cifs-utils/Pkgfile

@@ -5,12 +5,15 @@
 
 name=cifs-utils
 version=5.9
-release=1
-source=(ftp://ftp.samba.org/pub/linux-cifs/$name/$name-$version.tar.bz2)
+release=3
+source=(ftp://ftp.samba.org/pub/linux-cifs/$name/$name-$version.tar.bz2
+        cifs $name-$version-got_user.patch)
 
 build () {
     cd $name-$version
+    patch -p1 -i $SRC/$name-$version-got_user.patch
     ./configure --prefix=/usr --mandir=/usr/man
     make
     make DESTDIR=$PKG install
+    install -D -m 0755 $SRC/cifs $PKG/etc/rc.d/cifs
 }

cifs-utils/cifs

@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# /etc/rc.d/cifs: mount/umount cifs filesystems
+#
+
+case $1 in
+start)
+        /bin/mount -a -t cifs
+        ;;
+stop)
+        /bin/umount -a -t cifs 
+        ;;
+restart)
+        $0 stop
+        sleep 2
+        $0 start
+        ;;
+*)
+        echo "usage: $0 [start|stop|restart]"
+        ;;
+esac
+
+# End of file

cifs-utils/cifs-utils-5.9-got_user.patch

@@ -0,0 +1,29 @@
+commit 1a01f7c4b90695211d12291d7a24bec05b1f2922
+Author: Jeff Layton <jlayton@samba.org>
+Date:   Sat Jan 12 22:02:01 2013 -0500
+
+    mount.cifs: set parsed_info->got_user when a cred file supplies a username
+    
+    commit 85d18a1ed introduced a regression when using a credentials file.
+    It set the username in the parsed mount info properly, but didn't set
+    the "got_user" flag in it.
+    
+    Also, fix an incorrect strlcpy length specifier in open_cred_file.
+    
+    Reported-by: "Mantas M." <grawity@gmail.com>
+    Signed-off-by: Jeff Layton <jlayton@samba.org>
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index c7c3055..40b77e9 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name,
+ 		switch (parse_cred_line(line_buf + i, &temp_val)) {
+ 		case CRED_USER:
+ 			strlcpy(parsed_info->username, temp_val,
+-				sizeof(parsed_info->domain));
++				sizeof(parsed_info->username));
++			parsed_info->got_user = 1;
+ 			break;
+ 		case CRED_PASS:
+ 			i = set_password(parsed_info, temp_val);

samba/.md5sum

@@ -1,3 +1,3 @@
 448caca4745aef1a842f4fdb1aa62e1e  samba
-b5f0560c216122529b1c3b7f41c62567  samba-3.6.10.tar.gz
+9039e0ab3e4fc632ff0a1a8f2433edb4  samba-3.6.11.tar.gz
 fbaccda19afc8f75f6f0123cab82c87e  samba-config.patch

samba/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  ncurses openssl readline zlib tdb talloc libcap acl
 
 name=samba
-version=3.6.10
+version=3.6.11
 release=1
 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
         samba-config.patch samba)