Import perl-5.18.2

OK espie@ sthen@ deraadt@

8 files changed, 85 insertions, 23 deletions

diff --git a/gnu/usr.bin/perl/cpan/Encode/Encode/Makefile_PL.e2x b/gnu/usr.bin/perl/cpan/Encode/Encode/Makefile_PL.e2x
index 1d83a2fbda2..ece58830fea 100644
--- a/gnu/usr.bin/perl/cpan/Encode/Encode/Makefile_PL.e2x
+++ b/gnu/usr.bin/perl/cpan/Encode/Encode/Makefile_PL.e2x
@@ -17,12 +17,17 @@ my %tables = (
 #### DO NOT EDIT BEYOND THIS POINT!
 require File::Spec;
 my ($enc2xs, $encode_h) = ();
+my @path_ext = ('');
+@path_ext = split(';', $ENV{PATHEXT}) if $^O eq 'MSWin32';
 PATHLOOP:
 for my $d (@Config{qw/bin sitebin vendorbin/}, 
        (split /$Config{path_sep}/o, $ENV{PATH})){
     for my $f (qw/enc2xs enc2xs5.7.3/){
         my $path = File::Spec->catfile($d, $f);
-        -r $path and $enc2xs = $path and last PATHLOOP;
+        for my $ext (@path_ext) {
+            my $bin = "$path$ext";
+            -r "$bin" and $enc2xs = $bin and last PATHLOOP;
+        }
     }
 }
 $enc2xs or die "enc2xs not found!";
diff --git a/gnu/usr.bin/perl/cpan/Encode/MANIFEST b/gnu/usr.bin/perl/cpan/Encode/MANIFEST
index 3fe6582a22b..830cebcc6b8 100644
--- a/gnu/usr.bin/perl/cpan/Encode/MANIFEST
+++ b/gnu/usr.bin/perl/cpan/Encode/MANIFEST
@@ -202,3 +202,4 @@ ucm/posix-bc.ucm	Unicode Character Map
 ucm/shiftjis.ucm	Unicode Character Map
 ucm/symbol.ucm	Unicode Character Map
 ucm/viscii.ucm	Unicode Character Map
+META.json                                Module JSON meta-data (added by MakeMaker)
diff --git a/gnu/usr.bin/perl/cpan/Encode/META.json b/gnu/usr.bin/perl/cpan/Encode/META.json
new file mode 100644
index 00000000000..4895bda5b2c
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Encode/META.json
@@ -0,0 +1,39 @@
+{
+   "abstract" : "unknown",
+   "author" : [
+      "unknown"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.120921",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "Encode",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {}
+      }
+   },
+   "release_status" : "stable",
+   "version" : "2.49"
+}
diff --git a/gnu/usr.bin/perl/cpan/Encode/META.yml b/gnu/usr.bin/perl/cpan/Encode/META.yml
index d73458f7bd1..398a230678c 100644
--- a/gnu/usr.bin/perl/cpan/Encode/META.yml
+++ b/gnu/usr.bin/perl/cpan/Encode/META.yml
@@ -1,20 +1,21 @@
---- #YAML:1.0
-name:               Encode
-version:            2.44
-abstract:           ~
-author:  []
-license:            unknown
-distribution_type:  module
-configure_requires:
-    ExtUtils::MakeMaker:  0
+---
+abstract: unknown
+author:
+  - unknown
 build_requires:
-    ExtUtils::MakeMaker:  0
-requires:  {}
-no_index:
-    directory:
-        - t
-        - inc
-generated_by:       ExtUtils::MakeMaker version 6.57_05
+  ExtUtils::MakeMaker: 0
+configure_requires:
+  ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.120921'
+license: perl
 meta-spec:
-    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
-    version:  1.4
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: Encode
+no_index:
+  directory:
+    - t
+    - inc
+requires: {}
+version: 2.49
diff --git a/gnu/usr.bin/perl/cpan/Encode/lib/Encode/Supported.pod b/gnu/usr.bin/perl/cpan/Encode/lib/Encode/Supported.pod
index e84faafd9e2..8efa4ff6f89 100644
--- a/gnu/usr.bin/perl/cpan/Encode/lib/Encode/Supported.pod
+++ b/gnu/usr.bin/perl/cpan/Encode/lib/Encode/Supported.pod
@@ -94,7 +94,7 @@ To find how (UCS-2|UTF-(16|32))(LE|BE)? differ from one another,
 see L<Encode::Unicode>. 
 
 UTF-7 is a special encoding which "re-encodes" UTF-16BE into a 7-bit
