From 5fca48bd6d131748ea92cdfe7fc00388b1b6220c Mon Sep 17 00:00:00 2001
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Thu, 25 Oct 2012 11:03:41 +0200
Subject: [PATCH] Upgrade to mdadm-3.2.6

Resolves bz#869930

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 .gitignore                                       |  1 +
 mdadm-3.2.3-udev.patch => mdadm-3.2.6-udev.patch |  4 ++--
 mdadm.spec                                       | 16 +++++++---------
 sources                                          |  3 +--
 4 files changed, 11 insertions(+), 13 deletions(-)
 rename mdadm-3.2.3-udev.patch => mdadm-3.2.6-udev.patch (89%)

diff --git a/.gitignore b/.gitignore
index b95ceb9..612e34e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ clog
 /mdadm-3.2.3.tar.bz2
 /mdadm-3.2.4.tar.xz
 /mdadm-3.2.5.tar.xz
+/mdadm-3.2.6.tar.xz
diff --git a/mdadm-3.2.3-udev.patch b/mdadm-3.2.6-udev.patch
similarity index 89%
rename from mdadm-3.2.3-udev.patch
rename to mdadm-3.2.6-udev.patch
index 167c4de..a2084ce 100644
--- a/mdadm-3.2.3-udev.patch
+++ b/mdadm-3.2.6-udev.patch
@@ -18,10 +18,10 @@
  
  # remember you can limit what gets auto/incrementally assembled by
  # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
--ACTION=="add", RUN+="/sbin/mdadm --incremental $tempnode"
+-ACTION=="add", RUN+="/sbin/mdadm --incremental $tempnode --offroot"
 -ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
 -ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
-+#ACTION=="add", RUN+="/sbin/mdadm --incremental $tempnode"
++#ACTION=="add", RUN+="/sbin/mdadm --incremental $tempnode --offroot"
 +#ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
 +#ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
  
diff --git a/mdadm.spec b/mdadm.spec
index af65dc6..dff4712 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     3.2.5
-Release:     14%{?dist}
+Version:     3.2.6
+Release:     1%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -12,11 +12,8 @@ Source6:     mdmonitor.service
 Source7:     mdmonitor-takeover.service
 Source8:     mdadm.conf
 Source9:     mdadm_event.conf
-Patch1:      mdadm-3.2.5-imsm-fix-correct-checking-volume-s-degradation.patch
-Patch2:      mdadm-3.2.5-Replace-sha1.h-with-slightly-older-version.patch
-Patch3:	     mdadm-3.2.5-Add-zlib-license-to-crc32.c.patch
 # Fedora customization patches
-Patch97:     mdadm-3.2.3-udev.patch
+Patch97:     mdadm-3.2.6-udev.patch
 Patch98:     mdadm-2.5.2-static.patch
 # Fedora 15, 16, 17 - only
 Patch99:     mdadm-3.2.4-map-dir.patch
@@ -58,9 +55,6 @@ is not used as the system init process.
 %prep
 %setup -q
 
-%patch1 -p1 -b .reshape
-%patch2 -p1 -b .shaver
-%patch3 -p1 -b .zlibver
 # Fedora customization patches
 %patch97 -p1 -b .udev
 %patch98 -p1 -b .static
@@ -142,6 +136,10 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Thu Oct 25 2012 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.2.6-1
+- Upgrade to mdadm-3.2.6
+- Resolves bz869930
+
 * Fri Oct 19 2012 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.2.5-14
 - Dummy update to work around bodhi breakage. No actual code changes.
 
diff --git a/sources b/sources
index cd4bd7c..e16d218 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-86f0c852eb2e8c23c43044f622865bde  mdadm-3.2.4.tar.xz
-2fd33dedcdb06f0d1461f50ddabb7e4a  mdadm-3.2.5.tar.xz
+2afc306135466923fe5020d743bff9a4  mdadm-3.2.6.tar.xz