Revbump to add patches for rsync and ipv6 support, Gentoo bug 289942 & 289943

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 174 insertions, 4 deletions

diff --git a/net-analyzer/mirmon/ChangeLog b/net-analyzer/mirmon/ChangeLog
index 3cddf5b11869..99ef69416428 100644
--- a/net-analyzer/mirmon/ChangeLog
+++ b/net-analyzer/mirmon/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/mirmon
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mirmon/ChangeLog,v 1.6 2008/08/16 16:29:51 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mirmon/ChangeLog,v 1.7 2009/10/29 02:26:36 darkside Exp $
+
+*mirmon-1.38-r1 (29 Oct 2009)
+
+  29 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/0001-Add-rsync-monitoring-support-to-mirmon.patch,
+  +files/0002-Add-ipv6-monitor-support-to-mirmon.patch,
+  +mirmon-1.38-r1.ebuild, metadata.xml:
+  Revbump to add patches for rsync and ipv6 support, Gentoo bug 289942 &
+  289943
 
   16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove jforman from metadata.xml (#38728)
diff --git a/net-analyzer/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch b/net-analyzer/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch
new file mode 100644
index 000000000000..3d30c0b5cc94
--- /dev/null
+++ b/net-analyzer/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch
@@ -0,0 +1,87 @@
+https://bugs.gentoo.org/show_bug.cgi?id=289942
+
+From d91f1f17be33dfc5ed771829639791b5463417a2 Mon Sep 17 00:00:00 2001
+From: Jeremy Olexa <darkside@gentoo.org>
+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
+
diff --git a/net-analyzer/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch b/net-analyzer/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch
new file mode 100644
index 000000000000..40e541538c4c
--- /dev/null
+++ b/net-analyzer/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/show_bug.cgi?id=289943
+
+From ab302148275a973c3fccd164fa1ae4b4c4409d21 Mon Sep 17 00:00:00 2001
+From: Jeremy Olexa <darkside@gentoo.org>
+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
+
diff --git a/net-analyzer/mirmon/metadata.xml b/net-analyzer/mirmon/metadata.xml
index 2bcd2cccaf14..e44074e37901 100644
--- a/net-analyzer/mirmon/metadata.xml
+++ b/net-analyzer/mirmon/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
   <herd>no-herd</herd>
   <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+    <email>mirror-admin@gentoo.org</email>
   </maintainer>
-
 <longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/mirmon/mirmon-1.38-r1.ebuild b/net-analyzer/mirmon/mirmon-1.38-r1.ebuild
new file mode 100644
index 000000000000..e305a70daa5c
--- /dev/null
+++ b/net-analyzer/mirmon/mirmon-1.38-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mirmon/mirmon-1.38-r1.ebuild,v 1.1 2009/10/29 02:26:36 darkside Exp $
+
+inherit webapp eutils
+
+DESCRIPTION="Monitor the status of mirrors"
+HOMEPAGE="http://www.cs.uu.nl/people/henkp/mirmon/"
+SRC_URI="http://www.cs.uu.nl/people/henkp/$PN/src/$P.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-lang/perl-5.8.5-r2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/0001-Add-rsync-monitoring-support-to-mirmon.patch" \
+		"${FILESDIR}/0002-Add-ipv6-monitor-support-to-mirmon.patch"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	for file in mirmon.html mirmon.txt; do
+		dodoc ${file}
+		rm -f ${file}
+	done
+	cp -R . "${D}"/${MY_HTDOCSDIR}
+
+	webapp_src_install
+}