Version bump #322055 by Xake which also fixes #301396 by Torsten Kurbad. Add tip about rc_need to mdraid conf.d #223475 #301617.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 93 insertions, 13 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index b07914bd9e6c..86cf7c192ddf 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.129 2010/06/03 02:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.130 2010/06/03 02:05:44 vapier Exp $
+
+*mdadm-3.1.2 (03 Jun 2010)
+
+  03 Jun 2010; Mike Frysinger <vapier@gentoo.org> +mdadm-3.1.2.ebuild,
+  +files/mdraid.confd:
+  Version bump #322055 by Xake which also fixes #301396 by Torsten Kurbad.
+  Add tip about rc_need to mdraid conf.d #223475 #301617.
 
   03 Jun 2010; Mike Frysinger <vapier@gentoo.org> files/raid-start.sh-3.0:
   Drop mdadm.conf parsing now that auto assembling is requied with newer
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 78969dbfd8f9..bbd89e280c21 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,33 +1,36 @@
-AUX 64-md-raid.rules 738 RMD160 95f8934aded76f5b85e5f2ff9f9f250f8c4a4300 SHA1 4c4a103fd8ed7134f8b86b1f7d2f4f6cf439184e SHA256 9ad68b9efc5bf7785c1a5cc4b49568f54b25ad0b9783a7642e60a131ef238f3b
-AUX mdadm-1.9.0-dont-make-man.patch 260 RMD160 439a95518c7890bf72ef463ec274c53437f4ac5e SHA1 b40ab96938d0a0d80a25d67fc263c94c76749269 SHA256 71c81dbbfa1d466e9ee2d3ff0afa8b2d57e75be5dbccdbdd837786723943f7cd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mdadm-2.6-syslog-updates.patch 1117 RMD160 c7de674fc76eb444d1d5f97a5a4c59c955aa51b6 SHA1 c00f4f283acd226241aed07e35133f965bb8b154 SHA256 207fd5ec76829fed5310f766001686807c623fe3eee541701f3366f96ef77b86
 AUX mdadm-2.6.4-mdassemble.patch 465 RMD160 4abcfcd75242d552f674a850ea116835a8f56aea SHA1 609161b594c51644f30de98a7a74473361bdb98b SHA256 015321cbb219f80444c9d56d01bde36f828d2814c57712a7655bdbae811ff8c4
 AUX mdadm-3.0-dont-make-man.patch 278 RMD160 a0275251626d91dc53b3fadfab6543961f5d7608 SHA1 0c74b7f10fab185442654bb965ac557daa567c17 SHA256 bfc42300913a178c3bcd5f9af4c721893224b2741beddcfba6498d012b1d5679
 AUX mdadm-3.0.2-fix-null-dereference-in-set_member_info.patch 1415 RMD160 2b625be99bcceb98bd4d795ed1a552177da4ce09 SHA1 5a2f5f131d049e0fe37807a2718af627f5d00bac SHA256 4c7ddaf790e2460238b34911836515bfcd12d97747eef2f8c6bba68c01b2f214
 AUX mdadm.confd 205 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 SHA1 46d75372ecfcfcb34b1576bd994c22cae24f2a79 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79
 AUX mdadm.rc 574 RMD160 69640d0b1fbd11bd7078c0e7791d247420653b73 SHA1 39044e7d6ad63c44669baf9775230670f04b201c SHA256 3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7
+AUX mdraid.confd 225 RMD160 944896151ffdaf7b172c8d045d3cf9bd9083fabd SHA1 41b2e6441e1bac71657290a6764774fb0d452721 SHA256 1b7918c4bdd024607bcb49d7cea0a77cb70502d2fbb4dbe07024bb5b5699c8e0
 AUX mdraid.rc 637 RMD160 64741e62695e9dbefba5dcef37137e93d621f5e6 SHA1 c443e5cb47359b307515d942ca3d6b713b4f2244 SHA256 55c37752aa34db35bc36f566b0f093e21022ee9ae9dd11465e472d192a8631d2
-AUX mdraid.rc-2.6.3-r4 637 RMD160 6cd883833e8327256b61567eef3372c0b539824f SHA1 083569014fad29efdf23ca5522163cec31623853 SHA256 c460a68a9ceed95d9ddd3c862c0c58f482a289e074c37dc6ab82f564e04f70ec
 AUX mdraid.rc-3.1.1 815 RMD160 df283e9b55ba6df3ac209861e18c3197ede51885 SHA1 a34072a43037ec9f8c4bc858660bb261a6dfff1d SHA256 95f759ba9d4f719bb5122546fdcce18dd9b0060df1296cf8ae17a04137e163e2
