From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 26 08:10:18 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 A216916A401 for ; Wed, 26 Apr 2006 08:10:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F60343D4C for ; Wed, 26 Apr 2006 08:10:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3Q8AHcS029518 for ; Wed, 26 Apr 2006 08:10:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3Q8AHrS029517; Wed, 26 Apr 2006 08:10:17 GMT (envelope-from gnats) Resent-Date: Wed, 26 Apr 2006 08:10:17 GMT Resent-Message-Id: <200604260810.k3Q8AHrS029517@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, Jan-Peter Koopmann Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A102916A407 for ; Wed, 26 Apr 2006 08:07:07 +0000 (UTC) (envelope-from root=freebsd-gnats-submit=freebsd.org=7d45f6c3b4adf33f63274392d7377e7a5e58050b@seceidos.de) Received: from mail.seceidos.de (mail.seceidos.de [213.157.28.234]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4154F43D48 for ; Wed, 26 Apr 2006 08:07:06 +0000 (GMT) (envelope-from root=freebsd-gnats-submit=freebsd.org=7d45f6c3b4adf33f63274392d7377e7a5e58050b@seceidos.de) Message-Id: <200604260806.k3Q86vVq002069@services.intern.seceidos.de> Date: Wed, 26 Apr 2006 10:06:57 +0200 (CEST) From: Jan-Peter Koopmann To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/96351: [MAINTAINER] mail/MailScanner: update to 4.52.2_1 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, 26 Apr 2006 08:10:18 -0000 >Number: 96351 >Category: ports >Synopsis: [MAINTAINER] mail/MailScanner: update to 4.52.2_1 >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 26 08:10:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jan-Peter Koopmann >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD services.intern.seceidos.de 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Jan 5 10:56:46 CET >Description: Reason for critical/high: The old version was incompatible with Exim 4.61 due to changed queue file format. Therefore this is quite urgent! Version 4.52.2_1 ================= - fixed bug in mta.sh script - fixed rc.subr reference in update_phishing_sites.cron and update_virus_scanners.cron --> now dynamically rewritten to correct location - Exim 4.61 changed queue file format which was incompatible with 4.52.2 --> patched Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- MailScanner-4.52.2_1.patch begins here --- ? files/patch-lib:MailScanner:Exim.pm Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/Makefile,v retrieving revision 1.47 diff -u -r1.47 Makefile --- Makefile 13 Apr 2006 16:42:24 -0000 1.47 +++ Makefile 26 Apr 2006 08:04:39 -0000 @@ -7,6 +7,7 @@ PORTNAME= MailScanner PORTVERSION= 4.52.2 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL} @@ -146,7 +147,8 @@ ${WRKSRC}/bin/update_virus_scanners ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ - s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g;' \ + s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \ + s,%%RC_SUBR%%,${RC_SUBR},g;' \ ${WRKSRC}/bin/cron/update_virus_scanners.cron ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ @@ -154,7 +156,8 @@ ${WRKSRC}/bin/update_phishing_sites ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ - s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g;' \ + s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \ + s,%%RC_SUBR%%,${RC_SUBR},g;' \ ${WRKSRC}/bin/cron/update_phishing_sites.cron ${PERL} -pi -e \ 's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g;' \ Index: files/CHANGES.port =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/CHANGES.port,v retrieving revision 1.3 diff -u -r1.3 CHANGES.port --- files/CHANGES.port 13 Apr 2006 16:42:25 -0000 1.3 +++ files/CHANGES.port 26 Apr 2006 08:04:39 -0000 @@ -1,6 +1,14 @@ +Version 4.52.2_1 +================= +- fixed bug in mta.sh script +- fixed rc.subr reference in update_phishing_sites.cron and + update_virus_scanners.cron --> now dynamically rewritten to correct + location +- Exim 4.61 changed queue file format which was incompatible with 4.52.2 --> patched + Version 4.52.2 ================= -- Upgrade to MailScanenr 4.52 +- Upgrade to MailScanner 4.52 Version 4.51.5 ================= Index: files/mta.sh.in =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/mta.sh.in,v retrieving revision 1.3 diff -u -r1.3 mta.sh.in --- files/mta.sh.in 13 Apr 2006 13:27:23 -0000 1.3 +++ files/mta.sh.in 26 Apr 2006 08:04:39 -0000 @@ -69,7 +69,7 @@ \( \( $_mta_osversion -ge 700000 \) -a \ \( $_mta_osversion -lt 700007 \) \) ] then - $_mta_rc_script="{$_mta_rc_script}.sh" + _mta_rc_script="${_mta_rc_script}.sh" fi load_rc_config $name Index: files/patch-bin:cron:update_phishing_sites.cron =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/patch-bin:cron:update_phishing_sites.cron,v retrieving revision 1.1 diff -u -r1.1 patch-bin:cron:update_phishing_sites.cron --- files/patch-bin:cron:update_phishing_sites.cron 16 Feb 2006 16:34:56 -0000 1.1 +++ files/patch-bin:cron:update_phishing_sites.cron 26 Apr 2006 08:04:39 -0000 @@ -15,7 +15,7 @@ +# order to spread virus updates round the clock. 1800 seconds = 30 minutes. +# Set this to 0 to disable it + -+. /usr/local/etc/rc.subr ++. %%RC_SUBR%% + +name="mailscanner" +rcvar=`set_rcvar` Index: files/patch-bin:cron:update_virus_scanners.cron =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/patch-bin:cron:update_virus_scanners.cron,v retrieving revision 1.1 diff -u -r1.1 patch-bin:cron:update_virus_scanners.cron --- files/patch-bin:cron:update_virus_scanners.cron 16 Feb 2006 16:34:56 -0000 1.1 +++ files/patch-bin:cron:update_virus_scanners.cron 26 Apr 2006 08:04:39 -0000 @@ -15,7 +15,7 @@ +# order to spread virus updates round the clock. 1800 seconds = 30 minutes. +# Set this to 0 to disable it + -+. /usr/local/etc/rc.subr ++. %%RC_SUBR%% + +name="mailscanner" +rcvar=`set_rcvar` --- MailScanner-4.52.2_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: