Merge pull request #1920 from Rmys/master

mdadm-4.3

hardware/disk/mdadm/actions.py

@@ -12,7 +12,7 @@ from pisi.actionsapi import shelltools
 def builddiet():
     autotools.make("clean")
     shelltools.export("GCC", "diet %s %s %s %s -DHAVE_STDINT_H -Os -static" % (get.CC(), get.CFLAGS(), get.CXXFLAGS(), get.LDFLAGS()))
-    autotools.make("mdadm.static")
+    autotools.make("CXFLAGS='%s -DNO_LIBUDEV' mdadm.static" % get.CFLAGS())
     #autotools.make("mdassemble.static")
 
     pisitools.insinto("/sbin", "mdadm.static")
@@ -22,7 +22,7 @@ def build():
     # fix build with gcc-4.9.0
     pisitools.dosed("Makefile", "(Wall) -Werror", "\\1")
     # Not sure about MDASSEMBLE_AUTO=1. Need to investigate.
-    autotools.make("SYSCONFDIR=/%s MDASSEMBLE_AUTO=1 mdadm mdmon" % get.confDIR())
+    autotools.make("CXFLAGS='%s -DNO_LIBUDEV' SYSCONFDIR=/%s MDASSEMBLE_AUTO=1 mdadm mdmon" % (get.CFLAGS(), get.confDIR()))
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())

hardware/disk/mdadm/files/mdadm-4.3-no-udev.patch

@@ -0,0 +1,31 @@
+https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/patch/?id=1750758c7ff526e3560433f6235e5cfa35cf646a
+https://bugs.gentoo.org/928228
+
+From 1750758c7ff526e3560433f6235e5cfa35cf646a Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+Date: Wed, 6 Mar 2024 15:50:55 +0100
+Subject: udev.c: Do not require libudev.h if DNO_LIBUDEV
+
+libudev may not be presented at all, do not require it.
+
+Reported-by: Boian Bonev <bbonev@ipacct.com>
+Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+---
+ udev.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/udev.c b/udev.c
+index bc4722b0..066e6ab1 100644
+--- a/udev.c
++++ b/udev.c
+@@ -26,7 +26,10 @@
+ #include	<signal.h>
+ #include	<limits.h>
+ #include	<syslog.h>
++
++#ifndef NO_LIBUDEV
+ #include	<libudev.h>
++#endif
+ 
+ static char *unblock_path;
+ 

hardware/disk/mdadm/pspec.xml

@@ -12,12 +12,13 @@
         <IsA>app:console</IsA>
         <Summary>Utility to control Linux MD devices (software RAID arrays)</Summary>
         <Description>mdadm is used to create, manage, and monitor Linux MD (software RAID) devices.</Description>
-        <Archive sha1sum="4bbbd02674ac67dc9773f41aace7677aa5374c1c" type="tarxz">https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz</Archive>
+        <Archive sha1sum="fb0bace919325b42a005372b5a5cfa999da6567a" type="tarxz">https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.3.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>dietlibc</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">sysmacros.patch</Patch>
+            <Patch level="1">mdadm-4.3-no-udev.patch</Patch>
         </Patches>
     </Source>
 
@@ -57,6 +58,13 @@
     </Package>
 
     <History>
+        <Update release="9">
+            <Date>2024-07-25</Date>
+            <Version>4.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
          <Update release="8">
             <Date>2023-11-08</Date>
             <Version>4.1</Version>