Import perl-5.18.2

OK espie@ sthen@ deraadt@

1 files changed, 2 insertions, 17 deletions

diff --git a/gnu/usr.bin/perl/dist/IO/t/cachepropagate-unix.t b/gnu/usr.bin/perl/dist/IO/t/cachepropagate-unix.t
index 9ec42b04556..e3e438ea1ca 100644
--- a/gnu/usr.bin/perl/dist/IO/t/cachepropagate-unix.t
+++ b/gnu/usr.bin/perl/dist/IO/t/cachepropagate-unix.t
@@ -14,25 +14,10 @@ use Test::More;
 plan skip_all => "UNIX domain sockets not implemented on $^O"
   if ($^O =~ m/^(?:qnx|nto|vos|MSWin32|VMS)$/);
 
-my $socketpath = catfile(tempdir( CLEANUP => 1 ), 'testsock');
-
-# check the socketpath fits in sun_path.
-#
-# pack_sockaddr_un() just truncates the path, this may change, but how
-# it will handle such a condition is undetermined (and we might need
-# to work with older versions of Socket outside of a perl build)
-# https://rt.cpan.org/Ticket/Display.html?id=116819
-
-my $name = eval { pack_sockaddr_un($socketpath) };
-if (defined $name) {
-    my ($packed_name) = eval { unpack_sockaddr_un($name) };
-    if (!defined $packed_name || $packed_name ne $socketpath) {
-        plan skip_all => "socketpath too long for sockaddr_un";
-    }
-}
-
 plan tests => 15;
 
+my $socketpath = catfile(tempdir( CLEANUP => 1 ), 'testsock');
+
 # start testing stream sockets:
 my $listener = IO::Socket::UNIX->new(Type => SOCK_STREAM,
 				     Listen => 1,