rpms/perl/devel perl-5.8.6-findbin-selinux.patch, 1.1, 1.2 perl.spec, 1.58, 1.59

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat May 14 07:33:45 UTC 2005


Author: wtogami

Update of /cvs/dist/rpms/perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6934

Modified Files:
	perl-5.8.6-findbin-selinux.patch perl.spec 
Log Message:
New findbin-selinux patch: it now passes the FindBin.t tests (#127023)


perl-5.8.6-findbin-selinux.patch:
 FindBin.pm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Index: perl-5.8.6-findbin-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl-5.8.6-findbin-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-5.8.6-findbin-selinux.patch	11 May 2005 09:14:01 -0000	1.1
+++ perl-5.8.6-findbin-selinux.patch	14 May 2005 07:33:42 -0000	1.2
@@ -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


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- perl.spec	11 May 2005 09:14:01 -0000	1.58
+++ perl.spec	14 May 2005 07:33:42 -0000	1.59
@@ -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 @@
 %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).
 




More information about the fedora-cvs-commits mailing list