- updated to 4.4

diff --git a/mdadm-udev-rules-paths.patch b/mdadm-udev-rules-paths.patch
index 07ae97723085cafbe25d4fa8e45a36544ecf84ca..a37778d5c42e9e4cd6cb6eaf4871c787563c85f3 100644 (file)
--- a/mdadm-udev-rules-paths.patch
+++ b/mdadm-udev-rules-paths.patch
@@ -1,6 +1,6 @@
-diff -ur mdadm-4.3.orig/udev-md-clustered-confirm-device.rules mdadm-4.3/udev-md-clustered-confirm-device.rules
---- mdadm-4.3.orig/udev-md-clustered-confirm-device.rules      2024-02-15 17:33:04.000000000 +0100
-+++ mdadm-4.3/udev-md-clustered-confirm-device.rules   2024-04-03 02:28:17.711611149 +0200
+diff -ur mdadm-4.4.orig/udev-md-clustered-confirm-device.rules mdadm-4.4/udev-md-clustered-confirm-device.rules
+--- mdadm-4.4.orig/udev-md-clustered-confirm-device.rules      2024-12-13 10:54:53.000000000 +0100
++++ mdadm-4.4/udev-md-clustered-confirm-device.rules   2025-09-11 20:08:00.461048733 +0200

 @@ -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
 @@ -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,9 +14,9 @@ diff -ur mdadm-4.3.orig/udev-md-clustered-confirm-device.rules mdadm-4.3/udev-md
 +ENV{.md.newdevice}=="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing"
  
  LABEL="clustermd_end"
 +ENV{.md.newdevice}=="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing"
  
  LABEL="clustermd_end"

-diff -ur mdadm-4.3.orig/udev-md-raid-arrays.rules mdadm-4.3/udev-md-raid-arrays.rules
---- mdadm-4.3.orig/udev-md-raid-arrays.rules   2024-02-15 17:33:04.000000000 +0100
-+++ mdadm-4.3/udev-md-raid-arrays.rules        2024-04-03 02:29:45.900799937 +0200
+diff -ur mdadm-4.4.orig/udev-md-raid-arrays.rules mdadm-4.4/udev-md-raid-arrays.rules
+--- mdadm-4.4.orig/udev-md-raid-arrays.rules   2024-12-13 10:54:53.000000000 +0100
++++ mdadm-4.4/udev-md-raid-arrays.rules        2025-09-11 20:08:00.461048733 +0200

 @@ -18,7 +18,7 @@
  ATTR{md/sync_action}=="reshape", ENV{RESHAPE_ACTIVE}="yes"
  LABEL="md_ignore_state"
 @@ -18,7 +18,7 @@
  ATTR{md/sync_action}=="reshape", ENV{RESHAPE_ACTIVE}="yes"
  LABEL="md_ignore_state"


@@ -40,9 +40,9 @@ diff -ur mdadm-4.3.orig/udev-md-raid-arrays.rules mdadm-4.3/udev-md-raid-arrays.
 +ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service"
  
  LABEL="md_end"
 +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.3.orig/udev-md-raid-assembly.rules mdadm-4.3/udev-md-raid-assembly.rules
---- mdadm-4.3.orig/udev-md-raid-assembly.rules 2024-02-15 17:33:04.000000000 +0100
-+++ mdadm-4.3/udev-md-raid-assembly.rules      2024-04-03 02:29:03.096222931 +0200
+diff -ur mdadm-4.4.orig/udev-md-raid-assembly.rules mdadm-4.4/udev-md-raid-assembly.rules
+--- mdadm-4.4.orig/udev-md-raid-assembly.rules 2024-12-13 10:54:53.000000000 +0100
++++ mdadm-4.4/udev-md-raid-assembly.rules      2025-09-11 20:08:45.793195292 +0200

 @@ -38,10 +38,10 @@
  
  # remember you can limit what gets auto/incrementally assembled by
 @@ -38,10 +38,10 @@
  
  # remember you can limit what gets auto/incrementally assembled by


