- Update to 3.2.6

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

5 files changed, 87 insertions, 6 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index b1f36d2c4287..e6ca8c2788b2 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -14,14 +14,24 @@ MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam/sources/
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - stable maintenance version
 
-PORTVER_MAJ=	3.2.4
+PORTVER_MAJ=	3.2.6
 #SNAP_DATE=	.20041229.1945
 
 .ifdef(SNAP_DATE)
-DISTFILES=	dspam.${PORTVER_MAJ}.cvs.stable${SNAP_DATE}.tar.gz
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 WRKSRC=		${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
 .endif
 
+## maintainer only
+.ifdef(MAINT)
+MASTER_SITES=	http://dspam.nuclearelephant.com/sources/
+NO_CHECKSUM=	yes
+.	ifdef(SNAP_DATE)
+DISTFILES=	snapshot-stable.tar.gz
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
+.	endif
+.endif
+
 ## debug / log / admin options
 OPTIONS=	DEBUG "Enable debugging logging" on
 OPTIONS+=	VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off
@@ -79,9 +89,13 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
+.ifdef(GDBS)
+CFLAGS+=	-g -DDEBUG
+.endif
+
 PKGMESSAGE=	${WRKSRC}/README.FreeBSD
 
-UPD_LINE_NO=	11
+UPD_LINE_NO=	13
 
 CONFLICTS=	dspam-2* dspam-devel-[0-9]*
 
@@ -114,7 +128,7 @@ PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME}
 
 CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
 CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
-# we set DSPAM_MODE at the end as some LDA whant specific mode
+# we set DSPAM_MODE at the end as some LDA want specific mode
 
 SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
@@ -404,12 +418,19 @@ DOCS=	CHANGELOG LICENSE README README.FreeBSD README.courier README.exim \
 	README.pop3filter README.postfix README.qmail README.sendmail \
 	RELEASE.NOTES
 
+.ifndef(MAINT)
 pre-everything::
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
 	@${GREP} -B 1 -A ${UPD_LINE_NO} ${PKGNAME} ${FILESDIR}/UPDATING
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} ""
+.else	# maintainer only
+post-fetch:
+.	ifndef(STOP)
+.		include "/root/ports/upd"
+.	endif
+.endif
 
 pre-extract:
 .if defined(WITH_EXIM_LDA) && defined(WITH_POSTGRESQL73)
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index 9919b8b1ca81..de83fb7f8f0a 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,2 +1,2 @@
-MD5 (dspam-3.2.4.tar.gz) = 30885376c7300c5abde37896b0ccf89a
-SIZE (dspam-3.2.4.tar.gz) = 620924
+MD5 (dspam-3.2.6.tar.gz) = aad53b4542076840e2a0e1fd43e48ebb
+SIZE (dspam-3.2.6.tar.gz) = 621074
diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
index a328ad0fd16d..b755a547e0be 100644
--- a/mail/dspam/files/UPDATING
+++ b/mail/dspam/files/UPDATING
@@ -11,6 +11,20 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 #############################################################################
+# dspam-3.2.6
+#
+
+- In v3.2.6, the default level of statistical sedation has been changed from
+5 to 0 (off). This feature is normally overridden by dspam.conf, but if you
+have removed the feature from the default configuration, this may change
+DSPAM's behavior. To ensure that nothing changes in your filter's behavior,
+make sure the following line is in your dspam.conf:
+Feature tb=5
+
+- fix for statisticalSedation ignore
+
+
+#############################################################################
 # dspam-3.2.4
 #
 
diff --git a/mail/dspam/files/patch-dspam.c b/mail/dspam/files/patch-dspam.c
new file mode 100644
index 000000000000..4863a8411661
--- /dev/null
+++ b/mail/dspam/files/patch-dspam.c
@@ -0,0 +1,28 @@
+*** dspam.c	Fri Jan 28 14:33:46 2005
+--- dspam.c.orig	Fri Jan 28 14:33:40 2005
+***************
+*** 2748,2757 ****
+      free(SIG.data);
+    nt_destroy (inoc_users);
+    nt_destroy (classify_users);
+!   if (CTX)
+      dspam_destroy (CTX);
+    return result;
+- 
+  }
+  
+  int
+--- 2748,2760 ----
+      free(SIG.data);
+    nt_destroy (inoc_users);
+    nt_destroy (classify_users);
+!   if (CTX) {
+!     if (CTX->signature == &SIG) {
+!       CTX->signature = NULL;
+!      }
+      dspam_destroy (CTX);
++   }
+    return result;
+  }
+  
+  int
diff --git a/mail/dspam/files/patch-tools_dspam_clean.c b/mail/dspam/files/patch-tools_dspam_clean.c
new file mode 100644
index 000000000000..aef014c87d43
--- /dev/null
+++ b/mail/dspam/files/patch-tools_dspam_clean.c
@@ -0,0 +1,18 @@
+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.