-AUX raid-start.sh 1445 RMD160 6c210b05103376ea0e6d9c251ef8cc3b7b74957f SHA1 dda9e22d1fa9ed9dd5d27dbb635bbaba71263893 SHA256 73161840031941f178d6e3cab3880ae8919128e4b2adeffee97fa3401c7ffbc2
-AUX raid-start.sh-2.6.4 1470 RMD160 c779e6f5ff5fb74c46c8d590a87bc07d97f21943 SHA1 4cd319c799b2ff9c186b89d16a80da64506e7b02 SHA256 f9a65d5947053bc7c6930f2b011b7e4b3a37f1f390beac7a72f0ac3a54d0d174
-AUX raid-start.sh-3.0 982 RMD160 b697978ebd9c60ac17566504491a705ba1523700 SHA1 c8c753e750f62b4ebcc079a039468920a7a777b9 SHA256 529d3ba73bf23944e4ca12f0b311c6bfb30e3bb4ff90ad906e1ae3b3419e33c2
+AUX raid-start.sh-3.0 799 RMD160 6495c44ea5be6e18a2b76e0c724f2dbf36073f90 SHA1 2df50d9f03cc907990ddd4b235dbc605c3e208c8 SHA256 7f4e6b5d148578f417bcc05d4d4d5c65641c2a810b74b2f7f43b808c7c52a9ce
 AUX raid-stop.sh 645 RMD160 a2855fbdad1222044a9de5b7a9f441592d42960b SHA1 daa2052a3835ca178005a96a3675759a96119203 SHA256 167a6bd452b5831cd5235eb80bf5f91bb2e5a10db132408fce29e60eb9d200db
-AUX udev-141-64-md-raid.rules 1900 RMD160 235513a92557c2fac5410cb82a031652b56995f0 SHA1 c3a634df2d9f6c3c6e16d86872a8f434588f00c9 SHA256 3a594a85278e66eb1045a5e9b10f5621839567c4097ecff3fefb2a2416983b8b
 AUX udev-145-64-md-raid.rules 1907 RMD160 62709980a4fc8fe9f93ef5b9de4aef553cc0ab0a SHA1 d6fc83ef160d1bc51c2a4ca6cba0301eb8d0c097 SHA256 5f4061246afda40a151c1c2b9f9e4cbf9d87b8d92f67db3792c92a86ba0274f0
-DIST mdadm-2.6.8.tar.bz2 155837 RMD160 c0aeacd37f0a0f38e095e5eb5ec43082a6d84524 SHA1 4147e0b067ae74b71bcfd9bdb4c3c23564d65f73 SHA256 cc7f97d67c7a33123eb3950f3bb00ce84bc0931573024beac0d9cf27dd09e3ea
-DIST mdadm-2.6.9.tar.bz2 156358 RMD160 46fca913d409ad58e510a666c4d3356d9112b6e5 SHA1 11559036be68876e3c55f3cc27d67801d3d71aca SHA256 9852c90de6b6d1c40f8d419a67f1e1cf3913febe232d04caf8a5cc9aca72a611
 DIST mdadm-3.0.2.tar.bz2 252754 RMD160 3cb6407272c797cebd7496cf19b2b3a52ee68633 SHA1 e7f95e0554b51c251d04397eb1cb0884ac2fa336 SHA256 821c2a073daed4916973226a6c623de5d697cceb077de935e2b1c316b11f3da7
 DIST mdadm-3.0.3.tar.bz2 257554 RMD160 dec3d2aea136c5ac256fdda2822cf28d800afaf2 SHA1 de020e1869c85601fa86752c0d19d05446e9048f SHA256 b51a52aebfb83b09ae7faee9eebb4d49a7ad27767bcc9569079df62c7d510599
 DIST mdadm-3.0.tar.bz2 250775 RMD160 b54ef427b1561216995b43171114042ecd4b4368 SHA1 e94defc72c585bed607eff51075045d172894229 SHA256 6fd6ab77c4d996879192edd8ad90cd512165a857795c25c98fc35206df6c2e64
 DIST mdadm-3.1.1.tar.bz2 270338 RMD160 2d34a90f8a34e784a77bbf568dc59a69bd68e6aa SHA1 8902fd57eeb416455182bf0627a808275c5183ba SHA256 31c0d3040774283b1e1fad7830cef53a3b89087b2021ec108696a7fad0eb005e
