From 35b3220e555130c39d9f68b7a113d5e452e51aa2 Mon Sep 17 00:00:00 2001 From: Xiao Ni Date: Tue, 3 Aug 2021 22:34:11 +0800 Subject: [PATCH] Update to latest upstream Resolves: rhbz#1870487, rhbz#1880529 Signed-off-by: Xiao Ni --- disable-Werror.patch | 11 +++++++++++ mdadm-2.5.2-static.patch | 8 ++++---- mdadm.spec | 22 +++++++++++++--------- sources | 2 +- 4 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 disable-Werror.patch diff --git a/disable-Werror.patch b/disable-Werror.patch new file mode 100644 index 0000000..2d52c67 --- /dev/null +++ b/disable-Werror.patch @@ -0,0 +1,11 @@ +--- mdadm/Makefile.orig 2021-07-28 21:39:23.887433859 +0800 ++++ mdadm/Makefile 2021-07-28 21:39:37.989432841 +0800 +@@ -50,7 +50,7 @@ + CC := $(CROSS_COMPILE)gcc + endif + CXFLAGS ?= -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 + endif diff --git a/mdadm-2.5.2-static.patch b/mdadm-2.5.2-static.patch index 1eb335a..188b478 100644 --- a/mdadm-2.5.2-static.patch +++ b/mdadm-2.5.2-static.patch @@ -1,7 +1,7 @@ ---- mdadm-3.2.1/Makefile.static 2011-03-27 22:31:20.000000000 -0400 -+++ mdadm-3.2.1/Makefile 2011-03-28 10:16:55.277900184 -0400 -@@ -238,16 +238,16 @@ install : mdadm mdmon install-man instal - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon +--- mdadm-3.2.1/Makefile.static 2021-01-11 15:46:47.292126848 +0800 ++++ mdadm-3.2.1/Makefile 2021-01-11 15:46:10.720192519 +0800 +@@ -248,16 +248,16 @@ + install : install-bin install-man install-udev install-static : mdadm.static install-man - $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm diff --git a/mdadm.spec b/mdadm.spec index f1c612d..5490bcd 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,12 +1,12 @@ Name: mdadm -Version: 4.1 -#define subversion rc2 -Release: 8%{?subversion:.%{subversion}}%{?dist} +Version: 4.2 +%define subversion rc2 +Release: rc2%{?dist} Summary: The mdadm program controls Linux md devices (software RAID arrays) URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ -Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}%{?subversion:-%{subversion}}.tar.xz +Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}%{?subversion:-%{subversion}}.tar.xz Source1: raid-check Source2: mdadm.rules Source3: mdadm-raid-check-sysconfig @@ -16,15 +16,15 @@ Source6: mdadm_event.conf Source7: raid-check.timer Source8: raid-check.service -# Build without -Werror. From Debian. -Patch00: https://sources.debian.org/data/main/m/mdadm/4.1-2/debian/patches/debian-no-Werror.diff#/mdadm-4.1-no-Werror.patch +# Build without -Werror. +Patch00: disable-Werror.patch # Fedora customization patches -Patch97: mdadm-3.3-udev.patch -Patch98: mdadm-2.5.2-static.patch +Patch97: mdadm-3.3-udev.patch +Patch98: mdadm-2.5.2-static.patch BuildRequires: make -BuildRequires: systemd-rpm-macros binutils-devel gcc +BuildRequires: systemd-rpm-macros binutils-devel gcc systemd-devel Requires: libreport-filesystem Requires(post): systemd coreutils Requires(preun): systemd @@ -90,6 +90,10 @@ install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d /etc/libreport/events.d/* %changelog +* Tue Aug 03 2021 Xiao Ni - 4.2-rc2 +- Update to mdadm-4.2-rc2 +- Resolves rhbz#1870487, rhbz#1880529 + * Fri Apr 16 2021 Mohan Boddu - 4.1-8 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/sources b/sources index 8f50f97..a190524 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mdadm-4.1.tar.xz) = 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433 +SHA512 (mdadm-4.2-rc2.tar.xz) = 09a3657284c7f98892f5be663d5e034252ff319d8ff1d235597efc373c156188d450e12f64a9a0fb9266b00035c1602133e487ce1961db1a12db05f7f9829249