diff options
| author | Yen-Ming Lee <leeym@FreeBSD.org> | 2004-04-04 06:23:11 +0000 |
|---|---|---|
| committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2004-04-04 06:23:11 +0000 |
| commit | 6e33eddc2d765ef196483460fc9a6ecd9ee625f0 (patch) | |
| tree | 7fed5c81ab15b602e40be226e1bde53b251e2c81 /security/amavisd-new | |
| parent | c2809c490ae3db1941b733d290a897dab0f8cdf8 (diff) | |
Notes
Diffstat (limited to 'security/amavisd-new')
| -rw-r--r-- | security/amavisd-new/Makefile | 3 | ||||
| -rw-r--r-- | security/amavisd-new/distinfo | 4 | ||||
| -rw-r--r-- | security/amavisd-new/files/patch-amavisd | 38 |
3 files changed, 8 insertions, 37 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 5351c143c3ce..56ea07acc80e 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -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 --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo index a25a802a4661..69cca7298184 100644 --- a/security/amavisd-new/distinfo +++ b/security/amavisd-new/distinfo @@ -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 --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd index 8cba9aecfa18..b541eadff85c 100644 --- a/security/amavisd-new/files/patch-amavisd +++ b/security/amavisd-new/files/patch-amavisd @@ -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 |