diff --git a/.nfs-utils.metadata b/.nfs-utils.metadata index 8f7dd17..1f0682f 100644 --- a/.nfs-utils.metadata +++ b/.nfs-utils.metadata @@ -1 +1 @@ -16b277a36375e78a367dab5dd7599c2f4a7eb933 SOURCES/nfs-utils-1.2.9.tar.bz2 +c4308c2560748c35467483ca98ce050bd985f1fa SOURCES/nfs-utils-1.3.0.tar.xz diff --git a/SOURCES/nfs-server.postconfig b/SOURCES/nfs-server.postconfig deleted file mode 100644 index 6ff8a59..0000000 --- a/SOURCES/nfs-server.postconfig +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -. /etc/sysconfig/nfs - -# -# Enabled the RDMA server support if configured to do so. -# -# Load the module and then enable the server to listen -# on the given port -if [ -n "$RDMA_PORT" ]; then - /sbin/modprobe svcrdma - echo "rdma $RDMA_PORT" > /proc/fs/nfsd/portlist -fi - -exit 0 diff --git a/SOURCES/nfs-server.service b/SOURCES/nfs-server.service index 8c8357b..6f8ccb4 100644 --- a/SOURCES/nfs-server.service +++ b/SOURCES/nfs-server.service @@ -12,11 +12,10 @@ EnvironmentFile=-/etc/sysconfig/nfs ExecStartPre=/usr/libexec/nfs-utils/scripts/nfs-server.preconfig ExecStartPre=/usr/sbin/exportfs -r ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDARGS $RPCNFSDCOUNT -ExecStartPost=-/usr/libexec/nfs-utils/scripts/nfs-server.postconfig ExecStop=/usr/sbin/rpc.nfsd 0 ExecStopPost=/usr/sbin/exportfs -f ExecReload=/usr/sbin/exportfs -r [Install] WantedBy=nfs.target - +Also=nfs.target diff --git a/SOURCES/nfs-utils-1.2.9-gssd-nokeytab.patch b/SOURCES/nfs-utils-1.2.9-gssd-nokeytab.patch deleted file mode 100644 index 0f095df..0000000 --- a/SOURCES/nfs-utils-1.2.9-gssd-nokeytab.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up nfs-utils-1.2.9/utils/gssd/gssd_proc.c.orig nfs-utils-1.2.9/utils/gssd/gssd_proc.c ---- nfs-utils-1.2.9/utils/gssd/gssd_proc.c.orig 2013-11-05 15:41:27.000000000 -0500 -+++ nfs-utils-1.2.9/utils/gssd/gssd_proc.c 2013-11-12 13:28:40.024226616 -0500 -@@ -1027,6 +1027,21 @@ process_krb5_upcall(struct clnt_info *cl - gss_cred_id_t gss_cred; - OM_uint32 maj_stat, min_stat, lifetime_rec; - pid_t pid; -+ static int once = 0; -+ -+ /* -+ * If there is not a readable keytab why bother. -+ * Just return the error back to the kernel. -+ */ -+ if (access(keytabfile, R_OK) == -1) { -+ if (!once) { -+ printerr(0, "WARNING: unable able access %s: %s\n", -+ keytabfile, strerror(errno)); -+ once = 1; -+ } -+ do_error_downcall(fd, uid, -errno); -+ return; -+ } - - pid = fork(); - switch(pid) { -@@ -1116,7 +1131,7 @@ process_krb5_upcall(struct clnt_info *cl - * of them until one works or we've tried them all - */ - if (gssd_get_krb5_machine_cred_list(&credlist)) { -- printerr(0, "ERROR: No credentials found " -+ printerr(1, "ERROR: No credentials found " - "for connection to server %s\n", - clp->servername); - goto out_return_error; diff --git a/SOURCES/nfs-utils-1.2.9-mount-error.patch b/SOURCES/nfs-utils-1.2.9-mount-error.patch deleted file mode 100644 index edce041..0000000 --- a/SOURCES/nfs-utils-1.2.9-mount-error.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up nfs-utils-1.2.9/utils/mount/network.c.orig nfs-utils-1.2.9/utils/mount/network.c ---- nfs-utils-1.2.9/utils/mount/network.c.orig 2013-11-05 15:41:27.000000000 -0500 -+++ nfs-utils-1.2.9/utils/mount/network.c 2013-11-06 07:42:08.661822962 -0500 -@@ -1242,6 +1242,8 @@ nfs_nfs_version(struct mount_options *op - *version = tmp; - return 1; - } -+ nfs_error(_("%s: parsing error on 'vers=' option\n"), -+ progname); - return 0; - case PO_NOT_FOUND: - nfs_error(_("%s: parsing error on 'vers=' option\n"), -@@ -1259,6 +1261,8 @@ nfs_nfs_version(struct mount_options *op - *version = tmp; - return 1; - } -+ nfs_error(_("%s: parsing error on 'nfsvers=' option\n"), -+ progname); - return 0; - case PO_NOT_FOUND: - nfs_error(_("%s: parsing error on 'nfsvers=' option\n"), diff --git a/SOURCES/nfs.sysconfig b/SOURCES/nfs.sysconfig index d908a8f..3f959db 100644 --- a/SOURCES/nfs.sysconfig +++ b/SOURCES/nfs.sysconfig @@ -34,9 +34,5 @@ GSS_USE_PROXY="no" # Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8) RPCSVCGSSDARGS="" # -# To enable RDMA support on the server by setting this to -# the port the server should listen on -#RDMA_PORT=20049 -# # Optional arguments passed to blkmapd. See blkmapd(8) BLKMAPDARGS="" diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec index 3d96e52..a36f6fb 100644 --- a/SPECS/nfs-utils.spec +++ b/SPECS/nfs-utils.spec @@ -1,14 +1,14 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Name: nfs-utils URL: http://sourceforge.net/projects/nfs -Version: 1.2.9 -Release: 0.3%{?dist} +Version: 1.3.0 +Release: 0%{?dist} Epoch: 1 # group all 32bit related archs %define all_32bit_archs i386 i486 i586 i686 athlon ppc sparcv9 -Source0: http://sourceforge.net/projects/nfs/files/nfs-utils/%{version}/%{name}-%{version}.tar.bz2 +Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz Source9: id_resolver.conf Source10: nfs.sysconfig @@ -33,11 +33,7 @@ Source21: proc-fs-nfsd.mount Source50: nfs-lock.preconfig Source51: nfs-server.preconfig -Source52: nfs-server.postconfig -%define nfs_configs %{SOURCE50} %{SOURCE51} %{SOURCE52} - -Patch001: nfs-utils-1.2.9-mount-error.patch -Patch002: nfs-utils-1.2.9-gssd-nokeytab.patch +%define nfs_configs %{SOURCE50} %{SOURCE51} Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch @@ -95,9 +91,6 @@ This package also contains the mount.nfs and umount.nfs program. %prep %setup -q -%patch001 -p1 -%patch002 -p1 - %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -218,16 +211,12 @@ if [ $1 -eq 1 ]; then /bin/systemctl enable nfs.target >/dev/null 2>&1 || : /bin/systemctl enable nfs-lock.service >/dev/null 2>&1 || : /bin/systemctl start nfs-lock.service >/dev/null 2>&1 || : - /bin/systemctl enable nfs-secure.service >/dev/null 2>&1 || : - /bin/systemctl start nfs-secure.service >/dev/null 2>&1 || : else # Package upgrade /bin/systemctl reenable nfs.target >/dev/null 2>&1 || : if /bin/systemctl --quiet is-enabled nfs-lock.service ; then /bin/systemctl reenable nfs-lock.service >/dev/null 2>&1 || : fi - /bin/systemctl enable nfs-secure.service >/dev/null 2>&1 || : - /bin/systemctl start nfs-secure.service >/dev/null 2>&1 || : fi # Make sure statd used the correct uid/gid. chown -R rpcuser:rpcuser /var/lib/nfs/statd @@ -255,6 +244,10 @@ if [ $1 -ge 1 ]; then fi /bin/systemctl --system daemon-reload >/dev/null 2>&1 || : +%triggerun -- nfs-utils < 1:1.2.9-0.5 +/bin/systemctl stop nfs-secure.service >/dev/null 2>&1 || : +/bin/systemctl disable nfs-secure.service >/dev/null 2>&1 || : + %triggerun -- nfs-utils < 1:1.2.4-2 /bin/systemctl enable nfs-lock.service >/dev/null 2>&1 || : if /sbin/chkconfig --level 3 nfs ; then @@ -315,11 +308,47 @@ fi /sbin/umount.nfs4 %changelog +* Wed Mar 26 2014 Steve Dickson 1.3.0-0.0 +- Updated to latest upstream release: nfs-utils-1-3-0 + - mount.nfs: Fix fallback from tcp to udp (bz 984901) + - nfsidmap: Keys need to be invalidated instead of revoked (bz 1080505) +- Removed RDMA_PORT stub from /etc/sysconfig/nfs (bz 1078792) + +* Fri Jan 24 2014 Daniel Mach - 1:1.2.9-4 +- Mass rebuild 2014-01-24 + +* Thu Jan 23 2014 Steve Dickson 1.2.9-3.1 +- gssd: set $HOME to prevent recursion when home dirs are on kerberized NFS mount (bz 1056658) + +* Mon Jan 20 2014 Steve Dickson 1.2.9-3.0 +- Updated to the latest upstream RC release nfs-utils-1.2.10-rc3 + - exportfs: Exit with correct value when an error occurs (bz 1053933) + - mount.nfs: Removed supported flag from usage string (bz 1000989) + - gssd: Improve first attempt at acquiring GSS credentials (bz 1053877) + - rpc.idmapd: Remove no longer supported flags from man page (bz 1003513) + - rpc.statd: Allow usage messages to be displayed when statd is running. (bz 1037044) + +* Wed Jan 8 2014 Steve Dickson 1.2.9-2.1 +- exportfs: Remove a buffer overlow (bz 1008384) +- nfs-server: Added an Also cause (bz 1050161) + +* Wed Jan 8 2014 Steve Dickson 1.2.9-2.0 +- Updated to the latest upstream RC release nfs-utils-1.2.10-rc2 + - mount.nfs: Eliminated long delays during mount (bz 1031643) + - exportfs: Corrected erroneously error messages (bz 1049589) + +* Tue Jan 7 2014 Steve Dickson 1.2.9-0.5 +- Reverted patch for bz1029573. The kernel can now detect + when rpc.gssd is or is not running (bz1031197) +- gssd: always reply to rpc-pipe requests from kernel. (bz1031197) + +* Fri Dec 27 2013 Daniel Mach - 1:1.2.9-0.4 +- Mass rebuild 2013-12-27 + * Tue Nov 12 2013 Steve Dickson 1.2.9-0.3 - The patch for bz 1029573 had a zero length due a typo (bz 1029573) * Tue Nov 12 2013 Steve Dickson 1.2.9-0.2 -- gssd, is started by default to fix a 15sec kernel hang (bz 1029573) - gssd will return immediately when a keytab is not readable (bz 1029573) * Thu Nov 7 2013 Steve Dickson 1.2.9-0.1