diff options
| author | frueauf <frueauf@pkgsrc.org> | 2001-09-23 10:53:37 +0000 |
|---|---|---|
| committer | frueauf <frueauf@pkgsrc.org> | 2001-09-23 10:53:37 +0000 |
| commit | 3df4a57a141e7cc41d266cd9f00b278eff37e64a (patch) | |
| tree | 694860e486d974c6356be2bd30e22c195d2ca1ad /mail | |
| parent | 0c6336a1e4eaad94c86033711547d1d37abe1c9e (diff) | |
| download | pkgsrc-3df4a57a141e7cc41d266cd9f00b278eff37e64a.tar.gz | |
Update fetchmail{conf} to 5.9.0 and apply patch provided in pr 14031
by Xavier HUMBERT <xavier@xavhome.fr.eu.org>.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/fetchmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/fetchmail/distinfo | 7 | ||||
| -rw-r--r-- | mail/fetchmail/patches/patch-ae | 58 | ||||
| -rw-r--r-- | mail/fetchmailconf/Makefile | 4 |
4 files changed, 66 insertions, 7 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 2a91c5541cc..45cb87cfe65 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.104 2001/08/27 14:35:10 tron Exp $ +# $NetBSD: Makefile,v 1.105 2001/09/23 10:53:37 frueauf Exp $ -DISTNAME= fetchmail-5.8.17 +DISTNAME= fetchmail-5.9.0 CATEGORIES= mail MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/ \ http://www.tuxedo.org/~esr/fetchmail/ \ diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index 7655d830a69..02410aa61cd 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.9 2001/08/10 05:31:40 tron Exp $ +$NetBSD: distinfo,v 1.10 2001/09/23 10:53:37 frueauf Exp $ -SHA1 (fetchmail-5.8.17.tar.gz) = 60f1f4762e5cb73798828a10e6feb89b5aecb88d -Size (fetchmail-5.8.17.tar.gz) = 877438 bytes +SHA1 (fetchmail-5.9.0.tar.gz) = 87b7b72a55eefa86d29b4b112ab1823f47fb02ff +Size (fetchmail-5.9.0.tar.gz) = 863180 bytes SHA1 (patch-aa) = 3c8aaac5d53c1069995ab74ad99bc5e64843a507 SHA1 (patch-ab) = 009a97639502365f8b6ec4e854622620391a812f SHA1 (patch-ac) = ef0e651807bb0942ca79ed3b10ffc000f71bd330 SHA1 (patch-ad) = b6bffc59f28992fa0d3de0f9dad250c73bbeffc6 +SHA1 (patch-ae) = 4eb69bf125bd3c1dec1d70bc12061a8823551dfb diff --git a/mail/fetchmail/patches/patch-ae b/mail/fetchmail/patches/patch-ae new file mode 100644 index 00000000000..6b0ee759db4 --- /dev/null +++ b/mail/fetchmail/patches/patch-ae @@ -0,0 +1,58 @@ +$NetBSD: patch-ae,v 1.3 2001/09/23 10:53:38 frueauf Exp $ + +Since it is not fixed in 5.9.0, in fechtmail's mailing-list, +Sunil Shetye <shetye@bombay.retortsoft.com> proposed a patch : +in article <20010905130320.A26152@mcdonald.bombay.retortsoft.com> +which was provided in pr 14031 by Xavier HUMBERT <xavier@xavhome.fr.eu.org>. + + +--- sink.c-orig Mon Aug 6 10:02:53 2001 ++++ sink.c Sun Sep 23 12:18:43 2001 +@@ -586,6 +586,7 @@ + const char *ap; + char options[MSGBUFSIZE]; + char addr[HOSTLEN+USERNAMELEN+1]; ++ char **from_responses; + int total_addresses; + + /* +@@ -665,6 +666,7 @@ + total_addresses = 0; + for (idp = msg->recipients; idp; idp = idp->next) + total_addresses++; ++ xalloca(from_responses, char **, sizeof(char *) * total_addresses); + for (idp = msg->recipients; idp; idp = idp->next) + if (idp->val.status.mark == XMIT_ACCEPT) + { +@@ -694,6 +696,20 @@ + + handle_smtp_report(ctl, msg); + ++#ifdef HAVE_SNPRINTF ++ snprintf(errbuf, sizeof(errbuf), "%s: %s", ++ idp->id, smtp_response); ++#else ++ strncpy(errbuf, idp->id, sizeof(errbuf)); ++ strcat(errbuf, ": "); ++ strcat(errbuf, smtp_response); ++#endif /* HAVE_SNPRINTF */ ++ ++ xalloca(from_responses[*bad_addresses], ++ char *, ++ strlen(errbuf)+1); ++ strcpy(from_responses[*bad_addresses], errbuf); ++ + (*bad_addresses)++; + idp->val.status.mark = XMIT_RCPTBAD; + if (outlevel >= O_VERBOSE) +@@ -702,6 +718,10 @@ + ctl->listener, addr); + } + } ++ if (*bad_addresses) ++ send_bouncemail(ctl, msg, XMIT_RCPTBAD, ++ "Some addresses were rejected by the MDA fetchmail forwards to.\r\n", ++ *bad_addresses, from_responses); + + /* + * It's tempting to do local notification only if bouncemail was diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index e8b539ac5cd..7a1a5a0ff31 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2001/08/10 05:31:40 tron Exp $ +# $NetBSD: Makefile,v 1.27 2001/09/23 10:53:38 frueauf Exp $ -DISTNAME= fetchmail-5.8.17 +DISTNAME= fetchmail-5.9.0 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} CATEGORIES= mail MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/ \ |