>From 11b885cecf4c795a8f4fee06b4a057da9b725460 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <j.orti.alca...@gmail.com>
Date: Mon, 30 Nov 2015 11:07:50 +0100
Subject: Add patch to fix Spamassassin (rhbz#1286589)
---
amavisd-new.spec | 7 ++++++-
amavisd-sa_fix.patch | 13 +++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 amavisd-sa_fix.patch
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 1001e8a..8654d5d 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.5.2
-Release: 3%{?prerelease:.%{prerelease}}%{?dist}
+Release: 4%{?prerelease:.%{prerelease}}%{?dist}
License: GPL
Group: Applications/System
URL: http://www.ijs.si/software/amavisd/
@@ -18,6 +18,7 @@ Patch0: amavisd-conf.patch
Patch1: amavisd-init.patch
Patch2: amavisd-condrestart.patch
Patch3: amavisd-db.patch
+Patch4: amavisd-sa_fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root/
Requires: smtpdaemon
Requires: /usr/sbin/clamd, /etc/clamd.d
@@ -85,6 +86,7 @@ which could cause a mail loss.
%patch1 -p1
%patch2 -p0
%patch3 -p0
+%patch4 -p1
install -m644 %{SOURCE4} %{SOURCE5} README_FILES/
sed -i -e 's,/var/amavis/amavisd.sock\>,/var/spool/amavisd/amavisd.sock,' \
@@ -166,6 +168,9 @@ fi
%ghost /var/spool/amavisd/clamd.sock
%changelog
+* Mon Nov 30 2015 Juan Orti Alcaine <jo...@fedoraproject.org> 2.5.2-4
+- Add patch to fix Spamassassin (rhbz#1286589)
+
* Thu Aug 07 2014 Juan Orti Alcaine <jo...@fedoraproject.org> 2.5.2-3
- Change permissions of /var/spool/amavisd folders to 750
diff --git a/amavisd-sa_fix.patch b/amavisd-sa_fix.patch
new file mode 100644
index 0000000..23ada10
--- /dev/null
+++ b/amavisd-sa_fix.patch
@@ -0,0 +1,13 @@
+diff --git a/amavisd b/amavisd
+index bc2f365..58273aa 100755
+--- a/amavisd
++++ b/amavisd
+@@ -17971,7 +17971,7 @@ sub call_spamassassin($$$) {
+ my($self,$msginfo,$lines) = @_;
+ my($mail_obj,$per_msg_status);
+ my($which_section) = 'SA prepare';
+- my($data_representation) = 'GLOB'; # pass data as ARRAY or a GLOB to SA
++ my($data_representation) = 'ARRAY'; # pass data as ARRAY or a GLOB to SA
+ my($saved_umask) = umask; my($saved_pid) = $$;
+ my($spamassassin_obj) = $self->{'spamassassin_obj'};
+ my($sa_version) = $self->sa_version;
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/amavisd-new.git/commit/?h=el5&id=11b885cecf4c795a8f4fee06b4a057da9b725460
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
