Fix some typos.

2 files changed, 66 insertions, 53 deletions

diff --git a/mail/dspam/files/patch-src__dspam.conf.in b/mail/dspam/files/patch-src__dspam.conf.in
new file mode 100644
index 00000000000..63e907c50ea
--- /dev/null
+++ b/mail/dspam/files/patch-src__dspam.conf.in
@@ -0,0 +1,66 @@
+--- ./src/dspam.conf.in.orig	Tue Oct 10 01:22:52 2006
++++ ./src/dspam.conf.in	Tue Oct 10 01:39:10 2006
+@@ -52,7 +52,7 @@
+ # the user DSPAM is processing mail for. This configuration parameter is only 
+ # necessary if you plan on allowing untrusted processing.
+ #
+-#UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
++#UntrustedDeliveryAgent "@delivery_agent@"
+ 
+ #
+ # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP 
+@@ -85,7 +85,7 @@
+ # a quarantine agent which will be called with all messages DSPAM thinks is
+ # spam. Use %u to specify the user DSPAM is processing mail for.
+ #
+-#QuarantineAgent	"/usr/bin/procmail -d spam"
++#QuarantineAgent	"@delivery_agent@"
+ 
+ #
+ # DSPAM can optionally process "plused users" (addresses in the user+detail
+@@ -273,7 +273,7 @@
+ # Storage driver settings: Specific to a particular storage driver. Uncomment
+ # the configuration specific to your installation, if applicable.
+ #
+-#MySQLServer    	/var/lib/mysql/mysql.sock
++#MySQLServer    	/tmp/mysql.sock
+ #MySQLPort
+ #MySQLUser 	     	dspam
+ #MySQLPass    		changeme
+@@ -619,7 +619,10 @@
+ # If the message is larger than the maximum size, it will be delivered 
+ # without processing. Value is in bytes.
+ #
++# WARNING: this applies to clamav scan also
++#
+ #MaxMessageSize 4194304
++MaxMessageSize 307200
+ 
+ #
+ # Virus Checking: If you are running clamd, DSPAM can perform stream-based
+@@ -644,6 +647,7 @@
+ #
+ #ServerPort		24
+ #ServerQueueSize	32
++# keep this is sync with /usr/local/etc/rc.d/dspam[.sh] rc.d script
+ #ServerPID              /var/run/dspam.pid
+ 
+ #
+@@ -680,14 +684,15 @@
+ # you are running the client and server on the same machine, as it eliminates
+ # much of the bandwidth overhead.
+ #
+-#ServerDomainSocketPath  "/tmp/dspam.sock"
++# keep this is sync with /usr/local/etc/rc.d/dspam[.sh] rc.d script
++#ServerDomainSocketPath  "/var/run/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.sock
+ #ClientIdent	"secret@Relay1"
+ #
+ #ClientHost	127.0.0.1
diff --git a/mail/dspam/files/patch-src_dspam.conf.in b/mail/dspam/files/patch-src_dspam.conf.in
deleted file mode 100644
index a369da8bf8f..00000000000
--- a/mail/dspam/files/patch-src_dspam.conf.in
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/dspam.conf.in.dist	Fri Feb 25 23:08:31 2005
-+++ src/dspam.conf.in	Fri Feb 25 23:19:02 2005
-@@ -35,6 +35,7 @@
- # necessary if you plan on allowing untrusted processing.
- #
- #UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
-+#UntrustedDeliveryAgent "@delivery_agent@"
- 
- #
- # LMTP Delivery: Alternatively, you may wish to use LMTP delivery to deliver
-@@ -53,6 +54,7 @@
- # spam. Use %u to specify the user DSPAM is processing mail for.
- #
- #QuarantineAgent	"/usr/bin/procmail -d spam"
-+#QuarantineAgent       "@delivery_agent@"
- 
- #
- # OnFail: What to do if local delivery or quarantine should fail. If set
-@@ -179,7 +181,7 @@
- # Storage driver settings: Specific to a particular storage driver. Uncomment
- # the configuration specific to your installation, if applicable.
- #
--#MySQLServer    	/var/lib/mysql/mysql.sock
-+#MySQLServer    	/tmp/mysql.sock
- #MySQLPort
- #MySQLUser 	     	dspam
- #MySQLPass    		changeme
-@@ -385,6 +387,7 @@
- # without processing. Value is in bytes.
- #
- #MaxMessageSize 4194304
-+MaxMessageSize 307200
- 
- #
- # Daemonized Server: If you are running DSPAM as a daemonized server using
-@@ -396,6 +399,7 @@
- #
- #ServerPort		24
- #ServerQueueSize	32
-+# keep this is sync with /usr/local/etc/rc.d/dspam.rc script
- #ServerPID              /var/run/dspam.pid
- 
- #
-@@ -422,7 +426,8 @@
- # you are running the client and server on the same machine, as it eliminates
- # much of the bandwidth overhead.
- #
--#ServerDomainSocketPath  "/tmp/dspam.sock"
-+# keep this is sync with /usr/local/etc/rd.d/dspam.rc script
-+#ServerDomainSocketPath  "/var/run/dspam.sock"
- 
- #
- # Client Mode: If you are running DSPAM in client/server mode, uncomment and