Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Jan 2005 22:29:24 +0200
From:      "Ion-Mihai " IOnut " Tetcu" <itetcu@people.tecnik93.com>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject:   ports/76796: [MAINTAINER] mail/dspam: update to 3.2.6
Message-ID:  <1106944164.0@it.buh.cameradicommercio.ro>
Resent-Message-ID: <200501282030.j0SKUAte013995@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         76796
>Category:       ports
>Synopsis:       [MAINTAINER] mail/dspam: update to 3.2.6
>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:   Fri Jan 28 20:30:10 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Ion-Mihai "IOnut" Tetcu
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
Tecnik'93 
>Environment:


System: FreeBSD 5.3-STABLE #17: Mon Jan 17 23:40:22 EET 2005




>Description:


Update to 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



>How-To-Repeat:





>Fix:


--- dspam-3.2.4_to_dspam-3.2.6.diff begins here ---
diff -urN dspam.cvs/Makefile dspam/Makefile
--- dspam.cvs/Makefile	Fri Jan 28 15:35:12 2005
+++ dspam/Makefile	Fri Jan 28 22:25:55 2005
@@ -14,14 +14,24 @@
 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 @@
 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 @@
 
 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 @@
 	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 -urN dspam.cvs/distinfo dspam/distinfo
--- dspam.cvs/distinfo	Fri Jan 28 15:35:12 2005
+++ dspam/distinfo	Fri Jan 28 22:25:55 2005
@@ -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 -urN dspam.cvs/files/UPDATING dspam/files/UPDATING
--- dspam.cvs/files/UPDATING	Fri Jan 28 15:35:12 2005
+++ dspam/files/UPDATING	Fri Jan 28 22:25:54 2005
@@ -11,6 +11,20 @@
 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 -urN dspam.cvs/files/patch-dspam.c dspam/files/patch-dspam.c
--- dspam.cvs/files/patch-dspam.c	Thu Jan  1 02:00:00 1970
+++ dspam/files/patch-dspam.c	Fri Jan 28 22:25:54 2005
@@ -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 -urN dspam.cvs/files/patch-tools_dspam_clean.c dspam/files/patch-tools_dspam_clean.c
--- dspam.cvs/files/patch-tools_dspam_clean.c	Thu Jan  1 02:00:00 1970
+++ dspam/files/patch-tools_dspam_clean.c	Fri Jan 28 22:25:54 2005
@@ -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.
--- dspam-3.2.4_to_dspam-3.2.6.diff ends here ---



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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1106944164.0>