diff --git a/dmraid-1.0.0.rc15-scsi_serial_remove_ws.patch b/dmraid-1.0.0.rc15-scsi_serial_remove_ws.patch new file mode 100644 index 0000000..2b7e516 --- /dev/null +++ b/dmraid-1.0.0.rc15-scsi_serial_remove_ws.patch @@ -0,0 +1,16 @@ +Index: 1.0.0.rc15/lib/device/scsi.c +=================================================================== +--- 1.0.0.rc15.orig/lib/device/scsi.c 2008-09-17 15:20:33.000000000 +0200 ++++ 1.0.0.rc15/lib/device/scsi.c 2008-10-14 15:45:20.000000000 +0200 +@@ -110,7 +110,10 @@ get_scsi_serial(struct lib_context *lc, + } + + ret = ret && +- (di->serial = dbg_strdup((char *) &response[p->start + 1])); ++ (di->serial = ++ dbg_strdup(remove_white_space(lc, ++ (char *) &response[p->start + 1], ++ serial_len))); + } + + dbg_free(response); diff --git a/dmraid.changes b/dmraid.changes index ce45bd2..7f91a73 100644 --- a/dmraid.changes +++ b/dmraid.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 14 17:33:33 CEST 2008 - mkoenig@suse.de + +- remove whitespace from serial id [bnc#433833] + ------------------------------------------------------------------- Thu Sep 25 14:49:41 CEST 2008 - mkoenig@suse.de diff --git a/dmraid.spec b/dmraid.spec index 23b3cf8..7b5a03c 100644 --- a/dmraid.spec +++ b/dmraid.spec @@ -19,7 +19,8 @@ Name: dmraid -BuildRequires: device-mapper-devel libselinux-devel zlib-devel +BuildRequires: device-mapper-devel zlib-devel +BuildRequires: libselinux-devel Requires: kpartx Url: http://people.redhat.com/~heinzm/sw/dmraid/src/ License: GPL v2 or later @@ -27,7 +28,7 @@ Group: System/Base AutoReqProv: on Summary: A Device-Mapper Software RAID Support Tool Version: 1.0.0.rc15 -Release: 1 +Release: 2 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Source1: sysconfig.dmraid Source2: boot.dmraid @@ -41,6 +42,7 @@ Patch3: dmraid_duplicate_args.patch Patch4: dmraid-1.0.0.rc13-geometry.patch Patch6: dmraid-1.0.0.rc15-fix_macro.patch Patch10: dmraid-1.0.0.rc14-fixup_lsi1068e.patch +Patch11: dmraid-1.0.0.rc15-scsi_serial_remove_ws.patch # libdmraid-events Patch50: libdmraid-events.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -110,6 +112,7 @@ Authors: %patch4 -p1 %patch6 -p1 %patch10 -p1 +%patch11 -p1 pushd libdmraid* %patch50 popd @@ -193,6 +196,8 @@ install -D -m644 reg_tool/dm_dso_reg_tool.8 $RPM_BUILD_ROOT/usr/share/man/man8/d /%{_lib}/libdmraid-events.so.0 %changelog +* Tue Oct 14 2008 mkoenig@suse.de +- remove whitespace from serial id [bnc#433833] * Thu Sep 25 2008 mkoenig@suse.de - update to 1.0.0rc15 * jm.c: fixed name handling