Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Mar 2006 20:02:23 +0200
From:      "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject:   ports/94501: [MAINTAINER] dspam-devel: update to a new CVS snapshot.
Message-ID:  <1142445743.124@it.buh.tecnik93.com>
Resent-Message-ID: <200603151810.k2FIAOEA000386@freefall.freebsd.org>

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

>Number:         94501
>Category:       ports
>Synopsis:       [MAINTAINER] dspam-devel: update to a new CVS snapshot.
>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:   Wed Mar 15 18:10:23 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Ion-Mihai "IOnut" Tetcu
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
Tecnik'93 
>Environment:


System: FreeBSD 6.1-PRERELEASE #0: Fri Feb 24 07:01:54 EET 2006
    root@it.buh.tecnik93.com:/usr/obj/usr/src/sys/IT6_B_P



>Description:


Update to a new CVS snapshot:

New features:
- support for reading from multiple mysql servers; support for separate
read/write servers to be used with mysql_drv; see dspam.conf
- SYSLOG options knob: log to via syslog if "on" or in flat file if "off"
- dspam_stats: -t for displaying a total of all stats included in the
original query

Bugfixes:
- fixed a bug causing --deliver=summary to return no output when used in
dspamc
- fixed a segfault which can occur if TrainingMode is not specified in
dspam.conf

Diff also at:
people.tecnik93.com/~itetcu/FreeBSD/ports/dspam-devel/port/dspam-devel-3.6.4_1_to_3.6.4.20060315.1518.diff

Tinderbox build logs at:
people.tecnik93.com/~itetcu/FreeBSD/ports/dspam-devel/build_logs/



>How-To-Repeat:





>Fix:


--- dspam-devel-3.6.4_1_to_3.6.4.20060315.1518.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dspam-devel/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile	27 Feb 2006 15:47:41 -0000	1.49
+++ Makefile	15 Mar 2006 17:59:10 -0000
@@ -3,7 +3,7 @@
 # Whom:			Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
 #
 # $FreeBSD: ports/mail/dspam-devel/Makefile,v 1.49 2006/02/27 15:47:41 garga Exp $
-# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.36 2006/02/26 02:23:16 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.38 2006/03/15 17:55:09 itetcu Exp $
 #
 
 # Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
@@ -13,7 +13,6 @@
 
 PORTNAME=	dspam-devel
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	# set later
 
@@ -21,10 +20,10 @@
 COMMENT=	Bayesian spam filter - development version
 
 PORTVER_MAJ=	3.6.4
-#SNAP_DATE=	.20060211.0037
-_UPD_LINE_NO=	7
+SNAP_DATE=	.20060315.1518
+_UPD_LINE_NO=	17
 
-MIN_OPTIONS_VER=	${PORTNAME}-3.6.3.20060203.1409
+MIN_OPTIONS_VER=	${PORTNAME}-3.6.4.20060315.1518
 
 .ifdef(SNAP_DATE)
 MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
@@ -39,7 +38,8 @@
 .endif
 
 ## debug / log / admin options
-OPTIONS=	DEBUG "Enable debugging logging" on
+OPTIONS=	SYSLOG "Logs via syslog" on
+OPTIONS+=	DEBUG "Enable debugging logging" on
 OPTIONS+=	VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off
 OPTIONS+=	BNR_DEBUG "Enable debug for BNR" off
 OPTIONS+=	PREF_EXT "Preferences in database not in files" off
@@ -114,6 +114,7 @@
 
 _VAR_DIR=	/var
 LOG_DIR?=	${_VAR_DIR}/log/dspam
+LOGFILE?=	${LOG_DIR}/dspam.log
 
 DSPAM_MODE?=	4510
 DSPAM_OWNER?=	root
@@ -147,6 +148,13 @@
 		-e '/^%%FreeBSD/D' \
 		-e '/^%%Tecnik%%/D'
 
