From 426e5a06bd032671e733a3ba6e6a81250954b477 Mon Sep 17 00:00:00 2001 From: Tobias Scherbaum Date: Sat, 29 Sep 2007 09:11:00 +0000 Subject: Version bump, fix quoting, 1.4.10 fixes a buffer overflow vulnerability in its check_http plugin (Portage version: 2.1.3.9) --- net-analyzer/nagios-plugins/ChangeLog | 10 +- .../files/digest-nagios-plugins-1.4.10 | 3 + .../files/digest-nagios-plugins-1.4.9 | 3 - .../files/nagios-plugins-1.4.10-contrib.patch | 43 +++++++ .../nagios-plugins/nagios-plugins-1.4.10.ebuild | 123 +++++++++++++++++++++ .../nagios-plugins/nagios-plugins-1.4.9.ebuild | 123 --------------------- 6 files changed, 178 insertions(+), 127 deletions(-) create mode 100644 net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.10 delete mode 100644 net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.9 create mode 100644 net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-contrib.patch create mode 100644 net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild delete mode 100644 net-analyzer/nagios-plugins/nagios-plugins-1.4.9.ebuild (limited to 'net-analyzer/nagios-plugins') diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog index f21f03edec1c..fc808a6182df 100644 --- a/net-analyzer/nagios-plugins/ChangeLog +++ b/net-analyzer/nagios-plugins/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-analyzer/nagios-plugins # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.69 2007/06/30 16:36:32 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.70 2007/09/29 09:10:59 dertobi123 Exp $ + +*nagios-plugins-1.4.10 (29 Sep 2007) + + 29 Sep 2007; Tobias Scherbaum + +files/nagios-plugins-1.4.10-contrib.patch, -nagios-plugins-1.4.9.ebuild, + +nagios-plugins-1.4.10.ebuild: + Version bump, fix quoting, 1.4.10 fixes a buffer overflow vulnerability in + its check_http plugin 30 Jun 2007; Tobias Scherbaum nagios-plugins-1.4.8-r1.ebuild, nagios-plugins-1.4.9.ebuild: diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.10 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.10 new file mode 100644 index 000000000000..b5e8d8d88381 --- /dev/null +++ b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.10 @@ -0,0 +1,3 @@ +MD5 c67841223864ae1626ab2adb2f0b4c9d nagios-plugins-1.4.10.tar.gz 1693979 +RMD160 8f8167f07d6162165d7cb38c9c09ebff418151bd nagios-plugins-1.4.10.tar.gz 1693979 +SHA256 193ef480cd2b98d63de9183a83e277d6ef3b55032f44bd76616ef5e7a3d4a76e nagios-plugins-1.4.10.tar.gz 1693979 diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.9 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.9 deleted file mode 100644 index 4e147c6806a0..000000000000 --- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6e617e95cadeedd92870cdbd2f13726c nagios-plugins-1.4.9.tar.gz 1370263 -RMD160 fdbe8cf1fc2ec6886b03a41542e1eda26d220186 nagios-plugins-1.4.9.tar.gz 1370263 -SHA256 93cf5dadfb092d7c4d600a713bbef75d37141edb4d18ac3bc3c0d1c09f4b7fe2 nagios-plugins-1.4.9.tar.gz 1370263 diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-contrib.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-contrib.patch new file mode 100644 index 000000000000..905f76023d6d --- /dev/null +++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-contrib.patch @@ -0,0 +1,43 @@ +diff -Naur nagios-plugins-1.4.10.orig/contrib/check_dns_random.pl nagios-plugins-1.4.10/contrib/check_dns_random.pl +--- nagios-plugins-1.4.10.orig/contrib/check_dns_random.pl 2003-01-29 06:27:20.000000000 +0100 ++++ nagios-plugins-1.4.10/contrib/check_dns_random.pl 2007-09-29 10:57:38.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/perl -w + # ------------------------------------------------------------------------------ + # File Name: check_dns_random.pl + # Author: Richard Mayhew - South Africa +@@ -33,9 +33,9 @@ + + my $host = shift || &usage; + +-my $domainfile = "/usr/local/nagios/etc/domains.list"; ++my $domainfile = "/etc/nagios/domains.list"; + my $wc = `/usr/bin/wc -l $domainfile`; +-my $check = "/usr/local/nagios/libexec/check_dns"; ++my $check = "/usr/nagios/libexec/check_dns"; + my $x = 0; + my $srv_file = ""; + my $z = ""; +@@ -49,8 +49,7 @@ + my @data = split(/\n/,$srv_file); + + chomp $wc; +-$wc =~ s/ //g; +-$wc =~ s/domains//g; ++$wc =~ s/([[:digit:]]+) .*/$1/g; + + $x = rand $wc; + ($z,$y) = split(/\./,$x); +diff -Naur nagios-plugins-1.4.10.orig/contrib/check_linux_raid.pl nagios-plugins-1.4.10/contrib/check_linux_raid.pl +--- nagios-plugins-1.4.10.orig/contrib/check_linux_raid.pl 2007-08-28 05:19:45.000000000 +0200 ++++ nagios-plugins-1.4.10/contrib/check_linux_raid.pl 2007-09-29 10:57:50.000000000 +0200 +@@ -23,7 +23,7 @@ + # WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min + + use strict; +-use lib "/usr/local/nagios/libexec"; ++use lib "/usr/nagios/libexec"; + use utils qw(%ERRORS); + + # die with an error if we're not on Linux diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild new file mode 100644 index 000000000000..82c7a5c58f14 --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild,v 1.1 2007/09/29 09:10:59 dertobi123 Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +inherit eutils autotools + +DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly" +HOMEPAGE="http://www.nagios.org/" +SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping +nagios-ssh nagios-game ups ipv6 radius" + +DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) + mysql? ( virtual/mysql ) + postgres? ( >=dev-db/postgresql-7.2 ) + ssl? ( >=dev-libs/openssl-0.9.6g ) + radius? ( >=net-dialup/radiusclient-0.3.2 )" + +RESTRICT="test" + +RDEPEND="${DEPEND} + >=dev-lang/perl-5.6.1-r7 + samba? ( >=net-fs/samba-2.2.5-r1 ) + snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 + >=net-analyzer/net-snmp-5.0.6 + ) + mysql? ( dev-perl/DBI + dev-perl/DBD-mysql ) + nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) + nagios-ntp? ( >=net-misc/ntp-4.1.1a ) + nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) + nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) + ups? ( >=sys-power/nut-1.4 ) + !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" + +pkg_setup() { + enewgroup nagios + enewuser nagios -1 /bin/bash /var/nagios/home nagios +} + +src_unpack() { + unpack ${A} + cd "${S}" + if ! use radius; then + EPATCH_OPTS="-p0 -d ${S}" epatch \ + ${FILESDIR}/nagios-plugins-1.4-noradius.patch + fi + + epatch ${FILESDIR}/${PN}-1.4.10-contrib.patch + + AT_M4DIR="m4 gl/m4" eautoreconf +} + +src_compile() { + + local conf + if use ssl; then + conf="${conf} --with-openssl=/usr" + else + conf="${conf} --without-openssl" + fi + + econf \ + $(use_with mysql) \ + $(use_with postgres) \ + $(use_with ipv6) \ + ${conf} \ + --host=${CHOST} \ + --prefix=/usr/nagios \ + --sysconfdir=/etc/nagios \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man || die "econf failed" + + # fix problem with additional - + sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" + + emake || die "emake failed" +} + +src_install() { + mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg + chmod +x "${S}"/contrib/*.pl + + sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed" + sed -i -e '30s/use lib utils.pm;/use utils;/' \ + "${S}"/plugins-scripts/check_file_age.pl || die "sed failed" + + dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \ + Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT + + emake DESTDIR="${D}" install || die "make install failed" + + if use mysql || use postgres; then + dodir /usr/nagios/libexec + exeinto /usr/nagios/libexec + doexe "${S}"/contrib/check_nagios_db.pl + fi + + dodir /usr/nagios/libexec/ + mv "${S}"/contrib "${D}"/usr/nagios/libexec/contrib + + chown root:nagios "${D}"/usr/nagios || die "Failed Chown of ${D}usr/nagios" + chown -R root:nagios "${D}"/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec" + + chmod -R o-rwx "${D}"/usr/nagios/libexec || die "Failed Chmod of ${D}usr/nagios/libexec" + + chmod 04710 "${D}"/usr/nagios/libexec/check_icmp || die "Failed Chmod of ${D}usr/nagios/libexec/check_icmp" +} + +pkg_postinst() { + einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." + einfo "Depending on what you want to monitor with nagios, some or all of these USE" + einfo "flags need to be set for nagios to function correctly." + echo + einfo "contrib plugins are installed into /usr/nagios/libexec/contrib" +} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.9.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.9.ebuild deleted file mode 100644 index 00cca185f3c6..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.9.ebuild +++ /dev/null @@ -1,123 +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-plugins/nagios-plugins-1.4.9.ebuild,v 1.3 2007/07/11 23:49:24 mr_bones_ Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping -nagios-ssh nagios-game ups ipv6 radius" - -DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( virtual/mysql ) - postgres? ( >=dev-db/postgresql-7.2 ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - radius? ( >=net-dialup/radiusclient-0.3.2 )" - -RESTRICT="test" - -RDEPEND="${DEPEND} - >=dev-lang/perl-5.6.1-r7 - samba? ( >=net-fs/samba-2.2.5-r1 ) - snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 - >=net-analyzer/net-snmp-5.0.6 - ) - mysql? ( dev-perl/DBI - dev-perl/DBD-mysql ) - nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) - nagios-ntp? ( >=net-misc/ntp-4.1.1a ) - nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) - nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) - ups? ( >=sys-power/nut-1.4 ) - !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_unpack() { - unpack ${A} - cd "${S}" - if ! use radius; then - EPATCH_OPTS="-p0 -d ${S}" epatch \ - ${FILESDIR}/nagios-plugins-1.4-noradius.patch - fi - - epatch ${FILESDIR}/${PN}-1.4-contrib.patch - - AT_M4DIR="m4 gl/m4" eautoreconf -} - -src_compile() { - - local conf - if use ssl; then - conf="${conf} --with-openssl=/usr" - else - conf="${conf} --without-openssl" - fi - - econf \ - $(use_with mysql) \ - $(use_with postgres) \ - $(use_with ipv6) \ - ${conf} \ - --host=${CHOST} \ - --prefix=/usr/nagios \ - --sysconfdir=/etc/nagios \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "econf failed" - - # fix problem with additional - - sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" - - emake || die "emake failed" -} - -src_install() { - mv ${S}/contrib/check_compaq_insight.pl ${S}/contrib/check_compaq_insight.pl.msg - chmod +x ${S}/contrib/*.pl - - sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' ${S}/contrib/*.pl || die "sed failed" - sed -i -e '30s/use lib utils.pm;/use utils;/' \ - ${S}/plugins-scripts/check_file_age.pl || die "sed failed" - - dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \ - Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT - - emake DESTDIR="${D}" install || die "make install failed" - - if use mysql || use postgres; then - dodir /usr/nagios/libexec - exeinto /usr/nagios/libexec - doexe ${S}/contrib/check_nagios_db.pl - fi - - dodir /usr/nagios/libexec/ - mv ${S}/contrib ${D}/usr/nagios/libexec/contrib - - chown root:nagios ${D}/usr/nagios || die "Failed Chown of ${D}usr/nagios" - chown -R root:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec" - - chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}usr/nagios/libexec" - - chmod 04710 ${D}/usr/nagios/libexec/check_icmp || "Failed Chmod of ${D}usr/nagios/libexec/check_icmp" -} - -pkg_postinst() { - einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." - einfo "Depending on what you want to monitor with nagios, some or all of these USE" - einfo "flags need to be set for nagios to function correctly." - echo - einfo "contrib plugins are installed into /usr/nagios/libexec/contrib" -} -- cgit v1.2.3-65-gdbad