mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

- Fix modes of the temp directory [1]

Browse Source 
- Fix a bug in SMTP handling [2]
- Bump PORTREVISION

PR:		ports/127216 [1]
Submitted by:	Juan J Lopez <jlopez@evsis.com.ar> [1],
		Matt Emmerton <matt@gsicomp.on.ca> [2] (via private mail)
Approved by:	portmgr (erwin)
This commit is contained in:
Gabor Kovesdan 2008-09-22 09:30:48 +00:00
parent 73f3a0d1a6
commit 856c5bf9f1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=220447
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
security/amavisd-new/Makefile
View File

@ -8,6 +8,7 @@
PORTNAME= amavisd-new
PORTVERSION= 2.6.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= http://www.ijs.si/software/amavisd/ \

2
security/amavisd-new/files/amavisd.sh.in
View File

@ -33,7 +33,7 @@ rm -rf %%AMAVISDIR%%/tmp/* %%AMAVISDIR%%/tmp/.* 2>/dev/null || true
if [ ${amavisd_ram} ];then
df %%AMAVISDIR%%/tmp | grep '^/dev/md' > /dev/null
if [ $? -eq 1 ];then
mdmfs -M -s ${amavisd_ram} -w %%AMAVISUSER%%:%%AMAVISGROUP%% md %%AMAVISDIR%%/tmp || true
mdmfs -M -s ${amavisd_ram} -p 750 -w %%AMAVISUSER%%:%%AMAVISGROUP%% md %%AMAVISDIR%%/tmp || true
fi
fi
}

22
security/amavisd-new/files/patch-amavisd Normal file
View File

@ -0,0 +1,22 @@
--- amavisd.orig 2008-09-22 11:21:15.000000000 +0200
+++ amavisd 2008-09-22 11:23:53.000000000 +0200
@@ -16878,13 +16878,18 @@
$data_command_accepted = $smtp_resp=~/^3/ ? 1 : 0;
if (!$data_command_accepted) {
do_log(0,"Negative SMTP resp. to DATA: %s", $smtp_resp);
+ $in_datasend_mode = 0;
+ $smtp_session->timeout($smtp_rset_timeout);
+ $what_cmd = 'RSET'; $smtp_handle->rset; # send a RSET
} elsif (!$any_valid_recips) { # pipelining
do_log(2,"Too late, DATA accepted but no valid recips, send dummy");
$which_section = 'fwd-data-contents';
$smtp_session->timeout(
- max(60,min($smtp_data_xfer_timeout,$deadline-time)));
+ max(60,min($smtp_data_done_timeout,$deadline-time)));
+ $what_cmd = 'data-dot';
$smtp_handle->dataend; # as required by rfc2920: if the DATA command
# was accepted the SMTP client should send a single dot
+ $in_datasend_mode = 0;
} elsif ($any_tempfail_recips && !$dsn_per_recip_capable) { # pipelining
# we must not proceed if mail did not came in as LMTP,
# or we would generate mail duplicates on each delivery attempt