diff options
| author | Juergen Daubert <jue@jue.li> | 2020-10-24 10:13:16 +0000 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2020-10-24 10:13:16 +0000 |
| commit | c68e000a61d28ddc2dc77a34705639c9d1090da5 (patch) | |
| tree | 629c8d4c7d5e07544ac994f6312d78594dd61505 /nfs-utils | |
| parent | 2356e7119d8fdbc2630bb0e2563b0042de332fcf (diff) | |
| parent | 42f37f1b2b21f7f4b836d0ad39d7fae8b526e1d8 (diff) | |
| download | opt-c68e000a61d28ddc2dc77a34705639c9d1090da5.tar.gz opt-c68e000a61d28ddc2dc77a34705639c9d1090da5.tar.xz | |
Merge branch '3.5' into 3.6
Conflicts:
jdk8-bin/.signature
jdk8-bin/Pkgfile
nfs-utils/.signature
python3-pip/.footprint
python3-pip/.signature
python3-setuptools/.footprint
python3-setuptools/.signature
python3-setuptools/Pkgfile
Diffstat (limited to 'nfs-utils')
| -rw-r--r-- | nfs-utils/.signature | 7 | ||||
| -rw-r--r-- | nfs-utils/Pkgfile | 9 | ||||
| -rw-r--r-- | nfs-utils/python3.patch | 37 |
3 files changed, 6 insertions, 47 deletions
diff --git a/nfs-utils/.signature b/nfs-utils/.signature index 7dbda16bb..12ab5063c 100644 --- a/nfs-utils/.signature +++ b/nfs-utils/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/a9BqNtPKUa+Lsf1Lbs+fPXK36SsOsjEarU/fo9e71C0YPmFfCc/fm9un+rXpVJS392Ezz6yMjRZ4cmttHxbdQk= -SHA256 (Pkgfile) = 351bb7d7e7c1f0036b8208a6b20e81082daed75bffba6a39f8b321617e013f0d +RWSE3ohX2g5d/eFxLcHg2231sdfIxF/jyiaPToZkJ3RhZczqQ+BjOROrbW+rMwrhptsSMfqiqJ1E1iZIs41FHq7jxVJShVArEQM= +SHA256 (Pkgfile) = a77f9eba6e96a27e75d832dccf9ea34e7052f1230d78c28b1b369d38074a40be SHA256 (.footprint) = 08bee52c264923d52794306fc37e29919a58e306901e482c727dc021e908797d -SHA256 (nfs-utils-2.5.1.tar.xz) = 0f1c8170e16a07d9836bbf0836d48d0c842b6f0e0e8b18748f099751851d30c4 +SHA256 (nfs-utils-2.5.2.tar.xz) = d493b81c9d3ffce5d10af701a63ed2b8a21768c23da4a2eceb4d708aea65d9de SHA256 (exports) = 9556615724e66fbe6e7a2bfd740db4c5399a6abafab8cce868975f6926548eec SHA256 (idmapd.conf) = 2759ea36eff3397c39b534ee34752e02f60976160d66570ae19dbbbb5c00ee53 SHA256 (nfs) = 3ab2824ff5cbe4498faf6cbbbea19793d96bd80c48b9c18c0939938b18ab0217 @@ -13,4 +13,3 @@ 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 e88862d13..24d05e458 100644 --- a/nfs-utils/Pkgfile +++ b/nfs-utils/Pkgfile @@ -4,18 +4,15 @@ # Depends on: libdevmapper util-linux libcap rpcsvc-proto rpcbind libevent keyutils sqlite3 name=nfs-utils -version=2.5.1 -release=2 +version=2.5.2 +release=1 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 - python3.patch) + nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd nfsdcld) 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 deleted file mode 100644 index 3d08edcfa..000000000 --- a/nfs-utils/python3.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - """ |