diff --git a/perl-5.10.0-spamassassin.patch b/perl-5.10.0-spamassassin.patch new file mode 100644 index 0000000..ca6ff87 --- /dev/null +++ b/perl-5.10.0-spamassassin.patch @@ -0,0 +1,11 @@ +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; + } diff --git a/perl.spec b/perl.spec index 2084c35..a34dcb3 100644 --- a/perl.spec +++ b/perl.spec @@ -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á - 4:5.10.0-77 +- 510127 spam assassin suffer from tainted bug + * Mon Jul 27 2009 Marcela Mašláňová - 4:5.10.0-76 - 494773 much better swap logic to support reentrancy and fix assert failure (rt #60508)