pool/nfs-utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add reenable-nfsv2.patch for reverting nfsv2 deprecation until

Browse Source 
test coverage is fixed

OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=251
This commit is contained in:
Dirk Mueller 2022-03-08 21:04:39 +00:00 committed by Git OBS Bridge
parent 188d5563b5
commit 3de30510a9
3 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nfs-utils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 8 20:58:54 UTC 2022 - Dirk Müller <dmueller@suse.com>
- add reenable-nfsv2.patch for reverting nfsv2 deprecation until
test coverage is fixed
-------------------------------------------------------------------
Thu Mar 3 10:08:47 UTC 2022 - Martin Liška <mliska@suse.cz>

2
nfs-utils.spec
View File

@ -43,7 +43,7 @@ Source26: nfs.conf
Source27: nfs-kernel-server.tmpfiles.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
Patch1: gcc12-fix.patch
Patch2: reenable-nfsv2.patch
BuildRequires: e2fsprogs-devel
BuildRequires: gcc-c++
BuildRequires: libtool

60
reenable-nfsv2.patch Normal file
View File

@ -0,0 +1,60 @@
This reverts https://git.kernel.org/pub/scm/linux/kernel/git/rw/nfs-utils.git/commit/?id=2c2c36c59fa1de2ff7fd28917e54700ecb39b730
and https://git.kernel.org/pub/scm/linux/kernel/git/rw/nfs-utils.git/commit/?id=2c2c36c59fa1de2ff7fd28917e54700ecb39b730
as openqa is still testing NFSv2
see https://progress.opensuse.org/issues/106679
--- nfs-utils-2.6.1.orig/utils/mount/configfile.c
+++ nfs-utils-2.6.1/utils/mount/configfile.c
@@ -71,7 +71,7 @@ struct mnt_alias {
int mnt_alias_sz = (sizeof(mnt_alias_tab)/sizeof(mnt_alias_tab[0]));
static const char *version_keys[] = {
- "v3", "v4", "vers", "nfsvers", "minorversion", NULL
+ "v2", "v3", "v4", "vers", "nfsvers", "minorversion", NULL
};
static int strict;
--- nfs-utils-2.6.1.orig/utils/mount/stropts.c
+++ nfs-utils-2.6.1/utils/mount/stropts.c
@@ -1017,6 +1017,7 @@ static int nfs_try_mount(struct nfsmount
}
switch (mi->version.major) {
+ case 2:
case 3:
result = nfs_try_mount_v3v2(mi, FALSE);
break;
@@ -1247,14 +1248,6 @@ static int nfsmount_start(struct nfsmoun
if (!nfs_validate_options(mi))
return EX_FAIL;
- /*
- * NFS v2 has been deprecated
- */
- if (mi->version.major == 2) {
- mount_error(mi->spec, mi->node, EOPNOTSUPP);
- return EX_FAIL;
- }
-
/*
* Avoid retry and negotiation logic when remounting
*/
--- nfs-utils-2.6.1.orig/utils/nfsd/nfsd.c
+++ nfs-utils-2.6.1/utils/nfsd/nfsd.c
@@ -226,6 +226,7 @@ main(int argc, char **argv)
}
/* FALLTHRU */
case 3:
+ case 2:
NFSCTL_VERUNSET(versbits, c);
break;
default:
@@ -250,6 +251,7 @@ main(int argc, char **argv)
minorvers = minorversset = minormask;
/* FALLTHRU */
case 3:
+ case 2:
NFSCTL_VERSET(versbits, c);
break;
default: