[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 13/24: check_whois: Update to latest version 1.23

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins-contrib.

commit ce7f6fe74a7166c90db68ea23a99b9cf1375c44a
Author: Jan Wagner <waja at cyconet.org>
Date:   Tue Nov 28 22:21:59 2017 +0100

    check_whois: Update to latest version 1.23
---
 check_whois/check_whois | 10 +++++-----
 check_whois/control     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/check_whois/check_whois b/check_whois/check_whois
index c103f88..8fe9578 100644
--- a/check_whois/check_whois
+++ b/check_whois/check_whois
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # nagios: -epn
 
-# $Id: check_whois,v 1.21 2015/10/12 16:44:13 wessels Exp $
+# $Id: check_whois,v 1.23 2017/03/31 23:37:49 wessels Exp $
 #
 # check_whois
 #
@@ -80,7 +80,7 @@ my $string_found = 0;
 my $name = shift or die usage();
 $name =~ s/^zone\.//;
 my $whoiscmd = findwhois();
-print STDERR "$0 version ". '$Id: check_whois,v 1.21 2015/10/12 16:44:13 wessels Exp $'. "\n" if $opts{d};
+print STDERR "$0 version ". '$Id: check_whois,v 1.23 2017/03/31 23:37:49 wessels Exp $'. "\n" if $opts{d};
 print STDERR "Whois command = $whoiscmd\n" if $opts{d};
 grok($whoiscmd, $name);
 exit 0;
@@ -152,17 +152,17 @@ sub grok {
 
                 if (/expiration date:\s*(\d\d-\w\w\w-\d\d\d\d)/) {
                         $expires = $1;
-                } elsif (/(record )?(will )?expires? on[ :](.*)\.?$/) {
+                } elsif (/(record )?(will )?expires? on[ :](\S.*\S)\.?$/) {
                         $expires = $3;
                 } elsif (/expires:\s+([-\w\s]+)/) {
                         $expires = $1;
-                } elsif (/(domain )?expiration date:\s+(.*)/) {
+                } elsif (/(domain )?expiration date:\s+(\S.*\S)/) {
                         $expires = $2;
                 } elsif ($name =~ /\.gov\.uk$/ && /renewal date:/) {
 			chomp($_ = <CMD>);
                 	tr/A-Z/a-z/;
 			$expires = $_;
-                } elsif (/(expiry|renewal) date:\s+(.*)/) {
+                } elsif (/(expiry|renewal) date:\s+(\S.*\S)/) {
                         $expires = $2;
                 }
 
diff --git a/check_whois/control b/check_whois/control
index e148f87..ec887e5 100644
--- a/check_whois/control
+++ b/check_whois/control
@@ -6,4 +6,4 @@ Description: plugin to check for the expiration of a domain.
  output formats differ or there is no expiration date in the
  whois output.
 Recommends: libdate-manip-perl
-Version: 1.21
+Version: 1.23

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins-contrib.git