Accepting request 346397 from home:Andreas_Schwab:Factory
- nfs-utils-uninit-mem.patch: fix use of uninitialized memory (bsc#956743) OBS-URL: https://build.opensuse.org/request/show/346397 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=152
This commit is contained in:
parent
ae7db45d3d
commit
d187bddd91
16
nfs-utils-uninit-mem.patch
Normal file
16
nfs-utils-uninit-mem.patch
Normal file
@ -0,0 +1,16 @@
|
||||
Index: nfs-utils-1.3.3/utils/mount/network.c
|
||||
===================================================================
|
||||
--- nfs-utils-1.3.3.orig/utils/mount/network.c
|
||||
+++ nfs-utils-1.3.3/utils/mount/network.c
|
||||
@@ -1626,7 +1626,10 @@ int nfs_options2pmap(struct mount_option
|
||||
return 0;
|
||||
if (!nfs_nfs_version(options, &version))
|
||||
return 0;
|
||||
- nfs_pmap->pm_vers = version.major;
|
||||
+ if (version.v_mode == V_DEFAULT)
|
||||
+ nfs_pmap->pm_vers = 0;
|
||||
+ else
|
||||
+ nfs_pmap->pm_vers = version.major;
|
||||
if (!nfs_nfs_protocol(options, &nfs_pmap->pm_prot))
|
||||
return 0;
|
||||
if (!nfs_nfs_port(options, &nfs_pmap->pm_port))
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 26 16:17:42 UTC 2015 - schwab@suse.de
|
||||
|
||||
- nfs-utils-uninit-mem.patch: fix use of uninitialized memory (bsc#956743)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 9 23:53:43 UTC 2015 - p.drouand@gmail.com
|
||||
|
||||
|
@ -19,6 +19,7 @@
|
||||
Name: nfs-utils
|
||||
BuildRequires: device-mapper-devel
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: fedfs-utils-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libevent-devel
|
||||
@ -30,9 +31,8 @@ BuildRequires: libtool
|
||||
BuildRequires: nfsidmap-devel >= 0.24
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: sqlite3-devel
|
||||
BuildRequires: tcpd-devel
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: fedfs-utils-devel
|
||||
BuildRequires: tcpd-devel
|
||||
Url: http://kernel.org/pub/linux/utils/nfs-utils/
|
||||
Summary: Support Utilities for Kernel nfsd
|
||||
License: GPL-2.0+
|
||||
@ -62,6 +62,7 @@ Source17: nfs-server.nfsserver.conf
|
||||
Source18: nfs-client.nfs.conf
|
||||
Patch0: nfs-utils-1.0.7-bind-syntax.patch
|
||||
Patch1: nfs-utils-no-svcgss.service
|
||||
Patch2: nfs-utils-uninit-mem.patch
|
||||
Suggests: python-base
|
||||
|
||||
%description
|
||||
@ -113,6 +114,7 @@ This package contains additional NFS documentation.
|
||||
%setup -q -n nfs-utils-%{version} -a 1
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
cp %{S:6} .
|
||||
|
||||
%build
|
||||
|
Loading…
Reference in New Issue
Block a user