1 |
commit: 9154b9b57ad586e4f19ba5d6d1ace9ee53b20034 |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Apr 6 11:22:38 2018 +0000 |
4 |
Commit: Jonas Stein <jstein <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 6 23:52:28 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9154b9b5 |
7 |
|
8 |
www-apps/mirmon: Clean up old |
9 |
|
10 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
11 |
|
12 |
www-apps/mirmon/Manifest | 1 - |
13 |
...01-Add-rsync-monitoring-support-to-mirmon.patch | 87 ---------------------- |
14 |
www-apps/mirmon/mirmon-1.38-r4.ebuild | 47 ------------ |
15 |
3 files changed, 135 deletions(-) |
16 |
|
17 |
diff --git a/www-apps/mirmon/Manifest b/www-apps/mirmon/Manifest |
18 |
index 7a0f0cf88f0..19755d9932c 100644 |
19 |
--- a/www-apps/mirmon/Manifest |
20 |
+++ b/www-apps/mirmon/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST mirmon-1.38.tar.gz 33021 BLAKE2B b46778fa3cb5e54ecb5ac5951b26a4b17662b58e99fd78e701a588aa76e7d2033b8c02ed6584737c20e7269bd043a1c508d516007cbc10bca87b581455f84b9f SHA512 a879f7ac979ad31d24a27940600c7a95e0f9db6cc8654fd36f830f9a9cfb9d3a7e86fcb27870da3889ad159028a6807203664038e985c12a5f59a6b19b473b08 |
23 |
DIST mirmon-2.10.tar.gz 72212 BLAKE2B e1f6a68369bd97110d88d3171d552133f48ed8234b06c632f9798b5fd51dcf59e048d900f116fbd185adb86e8c9ee9ff63152a8dddf41dda6b01310644575d8b SHA512 e6e371e1b78b9a7e8e27dd1a68b07436430d9d1cbaa96ee6738049c4878c70b8736e24d86be2571f0a08b263b763c2d8883d78925ac703336f7a297903413d4d |
24 |
|
25 |
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 |
26 |
deleted file mode 100644 |
27 |
index 0c8c69d7795..00000000000 |
28 |
--- a/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch |
29 |
+++ /dev/null |
30 |
@@ -1,87 +0,0 @@ |
31 |
-https://bugs.gentoo.org/show_bug.cgi?id=289942 |
32 |
- |
33 |
-From d91f1f17be33dfc5ed771829639791b5463417a2 Mon Sep 17 00:00:00 2001 |
34 |
-From: Jeremy Olexa <darkside@g.o> |
35 |
-Date: Wed, 28 Oct 2009 20:58:45 -0500 |
36 |
-Subject: [PATCH 1/2] Add rsync monitoring support to mirmon. |
37 |
- |
38 |
-You will also need to modify mirmon.conf to use probe-mirmon instead |
39 |
-Original patch located at: http://www.tug.org/texlive/mirmon/probe-mirmon |
40 |
---- |
41 |
- mirmon | 2 +- |
42 |
- probe-mirmon | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ |
43 |
- 2 files changed, 51 insertions(+), 1 deletions(-) |
44 |
- create mode 100644 probe-mirmon |
45 |
- |
46 |
-diff --git a/mirmon b/mirmon |
47 |
-index a1261f5..6c0aaa8 100755 |
48 |
---- a/mirmon |
49 |
-+++ b/mirmon |
50 |
-@@ -384,7 +384,7 @@ sub get_ccs |
51 |
- sub type_site |
52 |
- { my $url = shift ; |
53 |
- my ( $type, $site, $home ) ; |
54 |
-- if ( $url =~ m!^(ftp|http)://([^/:]+)(:\d+)?/! ) |
55 |
-+ if ( $url =~ m!^(ftp|https?|rsync)://([^/:]+)(:\d+)?/! ) |
56 |
- { $type = $1 ; $site = $2 ; $home = $& ; } |
57 |
- return $type, $site, $home ; |
58 |
- } |
59 |
-diff --git a/probe-mirmon b/probe-mirmon |
60 |
-new file mode 100644 |
61 |
-index 0000000..a7fe513 |
62 |
---- /dev/null |
63 |
-+++ b/probe-mirmon |
64 |
-@@ -0,0 +1,50 @@ |
65 |
-+#!/usr/bin/env perl |
66 |
-+# $Id$ |
67 |
-+# public domain. Originally written by Karl Berry, 2009. |
68 |
-+# |
69 |
-+# Probe rsync url's for mirmon; use wget for anything else. |
70 |
-+# From description at http://people.cs.uu.nl/henkp/mirmon. |
71 |
-+# |
72 |
-+# Also requires a patch to mirmon itself to accept rsync urls |
73 |
-+# (and I wanted https too): |
74 |
-+# --- /usr/local/share/mirmon/ORIG/mirmon 2007-08-18 18:05:47.000000000 +0200 |
75 |
-+# +++ /usr/local/share/mirmon/mirmon 2009-07-03 22:38:00.000000000 +0200 |
76 |
-+# @@ -386,3 +386,3 @@ |
77 |
-+# my ( $type, $site, $home ) ; |
78 |
-+# - if ( $url =~ m!^(ftp|http)://([^/:]+)(:\d+)?/! ) |
79 |
-+# + if ( $url =~ m!^(ftp|https?|rsync)://([^/:]+)(:\d+)?/! ) |
80 |
-+# { $type = $1 ; $site = $2 ; $home = $& ; } |
81 |
-+ |
82 |
-+exit (&main ()); |
83 |
-+ |
84 |
-+sub main |
85 |
-+{ |
86 |
-+ my ($timeout,$url) = @ARGV; |
87 |
-+ my $ret; |
88 |
-+ |
89 |
-+ if ($url =~ m,^rsync://,) { |
90 |
-+ $ret = &handle_rsync ($timeout, $url); |
91 |
-+ } else { |
92 |
-+ $ret = system qq(wget -q -O - -t 1 -T $timeout $url); |
93 |
-+ } |
94 |
-+ return $ret; |
95 |
-+} |
96 |
-+ |
97 |
-+ |
98 |
-+sub handle_rsync |
99 |
-+{ |
100 |
-+ my ($timeout,$url) = @_; |
101 |
-+ |
102 |
-+ my $tmpdir = "rsync-tmp"; |
103 |
-+ -d $tmpdir || mkdir ($tmpdir, 0700); |
104 |
-+ |
105 |
-+ (my $file = $url) =~ s/\W/_/g; # translate all non-letters to _ |
106 |
-+ my $local = "$tmpdir/$file"; |
107 |
-+ my $ret = system |
108 |
-+ qq(/usr/local/bin/rsync --no-motd --timeout $timeout $url $local); |
109 |
-+ |
110 |
-+ @ARGV = ($local); # don't care about our args any more. |
111 |
-+ print <>; # let perl autoprint |
112 |
-+ |
113 |
-+ return $ret; |
114 |
-+} |
115 |
--- |
116 |
-1.6.4.4 |
117 |
- |
118 |
|
119 |
diff --git a/www-apps/mirmon/mirmon-1.38-r4.ebuild b/www-apps/mirmon/mirmon-1.38-r4.ebuild |
120 |
deleted file mode 100644 |
121 |
index ede9c4ac7ee..00000000000 |
122 |
--- a/www-apps/mirmon/mirmon-1.38-r4.ebuild |
123 |
+++ /dev/null |
124 |
@@ -1,47 +0,0 @@ |
125 |
-# Copyright 1999-2010 Gentoo Foundation |
126 |
-# Distributed under the terms of the GNU General Public License v2 |
127 |
- |
128 |
-inherit webapp eutils |
129 |
-WEBAPP_MANUAL_SLOT="yes" |
130 |
- |
131 |
-DESCRIPTION="Simple webapp to monitor the status of mirrors" |
132 |
-HOMEPAGE="http://people.cs.uu.nl/henkp/mirmon/" |
133 |
-SRC_URI="http://people.cs.uu.nl/henkp/mirmon/src/$PN/src/$P.tar.gz" |
134 |
- |
135 |
-LICENSE="GPL-2" |
136 |
-SLOT="0" |
137 |
-KEYWORDS="~amd64 ~ppc ~x86" |
138 |
-IUSE="" |
139 |
- |
140 |
-DEPEND=">=dev-lang/perl-5.8.5-r2" |
141 |
-RDEPEND="${DEPEND} |
142 |
- dev-perl/File-Tempdir |
143 |
- dev-perl/Socket6" |
144 |
- |
145 |
-src_unpack() { |
146 |
- unpack ${A} |
147 |
- cd "${S}" |
148 |
- epatch "${FILESDIR}/0001-Add-rsync-monitoring-support-to-mirmon.patch" \ |
149 |
- "${FILESDIR}/0002-Add-ipv6-monitor-support-to-mirmon.patch" |
150 |
- # set the proper interpreter |
151 |
- sed -i -e 's:/sw/bin/perl:/usr/bin/perl:' mirmon || die |
152 |
-} |
153 |
- |
154 |
-src_install() { |
155 |
- # Don't install empty dirs |
156 |
- MY_CGIBINDIR="" |
157 |
- MY_ICONSDIR="" |
158 |
- MY_ERRORSDIR="" |
159 |
- |
160 |
- webapp_src_preinst |
161 |
- |
162 |
- for file in mirmon.html mirmon.txt; do |
163 |
- dodoc ${file} |
164 |
- rm -f ${file} |
165 |
- done |
166 |
- cp -R icons "${D}"/${MY_HTDOCSDIR} |
167 |
- rm -rf icons |
168 |
- cp -R . "${D}"/${MY_HOSTROOTDIR} |
169 |
- |
170 |
- webapp_src_install |
171 |
-} |