- Update to 3.5.0.20050428.1100

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

2 files changed, 38 insertions, 21 deletions

diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index 44a9324f8817..de6b37a172aa 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -13,6 +13,23 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.5.0.20050428.1100
+#
+
+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, UPGRADING and CHANGES.
+
+###########################################################################
 # dspam-devel-3.4.r2.20050305.0930 (this is post RC2A)
 #
 
diff --git a/mail/dspam-devel/files/patch-dspam.c b/mail/dspam-devel/files/patch-dspam.c
index 678305f2d9d0..866006310930 100644
--- a/mail/dspam-devel/files/patch-dspam.c
+++ b/mail/dspam-devel/files/patch-dspam.c
@@ -1,23 +1,23 @@
---- src/dspam.c.dist	Sun Feb 20 22:42:47 2005
-+++ src/dspam.c	Sun Feb 20 22:46:22 2005
-@@ -2543,8 +2543,9 @@
-           LOG (LOG_CRIT, ERROR_MEM_ALLOC);
-       }
- 
--      if (CTX->result == DSR_ISSPAM)
--      {
-+// FreeBSD 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)
-@@ -2556,7 +2557,7 @@
+--- src/dspam.c.dist	Wed Apr 27 14:45:51 2005
++++ src/dspam.c	Wed Apr 27 14:47:50 2005
+@@ -2966,8 +2966,9 @@
+             LOG (LOG_CRIT, ERR_MEM_ALLOC);
          }
-         else
-           LOG (LOG_CRIT, ERROR_MEM_ALLOC);
--      }
-+//      }  // end of FreeBSD patch
  
-       if (!strcmp(_ds_pref_val(PTX, "showFactors"), "on")) {
-
+-        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)
+@@ -2979,7 +2980,7 @@
+           }
+           else
+             LOG (LOG_CRIT, ERR_MEM_ALLOC);
+-        }
++//        } // // end of FreeBSD port patch
+ 
+         if (!strcmp(_ds_pref_val(ATX->PTX, "showFactors"), "on")) {
+