From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 25 21:40:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 757551065672 for ; Wed, 25 Mar 2009 21:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4D2ED8FC15 for ; Wed, 25 Mar 2009 21:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n2PLe35Y087867 for ; Wed, 25 Mar 2009 21:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n2PLe3eX087866; Wed, 25 Mar 2009 21:40:03 GMT (envelope-from gnats) Resent-Date: Wed, 25 Mar 2009 21:40:03 GMT Resent-Message-Id: <200903252140.n2PLe3eX087866@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, Michael Scheidell Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 435281065718 for ; Wed, 25 Mar 2009 21:30:18 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 249D68FC0C for ; Wed, 25 Mar 2009 21:30:18 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n2PLUHAw087148 for ; Wed, 25 Mar 2009 21:30:17 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n2PLUHUL087147; Wed, 25 Mar 2009 21:30:17 GMT (envelope-from nobody) Message-Id: <200903252130.n2PLUHUL087147@www.freebsd.org> Date: Wed, 25 Mar 2009 21:30:17 GMT From: Michael Scheidell To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/133073: update security/amavisd-new for dkim .33 dependency, clamscan timing and rcsubr db dependency X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2009 21:40:04 -0000 >Number: 133073 >Category: ports >Synopsis: update security/amavisd-new for dkim .33 dependency, clamscan timing and rcsubr db dependency >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Mar 25 21:40:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Michael Scheidell >Release: all of them >Organization: SECNAP Network Security >Environment: na >Description: three issues: #1 dkim .33 is needed, and is critical for correct signing of outbound messages. also needed to validate some incoming messages that were not being correctly checked. #2 amavisd doesn't correctly handle issue with clamscan timeout (if clamd fails) #3, if using pgsql or mysql, it helps a lot if you get pgsql and mysql to start first. without this, there is a possibility of incoming email being temp failed with 4xx errors. patch attached and inline (since sometimes they get trashed) note: if clamav .95 patches come out soon, you might want to wait. >How-To-Repeat: see above. >Fix: diff -bBru /var/tmp/amavis262/ ./ diff -bBru /var/tmp/amavis262/Makefile ./Makefile --- /var/tmp/amavis262/Makefile 2009-02-24 10:36:43.000000000 -0500 +++ ./Makefile 2009-03-25 17:18:11.000000000 -0400 @@ -9,7 +9,7 @@ PORTNAME= amavisd-new PORTVERSION= 2.6.2 PORTEPOCH= 1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ http://mirrors.catpipe.net/amavisd-new/ \ @@ -29,7 +29,7 @@ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \ p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server \ - p5-Mail-DKIM>=0.31:${PORTSDIR}/mail/p5-Mail-DKIM + p5-Mail-DKIM>=0.33:${PORTSDIR}/mail/p5-Mail-DKIM USE_PERL5_RUN= 5.8.2+ GNU_CONFIGURE= yes @@ -291,7 +291,11 @@ .endfor @${CP} -pr ${WRKSRC}/README_FILES/images/ ${DOCSDIR}/images .endif - +.if defined(WITH_MYSQL) + @${REINPLACE_CMD} -e "/^# REQUIRE: LOGIN/s/LOGIN/LOGIN mysql/" ${WRKDIR}/amavisd.sh +.elif defined(WITH_PGSQL) + @${REINPLACE_CMD} -e "/^# REQUIRE: LOGIN/s/LOGIN/LOGIN postgresql/" ${WRKDIR}/amavisd.sh +.endif post-install: ${LN} -s ${PREFIX}/sbin/amavisd-release ${PREFIX}/sbin/amavisd-requeue @${CAT} ${PKGMESSAGE} diff -bBru /var/tmp/amavis262/files/patch-amavisd ./files/patch-amavisd --- /var/tmp/amavis262/files/patch-amavisd 2009-02-24 10:36:43.000000000 -0500 +++ ./files/patch-amavisd 2009-03-25 15:26:47.000000000 -0400 @@ -83,6 +83,12 @@ my($subj) = $msginfo->get_header_field_body('subject'); my($from) = $msginfo->get_header_field_body('from'); # raw full field my($rfc2822_from) = $msginfo->rfc2822_from; # undef, scalar or listref +@@ -19993,4 +19993,5 @@ + 1; + } or do { $eval_stat = $@ ne '' ? $@ : "errno=$!" }; ++ prolong_timer('ask_daemon_internal', $deadline-time); + last if $eval_stat eq ''; # mission accomplished + # error handling (most interesting error codes are EPIPE and ENOTCONN) @@ -21931,7 +21936,8 @@ $part->base_name, $err_nm[$sts], $sts); my($newpart) = $newpart_obj->full_name; Patch attached with submission follows: diff -bBru /var/tmp/amavis262/Makefile ./Makefile --- /var/tmp/amavis262/Makefile 2009-02-24 10:36:43.000000000 -0500 +++ ./Makefile 2009-03-25 17:18:11.000000000 -0400 @@ -9,7 +9,7 @@ PORTNAME= amavisd-new PORTVERSION= 2.6.2 PORTEPOCH= 1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ http://mirrors.catpipe.net/amavisd-new/ \ @@ -29,7 +29,7 @@ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \ p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server \ - p5-Mail-DKIM>=0.31:${PORTSDIR}/mail/p5-Mail-DKIM + p5-Mail-DKIM>=0.33:${PORTSDIR}/mail/p5-Mail-DKIM USE_PERL5_RUN= 5.8.2+ GNU_CONFIGURE= yes @@ -291,7 +291,11 @@ .endfor @${CP} -pr ${WRKSRC}/README_FILES/images/ ${DOCSDIR}/images .endif - +.if defined(WITH_MYSQL) + @${REINPLACE_CMD} -e "/^# REQUIRE: LOGIN/s/LOGIN/LOGIN mysql/" ${WRKDIR}/amavisd.sh +.elif defined(WITH_PGSQL) + @${REINPLACE_CMD} -e "/^# REQUIRE: LOGIN/s/LOGIN/LOGIN postgresql/" ${WRKDIR}/amavisd.sh +.endif post-install: ${LN} -s ${PREFIX}/sbin/amavisd-release ${PREFIX}/sbin/amavisd-requeue @${CAT} ${PKGMESSAGE} diff -bBru /var/tmp/amavis262/files/patch-amavisd ./files/patch-amavisd --- /var/tmp/amavis262/files/patch-amavisd 2009-02-24 10:36:43.000000000 -0500 +++ ./files/patch-amavisd 2009-03-25 15:26:47.000000000 -0400 @@ -83,6 +83,12 @@ my($subj) = $msginfo->get_header_field_body('subject'); my($from) = $msginfo->get_header_field_body('from'); # raw full field my($rfc2822_from) = $msginfo->rfc2822_from; # undef, scalar or listref +@@ -19993,4 +19993,5 @@ + 1; + } or do { $eval_stat = $@ ne '' ? $@ : "errno=$!" }; ++ prolong_timer('ask_daemon_internal', $deadline-time); + last if $eval_stat eq ''; # mission accomplished + # error handling (most interesting error codes are EPIPE and ENOTCONN) @@ -21931,7 +21936,8 @@ $part->base_name, $err_nm[$sts], $sts); my($newpart) = $newpart_obj->full_name; >Release-Note: >Audit-Trail: >Unformatted: