[gentoo-commits] repo/gentoo:master commit in: www-apps/mirmon/, www-apps/mirmon/files/

[gentoo-commits] repo/gentoo:master commit in: www-apps/mirmon/, www-apps/mirmon/files/

[Jonas Stein]

commit:     9154b9b57ad586e4f19ba5d6d1ace9ee53b20034
Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Fri Apr  6 11:22:38 2018 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 23:52:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9154b9b5

www-apps/mirmon: Clean up old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 www-apps/mirmon/Manifest                           |  1 -
 ...01-Add-rsync-monitoring-support-to-mirmon.patch | 87 ----------------------
 www-apps/mirmon/mirmon-1.38-r4.ebuild              | 47 ------------
 3 files changed, 135 deletions(-)

diff --git a/www-apps/mirmon/Manifest b/www-apps/mirmon/Manifest
index 7a0f0cf88f0..19755d9932c 100644
--- a/www-apps/mirmon/Manifest
+++ b/www-apps/mirmon/Manifest
@@ -1,2 +1 @@
-DIST mirmon-1.38.tar.gz 33021 BLAKE2B b46778fa3cb5e54ecb5ac5951b26a4b17662b58e99fd78e701a588aa76e7d2033b8c02ed6584737c20e7269bd043a1c508d516007cbc10bca87b581455f84b9f SHA512 a879f7ac979ad31d24a27940600c7a95e0f9db6cc8654fd36f830f9a9cfb9d3a7e86fcb27870da3889ad159028a6807203664038e985c12a5f59a6b19b473b08
 DIST mirmon-2.10.tar.gz 72212 BLAKE2B e1f6a68369bd97110d88d3171d552133f48ed8234b06c632f9798b5fd51dcf59e048d900f116fbd185adb86e8c9ee9ff63152a8dddf41dda6b01310644575d8b SHA512 e6e371e1b78b9a7e8e27dd1a68b07436430d9d1cbaa96ee6738049c4878c70b8736e24d86be2571f0a08b263b763c2d8883d78925ac703336f7a297903413d4d

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 0c8c69d7795..00000000000
--- 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 <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$
-+# 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 ede9c4ac7ee..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: www-apps/mirmon/, www-apps/mirmon/files/

[Robin H. Johnson]

commit:     126c94d7d854eed4373ccd2fcdc7209301613f07
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 22:20:52 2020 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 22:21:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=126c94d7

www-apps/mirmon: fix gethostbyname2 method

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch | 2 +-
 www-apps/mirmon/{mirmon-2.11.ebuild => mirmon-2.11-r1.ebuild}       | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch b/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch
index c50cf736cfd..d21eb2c022a 100644
--- a/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch
+++ b/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch
@@ -28,7 +28,7 @@ index 6c0aaa8..50d40ca 100755
 -use Net::hostent ;
 +
 +use Socket qw(AF_INET);
-+use Socket6 qw(AF_INET6);
++use Socket6 qw(AF_INET6 gethostbyname2);
 +use Data::Dumper qw( Dumper );
 +
 +sub gethost($){

diff --git a/www-apps/mirmon/mirmon-2.11.ebuild b/www-apps/mirmon/mirmon-2.11-r1.ebuild
similarity index 100%
rename from www-apps/mirmon/mirmon-2.11.ebuild
rename to www-apps/mirmon/mirmon-2.11-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: www-apps/mirmon/, www-apps/mirmon/files/

[Robin H. Johnson]

commit:     f8169b7ab50e900510cf96db00e44ecb7ee52470
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 21:03:25 2020 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May  2 22:11:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8169b7a

www-apps/mirmon: cleanup old version

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 .../0002-Add-ipv6-monitor-support-to-mirmon.patch  | 41 --------------------
 www-apps/mirmon/mirmon-2.10.ebuild                 | 44 ----------------------
 2 files changed, 85 deletions(-)

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
deleted file mode 100644
index 3742d30825b..00000000000
--- a/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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$
- 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/mirmon-2.10.ebuild b/www-apps/mirmon/mirmon-2.10.ebuild
deleted file mode 100644
index 63863466bdf..00000000000
--- a/www-apps/mirmon/mirmon-2.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp eutils
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="Simple webapp to monitor the status of mirrors"
-HOMEPAGE="https://www.staff.science.uu.nl/~penni101/mirmon/"
-SRC_URI="https://www.staff.science.uu.nl/~penni101/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.8.5-r2:0"
-RDEPEND="${DEPEND}
-	dev-perl/File-Tempdir
-	dev-perl/Socket6"
-
-src_prepare() {
-	epatch "${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 "${D}"/${MY_HTDOCSDIR}
-	rm -rf icons
-	cp -R . "${D}"/${MY_HOSTROOTDIR}
-
-	webapp_src_install
-}