Version bump.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

4 files changed, 165 insertions, 1 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 1ea411fd9511..59a6c3e4f2e7 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.142 2011/03/27 03:35:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.143 2011/04/08 00:13:19 vapier Exp $
+
+*mdadm-3.2.1 (08 Apr 2011)
+
+  08 Apr 2011; Mike Frysinger <vapier@gentoo.org> +mdadm-3.2.1.ebuild,
+  +files/mdadm-3.2.1-mdassemble.patch, +files/mdadm-3.2.1-syslog-updates.patch:
+  Version bump.
 
 *mdadm-3.1.5 (27 Mar 2011)
 
diff --git a/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch b/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch
new file mode 100644
index 000000000000..6e12dc2534a0
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/211426
+
+make default mdassemble sane
+
+--- a/Makefile
++++ b/Makefile
+@@ -181,8 +181,7 @@
+ 	$(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)
+ 
+ mdassemble : $(ASSEMBLE_SRCS) $(INCL)
+-	rm -f $(OBJS)
+-	$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(ASSEMBLE_FLAGS) -DHAVE_STDINT_H -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC)
+ 
+ mdassemble.static : $(ASSEMBLE_SRCS) $(INCL)
+ 	rm -f $(OBJS)
diff --git a/sys-fs/mdadm/files/mdadm-3.2.1-syslog-updates.patch b/sys-fs/mdadm/files/mdadm-3.2.1-syslog-updates.patch
new file mode 100644
index 000000000000..1e0b46eadca3
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.2.1-syslog-updates.patch
@@ -0,0 +1,61 @@
+From 226f1bda813f15e4b977da95e420ec09ff10eac9 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 7 Apr 2011 19:59:21 -0400
+Subject: [PATCH 2/4] mdadm: add missing --syslog option to monitor help
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ ReadMe.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/ReadMe.c b/ReadMe.c
+index 00b24d4..57c10f3 100644
+--- a/ReadMe.c
++++ b/ReadMe.c
+@@ -506,6 +506,7 @@ char Help_monitor[] =
+ "  --mail=       -m   : Address to mail alerts of failure to\n"
+ "  --program=    -p   : Program to run when an event is detected\n"
+ "  --alert=           : same as --program\n"
++"  --syslog      -y   : Report alerts via syslog\n"
+ "  --increment=  -r   : Report RebuildNN events in the given increment. default=20\n"
+ "  --delay=      -d   : seconds of delay between polling state. default=60\n"
+ "  --config=     -c   : specify a different config file\n"
+-- 
+1.7.4.1
+
+From 38cf2f1179517e54c54cbed85f76950ea9e918ea Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 7 Apr 2011 20:02:05 -0400
+Subject: [PATCH 3/4] mdadm: respect --syslog in monitor mode
+
+A few places don't accept syslog as a monitor mode, so fix that.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Monitor.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Monitor.c b/Monitor.c
+index 337785d..a3ea724 100644
+--- a/Monitor.c
++++ b/Monitor.c
+@@ -143,7 +143,7 @@ int Monitor(struct mddev_dev *devlist,
+ 			fprintf(stderr, Name ": Monitor using program \"%s\" from config file\n",
+ 			       alert_cmd);
+ 	}
+-	if (scan && !mailaddr && !alert_cmd) {
++	if (scan && !mailaddr && !alert_cmd && !dosyslog) {
+ 		fprintf(stderr, Name ": No mail address or alert command - not monitoring.\n");
+ 		return 1;
+ 	}
+@@ -335,7 +335,7 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info)
+ {
+ 	int priority;
+ 
+-	if (!info->alert_cmd && !info->mailaddr) {
++	if (!info->alert_cmd && !info->mailaddr && !info->dosyslog) {
+ 		time_t now = time(0);
+ 
+ 		printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");
+-- 
+1.7.4.1
diff --git a/sys-fs/mdadm/mdadm-3.2.1.ebuild b/sys-fs/mdadm/mdadm-3.2.1.ebuild
new file mode 100644
index 000000000000..d452ab8c30b6
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.2.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild,v 1.1 2011/04/08 00:13:19 vapier Exp $
+
+inherit eutils flag-o-matic 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"
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# until it's safe !
+#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+DEPEND=""
+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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${PN}-3.2.1-syslog-updates.patch
+	epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426
+	epatch "${FILESDIR}"/${PN}-3.1.5-cflags.patch #336175
+	use static && append-ldflags -static
+}
+
+mdadm_emake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		"$@" \
+		|| die
+}
+
+src_compile() {
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+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"
+}