Date: Thu, 26 May 2005 21:49:23 +0300 From: "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/81527: [MAINT] mail/dspam: UNBREAK install for WITHOUT_DAEMON; bugfix update to 20050523.0845 Message-ID: <1117133363.0@it.buh.cameradicommercio.ro> Resent-Message-ID: <200505261850.j4QIo2HI038278@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81527
>Category: ports
>Synopsis: [MAINT] mail/dspam: UNBREAK install for WITHOUT_DAEMON; bugfix update to 20050523.0845
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu May 26 18:50:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 5.4-STABLE i386
>Organization:
Tecnik'93
>Environment:
System: FreeBSD 5.4-STABLE #10: Wed May 18 04:50:54 EEST 2005
>Description:
Update to 20050523.0845 snapshot of dspam-3.4.6 for:
- BUGFIX: fix for managed groups where delivery of false positives would fail
due to the managed group not being recognized
- BUGFIX: fixed bug where messages lacking a terminating boundary would fail
to receive a signature in the message body
BUGFIX: correct a sed substitution when not using WITH_DAEMON
which would yeld [1] :
/usr/local/share/examples/dspam/mysql
sed: 1: ",%%DAEMON%%,D
": invalid command code ,
*** Error code 1
Convert port to the new way of USE_RC_SUBR
[1] From discussions with Piotr Gnyp <toread@discordia.pl>
>How-To-Repeat:
>Fix:
--- dspam-3.4.6.20050512.1145_to_3.4.6.20050523.0845_v2.diff begins here ---
diff -urN dspam.cvs/Makefile dspam/Makefile
--- dspam.cvs/Makefile Mon May 16 14:28:55 2005
+++ dspam/Makefile Thu May 26 21:35:53 2005
@@ -20,7 +20,7 @@
COMMENT= Bayesian spam filter - stable maintenance version
PORTVER_MAJ= 3.4.6
-SNAP_DATE= .20050512.1145
+SNAP_DATE= .20050523.0845
.ifdef(SNAP_DATE)
WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
@@ -104,7 +104,7 @@
PKGMESSAGE= ${WRKSRC}/src/README.FreeBSD
-_UPD_LINE_NO= 6
+_UPD_LINE_NO= 10
CONFLICTS= dspam-devel-[0-9]*
@@ -170,15 +170,12 @@
.ifdef(WITH_DAEMON)
CONFIGURE_ARGS+= --enable-daemon
-RC_DIR= ${PREFIX}/etc/rc.d
RC_SUFX= .sh
-USE_RC_SUBR= yes
-PLIST_FILES+= etc/rc.d/dspam${RC_SUFX}
+USE_RC_SUBR= ${PORTNAME}${RC_SUFX}
_SED_SCRIPT+= -e 's,%%DAEMON%%,,g'
-_SED_RC_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \
- -e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g'
+SUB_LIST+= DSPAM_HOME=${DSPAM_HOME}
.else
-_SED_SCRIPT+= -e ',%%DAEMON%%,D'
+_SED_SCRIPT+= -e '/%%DAEMON%%/D'
.endif
.if !defined(WITH_GRAHAM_BAYES)
@@ -295,7 +292,7 @@
PLIST_SUB+= SQLITE=""
#_SED_SCRIPT+= -e '/%%MYSQL%%/D'
#_SED_SCRIPT+= -e '/%%PGSQL%%/D'
-#_SED_SCRIPT+= -e 's,%%SQLITE%%,,g'
+#_SED_SCRIPT+= -e 's/%%SQLITE%%//g'
#PKGNAMESUFFIX= -sqlite2
DBDRV_COUNT:= ${DBDRV_COUNT:S/o//}
.endif
@@ -320,16 +317,18 @@
PLIST_SUB+= MYSQL=""
PLIST_SUB+= PGSQL="@comment "
PLIST_SUB+= SQLITE="@comment "
-#_SED_SCRIPT+= -e 's,%%MYSQL%%,,g'
+#_SED_SCRIPT+= -e 's/%%MYSQL%%//g'
#_SED_SCRIPT+= -e '/%%PGSQL%%/D'
#_SED_SCRIPT+= -e '/%%SQLITE%%/D'
DBDRV_COUNT:= ${DBDRV_COUNT:S/o//}
. if defined(WITH_MYSQL_COMPRESS)
CONFIGURE_ARGS+= --enable-client-compression
. endif
-_SED_RC_SCRIPT+= -e 's,%%MYSQL%%,mysql,g'
+#_SED_RC_SCRIPT+= -e 's/%%MYSQL%%/mysql/g'
+SUB_LIST+= MYSQL=mysql
.else
-_SED_RC_SCRIPT+= -e 's,%%MYSQL%%,,'
+#_SED_RC_SCRIPT+= -e 's/%%MYSQL%%//'
+SUB_LIST+= MYSQL=
.endif
.if defined(WITH_VIRT_USERS)
@@ -401,7 +400,7 @@
.if defined(WITH_POSTFIX_MBC)
DSPAM_MODE= 4511
-#_SED_SCRIPT+= -e 's,%%POSTFIX_MBC%%,,g'
+#_SED_SCRIPT+= -e 's/%%POSTFIX_MBC%%//g'
.else
#_SED_SCRIPT+= -e '/%%POSTFIX_MBC%%/D'
.endif
@@ -426,8 +425,8 @@
USE_PERL5_RUN= yes
PLIST_SUB+= CGI=""
CGI_PATH?= ${PREFIX}/www/vhosts/dspam
-_SED_SCRIPT+= -e 's,%%CGI%%,,g'
-_SED_SCRIPT+= -e 's,%%CGI_PATH%%,${CGI_PATH},g'
+_SED_SCRIPT+= -e 's/%%CGI%%//g'
+_SED_SCRIPT+= -e 's/%%CGI_PATH%%/${CGI_PATH}/g'
#SED_FILES= ${LS} ${WRKSRC}/cgi/*.pl
#SED_FILES+= ${LS} $PWRKSRC}/cgi/*.cgi
.else
@@ -525,8 +524,8 @@
@${REINPLACE_CMD} -e 's|where SYSDATE-created_on > 14|where SYSDATE-created_on > ${SIGNATURE_LIFE};|' ${WRKSRC}/src/tools.ora_drv/purge.sql
@${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|" ${WRKSRC}/src/tools.sqlite_drv/purge.sql
.if defined(WITH_DAEMON)
- @${CP} ${FILESDIR}/dspam ${WRKSRC}
- @${REINPLACE_CMD} ${_SED_RC_SCRIPT} ${WRKSRC}/dspam
+# @${CP} ${FILESDIR}/dspam ${WRKSRC}
+# @${REINPLACE_CMD} ${_SED_RC_SCRIPT} ${WRKSRC}/dspam
.endif
pre-configure:
@@ -575,7 +574,7 @@
${INSTALL} -o ${DSPAM_OWNER} -g ${DSPAM_GROUP} -m 0640 \
dspam.conf.sample ${PREFIX}/etc
.if defined(WITH_DAEMON)
- ${INSTALL_SCRIPT} ${WRKSRC}/dspam ${RC_DIR}/dspam${RC_SUFX}
+# ${INSTALL_SCRIPT} ${WRKSRC}/dspam ${RC_DIR}/dspam${RC_SUFX}
.endif
########
diff -urN dspam.cvs/distinfo dspam/distinfo
--- dspam.cvs/distinfo Sun May 15 23:26:01 2005
+++ dspam/distinfo Thu May 26 21:18:23 2005
@@ -1,2 +1,2 @@
-MD5 (dspam-3.4.6.20050512.1145.tar.gz) = 2e8ac4294df68f5dd0415c06205b2c1f
-SIZE (dspam-3.4.6.20050512.1145.tar.gz) = 699466
+MD5 (dspam-3.4.6.20050523.0845.tar.gz) = edda53118c5d088661afda5ce21d0afa
+SIZE (dspam-3.4.6.20050523.0845.tar.gz) = 699538
diff -urN dspam.cvs/files/UPDATING dspam/files/UPDATING
--- dspam.cvs/files/UPDATING Mon May 16 14:28:55 2005
+++ dspam/files/UPDATING Thu May 26 21:20:05 2005
@@ -16,6 +16,17 @@
make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
###########################################################################
+# dspam-3.4.6.20050523.0845
+#
+
+BUGFIX: fix for managed groups where delivery of false positives would fail
+due to the managed group not being recognized
+
+BUGFIX: fixed bug where messages lacking a terminating boundary would fail
+to receive a signature in the message body
+
+
+###########################################################################
# dspam-3.4.6.20050512.1145
#
diff -urN dspam.cvs/files/dspam dspam.rc/files/dspam.rc
--- dspam.cvs/files/dspam Fri May 6 00:03:37 2005
+++ dspam/files/dspam.rc Thu Jan 1 02:00:00 1970
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
-#
-
-# PROVIDE: dspam
-# REQUIRE: LOGIN NETWORKING SERVERS %%MYSQL%%
-# BEFORE: mail
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf[.local] to enable dspam:
-#
-# dspam_enable="YES"
-#
-
-. /etc/rc.subr
-
-name=dspam
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/bin/${name}
-command_args="--daemon > /dev/null 2>&1 &"
-pidfile=/var/run/${name}.pid
-required_dirs=%%DSPAM_HOME%%
-required_files=%%PREFIX%%/etc/${name}.conf
-
-extra_commands=reload
-
-reload()
-{
- kill -HUP `cat $pidfile`
-}
-
-# set defaults
-
-dspam_enable=${dspam_enable:-"NO"}
-#dspam_flags=${dspam_flags:-"--daemon &"}
-
-load_rc_config $name
-run_rc_command "$1"
diff -urN dspam.cvs/files/dspam.sh.in dspam/files/dspam.sh.in
--- dspam.cvs/files/dspam.sh.in Thu Jan 1 02:00:00 1970
+++ dspam/files/dspam.sh.in Thu May 26 21:26:19 2005
@@ -0,0 +1,41 @@
+#!/bin/sh
+# $FreeBSD$
+# formerly $ FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
+#
+
+# PROVIDE: dspam
+# REQUIRE: LOGIN NETWORKING SERVERS %%MYSQL%%
+# BEFORE: mail
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf[.local] to enable dspam:
+#
+# dspam_enable="YES"
+#
+
+. /etc/rc.subr
+
+name=dspam
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/${name}
+command_args="--daemon > /dev/null 2>&1 &"
+pidfile=/var/run/${name}.pid
+required_dirs=%%DSPAM_HOME%%
+required_files=%%PREFIX%%/etc/${name}.conf
+
+extra_commands=reload
+
+reload()
+{
+ kill -HUP `cat $pidfile`
+}
+
+# set defaults
+
+dspam_enable=${dspam_enable:-"NO"}
+#dspam_flags=${dspam_flags:-"--daemon &"}
+
+load_rc_config $name
+run_rc_command "$1"
diff -urN dspam.cvs/files/patch-dspam.c dspam/files/patch-dspam.c
--- dspam.cvs/files/patch-dspam.c Fri May 6 00:03:37 2005
+++ dspam/files/patch-dspam.c Thu May 26 17:59:14 2005
@@ -4,7 +4,7 @@
LOG (LOG_CRIT, ERROR_MEM_ALLOC);
}
-- if (CTX->result == DSR_ISSPAM)
+- if (CTX->result == DSR_ISSPAM && ATX->managed_group[0])
- {
+// FreeBSD port patch: put the user in all emails, extremely usefull for scripts
+// if (CTX->result == DSR_ISSPAM)
--- dspam-3.4.6.20050512.1145_to_3.4.6.20050523.0845_v2.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?1117133363.0>