From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 3 Sep 2014 19:15:13 +0000 (+0200)
Subject: mdadm: Update to 3.3.2
X-Git-Tag: v2.17-core87~103^2~51^2~28
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=9750c5e9dc369805df8b9983300103a919fb3559

mdadm: Update to 3.3.2
---

diff --git a/lfs/mdadm b/lfs/mdadm
index 2970b004c7..29d495d605 100644
--- a/lfs/mdadm
+++ b/lfs/mdadm
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.3.1
+VER        = 3.3.2
 
 THISAPP    = mdadm-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4227d48de62dfb217c92fa0c54171bbe
+$(DL_FILE)_MD5 = 44698d351501cac6a89072dc877eb220
 
 install : $(TARGET)
 
@@ -73,7 +73,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mdadm-3.3.1-Assemble-Only-fail-auto-assemble-in-face-of-mdadm.co.patch
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/src/patches/mdadm-3.3.1-Assemble-Only-fail-auto-assemble-in-face-of-mdadm.co.patch b/src/patches/mdadm-3.3.1-Assemble-Only-fail-auto-assemble-in-face-of-mdadm.co.patch
deleted file mode 100644
index 521578921b..0000000000
--- a/src/patches/mdadm-3.3.1-Assemble-Only-fail-auto-assemble-in-face-of-mdadm.co.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 5141638c54535b4ac80b8481404d868a63a18ecd Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Tue, 29 Jul 2014 13:48:23 +1000
-Subject: [PATCH] Assemble: Only fail auto-assemble in face of mdadm.conf
- conflicts.
-
-We should never auto-assemble things that conflict with mdadm.conf
-However explicit assembly requests should be allowed.
-
-Reported-by: olovopb
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1070245
-Signed-off-by: NeilBrown <neilb@suse.de>
----
- Assemble.c | 47 ++++++++++++++++++++++++++---------------------
- 1 file changed, 26 insertions(+), 21 deletions(-)
-
-diff --git a/Assemble.c b/Assemble.c
-index aca28be..cdcdb0f 100644
---- a/Assemble.c
-+++ b/Assemble.c
-@@ -366,9 +366,6 @@ static int select_devices(struct mddev_dev *devlist,
- 			tmpdev = NULL;
- 			goto loop;
- 		} else {
--			int rv = 0;
--			struct mddev_ident *match;
--
- 			content = *contentp;
- 			tst->ss->getinfo_super(tst, content, NULL);
- 
-@@ -377,25 +374,33 @@ static int select_devices(struct mddev_dev *devlist,
- 					   report_mismatch ? devname : NULL))
- 				goto loop;
- 
--			match = conf_match(tst, content, devname,
--					   report_mismatch ? c->verbose : -1,
--					   &rv);
--			if (!match && rv == 2)
--				goto loop;
--			if (match && match->devname &&
--			    strcasecmp(match->devname, "<ignore>") == 0) {
--				if (report_mismatch)
--					pr_err("%s is a member of an explicitly ignored array\n",
--					       devname);
--				goto loop;
--			}
--			if (match && !ident_matches(match, content, tst,
--						    c->homehost, c->update,
--						    report_mismatch ? devname : NULL))
--				/* Array exists  in mdadm.conf but some
--				 * details don't match, so reject it
-+			if (auto_assem) {
-+				/* Never auto-assemble things that conflict
-+				 * with mdadm.conf in some way
- 				 */
--				goto loop;
-+				struct mddev_ident *match;
-+				int rv = 0;
-+
-+				match = conf_match(tst, content, devname,
-+						   report_mismatch ? c->verbose : -1,
-+						   &rv);
-+				if (!match && rv == 2)
-+					goto loop;
-+				if (match && match->devname &&
-+				    strcasecmp(match->devname, "<ignore>") == 0) {
-+					if (report_mismatch)
-+						pr_err("%s is a member of an explicitly ignored array\n",
-+						       devname);
-+					goto loop;
-+				}
-+				if (match && !ident_matches(match, content, tst,
-+							    c->homehost, c->update,
-+							    report_mismatch ? devname : NULL))
-+					/* Array exists  in mdadm.conf but some
-+					 * details don't match, so reject it
-+					 */
-+					goto loop;
-+			}
- 
- 			/* should be safe to try an exclusive open now, we
- 			 * have rejected anything that some other mdadm might
--- 
-1.9.3
-