mdadm: update to 4.2.

This commit is contained in:
Leah Neukirchen 2022-01-01 18:20:01 +01:00
parent 8f20678c17
commit 8c03af41b2
3 changed files with 3 additions and 33 deletions

View file

@ -1,13 +0,0 @@
--- a/mdadm.h 2018-10-01 20:26:06.000000000 +0200
+++ b/mdadm.h 2019-12-27 07:24:26.224920452 +0100
@@ -45,10 +45,7 @@
#include <errno.h>
#include <string.h>
#include <syslog.h>
-#ifdef __GLIBC__
-/* Newer glibc requires sys/sysmacros.h directly for makedev() */
#include <sys/sysmacros.h>
-#endif
#ifdef __dietlibc__
#include <strings.h>
/* dietlibc has deprecated random and srandom!! */

View file

@ -1,17 +0,0 @@
From Rich Felker, over IRC
diff --git a/policy.c b/policy.c
index c0d18a7e..78ad34cd 100644
--- a/policy.c
+++ b/policy.c
@@ -214,8 +214,9 @@ static char *disk_path(struct mdinfo *disk)
continue;
if (stb.st_rdev != makedev(disk->disk.major, disk->disk.minor))
continue;
+ char *result = xstrdup(ent->d_name);
closedir(by_path);
- return xstrdup(ent->d_name);
+ return result;
}
closedir(by_path);
}

View file

@ -1,7 +1,7 @@
# Template file for 'mdadm' # Template file for 'mdadm'
pkgname=mdadm pkgname=mdadm
version=4.1 version=4.2
revision=4 revision=1
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="eudev-libudev-devel" makedepends="eudev-libudev-devel"
short_desc="Tool for managing/monitoring Linux md device arrays" short_desc="Tool for managing/monitoring Linux md device arrays"
@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://git.kernel.org/cgit/utils/mdadm/mdadm.git/log/" homepage="https://git.kernel.org/cgit/utils/mdadm/mdadm.git/log/"
distfiles="${KERNEL_SITE}/utils/raid/${pkgname}/${pkgname}-${version}.tar.xz" distfiles="${KERNEL_SITE}/utils/raid/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a checksum=461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d
pre_configure() { pre_configure() {
sed -i 's,^install : mdadm mdmon,install: ,g' Makefile sed -i 's,^install : mdadm mdmon,install: ,g' Makefile