Upgrade to mdadm-3.3.2

Resolves: bz#1132847 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
2014-08-26 19:50:34 +02:00 · 2014-08-17 09:03:43 +00:00 · 2014-08-05 11:48:09 +02:00 · 2014-08-05 11:47:50 +02:00 · 2014-08-04 10:58:58 +02:00 · 2014-08-04 10:35:06 +02:00
4 changed files with 71 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@ -17,3 +17,4 @@ clog
 /mdadm-3.2.6.tar.xz
 /mdadm-3.3.tar.xz
 /mdadm-3.3.1.tar.xz
+/mdadm-3.3.2.tar.xz
--- a/mdadm-3.3.1-DDF-cast-print-arguments-in-super-ddf.c.patch
+++ b/mdadm-3.3.1-DDF-cast-print-arguments-in-super-ddf.c.patch
@ -0,0 +1,51 @@
+From d13566f9b6ff8377f45cd025a1cd1a58bcb4e857 Mon Sep 17 00:00:00 2001
+From: Guy Menanteau <menantea@linux.vnet.ibm.com>
+Date: Mon, 4 Aug 2014 16:53:03 +0200
+Subject: [PATCH] DDF: cast print arguments in super-ddf.c
+
+mdadm fails to build on ppc64 and ppc64le architectures.
+===
+super-ddf.c: In function '_set_config_size':
+super-ddf.c:2849:4: error: format '%llx' expects argument of type 'long long unsigned int', but argument 6 has type '__u64' [-Werror=format=]
+    pr_err("%s: %x:%x: workspace size 0x%llx too big, ignoring\n",
+    ^
+super-ddf.c:2855:2: error: format '%llx' expects argument of type 'long long unsigned int', but argument 6 has type '__u64' [-Werror=format=]
+  dprintf("%s: %x:%x config_size %llx, DDF structure is %llx blocks\n",
+  ^
+cc1: all warnings being treated as errors
+<builtin>: recipe for target 'super-ddf.o' failed
+===
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1125883
+Signed-off-by: <menantea@linux.vnet.ibm.com>
+Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ super-ddf.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/super-ddf.c b/super-ddf.c
+index 8957c2e..bc0ce2c 100644
+--- a/super-ddf.c
+++ b/super-ddf.c
+@@ -2847,13 +2847,15 @@ static void _set_config_size(struct phys_disk_entry *pde, const struct dl *dl)
+ 		__u64 wsp = cfs - t;
+ 		if (wsp > 1024*1024*2ULL && wsp > dl->size / 16) {
+ 			pr_err("%s: %x:%x: workspace size 0x%llx too big, ignoring\n",
+-			       __func__, dl->major, dl->minor, wsp);
+			       __func__, dl->major, dl->minor,
+			       (unsigned long long)wsp);
+ 		} else
+ 			cfs = t;
+ 	}
+ 	pde->config_size = cpu_to_be64(cfs);
+ 	dprintf("%s: %x:%x config_size %llx, DDF structure is %llx blocks\n",
+-		__func__, dl->major, dl->minor, cfs, dl->size-cfs);
+		__func__, dl->major, dl->minor,
+		(unsigned long long)cfs, (unsigned long long)(dl->size-cfs));
+ }
+ 
+ /* Add a device to a container, either while creating it or while
+-- 
+1.9.3
+
--- 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.3.1
-Release:     3%{?dist}
+Version:     3.3.2
+Release:     1%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
 Source1:     mdmonitor.init
 Source2:     raid-check
@ -12,8 +12,6 @@ Source6:     mdmonitor.service
 Source7:     mdadm.conf
 Source8:     mdadm_event.conf

-Patch1:      mdadm-3.3.1-Grow-improve-error-message-is-grow-n2-used-on-Linear.patch
-Patch2:      mdadm-3.3.1-Assemble-Only-fail-auto-assemble-in-face-of-mdadm.co.patch
 # Fedora customization patches
 Patch97:     mdadm-3.3-udev.patch
 Patch98:     mdadm-2.5.2-static.patch
@ -40,8 +38,6 @@ file can be used to help with some common tasks.
 %prep
 %setup -q

-%patch1 -p1 -b .lineargrow
-%patch2 -p1 -b .autofail
 # Fedora customization patches
 %patch97 -p1 -b .udev
 %patch98 -p1 -b .static
@ -106,6 +102,22 @@ rm -rf %{buildroot}
 /etc/libreport/events.d/*

 %changelog
+* Tue Aug 26 2014 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.3.2-1
+- Upgrade to mdadm-3.3.2
+- Resolves bz1132847
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Aug 5 2014 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.3.1-6
+- Apply proper fix for bz1125883, clean up after rogue patch application
+- Resolves bz1125883
+
+* Mon Aug 04 2014 Dan Horák <dan[at]danny.cz> - 3.3.1-5
+- revert the previous fix, not upstream yet
+
+* Mon Aug 04 2014 Dan Horák <dan[at]danny.cz> - 3.3.1-4
+- fix FTBFS on ppc64 (#1125883)
+
 * Tue Jul 29 2014 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.3.1-3
 - Improve error message for "--grow -n2" when used on Linear arrays
 - Fix problem where explicitly specified arrays were not assembled if
--- a/2
+++ b/2
@ -1 +1 @@
-4227d48de62dfb217c92fa0c54171bbe  mdadm-3.3.1.tar.xz
+44698d351501cac6a89072dc877eb220  mdadm-3.3.2.tar.xz
Author	SHA1	Message	Date
Jes Sorensen	e051468372	Upgrade to mdadm-3.3.2 Resolves: bz#1132847 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>	2014-08-26 19:50:34 +02:00
Peter Robinson	6915718493	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	2014-08-17 09:03:43 +00:00
Jes Sorensen	6520b3bd9f	Apply proper fix for bz1125883 Resolves bz1125883 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>	2014-08-05 11:48:09 +02:00
Jes Sorensen	6f8e01c4f8	Merge branch 'f21' of ssh://pkgs.fedoraproject.org/mdadm into f21 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Conflicts: mdadm.spec	2014-08-05 11:47:50 +02:00
Dan Horák	3676a4c5d7	- revert the previous fix, not upstream yet	2014-08-04 10:58:58 +02:00
Dan Horák	8db38178da	- fix FTBFS on ppc64 (#1125883 )	2014-08-04 10:35:06 +02:00
Jes Sorensen	3dda0b3acd	Fix two mdadm bugs 1) Improve error message when trying to use --grow -n<X> on a Linear array 2) Allow assembly of explicitly specified arrays, even if they are disabled in /etc/mdadm.conf Resolves: bz#1122146, bz#1124310 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>	2014-07-29 10:20:32 +02:00