gentoo resync : 14.05.2020

2 files changed, 40 insertions, 2 deletions

diff --git a/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch b/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch
index 3742d30825b7..d21eb2c022a3 100644
--- a/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch
+++ b/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch
@@ -1,3 +1,7 @@
+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
@@ -23,8 +27,8 @@ index 6c0aaa8..50d40ca 100755
  use IO::Select ;
 -use Net::hostent ;
 +
-+use Socket;
-+use Socket6;
++use Socket qw(AF_INET);
++use Socket6 qw(AF_INET6 gethostbyname2);
 +use Data::Dumper qw( Dumper );
 +
 +sub gethost($){
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 <robbat2@gentoo.org>
+
+--- 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 <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 <url> : probe some <url> (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 ;
+