From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- www-apps/mirmon/Manifest | 9 +++-- .../0002-Add-ipv6-monitor-support-to-mirmon.patch | 41 ------------------- .../2.11-Add-ipv6-monitor-support-to-mirmon.patch | 45 +++++++++++++++++++++ www-apps/mirmon/files/2.11-Fix-options.patch | 34 ++++++++++++++++ www-apps/mirmon/metadata.xml | 8 +++- www-apps/mirmon/mirmon-2.10.ebuild | 44 --------------------- www-apps/mirmon/mirmon-2.11-r2.ebuild | 46 ++++++++++++++++++++++ 7 files changed, 136 insertions(+), 91 deletions(-) delete mode 100644 www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch create mode 100644 www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch create mode 100644 www-apps/mirmon/files/2.11-Fix-options.patch delete mode 100644 www-apps/mirmon/mirmon-2.10.ebuild create mode 100644 www-apps/mirmon/mirmon-2.11-r2.ebuild (limited to 'www-apps/mirmon') diff --git a/www-apps/mirmon/Manifest b/www-apps/mirmon/Manifest index 056cb8838308..c39f99e9155b 100644 --- a/www-apps/mirmon/Manifest +++ b/www-apps/mirmon/Manifest @@ -1,4 +1,5 @@ -AUX 0002-Add-ipv6-monitor-support-to-mirmon.patch 970 BLAKE2B 8a78bcf62e020d4e8e369173e548d721be0584acc91be47c9e1aec3c1308fb3ee47033a842e0e9ffe172fccb3e98d52916f5441022c1ef87aa798295eca9ffe9 SHA512 ea6f7f51e516b944f69b6c76ecb48e36a1127867fdbaf558c9b81253ee47793bb017dfb0df830343c21dc8c8023390c6b53ef9f16e798731ab0c3f4b201dc9ad -DIST mirmon-2.10.tar.gz 72212 BLAKE2B e1f6a68369bd97110d88d3171d552133f48ed8234b06c632f9798b5fd51dcf59e048d900f116fbd185adb86e8c9ee9ff63152a8dddf41dda6b01310644575d8b SHA512 e6e371e1b78b9a7e8e27dd1a68b07436430d9d1cbaa96ee6738049c4878c70b8736e24d86be2571f0a08b263b763c2d8883d78925ac703336f7a297903413d4d -EBUILD mirmon-2.10.ebuild 905 BLAKE2B 26c5c8f7c23777c751ab4bf0f2e5640358dad7dc615b04e08001f24b9eccb9eba2a11dfb5463d3c2ac83f2fc6a4d64ac2283155ed92b2dc3ef298a77e7847a9c SHA512 c64a6d5121e7208667c4eebab50c6219ff40a62fe7764b067cfcce81504d2686980a5de91f0b52b7a9788987448fd1098b95ab6959c92894891a1db6aa174319 -MISC metadata.xml 301 BLAKE2B 5fe42bb4c75fe17ecef559afa5a288fe1f4529017ca04e4fd265045bc23371d1bbe5851c9a85ec3be57957ab05c2ea7dfc63412561e7e2b78340b97e2fb273f4 SHA512 7e3589110474bd73e8ce39b9056dd426d5d68eed8f6babaf90357e629feda96e4ec03e568a8042ff7dfe8521696150d794c3344f7773b4df060c0ee77d7dfb8e +AUX 2.11-Add-ipv6-monitor-support-to-mirmon.patch 1238 BLAKE2B 4e7d12fcd88b44584dca161e675b1eda1655bb39b464b4e1c90ae0844d627b6d0d56c009582036054d7c44743f55f17f068857d48b09511a477a94fb9123dc81 SHA512 c2bed5deef5e16e7c28aa3f7f7da0c3026a45d67fced62aeb380f1ce98e1535d7598c98e68b7a95cf25b2369b5ed3bdfd617b1ca6140ce914a42f23850bc3b1c +AUX 2.11-Fix-options.patch 1336 BLAKE2B 8f35a902025fde5af0acc59139333c4ed23e310b9e687e8dc4f9d8221b066b0ca149c178e0e0f5117a5662470add4246d2c9685beb5eb1ec9f897f256ad55b9c SHA512 3b59e285c05bca87db6583940219def9f73a46a9b9d58d786106dce1c1029f97f9cc97cbdb8dfefa814860d57bbb7ab1cc2defb28ee535687162792a18561e78 +DIST mirmon-2.11.tar.gz 67630 BLAKE2B 6b7ba87cf7705083f8199ef9e2cff1e63a73592cf1bb0852fa5bece7ce462f06c4be5c60570748e6d5b46e845cdb8c1af44b4b1f976dc2a34a9b7d5e08fd7811 SHA512 4fff47042b9768d10541c1b478a44277ab7610e635e09bcac404a94590b86b375e21098130d0b91c4f9a1bd883cef8967c74dae7b50cee7b51339999b0240580 +EBUILD mirmon-2.11-r2.ebuild 1046 BLAKE2B b77382d16482cf8f2caccdec00d604d10893df28836f82cecc902aa902ea0258ad70e303c0660efb95bd47a6127dce4057b3867591c68eaf8034b1e09336b0aa SHA512 8a8cef322d9ea90b64558fdd047467356333afaf897561ea8c27fc7cf36d430beb93327d4d6efcd93b952d97208519ed4968b361dc0bc652ca61fea6624ba16d +MISC metadata.xml 450 BLAKE2B 1b83a7498d0025ff4dc255cbc8bac2c9ce6401c3a0f4ba3631e8b3eaf1ba81cca5f23223936ce5664ee28dc7bb9525d728f45bcc09f602172e50d79f92137a82 SHA512 71cbf05ea1221802576a331bcc7f6885d86261c8a95cd0a7cd4bf55b3b55a52074204114ca2e0676314de8345e27227cf3161d08d6cf617e2a067b0cef5d87b9 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 3742d30825b7..000000000000 --- 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 -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/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch b/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch new file mode 100644 index 000000000000..d21eb2c022a3 --- /dev/null +++ b/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch @@ -0,0 +1,45 @@ +Note: import amended to just required symbols to satify Perl 5.30. + Subroutine Mirmon::pack_sockaddr_in6 redefined at /usr/lib64/perl5/5.30.1/Exporter.pm line 66. + at /usr/share/webapps/mirmon/2.10/hostroot/mirmon line 175. + +https://bugs.gentoo.org/show_bug.cgi?id=289943 + +From ab302148275a973c3fccd164fa1ae4b4c4409d21 Mon Sep 17 00:00:00 2001 +From: Jeremy Olexa +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 qw(AF_INET); ++use Socket6 qw(AF_INET6 gethostbyname2); ++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/files/2.11-Fix-options.patch b/www-apps/mirmon/files/2.11-Fix-options.patch new file mode 100644 index 000000000000..0e0924ea9ddc --- /dev/null +++ b/www-apps/mirmon/files/2.11-Fix-options.patch @@ -0,0 +1,34 @@ +Fix option handling. + +Add debug option to getopt inputs. +Add debug option to usage output. +Add version option to usage output. + +Signed-off-by: Robin H. Johnson + +--- mirmon-2.11.orig/mirmon 2020-04-30 13:32:52.803951845 -0700 ++++ mirmon-2.11/mirmon 2020-04-30 13:33:58.051641169 -0700 +@@ -1900,12 +1900,14 @@ + Usage: $prog [-v] [-q] [-t timeout] [-c conf] [-get all|update|url ] + option v : be verbose + option q : be quiet ++option d : debug output + option t : set timeout ; default $TIMEOUT + option get : get all : probe all sites + : get update : probe a selection of the sites (see doc) + : get url : probe some (in the mirror-list). + option c : configuration file ; default search : + ( $DEF_CNF ) ++option version : display version + ------------------------------------------------------------------- + Mirmon normally only reports errors and changes in the mirror list. + This is $VERSION. +@@ -1924,7 +1926,7 @@ + use Getopt::Long ; + Getopt::Long::config ( 'no_ignore_case' ) ; + my %opt = () ; +-Usage '' unless GetOptions ( \%opt, qw(v q t=i get=s c=s version) ) ; ++Usage '' unless GetOptions ( \%opt, qw(d v q t=i get=s c=s version) ) ; + Usage "Arg count\n" if @ARGV > 1 ; + Usage "Arg count\n" if $opt{get} and $opt{get} eq 'url' and ! @ARGV ; + diff --git a/www-apps/mirmon/metadata.xml b/www-apps/mirmon/metadata.xml index d9b32066e754..f02d1e93aba4 100644 --- a/www-apps/mirmon/metadata.xml +++ b/www-apps/mirmon/metadata.xml @@ -1,6 +1,10 @@ - - Simple graphical mirror monitor with html output to analyze whether data is being kept in sync. + + + sysadmin@gentoo.org + Gentoo Sysadmin Project + + Simple graphical mirror monitor with html output to analyze whether data is being kept in sync. diff --git a/www-apps/mirmon/mirmon-2.10.ebuild b/www-apps/mirmon/mirmon-2.10.ebuild deleted file mode 100644 index 63863466bdfc..000000000000 --- 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 -} diff --git a/www-apps/mirmon/mirmon-2.11-r2.ebuild b/www-apps/mirmon/mirmon-2.11-r2.ebuild new file mode 100644 index 000000000000..0d6ce1561b0e --- /dev/null +++ b/www-apps/mirmon/mirmon-2.11-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit webapp eutils +WEBAPP_MANUAL_SLOT="yes" + +DESCRIPTION="Simple webapp to monitor the status of mirrors" +# The author has passed away: https://www.apache.org/memorials/henk_penning.html +HOMEPAGE="http://www2.projects.science.uu.nl/csg/mirmon/mirmon.html" +SRC_URI="https://deb.debian.org/debian/pool/main/m/${PN}/${PN}_${PV}.orig.tar.gz -> ${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" + +PATCHES=( + "${FILESDIR}/2.11-Add-ipv6-monitor-support-to-mirmon.patch" + "${FILESDIR}/2.11-Fix-options.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 +} -- cgit v1.2.3