Date: Friday, June 22, 2018 @ 09:26:27 Author: tpowa Revision: 327452
archrelease: copy trunk to extra-x86_64 Added: cifs-utils/repos/extra-x86_64/PKGBUILD (from rev 327451, cifs-utils/trunk/PKGBUILD) cifs-utils/repos/extra-x86_64/fix-5.9-credentials.patch (from rev 327451, cifs-utils/trunk/fix-5.9-credentials.patch) Deleted: cifs-utils/repos/extra-x86_64/PKGBUILD cifs-utils/repos/extra-x86_64/fix-5.9-credentials.patch ---------------------------+ PKGBUILD | 72 ++++++++++++++++++++++---------------------- fix-5.9-credentials.patch | 32 +++++++++---------- 2 files changed, 52 insertions(+), 52 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-22 09:26:21 UTC (rev 327451) +++ PKGBUILD 2018-06-22 09:26:27 UTC (rev 327452) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -pkgname=cifs-utils -pkgver=6.7 -pkgrel=2 -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' 'pam') -source=("https://download.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2"{,.asc}) -validpgpkeys=('98EDEB95638461E78CE83B795AFDBFB270F3B981') #cifs-utils Distribution Verification Key <cifs-ut...@samba.org> - -build() { - cd "$srcdir/$pkgname-$pkgver" - # systemd support is broken in mount.cifs - # https://bugs.archlinux.org/task/30958 - autoreconf -i - ./configure --prefix=/usr --sbindir=/usr/bin --disable-systemd - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" ROOTSBINDIR=/usr/bin install - mkdir -p $pkgdir/etc/request-key.d - install -m 644 contrib/request-key.d/cifs.idmap.conf $pkgdir/etc/request-key.d - install -m 644 contrib/request-key.d/cifs.spnego.conf $pkgdir/etc/request-key.d - # set mount.cifs uid, to enable none root mounting form fstab - chmod +s $pkgdir/usr/bin/mount.cifs - # fix idmap-plugin #42052 - mkdir -p $pkgdir/etc/cifs-utils - ln -s /usr/lib/cifs-utils/idmapwb.so ${pkgdir}/etc/cifs-utils/idmap-plugin -} -md5sums=('af3ae1d27aca624c4daac5bf3eb0d4c1' - 'SKIP') Copied: cifs-utils/repos/extra-x86_64/PKGBUILD (from rev 327451, cifs-utils/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-22 09:26:27 UTC (rev 327452) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +pkgname=cifs-utils +pkgver=6.8 +pkgrel=1 +pkgdesc="CIFS filesystem user-space tools" +arch=(x86_64) +url="http://wiki.samba.org/index.php/LinuxCIFS_utils" +license=('GPL') +depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient' 'pam') +source=("https://download.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2"{,.asc}) +validpgpkeys=('C699981A31F338706C817650DF5BA9D30642D5A0') #cifs-utils Distribution Verification Key <cifs-ut...@samba.org> + +build() { + cd "$srcdir/$pkgname-$pkgver" + # systemd support is broken in mount.cifs + # https://bugs.archlinux.org/task/30958 + autoreconf -i + ./configure --prefix=/usr --sbindir=/usr/bin --disable-systemd + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" ROOTSBINDIR=/usr/bin install + mkdir -p $pkgdir/etc/request-key.d + install -m 644 contrib/request-key.d/cifs.idmap.conf $pkgdir/etc/request-key.d + install -m 644 contrib/request-key.d/cifs.spnego.conf $pkgdir/etc/request-key.d + # set mount.cifs uid, to enable none root mounting form fstab + chmod +s $pkgdir/usr/bin/mount.cifs + # fix idmap-plugin #42052 + mkdir -p $pkgdir/etc/cifs-utils + ln -s /usr/lib/cifs-utils/idmapwb.so ${pkgdir}/etc/cifs-utils/idmap-plugin +} +md5sums=('a385d60293e6f9e4cb0d4ac2093990d8' + 'SKIP') Deleted: fix-5.9-credentials.patch =================================================================== --- fix-5.9-credentials.patch 2018-06-22 09:26:21 UTC (rev 327451) +++ fix-5.9-credentials.patch 2018-06-22 09:26:27 UTC (rev 327452) @@ -1,16 +0,0 @@ -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); Copied: cifs-utils/repos/extra-x86_64/fix-5.9-credentials.patch (from rev 327451, cifs-utils/trunk/fix-5.9-credentials.patch) =================================================================== --- fix-5.9-credentials.patch (rev 0) +++ fix-5.9-credentials.patch 2018-06-22 09:26:27 UTC (rev 327452) @@ -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);