cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 20030616.p9

Browse Source 
PR:		65120
Submitted by:	Blaz Zupan <blaz.zupan@amis.net>
This commit is contained in:
Yen-Ming Lee 2004-04-04 06:23:11 +00:00
parent c2809c490a
commit 6e33eddc2d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=106093
3 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/amavisd-new/Makefile
View File

@ -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/ \

4
security/amavisd-new/distinfo
View File

@ -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

38
security/amavisd-new/files/patch-amavisd
View File

@ -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