diff options
author | Lance Albertson <ramereth@gentoo.org> | 2006-05-16 13:45:49 +0000 |
---|---|---|
committer | Lance Albertson <ramereth@gentoo.org> | 2006-05-16 13:45:49 +0000 |
commit | 24aa58340cdb60554a4ecd8e06a6da0d2cf97ca4 (patch) | |
tree | e9d4b4eebc558afb2459ac3e59aeac636a4761b3 /net-analyzer/nagios-core | |
parent | Version bumped. (diff) | |
download | historical-24aa58340cdb60554a4ecd8e06a6da0d2cf97ca4.tar.gz historical-24aa58340cdb60554a4ecd8e06a6da0d2cf97ca4.tar.bz2 historical-24aa58340cdb60554a4ecd8e06a6da0d2cf97ca4.zip |
version bump for yet another security issue (see bug #133487)
Package-Manager: portage-2.0.54-r2
Diffstat (limited to 'net-analyzer/nagios-core')
-rw-r--r-- | net-analyzer/nagios-core/ChangeLog | 9 | ||||
-rw-r--r-- | net-analyzer/nagios-core/Manifest | 14 | ||||
-rw-r--r-- | net-analyzer/nagios-core/files/digest-nagios-core-1.4.1 | 2 | ||||
-rw-r--r-- | net-analyzer/nagios-core/files/digest-nagios-core-2.3.1 | 2 | ||||
-rw-r--r-- | net-analyzer/nagios-core/nagios-core-1.4.1.ebuild | 270 | ||||
-rw-r--r-- | net-analyzer/nagios-core/nagios-core-2.3.1.ebuild | 227 |
6 files changed, 513 insertions, 11 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog index 666602140c92..74cdda5a8a3e 100644 --- a/net-analyzer/nagios-core/ChangeLog +++ b/net-analyzer/nagios-core/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/nagios-core # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.82 2006/05/12 20:31:46 eldad Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.83 2006/05/16 13:45:05 ramereth Exp $ + +*nagios-core-2.3.1 (16 May 2006) +*nagios-core-1.4.1 (16 May 2006) + + 16 May 2006; Lance Albertson <ramereth@gentoo.org> + +nagios-core-1.4.1.ebuild, +nagios-core-2.3.1.ebuild: + * Version bump for yet another security issue (See bug #133487) 12 May 2006; Eldad Zack <eldad@gentoo.org> nagios-core-1.4.ebuild, nagios-core-2.3.ebuild: diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 05ab1e72036e..d5c2b6efd406 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,23 +1,17 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 e949c9c191104d680af879c6c8ad7de3 ChangeLog 14756 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409 MD5 155842cf933f59e8cd68b61d84280e70 files/digest-nagios-core-1.4 151 +MD5 2e5fdbc8e1063290d5589c1091bde0bb files/digest-nagios-core-1.4.1 153 MD5 0112e82ce6b3c7360d47e40bdf76a990 files/digest-nagios-core-2.3 131 +MD5 801bbf98c4aa4b4d10fc5de369933342 files/digest-nagios-core-2.3.1 133 MD5 f83fb59efe215d8191866a95685b4b39 files/nagios 1416 MD5 354f5aeb0e831ee8e218962eb85d07e4 files/nagios-1.x-Makefile-asneeded.diff 5460 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049 +MD5 b82694414e8e2a8f72ae688c08a97cd1 nagios-core-1.4.1.ebuild 7507 MD5 71fc67b930bb60a4b18c2fd2e55febbf nagios-core-1.4.ebuild 7504 +MD5 bad76591d737b015d248479440d94a51 nagios-core-2.3.1.ebuild 5990 MD5 bad76591d737b015d248479440d94a51 nagios-core-2.3.ebuild 5990 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux) - -iD8DBQFEZPDGT+MN7JbqCpMRAnS0AJ9W5FBvWppBIlHO1mN1SqYSYb333gCfabhH -vuTFycjhVYJ2Od3ToVOMszs= -=ie+E ------END PGP SIGNATURE----- diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.4.1 b/net-analyzer/nagios-core/files/digest-nagios-core-1.4.1 new file mode 100644 index 000000000000..eb65753fc6ce --- /dev/null +++ b/net-analyzer/nagios-core/files/digest-nagios-core-1.4.1 @@ -0,0 +1,2 @@ +MD5 4e77a1200f8e4343e59234df76d2a444 nagios-1.4.1.tar.gz 1643386 +MD5 565ce2a690d50aeb542e7afe44b8c733 nagios-1.x-Makefile-distclean-gentoo.diff.bz2 1133 diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1 b/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1 new file mode 100644 index 000000000000..bbc7d31072b4 --- /dev/null +++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1 @@ -0,0 +1,2 @@ +MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990 +MD5 22029e5b71b50036c41a44f63e58150d nagios-2.3.1.tar.gz 1734958 diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild new file mode 100644 index 000000000000..d5518961b65b --- /dev/null +++ b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild @@ -0,0 +1,270 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild,v 1.1 2006/05/16 13:45:05 ramereth Exp $ + +inherit eutils apache-module toolchain-funcs + +MY_P=${P/-core} +DESCRIPTION="Nagios Core - Check daemon, CGIs, docs" +HOMEPAGE="http://www.nagios.org/" +SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz + mirror://gentoo/nagios-1.x-Makefile-distclean-gentoo.diff.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="noweb mysql postgres perl debug apache2" + +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? ( >=dev-lang/perl-5.6.1-r7 ) + mysql? ( >=dev-db/mysql-3.23.56 ) + postgres? ( !mysql? ( >=dev-db/postgresql-7.3.2 ) )" + +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 /usr/bin/gdlib-config ]]; then + if [[ ! $(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}/nagios-1.x-Makefile-asneeded.diff + epatch ${WORKDIR}/nagios-1.x-Makefile-distclean-gentoo.diff + + # libpq-fe.h isnt in psgql/ + cd xdata/ + sed -i -e "s:pgsql/::" *.c +} + +src_compile() { + local myconf + + if use mysql && use postgres; then + ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time." + ewarn "Using MySQL as default." + + has_version ">=sys-apps/portage-2.0.50" && ( + einfo "You can add -" + echo + einfo "net-analyzer/nagios-core [use flags]" + echo + einfo "to /etc/portage/package.use to permanently set this package's USE flags" + einfo "More info on package.use is available on:" + einfo " man 5 portage" + ) + elif use postgres ; then + myconf="${myconf} \ + --with-pgsql-xdata \ + --with-pgsql-status \ + --with-pgsql-comments \ + --with-pgsql-extinfo \ + --with-pgsql-retention \ + --with-pgsql-downtime" + + if [ -r /usr/include/postgresql/libpq-fe.h ] ; then + myconf="${myconf} --with-pgsql-inc=/usr/include/postgresql" + fi + fi + + use mysql && myconf="${myconf} \ + --with-file-perfdata \ + --with-template-extinfo \ + --with-mysql-xdata \ + --with-mysql-status \ + --with-mysql-comments \ + --with-mysql-retention \ + --with-mysql-downtime" + + use perl && myconf="${myconf} \ + --enable-embedded-perl \ + --with-perlcache" + + 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" + + make CC=$(tc-getCC) DESTDIR=${D} 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 + + emake -C contrib all || "contrib make filed" +} + +src_install() { + dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING contrib/htaccess.sample + docinto contrib + dodoc contrib/README + + if use noweb; then + sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile + sed -i -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile + fi + + 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/* + + # 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/database 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 + for cgi in `find contrib/ -name "*.cgi" -maxdepth 1` ; do + dosbin $cgi + done + 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 +} + +pkg_preinst() { + if use noweb; then + chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw" + else + chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw" + fi + + chmod 2750 ${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 + + if use mysql && use postgres; then + ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time." + ewarn "as a default, MySQL support was built." + ewarn "To build nagios with PostgreSQL you'll have to emerge nagios without the mysql useflag." + fi + + einfo + einfo "If you are using distributed monitoring, check the contrib scripts." + einfo "configure the central nagios server for the nsca in /etc/conf.d/nagios." + 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 +} + +pkg_prerm() { + /etc/init.d/nagios stop +} diff --git a/net-analyzer/nagios-core/nagios-core-2.3.1.ebuild b/net-analyzer/nagios-core/nagios-core-2.3.1.ebuild new file mode 100644 index 000000000000..fba8bab3f6c1 --- /dev/null +++ b/net-analyzer/nagios-core/nagios-core-2.3.1.ebuild @@ -0,0 +1,227 @@ +# Copyright 1999-2006 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.3.1.ebuild,v 1.1 2006/05/16 13:45:05 ramereth 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="~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 +} + +pkg_preinst() { + 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 +} |