From e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Apr 2018 13:16:39 +0100 Subject: gentoo resync : 07.04.2018 --- www-apps/mirmon/Manifest | 3 - ...01-Add-rsync-monitoring-support-to-mirmon.patch | 87 ---------------------- www-apps/mirmon/mirmon-1.38-r4.ebuild | 47 ------------ 3 files changed, 137 deletions(-) delete mode 100644 www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch delete mode 100644 www-apps/mirmon/mirmon-1.38-r4.ebuild (limited to 'www-apps/mirmon') diff --git a/www-apps/mirmon/Manifest b/www-apps/mirmon/Manifest index d0d362b80e4b..056cb8838308 100644 --- a/www-apps/mirmon/Manifest +++ b/www-apps/mirmon/Manifest @@ -1,7 +1,4 @@ -AUX 0001-Add-rsync-monitoring-support-to-mirmon.patch 2534 BLAKE2B 7291c584d990ccfa173189d07f7de11eeab4eb8b86846769a02b1f4830cf1bcd21d88cacbbe18b3517f609cd0dc9523f199cb31bdef224c7959bd5c79394d31d SHA512 36bee0706ba782a8706ee88d52e913f10d3f1b84a5979f252aa947b44ed30c7f9c5db5b17dbe0b5bf6dae7fd899c926f2a79349081731d00f4160808d32a5844 AUX 0002-Add-ipv6-monitor-support-to-mirmon.patch 970 BLAKE2B 8a78bcf62e020d4e8e369173e548d721be0584acc91be47c9e1aec3c1308fb3ee47033a842e0e9ffe172fccb3e98d52916f5441022c1ef87aa798295eca9ffe9 SHA512 ea6f7f51e516b944f69b6c76ecb48e36a1127867fdbaf558c9b81253ee47793bb017dfb0df830343c21dc8c8023390c6b53ef9f16e798731ab0c3f4b201dc9ad -DIST mirmon-1.38.tar.gz 33021 BLAKE2B b46778fa3cb5e54ecb5ac5951b26a4b17662b58e99fd78e701a588aa76e7d2033b8c02ed6584737c20e7269bd043a1c508d516007cbc10bca87b581455f84b9f SHA512 a879f7ac979ad31d24a27940600c7a95e0f9db6cc8654fd36f830f9a9cfb9d3a7e86fcb27870da3889ad159028a6807203664038e985c12a5f59a6b19b473b08 DIST mirmon-2.10.tar.gz 72212 BLAKE2B e1f6a68369bd97110d88d3171d552133f48ed8234b06c632f9798b5fd51dcf59e048d900f116fbd185adb86e8c9ee9ff63152a8dddf41dda6b01310644575d8b SHA512 e6e371e1b78b9a7e8e27dd1a68b07436430d9d1cbaa96ee6738049c4878c70b8736e24d86be2571f0a08b263b763c2d8883d78925ac703336f7a297903413d4d -EBUILD mirmon-1.38-r4.ebuild 1058 BLAKE2B 9f5ba9d09321860b989cdc246466acdce381901ae1824b9d8a461299f5dd943ae626d646ce0b12516990fd6979db7bae58d28baf98f063b058a99b440adb0b3c SHA512 3f048753db716ddc339299b0fd3f3cf4c1f802de4237716ccef7f6f5219f323637c43599f25e0a0c3cf005209157be58d76bd113a60a01ee6cef679d052e97af EBUILD mirmon-2.10.ebuild 905 BLAKE2B 26c5c8f7c23777c751ab4bf0f2e5640358dad7dc615b04e08001f24b9eccb9eba2a11dfb5463d3c2ac83f2fc6a4d64ac2283155ed92b2dc3ef298a77e7847a9c SHA512 c64a6d5121e7208667c4eebab50c6219ff40a62fe7764b067cfcce81504d2686980a5de91f0b52b7a9788987448fd1098b95ab6959c92894891a1db6aa174319 MISC metadata.xml 301 BLAKE2B 5fe42bb4c75fe17ecef559afa5a288fe1f4529017ca04e4fd265045bc23371d1bbe5851c9a85ec3be57957ab05c2ea7dfc63412561e7e2b78340b97e2fb273f4 SHA512 7e3589110474bd73e8ce39b9056dd426d5d68eed8f6babaf90357e629feda96e4ec03e568a8042ff7dfe8521696150d794c3344f7773b4df060c0ee77d7dfb8e 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 deleted file mode 100644 index 0c8c69d7795f..000000000000 --- a/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch +++ /dev/null @@ -1,87 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=289942 - -From d91f1f17be33dfc5ed771829639791b5463417a2 Mon Sep 17 00:00:00 2001 -From: Jeremy Olexa -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$ -+# 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/mirmon-1.38-r4.ebuild b/www-apps/mirmon/mirmon-1.38-r4.ebuild deleted file mode 100644 index ede9c4ac7ee2..000000000000 --- a/www-apps/mirmon/mirmon-1.38-r4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit webapp eutils -WEBAPP_MANUAL_SLOT="yes" - -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" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -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" - # set the proper interpreter - sed -i -e 's:/sw/bin/perl:/usr/bin/perl:' mirmon || die -} - -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 "${D}"/${MY_HTDOCSDIR} - rm -rf icons - cp -R . "${D}"/${MY_HOSTROOTDIR} - - webapp_src_install -} -- cgit v1.2.3