Date: Sunday, January 27, 2013 @ 13:26:02 Author: tpowa Revision: 176097
archrelease: copy trunk to extra-i686, extra-x86_64 Added: cifs-utils/repos/extra-i686/PKGBUILD (from rev 176096, cifs-utils/trunk/PKGBUILD) cifs-utils/repos/extra-i686/fix-5.9-credentials.patch (from rev 176096, cifs-utils/trunk/fix-5.9-credentials.patch) cifs-utils/repos/extra-x86_64/PKGBUILD (from rev 176096, cifs-utils/trunk/PKGBUILD) cifs-utils/repos/extra-x86_64/fix-5.9-credentials.patch (from rev 176096, cifs-utils/trunk/fix-5.9-credentials.patch) Deleted: cifs-utils/repos/extra-i686/PKGBUILD cifs-utils/repos/extra-x86_64/PKGBUILD ----------------------------------------+ extra-i686/PKGBUILD | 59 ++++++++++++++++--------------- extra-i686/fix-5.9-credentials.patch | 16 ++++++++ extra-x86_64/PKGBUILD | 59 ++++++++++++++++--------------- extra-x86_64/fix-5.9-credentials.patch | 16 ++++++++ 4 files changed, 96 insertions(+), 54 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-01-27 12:25:40 UTC (rev 176096) +++ extra-i686/PKGBUILD 2013-01-27 12:26:02 UTC (rev 176097) @@ -1,27 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -pkgname=cifs-utils -pkgver=5.8 -pkgrel=1 -pkgdesc="CIFS filesystem user-space tools" -arch=(i686 x86_64) -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) - -build() { - cd "$srcdir/$pkgname-$pkgver" - # systemd support is broken in mount.cifs - # https://bugs.archlinux.org/task/30958 - ./configure --prefix=/usr --disable-systemd - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" ROOTSBINDIR=/usr/bin install - # set mount.cifs uid, to enable none root mounting form fstab - chmod +s $pkgdir/usr/bin/mount.cifs -} -md5sums=('6aa9c4347780872fefe5823ac06a8ff3') Copied: cifs-utils/repos/extra-i686/PKGBUILD (from rev 176096, cifs-utils/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-01-27 12:26:02 UTC (rev 176097) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +pkgname=cifs-utils +pkgver=5.9 +pkgrel=1 +pkgdesc="CIFS filesystem user-space tools" +arch=(i686 x86_64) +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 + 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 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" ROOTSBINDIR=/usr/bin install + # set mount.cifs uid, to enable none root mounting form fstab + chmod +s $pkgdir/usr/bin/mount.cifs +} +md5sums=('6aa9c4347780872fefe5823ac06a8ff3') +md5sums=('7164ad6f7963a31fcbffbe4f14a7cfc6' + '2550d43af5bb734307cae22a09cd7710') Copied: cifs-utils/repos/extra-i686/fix-5.9-credentials.patch (from rev 176096, cifs-utils/trunk/fix-5.9-credentials.patch) =================================================================== --- extra-i686/fix-5.9-credentials.patch (rev 0) +++ extra-i686/fix-5.9-credentials.patch 2013-01-27 12:26:02 UTC (rev 176097) @@ -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); Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-01-27 12:25:40 UTC (rev 176096) +++ extra-x86_64/PKGBUILD 2013-01-27 12:26:02 UTC (rev 176097) @@ -1,27 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -pkgname=cifs-utils -pkgver=5.8 -pkgrel=1 -pkgdesc="CIFS filesystem user-space tools" -arch=(i686 x86_64) -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) - -build() { - cd "$srcdir/$pkgname-$pkgver" - # systemd support is broken in mount.cifs - # https://bugs.archlinux.org/task/30958 - ./configure --prefix=/usr --disable-systemd - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" ROOTSBINDIR=/usr/bin install - # set mount.cifs uid, to enable none root mounting form fstab - chmod +s $pkgdir/usr/bin/mount.cifs -} -md5sums=('6aa9c4347780872fefe5823ac06a8ff3') Copied: cifs-utils/repos/extra-x86_64/PKGBUILD (from rev 176096, cifs-utils/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-01-27 12:26:02 UTC (rev 176097) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +pkgname=cifs-utils +pkgver=5.9 +pkgrel=1 +pkgdesc="CIFS filesystem user-space tools" +arch=(i686 x86_64) +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 + 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 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" ROOTSBINDIR=/usr/bin install + # set mount.cifs uid, to enable none root mounting form fstab + chmod +s $pkgdir/usr/bin/mount.cifs +} +md5sums=('6aa9c4347780872fefe5823ac06a8ff3') +md5sums=('7164ad6f7963a31fcbffbe4f14a7cfc6' + '2550d43af5bb734307cae22a09cd7710') Copied: cifs-utils/repos/extra-x86_64/fix-5.9-credentials.patch (from rev 176096, cifs-utils/trunk/fix-5.9-credentials.patch) =================================================================== --- extra-x86_64/fix-5.9-credentials.patch (rev 0) +++ extra-x86_64/fix-5.9-credentials.patch 2013-01-27 12:26:02 UTC (rev 176097) @@ -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);