From fccb0d411ff7f4873790025d0d8053fe7d96cafa Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Wed, 8 Feb 2023 17:50:08 +0800 Subject: [PATCH] remove versioned MODULE_COMPAT_ requires & update to version 3.84 --- PathTools-3.75-Upgrade-to-3.78.patch | 283 ++++++++++++++++++++ PathTools-3.78-Upgrade-to-3.80.patch | 278 ++++++++++++++++++++ PathTools-3.80-Upgrade-to-3.84.patch | 371 +++++++++++++++++++++++++++ perl-PathTools.spec | 23 +- 4 files changed, 950 insertions(+), 5 deletions(-) create mode 100644 PathTools-3.75-Upgrade-to-3.78.patch create mode 100644 PathTools-3.78-Upgrade-to-3.80.patch create mode 100644 PathTools-3.80-Upgrade-to-3.84.patch diff --git a/PathTools-3.75-Upgrade-to-3.78.patch b/PathTools-3.75-Upgrade-to-3.78.patch new file mode 100644 index 0000000..67d2581 --- /dev/null +++ b/PathTools-3.75-Upgrade-to-3.78.patch @@ -0,0 +1,283 @@ +From 3c570b93e7ca990b3274219dd828e8fdaac0bf9d Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Thu, 25 Apr 2019 17:04:30 +0200 +Subject: [PATCH] Upgrade to 3.78 + +--- + Cwd.pm | 8 ++++++-- + lib/File/Spec.pm | 2 +- + lib/File/Spec/AmigaOS.pm | 2 +- + lib/File/Spec/Cygwin.pm | 2 +- + lib/File/Spec/Epoc.pm | 2 +- + lib/File/Spec/Functions.pm | 2 +- + lib/File/Spec/Mac.pm | 2 +- + lib/File/Spec/OS2.pm | 2 +- + lib/File/Spec/Unix.pm | 2 +- + lib/File/Spec/Win32.pm | 14 ++------------ + t/Spec.t | 4 ++-- + t/cwd.t | 11 ++++++++++- + t/cwd_enoent.t | 9 ++++++--- + 13 files changed, 34 insertions(+), 28 deletions(-) + +diff --git a/Cwd.pm b/Cwd.pm +index 16d5b11..9b173c2 100644 +--- a/Cwd.pm ++++ b/Cwd.pm +@@ -3,7 +3,7 @@ use strict; + use Exporter; + + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + my $xs_version = $VERSION; + $VERSION =~ tr/_//d; + +@@ -171,7 +171,7 @@ if($^O ne 'MSWin32') { + if ($^O =~ /android/) { + # If targetsh is executable, then we're either a full + # perl, or a miniperl for a native build. +- if (-x $Config::Config{targetsh}) { ++ if ( exists($Config::Config{targetsh}) && -x $Config::Config{targetsh}) { + $pwd_cmd = "$Config::Config{targetsh} -c pwd" + } + else { +@@ -659,6 +659,10 @@ if (exists $METHOD_MAP{$^O}) { + } + } + ++# built-in from 5.30 ++*getcwd = \&Internals::getcwd ++ if !defined &getcwd && defined &Internals::getcwd; ++ + # In case the XS version doesn't load. + *abs_path = \&_perl_abs_path unless defined &abs_path; + *getcwd = \&_perl_getcwd unless defined &getcwd; +diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm +index eb3b55a..7fe3272 100644 +--- a/lib/File/Spec.pm ++++ b/lib/File/Spec.pm +@@ -2,7 +2,7 @@ package File::Spec; + + use strict; + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + $VERSION =~ tr/_//d; + + my %module = ( +diff --git a/lib/File/Spec/AmigaOS.pm b/lib/File/Spec/AmigaOS.pm +index 1355768..2b7d18a 100644 +--- a/lib/File/Spec/AmigaOS.pm ++++ b/lib/File/Spec/AmigaOS.pm +@@ -3,7 +3,7 @@ package File::Spec::AmigaOS; + use strict; + require File::Spec::Unix; + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Cygwin.pm b/lib/File/Spec/Cygwin.pm +index 9dc15a1..d44ced3 100644 +--- a/lib/File/Spec/Cygwin.pm ++++ b/lib/File/Spec/Cygwin.pm +@@ -3,7 +3,7 @@ package File::Spec::Cygwin; + use strict; + require File::Spec::Unix; + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Epoc.pm b/lib/File/Spec/Epoc.pm +index bd87b68..b611cd9 100644 +--- a/lib/File/Spec/Epoc.pm ++++ b/lib/File/Spec/Epoc.pm +@@ -2,7 +2,7 @@ package File::Spec::Epoc; + + use strict; + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + $VERSION =~ tr/_//d; + + require File::Spec::Unix; +diff --git a/lib/File/Spec/Functions.pm b/lib/File/Spec/Functions.pm +index 19ab4db..3f617bd 100644 +--- a/lib/File/Spec/Functions.pm ++++ b/lib/File/Spec/Functions.pm +@@ -3,7 +3,7 @@ package File::Spec::Functions; + use File::Spec; + use strict; + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + $VERSION =~ tr/_//d; + + require Exporter; +diff --git a/lib/File/Spec/Mac.pm b/lib/File/Spec/Mac.pm +index 926a5dd..d920d2f 100644 +--- a/lib/File/Spec/Mac.pm ++++ b/lib/File/Spec/Mac.pm +@@ -4,7 +4,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm +index 4404fe8..603781a 100644 +--- a/lib/File/Spec/OS2.pm ++++ b/lib/File/Spec/OS2.pm +@@ -4,7 +4,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm +index cd29f76..6749e60 100644 +--- a/lib/File/Spec/Unix.pm ++++ b/lib/File/Spec/Unix.pm +@@ -3,7 +3,7 @@ package File::Spec::Unix; + use strict; + use Cwd (); + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + $VERSION =~ tr/_//d; + + =head1 NAME +diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm +index 0cf0e28..5934010 100644 +--- a/lib/File/Spec/Win32.pm ++++ b/lib/File/Spec/Win32.pm +@@ -5,7 +5,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.75'; ++our $VERSION = '3.78'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +@@ -137,7 +137,7 @@ sub catfile { + # Legacy / compatibility support + # + shift, return _canon_cat( "/", @_ ) +- if $_[0] eq ""; ++ if !@_ || $_[0] eq ""; + + # Compatibility with File::Spec <= 3.26: + # catfile('A:', 'foo') should return 'A:\foo'. +@@ -407,16 +407,6 @@ sub _canon_cat # @path -> path + )+ # performance boost -- I do not know why + }{\\}gx; + +- # XXX I do not know whether more dots are supported by the OS supporting +- # this ... annotation (NetWare or symbian but not MSWin32). +- # Then .... could easily become ../../.. etc: +- # Replace \.\.\. by (\.\.\.+) and substitute with +- # { $1 . ".." . "\\.." x (length($2)-2) }gex +- # ... --> ../.. +- $path =~ s{ (\A|\\) # at begin or after a slash +- \.\.\. +- (?=\\|\z) # at end or followed by slash +- }{$1..\\..}gx; + # xx\yy\..\zz --> xx\zz + while ( $path =~ s{(?: + (?:\A|\\) # at begin or after a slash +diff --git a/t/Spec.t b/t/Spec.t +index 1b26190..c953391 100644 +--- a/t/Spec.t ++++ b/t/Spec.t +@@ -277,9 +277,9 @@ my @tests = ( + [ "Win32->canonpath('//a/b/../../c')", '\\\\a\\b\\c' ], + [ "Win32->canonpath('//a/b/c/../d')", '\\\\a\\b\\d' ], + [ "Win32->canonpath('//a/b/c/../../d')",'\\\\a\\b\\d' ], +-[ "Win32->canonpath('//a/b/c/.../d')", '\\\\a\\b\\d' ], ++[ "Win32->canonpath('//a/b/c/.../d')", '\\\\a\\b\\c\\...\\d' ], + [ "Win32->canonpath('/a/b/c/../../d')", '\\a\\d' ], +-[ "Win32->canonpath('/a/b/c/.../d')", '\\a\\d' ], ++[ "Win32->canonpath('/a/b/c/.../d')", '\\a\\b\\c\\...\\d' ], + [ "Win32->canonpath('\\../temp\\')", '\\temp' ], + [ "Win32->canonpath('\\../')", '\\' ], + [ "Win32->canonpath('\\..\\')", '\\' ], +diff --git a/t/cwd.t b/t/cwd.t +index 483b437..c056938 100644 +--- a/t/cwd.t ++++ b/t/cwd.t +@@ -10,6 +10,7 @@ chdir 't'; + use Config; + use File::Spec; + use File::Path; ++use Errno qw(EACCES); + + use lib File::Spec->catdir('t', 'lib'); + use Test::More; +@@ -208,7 +209,15 @@ SKIP: { + + like($abs_path, qr|$want$|i, "Cwd::abs_path produced $abs_path"); + like($fast_abs_path, qr|$want$|i, "Cwd::fast_abs_path produced $fast_abs_path"); +- like($pas, qr|$want$|i, "Cwd::_perl_abs_path produced $pas") if $EXTRA_ABSPATH_TESTS; ++ if ($EXTRA_ABSPATH_TESTS) { ++ # _perl_abs_path() can fail if some ancestor directory isn't readable ++ if (defined $pas) { ++ like($pas, qr|$want$|i, "Cwd::_perl_abs_path produced $pas"); ++ } ++ else { ++ is($!+0, EACCES, "check we got the expected error on failure"); ++ } ++ } + + rmtree($test_dirs[0], 0, 0); + 1 while unlink $file; +diff --git a/t/cwd_enoent.t b/t/cwd_enoent.t +index 8f3a1fb..510c65e 100644 +--- a/t/cwd_enoent.t ++++ b/t/cwd_enoent.t +@@ -2,7 +2,7 @@ use warnings; + use strict; + + use Config; +-use Errno qw(ENOENT); ++use Errno qw(); + use File::Temp qw(tempdir); + use Test::More; + +@@ -19,6 +19,7 @@ unless(mkdir("$tmp/testdir") && chdir("$tmp/testdir") && rmdir("$tmp/testdir")){ + plan tests => 8; + require Cwd; + ++my @acceptable_errnos = (&Errno::ENOENT, (defined &Errno::ESTALE ? &Errno::ESTALE : ())); + foreach my $type (qw(regular perl)) { + SKIP: { + skip "_perl_abs_path() not expected to work", 4 +@@ -36,12 +37,14 @@ foreach my $type (qw(regular perl)) { + $res = Cwd::getcwd(); + $eno = 0+$!; + is $res, undef, "$type getcwd result on non-existent directory"; +- is $eno, ENOENT, "$type getcwd errno on non-existent directory"; ++ ok((grep { $eno == $_ } @acceptable_errnos), "$type getcwd errno on non-existent directory") ++ or diag "Got errno code $eno, expected " . join(", ", @acceptable_errnos); + $! = 0; + $res = Cwd::abs_path("."); + $eno = 0+$!; + is $res, undef, "$type abs_path result on non-existent directory"; +- is $eno, ENOENT, "$type abs_path errno on non-existent directory"; ++ ok((grep { $eno == $_ } @acceptable_errnos), "$type abs_path errno on non-existent directory") ++ or diag "Got errno code $eno, expected " . join(", ", @acceptable_errnos); + } + } + +-- +2.20.1 + diff --git a/PathTools-3.78-Upgrade-to-3.80.patch b/PathTools-3.78-Upgrade-to-3.80.patch new file mode 100644 index 0000000..6585b32 --- /dev/null +++ b/PathTools-3.78-Upgrade-to-3.80.patch @@ -0,0 +1,278 @@ +From 2aa3d01bca010903b9cdb848e61ca45f84ce6bcf Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Thu, 6 May 2021 08:31:26 +0200 +Subject: [PATCH] Upgrade to 3.80 + +--- + Cwd.pm | 2 +- + Cwd.xs | 24 +++-- + META.json | 2 +- + META.yml | 2 +- + lib/File/Spec.pm | 2 +- + lib/File/Spec/AmigaOS.pm | 2 +- + lib/File/Spec/Cygwin.pm | 2 +- + lib/File/Spec/Epoc.pm | 2 +- + lib/File/Spec/Functions.pm | 2 +- + lib/File/Spec/Mac.pm | 2 +- + lib/File/Spec/OS2.pm | 2 +- + lib/File/Spec/Unix.pm | 2 +- + lib/File/Spec/Win32.pm | 4 +- + t/cwd.t | 4 + + t/cwd_enoent.t | 2 + + 16 files changed, 232 insertions(+), 20 deletions(-) + +diff --git a/Cwd.pm b/Cwd.pm +index 9b173c2..6a1d2f1 100644 +--- a/Cwd.pm ++++ b/Cwd.pm +@@ -3,7 +3,7 @@ use strict; + use Exporter; + + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + my $xs_version = $VERSION; + $VERSION =~ tr/_//d; + +diff --git a/Cwd.xs b/Cwd.xs +index 8662400..223e1a6 100644 +--- a/Cwd.xs ++++ b/Cwd.xs +@@ -84,6 +84,9 @@ bsd_realpath(const char *path, char resolved[MAXPATHLEN]) + unsigned symlinks; + int serrno; + char remaining[MAXPATHLEN], next_token[MAXPATHLEN]; ++#ifdef PERL_IMPLICIT_SYS ++ dTHX; ++#endif + + serrno = errno; + symlinks = 0; +@@ -119,15 +122,24 @@ bsd_realpath(const char *path, char resolved[MAXPATHLEN]) + + p = strchr(remaining, '/'); + s = p ? p : remaining + remaining_len; ++ + if ((STRLEN)(s - remaining) >= (STRLEN)sizeof(next_token)) { + errno = ENAMETOOLONG; + return (NULL); + } + memcpy(next_token, remaining, s - remaining); + next_token[s - remaining] = '\0'; +- remaining_len -= s - remaining; +- if (p != NULL) +- memmove(remaining, s + 1, remaining_len + 1); ++ ++ /* shift first component off front of path, including '/' */ ++ if (p) { ++ s++; /* skip '/' */ ++ remaining_len -= s - remaining; ++ /* the +1 includes the trailing '\0' */ ++ memmove(remaining, s, remaining_len + 1); ++ } ++ else ++ remaining_len = 0; ++ + if (resolved[resolved_len - 1] != '/') { + if (resolved_len + 1 >= MAXPATHLEN) { + errno = ENAMETOOLONG; +@@ -166,8 +178,8 @@ bsd_realpath(const char *path, char resolved[MAXPATHLEN]) + } + #if defined(HAS_LSTAT) && defined(HAS_READLINK) && defined(HAS_SYMLINK) + { +- struct stat sb; +- if (lstat(resolved, &sb) != 0) { ++ Stat_t sb; ++ if (PerlLIO_lstat(resolved, &sb) != 0) { + if (errno == ENOENT && p == NULL) { + errno = serrno; + return (resolved); +@@ -182,7 +194,7 @@ bsd_realpath(const char *path, char resolved[MAXPATHLEN]) + errno = ELOOP; + return (NULL); + } +- slen = readlink(resolved, symlink, sizeof(symlink) - 1); ++ slen = PerlLIO_readlink(resolved, symlink, sizeof(symlink) - 1); + if (slen < 0) + return (NULL); + symlink[slen] = '\0'; +diff --git a/META.json b/META.json +index e41b849..ad429a5 100644 +--- a/META.json ++++ b/META.json +@@ -50,6 +50,6 @@ + "url" : "git://perl5.git.perl.org/perl.git" + } + }, +- "version" : "3.75", ++ "version" : "3.73", + "x_serialization_backend" : "JSON::PP version 2.27400_02" + } +diff --git a/META.yml b/META.yml +index c53f36e..c2adfcf 100644 +--- a/META.yml ++++ b/META.yml +@@ -26,5 +26,5 @@ resources: + bugtracker: https://rt.perl.org/rt3/ + homepage: http://dev.perl.org/ + repository: git://perl5.git.perl.org/perl.git +-version: '3.75' ++version: '3.73' + x_serialization_backend: 'CPAN::Meta::YAML version 0.018' +diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm +index 7fe3272..30d883b 100644 +--- a/lib/File/Spec.pm ++++ b/lib/File/Spec.pm +@@ -2,7 +2,7 @@ package File::Spec; + + use strict; + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + $VERSION =~ tr/_//d; + + my %module = ( +diff --git a/lib/File/Spec/AmigaOS.pm b/lib/File/Spec/AmigaOS.pm +index 2b7d18a..fd9da81 100644 +--- a/lib/File/Spec/AmigaOS.pm ++++ b/lib/File/Spec/AmigaOS.pm +@@ -3,7 +3,7 @@ package File::Spec::AmigaOS; + use strict; + require File::Spec::Unix; + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Cygwin.pm b/lib/File/Spec/Cygwin.pm +index d44ced3..953c233 100644 +--- a/lib/File/Spec/Cygwin.pm ++++ b/lib/File/Spec/Cygwin.pm +@@ -3,7 +3,7 @@ package File::Spec::Cygwin; + use strict; + require File::Spec::Unix; + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Epoc.pm b/lib/File/Spec/Epoc.pm +index b611cd9..fcb9e89 100644 +--- a/lib/File/Spec/Epoc.pm ++++ b/lib/File/Spec/Epoc.pm +@@ -2,7 +2,7 @@ package File::Spec::Epoc; + + use strict; + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + $VERSION =~ tr/_//d; + + require File::Spec::Unix; +diff --git a/lib/File/Spec/Functions.pm b/lib/File/Spec/Functions.pm +index 3f617bd..e14ad2f 100644 +--- a/lib/File/Spec/Functions.pm ++++ b/lib/File/Spec/Functions.pm +@@ -3,7 +3,7 @@ package File::Spec::Functions; + use File::Spec; + use strict; + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + $VERSION =~ tr/_//d; + + require Exporter; +diff --git a/lib/File/Spec/Mac.pm b/lib/File/Spec/Mac.pm +index d920d2f..8026edc 100644 +--- a/lib/File/Spec/Mac.pm ++++ b/lib/File/Spec/Mac.pm +@@ -4,7 +4,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm +index 603781a..3c35ba9 100644 +--- a/lib/File/Spec/OS2.pm ++++ b/lib/File/Spec/OS2.pm +@@ -4,7 +4,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm +index 6749e60..c06d18f 100644 +--- a/lib/File/Spec/Unix.pm ++++ b/lib/File/Spec/Unix.pm +@@ -3,7 +3,7 @@ package File::Spec::Unix; + use strict; + use Cwd (); + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + $VERSION =~ tr/_//d; + + =head1 NAME +diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm +index 5934010..1537442 100644 +--- a/lib/File/Spec/Win32.pm ++++ b/lib/File/Spec/Win32.pm +@@ -5,7 +5,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.78'; ++our $VERSION = '3.80'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +@@ -84,7 +84,7 @@ sub tmpdir { + MSWin32 case-tolerance depends on GetVolumeInformation() $ouFsFlags == FS_CASE_SENSITIVE, + indicating the case significance when comparing file specifications. + Since XP FS_CASE_SENSITIVE is effectively disabled for the NT subsubsystem. +-See http://cygwin.com/ml/cygwin/2007-07/msg00891.html ++See L + Default: 1 + + =cut +diff --git a/t/cwd.t b/t/cwd.t +index c056938..d155e33 100644 +--- a/t/cwd.t ++++ b/t/cwd.t +@@ -187,6 +187,10 @@ rmtree($test_dirs[0], 0, 0); + SKIP: { + skip "no symlinks on this platform", 2+$EXTRA_ABSPATH_TESTS unless $Config{d_symlink} && $^O !~ m!^(qnx|nto)!; + ++ # on Win32 GetCurrentDirectory() includes the symlink if ++ # you chdir() to a path including the symlink. ++ skip "Win32 symlinks are unusual", 2+$EXTRA_ABSPATH_TESTS if $^O eq "MSWin32"; ++ + my $file = "linktest"; + mkpath([$Test_Dir], 0, 0777); + symlink $Test_Dir, $file; +diff --git a/t/cwd_enoent.t b/t/cwd_enoent.t +index 510c65e..2e94bad 100644 +--- a/t/cwd_enoent.t ++++ b/t/cwd_enoent.t +@@ -26,6 +26,8 @@ foreach my $type (qw(regular perl)) { + if $type eq "perl" && + !(($Config{prefix} =~ m/\//) && $^O ne "cygwin"); + ++ # https://github.com/Perl/perl5/issues/16525 ++ # https://bugs.dragonflybsd.org/issues/3250 + skip "getcwd() doesn't fail on non-existent directories on this platform", 4 + if $type eq 'regular' && $^O eq 'dragonfly'; + +-- +2.30.2 + diff --git a/PathTools-3.80-Upgrade-to-3.84.patch b/PathTools-3.80-Upgrade-to-3.84.patch new file mode 100644 index 0000000..d104e3d --- /dev/null +++ b/PathTools-3.80-Upgrade-to-3.84.patch @@ -0,0 +1,371 @@ +From 29821ef8025dddc95c122e87afb09d5b3a5ef6ed Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Thu, 12 May 2022 10:53:47 +0200 +Subject: [PATCH] Upgrade to 3.84 + +--- + Changes | 30 ++++++++++++++++++++++++++ + Cwd.pm | 43 ++++++++++---------------------------- + Cwd.xs | 4 ++++ + Makefile.PL | 2 +- + lib/File/Spec.pm | 4 ++-- + lib/File/Spec/AmigaOS.pm | 2 +- + lib/File/Spec/Cygwin.pm | 2 +- + lib/File/Spec/Epoc.pm | 2 +- + lib/File/Spec/Functions.pm | 2 +- + lib/File/Spec/Mac.pm | 2 +- + lib/File/Spec/OS2.pm | 2 +- + lib/File/Spec/Unix.pm | 4 ++-- + lib/File/Spec/Win32.pm | 2 +- + t/cwd_enoent.t | 3 +++ + 14 files changed, 60 insertions(+), 44 deletions(-) + +diff --git a/Changes b/Changes +index 7f04db2..9533c1f 100644 +--- a/Changes ++++ b/Changes +@@ -1,5 +1,35 @@ + Revision history for Perl distribution PathTools. + ++3.81 ++ ++- compare inode numbers as strings (github #18788) ++ ++3.80 ++ ++- use the PerlLIO_*() functions for lstat() and readlink() to support ++ Win32 symlink support added to perl. ++ ++- skip a test that assumes getcwd() doesn't return symlinks on Win32, where ++ it can. ++ ++3.79 ++ ++- fix an off-by-one in bsd_realpath() ++ ++3.78 ++ ++- fallback to Internals::getcwd() for getcwd() if available (requires ++ $Config{d_getcwd}) ++ ++3.77 ++ ++- don't translate "..." to "..\.." on Win32 ++ ++3.76 ++ ++- test t/cwd_enoent.t - also accept ESTALE for a directory that no ++ longer exists (github #16699) ++ + 3.75 + - Fix t/abs2rel.t on 5.8.8 by changing mkpath call to be + compatible with older File::Path +diff --git a/Cwd.pm b/Cwd.pm +index 6a1d2f1..0683583 100644 +--- a/Cwd.pm ++++ b/Cwd.pm +@@ -3,7 +3,7 @@ use strict; + use Exporter; + + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + my $xs_version = $VERSION; + $VERSION =~ tr/_//d; + +@@ -181,12 +181,6 @@ if ($^O =~ /android/) { + } + + my $found_pwd_cmd = defined($pwd_cmd); +-unless ($pwd_cmd) { +- # Isn't this wrong? _backtick_pwd() will fail if someone has +- # pwd in their path but it is not /bin/pwd or /usr/bin/pwd? +- # See [perl #16774]. --jhi +- $pwd_cmd = 'pwd'; +-} + + # Lazy-load Carp + sub _carp { require Carp; Carp::carp(@_) } +@@ -213,26 +207,13 @@ sub _backtick_pwd { + # we take care not to override an existing definition for cwd(). + + unless ($METHOD_MAP{$^O}{cwd} or defined &cwd) { +- # The pwd command is not available in some chroot(2)'ed environments +- my $sep = $Config::Config{path_sep} || ':'; +- my $os = $^O; # Protect $^O from tainting +- +- +- # Try again to find a pwd, this time searching the whole PATH. +- if (defined $ENV{PATH} and $os ne 'MSWin32') { # no pwd on Windows +- my @candidates = split($sep, $ENV{PATH}); +- while (!$found_pwd_cmd and @candidates) { +- my $candidate = shift @candidates; +- $found_pwd_cmd = 1 if -x "$candidate/pwd"; +- } +- } +- + if( $found_pwd_cmd ) + { + *cwd = \&_backtick_pwd; + } + else { +- *cwd = \&getcwd; ++ # getcwd() might have an empty prototype ++ *cwd = sub { getcwd(); }; + } + } + +@@ -275,7 +256,7 @@ sub fastcwd_ { + ($odev, $oino) = ($cdev, $cino); + CORE::chdir('..') || return undef; + ($cdev, $cino) = stat('.'); +- last if $odev == $cdev && $oino == $cino; ++ last if $odev == $cdev && $oino eq $cino; + opendir(DIR, '.') || return undef; + for (;;) { + $direntry = readdir(DIR); +@@ -284,7 +265,7 @@ sub fastcwd_ { + next if $direntry eq '..'; + + ($tdev, $tino) = lstat($direntry); +- last unless $tdev != $odev || $tino != $oino; ++ last unless $tdev != $odev || $tino ne $oino; + } + closedir(DIR); + return undef unless defined $direntry; # should never happen +@@ -298,7 +279,7 @@ sub fastcwd_ { + && CORE::chdir($1) or return undef; + ($cdev, $cino) = stat('.'); + die "Unstable directory path, current directory changed unexpectedly" +- if $cdev != $orig_cdev || $cino != $orig_cino; ++ if $cdev != $orig_cdev || $cino ne $orig_cino; + $path; + } + if (not defined &fastcwd) { *fastcwd = \&fastcwd_ } +@@ -315,7 +296,7 @@ sub chdir_init { + if ($ENV{'PWD'} and $^O ne 'os2' and $^O ne 'dos' and $^O ne 'MSWin32') { + my($dd,$di) = stat('.'); + my($pd,$pi) = stat($ENV{'PWD'}); +- if (!defined $dd or !defined $pd or $di != $pi or $dd != $pd) { ++ if (!defined $dd or !defined $pd or $di ne $pi or $dd != $pd) { + $ENV{'PWD'} = cwd(); + } + } +@@ -328,7 +309,7 @@ sub chdir_init { + if ($^O ne 'MSWin32' and $ENV{'PWD'} =~ m|(/[^/]+(/[^/]+/[^/]+))(.*)|s) { + my($pd,$pi) = stat($2); + my($dd,$di) = stat($1); +- if (defined $pd and defined $dd and $di == $pi and $dd == $pd) { ++ if (defined $pd and defined $dd and $di ne $pi and $dd == $pd) { + $ENV{'PWD'}="$2$3"; + } + } +@@ -430,7 +411,7 @@ sub _perl_abs_path + $! = $e; + return undef; + } +- if ($pst[0] == $cst[0] && $pst[1] == $cst[1]) ++ if ($pst[0] == $cst[0] && $pst[1] eq $cst[1]) + { + $dir = undef; + } +@@ -448,7 +429,7 @@ sub _perl_abs_path + $tst[0] = $pst[0]+1 unless (@tst = lstat("$dotdots/$dir")) + } + while ($dir eq '.' || $dir eq '..' || $tst[0] != $pst[0] || +- $tst[1] != $pst[1]); ++ $tst[1] ne $pst[1]); + } + $cwd = (defined $dir ? "$dir" : "" ) . "/$cwd" ; + closedir(PARENT); +@@ -820,9 +801,7 @@ C. + + =head1 AUTHOR + +-Originally by the perl5-porters. +- +-Maintained by Ken Williams ++Maintained by perl5-porters >. + + =head1 COPYRIGHT + +diff --git a/Cwd.xs b/Cwd.xs +index 223e1a6..4fda057 100644 +--- a/Cwd.xs ++++ b/Cwd.xs +@@ -15,6 +15,10 @@ + # include "ppport.h" + #endif + ++#if defined(HAS_READLINK) && !defined(PerlLIO_readlink) ++#define PerlLIO_readlink readlink ++#endif ++ + #ifdef I_UNISTD + # include + #endif +diff --git a/Makefile.PL b/Makefile.PL +index 11e04af..0311708 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -16,7 +16,7 @@ push @extra, 'LICENSE' => 'perl_5' + push @extra, 'META_MERGE' => { + resources => { + repository => 'git://perl5.git.perl.org/perl.git', +- bugtracker => 'https://rt.perl.org/rt3/', ++ bugtracker => 'https://github.com/Perl/perl5/issues', + homepage => "http://dev.perl.org/", + license => [ 'http://dev.perl.org/licenses/' ], + }, +diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm +index 30d883b..e0a49ed 100644 +--- a/lib/File/Spec.pm ++++ b/lib/File/Spec.pm +@@ -2,7 +2,7 @@ package File::Spec; + + use strict; + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + $VERSION =~ tr/_//d; + + my %module = ( +@@ -316,7 +316,7 @@ L + + =head1 AUTHOR + +-Currently maintained by Ken Williams C<< >>. ++Maintained by perl5-porters >. + + The vast majority of the code was written by + Kenneth Albanowski C<< >>, +diff --git a/lib/File/Spec/AmigaOS.pm b/lib/File/Spec/AmigaOS.pm +index fd9da81..a29617c 100644 +--- a/lib/File/Spec/AmigaOS.pm ++++ b/lib/File/Spec/AmigaOS.pm +@@ -3,7 +3,7 @@ package File::Spec::AmigaOS; + use strict; + require File::Spec::Unix; + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Cygwin.pm b/lib/File/Spec/Cygwin.pm +index 953c233..e21c0bb 100644 +--- a/lib/File/Spec/Cygwin.pm ++++ b/lib/File/Spec/Cygwin.pm +@@ -3,7 +3,7 @@ package File::Spec::Cygwin; + use strict; + require File::Spec::Unix; + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Epoc.pm b/lib/File/Spec/Epoc.pm +index fcb9e89..2429bb2 100644 +--- a/lib/File/Spec/Epoc.pm ++++ b/lib/File/Spec/Epoc.pm +@@ -2,7 +2,7 @@ package File::Spec::Epoc; + + use strict; + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + $VERSION =~ tr/_//d; + + require File::Spec::Unix; +diff --git a/lib/File/Spec/Functions.pm b/lib/File/Spec/Functions.pm +index e14ad2f..a09150c 100644 +--- a/lib/File/Spec/Functions.pm ++++ b/lib/File/Spec/Functions.pm +@@ -3,7 +3,7 @@ package File::Spec::Functions; + use File::Spec; + use strict; + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + $VERSION =~ tr/_//d; + + require Exporter; +diff --git a/lib/File/Spec/Mac.pm b/lib/File/Spec/Mac.pm +index 8026edc..369d1f0 100644 +--- a/lib/File/Spec/Mac.pm ++++ b/lib/File/Spec/Mac.pm +@@ -4,7 +4,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm +index 3c35ba9..604e2e3 100644 +--- a/lib/File/Spec/OS2.pm ++++ b/lib/File/Spec/OS2.pm +@@ -4,7 +4,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm +index c06d18f..52904b4 100644 +--- a/lib/File/Spec/Unix.pm ++++ b/lib/File/Spec/Unix.pm +@@ -3,7 +3,7 @@ package File::Spec::Unix; + use strict; + use Cwd (); + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + $VERSION =~ tr/_//d; + + =head1 NAME +@@ -530,7 +530,7 @@ Copyright (c) 2004 by the Perl 5 Porters. All rights reserved. + This program is free software; you can redistribute it and/or modify + it under the same terms as Perl itself. + +-Please submit bug reports and patches to perlbug@perl.org. ++Please submit bug reports at L. + + =head1 SEE ALSO + +diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm +index 1537442..b05b535 100644 +--- a/lib/File/Spec/Win32.pm ++++ b/lib/File/Spec/Win32.pm +@@ -5,7 +5,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.80'; ++our $VERSION = '3.84'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/t/cwd_enoent.t b/t/cwd_enoent.t +index 2e94bad..0fe3834 100644 +--- a/t/cwd_enoent.t ++++ b/t/cwd_enoent.t +@@ -31,6 +31,9 @@ foreach my $type (qw(regular perl)) { + skip "getcwd() doesn't fail on non-existent directories on this platform", 4 + if $type eq 'regular' && $^O eq 'dragonfly'; + ++ skip "getcwd() doesn't fail on non-existent directories on this platform", 4 ++ if $type eq 'regular' && $^O eq 'haiku'; ++ + no warnings "redefine"; + local *Cwd::abs_path = \&Cwd::_perl_abs_path if $type eq "perl"; + local *Cwd::getcwd = \&Cwd::_perl_getcwd if $type eq "perl"; +-- +2.34.3 + diff --git a/perl-PathTools.spec b/perl-PathTools.spec index 474c9c9..2f360ce 100644 --- a/perl-PathTools.spec +++ b/perl-PathTools.spec @@ -1,16 +1,23 @@ -%define anolis_release 3 +%define anolis_release 1 +%global base_version 3.75 Name: perl-PathTools -Version: 3.75 +Version: 3.84 Release: %{anolis_release}%{?dist} Summary: PathTools Perl module (Cwd, File::Spec) # Cwd.xs: BSD # other files: GPL+ or Artistic License: (GPL+ or Artistic) and BSD URL: https://metacpan.org/release/PathTools -Source0: https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/PathTools-%{version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/PathTools-%{base_version}.tar.gz # Disable VMS tests as it works on VMS only, so can not locate perl-File-Spec-VMS Patch0: 0001-PathTools-3.74-Disable-VMS-tests.patch +# Unbundled from perl 5.29.10 +Patch1: PathTools-3.75-Upgrade-to-3.78.patch +# Unbundled from perl 5.34.0 +Patch2: PathTools-3.78-Upgrade-to-3.80.patch +# Unbundled from perl 5.35.11 +Patch3: PathTools-3.80-Upgrade-to-3.84.patch BuildRequires: coreutils BuildRequires: findutils @@ -38,7 +45,6 @@ BuildRequires: perl(File::Temp) BuildRequires: perl(lib) BuildRequires: perl(Test::More) >= 0.88 BuildRequires: perl(warnings) -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Carp) Requires: perl(Errno) Requires: perl(Scalar::Util) @@ -60,8 +66,11 @@ BuildArch: noarch The %{name}-doc package contains documentation files for %{name}. %prep -%setup -q -n PathTools-%{version} +%setup -q -n PathTools-%{base_version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 # Do not distribute File::Spec::VMS as it works on VMS only rm lib/File/Spec/VMS.pm @@ -89,6 +98,10 @@ make test %doc Changes %changelog +* Wed Feb 08 2023 mgb01105731 - 3.84-1 +- remove versioned MODULE_COMPAT_ requires +- update to version 3.84 + * Mon Jan 30 2023 Chunmei Xu - 3.75-3 - rebuild with perl 5.36.0 -- Gitee