From caa5ca9f659cad64eaa40e0db2883c46eb324ac1 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Wed, 11 May 2005 09:14:01 +0000
Subject: [PATCH] - 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).

---
 perl-5.8.6-findbin-selinux.patch | 25 +++++++++++++++++++++++++
 perl.spec                        | 20 ++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 perl-5.8.6-findbin-selinux.patch

diff --git a/perl-5.8.6-findbin-selinux.patch b/perl-5.8.6-findbin-selinux.patch
new file mode 100644
index 0000000..817cd14
--- /dev/null
+++ b/perl-5.8.6-findbin-selinux.patch
@@ -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
diff --git a/perl.spec b/perl.spec
index 91b8480..e116e08 100644
--- a/perl.spec
+++ b/perl.spec
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver 5.8.6
-%define perlrel 10
+%define perlrel 11
 %define perlepoch 3
 
 Provides: perl(:WITH_PERLIO)
@@ -20,8 +20,7 @@ Provides: perl(:WITHOUT_ITHREADS)
 Provides: perl(:WITHOUT_THREADS)
 %endif
 
-%define perlmodcompat 5.8.5 5.8.4 5.8.3 5.8.2
-Provides: perl(:MODULE_COMPAT_5.8.2)
+%define perlmodcompat 5.8.5 5.8.4 5.8.3
 Provides: perl(:MODULE_COMPAT_5.8.3)
 Provides: perl(:MODULE_COMPAT_5.8.4)
 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
 Patch22: perl-5.8.1-lpthread-link.patch
 
-# bugzilla 118877
-Patch23: perl-5.8.3-findbin-selinux.patch
-
 # fix empty RPATH security issue
 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
 Patch27: perl-5.8.5-CAN-2005-0155+0156.patch
 
+# bugzilla 118877, 127023
+Patch28: perl-5.8.6-findbin-selinux.patch
+
 # arch-specific patches
 Patch100: perl-5.8.1-fpic.patch
 Patch101: perl-5.8.0-libdir64.patch
@@ -218,11 +217,11 @@ more secure running of setuid perl scripts.
 
 %patch19 -p1
 %patch21 -p1
-%patch23 -p1
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
 %patch27 -p0
+%patch28 -p1
 
 %patch100 -p1
 
@@ -307,7 +306,7 @@ sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
 
 make
 
-make test < /dev/null || /bin/true
+make test
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -422,6 +421,11 @@ 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
+  (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
 - Apply fixes for CAN-2004-0452, CAN-2005-0155 and CAN-2005-0156 (#156128).