From: Nigel Metheringham <nigel@exim.org>
Date: Tue, 22 Jun 2010 20:01:03 +0000 (+0100)
Subject: Update to mirmon 2.3
X-Git-Url: https://git.exim.org/mirror-monitor.git/commitdiff_plain/df2ea1b4f69d8bcde798410f86f59b24d1a83b65

Update to mirmon 2.3
---

diff --git a/icons/mmsb01.gif b/icons/mmsb01.gif
index a07d76f..3692272 100644
Binary files a/icons/mmsb01.gif and b/icons/mmsb01.gif differ
diff --git a/icons/mmsb02.gif b/icons/mmsb02.gif
index e13dbe0..f9e0327 100644
Binary files a/icons/mmsb02.gif and b/icons/mmsb02.gif differ
diff --git a/icons/mmsb03.gif b/icons/mmsb03.gif
index 372bdcc..0926abf 100644
Binary files a/icons/mmsb03.gif and b/icons/mmsb03.gif differ
diff --git a/icons/mmsb04.gif b/icons/mmsb04.gif
index 09ebdaf..ba60d35 100644
Binary files a/icons/mmsb04.gif and b/icons/mmsb04.gif differ
diff --git a/icons/mmsb05.gif b/icons/mmsb05.gif
index d764236..f52e217 100644
Binary files a/icons/mmsb05.gif and b/icons/mmsb05.gif differ
diff --git a/icons/mmsb06.gif b/icons/mmsb06.gif
index 575b390..b7f99bf 100644
Binary files a/icons/mmsb06.gif and b/icons/mmsb06.gif differ
diff --git a/icons/mmsb07.gif b/icons/mmsb07.gif
index bb8f069..e2154ca 100644
Binary files a/icons/mmsb07.gif and b/icons/mmsb07.gif differ
diff --git a/icons/mmsb08.gif b/icons/mmsb08.gif
index e3daf4a..9fe28f9 100644
Binary files a/icons/mmsb08.gif and b/icons/mmsb08.gif differ
diff --git a/icons/mmsb09.gif b/icons/mmsb09.gif
index e436e3e..19c57bd 100644
Binary files a/icons/mmsb09.gif and b/icons/mmsb09.gif differ
diff --git a/icons/mmsb10.gif b/icons/mmsb10.gif
index 1c018f6..4576fc1 100644
Binary files a/icons/mmsb10.gif and b/icons/mmsb10.gif differ
diff --git a/icons/mmsb11.gif b/icons/mmsb11.gif
index 26857fe..4f45570 100644
Binary files a/icons/mmsb11.gif and b/icons/mmsb11.gif differ
diff --git a/icons/mmsb12.gif b/icons/mmsb12.gif
index 451b382..d6e50ae 100644
Binary files a/icons/mmsb12.gif and b/icons/mmsb12.gif differ
diff --git a/icons/mmsb13.gif b/icons/mmsb13.gif
index 2631d8c..476f259 100644
Binary files a/icons/mmsb13.gif and b/icons/mmsb13.gif differ
diff --git a/icons/mmsb14.gif b/icons/mmsb14.gif
index a6549e6..87078a6 100644
Binary files a/icons/mmsb14.gif and b/icons/mmsb14.gif differ
diff --git a/icons/mmsbf01.gif b/icons/mmsbf01.gif
index b98b0d4..b462110 100644
Binary files a/icons/mmsbf01.gif and b/icons/mmsbf01.gif differ
diff --git a/icons/mmsbf02.gif b/icons/mmsbf02.gif
index 4fbffe2..dec068a 100644
Binary files a/icons/mmsbf02.gif and b/icons/mmsbf02.gif differ
diff --git a/icons/mmsbf03.gif b/icons/mmsbf03.gif
index bca751a..9bf0817 100644
Binary files a/icons/mmsbf03.gif and b/icons/mmsbf03.gif differ
diff --git a/icons/mmsbf04.gif b/icons/mmsbf04.gif
index 6a8b62e..e048707 100644
Binary files a/icons/mmsbf04.gif and b/icons/mmsbf04.gif differ
diff --git a/icons/mmsbf05.gif b/icons/mmsbf05.gif
index 0b2cf1f..2b77201 100644
Binary files a/icons/mmsbf05.gif and b/icons/mmsbf05.gif differ
diff --git a/icons/mmsbf06.gif b/icons/mmsbf06.gif
index 86f9575..c569c25 100644
Binary files a/icons/mmsbf06.gif and b/icons/mmsbf06.gif differ
diff --git a/icons/mmsbf07.gif b/icons/mmsbf07.gif
index 4bb061d..6ee5a5a 100644
Binary files a/icons/mmsbf07.gif and b/icons/mmsbf07.gif differ
diff --git a/icons/mmsbf08.gif b/icons/mmsbf08.gif
index 9c70b49..6305471 100644
Binary files a/icons/mmsbf08.gif and b/icons/mmsbf08.gif differ
diff --git a/icons/mmsbf09.gif b/icons/mmsbf09.gif
index 67234e3..eafd0bb 100644
Binary files a/icons/mmsbf09.gif and b/icons/mmsbf09.gif differ
diff --git a/icons/mmsbf10.gif b/icons/mmsbf10.gif
index cab66eb..c010ef9 100644
Binary files a/icons/mmsbf10.gif and b/icons/mmsbf10.gif differ
diff --git a/icons/mmsbf11.gif b/icons/mmsbf11.gif
index 151c44b..de55904 100644
Binary files a/icons/mmsbf11.gif and b/icons/mmsbf11.gif differ
diff --git a/icons/mmsbf12.gif b/icons/mmsbf12.gif
index 713c3ce..232741f 100644
Binary files a/icons/mmsbf12.gif and b/icons/mmsbf12.gif differ
diff --git a/icons/mmsbf13.gif b/icons/mmsbf13.gif
index 563866e..9067106 100644
Binary files a/icons/mmsbf13.gif and b/icons/mmsbf13.gif differ
diff --git a/icons/mmsf01.gif b/icons/mmsf01.gif
index 3f96f91..d57ae04 100644
Binary files a/icons/mmsf01.gif and b/icons/mmsf01.gif differ
diff --git a/icons/mmsf02.gif b/icons/mmsf02.gif
index b62e6e0..0891de0 100644
Binary files a/icons/mmsf02.gif and b/icons/mmsf02.gif differ
diff --git a/icons/mmsf03.gif b/icons/mmsf03.gif
index 3ebf5c3..f5abb21 100644
Binary files a/icons/mmsf03.gif and b/icons/mmsf03.gif differ
diff --git a/icons/mmsf04.gif b/icons/mmsf04.gif
index 94cf762..b3f8c7d 100644
Binary files a/icons/mmsf04.gif and b/icons/mmsf04.gif differ
diff --git a/icons/mmsf05.gif b/icons/mmsf05.gif
index a558eb9..4ea5d62 100644
Binary files a/icons/mmsf05.gif and b/icons/mmsf05.gif differ
diff --git a/icons/mmsf06.gif b/icons/mmsf06.gif
index a1cd47c..ff828dd 100644
Binary files a/icons/mmsf06.gif and b/icons/mmsf06.gif differ
diff --git a/icons/mmsf07.gif b/icons/mmsf07.gif
index ddf4a43..f48dd1b 100644
Binary files a/icons/mmsf07.gif and b/icons/mmsf07.gif differ
diff --git a/icons/mmsf08.gif b/icons/mmsf08.gif
index 4976f10..833c371 100644
Binary files a/icons/mmsf08.gif and b/icons/mmsf08.gif differ
diff --git a/icons/mmsf09.gif b/icons/mmsf09.gif
index fb8560f..cf9971f 100644
Binary files a/icons/mmsf09.gif and b/icons/mmsf09.gif differ
diff --git a/icons/mmsf10.gif b/icons/mmsf10.gif
index 362424f..eeeb1e4 100644
Binary files a/icons/mmsf10.gif and b/icons/mmsf10.gif differ
diff --git a/icons/mmsf11.gif b/icons/mmsf11.gif
index 4e1b8c0..a614bc6 100644
Binary files a/icons/mmsf11.gif and b/icons/mmsf11.gif differ
diff --git a/icons/mmsf12.gif b/icons/mmsf12.gif
index 0335cff..ef741a1 100644
Binary files a/icons/mmsf12.gif and b/icons/mmsf12.gif differ
diff --git a/icons/mmsf13.gif b/icons/mmsf13.gif
index b81b556..f289562 100644
Binary files a/icons/mmsf13.gif and b/icons/mmsf13.gif differ
diff --git a/icons/mmsf14.gif b/icons/mmsf14.gif
index fbe5052..cf4346b 100644
Binary files a/icons/mmsf14.gif and b/icons/mmsf14.gif differ
diff --git a/icons/vbrb.gif b/icons/vbrb.gif
new file mode 100644
index 0000000..2aa7073
Binary files /dev/null and b/icons/vbrb.gif differ
diff --git a/icons/vbrw.gif b/icons/vbrw.gif
new file mode 100644
index 0000000..ecc6917
Binary files /dev/null and b/icons/vbrw.gif differ
diff --git a/mirmon/countries.list b/mirmon/countries.list
index 9eef8fc..988bea9 100644
--- a/mirmon/countries.list
+++ b/mirmon/countries.list
@@ -1,4 +1,4 @@
-# List of countries
+# based on : http://www.iso.org/iso/list-en1-semic-3.txt
 ad - andorra
 ae - united arab emirates
 af - afghanistan
@@ -26,7 +26,7 @@ bi - burundi
 bj - benin
 bm - bermuda
 bn - brunei darussalam
-bo - bolivia
+bo - bolivia, plurinational state of
 br - brazil
 bs - bahamas
 bt - bhutan
@@ -40,7 +40,6 @@ cd - congo, the democratic republic of the
 cf - central african republic
 cg - congo
 ch - switzerland
-ci - cote d'ivoire
 ck - cook islands
 cl - chile
 cm - cameroon
@@ -136,6 +135,7 @@ ma - morocco
 mc - monaco
 md - moldova, republic of
 me - montenegro
+mf - saint martin
 mg - madagascar
 mh - marshall islands
 mk - macedonia, the former yugoslav republic of
@@ -182,7 +182,6 @@ pt - portugal
 pw - palau
 py - paraguay
 qa - qatar
-re - reunion
 ro - romania
 rs - serbia
 ru - russian federation
@@ -193,7 +192,7 @@ sc - seychelles
 sd - sudan
 se - sweden
 sg - singapore
-sh - saint helena
+sh - saint helena, ascension and tristan da cunha
 si - slovenia
 sj - svalbard and jan mayen
 sk - slovakia
@@ -231,7 +230,7 @@ uy - uruguay
 uz - uzbekistan
 va - holy see (vatican city state)
 vc - saint vincent and the grenadines
-ve - venezuela
+ve - venezuela, bolivarian republic of
 vg - virgin islands, british
 vi - virgin islands, u.s.
 vn - viet nam
diff --git a/mirmon/probe b/mirmon/probe
new file mode 100755
index 0000000..717cb16
--- /dev/null
+++ b/mirmon/probe
@@ -0,0 +1,76 @@
+#! /usr/bin/perl -w
+
+use strict ;
+
+my $WGET  = '/usr/bin/wget' ;
+my $RSYNC = '/usr/bin/rsync' ;
+
+my $timeout = 300 ;
+my $tmp_dir = '/tmp/mirmon' ;
+
+my $prog = substr($0,rindex($0,'/')+1) ;
+my $Usage = <<USAGE ;
+Usage: $prog [-v] [-q] [-d] [-t timeout] url
+option v : be verbose
+option q : be quiet
+option d : show debug info
+option t : timeout in seconds (default $timeout)
+argument url :
+  rysnc://host.dom.com/module/file
+   http://host.dom.com/some/file
+    ftp://host.dom.com/some/file
+USAGE
+sub Usage { die "$_[0]$Usage" ; }
+sub Error { die "$prog: $_[0]\n" ; }
+sub Warn  { warn "$prog: $_[0]\n" ; }
+
+# usage: &GetOptions(ARG,ARG,..) defines $opt_ID as 1 or user spec'ed value
+# usage: &GetOptions(\%opt,ARG,ARG,..) defines $opt{ID} as 1 or user value
+# ARG = 'ID' | 'ID=SPC' | 'ID:SPC' for no-arg, required-arg or optional-arg
+# ID  = perl identifier
+# SPC = i|f|s for integer, fixedpoint real or string argument
+
+use Getopt::Long ;
+Getopt::Long::config('no_ignore_case') ;
+my %opt = () ; Usage('') unless GetOptions
+  ( \%opt, qw(v q d t=i) ) ;
+Usage("Arg count\n") unless @ARGV == 1 ;
+
+my $url = shift ;
+$timeout = $opt{t} if exists $opt{t} ;
+$opt{v} ||= $opt{d} ;
+
+my $opt_v = '' ; $opt_v = '-v' if $opt{v} ;
+my $opt_q = '' ; $opt_q = '-q' if $opt{q} ;
+
+# make a tmp dir for rsync
+
+-d $tmp_dir or mkdir $tmp_dir or Error "can't mkdir $tmp_dir ($!)" ;
+
+# handle rsync urls with rsync
+#  rewrite rysnc://host.dom.com/module/file -> host.dom.com::module/file
+# handle ftp/http urls with wget
+
+if ( $url =~ m!^rsync://(.*)$! )
+  { my $src = $1 ;
+    my $dst = $src ;
+    $dst =~ s![/\s]!_!g ;
+    my $TMP = "$tmp_dir/$dst" ;
+    $src =~ s!/!::! ;
+    unlink $TMP ; # ignore status
+    my $cmd = "$RSYNC $opt_v $opt_q --no-motd --timeout $timeout $src $TMP" ;
+    Warn sprintf "'%s'\n", $cmd if $opt{d} ;
+    system $cmd ;
+    if ( open TMP, $TMP )
+      { print <TMP> ; close TMP ; }
+    else
+      { Warn "can't open $TMP" ; }
+  }
+else
+  { my $cmd = "$WGET -O - $opt_v $opt_q -t 1 -T $timeout $url |" ;
+    Warn sprintf "'%s'\n", $cmd if $opt{d} ;
+    if ( open CMD, $cmd )
+      { print <CMD> ; close CMD ; }
+    else
+      { Warn "can't popen $cmd ($!)" ; }
+  }