Hello community, here is the log from the commit of package dmraid checked in at Mon Dec 11 15:41:23 CET 2006. -------- --- dmraid/dmraid.changes 2006-11-24 13:06:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/dmraid/dmraid.changes 2006-12-11 11:19:12.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Dec 11 10:48:21 CET 2006 - mkoenig@suse.de + +- fix jm name string termination problem [#223843] + patch: dmraid-1.0.0.rc13-jm_termination.patch +- fix min, max macros + patch: dmraid-1.0.0.rc13-fix_macro.patch + +------------------------------------------------------------------- New: ---- dmraid-1.0.0.rc13-fix_macro.patch dmraid-1.0.0.rc13-jm_termination.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmraid.spec ++++++ --- /var/tmp/diff_new_pack.Zz0HRK/_old 2006-12-11 14:07:22.000000000 +0100 +++ /var/tmp/diff_new_pack.Zz0HRK/_new 2006-12-11 14:07:22.000000000 +0100 @@ -18,13 +18,15 @@ Autoreqprov: on Summary: A Device-Mapper Software RAID Support Tool Version: 1.0.0.rc13 -Release: 8 +Release: 10 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Patch0: dmraid_fixup_paths3.diff Patch1: dmraid-add_uuid.patch Patch2: dmraid_fixup_nvidia.diff Patch3: dmraid_duplicate_args.patch Patch4: dmraid-1.0.0.rc13-geometry.patch +Patch5: dmraid-1.0.0.rc13-jm_termination.patch +Patch6: dmraid-1.0.0.rc13-fix_macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,6 +62,8 @@ %patch2 -p2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build #rm -f aclocal.m4 @@ -95,6 +99,11 @@ %doc LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/* %changelog -n dmraid +* Mon Dec 11 2006 - mkoenig@suse.de +- fix jm name string termination problem [#223843] + patch: dmraid-1.0.0.rc13-jm_termination.patch +- fix min, max macros + patch: dmraid-1.0.0.rc13-fix_macro.patch * Thu Nov 23 2006 - mkoenig@suse.de - fix geometry patch [#222110] * Mon Nov 20 2006 - mkoenig@suse.de ++++++ dmraid-1.0.0.rc13-fix_macro.patch ++++++ Index: 1.0.0.rc13/lib/internal.h =================================================================== --- 1.0.0.rc13.orig/lib/internal.h +++ 1.0.0.rc13/lib/internal.h @@ -49,8 +49,8 @@ #define u_int64_t uint64_t #endif -#define min(a, b) a < b ? a : b -#define max(a, b) a > b ? a : b +#define min(a, b) ((a) < (b) ? (a) : (b)) +#define max(a, b) ((a) > (b) ? (a) : (b)) #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*a)) #define ARRAY_END(a) (a + ARRAY_SIZE(a)) ++++++ dmraid-1.0.0.rc13-jm_termination.patch ++++++ Index: 1.0.0.rc13/lib/format/ataraid/jm.c =================================================================== --- 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) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org