[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Sergei Trofimovich]

commit:     ff7acff3ab82143025a3cc5c9919f238ab833c92
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 23:24:00 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 23:24:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7acff3

net-analyzer/pnp4nagios: stable 0.6.26-r9 for ppc64, bug #637640

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
index c786b4d7cc5..48d161daa23 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Sam James]

commit:     624e8b6bac253cc2fc17738a19c28073ccae3557
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 13:34:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 13:34:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624e8b6b

net-analyzer/pnp4nagios: Stabilize 0.6.26_p20230918 ppc64, #916834

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
index 6444d0700e33..5ef07a6cac34 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/pnp-${GH_COMMIT}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Sam James]

commit:     679e982d619db95c751796ea9151647093878547
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 12:23:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 12:23:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=679e982d

net-analyzer/pnp4nagios: Stabilize 0.6.26_p20230918 x86, #916834

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
index bef9be0b41c2..6444d0700e33 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/pnp-${GH_COMMIT}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Sam James]

commit:     c42e5487eb4c5d8dda9f07a1f631901cc1448177
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 10:48:02 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 10:48:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c42e5487

net-analyzer/pnp4nagios: Stabilize 0.6.26_p20230918 amd64, #916834

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
index ac57aaf8d4fc..bef9be0b41c2 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/pnp-${GH_COMMIT}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     6225bda18fdbfa4036f815feba794c26df6bf352
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Mon Sep 18 10:25:13 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 15:06:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6225bda1

net-analyzer/pnp4nagios: change upstream for PHP 8.1+ compatibility

@Consol-Monitoring / Sven Nierlein are well known contributors to
the monitoring ecosystem. This fork is compatible with PHP 8.1.

The next step will be to explore https://github.com/pnp4nagios/pnp4nagios
which may become the unified upstream.

Closes: https://bugs.gentoo.org/914270
Closes: https://github.com/gentoo/gentoo/pull/32897
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-analyzer/pnp4nagios/Manifest                   |   1 +
 .../pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild  | 112 +++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index b4ecca138851..f97b423eb62d 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1 +1,2 @@
 DIST pnp4nagios-0.6.26_p20221106.tar.gz 3029704 BLAKE2B 5866f4dbfef9b1028255eb3e47ac57fa260c1e2caca50fcb1c5ff93a3dc9bee9f14152e3a269ecf12daab59e50e1f4dfcd6513f9ce3dc5da35de50b944c38260 SHA512 cd0c3ad3d4983c43f7e1a100e8a2e6a530b573ca6bed60125c87b22ab33c2486c5ce99c6f52d641cdc7468984925a22a6ee7e1ac330ea2278ec2439acb910d04
+DIST pnp4nagios-0.6.26_p20230918.tar.gz 3036216 BLAKE2B 101b84623bec93cb3c3c2c5f5785a308afeeff6c7a89504ec5e39812be5e0807eaf7dabf720a69e58a3dd7bfd654f124dd26030deab60f5c6e0a31bd665e83e6 SHA512 4b03c5bf3d00339627e22cf14669b21433f926d6e698933833911a40d8b324d5a70dc5187ee5291f48bfcc12e9b51aaba24c8d263d5f25081544f97dce372890

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
new file mode 100644
index 000000000000..bc1ee5c143cc
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org/"
+GH_COMMIT="e52677d3994d35197db68120d7089906a174a3f9"
+SRC_URI="https://github.com/ConSol-Monitoring/pnp/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/pnp-${GH_COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 icinga +nagios"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="^^ ( icinga nagios )"
+
+# Some things (sync mode, for one) are broken with nagios-4.x, but since
+# nagios-3.x has been end-of-life'd, we don't have much choice here but
+# to accept it.
+DEPEND="net-analyzer/rrdtool[graph,perl]
+	icinga? (
+		acct-group/icinga
+		acct-user/icinga
+	)
+	nagios? (
+		acct-group/nagios
+		acct-user/nagios
+	)"
+
+# 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}
+	dev-lang/php:*[filter,gd,json(+),simplexml,xml,zlib]
+	media-fonts/dejavu
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.14-makefile.patch"
+)
+
+src_configure() {
+	local user_group=nagios
+	use icinga && user_group=icinga
+
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/pnp
+		--datarootdir="${EPREFIX}"/usr/share/pnp
+		--localstatedir="${EPREFIX}"/var/lib/pnp
+		--with-nagios-user="${user_group}"
+		--with-nagios-group="${user_group}"
+		--with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	# Don't use INSTALL_OPTS because they set insecure permissions on
+	# all of /etc/pnp (https://github.com/lingej/pnp4nagios/issues/140).
+	emake INSTALL_OPTS="" DESTDIR="${D}" install install-config
+	einstalldocs
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${ED}/usr/share/pnp/install.php" || \
+		die "unable to remove ${ED}/usr/share/pnp/install.php"
+
+	# Fix CVE-2012-3457 (Gentoo bug 430358)
+	fperms o-rwx /etc/pnp/process_perfdata.cfg
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
+	fi
+
+	# The nagios or icinga user needs to write performance data to the
+	# perfdata-dir...
+	local user_group=nagios
+	use icinga && user_group=icinga
+	fowners ":${user_group}" /var/lib/pnp/{,perfdata,spool}
+	fperms g+rwx /var/lib/pnp/{,perfdata,spool}
+
+	# and likewise for its logs...
+	dodir /var/log/pnp
+	fowners ":${user_group}" /var/log/pnp
+	fperms g+rwx /var/log/pnp
+
+	# and its statistics. This one is arguably the responsibility of the
+	# build system, since process_perfdata.cfg refers to this location.
+	dodir /var/lib/pnp/stats
+	fowners ":${user_group}" /var/lib/pnp/stats
+	fperms g+rwx /var/lib/pnp/stats
+}
+
+pkg_postinst() {
+	elog "To enable the pnp4nagios web front-end, please visit"
+	elog "${EROOT}/etc/conf.d/apache2 and add \"-D PNP -D PHP\""
+	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
+	elog
+	elog "  http://localhost/pnp4nagios"
+	elog
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     c6418f54821a4d5d1d73bb831c808a44486e034e
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 14:59:30 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 15:06:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6418f54

net-analyzer/pnp4nagios: update HOMEPAGE

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-analyzer/pnp4nagios/metadata.xml                       | 2 +-
 net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
index 938f480add62..9e00dcae8fec 100644
--- a/net-analyzer/pnp4nagios/metadata.xml
+++ b/net-analyzer/pnp4nagios/metadata.xml
@@ -18,6 +18,6 @@
 
   <upstream>
     <remote-id type="sourceforge">pnp4nagios</remote-id>
-    <remote-id type="github">lingej/pnp4nagios</remote-id>
+    <remote-id type="github">ConSol-Monitoring/pnp4nagios</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
index bc1ee5c143cc..ac57aaf8d4fc 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org/"
+HOMEPAGE="https://github.com/ConSol-Monitoring/pnp"
 GH_COMMIT="e52677d3994d35197db68120d7089906a174a3f9"
 SRC_URI="https://github.com/ConSol-Monitoring/pnp/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/pnp-${GH_COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Arthur Zamarin]

commit:     af80c30212f3187e73d3c62035aebf6ee38126a5
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 13:48:34 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 13:48:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af80c302

net-analyzer/pnp4nagios: Stabilize 0.6.26_p20221106 amd64, #888037

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild
index e0b3580ddf26..3df8d7c6aedd 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${GH_COMMIT}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Arthur Zamarin]

