In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/b9645564d5ebc1cf394966d175426685771ef1c6?hp=385b74be1afedc16abe8f34422797cf2f36d2f24>
- Log ----------------------------------------------------------------- commit b9645564d5ebc1cf394966d175426685771ef1c6 Merge: 385b74be1a 5e99e069f5 Author: David Mitchell <[email protected]> Date: Thu Jun 22 13:03:53 2017 +0100 [MERGE] Upgrade Scalar-List-Utils to 1.47 including reverting any customisations. commit 5e99e069f583949fb8ac93b20100ac8054a66d3a Author: David Mitchell <[email protected]> Date: Thu Jun 22 12:53:29 2017 +0100 Upgrade Scalar-List-Utils from 1.46 to 1.47 Note that the last few commits have reverted any local customisations to 1.46. These were of two kinds. First, fixes for a tainting issue, the last of which was just a cherry-pick from upstream, which should have made it into 1.47 anyway. The second were fixes to tests for netbsd-vax and Inf/Nan. I don't think blead urgently needs these - we should wait for them to re-appear via the normal upstream merging process. See https://rt.cpan.org/Public/Bug/Display.html?id=118470 M Porting/Maintainers.pl M cpan/Scalar-List-Utils/ListUtil.xs M cpan/Scalar-List-Utils/Makefile.PL M cpan/Scalar-List-Utils/lib/List/Util.pm M cpan/Scalar-List-Utils/lib/List/Util/XS.pm M cpan/Scalar-List-Utils/lib/Scalar/Util.pm M cpan/Scalar-List-Utils/lib/Sub/Util.pm M cpan/Scalar-List-Utils/t/tainted.t commit a8291be4515002c660754a8f56e0eb156aaedfc8 Author: David Mitchell <[email protected]> Date: Thu Jun 22 12:37:14 2017 +0100 undo Scalar-List-Utils customisation.dat entries to reflect the revert in the last few commits M t/porting/customized.dat commit 5a6e393e4ad2e59deb07854f6d745b00f5778bfd Author: David Mitchell <[email protected]> Date: Thu Jun 22 12:33:40 2017 +0100 remove Scalar-List-Utils customisation list .. in preparation for installing new release Revert "Scalar-List-Utils: customize Maintainers.pl" This reverts commit 1476bbfa98fcd0efc3a4d1ccdd0b021ad7403986. M Porting/Maintainers.pl commit 8010793bfd7f2d5531e52b6bb3d255b55b5ee5b4 Author: David Mitchell <[email protected]> Date: Thu Jun 22 12:30:51 2017 +0100 undo a Scalar-List-Utils customisation .. in preparation for installing new release Revert "Scalar-List-Utils: netbsd-vax: no inf/nan" This reverts commit 5b15f36c4b1c5025dccabeef937495997e37e512. M cpan/Scalar-List-Utils/t/lln.t commit 0bdcb2e5150e98733a30608a2c44c95d4e53a879 Author: David Mitchell <[email protected]> Date: Thu Jun 22 12:30:27 2017 +0100 undo a Scalar-List-Utils customisation .. in preparation for installing new release Revert "Scalar-List-Utils: netbsd-vax: no inf/nan" This reverts commit 3ad3fb7edd9a5db1e0cf38ad50a84824ef641c39. M cpan/Scalar-List-Utils/t/uniq.t commit 32bc1f2052af1f841860bfab0fb7597bc98f4ba6 Author: David Mitchell <[email protected]> Date: Thu Jun 22 12:30:03 2017 +0100 undo a Scalar-List-Utils customisation .. in preparation for installing new release Revert "Scalar-List-Utils: customized VERSION bump" This reverts commit cdeaf44d582bf74f4c686dc58b288d8d33f25b95. M cpan/Scalar-List-Utils/lib/List/Util.pm M cpan/Scalar-List-Utils/lib/List/Util/XS.pm M cpan/Scalar-List-Utils/lib/Scalar/Util.pm M cpan/Scalar-List-Utils/lib/Sub/Util.pm commit f5ac400ef4c98ac6732a79664b11857f46cf2d8b Author: David Mitchell <[email protected]> Date: Thu Jun 22 12:29:15 2017 +0100 undo a Scalar-List-Utils customisation .. in preparation for installing new release Revert "netbsd-vax: also the 1E1000 is toxic (in compiletime)." This reverts commit d1deb742f98169ce12c103478382902d83f6717a. M cpan/Scalar-List-Utils/lib/List/Util.pm M cpan/Scalar-List-Utils/lib/List/Util/XS.pm M cpan/Scalar-List-Utils/lib/Scalar/Util.pm M cpan/Scalar-List-Utils/lib/Sub/Util.pm M cpan/Scalar-List-Utils/t/uniq.t commit 475524d62d5431302c913df3e8492b409284d7cc Author: David Mitchell <[email protected]> Date: Thu Jun 22 12:28:46 2017 +0100 undo a Scalar-List-Utils customisation .. in preparation for installing new release Revert "Scalar::List-Utils/t/tainted.t: Skip failing tests" This reverts commit 71a0317b30064fe6979f8616f6d11553b35de971. M cpan/Scalar-List-Utils/t/tainted.t commit ad91dfc9b53d9d453b48d3ef2f5c2a13a964d9d6 Author: David Mitchell <[email protected]> Date: Thu Jun 22 12:27:31 2017 +0100 undo a Scalar-List-Utils customisation .. in preparation for installing new release Revert "Cherry-pick Scalar-List-Utils tainted.t fix from upstream" This reverts commit a76614debec3c698069bcf0fa012318ed15461cc. M Porting/Maintainers.pl M cpan/Scalar-List-Utils/t/tainted.t M t/porting/customized.dat ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 11 +-------- cpan/Scalar-List-Utils/ListUtil.xs | 39 ++++++++++++++++++++++-------- cpan/Scalar-List-Utils/Makefile.PL | 2 +- cpan/Scalar-List-Utils/lib/List/Util.pm | 2 +- cpan/Scalar-List-Utils/lib/List/Util/XS.pm | 2 +- cpan/Scalar-List-Utils/lib/Scalar/Util.pm | 2 +- cpan/Scalar-List-Utils/lib/Sub/Util.pm | 2 +- cpan/Scalar-List-Utils/t/lln.t | 10 +++----- cpan/Scalar-List-Utils/t/uniq.t | 7 +----- t/porting/customized.dat | 7 ------ 10 files changed, 39 insertions(+), 45 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 9842741cc7..1fe22ba8fd 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -959,17 +959,8 @@ use File::Glob qw(:case); }, 'Scalar-List-Utils' => { - 'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.46.tar.gz', + 'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.47.tar.gz', 'FILES' => q[cpan/Scalar-List-Utils], - 'CUSTOMIZED' => [ - 'lib/List/Util.pm', # CPAN RT 118470 - 'lib/List/Util/XS.pm', # CPAN RT 118470 - 'lib/Scalar/Util.pm', # CPAN RT 118470 - 'lib/Sub/Util.pm', # CPAN RT 118470 - 't/lln.t', # CPAN RT 118470 - 't/uniq.t', # CPAN RT 118470 - 't/tainted.t', # CPAN RT 119169 - ], }, 'Search::Dict' => { diff --git a/cpan/Scalar-List-Utils/ListUtil.xs b/cpan/Scalar-List-Utils/ListUtil.xs index 79e74d9302..9db38045f9 100644 --- a/cpan/Scalar-List-Utils/ListUtil.xs +++ b/cpan/Scalar-List-Utils/ListUtil.xs @@ -7,14 +7,33 @@ #include <perl.h> #include <XSUB.h> -#define NEED_sv_2pv_flags 1 -#include "ppport.h" +#ifdef USE_PPPORT_H +# define NEED_sv_2pv_flags 1 +# define NEED_newSVpvn_flags 1 +# include "ppport.h" +#endif + +#ifndef PERL_VERSION_DECIMAL +# define PERL_VERSION_DECIMAL(r,v,s) (r*1000000 + v*1000 + s) +#endif +#ifndef PERL_DECIMAL_VERSION +# define PERL_DECIMAL_VERSION \ + PERL_VERSION_DECIMAL(PERL_REVISION,PERL_VERSION,PERL_SUBVERSION) +#endif +#ifndef PERL_VERSION_GE +# define PERL_VERSION_GE(r,v,s) \ + (PERL_DECIMAL_VERSION >= PERL_VERSION_DECIMAL(r,v,s)) +#endif +#ifndef PERL_VERSION_LE +# define PERL_VERSION_LE(r,v,s) \ + (PERL_DECIMAL_VERSION <= PERL_VERSION_DECIMAL(r,v,s)) +#endif -#if PERL_BCDVERSION >= 0x5006000 +#if PERL_VERSION_GE(5,6,0) # include "multicall.h" #endif -#if PERL_BCDVERSION < 0x5023008 +#if !PERL_VERSION_GE(5,23,8) # define UNUSED_VAR_newsp PERL_UNUSED_VAR(newsp) #else # define UNUSED_VAR_newsp NOOP @@ -28,7 +47,7 @@ was not exported. Therefore platforms like win32, VMS etc have problems so we redefine it here -- GMB */ -#if PERL_BCDVERSION < 0x5007000 +#if !PERL_VERSION_GE(5,7,0) /* Not in 5.6.1. */ # ifdef cxinc # undef cxinc @@ -879,7 +898,7 @@ PPCODE: /* This MULTICALL-based code appears to fail on perl 5.10.0 and 5.8.9 * Skip it on those versions (RT#87857) */ -#if defined(dMULTICALL) && (PERL_BCDVERSION > 0x5010000 || PERL_BCDVERSION < 0x5008009) +#if defined(dMULTICALL) && (PERL_VERSION_GE(5,10,1) || PERL_VERSION_LE(5,8,8)) assert(cv); if(!CvISXSUB(cv)) { /* Since MULTICALL is about to move it */ @@ -1056,11 +1075,11 @@ CODE: arg = sv_mortalcopy(arg); if(SvUOK(arg)) - sv_setpvf(keysv, "%"UVuf, SvUV(arg)); + sv_setpvf(keysv, "%" UVuf, SvUV(arg)); else if(SvIOK(arg)) - sv_setpvf(keysv, "%"IVdf, SvIV(arg)); + sv_setpvf(keysv, "%" IVdf, SvIV(arg)); else - sv_setpvf(keysv, "%"NVgf, SvNV(arg)); + sv_setpvf(keysv, "%" NVgf, SvNV(arg)); #ifdef HV_FETCH_EMPTY_HE he = (HE*) hv_common(seen, NULL, SvPVX(keysv), SvCUR(keysv), 0, HV_FETCH_LVALUE | HV_FETCH_EMPTY_HE, NULL, 0); if (HeVAL(he)) @@ -1329,7 +1348,7 @@ CODE: if(SvAMAGIC(sv) && (tempsv = AMG_CALLun(sv, numer))) { sv = tempsv; } -#if PERL_BCDVERSION < 0x5008005 +#if !PERL_VERSION_GE(5,8,5) if(SvPOK(sv) || SvPOKp(sv)) { RETVAL = looks_like_number(sv) ? &PL_sv_yes : &PL_sv_no; } diff --git a/cpan/Scalar-List-Utils/Makefile.PL b/cpan/Scalar-List-Utils/Makefile.PL index 247b3b7d9d..9859730e75 100644 --- a/cpan/Scalar-List-Utils/Makefile.PL +++ b/cpan/Scalar-List-Utils/Makefile.PL @@ -11,7 +11,7 @@ WriteMakefile( NAME => q[List::Util], ABSTRACT => q[Common Scalar and List utility subroutines], AUTHOR => q[Graham Barr <[email protected]>], - DEFINE => q[-DPERL_EXT], + DEFINE => ($ENV{PERL_CORE} ? q[-DPERL_EXT] : q[-DPERL_EXT -DUSE_PPPORT_H]), DISTNAME => q[Scalar-List-Utils], VERSION_FROM => 'lib/List/Util.pm', diff --git a/cpan/Scalar-List-Utils/lib/List/Util.pm b/cpan/Scalar-List-Utils/lib/List/Util.pm index 23473fc627..47324ca065 100644 --- a/cpan/Scalar-List-Utils/lib/List/Util.pm +++ b/cpan/Scalar-List-Utils/lib/List/Util.pm @@ -15,7 +15,7 @@ our @EXPORT_OK = qw( all any first min max minstr maxstr none notall product reduce sum sum0 shuffle uniq uniqnum uniqstr pairs unpairs pairkeys pairvalues pairmap pairgrep pairfirst ); -our $VERSION = "1.46_02"; +our $VERSION = "1.47"; our $XS_VERSION = $VERSION; $VERSION = eval $VERSION; diff --git a/cpan/Scalar-List-Utils/lib/List/Util/XS.pm b/cpan/Scalar-List-Utils/lib/List/Util/XS.pm index 783499c35f..a9e191fc00 100644 --- a/cpan/Scalar-List-Utils/lib/List/Util/XS.pm +++ b/cpan/Scalar-List-Utils/lib/List/Util/XS.pm @@ -3,7 +3,7 @@ use strict; use warnings; use List::Util; -our $VERSION = "1.46_02"; # FIXUP +our $VERSION = "1.47"; # FIXUP $VERSION = eval $VERSION; # FIXUP 1; diff --git a/cpan/Scalar-List-Utils/lib/Scalar/Util.pm b/cpan/Scalar-List-Utils/lib/Scalar/Util.pm index bb0f780b55..bd2b9ff802 100644 --- a/cpan/Scalar-List-Utils/lib/Scalar/Util.pm +++ b/cpan/Scalar-List-Utils/lib/Scalar/Util.pm @@ -17,7 +17,7 @@ our @EXPORT_OK = qw( dualvar isdual isvstring looks_like_number openhandle readonly set_prototype tainted ); -our $VERSION = "1.46_02"; +our $VERSION = "1.47"; $VERSION = eval $VERSION; require List::Util; # List::Util loads the XS diff --git a/cpan/Scalar-List-Utils/lib/Sub/Util.pm b/cpan/Scalar-List-Utils/lib/Sub/Util.pm index 28888f8265..48f775fadb 100644 --- a/cpan/Scalar-List-Utils/lib/Sub/Util.pm +++ b/cpan/Scalar-List-Utils/lib/Sub/Util.pm @@ -15,7 +15,7 @@ our @EXPORT_OK = qw( subname set_subname ); -our $VERSION = "1.46_02"; +our $VERSION = "1.47"; $VERSION = eval $VERSION; require List::Util; # as it has the XS diff --git a/cpan/Scalar-List-Utils/t/lln.t b/cpan/Scalar-List-Utils/t/lln.t index be928e462b..df9ea3aea9 100644 --- a/cpan/Scalar-List-Utils/t/lln.t +++ b/cpan/Scalar-List-Utils/t/lln.t @@ -10,13 +10,9 @@ foreach my $num (qw(1 -1 +1 1.0 +1.0 -1.0 -1.0e-12)) { ok(looks_like_number($num), "'$num'"); } -SKIP: { - my $vax_float = (pack("d",1) =~ /^[\x80\x10]\x40/); - skip("VAX does not have inf/nan", 3) if $vax_float; - is(!!looks_like_number("Inf"), $] >= 5.006001, 'Inf'); - is(!!looks_like_number("Infinity"), $] >= 5.008, 'Infinity'); - is(!!looks_like_number("NaN"), $] >= 5.008, 'NaN'); -} +is(!!looks_like_number("Inf"), $] >= 5.006001, 'Inf'); +is(!!looks_like_number("Infinity"), $] >= 5.008, 'Infinity'); +is(!!looks_like_number("NaN"), $] >= 5.008, 'NaN'); is(!!looks_like_number("foo"), '', 'foo'); is(!!looks_like_number(undef), '', 'undef'); is(!!looks_like_number({}), '', 'HASH Ref'); diff --git a/cpan/Scalar-List-Utils/t/uniq.t b/cpan/Scalar-List-Utils/t/uniq.t index 354b2137ac..5a6925d1f5 100644 --- a/cpan/Scalar-List-Utils/t/uniq.t +++ b/cpan/Scalar-List-Utils/t/uniq.t @@ -70,19 +70,14 @@ is_deeply( [ uniqnum qw( 1 1.1 1.2 1.3 ) ], [ 1, 1.1, 1.2, 1.3 ], 'uniqnum distinguishes floats' ); -SKIP: { -my $vax_float = (pack("d",1) =~ /^[\x80\x10]\x40/); -skip("VAX does not have inf/nan", 1) if $vax_float; - # Hard to know for sure what an Inf is going to be. Lets make one -my $Inf = 0 + eval '1E1000'; +my $Inf = 0 + 1E1000; my $NaN; $Inf **= 1000 while ( $NaN = $Inf - $Inf ) == $NaN; is_deeply( [ uniqnum 0, 1, 12345, $Inf, -$Inf, $NaN, 0, $Inf, $NaN ], [ 0, 1, 12345, $Inf, -$Inf, $NaN ], 'uniqnum preserves the special values of +-Inf and Nan' ); -} { my $maxint = ~0; diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 3be683b314..e7a3ea6e55 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -14,13 +14,6 @@ Pod::Checker cpan/Pod-Checker/t/pod/contains_bad_pod.xr 73538fd80dfe6e19ad561fe0 Pod::Checker cpan/Pod-Checker/t/pod/selfcheck.t 8ce3cfd38e4b9bcf5bc7fe7f2a14195e49aed7d8 Pod::Checker cpan/Pod-Checker/t/pod/testcmp.pl a0cd5c8eca775c7753f4464eee96fa916e3d8a16 Pod::Checker cpan/Pod-Checker/t/pod/testpchk.pl b2072c7f4379fd050e15424175d7cac5facf5b3b -Scalar-List-Utils cpan/Scalar-List-Utils/lib/List/Util.pm 8cbd3463af838b4a39a7077bea3fe758a71f8ec3 -Scalar-List-Utils cpan/Scalar-List-Utils/lib/List/Util/XS.pm 2d09b84a5575e67834655a0e9b3569c83d9a3902 -Scalar-List-Utils cpan/Scalar-List-Utils/lib/Scalar/Util.pm 98af8fe390d9c9fa11a1fafebbc68ea663cdce2c -Scalar-List-Utils cpan/Scalar-List-Utils/lib/Sub/Util.pm 188cf0dd95cd7ba60fd6a366f440811fb52c2c79 -Scalar-List-Utils cpan/Scalar-List-Utils/t/lln.t b7148c7f1cd9c70fd21d8153542b6d3de2b655ad -Scalar-List-Utils cpan/Scalar-List-Utils/t/tainted.t 9c52e04687ec8a7d23a1c38a762723858305b1fe -Scalar-List-Utils cpan/Scalar-List-Utils/t/uniq.t 5de01094d2bca9cf8b2bbbca920122f7396bf11e Socket cpan/Socket/Socket.pm 98e38176d745c38282907f391c077298f5a3d0ba Socket cpan/Socket/Socket.xs edd4fed212785f11c5c2095a75941dad27d586d9 Test::Harness cpan/Test-Harness/bin/prove 9b2866928cb1125de2c68f9773b25723e02c54c0 -- Perl5 Master Repository
