[dspam] docs and socket patches

[Nathanael Noblet]

commit 353d17a5af56614eff18aa5654075cddabd61156
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Jan 26 11:41:21 2011 -0700

    docs and socket patches

 dspam-3.9.0-docs.patch      |   45 +++++++++++++++++++++++++++++++++++++++++++
 dspam-3.9.0-dspamsock.patch |   19 ++++++++++++++++++
 dspam.spec                  |    7 ++++++
 3 files changed, 71 insertions(+), 0 deletions(-)
---
diff --git a/dspam-3.9.0-docs.patch b/dspam-3.9.0-docs.patch
new file mode 100644
index 0000000..46f6bb9
--- /dev/null
+++ b/dspam-3.9.0-docs.patch
@@ -0,0 +1,45 @@
+--- doc/postfix.txt	2009-12-14 18:10:46.000000000 -0700
++++ doc/postfix.txt.new	2011-01-26 11:23:42.595147369 -0700
+@@ -34,10 +34,10 @@
+ ServerMode		auto
+ ServerParameters	"--deliver=innocent"
+ ServerIdent		"localhost.localdomain"
+-ServerPID		/var/run/dspam.pid
+-ServerDomainSocketPath	"/tmp/dspam.sock"
++ServerPID		/var/run/dspam/dspam.pid
++ServerDomainSocketPath	"/var/run/dspam/dspam.sock"
+ 
+-  This will tell DSPAM to listen on /tmp/dspam.sock using the options above.
++  This will tell DSPAM to listen on /var/run/dspam/dspam.sock using the options above.
+ 
+   You'll also need to configure DSPAM to pass the good mail back into Postfix.
+   Comment out any "TrustedDeliveryAgent" option in dspam.conf and replace it
+@@ -81,7 +81,7 @@
+   To:
+ 
+ smtp      inet  n       -       n       -       -        smtpd
+-  -o content_filter=lmtp:unix:/tmp/dspam.sock
++  -o content_filter=lmtp:unix:/var/run/dspam/dspam.sock
+ 
+   This tells Postfix to send all mail to DSPAM for content filtering.
+ 
+--- doc/relay.txt	2009-12-14 18:10:46.000000000 -0700
++++ doc/relay.txt.new	2011-01-26 11:24:43.113030462 -0700
+@@ -68,7 +68,7 @@
+ ServerMode		standard
+ ServerParameters	"--deliver=innocent"
+ ServerIdent		"localhost.localdomain"
+-ServerDomainSocketPath	/tmp/dspam.sock
++ServerDomainSocketPath	/var/run/dspam/dspam.sock
+ 
+ You'll also want to use the following ParseToHeader parameters:
+ 
+@@ -88,7 +88,7 @@
+ this and add MySQL support for virtual_mailbox_domains, but you'll need to
+ maintain your own database table for that.
+ 
+-virtual_transport	= lmtp:unix:/tmp/dspam.sock
++virtual_transport	= lmtp:unix:/var/run/dspam/dspam.sock
+ virtual_mailbox_domains	= example.com
+ virtual_mailbox_maps	= mysql:/etc/postfix/vmailbox.cf
+ 
diff --git a/dspam-3.9.0-dspamsock.patch b/dspam-3.9.0-dspamsock.patch
new file mode 100644
index 0000000..4c15bea
--- /dev/null
+++ b/dspam-3.9.0-dspamsock.patch
@@ -0,0 +1,19 @@
+--- src/dspam.conf.in	2010-01-11 14:21:58.000000000 -0700
++++ src/dspam.conf.in.new	2011-01-26 11:21:01.667508786 -0700
+@@ -814,14 +814,14 @@
+ # you are running the client and server on the same machine, as it eliminates
+ # much of the bandwidth overhead.
+ #
+-#ServerDomainSocketPath	"/tmp/dspam.sock"
++#ServerDomainSocketPath	"/var/run/dspam/dspam.sock"
+ 
+ #
+ # Client Mode: If you are running DSPAM in client/server mode, uncomment and
+ # set these variables. A ClientHost beginning with a / will be treated as
+ # a domain socket.
+ #
+-#ClientHost	/tmp/dspam.sock
++#ClientHost	/var/run/dspam/dspam.sock
+ #ClientIdent	"secret at Relay1"
+ #
+ #ClientHost	127.0.0.1
diff --git a/dspam.spec b/dspam.spec
index ded776f..bc20193 100644
--- a/dspam.spec
+++ b/dspam.spec
@@ -21,6 +21,8 @@ Source5:                dspam-front
 Source6:                dspam-sysconfig
 Source99:               dspam-filter-requires.sh
 Patch0:                 dspam-3.9.0-file-name.patch
+Patch1:			dspam-3.9.0-docs.patch
+Patch2:			dspam-3.9.0-dspamsock.patch
 URL:                    http://www.nuclearelephant.com/
 # kept to be able to build EPEL versions
 Buildroot:              %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -130,6 +132,8 @@ Web-based interface for DSPAM's powerful Anti-Spam engine.
 
 %setup -q
 %patch0 -p1
+%patch1 -p0
+%patch2 -p0
 
 %build
 sh ./autogen.sh
@@ -362,6 +366,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
 
 %changelog
+* Wed Jan 26 2011 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-12
+- Patch config & doc defaults to put the socket in /var/run/dspam
+
 * Tue Nov 23 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-11
 - Updated for var-run-tmpfs feature