rpms/perl/devel perl-5.10.0-spamassassin.patch, NONE, 1.1 perl.spec, 1.226, 1.227

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27375

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-spamassassin.patch 
Log Message:
* Tue Jul 28 2009 arcela Mašláňová <mmaslano at redhat.com> - 4:5.10.0-77
- 510127 spam assassin suffer from tainted bug


perl-5.10.0-spamassassin.patch:
 Basename.pm |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE perl-5.10.0-spamassassin.patch ---
diff -up perl-5.10.0/lib/File/Basename.pm.spam perl-5.10.0/lib/File/Basename.pm
--- perl-5.10.0/lib/File/Basename.pm.spam	2009-07-27 08:45:18.000000000 +0200
+++ perl-5.10.0/lib/File/Basename.pm	2009-07-28 09:01:54.757410886 +0200
@@ -331,6 +331,7 @@ sub dirname {
 sub _strip_trailing_sep  {
     my $type = $Fileparse_fstype;
 
+	local $1;
     if ($type eq 'MacOS') {
         $_[0] =~ s/([^:]):\z/$1/s;
     }


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- perl.spec	27 Jul 2009 07:11:48 -0000	1.226
+++ perl.spec	28 Jul 2009 07:31:46 -0000	1.227
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        76%{?dist}
+Release:        77%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -196,6 +196,9 @@ Patch60:	perl-skip-prereq.patch
 # RT #60508
 Patch61:	perl-5.10.0-much-better-swap-logic.patch
 
+# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6148
+Patch62:	perl-5.10.0-spamassassin.patch
+
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
 Patch100:	perl-update-constant.patch
@@ -1004,6 +1007,7 @@ upstream tarball from perl.org.
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
+%patch62 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -1277,6 +1281,7 @@ perl -x patchlevel.h \
 	'Fedora Patch59: h2ph: generated *.ph files no longer produce warnings when processed' \
 	'Fedora Patch60: remove PREREQ_FATAL from Makefile.PLs processed by miniperl' \
 	'Fedora Patch61: much better swap logic to support reentrancy and fix assert failure' \
+	'Fedora Patch62: spam assassin needs workaround for removing tainted mode' \
 	'Fedora Patch100: Update module constant to %{constant_version}' \
 	'Fedora Patch101: Update Archive::Extract to %{Archive_Extract_version}' \
 	'Fedora Patch102: Update Archive::Tar to %{Archive_Tar_version}' \
@@ -1924,6 +1929,9 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Jul 28 2009 arcela Mašláňová <mmaslano at redhat.com> - 4:5.10.0-77
+- 510127 spam assassin suffer from tainted bug
+
 * Mon Jul 27 2009 Marcela Mašláňová <mmaslano at redhat.com> - 4:5.10.0-76
 - 494773 much better swap logic to support reentrancy and fix assert failure (rt #60508)