From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 23 Jan 2022 02:00:01 +0000 (+0100)
Subject: - updated to 4.2
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=40627419c77e5ab03927d62776a4ccc70f8550d4;p=packages%2Fmdadm.git

- updated to 4.2
---

diff --git a/mdadm-udev-rules-paths.patch b/mdadm-udev-rules-paths.patch
index 00d34c8..f3fbf2a 100644
--- a/mdadm-udev-rules-paths.patch
+++ b/mdadm-udev-rules-paths.patch
@@ -1,6 +1,6 @@
-diff -ur mdadm-4.1.orig/udev-md-clustered-confirm-device.rules mdadm-4.1/udev-md-clustered-confirm-device.rules
---- mdadm-4.1.orig/udev-md-clustered-confirm-device.rules	2018-10-01 18:26:06.000000000 +0000
-+++ mdadm-4.1/udev-md-clustered-confirm-device.rules	2018-12-04 08:16:15.690403000 +0000
+diff -ur mdadm-4.2.orig/udev-md-clustered-confirm-device.rules mdadm-4.2/udev-md-clustered-confirm-device.rules
+--- mdadm-4.2.orig/udev-md-clustered-confirm-device.rules	2021-12-30 20:43:35.000000000 +0100
++++ mdadm-4.2/udev-md-clustered-confirm-device.rules	2022-01-22 20:09:23.475366880 +0100
 @@ -13,9 +13,9 @@
  # Based on the received UUID, node confirms the device if
  # it is found by blkid, otherwise the node reports it is
@@ -14,31 +14,33 @@ diff -ur mdadm-4.1.orig/udev-md-clustered-confirm-device.rules mdadm-4.1/udev-md
 +ENV{.md.newdevice}=="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing"
  
  LABEL="clustermd_end"
-diff -ur mdadm-4.1.orig/udev-md-raid-arrays.rules mdadm-4.1/udev-md-raid-arrays.rules
---- mdadm-4.1.orig/udev-md-raid-arrays.rules	2018-10-01 18:26:06.000000000 +0000
-+++ mdadm-4.1/udev-md-raid-arrays.rules	2018-12-04 08:16:51.490403000 +0000
-@@ -17,7 +17,7 @@
- ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
+diff -ur mdadm-4.2.orig/udev-md-raid-arrays.rules mdadm-4.2/udev-md-raid-arrays.rules
+--- mdadm-4.2.orig/udev-md-raid-arrays.rules	2021-12-30 20:43:35.000000000 +0100
++++ mdadm-4.2/udev-md-raid-arrays.rules	2022-01-22 20:10:57.007556030 +0100
+@@ -18,7 +18,7 @@
+ ATTR{md/sync_action}=="reshape", ENV{RESHAPE_ACTIVE}="yes"
  LABEL="md_ignore_state"
  
--IMPORT{program}="BINDIR/mdadm --detail --export $devnode"
-+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
+-IMPORT{program}="BINDIR/mdadm --detail --no-devices --export $devnode"
++IMPORT{program}="/sbin/mdadm --detail --no-devices --export $devnode"
  ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
  ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
  ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
-@@ -35,7 +35,7 @@
+@@ -37,8 +37,8 @@
  ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service"
  
  # Tell systemd to run mdmon for our container, if we need it.
 -ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
 -ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
+-ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service"
 +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
 +ENV{MD_MON_THIS}=="?*", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
++ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service"
  
  LABEL="md_end"
-diff -ur mdadm-4.1.orig/udev-md-raid-assembly.rules mdadm-4.1/udev-md-raid-assembly.rules
---- mdadm-4.1.orig/udev-md-raid-assembly.rules	2018-10-01 18:26:06.000000000 +0000
-+++ mdadm-4.1/udev-md-raid-assembly.rules	2018-12-04 08:17:07.490403000 +0000
+diff -ur mdadm-4.2.orig/udev-md-raid-assembly.rules mdadm-4.2/udev-md-raid-assembly.rules
+--- mdadm-4.2.orig/udev-md-raid-assembly.rules	2021-12-30 20:43:35.000000000 +0100
++++ mdadm-4.2/udev-md-raid-assembly.rules	2022-01-22 20:09:23.475366880 +0100
 @@ -30,9 +30,9 @@
  
  # remember you can limit what gets auto/incrementally assembled by
diff --git a/mdadm.spec b/mdadm.spec
index b481aa6..72f98aa 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -7,12 +7,12 @@
 Summary:	Tool for creating and maintaining software RAID devices
 Summary(pl.UTF-8):	Narzędzie do tworzenia i obsługi programowych macierzy RAID
 Name:		mdadm
-Version:	4.1
+Version:	4.2
 Release:	1
 License:	GPL v2+
 Group:		Base
 Source0:	https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz
-# Source0-md5:	51bf3651bd73a06c413a2f964f299598
+# Source0-md5:	a304eb0a978ca81045620d06547050a6
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.cron