diff options
| -rw-r--r-- | net-analyzer/nagios-core/ChangeLog | 12 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/Manifest | 16 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc1 | 1 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p4 | 1 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p5 | 1 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/nagios-core-2.0_rc1.ebuild (renamed from net-analyzer/nagios-core/nagios-core-2.0b_p5.ebuild) | 7 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild | 223 | ||||
| -rw-r--r-- | net-analyzer/nagios/ChangeLog | 11 | ||||
| -rw-r--r-- | net-analyzer/nagios/Manifest | 12 | ||||
| -rw-r--r-- | net-analyzer/nagios/files/digest-nagios-2.0_rc1 (renamed from net-analyzer/nagios/files/digest-nagios-2.0b_p4) | 0 | ||||
| -rw-r--r-- | net-analyzer/nagios/files/digest-nagios-2.0b_p5 | 0 | ||||
| -rw-r--r-- | net-analyzer/nagios/nagios-2.0_rc1.ebuild (renamed from net-analyzer/nagios/nagios-2.0b_p5.ebuild) | 2 | ||||
| -rw-r--r-- | net-analyzer/nagios/nagios-2.0b_p4.ebuild | 30 |
13 files changed, 40 insertions, 276 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog index 74ec0d7df5e3..ef335391d739 100644 --- a/net-analyzer/nagios-core/ChangeLog +++ b/net-analyzer/nagios-core/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-analyzer/nagios-core # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.64 2005/12/17 21:08:43 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.65 2005/12/27 22:23:03 ramereth Exp $ + +*nagios-core-2.0_rc1 (27 Dec 2005) + + 27 Dec 2005; Lance Albertson <ramereth@gentoo.org> + +nagios-core-2.0_rc1.ebuild, -nagios-core-2.0b_p4.ebuild, + -nagios-core-2.0b_p5.ebuild: + * Version bump + * Special NOTE: Removing old beta ebuilds to force the correct version naming + scheme on users. 2.0b_p# should have been 2.0_beta# from the beginning and was + never fixed. 17 Dec 2005; Markus Rothe <corsair@gentoo.org> nagios-core-2.0b_p5.ebuild, nagios-core-1.3.ebuild: diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index cce42a541e49..c74668b5c57e 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,19 +1,17 @@ MD5 3e06424623741611b8de02db29715e29 ChangeLog 11601 -MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049 -MD5 af171cb84450787a92481d9d3b7e132b nagios-core-2.0b_p4.ebuild 5866 -MD5 92fb214ff93f5f66c997ea1b00fab6c5 nagios-core-1.2-r4.ebuild 7183 -MD5 e6c7fc1851174e9a07bf70bb2a1e7b65 nagios-core-2.0b_p5.ebuild 5978 -MD5 4dbcb9ac0f25a9e5c46921a9e3c2a3da nagios-core-1.3.ebuild 7490 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409 -MD5 7a96e80dbe17f26441d3266662b58a51 files/digest-nagios-core-2.0b_p4 65 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63 -MD5 c6cc963b6a3cc45558ebbc5890908bb0 files/digest-nagios-core-2.0b_p5 65 +MD5 484d128eff6e79cfcb09e37a92e1926f files/digest-nagios-core-1.3 63 +MD5 88603a32ba66b5b82d9a6c0d2b006032 files/digest-nagios-core-2.0_rc1 66 MD5 f83fb59efe215d8191866a95685b4b39 files/nagios 1416 +MD5 6b679390ce57974a0f69145e0918372f files/nagios-2.0b.cfg-sample.gz 8990 MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585 -MD5 6b679390ce57974a0f69145e0918372f files/nagios-2.0b.cfg-sample.gz 8990 -MD5 484d128eff6e79cfcb09e37a92e1926f files/digest-nagios-core-1.3 63 +MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049 +MD5 92fb214ff93f5f66c997ea1b00fab6c5 nagios-core-1.2-r4.ebuild 7183 +MD5 4dbcb9ac0f25a9e5c46921a9e3c2a3da nagios-core-1.3.ebuild 7490 +MD5 7bff016517d7831e4661de405cf7fecf nagios-core-2.0_rc1.ebuild 6211 diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc1 b/net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc1 new file mode 100644 index 000000000000..d8ed72feb7a9 --- /dev/null +++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc1 @@ -0,0 +1 @@ +MD5 5807fc2f1cf5355a2eadc6f4d51f6711 nagios-2.0rc1.tar.gz 1731687 diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p4 b/net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p4 deleted file mode 100644 index 089bd44d3ee3..000000000000 --- a/net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p4 +++ /dev/null @@ -1 +0,0 @@ -MD5 206ea26230d1360cc8871c0fee80b4c4 nagios-2.0b4.tar.gz 1710293 diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p5 b/net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p5 deleted file mode 100644 index 673be4f9d37d..000000000000 --- a/net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p5 +++ /dev/null @@ -1 +0,0 @@ -MD5 52e05ac1a2d1ab1e6869183912c9d27f nagios-2.0b5.tar.gz 1729378 diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p5.ebuild b/net-analyzer/nagios-core/nagios-core-2.0_rc1.ebuild index ea2c761e3b16..5024163bf347 100644 --- a/net-analyzer/nagios-core/nagios-core-2.0b_p5.ebuild +++ b/net-analyzer/nagios-core/nagios-core-2.0_rc1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2005 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.0b_p5.ebuild,v 1.2 2005/12/17 21:04:35 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0_rc1.ebuild,v 1.1 2005/12/27 22:23:03 ramereth Exp $ inherit eutils apache-module toolchain-funcs -MY_P=${PN/-core}-${PV/_p} +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" @@ -220,6 +220,9 @@ pkg_postinst() { einfo ewarn "Use /usr/nagios/contrib/convertcfg for configuration file conversion" einfo + einfo "Due to a mixup on how the ebuilds were versioned in portage, this" + einfo "upgrade might look like a downgrade. I needed to re-align the version" + einfo "numbering to be correct. Sorry for any confusion that may have caused." } pkg_prerm() { diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild deleted file mode 100644 index 0742eb8ac59a..000000000000 --- a/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2005 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.0b_p4.ebuild,v 1.3 2005/10/15 23:22:12 soulse Exp $ - -inherit eutils apache-module toolchain-funcs - -MY_P=${PN/-core}-${PV/_p} -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="~x86 ~sparc ~ppc ~amd64" -IUSE="noweb perl debug apache2" -# mysql postgres -DEPEND="virtual/mailx - !noweb? ( - >=media-libs/jpeg-6b-r3 - >=media-libs/libpng-1.2.5-r4 - >=media-libs/gd-1.8.3-r5 - ${NEED_APACHE_DEPEND} - perl? ( net-analyzer/traceroute ) - ) - perl? ( >=dev-lang/perl-5.6.1-r7 )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - # If there's a gd lib on the system, it will try to build with it. - # check if gdlib-config is on, and then check its output. - if [[ -x ${ROOT}usr/bin/gdlib-config ]]; then - if [[ ! $(${ROOT}usr/bin/gdlib-config --libs | grep -- -ljpeg) ]]; then - eerror "Your gd has been compiled without jpeg support." - eerror "Please re-emerge gd:" - eerror "# USE="jpeg" emerge gd" - die "pkg_setup failed" - fi - fi - - enewgroup nagios - - if use noweb; then - enewuser nagios -1 /bin/bash /dev/null nagios - else - enewuser nagios -1 /bin/bash /dev/null apache - usermod -G apache nagios - fi -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/2.x-series-nsca.patch - gunzip -c ${FILESDIR}/nagios-2.0b.cfg-sample.gz > ./nagios.cfg-sample -} - -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 noweb; then - myconf="${myconf} --with-command-grp=nagios" - else - myconf="${myconf} --with-command-grp=apache" - fi - - ./configure ${myconf} \ - --host=${CHOST} \ - --prefix=/usr/nagios \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - ${myconf} || die "./configure failed" - - emake CC=$(tc-getCC) nagios contrib || die "make failed" - - if use !noweb ; then - # Only compile the CGI's if "noweb" useflag is not set. - make CC=$(tc-getCC) DESTDIR=${D} cgis || die - fi - - # convert config files - emake -C contrib convertcfg || "config convert died" - -} - -src_install() { - dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING - - if use noweb; then - sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' \ - -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb 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/* - - dodoc ${S}/nagios.cfg-sample - - exeinto /etc/init.d - doexe ${FILESDIR}/nagios - - insinto /etc/conf.d - newins ${FILESDIR}/conf.d nagios - - - rm ${S}/contrib/Makefile* ${S}/contrib/*.c ${S}/contrib/*.h - - #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 - - mv contrib/ ${D}usr/nagios - - for dir in etc/nagios usr/nagios var/nagios usr/nagios/contrib - do - chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}" - done - - #Apache Module - if use !noweb; then - if use apache2; then - insinto ${APACHE2_MODULES_CONFDIR} - doins ${FILESDIR}/99_nagios.conf - else - insinto ${APACHE1_MODULES_CONFDIR} - doins ${FILESDIR}/nagios.conf - fi - if use perl; then - mv ${D}usr/nagios/contrib/traceroute.cgi ${D}usr/nagios/sbin - fperms a+x /usr/nagios/sbin/traceroute.cgi - fi - fi -} - -pkg_preinst() { - keepdir /etc/nagios - keepdir /var/nagios - keepdir /var/nagios/archives - keepdir /usr/nagios/share/ssi - keepdir /var/nagios/rw - - if use noweb; then - chown -R nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw" - else - chown -R nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw" - fi - - chmod ug+s ${D}/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw" -} - -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 !noweb; 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." - - if use apache2; then - einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\"" - else - einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\"" - fi - - einfo - einfo "That will make nagios's web front end visable via" - einfo "http://localhost/nagios/" - einfo - - 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/contrib/convertcfg for configuration file conversion" - einfo -} - -pkg_prerm() { - /etc/init.d/nagios stop -} diff --git a/net-analyzer/nagios/ChangeLog b/net-analyzer/nagios/ChangeLog index 9403c27458e8..c9b1b660bca5 100644 --- a/net-analyzer/nagios/ChangeLog +++ b/net-analyzer/nagios/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-analyzer/nagios # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.28 2005/12/17 21:19:21 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.29 2005/12/27 22:23:26 ramereth Exp $ + +*nagios-2.0_rc1 (27 Dec 2005) + + 27 Dec 2005; Lance Albertson <ramereth@gentoo.org> +nagios-2.0_rc1.ebuild, + -nagios-2.0b_p4.ebuild, -nagios-2.0b_p5.ebuild: + * Version bump + * Special NOTE: Removing old beta ebuilds to force the + correct version naming scheme on users. 2.0b_p# should have been 2.0_beta# + from the beginning and was never fixed. 17 Dec 2005; Markus Rothe <corsair@gentoo.org> nagios-2.0b_p5.ebuild: Added ~ppc64 diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest index 84b69face2fe..7c58ffef1560 100644 --- a/net-analyzer/nagios/Manifest +++ b/net-analyzer/nagios/Manifest @@ -1,10 +1,8 @@ -MD5 3907ac216fd63185e599a941f8649a5c ChangeLog 4006 +MD5 346815db0013742fdab73bd990aad142 ChangeLog 4359 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.2 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.3 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0_rc1 0 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049 MD5 9cc5bbb8531bdad0ca97cbdd7fb3764e nagios-1.2.ebuild 855 -MD5 bb0efd47039b2c1e5717d628935c99cb nagios-2.0b_p5.ebuild 861 -MD5 2087732313042452caa428329982cbac nagios-2.0b_p4.ebuild 855 MD5 af422d124ed9da226220c3d6291f99c5 nagios-1.3.ebuild 855 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.2 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0b_p5 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0b_p4 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.3 0 +MD5 bb0efd47039b2c1e5717d628935c99cb nagios-2.0_rc1.ebuild 861 diff --git a/net-analyzer/nagios/files/digest-nagios-2.0b_p4 b/net-analyzer/nagios/files/digest-nagios-2.0_rc1 index e69de29bb2d1..e69de29bb2d1 100644 --- a/net-analyzer/nagios/files/digest-nagios-2.0b_p4 +++ b/net-analyzer/nagios/files/digest-nagios-2.0_rc1 diff --git a/net-analyzer/nagios/files/digest-nagios-2.0b_p5 b/net-analyzer/nagios/files/digest-nagios-2.0b_p5 deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/net-analyzer/nagios/files/digest-nagios-2.0b_p5 +++ /dev/null diff --git a/net-analyzer/nagios/nagios-2.0b_p5.ebuild b/net-analyzer/nagios/nagios-2.0_rc1.ebuild index 2aeed4b678d7..62139b4a0e5e 100644 --- a/net-analyzer/nagios/nagios-2.0b_p5.ebuild +++ b/net-analyzer/nagios/nagios-2.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-2.0b_p5.ebuild,v 1.2 2005/12/17 21:19:21 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-2.0_rc1.ebuild,v 1.1 2005/12/27 22:23:26 ramereth Exp $ DESCRIPTION="The Nagios metapackage - merge this to pull install all of the nagios packages" diff --git a/net-analyzer/nagios/nagios-2.0b_p4.ebuild b/net-analyzer/nagios/nagios-2.0b_p4.ebuild deleted file mode 100644 index 3d7ab067ec07..000000000000 --- a/net-analyzer/nagios/nagios-2.0b_p4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-2.0b_p4.ebuild,v 1.1 2005/09/28 18:22:52 ramereth 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="~x86 ~sparc ~ppc ~amd64" -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() { - einfo "Note: this is a META ebuild for ${P}." - einfo "to remove it completely or before re-emerging" - einfo "either use 'depclean', or remove/re-emerge these packages:" - echo - for dep in ${RDEPEND}; do - einfo " ${dep}" - done - echo -} - |