sorta fixes for bug #423265

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 278 insertions, 15 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index b94e3dfd2a31..e2370e6acb6b 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/icinga
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.17 2012/06/18 18:23:28 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.18 2012/06/25 18:58:02 prometheanfire Exp $
+
+*icinga-1.7.1-r1 (25 Jun 2012)
+
+  25 Jun 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-1.7.1-r1.ebuild:
+  restricting the test feature because not all the packages needed to test are
+  in tree. sorta fixes bug #423265
 
 *icinga-1.7.1 (18 Jun 2012)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 29c8e71487bf..1ffd03a489c8 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -14,23 +14,24 @@ DIST icinga-1.7.0.tar.gz 12939198 RMD160 465edafc080c1674e17daf24a2ce8dabc203dae
 DIST icinga-1.7.1.tar.gz 12938365 RMD160 5f6f294f9f9ac4539389be811cd3759091299c48 SHA1 06abfde2b7c1785133d1501f635f94ce099ee6ca SHA256 86662178fae6a3618340b2d0b0fad5033439556649f79214a9a2331c10c2cab6
 EBUILD icinga-1.6.1-r2.ebuild 6961 RMD160 c9f6883ca33619a2fbd36b7d001150388dc6ab26 SHA1 fb97a36b68908fbebfcacb0830be79d72f3e42c6 SHA256 1b59c64f2906d8b12a39fce9539b558c9673be00b9af06e316e8a490b12f8fde
 EBUILD icinga-1.7.0.ebuild 7640 RMD160 c4a3aea900b539c07bcafca82dd2f6716902dd55 SHA1 92681dc754278d4f16d5d3e6fea3feeb1835814e SHA256 135b22cbf63b7c2c2e28ef7bfaedf72feb2c5270e610446478358b9255aa4322
+EBUILD icinga-1.7.1-r1.ebuild 7666 RMD160 738d740f3853c8aa5d469d809018961ed697525c SHA1 211283fce89e5380d4e25559f405fad101f1bc8c SHA256 fa0cc628698915ae6294ac744a88b3f5a2bb2d6d4ef7e02bce98cff4121ade8f
 EBUILD icinga-1.7.1.ebuild 7647 RMD160 03d6f08a4be4ea1f81ee6d27bd9cc8adc463b180 SHA1 bef33b2548f3813348b87c96ae3556ee408c2b7b SHA256 76895ac1a959bfdfeaf8334ea1808002928faec451172a3eef2e799bc3c685b2
-MISC ChangeLog 3255 RMD160 887e0a5235a11da9af5a35369ffb2d46a489411c SHA1 c00fbc0e45e46bd6300c08e90b3760f875b0254a SHA256 85acbb74aaf0b274055c574a065dc1733f46aa1b73521a65c9a6894d7e797690
+MISC ChangeLog 3486 RMD160 0aa610b232f860b0d37d7d52a3ed9f64114ca267 SHA1 9e56c143fef90e01fcda78eee4176dd148630766 SHA256 d30877992cb79605278850649522729e6b432ce97f04d6808155e6efbf4df2fd
 MISC metadata.xml 656 RMD160 d127ece7480eec27f50e853ff0192e5854819ae5 SHA1 03e185a7f1bd4ed5b1356e9ddaa7b73038b7fa27 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP33IrAAoJECRx6z5ArFrDr9sQAI4yAhinwqNBW2cRzqaZ0K8E
