In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/bdb1f1b3738d343c9d3048636256f9d44854d329?hp=b3452811f8922b43b170b4acf9945a0a9d3563dc>
- Log ----------------------------------------------------------------- commit bdb1f1b3738d343c9d3048636256f9d44854d329 Author: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk> Date: Thu Jun 15 12:35:17 2017 +0100 Update Getopt-Long to CPAN version 2.50 [DELTA] Changes in version 2.50 ----------------------- * Fix bug https://rt.cpan.org/Ticket/Display.html?id=120231. * Fix bug https://rt.cpan.org/Ticket/Display.html?id=120300. Unfortunately, this withdraws a small part of fix 114999. GNU getopt_long() does not accept the (optional) argument to be passed to the option without = sign. We do, since not doing so breaks existing scripts. * Provide a default value for options (gnu_compat mode). Thanks to Andrew Gregory. M Porting/Maintainers.pl M cpan/Getopt-Long/lib/Getopt/Long.pm commit 874389ae053832437addcb8d34e734a61d519323 Author: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk> Date: Thu Jun 15 12:31:13 2017 +0100 Update Devel-PPPort to CPAN version 3.36 [DELTA] 3.36 - 2017-05-14 * Support Perl 5.26.* which no longer has '.' in @INC M Porting/Maintainers.pl M cpan/Devel-PPPort/PPPort_pm.PL M cpan/Devel-PPPort/PPPort_xs.PL M cpan/Devel-PPPort/mktests.PL M cpan/Devel-PPPort/ppport_h.PL M cpan/Devel-PPPort/soak commit 272643d0694092346c0cce4acc9e46d6657028ab Author: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk> Date: Thu Jun 15 12:30:05 2017 +0100 Update IO-Socket-IP to CPAN version 0.39 [DELTA] 0.39 2017/03/06 16:40:30 [BUGFIXES] * Handle EOPNOTSUPP in resposne of efforts to disable V6ONLY (RT119780) (thanks XENU) M Porting/Maintainers.pl M cpan/IO-Socket-IP/lib/IO/Socket/IP.pm ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 6 ++--- cpan/Devel-PPPort/PPPort_pm.PL | 4 +-- cpan/Devel-PPPort/PPPort_xs.PL | 2 +- cpan/Devel-PPPort/mktests.PL | 2 +- cpan/Devel-PPPort/ppport_h.PL | 2 +- cpan/Devel-PPPort/soak | 2 +- cpan/Getopt-Long/lib/Getopt/Long.pm | 46 ++++++++++++++++++++++++----------- cpan/IO-Socket-IP/lib/IO/Socket/IP.pm | 6 ++--- 8 files changed, 44 insertions(+), 26 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index c8bdba6f00..d9445c7553 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -337,7 +337,7 @@ use File::Glob qw(:case); }, 'Devel::PPPort' => { - 'DISTRIBUTION' => 'WOLFSAGE/Devel-PPPort-3.35.tar.gz', + 'DISTRIBUTION' => 'WOLFSAGE/Devel-PPPort-3.36.tar.gz', # RJBS has asked MHX to have UPSTREAM be 'blead' # (i.e. move this from cpan/ to dist/) 'FILES' => q[cpan/Devel-PPPort], @@ -559,7 +559,7 @@ use File::Glob qw(:case); }, 'Getopt::Long' => { - 'DISTRIBUTION' => 'JV/Getopt-Long-2.49.1.tar.gz', + 'DISTRIBUTION' => 'JV/Getopt-Long-2.50.tar.gz', 'FILES' => q[cpan/Getopt-Long], 'EXCLUDED' => [ qr{^examples/}, @@ -618,7 +618,7 @@ use File::Glob qw(:case); }, 'IO::Socket::IP' => { - 'DISTRIBUTION' => 'PEVANS/IO-Socket-IP-0.38.tar.gz', + 'DISTRIBUTION' => 'PEVANS/IO-Socket-IP-0.39.tar.gz', 'FILES' => q[cpan/IO-Socket-IP], 'EXCLUDED' => [ qr{^examples/}, diff --git a/cpan/Devel-PPPort/PPPort_pm.PL b/cpan/Devel-PPPort/PPPort_pm.PL index ad75b13e80..1f4e95710a 100644 --- a/cpan/Devel-PPPort/PPPort_pm.PL +++ b/cpan/Devel-PPPort/PPPort_pm.PL @@ -15,7 +15,7 @@ use strict; $^W = 1; -require "parts/ppptools.pl"; +require "./parts/ppptools.pl"; my $INCLUDE = 'parts/inc'; my $DPPP = 'DPPP_'; @@ -539,7 +539,7 @@ package Devel::PPPort; use strict; use vars qw($VERSION $data); -$VERSION = '3.35'; +$VERSION = '3.36'; sub _init_data { diff --git a/cpan/Devel-PPPort/PPPort_xs.PL b/cpan/Devel-PPPort/PPPort_xs.PL index 5f18940ef1..d00cffa81b 100644 --- a/cpan/Devel-PPPort/PPPort_xs.PL +++ b/cpan/Devel-PPPort/PPPort_xs.PL @@ -15,7 +15,7 @@ use strict; $^W = 1; -require "parts/ppptools.pl"; +require "./parts/ppptools.pl"; my %SECTION = ( xshead => { code => '', header => "/* ---- code from __FILE__ ---- */" }, diff --git a/cpan/Devel-PPPort/mktests.PL b/cpan/Devel-PPPort/mktests.PL index fe79313222..02c9110463 100644 --- a/cpan/Devel-PPPort/mktests.PL +++ b/cpan/Devel-PPPort/mktests.PL @@ -15,7 +15,7 @@ use strict; $^W = 1; -require "parts/ppptools.pl"; +require "./parts/ppptools.pl"; my $template = do { local $/; <DATA> }; diff --git a/cpan/Devel-PPPort/ppport_h.PL b/cpan/Devel-PPPort/ppport_h.PL index e8c7c1e0d0..b7877b3277 100644 --- a/cpan/Devel-PPPort/ppport_h.PL +++ b/cpan/Devel-PPPort/ppport_h.PL @@ -14,6 +14,6 @@ ################################################################################ package Devel::PPPort; -require "PPPort.pm"; +require "./PPPort.pm"; rename 'ppport.h', 'ppport.old' if -f 'ppport.h'; unlink "ppport.old" if WriteFile("ppport.h") && -f 'ppport.h'; diff --git a/cpan/Devel-PPPort/soak b/cpan/Devel-PPPort/soak index 7473d7784c..dbf9f7d7ce 100644 --- a/cpan/Devel-PPPort/soak +++ b/cpan/Devel-PPPort/soak @@ -27,7 +27,7 @@ use File::Find; use List::Util qw(max); use Config; -my $VERSION = '3.35'; +my $VERSION = '3.36'; $| = 1; my %OPT = ( diff --git a/cpan/Getopt-Long/lib/Getopt/Long.pm b/cpan/Getopt-Long/lib/Getopt/Long.pm index 5e1834f3ca..664c8b63c9 100644 --- a/cpan/Getopt-Long/lib/Getopt/Long.pm +++ b/cpan/Getopt-Long/lib/Getopt/Long.pm @@ -4,23 +4,24 @@ # Author : Johan Vromans # Created On : Tue Sep 11 15:00:12 1990 # Last Modified By: Johan Vromans -# Last Modified On: Thu Jun 9 14:50:37 2016 -# Update Count : 1699 +# Last Modified On: Sat May 27 12:11:39 2017 +# Update Count : 1715 # Status : Released ################ Module Preamble ################ -package Getopt::Long; - use 5.004; use strict; +use warnings; + +package Getopt::Long; use vars qw($VERSION); -$VERSION = 2.49; +$VERSION = 2.50; # For testing versions only. use vars qw($VERSION_STRING); -$VERSION_STRING = "2.49"; +$VERSION_STRING = "2.50"; use Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK); @@ -1045,7 +1046,8 @@ sub FindOption ($$$$$) { # Complete the option name, if appropriate. if ( @hits == 1 && $hits[0] ne $opt ) { $tryopt = $hits[0]; - $tryopt = lc ($tryopt) if $ignorecase; + $tryopt = lc ($tryopt) + if $ignorecase > (($bundling && length($tryopt) == 1) ? 1 : 0); print STDERR ("=> option \"$opt\" -> \"$tryopt\"\n") if $debug; } @@ -1110,10 +1112,23 @@ sub FindOption ($$$$$) { # Check if there is an option argument available. if ( $gnu_compat ) { - my $optargtype = 0; # 0 = none, 1 = empty, 2 = nonempty - $optargtype = ( !defined($optarg) ? 0 : ( (length($optarg) == 0) ? 1 : 2 ) ); - return (1, $opt, $ctl, defined($ctl->[CTL_DEFAULT]) ? $ctl->[CTL_DEFAULT] : undef) - if (($optargtype == 0) && !$mand); + my $optargtype = 0; # none, 1 = empty, 2 = nonempty, 3 = aux + if ( defined($optarg) ) { + $optargtype = (length($optarg) == 0) ? 1 : 2; + } + elsif ( defined $rest || @$argv > 0 ) { + # GNU getopt_long() does not accept the (optional) + # argument to be passed to the option without = sign. + # We do, since not doing so breaks existing scripts. + $optargtype = 3; + } + if(($optargtype == 0) && !$mand) { + my $val + = defined($ctl->[CTL_DEFAULT]) ? $ctl->[CTL_DEFAULT] + : $type eq 's' ? '' + : 0; + return (1, $opt, $ctl, $val); + } return (1, $opt, $ctl, $type eq 's' ? '' : 0) if $optargtype == 1; # --foo= -> return nothing } @@ -1753,12 +1768,12 @@ destination for the option: GetOptions ("library=s" => \@libfiles); Alternatively, you can specify that the option can have multiple -values by adding a "@", and pass a scalar reference as the +values by adding a "@", and pass a reference to a scalar as the destination: GetOptions ("library=s@" => \$libfiles); -Used with the example above, C<@libfiles> (or C<@$libfiles>) would +Used with the example above, C<@libfiles> c.q. C<@$libfiles> would contain two strings upon completion: C<"lib/stdlib"> and C<"lib/extlib">, in that order. It is also possible to specify that only integer or floating point numbers are acceptable values. @@ -2322,11 +2337,14 @@ do. Without C<gnu_compat>, C<--opt=> gives an error. With C<gnu_compat>, C<--opt=> will give option C<opt> and empty value. This is the way GNU getopt_long() does it. +Note that C<--opt value> is still accepted, even though GNU +getopt_long() doesn't. + =item gnu_getopt This is a short way of setting C<gnu_compat> C<bundling> C<permute> C<no_getopt_compat>. With C<gnu_getopt>, command line handling should be -fully compatible with GNU getopt_long(). +reasonably compatible with GNU getopt_long(). =item require_order diff --git a/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm b/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm index 1bf6b0ea89..5a5ee7d204 100644 --- a/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm +++ b/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm @@ -7,7 +7,7 @@ package IO::Socket::IP; # $VERSION needs to be set before use base 'IO::Socket' # - https://rt.cpan.org/Ticket/Display.html?id=92107 BEGIN { - $VERSION = '0.38'; + $VERSION = '0.39'; } use strict; @@ -31,7 +31,7 @@ use Socket 1.97 qw( my $AF_INET6 = eval { Socket::AF_INET6() }; # may not be defined my $AI_ADDRCONFIG = eval { Socket::AI_ADDRCONFIG() } || 0; use POSIX qw( dup2 ); -use Errno qw( EINVAL EINPROGRESS EISCONN ENOTCONN ETIMEDOUT EWOULDBLOCK ); +use Errno qw( EINVAL EINPROGRESS EISCONN ENOTCONN ETIMEDOUT EWOULDBLOCK EOPNOTSUPP ); use constant HAVE_MSWIN32 => ( $^O eq "MSWin32" ); @@ -154,7 +154,7 @@ sub import if( setsockopt $testsock, IPPROTO_IPV6, IPV6_V6ONLY, 0 ) { return $can_disable_v6only = 1; } - elsif( $! == EINVAL ) { + elsif( $! == EINVAL || $! == EOPNOTSUPP ) { return $can_disable_v6only = 0; } else { -- Perl5 Master Repository