mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-01 11:18:09 -07:00
www-misc/monitorix: revbump to vn. 3.8.1-r1
- This update removes the information leakage bug created in the previous version. - Also updated some QA issues present. - Removed global USE flags from metadata.xml. - Removed masked versions 3.6.0 & 3.8.1. - Fixes the following bug Gentoo-bug: 580210 Reported-by: Göktürk Yüksek <gokturk@binghamton.edu> Package-Manager: portage-2.2.26 Closes: https://github.com/gentoo/gentoo/pull/1286 Signed-off-by: Ian Delaney <idella4@gentoo.org>
This commit is contained in:
Pedro Arizmendi
committed by
Ian Delaney
Ian Delaney
parent
52e5e71141
commit
dc3913e2fc
@@ -1,3 +1,2 @@
|
||||
DIST monitorix-3.5.1.tar.gz 218548 SHA256 8cbd749153f48e17a253791c2079912e50b499026de0083e5f25b87a782f3004 SHA512 cf64f89e147f3ddf31d48e593d5a5f09be827fd9a104c5cc28b1146e491507476d4f86bf249fda24ce92d7e37a3699dd94501d441c3767d12dfbabe4d782c37c WHIRLPOOL 2b894222f4defd5396c9c82554caeaccdcb64dd387dd78a0f2beabf896c6fedbf4571b2f2822786b2dc4165946588f72b5d4e1f6f5d2f4acde17beddd57ceab7
|
||||
DIST monitorix-3.6.0.tar.gz 229824 SHA256 0e9976a61f5d4ab787a69dc4ccf7cc4d03ff9db0afaa19790a4d29a67c3f0db2 SHA512 84525ba7eb6b6c225f4aace836795a17e51c59b14b328ab4fb0fd1fc5f78e5ec7f227c1c7ac7857b0a1f2d6d979feca2b445921da5f88bc6a9b5bdbef5d1e82b WHIRLPOOL df5b89e83e58bd1d5ddbebc1c909da10aa27c56828fc287ac0b79f231541839079aad9147562d5428d3b1dff815faa41991963cc2beb7160c474a1bbe52bd531
|
||||
DIST monitorix-3.8.1.tar.gz 270985 SHA256 84bdf73d9ce409527bfd62a9b774d58641723d2498ed0b325c61a7f3816bb028 SHA512 d07f6b2fc69efffd3fccd76db7ca94640d68fd016979b41fd19f1aa5951c0da7dd5513fe82482c020d4b60ab5187e3c7b704cca80331bd826d050f2ac8538b02 WHIRLPOOL a035e64a103c189b3138173436ff6ca76882c59e74433d60cb83519c035b3e43fb8bbb795b780697e3a15d6a42a9900e36baacc08248cfdd914b85f3957e7f30
|
||||
|
||||
@@ -13,9 +13,7 @@
|
||||
<longdescription>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="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>
|
||||
<flag name="lm_sensors">Additional hardware mnitoring sensors with <pkg>sys-apps/lm_sensors</pkg>.</flag>
|
||||
<flag name="postfix">Analyze postfix logs with <pkg>net-mail/pflogsumm</pkg>.</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils systemd user
|
||||
inherit systemd user
|
||||
|
||||
DESCRIPTION="A lightweight system monitoring tool"
|
||||
HOMEPAGE="http://www.monitorix.org/"
|
||||
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~x86"
|
||||
IUSE="apcupsd hddtemp httpd lm_sensors postfix"
|
||||
S="${WORKDIR}/Monitorix-${PV}"
|
||||
|
||||
DEPEND="sys-apps/sed"
|
||||
RDEPEND="dev-perl/Config-General
|
||||
dev-perl/DBI
|
||||
dev-perl/HTTP-Server-Simple
|
||||
@@ -39,11 +38,14 @@ pkg_setup() {
|
||||
|
||||
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
|
||||
sed -e "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" \
|
||||
-e "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" \
|
||||
-e "s|nobody|${PN}|g" -i ${PN}.conf || die
|
||||
}
|
||||
|
||||
# Override compile phase
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dosbin ${PN}
|
||||
|
||||
@@ -57,7 +59,7 @@ src_install() {
|
||||
insinto /etc/logrotate.d
|
||||
newins docs/${PN}.logrotate ${PN}
|
||||
|
||||
dodoc Changes README{,.nginx} docs/${PN}.service docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
|
||||
dodoc Changes README{,.nginx} docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
|
||||
doman man/man5/${PN}.conf.5
|
||||
doman man/man8/${PN}.8
|
||||
|
||||
@@ -65,6 +67,7 @@ src_install() {
|
||||
doins logo_bot.png logo_top.png ${PN}ico.png
|
||||
|
||||
dodir /var/lib/${PN}/www/imgs
|
||||
fowners monitorix:monitorix /var/lib/${PN}/www/imgs
|
||||
|
||||
exeinto /var/lib/${PN}/www/cgi
|
||||
doexe ${PN}.cgi
|
||||
@@ -81,7 +84,6 @@ src_install() {
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
chmod 777 /var/lib/${PN}/www/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."
|
||||
@@ -92,4 +94,8 @@ pkg_postinst() {
|
||||
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/"
|
||||
|
||||
elog ""
|
||||
elog "If you are not using monitorix built-in web server, please set"
|
||||
elog "the correct user and group ownership of /var/lib/${PN}/www/imgs/"
|
||||
}
|
||||
@@ -1,95 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils systemd user
|
||||
|
||||
DESCRIPTION="A lightweight system monitoring tool"
|
||||
HOMEPAGE="http://www.monitorix.org/"
|
||||
SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="apcupsd hddtemp httpd lm_sensors postfix"
|
||||
S="${WORKDIR}/Monitorix-${PV}"
|
||||
|
||||
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[graph,perl]
|
||||
dev-perl/CGI
|
||||
apcupsd? ( sys-power/apcupsd )
|
||||
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}"/${PN}.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}/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() {
|
||||
chmod 777 /var/lib/${PN}/www/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/"
|
||||
}
|
||||
Reference in New Issue
Block a user