rpms/mdadm/devel mdadm-3.0-alias.patch, NONE, 1.1 mdadm.spec, 1.58, 1.59

Doug Ledford dledford at fedoraproject.org
Fri Feb 13 20:15:34 UTC 2009


Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29772

Modified Files:
	mdadm.spec 
Added Files:
	mdadm-3.0-alias.patch 
Log Message:
* Thu Feb 12 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel2.1
- Update to latest upstream devel release
- Use the udev rules file included with mdadm instead of our own
- Drop all the no longer relevant patches
- Fix a build error in mdopen.c
- Fix the udev rules path in Makefile
- Fix a compile issue with the __le32_to_cpu() macro usage (bad juju to
  to operations on the target of the macro as it could get executed
  multiple times, and gcc now throws an error on that)


mdadm-3.0-alias.patch:

--- NEW FILE mdadm-3.0-alias.patch ---
--- mdadm-3.0-devel2/super-intel.c.undef	2009-02-13 15:09:40.000000000 -0500
+++ mdadm-3.0-devel2/super-intel.c	2009-02-13 15:09:58.000000000 -0500
@@ -271,8 +271,10 @@ static __u32 __gen_imsm_checksum(struct 
 	__u32 *p = (__u32 *) mpb;
 	__u32 sum = 0;
 
-        while (end--)
-                sum += __le32_to_cpu(*p++);
+        while (end--) {
+                sum += __le32_to_cpu(*p);
+		p++;
+	}
 
         return sum - __le32_to_cpu(mpb->check_sum);
 }


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mdadm.spec	13 Feb 2009 14:41:23 -0000	1.58
+++ mdadm.spec	13 Feb 2009 20:15:04 -0000	1.59
@@ -7,6 +7,7 @@
 Patch1:      mdadm-3.0-udev.patch
 Patch2:      mdadm-3.0-warn.patch
 Patch3:      mdadm-2.5.2-static.patch
+Patch4:      mdadm-3.0-alias.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -28,6 +29,7 @@
 %patch1 -p1 -b .udev
 %patch2 -p1 -b .warn
 %patch3 -p1 -b .static
+%patch4 -p1 -b .alias
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@@ -82,6 +84,9 @@
 - Drop all the no longer relevant patches
 - Fix a build error in mdopen.c
 - Fix the udev rules path in Makefile
+- Fix a compile issue with the __le32_to_cpu() macro usage (bad juju to
+  to operations on the target of the macro as it could get executed
+  multiple times, and gcc now throws an error on that)
 
 * Fri Oct 24 2008 Doug Ledford <dledford at redhat.com> - 2.6.7.1-1
 - Updated to latest upstream stable release (#466803)




More information about the fedora-extras-commits mailing list