From c20cf424f2d1b43aa8abeee6b77c5ee2ef51162c Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 11 Jan 2020 01:55:06 +0000
Subject: user/mdadm: Fix build on new musl

---
 user/mdadm/APKBUILD        | 13 ++++++-------
 user/mdadm/sysmacros.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 user/mdadm/sysmacros.patch

(limited to 'user/mdadm')

diff --git a/user/mdadm/APKBUILD b/user/mdadm/APKBUILD
index d15aefbc9..40e626919 100644
--- a/user/mdadm/APKBUILD
+++ b/user/mdadm/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: 
 pkgname=mdadm
 pkgver=4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool for managing Linux soft RAID arrays"
 url="http://neil.brown.name/blog/mdadm"
 arch="all"
@@ -17,15 +17,14 @@ source="https://mirrors.kernel.org/pub/linux/utils/raid/$pkgname/$pkgname-$pkgve
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname-raid.initd
+	sysmacros.patch
 	"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 $pkgname.conf-example "$pkgdir"/etc/$pkgname.conf
 	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
@@ -45,12 +44,12 @@ misc() {
 	pkgdesc="$pkgdesc (misc scripts)"
 	depends="$pkgname bash"
 
-	cd "$builddir"
-	install -Dm755 misc/mdcheck "$subpkgdir"/usr/sbin/mdcheck
-	install -Dm755 misc/syslog-events "$subpkgdir"/usr/sbin/handle-mdadm-events
+	install -Dm755 "$builddir"/misc/mdcheck "$subpkgdir"/usr/sbin/mdcheck
+	install -Dm755 "$builddir"/misc/syslog-events "$subpkgdir"/usr/sbin/handle-mdadm-events
 }
 
 sha512sums="f9bff760795ba7361f19fd1cbc02efedcdaa4b0125b99cf1369e78f30e5c128126751915fde41407d46c544514d864bf82b508419bc08f1db7aa447557e2ca9e  mdadm-4.1.tar.gz
 ca5f4e3ff5b284102b44e818d11622e1889066e3d18edce2d62c1a44ee8f4cfdc0979121c0462a916c638423c5ebc706c46aa996a7c4f68e030589adc62803f4  mdadm.initd
 7d45bf489ef93a4f217ffcf72311eb661b8de7fbf63a5344697252c0d3a684b0123ff60efa5f218da4eb4cda7c88d91c2ef3625d5e44a588e3e1210cb60b0ab9  mdadm.confd
-37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c  mdadm-raid.initd"
+37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c  mdadm-raid.initd
+47564bba9d45dfb39d63df9e6cd96ad03b37b314e794af180911481feb4e038035aa1ea6d3de2061982f46b51d1a205168f98e6f0a092f55f6f8e760dbabdae6  sysmacros.patch"
diff --git a/user/mdadm/sysmacros.patch b/user/mdadm/sysmacros.patch
new file mode 100644
index 000000000..22a393447
--- /dev/null
+++ b/user/mdadm/sysmacros.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/580188
+
+From 5c97e465b33bf8fefb17da7f553a1c3812e508d5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 18:10:54 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev prototypes
+
+These funcs are defined in sys/sysmacros.h, so include it for them.
+It works today due to an implicit include by sys/types.h, but the
+various Linux C libraries are moving away from that.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ mdadm.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mdadm.h b/mdadm.h
+index d209488..b8767a7 100755
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -33,6 +33,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ # endif
+ #endif
+ 
++#include	<sys/sysmacros.h>
+ #include	<sys/types.h>
+ #include	<sys/stat.h>
+ #include	<stdint.h>
+-- 
+2.7.4
+
-- 
cgit v1.2.3-70-g09d2