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)

6 files changed, 37 insertions, 193 deletions

diff --git a/www-misc/monitorix/ChangeLog b/www-misc/monitorix/ChangeLog
index f13943d2c88a..80b357cc65c5 100644
--- a/www-misc/monitorix/ChangeLog
+++ b/www-misc/monitorix/ChangeLog
@@ -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 <TomWij@gentoo.org> +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 <vapier@gentoo.org> monitorix-3.0.0-r1.ebuild,
   monitorix-3.1.0.ebuild, monitorix-3.2.1.ebuild:
diff --git a/www-misc/monitorix/files/monitorix-3.0.0.init b/www-misc/monitorix/files/monitorix-3.5.1.init
index 5cf2408b511e..1c21d21818cb 100644
--- a/www-misc/monitorix/files/monitorix-3.0.0.init
+++ b/www-misc/monitorix/files/monitorix-3.5.1.init
@@ -6,7 +6,7 @@ depend() {
 
 start() {
         ebegin "Starting monitorix"
-        start-stop-daemon --start --exec /usr/sbin/monitorix --pidfile /var/run/monitorix.pid -- -c /etc/monitorix.conf -p /var/run/monitorix.pid
+        start-stop-daemon --start --exec /usr/sbin/monitorix --pidfile /var/run/monitorix.pid -- -c /etc/monitorix/monitorix.conf -p /var/run/monitorix.pid
         local i=0
         local timeout=5
         while [ ! -f /var/run/monitorix.pid ] && [ $i -le $timeout ]; do
diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
index 4a72c3eecb9c..9c497d524bef 100644
--- a/www-misc/monitorix/metadata.xml
+++ b/www-misc/monitorix/metadata.xml
@@ -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>
diff --git a/www-misc/monitorix/monitorix-3.1.0.ebuild b/www-misc/monitorix/monitorix-3.1.0.ebuild
deleted file mode 100644
index da87eb9ae656..000000000000
--- a/www-misc/monitorix/monitorix-3.1.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.1.0.ebuild,v 1.2 2014/01/08 06:11:54 vapier Exp $
-
-EAPI="5"
-
-inherit eutils 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="evms hddtemp httpd lm_sensors postfix"
-
-DEPEND="sys-apps/sed"
-RDEPEND="net-analyzer/rrdtool[perl]
-	dev-perl/DBI
-	dev-perl/libwww-perl
-	dev-perl/XML-Simple
-	dev-perl/config-general
-	dev-perl/HTTP-Server-Simple
-	evms? ( sys-fs/evms )
-	hddtemp? ( app-admin/hddtemp )
-	httpd? ( virtual/httpd-cgi )
-	lm_sensors? ( sys-apps/lm_sensors )
-	postfix? ( net-mail/pflogsumm )"
-
-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}"/${PN}-3.0.0.init ${PN}
-
-	insinto /etc
-	doins ${PN}.conf
-
-	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 /usr/share/${PN}/htdocs
-	doins logo_bot.png logo_top.png ${PN}ico.png
-
-	dodir /var/lib/${PN}/imgs
-	dosym /var/lib/${PN}/imgs /usr/share/${PN}/htdocs/imgs
-
-	exeinto /usr/share/${PN}/htdocs/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/*
-}
-
-pkg_postinst() {
-	chown monitorix:monitorix /var/lib/${PN}/imgs
-
-	elog "WARNING: ${PN} includes a brand new config format since version"
-	elog "3.0.0, that may be incompatible with your existing config"
-	elog "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 "/usr/share/${PN}/htdocs/"
-}
diff --git a/www-misc/monitorix/monitorix-3.2.1.ebuild b/www-misc/monitorix/monitorix-3.2.1.ebuild
deleted file mode 100644
index e330e10af279..000000000000
--- a/www-misc/monitorix/monitorix-3.2.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.2.1.ebuild,v 1.2 2014/01/08 06:11:54 vapier Exp $
-
-EAPI="5"
-
-inherit eutils 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="evms hddtemp httpd lm_sensors postfix"
-
-DEPEND="sys-apps/sed"
-RDEPEND="net-analyzer/rrdtool[perl]
-	dev-perl/DBI
-	dev-perl/libwww-perl
-	dev-perl/XML-Simple
-	dev-perl/config-general
-	dev-perl/HTTP-Server-Simple
-	evms? ( sys-fs/evms )
-	hddtemp? ( app-admin/hddtemp )
-	httpd? ( virtual/httpd-cgi )
-	lm_sensors? ( sys-apps/lm_sensors )
-	postfix? ( net-mail/pflogsumm )"
-
-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}"/${PN}-3.0.0.init ${PN}
-
-	insinto /etc
-	doins ${PN}.conf
-
-	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 /usr/share/${PN}/htdocs
-	doins logo_bot.png logo_top.png ${PN}ico.png
-
-	dodir /var/lib/${PN}/imgs
-	dosym /var/lib/${PN}/imgs /usr/share/${PN}/htdocs/imgs
-
-	exeinto /usr/share/${PN}/htdocs/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/*
-}
-
-pkg_postinst() {
-	chown monitorix:monitorix /var/lib/${PN}/imgs
-
-	elog "WARNING: ${PN} includes a brand new config format since version"
-	elog "3.0.0, that may be incompatible with your existing config"
-	elog "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 "/usr/share/${PN}/htdocs/"
-}
diff --git a/www-misc/monitorix/monitorix-3.0.0-r1.ebuild b/www-misc/monitorix/monitorix-3.5.1.ebuild
index de297412a86f..1f1cba7303b2 100644
--- a/www-misc/monitorix/monitorix-3.0.0-r1.ebuild
+++ b/www-misc/monitorix/monitorix-3.5.1.ebuild
@@ -1,10 +1,10 @@
 # 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.0.0-r1.ebuild,v 1.2 2014/01/08 06:11:54 vapier Exp $
+# $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 user
+inherit eutils systemd user
 
 DESCRIPTION="A lightweight system monitoring tool"
 HOMEPAGE="http://www.${PN}.org/"
@@ -13,20 +13,24 @@ SRC_URI="http://www.${PN}.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="evms hddtemp httpd lm_sensors postfix"
+IUSE="apcupsd evms hddtemp httpd lm_sensors postfix"
 
 DEPEND="sys-apps/sed"
-RDEPEND="net-analyzer/rrdtool[perl]
+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
-	dev-perl/config-general
-	dev-perl/HTTP-Server-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 )"
+	postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
 
 pkg_setup() {
 	enewgroup ${PN}
@@ -45,9 +49,11 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${P}.init ${PN}
 
-	insinto /etc
+	insinto /etc/monitorix
 	doins ${PN}.conf
 
+	dodir /etc/${PN}/conf.d
+
 	insinto /etc/logrotate.d
 	newins docs/${PN}.logrotate ${PN}
 
@@ -55,13 +61,13 @@ src_install() {
 	doman man/man5/${PN}.conf.5
 	doman man/man8/${PN}.8
 
-	insinto /usr/share/${PN}/htdocs
+	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 /usr/share/${PN}/htdocs/imgs
+	dosym /var/lib/${PN}/imgs /var/lib/${PN}/www/imgs
 
-	exeinto /usr/share/${PN}/htdocs/cgi
+	exeinto /var/lib/${PN}/www/cgi
 	doexe ${PN}.cgi
 
 	dodir /usr/lib/${PN}
@@ -71,18 +77,21 @@ src_install() {
 	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} version 3.0.0 includes a brand new config"
-	elog "format, that may be incompatible with your existing config"
-	elog "file. Please take care if upgrading from an old version."
+	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 "/usr/share/${PN}/htdocs/"
+	elog "/var/lib/${PN}/www/"
 }