Update sys-fs/mdadm-3.4

3 files changed, 38 insertions, 2 deletions

diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index fc4411e8..814be9b0 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -15,6 +15,7 @@ AUX mdadm-3.3.1-IMSM-validate-metadata_update-size-before-using-it.patch 3882 SH
 AUX mdadm-3.3.1-Makefile-install-mdadm-grow-continue-.service.patch 1001 SHA256 29be282474734ab4210a23bc810d001fb4587c632df2292f9681644a7546661f SHA512 3f2395d00e66d2d45e50cad9de6456bdbe0b1e4ab2ec925e19060b1f6d399f5fada1411539baa5cb9fbcd528d9ec184692a5d78890c3a23ac62de71ed00f5562 WHIRLPOOL b86a38d25e0b35dc34b4ca38580f4fea23f1400452bf96d1d695bec51854a6aba574e66a6b30cb32d6f7e1795855425b7ed3462949f2cbe5587e99cf2c453a00
 AUX mdadm-3.3.1-mdmon-allow-prepare_update-to-report-failure.patch 3654 SHA256 cf75b7def5736ced0e1b80b5a2845a74a1debeb8b116e284576135d9e192eac9 SHA512 05b8f395ba1dbf31998eba0303396dbed92f825d37a99e48ab67dd66b6275d31fced087fcd3d70bb08a5e18a38098efab8a5df855519b457b532bb7f1aeb9f51 WHIRLPOOL 06030ed4374284f82ee30352968c7533a496648c2756468c1c1fda3ad717aebcfa3d1192911709377d16a2fe51c1e3818ce5515d9252eadad8d90f0b3e50a7ee
 AUX mdadm-3.3.1-mdmon-ensure-Unix-domain-socket-is-created-with-safe.patch 1015 SHA256 99b2d3a6cc36102933f393d07c8c45ec1591f001d39b0dc1619022ceb9cddadd SHA512 3f8f8a6cf3f75004916180d67257af504b722cce6fd85a1e0136fd46dc467ea5919e8d65ba7483f3960f0676e1bb0d3cc0b09d24acf235f2045247aa199d377f WHIRLPOOL 40e38f174daae78b45729f464851a39f9d502eccf56ecab5628ce6f87fc2cfa059ef587e8207869751fa8f0417dba9586c70a85c9a20480831d0e0432b43e3aa
+AUX mdadm-3.4-sysmacros.patch 859 SHA256 c604c29c93f77a14c0ce61222af2c4a5b5b438e16f547b995f81564d864c3cc4 SHA512 47564bba9d45dfb39d63df9e6cd96ad03b37b314e794af180911481feb4e038035aa1ea6d3de2061982f46b51d1a205168f98e6f0a092f55f6f8e760dbabdae6 WHIRLPOOL f19255694360acefd19de1f72b1fbdb835fc6c29e8c3699344f86513a0f09bf8bbabbacca64567a29c82f44665ecf166ec33925738bdc547754c8d2785168709
 AUX mdadm.confd 205 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79 SHA512 7bf66898000b3d02bbf0704a8032b0f4fc045380501dc8d2bbbb31d33b122d9c35879b25714663079eeadd207c9da87c9d9af8464e76146bf5b68594e73fd92c WHIRLPOOL b6a86bae6d298bcff17a497739109fa07f2bfb2682454a089dfef7ad51d2d770eec2661a5dd77140fe6ec33e94bc87d2378790eb06d11eace8dbe4ff0b83b677
 AUX mdadm.rc 574 SHA256 3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7 SHA512 d01f5de3ca957189d3619fda4c982c776533b20fac232832bfb7f34de5724348be572c24ad35508e5dc48b2df4710a258a4d1af39471ff7ce2c56ada13dfa7ab WHIRLPOOL 1362c4cbef50bd904092c5cb575ac3336e7e75ead2819795221406e0f2665843e5500fa7ecaf9e48e0231773ed18ea7950ffb5188f2f4e2138944931418e6b69
 AUX mdadm.service 307 SHA256 fdb0c813eb72c85445269eab1182cd68c8d1ca0abfefb2ac966344812d2f29dc SHA512 afa3fad6c260f864857c25d498cfd59778744a7bb0ea2b66c22395874089ee1ec875ab8c02307277aef224f547949d37fc3247a6a1d31fe8b80dbc0ce4edeeb5 WHIRLPOOL 410a781d9ca9d578ac88dd6277286f4ef7ec294e35d1ebf825e95148f56da8b6f9ed6f8170eeaf307753dce3be48217f174145151cb95c62d4a2ded0a56012bd
