Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b3012f633685c3479f2f83de050e1edad57794ba)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b3012f633685c3479f2f83de050e1edad57794ba)
  • Date: Sat, 13 Feb 2010 17:10:14 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

disk/mdadm/DETAILS | 5
disk/mdadm/HISTORY | 5
disk/mdadm/PRE_BUILD | 3
disk/mdadm/mdadm-3.0.2-fix-null-dereference-in-set_member_info.patch | 51
----------
4 files changed, 7 insertions(+), 57 deletions(-)

New commits:
commit b3012f633685c3479f2f83de050e1edad57794ba
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mdadm: => 3.1.1

diff --git a/disk/mdadm/DETAILS b/disk/mdadm/DETAILS
index 102e1f9..58c16ac 100755
--- a/disk/mdadm/DETAILS
+++ b/disk/mdadm/DETAILS
@@ -1,9 +1,8 @@
SPELL=mdadm
- VERSION=3.0.2
- PATCHLEVEL=1
+ VERSION=3.1.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/raid/$SPELL/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sign
SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index 1e164d5..c560f1f 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,8 @@
+2010-02-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.1.1
+ * PRE_BUILD,
mdadm-3.0.2-fix-null-dereference-in-set_member_info.patch:
+ removed
+
2009-12-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD,
mdadm-3.0.2-fix-null-dereference-in-set_member_info.patch:
added patch from gentoo to fix segfault
diff --git a/disk/mdadm/PRE_BUILD b/disk/mdadm/PRE_BUILD
deleted file mode 100755
index 0918786..0000000
--- a/disk/mdadm/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 <
${SCRIPT_DIRECTORY}/mdadm-3.0.2-fix-null-dereference-in-set_member_info.patch
diff --git
a/disk/mdadm/mdadm-3.0.2-fix-null-dereference-in-set_member_info.patch
b/disk/mdadm/mdadm-3.0.2-fix-null-dereference-in-set_member_info.patch
deleted file mode 100644
index c740421..0000000
--- a/disk/mdadm/mdadm-3.0.2-fix-null-dereference-in-set_member_info.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-http://bugs.gentoo.org/287338
-
-From 2b9aa337af7291d3f141322da96c9f667c99d53c Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb AT suse.de>
-Date: Thu, 1 Oct 2009 12:51:04 +1000
-Subject: [PATCH] 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 <neilb AT suse.de>
----
- mapfile.c | 15 +++++++++------
- 1 files changed, 9 insertions(+), 6 deletions(-)
-
-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';
---
-1.6.5.rc2
-



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b3012f633685c3479f2f83de050e1edad57794ba), Vlad Glagolev, 02/13/2010

Archive powered by MHonArc 2.6.24.

Top of Page