diff options
| author | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-08-27 08:30:05 +0000 |
|---|---|---|
| committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-08-27 08:30:05 +0000 |
| commit | 74ed2bc9cd51d014d78d4d5f2aed2968e4ff772f (patch) | |
| tree | eb475581e137f4b72adf1fae7c60f46e6cb24341 /security/amavisd-new/files | |
| parent | Update to 0.5.2. (diff) | |
- update amavisd-new to 20030616.p5.
- fix dependency on devel/p5-IO, which should only be used when
perl older than 5.6.1 is installed.
- enable cpio for extraction of tar archives, which uses much less
memory than Archive::Tar (suggested by amavisd-new author)
PR: 56013
Submitted by: Blaz Zupan <blaz.zupan@amis.net>
Notes
Notes:
svn path=/head/; revision=87774
Diffstat (limited to 'security/amavisd-new/files')
| -rw-r--r-- | security/amavisd-new/files/patch-amavisd | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd index 7cd539f058c8..39380b6b2b1b 100644 --- a/security/amavisd-new/files/patch-amavisd +++ b/security/amavisd-new/files/patch-amavisd @@ -1,11 +1,20 @@ ---- amavisd.orig Fri Jan 10 22:03:39 2003 -+++ amavisd Thu Mar 6 21:18:38 2003 -@@ -5070,7 +5070,7 @@ - my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)]); - $amavisd_path = $1 if $amavisd_path =~ m{^([A-Za-z0-9/._=+-]+)$}; # untaint +--- amavisd.orig Mon Aug 25 18:07:56 2003 ++++ amavisd Mon Aug 25 20:47:40 2003 +@@ -3903,7 +3903,7 @@ + /^\.lzo$/ && defined $lzop + && return do_uncompress($part,$tempdir,"$lzop -d -c"); + /^\.cpio$/ && defined $cpio && return do_cpio($part,$tempdir); +-# /^\.tar$/ && defined $cpio && return do_cpio($part,$tempdir); ++ /^\.tar$/ && defined $cpio && return do_cpio($part,$tempdir); + /^\.tar$/ && return do_tar($part,$tempdir); # fallback + /^\.zip$/ && return do_unzip($part,0,$tempdir); + /^\.rar$/ && return do_unrar($part,0,$tempdir); +@@ -6260,7 +6260,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; - $config_file = $1 if $config_file =~ m{^([A-Za-z0-9/._=+-]+)$}; # untaint + $config_file = $1 if $config_file=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)};# untaint |