diff options
author | Jeremy Olexa <darkside@gentoo.org> | 2010-05-09 22:06:27 +0000 |
---|---|---|
committer | Jeremy Olexa <darkside@gentoo.org> | 2010-05-09 22:06:27 +0000 |
commit | 78bfef1e926d355b0425fe5e667593ebd6513ebb (patch) | |
tree | 361c859520d72c7c72bd4e695e26535557b84127 /www-apps | |
parent | Fix build error with et_EE locale (#318995) (diff) | |
download | gentoo-2-78bfef1e926d355b0425fe5e667593ebd6513ebb.tar.gz gentoo-2-78bfef1e926d355b0425fe5e667593ebd6513ebb.tar.bz2 gentoo-2-78bfef1e926d355b0425fe5e667593ebd6513ebb.zip |
Move from net-analyzer/mirmon. Don't install empty directories and install mirmon script in HOSTROOT instead of HTDOCS
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'www-apps')
-rw-r--r-- | www-apps/mirmon/ChangeLog | 60 | ||||
-rw-r--r-- | www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch | 87 | ||||
-rw-r--r-- | www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch | 41 | ||||
-rw-r--r-- | www-apps/mirmon/metadata.xml | 9 | ||||
-rw-r--r-- | www-apps/mirmon/mirmon-1.38-r3.ebuild | 44 |
5 files changed, 241 insertions, 0 deletions
diff --git a/www-apps/mirmon/ChangeLog b/www-apps/mirmon/ChangeLog new file mode 100644 index 000000000000..39f2e89902cb --- /dev/null +++ b/www-apps/mirmon/ChangeLog @@ -0,0 +1,60 @@ +# ChangeLog for www-apps/mirmon +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/mirmon/ChangeLog,v 1.1 2010/05/09 22:06:27 darkside Exp $ + +*mirmon-1.38-r3 (09 May 2010) + + 09 May 2010; 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-r3.ebuild, +metadata.xml: + Move from net-analyzer/mirmon. Don't install empty directories and install + mirmon script in HOSTROOT instead of HTDOCS + + 10 Mar 2010; Jeremy Olexa <darkside@gentoo.org> mirmon-1.38-r2.ebuild: + Fix dep from last commit, I read it wrongly, File-Tempdir not File-Temp + + 09 Mar 2010; Jeremy Olexa <darkside@gentoo.org> -mirmon-1.38.ebuild, + mirmon-1.38-r2.ebuild: + Add missing dep on perl-File-Temp + +*mirmon-1.38-r2 (29 Oct 2009) + + 29 Oct 2009; Jeremy Olexa <darkside@gentoo.org> -mirmon-1.38-r1.ebuild, + +mirmon-1.38-r2.ebuild: + Forgot to add dependancy on dev-perl/Socket6 in last commit. Fix HOMEPAGE + and SRC_URI. + +*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) + +*mirmon-1.38 (18 Jan 2008) + + 18 Jan 2008; Raúl Porcel <armin76@gentoo.org> -mirmon-1.36.ebuild, + -mirmon-1.37.ebuild, +mirmon-1.38.ebuild: + Version bump, remove old, add ~amd64 + +*mirmon-1.37 (05 Jul 2007) + + 05 Jul 2007; Raúl Porcel <armin76@gentoo.org> +mirmon-1.37.ebuild: + Version bump + + 09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: + Regenerate digest in Manifest2 format. + + 19 Jul 2005; David Holm <dholm@gentoo.org> mirmon-1.36.ebuild: + Added to ~ppc. + + 02 Feb 2005; Jeffrey Forman <jforman@gentoo.org> : + Initial version of mirmon ebuild, version 1.36. To monitor mirrors update + status + diff --git a/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch b/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch new file mode 100644 index 000000000000..76a2fb993d9c --- /dev/null +++ b/www-apps/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 2010/05/09 22:06:26 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/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch b/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch new file mode 100644 index 000000000000..82c8af13a44e --- /dev/null +++ b/www-apps/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 2010/05/09 22:06:26 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/www-apps/mirmon/metadata.xml b/www-apps/mirmon/metadata.xml new file mode 100644 index 000000000000..e44074e37901 --- /dev/null +++ b/www-apps/mirmon/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>no-herd</herd> + <maintainer> + <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/www-apps/mirmon/mirmon-1.38-r3.ebuild b/www-apps/mirmon/mirmon-1.38-r3.ebuild new file mode 100644 index 000000000000..eab20f84283d --- /dev/null +++ b/www-apps/mirmon/mirmon-1.38-r3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/mirmon/mirmon-1.38-r3.ebuild,v 1.1 2010/05/09 22:06:27 darkside Exp $ + +inherit webapp eutils + +DESCRIPTION="Simple webapp to monitor the status of mirrors" +HOMEPAGE="http://people.cs.uu.nl/henkp/mirmon/" +SRC_URI="http://people.cs.uu.nl/henkp/mirmon/src/$PN/src/$P.tar.gz" + +LICENSE="GPL-2" + +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND=">=dev-lang/perl-5.8.5-r2" +RDEPEND="${DEPEND} + dev-perl/File-Tempdir + dev-perl/Socket6" + +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() { + # Don't install empty dirs + MY_CGIBINDIR="" + MY_ICONSDIR="" + MY_ERRORSDIR="" + + webapp_src_preinst + + for file in mirmon.html mirmon.txt; do + dodoc ${file} + rm -f ${file} + done + cp -R icons mirmon.html "${D}"/${MY_HTDOCSDIR} + rm -rf icons mirmon.html + cp -R . "${D}"/${MY_HOSTROOTDIR} + + webapp_src_install +} |