Non-maitainer bump, fixes bug 428560, bug 411497 and bug 366403.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 526 insertions, 19 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 3e16adb3032c..43d2bf5e2cb1 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.144 2012/06/12 02:44:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.145 2012/07/31 21:53:01 idl0r Exp $
+
+*nagios-plugins-1.4.16 (31 Jul 2012)
+
+  31 Jul 2012; Christian Ruppert <idl0r@gentoo.org>
+  +nagios-plugins-1.4.16.ebuild, +files/nagios-plugins-1.4.16-contrib.patch:
+  Non-maitainer bump, fixes bug 428560, bug 411497 and bug 366403.
 
   12 Jun 2012; Zac Medico <zmedico@gentoo.org> nagios-plugins-1.4.14-r2.ebuild,
   nagios-plugins-1.4.14.ebuild, nagios-plugins-1.4.15.ebuild:
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 23fbb32dc492..608ef5dd6168 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,24 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278
-AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968e24fce4547a95 SHA1 e5e6758790cc85db9f028cde3fb3d6611356167e SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229
-AUX nagios-plugins-1.4.12-pgsqlconfigure.patch 2981 RMD160 6090168654e888ce9b5bb1c5c6b493f3a019472d SHA1 db41a7f6b57f1119045fb90707a7a8182225d9b8 SHA256 8e57962c484363fa790c6920f1f9fe11f273a061fcc59ac2cb9b1d57634a1455
-AUX nagios-plugins-1.4.14-implicit-pointer-conversion.patch 486 RMD160 193b213ea168a7b25d16380918a3d82e85d86ce3 SHA1 130256ff58f01ac9cae08edbb2f86a2b90c89247 SHA256 65c06471f1b5085371dac7edf55004924745d342c08c03abe9d39116b6b0c10c
-AUX nagios-plugins-1.4.14-vserver.patch 3509 RMD160 49a84ccf016a707872af94306570d7ff173499b8 SHA1 45c255a947adb07cef9f3f18bf9eb0e511c82937 SHA256 7302c26729d02b00c5b5ac4857136773f348ea0a2b7fbddb8ef701784020c3c8
-AUX nagios-plugins-1.4.15-openldap.patch 2062 RMD160 d762717903b954935b5d02855ec7e719048982b0 SHA1 2c8cdd89a10e369148576ee70ddb8b350899d15f SHA256 dafa89ba112f3d6438c66fc2c10ec8cfffbc4965ad5da63eddea14811eabd319
-AUX nagios-plugins-1.4.15-vserver.patch 3492 RMD160 3676fe7b9e9aaefa48662d9a7e4569bee25282de SHA1 ba07ac251f9827be1952999b67c01ab41b2ca910 SHA256 06d34d4a5f75757782ece8074c366eb630b25be01428e8337ea6874cd3636d85
-DIST nagios-plugins-1.4.14.tar.gz 1950729 RMD160 f4e1768d84474fc4fa2b59a52efe320c7cbefb3a SHA1 b9998231f992c92b9370b62f15ac80323042f22c SHA256 b1f0f2c01bab2a320cc7c041106500acfd6a5262ff811a2c31b62608ac6c3352
-DIST nagios-plugins-1.4.15.tar.gz 2095419 RMD160 c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736 SHA1 1faab309c06d37e559490fd852ecb0dc8a8ab610 SHA256 51136e5210e3664e1351550de3aff4a766d9d9fea9a24d09e37b3428ef96fa5b
-EBUILD nagios-plugins-1.4.14-r2.ebuild 4591 RMD160 e5f3ff9b6c4082e0556fae55bb166b209a96d718 SHA1 d938f6fe92f3b0f71a6d9ebc1af504636a70aa92 SHA256 8a04b25dfc465f055ea4088d6a3a4d9d8b9fdf8197ae08400035160ad685382a
-EBUILD nagios-plugins-1.4.14.ebuild 4278 RMD160 4c1208998b1fbec7a1220cdab79197d96e155296 SHA1 4a682233c875533bc765f86e212e4c3605f6a1a6 SHA256 13873acc220d5cf475ec18f279e06bb4b03e2f86cfa04a4998f7327431ec069f
-EBUILD nagios-plugins-1.4.15.ebuild 4525 RMD160 27a6cadeb09e05a1a7c7d47389fe29247d8556ac SHA1 116431f1bb1579bfb6bab339bc8572a755bc41e3 SHA256 17297cf4b8914792a711e5fd10cec978fc0547fa3f965a6d4d9e9232188c3a5b
-MISC ChangeLog 9596 RMD160 64cd9904103d0163e1eb4a3b40fb81625001d567 SHA1 12ae451efa5271a24e2086772b1055202b303d20 SHA256 e0ae1e5a83bbee3f12371457136f2a24a1d79df104c212a9bb4bef7d1236b35f
-MISC metadata.xml 746 RMD160 9977f8ea44c05ef383ad66dae2f656bbe7f19ad6 SHA1 75e98ea53286f56ba6aa2b9bfb736fda6c9e21b3 SHA256 32e87d29dcc23e72360dcbd2d52ed1aaab6e6987478cb13bfc3f36495122f18e
+AUX nagios-plugins-1.4.10-contrib.patch 1610 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278 SHA512 d414c975f5988c2ba63d63ac19c95ae97298e4f8c3a622edc90a8676c41145efc8ac144cf24c3843a788f7744375022fbfa326bd51f7206a46f18464a6d551e2 WHIRLPOOL 87de54897d10483b3246f5211fae2231611ead7418eacab7bed6cf46c53f0d72d46f42b233b35965e1bc90b67da3d5dde455feb558c82b494fe33c27300be5cd
+AUX nagios-plugins-1.4.10-noradius.patch 1029 SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229 SHA512 fa1e80d3f3258fc722c2cfdb6b03f18d293802a8be94703748f61c305666e094c75b8c7fbbd36210efa10935ee7aeaf534faf583fd207387e145c4fa8f2a4476 WHIRLPOOL d9207b63ba10b6077a724c444c03b195f409d9097868c487030ee1bb2775be6fba3e5cacd9d292ec587b0a1d5d344235db7d9faac91674543e8e578a0f7c494b
+AUX nagios-plugins-1.4.12-pgsqlconfigure.patch 2981 SHA256 8e57962c484363fa790c6920f1f9fe11f273a061fcc59ac2cb9b1d57634a1455 SHA512 8524081c7349f3e91dbb976af9f24e7aab8694c124661539af564f36cb4aedfaa37a3209cfdf5af2f548c0627389d3cbf7537602cf1eb01f21afc3ed748bcc4b WHIRLPOOL be1f7439e343f5cc85138b877f415a1fc8a398c4c48a6eefe48eac98ebfebee48398175263eb5d165b028b477233d335919704717ec2e4ae27f114d185cb69fd
+AUX nagios-plugins-1.4.14-implicit-pointer-conversion.patch 486 SHA256 65c06471f1b5085371dac7edf55004924745d342c08c03abe9d39116b6b0c10c SHA512 fdafc747a539db537689d82d260c5cc4917a36cf9d8d8dd52a999fde1f1c20d293d304c2939caa73227c753b047eee7f77042f1bd4cf61c83d68bb561b66e84d WHIRLPOOL f30397ac4633823e44786b04b2f94f94cbbc5fb59825a1bb22aead931c4fee55ba1211f0e7ecff06a1c62fd9bb51c448ca01f7a5590c214d4e3ac187880b40cf
+AUX nagios-plugins-1.4.14-vserver.patch 3509 SHA256 7302c26729d02b00c5b5ac4857136773f348ea0a2b7fbddb8ef701784020c3c8 SHA512 0b4cda1f6deb3c964327cee7395b10698c68c328db2f8f9c8186683d91f2c744f5dc3b3bbc38c7d0be637e5fcaf331c4ef695e1a860f927407f0399905fa19ab WHIRLPOOL 1be88be3868fbcb916b171fb742e83be99fffac15ea9d9a58f1880ff2249f75db691aff147dd8791670e7fc5ad6c40717f080627d0bbc36394252b8928946210
+AUX nagios-plugins-1.4.15-openldap.patch 2062 SHA256 dafa89ba112f3d6438c66fc2c10ec8cfffbc4965ad5da63eddea14811eabd319 SHA512 5ca2d39e0cf8afa531363ef9f0b2348017ec1d7035ed212e2d94dedc9a042b3991ff25e81e88ed64861599b454fe66553543fa778c915ee62ddafa3b75cdb7db WHIRLPOOL df3e54ee619b539e8b215a3876a2f8938c0602d6b56699c71d9d3abd37af481aa9257b2be5ac5975131d716265dbd2f12c2e22d9459c7c66a54425c2f36f7ab9
+AUX nagios-plugins-1.4.15-vserver.patch 3492 SHA256 06d34d4a5f75757782ece8074c366eb630b25be01428e8337ea6874cd3636d85 SHA512 e99f38ff12d99f655d11a3ca3924686f75c2c8ce7103f6296ea5c55e554bd222ad12150d774bbd55dbf4a0194086b26fd90a360f1f9b22c44727a5df425ccc91 WHIRLPOOL 3beb94cf088c721b6eb13c7363c43ec3c2a61df4d6e47d494aba525ef8cc0d9332f9cc3cecd46ce4e62269d067ec0bac29e195ff8ddff5fb00afd84a492a0dfd
+AUX nagios-plugins-1.4.16-contrib.patch 12044 SHA256 7cceca9d9670a37cf6eb1597b6438146218c9118ce3e3f9252b714145476c803 SHA512 3d002a8dc8eed5f61b20a2c6e886eb0dc47f95d43f832250fc1377e1ea0528fbbed4a563d1a5bbb42cf5ab1ce2f6106217340f75ab13ae4d2ebe454a82f40138 WHIRLPOOL e527d195de10486983ccacc527504fff79923a6bf93054e8af6c0b6a2b4669f1a60625fd00b757cf9e921a6964e909dea4aee36587046f0677c9bd2334c2c878
+DIST nagios-plugins-1.4.14.tar.gz 1950729 SHA256 b1f0f2c01bab2a320cc7c041106500acfd6a5262ff811a2c31b62608ac6c3352 SHA512 f6eeddce03187e613f840aa453bca33b42153163dfaae78ecadacef1ea61417ce72962f4a4595afa7d5a3b804d439e0362874da826c2876bec1fd0bc0837c42b WHIRLPOOL 1e891edf5479300af9e06742e822809660972430f7166813ec4a17e00512868f478cdd81cf8808159b54bfe160c593b92aa1ca6a1cdbfe8ed5e894120b9e98cd
+DIST nagios-plugins-1.4.15.tar.gz 2095419 SHA256 51136e5210e3664e1351550de3aff4a766d9d9fea9a24d09e37b3428ef96fa5b SHA512 46b1bb382f46ee45f97758dfa7038c5a3a77ae79281708e7cfe728cc65f5afba9597e93cf1c2f4a13e4e7be6f83fede3e4979b9b58f56e9e646779866b629226 WHIRLPOOL b16272a5bc52175b211b10fc3453f8f5a5520a0bf4950f16edfc84ee0d2230fb8eaf6c8692af4426491bb3882bd315fc65c25d9565c8385d5bd4927ef14f8745
+DIST nagios-plugins-1.4.16.tar.gz 2087089 SHA256 b0caf07e0084e9b7f10fdd71cbd3ebabcd85ad78df64da360b51233b0e73b2bd SHA512 7a1401964b881c3db3e1e3f2a49dcf517ff7214724cc05c3ad629651b7e3eeb823b02abe0c6379d29996ac1e8a1208d918fd12e36cca46c7d36d9b1ebacdb2b3 WHIRLPOOL 3cb3b5d5f7f18e7eb5babde6f7bdd82ba167de4b875825c195d3abf7a14926102940616278769a8127a5c3269d475325145799c1414e6cc22eb208319fd2e879
+EBUILD nagios-plugins-1.4.14-r2.ebuild 4591 SHA256 8a04b25dfc465f055ea4088d6a3a4d9d8b9fdf8197ae08400035160ad685382a SHA512 50dacda94ad549c777d6188ff819cbd8128e9bc6dcd1a310b5bad0786a1c54591d79c88c968cbd0f6bc9c96dce7368fb5ed853621d7c3cb2f5cd3de526659d25 WHIRLPOOL ed7b88b08e48b3c745edf45a25178e911a4ebb74f8709b172886cde565e2f86c3e6ae02e94c73c99656e6c99ec9944b9266d68f2766386fad06239c155c9577a
+EBUILD nagios-plugins-1.4.14.ebuild 4278 SHA256 13873acc220d5cf475ec18f279e06bb4b03e2f86cfa04a4998f7327431ec069f SHA512 0fa9aa5f153af198329c09a3189ff33dcfd44d09b9cfeea84dd2256d52fd9e227d8ce62e75183e8647a6b639fb75ef07dea791b0fa7e2528170daa65179dfc23 WHIRLPOOL 94a5d47c722005afdc5e4757ba708f98dae1610938e2a4bb2f3e31647903d8aa35beb51b4b4113be9bf21693a46e66ca14a4c508fbb0eb4da89a726d68f1d4eb
+EBUILD nagios-plugins-1.4.15.ebuild 4525 SHA256 17297cf4b8914792a711e5fd10cec978fc0547fa3f965a6d4d9e9232188c3a5b SHA512 cf37d5f55c832072c3069119373eb59fd76fdfe2b0bb9ab3583ca90d764d3f5584838633eabeda8cb88f87e82009811372b2d1fe56d694d12ad6a41447519fb5 WHIRLPOOL fe0c08347a41690accc504629e534beec0da460a38f9cd46d6d9c09ca6196a8d66bd8a9a9e69285a7b614ea6c12627b751558a05b2e7c87fa21f752b81154b9c
+EBUILD nagios-plugins-1.4.16.ebuild 4494 SHA256 b16c4e5556c3ab848f9eda0796ea391b5d4c4c4779cc1310af28a62601141e8b SHA512 3d75e4cee7863b4cd02c3d86e59943262dd30f18ff0152be1ad9796ec275da1a290047e24d501e96249f1a5947601ffac313644593082528f7cf2fede92d7795 WHIRLPOOL 1b24803061aa5461a753112323693656c288f7c5e348c064233141ea98ef206f4a4b9e5969c9b00895e67e605390ebdb63ccd85c9bd3f52dd4f7f96678b5f708
+MISC ChangeLog 9829 SHA256 66065cff092d03fc606b8d76b86cbb4c266685efb42db13b5eb40e8041d5b65f SHA512 b1dd6fd5f930483159fc391f3d37a600e777eb4bc46f9c804ffa78f3425c9c2623dfcc2718371e8d9d28e63832433a5328777b5c0e5a4d47e97812e7ced9ff53 WHIRLPOOL 84f8b0d49badfd15d23b5a96ba7e75c5397ed213cbb4c0e4117e226db3da87adb362f9eb473e49ade2553901f1e6781ab927590e826bfd34cbde10c386b672a5
+MISC metadata.xml 746 SHA256 32e87d29dcc23e72360dcbd2d52ed1aaab6e6987478cb13bfc3f36495122f18e SHA512 1870a1aa1480bafe801ef61c0d2356e5483fbbe5afdef8f7e1150813f849ac0b802115880f2cdce1b52288cf6da05e48bff5425c14f0f79f353388d38f36411c WHIRLPOOL cc04b91162205e5622613b11608d56c6b98190e6182a4d47bef7b0212e1ebcd11f4c9d771b06b0225fe33d0b247c50c65ed393a1990609c62889460bf7ac5b6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/WrRMACgkQ/ejvha5XGaMtgACgg/U/OX+X7bpjG5Ainn4uFGYW
-ay4Anjh3/0ZcU3cyUi/2/4clZOQWbCLD
-=/bVr
+iQEcBAEBCAAGBQJQGFPGAAoJEMOx0zmdw4Z15NUH/R2X/7JkpGbugqOGy/S9LCJD
+JsxL0Fwf/taLhM/r6Dexoi9+ohmJoTLNIl0Aj3CU4WJwqwyXEO6u3Wek9TLRG/q2
+Mh8hTGD7sV31Oqi6VrhiFYeMFOvMNj8g9nFtQ+IEKiptv/UjiPQaUfJIxVhK0q3X
+CE8PQ0CG118ataw2pTQiveTZ4hNs0kKJ/p8wkM/plp3LoKWBiFEJVN+1GKnYjuND
+k0T5KLr1dYg+ok+wYhjhMQ1WgwYHBZIBLMZjz3RHGbSYTaPx3/FLoCDYToUcyx6L
+eD1Y6wQ9++yWtNt/PhDxYYZUYAydnPcWOy14op0E52giZLdnN92GjcM2haVas9A=
+=G+TX
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-contrib.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-contrib.patch
new file mode 100644
index 000000000000..37f4fc3032ba
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-contrib.patch
@@ -0,0 +1,351 @@
+From 48c83ab1bc1ef596129fad8634b8ec09f4a1e329 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Tue, 31 Jul 2012 23:47:20 +0200
+Subject: [PATCH] Fix some paths, bug 366403
+
+---
+ contrib/check_apc_ups.pl                |    2 +-
+ contrib/check_appletalk.pl              |    2 +-
+ contrib/check_dns_random.pl             |    9 ++++-----
+ contrib/check_flexlm.pl                 |    2 +-
+ contrib/check_ica_master_browser.pl     |    2 +-
+ contrib/check_ica_metaframe_pub_apps.pl |    2 +-
+ contrib/check_inodes-freebsd.pl         |    2 +-
+ contrib/check_linux_raid.pl             |    2 +-
+ contrib/check_lmmon.pl                  |    2 +-
+ contrib/check_lotus.pl                  |    2 +-
+ contrib/check_ms_spooler.pl             |    2 +-
+ contrib/check_nagios_db.pl              |    4 ++--
+ contrib/check_nmap.py                   |    2 +-
+ contrib/check_oracle_tbs                |    4 ++--
+ contrib/check_pfstate                   |    2 +-
+ contrib/check_snmp_disk_monitor.pl      |    4 ++--
+ contrib/check_snmp_printer.pl           |    2 +-
+ contrib/check_snmp_process_monitor.pl   |    6 +++---
+ contrib/check_snmp_procs.pl             |    2 +-
+ contrib/check_wins.pl                   |    2 +-
+ contrib/sched_downtime.pl               |    2 +-
+ 21 files changed, 29 insertions(+), 30 deletions(-)
+
+diff --git a/contrib/check_apc_ups.pl b/contrib/check_apc_ups.pl
+index 6bf1766..758da2f 100644
+--- a/contrib/check_apc_ups.pl
++++ b/contrib/check_apc_ups.pl
+@@ -13,7 +13,7 @@ use strict;
+ use Getopt::Long;
+ use vars qw($opt_V $opt_h $opt_H $opt_T $opt_t $opt_R $opt_r 
+   $opt_L $opt_l $PROGNAME);
+-use lib "/usr/local/nagios/libexec";
++use lib "/usr/lib/nagios/plugins";
+ use utils qw(%ERRORS &print_revision &support &usage);
+ 
+ sub print_help ();
+diff --git a/contrib/check_appletalk.pl b/contrib/check_appletalk.pl
+index 9277686..2b18084 100644
+--- a/contrib/check_appletalk.pl
++++ b/contrib/check_appletalk.pl
+@@ -22,7 +22,7 @@ BEGIN {
+ }
+ 
+ use strict;
+-use lib "/usr/local/nagios/libexec";
++use lib "/usr/lib/nagios/plugins";
+ 
+ use utils qw($TIMEOUT %ERRORS &print_revision &support);
+ use vars qw($PROGNAME);
+diff --git a/contrib/check_dns_random.pl b/contrib/check_dns_random.pl
+index 4bed412..efd5587 100644
+--- a/contrib/check_dns_random.pl
++++ b/contrib/check_dns_random.pl
+@@ -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 @@ $|=1;
+ 
+ my $host = shift || &usage;
+ 
+-my $domainfile = "/usr/local/nagios/etc/domains.list";
++my $domainfile = "/etc/domains.list";
+ my $wc = `/usr/bin/wc -l $domainfile`;
+-my $check = "/usr/local/nagios/libexec/check_dns";
++my $check = "/usr/lib/nagios/plugins/check_dns";
+ my $x = 0;
+ my $srv_file = "";
+ my $z = "";
+@@ -49,8 +49,7 @@ open(DOMAIN,"<$domainfile") or die "Error Opening $domainfile File!\n";
+                 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 --git a/contrib/check_flexlm.pl b/contrib/check_flexlm.pl
+index 8fa0e33..3b9b57d 100644
+--- a/contrib/check_flexlm.pl
++++ b/contrib/check_flexlm.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # usage: 
+ #    check_flexlm.pl license_file
+diff --git a/contrib/check_ica_master_browser.pl b/contrib/check_ica_master_browser.pl
+index 922e718..ed8b9db 100755
+--- a/contrib/check_ica_master_browser.pl
++++ b/contrib/check_ica_master_browser.pl
+@@ -12,7 +12,7 @@ use IO::Socket;
+ use IO::Select;
+ use Getopt::Long ;
+ 
+-use lib qw(/usr/local/nagios/libexec) ;
++use lib qw(/usr/lib/nagios/plugins) ;
+ use utils qw(%ERRORS &print_revision &support &usage);
+ use packet_utils qw(&pdump &tethereal) ;
+ 
+diff --git a/contrib/check_ica_metaframe_pub_apps.pl b/contrib/check_ica_metaframe_pub_apps.pl
+index 0edbdca..8110030 100755
+--- a/contrib/check_ica_metaframe_pub_apps.pl
++++ b/contrib/check_ica_metaframe_pub_apps.pl
+@@ -17,7 +17,7 @@ use Getopt::Long ;
+ 
+ my ($bcast_addr, $timeout, $debug, @citrix_servers, $crit_pub_apps, $warn_pub_apps, $long_list) ;
+ 
+-use lib qw(/usr/local/nagios/libexec) ;
++use lib qw(/usr/lib/nagios/plugins) ;
+ use utils qw(%ERRORS &print_revision &support &usage) ;
+ use packet_utils qw(&pdump &tethereal) ;
+ 
+diff --git a/contrib/check_inodes-freebsd.pl b/contrib/check_inodes-freebsd.pl
+index d66e5e3..ebd1f49 100644
+--- a/contrib/check_inodes-freebsd.pl
++++ b/contrib/check_inodes-freebsd.pl
+@@ -15,7 +15,7 @@
+ use strict;
+ use Getopt::Long;
+ use vars qw($opt_V $opt_h $opt_w $opt_c $opt_f $verbose $PROGNAME);
+-use lib "/usr/local/libexec/nagios" ;
++use lib "/usr/lib/nagios/plugins" ;
+ use utils qw($TIMEOUT %ERRORS &print_revision &support);
+ 
+ my $df = "/bin/df";
+diff --git a/contrib/check_linux_raid.pl b/contrib/check_linux_raid.pl
+index 77e75f6..ab982cd 100644
+--- a/contrib/check_linux_raid.pl
++++ b/contrib/check_linux_raid.pl
+@@ -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/lib/nagios/plugins";
+ use utils qw(%ERRORS);
+ 
+ # die with an error if we're not on Linux
+diff --git a/contrib/check_lmmon.pl b/contrib/check_lmmon.pl
+index bf4b438..7fb471b 100644
+--- a/contrib/check_lmmon.pl
++++ b/contrib/check_lmmon.pl
+@@ -6,7 +6,7 @@ if ($#ARGV < 1) {
+ print "Usage: $0 <critical temp> <warning temp> <normal temp>\n";
+ exit; } $crit = shift; $warn = shift; $norm = shift; if ($warn >
+ $crit) {    print "Warning level cannot be greater than critical
+-level!\n"; exit; } @b = qx{/usr/local/bin/lmmon -s}; foreach(@b) { @c
++level!\n"; exit; } @b = qx{/usr/bin/lmmon -s}; foreach(@b) { @c
+ = split(/ \/ /, $_); $d = $c[1]; } @e = split(/F/, $d); $f = $e[0];
+ 
+ $status = "$f degrees F\n";
+diff --git a/contrib/check_lotus.pl b/contrib/check_lotus.pl
+index 8bedced..9cda571 100755
+--- a/contrib/check_lotus.pl
++++ b/contrib/check_lotus.pl
+@@ -17,7 +17,7 @@ use Getopt::Long ;
+ 
+ my ($timeout, $debug, $lotus_host, $server, $indiv_dn, $packet_debug) ;
+ 
+-use lib qw(/usr/local/nagios/libexec) ;
++use lib qw(/usr/lib/nagios/plugins) ;
+ use utils qw($TIMEOUT %ERRORS &print_revision &support &usage) ;
+ use packet_utils qw(pdump &tethereal) ;
+ 
+diff --git a/contrib/check_ms_spooler.pl b/contrib/check_ms_spooler.pl
+index 3a80a76..748203c 100755
+--- a/contrib/check_ms_spooler.pl
++++ b/contrib/check_ms_spooler.pl
+@@ -52,7 +52,7 @@ sub version ();
+ 
+ delete @ENV{'PATH', 'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
+ 
+-use constant SMBCLIENT_PATH	=> '/usr/local/samba/bin/smbclient' ;
++use constant SMBCLIENT_PATH	=> '/usr/bin/smbclient' ;
+ use constant MAX_QUEUES_TO_CHECK => 20 ;		# So that the check doesn't take longer than $TIMEOUT
+ 
+ use constant SMBCLIENT_SVC	=> sub { return `${\SMBCLIENT_PATH} -L //$_[0] -U $_[1]%$_[2]` } ;
+diff --git a/contrib/check_nagios_db.pl b/contrib/check_nagios_db.pl
+index 5811d7c..3774ab0 100644
+--- a/contrib/check_nagios_db.pl
++++ b/contrib/check_nagios_db.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ 
+ use strict;
+ $|++;
+@@ -12,7 +12,7 @@ use DBI;
+ 
+ my $driver = "mysql";
+ 
+-my $CFG_DEF = "/opt/nagios/etc/cgi.cfg";
++my $CFG_DEF = "/etc/nagios/cgi.cfg";
+ my $QUERY = "select *, UNIX_TIMESTAMP(last_update) as ut from programstatus;";
+ my $EXPIRE_DEF = 5; ## expressed in minutes
+ my $PROCCNT = 0;
+diff --git a/contrib/check_nmap.py b/contrib/check_nmap.py
+index 07f6d7f..07e2e54 100644
+--- a/contrib/check_nmap.py
++++ b/contrib/check_nmap.py
+@@ -54,7 +54,7 @@ from getopt import getopt
+ import utils
+ 
+ # Where temp files should be placed
+-tempfile.tempdir='/usr/local/nagios/var'
++tempfile.tempdir='/var/nagios'
+ 
+ # Base name for tempfile
+ tempfile.template='check_nmap_tmp.'
+diff --git a/contrib/check_oracle_tbs b/contrib/check_oracle_tbs
+index 8281a4e..b35a232 100644
+--- a/contrib/check_oracle_tbs
++++ b/contrib/check_oracle_tbs
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ 
+ # (c)2004 John Koyle, RFP Depot, LLC.
+ # This is free software use it however you would like.
+@@ -6,7 +6,7 @@
+ use strict;
+ use DBI;
+ use Getopt::Long 2.16;
+-use lib "/usr/local/nagios/libexec";
++use lib "/usr/lib/nagios/plugins";
+ use utils qw(%ERRORS);
+ 
+ 
+diff --git a/contrib/check_pfstate b/contrib/check_pfstate
+index 57dde3f..14d15f4 100644
+--- a/contrib/check_pfstate
++++ b/contrib/check_pfstate
+@@ -3,7 +3,7 @@
+ use strict;
+ use Getopt::Long;
+ use vars qw($opt_V $opt_h $opt_P $opt_H $opt_w $opt_c $PROGNAME);
+-use lib "/usr/local/nagios/libexec"  ;
++use lib "/usr/lib/nagios/plugins"  ;
+ use utils qw(%ERRORS &print_revision &support &usage);
+ 
+ my $remote_user = "root";
+diff --git a/contrib/check_snmp_disk_monitor.pl b/contrib/check_snmp_disk_monitor.pl
+index 9a2edaa..f752afb 100644
+--- a/contrib/check_snmp_disk_monitor.pl
++++ b/contrib/check_snmp_disk_monitor.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ # author: Al Tobey <albert.tobey@priority-health.com>
+ # what:    monitor diskspace using the host-resources mib
+ # license: GPL - http://www.fsf.org/licenses/gpl.txt
+@@ -7,7 +7,7 @@
+ 
+ use strict;
+ require 5.6.0;
+-use lib qw( /opt/nagios/libexec );
++use lib qw( /usr/lib/nagios/plugins );
+ use utils qw(%ERRORS $TIMEOUT &print_revision &support &usage);
+ use SNMP 5.0;
+ use Getopt::Long;
+diff --git a/contrib/check_snmp_printer.pl b/contrib/check_snmp_printer.pl
+index cc7943b..83b05af 100755
+--- a/contrib/check_snmp_printer.pl
++++ b/contrib/check_snmp_printer.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ 
+ # check_snmp_printer - check for printer status via snmp
+ #  Supports both standard PRINT-MIB (RFC-1759) and HP Enterprise print-mib
+diff --git a/contrib/check_snmp_process_monitor.pl b/contrib/check_snmp_process_monitor.pl
+index 0f44597..abfd40a 100644
+--- a/contrib/check_snmp_process_monitor.pl
++++ b/contrib/check_snmp_process_monitor.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ # author: Al Tobey <albert.tobey@priority-health.com>
+ # what:   monitor a process using the host-resources mib
+ # license: GPL - http://www.fsf.org/licenses/gpl.txt
+@@ -15,7 +15,7 @@
+ 
+ use strict;
+ require 5.6.0;
+-use lib qw( /opt/nagios/libexec /usr/local/libexec );
++use lib qw( /usr/lib/nagios/plugins );
+ use utils qw(%ERRORS $TIMEOUT &print_revision &support &usage);
+ use SNMP 5.0;
+ use Getopt::Long;
+@@ -37,7 +37,7 @@ $opt_nocache   = undef;
+ $cache_exp     = 600;
+ $exit          = $ERRORS{OK};
+ $interpreters  = '(perl|/bin/sh|/usr/bin/sh|/bin/bash|/bin/ksh|python)';
+-our $cachefile = '/var/opt/nagios/tmp/'; # completed later
++our $cachefile = '/var/nagios/tmp/'; # completed later
+ our %processes = ();
+ 
+ sub process_options {
+diff --git a/contrib/check_snmp_procs.pl b/contrib/check_snmp_procs.pl
+index 4d19ff1..de5a8fe 100644
+--- a/contrib/check_snmp_procs.pl
++++ b/contrib/check_snmp_procs.pl
+@@ -35,7 +35,7 @@
+ #use strict;
+ use Getopt::Long;
+ use Net::SNMP qw (oid_lex_sort oid_base_match SNMP_VERSION_1);
+-use lib "/usr/local/nagios/libexec";
++use lib "/usr/lib/nagios/plugins";
+ use utils qw(%ERRORS &print_revision &support &usage);
+ 
+ my $PROGNAME="check_snmp_procs";
+diff --git a/contrib/check_wins.pl b/contrib/check_wins.pl
+index f11f864..701fa30 100755
+--- a/contrib/check_wins.pl
++++ b/contrib/check_wins.pl
+@@ -17,7 +17,7 @@ use strict ;
+ use Getopt::Long ;
+ use vars qw($opt_H $opt_D $opt_W $opt_T $debug @my_dcs);
+ 
+-use lib '/usr/local/nagios/libexec/' ;
++use lib '/usr/lib/nagios/plugins/' ;
+ use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
+ 
+ my $PROGNAME = 'check_wins' ;
+diff --git a/contrib/sched_downtime.pl b/contrib/sched_downtime.pl
+index b46b482..1e358f4 100644
+--- a/contrib/sched_downtime.pl
++++ b/contrib/sched_downtime.pl
+@@ -7,7 +7,7 @@
+ #
+ use POSIX qw(strtol);
+ 
+-my $command_file = '/usr/local/nagios/var/rw/nagios.cmd';
++my $command_file = '/var/nagios/rw/nagios.cmd';
+ 
+ my $hour = (60*60);
+ my $next_day = (24*60*60);
+-- 
+1.7.8.6
+
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild
new file mode 100644
index 000000000000..d37f53e46cbc
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2012 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.16.ebuild,v 1.1 2012/07/31 21:53:01 idl0r Exp $
+
+EAPI=4
+
+inherit autotools eutils multilib user
+
+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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid jabber"
+
+DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	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 ) )
+	jabber? ( >=dev-perl/Net-Jabber-2.0 )"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_prepare() {
+	if ! use radius; then
+		EPATCH_OPTS="-p1 -d ${S}" epatch \
+		"${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch
+	fi
+
+	# bug 366403
+	epatch "${FILESDIR}"/${P}-contrib.patch
+
+	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
+	epatch "${FILESDIR}"/${PN}-1.4.15-vserver.patch
+	epatch "${FILESDIR}"/${PN}-1.4.15-openldap.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local conf
+	if use ssl; then
+		conf="${conf} --with-openssl=/usr"
+	else
+		conf="${conf} --without-openssl"
+	fi
+
+	if use postgres; then
+		conf="${conf} --with-pgsql=/usr"
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		${conf} \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--sysconfdir=/etc/nagios || die "econf failed"
+
+	# fix problem with additional -
+	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed 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 s#/usr/nagios/libexec#/usr/$(get_libdir)/nagios/plugins#g "${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 ACKNOWLEDGEMENTS AUTHORS BUGS CODING \
+		ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if use mysql || use postgres; then
+		dodir /usr/$(get_libdir)/nagios/plugins
+		exeinto /usr/$(get_libdir)/nagios/plugins
+		doexe "${S}"/contrib/check_nagios_db.pl
+	fi
+
+	if ! use snmp; then
+		rm "${D}"/usr/$(get_libdir)/nagios/plugins/check_if{operstatus,status} \
+			|| die "Failed to remove SNMP check plugins"
+	fi
+
+	mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib
+
+	if ! use jabber; then
+		rm "${D}"usr/$(get_libdir)/nagios/plugins/contrib/nagios_sendim.pl \
+			|| die "Failed to remove XMPP notification addon"
+	fi
+
+	chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \
+		|| die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins"
+
+	chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \
+		|| die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins"
+
+	if use suid ; then
+
+		chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/{check_icmp,check_ide_smart,check_dhcp} \
+			|| die "Failed setting the suid bit for various plugins"
+	fi
+
+	dosym /usr/$(get_libdir)/nagios/plugins/utils.sh /usr/$(get_libdir)/nagios/plugins/contrib/utils.sh
+	dosym /usr/$(get_libdir)/nagios/plugins/utils.pm /usr/$(get_libdir)/nagios/plugins/contrib/utils.pm
+}
+
+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/$(get_libdir)/nagios/plugins/contrib"
+}