@@ -51,9 +51,9 @@ diff -ur mdadm-4.3.orig/udev-md-raid-assembly.rules mdadm-4.3/udev-md-raid-assem
 +ACTION!="remove", IMPORT{program}="/sbin/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}"
  ACTION!="remove", ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer"
  
 +ACTION!="remove", IMPORT{program}="/sbin/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}"
  ACTION!="remove", ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer"
  

--ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="BINDIR/mdadm -If $name --path $env{ID_PATH}"
--ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="BINDIR/mdadm -If $name"
-+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
-+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
+-ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="BINDIR/mdadm -If $devnode --path $env{ID_PATH}"
+-ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="BINDIR/mdadm -If $devnode"
++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $devnode --path $env{ID_PATH}"
++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $devnode"

  
  LABEL="md_inc_end"
  
  LABEL="md_inc_end"

diff --git a/mdadm.spec b/mdadm.spec
index 7972aade42b1601ad40badc1f9637d258f14080d..75ad8091a01a5ab1e685691b2c3b1eac3e5d5fc9 100644 (file)
--- 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
 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.3
+Version:       4.4

 Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz
 Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz

-# Source0-md5: a42def84e31734a529111394f2289e0e
+# Source0-md5: c4bb72fdded17c9d74fcdd4a0896c97a

 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.cron
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.cron


@@ -37,7 +37,7 @@ Requires:     /sbin/chkconfig
 Requires:      rc-scripts >= 0.4.2.4-2
 Suggests:      cronjobs
 %{!?with_initrd:Obsoletes:     mdadm-initrd < %{version}-%{release}}
 Requires:      rc-scripts >= 0.4.2.4-2
 Suggests:      cronjobs
 %{!?with_initrd:Obsoletes:     mdadm-initrd < %{version}-%{release}}

-Obsoletes:     mdctl
+Obsoletes:     mdctl < 0.5

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir                /sbin
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir                /sbin


@@ -56,7 +56,7 @@ alternatywa dla pakietu raidtools.
 Summary:       Tool for maintaining software RAID devices - initrd version
 Summary(pl.UTF-8):     Narzędzie do obsługi programowych macierzy RAID, wersja dla initrd
 Group:         Base
 Summary:       Tool for maintaining software RAID devices - initrd version
 Summary(pl.UTF-8):     Narzędzie do obsługi programowych macierzy RAID, wersja dla initrd
 Group:         Base

-Conflicts:     geninitrd < 10000.10
+Conflicts:     geninitrd < 12787

 
 %description initrd
 Tool for maintaining software RAID devices - statically linked for
 
 %description initrd
 Tool for maintaining software RAID devices - statically linked for


@@ -68,7 +68,7 @@ skonsolidowane na potrzeby initrd.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1
+%patch -P0 -p1

 
 %build
 %if %{with initrd}
 
 %build
 %if %{with initrd}


@@ -109,7 +109,7 @@ install -p initrd-mdadm $RPM_BUILD_ROOT%{_libdir}/initrd/mdadm
 ln -s mdadm $RPM_BUILD_ROOT%{_libdir}/initrd/mdctl
 %endif
 
 ln -s mdadm $RPM_BUILD_ROOT%{_libdir}/initrd/mdctl
 %endif
 

-cp -p mdadm.conf-example $RPM_BUILD_ROOT%{_sysconfdir}/mdadm.conf
+cp -p documentation/mdadm.conf-example $RPM_BUILD_ROOT%{_sysconfdir}/mdadm.conf

 
 ln -s mdadm $RPM_BUILD_ROOT%{_sbindir}/mdctl
 
 
 ln -s mdadm $RPM_BUILD_ROOT%{_sbindir}/mdctl
 


@@ -137,7 +137,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc ANNOUNCE* ChangeLog TODO
+%doc CHANGELOG.md README.md

 %attr(755,root,root) %{_sbindir}/mdadm
 %attr(755,root,root) %{_sbindir}/mdadm-checkarray
 %attr(755,root,root) %{_sbindir}/mdctl
 %attr(755,root,root) %{_sbindir}/mdadm
 %attr(755,root,root) %{_sbindir}/mdadm-checkarray
 %attr(755,root,root) %{_sbindir}/mdctl