PathTools: Update to 4.68c

rurban · rurban · commit 6b80a67e1f7b · 2017-08-07T14:18:33.000+02:00
Merge with 3.68: Add security usage note to File::Spec::no_upwards white space change so can compile under C++11 Protect modules also from . in @inc [perl #127384] (CVE-2016-1238) See https://github.com/rurban/PathTools/tree/cperl
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
@@ -1145,10 +1145,11 @@ package Maintainers;
 
     # PathTools cannot be cpan'd by sync-with-cpan. modernized
     'File::Spec' => {
-        'DISTRIBUTION' => 'RJBS/PathTools-3.67.tar.gz',
+        'DISTRIBUTION' => 'RJBS/PathTools-3.68.tar.gz',
         'FILES'        => q[dist/PathTools],
         'EXCLUDED'     => [qr{^t/lib/Test/}],
-        # core needs to update @INC in a chdir
+          # core needs to update @INC in a chdir
+          # See github.com/rurban/PathTools branch cperl
         'CUSTOMIZED'   => [ qw( t/rel2abs_vs_symlink.t ) ],
     },
 
diff --git a/dist/Module-CoreList/lib/Module/CoreList.pm b/dist/Module-CoreList/lib/Module/CoreList.pm
@@ -14917,6 +14917,7 @@ our %delta = (
             'Module::CoreList::Utils'=> '5.20170428c',
             'B'                     => '1.68_07',
             'Cpanel::JSON::XS'      => '3.0233',
+            'Cwd'                   => '4.68c',
             'Devel::PPPort'         => '3.36_02',
             'Encode'                => '2.92',
             'ExtUtils::CBuilder'    => '0.280226',
@@ -14955,7 +14956,16 @@ our %delta = (
             'ExtUtils::Typemaps::OutputMap' => '3.35',
             'ExtUtils::Typemaps::Type'      => '3.35',
             'File::Path'            => '3.15_01c',
-            'File::Spec::Functions' => '3.36_05',
+	    'File::Spec'            => '4.68c',
+	    'File::Spec::AmigaOS'   => '3.68',
+	    'File::Spec::Cygwin'    => '3.68',
+	    'File::Spec::Epoc'      => '3.68',
+	    'File::Spec::Functions' => '3.68',
+	    'File::Spec::Mac'       => '3.68',
+	    'File::Spec::OS2'       => '3.68',
+	    'File::Spec::Unix'      => '4.68c',
+	    'File::Spec::VMS'       => '4.68',
+	    'File::Spec::Win32'     => '4.68c',
             'IO::Socket'            => '1.38_01',
             'IO::Socket::INET'      => '1.35_01',
             'IO::Socket::UNIX'      => '1.26_01',
@@ -15068,6 +15078,7 @@ our %delta = (
             'B::Debug'              => '1.25',
             'base'                  => '2.26c',
             'Cpanel::JSON::XS'      => '3.0237',
+            'Cwd'                   => '4.68c',
             'deprecate'             => '0.03_01',
             'Devel::Peek'           => '1.26_02',
             'Devel::PPPort'         => '3.36_02',
@@ -15110,7 +15121,16 @@ our %delta = (
             'ExtUtils::Typemaps::Type'      => '3.35',
             'fields'                => '2.25c',
             'File::Path'            => '3.15_01c',
-            'File::Spec::Functions' => '3.36_05',
+	    'File::Spec'            => '4.68c',
+	    'File::Spec::AmigaOS'   => '3.68',
+	    'File::Spec::Cygwin'    => '3.68',
+	    'File::Spec::Epoc'      => '3.68',
+	    'File::Spec::Functions' => '3.68',
+	    'File::Spec::Mac'       => '3.68',
+	    'File::Spec::OS2'       => '3.68',
+	    'File::Spec::Unix'      => '4.68c',
+	    'File::Spec::VMS'       => '4.68',
+	    'File::Spec::Win32'     => '4.68c',
             'IO::Socket'            => '1.38_01',
             'IO::Socket::INET'      => '1.35_01',
             'IO::Socket::UNIX'      => '1.26_01',
diff --git a/dist/PathTools/Changes b/dist/PathTools/Changes
@@ -4,6 +4,11 @@ Revision history for Perl distribution PathTools.
 - Support getcwd with long paths.
 - Use libc realpath with possible long path support.
 
+3.68
+- avoid warning from pre-5.8 code for detecting tainted values
+- make taint.t detect that a pre-5.8 Perl supports tainting
+- avoid a dynamic linking problem on Perl 5.6
+
 3.67 - Mon Feb 27 09:33:04 EST 2017
 - Add security usage note to File::Spec::no_upwards
 
diff --git a/dist/PathTools/Cwd.xs b/dist/PathTools/Cwd.xs
@@ -7,6 +7,7 @@
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
+#define NEED_sv_2pv_flags
 #define NEED_my_strlcpy
 #define NEED_my_strlcat
 #include "ppport.h"
diff --git a/dist/PathTools/lib/File/Spec.pm b/dist/PathTools/lib/File/Spec.pm
@@ -4,7 +4,6 @@ use strict;
 use vars qw(@ISA);
 
 our $VERSION = '4.68c'; # modernized
-$VERSION =~ tr/_//;
 $VERSION =~ s/c$//;
 
 my %module = (MacOS   => 'Mac',
diff --git a/dist/PathTools/lib/File/Spec/AmigaOS.pm b/dist/PathTools/lib/File/Spec/AmigaOS.pm
@@ -4,8 +4,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.3.65';
-$VERSION =~ tr/_//d;
+$VERSION = '3.68';
 
 @ISA = qw(File::Spec::Unix);
 
diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.3.65';
+$VERSION = '3.68';
 $VERSION =~ tr/_//d;
 
 @ISA = qw(File::Spec::Unix);
diff --git a/dist/PathTools/lib/File/Spec/Epoc.pm b/dist/PathTools/lib/File/Spec/Epoc.pm
@@ -3,7 +3,7 @@ package File::Spec::Epoc;
 use strict;
 use vars qw($VERSION @ISA);
 
-$VERSION = '3.3.65';
+$VERSION = '3.68';
 $VERSION =~ tr/_//d;
 
 require File::Spec::Unix;
diff --git a/dist/PathTools/lib/File/Spec/Functions.pm b/dist/PathTools/lib/File/Spec/Functions.pm
@@ -5,7 +5,7 @@ use strict;
 
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
 
-$VERSION = '3.36_05';
+$VERSION = '3.68';
 $VERSION =~ tr/_//d;
 
 require Exporter;
diff --git a/dist/PathTools/lib/File/Spec/Mac.pm b/dist/PathTools/lib/File/Spec/Mac.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.3.65';
+$VERSION = '3.68';
 $VERSION =~ tr/_//d;
 
 @ISA = qw(File::Spec::Unix);
diff --git a/dist/PathTools/lib/File/Spec/OS2.pm b/dist/PathTools/lib/File/Spec/OS2.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.3.65';
+$VERSION = '3.68';
 $VERSION =~ tr/_//d;
 
 @ISA = qw(File::Spec::Unix);
diff --git a/dist/PathTools/lib/File/Spec/Unix.pm b/dist/PathTools/lib/File/Spec/Unix.pm
@@ -180,7 +180,8 @@ sub _tmpdir ($self, @dirlist) {
 	@dirlist = grep { ! Scalar::Util::tainted($_) } @dirlist;
     }
     elsif ($] < 5.007) { # No ${^TAINT} before 5.8
-	@dirlist = grep { eval { eval('1'.substr $_,0,0) } } @dirlist;
+	@dirlist = grep { !defined($_) || eval { eval('1'.substr $_,0,0) } }
+			@dirlist;
     }
     
     foreach (@dirlist) {
diff --git a/dist/PathTools/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '4.66';
+$VERSION = '4.68';
 $VERSION =~ tr/_//d;
 
 @ISA = qw(File::Spec::Unix);
@@ -439,8 +439,6 @@ Attempt to convert an absolute file specification to a relative specification.
 =cut
 
 sub abs2rel ($self, str $path, $base?) {
-    return vmspath(File::Spec::Unix::abs2rel( $self, $path, $base ))
-        if ((grep m{/}, $path, $base) && !(grep m{(?<!\^)[\[<:]}, $path, $base));
 
     $base = $self->_cwd() unless defined $base and length $base;
 
diff --git a/dist/PathTools/t/Spec.t b/dist/PathTools/t/Spec.t
@@ -139,6 +139,7 @@ my @tests = (
 ($] >= 5.008 ? (
 [ "Unix->canonpath(do { my \$x = '///a'.chr(0xaf); use utf8 (); utf8::upgrade(\$x); \$x })",   '/a'.chr(0xaf)   ],
 ) : ()),
+[ "Unix->canonpath(1)",                        '1'              ],
 
 [  "Unix->abs2rel('/t1/t2/t3','/t1/t2/t3')",          '.'                  ],
 [  "Unix->abs2rel('/t1/t2/t4','/t1/t2/t3')",          '../t4'              ],
diff --git a/dist/PathTools/t/taint.t b/dist/PathTools/t/taint.t
@@ -11,7 +11,7 @@ use lib File::Spec->catdir('t', 'lib');
 use Test::More;
 BEGIN {
     plan(
-        ${^TAINT}
+	!eval { eval("1".substr($^X,0,0)) }
         ? (tests => 21)
         : (skip_all => "A perl without taint support")
     );
diff --git a/pod/perlcdelta.pod b/pod/perlcdelta.pod
@@ -382,6 +382,12 @@ Improve some tests on missing network connections
 
 Added new 'oelem' and 'oelemfast' to :base_core
 
+=item L<PathTools> 4.68c
+
+Add security usage note to File::Spec::no_upwards
+white space change so can compile under C++11
+Protect modules also from . in @INC [perl #127384] (CVE-2016-1238)
+
 =item L<Search::Dict> 1.07_01
 
 Bump version
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
@@ -100,7 +100,7 @@ Math::BigInt cpan/Math-BigInt/t/upgrade.t 7c15cac7f321ca396648ec45da6389a1283e15
 Math::BigInt cpan/Math-BigInt/t/upgradef.t 06610e9883ce805bcd6543ab959a9826f598eb40
 Math::BigInt cpan/Math-BigInt/t/with_sub.t c040328e223df6f56250f5d67dcb2c9a2f23c110
 Memoize cpan/Memoize/t/expmod_t.t 9386100cd9c95a0e8a4e001bba3aa52eec114d21
-Module::CoreList dist/Module-CoreList/lib/Module/CoreList.pm 2efe8befa070c46ab3dcfc950adbab69802d6500
+Module::CoreList dist/Module-CoreList/lib/Module/CoreList.pm 246f13ec4483e8a6d5669cc263a0f14f96e3d04e
 Module::CoreList dist/Module-CoreList/lib/Module/CoreList/Utils.pm 7ff05ce5f0b967d229b90870de806ce3fea82b22
 Module::Metadata cpan/Module-Metadata/t/lib/GeneratePackage.pm 502ffbe2609947430e6aa1a3df8064b3fef3e086
 Net::Domain cpan/libnet/lib/Net/Cmd.pm 70a007c38833667ad47ea8059c37c1b7d1c77b6c
diff --git a/t/porting/known_pod_issues.dat b/t/porting/known_pod_issues.dat
@@ -11,6 +11,9 @@
 #   generated by this program; and the third field is a count of how many
 #   known instances of that message there are in the pod.  -1 means that the
 #   program can expect any number of this type of message.
+<<<<<<< HEAD
+=======
+>>>>>>> 101b5a5... PathTools: Update to 4.68c
 _control87(3)
 accept(2)
 access(2)
@@ -320,6 +323,7 @@ XML::LibXML
 YAML
 YAML::Syck
 YAML::Tiny
+||||||| parent of 101b5a5... PathTools: Update to 4.68c
 dist/cpan-meta-requirements/lib/cpan/meta/requirements.pm	Verbatim line length including indents exceeds 79 by	2
 dist/cpan-meta/lib/cpan/meta.pm	Apparent broken link	5
 dist/cpan-meta/lib/cpan/meta/converter.pm	Verbatim line length including indents exceeds 79 by	1
@@ -430,7 +434,7 @@ pod/perl5270cdelta.pod	Apparent broken link	3
 pod/perl5270cdelta.pod	Apparent internal link is missing its forward slash	1
 pod/perl5270cdelta.pod	Verbatim line length including indents exceeds 79 by	1
 pod/perl5270cdelta.pod	alternative text. contains non-escaped | or /	1
-pod/perl5271cdelta.pod	Apparent broken link	5
+pod/perl5271cdelta.pod	Apparent broken link	6
 pod/perl5271cdelta.pod	Apparent internal link is missing its forward slash	1
 pod/perl5271cdelta.pod	Verbatim line length including indents exceeds 79 by	2
 pod/perlandroid.pod	Verbatim line length including indents exceeds 79 by	3