+.ifdef(WITH_SYSLOG)
+CONFIGURE_ARGS+=	--enable-syslog
+.else
+CONFIGURE_ARGS+=	--disable-syslog
+CONFIGURE_ARGS+=	--with-logfile=${LOGFILE}
+.endif
+
 .ifdef(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
@@ -460,6 +468,9 @@
 	@${ECHO_CMD} "DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP}"
 	@${ECHO_CMD} "DSPAM_HOME_MODE=${DSPAM_HOME_MODE} (default: 0770)"
 	@${ECHO_CMD} "LOG_DIR=${LOG_DIR} (default: ${_VAR_DIR}/log/dspam)"
+.	ifndef(WITH_SYSLOG)
+	@${ECHO_CMD} "LOGFILE=${LOGFILE} (default: ${_VAR_DIR}/log/dspam/dspam.log)"
+.	endif
 .	ifdef(WITH_CGI)
 		@${ECHO_CMD} "Define CGI_PATH before make-ing if you need the CGI files"
 		@${ECHO_CMD} "installed in other place that this installation's default"
@@ -529,7 +540,9 @@
 	@${FALSE}
 .endif
 .ifdef(SNAP_DATE)
+	@${ECHO_CMD}
 	@${ECHO_CMD} "You can safely ignore the following auto*  errors"
+	@${ECHO_CMD}
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
 .endif
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/dspam-devel/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- distinfo	17 Feb 2006 16:41:05 -0000	1.28
+++ distinfo	15 Mar 2006 17:59:10 -0000
@@ -1,3 +1,3 @@
-MD5 (dspam-3.6.4.tar.gz) = e9fdb00a23a99e05c9e4c22aa8aa3655
-SHA256 (dspam-3.6.4.tar.gz) = bdb10acbff97483db8ef7aafee8ba2e9113f6b7d5fc76cf569334b32937ca304
-SIZE (dspam-3.6.4.tar.gz) = 743664
+MD5 (dspam-devel-3.6.4.20060315.1518.tar.gz) = c40ec96422922451f4875bdb6089aa1f
+SHA256 (dspam-devel-3.6.4.20060315.1518.tar.gz) = fcb81c908da122307b8685b5668618c2d3eb52fe3023e058c53335700a12b8f7
+SIZE (dspam-devel-3.6.4.20060315.1518.tar.gz) = 401405
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/dspam-devel/pkg-plist,v
retrieving revision 1.29
diff -u -r1.29 pkg-plist
--- pkg-plist	23 Feb 2006 10:37:45 -0000	1.29
+++ pkg-plist	15 Mar 2006 17:59:10 -0000
@@ -81,6 +81,7 @@
 %%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
+%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
 %%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
 %%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
Index: files/UPDATING
===================================================================
RCS file: /home/ncvs/ports/mail/dspam-devel/files/UPDATING,v
retrieving revision 1.21
diff -u -r1.21 UPDATING
--- files/UPDATING	27 Feb 2006 15:47:42 -0000	1.21
+++ files/UPDATING	15 Mar 2006 17:59:10 -0000
@@ -11,6 +11,24 @@
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.6.4.20060315.1518
+#
+
+New feature:
+- support for reading from multiple mysql servers; support for separate
+read/write servers to be used with mysql_drv; see dspam.conf
+- SYSLOG options knob: log to via syslog if "on" or in flat file if "off"
+- dspam_stats: -t for displaying a total of all stats included in the 
+original query
+
+Bugfixes:
+- fixed a bug causing --deliver=summary to return no output when used in
+dspamc
+- fixed a segfault which can occur if TrainingMode is not specified in
+dspam.conf
+
+
+###########################################################################
 # dspam-devel-3.6.4_1 (Added post-factum, mega libtool commit)
 #
 
Index: files/dspam-devel.sh.in
===================================================================
RCS file: /home/ncvs/ports/mail/dspam-devel/files/dspam-devel.sh.in,v
retrieving revision 1.9
diff -u -r1.9 dspam-devel.sh.in
--- files/dspam-devel.sh.in	27 Feb 2006 15:47:42 -0000	1.9
+++ files/dspam-devel.sh.in	15 Mar 2006 17:59:10 -0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.9 2006/02/27 15:47:42 garga Exp $
 # formerly $ FreeBSD: ports/mail/dspam-devel/files/dspam.rc,v 1.2 2005/02/25 03:09:26 leeym Exp $
-# $Tecnik: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.8 2006/02/26 00:08:23 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.9 2006/03/15 17:55:13 itetcu Exp $
 
 # PROVIDE: dspam
 # REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%
--- dspam-devel-3.6.4_1_to_3.6.4.20060315.1518.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?1142445743.124>