Version bump, plus remove old 2.x series
authorTobias Scherbaum <dertobi123@gentoo.org>
Fri, 2 Apr 2010 17:04:31 +0000 (17:04 +0000)
committerTobias Scherbaum <dertobi123@gentoo.org>
Fri, 2 Apr 2010 17:04:31 +0000 (17:04 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-analyzer/nagios-core/ChangeLog
net-analyzer/nagios-core/files/2.x-series-nsca.patch [deleted file]
net-analyzer/nagios-core/files/99_nagios.conf [deleted file]
net-analyzer/nagios-core/files/nagios [deleted file]
net-analyzer/nagios-core/nagios-core-3.2.1.ebuild [moved from net-analyzer/nagios-core/nagios-core-2.12-r1.ebuild with 51% similarity]
net-analyzer/nagios/ChangeLog
net-analyzer/nagios/nagios-2.12.ebuild [deleted file]
net-analyzer/nagios/nagios-3.2.1.ebuild [new file with mode: 0644]

index cbe44b4cd975ab8200923b94841bab243b62ba99..329b33366ca057a017b054a57d4cd246a179ba0c 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nagios-core
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.158 2009/09/28 10:30:10 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.159 2010/04/02 17:03:52 dertobi123 Exp $
+
+*nagios-core-3.2.1 (02 Apr 2010)
+
+  02 Apr 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/2.x-series-nsca.patch, -nagios-core-2.12-r1.ebuild,
+  +nagios-core-3.2.1.ebuild, -files/99_nagios.conf, -files/nagios:
+  Version bump, plus remove old 2.x series
 
   28 Sep 2009; Tobias Scherbaum <dertobi123@gentoo.org>
   -files/lighttpd_nagios3.conf:
diff --git a/net-analyzer/nagios-core/files/2.x-series-nsca.patch b/net-analyzer/nagios-core/files/2.x-series-nsca.patch
deleted file mode 100644 (file)
index faae90c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
---- contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca.orig     2005-01-28 12:57:11.537852344 +0930
-+++ contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca  2005-01-28 12:57:45.877631904 +0930
-@@ -28,9 +28,12 @@
- 
- printfcmd="/bin/printf"
- 
--NscaBin="/usr/local/nagios/libexec/send_nsca" 
--NscaCfg="/usr/local/nagios/etc/send_nsca.cfg"
--NagiosHost="nagioshost"
-+NscaBin="/usr/nagios/libexec/send_nsca" 
-+NscaCfg="/etc/nagios/send_nsca.cfg"
-+
-+# Gentoo Linux Users: configure the hostname in /etc/conf.d/nagios
-+source /etc/conf.d/nagios
-+NagiosHost="${NAGIOS_NSCA_HOST}"
- 
- # Fire the data off to the NSCA daemon using the send_nsca script 
- $printfcmd "%s\t%s\t%s\t%s\n" "$1" "$2" "$3" "$4" | $NscaBin $NagiosHost -c $NscaCfg
diff --git a/net-analyzer/nagios-core/files/99_nagios.conf b/net-analyzer/nagios-core/files/99_nagios.conf
deleted file mode 100644 (file)
index b41cdee..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<IfDefine NAGIOS>
-       ScriptAlias /nagios/cgi-bin/ /usr/nagios/sbin/
-       <Directory "/usr/nagios/sbin/">
-               AllowOverride AuthConfig
-               Options ExecCGI
-               Order allow,deny
-               Allow from all
-       </Directory>
-       Alias /nagios /usr/nagios/share/
-       <Directory "/usr/nagios/share">
-               AllowOverride AuthConfig
-               Order allow,deny
-               Allow from all
-       </Directory>
-</IfDefine>
diff --git a/net-analyzer/nagios-core/files/nagios b/net-analyzer/nagios-core/files/nagios
deleted file mode 100644 (file)
index c78279d..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios,v 1.10 2007/05/08 21:36:14 dertobi123 Exp $
-
-opts="${opts} reload checkconfig"
-
-depend() {
-       need net
-       use dns logger firewall
-       after mysql postgresql
-}
-
-reload()
-{
-       checkconfig || return 1
-       ebegin "Reloading configuration"
-       killall -HUP nagios &>/dev/null
-       eend $?
-}
-
-checkconfig() {
-       # Silent Check
-       /usr/nagios/bin/nagios -v /etc/nagios/nagios.cfg &>/dev/null && return 0
-
-       # Now we know there's problem - run again and display errors
-       /usr/nagios/bin/nagios -v /etc/nagios/nagios.cfg
-       eend $? "Configuration Error. Please fix your configfile"
-}
-
-start() {
-       checkconfig || return 1
-       ebegin "Starting nagios"
-       touch /var/nagios/nagios.log /var/nagios/status.sav
-       chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav
-       rm -f /var/nagios/rw/nagios.cmd
-       start-stop-daemon --quiet --start --startas /usr/nagios/bin/nagios \
-               -e HOME="/var/nagios/home" --pidfile /var/nagios/nagios.lock \
-               -- -d /etc/nagios/nagios.cfg
-       eend $?
-}
-
-stop() {
-       ebegin "Stopping nagios"
-       start-stop-daemon --quiet --stop --pidfile /var/nagios/nagios.lock
-       rm -f /var/nagios/status.log /var/nagios/nagios.tmp /var/nagios/nagios.lock /var/nagios/rw/nagios.cmd
-       eend $?
-}
-
-svc_restart() {
-       checkconfig || return 1
-       ebegin "Restarting nagios"
-       svc_stop
-       svc_start
-       eend $?
-}
-
similarity index 51%
rename from net-analyzer/nagios-core/nagios-core-2.12-r1.ebuild
rename to net-analyzer/nagios-core/nagios-core-3.2.1.ebuild
index d3fc86907e9cbc47e4b542e2c8fcd6793be468f7..15b749401c41fb5179e3d5996283fc0cfdf15853 100644 (file)
@@ -1,27 +1,25 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.12-r1.ebuild,v 1.6 2009/06/30 14:10:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.2.1.ebuild,v 1.1 2010/04/02 17:03:52 dertobi123 Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit eutils depend.apache toolchain-funcs
 
-MY_P=${PN/-core}-${PV/_}
+MY_P=${PN/-core}-${PV}
 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"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="debug perl +web vim-syntax"
+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
-               perl? ( net-analyzer/traceroute )
+               >=media-libs/gd-1.8.3-r5[jpeg,png]
+               lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
+               apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
        )
        perl? ( >=dev-lang/perl-5.6.1-r7 )"
 RDEPEND="${DEPEND}
@@ -34,38 +32,19 @@ S="${WORKDIR}/${MY_P}"
 pkg_setup() {
        depend.apache_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
-
-       # Fix remote execution in statuswml.cgi, bug #275288
-       epatch "${FILESDIR}/statuswml-bug275288.patch"
-
+src_prepare() {
        local strip="$(echo '$(MAKE) strip-post-install')"
        sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
 }
 
-src_compile() {
+src_configure() {
        local myconf
 
-       if use perl
-       then
+       if use perl ; then
                myconf="${myconf} --enable-embedded-perl --with-perlcache"
        fi
 
@@ -78,36 +57,41 @@ src_compile() {
                myconf="${myconf} --enable-DEBUG5"
        fi
 
-       if use apache2 ; then
-               myconf="${myconf} --with-command-group=apache"
-       else
+       if use !apache2 && use !lighttpd ; then
                myconf="${myconf} --with-command-group=nagios"
+       else
+               if use apache2 ; then
+                       myconf="${myconf} --with-command-group=apache"
+                       myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+               elif use lighttpd ; then
+                       myconf="${myconf} --with-command-group=lighttpd"
+               fi
        fi
 
        econf ${myconf} \
-               --prefix=/usr/nagios \
+               --prefix=/usr \
+               --bindir=/usr/sbin \
+               --sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+               --datadir=/usr/share/nagios/htdocs \
                --localstatedir=/var/nagios \
                --sysconfdir=/etc/nagios \
-               --datadir=/usr/nagios/share \
+               --libexecdir=/usr/$(get_libdir)/nagios/plugins \
                || die "./configure failed"
+}
 
+src_compile() {
        emake CC=$(tc-getCC) nagios || die "make failed"
 
        if use web ; then
                # Only compile the CGI's if "web" useflag is set.
-               make CC=$(tc-getCC) DESTDIR="${D}" cgis || die
+               emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die
        fi
-
-       emake -C contrib all || die "contrib make filed"
-
 }
 
 src_install() {
        dodoc Changelog INSTALLING LEGAL README UPGRADING
-       docinto contrib
-       dodoc contrib/README
 
-       if ! use web; then
+       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
@@ -115,91 +99,64 @@ src_install() {
 
        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
+       emake DESTDIR="${D}" install
+       emake DESTDIR="${D}" install-config
+       emake DESTDIR="${D}" install-commandmode
 
-       #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
-
-       chmod 644 "${S}"/contrib/*.cgi
-       into /usr/nagios
-       for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do
-               dobin "$bin"
-       done
+       newinitd "${FILESDIR}"/nagios3 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
+                       doins "${FILESDIR}"/99_nagios3.conf
+           elif use lighttpd ; then
+                       insinto /etc/lighttpd
+                       newins "${FILESDIR}/lighttpd_nagios3-r1.conf" nagios.conf
                else
-                       ewarn "${CATEGORY}/${PF} only supports apache-2.x webserver"
-                       ewarn "out-of-the-box. Since you are not using apache, you"
+                       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
 
-               if use perl; then
-                       into /usr/nagios ; dosbin contrib/traceroute.cgi
-               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/nagios
-       find "${D}"/usr/nagios -type d -print0 | xargs -0 chmod 755
-       find "${D}"/usr/nagios/*bin -type f -print0 | xargs -0 chmod 755
-       find "${D}"/usr/nagios/share -type f -print0 | xargs -0 chmod 644
+       chown -R root:root "${D}"/usr/$(get_libdir)/nagios
+       find "${D}"/usr/$(get_libdir)/nagios -type d -print0 | xargs -0 chmod 755
+       find "${D}"/usr/$(get_libdir)/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755
 
        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 ; then
-               chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+       if use !apache2 && use !lighttpd; then
+               chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
        else
-               chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+               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"
-
-       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() {
-       elog
-       elog "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
-       elog
-       elog "Also, if you want nagios to start at boot time"
+       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
+       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"
@@ -209,14 +166,21 @@ pkg_postinst() {
                elog "read-access to /etc/nagios."
                elog
 
-               if use apache2 ; then
+               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 "  usermod -G nagios apache"
-                       elog "or"
-                       elog "  chown nagios:apache /etc/nagios"
                        elog
-                       elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+                       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/"
@@ -238,11 +202,9 @@ pkg_postinst() {
        elog "filesystem. You can fix this by adding nagios into"
        elog "the group wheel, but this is not recomended."
        elog
-
-       elog
-       ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion"
 }
 
-pkg_prerm() {
-       [[ "${ROOT}" == "/" ]] && /etc/init.d/nagios stop
+pkg_postinst() {
+       einfo "Fixing permissions"
+       chown nagios:nagios "${ROOT}"var/nagios
 }
index 208b0b461d9d70645acd18ee9a268168e8d423e2..cc7088ed3060d2a4dbbcb0f042ed0ed6b6744ea1 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.85 2009/08/13 14:51:20 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.86 2010/04/02 17:04:31 dertobi123 Exp $
+
+*nagios-3.2.1 (02 Apr 2010)
+
+  02 Apr 2010; Tobias Scherbaum <dertobi123@gentoo.org> -nagios-2.12.ebuild,
+  +nagios-3.2.1.ebuild:
+  Version bump, plus remove old 2.x series
 
 *nagios-3.2.0 (13 Aug 2009)
 
diff --git a/net-analyzer/nagios/nagios-2.12.ebuild b/net-analyzer/nagios/nagios-2.12.ebuild
deleted file mode 100644 (file)
index a66e36c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-2.12.ebuild,v 1.5 2008/05/22 18:34:52 maekke Exp $
-
-DESCRIPTION="The Nagios metapackage - merge this to pull install all of the
-nagios packages"
-HOMEPAGE="http://www.nagios.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="~net-analyzer/nagios-core-${PV}
-       >=net-analyzer/nagios-plugins-1.4
-       >=net-analyzer/nagios-nrpe-1.8
-       >=net-analyzer/nagios-nsca-2.3
-       >=net-analyzer/nagios-imagepack-1.0"
-
-pkg_postrm() {
-       elog "Note: this is a META ebuild for ${P}."
-       elog "to remove it completely or before re-emerging"
-       elog "either use 'depclean', or remove/re-emerge these packages:"
-       elog
-       for dep in ${RDEPEND}; do
-               elog "     ${dep}"
-       done
-       echo
-}
diff --git a/net-analyzer/nagios/nagios-3.2.1.ebuild b/net-analyzer/nagios/nagios-3.2.1.ebuild
new file mode 100644 (file)
index 0000000..f500ae3
--- /dev/null
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.2.1.ebuild,v 1.1 2010/04/02 17:04:31 dertobi123 Exp $
+
+inherit multilib
+
+DESCRIPTION="The Nagios metapackage - merge this to pull install all of the nagios packages"
+HOMEPAGE="http://www.nagios.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+       >=net-analyzer/nagios-plugins-1.4.13-r1
+       >=net-analyzer/nagios-imagepack-1.0-r100"
+
+pkg_setup() {
+       # Avoid upgrading from Nagios <3 as the directory structure has changed
+       if has_version '<net-analyzer/nagios-3.0' ; then
+               if [[ "${FORCE_UPGRADE}" ]] ; then
+                       echo
+                       ewarn "you are upgrading from an incompatible version and have"
+                       ewarn "FORCE_UPGRADE set, will build this package while Nagios is running."
+                       echo
+               else
+                       echo
+                       eerror "You are upgrading from an incompatible version."
+                       eerror "Please be advised that installation paths have changed to a more FHS"
+                       eerror "compliant structure and you won't be able to easily upgrade to"
+                       eerror "Nagios 3 therefore. You will have to change your configuration"
+                       eerror "to reflect this change, for example Nagios plugins are now installed"
+                       eerror "into /usr/$(get_libdir)/nagios/plugins/ instead of /usr/nagios/libexec."
+                       echo
+                       eerror "If you want to upgrade now, emerge nagios with:"
+                       eerror "    FORCE_UPGRADE=1 emerge nagios"
+                       die "Upgrading from an incompatible version!"
+                       echo
+               fi
+       fi
+}
+
+pkg_postrm() {
+       elog "Note: this is a META ebuild for ${P}."
+       elog "to remove it completely or before re-emerging"
+       elog "either use 'depclean', or remove/re-emerge these packages:"
+       elog
+       for dep in ${RDEPEND}; do
+               elog "     ${dep}"
+       done
+       echo
+}