fixing the keepdirs bug 449392 for net-analyzer/icinga

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 269 insertions, 15 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index fb5a91940a2f..b2a267155465 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/icinga
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.34 2013/01/11 22:45:10 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.35 2013/01/14 02:21:22 prometheanfire Exp $
+
+*icinga-1.8.3-r1 (14 Jan 2013)
+
+  14 Jan 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-1.8.3-r1.ebuild:
+  fixing keepdirs /var/run/icinga for bug 449392
 
 *icinga-1.8.3 (11 Jan 2013)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index e2c8c579b6d4..96fd9bf96c5a 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -14,23 +14,24 @@ DIST icinga-1.8.2.tar.gz 7458441 SHA256 39b69a8676895cf458fb71a2ebe75806ea6014bf
 DIST icinga-1.8.3.tar.gz 7458425 SHA256 9043cceb6891c1d0bcaf8676292047873f03dda216328f48854cc2106ace40ca SHA512 576a5cf0d90eb34047976ff5f4bd7647b90457ff92e63cdaad423b94268f0bcf3bd2903ff84094f102196067793106f37e0de29901ee506d47862d32a1094b98 WHIRLPOOL 39bc5f0431ed25ea9358577a7fb53f0d4d72d58571906770f6b45004253f0447c18dd0eefca109278d5879a1c9a5ebe5456f8a87f3898fa2fd42e649885d4c40
 EBUILD icinga-1.8.1.ebuild 7523 SHA256 0b04bf59354176a5c9eb469641f49adef5a8b822565c36de1ef5e1d36d21b618 SHA512 e54291c61b9de54902932ac9c210d057cc5b7be66e34011e445d8ea41007b70a4c4f62defd21d41af93398afa9224749aa87c10ce5d6dea24d2369586a91cf19 WHIRLPOOL 120bfa93fb08c63ea12e4e2d7e5b388b239b653b0bb313a6799cb72185d6fd91c2780fc71dd889a83a59ef8038a84c16d92c061d6ef9279dd9d3f196a34379dd
 EBUILD icinga-1.8.2.ebuild 7523 SHA256 62df6cf3591454ff9bb96bbd303995ada8cb06d953af9503fc9de0baa2afbe06 SHA512 5a395eca604487e40b3571841d6efaa339bd7829be668a048a8c75133327d2bf8e48591c38026fd980ed92be7c7fb689ce24521dfc6effc44ab36361a7ece862 WHIRLPOOL a4107ebb01ee503bb4e951686a6b7126007b9c4de2ae008352f47e8e76e41d60099633a6a8afac7830a64f31d47ab99679f5565f1ae73b6e85db74b3f8e2fbfc
+EBUILD icinga-1.8.3-r1.ebuild 7449 SHA256 5cb12b61f91fdb6f350c26be1e7239c3b5a943e633a1a3032c82039f2fbff6f6 SHA512 04d2573231ba8505720f86cb139518cfd80ac3c50d70cc2ab56e76b5583b7b9c1b4c0c8a970b9734243601558053759df788c6640c91337ba530be795bbab189 WHIRLPOOL 85f91aef18f58dcbcd88d599d41dde8d6372e1be9000786b61ee123e6c699c027c7886cc7a5b318bef5956ac2b4da7b7f2925915bb77dfaae15668d8ed1c0e95
 EBUILD icinga-1.8.3.ebuild 7523 SHA256 9e7764d09c59aa85ce9cf40974a2e81740949679eb18b1b19f967da38827a7b5 SHA512 ef61f79d2a2683e3adc53d8ccd4fc72dd4a2a2af3cc670bfa5b72ac95e19597b5426be2b4f71b68456196a8efd78530fb1b4e6886835fa0cb3039864330c647c WHIRLPOOL 8430815363e701ec4dc8669f5f548c5fa3a48b97fe40cb32deeca2140947d048dca2a9549236cd4d3016f8f6075af493403f6b5b148407517e3521d1cbe8a692