-pwtxwCvWRV0U6NoTzi0jeBcR3fpjOqodbsftx2ZlZFbCOP89Mw1hovk19ZBI7ss8
-bvZNLwgihVYl1LGPc6Lmj/B+lOFQShz2QrIbSaSRvKe92Z/2DQgATVGQWq1s3ReB
-aZc5PvLtUmz6Z6rrgCF3NUQKezac8j6OfJKVoOhQllX0BZxxR9nmshAkD3JnOGeg
-DwhG0aH3qwfislIXXfoql4DgrHqE7WB6GConHAkpjGJkolBrxiIowTxJkGC5yur7
-Xxvm20E6cVq4zjnT7Wq/T+od5j23MyTGnixLOoTDApsrSjE9tm4vuw9cP+YrX1wR
-Z3Psq8EgAnLO0uuMSdRwWVQEt5pG0/hh1uGdGx4/KuMuPwmGOUzDrRWXxlcCeCcB
-AXZL0Plp/ajT0g5xaEhhpSZ7wz2w+q5vBMstdikIz2E2MMloZWTq2ezLvJxW+Lu1
-O0GWDcgVJ0UugkTn7+31Ts+dc1tpRgAvzCnl/tkUjHsyY8fmOAd3jJIK26Ixtaag
-eIf59/27V+iP4yxx2CZD/z96p/hHs9qv0AaTeiBWrGTuZDj3FwB8ui7fl4X1UH0m
-TRvSXMSyRUydrISRLbAxSZk5NgvY56ewYgu1iUGVA2QmG0Twaz6SLdG5LxWRTWmG
-AQy71apc2noSnIaTTGYC
-=oUW3
+iQIcBAEBAgAGBQJP6LTNAAoJECRx6z5ArFrDXUgP/ies96qUZHnXy5F2NTO9EU1P
+x6abj7iDVjv4iCpOPecWkkq4v4Hm2c7/Sq9ba4myhBxRHJia3Gpc5vW7cjMdgBYv
+tLjvwY3zYMQoORuEOnq0kf9AzXkDH8rgd3wzA/wGd1z8euRpyX+6HZ6Jd1XiJn5x
+t/hJa4+zcy2TyHzbEJtOnHpJA+ZdZKBZne4ObDVwfjaFYGRrQBy1bEBebWnMr4by
+SoRUaUSP5aQfhZMPjXmsmxICCva5dTWeeiQVuztgW4MLz23XinKm/CMF9H5G1xp9
+Omx1aBQGEzRy5Y2V3eNf4yR75fOYr1wkT4tHv29rgWMhLZtrFcNRxvez2q78Vyfe
+eR1AFtCYaGOT/lWHkZuGrn8+fIjHEyYZfWHsF8Et8s/1pr1bQbd9LD4du1D6O6EC
+KBhx6XPgjEpRxDidBm08OZfDFmj/pG5cI1Qh32MNpBLVcFMrhgBwOpvTvXbiPgc4
+eGftXXOAqa2yb0VU71YT3ywhqv8j2VvymzZBhJKe89CqJLOasUrmj0vgjUp9GKHt
+OUt8epCCLoT3RjPv2usFElTRjb7bsx5UMARj8rPffO/Mb7ZADNCB15XNEjj7ZgLB
+9LMXlyLcCpVV3KIqRKCSVySFZt+6Turut5+aYB9hsDVzz8YRfiLETqW6V1hlnBnv
+eTZ9+233C18pWB8fyLyz
+=uEIC
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.7.1-r1.ebuild b/net-analyzer/icinga/icinga-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..3c4eacf61c73
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.7.1-r1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.7.1-r1.ebuild,v 1.1 2012/06/25 18:58:02 prometheanfire Exp $
+
+EAPI=2
+
+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}
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+apache2 debug 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 dev-lang/php[cgi] )
+		apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	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)
+	$(use_enable debug DEBUG0)
+	$(use_enable debug DEBUG1)
+	$(use_enable debug DEBUG2)
+	$(use_enable debug DEBUG3)
+	$(use_enable debug DEBUG4)
+	$(use_enable debug DEBUG5)
+	--disable-statuswrl
+	--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 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 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
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/* || die
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
+		elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+	fi
+
+	if use eventhandler ; then
+		dodir /etc/icinga/eventhandlers || die
+		fowners icinga:icinga /etc/icinga/eventhandlers || die
+	fi
+
+	fowners -R root:root /usr/$(get_libdir)/icinga || die
+	cd "${D}" || die
+	find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
+	find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	keepdir /etc/icinga
+	keepdir /var/lib/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	if use apache2 ; then
+		webserver=apache
+	elif use lighttpd ; then
+		webserver=lighttpd
+	else
+		webserver=icinga
+	fi
+
+	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
+	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
+
+	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
+	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
+}
+
+pkg_postinst() {
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "Note that the user your webserver is running as needs"
+		elog "read-access to /etc/icinga."
+		elog
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add a line like"
+				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
+				elog
+				elog "Icinga web service needs user authentication. If you"
+				elog "use the base configuration, you need a password file"
+				elog "with a password for user \"icingaadmin\""
+				elog "You can create this file by executing:"
+				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+	else
+		ewarn "Please note that you have installed Icinga without web interface."
+		ewarn "Please don't file any bugs about having no web interface when you do this."
+		ewarn "Thank you!"
+	fi
+	elog
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+	elog "If your kernel has /proc protection, icinga"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding icinga into"
+	elog "the group wheel, but this is not recomended."
+	elog
+	if [ -d "${ROOT}"/var/icinga ] ; then
+		ewarn
+		ewarn "/var/icinga was moved to /var/lib/icinga"
+		ewarn "please move the files if this was an upgrade"
+		if use idoutils ; then
+			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
+			ewarn "it accesses"
+		fi
+		ewarn
+		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
+		ewarn "remove /var/icinga afterwards to make this warning disappear"
+	fi
+}