-encoding.  It is implemented seperately by Encode::Unicode::UTF7.
+encoding.  It is implemented separately by Encode::Unicode::UTF7.
 
 =head2 Encode::Byte -- Extended ASCII
 
@@ -420,7 +420,7 @@ at L<http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/> .
 =item (Mac) Indic encodings
 
 The maps for the following are available at L<http://www.unicode.org/>
-but remain unsupport because those encodings need algorithmical
+but remain unsupported because those encodings need an algorithmical
 approach, currently unsupported by F<enc2xs>:
 
   MacDevanagari
diff --git a/gnu/usr.bin/perl/cpan/Encode/t/Encode.t b/gnu/usr.bin/perl/cpan/Encode/t/Encode.t
index 369557ef1dc..918975eb4c5 100755
--- a/gnu/usr.bin/perl/cpan/Encode/t/Encode.t
+++ b/gnu/usr.bin/perl/cpan/Encode/t/Encode.t
@@ -25,7 +25,7 @@ my @character_set = ('0'..'9', 'A'..'Z', 'a'..'z');
 my @source = qw(ascii iso8859-1 cp1250);
 my @destiny = qw(cp1047 cp37 posix-bc);
 my @ebcdic_sets = qw(cp1047 cp37 posix-bc);
-plan test => 38+$n*@encodings + 2*@source*@destiny*@character_set + 2*@ebcdic_sets*256 + 6 + 2;
+plan test => 38+$n*@encodings + 2*@source*@destiny*@character_set + 2*@ebcdic_sets*256 + 6 + 4;
 my $str = join('',map(chr($_),0x20..0x7E));
 my $cpy = $str;
 ok(length($str),from_to($cpy,'iso8859-1','Unicode'),"Length Wrong");
@@ -149,3 +149,14 @@ sub new { my $class = shift; bless [ @_  ] => $class }
 package main;
 ok(decode(latin1 => Encode::Dummy->new("foobar")), "foobar");
 ok(encode(utf8   => Encode::Dummy->new("foobar")), "foobar");
+
+# hash keys
+my $key = (keys %{{ "whatever\x{100}" => '' }})[0];
+my $kopy = $key;
+encode("UTF-16LE", $kopy, Encode::FB_CROAK);
+ok $key, "whatever\x{100}", 'encode with shared hash key scalars';
+undef $key;
+$key = (keys %{{ "whatever" => '' }})[0];
+$kopy = $key;
+decode("UTF-16LE", $kopy, Encode::FB_CROAK);
+ok $key, "whatever", 'decode with shared hash key scalars';
diff --git a/gnu/usr.bin/perl/cpan/Encode/t/encoding.t b/gnu/usr.bin/perl/cpan/Encode/t/encoding.t
index b17b11fc445..8c7f253377f 100755
--- a/gnu/usr.bin/perl/cpan/Encode/t/encoding.t
+++ b/gnu/usr.bin/perl/cpan/Encode/t/encoding.t
@@ -16,6 +16,7 @@ BEGIN {
 
 print "1..31\n";
 
+no warnings "deprecated";
 use encoding "latin1"; # ignored (overwritten by the next line)
 use encoding "greek";  # iso 8859-7 (no "latin" alias, surprise...)
 
diff --git a/gnu/usr.bin/perl/cpan/Encode/t/gsm0338.t b/gnu/usr.bin/perl/cpan/Encode/t/gsm0338.t
index 822ff4fd978..127604b461f 100755
--- a/gnu/usr.bin/perl/cpan/Encode/t/gsm0338.t
+++ b/gnu/usr.bin/perl/cpan/Encode/t/gsm0338.t
@@ -13,7 +13,7 @@ BEGIN {
 
 use strict;
 use utf8;
-use Test::More tests => 778;
+use Test::More tests => 780;
 use Encode;
 use Encode::GSM0338;
 
@@ -87,6 +87,10 @@ for my $c ( map { chr } 0 .. 127 ) {
     }
 }
 
+# https://rt.cpan.org/Ticket/Display.html?id=75670
+is decode("gsm0338", "\x09") => chr(0xC7), 'RT75670: decode';
+is encode("gsm0338", chr(0xC7)) => "\x09", 'RT75670: encode';
+
 __END__
 for my $c (map { chr } 0..127){
     my $b = "\x1b$c";