ports/65120: MAINTAINER UPDATE: security/amavisd-new update to 20030616.p9

[Blaz Zupan]

>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 at 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: