In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/8fad3ae2f1dcc9a9fcb99cbb38081dc1434f6864?hp=717feafc134edebccf30e580526055d3a75a0a59>

- Log -----------------------------------------------------------------
commit 8fad3ae2f1dcc9a9fcb99cbb38081dc1434f6864
Author: Craig A. Berry <craigbe...@mac.com>
Date:   Thu Sep 25 07:25:18 2014 -0500

    Specify NI_NUMERICSERV for getnameinfo.
    
    Waiting to be merged upstream: see CPAN RT#98217.

M       Porting/Maintainers.pl
M       cpan/Socket/t/getnameinfo.t
M       t/porting/customized.dat

commit 717049dd20736062e34108e9929836325015aa55
Author: Craig A. Berry <craigbe...@mac.com>
Date:   Thu Sep 25 07:12:30 2014 -0500

    In autodie's truncate.t, close $tmpfile before opening again.
    
    Waiting to be merged upstream: see CPAN RT#96609.

M       Porting/Maintainers.pl
M       cpan/autodie/t/truncate.t
M       t/porting/customized.dat
-----------------------------------------------------------------------

Summary of changes:
 Porting/Maintainers.pl      | 6 ++++++
 cpan/Socket/t/getnameinfo.t | 2 +-
 cpan/autodie/t/truncate.t   | 2 ++
 t/porting/customized.dat    | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 328f529..2ec3c5e 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -159,6 +159,8 @@ use File::Glob qw(:case);
         'CUSTOMIZED'   => [
             # Waiting to be merged upstream: see CPAN RT#87237
             qw(        t/utf8_open.t ),
+            # Waiting to be merged upstream: see CPAN RT#96609
+            qw(        t/truncate.t ),
         ],
     },
 
@@ -983,6 +985,10 @@ use File::Glob qw(:case);
     'Socket' => {
         'DISTRIBUTION' => 'PEVANS/Socket-2.015.tar.gz',
         'FILES'        => q[cpan/Socket],
+        'CUSTOMIZED'   => [
+            # Waiting to be merged upstream: see CPAN RT#98217
+            qw(        t/getnameinfo.t ),
+        ],
     },
 
     'Storable' => {
diff --git a/cpan/Socket/t/getnameinfo.t b/cpan/Socket/t/getnameinfo.t
index 5ee5575..1df639b 100644
--- a/cpan/Socket/t/getnameinfo.t
+++ b/cpan/Socket/t/getnameinfo.t
@@ -28,7 +28,7 @@ cmp_ok( $err, "==", 0, '$err == 0 for 
{family=AF_INET,port=80,sinaddr=127.0.0.1}
 # sure is it's not empty
 ok( length $host, '$host is nonzero length for NS' );
 
-( $err, $host, $service ) = getnameinfo( pack_sockaddr_in( 80, inet_aton( 
"127.0.0.1" ) ), NI_NUMERICHOST );
+( $err, $host, $service ) = getnameinfo( pack_sockaddr_in( 80, inet_aton( 
"127.0.0.1" ) ), NI_NUMERICHOST | NI_NUMERICSERV );
 cmp_ok( $err, "==", 0, '$err == 0 for 
{family=AF_INET,port=80,sinaddr=127.0.0.1}/NI_NUMERICHOST' );
 
 ok( length $service, '$service is nonzero length for NH' );
diff --git a/cpan/autodie/t/truncate.t b/cpan/autodie/t/truncate.t
index df6270e..7af7226 100644
--- a/cpan/autodie/t/truncate.t
+++ b/cpan/autodie/t/truncate.t
@@ -62,6 +62,8 @@ eval {
 
 is($@, "", "Truncating a normal file should be fine");
 
+$tmpfh->close;
+
 # Time to test truncating via globs.
 
 # Firstly, truncating a closed filehandle should fail.
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 9d54c2a..5eeae87 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -4,6 +4,7 @@ Digest::SHA cpan/Digest-SHA/hints/hpux.pl 
8cf51e816894ee03826eac737bd6843300d6e6
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 
f738b4b8d6dfdb2bae5f3e43106370867aa88f01
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 
2cd28c8279d7900e28962712763eaa4768117414
 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t 
ca39f0146e89de02c746e199c45dcb3e5edad691
+Socket cpan/Socket/t/getnameinfo.t f25ae4125d64a81538d4d3b73a3a0b9ce3c0404d
 Text::Balanced cpan/Text-Balanced/t/01_compile.t 
1598cf491a48fa546260a2ec41142abe84da533d
 Text::Balanced cpan/Text-Balanced/t/02_extbrk.t 
6ba1b64a4604e822dc2260b8ffcea6b406339ee8
 Text::Balanced cpan/Text-Balanced/t/03_extcbk.t 
3307c980af28963414cab799c427b359ef3b8657
@@ -15,6 +16,7 @@ Text::Balanced cpan/Text-Balanced/t/08_extvar.t 
0776ef2cbdad5b1fbefb300541d07921
 Text::Balanced cpan/Text-Balanced/t/09_gentag.t 
42361b5dfb3bb728bce20f4fb0d92ccfb27c2ba7
 Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 
9bae51c9b944cd5c0bbabe9d397e573976a2be8e
 Text::ParseWords cpan/Text-ParseWords/t/taint.t 
3cff0dae812801f7aa1738d6070508f2c5bcc2e5
+autodie cpan/autodie/t/truncate.t 0fa688d8838b2b4d5b6508f244f4eb099a72e86f
 autodie cpan/autodie/t/utf8_open.t 5295851351c49f939008c5aca6a798742b1e503d
 podlators cpan/podlators/scripts/pod2man.PL 
f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6
 podlators cpan/podlators/scripts/pod2text.PL 
b4693fcfe4a0a1b38a215cfb8985a65d5d025d69

--
Perl5 Master Repository

Reply via email to