From: Pacho Ramos <pacho@gentoo.org>
Date: Sat, 9 May 2015 07:17:58 +0000 (+0000)
Subject: Version bump (#532772 by Michael Orlitzky)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4efc284fc1c83c556839147cc88ef3a2a5cec65;p=gentoo.git

Version bump (#532772 by Michael Orlitzky)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
---

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index 2bd90813417f..790bce7b7808 100644
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/pnp4nagios
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.63 2015/04/07 14:29:01 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.64 2015/05/09 07:17:57 pacho Exp $
+
+*pnp4nagios-0.6.25 (09 May 2015)
+
+  09 May 2015; Pacho Ramos <pacho@gentoo.org> +files/98_pnp4nagios-2.4.conf,
+  +pnp4nagios-0.6.25.ebuild:
+  Version bump (#532772 by Michael Orlitzky)
 
   10 Nov 2014; Justin Lecher <jlec@gentoo.org> -pnp4nagios-0.6.19-r1.ebuild,
   -pnp4nagios-0.6.21.ebuild:
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index d89e207edc09..f8f0f8b90acf 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX 98_pnp4nagios-2.4.conf 725 SHA256 44436bf79e2b3624e3eb9eda86a083896b7057bb94dc04637ad2ad58e5e40f76 SHA512 9698529decd9587b4c48dfd5a92069645d4a8fb0796f05fea104459bc4a58aab081f10fc110d75e97331ec960e5fef71a85745c3ea58c6b9f6c37bcec4143000 WHIRLPOOL 0661a385e75d41b9a3e61cabf555ec0bbf6f59504867d7dee47936097dd491457d55d1507720af4152fcabb7ed90752def669270c5f31dcbc0d84f8db732f876
 AUX 98_pnp4nagios.conf 1025 SHA256 d4860e09c66e1d20e342a4ab997988ae825e6f4561a9631fd6c608f1c5420a5f SHA512 ac7f4cd92951e856c5af44eb8cfa0c75a867364b6d3d76ed5fb2479631f9ae20587f2d0a09ff4810602665558210232ab41ce6abf53859884a956826cbb5bfc2 WHIRLPOOL d28394eb0f63bd02f71c3ddd6c651f06c69354e2c9fd6fbd0bf65433d4721087078d06aa93df795c80f43a422b35f563b763ed7895891c603d6abbf359a197b1
 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
+DIST pnp4nagios-0.6.25.tar.gz 2921068 SHA256 62d9cdcb132326753373b18fafebd716ec27dc5cbe1ef42204440fca21ca7a0c SHA512 e561fcac8243e6b1ab401312b4a05a6c752e2869da7366a22e4e48d54ae1e9c17c52cb2dffb1ca5748179f3bc856f779317196992643e9862eb09c4debf277c8 WHIRLPOOL 9267bbb04b3cdfdd4d12601508a6d602aa9513a096aac06adf4631fcb1218d2e24fef7a6be1defd8a3ac87106a9cdf6b689b50c432fe0f07ca45d7fbf665d810
 EBUILD pnp4nagios-0.6.24.ebuild 2090 SHA256 9bbb4b82fee3508615da92f46381d24d759704c0146f787ebe32ee868516603a SHA512 1ba51aedc02b5103ec5ae4e5f42995a285182bd01508559072c4b6d201f4c03f861a11e4ceb7b3418d4be71732b7444823f97c72133d4fe109fa9b2c5c8cc8a2 WHIRLPOOL bb8686244a1a9517bb846c5971f1b4e688ee6ce92c78c3320d67e18151886badfcab5edc04a1ba5b5bb6ec9678f6e20eeac565790e45bf42e08002078890cfd8
-MISC ChangeLog 9540 SHA256 c0ca329f788ccf88eca10029f95ba4bc737abfd60636b19a91a20ef505bc2a5d SHA512 f67de17aee721a69a854e1ed01fb3489051de21590174686ba4c8b0fc28aa128213cdf66635a675b56a6c097ca845bf6a5830c38fe157979bc0811c707c0d509 WHIRLPOOL 056174d68b9f6a4d29e795e0bb6a6b96d504d9268c321eb9b910e46c4b2a545e736bd5f528e6a2ad4ae686f4657cb69b272f301a4a5634daea55c9bd529fc4e1
+EBUILD pnp4nagios-0.6.25.ebuild 3031 SHA256 952cb20c94a9a7880db3f7195420ac83a6dc6d6ef1063679c46d3686173c6873 SHA512 c366be601bc5cdc834e03351d61f7c8d1e25d5019aff20e9aacef7746aec16c074b552871d043b34629511a6346465bce1f4d5a8ad69118abd2b2c878c8749ad WHIRLPOOL 8d4641f6c1e17b030f7e78a62548bf044b543886735aa937c12196258cea034addd47ab99140e741d884f8467045c296f4cdd39589bec8505520d027474a498c
+MISC ChangeLog 9727 SHA256 4189bed66a74bfa7d899833ea65c4aee4c4f14b9c0a529cbc85cc14e82510485 SHA512 8a5381301af07559f48300043e9517baa3969452c7abd14fb13c5fa520497d3b17c15eb445d7a75b1a5dbf96aca9652d54601304a61c19222ce9caa2c892000f WHIRLPOOL 8ac59be793b189e21f8e2f3da605cd26852eb86186e42e73ec1197594239cb646e1d825ac3e78aba81f3bd64ea6b3e10786084324da57fcbf79a63b3ced86f96
 MISC metadata.xml 163 SHA256 a8aa48f63dab89c2af1f961029dea0ebf68a618dba59ac4661ea915dc85e18f0 SHA512 1744b806c2ddddbeee4d2b1e23c7f1ccf0d9427f679a65bd22cde617399d3a5bb30aada17ba5b648a3a46d9e1169b9d30ede4551fb8756dffc4e3e9306b199cf WHIRLPOOL b5af95c50999aaf066e6466928866baa34c6425459a580ab0712ba3e3ea518dc37a4082007043307ff169b1f8efe4f6a632d27d016b6fd307bf463cb47b78d55
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVI+muXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir6JIP/i/2PMZan90nRZHO9SvemGQN
-+b9mqo2PoPFNAFseu+RQwLLhoQC9eN1fNcejSK4dIsm1iSt4UnuzLMQaPn82p8QS
-bcfizuRpBtzTKpVVhM3hCStfpi/gVxp19zazuqy4QEN9Ds2+1WV3G/TFNH35QFs5
-ME9zPYGcigUBMBxFePIXqBARvDCoN9hLqSzfBiYevuFg6C3mWijn/d9lxXlMKDWx
-XsJogSrU1pJ+ZIdnLvRkmDmjpqyuyq4YJ+IMUOwFE3SDl85Yb0VzNtHqtA+cpiNK
-Cp0XCCXyIbN6hdjY/mSWcnYkc3KHhiBoVnUW2FArG92YJfIo73uqbhVYl5qmQhjK
-zdsPxoBswivwaqpTosKSmjm8To90zWa8gw8l3YFCVCRw8IHwmiId7CPGmXFQeToT
-alhd7z6api5nHbnCbyRBz8cswtJQYAZgtiBBbfbuGQaTqF9bsH/N4aRdLhzIoy5l
-ktBjPJcDYW82d2OfqSLQ74ogpbimxBQyKyEFJe80SwwkRx1WVSjWrZXd4fvL3ldQ
-AqUJa0cBTLlXXCjMDgmuZVTYyX5PkIafTBDvVW2EgW95pOh0jJDq9Gk2nOWxDhhX
-igO9pxEvlQS/a2T5DtftL1743wYK6sCY95IYBB5d7VbSComSgWdX8VbM6MJzBFCF
-BLGdGpaDkMkNODZm+hRu
-=PMaf
+iEYEAREIAAYFAlVNtKYACgkQCaWpQKGI+9THMgCdFhcPgr6FtmjZXxcihUPI+AJw
+yzcAn2tgAIh/jM65SRGILyn12jXS6oVV
+=hZ2C
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf
new file mode 100644
index 000000000000..5944a2e2f70f
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf
@@ -0,0 +1,29 @@
+<IfDefine PNP>
+
+  Alias /pnp4nagios /usr/share/pnp/
+
+  <Directory /usr/share/pnp>
+    AllowOverride AuthConfig
+    Require all granted
+
+    <IfModule rewrite_module>
+      # Turn on URL rewriting
+      RewriteEngine On
+      Options +FollowSymLinks
+
+      # Installation directory
+      RewriteBase /pnp4nagios
+
+      # Protect application and system files from being viewed
+      RewriteRule ^(application|modules|system) - [F,L]
+
+      # Allow any files or directories that exist to be displayed directly
+      RewriteCond %{REQUEST_FILENAME} !-f
+      RewriteCond %{REQUEST_FILENAME} !-d
+
+      # Rewrite all other URLs to index.php/URL
+      RewriteRule .* index.php/$0 [PT,L]
+    </IfModule>
+  </Directory>
+
+</IfDefine>
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
new file mode 100644
index 000000000000..fcf5b24dd382
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild,v 1.1 2015/05/09 07:17:57 pacho Exp $
+
+EAPI=5
+
+inherit depend.apache eutils
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org/"
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+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-5.3:*[json,simplexml,zlib,xml,filter]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	|| ( <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
+APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
+APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
+
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
+
+# There is no want_apache2_4, but we needed to specify that manually
+# anyway to be able to include the list of modules.
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch"
+}
+
+src_configure() {
+	local var_dir=
+	local user_group=
+
+	if has_version net-analyzer/nagios-core; then
+		var_dir=/var/nagios/
+		user_group=nagios
+	else
+		var_dir=/var/lib/icinga/
+		user_group=icinga
+	fi
+
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--mandir=/usr/share/man \
+		--with-perfdata-dir=${var_dir}/perfdata \
+		--with-nagios-user=${user_group} \
+		--with-nagios-group=${user_group} \
+		--with-perfdata-logfile=${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir=/var/spool/pnp
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${D}/usr/share/pnp/install.php" || \
+		die "unable to remove ${D}/usr/share/pnp/install.php"
+
+	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
+	find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \
+		die "unable to set file permissions under ${D}/etc/pnp"
+
+	find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \
+		die "unable to set directory permissions under ${D}/etc/pnp"
+}
+
+pkg_postinst() {
+	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
+}