ports/opt (3.0): cifs-utils: update to 6.0
commit a33f33fc1b3f79004917166a0843bbe49d355844 Author: Juergen Daubert <jue@jue.li> Date: Tue Mar 26 09:41:06 2013 +0100 cifs-utils: update to 6.0 diff --git a/cifs-utils/.md5sum b/cifs-utils/.md5sum index bda7b96..3785d45 100644 --- a/cifs-utils/.md5sum +++ b/cifs-utils/.md5sum @@ -1,3 +1,2 @@ 24c6eded8b4023e946223862709baf6c cifs -53d12c13345008e6252017c2735b18e5 cifs-utils-5.9-got_user.patch -7164ad6f7963a31fcbffbe4f14a7cfc6 cifs-utils-5.9.tar.bz2 +371e007a201be90c16497cd9bd5e2553 cifs-utils-6.0.tar.bz2 diff --git a/cifs-utils/Pkgfile b/cifs-utils/Pkgfile index f3e5903..f4e4472 100644 --- a/cifs-utils/Pkgfile +++ b/cifs-utils/Pkgfile @@ -4,14 +4,13 @@ # Depends on: samba keyutils name=cifs-utils -version=5.9 -release=3 +version=6.0 +release=1 source=(ftp://ftp.samba.org/pub/linux-cifs/$name/$name-$version.tar.bz2 - cifs $name-$version-got_user.patch) + cifs) build () { cd $name-$version - patch -p1 -i $SRC/$name-$version-got_user.patch ./configure --prefix=/usr --mandir=/usr/man make make DESTDIR=$PKG install diff --git a/cifs-utils/cifs-utils-5.9-got_user.patch b/cifs-utils/cifs-utils-5.9-got_user.patch deleted file mode 100644 index b6ac891..0000000 --- a/cifs-utils/cifs-utils-5.9-got_user.patch +++ /dev/null @@ -1,29 +0,0 @@ -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);
participants (1)
-
crux@crux.nu