rpms/dmraid/devel dmraid-1.0.0.rc14-jmicron-name.patch, NONE, 1.1 dmraid.spec, 1.81, 1.82

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7741

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc14-jmicron-name.patch 
Log Message:
- Fix jmicron name parsing (#219058)


dmraid-1.0.0.rc14-jmicron-name.patch:
 jm.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE dmraid-1.0.0.rc14-jmicron-name.patch ---
--- 1.0.0.rc13.orig/lib/format/ataraid/jm.c
+++ 1.0.0.rc13/lib/format/ataraid/jm.c
@@ -28,10 +28,15 @@ static char *name(struct lib_context *lc
 	size_t len;
 	struct jm *jm = META(rd, jm);
 	char buf[2], *ret, *name = (char *) jm->name;
+	char buf0[JM_NAME_LEN+1] = { '\0' };
+	size_t i = JM_NAME_LEN-1;
 
-	/* Name always 0 terminated ? */
-	if ((len = strlen(name)) > JM_NAME_LEN)
-		len = JM_NAME_LEN;
+	strncpy(buf0, jm->name, JM_NAME_LEN);
+	while (i!=0 && buf0[i]==' ') {
+		buf0[i]='\0';
+		--i;
+	}
+	len = strlen(buf0);
 
 	len += sizeof(HANDLER) + 2;
 	if (jm->mode == JM_T_RAID01)


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- dmraid.spec	5 Feb 2007 20:28:19 -0000	1.81
+++ dmraid.spec	18 Apr 2007 20:46:12 -0000	1.82
@@ -7,7 +7,7 @@
 Summary: Device-mapper RAID tool and library.
 Name: dmraid
 Version: 1.0.0.rc14
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -18,6 +18,7 @@
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
+Patch0: dmraid-1.0.0.rc14-jmicron-name.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation and display of
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q -n dmraid/%{version}
+%patch0 -p1 -b .jmicron-name
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link
@@ -78,6 +80,9 @@
 %{_libdir}/libdmraid.so
 
 %changelog
+* Wed Apr 18 2007 Peter Jones <pjones at redhat.com> - 1.0.0.rc14-3
+- Fix jmicron name parsing (#219058)
+
 * Mon Feb 05 2007 Alasdair Kergon <agk at redhat.com> - 1.0.0.rc14-2
 - Add build dependency on new device-mapper-devel package.
 - Add dependency on device-mapper.