Version bump, fix quoting, 1.4.10 fixes a buffer overflow vulnerability in its check_http plugin

(Portage version: 2.1.3.9)

5 files changed, 67 insertions, 16 deletions

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 <dertobi123@gentoo.org>
+  +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 <dertobi123@gentoo.org>
   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.9.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild
index 00cca185f3c6..82c7a5c58f14 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.9.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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"
@@ -53,7 +53,7 @@ src_unpack() {
 			${FILESDIR}/nagios-plugins-1.4-noradius.patch
 	fi
 
-	epatch ${FILESDIR}/${PN}-1.4-contrib.patch
+	epatch ${FILESDIR}/${PN}-1.4.10-contrib.patch
 
 	AT_M4DIR="m4 gl/m4" eautoreconf
 }
@@ -85,12 +85,12 @@ src_compile() {
 }
 
 src_install() {
-	mv ${S}/contrib/check_compaq_insight.pl ${S}/contrib/check_compaq_insight.pl.msg
-	chmod +x ${S}/contrib/*.pl
+	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 '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"
+		"${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
@@ -100,18 +100,18 @@ src_install() {
 	if use mysql || use postgres; then
 		dodir /usr/nagios/libexec
 		exeinto /usr/nagios/libexec
-		doexe ${S}/contrib/check_nagios_db.pl
+		doexe "${S}"/contrib/check_nagios_db.pl
 	fi
 
 	dodir /usr/nagios/libexec/
-	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
+	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"
+	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 -R o-rwx "${D}"/usr/nagios/libexec || die "Failed Chmod of ${D}usr/nagios/libexec"
 
-	chmod 04710 ${D}/usr/nagios/libexec/check_icmp || "Failed Chmod of ${D}usr/nagios/libexec/check_icmp"
+	chmod 04710 "${D}"/usr/nagios/libexec/check_icmp || die "Failed Chmod of ${D}usr/nagios/libexec/check_icmp"
 }
 
 pkg_postinst() {