ports/80790: [Maintainer Update] mail/dspam: depends fix, update to 3.4.6, bugfixes

[Ion-Mihai IOnut Tetcu]

>Number:         80790
>Category:       ports
>Synopsis:       [Maintainer Update] mail/dspam: depends fix, update to 3.4.6, bugfixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 08 17:10:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Ion-Mihai "IOnut" Tetcu
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:


System: FreeBSD 5.4-PRERELEASE #2: Thu Mar  3 23:57:35 EET 2005



>Description:


Update to dspam-3.4.6

- 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 so 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@
[3] Pointed out by Arvinn Lokkebakken <arvinn at whitebird.no> for


>How-To-Repeat:





>Fix:


--- dspam-3.4.5_to_3.4.6.diff begins here ---
diff -urN dspam.cvs/Makefile dspam/Makefile
--- dspam.cvs/Makefile	Fri May  6 04:46:10 2005
+++ dspam/Makefile	Sun May  8 19:38:05 2005
@@ -19,7 +19,7 @@
 MAINTAINER=	itetcu at people.tecnik93.com
 COMMENT=	Bayesian spam filter - stable maintenance version
 
-PORTVER_MAJ=	3.4.5
+PORTVER_MAJ=	3.4.6
 #SNAP_DATE=	.20050417.0700
 
 .ifdef(SNAP_DATE)
@@ -53,6 +53,9 @@
 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 @@
 
 .ifdef(GDBS)
 CFLAGS+=	-g -DDEBUG
+STRIP=
 .endif
 
 PKGMESSAGE=	 ${WRKSRC}/src/README.FreeBSD
 
-_UPD_LINE_NO=	16
+_UPD_LINE_NO=	17
 
 CONFLICTS=	dspam-2* dspam-3*
 
@@ -120,13 +124,6 @@
 
 .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}
 
@@ -216,6 +213,16 @@
 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
@@ -269,7 +276,7 @@
 
 .if defined(WITH_SQLITE3)
 HAVE_SQLITE=	yes
-LIB_DEPENDS+=	sqlite.3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 .endif
 
 .if defined(WITH_SQLITE2)
@@ -554,6 +561,10 @@
 .endif
 .if defined(WITH_USER_HOMEDIR) && defined(WITH_CGI)
 	@${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
 
diff -urN dspam.cvs/distinfo dspam/distinfo
--- dspam.cvs/distinfo	Fri May  6 04:46:16 2005
+++ dspam/distinfo	Sun May  8 19:37:51 2005
@@ -1,2 +1,2 @@
-MD5 (dspam-3.4.5.tar.gz) = fcb16a275e343baaa657eda045123e06
-SIZE (dspam-3.4.5.tar.gz) = 698456
+MD5 (dspam-3.4.6.tar.gz) = 05d6d5546967305e9f1c394f443f8e93
+SIZE (dspam-3.4.6.tar.gz) = 698599
diff -urN dspam.cvs/files/UPDATING dspam/files/UPDATING
--- dspam.cvs/files/UPDATING	Fri May  6 11:04:07 2005
+++ dspam/files/UPDATING	Sun May  8 19:37:40 2005
@@ -16,6 +16,24 @@
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-3.4.6
+#
+
+- 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 so 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@
+[3] Pointed out by Arvinn Lokkebakken <arvinn at whitebird.no>
+
+
+###########################################################################
 # dspam-3.4.5
 #
 
--- dspam-3.4.5_to_3.4.6.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: