Updated to latest upstream version 1.3.3

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2015-11-02 09:49:34 -05:00
parent 7765dd87e1
commit f48d343ad8
4 changed files with 14 additions and 14 deletions

2
.gitignore vendored
View File

@ -6,3 +6,5 @@ nfs-utils-1.3.0/
nfs-utils-1.3.1/ nfs-utils-1.3.1/
/nfs-utils-1.3.2.tar.xz /nfs-utils-1.3.2.tar.xz
nfs-utils-1.3.2/ nfs-utils-1.3.2/
/nfs-utils-1.3.3.tar.xz
nfs-utils-1.3.3/

View File

@ -1,12 +1,12 @@
diff -up nfs-utils-1.2.8/utils/nfsidmap/nfsidmap.c.orig nfs-utils-1.2.8/utils/nfsidmap/nfsidmap.c diff -up nfs-utils-1.3.3/utils/nfsidmap/nfsidmap.c.orig nfs-utils-1.3.3/utils/nfsidmap/nfsidmap.c
--- nfs-utils-1.2.8/utils/nfsidmap/nfsidmap.c.orig 2013-04-22 12:47:20.000000000 -0400 --- nfs-utils-1.3.3/utils/nfsidmap/nfsidmap.c.orig 2015-09-26 10:01:11.000000000 -0400
+++ nfs-utils-1.2.8/utils/nfsidmap/nfsidmap.c 2013-09-18 15:38:13.872514000 -0400 +++ nfs-utils-1.3.3/utils/nfsidmap/nfsidmap.c 2015-11-02 09:04:35.380893753 -0500
@@ -291,7 +291,7 @@ int main(int argc, char **argv) @@ -425,7 +425,7 @@ int main(int argc, char **argv)
xlog_stderr(0); xlog_stderr(0);
if ((argc - optind) != 2) { if ((argc - optind) != 2) {
- xlog_err("Bad arg count. Check /etc/request-key.conf"); - xlog_err("Bad arg count. Check /etc/request-key.conf");
+ xlog_err("Bad arg count. Check /etc/request-key.d/id_resolver.conf"); + xlog_err("Bad arg count. Check /etc/request-key.d/request-key.conf");
xlog_warn(usage, progname); xlog_warn(usage, progname);
return 1; return EXIT_FAILURE;
} }

View File

@ -5,8 +5,8 @@
Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
Name: nfs-utils Name: nfs-utils
URL: http://sourceforge.net/projects/nfs URL: http://sourceforge.net/projects/nfs
Version: 1.3.2 Version: 1.3.3
Release: 14%{?dist} Release: 0.0%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -19,9 +19,6 @@ Source2: nfs.sysconfig
Source3: nfs-utils_env.sh Source3: nfs-utils_env.sh
Source4: lockd.conf Source4: lockd.conf
Patch001: nfs-utils-1.3.3-rc5.patch
Patch002: nfs-utils-1.3.2-gssd-noclear-retval.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch
@ -82,9 +79,6 @@ This package also contains the mount.nfs and umount.nfs program.
%prep %prep
%setup -q %setup -q
%patch001 -p1
%patch002 -p1
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
@ -314,6 +308,9 @@ fi
/sbin/umount.nfs4 /sbin/umount.nfs4
%changelog %changelog
* Mon Nov 2 2015 Steve Dickson <steved@redhat.com> 1.3.3-0.0
- Updated to latest upstream version 1.3.3
* Sun Nov 01 2015 Kalev Lember <klember@redhat.com> - 1:1.3.2-14 * Sun Nov 01 2015 Kalev Lember <klember@redhat.com> - 1:1.3.2-14
- Disable bootstrap - Disable bootstrap

View File

@ -1 +1,2 @@
4cdffb2c7f7fd2bdceaba55ab1b881da nfs-utils-1.3.2.tar.xz 4cdffb2c7f7fd2bdceaba55ab1b881da nfs-utils-1.3.2.tar.xz
cd6b568c2e9301cc3bfac09d87fbbc0b nfs-utils-1.3.3.tar.xz