tomwij 14/05/23 15:58:03
Modified: metadata.xml ChangeLog
Added: monitorix-3.5.1.ebuild
Removed: monitorix-3.2.1.ebuild monitorix-3.1.0.ebuild
monitorix-3.0.0-r1.ebuild
Log:
Version bump to 3.5.1, removed old, added systemd unit support. Fixed
security bug #493434 (CVE-2013-7071); reported by Ago, based on a contribution
by Wojciech Myrda (vojcek).
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key
6D34E57D)
Revision Changes Path
1.2 www-misc/monitorix/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/monitorix/metadata.xml?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/monitorix/metadata.xml?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/monitorix/metadata.xml?r1=1.1&r2=1.2
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-misc/monitorix/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml 13 Mar 2013 18:21:24 -0000 1.1
+++ metadata.xml 23 May 2014 15:58:03 -0000 1.2
@@ -9,6 +9,7 @@
A lightweight system monitoring tool.
</longdescription>
<use>
+ <flag name='apcupsd'>Make use of a daemon that controls APC UPSes with
<pkg>sys-power/apcupsd</pkg>.</flag>
<flag name='evms'>Make use of utilities for the IBM Enterprise Volume
Management System with <pkg>sys-fs/evms</pkg>.</flag>
<flag name='hddtemp'>Use SMART to monitor the temperature of hard drives
with <pkg>app-admin/hddtemp</pkg>.</flag>
<flag name='httpd'>Enables the CGI webserver with any package that
satisfies <pkg>virtual/httpd-cgi</pkg>.</flag>
1.6 www-misc/monitorix/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/monitorix/ChangeLog?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/monitorix/ChangeLog?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/monitorix/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-misc/monitorix/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 8 Jan 2014 06:11:54 -0000 1.5
+++ ChangeLog 23 May 2014 15:58:03 -0000 1.6
@@ -1,6 +1,16 @@
# ChangeLog for www-misc/monitorix
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/ChangeLog,v 1.5
2014/01/08 06:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/ChangeLog,v 1.6
2014/05/23 15:58:03 tomwij Exp $
+
+*monitorix-3.5.1 (23 May 2014)
+
+ 23 May 2014; Tom Wijsman <[email protected]> +files/monitorix-3.5.1.init,
+ +monitorix-3.5.1.ebuild, -files/monitorix-3.0.0.init,
+ -monitorix-3.0.0-r1.ebuild, -monitorix-3.1.0.ebuild, -monitorix-3.2.1.ebuild,
+ metadata.xml:
+ Version bump to 3.5.1, removed old, added systemd unit support. Fixed
security
+ bug #493434 (CVE-2013-7071); reported by Ago, based on a contribution by
+ Wojciech Myrda (vojcek).
08 Jan 2014; Mike Frysinger <[email protected]> monitorix-3.0.0-r1.ebuild,
monitorix-3.1.0.ebuild, monitorix-3.2.1.ebuild:
1.1 www-misc/monitorix/monitorix-3.5.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/monitorix/monitorix-3.5.1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/monitorix/monitorix-3.5.1.ebuild?rev=1.1&content-type=text/plain
Index: monitorix-3.5.1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/monitorix-3.5.1.ebuild,v
1.1 2014/05/23 15:58:03 tomwij Exp $
EAPI="5"
inherit eutils systemd user
DESCRIPTION="A lightweight system monitoring tool"
HOMEPAGE="http://www.${PN}.org/";
SRC_URI="http://www.${PN}.org/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="apcupsd evms hddtemp httpd lm_sensors postfix"
DEPEND="sys-apps/sed"
RDEPEND="dev-perl/config-general
dev-perl/DBI
dev-perl/HTTP-Server-Simple
dev-perl/IO-Socket-SSL
dev-perl/libwww-perl
dev-perl/MIME-Lite
dev-perl/XML-Simple
net-analyzer/rrdtool[perl]
virtual/perl-CGI
apcupsd? ( sys-power/apcupsd )
evms? ( sys-fs/evms )
hddtemp? ( app-admin/hddtemp )
httpd? ( virtual/httpd-cgi )
lm_sensors? ( sys-apps/lm_sensors )
postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
pkg_setup() {
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
}
src_prepare() {
# Put better Gentoo defaults in the configuration file.
sed -i "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|"
${PN}.conf
sed -i "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|"
${PN}.conf
sed -i "s|nobody|${PN}|g" ${PN}.conf
}
src_install() {
dosbin ${PN}
newinitd "${FILESDIR}"/${P}.init ${PN}
insinto /etc/monitorix
doins ${PN}.conf
dodir /etc/${PN}/conf.d
insinto /etc/logrotate.d
newins docs/${PN}.logrotate ${PN}
dodoc Changes README{,.nginx} docs/${PN}.service
docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
doman man/man5/${PN}.conf.5
doman man/man8/${PN}.8
insinto /var/lib/${PN}/www
doins logo_bot.png logo_top.png ${PN}ico.png
dodir /var/lib/${PN}/imgs
dosym /var/lib/${PN}/imgs /var/lib/${PN}/www/imgs
exeinto /var/lib/${PN}/www/cgi
doexe ${PN}.cgi
dodir /usr/lib/${PN}
exeinto /usr/lib/${PN}
doexe lib/*.pm
dodir /var/lib/${PN}/usage
insinto /var/lib/${PN}/reports
doins -r reports/*
systemd_dounit docs/${PN}.service
}
pkg_postinst() {
chown monitorix:monitorix /var/lib/${PN}/imgs
elog "WARNING: ${PN} has changed its config format twice, in versions"
elog "3.0.0 and 3.4.0; this format may be incompatible with your
existing"
elog "config file. Please take care if upgrading from an old version."
elog ""
elog "${PN} includes its own web server as of version 3.0.0."
elog "For this reason, the dependency on the webapp framework"
elog "has been removed. If you wish to use your own web server,"
elog "the ${PN} web data can be found at:"
elog "/var/lib/${PN}/www/"
}
