Version bump

(Portage version: 2.1.2_rc4-r1)

4 files changed, 82 insertions, 1 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index d93cba92dd2a..9aba0444a293 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.53 2006/12/24 01:00:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.54 2006/12/28 23:21:27 dev-zero Exp $
+
+*mdadm-2.6 (28 Dec 2006)
+
+  28 Dec 2006; Tiziano Müller <dev-zero@gentoo.org>
+  +files/mdadm-2.6-syslog-updates.patch, +mdadm-2.6.ebuild:
+  Version bump.
 
   24 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org> mdadm-2.5.3.ebuild:
   Stable on ppc.
diff --git a/sys-fs/mdadm/files/digest-mdadm-2.6 b/sys-fs/mdadm/files/digest-mdadm-2.6
new file mode 100644
index 000000000000..c3dc96337c78
--- /dev/null
+++ b/sys-fs/mdadm/files/digest-mdadm-2.6
@@ -0,0 +1,3 @@
+MD5 e5d87884da6f80a68d94cff5a5bebd82 mdadm-2.6.tar.bz2 148115
+RMD160 35ac194425dcc0e3556e488399ce747b949be9cb mdadm-2.6.tar.bz2 148115
+SHA256 024c10265c4d24445bb8aaf5123d2911716a62d3b6a014e4f5eef65b62cf1fb8 mdadm-2.6.tar.bz2 148115
diff --git a/sys-fs/mdadm/files/mdadm-2.6-syslog-updates.patch b/sys-fs/mdadm/files/mdadm-2.6-syslog-updates.patch
new file mode 100644
index 000000000000..ca50c711a4ec
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-2.6-syslog-updates.patch
@@ -0,0 +1,30 @@
+--- mdadm-2.4.1/Monitor.c
++++ mdadm-2.4.1/Monitor.c
+@@ -126,7 +126,7 @@
+ 			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;
+ 	}
+@@ -465,7 +465,7 @@
+ {
+ 	int priority;
+ 
+-	if (!cmd && !mailaddr) {
++	if (!cmd && !mailaddr && !dosyslog) {
+ 		time_t now = time(0);
+ 	       
+ 		printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");
+--- mdadm-2.4.1/ReadMe.c
++++ mdadm-2.4.1/ReadMe.c
+@@ -463,6 +464,7 @@
+ "  --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"
+ "  --delay=      -d   : seconds of delay between polling state. default=60\n"
+ "  --config=     -c   : specify a different config file\n"
+ "  --scan        -s   : find mail-address/program in config file\n"
diff --git a/sys-fs/mdadm/mdadm-2.6.ebuild b/sys-fs/mdadm/mdadm-2.6.ebuild
new file mode 100644
index 000000000000..4259bb58d8f0
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-2.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.ebuild,v 1.1 2006/12/28 23:21:27 dev-zero 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://cgi.cse.unsw.edu.au/~neilb/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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${P}-syslog-updates.patch
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake \
+		CROSS_COMPILE=${CHOST}- \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	exeinto /$(get_libdir)/rcscripts/addons
+	doexe "${FILESDIR}"/raid-{start,stop}.sh || die "addon failed"
+	dodoc INSTALL TODO "ANNOUNCE-${PV}"
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm || die
+	newconfd "${FILESDIR}"/mdadm.confd mdadm || die
+}