@@ -46,4 +47,4 @@ EBUILD mdadm-3.3.2.ebuild 2429 SHA256 a6d8d366b4db8d17306caeaf8a1af6903041c907ea
 EBUILD mdadm-3.3.3.ebuild 2604 SHA256 1570fd0a1327a25f747261a3584d8dc5b203ba170299099bdce90430f672f899 SHA512 9da67e222f4488568a8d466b2e648c92b4592c7dcc95522a5ed5bbc3a39e0b302d9b4d72c5a819bb8e4c4bdbd5b25e6ce7217cb2320e1edbe20c54f3074bc501 WHIRLPOOL 43816fcc5202594f74cf09b8b90ae33ac006703c5677f1314eb6b037e99e8c233eaa0abacf35dd47063f77696877c9fbf10685d0f938d8c372e0ce3b9d4adbab
 EBUILD mdadm-3.3.4.ebuild 2604 SHA256 1570fd0a1327a25f747261a3584d8dc5b203ba170299099bdce90430f672f899 SHA512 9da67e222f4488568a8d466b2e648c92b4592c7dcc95522a5ed5bbc3a39e0b302d9b4d72c5a819bb8e4c4bdbd5b25e6ce7217cb2320e1edbe20c54f3074bc501 WHIRLPOOL 43816fcc5202594f74cf09b8b90ae33ac006703c5677f1314eb6b037e99e8c233eaa0abacf35dd47063f77696877c9fbf10685d0f938d8c372e0ce3b9d4adbab
 EBUILD mdadm-3.3.ebuild 2177 SHA256 33e178f2fb74d9dcedb3a5ee39cedf2bae65977a8fb0554e0eb14ba841074fbd SHA512 8569153fad096ace358a1383b2e83f75bea3dbd314ef871a5503586332cb33a56ee0de16261487896452814cdea10568405e54716d5c3e5898be8ff8565caa8a WHIRLPOOL 10492c5c9352d0a07bcf9364b41491fdddac8ff937613476f71714aee636765b7bda00b48a9b4d63d796471a5769a79c322866e5f06267e12d663d1ba9b8cca9
-EBUILD mdadm-3.4.ebuild 2748 SHA256 049623ecd0fd69e4105114294c259bf18a18099f542c5e2aff44fca92395f84a SHA512 4941c30fdf5b46ec97a9649785c6f87b90920fe2cea27ce77b6d4d11be9729f14975ea34aaa3edcfe4a6e91ce7fba2c7a1abedfd343f074c4b8f11a3ef7e04c7 WHIRLPOOL 387bf8eb4ae2b4c11eb9e2f53a957f6a1470eea86669d3129821afbb9a3a8340b0c2a49c89c1cc2a73524205afa74ce34713909aa666438a8f3fc47d8cc32f71
+EBUILD mdadm-3.4.ebuild 2823 SHA256 c1b63e0632058a357c8d89a1327c7857efb425b2aff1146d62363dc42dd570f3 SHA512 67f2ef963fadda1736ecc19f918f7dd7dbf54f4db682f1a26c5d51d65eeafd5dac4958008dafefdf5bd305a7294d93c0b3f551eb7ee45566369236a52908ab79 WHIRLPOOL 09068e4ce4422d9ce884ddf78cb71d57f450431ba6356ddf84773380830bfba68ebb6141137255df55160d27e51120cdd819f073c262ed18c84d1d5745567627
diff --git a/sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch b/sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch
new file mode 100644
index 00000000..22a39344
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.4-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
+
diff --git a/sys-fs/mdadm/mdadm-3.4.ebuild b/sys-fs/mdadm/mdadm-3.4.ebuild
index f7b172a1..cbb58066 100644
--- a/sys-fs/mdadm/mdadm-3.4.ebuild
+++ b/sys-fs/mdadm/mdadm-3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: a4aff3eb858e6256edc0e183a326d32298bf08b0 $
+# $Id: 559b74e5ad9b2e316693570554277cc4d244cb9c $
 
 EAPI=5
 inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
@@ -26,6 +26,10 @@ RESTRICT="test"
 
 rundir="/dev/.mdadm"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
+}
+
 mdadm_emake() {
 	local myconf=()