- Update to 2.6-20080411
This commit is contained in:
parent
52533f9f53
commit
ce9f4228f6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=211149
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= postfix
|
||||
DISTVERSION= 2.6-20080221
|
||||
PORTREVISION= 2
|
||||
DISTVERSION= 2.6-20080411
|
||||
PORTEPOCH= 4
|
||||
CATEGORIES= mail ipv6
|
||||
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (postfix/postfix-2.6-20080221.tar.gz) = bfec2e9cbeeaef1a5d55fe8f4c654498
|
||||
SHA256 (postfix/postfix-2.6-20080221.tar.gz) = 5fc6afcf958fb3942dfa42648d03dbd4b2c83f099b872bce3f1d44e888b9cdc6
|
||||
SIZE (postfix/postfix-2.6-20080221.tar.gz) = 3141991
|
||||
MD5 (postfix/postfix-2.6-20080411.tar.gz) = cbbb306015ce7adc5ac2ded1244c630f
|
||||
SHA256 (postfix/postfix-2.6-20080411.tar.gz) = 3aba0c5d7de46acbf6a633e458c8acc6d4be8b4c6bc7006f3db4e2026d60a230
|
||||
SIZE (postfix/postfix-2.6-20080411.tar.gz) = 3146581
|
||||
|
@ -1,36 +0,0 @@
|
||||
--- src/smtpd/smtpd.c.orig 2008-03-24 16:38:05.000000000 -0300
|
||||
+++ src/smtpd/smtpd.c 2008-03-24 16:48:38.000000000 -0300
|
||||
@@ -2108,14 +2108,14 @@
|
||||
if (smtpd_milters != 0
|
||||
&& SMTPD_STAND_ALONE(state) == 0
|
||||
&& (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
|
||||
+ PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
|
||||
err = milter_mail_event(smtpd_milters,
|
||||
milter_argv(state, argc - 2, argv + 2));
|
||||
if (err != 0) {
|
||||
/* Log reject etc. with correct sender information. */
|
||||
- PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
|
||||
err = check_milter_reply(state, err);
|
||||
- POP_STRING(saved_sender, state->sender);
|
||||
}
|
||||
+ POP_STRING(saved_sender, state->sender);
|
||||
if (err != 0) {
|
||||
/* XXX Reset access map side effects. */
|
||||
mail_reset(state);
|
||||
@@ -2362,14 +2362,14 @@
|
||||
}
|
||||
if (smtpd_milters != 0
|
||||
&& (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
|
||||
+ PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
|
||||
err = milter_rcpt_event(smtpd_milters,
|
||||
milter_argv(state, argc - 2, argv + 2));
|
||||
if (err != 0) {
|
||||
/* Log reject etc. with correct recipient information. */
|
||||
- PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
|
||||
err = check_milter_reply(state, err);
|
||||
- POP_STRING(saved_rcpt, state->recipient);
|
||||
}
|
||||
+ POP_STRING(saved_rcpt, state->recipient);
|
||||
if (err != 0) {
|
||||
smtpd_chat_reply(state, "%s", err);
|
||||
return (-1);
|
Loading…
Reference in New Issue
Block a user