From a9abd6237a047a63b9bcf75b90055cb4321dd0f6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:03:22 -0600
Subject: cifs-utils: 6.2 update binary path to /usr/bin refs #961

---
 abs/extra/cifs-utils/PKGBUILD                  | 10 ++++++----
 abs/extra/cifs-utils/fix-5.9-credentials.patch | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 abs/extra/cifs-utils/fix-5.9-credentials.patch

diff --git a/abs/extra/cifs-utils/PKGBUILD b/abs/extra/cifs-utils/PKGBUILD
index f220fa4..fb2db27 100644
--- a/abs/extra/cifs-utils/PKGBUILD
+++ b/abs/extra/cifs-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 161430 2012-06-11 13:06:12Z tpowa $
+# $Id: PKGBUILD 200381 2013-11-27 10:08:51Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
-pkgver=5.5
+pkgver=6.2
 pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64)
@@ -12,7 +12,9 @@ source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  # systemd support is broken in mount.cifs
+  # https://bugs.archlinux.org/task/30958
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-systemd
   make
 }
 
@@ -22,4 +24,4 @@ package() {
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/usr/bin/mount.cifs
 }
-md5sums=('4de6c660ccdb9506d0e2cff4f37b8707')
+md5sums=('6a83fe19e02266cb468ea3bf1cc0d007')
diff --git a/abs/extra/cifs-utils/fix-5.9-credentials.patch b/abs/extra/cifs-utils/fix-5.9-credentials.patch
new file mode 100644
index 0000000..24e20ed
--- /dev/null
+++ b/abs/extra/cifs-utils/fix-5.9-credentials.patch
@@ -0,0 +1,16 @@
+X-Git-Url: https://git.samba.org/?p=cifs-utils.git;a=blobdiff_plain;f=mount.cifs.c;h=40b77e92e3f734c606f522ccf279a0508ad64eab;hp=c7c3055cb890764937193b1d50d1f0fb7ae18826;hb=1a01f7c4b90695211d12291d7a24bec05b1f2922;hpb=739289ad3ce915e1ee2705ecd7ac4e907cd91405
+
+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);
-- 
cgit v0.12

