[mdadm/f15: 1/2] Update to mdadm-3.2.3
Jes Sorensen
jsorensen at fedoraproject.org
Thu Jan 5 10:07:02 UTC 2012
commit 09420a0c0fa0a61a51088956ca77c694a70218a9
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date: Fri Dec 30 17:42:20 2011 +0100
Update to mdadm-3.2.3
Signed-off-by: Jes Sorensen <Jes.Sorensen at redhat.com>
mdadm-3.1.3-udev.patch | 20 ---
mdadm-3.2.1-version.patch | 24 ---
...large-devices-from-being-added-to-0.90-ar.patch | 163 ------------------
...nused-handle-in-child-process-during-resh.patch | 84 ---------
...-component-size-checks-in-validate_super0.patch | 76 ---------
mdadm-3.2.2-Fix-serious-memory-leak.patch | 113 -------------
...ow-refuse-to-grow-a-0.90-array-beyond-2TB.patch | 77 ---------
...emove-race-for-starting-container-devices.patch | 88 ----------
mdadm-3.2.2-attributes.patch | 41 -----
mdadm-3.2.2-fixbuild.patch | 26 ---
mdadm-3.2.2-hold-lock-during-assemble.patch | 45 -----
mdadm-3.2.2-man.patch | 178 --------------------
mdadm-3.2.2-no-sysfs-launch-container.patch | 26 ---
mdadm-3.2.2-readd.patch | 26 ---
...3.2.2-resync-does-not-continue-after-auto.patch | 56 ------
...uper0-fix-overflow-when-checking-max-size.patch | 29 ----
mdadm-3.2.2-writemostly.patch | 87 ----------
mdadm-3.2.3-udev.patch | 32 ++++
mdadm.spec | 44 +----
19 files changed, 41 insertions(+), 1194 deletions(-)
---
diff --git a/mdadm-3.2.3-udev.patch b/mdadm-3.2.3-udev.patch
new file mode 100644
index 0000000..167c4de
--- /dev/null
+++ b/mdadm-3.2.3-udev.patch
@@ -0,0 +1,32 @@
+--- mdadm-3.2.3/udev-md-raid.rules.udev 2011-12-15 05:13:08.000000000 +0100
++++ mdadm-3.2.3/udev-md-raid.rules 2011-12-28 17:18:02.753053345 +0100
+@@ -2,19 +2,21 @@
+
+ SUBSYSTEM!="block", GOTO="md_end"
+
++# In Fedora we handle the raid components in 65-md-incremental.rules so that
++# we can do things like honor anaconda command line options and such
+ # handle potential components of arrays (the ones supported by md)
+-ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", GOTO="md_inc"
+-GOTO="md_inc_skip"
+-
+-LABEL="md_inc"
++#ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", GOTO="md_inc"
++#GOTO="md_inc_skip"
++#
++#LABEL="md_inc"
+
+ # 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=="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=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
++#ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
+
+-LABEL="md_inc_skip"
++#LABEL="md_inc_skip"
+
+ # handle md arrays
+ ACTION!="add|change", GOTO="md_end"
diff --git a/mdadm.spec b/mdadm.spec
index 5012ede..858b868 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.2
-Release: 15%{?dist}
+Version: 3.2.3
+Release: 1%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
Source1: mdmonitor.init
Source2: raid-check
@@ -11,23 +11,7 @@ Source5: mdadm-cron
Source6: mdmonitor.service
Source7: mdmonitor-takeover.service
Source8: mdadm.conf
-Patch0: mdadm-3.2.2-man.patch
-Patch1: mdadm-3.2.1-version.patch
-Patch2: mdadm-3.2.2-fixbuild.patch
-Patch3: mdadm-3.2.2-readd.patch
-Patch4: mdadm-3.2.2-writemostly.patch
-Patch5: mdadm-3.2.2-attributes.patch
-Patch6: mdadm-3.2.2-resync-does-not-continue-after-auto.patch
-Patch7: mdadm-3.2.2-Remove-race-for-starting-container-devices.patch
-Patch8: mdadm-3.2.2-no-sysfs-launch-container.patch
-Patch9: mdadm-3.2.2-hold-lock-during-assemble.patch
-Patch10: mdadm-3.2.2-Fix-component-size-checks-in-validate_super0.patch
-Patch11: mdadm-3.2.2-Discourage-large-devices-from-being-added-to-0.90-ar.patch
-Patch12: mdadm-3.2.2-Grow-refuse-to-grow-a-0.90-array-beyond-2TB.patch
-Patch13: mdadm-3.2.2-super0-fix-overflow-when-checking-max-size.patch
-Patch14: mdadm-3.2.2-Fix-serious-memory-leak.patch
-Patch15: mdadm-3.2.2-FIX-Close-unused-handle-in-child-process-during-resh.patch
-Patch19: mdadm-3.1.3-udev.patch
+Patch19: mdadm-3.2.3-udev.patch
Patch20: mdadm-2.5.2-static.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+
@@ -61,22 +45,6 @@ is not used as the system init process.
%prep
%setup -q
-%patch0 -p1 -b .man
-%patch1 -p1 -b .version
-%patch2 -p1 -b .build
-%patch3 -p1 -b .readd
-%patch4 -p1 -b .writemostly
-%patch5 -p1 -b .attributes
-%patch6 -p1 -b .resync
-%patch7 -p1 -b .container
-%patch8 -p1 -b .sysfs
-%patch9 -p1 -b .assemble
-%patch10 -p1 -b .component
-%patch11 -p1 -b .discourage
-%patch12 -p1 -b .grow
-%patch13 -p1 -b .overflow
-%patch14 -p1 -b .memleak
-%patch15 -p1 -b .reshape
%patch19 -p1 -b .udev
%patch20 -p1 -b .static
@@ -151,6 +119,12 @@ fi
%{_initrddir}/*
%changelog
+* Wed Jan 4 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.3-1
+- Update to upstream 3.2.3
+- Resolves: bz770110 (rawhide) bz771413 (f16) bz759014 (rawhide)
+- Resolves: bz759015 (f16) bz759035 (rawhide) bz759036 (f16)
+- Resolves: bz771608 (f15) bz759016 (f15) bz759039 (f15)
+
* Mon Nov 21 2011 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.2-15
- Backport upstream fix for memory leak that can prevent migration to
RAID5 from completing.
More information about the scm-commits
mailing list