commit:     007a3654b89bcab6a120f779f531b68563e1477f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 13:48:33 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 13:48:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007a3654

net-analyzer/pnp4nagios: Stabilize 0.6.26_p20221106 x86, #888037

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild
index 3672c6225173..e0b3580ddf26 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${GH_COMMIT}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Sam James]

commit:     12503f8efab1163bc98d288272e65fc4b873577e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 12:16:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 12:16:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12503f8e

net-analyzer/pnp4nagios: Stabilize 0.6.26_p20221106 ppc64, #888037

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild
index 1ce42b2d29c9..3672c6225173 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${GH_COMMIT}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     a41e1231f48bfe9c3835b356665ebb6bb76ad6c0
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 10:05:59 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 10:05:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41e1231

net-analyzer/pnp4nagios: drop 0.6.26-r10

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .../pnp4nagios/pnp4nagios-0.6.26-r10.ebuild        | 100 ---------------------
 1 file changed, 100 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
deleted file mode 100644
index ab4a072f70b2..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="apache2 icinga +nagios"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
-
-REQUIRED_USE="^^ ( icinga nagios )"
-
-# Some things (sync mode, for one) are broken with nagios-4.x, but since
-# nagios-3.x has been end-of-life'd, we don't have much choice here but
-# to accept it.
-DEPEND="
-	dev-lang/php:*[filter,gd,json(+),simplexml,xml,zlib]
-	net-analyzer/rrdtool[graph,perl]
-	icinga? ( net-analyzer/icinga2 )
-	nagios? ( net-analyzer/nagios-core )"
-
-# 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}] )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6.14-makefile.patch" )
-
-src_configure() {
-	local user_group=nagios
-	use icinga && user_group=icinga
-
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/pnp \
-		--datarootdir="${EPREFIX}"/usr/share/pnp \
-		--localstatedir="${EPREFIX}"/var/lib/pnp \
-		--with-nagios-user="${user_group}" \
-		--with-nagios-group="${user_group}" \
-		--with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log
-}
-
-src_compile() {
-	# The default target just shows a help
-	emake all
-}
-
-src_install() {
-	# Don't use INSTALL_OPTS because they set insecure permissions on
-	# all of /etc/pnp (https://github.com/lingej/pnp4nagios/issues/140).
-	emake INSTALL_OPTS="" DESTDIR="${D}" install install-config
-	einstalldocs
-	newinitd "${FILESDIR}"/npcd.initd npcd
-	rm "${ED%/}/usr/share/pnp/install.php" || \
-		die "unable to remove ${ED%/}/usr/share/pnp/install.php"
-
-	# Fix CVE-2012-3457 (Gentoo bug 430358)
-	fperms o-rwx /etc/pnp/process_perfdata.cfg
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
-	fi
-
-	# The nagios or icinga user needs to write performance data to the
-	# perfdata-dir...
-	local user_group=nagios
-	use icinga && user_group=icinga
-	fowners ":${user_group}" /var/lib/pnp/{,perfdata,spool}
-	fperms g+rwx /var/lib/pnp/{,perfdata,spool}
-
-	# and likewise for its logs...
-	dodir /var/log/pnp
-	fowners ":${user_group}" /var/log/pnp
-	fperms g+rwx /var/log/pnp
-
-	# and its statistics. This one is arguably the responsibility of the
-	# build system, since process_perfdata.cfg refers to this location.
-	dodir /var/lib/pnp/stats
-	fowners ":${user_group}" /var/lib/pnp/stats
-	fperms g+rwx /var/lib/pnp/stats
-}
-
-pkg_postinst() {
-	elog "To enable the pnp4nagios web front-end, please visit"
-	elog "${EROOT%/}/etc/conf.d/apache2 and add \"-D PNP -D PHP\""
-	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
-	elog
-	elog "  http://localhost/pnp4nagios"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Jakov Smolić]

commit:     dd1cd6ba74a877b2a3abd9801cf08e41b70adc10
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 12:38:35 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 12:38:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1cd6ba

net-analyzer/pnp4nagios: Stabilize 0.6.26-r11 amd64, #862885

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
index fa6c0ab81709..043414bfa907 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Sam James]

commit:     caf0d4107c6c3986772f55a2d7f8261204117c2f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 14:26:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 14:26:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caf0d410

net-analyzer/pnp4nagios: Stabilize 0.6.26-r11 x86, #862885

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
index 52328140ab7a..fa6c0ab81709 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Arthur Zamarin]

commit:     03046a55fecad28b9c33e3d40461d488cffb0eca
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 16:12:19 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 16:12:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03046a55

net-analyzer/pnp4nagios: Stabilize 0.6.26-r11 ppc64, #862885

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
index 2d9d334da161..52328140ab7a 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Matthew Thode]

