[nfs-utils] Update to the latest upstream release: nfs-utils-1.2.6

[Steve Dickson]

commit 470c3f7bf3fb868330de4f0af18e86155f36e80e
Author: Steve Dickson <steved at redhat.com>
Date:   Tue May 15 11:40:55 2012 -0400

    Update to the latest upstream release: nfs-utils-1.2.6
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 .gitignore                           |    2 +
 0001-blkmapd-remove-pretty_sig.patch |   75 ++++++++++++++++++++++++++++++++++
 nfs-utils.spec                       |    9 +++-
 sources                              |    1 +
 4 files changed, 84 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7749217..1a3f0d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 x86_64
 nfs-utils-1.2.5
+nfs-utils-1.2.6
 /nfs-utils-1.2.5.tar.bz2
+/nfs-utils-1.2.6.tar.bz2
diff --git a/0001-blkmapd-remove-pretty_sig.patch b/0001-blkmapd-remove-pretty_sig.patch
new file mode 100644
index 0000000..c119361
--- /dev/null
+++ b/0001-blkmapd-remove-pretty_sig.patch
@@ -0,0 +1,75 @@
+From a69f6aeb19841f5a95c3eb4f4e5fe5ca0db247f4 Mon Sep 17 00:00:00 2001
+From: Jim Rees <rees at umich.edu>
+Date: Tue, 15 May 2012 10:10:01 -0400
+Subject: [PATCH 1/1] blkmapd: remove pretty_sig()
+
+This really only works against EMC servers.  There is at least one server
+that returns unprintable signatures, which fill the log with garbage (the
+spec does not mandate printable signatures).  It could be made more generic,
+for example by checking each byte for isprint().  But the signatures are
+really only of interest to developers, not admins, so it seems better to
+just remove it.
+
+Signed-off-by: Jim Rees <rees at umich.edu>
+Signed-off-by: Steve Dickson <steved at redhat.com>
+---
+ utils/blkmapd/device-process.c |   29 -----------------------------
+ 1 files changed, 0 insertions(+), 29 deletions(-)
+
+diff --git a/utils/blkmapd/device-process.c b/utils/blkmapd/device-process.c
+index 652a7a8..5fe3dff 100644
+--- a/utils/blkmapd/device-process.c
++++ b/utils/blkmapd/device-process.c
+@@ -49,28 +49,6 @@
+ 
+ #include "device-discovery.h"
+ 
+-static char *pretty_sig(char *sig, uint32_t siglen)
+-{
+-	static char rs[100];
+-	uint64_t sigval;
+-	unsigned int i;
+-
+-	if (siglen <= sizeof(sigval)) {
+-		sigval = 0;
+-		for (i = 0; i < siglen; i++)
+-			sigval |= ((unsigned char *)sig)[i] << (i * 8);
+-		sprintf(rs, "0x%0llx", (unsigned long long) sigval);
+-	} else {
+-		if (siglen > sizeof rs - 4) {
+-			siglen = sizeof rs - 4;
+-			sprintf(&rs[siglen], "...");
+-		} else
+-			rs[siglen] = '\0';
+-		memcpy(rs, sig, siglen);
+-	}
+-	return rs;
+-}
+-
+ uint32_t *blk_overflow(uint32_t * p, uint32_t * end, size_t nbytes)
+ {
+ 	uint32_t *q = p + ((nbytes + 3) >> 2);
+@@ -109,9 +87,6 @@ static int decode_blk_signature(uint32_t **pp, uint32_t * end,
+ 		 * for mapping, then thrown away.
+ 		 */
+ 		comp->bs_string = (char *)p;
+-		BL_LOG_INFO("%s: si_comps[%d]: bs_length %d, bs_string %s\n",
+-			    __func__, i, siglen,
+-			    pretty_sig(comp->bs_string, siglen));
+ 		p += ((siglen + 3) >> 2);
+ 	}
+ 	*pp = p;
+@@ -152,10 +127,6 @@ read_cmp_blk_sig(struct bl_disk *disk, int fd, struct bl_sig_comp *comp)
+ 	}
+ 
+ 	ret = memcmp(sig, comp->bs_string, siglen);
+-	if (!ret)
+-		BL_LOG_INFO("%s: %s sig %s at %lld\n", __func__, dev_name,
+-			    pretty_sig(sig, siglen),
+-			    (long long)comp->bs_offset);
+ 
+  out:
+ 	if (sig)
+-- 
+1.7.7.6
+
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 6ef9b13..8166609 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,8 +1,8 @@
 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.5
-Release: 16%{?dist}
+Version: 1.2.6
+Release: 0%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -30,7 +30,7 @@ Source52: nfs-server.postconfig
 
 Source60: nfs4-modalias.conf
 
-Patch001: nfs-utils-1.2.6-rc7.patch
+Patch001: 0001-blkmapd-remove-pretty_sig.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -281,6 +281,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue May 15 2012 Steve Dickson <steved at redhat.com> 1.2.6-0
+- Update to the latest upstream release: nfs-utils-1.2.6
+
 * Thu May  3 2012 Steve Dickson <steved at redhat.com> 1.2.5-16
 - Update to the latest RC release: nfs-utils-1.2.6-rc7
 
diff --git a/sources b/sources
index 9cca66b..9020bc0 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 8395ac770720b83c5c469f88306d7765  nfs-utils-1.2.5.tar.bz2
+8be543ca270c2234ff18f8c8d35e0d37  nfs-utils-1.2.6.tar.bz2