[gentoo-commits] gentoo-x86 commit in net-analyzer/mirmon/files: 0001-Add-rsync-monitoring-support-to-mirmon.patch 0002-Add-ipv6-monitor-support-to-mirmon.patch

[Jeremy Olexa (darkside)]

darkside    09/10/29 02:26:39

  Added:                0001-Add-rsync-monitoring-support-to-mirmon.patch
                        0002-Add-ipv6-monitor-support-to-mirmon.patch
  Log:
  Revbump to add patches for rsync and ipv6 support, Gentoo bug 289942 & 289943
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-analyzer/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch?rev=1.1&content-type=text/plain

Index: 0001-Add-rsync-monitoring-support-to-mirmon.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=289942

From d91f1f17be33dfc5ed771829639791b5463417a2 Mon Sep 17 00:00:00 2001
From: Jeremy Olexa <darkside@g.o>
Date: Wed, 28 Oct 2009 20:58:45 -0500
Subject: [PATCH 1/2] Add rsync monitoring support to mirmon.

You will also need to modify mirmon.conf to use probe-mirmon instead
Original patch located at: http://www.tug.org/texlive/mirmon/probe-mirmon
---
 mirmon       |    2 +-
 probe-mirmon |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletions(-)
 create mode 100644 probe-mirmon

diff --git a/mirmon b/mirmon
index a1261f5..6c0aaa8 100755
--- a/mirmon
+++ b/mirmon
@@ -384,7 +384,7 @@ sub get_ccs
 sub type_site
   { my $url = shift ;
     my ( $type, $site, $home ) ;
-    if ( $url =~ m!^(ftp|http)://([^/:]+)(:\d+)?/! )
+    if ( $url =~ m!^(ftp|https?|rsync)://([^/:]+)(:\d+)?/! )
       { $type = $1 ; $site = $2 ; $home = $& ; }
     return $type, $site, $home ;
   }
diff --git a/probe-mirmon b/probe-mirmon
new file mode 100644
index 0000000..a7fe513
--- /dev/null
+++ b/probe-mirmon
@@ -0,0 +1,50 @@
+#!/usr/bin/env perl
+# $Id: 0001-Add-rsync-monitoring-support-to-mirmon.patch,v 1.1 2009/10/29 02:26:38 darkside Exp $
+# public domain.  Originally written by Karl Berry, 2009.
+# 
+# Probe rsync url's for mirmon; use wget for anything else.
+# From description at http://people.cs.uu.nl/henkp/mirmon.
+# 
+# Also requires a patch to mirmon itself to accept rsync urls
+# (and I wanted https too):
+# --- /usr/local/share/mirmon/ORIG/mirmon	2007-08-18 18:05:47.000000000 +0200
+# +++ /usr/local/share/mirmon/mirmon	2009-07-03 22:38:00.000000000 +0200
+# @@ -386,3 +386,3 @@
+#      my ( $type, $site, $home ) ;
+# -    if ( $url =~ m!^(ftp|http)://([^/:]+)(:\d+)?/! )
+# +    if ( $url =~ m!^(ftp|https?|rsync)://([^/:]+)(:\d+)?/! )
+#        { $type = $1 ; $site = $2 ; $home = $& ; }
+
+exit (&main ());
+
+sub main
+{
+  my ($timeout,$url) = @ARGV;
+  my $ret;
+
+  if ($url =~ m,^rsync://,) {
+    $ret = &handle_rsync ($timeout, $url);
+  } else {
+    $ret = system qq(wget -q -O - -t 1 -T $timeout $url);
+  }
+  return $ret;
+}
+
+
+sub handle_rsync
+{
+  my ($timeout,$url) = @_;
+  
+  my $tmpdir = "rsync-tmp";
+  -d $tmpdir || mkdir ($tmpdir, 0700);
+  
+  (my $file = $url) =~ s/\W/_/g;  # translate all non-letters to _
+  my $local = "$tmpdir/$file";
+  my $ret = system
+             qq(/usr/local/bin/rsync --no-motd --timeout $timeout $url $local);
+
+  @ARGV = ($local);  # don't care about our args any more.
+  print <>;          # let perl autoprint
+
+  return $ret;
+}
-- 
1.6.4.4




1.1                  net-analyzer/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch?rev=1.1&content-type=text/plain

Index: 0002-Add-ipv6-monitor-support-to-mirmon.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=289943

From ab302148275a973c3fccd164fa1ae4b4c4409d21 Mon Sep 17 00:00:00 2001
From: Jeremy Olexa <darkside@g.o>
Date: Wed, 28 Oct 2009 21:04:39 -0500
Subject: [PATCH 2/2] Add ipv6 monitor support to mirmon

This patch will overload the gethost() function provided by perl in such a way
that it uses gethostbyname2() from Socket6, which is a new dependency.

Original patch by: Kent Fredric
---
 mirmon |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/mirmon b/mirmon
index 6c0aaa8..50d40ca 100755
--- a/mirmon
+++ b/mirmon
@@ -30,7 +30,17 @@ my $VER = '$Id: 0002-Add-ipv6-monitor-support-to-mirmon.patch,v 1.1 2009/10/29 02:26:38 darkside Exp $' ;
 use strict ;
 use IO::Pipe ;
 use IO::Select ;
-use Net::hostent ;
+
+use Socket;
+use Socket6;
+use Data::Dumper qw( Dumper );
+
+sub gethost($){
+  my $url = shift;
+  return 1 if gethostbyname2 $url, AF_INET;
+  return 1 if gethostbyname2 $url, AF_INET6;
+  return 0;
+}
 
 my $DEF_CNF = "/etc/$PRG.conf" ;
 
-- 
1.6.4.4