From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 3 03:00:41 2004 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 AEFFD16A4CE for ; Sat, 3 Apr 2004 03:00:41 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0E7443D66 for ; Sat, 3 Apr 2004 03:00:41 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i33B0fbv085898 for ; Sat, 3 Apr 2004 03:00:41 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i33B0fHh085897; Sat, 3 Apr 2004 03:00:41 -0800 (PST) (envelope-from gnats) Resent-Date: Sat, 3 Apr 2004 03:00:41 -0800 (PST) Resent-Message-Id: <200404031100.i33B0fHh085897@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, Blaz Zupan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6A7F16A4CE for ; Sat, 3 Apr 2004 02:53:18 -0800 (PST) Received: from out-1.mail.amis.net (out-1.mail.amis.net [212.18.32.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAD6C43D1F for ; Sat, 3 Apr 2004 02:53:17 -0800 (PST) (envelope-from blaz.zupan@amis.net) Received: from localhost (in-2.mail.amis.net [212.18.32.19]) by out-1.mail.amis.net (Postfix) with ESMTP id 98A469BFD for ; Sat, 3 Apr 2004 12:53:16 +0200 (CEST) Received: from in-2.mail.amis.net ([127.0.0.1]) by localhost (in-2.mail.amis.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 91608-05 for ; Sat, 3 Apr 2004 12:53:14 +0200 (CEST) Received: from piranha.amis.net (piranha.amis.net [212.18.32.3]) by in-2.mail.amis.net (Postfix) with ESMTP id 6209822861E for ; Sat, 3 Apr 2004 12:53:14 +0200 (CEST) Received: from titanic.medinet.si (titanic.medinet.si [212.18.42.5]) by piranha.amis.net (Postfix) with ESMTP id 4FB6DFD88 for ; Sat, 3 Apr 2004 12:53:14 +0200 (CEST) Received: by titanic.medinet.si (Postfix, from userid 1000) id 3F78A5546F; Sat, 3 Apr 2004 12:53:14 +0200 (CEST) Message-Id: <20040403105314.3F78A5546F@titanic.medinet.si> Date: Sat, 3 Apr 2004 12:53:14 +0200 (CEST) From: Blaz Zupan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/65120: MAINTAINER UPDATE: security/amavisd-new update to 20030616.p9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Blaz Zupan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Apr 2004 11:00:41 -0000 >Number: 65120 >Category: ports >Synopsis: MAINTAINER UPDATE: security/amavisd-new update to 20030616.p9 >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: Sat Apr 03 03:00:41 PST 2004 >Closed-Date: >Last-Modified: >Originator: Blaz Zupan >Release: FreeBSD 4.9-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD titanic.medinet.si 4.9-RELEASE-p1 FreeBSD 4.9-RELEASE-p1 #3: Sat Dec 20 15:57:16 CET 2003 root@bigbrother.amis.net:/db/obj/usr/src/sys/TITANIC i386 >Description: >How-To-Repeat: >Fix: diff -urN amavisd-new.orig/Makefile amavisd-new/Makefile --- amavisd-new.orig/Makefile Mon Mar 22 20:29:14 2004 +++ amavisd-new/Makefile Sat Apr 3 12:30:36 2004 @@ -7,8 +7,7 @@ # Based on amavisd ports makefile. PORTNAME= amavisd-new -PORTVERSION= 20030616.p8 -PORTREVISION= 1 +PORTVERSION= 20030616.p9 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ http://mirrors.catpipe.net/amavisd-new/ \ diff -urN amavisd-new.orig/distinfo amavisd-new/distinfo --- amavisd-new.orig/distinfo Mon Mar 22 20:06:19 2004 +++ amavisd-new/distinfo Sat Apr 3 12:25:44 2004 @@ -1,2 +1,2 @@ -MD5 (amavisd-new-20030616-p8.tar.gz) = 5b55cef4ef4cc717b9ee1ed204a1ed96 -SIZE (amavisd-new-20030616-p8.tar.gz) = 328420 +MD5 (amavisd-new-20030616-p9.tar.gz) = 4c96fadc57a5de84cc3bc6b548b46aff +SIZE (amavisd-new-20030616-p9.tar.gz) = 363756 diff -urN amavisd-new.orig/files/patch-amavisd amavisd-new/files/patch-amavisd --- amavisd-new.orig/files/patch-amavisd Mon Mar 22 20:27:16 2004 +++ amavisd-new/files/patch-amavisd Sat Apr 3 12:31:01 2004 @@ -1,39 +1,11 @@ ---- amavisd.orig Tue Mar 9 03:21:43 2004 -+++ amavisd Mon Mar 22 20:26:59 2004 -@@ -109,7 +109,7 @@ - - BEGIN { - fetch_modules('REQUIRED BASIC MODULES', 1, qw( -- Exporter POSIX Fcntl Socket Errno Carp Carp::Heavy Time::HiRes -+ Exporter POSIX Fcntl Socket Errno Carp Time::HiRes - IO::File IO::Socket IO::Socket::UNIX IO::Socket::INET - IO::Handle IO::Wrap IO::Stringy - Digest::MD5 Unix::Syslog File::Basename File::Copy -@@ -5358,7 +5358,8 @@ - } - section_time('parts'); prolong_timer('decoding'); - } -- if ($any_undecipherable) { # test if undecipherables are banned -+ if ($any_undecipherable && $banned_filename_re) { -+ # test if undecipherables are banned - my($rn) = 'UNDECIPHERABLE'; - my($result,$patt) = $banned_filename_re->lookup_re($rn); - if ($result) { -@@ -5920,7 +5921,7 @@ - $s = $undecipherable_subject_tag; - do_log(3,"adding $undecipherable_subject_tag, $any_undecipherable, $hold"); - } -- $s .= $sa_spam_subject_tag; -+ $s .= $sa_spam_subject_tag if $do_subj; - my($entity) = $msginfo->mime_entity; - if (defined $entity && defined $entity->head->get('Subject',0)) { - $hdr_edits->edit_header('Subject', -@@ -6420,7 +6421,7 @@ - local($1); +--- amavisd.orig Fri Apr 2 21:33:50 2004 ++++ amavisd Sat Apr 3 12:29:41 2004 +@@ -6461,7 +6461,7 @@ + my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)], 0); $amavisd_path = $1 if $amavisd_path=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)}; # untaint -my($config_file) = '/etc/amavisd.conf'; # default location of config file +my($config_file) = '%%PREFIX%%/etc/amavisd.conf'; # default location of config file if (@ARGV >= 2 && $ARGV[0] eq '-c') { # override by command line option -c shift @ARGV; $config_file = shift @ARGV; - local($1); + $config_file = $1 if $config_file=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)};# untaint >Release-Note: >Audit-Trail: >Unformatted: