rpms/mdadm/F-12 .cvsignore, 1.25, 1.26 mdadm.spec, 1.74, 1.75 mdmonitor.init, 1.8, 1.9 sources, 1.25, 1.26

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/mdadm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2379

Modified Files:
	.cvsignore mdadm.spec mdmonitor.init sources 
Log Message:
* Fri Oct  2 2009 Hans de Goede <hdegoede at redhat.com> - 3.0.2-1
- New upstream release 3.0.2
- Add a patch fixing mdadm --detail -export segfaults (bz526761, bz523862)
- Add a patch making mdmon store its state under /dev/.mdadm for initrd
  mdmon, rootfs mdmon handover
- Restart mdmon from initscript (when running) for rootfs mdmon handover



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	15 Sep 2009 19:03:58 -0000	1.25
+++ .cvsignore	2 Oct 2009 19:41:35 -0000	1.26
@@ -1,16 +1 @@
-mdmpd-0.4.tgz
-mdadm-2.2.tar.bz2
-mdadm-2.3.1.tgz
-mdadm-2.5.2.tar.bz2
-mdadm-2.5.3.tar.bz2
-mdadm-2.5.4.tgz
-mdadm-2.6.tgz
-mdadm-2.6.1.tgz
-mdadm-2.6.2.tgz
-mdadm-2.6.4.tgz
-mdadm-2.6.7.tar.bz2
-mdadm-2.6.7.1.tar.bz2
-mdadm-3.0-devel2.tar.bz2
-mdadm-3.0-devel3.tar.bz2
-mdadm-3.0.tar.bz2
-mdadm-3.0-0.20090915git.tar.bz2
+mdadm-3.0.2.tar.bz2


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdadm.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- mdadm.spec	17 Sep 2009 11:43:33 -0000	1.74
+++ mdadm.spec	2 Oct 2009 19:41:36 -0000	1.75
@@ -1,8 +1,8 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     3.0
-Release:     4%{?dist}
-Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-0.20090915git.tar.bz2
+Version:     3.0.2
+Release:     1%{?dist}
+Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
 Source3:     mdadm.rules
@@ -11,7 +11,8 @@ Patch1:      mdadm-2.5.2-static.patch
 Patch2:      mdadm-3.0-endian-FAIL.patch
 Patch3:      mdadm-3.0-metadata.patch
 Patch4:      mdadm-3.0-uuid.patch
-Patch5:      mdadm-3.0-calloc.patch
+Patch5:      mdadm-3.0-mdmon-dev-.mdadm.patch
+Patch6:      mdadm-3.0-rh526761.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -36,7 +37,8 @@ file can be used to help with some commo
 %patch2 -p1 -b .endian
 %patch3 -p1 -b .metadata
 %patch4 -p1 -b .uuid
-%patch5 -p1 -b .calloc
+%patch5 -p1 -b .mdmon
+%patch6 -p1 -b .rh526761
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@@ -82,6 +84,13 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Fri Oct  2 2009 Hans de Goede <hdegoede at redhat.com> - 3.0.2-1
+- New upstream release 3.0.2
+- Add a patch fixing mdadm --detail -export segfaults (bz526761, bz523862)
+- Add a patch making mdmon store its state under /dev/.mdadm for initrd
+  mdmon, rootfs mdmon handover
+- Restart mdmon from initscript (when running) for rootfs mdmon handover
+
 * Thu Sep 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-4
 - Stop some mdmon segfaults (bz523860)
 


Index: mdmonitor.init
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdmonitor.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mdmonitor.init	19 Oct 2007 16:38:10 -0000	1.8
+++ mdmonitor.init	2 Oct 2009 19:41:36 -0000	1.9
@@ -40,6 +40,12 @@ usage ()
 
 start ()
 {
+# (Re)start mdmon to take over monitoring of mdmon started from the initrd
+    if [ -f /dev/.mdadm/*.pid ]; then
+        origprog="$prog"; prog="mdmon"
+        action $"Starting $prog: " /sbin/mdmon /proc/mdstat /
+        prog="$origprog"
+    fi
 # Make sure configuration file exists and has information we can use
 # MAILADDR or PROGRAM or both must be set in order to run mdadm --monitor
     [ -f /etc/mdadm.conf ] || return 6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	15 Sep 2009 19:03:58 -0000	1.25
+++ sources	2 Oct 2009 19:41:36 -0000	1.26
@@ -1 +1 @@
-7a1ba5aaaa04e34ef85b85fcadbf2519  mdadm-3.0-0.20090915git.tar.bz2
+38f7e3e073fcf35fc766686bd414488b  mdadm-3.0.2.tar.bz2