From 4c586a0393e503a27bc854b217c827c74b2b7518 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Thu, 28 Dec 2006 23:21:27 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.1.2_rc4-r1 --- sys-fs/mdadm/ChangeLog | 8 +++- sys-fs/mdadm/Manifest | 20 +++++++-- sys-fs/mdadm/files/digest-mdadm-2.6 | 3 ++ .../files/mdadm-2.6-syslog-updates.patch | 30 +++++++++++++ sys-fs/mdadm/mdadm-2.6.ebuild | 42 +++++++++++++++++++ 5 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 sys-fs/mdadm/files/digest-mdadm-2.6 create mode 100644 sys-fs/mdadm/files/mdadm-2.6-syslog-updates.patch create mode 100644 sys-fs/mdadm/mdadm-2.6.ebuild 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 + +files/mdadm-2.6-syslog-updates.patch, +mdadm-2.6.ebuild: + Version bump. 24 Dec 2006; Tobias Scherbaum mdadm-2.5.3.ebuild: Stable on ppc. diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest index 63405ffaa413..1b95e91c7508 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -6,6 +6,10 @@ AUX mdadm-2.4.1-syslog-updates.patch 1317 RMD160 f757dc62be08b1efb8f3883f4fd0fa5 MD5 d1232df233ac842e9679a4abf7348c81 files/mdadm-2.4.1-syslog-updates.patch 1317 RMD160 f757dc62be08b1efb8f3883f4fd0fa5d8ec4f0bf files/mdadm-2.4.1-syslog-updates.patch 1317 SHA256 435c56d360a766ea20a38f9c74162f75b0453d8fe6ae17dcd19c515a4007a9fd files/mdadm-2.4.1-syslog-updates.patch 1317 +AUX mdadm-2.6-syslog-updates.patch 1117 RMD160 c7de674fc76eb444d1d5f97a5a4c59c955aa51b6 SHA1 c00f4f283acd226241aed07e35133f965bb8b154 SHA256 207fd5ec76829fed5310f766001686807c623fe3eee541701f3366f96ef77b86 +MD5 df6713946957d0526274fda5e341868a files/mdadm-2.6-syslog-updates.patch 1117 +RMD160 c7de674fc76eb444d1d5f97a5a4c59c955aa51b6 files/mdadm-2.6-syslog-updates.patch 1117 +SHA256 207fd5ec76829fed5310f766001686807c623fe3eee541701f3366f96ef77b86 files/mdadm-2.6-syslog-updates.patch 1117 AUX mdadm.confd 205 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 SHA1 46d75372ecfcfcb34b1576bd994c22cae24f2a79 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79 MD5 6682657bc391e56742065e9aecc2306f files/mdadm.confd 205 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 files/mdadm.confd 205 @@ -26,6 +30,7 @@ DIST mdadm-2.5.2.tar.bz2 134591 RMD160 a684d9ff83e49862682a75a115c58b1cea1a7efc DIST mdadm-2.5.3.tar.bz2 135019 RMD160 d470be42df7f737359944b17ac22e840db390373 SHA1 a78b03508f75516c0f4d615b5870f2abc617e99e SHA256 4faca7f0bf411aba15fb8f55f692effb893761885701b59ff3f49fce66ec8055 DIST mdadm-2.5.4.tar.bz2 136104 RMD160 6567ba65cf56cdb1466157d485ae758d7e1fbc81 SHA1 6076153404aca9fd0a0bb980eb6e0ff72edef18b SHA256 97433a441c4f1276f3248e71098eb127db971b8740a7a622307dd3f0e07ebb15 DIST mdadm-2.5.5.tar.bz2 136908 RMD160 ad89d0d417a0acc916da507f6dd9ff7e5f5d1372 SHA1 3a433c8c09119079758394d74a4f39e2928f0e3a SHA256 d54ae28bdafdbd3c71bfafa8f8814583356714b6a1436783161413a1e34a38c9 +DIST mdadm-2.6.tar.bz2 148115 RMD160 35ac194425dcc0e3556e488399ce747b949be9cb SHA1 c9428926779041235d97122a953bc2a3d2d00007 SHA256 024c10265c4d24445bb8aaf5123d2911716a62d3b6a014e4f5eef65b62cf1fb8 EBUILD mdadm-2.5.2.ebuild 1214 RMD160 b646e225757047c8bf835039b523a3b0460d7335 SHA1 985fb526b74dfbeca2cc5c9bfd5476c63b457e72 SHA256 8b7bb989b34d851031e53905d2fd12852e489242a0c1d3112f9020ed643acdf6 MD5 eab58370a66e0309829f7d420ea405c7 mdadm-2.5.2.ebuild 1214 RMD160 b646e225757047c8bf835039b523a3b0460d7335 mdadm-2.5.2.ebuild 1214 @@ -42,10 +47,14 @@ EBUILD mdadm-2.5.5.ebuild 1249 RMD160 814e69a9bec9a724a023e1453cc86b156e942b4a S MD5 2c285f588ddb38e0a543582cf768f304 mdadm-2.5.5.ebuild 1249 RMD160 814e69a9bec9a724a023e1453cc86b156e942b4a mdadm-2.5.5.ebuild 1249 SHA256 120279e7022b1c1ef935535142eb35f70597c5a921e08cb856d2b6f30a663922 mdadm-2.5.5.ebuild 1249 -MISC ChangeLog 9651 RMD160 1b0f14802caaec4a193c9322dfac71c8d31e8472 SHA1 9c6171800f906c0ff11cad805f1fe8344ea57e55 SHA256 2a2290359f0e137ad871e74388c9a21de7c89b4abffc2f803542bad3456ada5f -MD5 d9b3cdc65964753e3450be65a2cc3f7e ChangeLog 9651 -RMD160 1b0f14802caaec4a193c9322dfac71c8d31e8472 ChangeLog 9651 -SHA256 2a2290359f0e137ad871e74388c9a21de7c89b4abffc2f803542bad3456ada5f ChangeLog 9651 +EBUILD mdadm-2.6.ebuild 1242 RMD160 8ce5fb3e6ab8cd1e5baf04e4d23ee60df24f789c SHA1 3f87ee6e806812795fe1d5c96555b430e4ead53d SHA256 de451d021adc7b9f7daa357afb461901b838258db48d52b59ea1f2975285067f +MD5 155e5f59268e526cc04a907b7aaca516 mdadm-2.6.ebuild 1242 +RMD160 8ce5fb3e6ab8cd1e5baf04e4d23ee60df24f789c mdadm-2.6.ebuild 1242 +SHA256 de451d021adc7b9f7daa357afb461901b838258db48d52b59ea1f2975285067f mdadm-2.6.ebuild 1242 +MISC ChangeLog 9805 RMD160 fcc123944249cd6200ffd4917df7550b88895476 SHA1 ebacf4fd6ee87d2a34910139c81fed1c847b16aa SHA256 781bc920cd07c89af0605d28b71bcc633c8aeb13852eec4e13bbebaf1256de73 +MD5 82d547ac059a981db787c20f2c727e37 ChangeLog 9805 +RMD160 fcc123944249cd6200ffd4917df7550b88895476 ChangeLog 9805 +SHA256 781bc920cd07c89af0605d28b71bcc633c8aeb13852eec4e13bbebaf1256de73 ChangeLog 9805 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -62,3 +71,6 @@ SHA256 63ac9fc2af02033730d0bf32b4a7588a44d0bac65e7e2bf3694376bb358f7bc0 files/di MD5 1029a640f5df09d3cdf522a41e4cce2e files/digest-mdadm-2.5.5 238 RMD160 b22359d8240ff4f4514d3029e3c68798165dcd85 files/digest-mdadm-2.5.5 238 SHA256 83473b97357f1f72ead5822bb8ec733289f5b95d7c1bab5336d7df282b19a694 files/digest-mdadm-2.5.5 238 +MD5 16363aa81f8ad58e417a19e8ca68e6f4 files/digest-mdadm-2.6 232 +RMD160 e25e293bc7122224a83b6e42e6eeaedf8d815d17 files/digest-mdadm-2.6 232 +SHA256 c48f95f8c4fc83d07bf16a204f2e46f053b0c85a96837c2baecea762f8d5a832 files/digest-mdadm-2.6 232 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 +} -- 2.26.2