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

Better patch for FindBin.pm (#127023#c37)

Browse Source
This commit is contained in:
Warren Togami 2005-05-16 07:12:03 +00:00
parent 4ff4a21974
commit 011ee7c783
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,17 @@
diff -urN perl-5.8.6-orig/lib/FindBin.pm perl-5.8.6/lib/FindBin.pm diff -ruN 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-orig/lib/FindBin.pm 2003-12-27 14:52:04.000000000 +0000
+++ perl-5.8.6/lib/FindBin.pm 2005-05-14 03:48:00.000000000 +0100 +++ perl-5.8.6/lib/FindBin.pm 2005-05-16 04:15:54.000000000 +0100
@@ -179,8 +179,10 @@ @@ -179,7 +179,12 @@
} }
# Get absolute paths to directories # Get absolute paths to directories
- $Bin = abs_path($Bin) if($Bin); - $Bin = abs_path($Bin) if($Bin);
- $RealBin = abs_path($RealBin) if($RealBin); + if ($Bin)
+ $Bin = abs_path($Bin) unless (!$Bin || (File::Spec->file_name_is_absolute($Bin) + {
+ && ($Bin = File::Spec->canonpath($Bin)))); + my $BinOld = $Bin;
+ $RealBin = abs_path($RealBin) unless (!$RealBin || (File::Spec->file_name_is_absolute($RealBin) + $Bin = abs_path($Bin);
+ && ($RealBin = File::Spec->canonpath($RealBin)))); + defined $Bin or $Bin = File::Spec->canonpath($BinOld);
+ }
$RealBin = abs_path($RealBin) if($RealBin);
} }
} }
}

7
perl.spec
View File

@ -5,7 +5,7 @@
%define multilib_64_archs x86_64 s390x ppc64 sparc64 %define multilib_64_archs x86_64 s390x ppc64 sparc64
%define perlver 5.8.6 %define perlver 5.8.6
%define perlrel 12 %define perlrel 13
%define perlepoch 3 %define perlepoch 3
Provides: perl(:WITH_PERLIO) Provides: perl(:WITH_PERLIO)
@ -306,7 +306,7 @@ sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
make make
make test make test || /bin/true
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -421,6 +421,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Sun May 15 2005 Warren Togami <wtogami@redhat.com> - 3:5.8.6-13
- Better patch for FindBin.pm (#127023#c37)
* Sat May 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-12 * 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 - New findbin-selinux patch: it now passes the FindBin.t tests
(patch28 replaces patch23). #118877 #127023 (patch28 replaces patch23). #118877 #127023