readding r1

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

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index f56a2961e9e54b08d596bc33d4c1938b5215b943..66baf032cd6251397ce99b2e051a4f83d53de832 100644 (file)
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/icinga
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.9 2011/12/29 15:54:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.10 2011/12/29 15:59:11 prometheanfire Exp $
+
+  29 Dec 2011; mthode <mthode@gentoo.org> +icinga-1.6.1-r1.ebuild:
+  readding r1....
 
 *icinga-1.6.1-r2 (29 Dec 2011)
 

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 2248781c0ca7e65f60338b5b56742affdb65f563..bbd5853d0770b21ac4a249129178f15c63f1dfd6 100644 (file)
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -10,23 +10,24 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 990 RMD160 4eef38e9266754653a7cc5c2f00e294a060941bd SHA1 fc444a4845bf8c6a5c0378f397583b11ce4bd5f1 SHA256 b59b82578929c54ecf8555ffd28c1a13f4b7e856240f8b1c77c9ceca06839252
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
+EBUILD icinga-1.6.1-r1.ebuild 6966 RMD160 dc74f5db5ba287a878c89bdd409ffbce7bd10bf5 SHA1 4e0d1d97832e554d8db12fbd9d72996947fd3db1 SHA256 f73436e501d4984d61fe3e2f1ab0f338ab914baa91377f766b313806ab2de6b5
 EBUILD icinga-1.6.1-r2.ebuild 6967 RMD160 de56d01c620946ed79e3a18c133f83ce7b522692 SHA1 9d303bc3cfa40df087cc71855e930e56e228332c SHA256 1e95471d646f458f67204e740b25b4bb2ade9eb5352b0cebeb3649e6bdd39eb5
-MISC ChangeLog 2137 RMD160 e824fc491a8cbf5c84dc5fbeb8d33c8473466f52 SHA1 c9fcf4fc3b5bbd5b151870a4d20e99376c22f945 SHA256 d524ac8b49e158cf680de64ed35491b66e5f33e0066ed2bb774dbba9e18bc7cb
+MISC ChangeLog 2224 RMD160 04dff20c39ef95fe2263efcebcd35fbe10b883eb SHA1 d3e3de4ab18c6c9cdbe3a6365d3a555cde55867e SHA256 edda1da3da14f29e4ec428f1a9e046cbda9538ccb15b2fe5ed32eca772e0967c
 MISC metadata.xml 556 RMD160 c1d1f8af0e1c04b4d8f6dd56778b668a78a6ea71 SHA1 792f55c63007e3618d0ce38c636e6758d0fca123 SHA256 25b529090c12f48532b45242e759296861c4a9e5c1111648f382f6a5326075ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO/I1rAAoJECRx6z5ArFrDlYAQAKK04+Jfr2HM1Q76N6Co9BOk
-rUg2P07ij2a7b9mo/Y7DASBjrqO2omJWap5mPNjCTXwnRiyHavX03K5nmgTDI3yw
-zxBQ2Eed8DqkhqeyO+hdAjXlxNXynVh/HK5dAARvJqKnl8B/zCs5VpcL5ngYf+YP
-gndqbU8eEksOg/jBv1DC0OVMcO58ZbFn6WPtJ9bOTBo9Lx1q+KeKa9pXV+RMQVgw
-YBQZqeDMCF+FRpB28HlqOl586QatdMO53O/nvMczPNy0NAswqh9w7wP77pENgrsO
-QsmS+PSvaqnlp8BSKKptpMtcTVbEh4FBPjKo+BCBBRDCN5mn1kmRGyCJeFXyPxwo
-bb/uiweBQeL0MUjXdEU5iTkDVfP1phuwEigMIKv5qOQhNeFyCcOW+j79mvLNpk8H
-HBAB1wCYFKnpOhR5hIh9Fv592TY92u1fVvTKKRRSbskAdGsRhvYEcp0pXsJZdTJL
-bBnEhTS3mPahig2fshtlFjRgKv+RY2l1/cCT6RIFouXCV0LSXHBym+3ZatkQXFyC
-wAmhE8zKFUke+zD4wHobYYhPhqOI9qS3ujQGPe1q5LLQxVeByWpc6xElDJL1SGkL
-MD5RDZ90ZHaqDTFOwEKkUrURpkTF5WPCc6ky3yBxatXZRZtJZ0LBqKNln51NNeWN
-hEXr7A1RYxJYgAM44t8l
-=q1Us
+iQIcBAEBAgAGBQJO/I5cAAoJECRx6z5ArFrDRacP/jGzufJD5c4geqg7jdC56nw8
+ivadC1MKX2SI9YHulYhFzFfRjtsmIF3u8ByPJmIVQNCJOkooIo7/Cv7FmxN4V2Rk
+eUAny8iMooIStlLLNfu878lIeTX+Ml9s10Hq+uVS8mVQ/QrljUS9hEMEe9wai9PZ
+KpUnAFjIMwJN5VnACqOgv2hLoZjO0bzzI/ayqNye8g6WwTG+ODngExnLWth0BT8h
+DDj01EYqy4nK1gfEYxV13nrcQNSCS02jZxwiyTvieOZ3WvoM+Pk+JclOglrvux8w
+OSYou9Lv5tlm5A6bPrEc6zIkrTwL0Bw47brV0YQVK7CsVA486iaKa0A2ng5h9wGW
+tyVh5ZQ5zIIRM9sKeaOgKeBQZH6Dkq17Twzt40jb0cbFE0ekl3hw8Xl+AvhUWl3M
+w1cfwzel+oa1kXPdBjkSXBzjAFG2ZCsP5z1fFkaAIFtKyx75V468VV8JwWK2OKlb
+0K4yfqlMVn6J8UQj+OGE7eaceutfSMhgza0EIHB42oZsFvZuqqe9MOIZ/73zdT81
+hMUb6n1itpGY2AccbrjIsJOwEAx+3cIDooa28PdJSvV6HHdGWwl8MPEBWi/ErXAP
+Gd1hC3C1ayuVjlc+to75lnjlYXsR1sVtxxnlYoRDOVue3w7ecLV/xsc0jU+QMXqW
+xDzR55wgzVpds2Lb9szd
+=cCTO
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/icinga/icinga-1.6.1-r1.ebuild b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
new file mode 100644 (file)
index 0000000..a8fced0
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1-r1.ebuild,v 1.3 2011/12/29 15:59:11 prometheanfire Exp $
+
+EAPI=2
+
+inherit depend.apache eutils multilib toolchain-funcs
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+apache2 debug +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 )"
+
+want_apache2
+
+pkg_setup() {
+       depend.apache_pkg_setup
+       enewgroup icinga
+       enewgroup nagios
+       enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios"
+}
+
+src_prepare() {
+       epatch "${FILESDIR}/fix-prestripped-binaries.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
+       --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"
+
+       if use plugins ; then
+               myconf+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
+       else
+               myconf+=" --libexecdir=/usr/$(get_libdir)/icinga/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
+
+       sed -i -e 's/var\/lib\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
+
+       if use idoutils ; then
+                emake DESTDIR="${D}" install-idoutils || die
+       fi
+
+       newinitd "${FILESDIR}"/icinga-init.d-2 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
+
+       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
+}