Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/mirmon/files/, www-apps/mirmon/
Date: Wed, 29 Apr 2020 07:18:29
Message-Id: 1588144701.a13d4173a8f07a97a2b12a1db7005948b87cf787.robbat2@gentoo
1 commit: a13d4173a8f07a97a2b12a1db7005948b87cf787
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 29 07:12:08 2020 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 29 07:18:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a13d4173
7
8 www-apps/mirmon: bump
9
10 Update HOMEPAGE & SRC_URI. The upstream author has passed away.
11
12 Reference: https://www.apache.org/memorials/henk_penning.html
13 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
14
15 www-apps/mirmon/Manifest | 1 +
16 .../2.11-Add-ipv6-monitor-support-to-mirmon.patch | 45 ++++++++++++++++++++++
17 www-apps/mirmon/metadata.xml | 8 +++-
18 www-apps/mirmon/mirmon-2.11.ebuild | 45 ++++++++++++++++++++++
19 4 files changed, 97 insertions(+), 2 deletions(-)
20
21 diff --git a/www-apps/mirmon/Manifest b/www-apps/mirmon/Manifest
22 index 19755d9932c..4ad88b4292d 100644
23 --- a/www-apps/mirmon/Manifest
24 +++ b/www-apps/mirmon/Manifest
25 @@ -1 +1,2 @@
26 DIST mirmon-2.10.tar.gz 72212 BLAKE2B e1f6a68369bd97110d88d3171d552133f48ed8234b06c632f9798b5fd51dcf59e048d900f116fbd185adb86e8c9ee9ff63152a8dddf41dda6b01310644575d8b SHA512 e6e371e1b78b9a7e8e27dd1a68b07436430d9d1cbaa96ee6738049c4878c70b8736e24d86be2571f0a08b263b763c2d8883d78925ac703336f7a297903413d4d
27 +DIST mirmon-2.11.tar.gz 67630 BLAKE2B 6b7ba87cf7705083f8199ef9e2cff1e63a73592cf1bb0852fa5bece7ce462f06c4be5c60570748e6d5b46e845cdb8c1af44b4b1f976dc2a34a9b7d5e08fd7811 SHA512 4fff47042b9768d10541c1b478a44277ab7610e635e09bcac404a94590b86b375e21098130d0b91c4f9a1bd883cef8967c74dae7b50cee7b51339999b0240580
28
29 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
30 new file mode 100644
31 index 00000000000..c50cf736cfd
32 --- /dev/null
33 +++ b/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch
34 @@ -0,0 +1,45 @@
35 +Note: import amended to just required symbols to satify Perl 5.30.
36 + Subroutine Mirmon::pack_sockaddr_in6 redefined at /usr/lib64/perl5/5.30.1/Exporter.pm line 66.
37 + at /usr/share/webapps/mirmon/2.10/hostroot/mirmon line 175.
38 +
39 +https://bugs.gentoo.org/show_bug.cgi?id=289943
40 +
41 +From ab302148275a973c3fccd164fa1ae4b4c4409d21 Mon Sep 17 00:00:00 2001
42 +From: Jeremy Olexa <darkside@g.o>
43 +Date: Wed, 28 Oct 2009 21:04:39 -0500
44 +Subject: [PATCH 2/2] Add ipv6 monitor support to mirmon
45 +
46 +This patch will overload the gethost() function provided by perl in such a way
47 +that it uses gethostbyname2() from Socket6, which is a new dependency.
48 +
49 +Original patch by: Kent Fredric
50 +---
51 + mirmon | 12 +++++++++++-
52 + 1 files changed, 11 insertions(+), 1 deletions(-)
53 +
54 +diff --git a/mirmon b/mirmon
55 +index 6c0aaa8..50d40ca 100755
56 +--- a/mirmon
57 ++++ b/mirmon
58 +@@ -30,7 +30,17 @@ my $VER = '# $Id$
59 + use strict ;
60 + use IO::Pipe ;
61 + use IO::Select ;
62 +-use Net::hostent ;
63 ++
64 ++use Socket qw(AF_INET);
65 ++use Socket6 qw(AF_INET6);
66 ++use Data::Dumper qw( Dumper );
67 ++
68 ++sub gethost($){
69 ++ my $url = shift;
70 ++ return 1 if gethostbyname2 $url, AF_INET;
71 ++ return 1 if gethostbyname2 $url, AF_INET6;
72 ++ return 0;
73 ++}
74 +
75 + my $DEF_CNF = "/etc/$PRG.conf" ;
76 +
77 +--
78 +1.6.4.4
79 +
80
81 diff --git a/www-apps/mirmon/metadata.xml b/www-apps/mirmon/metadata.xml
82 index d9b32066e75..f02d1e93aba 100644
83 --- a/www-apps/mirmon/metadata.xml
84 +++ b/www-apps/mirmon/metadata.xml
85 @@ -1,6 +1,10 @@
86 <?xml version="1.0" encoding="UTF-8"?>
87 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
88 <pkgmetadata>
89 - <!-- maintainer-needed -->
90 - <longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
91 + <!-- used by infra, please do not non-maintainer drop -->
92 + <maintainer type="project">
93 + <email>sysadmin@g.o</email>
94 + <name>Gentoo Sysadmin Project</name>
95 + </maintainer>
96 + <longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
97 </pkgmetadata>
98
99 diff --git a/www-apps/mirmon/mirmon-2.11.ebuild b/www-apps/mirmon/mirmon-2.11.ebuild
100 new file mode 100644
101 index 00000000000..861191e7470
102 --- /dev/null
103 +++ b/www-apps/mirmon/mirmon-2.11.ebuild
104 @@ -0,0 +1,45 @@
105 +# Copyright 1999-2016 Gentoo Foundation
106 +# Distributed under the terms of the GNU General Public License v2
107 +
108 +EAPI=7
109 +
110 +inherit webapp eutils
111 +WEBAPP_MANUAL_SLOT="yes"
112 +
113 +DESCRIPTION="Simple webapp to monitor the status of mirrors"
114 +# The author has passed away: https://www.apache.org/memorials/henk_penning.html
115 +HOMEPAGE="http://www2.projects.science.uu.nl/csg/mirmon/mirmon.html"
116 +SRC_URI="https://deb.debian.org/debian/pool/main/m/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
117 +
118 +LICENSE="GPL-2"
119 +SLOT="0"
120 +KEYWORDS="~amd64 ~ppc ~x86"
121 +IUSE=""
122 +
123 +DEPEND=">=dev-lang/perl-5.8.5-r2:0"
124 +RDEPEND="${DEPEND}
125 + dev-perl/File-Tempdir
126 + dev-perl/Socket6"
127 +
128 +PATCHES=(
129 + "${FILESDIR}/2.11-Add-ipv6-monitor-support-to-mirmon.patch"
130 +)
131 +
132 +src_install() {
133 + # Don't install empty dirs
134 + MY_CGIBINDIR=""
135 + MY_ICONSDIR=""
136 + MY_ERRORSDIR=""
137 +
138 + webapp_src_preinst
139 +
140 + for file in mirmon.html mirmon.txt; do
141 + dodoc ${file}
142 + rm -f ${file}
143 + done
144 + cp -R icons "${D}"/${MY_HTDOCSDIR}
145 + rm -rf icons
146 + cp -R . "${D}"/${MY_HOSTROOTDIR}
147 +
148 + webapp_src_install
149 +}