| 1 |
robbat2 08/05/31 21:10:41 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: munin-1.3.4.ebuild |
| 5 |
Log: |
| 6 |
Bug #214152, version bump. Includes fw_conntrack fixes per bug 195964. |
| 7 |
(Portage version: 2.1.5.2) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.12 net-analyzer/munin/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.11&r2=1.12 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v |
| 19 |
retrieving revision 1.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -p -w -b -B -u -u -r1.11 -r1.12 |
| 22 |
--- ChangeLog 30 Jun 2007 01:32:01 -0000 1.11 |
| 23 |
+++ ChangeLog 31 May 2008 21:10:40 -0000 1.12 |
| 24 |
@@ -1,6 +1,14 @@ |
| 25 |
# ChangeLog for net-analyzer/munin |
| 26 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.11 2007/06/30 01:32:01 kumba Exp $ |
| 28 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.12 2008/05/31 21:10:40 robbat2 Exp $ |
| 30 |
+ |
| 31 |
+*munin-1.3.4 (31 May 2008) |
| 32 |
+ |
| 33 |
+ 31 May 2008; Robin H. Johnson <robbat2@g.o> |
| 34 |
+ +files/munin-1.3.3-fw_conntrack_plugins.patch, |
| 35 |
+ +files/munin-1.3.4-Makefile.patch, |
| 36 |
+ +files/munin-1.3.4-plugin-cleanup.patch, +munin-1.3.4.ebuild: |
| 37 |
+ Bug #214152, version bump. Includes fw_conntrack fixes per bug 195964. |
| 38 |
|
| 39 |
30 Jun 2007; Joshua Kinard <kumba@g.o> munin-1.3.3-r2.ebuild: |
| 40 |
Marked unstable on mips, per #183588. |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 net-analyzer/munin/munin-1.3.4.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/munin-1.3.4.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/munin-1.3.4.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: munin-1.3.4.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2008 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4.ebuild,v 1.1 2008/05/31 21:10:40 robbat2 Exp $ |
| 54 |
|
| 55 |
inherit eutils |
| 56 |
|
| 57 |
DESCRIPTION="Munin Server Monitoring Tool" |
| 58 |
HOMEPAGE="http://munin.sourceforge.net" |
| 59 |
SRC_URI="mirror://sourceforge/munin/${PN}_${PV}.tar.gz" |
| 60 |
LICENSE="GPL-2" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" |
| 63 |
IUSE="doc minimal munin-irc munin-dhcp munin-surfboard munin-apache munin-squid ssl" |
| 64 |
|
| 65 |
# Upstream's listing of required modules is NOT correct! |
| 66 |
DEPEND_COM="dev-lang/perl |
| 67 |
dev-perl/net-server |
| 68 |
sys-process/procps |
| 69 |
ssl? ( dev-perl/Net-SSLeay ) |
| 70 |
dev-perl/Net-SNMP |
| 71 |
dev-perl/DateManip |
| 72 |
virtual/perl-Time-HiRes |
| 73 |
virtual/perl-Digest-MD5 |
| 74 |
virtual/perl-Getopt-Long |
| 75 |
virtual/perl-Storable |
| 76 |
virtual/perl-Text-Balanced |
| 77 |
!minimal? ( dev-perl/HTML-Template |
| 78 |
net-analyzer/rrdtool ) |
| 79 |
munin-irc? ( dev-perl/Net-IRC ) |
| 80 |
munin-dhcp? ( dev-perl/Net-Netmask dev-perl/libwww-perl ) |
| 81 |
munin-surfboard? ( dev-perl/libwww-perl ) |
| 82 |
munin-apache? ( dev-perl/libwww-perl ) |
| 83 |
munin-squid? ( virtual/perl-MIME-Base64 )" |
| 84 |
# Sybase isn't supported in Gentoo |
| 85 |
#munin-sybase? ( dev-perl/DBD-Sybase ) |
| 86 |
|
| 87 |
# Keep this seperate, as previous versions have had other deps here |
| 88 |
DEPEND="${DEPEND_COM}" |
| 89 |
RDEPEND="${DEPEND_COM} |
| 90 |
!minimal? ( virtual/cron )" |
| 91 |
|
| 92 |
pkg_setup() { |
| 93 |
enewgroup munin |
| 94 |
enewuser munin 177 -1 /var/lib/munin munin |
| 95 |
} |
| 96 |
|
| 97 |
src_unpack() { |
| 98 |
if use !minimal; then |
| 99 |
if ! built_with_use net-analyzer/rrdtool perl ; then |
| 100 |
die 'Sorry, munin needs net-analyzer/rrdtool built with USE=perl.' |
| 101 |
fi |
| 102 |
fi |
| 103 |
unpack ${A} |
| 104 |
# upstream needs a lot of DESTDIR loving |
| 105 |
# and Gentoo location support |
| 106 |
EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-Makefile.patch |
| 107 |
# Fix noise in the plugins |
| 108 |
EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-plugin-cleanup.patch |
| 109 |
|
| 110 |
# Bug #195964, fix up conntrack |
| 111 |
EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/munin-1.3.3-fw_conntrack_plugins.patch |
| 112 |
} |
| 113 |
|
| 114 |
src_compile() { |
| 115 |
emake build build-man || die "build/build-man failed" |
| 116 |
if use doc; then |
| 117 |
emake build-doc || die "build-doc failed" |
| 118 |
fi |
| 119 |
|
| 120 |
#Ensure TLS is disabled if built without SSL |
| 121 |
if ! use ssl; then |
| 122 |
echo "tls disabled" >> ${S}/build/node/munin-node.conf \ |
| 123 |
|| die "Fixing munin-node.conf Failed!" |
| 124 |
echo "tls disabled" >> ${S}/build/server/munin.conf \ |
| 125 |
|| die "Fixing munin.conf Failed!" |
| 126 |
fi |
| 127 |
|
| 128 |
} |
| 129 |
|
| 130 |
src_install() { |
| 131 |
local dirs |
| 132 |
dirs="/var/log/munin/ /var/lib/munin/" |
| 133 |
dirs="${dirs} /var/lib/munin/plugin-state/" |
| 134 |
dirs="${dirs} /var/run/munin/plugin-state/" |
| 135 |
dirs="${dirs} /etc/munin/plugin-conf.d/" |
| 136 |
dirs="${dirs} /etc/munin/plugins/" |
| 137 |
keepdir ${dirs} |
| 138 |
|
| 139 |
emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed" |
| 140 |
fowners munin:munin ${dirs} |
| 141 |
|
| 142 |
emake DESTDIR="${D}" install-man || die "install manpages failed" |
| 143 |
|
| 144 |
insinto /etc/munin/plugin-conf.d/ |
| 145 |
newins ${FILESDIR}/${PN}-1.3.2-plugins.conf munin-node |
| 146 |
|
| 147 |
# make sure we've got everything in the correct directory |
| 148 |
insinto /var/lib/munin |
| 149 |
newins ${FILESDIR}/${PN}-1.3.3-crontab crontab |
| 150 |
newinitd ${FILESDIR}/munin-node_init.d_1.3.3-r1 munin-node |
| 151 |
newconfd ${FILESDIR}/munin-node_conf.d_1.3.3-r1 munin-node |
| 152 |
dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* |
| 153 |
} |
| 154 |
|
| 155 |
pkg_config() { |
| 156 |
einfo "Press enter to install the default crontab for the munin master" |
| 157 |
einfo "installation from /var/lib/munin/crontab" |
| 158 |
einfo "If you have a large site, you may wish to customize it." |
| 159 |
read |
| 160 |
crontab -u munin /var/lib/munin/crontab |
| 161 |
} |
| 162 |
|
| 163 |
pkg_postinst() { |
| 164 |
elog "Please follow the munin documentation to set up the plugins you" |
| 165 |
elog "need, afterwards start munin-node via /etc/init.d/munin-node." |
| 166 |
elog "To have munin's cronjob automatically configured for you if this is" |
| 167 |
elog "your munin master installation, please:" |
| 168 |
elog "emerge --config net-analyzer/munin" |
| 169 |
elog "" |
| 170 |
elog "Please note that the crontab has undergone some modifications" |
| 171 |
elog "since 1.3.2, and you should update to it!" |
| 172 |
} |
| 173 |
|
| 174 |
|
| 175 |
|
| 176 |
-- |
| 177 |
gentoo-commits@l.g.o mailing list |
Archives