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

- Rediff the findbin-selinux patch in order to disable the FindBin.t test

Browse Source 
(patch28 replaces patch23). #118877 #127023
- Remove 5.8.2 ABI compat (#154295 comments 6 and 7).
This commit is contained in:
Warren Togami 2005-05-11 09:14:01 +00:00
parent fb212f209d
commit caa5ca9f65
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
perl-5.8.6-findbin-selinux.patch Normal file
View File

@ -0,0 +1,25 @@
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/lib/FindBin.pm 2005-04-27 11:52:30.000000000 +0100
@@ -179,8 +179,8 @@
}
# 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));
}
}
}
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

20
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 10 %define perlrel 11
%define perlepoch 3 %define perlepoch 3
Provides: perl(:WITH_PERLIO) Provides: perl(:WITH_PERLIO)
@ -20,8 +20,7 @@ Provides: perl(:WITHOUT_ITHREADS)
Provides: perl(:WITHOUT_THREADS) Provides: perl(:WITHOUT_THREADS)
%endif %endif
%define perlmodcompat 5.8.5 5.8.4 5.8.3 5.8.2 %define perlmodcompat 5.8.5 5.8.4 5.8.3
Provides: perl(:MODULE_COMPAT_5.8.2)
Provides: perl(:MODULE_COMPAT_5.8.3) Provides: perl(:MODULE_COMPAT_5.8.3)
Provides: perl(:MODULE_COMPAT_5.8.4) Provides: perl(:MODULE_COMPAT_5.8.4)
Provides: perl(:MODULE_COMPAT_5.8.5) Provides: perl(:MODULE_COMPAT_5.8.5)
@ -91,9 +90,6 @@ Patch21: perl-5.8.0-rpath-make.patch
# bugzilla 101767, make sure threads.so links directly to -lpthread # bugzilla 101767, make sure threads.so links directly to -lpthread
Patch22: perl-5.8.1-lpthread-link.patch Patch22: perl-5.8.1-lpthread-link.patch
# bugzilla 118877
Patch23: perl-5.8.3-findbin-selinux.patch
# fix empty RPATH security issue # fix empty RPATH security issue
Patch24: perl-5.8.3-empty-rpath.patch Patch24: perl-5.8.3-empty-rpath.patch
@ -106,6 +102,9 @@ Patch26: perl-5.8.0-rmtree.patch
# CAN-2005-0155 and CAN-2005-0156 fix # CAN-2005-0155 and CAN-2005-0156 fix
Patch27: perl-5.8.5-CAN-2005-0155+0156.patch Patch27: perl-5.8.5-CAN-2005-0155+0156.patch
# bugzilla 118877, 127023
Patch28: perl-5.8.6-findbin-selinux.patch
# arch-specific patches # arch-specific patches
Patch100: perl-5.8.1-fpic.patch Patch100: perl-5.8.1-fpic.patch
Patch101: perl-5.8.0-libdir64.patch Patch101: perl-5.8.0-libdir64.patch
@ -218,11 +217,11 @@ more secure running of setuid perl scripts.
%patch19 -p1 %patch19 -p1
%patch21 -p1 %patch21 -p1
%patch23 -p1
%patch24 -p1 %patch24 -p1
%patch25 -p1 %patch25 -p1
%patch26 -p1 %patch26 -p1
%patch27 -p0 %patch27 -p0
%patch28 -p1
%patch100 -p1 %patch100 -p1
@ -307,7 +306,7 @@ sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
make make
make test < /dev/null || /bin/true make test
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -422,6 +421,11 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %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
(patch28 replaces patch23). #118877 #127023
- Remove 5.8.2 ABI compat (#154295 comments 6 and 7).
* Thu Apr 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 3:5.8.6-10 * Thu Apr 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 3:5.8.6-10
- Apply fixes for CAN-2004-0452, CAN-2005-0155 and CAN-2005-0156 (#156128). - Apply fixes for CAN-2004-0452, CAN-2005-0155 and CAN-2005-0156 (#156128).