mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00
Code Issues Releases Activity

- Fix milter macros (patch from Wietse Venema) [1]

Browse Source 
- 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]
This commit is contained in:
Marcus Alves Grando 2008-03-24 20:15:05 +00:00
parent 90b55483dc
commit 9310717632
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=209721
15 changed files with 205 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/postfix/Makefile
View File

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

3
mail/postfix/distinfo
View File

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

36
mail/postfix/files/patch-src__smtpd__smtpd.c Normal file
View File

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

5
mail/postfix25/Makefile
View File

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

3
mail/postfix25/distinfo
View File

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

36
mail/postfix25/files/patch-src__smtpd__smtpd.c Normal file
View File

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

5
mail/postfix26/Makefile
View File

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

3
mail/postfix26/distinfo
View File

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

36
mail/postfix26/files/patch-src__smtpd__smtpd.c Normal file
View File

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

5
mail/postfix27/Makefile
View File

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

3
mail/postfix27/distinfo
View File

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

36
mail/postfix27/files/patch-src__smtpd__smtpd.c Normal file
View File

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

5
mail/postfix28/Makefile
View File

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

3
mail/postfix28/distinfo
View File

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

36
mail/postfix28/files/patch-src__smtpd__smtpd.c Normal file
View File

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