From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Mar 4 16:20:20 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CECDA16A4CE for ; Fri, 4 Mar 2005 16:20:20 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0E4843D31 for ; Fri, 4 Mar 2005 16:20:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j24GKJJm045786 for ; Fri, 4 Mar 2005 16:20:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j24GKJEe045785; Fri, 4 Mar 2005 16:20:19 GMT (envelope-from gnats) Resent-Date: Fri, 4 Mar 2005 16:20:19 GMT Resent-Message-Id: <200503041620.j24GKJEe045785@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Ion-Mihai " IOnut " Tetcu" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4921616A4CE for ; Fri, 4 Mar 2005 16:15:49 +0000 (GMT) Received: from relay.rdsnet.ro (gimli.rdsnet.ro [193.231.236.70]) by mx1.FreeBSD.org (Postfix) with SMTP id E774D43D1F for ; Fri, 4 Mar 2005 16:15:47 +0000 (GMT) (envelope-from itetcu@people.tecnik93.com) Received: (qmail 20533 invoked from network); 4 Mar 2005 16:10:19 -0000 Received: from unknown (HELO smtp.rdsnet.ro) (62.231.74.130) by smtp1-133.rdsnet.ro with SMTP; 4 Mar 2005 16:10:19 -0000 Received: (qmail 1409 invoked by uid 89); 4 Mar 2005 16:21:26 -0000 Received: from unknown (HELO it.buh.tecnik93.com) (81.196.204.98) by 0 with SMTP; 4 Mar 2005 16:21:26 -0000 Received: from it.buh.tecnik93.com (localhost.buh.tecnik93.com [127.0.0.1]) by it.buh.tecnik93.com (Postfix) with ESMTP id EF95A114D4 for ; Fri, 4 Mar 2005 18:15:37 +0200 (EET) Message-Id: <1109952937.0@it.buh.tecnik93.com> Date: Fri, 4 Mar 2005 18:15:37 +0200 From: "Ion-Mihai " IOnut " Tetcu" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.4 Subject: ports/78418: [MAINTAINER] mail/dspam-devel: BUGFIXES, update to RC2A snapshot of 20050302.1715 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Mar 2005 16:20:20 -0000 >Number: 78418 >Category: ports >Synopsis: [MAINTAINER] mail/dspam-devel: BUGFIXES, update to RC2A snapshot of 20050302.1715 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Mar 04 16:20:19 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-devel-3.4.r2.20050302.1715 (this is post RC2A) - BUGFIX: fix dspamc hanging when using --stdout - BUGFIX: fixed TOE auto whitelisting - BUGFIXES for stats - BUXFIXES for some un-standard mails segfaults - other BUGFIXES - NEW FEAUTRES: LMTP delivery, "standard" LMTP inbound support; see CHANGELOG, README and dspam.conf for details (tested slightly on FreeBSD) - note (very late) SBL query support and SBL queue logging support (both SBL client and server ports are WIP) - As of 3.4 Beta 2, the PostgreSQL driver uses BIGINT instead of NUMERIC(20) type to store tokens in database (fully backward compatible). This change speedup driver and reduce storage space used by dspam. Use: dspam_pg2int8 /tmp/dspam_pg_mig.sql and follow the instructions. It would be nice if ports/77800 - Reserve UID 202 for Dspam (mail/dspam mail/dspam-devel mail/dspampd and other to come) would be commited. It would be nice if ports/78402 [MAINTAINER] mail/dspam: bugfix update to 3.2.7.20050302.1330 would be commited. http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/78214 is superceeded by this one and should be closed >How-To-Repeat: >Fix: --- dspam-devel-3.4.r1.20050216.0945_to_dspam-devel-3.4.r2.20050302.1715.diff begins here --- diff -urN dspam-devel.cvs/Makefile dspam-devel/Makefile --- dspam-devel.cvs/Makefile Mon Feb 28 17:58:36 2005 +++ dspam-devel/Makefile Fri Mar 4 18:05:31 2005 @@ -19,8 +19,8 @@ MAINTAINER= itetcu@people.tecnik93.com COMMENT= Bayesian spam filter - development version -PORTVER_MAJ= 3.4.r1 -SNAP_DATE= .20050216.0945 +PORTVER_MAJ= 3.4.r2 +SNAP_DATE= .20050302.1715 .ifdef(SNAP_DATE) WRKSRC= ${WRKDIR}/dspam-cvs-devel${SNAP_DATE} @@ -100,7 +100,7 @@ PKGMESSAGE= ${WRKSRC}/src/README.FreeBSD -UPD_LINE_NO= 15 +UPD_LINE_NO= 21 CONFLICTS= dspam-2* dspam-3* diff -urN dspam-devel.cvs/distinfo dspam-devel/distinfo --- dspam-devel.cvs/distinfo Mon Feb 28 17:58:36 2005 +++ dspam-devel/distinfo Fri Mar 4 18:05:31 2005 @@ -1,2 +1,2 @@ -MD5 (dspam-devel-3.4.r1.20050216.0945.tar.gz) = af3a9a4d47463e3a7f85b4a6877127fe -SIZE (dspam-devel-3.4.r1.20050216.0945.tar.gz) = 676650 +MD5 (dspam-devel-3.4.r2.20050302.1715.tar.gz) = ed4f4a1d47eabd90b62e28d924c3f175 +SIZE (dspam-devel-3.4.r2.20050302.1715.tar.gz) = 683803 diff -urN dspam-devel.cvs/files/UPDATING dspam-devel/files/UPDATING --- dspam-devel.cvs/files/UPDATING Mon Feb 28 17:58:36 2005 +++ dspam-devel/files/UPDATING Fri Mar 4 18:05:31 2005 @@ -1,3 +1,5 @@ +$FreeBSD$ + This file documents some of the problems you may encounter when upgrading dspam port. I will try my best to minimize these disruptions, but sometimes they are unavoidable. @@ -11,6 +13,28 @@ make extract; more `find . -type f -maxdepth 2 -name UPGRADING` ########################################################################### +# dspam-devel-3.4.r2.20050302.1715 (this is post RC2A) +# + +- BUGFIX: fix dspamc hanging when using --stdout +- BUGFIX: fixed TOE auto whitelisting +- BUGFIXES for stats +- BUXFIXES for some un-standard mails segfaults + +- NEW FEAUTRES: LMTP delivery, "standard" LMTP inbound support; +see CHANGELOG, README and dspam.conf for details (tested slightly on BSD) + +- note (very late) SBL query support and SBL queue logging support +(both SBL client and server ports are WIP) + +- As of 3.4 Beta 2, the PostgreSQL driver uses BIGINT instead of NUMERIC(20) +type to store tokens in database (fully backward compatible). This change +speedup driver and reduce storage space used by dspam. Use: +dspam_pg2int8 /tmp/dspam_pg_mig.sql +and follow the instructions. + + +########################################################################### # dspam-devel-3.4.r1.20050216.0945 # @@ -29,9 +53,6 @@ ########################################################################### # dspam-devel-3.3.4 # - -Users on 4.x are kindly asked to report problems ASAP -I would like to fix them before the freeze on 31. Thanks ! The daemon mode seems to be completead now, so the port act like it should: - if enabled with WITH_DEAMON we install the rc script; to start it at diff -urN dspam-devel.cvs/files/patch-dspam.c dspam-devel/files/patch-dspam.c --- dspam-devel.cvs/files/patch-dspam.c Fri Feb 25 05:09:26 2005 +++ dspam-devel/files/patch-dspam.c Fri Mar 4 18:05:31 2005 @@ -20,47 +20,4 @@ +// } // end of FreeBSD patch if (!strcmp(_ds_pref_val(PTX, "showFactors"), "on")) { - -@@ -2594,7 +2595,7 @@ - int embed_signature(DSPAM_CTX *CTX, AGENT_CTX *ATX, agent_pref_t PTX) { - struct nt_node *node_nt; - struct nt_c c_nt; --/* char toplevel_boundary[128] = { 0 }; */ -+ char toplevel_boundary[128] = { 0 }; - struct _ds_message_block *block; - int i = 0; - -@@ -2613,13 +2614,13 @@ - if (block->media_subtype == MST_SIGNED) - return embed_signed(CTX, ATX, PTX); - --/* -+ - if (block->media_type == MT_MULTIPART && block->terminating_boundary != NULL) - { - strlcpy(toplevel_boundary, block->terminating_boundary, - sizeof(toplevel_boundary)); - } --*/ -+ - - while (node_nt != NULL) - { -@@ -2635,16 +2636,7 @@ - && (block->media_type == MT_TEXT - || (block->boundary == NULL && i == 0 - && block->media_type != MT_MULTIPART)) -- -- /* The part is one of the top-level parts */ -- && ( --/*toplevel_boundary[0] == 0 || */ -- (block->terminating_boundary --/* && -- !strncmp(block->terminating_boundary, toplevel_boundary, -- strlen(toplevel_boundary)) --*/ -- ))) -+ && (toplevel_boundary[0] == 0 || block->terminating_boundary)) - { - int is_attachment = 0; - struct _ds_header_field *field; + diff -urN dspam-devel.cvs/files/patch-src_dspam.conf.in dspam-devel/files/patch-src_dspam.conf.in --- dspam-devel.cvs/files/patch-src_dspam.conf.in Wed Jan 12 09:28:34 2005 +++ dspam-devel/files/patch-src_dspam.conf.in Fri Mar 4 18:05:31 2005 @@ -1,24 +1,22 @@ ---- src/dspam.conf.in.orig Thu Dec 30 04:05:39 2004 -+++ src/dspam.conf.in Thu Dec 30 04:14:16 2004 -@@ -34,7 +34,7 @@ - # the user DSPAM is processing mail for. This configuration parameter is only +--- src/dspam.conf.in.dist Fri Feb 25 23:08:31 2005 ++++ src/dspam.conf.in Fri Feb 25 23:19:02 2005 +@@ -35,6 +35,7 @@ # necessary if you plan on allowing untrusted processing. # --#UntrustedDeliveryAgent "/usr/bin/procmail -d %u" + #UntrustedDeliveryAgent "/usr/bin/procmail -d %u" +#UntrustedDeliveryAgent "@delivery_agent@" # - # Quarantine Agent: DSPAM's default behavior is to quarantine all mail it -@@ -42,7 +42,7 @@ - # a quarantine agent which will be called with all messages DSPAM thinks is + # LMTP Delivery: Alternatively, you may wish to use LMTP delivery to deliver +@@ -53,6 +54,7 @@ # spam. Use %u to specify the user DSPAM is processing mail for. # --#QuarantineAgent "/usr/bin/procmail -d spam" -+#QuarantineAgent "@delivery_agent@" + #QuarantineAgent "/usr/bin/procmail -d spam" ++#QuarantineAgent "@delivery_agent@" # # OnFail: What to do if local delivery or quarantine should fail. If set -@@ -169,7 +169,7 @@ +@@ -179,7 +181,7 @@ # Storage driver settings: Specific to a particular storage driver. Uncomment # the configuration specific to your installation, if applicable. # @@ -27,7 +25,7 @@ #MySQLPort #MySQLUser dspam #MySQLPass changeme -@@ -375,6 +375,7 @@ +@@ -385,6 +387,7 @@ # without processing. Value is in bytes. # #MaxMessageSize 4194304 @@ -35,15 +33,15 @@ # # Daemonized Server: If you are running DSPAM as a daemonized server using -@@ -388,6 +389,7 @@ +@@ -396,6 +399,7 @@ + # + #ServerPort 24 #ServerQueueSize 32 - #ServerPass.Relay1 "secret" - #ServerPass.Relay2 "password" +# keep this is sync with /usr/local/etc/rc.d/dspam.rc script - #ServerPID /var/run/dspam.pid + #ServerPID /var/run/dspam.pid - # If you wish to use a local domain socket instead of a TCP socket, uncomment -@@ -395,7 +397,8 @@ + # +@@ -422,7 +426,8 @@ # you are running the client and server on the same machine, as it eliminates # much of the bandwidth overhead. # diff -urN dspam-devel.cvs/pkg-plist dspam-devel/pkg-plist --- dspam-devel.cvs/pkg-plist Mon Feb 28 17:58:36 2005 +++ dspam-devel/pkg-plist Fri Mar 4 18:05:31 2005 @@ -9,6 +9,7 @@ bin/dspam_genaliases bin/dspam_logrotate bin/dspam_merge +%%PGSQL%%bin/dspam_pg2int8 bin/dspam_stats @unexec if cmp -s %D/etc/dspam.conf %D/etc/dspam.conf.sample; then rm -f %D/etc/dspam.conf; fi etc/dspam.conf.sample --- dspam-devel-3.4.r1.20050216.0945_to_dspam-devel-3.4.r2.20050302.1715.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: