- Update to RC2A snapshot of 20050302.1715

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

6 files changed, 63 insertions, 83 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 302e0ffe0b7f..7b232f212177 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -19,8 +19,8 @@ MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sourc
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - development version
 
-PORTVER_MAJ=	3.4.r1
-SNAP_DATE=	.20050216.0945
+PORTVER_MAJ=	3.4.r2
+SNAP_DATE=	.20050305.0930
 
 .ifdef(SNAP_DATE)
 WRKSRC=		${WRKDIR}/dspam-cvs-devel${SNAP_DATE}
@@ -100,7 +100,7 @@ CFLAGS+=	-g -DDEBUG
 
 PKGMESSAGE=	 ${WRKSRC}/src/README.FreeBSD
 
-UPD_LINE_NO=	15
+UPD_LINE_NO=	24
 
 CONFLICTS=	dspam-2* dspam-3*
 
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index 3224543823ce..b3e2501741ec 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (dspam-devel-3.4.r1.20050216.0945.tar.gz) = af3a9a4d47463e3a7f85b4a6877127fe
-SIZE (dspam-devel-3.4.r1.20050216.0945.tar.gz) = 676650
+MD5 (dspam-devel-3.4.r2.20050305.0930.tar.gz) = 265524d5d3fd015423a0818f46bff464
+SIZE (dspam-devel-3.4.r2.20050305.0930.tar.gz) = 683835
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index aae4d5cebc1e..44a9324f8817 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 This file documents some of the problems you may encounter when
 upgrading dspam port.  I will try my best to minimize these disruptions,
 but sometimes they are unavoidable.
@@ -11,12 +13,37 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.4.r2.20050305.0930 (this is post RC2A)
+#
+
+- BUGFIX: fix dspamc hanging when using --stdout
+- BUGFIX: fixed TOE auto whitelisting
+- BUGFIX: individual logging
+- BUGFIX: parsetoheaders and daemon mode combo
+- BUGFIX: autodetect bugs in cgi
+- BUGFIXES for stats
+- BUGFIXES for some un-standard mails segfaults
+
+- NEW FEATURES: LMTP delivery, "standard" LMTP inbound support;
+see CHANGELOG, README and dspam.conf for details (tested slightly on BSD)
+
+- note (very late) SBL query support and SBL queue logging support
+(both SBL client and server ports are WIP)
+
+- As of 3.4 Beta 2, the PostgreSQL driver uses BIGINT instead of NUMERIC(20)
+type to store tokens in database (fully backward compatible). This change
+speedup driver and reduce storage space used by dspam. Use:
+dspam_pg2int8 /tmp/dspam_pg_mig.sql
+and follow the instructions.
+
+
+###########################################################################
 # dspam-devel-3.4.r1.20050216.0945
 #
 
 - if dspam --daemon SIGBUS please send your sources date, CFLAGS and other
 relevant information; this version is believed to be working; tested on:
-i386 5.2.1-RELEASE-p1, i386 5.3-STABLE, amd64 5.3-RELEASE with help from Erwin Lansing <erwin@lansing.dk>, 
+i386 5.2.1-RELEASE-p1, i386 5.3-STABLE, amd64 5.3-RELEASE with help from Erwin Lansing <erwin@lansing.dk>,
 "Daniel S. Haischt" <me@daniel.stefan.haischt.name> and Joey Freeland <joeyfreeland@gmail.com>
 - patch dspam.c for bug causing signature to not get written to message
 body (obtained from dspam cvs)
@@ -30,9 +57,6 @@ postgresql ports into a server and a client part"
 # dspam-devel-3.3.4
 #
 
-Users on 4.x are kindly asked to report problems ASAP
-I would like to fix them before the freeze on 31. Thanks !
-
 The daemon mode seems to be completead now, so the port act like it should:
 - if enabled with WITH_DEAMON we install the rc script; to start it at
 boot put 'dspam_enable="YES"' in /etc/rc.conf and set the appropriate
@@ -63,13 +87,13 @@ TrustedDeliveryAgent, but leave them commented out
 DSPAM_HOME_{GROUP,MODE})
 - USE_MYSQL and have make describe output right
 - add support for exim [2] which we build with the same database back-end
-as dspam if possible ( suggested, incorrectly, in ports/74762 by 
+as dspam if possible ( suggested, incorrectly, in ports/74762 by
 Shahbaz Javeed <sjaveed@adderpit.com> )
 - fix PREF_EXT and BDB4 cases as well in our Makefile
 
 
 #############################################################################
-# dspam-devel=3.3.0.a.20041203.1245_1 (entry added post-factum, it was an 
+# dspam-devel=3.3.0.a.20041203.1245_1 (entry added post-factum, it was an
 #                   automated update approved by me but not under my control)
 #
 
@@ -106,9 +130,9 @@ DATA
 # dspam-devel-3.3.0.a.20041125.0945
 #
 
-- changed the naming scheme because of to many upstream modification in 
-tarball naming - right now it lacks any version (for the same reason the 
-distfile is renamed from snapshot.tar.gz to PKGNAME and sits on my server); 
+- changed the naming scheme because of to many upstream modification in
+tarball naming - right now it lacks any version (for the same reason the
+distfile is renamed from snapshot.tar.gz to PKGNAME and sits on my server);
 \ it is now made up of:
 PORTNAME:		dspam-devel
 next MINOR_VERSION:	3.3.0
@@ -123,9 +147,9 @@ have the 3.3.0 beta's, rc's and release (tested with pkg_version -t)
  MaxMessageSize - specify a maximum message size to process
 \ I suggest setting it somewhere between 100 and 300 KB, it is unlikely the
 spam you are receiving is bigger and this will improve performance as big
-messages won't stuck the databese 
+messages won't stuck the database
 
-- tum mode has been enhanced and it should outperform teft 
+- tum mode has been enhanced and it should outperform teft
 
 ###############################################################################
 # dspam-devel-3.2.0-20041027.0930 (never comited in the cvs, don't ask me why):
@@ -167,7 +191,7 @@ WITH_SIGNATURE_LIFE     SIGNATURE_LIFE
 OPTION                       port default
 ----------------------------------------------
 LOG_DIR                         /var/log/dspam
-WITH_USER_HOMEDIR             
+WITH_USER_HOMEDIR
 DSPAM_HOME_OWNER
 DSPAM_HOME_GROUP
 DSPAM_HOME_MODE
@@ -195,8 +219,8 @@ in dspam port dir with appropiate OPTIONS adn VARs (see changes above)
 - use the appropiate migration script from files dir of dspam port dir
 (if using MySQL 4.1.x or 3.xx you're on your own for now)
 
-5. Back-up and them move the files from the old DSPAM_HOME 
-(defaulted: /usr/loca/etc/dspam) to the new DSPAM_HOME (default /vad/db/dspam) 
+5. Back-up and them move the files from the old DSPAM_HOME
+(defaulted: /usr/loca/etc/dspam) to the new DSPAM_HOME (default /vad/db/dspam)
 or where ever you defined DSPA_HOME in 2 above.
 
 6. Adjust you new dspam.conf according with your setup OPTIONS and VARs defined
@@ -207,8 +231,8 @@ on make / mak install step.
 7. Enable dspam in the MTA setup, but only locally or something and start testing.
 
 If something ain't working is one of:
-- permissions problems (hint: with what UID 
+- permissions problems (hint: with what UID
 is dspam called from your MTA vs. DSPAM_HOME and DSPAM_LOG_DIR)
-- something wrong in dspam.conf (hint: you didn't remove old config files 
+- something wrong in dspam.conf (hint: you didn't remove old config files
 and they are still used ?)
 
diff --git a/mail/dspam-devel/files/patch-dspam.c b/mail/dspam-devel/files/patch-dspam.c
index c4b60d7626ad..678305f2d9d0 100644
--- a/mail/dspam-devel/files/patch-dspam.c
+++ b/mail/dspam-devel/files/patch-dspam.c
@@ -20,47 +20,4 @@
 +//      }  // end of FreeBSD patch
  
        if (!strcmp(_ds_pref_val(PTX, "showFactors"), "on")) {
- 
-@@ -2594,7 +2595,7 @@
- int embed_signature(DSPAM_CTX *CTX, AGENT_CTX *ATX, agent_pref_t PTX) {
-   struct nt_node *node_nt;
-   struct nt_c c_nt;
--/*  char toplevel_boundary[128] = { 0 }; */
-+  char toplevel_boundary[128] = { 0 };
-   struct _ds_message_block *block;
-   int i = 0;
- 
-@@ -2613,13 +2614,13 @@
-   if (block->media_subtype == MST_SIGNED)
-     return embed_signed(CTX, ATX, PTX);
- 
--/*
-+
-   if (block->media_type == MT_MULTIPART && block->terminating_boundary != NULL)
-   {
-     strlcpy(toplevel_boundary, block->terminating_boundary,
-             sizeof(toplevel_boundary));
-   }
--*/
-+
- 
-   while (node_nt != NULL)
-   {
-@@ -2635,16 +2636,7 @@
-         && (block->media_type == MT_TEXT
-             || (block->boundary == NULL && i == 0
-                 && block->media_type != MT_MULTIPART))
--
--        /* The part is one of the top-level parts */ 
--        && (
--/*toplevel_boundary[0] == 0 || */
--           (block->terminating_boundary 
--/*            && 
--            !strncmp(block->terminating_boundary, toplevel_boundary,
--             strlen(toplevel_boundary))   
--*/
--           )))
-+        && (toplevel_boundary[0] == 0 || block->terminating_boundary))
-     {
-       int is_attachment = 0;
-       struct _ds_header_field *field;
+
diff --git a/mail/dspam-devel/files/patch-src_dspam.conf.in b/mail/dspam-devel/files/patch-src_dspam.conf.in
index 0210ffac5805..a369da8bf8f4 100644
--- a/mail/dspam-devel/files/patch-src_dspam.conf.in
+++ b/mail/dspam-devel/files/patch-src_dspam.conf.in
@@ -1,24 +1,22 @@
---- src/dspam.conf.in.orig	Thu Dec 30 04:05:39 2004
-+++ src/dspam.conf.in	Thu Dec 30 04:14:16 2004
-@@ -34,7 +34,7 @@
- # the user DSPAM is processing mail for. This configuration parameter is only 
+--- 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 "/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
+ # 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@"
+ #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 @@
+@@ -179,7 +181,7 @@
  # Storage driver settings: Specific to a particular storage driver. Uncomment
  # the configuration specific to your installation, if applicable.
  #
@@ -27,7 +25,7 @@
  #MySQLPort
  #MySQLUser 	     	dspam
  #MySQLPass    		changeme
-@@ -375,6 +375,7 @@
+@@ -385,6 +387,7 @@
  # without processing. Value is in bytes.
  #
  #MaxMessageSize 4194304
@@ -35,15 +33,15 @@
  
  #
  # Daemonized Server: If you are running DSPAM as a daemonized server using
-@@ -388,6 +389,7 @@
+@@ -396,6 +399,7 @@
+ #
+ #ServerPort		24
  #ServerQueueSize	32
- #ServerPass.Relay1	"secret"
- #ServerPass.Relay2	"password"
 +# keep this is sync with /usr/local/etc/rc.d/dspam.rc script
- #ServerPID		/var/run/dspam.pid
+ #ServerPID              /var/run/dspam.pid
  
- # If you wish to use a local domain socket instead of a TCP socket, uncomment
-@@ -395,7 +397,8 @@
+ #
+@@ -422,7 +426,8 @@
  # you are running the client and server on the same machine, as it eliminates
  # much of the bandwidth overhead.
  #
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index d1412d17e3e0..2a1832e23dd5 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -9,6 +9,7 @@ bin/dspam_dump
 bin/dspam_genaliases
 bin/dspam_logrotate
 bin/dspam_merge
+%%PGSQL%%bin/dspam_pg2int8
 bin/dspam_stats
 @unexec if cmp -s %D/etc/dspam.conf %D/etc/dspam.conf.sample; then rm -f %D/etc/dspam.conf; fi
 etc/dspam.conf.sample