The Debian patchset has a great tool (checkarray) to run a regular check of arrays , and I think we could benefit from it, since it saved my data at least once already.

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

3 files changed, 96 insertions, 12 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 2550854145e3..41da97c4c260 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.172 2013/09/28 08:43:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.173 2013/11/02 06:35:27 robbat2 Exp $
+
+*mdadm-3.3-r2 (02 Nov 2013)
+
+  02 Nov 2013; Robin H. Johnson <robbat2@gentoo.org> +mdadm-3.3-r2.ebuild:
+  The Debian patchset has a great tool (checkarray) to run a regular check of
+  arrays , and I think we could benefit from it, since it saved my data at least
+  once already.
 
 *mdadm-3.3-r1 (28 Sep 2013)
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index e57bc2990851..92808e4904bf 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX mdadm-2.6-syslog-updates.patch 1117 SHA256 207fd5ec76829fed5310f766001686807c623fe3eee541701f3366f96ef77b86 SHA512 268838ff1ff262b4ce6fdfda16b5b062b4debf0e4a9fa7b9e6e129d3ee60bac96f461ca02fa5663e166678cc03ef488eb24d160486a7504366deaedc42c05d83 WHIRLPOOL a2a806eab4fe0c116ce4c0d9d50ad6b70a1f2f9a1351622f1536f84764382bcb0fd53891e121d6b05349ae423ea0f455dd94027e51ccf09d661c4cf29a375c46
 AUX mdadm-2.6.4-mdassemble.patch 465 SHA256 015321cbb219f80444c9d56d01bde36f828d2814c57712a7655bdbae811ff8c4 SHA512 95e405b04fd7ed944e8c80840ada3b32e35c86aa260b27e827f2e8021a90d03ff644eba00fcfcd9def4ed7e1e672aba0ccb68bbb5840b34a34a68a8cb68cf727 WHIRLPOOL 9fde86d14b32e6c8345df0ca4d6baecb433389ebbb2b035c8142c2b85ccdecebd0bdf7f8edbe092c65420213ca43289055d80beee2a65c10ee484f259c42e102
 AUX mdadm-3.0-dont-make-man.patch 278 SHA256 bfc42300913a178c3bcd5f9af4c721893224b2741beddcfba6498d012b1d5679 SHA512 571a022b92c090e743adfdf2f7e0609d86c2bf729bcff42a002f2bfc999d5f814540753cd44b04eb4656e53b70679ab7381e688399a6cdd992a433cde3612140 WHIRLPOOL 0808d47b9a48fd799368d1e4334de8dd54e12f04aeb0458a7cbf87e2a502aa7084b9d1f8c97feaf32f438a645dab314e400c7c99b743f094e25992b136ef3ec0
@@ -24,6 +21,7 @@ DIST mdadm-3.2.3.tar.bz2 366770 SHA256 0ff49a04c6250834ce1b5be5a1581532e70e2221a
 DIST mdadm-3.2.5.tar.bz2 369582 SHA256 5ae2bfd241c88601c1ef9072806248491e025fa09a388c40230d72d65eabbd3c SHA512 021a28adf1793df2010ea34e9ece27bb10c79343bc96cc70fc479eb2404a3bc8f428afbc9e2b6a09533d77262c3045047bf06f9e72a9590f298665b69dd6282d WHIRLPOOL 165e5af840b460adbe3651402dfc763e1727c17bf1a8ffc62e5336b4658cfab94b34665cdfd3f7c035e58f35cd3577aee0f6fdf3cea0883d0ff99b758f0ed23d
 DIST mdadm-3.2.6.tar.bz2 371525 SHA256 c44ed3b31238b41cffe67caffaf45067d01e095de94988889ea8a94e22dc6c38 SHA512 1ebcd4c797cd9f7388f9a27372a19205dc81a4b19adc83e1d6d7cfd4ef18f40a211fddf59ed027a1bf35bd36d4b6795e88e8086c3b022c188ec6e9f68bf1a4ee WHIRLPOOL 61d07512758491326c21bb745ca457a9f3d9215292358d7b4755eb84bb72877058fb239cbffe25c8121caff066aded84e8353b9716e9d4a45d724777f01a6714
 DIST mdadm-3.3.tar.xz 399152 SHA256 565d2d0f3114679d7ac96c31282fdc61b0e2eddbed13d3ea723a64b079899151 SHA512 09eca8a8e26f4159be3d1988925d9ade5e580eac94ea4044ee92e0c5e08fbfbc8d7ec83d34621df4eab1217b97df372b868144db20e33ad2c6ed01210911bd9a WHIRLPOOL 32f83199b9327fa1124c80c63a815a16f7423f76ef9b9d77a568e2c25e2cef8ef84ffdff25f3314f77e976c0d9ed758a3e62837a15a46c6e60932d83b7bb805b