commit:     5963924837c5496deca9989246a9c462464a4f6e
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 07:32:13 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 07:32:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59639248

net-analyzer/pnp4nagios: fix metadata for icinga removal

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 net-analyzer/pnp4nagios/metadata.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
index 6612bb05751..4854813f7de 100644
--- a/net-analyzer/pnp4nagios/metadata.xml
+++ b/net-analyzer/pnp4nagios/metadata.xml
@@ -11,8 +11,7 @@
       Build against <pkg>net-analyzer/nagios-core</pkg> (the default)
     </flag>
     <flag name="icinga">
-      Build against <pkg>net-analyzer/icinga2</pkg> or
-      <pkg>net-analyzer/icinga</pkg> instead of
+      Build against <pkg>net-analyzer/icinga2</pkg> instead of
       <pkg>net-analyzer/nagios-core</pkg>
     </flag>
   </use>

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Matthew Thode]

commit:     28289c7f1df4e82a1aefe21bb804ec6d2293146e
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 23:37:34 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 23:37:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28289c7f

net-analyzer/pnp4nagios: remove icinga dependency

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
index 48d161daa23..6a09ab87188 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ REQUIRED_USE="^^ ( icinga nagios )"
 DEPEND="
 	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
 	net-analyzer/rrdtool[graph,perl]
-	icinga? ( || ( net-analyzer/icinga2 net-analyzer/icinga ) )
+	icinga? ( net-analyzer/icinga2 )
 	nagios? ( net-analyzer/nagios-core )"
 
 # A list of modules used in our Apache config file.

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     1b7ee5b1a4c5828b756ebbf767091192cfee5cdc
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 19 22:08:53 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 22:11:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b7ee5b1

net-analyzer/pnp4nagios: remove "unused" vulnerable versions.

Bug: https://bugs.gentoo.org/637640
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-analyzer/pnp4nagios/Manifest                   |   2 -
 net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild   |  84 ----------------
 .../pnp4nagios/pnp4nagios-0.6.25-r1.ebuild         | 105 --------------------
 .../pnp4nagios/pnp4nagios-0.6.25-r2.ebuild         | 108 ---------------------
 .../pnp4nagios/pnp4nagios-0.6.25-r3.ebuild         | 101 -------------------
 net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild   | 105 --------------------
 6 files changed, 505 deletions(-)

diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index b6f67e80d8a..e33adf3e6b1 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,3 +1 @@
-DIST pnp4nagios-0.6.24.tar.gz 2919182 BLAKE2B 95f2e00182e8fcce7bb17c56d0900def9c7a99c7f709983a906465a3033807fc673de64d2312f61446247b34a2bb56a06972fad225b7929ed87250abece7bb47 SHA512 7e8c32e0ac69ab747a57e8ab6cc59fddfb63e16598fda9c1e6270d6309ff0885cd1bd0876d05aa1d30bffa76b281d41dc8fbe59e430778bf4d3bdddc4a7bee9f
-DIST pnp4nagios-0.6.25.tar.gz 2921068 BLAKE2B 9497af2e5d2ffc24685f0cae6e3ab6b912765cb246b22dac2c93a196ebf13fce0909fcd4a1d94438ca986808168416f54ade97972d278a64d069d38fff8ebbb8 SHA512 e561fcac8243e6b1ab401312b4a05a6c752e2869da7366a22e4e48d54ae1e9c17c52cb2dffb1ca5748179f3bc856f779317196992643e9862eb09c4debf277c8
 DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
deleted file mode 100644
index 7a79e5d51e9..00000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-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 )"
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	media-fonts/dejavu
-	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
-
-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
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}"/98_pnp4nagios.conf
-	fi
-
-	# Bug 430358 - CVE-2012-3457
-	find "${D}/etc/pnp" -type f -exec chmod 0640 {} \; || die
-	find "${D}/etc/pnp" -type d -exec chmod 0750 {} \; || die
-}
-
-pkg_postinst() {
-	elog "Please make sure to enable URL rewriting in Apache or any other"
-	elog "webserver you're using, to get pnp4nagios running!"
-}

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
deleted file mode 100644
index ea74516d0c5..00000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:*[filter,gd,json,simplexml,xml,zlib]
-	>=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
-}

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
deleted file mode 100644
index 7630fe3e6f9..00000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:*[filter,gd,json,simplexml,xml,zlib]
-	>=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
-	elif has_version net-analyzer/icinga2; then
-		var_dir=/var/lib/icinga2/
-		user_group=icinga
-	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
-}

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
deleted file mode 100644
index 2044e45a7e0..00000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="apache2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-# A lot of things (sync mode, for one) are broken with nagios-4.x.
-DEPEND="
-	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
-	>=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}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.14-makefile.patch"
-	"${FILESDIR}/${P}-rrdtool-0.6.0-support.patch"
-)
-
-src_configure() {
-	local var_dir user_group
-
-	if has_version net-analyzer/nagios-core; then
-		var_dir=/var/nagios
-		user_group=nagios
-	elif has_version net-analyzer/icinga2; then
-		var_dir=/var/lib/icinga2
-		user_group=icinga
-	else
-		var_dir=/var/lib/icinga
-		user_group=icinga
-	fi
-
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/pnp \
-		--datarootdir="${EPREFIX}"/usr/share/pnp \
-		--with-perfdata-dir="${EPREFIX}"${var_dir}/perfdata \
-		--with-nagios-user=${user_group} \
-		--with-nagios-group=${user_group} \
-		--with-perfdata-logfile="${EPREFIX}"${var_dir}/perfdata.log \
-		--with-perfdata-spool-dir="${EPREFIX}"/var/spool/pnp
-}
-
-src_compile() {
-	# The default target just shows a help
-	emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-config
-	einstalldocs
-	newinitd "${FILESDIR}"/npcd.initd npcd
-	rm "${ED%/}/usr/share/pnp/install.php" || \
-		die "unable to remove ${ED%/}/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 "${ED%/}/etc/pnp" \
-			|| die "failed to change group of ${ED%/}/etc/pnp"
-	fi
-
-	# Bug 430358 - CVE-2012-3457
-	local f
-	while IFS="" read -d $'\0' -r f ; do
-		chmod 0640 "${f}" || die
-	done < <(find "${ED%/}/etc/pnp" -type f)
-
-	while IFS="" read -d $'\0' -r f ; do
-		chmod 0750 "${f}" || die
-	done < <(find "${ED%/}/etc/pnp" -type d)
-}
-
-pkg_postinst() {
-	elog "To enable the pnp4nagios web front-end, please visit"
-	elog "${EROOT%/}/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
-}

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
deleted file mode 100644
index 8c83a932fe0..00000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Sergei Trofimovich]

