diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-28 16:53:19 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-28 16:53:19 +0100 |
| commit | 01346da4de50d9eda2660653fcaae6c1abfaa28a (patch) | |
| tree | bd7bb7e3f004777c788f809c5a5a10a69839be13 /extra/cifs-utils | |
| parent | 5bc312c4c7af74bbbb6042c5856bac6e53efa32c (diff) | |
| parent | 1b9f6dc846379470b620b5dbb9d4d7acd1de148c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-chewing/PKGBUILD
community/fcitx-cloudpinyin/PKGBUILD
community/fcitx-rime/PKGBUILD
community/linux-tools/PKGBUILD
community/lxpanel/PKGBUILD
community/pdns/PKGBUILD
core/bash/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/json-c/PKGBUILD
extra/liblouis/PKGBUILD
extra/live-media/PKGBUILD
extra/samba/PKGBUILD
extra/transmission/PKGBUILD
social/opentracker/PKGBUILD
Diffstat (limited to 'extra/cifs-utils')
| -rw-r--r-- | extra/cifs-utils/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/cifs-utils/fix-5.9-credentials.patch | 16 |
2 files changed, 24 insertions, 3 deletions
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index 896032387..402b92d9f 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,17 +1,20 @@ -# $Id: PKGBUILD 173349 2012-12-19 14:22:07Z tpowa $ +# $Id: PKGBUILD 176097 2013-01-27 12:26:02Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils -pkgver=5.8 +pkgver=5.9 pkgrel=1 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64 'mips64el') url="http://wiki.samba.org/index.php/LinuxCIFS_utils" license=('GPL') depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient') -source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2) +source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2 + fix-5.9-credentials.patch) build() { cd "$srcdir/$pkgname-$pkgver" + # fix credentials + patch -Np1 -i ../fix-5.9-credentials.patch # systemd support is broken in mount.cifs # https://bugs.archlinux.org/task/30958 ./configure --prefix=/usr --disable-systemd @@ -25,3 +28,5 @@ package() { chmod +s $pkgdir/usr/bin/mount.cifs } md5sums=('6aa9c4347780872fefe5823ac06a8ff3') +md5sums=('7164ad6f7963a31fcbffbe4f14a7cfc6' + '2550d43af5bb734307cae22a09cd7710') diff --git a/extra/cifs-utils/fix-5.9-credentials.patch b/extra/cifs-utils/fix-5.9-credentials.patch new file mode 100644 index 000000000..24e20ed3a --- /dev/null +++ b/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); |