X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..f9502be60327eae722efcf490d6a3f992d8b421b:/packages/perl/Cwd.pm.patch

diff --git a/packages/perl/Cwd.pm.patch b/packages/perl/Cwd.pm.patch
index 3d3ff7f7..333feeb1 100644
--- a/packages/perl/Cwd.pm.patch
+++ b/packages/perl/Cwd.pm.patch
@@ -1,15 +1,24 @@
-diff -u -r ../perl-5.20.2/dist/PathTools/Cwd.pm ./dist/PathTools/Cwd.pm
---- ../perl-5.20.2/dist/PathTools/Cwd.pm	2015-01-10 07:06:37.000000000 -0500
-+++ ./dist/PathTools/Cwd.pm	2015-05-17 19:40:53.224454256 -0400
-@@ -333,9 +333,8 @@
- # are safe.  This prevents _backtick_pwd() consulting $ENV{PATH}
+diff -u -r ../perl-5.22.0/dist/PathTools/Cwd.pm ./dist/PathTools/Cwd.pm
+--- ../perl-5.24.1/dist/PathTools/Cwd.pm	2016-07-25 09:12:20.000000000 +0000
++++ ./dist/PathTools/Cwd.pm	2017-02-28 20:36:10.314765294 +0000
+@@ -179,9 +179,8 @@
  # so everything works under taint mode.
  my $pwd_cmd;
--foreach my $try ('/bin/pwd',
--		 '/usr/bin/pwd',
--		 '/QOpenSys/bin/pwd', # OS/400 PASE.
-+foreach my $try ('@TERMUX_PREFIX@/bin/pwd',
-+		 '@TERMUX_PREFIX@/bin/applets/pwd'
- 		) {
- 
-     if( -x $try ) {
+ if($^O ne 'MSWin32') {
+-    foreach my $try ('/bin/pwd',
+-		     '/usr/bin/pwd',
+-		     '/QOpenSys/bin/pwd', # OS/400 PASE.
++    foreach my $try ('@TERMUX_PREFIX@/bin/applets/pwd',
++		     '@TERMUX_PREFIX@/bin/pwd'
+ 		    ) {
+ 	if( -x $try ) {
+ 	    $pwd_cmd = $try;
+@@ -198,7 +197,7 @@
+ 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 (defined($Config::Config{targetsh}) && -x $Config::Config{targetsh}) {
+         $pwd_cmd = "$Config::Config{targetsh} -c pwd"
+     }
+     else {