commit:     1e6d301bd61a4ef4533bcd02aabb9111b493844f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 22:35:52 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 22:39:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6d301b

net-analyzer/pnp4nagios: stable 0.6.26-r9 for ppc, bug #637640

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
index 784147a6a68..c786b4d7cc5 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Thomas Deutschmann]

commit:     150b2fd8a80ff59af2adceeac1a3a8468af13f9d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 18:47:42 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 18:52:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=150b2fd8

net-analyzer/pnp4nagios: x86 stable (bug #637640)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
index f55ea798a51..784147a6a68 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Agostino Sarubbo]

commit:     add7da99ce942246b0c24e2f859220980315ee55
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 13:38:14 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 13:38:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add7da99

net-analyzer/pnp4nagios: amd64 stable wrt bug #637640

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/pnp4nagios/Manifest                    | 2 +-
 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index eafa0a86fcc..c8138663709 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,3 +1,3 @@
 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
-DIST pnp4nagios-0.6.26.tar.gz 3039265 SHA256 ab59a8a02d0f70de3cf89b12fe1e9216e4b1127bc29c04a036cd06dde72ee8fb SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427 WHIRLPOOL 9e4d3565f37ace45d509b86b5b603d37aebed0fde385f27d78b2a1c231ff9f2cba6973a7f29b216755e76b139dce087411e22ceaafcbe51e890691f49e2161d9
+DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
index ffa296c1348..f55ea798a51 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     974707d375cc8cb22593224b38c73853e906d157
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 23:30:20 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=974707d3

net-analyzer/pnp4nagios: use group permissions for writable directories.

The past few revisions have made some directories owned by the "nagios
user" so that the nagios/icinga daemon can write stuff there. Instead
of giving ownership of those directories to the nagios user, it's a
little bit more secure to give group-rwx permissions to the "nagios
group." This new revision does that instead.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../{pnp4nagios-0.6.26-r8.ebuild => pnp4nagios-0.6.26-r9.ebuild} | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r8.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
similarity index 92%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r8.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
index 8d5fdbcf842..ffa296c1348 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r8.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
@@ -75,16 +75,19 @@ src_install() {
 	# perfdata-dir...
 	local user_group=nagios
 	use icinga && user_group=icinga
-	fowners "${user_group}:${user_group}" /var/lib/pnp/{,perfdata,spool}
+	fowners ":${user_group}" /var/lib/pnp/{,perfdata,spool}
+	fperms g+rwx /var/lib/pnp/{,perfdata,spool}
 
 	# and likewise for its logs...
 	dodir /var/log/pnp
-	fowners "${user_group}:${user_group}" /var/log/pnp
+	fowners ":${user_group}" /var/log/pnp
+	fperms g+rwx /var/log/pnp
 
 	# and its statistics. This one is arguably the responsibility of the
 	# build system, since process_perfdata.cfg refers to this location.
 	dodir /var/lib/pnp/stats
-	fowners "${user_group}:${user_group}" /var/lib/pnp/stats
+	fowners ":${user_group}" /var/lib/pnp/stats
+	fperms g+rwx /var/lib/pnp/stats
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     667c4d4c33593e983947d5a4ce2f59288bd9dc76
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 20:42:36 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667c4d4c

net-analyzer/pnp4nagios: use consistent perfdata directories.

Past revisions have stored the RRDtool data and the process_perdata.pl
logs in (for example) /var/nagios or /var/icinga, depending on whether
or you had Nagios or Icinga installed. That's silly: the data format
doesn't change, so it makes more sense to choose one location (now:
/var/lib/pnp) and stick with it.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 ....6.26-r4.ebuild => pnp4nagios-0.6.26-r5.ebuild} | 32 ++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r4.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r5.ebuild
similarity index 78%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r4.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r5.ebuild
index c173abd999e..3e886eb89dc 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r4.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r5.ebuild
@@ -38,27 +38,16 @@ RDEPEND="${DEPEND}
 PATCHES=( "${FILESDIR}/${PN}-0.6.14-makefile.patch" )
 
 src_configure() {
-	local var_dir user_group
-
-	if use icinga; then
-		var_dir=/var/lib/icinga
-		user_group=icinga
-	elif use icinga2; then
-		var_dir=/var/lib/icinga2
-		user_group=icinga
-	else
-		# Thanks to REQUIRED_USE, "use nagios" is the only other case.
-		var_dir=/var/nagios
-		user_group=nagios
-	fi
+	local user_group=nagios
+	( use icinga || use icinga2 ) && user_group=icinga
 
 	econf \
 		--sysconfdir="${EPREFIX}"/etc/pnp \
 		--datarootdir="${EPREFIX}"/usr/share/pnp \
-		--with-perfdata-dir="${EPREFIX}"${var_dir}/perfdata \
-		--with-nagios-user=${user_group} \
-		--with-nagios-group=${user_group} \
-		--with-perfdata-logfile="${EPREFIX}"${var_dir}/perfdata.log \
+		--with-nagios-user="${user_group}" \
+		--with-nagios-group="${user_group}" \
+		--with-perfdata-dir="${EPREFIX}"/var/lib/pnp/perfdata \
+		--with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log \
 		--with-perfdata-spool-dir="${EPREFIX}"/var/spool/pnp
 }
 
@@ -88,6 +77,15 @@ src_install() {
 		# server read it.
 		fowners :apache /etc/pnp/process_perfdata.cfg
 	fi
+
+	# The nagios or icinga user will also need to be able to write
+	# performance data to the perfdata-dir and perfdata-spool-dir
+	# directories.
+	local user_group=nagios
+	( use icinga || use icinga2 ) && user_group=icinga
+	dodir /var/lib/pnp/{,perfdata} /var/log/pnp
+	fowners "${user_group}:${user_group}" /var/lib/pnp/{,perfdata}
+	fowners "${user_group}:${user_group}" /var/log/pnp
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     8e44298fd864c4a30a38f47522679a20a317732c
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 00:27:45 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e44298f

net-analyzer/pnp4nagios: tighten permissions on process_perfdata.cfg.

With USE=apache2, we used to set the group of process_perfdata.cfg to
"apache2", but that appears unnecessary. This revision doesn't do it.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../{pnp4nagios-0.6.26-r6.ebuild => pnp4nagios-0.6.26-r7.ebuild}     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r6.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r7.ebuild
similarity index 94%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r6.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r7.ebuild
index 9642d1e6479..4057b829d9e 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r6.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r7.ebuild
@@ -70,11 +70,6 @@ src_install() {
 	if use apache2 ; then
 		insinto /etc/apache2/modules.d
 		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
-
-		# This one file isn't world-readable, but it should be group-
-		# readable. Give it to the "apache" group to let the web
-		# server read it.
-		fowners :apache /etc/pnp/process_perfdata.cfg
 	fi
 
 	# The nagios or icinga user needs to write performance data to the

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     04e9a4ead6dfa73782be728baf9c75a67f09ad6f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 17:30:44 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04e9a4ea

net-analyzer/pnp4nagios: drop pointless rrdtool lower bound.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
index 75c54aacb9b..daba225be4f 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="^^ ( icinga icinga2 nagios )"
 # to accept it.
 DEPEND="
 	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
+	net-analyzer/rrdtool[graph,perl]
 	icinga? ( net-analyzer/icinga )
 	icinga2? ( net-analyzer/icinga2 )
 	nagios? ( net-analyzer/nagios-core )"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     42744d418f1fe9fa3b593dcec59e3f8afacf195d
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 16:14:02 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42744d41

net-analyzer/pnp4nagios: new version 0.6.26.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/pnp4nagios/Manifest                 |  1 +
 net-analyzer/pnp4nagios/pnp4nagios-0.6.26.ebuild | 98 ++++++++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 8f1c42a86f9..eafa0a86fcc 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,2 +1,3 @@
 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
+DIST pnp4nagios-0.6.26.tar.gz 3039265 SHA256 ab59a8a02d0f70de3cf89b12fe1e9216e4b1127bc29c04a036cd06dde72ee8fb SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427 WHIRLPOOL 9e4d3565f37ace45d509b86b5b603d37aebed0fde385f27d78b2a1c231ff9f2cba6973a7f29b216755e76b139dce087411e22ceaafcbe51e890691f49e2161d9

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26.ebuild
new file mode 100644
index 00000000000..06416fc0d98
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="apache2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+# A lot of things (sync mode, for one) are broken with nagios-4.x.
+DEPEND="
+	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
+	>=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}] )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6.14-makefile.patch" )
+
+src_configure() {
+	local var_dir user_group
+
+	if has_version net-analyzer/nagios-core; then
+		var_dir=/var/nagios
+		user_group=nagios
+	elif has_version net-analyzer/icinga2; then
+		var_dir=/var/lib/icinga2
+		user_group=icinga
+	else
+		var_dir=/var/lib/icinga
+		user_group=icinga
+	fi
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/pnp \
+		--datarootdir="${EPREFIX}"/usr/share/pnp \
+		--with-perfdata-dir="${EPREFIX}"${var_dir}/perfdata \
+		--with-nagios-user=${user_group} \
+		--with-nagios-group=${user_group} \
+		--with-perfdata-logfile="${EPREFIX}"${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir="${EPREFIX}"/var/spool/pnp
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config
+	einstalldocs
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${ED%/}/usr/share/pnp/install.php" || \
+		die "unable to remove ${ED%/}/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 "${ED%/}/etc/pnp" \
+			|| die "failed to change group of ${ED%/}/etc/pnp"
+	fi
+
+	# Bug 430358 - CVE-2012-3457
+	local f
+	while IFS="" read -d $'\0' -r f ; do
+		chmod 0640 "${f}" || die
+	done < <(find "${ED%/}/etc/pnp" -type f)
+
+	while IFS="" read -d $'\0' -r f ; do
+		chmod 0750 "${f}" || die
+	done < <(find "${ED%/}/etc/pnp" -type d)
+}
+
+pkg_postinst() {
+	elog "To enable the pnp4nagios web front-end, please visit"
+	elog "${EROOT%/}/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
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     8f978407a29d863ab28404912b53cdcd37310e06
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 00:21:48 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f978407

net-analyzer/pnp4nagios: fix the default stats directory.

The process_perfdata.cfg file refers to a STATS_DIR that is set to
"@localstatedir@/stats" at build-time. However, the build system
doesn't create that directory nor ensure that it is writable. This
latest revision passes --localstatedir to econf, and then creates the
associated directory with the desired permissions. The "bulk mode"
without NPCD now works out-of-the-box!

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 ...0.6.26-r5.ebuild => pnp4nagios-0.6.26-r6.ebuild} | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r5.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r6.ebuild
similarity index 85%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r5.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r6.ebuild
index 3e886eb89dc..9642d1e6479 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r5.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r6.ebuild
@@ -44,11 +44,10 @@ src_configure() {
 	econf \
 		--sysconfdir="${EPREFIX}"/etc/pnp \
 		--datarootdir="${EPREFIX}"/usr/share/pnp \
+		--localstatedir="${EPREFIX}"/var/lib/pnp \
 		--with-nagios-user="${user_group}" \
 		--with-nagios-group="${user_group}" \
-		--with-perfdata-dir="${EPREFIX}"/var/lib/pnp/perfdata \
-		--with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log \
-		--with-perfdata-spool-dir="${EPREFIX}"/var/spool/pnp
+		--with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log
 }
 
 src_compile() {
@@ -78,14 +77,20 @@ src_install() {
 		fowners :apache /etc/pnp/process_perfdata.cfg
 	fi
 
-	# The nagios or icinga user will also need to be able to write
-	# performance data to the perfdata-dir and perfdata-spool-dir
-	# directories.
+	# The nagios or icinga user needs to write performance data to the
+	# perfdata-dir...
 	local user_group=nagios
 	( use icinga || use icinga2 ) && user_group=icinga
-	dodir /var/lib/pnp/{,perfdata} /var/log/pnp
-	fowners "${user_group}:${user_group}" /var/lib/pnp/{,perfdata}
+	fowners "${user_group}:${user_group}" /var/lib/pnp/{,perfdata,spool}
+
+	# and likewise for its logs...
+	dodir /var/log/pnp
 	fowners "${user_group}:${user_group}" /var/log/pnp
+
+	# and its statistics. This one is arguably the responsibility of the
+	# build system, since process_perfdata.cfg refers to this location.
+	dodir /var/lib/pnp/stats
+	fowners "${user_group}:${user_group}" /var/lib/pnp/stats
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     d48697f8eca1f8d87030577c15cd1c4f1b0597a8
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 00:33:34 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48697f8

net-analyzer/pnp4nagios: drop USE=icinga2 in a new revision.

Now that pnp4nagios doesn't rely on the localstatedir of Nagios or
Icinga, the two implementations of Icinga are actually suitable for an
"or" dependency. We therefore do away with USE=icinga2, and let
USE=icinga mean "either icinga or icinga2."

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/pnp4nagios/metadata.xml                          |  7 ++-----
 ...np4nagios-0.6.26-r7.ebuild => pnp4nagios-0.6.26-r8.ebuild} | 11 +++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
index d5799ab49c9..6612bb05751 100644
--- a/net-analyzer/pnp4nagios/metadata.xml
+++ b/net-analyzer/pnp4nagios/metadata.xml
@@ -11,11 +11,8 @@
       Build against <pkg>net-analyzer/nagios-core</pkg> (the default)
     </flag>
     <flag name="icinga">
-      Build against <pkg>net-analyzer/icinga</pkg> instead of
-      <pkg>net-analyzer/nagios-core</pkg>
-    </flag>
-    <flag name="icinga2">
-      Build against <pkg>net-analyzer/icinga2</pkg> instead of
+      Build against <pkg>net-analyzer/icinga2</pkg> or
+      <pkg>net-analyzer/icinga</pkg> instead of
       <pkg>net-analyzer/nagios-core</pkg>
     </flag>
   </use>

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r7.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r8.ebuild
similarity index 91%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r7.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r8.ebuild
index 4057b829d9e..8d5fdbcf842 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r7.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r8.ebuild
@@ -9,10 +9,10 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="apache2 icinga icinga2 +nagios"
+IUSE="apache2 icinga +nagios"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-REQUIRED_USE="^^ ( icinga icinga2 nagios )"
+REQUIRED_USE="^^ ( icinga nagios )"
 
 # Some things (sync mode, for one) are broken with nagios-4.x, but since
 # nagios-3.x has been end-of-life'd, we don't have much choice here but
@@ -20,8 +20,7 @@ REQUIRED_USE="^^ ( icinga icinga2 nagios )"
 DEPEND="
 	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
 	net-analyzer/rrdtool[graph,perl]
-	icinga? ( net-analyzer/icinga )
-	icinga2? ( net-analyzer/icinga2 )
+	icinga? ( || ( net-analyzer/icinga2 net-analyzer/icinga ) )
 	nagios? ( net-analyzer/nagios-core )"
 
 # A list of modules used in our Apache config file.
@@ -39,7 +38,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.6.14-makefile.patch" )
 
 src_configure() {
 	local user_group=nagios
-	( use icinga || use icinga2 ) && user_group=icinga
+	use icinga && user_group=icinga
 
 	econf \
 		--sysconfdir="${EPREFIX}"/etc/pnp \
@@ -75,7 +74,7 @@ src_install() {
 	# The nagios or icinga user needs to write performance data to the
 	# perfdata-dir...
 	local user_group=nagios
-	( use icinga || use icinga2 ) && user_group=icinga
+	use icinga && user_group=icinga
 	fowners "${user_group}:${user_group}" /var/lib/pnp/{,perfdata,spool}
 
 	# and likewise for its logs...

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     6a5bac28672abbc54f164d853d929a3e4d8b654d
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 17:27:17 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5bac28

net-analyzer/pnp4nagios: new revision to fix insecure config permissions.

Previous revisions of pnp4nagios install /etc/pnp owned by the "nagios
user," and the npcd daemon also runs as that user. That configuration
is insecure: the unprivileged user can edit /etc/pnp/npcd.cfg, and
escalate his own privileges by setting "user = root". To avoid the
problem, we set INSTALL_OPTS="" while running "emake install". That
leaves all of /etc/pnp with the default (root:root) ownership.

Bug: https://github.com/lingej/pnp4nagios/issues/140
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../{pnp4nagios-0.6.26-r2.ebuild => pnp4nagios-0.6.26-r3.ebuild}      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
similarity index 93%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
index 818bc3104ff..ce886f53738 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
@@ -68,7 +68,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install install-config
+	# Don't use INSTALL_OPTS because they set insecure permissions on
+	# all of /etc/pnp (https://github.com/lingej/pnp4nagios/issues/140).
+	emake INSTALL_OPTS="" DESTDIR="${D}" install install-config
 	einstalldocs
 	newinitd "${FILESDIR}"/npcd.initd npcd
 	rm "${ED%/}/usr/share/pnp/install.php" || \

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     184ae2c637ba60cd8f65d33c9098a2f4a079b4dc
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 17:08:14 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=184ae2c6

net-analyzer/pnp4nagios: new revision with a better fix for CVE-2012-3457.

In CVE-2012-3457, it was reported that one particular file should not
be world-readable. To fix that, our ebuild made all of /etc/pnp
unreadable; that made other permissions issues difficult to work
around. This r2 sets o-rwx only on /etc/pnp/process_perfdata.cfg.

Bug: https://bugs.gentoo.org/430358
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 ...0.6.26-r1.ebuild => pnp4nagios-0.6.26-r2.ebuild} | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild
similarity index 84%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild
index c15a8c98de6..818bc3104ff 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild
@@ -74,25 +74,18 @@ src_install() {
 	rm "${ED%/}/usr/share/pnp/install.php" || \
 		die "unable to remove ${ED%/}/usr/share/pnp/install.php"
 
+	# Fix CVE-2012-3457 (Gentoo bug 430358)
+	fperms o-rwx /etc/pnp/process_perfdata.cfg
+
 	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 "${ED%/}/etc/pnp" \
-			|| die "failed to change group of ${ED%/}/etc/pnp"
+		# This one file isn't world-readable, but it should be group-
+		# readable. Give it to the "apache" group to let the web
+		# server read it.
+		fowners :apache /etc/pnp/process_perfdata.cfg
 	fi
-
-	# Bug 430358 - CVE-2012-3457
-	local f
-	while IFS="" read -d $'\0' -r f ; do
-		chmod 0640 "${f}" || die
-	done < <(find "${ED%/}/etc/pnp" -type f)
-
-	while IFS="" read -d $'\0' -r f ; do
-		chmod 0750 "${f}" || die
-	done < <(find "${ED%/}/etc/pnp" -type d)
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     ec1a909b25ce487843dce8bbb644c9e388ff38f0
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 20:12:23 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec1a909b

net-analyzer/pnp4nagios: new revision to fix apache2 conf file.

The last few revisions have done,

  insinto "${APACHE_MODULES_CONFDIR}"

but the depend.apache eclass was removed in pnp4nagios-0.6.25-r3,
which means that the conf file wound up installed to ${ROOT}. The
new revision specifies the path explicitly without using the eclass
variable.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../{pnp4nagios-0.6.26-r3.ebuild => pnp4nagios-0.6.26-r4.ebuild}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r4.ebuild
similarity index 98%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r4.ebuild
index daba225be4f..c173abd999e 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r4.ebuild
@@ -80,7 +80,7 @@ src_install() {
 	fperms o-rwx /etc/pnp/process_perfdata.cfg
 
 	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
+		insinto /etc/apache2/modules.d
 		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
 
 		# This one file isn't world-readable, but it should be group-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     7c5156d908adf2da53846cf857ff2b039bf79078
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 17:29:42 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5156d9

net-analyzer/pnp4nagios: change "-DPHP5" to "-DPHP" in pkg_postinst().

The apache "define" changed a while ago from "PHP5" to simply "PHP".
This commit fixes the latest revision, in place, to output the correct
instructions.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
index ce886f53738..75c54aacb9b 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r3.ebuild
@@ -92,7 +92,7 @@ src_install() {
 
 pkg_postinst() {
 	elog "To enable the pnp4nagios web front-end, please visit"
-	elog "${EROOT%/}/etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
+	elog "${EROOT%/}/etc/conf.d/apache2 and add \"-D PNP -D PHP\""
 	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
 	elog
 	elog "  http://localhost/pnp4nagios"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Michael Orlitzky]

commit:     8a6c86311831919c79c94f0b4744e05691fe5045
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 16:33:39 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 23:37:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a6c8631

net-analyzer/pnp4nagios: new revision to fix nagios/icinga "or" dependency.

Previous revisions of pnp4nagios have an "or" dependency on either
Nagios or Icinga,

  || ( net-analyzer/nagios-core net-analyzer/icinga ...

The way "or" dependencies work is that they are considered satisfied
if any elements of the associated group are installed. Thus the above
stanza allows Nagios and Icinga to be swapped out without rebuilding
pnp4nagios. That is incorrect, since later in the ebuild, nagios-
or icinga-specific paths are compiled into pnp4nagios.

The usual solution to that problem is to choose a default package that
satisfies the "one of these" dependency, but to allow the user to
specify one with a USE flag. This new revision adds three USE flags:
icinga, icinga2, and nagios. The "nagios" flag is enabled by default,
and builds pnp4nagios against net-analyzer/nagios. The other flags
build against the associated package.

In the process, the dependency on nagios-3.x was loosened to accept
nagios-4.x as well. The nagios-3.x series has been end-of-life'd, and
has multiple open security bugs.

Bug: https://bugs.gentoo.org/628086
Bug: https://bugs.gentoo.org/629380
Bug: https://bugs.gentoo.org/636234
Closes: https://bugs.gentoo.org/600424
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/pnp4nagios/metadata.xml               | 16 ++++++++++++++
 ...s-0.6.26.ebuild => pnp4nagios-0.6.26-r1.ebuild} | 25 ++++++++++++++--------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
index 379fdde3e07..d5799ab49c9 100644
--- a/net-analyzer/pnp4nagios/metadata.xml
+++ b/net-analyzer/pnp4nagios/metadata.xml
@@ -5,7 +5,23 @@
     <email>sysadmin@gentoo.org</email>
     <name>Gentoo Sysadmin Project</name>
   </maintainer>
+
+  <use>
+    <flag name="nagios">
+      Build against <pkg>net-analyzer/nagios-core</pkg> (the default)
+    </flag>
+    <flag name="icinga">
+      Build against <pkg>net-analyzer/icinga</pkg> instead of
+      <pkg>net-analyzer/nagios-core</pkg>
+    </flag>
+    <flag name="icinga2">
+      Build against <pkg>net-analyzer/icinga2</pkg> instead of
+      <pkg>net-analyzer/nagios-core</pkg>
+    </flag>
+  </use>
+
   <upstream>
     <remote-id type="sourceforge">pnp4nagios</remote-id>
+    <remote-id type="github">lingej/pnp4nagios</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild
similarity index 84%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild
index 06416fc0d98..c15a8c98de6 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild
@@ -9,14 +9,20 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="apache2"
+IUSE="apache2 icinga icinga2 +nagios"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-# A lot of things (sync mode, for one) are broken with nagios-4.x.
+REQUIRED_USE="^^ ( icinga icinga2 nagios )"
+
+# Some things (sync mode, for one) are broken with nagios-4.x, but since
+# nagios-3.x has been end-of-life'd, we don't have much choice here but
+# to accept it.
 DEPEND="
 	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
 	>=net-analyzer/rrdtool-1.2[graph,perl]
-	|| ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
+	icinga? ( net-analyzer/icinga )
+	icinga2? ( net-analyzer/icinga2 )
+	nagios? ( net-analyzer/nagios-core )"
 
 # A list of modules used in our Apache config file.
 APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
@@ -34,15 +40,16 @@ PATCHES=( "${FILESDIR}/${PN}-0.6.14-makefile.patch" )
 src_configure() {
 	local var_dir user_group
 
-	if has_version net-analyzer/nagios-core; then
-		var_dir=/var/nagios
-		user_group=nagios
-	elif has_version net-analyzer/icinga2; then
+	if use icinga; then
+		var_dir=/var/lib/icinga
+		user_group=icinga
+	elif use icinga2; then
 		var_dir=/var/lib/icinga2
 		user_group=icinga
 	else
-		var_dir=/var/lib/icinga
-		user_group=icinga
+		# Thanks to REQUIRED_USE, "use nagios" is the only other case.
+		var_dir=/var/nagios
+		user_group=nagios
 	fi
 
 	econf \

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Patrice Clement]

commit:     982a97b2acad008069b9cfb6c21574cc97ec3654
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Mon Nov 28 16:04:51 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 23:42:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982a97b2

net-analyzer/pnp4nagios: remove dep. on outdated apache eclass, various fixes.

Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2943

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../pnp4nagios/pnp4nagios-0.6.25-r3.ebuild         | 56 ++++++++++------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
index 974810a..ee5fadd 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
@@ -4,15 +4,13 @@
 
 EAPI=6
 
-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=""
+IUSE="apache2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 # A lot of things (sync mode, for one) are broken with nagios-4.x.
@@ -37,38 +35,28 @@ PATCHES=(
 	"${FILESDIR}/${P}-rrdtool-0.6.0-support.patch"
 )
 
-# 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_configure() {
-	local var_dir=
-	local user_group=
+	local var_dir user_group
 
 	if has_version net-analyzer/nagios-core; then
-		var_dir=/var/nagios/
+		var_dir=/var/nagios
 		user_group=nagios
 	elif has_version net-analyzer/icinga2; then
-		var_dir=/var/lib/icinga2/
+		var_dir=/var/lib/icinga2
 		user_group=icinga
 	else
-		var_dir=/var/lib/icinga/
+		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 \
+		--sysconfdir="${EPREFIX}"/etc/pnp \
+		--datarootdir="${EPREFIX}"/usr/share/pnp \
+		--with-perfdata-dir="${EPREFIX}"${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
+		--with-perfdata-logfile="${EPREFIX}"${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir="${EPREFIX}"/var/spool/pnp
 }
 
 src_compile() {
@@ -78,9 +66,10 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install install-config
+	einstalldocs
 	newinitd "${FILESDIR}"/npcd.initd npcd
-	rm "${D}/usr/share/pnp/install.php" || \
-		die "unable to remove ${D}/usr/share/pnp/install.php"
+	rm "${ED%/}/usr/share/pnp/install.php" || \
+		die "unable to remove ${ED%/}/usr/share/pnp/install.php"
 
 	if use apache2 ; then
 		insinto "${APACHE_MODULES_CONFDIR}"
@@ -88,21 +77,24 @@ src_install() {
 
 		# 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"
+		chgrp -R apache "${ED%/}/etc/pnp" \
+			|| die "failed to change group of ${ED%/}/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"
+	local f
+	while IFS="" read -d $'\0' -r f ; do
+		chmod 0640 "${f}" || die
+	done < <(find "${ED%/}/etc/pnp" -type f)
+
+	while IFS="" read -d $'\0' -r f ; do
+		chmod 0750 "${f}" || die
+	done < <(find "${ED%/}/etc/pnp" -type d)
 }
 
 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 "${EROOT%/}/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"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Agostino Sarubbo]

commit:     7c0cc5f4b2e2a35c51f9520ddb527c479334a342
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 11:08:03 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 11:08:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0cc5f4

net-analyzer/pnp4nagios: amd64 stable wrt bug #548968

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
index d8e657b..f1ea00e 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 # A lot of things (sync mode, for one) are broken with nagios-4.x.
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Matt Thode]

commit:     cf7be0c9212a335e846b42bf331802627d2b1df6
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 23:31:12 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 23:31:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf7be0c9

net-analyzer/pnp4nagios: fixing typo

Package-Manager: portage-2.2.26

 net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
index 4e25195..d8e657b 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
@@ -52,7 +52,7 @@ src_configure() {
 		var_dir=/var/nagios/
 		user_group=nagios
 	elif has_version net-analyzer/icinga2; then
-		var_dir=/var/lib/icing2/
+		var_dir=/var/lib/icinga2/
 		user_group=icinga
 	else
 		var_dir=/var/lib/icinga/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Matt Thode]

commit:     21dfadf1142d36f3a591ecadb39b28a29aa8c84f
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 14:45:12 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 14:45:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21dfadf1

net-analyzer/pnp4nagios: fixing bug 543120, add icinga2 specifics

Package-Manager: portage-2.2.26

 .../pnp4nagios/pnp4nagios-0.6.25-r2.ebuild         | 109 +++++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
new file mode 100644
index 0000000..4e25195
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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:*[filter,gd,json,simplexml,xml,zlib]
+	>=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
+	elif has_version net-analyzer/icinga2; then
+		var_dir=/var/lib/icing2/
+		user_group=icinga
+	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
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/

[Matt Thode]

commit:     e754036202667776fef04ba66c0dd04bc8dd76ea
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 22:11:26 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 22:11:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7540362

net-analyzer/pnp4nagios: fix bug 568444

Package-Manager: portage-2.2.24

 .../pnp4nagios/pnp4nagios-0.6.25-r1.ebuild         | 106 +++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
new file mode 100644
index 0000000..7bbcb57
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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:*[filter,gd,json,simplexml,xml,zlib]
+	>=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
+}