[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/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}"