+DIST mdadm_3.3-2.debian.tar.gz 127889 SHA256 c38b155e7395b35380d506458d979b82c5b853de996f21ccab50b1202d726301 SHA512 92e4c403542caba4b9afb870ba803e6bc7ade143b27efdc27e03b3407f322722a635457cce9e8c195a3ecd7cbce66fdebdd6046fc4f36836e56e27d5d838c037 WHIRLPOOL 8f8ef1142a79044093a5f55b181dc35a142b83041a59a9b71945aa6fe84cd089a7e1b183ec6b5db210a0d07e94efad0ab3a0d0341fc6cbbbf4da9d0254b5c737
 EBUILD mdadm-3.1.4.ebuild 2277 SHA256 63890f88df3b70f7ccc7584f99a6c66ae7435eb4e44b4b262aab4c854bc2dd6b SHA512 46676cc4ef53536654c372ca44e4916e11bdc237ecf3d76256af9d9351796e9837febb9d2f3add958f0ae41c67ac2135494a2fa61fd70facaed9eb6bafc2b1f2 WHIRLPOOL 525fdc76f1a173a712111903dc02528611cc72946278d9460cc115d3986a48e926ced81114cf7626d79c1c8116be6cc736bd4184b8bc57574ab1479ac93429c6
 EBUILD mdadm-3.1.5.ebuild 2235 SHA256 038781a904accd76b9484df7317765c374d5c910beb0c0f7ec57deaafd0737a8 SHA512 ea4a730844ef093defd9a91acedbd00865a1d35eec9f378484c5290959685727d1ef38c4d7056584fe647fc034ae81b21ba504f2e25f7f77a1a310bf7e9ba889 WHIRLPOOL 39f25b4c53fbe3caa8a577b5089f3c8d79c32c49930c5166ee674250d3969b5a7ca7af013d0793da06be59170179779b9175af5d3b8def7d26dcd32d8829564b
 EBUILD mdadm-3.2.3-r2.ebuild 2018 SHA256 6607052b8b7d8260ba6362cf893065e39850b04bce4319ecb6da81b1d1c399d9 SHA512 10fa169071206d997e8b45838c9e16acd5670ab1404d75a9f4881b8d5730b7fa3c24966ee343cbc008c05a388b28f38c0c9efab29ce3320836450fe176404044 WHIRLPOOL 13de1db4fb8727fd1a6d20239098705aca111fb35e97adc8a7c20b743c030b55ddd9b9190df7206f7f1787a161636bcbf9b4c6cd0b4060de27f33b38b9b4f2b5
@@ -31,13 +29,7 @@ EBUILD mdadm-3.2.5-r1.ebuild 1989 SHA256 6cc4f775d1bc3bb6204f80db64c14104da5f13a
 EBUILD mdadm-3.2.6-r1.ebuild 2061 SHA256 dcee1c9b4ae0f6c9c05c754fdd958e23bb8efca6bde82f3452a9f0a91a7e621e SHA512 4e64f5b0fccdada51e23e1ab1187d3be05300b4f08751432ac35603aa698800a67adbf483de3729d9a1f3d3ac5d579ed1dc3e02dea3555387f21d066271dd523 WHIRLPOOL 50f2a0714081ede4de6c4a4334be7cbc42e98a8dbd365479314ef76991c7d3a6d866e8527d1f3e2be30936b544fd131cc4727bb907ec7124f6595556932f1680
 EBUILD mdadm-3.2.6.ebuild 1960 SHA256 6acbe9258f052b821d6396b7565684a1a2bad0caf9c2c73e7d84d37c98071569 SHA512 aaa111b614a1cccd30143da2d9fef989960ac4897dc97d84d8af536681ab7be562ef59d0d3978a092a194fe700807e5f5ffd67bbf82e01338bd5b8b4384e2a17 WHIRLPOOL 11a5ff3ca2fb7e71ff0c48567079aa2a3a460aaea85d566ef8354be6ad1ca494c61ac90e545ce0bff04af432948e8d19bd859469c09157ad65098f8b1c560662
 EBUILD mdadm-3.3-r1.ebuild 1999 SHA256 83259e41249e8962778288d2438457088c2fa6a278c277b9e0a56c446af20d23 SHA512 a2db3f79c217f0c3e163338271217dd4b753b814ebcb73be3e1d388b7bfa2072435c6f9ae99a65fa00150096226b6023255ca7774a76ada1f7ccf855e9500c9f WHIRLPOOL 52128c8213ea9292cb09b6a85abfd99c788332b98107bf273ab7dc4dd1da1ebd16878e3d68afe919f12c3d85b2ddb88f8a71b76cd5b95428d40e7b425c3abc33
+EBUILD mdadm-3.3-r2.ebuild 2379 SHA256 5d77551da38f4b279c4918ec5f7149dca738a67afdac7481f8c0f8408bdf4559 SHA512 330e617e3aa829d18fa4fe70301c5169f426991f66849b4ee0b3c04bde7494ca8fce222fd4e6abd05aeaf8a756c72d32951a06575eb11bcf35254bb37782bea1 WHIRLPOOL 503d68e2c318a015b1229b2daf3129785d98b177fd3440995a9d08a3bebf86c95b40238e5f813f8c986edfa6c9f588d6efbb07098e3605fb8afad82e3395fc5c
 EBUILD mdadm-3.3.ebuild 1897 SHA256 17bb24cb6e37ec6a0b289055b71d560322b6f46d23f655cb862b907bf0d23594 SHA512 1429d83a1b091e64e922a8dc1c793b6eb9cae099e734b540992c37b9c2ed1b7517d1bc193280509b9714a7ea011cd06aec21168f622765478878d16be8160d0d WHIRLPOOL dcf11632efbab34558fa14bf1f2fa507917a788d2cff1db9acec190997d547ff1138fd1c5b7bf7be9b6381837bf6f2720e3da90331bbf65e5129f4b348b6897b
-MISC ChangeLog 26221 SHA256 8b75a3cd6b1a1163f6af37f7353bd230cfb2792be1a62f3133af1f9c13b9486b SHA512 437f106103c004ca865d648109e90fe4b0467ebf70ed87cadfb63be32cde7f44ab4bb08eb6f63f795f94df74d3db176b45c044176e572b062d1ad0610235b3b9 WHIRLPOOL db748660f33154dc8e142fda418ad0df1df04fa3c34fca940636e66fff90310b4adf510a95730f898adb0940e81c429c3a48868c96485c800c9a646c2f61a23b
+MISC ChangeLog 26503 SHA256 ed505b6e11416eca57b979630a991fed852dfab300b3d2fa6a0cb371ac44be32 SHA512 11f966faad2c651023f90c517e3389305b602d4e6f68634dc25efb169fe58780ab75fe19be6262d8ba5e2d3dbaab6e4a3ca3eba40d430017328ee4c3eee6f6b3 WHIRLPOOL 0a0aa2edb32224bcfb3675560f2af6ff41ca2c1afe54734028effa9c4f3fe1a0fb4a2c6aebff6363a19cf8234e1faaee252c8338a75f9f3e81c2e43674b4ebcd
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iEYEAREIAAYFAlJGlsUACgkQCaWpQKGI+9RiswCfWQl/GpINVcSHUCvJlM3+Aikr
-wrEAn1aDchCBVEUe1XgMpX7AX7kXRUxo
-=ifWj
------END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/mdadm-3.3-r2.ebuild b/sys-fs/mdadm/mdadm-3.3-r2.ebuild
new file mode 100644
index 000000000000..f7c0de3ba117
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.3-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.3-r2.ebuild,v 1.1 2013/11/02 06:35:27 robbat2 Exp $
+
+EAPI="4"
+inherit multilib flag-o-matic systemd toolchain-funcs
+
+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}_${PV}-${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}" \
+		MAP_DIR=/run/mdadm \
+		"$@"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		SYSTEMD_DIR=$(systemd_get_unitdir) \
+		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
+	systemd_dounit "${FILESDIR}"/mdadm.service
+	systemd_newtmpfilesd "${FILESDIR}"/mdadm.tmpfiles.conf mdadm.conf
+
+	# From the Debian patchset
+	into /usr
+	dodoc "${WORKDIR}/debian/README.checkarray"
+	dosbin "${WORKDIR}/debian/checkarray"
+	sed -i -e 's~/usr/share/mdadm/checkarray~/usr/sbin/checkarray~g' \
+			"${WORKDIR}"/debian/mdadm.cron.d
+	insinto /etc/cron.d/
+	newins "${WORKDIR}"/debian/mdadm.cron.d 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
+}