diff options
author | Tobias Scherbaum <dertobi123@gentoo.org> | 2007-09-29 09:11:00 +0000 |
---|---|---|
committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2007-09-29 09:11:00 +0000 |
commit | 6367c756af82d1e57b83b5410218e537dacc1acc (patch) | |
tree | 01e8e1c06d18f87644450915384fdd77ae95340e /net-analyzer/nagios-plugins | |
parent | Keyworded and marked stable on arm wrt #156160 and #191283 so they won't bloc... (diff) | |
download | historical-6367c756af82d1e57b83b5410218e537dacc1acc.tar.gz historical-6367c756af82d1e57b83b5410218e537dacc1acc.tar.bz2 historical-6367c756af82d1e57b83b5410218e537dacc1acc.zip |
Version bump, fix quoting, 1.4.10 fixes a buffer overflow vulnerability in its check_http plugin
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'net-analyzer/nagios-plugins')
-rw-r--r-- | net-analyzer/nagios-plugins/ChangeLog | 10 | ||||
-rw-r--r-- | net-analyzer/nagios-plugins/Manifest | 28 | ||||
-rw-r--r-- | net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.10 | 3 | ||||
-rw-r--r-- | net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.9 | 3 | ||||
-rw-r--r-- | net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-contrib.patch | 43 | ||||
-rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild (renamed from net-analyzer/nagios-plugins/nagios-plugins-1.4.9.ebuild) | 24 |
6 files changed, 83 insertions, 28 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/Manifest b/net-analyzer/nagios-plugins/Manifest index 2f8fb93b10b0..f03f9857c28b 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -6,31 +6,35 @@ AUX nagios-plugins-1.4-noradius.patch 666 RMD160 5c1d6d73b39a5e1bf763dfa40a094a6 MD5 73ee36e67ff5948e0db8c99963a9e89f files/nagios-plugins-1.4-noradius.patch 666 RMD160 5c1d6d73b39a5e1bf763dfa40a094a602a92e233 files/nagios-plugins-1.4-noradius.patch 666 SHA256 65dcc040bef18f6706a0534e29c04003920757b193010b07ff8740551c4c0865 files/nagios-plugins-1.4-noradius.patch 666 +AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278 +MD5 d5a111b2c5cff8f253cb1003afc52b71 files/nagios-plugins-1.4.10-contrib.patch 1610 +RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 files/nagios-plugins-1.4.10-contrib.patch 1610 +SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278 files/nagios-plugins-1.4.10-contrib.patch 1610 AUX nagios-plugins-1.4.8-mysql.patch 588 RMD160 79282c1f6e988ec1ff8e34f356277425fdeb85f6 SHA1 01febafe9465cc90f324b55bc5e2d4a0bd994fca SHA256 ba6940889d5352b28cf40180975f262d2db84014e73ca3b425a19fd93f295539 MD5 4763f9482afd9e2bbf0e8fd8589d7d21 files/nagios-plugins-1.4.8-mysql.patch 588 RMD160 79282c1f6e988ec1ff8e34f356277425fdeb85f6 files/nagios-plugins-1.4.8-mysql.patch 588 SHA256 ba6940889d5352b28cf40180975f262d2db84014e73ca3b425a19fd93f295539 files/nagios-plugins-1.4.8-mysql.patch 588 +DIST nagios-plugins-1.4.10.tar.gz 1693979 RMD160 8f8167f07d6162165d7cb38c9c09ebff418151bd SHA1 8b41a69a90f9c656afb56b861f4505e5ad1aa5a4 SHA256 193ef480cd2b98d63de9183a83e277d6ef3b55032f44bd76616ef5e7a3d4a76e DIST nagios-plugins-1.4.8.tar.gz 1356563 RMD160 28754b5e09ef0617530fdc6f54c62f5f94c0bd03 SHA1 24446531e4f9647b0a633f1782ee34031d85fd1c SHA256 ce59972199049e587f2ee078888beb3824a6612d75a8efc9feaafe64d6ee83ef -DIST nagios-plugins-1.4.9.tar.gz 1370263 RMD160 fdbe8cf1fc2ec6886b03a41542e1eda26d220186 SHA1 df726022c3835f80c25d5efcdbb11d0aae53e15a SHA256 93cf5dadfb092d7c4d600a713bbef75d37141edb4d18ac3bc3c0d1c09f4b7fe2 +EBUILD nagios-plugins-1.4.10.ebuild 3658 RMD160 ea2b5d9bc0435afb253829524e3dc05f66c33260 SHA1 e561b57ad6f6863b11077bcd1fb3d4dc51ab5f57 SHA256 b6e34401c664e0ac4d97bfd0fd6bca7db39d3f3724decde04974e68d9ec898ed +MD5 7e6ac13d9e635e21ef2f8845aa8152ff nagios-plugins-1.4.10.ebuild 3658 +RMD160 ea2b5d9bc0435afb253829524e3dc05f66c33260 nagios-plugins-1.4.10.ebuild 3658 +SHA256 b6e34401c664e0ac4d97bfd0fd6bca7db39d3f3724decde04974e68d9ec898ed nagios-plugins-1.4.10.ebuild 3658 EBUILD nagios-plugins-1.4.8-r1.ebuild 3657 RMD160 2edf4dae735a2399ec3b09c2679c373fbd972cca SHA1 04f49e37aca50f44d8a53cd5feb00c02bf09e9de SHA256 aef7f8b293d5181d36b0e3a4303230e4703cc9e5a1e523c018a5d9f89b64351c MD5 e23c2e379e3fba2abdd3d4264e59a76f nagios-plugins-1.4.8-r1.ebuild 3657 RMD160 2edf4dae735a2399ec3b09c2679c373fbd972cca nagios-plugins-1.4.8-r1.ebuild 3657 SHA256 aef7f8b293d5181d36b0e3a4303230e4703cc9e5a1e523c018a5d9f89b64351c nagios-plugins-1.4.8-r1.ebuild 3657 -EBUILD nagios-plugins-1.4.9.ebuild 3621 RMD160 57638018b8b6b29b4851fea624655c5fa966479d SHA1 885267d646f67293cf9a791393707d9b938354cf SHA256 a47892566ac7bf3261c2f51799fcc73682791843282436e0fa284238f4110d31 -MD5 a7746f60f074279bfd9a99eaebb0ccef nagios-plugins-1.4.9.ebuild 3621 -RMD160 57638018b8b6b29b4851fea624655c5fa966479d nagios-plugins-1.4.9.ebuild 3621 -SHA256 a47892566ac7bf3261c2f51799fcc73682791843282436e0fa284238f4110d31 nagios-plugins-1.4.9.ebuild 3621 -MISC ChangeLog 12283 RMD160 a1be905d3b62ca618abe39fec73e163a2b3a1522 SHA1 7f16390d782567294aa1b24321ad906056109106 SHA256 dc63e975b962a1ed576f9a43a213bef51c20a6c2592f6b8a0ef24d52a6c82e6f -MD5 fc7a31937549faef51fe079edbec37d0 ChangeLog 12283 -RMD160 a1be905d3b62ca618abe39fec73e163a2b3a1522 ChangeLog 12283 -SHA256 dc63e975b962a1ed576f9a43a213bef51c20a6c2592f6b8a0ef24d52a6c82e6f ChangeLog 12283 +MISC ChangeLog 12588 RMD160 53b5c996c9f0730d26233e54c741211f69d0dbf0 SHA1 7a1583dad099a3fbd95aaab1a8d62a05b8321b6c SHA256 4243f7a0121e5b72f1bc53d88710f70b7fa1cf4fd0152ec781179b4fe6336fbe +MD5 fcda9cffa3ea19e2e3f856f2aef764b0 ChangeLog 12588 +RMD160 53b5c996c9f0730d26233e54c741211f69d0dbf0 ChangeLog 12588 +SHA256 4243f7a0121e5b72f1bc53d88710f70b7fa1cf4fd0152ec781179b4fe6336fbe ChangeLog 12588 MISC metadata.xml 374 RMD160 c261e08c2be47cbf618ed122151d25f96a176aa9 SHA1 88da42b8cc7c08339067720081f61c110e00acb5 SHA256 4babbe654b066c416bb453a8decbd1e8bdaf450226d9ed6d4380bf17e5761f59 MD5 afd013450a188e41979f4d528607d692 metadata.xml 374 RMD160 c261e08c2be47cbf618ed122151d25f96a176aa9 metadata.xml 374 SHA256 4babbe654b066c416bb453a8decbd1e8bdaf450226d9ed6d4380bf17e5761f59 metadata.xml 374 +MD5 d75d2af2cab30c528f228913ad57570e files/digest-nagios-plugins-1.4.10 268 +RMD160 ec41e1b29051f95d8074af822de325f1209d00e8 files/digest-nagios-plugins-1.4.10 268 +SHA256 51cbacb57cfc44ca66a1ceb4a037409e106fc335ab15d5ccc4da3422547664bb files/digest-nagios-plugins-1.4.10 268 MD5 bb2c03bcf04c01e804752addf2281d55 files/digest-nagios-plugins-1.4.8-r1 265 RMD160 b08f8ed8e94124305adeff87ae406428690b267a files/digest-nagios-plugins-1.4.8-r1 265 SHA256 a5f71eb154fc0d8cbaeecbc22c2d9a365775bd4990552e86e0ec84da6ea59add files/digest-nagios-plugins-1.4.8-r1 265 -MD5 61d5ee0023a740e02e487ff316628ff4 files/digest-nagios-plugins-1.4.9 265 -RMD160 4538b3a1f1b06123045cb21c169b555aff9d12a0 files/digest-nagios-plugins-1.4.9 265 -SHA256 15f49615b07f9220930316a4215f44cc54cebe4f7530812e5addd2f27bd5238d files/digest-nagios-plugins-1.4.9 265 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() { |