From a717aa00f24a508ea53dbc93d438eba1b3e53b0c Mon Sep 17 00:00:00 2001 From: Tobias Scherbaum Date: Sun, 9 Mar 2008 16:34:52 +0000 Subject: Version bump svn path=/; revision=23 --- net-analyzer/nagios-core/ChangeLog | 8 + net-analyzer/nagios-core/Manifest | 6 +- .../nagios-core/nagios-core-3.0_rc2.ebuild | 267 --------------------- .../nagios-core/nagios-core-3.0_rc3.ebuild | 222 +++++++++++++++++ 4 files changed, 233 insertions(+), 270 deletions(-) create mode 100644 net-analyzer/nagios-core/ChangeLog delete mode 100644 net-analyzer/nagios-core/nagios-core-3.0_rc2.ebuild create mode 100644 net-analyzer/nagios-core/nagios-core-3.0_rc3.ebuild diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog new file mode 100644 index 0000000..c87cb88 --- /dev/null +++ b/net-analyzer/nagios-core/ChangeLog @@ -0,0 +1,8 @@ +# ChangeLog for net-analyzer/nagios-core +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 09 Mar 2008; Tobias Scherbaum + -nagios-core-3.0_rc2.ebuild, +nagios-core-3.0_rc3.ebuild: + Version bump + diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index f3c9ffd..5b03cae 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -3,6 +3,6 @@ AUX 99_nagios.conf 377 RMD160 79f66fc0ae78fb856bd38ba479dbc8af4c2cf989 SHA1 cc2b AUX conf.d 409 RMD160 8b08c01284fc590a2291164589da42515d1a0586 SHA1 dd7bf46facd6a3069794ad9623cddd854198520e SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a AUX lighttpd_nagios.conf 450 RMD160 2ed5d57510b879e313637c8184968cc6632eb6c4 SHA1 559948838c235923ed0791515a5df9773e2b6a01 SHA256 4db16539ad388059d14ff70a291c768640145ae5a9bb74133c42854208ce5497 AUX nagios 1441 RMD160 7a0b7e2730b4d9705e697d0446949cbe051ae99c SHA1 4de4c49ee064d1a53a7d1f1c24753e1e32f6dddb SHA256 0c3abc96bd02c4215c95fe6d39408c044eacb781b23c021ee3367ffa02f4256c -DIST nagios-2.0b.cfg-sample.gz 8990 RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 SHA1 7a27bcf4be959424b688f52e31887862b863ec23 SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12 -DIST nagios-3.0rc2.tar.gz 2747084 RMD160 cf9f35eccc1242932be49308e3fc79a81a67ea9a SHA1 77db9d6984b35a7743496276ba42f6a1a9c76815 SHA256 e608f7ec73e4d86a644bbb39283e90e56210784bbf2833cc571ded105a65a082 -EBUILD nagios-core-3.0_rc2.ebuild 7663 RMD160 319a1ddd6a1a94e9a60e35abe4803a204a36d18e SHA1 c7c56c289610fc3fa05dfda19552ff359ce2a24c SHA256 c4412d69a43b77852e6b901546b1b9474d3ab035b645fb9fa589199e19e72b2c +DIST nagios-3.0rc3.tar.gz 2754844 RMD160 5dfb1c6c09ef7dda4b1e6f78f58d6e1c05c8b0c1 SHA1 a31d4f02936bb8c8a342f4a6b185bf301ce9db06 SHA256 615f4116f77f2bd56884b8007f58b2669cd9e53fa5074897841d643ed6d0b15d +EBUILD nagios-core-3.0_rc3.ebuild 6301 RMD160 aa294ab5f1145b3e4824349e8ff92c689eaa6716 SHA1 3015a74122540b1f2577e82cf09bce9d8405948c SHA256 d8320c753b77522b3ccba8bfda19b71596e418d44d4c2d4abbf99445e0c0fc86 +MISC ChangeLog 257 RMD160 0b23ab715133ea7f5acbff8adedba6b6e87bb9cb SHA1 04e6defb7598b63fbff4189fc81ec79d0b0d2008 SHA256 5badebde0f55adc52d0d1bac571104a512fee08341c6fe8fed39b307c9cd7c41 diff --git a/net-analyzer/nagios-core/nagios-core-3.0_rc2.ebuild b/net-analyzer/nagios-core/nagios-core-3.0_rc2.ebuild deleted file mode 100644 index c7aba86..0000000 --- a/net-analyzer/nagios-core/nagios-core-3.0_rc2.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.9-r1.ebuild,v 1.4 2007/08/01 21:00:26 marineam Exp $ - -inherit eutils apache-module toolchain-funcs - -MY_P=${PN/-core}-${PV/_rc/rc} -DESCRIPTION="Nagios Core - Check daemon, CGIs, docs" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz - mirror://gentoo/nagios-2.0b.cfg-sample.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="apache2 lighttpd perl debug" -# mysql postgres -DEPEND="virtual/mailx - apache2? ( - ${NEED_APACHE_DEPEND} - >=media-libs/jpeg-6b-r3 - >=media-libs/libpng-1.2.5-r4 - >=media-libs/gd-1.8.3-r5 - perl? ( net-analyzer/traceroute ) - ) - lighttpd? ( - www-servers/lighttpd ) - >=media-libs/jpeg-6b-r3 - >=media-libs/libpng-1.2.5-r4 - >=media-libs/gd-1.8.3-r5 - perl? ( net-analyzer/traceroute ) - perl? ( >=dev-lang/perl-5.6.1-r7 ) - >=dev-libs/glib-2" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - # Check if gd has been compiled with jpeg and png support - if use apache2 || lighttpd; then - if ! built_with_use media-libs/gd jpeg png; then - eerror "Your gd has been compiled without jpeg and/or png support." - eerror "Please re-emerge gd:" - eerror "# USE="jpeg png" emerge gd" - die "pkg_setup failed" - fi - fi - - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/2.x-series-nsca.patch - - local strip="$(echo '$(MAKE) strip-post-install')" - sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in" -} - -src_compile() { - local myconf - - if use perl - then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - - if use debug; then - myconf="${myconf} --enable-DEBUG0" - myconf="${myconf} --enable-DEBUG1" - myconf="${myconf} --enable-DEBUG2" - myconf="${myconf} --enable-DEBUG3" - myconf="${myconf} --enable-DEBUG4" - myconf="${myconf} --enable-DEBUG5" - fi - - if use !apache2 && use !lighttpd ; then - myconf="${myconf} --with-command-grp=nagios" - else - if use apache2 ; then - myconf="${myconf} --with-command-grp=apache" - myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d" - fi - if use lighttpd ; then - myconf="${myconf} --with-command-grp=lighttpd" - fi - fi - - econf ${myconf} \ - --prefix=/usr \ - --bindir=/usr/sbin \ - --sbindir=/usr/lib/nagios/cgi-bin \ - --datadir=/usr/share/nagios/htdocs \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --libexecdir=/usr/lib/nagios/plugins \ - || die "./configure failed" - - #--with-lockfile=/var/run/nagios2/nagios2.pid - - - emake CC=$(tc-getCC) nagios || die "make failed" - - if use apache2 || use lighttpd ; then - # Only compile the CGI's if any of the web backends is set. - make CC=$(tc-getCC) DESTDIR="${D}" cgis || die - fi - - emake -C contrib all || "contrib make filed" - -} - -src_install() { - dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING - docinto contrib - dodoc contrib/README - - if use !apache2 && use !lighttpd; then - sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to use flag/' \ - -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to use flag/' \ - Makefile - fi - - sed -i -e 's/^contactgroups$//g' Makefile - - make DESTDIR="${D}" install - make DESTDIR="${D}" install-config - make DESTDIR="${D}" install-commandmode - - -# docinto sample-configs -# dodoc "${D}"/etc/nagios/* -# rm "${D}"/etc/nagios/* - -# newdoc ${WORKDIR}/nagios-2.0b.cfg-sample nagios.cfg-sample - - #contribs are not configured by the configure script, we'll configure them overselves... - find "${S}"/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:; - s:/usr/local/nagios/libexec:/usr/nagios/libexec:; - s:/usr/local/nagios/etc:/etc/nagios:; - s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i - - insinto /usr/share/doc/${PF}/contrib - doins -r contrib/eventhandlers - - doinitd "${FILESDIR}"/nagios || die "Error adding nagios init script" - newconfd "${FILESDIR}"/conf.d nagios \ - || die "Error adding nagios init script configuration" - - chmod 644 "${S}"/contrib/*.cgi - into /usr/nagios - for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do - dobin "$bin" - done - - # Apache Module - if use apache2; then - insinto "${APACHE2_MODULES_CONFDIR}" - doins "${FILESDIR}"/99_nagios.conf \ - || die "Error adding configuration files for apache" - - if use perl; then - into /usr/nagios ; dosbin contrib/traceroute.cgi - fi - fi - - # Lighttpd Module - if use lighttpd; then - insinto /etc/lighttpd - newins "${FILESDIR}/lighttpd_nagios.conf" nagios.conf - fi - - for dir in etc/nagios var/nagios ; do - chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}" - done - - chown -R root:root "${D}"/usr/lib/nagios - find "${D}"/usr/lib/nagios -type d -print0 | xargs -0 chmod 755 - find "${D}"/usr/lib/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755 -# find "${D}"/usr/nagios/share -type f -print0 | xargs -0 chmod 644 - - chown root:root "${D}"/usr/lib/nagios - chown root:root "${D}"/usr/lib/nagios/cgi-bin - - chown nagios:nagios "${D}"/var/nagios/spool/checkresults - chmod 640 "${D}"/var/nagios/spool/checkresults - - keepdir /etc/nagios - keepdir /var/nagios - keepdir /var/nagios/archives - keepdir /usr/nagios/share/ssi - keepdir /var/nagios/rw - keepdir /var/nagios/spool/checkresults - - if use !apache2 && use !lighttpd; then - chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw" - else - if use apache2 ; then - chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw" - fi - if use lighttpd ; then - chown -R nagios:lighttpd "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw" - fi - fi - - chmod ug+s "${D}"/var/nagios/rw || die "Failed chmod of ${D}/var/nagios/rw" - chmod 0750 "${D}"/etc/nagios || die "Failed chmod of ${D}/etc/nagios" - - cat << EOF > "${T}"/55-nagios-core-revdep -SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec" -EOF - - insinto /etc/revdep-rebuild - doins "${T}"/55-nagios-core-revdep -} - -pkg_postinst() { - einfo - einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/." - einfo - einfo "Also, if you want nagios to start at boot time" - einfo "remember to execute:" - einfo " rc-update add nagios default" - einfo - - if use !apache2 || use !lighttpd; then - einfo "This does not include cgis that are perl-dependent" - einfo "Currently traceroute.cgi is perl-dependent" - einfo "To have ministatus.cgi requires copying of ministatus.c" - einfo "to cgi directory for compiling." - - einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\"" - - einfo - einfo "That will make nagios's web front end visable via" - einfo "http://localhost/nagios/" - einfo - einfo "Note that the user your webserver is running at needs" - einfo "read-access to /etc/nagios. There are several possible" - einfo "solutions to accomplish this, choose the one you are" - einfo "most comfortable with:" - einfo " usermod -G nagios apache" - einfo "or" - einfo " chown nagios:apache /etc/nagios" - - else - einfo "Please note that you have installed Nagios without web interface." - einfo "Please don't file any bugs about having no web interface when you do this." - einfo "Thank you!" - fi - - einfo - einfo "If your kernel has /proc protection, nagios" - einfo "will not be happy as it relies on accessing the proc" - einfo "filesystem. You can fix this by adding nagios into" - einfo "the group wheel, but this is not recomended." - einfo - - einfo - ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion" -} - -pkg_prerm() { - /etc/init.d/nagios stop -} diff --git a/net-analyzer/nagios-core/nagios-core-3.0_rc3.ebuild b/net-analyzer/nagios-core/nagios-core-3.0_rc3.ebuild new file mode 100644 index 0000000..7cffe71 --- /dev/null +++ b/net-analyzer/nagios-core/nagios-core-3.0_rc3.ebuild @@ -0,0 +1,222 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.10-r2.ebuild,v 1.2 2008/02/28 00:56:10 mr_bones_ Exp $ + +EAPI="1" + +inherit eutils depend.apache toolchain-funcs + +MY_P=${PN/-core}-${PV/_rc/rc} +DESCRIPTION="Nagios Core - Check daemon, CGIs, docs" +HOMEPAGE="http://www.nagios.org/" +SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug lighttpd perl +web vim-syntax" +DEPEND="virtual/mailx + web? ( + >=media-libs/jpeg-6b-r3 + >=media-libs/libpng-1.2.5-r4 + >=media-libs/gd-1.8.3-r5 + lighttpd? ( www-servers/lighttpd ) + ) + perl? ( >=dev-lang/perl-5.6.1-r7 )" +RDEPEND="${DEPEND} + vim-syntax? ( app-vim/nagios-syntax )" + +want_apache2 + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + # Check if gd has been compiled with jpeg and png support + if use web; then + if ! built_with_use media-libs/gd jpeg png; then + eerror "Your gd has been compiled without jpeg and/or png support." + eerror "Please re-emerge gd:" + eerror "# USE="jpeg png" emerge gd" + die "pkg_setup failed" + fi + fi + + enewgroup nagios + enewuser nagios -1 /bin/bash /var/nagios/home nagios +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/2.x-series-nsca.patch + + local strip="$(echo '$(MAKE) strip-post-install')" + sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in" +} + +src_compile() { + local myconf + + if use perl ; then + myconf="${myconf} --enable-embedded-perl --with-perlcache" + fi + + if use debug; then + myconf="${myconf} --enable-DEBUG0" + myconf="${myconf} --enable-DEBUG1" + myconf="${myconf} --enable-DEBUG2" + myconf="${myconf} --enable-DEBUG3" + myconf="${myconf} --enable-DEBUG4" + myconf="${myconf} --enable-DEBUG5" + fi + + if use !apache2 && use !lighttpd ; then + myconf="${myconf} --with-command-grp=nagios" + else + if use apache2 ; then + myconf="${myconf} --with-command-grp=apache" + myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d" + elif use lighttpd ; then + myconf="${myconf} --with-command-grp=lighttpd" + fi + fi + + econf ${myconf} \ + --prefix=/usr \ + --bindir=/usr/sbin \ + --sbindir=/usr/$(get_libdir)/nagios/cgi-bin \ + --datadir=/usr/share/nagios/htdocs \ + --localstatedir=/var/nagios \ + --sysconfdir=/etc/nagios \ + --libexecdir=/usr/$(get_libdir)/nagios/plugins \ + || die "./configure failed" + + + emake CC=$(tc-getCC) nagios || die "make failed" + + if use web ; then + # Only compile the CGI's if "web" useflag is set. + emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die + fi +} + +src_install() { + dodoc Changelog INSTALLING LEGAL README UPGRADING + + if ! use web ; then + sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \ + -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \ + Makefile + fi + + sed -i -e 's/^contactgroups$//g' Makefile + + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-config + emake DESTDIR="${D}" install-commandmode + + doinitd "${FILESDIR}"/nagios + newconfd "${FILESDIR}"/conf.d nagios + + # Apache Module + if use web ; then + if use apache2 ; then + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}"/99_nagios.conf + elif use lighttpd ; then + insinto /etc/lighttpd + newins "${FILESDIR}/lighttpd_nagios.conf" nagios.conf + 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 + + for dir in etc/nagios var/nagios ; do + chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}" + done + + chown -R root:root "${D}"/usr/lib/nagios + find "${D}"/usr/lib/nagios -type d -print0 | xargs -0 chmod 755 + find "${D}"/usr/lib/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755 + + keepdir /etc/nagios + keepdir /var/nagios + keepdir /var/nagios/archives + keepdir /var/nagios/rw + keepdir /var/nagios/spool/checkresults + + if use !apache2 && use !lighttpd; then + chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw" + else + if use apache2 ; then + chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw" + elif use lighttpd ; then + chown -R nagios:lighttpd "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw" + fi + fi + + chmod ug+s "${D}"/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw" + chmod 0750 "${D}"/etc/nagios || die "Failed chmod of ${D}/etc/nagios" +} + +pkg_postinst() { + elog "If you want nagios to start at boot time" + elog "remember to execute:" + elog " rc-update add nagios default" + elog + + if use web ; then + elog "This does not include cgis that are perl-dependent" + elog "Currently traceroute.cgi is perl-dependent" + elog "To have ministatus.cgi requires copying of ministatus.c" + elog "to cgi directory for compiling." + + elog "Note that the user your webserver is running at needs" + elog "read-access to /etc/nagios." + 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 nagios apache" + elog "or" + elog " chown nagios:apache /etc/nagios" + elog + elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\"" + elif use lighttpd ; then + elog " usermod -G nagios lighttpd " + elog "or" + elog " chown nagios:lighttpd /etc/nagios" + fi + elog + elog "That will make nagios's web front end visable via" + elog "http://localhost/nagios/" + elog + else + elog "IMPORTANT: Do not forget to add the user your webserver" + elog "is running as to the nagios group!" + fi + + else + elog "Please note that you have installed Nagios without web interface." + elog "Please don't file any bugs about having no web interface when you do this." + elog "Thank you!" + fi + + elog + elog "If your kernel has /proc protection, nagios" + elog "will not be happy as it relies on accessing the proc" + elog "filesystem. You can fix this by adding nagios into" + elog "the group wheel, but this is not recomended." + elog +} + +pkg_prerm() { + [[ "${ROOT}" == "/" ]] && /etc/init.d/nagios stop +} -- cgit v1.2.3-65-gdbad