commit be45028815d8b485ee71151d9677ff4a621af086 Author: Nathanael D. Noblet <nathanael@xxxxxxx> Date: Sun Oct 7 23:44:53 2012 -0600 add exim patch and fix bug 622502 dspam-3.10.2.exim.patch | 35 +++++++++++++++++++++++++++++++++++ dspam.spec | 11 +++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) --- diff --git a/dspam-3.10.2.exim.patch b/dspam-3.10.2.exim.patch new file mode 100644 index 0000000..f3031c2 --- /dev/null +++ b/dspam-3.10.2.exim.patch @@ -0,0 +1,35 @@ +--- doc/exim.txt 2011-08-16 17:38:30.000000000 -0500 ++++ doc/exim.txt_NEW 2012-08-02 10:06:19.405528304 -0500 +@@ -40,11 +40,17 @@ + + command = /usr/local/bin/dspam --deliver=innocent --user "$local_part@$domain" -- %u + +-Finally, you will need to configure and compile DSPAM. DSPAM will most likely +-end up calling exim again for delivery, using the spam-scanned protocol to +-identify scanned messages. The most common example is: +- +- ./configure --with-delivery-agent="/usr/sbin/exim -oMr spam-scanned" ++Finally, you will need to configure and compile DSPAM. You can configure ++DSPAM with the appropriate LDA using --with-delivery-agent= at configure ++time or by specifying TrustedDeliveryAgent in dspam.conf. DSPAM will most ++likely end up calling exim again for delivery, using the spam-scanned ++protocol to identify scanned messages. The most common example is: ++ ++ ./configure --with-delivery-agent="/usr/sbin/exim -oMr spam-scanned -oi" ++ ++Note: DSPAM expects the LDA to NOT provide the "line with a single dot (.)" ++processing to indicate the end of data that a MTA must provide to meet the ++SMTP RFC, hence the "-oi" option to exim above. + + RUNNING WITHOUT PRIVILEGED EXIM USERS + +--- src/dspam.conf.in 2012-04-11 13:48:33.000000000 -0500 ++++ src/dspam.conf.in_NEW 2012-08-02 10:09:38.235559835 -0500 +@@ -43,7 +43,7 @@ + # Other popular configurations: + #TrustedDeliveryAgent "/usr/cyrus/bin/deliver" # Cyrus + #TrustedDeliveryAgent "/bin/maildrop" # Maildrop +-#TrustedDeliveryAgent "/usr/local/sbin/exim -oMr spam-scanned" # Exim ++#TrustedDeliveryAgent "/usr/local/sbin/exim -oMr spam-scanned -oi" # Exim + # + TrustedDeliveryAgent "@delivery_agent@" diff --git a/dspam.spec b/dspam.spec index e7103bf..c79f9e1 100644 --- a/dspam.spec +++ b/dspam.spec @@ -11,7 +11,7 @@ Summary: A library and Mail Delivery Agent for Bayesian SPAM filtering Name: dspam Version: 3.10.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -24,7 +24,8 @@ Source8: dspam-systemd Source99: dspam-filter-requires.sh Patch1: dspam-3.9.0-docs.patch Patch2: dspam-3.9.0-dspamsock.patch -Patch3: dspam-default-server-port.patch +Patch3: dspam-default-server-port.patch +Patch4: dspam-3.10.2.exim.patch URL: http://www.nuclearelephant.com/ # kept to be able to build EPEL versions Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -39,6 +40,7 @@ BuildRequires: systemd-units Requires: dspam-libs = %{version}-%{release} Requires(post): systemd-sysv +Requires: perl(Mail::MboxParser) %description The DSPAM agent masquerades as the email server's local delivery agent @@ -135,6 +137,7 @@ Web-based interface for DSPAM's powerful Anti-Spam engine. %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %build @@ -376,6 +379,10 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf %changelog +* Sun Oct 7 2012 Nathanael Noblet <nathanael@xxxxxxx> - 3.10.2-3 +- Add exim patch +- Require perl(Mail::MboxParser) fixes bug #622502 + * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 3.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel