diff options
author | Marcus Alves Grando <mnag@FreeBSD.org> | 2008-08-17 23:14:30 +0000 |
---|---|---|
committer | Marcus Alves Grando <mnag@FreeBSD.org> | 2008-08-17 23:14:30 +0000 |
commit | e1a1580f7161ec6f29e2f1efd5b2914775d696bb (patch) | |
tree | f1929edd7cf3f42bbd9137ca58968a04b7e37956 /mail/postfix | |
parent | adfa33e68e60fab02861ee5c8b73ce6bc73c75d1 (diff) | |
download | ports-e1a1580f7161ec6f29e2f1efd5b2914775d696bb.tar.gz ports-e1a1580f7161ec6f29e2f1efd5b2914775d696bb.zip |
- Update to 2.5.4
- Update VDA patch to 2.5.3
Notes
Notes:
svn path=/head/; revision=218731
Diffstat (limited to 'mail/postfix')
-rw-r--r-- | mail/postfix/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix/distinfo | 12 | ||||
-rw-r--r-- | mail/postfix/files/patch-src__smtpd__smtpd.c | 36 |
3 files changed, 8 insertions, 45 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 57d6738a2f7a..2be3c280b8a8 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 2.5.1 -PORTREVISION= 2 +PORTVERSION= 2.5.4 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -186,7 +185,7 @@ _REQUIRE+= ypserv .if defined(WITH_VDA) PATCH_SITES+= http://vda.sourceforge.net/VDA/ -PATCHFILES+= postfix-2.5.1-vda-ng.patch.gz +PATCHFILES+= postfix-2.5.3-vda-ng.patch.gz PATCH_DIST_STRIP= -p1 .endif diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index be41168d0f37..86b3e16786f6 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,6 +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 +MD5 (postfix/postfix-2.5.4.tar.gz) = 0985c854cd92016a8a6b2ed0b7d95af1 +SHA256 (postfix/postfix-2.5.4.tar.gz) = c455de2efd03a38e6b7507521dc0141c526105b8bdf231732f7cd7a9129b4a63 +SIZE (postfix/postfix-2.5.4.tar.gz) = 3157713 +MD5 (postfix/postfix-2.5.3-vda-ng.patch.gz) = 44bc9b1278fc971515cb8c94268dea94 +SHA256 (postfix/postfix-2.5.3-vda-ng.patch.gz) = 5690c734072e6231b151449a7ef1da25e9ac091f51b279c4670219751b984799 +SIZE (postfix/postfix-2.5.3-vda-ng.patch.gz) = 12809 diff --git a/mail/postfix/files/patch-src__smtpd__smtpd.c b/mail/postfix/files/patch-src__smtpd__smtpd.c deleted file mode 100644 index f08cfea86de9..000000000000 --- a/mail/postfix/files/patch-src__smtpd__smtpd.c +++ /dev/null @@ -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); |