From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 307A61396D9 for ; Sat, 4 Nov 2017 23:40:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81ACFE0EA0; Sat, 4 Nov 2017 23:40:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52F7AE0E2D for ; Sat, 4 Nov 2017 23:40:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4CA034171E for ; Sat, 4 Nov 2017 23:40:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 373599528 for ; Sat, 4 Nov 2017 23:40:20 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1509838640.8a6c86311831919c79c94f0b4744e05691fe5045.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/pnp4nagios/metadata.xml net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild net-analyzer/pnp4nagios/pnp4nagios-0.6.26.ebuild X-VCS-Directories: net-analyzer/pnp4nagios/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 8a6c86311831919c79c94f0b4744e05691fe5045 X-VCS-Branch: master Date: Sat, 4 Nov 2017 23:40:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b58d6634-6d29-4fe9-af7b-be4cbb164d28 X-Archives-Hash: e35b99aa248bf6fb17c9e62b5d828eb2 commit: 8a6c86311831919c79c94f0b4744e05691fe5045 Author: Michael Orlitzky gentoo org> AuthorDate: Thu Nov 2 16:33:39 2017 +0000 Commit: Michael Orlitzky gentoo 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 @@ sysadmin@gentoo.org Gentoo Sysadmin Project + + + + Build against net-analyzer/nagios-core (the default) + + + Build against net-analyzer/icinga instead of + net-analyzer/nagios-core + + + Build against net-analyzer/icinga2 instead of + net-analyzer/nagios-core + + + pnp4nagios + lingej/pnp4nagios 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] - || (