-MISC ChangeLog 6177 SHA256 b91d11daae64f896439e4b1fe801b71c7ef90ddf2b507451d3d69c1dd6fc840e SHA512 1ea3316555e8f3a867074d005ad2724cfe95be8c12a620133fa286f6b93637dbebb0770c77120498c277555ffc2406445f34d7b7f563b91ab6f6a174601df517 WHIRLPOOL 01498c7dcd8febdb730288922ccce3d2a11290dfcdb8509ed0450b943748c38899139802cf81f45314a8f090974c35aeba67ce6add613099a275f4b64df121a6
+MISC ChangeLog 6343 SHA256 836da8896f0605eff0234202910ba545295c182f7930095e9ee48860010668fd SHA512 46765bdebc12c59485be06d378c2874bed4a9977f2b6adf98b4449136d478418c12e1e0c24dbb9327d088e81073b93c193d670c698070b6cd937b314ea33f7a8 WHIRLPOOL bc18f7d3f2ca60e88be6024688674823544dff7aae2bd76834cf387e097f6d5e9e761464f45fcea80f0f54c4ded18def699f982f87be5dd652eeb6c26cbbeeb7
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ8JX8AAoJECRx6z5ArFrDAyYQAKuuCjpdPP+/DLtzGoCKdnT7
-Db94oS28ObJXS4pMHi3AgAquejkdfkLikRZ4bHTTREgpg7WRkHxRwMjozSGqhlp/
-UrRWD8WMDqUectLERXv8O2v6Dl5nzG3bHJBHtABL2BNMTjs7lRoPI6rIGc7GAdT0
-a1fqNHcUzNwpWd39NhCP2ZN090/Xa/fiHIXUKphnH1MeX+AIG4I3FL9L/0GWYrZb
-KTyj0GlVS27SSzq/ow6ZmPArXou+FvKbPyPr20MlyI6KQVqWy6/CkZcTR3CoXO5m
-qgXKL3cGUjYbkwOw1PdWCoYbJS1BsI1u3jnTaMxT1nxG49oWGz7iCQXcUtpWhOGi
-F5x6GtEkbZAoxsorsgbghXbySyT1J7SHwtlBN9oE4gKOs/w9dbwC8RJSWWN2qsjj
-tMcyGd/AvgtglsluDGEHnvNFc3tnIuuYhuunLhXDIWDemJvpegnp1sWd5LP8FVde
-FrjglFU0cziesfelyfBbwuLmv08uvMwTKcvV5ESDAMrX1uef2kyX3/pAfAqxUnWh
-vf3+jfOb3Zkj5JBBh819LroS5FXhz41i8r9h5cUGlBD0DRxLq00Dyge9RFMnB63r
-+wd4za6KMCyGVTc3KU+U29iSctjDUAkgtlkMSCRhLVORNSto/qRak9CWo3EEhFWW
-SFRLmHCNYdGe7Cucs3PT
-=CpuH
+iQIcBAEBCAAGBQJQ82upAAoJECRx6z5ArFrDOG8P/3rApnOjt9aQyM813KLZwAsO
+OwM9fCIqv2aBgh3W7LKz63eA9+cn7p5mPL3vgTHhYFG2HsDIz2JYqsIhbe4/FS+2
+Opzl4SgC/myQ6bx2v8ypuYOGUsoNzrXBI5Wo9/dyxaPalfi7YjEkGg8GAJoMHn1s
+qS64eeZsmV75HEsU+mdnztknvGES4ViF20W+6OnKgcFxyeP4hUiHX+taE0mOdbao
+55Lw8lhtDaimYnuxj1Dz4hftV/M9frpPnoz3mCyOJEZS6gdmhI/JP/XNT2CuqWuW
+iUGS100dTOP8jc9yMYbeQMBeNkCtrHVaMlTje5DgEBy2LbBJHHKxDb+jbjJrXN0E
+4d0RY1U5jMHuHI6294n4Q5l5+I08lJeU+4Py/G2eU7bonVrT7Nw6HJt5CoPNPGzc
+0eBDPKSGX/uB8CdmcB1MtbkxxLdMSWBXTRWa/NCtgq6hjfFAmejtq4TnieWzVzFf
+PyVz2x7BiSBB4dwWy0FaKZlM/H7p3MIqYl8Pfn93jItX87wkKkFxqPauBxudjp91
+G5ZgB73G4L6zLadYn012kWgoGS7GMkdcaRGzQcaE3vb6JYYdljPuQT0p4q8znkPz
+kIuec2WF52/m0BvKn/E+i0fELgwhr9WK2AwYSGEEpYpseUAeupOW0sy/hn/OfJsB
+R3VZwF1JVPi0+j7YZk6J
+=4MhM
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.8.3-r1.ebuild b/net-analyzer/icinga/icinga-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..9bc679a2ae2e
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.8.3-r1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.8.3-r1.ebuild,v 1.1 2013/01/14 02:21:22 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 ~hppa ~x86"
+IUSE="+apache2 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/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)
+	--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
+		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 {} +
+	fi
+
+	if use eventhandler ; then
+		dodir /etc/icinga/eventhandlers || die
+		fowners icinga:icinga /etc/icinga/eventhandlers || die
+	fi
+
+	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"
+			ewarn "update your db with the scripts under the directory"
+			ewarn "/usr/share/icinga/contrib/db/"
+		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
+}