- Support for clamd virus checking via TCP (see ClamAVHost, ClamAVPort and

ClamAVResponse in dspam.conf)
- Support "user+detail" inbound emails and "+quarantine" outbound emails
(see EnablePlusedDetail and QuarantineMailbox in dspam.conf)

- BUG FIX: "obscure" [1] bug causing dspam to crash under certain conditions
when the loose signature was provided without the appropriate delimiter
- BUG FIX: fix sqlite3 dependency check [2]
- BUG FIX: don't strip binary if we want GDB suport
- BUG FIX: DOMAIN_SCALE and LARGE_SCALE are incompatible catch this before
./cofigure fails [3]

[1] "Obscure" = it took me about 4 hours and a 500 queue processed one by
one by hand to catch and reproduce the problem after 7 days of mail
processing w/o error
[2] Pointed out by vanilla@ for mail/dspam but true here also
[3] Pointed out by Arvinn Lokkebakken <arvinn@whitebird.no> for mail/dspam
but true here also

PR:		ports/80791
Submitted by:	maintainer

3 files changed, 52 insertions, 18 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 070bb5e351b9..9a6a9dee6e86 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - development version
 
 PORTVER_MAJ=	3.5.0
-SNAP_DATE=	.20050428.1100
+SNAP_DATE=	.20050506.0930
 
 .ifdef(SNAP_DATE)
 WRKSRC=		${WRKDIR}/dspam-cvs-devel${SNAP_DATE}
@@ -53,6 +53,9 @@ OPTIONS+=	TEST_COND "More inoculous results rapidly, risk fps" on
 OPTIONS+=	NO_BIAS "No bias toward innocent mail" off
 OPTIONS+=	NEURAL_NET "Enable neural networking" off
 
+OPTIONS+=	CLAMAV "Enable clamav support" off
+OPTIONS+=	CLAMAV_DEVEL "Enable clamav support" off
+
 ## run-time configure  options
 OPTIONS+=	USER_HOMEDIR "Store user data in ~/.dspam" off
 OPTIONS+=	TRUSTED_USERS "Disable trusted user security" off
@@ -96,11 +99,12 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifdef(GDBS)
 CFLAGS+=	-g -DDEBUG
+STRIP=
 .endif
 
 PKGMESSAGE=	 ${WRKSRC}/src/README.FreeBSD
 
-_UPD_LINE_NO=	16
+_UPD_LINE_NO=	22
 
 CONFLICTS=	dspam-2* dspam-3*
 
@@ -120,13 +124,6 @@ DSPAM_HOME_MODE?=	0770
 
 .include <bsd.port.pre.mk>
 
-## Actually Thu Feb 10 17:38:05 EET 2005 works
-#.if ${OSVERSION} >= 500036
-#.	if	${OSVERSION} < 503102
-#IGNORE=	Need newer pthread support, please upgrade your system
-#.	endif
-#.endif
-
 CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}
 PLIST_SUB+=	LOG_DIR=${LOG_DIR}
 
@@ -214,6 +211,16 @@ CONFIGURE_ARGS+=	--disable-bias
 CONFIGURE_ARGS+=	--enable-neural-networking
 .endif
 
+.if defined(WITH_CLAMAV)
+RUN_DEPENDS+=	${LOCALBASE}/etc/clamd.conf:${PORTSDIR}/security/clamav
+CONFIGURE_ARGS+=	--enable-clamav
+.endif
+
+.if defined(WITH_CLAMAV_DEVEL)
+RUN_DEPENDS+=	${LOCALBASE}/etc/clamd.conf:${PORTSDIR}/security/clamav-devel
+CONFIGURE_ARGS+=	--enable-clamav
+.endif
+
 .if defined(WITH_USER_HOMEDIR)
 CONFIGURE_ARGS+=	--enable-homedir
 .endif
@@ -267,18 +274,19 @@ DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
 
 .if defined(WITH_SQLITE3)
 HAVE_SQLITE=	yes
-LIB_DEPENDS+=	sqlite.3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=	--with-storage-driver=sqlite3_drv
 .endif
 
 .if defined(WITH_SQLITE2)
 HAVE_SQLITE=	yes
 LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
+CONFIGURE_ARGS+=	--with-storage-driver=sqlite_drv
 .endif
 
 .if defined(HAVE_SQLITE)
-CONFIGURE_ARGS+=	--with-storage-driver=sqlite_drv \
-	--with-sqlite-includes=${LOCALBASE}/include \
-	--with-sqlite-libraries=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-sqlite-includes=${LOCALBASE}/include \
+			--with-sqlite-libraries=${LOCALBASE}/lib
 PLIST_SUB+=	DB4="@comment "
 PLIST_SUB+=	MYSQL="@comment "
 PLIST_SUB+=	PGSQL="@comment "
@@ -495,9 +503,7 @@ pre-extract:
 	@${ECHO_CMD} "any port. Please remove/adjust your pkgtools.conf, environment and"
 	@${ECHO_CMD} "your make command-line and/or do 'make rmconfig' as appropiate."
 	@${ECHO_CMD} "But before read ${FILESDIR}/UPDATING"
-	@${ECHO_CMD} "as a lot of things have changed, notably the majority of"
-	@${ECHO_CMD} "compile-time options can/must now be set in"
-	@${ECHO_CMD} "${PREFIX}/etc/dspam.conf"
+	@${ECHO_CMD} "as a lot of things have changed.
 	@${ECHO_CMD} "******************************************************************"
 	@${ECHO_CMD} "******************************************************************"
 	@${ECHO_CMD} ""
@@ -557,6 +563,10 @@ pre-configure:
 	@${ECHO_CMD} "USER_HOMEDIR and CGI are incopatible"
 	@${FALSE}
 .endif
+.if defined(WITH_DOMAIN_SCALE) && defined(WITH_LARGE_SCALE)
+	@${ECHO_CMD} "DOMAIN_SCALE and LARGE_SCALE are incopatible"
+	@${FALSE}
+.endif
 
 post-install:
 	${CP} ${WRKSRC}/src/dspam.conf ${WRKSRC}/src/dspam.conf.sample
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index b165929575fc..aea024369898 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (dspam-devel-3.5.0.20050428.1100.tar.gz) = 5cb763e8d07aa05ba4ac984ba2e1099b
-SIZE (dspam-devel-3.5.0.20050428.1100.tar.gz) = 700915
+MD5 (dspam-devel-3.5.0.20050506.0930.tar.gz) = f986466f8deb145074d966450eb4cf7b
+SIZE (dspam-devel-3.5.0.20050506.0930.tar.gz) = 703004
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index de6b37a172aa..6f396781e961 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -13,6 +13,29 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.5.0.20050506.0930
+#
+
+- Support for clamd virus checking via TCP (see ClamAVHost, ClamAVPort and
+ClamAVResponse in dspam.conf)
+- Support "user+detail" inbound emails and "+quarantine" outbound emails
+(see EnablePlusedDetail and QuarantineMailbox in dspam.conf)
+
+- BUG FIX: "obscure" [1] bug causing dspam to crash under certain conditions 
+when the loose signature was provided without the appropriate delimiter
+- BUG FIX: fix sqlite3 dependency check [2]
+- BUG FIX: don't strip binary if we want GDB suport
+- BUG FIX: DOMAIN_SCALE and LARGE_SCALE are incompatible catch this before
+./cofigure fails [3]
+
+[1] "Obscure" = it took me about 4 hours and a 500 queue processed one by
+one by hand to catch and reproduce the problem after 7 days of mail
+processing w/o error
+[2] Pointed out by vanilla@ for mail/dspam but true here also
+[3] Pointed out by Arvinn Løkkebakken <arvinn@whitebird.no> for mail/dspam
+but true here also
+
+###########################################################################
 # dspam-devel-3.5.0.20050428.1100
 #
 
@@ -29,6 +52,7 @@ 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)
 #