rpms/util-linux/FC-3 util-linux-2.12a-lastlabel.patch, NONE, 1.1 util-linux-2.12p-look-separator.patch, NONE, 1.1 util-linux-2.12p-nfsman.patch, NONE, 1.1 util-linux.spec, 1.54, 1.55

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/util-linux/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv31039

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.12a-lastlabel.patch 
	util-linux-2.12p-look-separator.patch 
	util-linux-2.12p-nfsman.patch 
Log Message:
- fix #156597 - look - doesn't work with separators
- fix #154202 - wrong duplicate labels detection
- fix #155293 - man 5 nfs should include vers as a mount option


util-linux-2.12a-lastlabel.patch:
 mount_by_label.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE util-linux-2.12a-lastlabel.patch ---
--- util-linux-2.12a/mount/mount_by_label.c.lastlabel	2005-04-08 14:00:03.525410992 +0200
+++ util-linux-2.12a/mount/mount_by_label.c	2005-04-08 14:00:16.871382096 +0200
@@ -385,7 +385,7 @@
         uuidcache_init();
 	if(!uuidCache) return NULL;
 
-        for (last = uuidCache; last->next; last = last->next) {
+        for (last = uuidCache; last; last = last->next) {
 		if (last->label && !strcmp(last->label, label)) {
 			occurrences++;
 			if (occurrences == 2)

util-linux-2.12p-look-separator.patch:
 look.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE util-linux-2.12p-look-separator.patch ---
--- util-linux-2.12p/misc-utils/look.c.sep	2005-05-02 12:51:17.808227240 +0200
+++ util-linux-2.12p/misc-utils/look.c	2005-05-02 12:53:18.078943312 +0200
@@ -327,9 +327,12 @@
 	/* copy, ignoring things that should be ignored */
 	p = comparbuf;
 	i = stringlen;
-	while(s2 < s2end && *s2 != '\n' && i--) {
+	while(s2 < s2end && *s2 != '\n' && i) {
 		if (!dflag || isalnum(*s2))
+		{
 			*p++ = *s2;
+			i--;
+		}
 		s2++;
 	}
 	*p = 0;

util-linux-2.12p-nfsman.patch:
 nfs.5 |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE util-linux-2.12p-nfsman.patch ---
--- util-linux-2.12p/mount/nfs.5.nfsver	2005-04-20 12:29:01.597052880 +0200
+++ util-linux-2.12p/mount/nfs.5	2005-04-20 12:30:02.181842592 +0200
@@ -180,6 +180,10 @@
 for hosts that can run multiple NFS servers.
 The default value depends on which kernel you are using.
 .TP 1.5i
+.I vers=n
+vers is an alternative to nfsvers and is compatible with
+many other operating systems.
+.TP 1.5i
 .I nolock
 Disable NFS locking. Do not start lockd.
 This has to be used with some old NFS servers


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-3/util-linux.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- util-linux.spec	2 May 2005 12:46:11 -0000	1.54
+++ util-linux.spec	2 May 2005 16:55:37 -0000	1.55
@@ -111,6 +111,13 @@
 Patch163: util-linux-2.12a-swap-label.patch
 # 145355 - Man pages for fstab and fstab-sync in conflict
 Patch164: util-linux-2.12a-fstab-man.patch
+# 154202 - wrong duplicate labels detection
+Patch165: util-linux-2.12a-lastlabel.patch
+# 155293 - man 5 nfs should include vers as a mount option
+Patch166: util-linux-2.12p-nfsman.patch
+# 156597 - look - doesn't work with separators
+Patch167: util-linux-2.12p-look-separator.patch
+
 
 # patches required for NFSv4 support
 Patch1000: util-linux-2.12-nfsv4.patch
@@ -240,6 +247,9 @@
 %patch162 -p1 -b .typo
 %patch163 -p1 -b .swaplabel
 %patch164 -p1 -b .sync
+%patch165 -p1
+%patch166 -p1
+%patch167 -p1
 
 %patch1000 -p1 -b .nfsv4
 %patch1001 -p1
@@ -623,6 +633,8 @@
 %changelog
 * Mon May  2 2005 Karel Zak <kzak at edhat.com> 2.12a-24.1
 - fix #156597 - look - doesn't work with separators
+- fix #154202 - wrong duplicate labels detection
+- fix #155293 - man 5 nfs should include vers as a mount option
 
 * Mon Apr  4 2005 Karel Zak <kzak at edhat.com> 2.12a-23
 - Fixed dmesg doesn't understand kernel log buffer size (#138772)