Actually make the monthly auto-check work.

Package-Manager: portage-2.2.17/cvs/Linux x86_64

5 files changed, 101 insertions, 23 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index a04c8293180d..33d3148fdd4f 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.193 2015/04/04 21:58:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.194 2015/04/11 20:51:01 robbat2 Exp $
+
+*mdadm-3.3.2-r1 (11 Apr 2015)
+
+  11 Apr 2015; Robin H. Johnson <robbat2@gentoo.org> +files/etc-default-mdadm,
+  +mdadm-3.3.2-r1.ebuild, files/mdadm.weekly:
+  Actually make the monthly auto-check work.
 
   04 Apr 2015; Mike Frysinger <vapier@gentoo.org> files/mdraid.confd,
   files/mdraid.rc:
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 85a48d22fe08..18f3602b05c6 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX etc-default-mdadm 296 SHA256 51df1ec0fd02923f4b6fed1bc110a4de3fc0bfb53eacfa2778905c1cb8803c20 SHA512 759bdbf542360e3cca7f2bb4b2e830d46d9bb7935e502c9375aad51bcc6873c1f69fd4185663ef897c07b656e4866f3d57c2c1f4f63f461915d9c06a830cdeea WHIRLPOOL 11ea8e14dea419cb87a7e4f0e5b844b63f01e1e537766350da1334cc04c7c28fbd7e17b326b3694d0dde6e6ff826aaee51fade8b2caa71b5f97d2e14de13bfa6
 AUX mdadm-3.2.1-mdassemble.patch 487 SHA256 505f9fec01fd8a40f773fd6709337b2b29fc30a600cddd3075a647198279592c SHA512 258a4c00aaf0448b173fc8e201595d7378c7d6e77e97c98050dfdc3a0ba889c5320ad6517e1aec951d9f84a014dbd5b78f66d52cb21d57eb6a0a85e51e8cd73d WHIRLPOOL 5cc398866b82425923a5524636e886fa44b32a3c02cf64f6d7c93ce253704e6fb041f77bef6b1cf755d3b67582496cbab8af70ee213046713f1306e5e192e206
 AUX mdadm-3.2.x-udevdir.patch 876 SHA256 937132cf80fed615e9714940819874b9f8ec0125df08e55db876601a1ac84365 SHA512 67635a7c66f319ef7dfd2397925ac599015316f2715785abc25eae6c46e4bb0e69d0e402bff48264c2e3347af679940b81964147c61b9d6407266634bd29791f WHIRLPOOL 75b0b6d11d3b85598fa96881e0f309a09e2e7d465f9bf46b02bde3230308c8532d1612af242c3107895713c8caa4b25864c39d66c4599ed4b939d8c37840c9af
 AUX mdadm-3.3.1-DDF-validate-metadata_update-size-before-using-it.patch 1409 SHA256 a4168c58f7a75890e74b68ff1634ead1bead5f5ba28e02defb5972e6b62cc080 SHA512 ce8962daeebbdb92a16263d82019ff0ffa2e3127e0477b821ef157e1a71d958434fd2054e776ba0a816f334504a16ad276b655aa5951dd3331868e74db8488c3 WHIRLPOOL 3122994c9f5f31cac0dd4f8e4290148523069cc2f26905cad1fff4afa2408752178c912c52a9528d98eb5f0904e7c92fed1e6c1e60db8e519ff95f7a6c89f97e
@@ -15,7 +13,7 @@ AUX mdadm.confd 205 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b1615
 AUX mdadm.rc 574 SHA256 3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7 SHA512 d01f5de3ca957189d3619fda4c982c776533b20fac232832bfb7f34de5724348be572c24ad35508e5dc48b2df4710a258a4d1af39471ff7ce2c56ada13dfa7ab WHIRLPOOL 1362c4cbef50bd904092c5cb575ac3336e7e75ead2819795221406e0f2665843e5500fa7ecaf9e48e0231773ed18ea7950ffb5188f2f4e2138944931418e6b69
 AUX mdadm.service 307 SHA256 fdb0c813eb72c85445269eab1182cd68c8d1ca0abfefb2ac966344812d2f29dc SHA512 afa3fad6c260f864857c25d498cfd59778744a7bb0ea2b66c22395874089ee1ec875ab8c02307277aef224f547949d37fc3247a6a1d31fe8b80dbc0ce4edeeb5 WHIRLPOOL 410a781d9ca9d578ac88dd6277286f4ef7ec294e35d1ebf825e95148f56da8b6f9ed6f8170eeaf307753dce3be48217f174145151cb95c62d4a2ded0a56012bd
 AUX mdadm.tmpfiles.conf 30 SHA256 6382e48282297663adbe1b1db55c1554d27badd8ab0ee5a4d2e1bbf880f62af3 SHA512 65bf1a8ce3520f74e5ca2e8167b8da5cb3c9db2135385d3a76b0fc137af6f2fa4f9237effdd3d58f6e002cf016b38b364f780911c7abcb103127627c8de9409e WHIRLPOOL be5b287655d6587dc3088118e277950e4530e2df0ea1336924ea832ba1612773ff3f0bda60f9d5de1aee567e3e220d7a20fa5ca922efdfac6b9739ed345ad56e
-AUX mdadm.weekly 126 SHA256 5774fdae3f27486e4c6c6565314ebed1d24825a67712ecc2f8ea33867dc7869d SHA512 835c1d3eb50fac9eb10ad3703c5c2793c9f86bfb0e33dac55ca662dd61c060ebcb77bc51e7b61ac68778e30e914b072c675526e9eebf1ecfe916fa3413502945 WHIRLPOOL 3b247ac66864b0736edc24a8c441ad2b15581ff4ada455c9acab43c49f2e33ad1a1e99b17c000a9118a944147de005e9b457fad1c1cd12150c37621035da7964
+AUX mdadm.weekly 187 SHA256 1234feb39795ebd03c53ca6f2d6496cf69c658890278d803ea40c86b841f898e SHA512 3bc7bf8c9593f06e42ae657e2bce416758090d1f999a447986df17b97e1494b261f02155b83932295f2f3bbab7d8933cf647c834bfb1d7def879cbedfaa6d7c2 WHIRLPOOL ff1b95deee1ee422f05aa438b498708bdb65754cd1158f371d1657f864ea0a52c62e5c93cbb4bfe98cedea23670a3a8b3fa4a04818975d80cf577d12318df7c7
 AUX mdraid.confd 383 SHA256 b489ced10391d4295bb8ca29e128b0d4217c290f1b4e37b05f5a9275048d289d SHA512 37fe70f5df0fb2b68be01ee774e3a943cfb280322f2db0c5d6892e701fb58be26a225b78448814294bf68f154cca697278fcf9572a47b6201920d95ad05189d6 WHIRLPOOL 60de14055064337413b137479ed7f1d45b2293fe8be4ec820dcfc716c8898f9066871a48d094bd4f3e78215e6f6e97a36d4a87f2ea3fd8e048461bfe224848ae
 AUX mdraid.rc 861 SHA256 003b2c832909f1b89ffd283fb02d2712791d922394e201de0e42c0b463b2b1bd SHA512 baa21e991919999a60432eeee683793d94f4389022676c89e0b38f57febadf98ff45361fff234a557b879b8170b9a497cf6324975fe5a058538309ef272974ea WHIRLPOOL 4d9870d08e113430ac2e4fc7ab61dac56beea21cbf21a31184e8e0fd55ee3020c631d5ffee8e7b24321b2d3d61cb8a74048faf31489b82504b6b2c6e3365bab2
 DIST mdadm-3.2.6.tar.bz2 371525 SHA256 c44ed3b31238b41cffe67caffaf45067d01e095de94988889ea8a94e22dc6c38 SHA512 1ebcd4c797cd9f7388f9a27372a19205dc81a4b19adc83e1d6d7cfd4ef18f40a211fddf59ed027a1bf35bd36d4b6795e88e8086c3b022c188ec6e9f68bf1a4ee WHIRLPOOL 61d07512758491326c21bb745ca457a9f3d9215292358d7b4755eb84bb72877058fb239cbffe25c8121caff066aded84e8353b9716e9d4a45d724777f01a6714
@@ -24,23 +22,7 @@ DIST mdadm-3.3.2.tar.xz 410628 SHA256 0f3a7e1a76b13892b79f9fceaf99ecb23513260389
 DIST mdadm_3.3-2.debian.tar.gz 127889 SHA256 c38b155e7395b35380d506458d979b82c5b853de996f21ccab50b1202d726301 SHA512 92e4c403542caba4b9afb870ba803e6bc7ade143b27efdc27e03b3407f322722a635457cce9e8c195a3ecd7cbce66fdebdd6046fc4f36836e56e27d5d838c037 WHIRLPOOL 8f8ef1142a79044093a5f55b181dc35a142b83041a59a9b71945aa6fe84cd089a7e1b183ec6b5db210a0d07e94efad0ab3a0d0341fc6cbbbf4da9d0254b5c737
 EBUILD mdadm-3.2.6-r1.ebuild 2061 SHA256 dcee1c9b4ae0f6c9c05c754fdd958e23bb8efca6bde82f3452a9f0a91a7e621e SHA512 4e64f5b0fccdada51e23e1ab1187d3be05300b4f08751432ac35603aa698800a67adbf483de3729d9a1f3d3ac5d579ed1dc3e02dea3555387f21d066271dd523 WHIRLPOOL 50f2a0714081ede4de6c4a4334be7cbc42e98a8dbd365479314ef76991c7d3a6d866e8527d1f3e2be30936b544fd131cc4727bb907ec7124f6595556932f1680
 EBUILD mdadm-3.3.1-r2.ebuild 2990 SHA256 8a6f70db105b5750fa55d590ba9ca6484ec2d762a10028aee03b450d602afd32 SHA512 ff5ae9863921b4cc57bc4fd0f745afaa5095b2504045083d883987783ca7ab1ebe13329871d521eebfa046c117dae24c1b5cf8a3e795ebdf10a3474f99e23d7a WHIRLPOOL 62ab909b2b12a06eb2781329b00f40a4e41c96c823f1723acc43b13f54fa555279e4a6a3543f3fc8462c9cf212ef1c4123a8624a58ba4ae5a7ffc60f79036bba
+EBUILD mdadm-3.3.2-r1.ebuild 2247 SHA256 82fa9c21b7ef1b2cf2b4967d4c3dc712322ae8c95c35fab6d154f144243ac78e SHA512 e6f09597b5081ecfc15fbca71a97bb6e505d7e7b68534039a2a64fade1c7189bc46840319c5e36eeb6d1503982afef151eec775dc6889e67792402f7c32eb775 WHIRLPOOL 0e015ace8e77ab7133e8d4d47123c4039fad09cfd672996d88e52d7efa74554d8cb450cb16c2d861059974348ecf7a62c7c6dfac731f86d6e42e3df7f4882dcb
 EBUILD mdadm-3.3.2.ebuild 2178 SHA256 877bedf7b1de6fbc55acc39c7930a092e67b374a3af0a9c2bbd7fc67ba043e47 SHA512 aad53e2b44586cf446ceec58419397048df58aa060b3d85d16ebc920372d4ea32a117f8d6e122a9814350ab9c596e5e365d7fb118258606215e8927d35bcb375 WHIRLPOOL 4eaf9f975283c8e077189aef1426899e8c7d306c04b84c6e12de5a866f41db76c91713e351738e519ea6ee937702e0e10c53ff57eaeb04075396ef44a6e0cb23
