net-analyzer/pnp4nagios: version bump fixing nagios dep and permissions.

diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 7845fa3e1f334fff97ac977a54c5a27f913daef7..3deef35b90ff9bcd74cbfae465e37ca2fb297df3 100644 (file)
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -2,6 +2,6 @@ AUX 98_pnp4nagios-2.4.conf 725 SHA256 44436bf79e2b3624e3eb9eda86a083896b7057bb94
 AUX npcd 759 SHA256 ea4c71df5c0a6bb410c44b08fc5c5428a3adf8c5daa7a12fe1068eaf71613be5 SHA512 54ccf3da9831b407d7a6b21d3409f7a8c854a32ec6eeda6036997059551bcec52e01b2b63a59e5269fef00c1c859dc856c4c6feb2323ff7fb328dd546c576a80 WHIRLPOOL 4e79bc6ee46a3aad0724488f4fa364b2e6916e30065ff8aed834c2e38929d6fd363210870fb3e4868ee65b0e7073b0d736c954f76415eec37aaa4efe62738454
 AUX npcd.initd 477 SHA256 eb1d5bdf589867136aaefa2f47bd808ef41109860d07d3862fd308585b6d7cff SHA512 c7c0ad6a94820f7327561e779968dc73104bf104bfc3077e952866522e89e7db69c2e289c7e4d61fce978416ef1a8e6d10e3f997fb498ce2157a3c23a869da4d WHIRLPOOL 7ff2db763dc3ee6cf24b0d720e1dd58235681ee1580d44aebbac406631c7c22366d871937eda7d64b4f07448fc28737650e42904aa69a687b7dbf0ab7a0672ab
 AUX pnp4nagios-0.6.14-makefile.patch 1057 SHA256 71fac5f40ba133258754bdd42d503024a7a64da7ae37b96bf6ed20a3c367f2ef SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602 WHIRLPOOL 7e6725dfef952a97f5d682af955560c88895ae71e5aae9a3bb4842b3696d2f6009e6239c0860991d86fe68d64b4bf7c1e668a5059751cbba4b33850f2bc7584f
-DIST pnp4nagios-0.6.24.tar.gz 2919182 SHA256 87412ef01257c6096aa5c84fdb47db950b851c596e1306180be8ba45401793cf SHA512 7e8c32e0ac69ab747a57e8ab6cc59fddfb63e16598fda9c1e6270d6309ff0885cd1bd0876d05aa1d30bffa76b281d41dc8fbe59e430778bf4d3bdddc4a7bee9f WHIRLPOOL 4f48b406a7d82a4370701ede2625ed2c247bb933a9197d3417c4eb18f18b879465aeb4775e9a0f0300ac1140159df6c6130466b5434c0b33bccb7fff04de86f8
-EBUILD pnp4nagios-0.6.24-r1.ebuild 2559 SHA256 897a231717c11747ec3783e4618a5134e70bd418025659780ab71d7039a7080b SHA512 d62a276741c98bf2afc99cef82e55783e60c05511965807c6c3e7cfc77769ea559eb7580d3a231080dbab9dd1210eb252dd1978009785eece6d89cab95e21a2a WHIRLPOOL 317fd213d0caec6a2b328bf8d107b130f88a59d911206a3c3ea4cd38714ad4d0145408aa024aca98755388908eeda9e3261b7c18e165488dc317e3b6947c4d4f
+DIST pnp4nagios-0.6.25.tar.gz 2921068 SHA256 62d9cdcb132326753373b18fafebd716ec27dc5cbe1ef42204440fca21ca7a0c SHA512 e561fcac8243e6b1ab401312b4a05a6c752e2869da7366a22e4e48d54ae1e9c17c52cb2dffb1ca5748179f3bc856f779317196992643e9862eb09c4debf277c8 WHIRLPOOL 9267bbb04b3cdfdd4d12601508a6d602aa9513a096aac06adf4631fcb1218d2e24fef7a6be1defd8a3ac87106a9cdf6b689b50c432fe0f07ca45d7fbf665d810
+EBUILD pnp4nagios-0.6.25.ebuild 2934 SHA256 b2767915a0c34db1f6be3ee7476455a96f2821c56c04e028846db36b8b818a1d SHA512 ad40259cad31d72a5bb4c4117daf3bbda90ed58ceaa2ae0a3ddb16f3dc8f9699adb9537e0f97cb96ccbe6e5ab106a272e1713fac3c920a52c9ad775c70a6de31 WHIRLPOOL a535f71d2f9134ca42a1ff11cdff646ce8b505b505c99a57953ce2df5d869cffbd35d4647f8dbad6a629595ef653216b5d6d305ef865c5eb3e6aec4ad41d6453
 MISC metadata.xml 163 SHA256 a8aa48f63dab89c2af1f961029dea0ebf68a618dba59ac4661ea915dc85e18f0 SHA512 1744b806c2ddddbeee4d2b1e23c7f1ccf0d9427f679a65bd22cde617399d3a5bb30aada17ba5b648a3a46d9e1169b9d30ede4551fb8756dffc4e3e9306b199cf WHIRLPOOL b5af95c50999aaf066e6466928866baa34c6425459a580ab0712ba3e3ea518dc37a4082007043307ff169b1f8efe4f6a632d27d016b6fd307bf463cb47b78d55

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
similarity index 80%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.24-r1.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
index 93ae57243e1cdf2564840583125e2ec620b8e2df..2bde2932322ba628d16c17501fa929f0db191552 100644 (file)
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24-r1.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
@@ -15,11 +15,12 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
+# A lot of things (sync mode, for one) are broken with nagios-4.x.
 DEPEND="
        dev-lang/php[json,simplexml,zlib,xml,filter]
        >=dev-lang/php-5.3
        >=net-analyzer/rrdtool-1.2[graph,perl]
-       || ( net-analyzer/nagios-core net-analyzer/icinga net-analyzer/icinga2 )"
+       || ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
 
 # A list of modules used in our Apache config file.
 APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
@@ -81,6 +82,11 @@ src_install() {
        if use apache2 ; then
                insinto "${APACHE_MODULES_CONFDIR}"
                newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
+
+               # Allow the apache user to read our config files. This same
+               # approach is used in net-analyzer/nagios-core.
+               chgrp -R apache "${D}/etc/pnp" \
+                       || die "failed to change group of ${ROOT}etc/pnp"
        fi
 
        # Bug 430358 - CVE-2012-3457
@@ -92,6 +98,10 @@ src_install() {
 }
 
 pkg_postinst() {
-       elog "Please make sure to enable URL rewriting in Apache or any other"
-       elog "webserver you're using, to get pnp4nagios running!"
+       elog "To enable the pnp4nagios web front-end, please visit"
+       elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
+       elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
+       elog
+       elog "  http://localhost/pnp4nagios"
+       elog
 }