[dspam/f17] add exim patch, fix requires

[Nathanael Noblet]

commit 32a021d2b73e470ab65b4422822909e99a96186e
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Sun Oct 7 23:58:53 2012 -0600

    add exim patch, fix requires

 .gitignore              |    1 +
 dspam-3.10.2.exim.patch |   35 +++++++++++++++++++++++++++++++++++
 dspam.spec              |   16 ++++++++++++----
 3 files changed, 48 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3916ccd..fa1c4e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ dspam-3.9.0.tar.gz
 dspam-3.10.0.tar.gz
 /dspam-3.10.1.tar.gz
 /dspam-3.10.2.tar.gz
+/.project
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 f745697..6cace29 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:                1%{?dist}
+Release:                2%{?dist}
 License:                GPLv2
 Group:                  System Environment/Daemons
 Source0:                http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -24,7 +24,9 @@ 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)
@@ -35,10 +37,11 @@ BuildRequires:          mysql-devel
 BuildRequires:          postgresql-devel
 BuildRequires:          sqlite-devel
 BuildRequires:          openldap-devel
-BuildRequires:			systemd-units
+BuildRequires:          systemd-units
 
 Requires:               dspam-libs = %{version}-%{release}
-Requires(post): 		systemd-sysv
+Requires(post):         systemd-sysv
+Requires:               perl(Mail::MboxParser)
 
 %description
 The DSPAM agent masquerades as the email server's local delivery agent
@@ -135,6 +138,7 @@ Web-based interface for DSPAM's powerful Anti-Spam engine.
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
 
 %build
 
@@ -376,6 +380,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
 
 %changelog
+* Sun Oct 7 2012 Nathanael Noblet <nathanael at gnat.ca> - 3.10.2-2
+- Add exim patch
+- Require perl(Mail::MboxParser) fixes bug #622502
+
 * Wed May 2 2012 Nathanael Noblet <nathanael at gnat.ca> - 3.10.2-1
 - New upstream release