-EBUILD mdadm-2.6.8.ebuild 1905 RMD160 544dee7abda556795d2cd00d357afa15305334b1 SHA1 946cbde625acd4be80514f3aeb94e15d2333ff46 SHA256 db3c592725b327caa5bc56fce00d504afe9b25eab19f7a8f502a38c2ed62cc44
-EBUILD mdadm-2.6.9-r1.ebuild 1977 RMD160 41dd3c473fa25f4942f4b8f148f399495aff1f2d SHA1 475642c948ce06532965f8d3bbc4e591a53aa7be SHA256 a593744ea7bf85213781ec50d29554ae402da78e11046219d409428198ae76cc
+DIST mdadm-3.1.2.tar.bz2 278377 RMD160 6cbc7a24513a756b08d158591dfd14fb07b171a0 SHA1 0599bd60a6cf8194bc2b5306ec939e05f825e4ce SHA256 ff831c433c386039163ac09c84b02132a8bb8ad5a0bdb571ff91211980124d68
 EBUILD mdadm-3.0.2-r1.ebuild 2059 RMD160 67abd4c018d55b94cb69b3323f08cf13dd61f614 SHA1 97553bd59b7f0eea30dced9e5c40b3d0b44dad69 SHA256 e0e86b80b4931ed77441ba3c4d5e111a86fa26e0589017e85e2e2b4c5f31a70e
 EBUILD mdadm-3.0.2.ebuild 1975 RMD160 d8b2199b759aa74172d52c40cfb14818a590b13e SHA1 29e6a861feceaec8a90c5cedcf8ea2c1d0c26e2c SHA256 9b4c524887dcf527f0ddd8a29fc9e7f7b3b7cbcefb83dda0a9f9bfd403b698ac
 EBUILD mdadm-3.0.3.ebuild 1975 RMD160 5cf4714e6e15910176a14d056ad15fba05176953 SHA1 d8d7faf8646ab3bcc6869016100a82e28408f128 SHA256 b91f78defd6bd829e111393b77460fd31ff57e11b47488de0d093f88964f8ef1
 EBUILD mdadm-3.0.ebuild 1968 RMD160 93afe16145d58cffa6d932a5bec8fddf096f83d5 SHA1 863bb788ec8dc00b080e871b850efe9ed4fa1703 SHA256 945e0772db90a7e48f03fa0f862f4fd99358fe4c7330ad313d0bd3372a7628bb
 EBUILD mdadm-3.1.1-r1.ebuild 2009 RMD160 89d4f4a29ce1224ce16e6bc46c92ca475e3ce778 SHA1 1668f1d1abe0d8829b6f5a3740b526b8e44241c3 SHA256 06aa02c67ba0187d846c7d5c1034c689355fe9e8f03b78397d58338aca821142
 EBUILD mdadm-3.1.1.ebuild 1874 RMD160 604fc39346e68886875e6e6ddf00eb72697a0c22 SHA1 48643e9039101832e3c040d8254f476c23fbc1d2 SHA256 179b9a58eb6e8b0c9725c17a4964a1c1fb43017a153c35cf88fada6f5bdc6169
-MISC ChangeLog 19877 RMD160 6ff2f213fd8d96d06b48f4d4b351025f05880064 SHA1 c9a574ea9b4ca63c2653ae3dc157c8d8e39fd3fb SHA256 b79981348aa23ce3e3c3674497979d1a579a457e43a46e6209d1b93ab0dfa5af
+EBUILD mdadm-3.1.2.ebuild 1913 RMD160 2f2b454a95c4811638777770049fec22bfd90000 SHA1 0691903025d6a15c3c213a11b4ae70888cebe6f5 SHA256 9008ac2fbb99d0849c4ec839ff1f654d45f16695b45bfc36cc760c6ea5834c56
+MISC ChangeLog 20369 RMD160 6c04f430d06f097924d1489cfa139c78e02cbd00 SHA1 aeb7d3f9fb081a4991db0bd2b777a6c279aa2530 SHA256 3acf8be6848344cca378ce6db1d73ac315ece9ac68f5eebcc3775cc3e0550972
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwHDeAACgkQTwhj9JtAlp6a/wD8DKQponZINzC8OxJ5+saat8mr
+Dn5gctXRWcuj/5Ro/mAA/RoxvqZ4/qDQdjvUQE8mte2d1WbxIj+hTxDwD6MJ21Tz
+=9K3N
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/mdraid.confd b/sys-fs/mdadm/files/mdraid.confd
new file mode 100644
index 000000000000..daa17abd8740
--- /dev/null
+++ b/sys-fs/mdadm/files/mdraid.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/mdraid: config file for /etc/init.d/mdraid
+
+# For people who run raid on top of some other layer (like
+# dmcrypt), use rc_need to specify that requirement.  See
+# the runscript(8) man page for more information.
diff --git a/sys-fs/mdadm/mdadm-3.1.2.ebuild b/sys-fs/mdadm/mdadm-3.1.2.ebuild
new file mode 100644
index 000000000000..4d192eea6101
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.1.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.1.2.ebuild,v 1.1 2010/06/03 02:05:44 vapier Exp $
+
+inherit eutils flag-o-matic
+
+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"
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+DEPEND=""
+RDEPEND=">=sys-apps/util-linux-2.16"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${PN}-2.6-syslog-updates.patch
+	epatch "${FILESDIR}"/${PN}-2.6.4-mdassemble.patch #211426
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake \
+		CROSS_COMPILE=${CHOST}- \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		all mdassemble \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	into /
+	dosbin mdassemble || die
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	exeinto /$(get_libdir)/rcscripts/addons
+	newexe "${FILESDIR}"/raid-start.sh-3.0 raid-start.sh || die
+	newexe "${FILESDIR}"/raid-stop.sh raid-stop.sh || die
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm || die
+	newconfd "${FILESDIR}"/mdadm.confd mdadm || die
+	newinitd "${FILESDIR}"/mdraid.rc-3.1.1 mdraid || die
+	newconfd "${FILESDIR}"/mdraid.confd mdraid || die
+
+	# do not rely on /lib -> /libXX link
+	sed -i \
+		-e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" \
+		"${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "If using baselayout-2 and not relying on kernel auto-detect"
+	elog "of your RAID devices, you need to add 'mdraid' to your 'boot'"
+	elog "runlevel. Run the following command:"
+	elog "rc-update add mdraid boot"
+}