From: Marcin Krol Date: Thu, 15 Jan 2026 18:30:27 +0000 (+0100) Subject: - updated to 4.5 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=862b72c5d57a64774384c1b4ecadeffab39063c0;p=packages%2Fmdadm.git - updated to 4.5 --- diff --git a/mdadm-udev-rules-paths.patch b/mdadm-udev-rules-paths.patch index a37778d..0523024 100644 --- a/mdadm-udev-rules-paths.patch +++ b/mdadm-udev-rules-paths.patch @@ -1,31 +1,6 @@ -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 - # missing. --PROGRAM="BINDIR/blkid -o device -t UUID_SUB=$env{DEVICE_UUID}", ENV{.md.newdevice} = "$result" -+PROGRAM="/sbin/blkid -o device -t UUID_SUB=$env{DEVICE_UUID}", ENV{.md.newdevice} = "$result" - --ENV{.md.newdevice}!="", RUN+="BINDIR/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:$env{.md.newdevice}" --ENV{.md.newdevice}=="", RUN+="BINDIR/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing" -+ENV{.md.newdevice}!="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:$env{.md.newdevice}" -+ENV{.md.newdevice}=="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing" - - LABEL="clustermd_end" -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" - --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}" +diff -u mdadm-4.5.orig/udev-md-raid-arrays.rules mdadm-4.5/udev-md-raid-arrays.rules +--- mdadm-4.5.orig/udev-md-raid-arrays.rules 2025-12-16 14:06:20.000000000 +0100 ++++ mdadm-4.5/udev-md-raid-arrays.rules 2026-01-15 19:20:04.419177071 +0100 @@ -37,9 +37,9 @@ ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service" @@ -33,27 +8,10 @@ diff -ur mdadm-4.4.orig/udev-md-raid-arrays.rules mdadm-4.4/udev-md-raid-arrays. -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}=="?*", TEST=="/etc/initrd-release", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@initrd-%c.service" -ENV{MD_MON_THIS}=="?*", TEST!="/etc/initrd-release", 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_RESHAPE_ACTIVE}=="True", 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}=="?*", TEST=="/etc/initrd-release", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@initrd-%c.service" +ENV{MD_MON_THIS}=="?*", TEST!="/etc/initrd-release", 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" ++ENV{MD_RESHAPE_ACTIVE}=="True", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service" LABEL="md_end" -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 - # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' --ACTION!="remove", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}" -+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 $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" diff --git a/mdadm.spec b/mdadm.spec index 75ad809..e5d7ddd 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -7,18 +7,18 @@ 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.4 +Version: 4.5 Release: 1 License: GPL v2+ Group: Base -Source0: https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz -# Source0-md5: c4bb72fdded17c9d74fcdd4a0896c97a +Source0: https://github.com/md-raid-utilities/mdadm/archive/refs/tags/%{name}-%{version}.tar.gz +# Source0-md5: 6c61329903607faededde9a9d7248aab Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.cron Source4: %{name}-checkarray Patch0: %{name}-udev-rules-paths.patch -URL: https://www.kernel.org/pub/linux/utils/raid/mdadm/ +URL: https://github.com/md-raid-utilities/mdadm/ BuildRequires: corosync-devel BuildRequires: dlm-devel BuildRequires: groff @@ -67,7 +67,7 @@ Narzędzie do zarządzania programowymi macierzami RAID - statycznie skonsolidowane na potrzeby initrd. %prep -%setup -q +%setup -q -n %{name}-%{name}-%{version} %patch -P0 -p1 %build