diff options
| author | mnag <mnag@FreeBSD.org> | 2008-03-25 04:15:05 +0800 |
|---|---|---|
| committer | mnag <mnag@FreeBSD.org> | 2008-03-25 04:15:05 +0800 |
| commit | 137e1851abb73bceb723abd24a37c9a9382e8088 (patch) | |
| tree | 660220f500bb6bceb04e62e67c73983a87f48c8a /mail/postfix | |
| parent | 52a8619f60deff1c285291b3c4db0aba67ed9547 (diff) | |
| download | freebsd-ports-gnome-137e1851abb73bceb723abd24a37c9a9382e8088.tar.gz freebsd-ports-gnome-137e1851abb73bceb723abd24a37c9a9382e8088.tar.zst freebsd-ports-gnome-137e1851abb73bceb723abd24a37c9a9382e8088.zip | |
- Fix milter macros (patch from Wietse Venema) [1]
- Update VDA patch to 2.5.1 [2]
PR: 121652 [1], 122029 [2]
Submitted by: dmx___dmx.org.ru [1], ShuenBin Hsu <sbhsu___mail.a6.idv.tw> [2]
Diffstat (limited to 'mail/postfix')
| -rw-r--r-- | mail/postfix/Makefile | 5 | ||||
| -rw-r--r-- | mail/postfix/distinfo | 3 | ||||
| -rw-r--r-- | mail/postfix/files/patch-src__smtpd__smtpd.c | 36 |
3 files changed, 41 insertions, 3 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index d90447f37a44..57d6738a2f7a 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -7,7 +7,7 @@ PORTNAME= postfix PORTVERSION= 2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -185,9 +185,8 @@ _REQUIRE+= ypserv .endif .if defined(WITH_VDA) -IGNORE= Waiting for a new patch that's work with 2.5.1 PATCH_SITES+= http://vda.sourceforge.net/VDA/ -PATCHFILES+= postfix-2.4.5-vda-ng.patch.gz +PATCHFILES+= postfix-2.5.1-vda-ng.patch.gz PATCH_DIST_STRIP= -p1 .endif diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 0e9da6915239..be41168d0f37 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,3 +1,6 @@ MD5 (postfix/postfix-2.5.1.tar.gz) = 95a559c509081fdd07d78eafd4f4c3b4 SHA256 (postfix/postfix-2.5.1.tar.gz) = bad7ed98d1bbc8fd27d4b4d6d65a8dfe21794c109bc923e5fe45abea5b484037 SIZE (postfix/postfix-2.5.1.tar.gz) = 3153629 +MD5 (postfix/postfix-2.5.1-vda-ng.patch.gz) = bba9426f8ae9d8603861ce782f117760 +SHA256 (postfix/postfix-2.5.1-vda-ng.patch.gz) = aae719707cea7257081cff915730a596a22e1415c625c574417018700760f423 +SIZE (postfix/postfix-2.5.1-vda-ng.patch.gz) = 12348 diff --git a/mail/postfix/files/patch-src__smtpd__smtpd.c b/mail/postfix/files/patch-src__smtpd__smtpd.c new file mode 100644 index 000000000000..f08cfea86de9 --- /dev/null +++ b/mail/postfix/files/patch-src__smtpd__smtpd.c @@ -0,0 +1,36 @@ +--- 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); |