MFH: r418012 r418700 r419045 r419520

Update to v5.25.3-99-g25e092d.

Security:	CVE-2016-1238
Changes:	https://github.com/Perl/perl5/compare/v5.25.2-44-g7e169e8...v5.25.3-99-g25e092d
Sponsored by:	Absolight

9 files changed, 31 insertions, 37 deletions

diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 0312c6257c2b..8a3033113d96 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -30,7 +30,7 @@ TEST_ENV=	${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \
 USE_GITHUB=	yes
 GH_ACCOUNT=	Perl
 GH_PROJECT=	perl5
-GH_TAGNAME=	v5.25.2-44-g7e169e8
+GH_TAGNAME=	v5.25.3-99-g25e092d
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo
index cb4acfa38109..dceee6780cfe 100644
--- a/lang/perl5-devel/distinfo
+++ b/lang/perl5-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467027411
-SHA256 (perl/perl-5.25.2-44_GH0.tar.gz) = 1f67b971088bd1035f59244d97a6d9677996b0ba9aeb3ccc773373cbb263340b
-SIZE (perl/perl-5.25.2-44_GH0.tar.gz) = 18162342
+TIMESTAMP = 1470224279
+SHA256 (perl/perl-5.25.3-99_GH0.tar.gz) = 2809aa916a6a5ce10ec3f395133c0643972e6bc70c77cac1aefc0a9d297c3160
+SIZE (perl/perl-5.25.3-99_GH0.tar.gz) = 18211260
diff --git a/lang/perl5-devel/files/patch-Configure b/lang/perl5-devel/files/patch-Configure
index 830203f0ac78..6e2a85dca6ea 100644
--- a/lang/perl5-devel/files/patch-Configure
+++ b/lang/perl5-devel/files/patch-Configure
@@ -1,4 +1,4 @@
---- Configure.orig	2016-06-06 00:43:48 UTC
+--- Configure.orig	2016-08-03 07:40:44 UTC
 +++ Configure
 @@ -3864,7 +3864,10 @@ esac
  . ./posthint.sh
@@ -21,7 +21,7 @@
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
-@@ -9592,8 +9595,7 @@ prefixvar=siteman3dir
+@@ -9620,8 +9623,7 @@ prefixvar=siteman3dir
  
  : determine where add-on public executable scripts go
  case "$sitescript" in
diff --git a/lang/perl5-devel/files/patch-cpan_Math-BigInt_lib_Math_BigInt.pm b/lang/perl5-devel/files/patch-cpan_Math-BigInt_lib_Math_BigInt.pm
deleted file mode 100644
index 001358d38c35..000000000000
--- a/lang/perl5-devel/files/patch-cpan_Math-BigInt_lib_Math_BigInt.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpan/Math-BigInt/lib/Math/BigInt.pm.orig	2016-01-06 13:21:01 UTC
-+++ cpan/Math-BigInt/lib/Math/BigInt.pm
-@@ -65,7 +65,7 @@ use overload
- '>>='   =>      sub { $_[0]->brsft($_[1]); },
- 
- # not supported by Perl yet
--'..'    =>      \&_pointpoint,
-+# '..'    =>      \&_pointpoint,
- 
- '<=>'   =>      sub { my $rc = $_[2] ?
-                       ref($_[0])->bcmp($_[1],$_[0]) :
diff --git a/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
index ac28ca8c26cf..ec8db034312a 100644
--- a/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
+++ b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
@@ -1,6 +1,6 @@
---- cpan/Pod-Perldoc/lib/Pod/Perldoc.pm.orig	2015-12-16 03:15:45 UTC
+--- cpan/Pod-Perldoc/lib/Pod/Perldoc.pm.orig	2016-08-03 07:40:44 UTC
 +++ cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
-@@ -1931,6 +1931,7 @@ sub page {  # apply a pager to the outpu
+@@ -1936,6 +1936,7 @@ sub page {  # apply a pager to the outpu
                  # fix visible escape codes in ToTerm output
                  # https://bugs.debian.org/758689
                  local $ENV{LESS} = defined $ENV{LESS} ? "$ENV{LESS} -R" : "-R";
diff --git a/lang/perl5-devel/files/patch-perl.c b/lang/perl5-devel/files/patch-perl.c
index d352007f3212..b2ff688f43b0 100644
--- a/lang/perl5-devel/files/patch-perl.c
+++ b/lang/perl5-devel/files/patch-perl.c
@@ -1,6 +1,6 @@
---- perl.c.orig	2016-06-20 10:48:35 UTC
+--- perl.c.orig	2016-08-03 07:40:44 UTC
 +++ perl.c
-@@ -1863,23 +1863,7 @@ S_Internals_V(pTHX_ CV *cv)
+@@ -1876,23 +1876,7 @@ S_Internals_V(pTHX_ CV *cv)
      PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options,
  			      sizeof(non_bincompat_options) - 1, SVs_TEMP));
  
diff --git a/lang/perl5-devel/files/patch-t_porting_customized.dat b/lang/perl5-devel/files/patch-t_porting_customized.dat
index 4c1854d6af89..82cd50d48cef 100644
--- a/lang/perl5-devel/files/patch-t_porting_customized.dat
+++ b/lang/perl5-devel/files/patch-t_porting_customized.dat
@@ -1,17 +1,20 @@
---- t/porting/customized.dat.orig	2016-06-26 22:23:33 UTC
+--- t/porting/customized.dat.orig	2016-08-03 07:40:44 UTC
 +++ t/porting/customized.dat
-@@ -1,12 +1,13 @@
- Encode cpan/Encode/Byte/Makefile.PL 54f446297d614331ef3f51e8310faff27cc44f90
- Encode cpan/Encode/encoding.pm 51c19efc9bfe8467d6ae12a4654f6e7f980715bf
- ExtUtils::Constant cpan/ExtUtils-Constant/t/Constant.t a0369c919e216fb02767a637666bb4577ad79b02
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm fc5a731797f5c4fedf02ea2b5277aa720f0880ab
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/basic.t b7ee8691baf37197bf4249534f429fcf28f5cedf
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm 27aaa6acefd4223b57de74299314c19891ed17bc
- File::Path cpan/File-Path/lib/File/Path.pm fd8ce4420a0c113d3f47dd3223859743655c1da8
- File::Path cpan/File-Path/t/Path_win32.t 94b9276557ce7f80b91f6fd9bfa7a0cd9bf9683e
- Math::BigRat cpan/Math-BigRat/lib/Math/BigRat.pm 6eabc68e04f67694f6fe523e64eb013fc337ca5b
--Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm fe0bc906fb74b69cfd3fb289316ba669d770d465
-+Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm 07e7d337de37d19b3cc7025af17b9111fb2ba265
+@@ -30,7 +30,7 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMa
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm ed2f726eaed3f4c9353c444cd031a1a0da106263
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm a6c9b7ff946a87638a508c80396612776419f7d6
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm 0e26d258f50e34c0638e97962a9a4c26a130d836
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 56aa847736bbc0ae3bc0656be1b331b40e338050
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm ac29a8dc1c7d6f0aca4abff0730c05bde1dab3ad
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm d0c51b23bd5a53948636317e28b7f34eb8a5805a
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm afc99adc2815e016da8b086fbb2fb67e80f2a945
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm 67b59d460239edecf9c484cb1bbe9103aa812a8e
+@@ -91,7 +91,7 @@ Pod::Checker cpan/Pod-Checker/t/pod/cont
+ 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
+-Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm ba3072a6af793b410b02594ed8fe109ac16a1d43
++Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm e9e98b26450ceb3bae1e54ac8a57dab88932de96
  Scalar-List-Utils cpan/Scalar-List-Utils/lib/List/Util.pm e479a29c6b66ac5cbbde4ef2296afaab6c4635a6
  Scalar-List-Utils cpan/Scalar-List-Utils/lib/List/Util/XS.pm cbc38838d32fd213ae7b37ac38e30195355be3b9
  Scalar-List-Utils cpan/Scalar-List-Utils/lib/Scalar/Util.pm 14a20075dfb9a4ef33b99115ed6f43e6d1a15f9b
diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist
index 10b407628a04..a2d1c4a01448 100644
--- a/lang/perl5-devel/pkg-plist
+++ b/lang/perl5-devel/pkg-plist
@@ -479,7 +479,6 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%PRIV_LIB%%/Test/Builder/Tester.pm
 %%PRIV_LIB%%/Test/Builder/Tester/Color.pm
 %%PRIV_LIB%%/Test/Builder/TodoDiag.pm
-%%PRIV_LIB%%/Test/FAQ.pod
 %%PRIV_LIB%%/Test/Harness.pm
 %%PRIV_LIB%%/Test/More.pm
 %%PRIV_LIB%%/Test/Simple.pm
@@ -500,6 +499,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%PRIV_LIB%%/Test2/Event/Diag.pm
 %%PRIV_LIB%%/Test2/Event/Exception.pm
 %%PRIV_LIB%%/Test2/Event/Generic.pm
+%%PRIV_LIB%%/Test2/Event/Info.pm
 %%PRIV_LIB%%/Test2/Event/Note.pm
 %%PRIV_LIB%%/Test2/Event/Ok.pm
 %%PRIV_LIB%%/Test2/Event/Plan.pm
@@ -1354,6 +1354,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%MAN3%%/Test2::Event::Diag.3.gz
 %%MAN3%%/Test2::Event::Exception.3.gz
 %%MAN3%%/Test2::Event::Generic.3.gz
+%%MAN3%%/Test2::Event::Info.3.gz
 %%MAN3%%/Test2::Event::Note.3.gz
 %%MAN3%%/Test2::Event::Ok.3.gz
 %%MAN3%%/Test2::Event::Plan.3.gz
@@ -1381,7 +1382,6 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%MAN3%%/Test::Builder::Tester.3.gz
 %%MAN3%%/Test::Builder::Tester::Color.3.gz
 %%MAN3%%/Test::Builder::TodoDiag.3.gz
-%%MAN3%%/Test::FAQ.3.gz
 %%MAN3%%/Test::Harness.3.gz
 %%MAN3%%/Test::More.3.gz
 %%MAN3%%/Test::Simple.3.gz
@@ -1521,6 +1521,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%PRIV_LIB%%/pod/perl5251delta.pod
 %%PRIV_LIB%%/pod/perl5252delta.pod
 %%PRIV_LIB%%/pod/perl5253delta.pod
+%%PRIV_LIB%%/pod/perl5254delta.pod
 %%PRIV_LIB%%/pod/perl561delta.pod
 %%PRIV_LIB%%/pod/perl56delta.pod
 %%PRIV_LIB%%/pod/perl581delta.pod
@@ -2208,6 +2209,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%MAN1%%/perl5251delta.1.gz
 %%MAN1%%/perl5252delta.1.gz
 %%MAN1%%/perl5253delta.1.gz
+%%MAN1%%/perl5254delta.1.gz
 %%MAN1%%/perl561delta.1.gz
 %%MAN1%%/perl56delta.1.gz
 %%MAN1%%/perl581delta.1.gz
diff --git a/lang/perl5-devel/version.mk b/lang/perl5-devel/version.mk
index eda1f198f59e..558d714e43a9 100644
--- a/lang/perl5-devel/version.mk
+++ b/lang/perl5-devel/version.mk
@@ -1,2 +1,2 @@
-PERL_VERSION=	5.25.3
+PERL_VERSION=	5.25.4
 PERL5_DEPEND=	perl5>=5.25<5.26