From 0c07e5527143292dc7bc25cfcabce8f7a32871b9 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 9 Jan 2020 07:29:26 +0000
Subject: user/cifs-utils: Bump to 6.10

---
 user/cifs-utils/APKBUILD              | 20 +++++++++++++-------
 user/cifs-utils/respect-destdir.patch | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 user/cifs-utils/respect-destdir.patch

(limited to 'user/cifs-utils')

diff --git a/user/cifs-utils/APKBUILD b/user/cifs-utils/APKBUILD
index 436e0d909..798bb8a1e 100644
--- a/user/cifs-utils/APKBUILD
+++ b/user/cifs-utils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=cifs-utils
-pkgver=6.9
+pkgver=6.10
 pkgrel=0
 pkgdesc="CIFS filesystem user-space tools"
 url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -9,17 +9,22 @@ arch="all"
 options="!check suid"  # No test suite.
 license="GPL-3.0+ AND GPL-2.0+ AND LGPL-3.0+"
 depends=""
-makedepends="keyutils-dev krb5-dev libcap-ng-dev linux-pam-dev
-	py3-docutils talloc-dev"
+makedepends="keyutils-dev krb5-dev libcap-ng-dev linux-pam-dev py3-docutils
+	talloc-dev autoconf automake"
 subpackages="$pkgname-doc $pkgname-dev"
 source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2
 	musl-fix-includes.patch
-	xattr_size_max.patch"
+	respect-destdir.patch
+	xattr_size_max.patch
+	"
+
+prepare() {
+	default_prepare
+	autoreconf -vif
+}
 
 build() {
 	# --enable-cifsidmap and --enable-cifsacl require libwbclient (samba)
-
-	autoreconf -i
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -43,6 +48,7 @@ package() {
 	chmod u+s "$pkgdir"/sbin/mount.cifs
 }
 
-sha512sums="b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a  cifs-utils-6.9.tar.bz2
+sha512sums="e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc  cifs-utils-6.10.tar.bz2
 99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe  musl-fix-includes.patch
+f3acb4f7873628d67c7dfb2378135c302fe382e314277829ea5569710bac0ddb43684aa6d143327d735aec641997084eaa567823b534138ed884bd74044b652a  respect-destdir.patch
 2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98  xattr_size_max.patch"
diff --git a/user/cifs-utils/respect-destdir.patch b/user/cifs-utils/respect-destdir.patch
new file mode 100644
index 000000000..6330efc38
--- /dev/null
+++ b/user/cifs-utils/respect-destdir.patch
@@ -0,0 +1,18 @@
+--- cifs-utils-6.10/Makefile.am.old	2019-12-16 23:34:56.000000000 +0000
++++ cifs-utils-6.10/Makefile.am	2020-01-09 07:28:27.635229782 +0000
+@@ -119,11 +119,11 @@
+ SUBDIRS = contrib
+ 
+ install-exec-hook:
+-	(cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
++	(cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
+ 
+ install-data-hook:
+-	(cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
++	(cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
+ 
+ uninstall-hook:
+-	(cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3)
+-	(cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8)
++	(cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3)
++	(cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8)
-- 
cgit v1.2.3-60-g2f50