From ac3d26bb9178bdb07038000bc4e2b24e67e3649b Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Mon, 12 Mar 2007 00:28:47 +0000 Subject: [PATCH] Version bump to 2.8 Package-Manager: portage-2.1.2.2 --- net-analyzer/nagios-core/ChangeLog | 7 +- net-analyzer/nagios-core/Manifest | 16 +- .../nagios-core/files/digest-nagios-core-2.8 | 6 + .../nagios-core/nagios-core-2.8.ebuild | 225 ++++++++++++++++++ net-analyzer/nagios-nrpe/Manifest | 26 +- 5 files changed, 261 insertions(+), 19 deletions(-) create mode 100644 net-analyzer/nagios-core/files/digest-nagios-core-2.8 create mode 100644 net-analyzer/nagios-core/nagios-core-2.8.ebuild diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog index d92a2f3654e0..cbd1d2db9a7e 100644 --- a/net-analyzer/nagios-core/ChangeLog +++ b/net-analyzer/nagios-core/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/nagios-core # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.94 2007/02/03 20:01:35 mjolnir Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.95 2007/03/12 00:28:47 mjolnir Exp $ + +*nagios-core-2.8 (12 Mar 2007) + + 12 Mar 2007; Martin Jackson +nagios-core-2.8.ebuild: + Version bump to 2.8, by popular demand (#159571) 03 Feb 2007; Martin Jackson -nagios-core-2.3.1.ebuild, -nagios-core-2.4.ebuild, diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 44d401348ce5..a531793da4a1 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -32,6 +32,7 @@ DIST nagios-2.0b.cfg-sample.gz 8990 RMD160 5c1f02e13351f46214d032936dd1ecef3c244 DIST nagios-2.3.1.tar.gz 1734958 RMD160 fb1d1e66682ce4261535281de04067c3ad33b5ee SHA1 8376d15ca7d0ad6bd890a4d1170d325494604377 SHA256 40cd86756eb859cfd00c47c8a6670aac74c841393c49fc24bd5ed43099e3cdcc DIST nagios-2.4.tar.gz 1735573 RMD160 7f05352b0f46f14e5ce7fc19278216b9862e7735 SHA1 31a394195f571ec8417afec6b22da5d91f5f773b SHA256 e62346de93df5f4387377faac9ad1fd2fbfd5628f0482646144dc2b8d266fcd8 DIST nagios-2.5.tar.gz 1736167 RMD160 a0f1890ed546ce026cf784ae3ca83119275bd529 SHA1 00e6bc45c5634649b6a1be2758ec181197d38f76 SHA256 de9eb06609299cc231d0c2104a7f65367446cb86cb6aa3f6787fb25003fd452e +DIST nagios-2.8.tar.gz 1737830 RMD160 73b79e36599f755f7671a03f91f9924b8f864278 SHA1 9ebb59e1778df83cc238294ba2714f21e82bad33 SHA256 5143ad425bac8e1da659f2671842b874e69409b50040fca3e35b1c334abbdf8c EBUILD nagios-core-1.4.1-r1.ebuild 7487 RMD160 af3ac9162888fb14c21c093a128b08f9b3ff70c5 SHA1 0bdb9c54a87391fcbc181a9e29153629e25ebc51 SHA256 fa0681cffcdf91df40148fa732cfa14b8d9e380dd74b6109414917591962e7dd MD5 10b5b3d010cd104af29b9b8f0b6d49a0 nagios-core-1.4.1-r1.ebuild 7487 RMD160 af3ac9162888fb14c21c093a128b08f9b3ff70c5 nagios-core-1.4.1-r1.ebuild 7487 @@ -52,10 +53,14 @@ EBUILD nagios-core-2.5-r1.ebuild 5984 RMD160 8d57c4a938d3f3e981811cc7564943365ba MD5 318c062e048fdc885a749f07a1c28340 nagios-core-2.5-r1.ebuild 5984 RMD160 8d57c4a938d3f3e981811cc7564943365ba300bb nagios-core-2.5-r1.ebuild 5984 SHA256 6da767b289912b80a90a8b6f386af3836a62cac62ad298b62998024f76f32b44 nagios-core-2.5-r1.ebuild 5984 -MISC ChangeLog 16744 RMD160 4c14ca784f8938b9f2e8dfddaf40ae6317420906 SHA1 93305482b994a7e2f73d28afa138237e0613f7a5 SHA256 39b91d820aaeff461dde61d39f2c864b7875dc71b57de09b57194af1b81817a8 -MD5 4f70e5ed15afae46a2593efb91c97339 ChangeLog 16744 -RMD160 4c14ca784f8938b9f2e8dfddaf40ae6317420906 ChangeLog 16744 -SHA256 39b91d820aaeff461dde61d39f2c864b7875dc71b57de09b57194af1b81817a8 ChangeLog 16744 +EBUILD nagios-core-2.8.ebuild 5981 RMD160 d03fd2331f7101742827b9254e89333eb0721456 SHA1 89cd81c2893eb4227587ad857a7d554950dc662f SHA256 e723631d99c2bbe3037b291fd2ea1ebb6e71bd880454ac4c89e015bad461cea5 +MD5 c2911f884d5a1a9683e815e2469984f4 nagios-core-2.8.ebuild 5981 +RMD160 d03fd2331f7101742827b9254e89333eb0721456 nagios-core-2.8.ebuild 5981 +SHA256 e723631d99c2bbe3037b291fd2ea1ebb6e71bd880454ac4c89e015bad461cea5 nagios-core-2.8.ebuild 5981 +MISC ChangeLog 16904 RMD160 88a2c1266b48c5a635194069c93d7007a9ab56c8 SHA1 a4f8a6a954d0f6262237141520860bcdf7f38138 SHA256 599ae9f3a2f07061cc0e8d7e6884258a11f488900ae1da01cdf2a699f4fc4de6 +MD5 fcccf2ebbd7f91c692307b35c6292412 ChangeLog 16904 +RMD160 88a2c1266b48c5a635194069c93d7007a9ab56c8 ChangeLog 16904 +SHA256 599ae9f3a2f07061cc0e8d7e6884258a11f488900ae1da01cdf2a699f4fc4de6 ChangeLog 16904 MISC metadata.xml 1049 RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 SHA1 19972fccad8732b7fd85e1b8c0f1077dc254432f SHA256 c2b2985cb9cd326a5eb6523769cdf7e63bde2a0523dc59df5989282d1fbbd2a0 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049 RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 metadata.xml 1049 @@ -75,3 +80,6 @@ SHA256 87e3e628b03992d5b8038a9b80ab168c036c28879b9e357f71539227d512fa49 files/di MD5 b6b85fb28fc2279eb3be17377152d4d3 files/digest-nagios-core-2.5-r1 485 RMD160 114fba97e51b68fa3f07c60ee4a24be0bfacfa11 files/digest-nagios-core-2.5-r1 485 SHA256 d26b0a8fcb534c5593d50a59e3169ea24c292f13e8c519f97818bd3855001132 files/digest-nagios-core-2.5-r1 485 +MD5 2980b87e878d70dbf0e9e34a7aef84a9 files/digest-nagios-core-2.8 485 +RMD160 1e0106561d78cc03a4b1d97b6f0b9470917d6ca9 files/digest-nagios-core-2.8 485 +SHA256 7de1d96d3d94195445aea99889ba72b3fc5c7fd2f802f054cd98885d80b76563 files/digest-nagios-core-2.8 485 diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.8 b/net-analyzer/nagios-core/files/digest-nagios-core-2.8 new file mode 100644 index 000000000000..763ae90282f4 --- /dev/null +++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.8 @@ -0,0 +1,6 @@ +MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990 +RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 nagios-2.0b.cfg-sample.gz 8990 +SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12 nagios-2.0b.cfg-sample.gz 8990 +MD5 27a9ee8baf6d707a62b2ce8ba9351220 nagios-2.8.tar.gz 1737830 +RMD160 73b79e36599f755f7671a03f91f9924b8f864278 nagios-2.8.tar.gz 1737830 +SHA256 5143ad425bac8e1da659f2671842b874e69409b50040fca3e35b1c334abbdf8c nagios-2.8.tar.gz 1737830 diff --git a/net-analyzer/nagios-core/nagios-core-2.8.ebuild b/net-analyzer/nagios-core/nagios-core-2.8.ebuild new file mode 100644 index 000000000000..9ec087a8b9cf --- /dev/null +++ b/net-analyzer/nagios-core/nagios-core-2.8.ebuild @@ -0,0 +1,225 @@ +# 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.8.ebuild,v 1.1 2007/03/12 00:28:47 mjolnir Exp $ + +inherit eutils apache-module toolchain-funcs gnuconfig + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +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 nagios,apache + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/2.x-series-nsca.patch + # ppc64 needs this + gnuconfig_update +} + +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 || 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 + + emake -C contrib all || "contrib make filed" + +} + +src_install() { + dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING + docinto contrib + dodoc contrib/README + + 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/* + + 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 + + exeinto /etc/init.d + doexe ${FILESDIR}/nagios + + insinto /etc/conf.d + newins ${FILESDIR}/conf.d nagios + + 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 !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 + into /usr/nagios ; dosbin contrib/traceroute.cgi + fi + fi + + for dir in etc/nagios usr/nagios var/nagios ; do + chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}" + done + + 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" + chmod 0750 ${D}/etc/nagios || die "Failed chmod of ${D}/etc/nagios" +} + +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/bin/convertcfg for configuration file conversion" +} + +pkg_prerm() { + /etc/init.d/nagios stop +} diff --git a/net-analyzer/nagios-nrpe/Manifest b/net-analyzer/nagios-nrpe/Manifest index fb00f6bcb886..15a8be253fb2 100644 --- a/net-analyzer/nagios-nrpe/Manifest +++ b/net-analyzer/nagios-nrpe/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX nrpe-1.8 462 RMD160 00f49ef6b7c795cf9d02b8dd4e93b65fbfcb202c SHA1 b91dbfedda11eab9afb49adca3e294269bfa3ae3 SHA256 2453bf826b428777736c9a04a605c83cdc774765372e0525704e73116045fff7 MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-1.8 462 RMD160 00f49ef6b7c795cf9d02b8dd4e93b65fbfcb202c files/nrpe-1.8 462 @@ -25,6 +22,7 @@ DIST nrpe-1.8.tar.gz 41347 RMD160 87f52d5618bb170d3372f6c5a5eab16acc7ccd28 SHA1 DIST nrpe-2.3.tar.gz 97586 RMD160 b366e1bb4209921002079c8cf75414bb9cf25cd7 SHA1 03231fecaf5dbbde1d56ba95b0ad77b30106df0c SHA256 c961a21feff2995df39ee18478bc1b1a38ab8da0e5fe62b31fafc234de58f248 DIST nrpe-2.5.1.tar.gz 100382 RMD160 757eb92cde878d8a0d3e483149d8969728ed7e03 SHA1 1beab9dc5fe77b722a12161b23b536ac5e28a6a4 SHA256 a23a0a37d81900d03884898bd0ae9b9da95348cc4a08695a4c229337c83fbe5e DIST nrpe-2.5.2.tar.gz 100637 RMD160 79eb2486ebe81e520b4092d91f44e4c1ad0fd44e SHA1 e0fe51474d0d08fa6fc4b09ceab9adcc2585ddac SHA256 701fa133cffaaab9bce826b076d689f3216fd472585307ab1302b3e469a367b8 +DIST nrpe-2.7.1.tar.gz 102000 RMD160 7af488b8b05991cd8f49d28f716ecaf19cd6d838 SHA1 808c14a011eb31d601447a250811d35941317a60 SHA256 e8013cc820a2e7352284e24053919622546d3dc2e39c26fbe148d22285809e54 EBUILD nagios-nrpe-1.8-r1.ebuild 1562 RMD160 62e21be8bdc8ac1750f406a812eef141751cf3e7 SHA1 41726d2140d4b283502a8bfa1fb8ef5f23ee9541 SHA256 7c37c99999f410703a38b01173edf18229eea73f7486df0b284e0b42b5903eb9 MD5 9d91fabf9f7f1bda0b75ba5280521932 nagios-nrpe-1.8-r1.ebuild 1562 RMD160 62e21be8bdc8ac1750f406a812eef141751cf3e7 nagios-nrpe-1.8-r1.ebuild 1562 @@ -45,10 +43,14 @@ EBUILD nagios-nrpe-2.5.2.ebuild 2371 RMD160 84037d7b1f8f5f349496ca41d900bd6421cb MD5 30eaef707a3a90b513e6abd69f88ff9d nagios-nrpe-2.5.2.ebuild 2371 RMD160 84037d7b1f8f5f349496ca41d900bd6421cb2a65 nagios-nrpe-2.5.2.ebuild 2371 SHA256 4cd77ee1d1645c3695cdd244ce1d33dd9eb942e5a79afe951894a941c7db6d8c nagios-nrpe-2.5.2.ebuild 2371 -MISC ChangeLog 4545 RMD160 4134b789263ee42e75d2cfca5a8a70f6c910f3aa SHA1 58a6aee32599c62876ded04ed762291e5d9e827e SHA256 c30e7eeab1f4dfb9f106549b945a73e66770a7894d8194652833fac52fbb3f8d -MD5 0295a22393bdfaf775b80cd4e7c2d998 ChangeLog 4545 -RMD160 4134b789263ee42e75d2cfca5a8a70f6c910f3aa ChangeLog 4545 -SHA256 c30e7eeab1f4dfb9f106549b945a73e66770a7894d8194652833fac52fbb3f8d ChangeLog 4545 +EBUILD nagios-nrpe-2.7.1.ebuild 2528 RMD160 e17e1f8985605230ae67d8d700aadd8375e57c4f SHA1 3f4d61e70d3901b6e594c99979819974ded9c175 SHA256 b0794268b0fff0246b6419e826f29bef5f4ea012ad12504b18438c6ebba5d583 +MD5 2ebe6263ae34d523f2b0b382b69f1361 nagios-nrpe-2.7.1.ebuild 2528 +RMD160 e17e1f8985605230ae67d8d700aadd8375e57c4f nagios-nrpe-2.7.1.ebuild 2528 +SHA256 b0794268b0fff0246b6419e826f29bef5f4ea012ad12504b18438c6ebba5d583 nagios-nrpe-2.7.1.ebuild 2528 +MISC ChangeLog 4686 RMD160 103a77b2cacbc62fd7b81231d154313a3f04bf51 SHA1 101811d234e994ac5d012be22416ee958493f61d SHA256 2cd3199ed80dc6ec479a577b35f1b45424001496a2ed8bc0c44f760e9f0000e2 +MD5 4549984b3af71a73cbf6a4930f35815c ChangeLog 4686 +RMD160 103a77b2cacbc62fd7b81231d154313a3f04bf51 ChangeLog 4686 +SHA256 2cd3199ed80dc6ec479a577b35f1b45424001496a2ed8bc0c44f760e9f0000e2 ChangeLog 4686 MISC metadata.xml 483 RMD160 17cbf2c8c726024d7ab5d9856f417ecfb6c8624a SHA1 57c75f6469598a3ad0828022b36db734752a6170 SHA256 20e6427e87ba3ff8ed5a3df13c3a5c4ac9e1e36fec8e14bc63fdb3e80d0743d9 MD5 56c82d2c8a7e7500f3fec23e5bc43cf1 metadata.xml 483 RMD160 17cbf2c8c726024d7ab5d9856f417ecfb6c8624a metadata.xml 483 @@ -68,10 +70,6 @@ SHA256 234b64d0371546d8665a25e680911d6fe7a482abdcae45b2daddd660dcd8574b files/di MD5 310907b9fcd3cc8c8fdf4f61c4025c5d files/digest-nagios-nrpe-2.5.2-r1 232 RMD160 1ffdb4206729412896ab41cd6acd0f04665e6cec files/digest-nagios-nrpe-2.5.2-r1 232 SHA256 234b64d0371546d8665a25e680911d6fe7a482abdcae45b2daddd660dcd8574b files/digest-nagios-nrpe-2.5.2-r1 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFF2ju5z974XjDVpbkRAu4vAKCV2duoTCEDXaY1lYQHtSH17IuT5ACfZLxh -bVvfsxW6SltHlT3Z/8ZcveI= -=sudn ------END PGP SIGNATURE----- +MD5 8a163c67ae46a781aee7fdcf0513d33d files/digest-nagios-nrpe-2.7.1 232 +RMD160 77cd36e13b2d5e17435ffbfcbdd19f5eac764bdd files/digest-nagios-nrpe-2.7.1 232 +SHA256 d87460c9711a708a89d2a9b37d3af57e16566c79f3c99b26a813b69e959dfc89 files/digest-nagios-nrpe-2.7.1 232 -- 2.26.2