diff options
| -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, 7 insertions, 66 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 45cb87cfe65..0c618032fd8 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.105 2001/09/23 10:53:37 frueauf Exp $ +# $NetBSD: Makefile,v 1.106 2001/10/06 17:18:05 frueauf Exp $ -DISTNAME= fetchmail-5.9.0 +DISTNAME= fetchmail-5.9.4 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 02410aa61cd..0c6f982f7f7 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.10 2001/09/23 10:53:37 frueauf Exp $ +$NetBSD: distinfo,v 1.11 2001/10/06 17:18:05 frueauf Exp $ -SHA1 (fetchmail-5.9.0.tar.gz) = 87b7b72a55eefa86d29b4b112ab1823f47fb02ff -Size (fetchmail-5.9.0.tar.gz) = 863180 bytes +SHA1 (fetchmail-5.9.4.tar.gz) = a5385c4e11d7a6b5ec0e5f16cf9eeb221f35fda3 +Size (fetchmail-5.9.4.tar.gz) = 864505 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 deleted file mode 100644 index 6b0ee759db4..00000000000 --- a/mail/fetchmail/patches/patch-ae +++ /dev/null @@ -1,58 +0,0 @@ -$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 be8a047f59c..2d4babd6eb1 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2001/09/27 23:18:21 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2001/10/06 17:18:06 frueauf Exp $ -DISTNAME= fetchmail-5.9.0 +DISTNAME= fetchmail-5.9.4 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} CATEGORIES= mail MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/ \ |