cifs-utils: update to 6.10

cifs-utils/.footprint

@@ -3,11 +3,13 @@ drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/cifs
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/mount.cifs
+lrwxrwxrwx	root/root	sbin/mount.smb3 -> mount.cifs
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cifscreds
 -rwxr-xr-x	root/root	usr/bin/getcifsacl
 -rwxr-xr-x	root/root	usr/bin/setcifsacl
+-rwxr-xr-x	root/root	usr/bin/smb2-quota
 -rwxr-xr-x	root/root	usr/bin/smbinfo
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/cifsidmap.h
@@ -24,9 +26,11 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/cifscreds.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/getcifsacl.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/setcifsacl.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/smb2-quota.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/smbinfo.1.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/cifs.idmap.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/idmapwb.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/mount.cifs.8.gz
+lrwxrwxrwx	root/root	usr/share/man/man8/mount.smb3.8.gz -> mount.cifs.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/pam_cifscreds.8.gz

cifs-utils/.signature

@@ -1,7 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fIiolzi2U/UZKylf8ljJ41iX89bDD8VVJfw0bQDL21AbrmV8z5TTkmUdSMmXDbBgZvvYj5FXQFOS/gDnTbIBAI=
-SHA256 (Pkgfile) = 6f5bb7d63274418c706f0cf5f90b89b06393979f19fffd70ba9ee0c8626242ca
-SHA256 (.footprint) = 96a4880dcafae3ff9c621c5f5182a457ea63d688baab85ff3872d68f1560c863
-SHA256 (cifs-utils-6.9.tar.bz2) = 18d8f1bf92c13c4d611502dbd6759e3a766ddc8467ec8a2eda3f589e40b9ac9c
-SHA256 (cifs-utils-man.tar.xz) = 8d833e68fb8a853da837ba5a34cae74bb6995ee2a4fc7ad6cae7c05d761960a5
+RWSE3ohX2g5d/aogU41fA6yHqnrFNat6Yhd9TFC3QXi2WdTTtJJkcuZBbxcUjQm26obXl8Z/JqKpmp3sGUD0vidZdq5cXuBhrgs=
+SHA256 (Pkgfile) = c0a4d073c6ca14cdde7f46dc7a3a02236199d1d00b621216d53aaf1ffe3400bc
+SHA256 (.footprint) = 8ddb0a2b841711b4683fef6bb8708ddd8b46dedd3406c24a79c259f347296fe1
+SHA256 (cifs-utils-6.10.tar.bz2) = 92fc29c8e9039637f3344267500f1fa381e2cccd7d10142f0c1676fa575904a7
+SHA256 (cifs-utils-6.10.patch) = 61e522d591ef858832386864fb10db49f73a2115c128992172e722309aadba3e
+SHA256 (cifs-utils-man.tar.xz) = dda49d8022bdb79afddb7ebc511163aadf99b1f972c94c37d781349fd120418c
 SHA256 (cifs) = 6dc576a4b23722cc9b7fd630275f3ba721a0e659a8a9642cd0f7c37df09c9e79

cifs-utils/Pkgfile

@@ -4,21 +4,24 @@
 # Depends on:  linux-pam samba keyutils
 
 name=cifs-utils
-version=6.9
-release=2
+version=6.10
+release=1
 source=(https://download.samba.org/pub/linux-cifs/$name/$name-$version.tar.bz2
-        cifs-utils-man.tar.xz cifs)
+        $name-$version.patch $name-man.tar.xz cifs)
 
 build () {
     cd $name-$version
-    
+
+    patch -p1 -i $SRC/$name-$version.patch
+
+    install -d $PKG/{sbin,usr/share/man/man{1,8}}
+    install -m 0644 $SRC/*.1 $PKG/usr/share/man/man1
+    install -m 0644 $SRC/*.8 $PKG/usr/share/man/man8
+
+    autoreconf -i
     ./configure --prefix=/usr
     make
     make DESTDIR=$PKG install
-    
-    install -d $PKG/usr/share/man/man{1,8}
-    install -m 0644 $SRC/*.1 $PKG/usr/share/man/man1
-    install -m 0644 $SRC/*.8 $PKG/usr/share/man/man8
-    
+
     install -D -m 0755 $SRC/cifs $PKG/etc/rc.d/cifs
 }

cifs-utils/cifs-utils-6.10.patch

@@ -0,0 +1,16 @@
+diff -Nru cifs-utils-6.10.orig/Makefile.am cifs-utils-6.10/Makefile.am
+--- cifs-utils-6.10.orig/Makefile.am	2019-12-19 18:42:38.628068879 +0100
++++ cifs-utils-6.10/Makefile.am	2019-12-19 18:43:59.762637035 +0100
+@@ -119,10 +119,10 @@
+ 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)