- Update to 3.4.5

PR:		ports/80442
Submitted by:	Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> (maintainer)

7 files changed, 134 insertions, 58 deletions

diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
index f8317961df2e..8a5db0bf4d81 100644
--- a/mail/dspam/files/UPDATING
+++ b/mail/dspam/files/UPDATING
@@ -15,6 +15,23 @@ also the UPGRADING enclosed in the dspam distribution. You can see it by doing
 in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
+###########################################################################
+# dspam-3.4.5
+#
+
+This is the post-3.4 devel branch. A lot of things have changed and your
+existing dspam.conf won't probably work anymore. Please compare it with the
+dspam.conf.sample located in the same etc/ directory.
+
+Most notable addition is the SMTP delivery which together with "standard"
+inbound LMTP make a very nice content and light (e.g. it's the fastest setup
+I've had so far) filter.
+
+Database structure is roughly the same but you may wish to check your
+existing database structure with the *.sql corresponding to you database
+driver from EXAMPLESDIR (Mysql 4.1.x is now default as it's _much_ faster).
+Please read carefully distributed docs like README and UPGRADING.
+
 #############################################################################
 # dspam-3.2.8
 #
diff --git a/mail/dspam/files/dspam.rc b/mail/dspam/files/dspam.rc
new file mode 100644
index 000000000000..45fb07a1c2bd
--- /dev/null
+++ b/mail/dspam/files/dspam.rc
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: dspam
+# REQUIRE: LOGIN NETWORKING SERVERS %%MYSQL%%
+# BEFORE: mail
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf[.local] to enable dspam:
+#
+# dspam_enable="YES"
+#
+
+. /etc/rc.subr
+
+name=dspam
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/${name}
+command_args="--daemon  > /dev/null 2>&1 &"
+pidfile=/var/run/${name}.pid
+required_dirs=%%DSPAM_HOME%%
+required_files=%%PREFIX%%/etc/${name}.conf
+
+extra_commands=reload
+
+reload()
+{
+ kill -HUP `cat $pidfile`
+}
+
+# set defaults
+
+dspam_enable=${dspam_enable:-"NO"}
+#dspam_flags=${dspam_flags:-"--daemon &"}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/dspam/files/patch-Makefile.in b/mail/dspam/files/patch-Makefile.in
deleted file mode 100644
index bffbd6d73240..000000000000
--- a/mail/dspam/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Jun 24 18:32:38 2004
-+++ Makefile.in	Thu Jun 24 18:37:09 2004
-@@ -242,7 +242,7 @@
- man_MANS = dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 dspam_dump.1 \
-   dspam_merge.1
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = dspam.pc
- EXTRA_DIST = autogen.sh RELEASE.NOTES CHANGELOG LICENSE example.c \
-   dspam-button.gif dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 \
diff --git a/mail/dspam/files/patch-dspam.c b/mail/dspam/files/patch-dspam.c
new file mode 100644
index 000000000000..08aa251fbd6f
--- /dev/null
+++ b/mail/dspam/files/patch-dspam.c
@@ -0,0 +1,23 @@
+--- src/dspam.c.dist	Sun Apr 10 15:49:29 2005
++++ src/dspam.c	Sun Apr 10 15:52:48 2005
+@@ -2733,8 +2733,9 @@
+             LOG (LOG_CRIT, ERROR_MEM_ALLOC);
+         }
+ 
+-        if (CTX->result == DSR_ISSPAM)
+-        {
++// FreeBSD port patch: put the user in all emails, extremely usefull for scripts
++//        if (CTX->result == DSR_ISSPAM)
++//        {
+           snprintf(data, sizeof(data), "X-DSPAM-User: %s", CTX->username);
+           head = _ds_create_header_field(data);
+           if (head != NULL)
+@@ -2746,7 +2747,7 @@
+           }
+           else
+             LOG (LOG_CRIT, ERROR_MEM_ALLOC);
+-        }
++//        } // end of FreeBSD port patch
+ 
+         if (!strcmp(_ds_pref_val(PTX, "showFactors"), "on")) {
+ 
diff --git a/mail/dspam/files/patch-dspam.conf.in b/mail/dspam/files/patch-dspam.conf.in
deleted file mode 100644
index ab904e5b574d..000000000000
--- a/mail/dspam/files/patch-dspam.conf.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- dspam.conf.in.orig	Thu Dec 30 19:18:14 2004
-+++ dspam.conf.in	Thu Dec 30 19:20:02 2004
-@@ -34,7 +34,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@"
- 
- #
- # Quarantine Agent: DSPAM's default behavior is to quarantine all mail it 
-@@ -42,7 +42,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@"
- 
- #
- # OnFail: What to do if local delivery or quarantine should fail. If set
-@@ -169,7 +169,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
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 000000000000..a369da8bf8f4
--- /dev/null
+++ b/mail/dspam/files/patch-src_dspam.conf.in
@@ -0,0 +1,53 @@
+--- 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
diff --git a/mail/dspam/files/patch-tools_dspam_clean.c b/mail/dspam/files/patch-tools_dspam_clean.c
deleted file mode 100644
index aef014c87d43..000000000000
--- a/mail/dspam/files/patch-tools_dspam_clean.c
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: tools/dspam_clean.c
-===================================================================
-RCS file: /usr/local/cvsroot/dspam-3.2/tools/dspam_clean.c,v
-retrieving revision 1.5
-diff -u -r1.5 dspam_clean.c
---- tools/dspam_clean.c	25 Oct 2004 22:57:56 -0000	1.5
-+++ tools/dspam_clean.c	28 Jan 2005 19:58:49 -0000
-@@ -188,7 +188,7 @@
-       nt_add(users, argv[i]);
-   }
- 
--  if (!do_probs && !do_sigs && !do_unused) {
-+  if (help || !do_probs && !do_sigs && !do_unused) {
-     fprintf(stderr, "%s", CLEANSYNTAX);
-     _ds_destroy_attributes(agent_config);
-     nt_destroy(users);
-
-L.