-MISC ChangeLog 30728 SHA256 99abb183efc2e9ccec68c3f2a6bfbff4afb80802d3439d760552ca2ef9dd38ad SHA512 0098de17d1dd827237d6f244808e82353900e715eb5ba4c8935be44d2a6fabf17ad2498c2eef7fa410a235781157b058282b87f43bf38af2eed718692c83e2f5 WHIRLPOOL a79ff43cc139ecda18ce6f6e4f5eb6d2caa5d1977cf07405400dee84ad1d467698cb64096a0c3a27c74c6ce2a317ebb4b810bea1c8d6eb465880b130767c1552
+MISC ChangeLog 30931 SHA256 694d79c4351cb6fa67ff81afbed5ed76787b828656880697a01a8d0a8cb17e34 SHA512 2ab7649aaa4901bd94ea6a224ed4af72e0559b1294289df77d95fce1b579324ac485ae9e205f72bd8358c82d1ac4043733e4dd7cc91ac942b984ef975d062d1c WHIRLPOOL 976a5bd8c84f0d613135e12fe2c85065ab1854ec09bc18f6ba97c50f7015a900a4391c8bb9a98e7fa2ce4c435659da310febdc5297ca51a01063128c36652a3b
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVIF6LAAoJEPGu1DbS6WIAF6YP/2xBmqRSipydj2nbR+Y1BPQt
-si8meC3v/TngabyRX3LPyY4w7+e78+gUWiofS6t7fMIRgZ4VzW2qSsYzB0vNZ4mQ
-+psKJYWwmklhlq36gLosGjYDzY5l9iQoYF8hf1qqRXl5bXHsctroWCDXxp5QCa9C
-BluW61rfmyHh9sRzCjMOIr26pFDyuGaxUhNOLZPoQ0NOT5qjN0CV1nTh/qi5QaxK
-Bh/V7MJgq7Unh7NX8/9jeAHDugoh3YlhciJ8qfD3PxFATjS0vsOrRS5oT4rkiHCQ
-mBQEO+SThayOCPNCWugZ1PwzO4aeasmYP7va6fpwgbOyXetl5yEg9fmu4RKkXZ4a
-rayX5q+P0Diz87cwotU00lbfF4x0peOlYOMBBrt96XpPG53ZLtjFGlGLzU8G1j8S
-Z7IOx2m+qLNv1HmNpm+09ElfgchySLEhn1ZKg/AY2oAT0pY9iNWXpHi+EsUF7/u2
-l5kjVdjrltMXI02g5hfa6FSkPeHh6dIeB0zdj6dKxBXKWgPKSBLMfA1AFN25d3r8
-vQE5LkNrNu2YRer/vrIncFm4DmirQBsmYQPQ/8Upo9HwFL9lhYUQS48xsHQvV/Xn
-htPq64EMCVYNbxF54wy6ZbkU+tUY4m1iGzzJRG6DUH2QCS+rQnw7L7eIbrouhQkD
-I+iNTq/l1YcIMy3JY3O0
-=FxRd
------END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/etc-default-mdadm b/sys-fs/mdadm/files/etc-default-mdadm
new file mode 100644
index 000000000000..70ff20b8e385
--- /dev/null
+++ b/sys-fs/mdadm/files/etc-default-mdadm
@@ -0,0 +1,7 @@
+# Based on Debian /etc/default/mdadm
+
+# Gentoo comment: The cronjob checks for this value to decide to actually validate arrays. If missing, it does NOT actually do anything.
+# AUTOCHECK:
+#   should mdadm run periodic redundancy checks over your arrays? See
+#   /etc/cron.d/mdadm.
+AUTOCHECK=true
diff --git a/sys-fs/mdadm/files/mdadm.weekly b/sys-fs/mdadm/files/mdadm.weekly
index 72e401d534dd..e2b35b550fce 100644
--- a/sys-fs/mdadm/files/mdadm.weekly
+++ b/sys-fs/mdadm/files/mdadm.weekly
@@ -1,4 +1,5 @@
 #!/bin/sh
+# This requires that AUTOCHECK is true in /etc/default/mdadm
 if [ -x /usr/sbin/checkarray ] && [ $(date +\%d) -le 7 ]; then
 	/usr/sbin/checkarray --cron --all --idle --quiet
 fi
diff --git a/sys-fs/mdadm/mdadm-3.3.2-r1.ebuild b/sys-fs/mdadm/mdadm-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..cb75d234c907
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.3.2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.3.2-r1.ebuild,v 1.1 2015/04/11 20:51:01 robbat2 Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
+
+DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+HOMEPAGE="http://neil.brown.name/blog/mdadm"
+DEB_PR=2
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
+		mirror://debian/pool/main/m/mdadm/${PN}_3.3-${DEB_PR}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+DEPEND="virtual/pkgconfig
+	app-arch/xz-utils"
+RDEPEND=">=sys-apps/util-linux-2.16"
+
+# The tests edit values in /proc and run tests on software raid devices.
+# Thus, they shouldn't be run on systems with active software RAID devices.
+RESTRICT="test"
+
+mdadm_emake() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CC="$(tc-getCC)" \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		UDEVDIR="$(get_udevdir)" \
+		SYSTEMD_DIR="$(systemd_get_unitdir)" \
+		"$@"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	mdadm_emake DESTDIR="${D}" install install-systemd
+	into /
+	dosbin mdassemble
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm
+	newconfd "${FILESDIR}"/mdadm.confd mdadm
+	newinitd "${FILESDIR}"/mdraid.rc mdraid
+	newconfd "${FILESDIR}"/mdraid.confd mdraid
+
+	# From the Debian patchset
+	into /usr
+	dodoc "${WORKDIR}"/debian/README.checkarray
+	dosbin "${WORKDIR}"/debian/checkarray
+	insinto /etc/default
+	newins "${FILESDIR}"/etc-default-mdadm mdadm
+
+	insinto /etc/cron.weekly
+	newins "${FILESDIR}"/mdadm.weekly mdadm
+}
+
+pkg_postinst() {
+	if ! systemd_is_booted; then
+		if [[ -z ${REPLACING_VERSIONS} ]] ; then
+			# Only inform people the first time they install.
+			elog "If you're not relying on kernel auto-detect of your RAID"
+			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
+			elog "	rc-update add mdraid boot"
+		fi
+	fi
+}