Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/munin: munin-1.4.7-r1.ebuild ChangeLog
Date: Sat, 07 Jul 2012 07:21:59
Message-Id: 20120707072150.2F1822004C@flycatcher.gentoo.org
1 jlec 12/07/07 07:21:50
2
3 Modified: ChangeLog
4 Added: munin-1.4.7-r1.ebuild
5 Log:
6 Add fix when /var/run is on tmpfs
7
8 (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.71 net-analyzer/munin/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.71&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.71&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.70&r2=1.71
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v
20 retrieving revision 1.70
21 retrieving revision 1.71
22 diff -u -r1.70 -r1.71
23 --- ChangeLog 12 Jun 2012 02:29:22 -0000 1.70
24 +++ ChangeLog 7 Jul 2012 07:21:50 -0000 1.71
25 @@ -1,6 +1,12 @@
26 # ChangeLog for net-analyzer/munin
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.70 2012/06/12 02:29:22 zmedico Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.71 2012/07/07 07:21:50 jlec Exp $
30 +
31 +*munin-1.4.7-r1 (07 Jul 2012)
32 +
33 + 07 Jul 2012; Justin Lecher <jlec@g.o> +files/munin-node_init.d_1.4.7,
34 + +munin-1.4.7-r1.ebuild:
35 + Add fix when /var/run is on tmpfs
36
37 12 Jun 2012; Zac Medico <zmedico@g.o> munin-1.4.6-r4.ebuild,
38 munin-1.4.7.ebuild:
39 @@ -354,4 +360,3 @@
40 Initial commit. Bug #76018. Final ebuild by Robin H. Johnson
41 <robbat2@g.o>, with signicent contributions by Allen Parker
42 <infowolfe@×××××.com>.
43 -
44
45
46
47 1.1 net-analyzer/munin/munin-1.4.7-r1.ebuild
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-1.4.7-r1.ebuild?rev=1.1&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-1.4.7-r1.ebuild?rev=1.1&content-type=text/plain
51
52 Index: munin-1.4.7-r1.ebuild
53 ===================================================================
54 # Copyright 1999-2012 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.7-r1.ebuild,v 1.1 2012/07/07 07:21:50 jlec Exp $
57
58 EAPI=2
59
60 inherit eutils user
61
62 DESCRIPTION="Munin Server Monitoring Tool"
63 HOMEPAGE="http://munin.projects.linpro.no/"
64 SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
65
66 LICENSE="GPL-2"
67 SLOT="0"
68 KEYWORDS="~amd64 ~mips ~ppc ~x86"
69 IUSE="asterisk doc irc java memcached minimal mysql postgres ssl"
70
71 # Upstream's listing of required modules is NOT correct!
72 # Some of the postgres plugins use DBD::Pg, while others call psql directly.
73 # Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
74 DEPEND_COM="dev-lang/perl
75 sys-process/procps
76 asterisk? ( dev-perl/Net-Telnet )
77 irc? ( dev-perl/Net-IRC )
78 java? ( >=virtual/jdk-1.5 )
79 mysql? ( virtual/mysql
80 dev-perl/Cache-Cache
81 dev-perl/DBD-mysql )
82 ssl? ( dev-perl/Net-SSLeay )
83 postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
84 memcached? ( dev-perl/Cache-Memcached )
85 dev-perl/DateManip
86 dev-perl/Net-CIDR
87 dev-perl/Net-Netmask
88 dev-perl/Net-SNMP
89 dev-perl/libwww-perl
90 dev-perl/net-server
91 dev-perl/DBI
92 virtual/perl-Digest-MD5
93 virtual/perl-Getopt-Long
94 virtual/perl-MIME-Base64
95 virtual/perl-Storable
96 virtual/perl-Text-Balanced
97 virtual/perl-Time-HiRes
98 !minimal? ( dev-perl/HTML-Template
99 net-analyzer/rrdtool[perl]
100 dev-perl/Log-Log4perl )"
101 # Sybase isn't supported in Gentoo
102 #munin-sybase? ( dev-perl/DBD-Sybase )
103
104 # Keep this seperate, as previous versions have had other deps here
105 DEPEND="${DEPEND_COM}
106 virtual/perl-Module-Build"
107 RDEPEND="${DEPEND_COM}
108 !minimal? ( virtual/cron )"
109
110 pkg_setup() {
111 enewgroup munin
112 enewuser munin 177 -1 /var/lib/munin munin
113 }
114
115 src_prepare() {
116 # upstream needs a lot of DESTDIR loving
117 # and Gentoo location support
118 epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch
119
120 epatch "${FILESDIR}"/${PN}-1.4.6-apc-temp.patch
121 epatch "${FILESDIR}"/${PN}-1.4.*-munin-version-identifier.patch
122 epatch "${FILESDIR}"/${PN}-1.4.6-fix-asterisk-plugins.patch
123 epatch "${FILESDIR}"/${PN}-1.4.6-if_-hardened-v2.patch
124 epatch "${FILESDIR}"/${PN}-1.4.6-apc-multi.patch
125
126 # Don't build java plugins if not requested via USE.
127 if ! use java; then
128 # sed is needed so the java plugins aren't automagically built.
129 sed -i -e 's: build-plugins-java : :' \
130 -e 's: install-plugins-java : :' Makefile || die
131 fi
132
133 # Bug 304447, fix for gentoo PS location
134 sed -i -e 's,/usr/bin/ps,/bin/ps,g' \
135 "${S}"/plugins/node.d/ifx_concurrent_sessions_.in || die
136
137 # bug 367785, cleanup make output by disabling HP-UX cruft
138 sed -i -e "/plugins\/\*\.adv/d" Makefile || die
139 }
140
141 src_compile() {
142 emake -j 1 build build-man || die "build/build-man failed"
143 if use doc; then
144 emake -j 1 build-doc || die "build-doc failed"
145 fi
146
147 #Ensure TLS is disabled if built without SSL
148 if ! use ssl; then
149 echo "tls disabled" >> ${S}/build/node/munin-node.conf \
150 || die "Fixing munin-node.conf Failed!"
151 echo "tls disabled" >> ${S}/build/master/munin.conf \
152 || die "Fixing munin.conf Failed!"
153 fi
154
155 }
156
157 src_install() {
158 local dirs
159 dirs="/var/log/munin/ /var/lib/munin/"
160 dirs="${dirs} /var/lib/munin/plugin-state/"
161 dirs="${dirs} /var/run/munin/plugin-state/"
162 dirs="${dirs} /var/run/munin/spool/"
163 dirs="${dirs} /etc/munin/plugin-conf.d/"
164 dirs="${dirs} /etc/munin/munin-conf.d/"
165 dirs="${dirs} /etc/munin/plugins/"
166 keepdir ${dirs}
167
168 if use minimal; then
169 emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
170 install-plugins-prime || die "install failed"
171 else
172 emake -j 1 DESTDIR="${D}" install || die "install failed"
173 fi
174 fowners munin:munin ${dirs} || die
175
176 insinto /etc/munin/plugin-conf.d/
177 newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die
178
179 # make sure we've got everything in the correct directory
180 insinto /var/lib/munin
181 newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die
182 newinitd "${FILESDIR}"/munin-node_init.d_${PV} munin-node || die
183 newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node || die
184 dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \
185 || die
186
187 # bug 254968
188 insinto /etc/logrotate.d/
189 newins "${FILESDIR}"/logrotate.d-munin munin || die
190 }
191
192 pkg_config() {
193 einfo "Press enter to install the default crontab for the munin master"
194 einfo "installation from /var/lib/munin/crontab"
195 einfo "If you have a large site, you may wish to customize it."
196 read
197 # dcron is very fussy about syntax
198 # the following is the only form that works in BOTH dcron and vixie-cron
199 crontab - -u munin </var/lib/munin/crontab
200 }
201
202 pkg_postinst() {
203 elog "Please follow the munin documentation to set up the plugins you"
204 elog "need, afterwards start munin-node via /etc/init.d/munin-node."
205 if ! use minimal; then
206 elog "To have munin's cronjob automatically configured for you if this is"
207 elog "your munin master installation, please:"
208 elog "emerge --config net-analyzer/munin"
209 fi
210 }
Report Message
Find on MARC Find on Google Groups