Import perl-5.18.2

OK espie@ sthen@ deraadt@

3 files changed, 18 insertions, 2 deletions

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";