Author: arekm Date: Sun Oct 4 10:55:57 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; git fixes
---- Files affected: packages/mdadm: mdadm.spec (1.96 -> 1.97) , mdadm-git.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mdadm/mdadm.spec diff -u packages/mdadm/mdadm.spec:1.96 packages/mdadm/mdadm.spec:1.97 --- packages/mdadm/mdadm.spec:1.96 Fri Sep 25 10:55:20 2009 +++ packages/mdadm/mdadm.spec Sun Oct 4 12:55:52 2009 @@ -8,7 +8,7 @@ Summary(pl.UTF-8): Narzędzie do tworzenia i obsługi programowych macierzy RAID Name: mdadm Version: 3.0.2 -Release: 1 +Release: 2 License: GPL v2+ Group: Base Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.bz2 @@ -19,6 +19,7 @@ Source4: %{name}-checkarray Source5: %{name}-initramfs-hook Source6: %{name}-initramfs-local-top +Patch0: %{name}-git.patch URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ BuildRequires: groff BuildRequires: rpmbuild(macros) >= 1.213 @@ -77,6 +78,7 @@ %prep %setup -q +%patch0 -p1 %build %if %{with initrd} @@ -185,6 +187,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.97 2009/10/04 10:55:52 arekm +- rel 2; git fixes + Revision 1.96 2009/09/25 08:55:20 arekm - up to 3.0.2 ================================================================ Index: packages/mdadm/mdadm-git.patch diff -u /dev/null packages/mdadm/mdadm-git.patch:1.1 --- /dev/null Sun Oct 4 12:55:57 2009 +++ packages/mdadm/mdadm-git.patch Sun Oct 4 12:55:52 2009 @@ -0,0 +1,73 @@ +commit 2b9aa337af7291d3f141322da96c9f667c99d53c +Author: NeilBrown <[email protected]> +Date: Thu Oct 1 12:51:04 2009 +1000 + + Fix null-dereference in set_member_info + + set_member_info would try to dereference ->metadata_version, without + checking that it isn't NULL. + + Signed-off-by: NeilBrown <[email protected]> + +diff --git a/mapfile.c b/mapfile.c +index a3038be..ed59db5 100644 +--- a/mapfile.c ++++ b/mapfile.c +@@ -303,19 +303,22 @@ struct map_ent *map_by_name(struct map_ent **map, char *name) + */ + static void set_member_info(struct supertype *st, struct mdstat_ent *ent) + { +- char version[strlen(ent->metadata_version)+1]; + + st->subarray[0] = '\0'; + +- if (strncmp(ent->metadata_version, "external:", 9) != 0) ++ if (ent->metadata_version == NULL || ++ strncmp(ent->metadata_version, "external:", 9) != 0) + return; + +- strcpy(version, ent->metadata_version); +- +- if (is_subarray(&version[9])) { +- char *subarray = strrchr(version, '/'); ++ if (is_subarray(&ent->metadata_version[9])) { ++ char version[strlen(ent->metadata_version)+1]; ++ char *subarray; + char *name = &version[10]; + ++ strcpy(version, ent->metadata_version); ++ subarray = strrchr(version, '/'); ++ name = &version[10]; ++ + if (!subarray) + return; + *subarray++ = '\0'; + +commit 0e90271e53c0f6efb33e904cf407498350e2a14d +Author: NeilBrown <[email protected]> +Date: Thu Oct 1 12:38:31 2009 +1000 + + Add missing space in "--detail --brief" output. + + We need a space between the device name and the word "level".. + + Signed-off-by: NeilBrown <[email protected]> + +diff --git a/Detail.c b/Detail.c +index 001012a..a70db34 100644 +--- a/Detail.c ++++ b/Detail.c +@@ -207,11 +207,11 @@ int Detail(char *dev, int brief, int export, int test, char *homehost) + printf("ARRAY %s", dev); + if (brief > 1) { + if (array.raid_disks) +- printf("level=%s num-devices=%d", ++ printf(" level=%s num-devices=%d", + c?c:"-unknown-", + array.raid_disks ); + else +- printf("level=container num-devices=%d", ++ printf(" level=container num-devices=%d", + array.nr_disks); + } + if (container) { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mdadm/mdadm.spec?r1=1.96&r2=1.97&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
