removed icinga-1.5.1-r2.ebuild for init.d error (fix was in r3)
authorMatt Thode <prometheanfire@gentoo.org>
Tue, 22 Nov 2011 19:53:37 +0000 (19:53 +0000)
committerMatt Thode <prometheanfire@gentoo.org>
Tue, 22 Nov 2011 19:53:37 +0000 (19:53 +0000)
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

net-analyzer/icinga/ChangeLog
net-analyzer/icinga/Manifest
net-analyzer/icinga/icinga-1.5.1-r2.ebuild [deleted file]

index ed3e752db4a000f060148ef78175bdccb1985448..11fd3585d475bb68cd27dd2c845b3b0831d2fb56 100644 (file)
@@ -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.4 2011/11/22 19:21:54 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.5 2011/11/22 19:53:37 prometheanfire Exp $
+
+  22 Nov 2011; mthode <mthode@gentoo.org> -icinga-1.5.1-r2.ebuild:
+  removed icinga-1.5.1-r2.ebuild for init.d error (fix is in r3)
 
 *icinga-1.5.1-r3 (22 Nov 2011)
 
index df2e64e5593dc82a1baae4445873c64e72e448cd..ecff38aff33f5ea06c5c7494194ee6c45b372fc5 100644 (file)
@@ -8,8 +8,7 @@ AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29
 AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf09a34fe55dd49c3381ca11781a643e4d1ca0 SHA256 88913ba8d8d2824e52ea26d93bdb7587d6ab53020546a6a98c9e9d337cc17985
 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
 EBUILD icinga-1.5.1-r1.ebuild 5994 RMD160 a27d0ed3cf235cc84cdb0c884f20830dc43b1b18 SHA1 b1379003bf2f34fcbdb33b0d562b95eb2eb8caf0 SHA256 a9aaf217834524febbbe9da0cc1ece0c0cedfa84925262706d1266499a125728
-EBUILD icinga-1.5.1-r2.ebuild 6371 RMD160 3c8ea4fe6fdc1a519ab8b9498627e9254981acd6 SHA1 5819ddd0a1e753acf5603523b6e10cb71e9fd0c8 SHA256 de518464e70c640dc8a9f967ef256b2833d7a3d685419f3ac85ec3c3b05dd3ec
 EBUILD icinga-1.5.1-r3.ebuild 6534 RMD160 457e74c2d69873f98d67223f40e9bd7b059f5e67 SHA1 f5220e48e5d74de35f27f3821adb53da731e1d71 SHA256 efd859ec69250cc1a835c68b094d03cdcc297ee660e6628c1737e8372167b4e1
 EBUILD icinga-1.5.1.ebuild 6053 RMD160 00f41bc1823d46953883492ce5e2f61e94d2590b SHA1 e8db2ce79b8bd348317e6e5598d07c2ec80ca70b SHA256 37cd668192f7751abe056a66ac8fc13052fbcf61b6d4b7a1d1f24cdd80299702
-MISC ChangeLog 1130 RMD160 6e51681b02360428a1d69256bbd077420911bd9f SHA1 c85ede37ea229999e0b3ab665fe335c4b756a6c8 SHA256 208115aabda702661006841a772ece9f1ba0f3ff36e03ad461839c6890ec1ef8
+MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
 MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d
diff --git a/net-analyzer/icinga/icinga-1.5.1-r2.ebuild b/net-analyzer/icinga/icinga-1.5.1-r2.ebuild
deleted file mode 100644 (file)
index 35a1b52..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-# 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.5.1-r2.ebuild,v 1.1 2011/11/21 23:54:06 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 api 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"
-       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 \"-D ICINGA\""
-                       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
-
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/fix-prestripped-binaries.patch"
-}
-
-src_configure() {
-       local myconf
-       local myconf2
-
-       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"
-
-       myconf2="--bindir=/usr/sbin
-       --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-       --datarootdir=/usr/share/icinga/htdocs
-       --localstatedir=/var/icinga
-       --sysconfdir=/etc/icinga"
-
-       if use plugins ; then
-               myconf2+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
-       else
-               myconf2+=" --libexecdir=/usr/$(get_libdir)/icinga/plugins"
-       fi
-
-       if use !apache2 && use !lighttpd ; then
-               myconf2+=" --with-command-group=icinga"
-       else
-               if use apache2 ; then
-                       myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-                       myconf2+=" --with-command-group=apache"
-               elif use lighttpd ; then
-                       myconf2+=" --with-command-group=lighttpd"
-               fi
-       fi
-
-       econf ${myconf} ${myconf2}
-       if use api ; then
-               cd module/icinga-api || die
-               econf ${myconf2}
-       fi
-}
-
-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
-
-       sed -i -e 's/^contactgroups$//g' Makefile || die
-
-       emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-       sed -i -e 's/icinga\/icinga.lock/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
-       sed -i -e 's/var\/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
-       if use api ; then
-                emake DESTDIR="${D}" install-api || 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
-
-       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/icinga
-       keepdir /var/icinga/archives
-       keepdir /var/icinga/rw
-       keepdir /var/icinga/spool/checkresults
-
-       if use apache2 ; then
-               webserver=apache
-       elif use lighttpd ; then
-               webserver=lighttpd
-       else
-               webserver=icinga
-       fi
-
-       fowners icinga:icinga /var/icinga || die "Failed chown of /var/icinga"
-       fowners -R icinga:${webserver} /var/icinga/rw || die "Failed chown of /var/icinga/rw"
-
-       fperms 6755 /var/icinga/rw || die "Failed Chmod of ${D}/var/icinga/rw"
-       fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-}
-
-pkg_postinst() {
-       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."
-}