Update to dspam 3.60

ok'ed xtraeme@

From the RELEASE file:
Automatic Whitelisting Improvements
Dynamically Loadable Storage Driver Support
PostgreSQL Performance Enhancements
LDAP Verification
Unified Spam Alias / UID in Signature Support
Domain Based Delivery Hosts
Integrated Clam A/V Support
Markovian Discrimination
Self-Contained Hash Driver
Fallback Domain-Based User Support
Improved, Unified Logging
Activity logging has also been improved
Plused Detail Support
Message Fragments Support
Domain Blocklisting Support
User preferences made case-insensitive
LMTP error codes now include messages from relay host
RBLInoculate option allows RBL'd emails to be quarantined or learned as spam
MySQL and PgSQL object creation scripts updated to improve performance
Added 'date' to quarantine display and sorted most recent at top
Significant code cleanup and audit
Domain-based groups changed from @domain.tld to *@domain.tld
X-DSPAM-Result expanded to support Virus, Blacklisted, and Blocklisted results
DSPAM WebUI now supports history paging
Rewritten documentation for ease of installation

4 files changed, 81 insertions, 18 deletions

diff --git a/mail/dspam/patches/patch-aa b/mail/dspam/patches/patch-aa
index c55a1ba61c4..bed1d6e5fb0 100644
--- a/mail/dspam/patches/patch-aa
+++ b/mail/dspam/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2005/03/21 21:35:52 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/20 08:33:13 adrianp Exp $
 
---- src/Makefile.in.orig	2005-02-17 15:16:55.000000000 +0100
-+++ src/Makefile.in	2005-02-17 15:17:01.000000000 +0100
-@@ -251,7 +251,7 @@
+--- src/Makefile.in.orig	2005-10-17 14:07:30.000000000 +0100
++++ src/Makefile.in
+@@ -373,7 +373,7 @@ DIST_SUBDIRS = . \
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = dspam.pc
  etcdir = $(sysconfdir)
 -etc_SCRIPTS = dspam_conf
 +etc_SCRIPTS =
+ libversion = 7:0:0
  
  # Defaults from dspam.conf
- EXTRA_DIST = example.c dspam-button.gif dspam.pc.in dspam-uninstalled.pc.in \
diff --git a/mail/dspam/patches/patch-ab b/mail/dspam/patches/patch-ab
deleted file mode 100644
index aabd91ff4a5..00000000000
--- a/mail/dspam/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/dspam.c.orig	2005-04-20 10:07:19.000000000 -0400
-+++ src/dspam.c	2005-04-28 10:49:13.000000000 -0400
-@@ -3094,6 +3094,10 @@
-   DRIVER_CTX DTX;
-   char *pidfile;
- 
-+#ifdef __NetBSD__
-+  daemon(0, 0);
-+#endif
-+
-   __daemon_run  = 1;
-   __num_threads = 0;
-   __hup = 0;
diff --git a/mail/dspam/patches/patch-ac b/mail/dspam/patches/patch-ac
new file mode 100644
index 00000000000..7b4384c2c55
--- /dev/null
+++ b/mail/dspam/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2005/10/20 08:33:13 adrianp Exp $
+
+--- webui/cgi-bin/dspam.cgi.orig	2005-10-17 15:31:46.000000000 +0100
++++ webui/cgi-bin/dspam.cgi
+@@ -195,8 +195,8 @@ sub DisplayHistory {
+     }
+     close (LINES);
+ 
+-    $end = $all_lines - (($history_site-1) * $CONFIG{'HISTORY_PER_SITE'});
+-    $begin = $end - $CONFIG{'HISTORY_PER_SITE'} + 1 ;
++    $end = $all_lines - (($history_site-1) * $CONFIG{'HISTORY_PER_PAGE'});
++    $begin = $end - $CONFIG{'HISTORY_PER_PAGE'} + 1 ;
+ 
+     if ($begin < 0) {
+       $begin = 1;
diff --git a/mail/dspam/patches/patch-ad b/mail/dspam/patches/patch-ad
new file mode 100644
index 00000000000..620011e1aa6
--- /dev/null
+++ b/mail/dspam/patches/patch-ad
@@ -0,0 +1,61 @@
+$NetBSD: patch-ad,v 1.1 2005/10/20 08:33:13 adrianp Exp $
+
+--- src/dspam.conf.in.orig	2005-10-10 14:52:21.000000000 +0100
++++ src/dspam.conf.in
+@@ -24,7 +24,7 @@ Home @dspam_home@
+ # this option. If you do not wish to lose all of your data, you will need to
+ # migrate it to the new backend before making this change.
+ #
+-StorageDriver @libdir@/@storage_driver@
++#StorageDriver @libdir@/@storage_driver@
+ 
+ #
+ # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call 
+@@ -53,7 +53,7 @@ TrustedDeliveryAgent "@delivery_agent@"
+ # 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 "@PREFIX@/bin/procmail -d %u"
+ 
+ #
+ # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP 
+@@ -73,7 +73,7 @@ TrustedDeliveryAgent "@delivery_agent@"
+ # 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	"@PREFIX@/bin/procmail -d spam"
+ 
+ #
+ # DSPAM can optionally process "plused users" (addresses in the user+detail
+@@ -249,7 +249,7 @@ AllowOverride whitelistThreshold
+ # 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
+@@ -590,9 +590,9 @@ Opt out
+ # specified. If you want the client machine to perform delivery, use
+ # the --stdout option in conjunction with a local setup. 
+ #
+-#ServerPort		24
++#ServerPort		2400
+ #ServerQueueSize	32
+-#ServerPID              /var/run/dspam.pid
++#ServerPID              @DSPAM_PIDDIR@/dspam.pid
+ 
+ #
+ # ServerMode specifies the type of LMTP server to start. This can be one of:
+@@ -646,7 +646,7 @@ Opt out
+ # If you are a reporting streamlined blackhole list participant, you can
+ # touch ip addresses within the directory the rabl_client process is watching.
+ #
+-#RABLQueue	/var/spool/rabl
++#RABLQueue	@VARBASE@/spool/rabl
+ 
+ # DataSource: If you are using any type of data source that does not include
+ # email-like headers (such as documents), uncomment the line below. This