[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/, profiles/, net-analyzer/icinga-web/, ...
commit: d4e5a319c2fb1f17a2e26e5f560f15d1bd2f13de
Author: Matthew Thode gentoo org>
AuthorDate: Tue Mar 17 06:30:25 2020 +
Commit: Matthew Thode gentoo org>
CommitDate: Tue Mar 17 06:31:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e5a319
profiles: remove icinga and icinga-web
Closes: https://bugs.gentoo.org/709998
Signed-off-by: Matthew Thode gentoo.org>
net-analyzer/icinga-web/Manifest | 1 -
net-analyzer/icinga-web/icinga-web-1.14.1.ebuild | 205 --
net-analyzer/icinga-web/metadata.xml | 18 --
net-analyzer/icinga/Manifest | 1 -
net-analyzer/icinga/files/icinga-apache.conf | 17 --
net-analyzer/icinga/files/icinga-conf.d | 3 -
net-analyzer/icinga/files/icinga-init.d | 64 --
net-analyzer/icinga/files/icinga-lighty.conf | 24 --
net-analyzer/icinga/files/ido2db-conf.d | 1 -
net-analyzer/icinga/files/ido2db-init.d | 39
net-analyzer/icinga/icinga-1.14.2.ebuild | 265 ---
net-analyzer/icinga/metadata.xml | 20 --
profiles/package.mask| 5 -
13 files changed, 663 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
deleted file mode 100644
index 243329639dc..000
--- a/net-analyzer/icinga-web/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST icinga-web-1.14.1.tar.gz 14524043 BLAKE2B
0a3bdf9afc77b508dd3967e38050f6babfe01240f8cf8196158abe42818079b09a962513541298d0b0ac2b1497640d292cf1ef4feac24e302c0622f6ef0fafd8
SHA512
1ddb1fe128c2ceff20e232d61d84abebbe9578f2ef9bf0c408523c399ab6125dedc7d4e82981fff113aba8959a1ac02712032b4a36e5aa951850c084792a47bb
diff --git a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
deleted file mode 100644
index 39f00e24022..000
--- a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/;
-SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz;
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
- dev-db/libdbi-drivers[mysql?,postgres?]
- || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
-
dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
- pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
- if use apache2 ; then
- depend.apache_pkg_setup
- fi
- enewgroup icinga
- enewgroup nagios
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
- #removed checks for some php stuff since we have these things called
use flags
- sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g'
configure.ac
- sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
- autoreconf
-}
-
-src_configure() {
- local myconf
-
- myconf="--prefix=/usr/share/icinga/icinga-web
- --bindir=/usr/sbin
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
- --datarootdir=/usr/share/icinga/htdocs
- --localstatedir=/var/lib/icinga
- --sysconfdir=/etc/icinga
- --libexecdir=/usr/$(get_libdir)/icinga/plugins
- --with-bin-user=icinga
- --with-bin-group=nagios
- --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
- --with-conf-dir=/etc/icinga-web
- --with-log-dir=/var/log/icinga-web
- --with-icinga-objects-dir=/etc/icinga/objects
- --with-icinga-bin=/usr/sbin/icinga
- --with-icinga-cfg=/etc/icinga/icinga.cfg"
-
- if use apache2 ; then
- myconf+=" --with-web-user=apache
- --with-web-group=apache
- --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
- else
- myconf+=" --with-web-user=root
- --with-web-group=root"
- fi
-
- if use postgres ; then
- myconf+=" --with-db-type=pgsql
- --with-db-port=5432
- --with-api-subtype=pgsql
- --with-api-port=5432"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- dodoc README
- rm -f README
-
- emake -j1 DESTDIR="${D}" install
-
- emake DESTDIR="${D}" install-javascript
-
- if use apache2 ; then
- dodir ${APACHE_MODULES_CONFDIR}
- emake DESTDIR="${D}" install-apache-config
- echo '' >
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
- cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >>
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: f59050ac934ee53937f449937f26d9137e42ad30
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Mar 19 23:23:51 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Mar 19 23:23:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f59050ac
net-analyzer/icinga: stable 1.14.2 for ppc64, bug #637640
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"
net-analyzer/icinga/icinga-1.14.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild
b/net-analyzer/icinga/icinga-1.14.2.ebuild
index a611880db2e..3bc81cee760 100644
--- a/net-analyzer/icinga/icinga-1.14.2.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-core-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl:= )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 2b53379e080358f3a4045d5b06e861dc4bbe4add
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Mar 19 22:35:32 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Mar 19 22:39:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b53379e
net-analyzer/icinga: stable 1.14.2 for ppc, bug #637640
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"
net-analyzer/icinga/icinga-1.14.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild
b/net-analyzer/icinga/icinga-1.14.2.ebuild
index d9d4e9fb365..a611880db2e 100644
--- a/net-analyzer/icinga/icinga-1.14.2.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.2.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
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-core-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl:= )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/
commit: d8a26ce084d36877958191ab6bc46e78e32378df
Author: Matthew Thode gentoo org>
AuthorDate: Fri Jan 19 17:17:36 2018 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Jan 19 17:25:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a26ce0
net-analyzer/icinga-web: drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-analyzer/icinga-web/Manifest | 1 -
net-analyzer/icinga-web/icinga-web-1.14.0.ebuild | 205 ---
net-analyzer/icinga-web/icinga-web-1.14.1.ebuild | 2 +-
3 files changed, 1 insertion(+), 207 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index d0ad9ec787d..243329639dc 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,2 +1 @@
-DIST icinga-web-1.14.0.tar.gz 14523746 BLAKE2B
cff22c031ecc8af73690ea69c692b530aebd3f35c7a148999aedd9b142a6c304a88ee62af28ac0f80c09174bde6c1af15131596ad2ae8a7c3238a247261adc60
SHA512
9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b
DIST icinga-web-1.14.1.tar.gz 14524043 BLAKE2B
0a3bdf9afc77b508dd3967e38050f6babfe01240f8cf8196158abe42818079b09a962513541298d0b0ac2b1497640d292cf1ef4feac24e302c0622f6ef0fafd8
SHA512
1ddb1fe128c2ceff20e232d61d84abebbe9578f2ef9bf0c408523c399ab6125dedc7d4e82981fff113aba8959a1ac02712032b4a36e5aa951850c084792a47bb
diff --git a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
deleted file mode 100644
index 21595801558..000
--- a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/;
-SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz;
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
- dev-db/libdbi-drivers[mysql?,postgres?]
- || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
-
dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
- pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
- if use apache2 ; then
- depend.apache_pkg_setup
- fi
- enewgroup icinga
- enewgroup nagios
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
- #removed checks for some php stuff since we have these things called
use flags
- sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g'
configure.ac
- sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
- autoreconf
-}
-
-src_configure() {
- local myconf
-
- myconf="--prefix=/usr/share/icinga/icinga-web
- --bindir=/usr/sbin
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
- --datarootdir=/usr/share/icinga/htdocs
- --localstatedir=/var/lib/icinga
- --sysconfdir=/etc/icinga
- --libexecdir=/usr/$(get_libdir)/icinga/plugins
- --with-bin-user=icinga
- --with-bin-group=nagios
- --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
- --with-conf-dir=/etc/icinga-web
- --with-log-dir=/var/log/icinga-web
- --with-icinga-objects-dir=/etc/icinga/objects
- --with-icinga-bin=/usr/sbin/icinga
- --with-icinga-cfg=/etc/icinga/icinga.cfg"
-
- if use apache2 ; then
- myconf+=" --with-web-user=apache
- --with-web-group=apache
- --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
- else
- myconf+=" --with-web-user=root
- --with-web-group=root"
- fi
-
- if use postgres ; then
- myconf+=" --with-db-type=pgsql
- --with-db-port=5432
- --with-api-subtype=pgsql
- --with-api-port=5432"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- dodoc README
- rm -f README
-
- emake -j1 DESTDIR="${D}" install
-
- emake DESTDIR="${D}" install-javascript
-
- if use apache2 ; then
- dodir ${APACHE_MODULES_CONFDIR}
- emake DESTDIR="${D}" install-apache-config
- echo '' >
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
- cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >>
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
- rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm
failed"
- echo '' >>
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
- fi
-
- insinto /usr/share/icinga/icinga-web/contrib
- doins -r etc/schema/*
-
- if use apache2 ; then
- sed
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
commit: a0cf219ceaf011a4e396592ba2709208aa425586
Author: Matthew Thode gentoo org>
AuthorDate: Sat Dec 30 17:37:21 2017 +
Commit: Matt Thode gentoo org>
CommitDate: Sat Dec 30 17:38:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0cf219c
net-analyzer/icinga: 1.14.2 stable amd64 and x86 for bug 638186
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-analyzer/icinga/Manifest | 3 -
.../files/fix-prestripped-binaries-1.7.0.patch | 23 --
net-analyzer/icinga/icinga-1.13.4.ebuild | 269
net-analyzer/icinga/icinga-1.14.0-r1.ebuild| 274 -
net-analyzer/icinga/icinga-1.14.0-r2.ebuild| 274 -
net-analyzer/icinga/icinga-1.14.0.ebuild | 268
net-analyzer/icinga/icinga-1.14.2.ebuild | 2 +-
7 files changed, 1 insertion(+), 1112 deletions(-)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 273da497dae..ed876974bb6 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,4 +1 @@
-DIST CVE-2015-8010_1.13.3.patch 177807 BLAKE2B
c3832442d2953f28793236cd29c537041fc68e976e593da4793cd55c240de784c5bb3996ff38464097b3af27bb276d21c7538c90d2470d5067a831b1800f2874
SHA512
bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a
-DIST icinga-1.13.4.tar.gz 18741576 BLAKE2B
fccc88c8749d405e29961e5a1510bec7f920fc43910be757668392098f4ff19ed9f659de911f97e150eea8bd8cfd7a60b440704bdcd9aba450ba1ea29222d1cf
SHA512
245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6
-DIST icinga-1.14.0.tar.gz 20779347 BLAKE2B
65899e99fdc57563aa1dee6f19572c032c5ab6e2aa7093482bd6d6068b4d066d3630ce9bf1396efcb65592d4f25292149178dac81a2a0b775745f70b7409bcc0
SHA512
f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
DIST icinga-1.14.2.tar.gz 20779284 BLAKE2B
ffc5ab7195faa64b01ae2f37385590405a5525b5ba0cb357bbdc24eb61c1590d25f299d706debb1af1026215dd3800c5133a5fe81cbce8708e0f7ee761a584e2
SHA512
9e993d9653497a5942ad6c3d1ef50b5da4153ba2c7a747aa094c2628f36b687033588b629ca21f8955c84fc6a15f7a7d8169f8b8677f36939bab76cc5e398e41
diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
deleted file mode 100644
index 256cfc83232..000
--- a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rupN icinga-1.7.0beta1-orig//base/Makefile.in
icinga-1.7.0beta1//base/Makefile.in
icinga-1.7.0beta1-orig//base/Makefile.in 2012-05-09 07:10:21.0
-0500
-+++ icinga-1.7.0beta1//base/Makefile.in2012-05-14 14:00:29.666346315
-0500
-@@ -41,7 +41,7 @@ HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
- COMMAND_OPTS=@COMMAND_OPTS@
--STRIP=@STRIP@
-+STRIP=/bin/true
-
- CGIURL=@cgiurl@
- HTMURL=@htmurl@
-diff -rupN icinga-1.7.0beta1-orig//cgi/Makefile.in
icinga-1.7.0beta1//cgi/Makefile.in
icinga-1.7.0beta1-orig//cgi/Makefile.in2012-05-09 07:10:21.0
-0500
-+++ icinga-1.7.0beta1//cgi/Makefile.in 2012-05-14 14:00:43.285346614 -0500
-@@ -21,7 +21,7 @@ INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
- INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
- COMMAND_OPTS=@COMMAND_OPTS@
--STRIP=@STRIP@
-+STRIP=/bin/true
-
- CGIEXTRAS=@CGIEXTRAS@
diff --git a/net-analyzer/icinga/icinga-1.13.4.ebuild
b/net-analyzer/icinga/icinga-1.13.4.ebuild
deleted file mode 100644
index 4f6eef1f43e..000
--- a/net-analyzer/icinga/icinga-1.13.4.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user
versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/;
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
-
https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch;
-S="${WORKDIR}/${PN}-core-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
- perl? ( dev-lang/perl:= )
- virtual/mailx
- web? (
- media-libs/gd[jpeg,png]
- lighttpd? ( www-servers/lighttpd )
- )
- !net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
- plugins? (
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: b1035a95482a29848833574f945889e167f5a2db
Author: Matthew Thode gentoo org>
AuthorDate: Fri Dec 22 22:13:15 2017 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Dec 22 22:34:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1035a95
net-analyzer/icinga: no more manually fixing stripping
removed in commit fe24b74619eee99446a17dcbd8c6fe88095df988
fixes: Bug 641986
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-analyzer/icinga/icinga-1.14.2.ebuild | 9 -
1 file changed, 9 deletions(-)
diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild
b/net-analyzer/icinga/icinga-1.14.2.ebuild
index 681ce94efa8..c7931ece03d 100644
--- a/net-analyzer/icinga/icinga-1.14.2.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.2.ebuild
@@ -7,10 +7,6 @@ inherit depend.apache eutils multilib pax-utils
toolchain-funcs user versionator
DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
HOMEPAGE="http://www.icinga.org/;
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz;
S="${WORKDIR}/${PN}-core-${PV}"
@@ -42,11 +38,6 @@ pkg_setup() {
enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
}
-src_prepare() {
- epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
- eapply_user
-}
-
src_configure() {
local myconf
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/, net-analyzer/icinga/files/
commit: 926ea83a6bf896333bdf10a58d240cfb500cb171
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Dec 21 21:56:43 2017 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Dec 21 21:56:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=926ea83a
net-analyzer/icinga: fix start under grsec
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-analyzer/icinga/files/icinga-init.d | 7 +-
net-analyzer/icinga/icinga-1.14.0-r2.ebuild | 274
2 files changed, 279 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga/files/icinga-init.d
b/net-analyzer/icinga/files/icinga-init.d
index af1f3c5d29e..3a20f31c194 100644
--- a/net-analyzer/icinga/files/icinga-init.d
+++ b/net-analyzer/icinga/files/icinga-init.d
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
: ${ICINGACFG:=/etc/icinga/icinga.cfg}
@@ -41,9 +41,12 @@ reload()
}
start_pre() {
- checkpath -d -o icinga:icinga $(get_config temp_path) $(dirname
$(get_config lock_file)) $(dirname $(get_config log_file)) $(dirname
$(get_config status_file))
+ checkpath -d -o icinga:icinga $(dirname $(get_config lock_file))
$(dirname $(get_config log_file)) $(dirname $(get_config status_file))
checkpath -f -o icinga:icinga $(get_config log_file)
rm -f $(get_config command_file)
+ # Temp dir must NOT be group-writable
+ # grsec: denied untrusted exec (due to file in group-writable directory)
+ checkpath -d -o icinga:icinga -m 0750 $(get_config temp_path)
}
stop_post() {
diff --git a/net-analyzer/icinga/icinga-1.14.0-r2.ebuild
b/net-analyzer/icinga/icinga-1.14.0-r2.ebuild
new file mode 100644
index 000..681ce94efa8
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.14.0-r2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user
versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/;
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz;
+S="${WORKDIR}/${PN}-core-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+ perl? ( dev-lang/perl:= )
+ virtual/mailx
+ web? (
+ media-libs/gd[jpeg,png]
+ lighttpd? ( www-servers/lighttpd )
+ )
+ !net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+ plugins? ( || (
+ net-analyzer/monitoring-plugins
+ net-analyzer/nagios-plugins
+ ) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+ eapply_user
+}
+
+src_configure() {
+ local myconf
+
+ myconf="$(use_enable perl embedded-perl)
+ $(use_with perl perlcache)
+ $(use_enable idoutils)
+ $(use_enable ssl)
+ --with-cgiurl=/icinga/cgi-bin
+ --with-log-dir=/var/log/icinga
+ --libdir=/usr/$(get_libdir)
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --with-lockfile=/var/run/icinga/icinga.lock
+ --with-temp-dir=/tmp/icinga
+ --with-temp-file=/tmp/icinga/icinga.tmp"
+
+ if use idoutils ; then
+ myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+ --with-icinga-chkfile=/var/lib/icinga/icinga.chk
+ --with-ido-sockfile=/var/lib/icinga/ido.sock
+ --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+ fi
+
+ if use eventhandler ; then
+ myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+ fi
+
+ if use plugins ; then
+ myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+ else
+ myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+ fi
+
+ if use !apache2 && use !lighttpd ; then
+ myconf+=" --with-command-group=icinga"
+ else
+ if use apache2 ; then
+ myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/
commit: b032ab72ff9057e732a10a970572a170113d2f23
Author: Matthew Thode gentoo org>
AuthorDate: Wed Dec 20 23:42:26 2017 +
Commit: Matt Thode gentoo org>
CommitDate: Wed Dec 20 23:42:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b032ab72
net-analyzer/icinga-web: 1.14.1 bup
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-analyzer/icinga-web/Manifest | 1 +
net-analyzer/icinga-web/icinga-web-1.14.1.ebuild | 205 +++
2 files changed, 206 insertions(+)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 7288c6e0f66..d0ad9ec787d 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1 +1,2 @@
DIST icinga-web-1.14.0.tar.gz 14523746 BLAKE2B
cff22c031ecc8af73690ea69c692b530aebd3f35c7a148999aedd9b142a6c304a88ee62af28ac0f80c09174bde6c1af15131596ad2ae8a7c3238a247261adc60
SHA512
9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b
+DIST icinga-web-1.14.1.tar.gz 14524043 BLAKE2B
0a3bdf9afc77b508dd3967e38050f6babfe01240f8cf8196158abe42818079b09a962513541298d0b0ac2b1497640d292cf1ef4feac24e302c0622f6ef0fafd8
SHA512
1ddb1fe128c2ceff20e232d61d84abebbe9578f2ef9bf0c408523c399ab6125dedc7d4e82981fff113aba8959a1ac02712032b4a36e5aa951850c084792a47bb
diff --git a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
new file mode 100644
index 000..cac1bd8c81a
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit depend.apache eutils user multilib
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/;
+SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz;
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+ dev-db/libdbi-drivers[mysql?,postgres?]
+ || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
+
dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
+ pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+ if use apache2 ; then
+ depend.apache_pkg_setup
+ fi
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ #removed checks for some php stuff since we have these things called
use flags
+ sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g'
configure.ac
+ sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
+ autoreconf
+}
+
+src_configure() {
+ local myconf
+
+ myconf="--prefix=/usr/share/icinga/icinga-web
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --libexecdir=/usr/$(get_libdir)/icinga/plugins
+ --with-bin-user=icinga
+ --with-bin-group=nagios
+ --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+ --with-conf-dir=/etc/icinga-web
+ --with-log-dir=/var/log/icinga-web
+ --with-icinga-objects-dir=/etc/icinga/objects
+ --with-icinga-bin=/usr/sbin/icinga
+ --with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+ if use apache2 ; then
+ myconf+=" --with-web-user=apache
+ --with-web-group=apache
+ --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
+ else
+ myconf+=" --with-web-user=root
+ --with-web-group=root"
+ fi
+
+ if use postgres ; then
+ myconf+=" --with-db-type=pgsql
+ --with-db-port=5432
+ --with-api-subtype=pgsql
+ --with-api-port=5432"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ dodoc README
+ rm -f README
+
+ emake -j1 DESTDIR="${D}" install
+
+ emake DESTDIR="${D}" install-javascript
+
+ if use apache2 ; then
+ dodir ${APACHE_MODULES_CONFDIR}
+ emake DESTDIR="${D}" install-apache-config
+ echo '' >
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+ cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >>
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+ rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm
failed"
+ echo '' >>
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+ fi
+
+ insinto /usr/share/icinga/icinga-web/contrib
+ doins -r etc/schema/*
+
+ if use apache2 ; then
+ sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron
+ else
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 33784c87a950e8858fb761cfd06db6b81282
Author: Matthew Thode gentoo org>
AuthorDate: Wed Dec 20 23:36:54 2017 +
Commit: Matt Thode gentoo org>
CommitDate: Wed Dec 20 23:36:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33784c87
net-analyzer/icinga: 1.14.2 bup
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-analyzer/icinga/Manifest | 1 +
net-analyzer/icinga/icinga-1.14.2.ebuild | 274 +++
2 files changed, 275 insertions(+)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index fa302613897..273da497dae 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,3 +1,4 @@
DIST CVE-2015-8010_1.13.3.patch 177807 BLAKE2B
c3832442d2953f28793236cd29c537041fc68e976e593da4793cd55c240de784c5bb3996ff38464097b3af27bb276d21c7538c90d2470d5067a831b1800f2874
SHA512
bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a
DIST icinga-1.13.4.tar.gz 18741576 BLAKE2B
fccc88c8749d405e29961e5a1510bec7f920fc43910be757668392098f4ff19ed9f659de911f97e150eea8bd8cfd7a60b440704bdcd9aba450ba1ea29222d1cf
SHA512
245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6
DIST icinga-1.14.0.tar.gz 20779347 BLAKE2B
65899e99fdc57563aa1dee6f19572c032c5ab6e2aa7093482bd6d6068b4d066d3630ce9bf1396efcb65592d4f25292149178dac81a2a0b775745f70b7409bcc0
SHA512
f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
+DIST icinga-1.14.2.tar.gz 20779284 BLAKE2B
ffc5ab7195faa64b01ae2f37385590405a5525b5ba0cb357bbdc24eb61c1590d25f299d706debb1af1026215dd3800c5133a5fe81cbce8708e0f7ee761a584e2
SHA512
9e993d9653497a5942ad6c3d1ef50b5da4153ba2c7a747aa094c2628f36b687033588b629ca21f8955c84fc6a15f7a7d8169f8b8677f36939bab76cc5e398e41
diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild
b/net-analyzer/icinga/icinga-1.14.2.ebuild
new file mode 100644
index 000..681ce94efa8
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.14.2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user
versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/;
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz;
+S="${WORKDIR}/${PN}-core-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+ perl? ( dev-lang/perl:= )
+ virtual/mailx
+ web? (
+ media-libs/gd[jpeg,png]
+ lighttpd? ( www-servers/lighttpd )
+ )
+ !net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+ plugins? ( || (
+ net-analyzer/monitoring-plugins
+ net-analyzer/nagios-plugins
+ ) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+ eapply_user
+}
+
+src_configure() {
+ local myconf
+
+ myconf="$(use_enable perl embedded-perl)
+ $(use_with perl perlcache)
+ $(use_enable idoutils)
+ $(use_enable ssl)
+ --with-cgiurl=/icinga/cgi-bin
+ --with-log-dir=/var/log/icinga
+ --libdir=/usr/$(get_libdir)
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --with-lockfile=/var/run/icinga/icinga.lock
+ --with-temp-dir=/tmp/icinga
+ --with-temp-file=/tmp/icinga/icinga.tmp"
+
+ if use idoutils ; then
+ myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+ --with-icinga-chkfile=/var/lib/icinga/icinga.chk
+ --with-ido-sockfile=/var/lib/icinga/ido.sock
+ --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+ fi
+
+ if use eventhandler ; then
+ myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+ fi
+
+ if use plugins ; then
+ myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+ else
+ myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 8b9ce8259b379a8b409936efc77363b07197afa3
Author: Matthew Thode gentoo org>
AuthorDate: Sun Dec 3 17:57:25 2017 +
Commit: Matt Thode gentoo org>
CommitDate: Sun Dec 3 17:57:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9ce825
net-analyzer/icinga: don't do unnecessary chowns
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-analyzer/icinga/icinga-1.14.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
index bf0de98f741..681ce94efa8 100644
--- a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
@@ -165,7 +165,7 @@ src_install() {
if use eventhandler ; then
dodir /etc/icinga/eventhandlers
- fowners icinga:icinga /etc/icinga/eventhandlers
+# fowners icinga:icinga /etc/icinga/eventhandlers
fi
keepdir /etc/icinga
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 3d8ca20a1484cffc1de9da7bbb0131122f32b95c
Author: Matthew Thode gentoo org>
AuthorDate: Sun Dec 3 03:28:07 2017 +
Commit: Matt Thode gentoo org>
CommitDate: Sun Dec 3 03:29:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d8ca20a
net-analyzer/icinga: fixing bug 638186 CVE-2017-16882
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-analyzer/icinga/Manifest| 2 +-
net-analyzer/icinga/icinga-1.14.0-r1.ebuild | 274
2 files changed, 275 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 825510b0967..fa302613897 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,3 +1,3 @@
DIST CVE-2015-8010_1.13.3.patch 177807 BLAKE2B
c3832442d2953f28793236cd29c537041fc68e976e593da4793cd55c240de784c5bb3996ff38464097b3af27bb276d21c7538c90d2470d5067a831b1800f2874
SHA512
bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a
-DIST icinga-1.13.4.tar.gz 18741576 SHA256
5690f6b3f3340d341a265fe61598ff3f64cb7d135a0059e791b51c77bcd4833b SHA512
245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6
WHIRLPOOL
92c444ae98139c570b420cef83182401ee7756328a4edd89b52187c1844526aea0e374839395df082fff4504e2ace14366488a2d1d0864998890add32cd08c40
+DIST icinga-1.13.4.tar.gz 18741576 BLAKE2B
fccc88c8749d405e29961e5a1510bec7f920fc43910be757668392098f4ff19ed9f659de911f97e150eea8bd8cfd7a60b440704bdcd9aba450ba1ea29222d1cf
SHA512
245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6
DIST icinga-1.14.0.tar.gz 20779347 BLAKE2B
65899e99fdc57563aa1dee6f19572c032c5ab6e2aa7093482bd6d6068b4d066d3630ce9bf1396efcb65592d4f25292149178dac81a2a0b775745f70b7409bcc0
SHA512
f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
diff --git a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
new file mode 100644
index 000..bf0de98f741
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user
versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/;
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz;
+S="${WORKDIR}/${PN}-core-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+ perl? ( dev-lang/perl:= )
+ virtual/mailx
+ web? (
+ media-libs/gd[jpeg,png]
+ lighttpd? ( www-servers/lighttpd )
+ )
+ !net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+ plugins? ( || (
+ net-analyzer/monitoring-plugins
+ net-analyzer/nagios-plugins
+ ) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+ eapply_user
+}
+
+src_configure() {
+ local myconf
+
+ myconf="$(use_enable perl embedded-perl)
+ $(use_with perl perlcache)
+ $(use_enable idoutils)
+ $(use_enable ssl)
+ --with-cgiurl=/icinga/cgi-bin
+ --with-log-dir=/var/log/icinga
+ --libdir=/usr/$(get_libdir)
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --with-lockfile=/var/run/icinga/icinga.lock
+ --with-temp-dir=/tmp/icinga
+ --with-temp-file=/tmp/icinga/icinga.tmp"
+
+ if use idoutils ; then
+ myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+ --with-icinga-chkfile=/var/lib/icinga/icinga.chk
+ --with-ido-sockfile=/var/lib/icinga/ido.sock
+ --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+ fi
+
+ if use eventhandler ; then
+ myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+ fi
+
+ if use plugins ; then
+ myconf+="
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: d5b76fe144fcd8ea7094054569122ce0d1057fa7 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Nov 29 13:38:02 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Nov 29 13:38:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b76fe1 net-analyzer/icinga: 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 gentoo.org> net-analyzer/icinga/Manifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index 076c601b5fd..825510b0967 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -1,3 +1,3 @@ -DIST CVE-2015-8010_1.13.3.patch 177807 SHA256 8ccd8cdf221b8f2aa90ae1e4c76ccc61e7cf7519eadc9482c671502c2138c2a7 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a WHIRLPOOL 90f3eb3a6ad79337cf9d7fe63e201e313769fea6e3fdf2f2de0b2072b1b21e66d650b632794dcb39b458e7c17449f7fb2d45d678a3b628a467496284f238231d +DIST CVE-2015-8010_1.13.3.patch 177807 BLAKE2B c3832442d2953f28793236cd29c537041fc68e976e593da4793cd55c240de784c5bb3996ff38464097b3af27bb276d21c7538c90d2470d5067a831b1800f2874 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a DIST icinga-1.13.4.tar.gz 18741576 SHA256 5690f6b3f3340d341a265fe61598ff3f64cb7d135a0059e791b51c77bcd4833b SHA512 245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6 WHIRLPOOL 92c444ae98139c570b420cef83182401ee7756328a4edd89b52187c1844526aea0e374839395df082fff4504e2ace14366488a2d1d0864998890add32cd08c40 -DIST icinga-1.14.0.tar.gz 20779347 SHA256 440d6b0596804cdfb21ed93b4f74592a144e7d9ee15cc88b3079276cb0370851 SHA512 f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a WHIRLPOOL 165c32d53d328de53822bae6cc0b68f4529c4a9ebb1aab5ccd97fa6e42256025f788dda6d09326578907c7b4a0ce2e72f50f95b923a378401fcc4dbd7f415522 +DIST icinga-1.14.0.tar.gz 20779347 BLAKE2B 65899e99fdc57563aa1dee6f19572c032c5ab6e2aa7093482bd6d6068b4d066d3630ce9bf1396efcb65592d4f25292149178dac81a2a0b775745f70b7409bcc0 SHA512 f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 370dcd7b08ff7797d1bb8e39b454a92b4a320cfd
Author: Michael Weber gentoo org>
AuthorDate: Tue May 16 22:03:33 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Tue May 16 22:03:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370dcd7b
net-analyzer/icinga: add ~ppc ~ppc64 keywords (bug 605724).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="ppc ppc64"
net-analyzer/icinga/icinga-1.14.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga/icinga-1.14.0.ebuild
b/net-analyzer/icinga/icinga-1.14.0.ebuild
index f22db86ed82..f05bc0bec4a 100644
--- a/net-analyzer/icinga/icinga-1.14.0.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-core-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl:= )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 6e4b812a15811b75f373f3a647d9047b59370024
Author: Matthew Thode gentoo org>
AuthorDate: Sat Dec 24 19:15:55 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Sat Dec 24 19:15:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4b812a
net-analyzer/icinga: use the correct S directory
Package-Manager: portage-2.3.0
net-analyzer/icinga/icinga-1.13.4.ebuild | 1 +
net-analyzer/icinga/icinga-1.14.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/icinga/icinga-1.13.4.ebuild
b/net-analyzer/icinga/icinga-1.13.4.ebuild
index 61bb779..4279330 100644
--- a/net-analyzer/icinga/icinga-1.13.4.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.4.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="http://www.icinga.org/;
#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch;
+S="${WORKDIR}/${PN}-core-${PV}"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-analyzer/icinga/icinga-1.14.0.ebuild
b/net-analyzer/icinga/icinga-1.14.0.ebuild
index 61bb779..0a18be7 100644
--- a/net-analyzer/icinga/icinga-1.14.0.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.0.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="http://www.icinga.org/;
#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch;
+S="${WORKDIR}/${PN}-core-${PV}"
LICENSE="GPL-2"
SLOT="0"
@@ -45,7 +46,6 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
- epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch"
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/
commit: 0240fc01e53aa2c0ec470fccceb828bc9d649b69
Author: Matthew Thode gentoo org>
AuthorDate: Fri Dec 23 03:14:27 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Dec 23 03:18:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0240fc01
net-analyzer/icinga-web: bup for bug 603536
Package-Manager: portage-2.3.0
net-analyzer/icinga-web/Manifest | 1 +
net-analyzer/icinga-web/icinga-web-1.14.0.ebuild | 206 +++
2 files changed, 207 insertions(+)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 3b690ec..9dab8e2 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,2 +1,3 @@
DIST icinga-web-1.11.2.tar.gz 14133733 SHA256
726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512
ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1
WHIRLPOOL
bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
DIST icinga-web-1.12.0.tar.gz 14517225 SHA256
3e802ae0cbcabb9555908bf91b9c40d9c07eb80a8acc70f0c9cbd426e3feb675 SHA512
07831c62479e2c83929bd86dc8d7e57558d8e3b3dac2952d64e5170dc508d836cfb2e7446019d2ec9bea03740fc1c55e5857d2fd88fe67ea2726375f77246898
WHIRLPOOL
85ca6ad8423b72dcf77de6243b29fc9c5fadb09f68b56ae57380637014deea60749ff7c942b43d4965ab23efb2d4d79b9cffb194ed6d21e5262373b856ae9b1a
+DIST icinga-web-1.14.0.tar.gz 14523746 SHA256
ee57e53417d54ee65b4cabe6c18f15c57cf49750f9fb73691deb9f28b11a740e SHA512
9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b
WHIRLPOOL
628a606e9c9e927258875dc3529e575ccd9c1da7e358bc5cf96b55068741380a36c89935217dc8b3319942c396f26f50dedb428226f9f99dfa003c7ad3809631
diff --git a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
new file mode 100644
index ..334ba4a
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit depend.apache eutils user multilib
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/;
+SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz;
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+ dev-db/libdbi-drivers[mysql?,postgres?]
+ || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
+
dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
+ pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+ if use apache2 ; then
+ depend.apache_pkg_setup
+ fi
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ #removed checks for some php stuff since we have these things called
use flags
+ sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g'
configure.ac
+ sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
+ autoreconf
+}
+
+src_configure() {
+ local myconf
+
+ myconf="--prefix=/usr/share/icinga/icinga-web
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --libexecdir=/usr/$(get_libdir)/icinga/plugins
+ --with-bin-user=icinga
+ --with-bin-group=nagios
+ --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+ --with-conf-dir=/etc/icinga-web
+ --with-log-dir=/var/log/icinga-web
+ --with-icinga-objects-dir=/etc/icinga/objects
+ --with-icinga-bin=/usr/sbin/icinga
+ --with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+ if use apache2 ; then
+ myconf+=" --with-web-user=apache
+ --with-web-group=apache
+ --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
+ else
+ myconf+=" --with-web-user=root
+ --with-web-group=root"
+ fi
+
+ if use postgres ; then
+ myconf+=" --with-db-type=pgsql
+ --with-db-port=5432
+ --with-api-subtype=pgsql
+ --with-api-port=5432"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ dodoc README
+ rm -f README
+
+ emake -j1 DESTDIR="${D}" install
+
+ emake DESTDIR="${D}" install-javascript
+
+ if use apache2 ; then
+ dodir ${APACHE_MODULES_CONFDIR}
+ emake DESTDIR="${D}" install-apache-config
+ echo '' >
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/
commit: dceb729f0369d72f1d7820705fd12510b71446d2
Author: Matthew Thode gentoo org>
AuthorDate: Fri Dec 23 03:17:34 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Dec 23 03:18:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dceb729f
net-analyzer/icinga-web: cleanup for bug 603536
Package-Manager: portage-2.3.0
net-analyzer/icinga-web/Manifest | 2 -
net-analyzer/icinga-web/icinga-web-1.11.2.ebuild | 206 ---
net-analyzer/icinga-web/icinga-web-1.12.0.ebuild | 206 ---
3 files changed, 414 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 9dab8e2..e21f13d 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,3 +1 @@
-DIST icinga-web-1.11.2.tar.gz 14133733 SHA256
726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512
ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1
WHIRLPOOL
bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
-DIST icinga-web-1.12.0.tar.gz 14517225 SHA256
3e802ae0cbcabb9555908bf91b9c40d9c07eb80a8acc70f0c9cbd426e3feb675 SHA512
07831c62479e2c83929bd86dc8d7e57558d8e3b3dac2952d64e5170dc508d836cfb2e7446019d2ec9bea03740fc1c55e5857d2fd88fe67ea2726375f77246898
WHIRLPOOL
85ca6ad8423b72dcf77de6243b29fc9c5fadb09f68b56ae57380637014deea60749ff7c942b43d4965ab23efb2d4d79b9cffb194ed6d21e5262373b856ae9b1a
DIST icinga-web-1.14.0.tar.gz 14523746 SHA256
ee57e53417d54ee65b4cabe6c18f15c57cf49750f9fb73691deb9f28b11a740e SHA512
9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b
WHIRLPOOL
628a606e9c9e927258875dc3529e575ccd9c1da7e358bc5cf96b55068741380a36c89935217dc8b3319942c396f26f50dedb428226f9f99dfa003c7ad3809631
diff --git a/net-analyzer/icinga-web/icinga-web-1.11.2.ebuild
b/net-analyzer/icinga-web/icinga-web-1.11.2.ebuild
deleted file mode 100644
index 4baca8d..
--- a/net-analyzer/icinga-web/icinga-web-1.11.2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/;
-SRC_URI="https://github.com/icinga/${PN}/releases/download/v${PV}/${P}.tar.gz;
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
- dev-db/libdbi-drivers[mysql?,postgres?]
- || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
-
dev-lang/php[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
- pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
- if use apache2 ; then
- depend.apache_pkg_setup
- fi
- enewgroup icinga
- enewgroup nagios
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
- #removed checks for some php stuff since we have these things called
use flags
- sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g'
configure.ac
- sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
- autoreconf
-}
-
-src_configure() {
- local myconf
-
- myconf="--prefix=/usr/share/icinga/icinga-web
- --bindir=/usr/sbin
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
- --datarootdir=/usr/share/icinga/htdocs
- --localstatedir=/var/lib/icinga
- --sysconfdir=/etc/icinga
- --libexecdir=/usr/$(get_libdir)/icinga/plugins
- --with-bin-user=icinga
- --with-bin-group=nagios
- --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
- --with-conf-dir=/etc/icinga-web
- --with-log-dir=/var/log/icinga-web
- --with-icinga-objects-dir=/etc/icinga/objects
- --with-icinga-bin=/usr/sbin/icinga
- --with-icinga-cfg=/etc/icinga/icinga.cfg"
-
- if use apache2 ; then
- myconf+=" --with-web-user=apache
- --with-web-group=apache
- --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
- else
- myconf+=" --with-web-user=root
- --with-web-group=root"
- fi
-
- if use postgres ; then
- myconf+=" --with-db-type=pgsql
- --with-db-port=5432
- --with-api-subtype=pgsql
- --with-api-port=5432"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- dodoc README
- rm -f README
-
- emake -j1 DESTDIR="${D}" install
-
- emake DESTDIR="${D}" install-javascript
-
- if use apache2 ; then
- dodir ${APACHE_MODULES_CONFDIR}
- emake
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 14232d3f7e2f74358ff490c2b826d8fcf7b8e76b
Author: Matthew Thode gentoo org>
AuthorDate: Fri Dec 23 03:03:31 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Dec 23 03:03:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14232d3f
net-analyzer/icinga: bup, fix CVE-2016-9566
Package-Manager: portage-2.3.0
net-analyzer/icinga/Manifest | 2 +
net-analyzer/icinga/icinga-1.13.4.ebuild | 269 +++
net-analyzer/icinga/icinga-1.14.0.ebuild | 269 +++
3 files changed, 540 insertions(+)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 066d121..1c55cbb 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,2 +1,4 @@
DIST CVE-2015-8010_1.13.3.patch 177807 SHA256
8ccd8cdf221b8f2aa90ae1e4c76ccc61e7cf7519eadc9482c671502c2138c2a7 SHA512
bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a
WHIRLPOOL
90f3eb3a6ad79337cf9d7fe63e201e313769fea6e3fdf2f2de0b2072b1b21e66d650b632794dcb39b458e7c17449f7fb2d45d678a3b628a467496284f238231d
DIST icinga-1.13.3.tar.gz 18738204 SHA256
d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512
babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed
WHIRLPOOL
6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d
+DIST icinga-1.13.4.tar.gz 18741576 SHA256
5690f6b3f3340d341a265fe61598ff3f64cb7d135a0059e791b51c77bcd4833b SHA512
245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6
WHIRLPOOL
92c444ae98139c570b420cef83182401ee7756328a4edd89b52187c1844526aea0e374839395df082fff4504e2ace14366488a2d1d0864998890add32cd08c40
+DIST icinga-1.14.0.tar.gz 20779347 SHA256
440d6b0596804cdfb21ed93b4f74592a144e7d9ee15cc88b3079276cb0370851 SHA512
f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
WHIRLPOOL
165c32d53d328de53822bae6cc0b68f4529c4a9ebb1aab5ccd97fa6e42256025f788dda6d09326578907c7b4a0ce2e72f50f95b923a378401fcc4dbd7f415522
diff --git a/net-analyzer/icinga/icinga-1.13.4.ebuild
b/net-analyzer/icinga/icinga-1.13.4.ebuild
new file mode 100644
index ..54f9d5d
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.13.4.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user
versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/;
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
+
https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+ perl? ( dev-lang/perl:= )
+ virtual/mailx
+ web? (
+ media-libs/gd[jpeg,png]
+ lighttpd? ( www-servers/lighttpd )
+ )
+ !net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+ plugins? ( || (
+ net-analyzer/monitoring-plugins
+ net-analyzer/nagios-plugins
+ ) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+ epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch"
+}
+
+src_configure() {
+ local myconf
+
+ myconf="$(use_enable perl embedded-perl)
+ $(use_with perl perlcache)
+ $(use_enable idoutils)
+ $(use_enable ssl)
+ --with-cgiurl=/icinga/cgi-bin
+ --with-log-dir=/var/log/icinga
+ --libdir=/usr/$(get_libdir)
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --with-lockfile=/var/run/icinga/icinga.lock
+ --with-temp-dir=/tmp/icinga
+ --with-temp-file=/tmp/icinga/icinga.tmp"
+
+ if use idoutils ; then
+ myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+ --with-icinga-chkfile=/var/lib/icinga/icinga.chk
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 65ac8e8685345a7793745c8da40da2ed13af91f7
Author: Matthew Thode gentoo org>
AuthorDate: Fri Dec 23 03:07:01 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Dec 23 03:07:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ac8e86
net-analyzer/icinga: cleanup for bug 603534
Package-Manager: portage-2.3.0
net-analyzer/icinga/Manifest| 1 -
net-analyzer/icinga/icinga-1.13.3-r2.ebuild | 269
2 files changed, 270 deletions(-)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 1c55cbb..076c601 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,4 +1,3 @@
DIST CVE-2015-8010_1.13.3.patch 177807 SHA256
8ccd8cdf221b8f2aa90ae1e4c76ccc61e7cf7519eadc9482c671502c2138c2a7 SHA512
bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a
WHIRLPOOL
90f3eb3a6ad79337cf9d7fe63e201e313769fea6e3fdf2f2de0b2072b1b21e66d650b632794dcb39b458e7c17449f7fb2d45d678a3b628a467496284f238231d
-DIST icinga-1.13.3.tar.gz 18738204 SHA256
d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512
babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed
WHIRLPOOL
6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d
DIST icinga-1.13.4.tar.gz 18741576 SHA256
5690f6b3f3340d341a265fe61598ff3f64cb7d135a0059e791b51c77bcd4833b SHA512
245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6
WHIRLPOOL
92c444ae98139c570b420cef83182401ee7756328a4edd89b52187c1844526aea0e374839395df082fff4504e2ace14366488a2d1d0864998890add32cd08c40
DIST icinga-1.14.0.tar.gz 20779347 SHA256
440d6b0596804cdfb21ed93b4f74592a144e7d9ee15cc88b3079276cb0370851 SHA512
f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
WHIRLPOOL
165c32d53d328de53822bae6cc0b68f4529c4a9ebb1aab5ccd97fa6e42256025f788dda6d09326578907c7b4a0ce2e72f50f95b923a378401fcc4dbd7f415522
diff --git a/net-analyzer/icinga/icinga-1.13.3-r2.ebuild
b/net-analyzer/icinga/icinga-1.13.3-r2.ebuild
deleted file mode 100644
index 3c30764..
--- a/net-analyzer/icinga/icinga-1.13.3-r2.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user
versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/;
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz
-
https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
- perl? ( dev-lang/perl:= )
- virtual/mailx
- web? (
- media-libs/gd[jpeg,png]
- lighttpd? ( www-servers/lighttpd )
- )
- !net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
- plugins? ( || (
- net-analyzer/monitoring-plugins
- net-analyzer/nagios-plugins
- ) )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
- depend.apache_pkg_setup
- enewgroup icinga
- enewgroup nagios
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
- epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch"
-}
-
-src_configure() {
- local myconf
-
- myconf="$(use_enable perl embedded-perl)
- $(use_with perl perlcache)
- $(use_enable idoutils)
- $(use_enable ssl)
- --with-cgiurl=/icinga/cgi-bin
- --with-log-dir=/var/log/icinga
- --libdir=/usr/$(get_libdir)
- --bindir=/usr/sbin
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
- --datarootdir=/usr/share/icinga/htdocs
- --localstatedir=/var/lib/icinga
- --sysconfdir=/etc/icinga
- --with-lockfile=/var/run/icinga/icinga.lock
- --with-temp-dir=/tmp/icinga
- --with-temp-file=/tmp/icinga/icinga.tmp"
-
- if use idoutils ; then
- myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
- --with-icinga-chkfile=/var/lib/icinga/icinga.chk
- --with-ido-sockfile=/var/lib/icinga/ido.sock
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: e1e0a522af21d77b87bcab9afbe069c3c43fbab3
Author: Matthew Thode gentoo org>
AuthorDate: Fri Dec 23 03:06:38 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Dec 23 03:06:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e0a522
net-analyzer/icinga: fast stable for bug 603534
Package-Manager: portage-2.3.0
net-analyzer/icinga/icinga-1.13.4.ebuild | 2 +-
net-analyzer/icinga/icinga-1.14.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga/icinga-1.13.4.ebuild
b/net-analyzer/icinga/icinga-1.13.4.ebuild
index 54f9d5d..61bb779 100644
--- a/net-analyzer/icinga/icinga-1.13.4.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.4.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl:= )
diff --git a/net-analyzer/icinga/icinga-1.14.0.ebuild
b/net-analyzer/icinga/icinga-1.14.0.ebuild
index 54f9d5d..61bb779 100644
--- a/net-analyzer/icinga/icinga-1.14.0.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.0.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl:= )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/
commit: 9cfe53935dec1ba1efc53eeb2eab7456234158c1
Author: Matthew Thode gentoo org>
AuthorDate: Tue Oct 11 18:12:22 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Tue Oct 11 18:14:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfe5393
net-analyzer/icinga-web: bup
Package-Manager: portage-2.3.0
net-analyzer/icinga-web/Manifest | 1 +
net-analyzer/icinga-web/icinga-web-1.12.0.ebuild | 206 +++
2 files changed, 207 insertions(+)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 3422e1d..935b9fd 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,4 +1,5 @@
DIST icinga-web-1.10.0.tar.gz 14245635 SHA256
fe1b43448bcb6a9e8f565f079122e51283539eb6be214e7001c65653686b7f56 SHA512
90537ea710dd6408349b734b0901918db595d2d7a281e9245a63ba0150a4b7df4fabbb71755966361440ca6096391470d7399ddd5f4b245d1203000b89d8b368
WHIRLPOOL
c72004edb2a76efa4ccbea6363fddfa4c6d30c8c368fa57ee0f865d27927bdc5aea691b42c4415b5fe75a12d946768296feffbeb101ff8945377d92da20059bc
DIST icinga-web-1.10.1.tar.gz 14247394 SHA256
b334c063cf4f53fcc1922d99161b5ea5c32c04749c0f9dfe091f376158273664 SHA512
e155c4c00fde20680ed3286fbf7af4db13dd566693ec677a61c719cf8a0b36862bc51741180aceba204e6f768000d8a6dc4548bfbf7165f28f8bbc81c79bc63c
WHIRLPOOL
d4cf2ea128c0e46bf07ce1ae677a4e718405b926250f4972790388d2b45cef5996e16ca5b83dcdd8f8c9a84831a76cb88b76d0839bdce87e222d6712463b6de9
DIST icinga-web-1.11.2.tar.gz 14133733 SHA256
726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512
ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1
WHIRLPOOL
bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
+DIST icinga-web-1.12.0.tar.gz 14517225 SHA256
3e802ae0cbcabb9555908bf91b9c40d9c07eb80a8acc70f0c9cbd426e3feb675 SHA512
07831c62479e2c83929bd86dc8d7e57558d8e3b3dac2952d64e5170dc508d836cfb2e7446019d2ec9bea03740fc1c55e5857d2fd88fe67ea2726375f77246898
WHIRLPOOL
85ca6ad8423b72dcf77de6243b29fc9c5fadb09f68b56ae57380637014deea60749ff7c942b43d4965ab23efb2d4d79b9cffb194ed6d21e5262373b856ae9b1a
DIST icinga-web-1.9.1.tar.gz 14635896 SHA256
aa5b1aa6962a727a6760f89ef19845a878b7e06ee723b8f1fd7821b6a6b578aa SHA512
42a3edddae5a287b87fd6d077ac303e7caa0b430af86e9046413e7d04d703cd3de7df881463eebb1e5216315056e06ce9f6dccbef93b6e55d1c3f5fe002447b9
WHIRLPOOL
8b5a6bf78794f722952566c82ae238640a716e61022fead31145bbc6fa40ca3bbf439aa593c5839b09873f7d43469cff28422ecd9b93e51cc7124859d1ae8257
diff --git a/net-analyzer/icinga-web/icinga-web-1.12.0.ebuild
b/net-analyzer/icinga-web/icinga-web-1.12.0.ebuild
new file mode 100644
index ..ae6a04b
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.12.0.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit depend.apache eutils user multilib
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/;
+SRC_URI="https://github.com/icinga/${PN}/releases/download/v${PV}/${P}.tar.gz;
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+ dev-db/libdbi-drivers[mysql?,postgres?]
+ || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
+
dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
+ pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+ if use apache2 ; then
+ depend.apache_pkg_setup
+ fi
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ #removed checks for some php stuff since we have these things called
use flags
+ sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g'
configure.ac
+ sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
+ autoreconf
+}
+
+src_configure() {
+ local myconf
+
+ myconf="--prefix=/usr/share/icinga/icinga-web
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --libexecdir=/usr/$(get_libdir)/icinga/plugins
+ --with-bin-user=icinga
+ --with-bin-group=nagios
+ --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+ --with-conf-dir=/etc/icinga-web
+ --with-log-dir=/var/log/icinga-web
+ --with-icinga-objects-dir=/etc/icinga/objects
+ --with-icinga-bin=/usr/sbin/icinga
+ --with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+ if use apache2 ; then
+ myconf+=" --with-web-user=apache
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/
commit: b6288f904b64ec7dac4eca9a4311d4f0a11f1d18
Author: Matthew Thode gentoo org>
AuthorDate: Tue Oct 11 18:13:27 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Tue Oct 11 18:14:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6288f90
net-analyzer/icinga-web: cleanup
Package-Manager: portage-2.3.0
net-analyzer/icinga-web/Manifest | 3 -
.../icinga-web/icinga-web-1.10.0-r1.ebuild | 206 -
net-analyzer/icinga-web/icinga-web-1.10.0.ebuild | 206 -
net-analyzer/icinga-web/icinga-web-1.10.1.ebuild | 206 -
net-analyzer/icinga-web/icinga-web-1.9.1-r1.ebuild | 203
5 files changed, 824 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 935b9fd..3b690ec 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,5 +1,2 @@
-DIST icinga-web-1.10.0.tar.gz 14245635 SHA256
fe1b43448bcb6a9e8f565f079122e51283539eb6be214e7001c65653686b7f56 SHA512
90537ea710dd6408349b734b0901918db595d2d7a281e9245a63ba0150a4b7df4fabbb71755966361440ca6096391470d7399ddd5f4b245d1203000b89d8b368
WHIRLPOOL
c72004edb2a76efa4ccbea6363fddfa4c6d30c8c368fa57ee0f865d27927bdc5aea691b42c4415b5fe75a12d946768296feffbeb101ff8945377d92da20059bc
-DIST icinga-web-1.10.1.tar.gz 14247394 SHA256
b334c063cf4f53fcc1922d99161b5ea5c32c04749c0f9dfe091f376158273664 SHA512
e155c4c00fde20680ed3286fbf7af4db13dd566693ec677a61c719cf8a0b36862bc51741180aceba204e6f768000d8a6dc4548bfbf7165f28f8bbc81c79bc63c
WHIRLPOOL
d4cf2ea128c0e46bf07ce1ae677a4e718405b926250f4972790388d2b45cef5996e16ca5b83dcdd8f8c9a84831a76cb88b76d0839bdce87e222d6712463b6de9
DIST icinga-web-1.11.2.tar.gz 14133733 SHA256
726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512
ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1
WHIRLPOOL
bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
DIST icinga-web-1.12.0.tar.gz 14517225 SHA256
3e802ae0cbcabb9555908bf91b9c40d9c07eb80a8acc70f0c9cbd426e3feb675 SHA512
07831c62479e2c83929bd86dc8d7e57558d8e3b3dac2952d64e5170dc508d836cfb2e7446019d2ec9bea03740fc1c55e5857d2fd88fe67ea2726375f77246898
WHIRLPOOL
85ca6ad8423b72dcf77de6243b29fc9c5fadb09f68b56ae57380637014deea60749ff7c942b43d4965ab23efb2d4d79b9cffb194ed6d21e5262373b856ae9b1a
-DIST icinga-web-1.9.1.tar.gz 14635896 SHA256
aa5b1aa6962a727a6760f89ef19845a878b7e06ee723b8f1fd7821b6a6b578aa SHA512
42a3edddae5a287b87fd6d077ac303e7caa0b430af86e9046413e7d04d703cd3de7df881463eebb1e5216315056e06ce9f6dccbef93b6e55d1c3f5fe002447b9
WHIRLPOOL
8b5a6bf78794f722952566c82ae238640a716e61022fead31145bbc6fa40ca3bbf439aa593c5839b09873f7d43469cff28422ecd9b93e51cc7124859d1ae8257
diff --git a/net-analyzer/icinga-web/icinga-web-1.10.0-r1.ebuild
b/net-analyzer/icinga-web/icinga-web-1.10.0-r1.ebuild
deleted file mode 100644
index 99c69cc..
--- a/net-analyzer/icinga-web/icinga-web-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/;
-SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
- dev-db/libdbi-drivers[mysql?,postgres?]
- >=net-analyzer/icinga-1.10.0
-
dev-lang/php[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
- pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
- if use apache2 ; then
- depend.apache_pkg_setup
- fi
- enewgroup icinga
- enewgroup nagios
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
- #removed checks for some php stuff since we have these things called
use flags
- sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g'
configure.ac
- sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
- autoreconf
-}
-
-src_configure() {
- local myconf
-
- myconf="--prefix=/usr/share/icinga/icinga-web
- --bindir=/usr/sbin
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
- --datarootdir=/usr/share/icinga/htdocs
- --localstatedir=/var/lib/icinga
- --sysconfdir=/etc/icinga
- --libexecdir=/usr/$(get_libdir)/icinga/plugins
- --with-bin-user=icinga
- --with-bin-group=nagios
- --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
- --with-conf-dir=/etc/icinga-web
- --with-log-dir=/var/log/icinga-web
- --with-icinga-objects-dir=/etc/icinga/objects
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 6f1d011e30dbce0eab4052d9960e486e1c6352bf
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Sep 29 21:27:21 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Thu Sep 29 21:27:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1d011e
net-analyzer/icinga: Add missing slot operator in Perl dependency, bug 595428
Package-Manager: portage-2.3.0
.../icinga/{icinga-1.13.3-r1.ebuild => icinga-1.13.3-r2.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
b/net-analyzer/icinga/icinga-1.13.3-r2.ebuild
similarity index 99%
rename from net-analyzer/icinga/icinga-1.13.3-r1.ebuild
rename to net-analyzer/icinga/icinga-1.13.3-r2.ebuild
index 3813739..3c30764 100644
--- a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.3-r2.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm ~hppa x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
- perl? ( dev-lang/perl )
+ perl? ( dev-lang/perl:= )
virtual/mailx
web? (
media-libs/gd[jpeg,png]
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: d8c4ef7b43c4ca1ae553baa662ac7675f40ec97d
Author: Matthew Thode gentoo org>
AuthorDate: Fri Mar 18 12:48:45 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Fri Mar 18 12:48:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c4ef7b
net-analyzer/icinga: adding arm keyword
Package-Manager: portage-2.2.26
net-analyzer/icinga/icinga-1.13.3-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
index 0a2ab1b..3813739 100644
--- a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@
SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 8f860eae63294ab685b1652602264d781371204a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Nov 5 10:06:16 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Nov 5 10:06:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f860eae
net-analyzer/icinga: amd64 stable wrt bug #564242
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
net-analyzer/icinga/icinga-1.13.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
index 6580643..332ca03 100644
--- a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 1213c048912abc498e80cb060db464a85bf7be58
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Nov 5 10:07:17 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Nov 5 10:07:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1213c048
net-analyzer/icinga: x86 stable wrt bug #564242
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
net-analyzer/icinga/icinga-1.13.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
index 332ca03..0a2ab1b 100644
--- a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 1c528e6cb25c1ea7799821ab4c5771e1afcc893e
Author: Matthew Thode gentoo org>
AuthorDate: Thu Nov 5 10:44:45 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Thu Nov 5 10:44:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c528e6c
net-analyzer/icinga: cleanup
Package-Manager: portage-2.2.20.1
net-analyzer/icinga/icinga-1.13.3.ebuild | 267 ---
1 file changed, 267 deletions(-)
diff --git a/net-analyzer/icinga/icinga-1.13.3.ebuild
b/net-analyzer/icinga/icinga-1.13.3.ebuild
deleted file mode 100644
index cb9a0d9..000
--- a/net-analyzer/icinga/icinga-1.13.3.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user
versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/;
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
- perl? ( dev-lang/perl )
- virtual/mailx
- web? (
- media-libs/gd[jpeg,png]
- lighttpd? ( www-servers/lighttpd )
- )
- !net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
- plugins? ( || (
- net-analyzer/monitoring-plugins
- net-analyzer/nagios-plugins
- ) )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
- depend.apache_pkg_setup
- enewgroup icinga
- enewgroup nagios
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
- local myconf
-
- myconf="$(use_enable perl embedded-perl)
- $(use_with perl perlcache)
- $(use_enable idoutils)
- $(use_enable ssl)
- --with-cgiurl=/icinga/cgi-bin
- --with-log-dir=/var/log/icinga
- --libdir=/usr/$(get_libdir)
- --bindir=/usr/sbin
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
- --datarootdir=/usr/share/icinga/htdocs
- --localstatedir=/var/lib/icinga
- --sysconfdir=/etc/icinga
- --with-lockfile=/var/run/icinga/icinga.lock
- --with-temp-dir=/tmp/icinga
- --with-temp-file=/tmp/icinga/icinga.tmp"
-
- if use idoutils ; then
- myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
- --with-icinga-chkfile=/var/lib/icinga/icinga.chk
- --with-ido-sockfile=/var/lib/icinga/ido.sock
- --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
- fi
-
- if use eventhandler ; then
- myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
- fi
-
- if use plugins ; then
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
- else
- myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
- fi
-
- if use !apache2 && use !lighttpd ; then
- myconf+=" --with-command-group=icinga"
- else
- if use apache2 ; then
- myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
- myconf+=" --with-command-group=apache"
- elif use lighttpd ; then
- myconf+=" --with-command-group=lighttpd"
- fi
- fi
-
- econf ${myconf}
-}
-
-src_compile() {
- tc-export CC
-
- emake icinga || die "make failed"
-
- if use web ; then
- emake DESTDIR="${D}" cgis || die
- fi
-
- if use contrib ; then
- emake DESTDIR="${D}" -C contrib || die
- fi
-
- if use idoutils ; then
- emake DESTDIR="${D}" idoutils || die
- fi
-}
-
-src_install() {
- dodoc Changelog README UPGRADING || die
-
- if ! use web ; then
- sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
- fi
-
- emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
- if use idoutils ; then
-emake DESTDIR="${D}" install-idoutils || die
- fi
-
- if use contrib ; then
- emake DESTDIR="${D}" -C contrib install || die
- fi
-
- if use eventhandler ; then
- emake DESTDIR="${D}" install-eventhandlers || die
- fi
-
- newinitd "${FILESDIR}"/icinga-init.d icinga || die
- newconfd "${FILESDIR}"/icinga-conf.d icinga || die
- if use idoutils ; then
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
commit: a80a930bddca672f6fa5a51beacc9abd9c1fb6a2
Author: Matthew Thode gentoo org>
AuthorDate: Wed Nov 4 23:10:56 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Wed Nov 4 23:10:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a80a930b
net-analyzer/icinga: actually fixing CVE-2015-8010 bug 564242
Package-Manager: portage-2.2.20.1
.../icinga/files/CVE-2015-8010_1.13.3.patch| 0
net-analyzer/icinga/icinga-1.13.3-r1.ebuild| 268 +
2 files changed, 268 insertions(+)
diff --git a/net-analyzer/icinga/files/CVE-2015-8010_1.13.3.patch
b/net-analyzer/icinga/files/CVE-2015-8010_1.13.3.patch
new file mode 100644
index 000..e69de29
diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
new file mode 100644
index 000..9560c51
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user
versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/;
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+ perl? ( dev-lang/perl )
+ virtual/mailx
+ web? (
+ media-libs/gd[jpeg,png]
+ lighttpd? ( www-servers/lighttpd )
+ )
+ !net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+ plugins? ( || (
+ net-analyzer/monitoring-plugins
+ net-analyzer/nagios-plugins
+ ) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+ epatch "${FILESDIR}/CVE-2015-8010_1.13.3.patch"
+}
+
+src_configure() {
+ local myconf
+
+ myconf="$(use_enable perl embedded-perl)
+ $(use_with perl perlcache)
+ $(use_enable idoutils)
+ $(use_enable ssl)
+ --with-cgiurl=/icinga/cgi-bin
+ --with-log-dir=/var/log/icinga
+ --libdir=/usr/$(get_libdir)
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --with-lockfile=/var/run/icinga/icinga.lock
+ --with-temp-dir=/tmp/icinga
+ --with-temp-file=/tmp/icinga/icinga.tmp"
+
+ if use idoutils ; then
+ myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+ --with-icinga-chkfile=/var/lib/icinga/icinga.chk
+ --with-ido-sockfile=/var/lib/icinga/ido.sock
+ --with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+ fi
+
+ if use eventhandler ; then
+ myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+ fi
+
+ if use plugins ; then
+ myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+ else
+ myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+ fi
+
+ if use !apache2 && use !lighttpd ; then
+ myconf+=" --with-command-group=icinga"
+ else
+ if use apache2 ; then
+ myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+ myconf+=" --with-command-group=apache"
+ elif use lighttpd ; then
+ myconf+=" --with-command-group=lighttpd"
+ fi
+ fi
+
+ econf ${myconf}
+}
+
+src_compile() {
+ tc-export CC
+
+ emake icinga || die "make failed"
+
+ if use web ; then
+ emake DESTDIR="${D}" cgis || die
+ fi
+
+ if use contrib ; then
+ emake DESTDIR="${D}" -C contrib || die
+ fi
+
+ if use idoutils ; then
+ emake DESTDIR="${D}" idoutils || die
+ fi
+}
+
+src_install() {
+ dodoc Changelog README UPGRADING || die
+
+ if ! use web ; then
+ sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
+ fi
+
+ emake DESTDIR="${D}" install{,-config,-commandmode} || die
+
+ if use idoutils ; then
+emake DESTDIR="${D}" install-idoutils || die
+ fi
+
+ if use contrib ; then
+ emake DESTDIR="${D}"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/, net-analyzer/icinga/files/
commit: b0b83ba267a1daadaa6cc671c67cd7bfc09b42bb
Author: Matthew Thode gentoo org>
AuthorDate: Wed Nov 4 23:37:36 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Wed Nov 4 23:37:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b83ba2
net-analyzer/icinga: actually fixing bug 564242 CVE-2015-8010
Package-Manager: portage-2.2.20.1
net-analyzer/icinga/Manifest | 1 +
net-analyzer/icinga/files/CVE-2015-8010_1.13.3.patch | 0
net-analyzer/icinga/icinga-1.13.3-r1.ebuild | 5 +++--
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index e72df2b..066d121 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1 +1,2 @@
+DIST CVE-2015-8010_1.13.3.patch 177807 SHA256
8ccd8cdf221b8f2aa90ae1e4c76ccc61e7cf7519eadc9482c671502c2138c2a7 SHA512
bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a
WHIRLPOOL
90f3eb3a6ad79337cf9d7fe63e201e313769fea6e3fdf2f2de0b2072b1b21e66d650b632794dcb39b458e7c17449f7fb2d45d678a3b628a467496284f238231d
DIST icinga-1.13.3.tar.gz 18738204 SHA256
d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512
babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed
WHIRLPOOL
6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d
diff --git a/net-analyzer/icinga/files/CVE-2015-8010_1.13.3.patch
b/net-analyzer/icinga/files/CVE-2015-8010_1.13.3.patch
deleted file mode 100644
index e69de29..000
diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
index 9560c51..6580643 100644
--- a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
@@ -12,7 +12,8 @@ HOMEPAGE="http://www.icinga.org/;
#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
#S=${WORKDIR}/${PN}-${MY_PV}
#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz;
+SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz
+
https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch;
LICENSE="GPL-2"
SLOT="0"
@@ -44,7 +45,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
- epatch "${FILESDIR}/CVE-2015-8010_1.13.3.patch"
+ epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch"
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: c99474ca3ba3598392b699f1a93a167ae83934cf
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Nov 3 17:13:26 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Nov 3 17:13:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c99474ca
net-analyzer/icinga: x86 stable wrt bug #564242
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
net-analyzer/icinga/icinga-1.13.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/icinga/icinga-1.13.3.ebuild
b/net-analyzer/icinga/icinga-1.13.3.ebuild
index 0b77555..cb9a0d9 100644
--- a/net-analyzer/icinga/icinga-1.13.3.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.3.ebuild
@@ -16,7 +16,7 @@
SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 5cb0f51daa989179ff25f4cb32390ce79baeff8f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Nov 3 17:12:21 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Nov 3 17:12:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb0f51d
net-analyzer/icinga: amd64 stable wrt bug #564242
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
net-analyzer/icinga/icinga-1.13.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/icinga/icinga-1.13.3.ebuild
b/net-analyzer/icinga/icinga-1.13.3.ebuild
index 24f28f8..0b77555 100644
--- a/net-analyzer/icinga/icinga-1.13.3.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.3.ebuild
@@ -16,7 +16,7 @@
SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
perl? ( dev-lang/perl )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 7a2d83efa2cdd488fe7bf3d0b8fc6b8fd5052b15
Author: Matthew Thode gentoo org>
AuthorDate: Tue Nov 3 17:43:22 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Tue Nov 3 17:43:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2d83ef
net-analyzer/icinga: cleanup for CVE-2015-8010 bug 564242
Package-Manager: portage-2.2.20.1
net-analyzer/icinga/Manifest | 7 -
net-analyzer/icinga/icinga-1.10.4.ebuild | 259 --
net-analyzer/icinga/icinga-1.11.1.ebuild | 259 --
net-analyzer/icinga/icinga-1.11.4.ebuild | 259 --
net-analyzer/icinga/icinga-1.11.7.ebuild | 264 --
net-analyzer/icinga/icinga-1.12.0.ebuild | 264 --
net-analyzer/icinga/icinga-1.12.2.ebuild | 267 ---
net-analyzer/icinga/icinga-1.9.6.ebuild | 259 --
8 files changed, 1838 deletions(-)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 60eb54f..e72df2b 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,8 +1 @@
-DIST icinga-1.10.4.tar.gz 15391948 SHA256
fecaeca3f4f059fe506681e99a5e15fd4bef16ad1003b12e519ec91ce0b3bcfd SHA512
d3f5e69089c01429cf99d53e5eff30a890899bb7509ae1c5251021a4ad1abdfafdbccc55b9719c117740227ba9dad3af392a26f6c1117f2aaf3029f8ce6fc09b
WHIRLPOOL
907dd0af89ab6f09dc47829e85c44b82f9dc83b3d2b073de567e0e011fa6ca734f3c0e61b582ccdb5992fae53ef1a182f9bc440af086fe900cb1d375a501535a
-DIST icinga-1.11.1.tar.gz 18699628 SHA256
7dca7d6193fe9de1d5d044e3eefd9dfca5a24485a60d332edac68c5cc4838c95 SHA512
878d75ef669c9110c42275ab36781fc440d42e98821a0da400d2ed174b61e9571fbf35bd847afdfcf67039b4814b34f13b892ddca738d207fd2abf26715c803d
WHIRLPOOL
26561d572c9bb38df2ab0656fac69168b327e4e8c00d1e756aae4c8dbae10b74fd10313f74fb80f08bc9de713a402801d649abcbaa8adc6d3386f48f54cdf9dd
-DIST icinga-1.11.4.tar.gz 18657247 SHA256
34e923d8daac0235513ece5f54a2065b9166cce3ef3c9f8794e635c93ae0d541 SHA512
0cc2cd8561affbbb400f59d02023bc35de3f6f39c120fcb9d293d7ce343c88061b7a7ef557c22ed79881e499c967223616cf2a4a0746b480ee8a36b3e9a23e27
WHIRLPOOL
55277fee87e552ad94c069c252a68d3fe1fedef435e5fd0e00768a1e62887de6980913f3b4c096c62a6bf2cf1abca5dd2c68934e9f3603f96349572edf9e
-DIST icinga-1.11.7.tar.gz 18657763 SHA256
b6526dd44d42c70e50ebfb58608f1fec8ba6d805fda4fde57f1078c248e25045 SHA512
3c06771f83257afc9096078ba5304ad9a3fbd8d75f22ca62113c45b06f1a015ef3758936dcb3376b3a18584a360ca4a629e5b071570b7215f7b199e414946af1
WHIRLPOOL
4f66389b467f77e5544239c9c1553e185e37f115f057df83330118e2e8883efa5d73b05bc1c9b3801ff522947e098f3169185b71a172bf9ac26173a033ce30d6
-DIST icinga-1.12.0.tar.gz 18670338 SHA256
6bcee5605d66a0054514baeffd8084df6097cf8ebead2b8114387d5def14 SHA512
214eece3d5545f9157c25d83f1ed65eab82ae4508e713efa2aec83d69e0621ff53618a33c266e88f67b13e4734bd62d7e55cb2cbc547946d13e691f9b24c726b
WHIRLPOOL
94fd7435f113e839e1d6a71a466060ab3e2f161a64643e011acb01f1a34bfe00a7313ea47434db6f74405b1b3fe7581c39bb39fd04887e4985fcd16f0cc0c827
-DIST icinga-1.12.2.tar.gz 18745366 SHA256
3eb3e623070996fffe8ba1d5c0fe8081d3074bca5109de4ee597a9515507a4cc SHA512
eac3d354fa555d8374757a07cc84f028dcead71eb611245e16597b050f8f050d4b955cf7bc70ff0230a7fa8eb004541827c2686b60ccd683a0646c1d7707b264
WHIRLPOOL
fc1251966dfce7377e6f4017281b3f35cca2241ee1fb31b654126d8f045a957a6835cdb45d622efaaf0cf0cd89d45969f6a4c81dd628174dc7a9c29cef137b51
DIST icinga-1.13.3.tar.gz 18738204 SHA256
d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512
babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed
WHIRLPOOL
6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d
-DIST icinga-1.9.6.tar.gz 17082621 SHA256
a70a54d49813f8ea1b58688d5d2b3ecd00a0470a900c84943c044669f582274c SHA512
f2489d6c898e754ca162304651e71e071e5f1d0ce396ecd87ba9e6fd0a14343cca24fd860e661250b2723a696045d45602ebf2fc9aa16dbaf126415ba109b3ff
WHIRLPOOL
599b3a257e1ef9b9d713cfbde0233ab171f46ee5f2fffaa2e5a3ab95daaad2c9ee88e61def2420d60e9262fb57dc4a18ea168c0d9b1da52dc85792d2d1389cbf
diff --git a/net-analyzer/icinga/icinga-1.10.4.ebuild
b/net-analyzer/icinga/icinga-1.10.4.ebuild
deleted file mode 100644
index bcee570..000
--- a/net-analyzer/icinga/icinga-1.10.4.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/;
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/
commit: 01be0da7e94079bca6b18567e6a81a4d1a7206b2
Author: Matthew Thode gentoo org>
AuthorDate: Sun Nov 1 01:14:13 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Sun Nov 1 01:15:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01be0da7
net-analyzer/icinga: fixing CVE-2015-8010 bug 564242
Package-Manager: portage-2.2.20.1
net-analyzer/icinga/Manifest | 1 +
net-analyzer/icinga/icinga-1.13.3.ebuild | 267 +++
2 files changed, 268 insertions(+)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 05af21b..60eb54f 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -4,4 +4,5 @@ DIST icinga-1.11.4.tar.gz 18657247 SHA256
34e923d8daac0235513ece5f54a2065b9166cc
DIST icinga-1.11.7.tar.gz 18657763 SHA256
b6526dd44d42c70e50ebfb58608f1fec8ba6d805fda4fde57f1078c248e25045 SHA512
3c06771f83257afc9096078ba5304ad9a3fbd8d75f22ca62113c45b06f1a015ef3758936dcb3376b3a18584a360ca4a629e5b071570b7215f7b199e414946af1
WHIRLPOOL
4f66389b467f77e5544239c9c1553e185e37f115f057df83330118e2e8883efa5d73b05bc1c9b3801ff522947e098f3169185b71a172bf9ac26173a033ce30d6
DIST icinga-1.12.0.tar.gz 18670338 SHA256
6bcee5605d66a0054514baeffd8084df6097cf8ebead2b8114387d5def14 SHA512
214eece3d5545f9157c25d83f1ed65eab82ae4508e713efa2aec83d69e0621ff53618a33c266e88f67b13e4734bd62d7e55cb2cbc547946d13e691f9b24c726b
WHIRLPOOL
94fd7435f113e839e1d6a71a466060ab3e2f161a64643e011acb01f1a34bfe00a7313ea47434db6f74405b1b3fe7581c39bb39fd04887e4985fcd16f0cc0c827
DIST icinga-1.12.2.tar.gz 18745366 SHA256
3eb3e623070996fffe8ba1d5c0fe8081d3074bca5109de4ee597a9515507a4cc SHA512
eac3d354fa555d8374757a07cc84f028dcead71eb611245e16597b050f8f050d4b955cf7bc70ff0230a7fa8eb004541827c2686b60ccd683a0646c1d7707b264
WHIRLPOOL
fc1251966dfce7377e6f4017281b3f35cca2241ee1fb31b654126d8f045a957a6835cdb45d622efaaf0cf0cd89d45969f6a4c81dd628174dc7a9c29cef137b51
+DIST icinga-1.13.3.tar.gz 18738204 SHA256
d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512
babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed
WHIRLPOOL
6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d
DIST icinga-1.9.6.tar.gz 17082621 SHA256
a70a54d49813f8ea1b58688d5d2b3ecd00a0470a900c84943c044669f582274c SHA512
f2489d6c898e754ca162304651e71e071e5f1d0ce396ecd87ba9e6fd0a14343cca24fd860e661250b2723a696045d45602ebf2fc9aa16dbaf126415ba109b3ff
WHIRLPOOL
599b3a257e1ef9b9d713cfbde0233ab171f46ee5f2fffaa2e5a3ab95daaad2c9ee88e61def2420d60e9262fb57dc4a18ea168c0d9b1da52dc85792d2d1389cbf
diff --git a/net-analyzer/icinga/icinga-1.13.3.ebuild
b/net-analyzer/icinga/icinga-1.13.3.ebuild
new file mode 100644
index 000..24f28f8
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.13.3.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user
versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/;
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins
postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+ perl? ( dev-lang/perl )
+ virtual/mailx
+ web? (
+ media-libs/gd[jpeg,png]
+ lighttpd? ( www-servers/lighttpd )
+ )
+ !net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+ plugins? ( || (
+ net-analyzer/monitoring-plugins
+ net-analyzer/nagios-plugins
+ ) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+}
+
+src_configure() {
+ local myconf
+
+ myconf="$(use_enable perl embedded-perl)
+ $(use_with perl perlcache)
+ $(use_enable idoutils)
+ $(use_enable ssl)
+ --with-cgiurl=/icinga/cgi-bin
+ --with-log-dir=/var/log/icinga
+ --libdir=/usr/$(get_libdir)
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --with-lockfile=/var/run/icinga/icinga.lock
+
