rpms/perl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New findbin-selinux patch: it now passes the FindBin.t tests (#127023)

Browse Source
This commit is contained in:
Warren Togami 2005-05-14 07:33:42 +00:00
parent caa5ca9f65
commit 4ff4a21974
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
perl-5.8.6-findbin-selinux.patch
View File

@ -1,25 +1,16 @@
diff -ruN perl-5.8.6-orig/lib/FindBin.pm perl-5.8.6/lib/FindBin.pm
diff -urN perl-5.8.6-orig/lib/FindBin.pm perl-5.8.6/lib/FindBin.pm
--- perl-5.8.6-orig/lib/FindBin.pm 2003-12-27 14:52:04.000000000 +0000
+++ perl-5.8.6/lib/FindBin.pm 2005-04-27 11:52:30.000000000 +0100
@@ -179,8 +179,8 @@
+++ perl-5.8.6/lib/FindBin.pm 2005-05-14 03:48:00.000000000 +0100
@@ -179,8 +179,10 @@
}
# Get absolute paths to directories
- $Bin = abs_path($Bin) if($Bin);
- $RealBin = abs_path($RealBin) if($RealBin);
+ $Bin = abs_path($Bin) unless (!$Bin || File::Spec->file_name_is_absolute($Bin));
+ $RealBin = abs_path($RealBin) unless (!$RealBin || File::Spec->file_name_is_absolute($RealBin));
+ $Bin = abs_path($Bin) unless (!$Bin || (File::Spec->file_name_is_absolute($Bin)
+ && ($Bin = File::Spec->canonpath($Bin))));
+ $RealBin = abs_path($RealBin) unless (!$RealBin || (File::Spec->file_name_is_absolute($RealBin)
+ && ($RealBin = File::Spec->canonpath($RealBin))));
}
}
}
diff -ruN perl-5.8.6-orig/MANIFEST perl-5.8.6/MANIFEST
--- perl-5.8.6-orig/MANIFEST 2004-11-01 15:42:06.000000000 +0000
+++ perl-5.8.6/MANIFEST 2005-04-27 11:52:46.000000000 +0100
@@ -1392,7 +1392,6 @@
lib/Filter/Simple/t/filter.t See if Filter::Simple works
lib/Filter/Simple/t/import.t See if Filter::Simple works
lib/FindBin.pm Find name of currently executing program
-lib/FindBin.t See if FindBin works
lib/finddepth.pl A depth-first find emulator--used by find2perl
lib/find.pl A find emulator--used by find2perl
lib/flush.pl Routines to do single flush

6
perl.spec
View File

@ -5,7 +5,7 @@
%define multilib_64_archs x86_64 s390x ppc64 sparc64
%define perlver 5.8.6
%define perlrel 11
%define perlrel 12
%define perlepoch 3
Provides: perl(:WITH_PERLIO)
@ -421,8 +421,8 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Tue May 10 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-11
- Rediff the findbin-selinux patch in order to disable the FindBin.t test
* Sat May 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-12
- New findbin-selinux patch: it now passes the FindBin.t tests
(patch28 replaces patch23). #118877 #127023
- Remove 5.8.2 ABI compat (#154295 comments 6 and 7).