[arch-commits] Commit in cifs-utils/repos/extra-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Sat Jan 4 09:49:11 UTC 2020
Date: Saturday, January 4, 2020 @ 09:49:11
Author: arojas
Revision: 372538
archrelease: copy trunk to extra-x86_64
Added:
cifs-utils/repos/extra-x86_64/PKGBUILD
(from rev 372537, cifs-utils/trunk/PKGBUILD)
cifs-utils/repos/extra-x86_64/fix-5.9-credentials.patch
(from rev 372537, 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 | 77 +++++++++++++++++++++++---------------------
fix-5.9-credentials.patch | 32 +++++++++---------
2 files changed, 57 insertions(+), 52 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-04 09:48:52 UTC (rev 372537)
+++ PKGBUILD 2020-01-04 09:49:11 UTC (rev 372538)
@@ -1,36 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=cifs-utils
-pkgver=6.9
-pkgrel=1
-pkgdesc="CIFS filesystem user-space tools"
-arch=(x86_64)
-url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
-license=('GPL')
-depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient' 'pam')
-makedepends=('python-docutils')
-source=("https://download.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2"{,.asc})
-validpgpkeys=('C699981A31F338706C817650DF5BA9D30642D5A0') #cifs-utils Distribution Verification Key <cifs-utils at 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=('6ae854852e39ab1d5e2e3b512fdffb08'
- 'SKIP')
Copied: cifs-utils/repos/extra-x86_64/PKGBUILD (from rev 372537, cifs-utils/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-01-04 09:49:11 UTC (rev 372538)
@@ -0,0 +1,41 @@
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=cifs-utils
+pkgver=6.10
+pkgrel=1
+pkgdesc="CIFS filesystem user-space tools"
+arch=(x86_64)
+url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
+license=('GPL')
+depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient' 'pam')
+makedepends=('python-docutils')
+source=("https://download.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2"{,.asc})
+validpgpkeys=('C699981A31F338706C817650DF5BA9D30642D5A0') #cifs-utils Distribution Verification Key <cifs-utils at samba.org>
+md5sums=('1cb2d653ccc77f8644213340a4f6b7dc'
+ 'SKIP')
+
+prepare() {
+ # Fix install to honor DESTDIR
+ sed -e 's|\$(man8dir)|$(DESTDIR)$(man8dir)|g' -e 's|cd \$(ROOTSBINDIR)|cd $(DESTDIR)$(ROOTSBINDIR)|g' -i $pkgname-$pkgver/Makefile.am
+}
+
+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 -j1
+ 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
+}
Deleted: fix-5.9-credentials.patch
===================================================================
--- fix-5.9-credentials.patch 2020-01-04 09:48:52 UTC (rev 372537)
+++ fix-5.9-credentials.patch 2020-01-04 09:49:11 UTC (rev 372538)
@@ -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 372537, cifs-utils/trunk/fix-5.9-credentials.patch)
===================================================================
--- fix-5.9-credentials.patch (rev 0)
+++ fix-5.9-credentials.patch 2020-01-04 09:49:11 UTC (rev 372538)
@@ -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);
More information about the arch-commits
mailing list