Merge branch '3.5' into 3.6

 Conflicts:
	nfs-utils/.signature
	nfs-utils/Pkgfile

3 files changed, 45 insertions, 4 deletions

diff --git a/nfs-utils/.signature b/nfs-utils/.signature
index adc82e0f3..7dbda16bb 100644
--- a/nfs-utils/.signature
+++ b/nfs-utils/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/YrVRNo4Ty3MPcbNKDzk3mmoamryGQ5a/ovM0q4rl2yZqZkdKn8lV9p4nNw38ZtNAEiUCJ12yETQdLPvWzqU2wg=
-SHA256 (Pkgfile) = 89e043c1f22f7e6098a3f74b0f14de14908b9ed03caba5716809b7c86e5ffdb0
+RWSE3ohX2g5d/a9BqNtPKUa+Lsf1Lbs+fPXK36SsOsjEarU/fo9e71C0YPmFfCc/fm9un+rXpVJS392Ezz6yMjRZ4cmttHxbdQk=
+SHA256 (Pkgfile) = 351bb7d7e7c1f0036b8208a6b20e81082daed75bffba6a39f8b321617e013f0d
 SHA256 (.footprint) = 08bee52c264923d52794306fc37e29919a58e306901e482c727dc021e908797d
 SHA256 (nfs-utils-2.5.1.tar.xz) = 0f1c8170e16a07d9836bbf0836d48d0c842b6f0e0e8b18748f099751851d30c4
 SHA256 (exports) = 9556615724e66fbe6e7a2bfd740db4c5399a6abafab8cce868975f6926548eec
@@ -13,3 +13,4 @@ SHA256 (rpc.statd) = 764b99273b59839d44a7e05c20d863206df06f5e7e5cb5cedf9da1db624
 SHA256 (rpc.mountd) = a6aaaadc054df03a9e6500fdf8b2fc6669d78825daff2c68e52e4d9eb2e0509c
 SHA256 (rpc.nfsd) = 12d0936472011db6928e5c0526ac510217a0601863a012e8a1ea565e3c1721de
 SHA256 (nfsdcld) = ed10dc56f97a1d6a1045b2a422d41bf120d3227356ff30464d2ca6c25961351c
+SHA256 (python3.patch) = cc24ab7eec8d7edc3df63549e7805d51e2cda59182acfc69042369206ce60d24
diff --git a/nfs-utils/Pkgfile b/nfs-utils/Pkgfile
index 86c6a8d49..e88862d13 100644
--- a/nfs-utils/Pkgfile
+++ b/nfs-utils/Pkgfile
@@ -5,14 +5,17 @@
 
 name=nfs-utils
 version=2.5.1
-release=1
+release=2
 source=(https://www.kernel.org/pub/linux/utils/$name/$version/$name-$version.tar.xz
         exports idmapd.conf
-        nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd nfsdcld)
+        nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd nfsdcld
+        python3.patch)
 
 build () {
     cd $name-$version
 
+    patch -p1 -i $SRC/python3.patch
+
     CONFIG_SHELL=/bin/bash \
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
diff --git a/nfs-utils/python3.patch b/nfs-utils/python3.patch
new file mode 100644
index 000000000..3d08edcfa
--- /dev/null
+++ b/nfs-utils/python3.patch
@@ -0,0 +1,37 @@
+commit d1683f356bd920d93f2db007902b2c46f97a2e49
+Author: Signed-off-by: NeilBrown <neilb@suse.de>
+Date:   Mon Aug 31 10:48:04 2020 -0400
+
+    Convert remaining python scripts to python3
+    
+    nfs-utils contains 4 python scripts, two request
+     /usr/bin/python3
+    in their shebang line, two request
+     /usr/bin/python
+    
+    Those latter two run perfectly well with python3 and as python2 is on the
+    way out, change them so they requrest /usr/bin/python3.
+    
+    Signed-off-by: NeilBrown <neilb@suse.de>
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
+index 1054f698..00adc96b 100755
+--- a/tools/mountstats/mountstats.py
++++ b/tools/mountstats/mountstats.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- python-mode -*-
+ """Parse /proc/self/mountstats and display it in human readable form
+ """
+diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
+index 50fd6a92..4f5e8a66 100755
+--- a/tools/nfs-iostat/nfs-iostat.py
++++ b/tools/nfs-iostat/nfs-iostat.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- python-mode -*-
+ """Emulate iostat for NFS mount points using /proc/self/mountstats
+ """