diff options
| -rw-r--r-- | mail/fetchmail/Makefile | 6 | ||||
| -rw-r--r-- | mail/fetchmail/files/md5 | 4 | ||||
| -rw-r--r-- | mail/fetchmail/files/patch-sum | 4 | ||||
| -rw-r--r-- | mail/fetchmail/patches/patch-ac | 34 | ||||
| -rw-r--r-- | mail/fetchmail/pkg/PLIST | 3 | ||||
| -rw-r--r-- | mail/fetchmailconf/Makefile | 4 |
6 files changed, 25 insertions, 30 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 6a62733381e..9a8abc8ca4a 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.85 2001/02/24 02:25:22 hubertf Exp $ +# $NetBSD: Makefile,v 1.86 2001/03/03 12:27:50 frueauf Exp $ # -DISTNAME= fetchmail-5.6.0 +DISTNAME= fetchmail-5.7.0 CATEGORIES= mail MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/ \ http://www.tuxedo.org/~esr/fetchmail/ \ @@ -62,7 +62,7 @@ post-build: post-install: ${INSTALL_DATA_DIR} ${FDOC} cd ${WRKSRC} && ${INSTALL_DATA} \ - sample.rcfile FAQ NOTES FEATURES README COPYING \ + FAQ NOTES FEATURES README COPYING \ fetchmail-FAQ.html fetchmail-features.html \ design-notes.html ${FDOC} diff --git a/mail/fetchmail/files/md5 b/mail/fetchmail/files/md5 index 4f91c61d040..53227c78621 100644 --- a/mail/fetchmail/files/md5 +++ b/mail/fetchmail/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.51 2000/11/27 15:59:07 frueauf Exp $ +$NetBSD: md5,v 1.52 2001/03/03 12:27:51 frueauf Exp $ -MD5 (fetchmail-5.6.0.tar.gz) = 27deaf22b8a414a0611a962119ee2e16 +MD5 (fetchmail-5.7.0.tar.gz) = 0e5e14062e5e7d4004ebf1e04a272697 diff --git a/mail/fetchmail/files/patch-sum b/mail/fetchmail/files/patch-sum index ced5f9fd3f0..79590cfa793 100644 --- a/mail/fetchmail/files/patch-sum +++ b/mail/fetchmail/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.14 2000/11/15 18:50:28 tron Exp $ +$NetBSD: patch-sum,v 1.15 2001/03/03 12:27:51 frueauf Exp $ MD5 (patch-aa) = cc1298297934cf1b0821583ef27ac5d9 MD5 (patch-ab) = e250709868504acbfd40cfa89634766e -MD5 (patch-ac) = 2c816f294ba8abeca66f8d825791b076 +MD5 (patch-ac) = 17f520797cf067f96939d1c293d05390 MD5 (patch-ad) = da45661a42aca654307a83b8d00c6a18 diff --git a/mail/fetchmail/patches/patch-ac b/mail/fetchmail/patches/patch-ac index d3cac400ab7..27971c370e3 100644 --- a/mail/fetchmail/patches/patch-ac +++ b/mail/fetchmail/patches/patch-ac @@ -1,22 +1,18 @@ -$NetBSD: patch-ac,v 1.11 2000/11/15 18:50:29 tron Exp $ +$NetBSD: patch-ac,v 1.12 2001/03/03 12:27:51 frueauf Exp $ ---- imap.c.orig Fri Nov 10 23:34:27 2000 -+++ imap.c Wed Nov 15 19:43:51 2000 -@@ -827,13 +827,11 @@ - strcat (buf1, "\r\n"); - SockWrite (sock, buf1, strlen (buf1)); - -- if ((result = gen_recv (sock, buf1, sizeof (buf1)))) -- return result; -- -- if (strstr (buf1, "OK")) { -- return PS_SUCCESS; +--- imap.c.orig Thu Mar 1 20:26:58 2001 ++++ imap.c Sat Mar 3 12:57:24 2001 +@@ -196,11 +196,9 @@ + strcat(msgbuf,"\r\n"); + SockWrite (sock, msgbuf, strlen (msgbuf)); + +- if ((result = gen_recv (sock, msgbuf, sizeof msgbuf))) + result = imap_ok (sock, NULL); -+ if (result == PS_SUCCESS) { -+ return result; - } else { -- return PS_AUTHFAIL; -+ return PS_AUTHFAIL; - } ++ if (result == PS_SUCCESS) + return result; +- +- if (strstr (msgbuf, "OK")) +- return PS_SUCCESS; + else + return PS_AUTHFAIL; } - diff --git a/mail/fetchmail/pkg/PLIST b/mail/fetchmail/pkg/PLIST index 3044ae18e85..c84338fa2f2 100644 --- a/mail/fetchmail/pkg/PLIST +++ b/mail/fetchmail/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2000/01/24 08:43:43 itojun Exp $ +@comment $NetBSD: PLIST,v 1.8 2001/03/03 12:27:52 frueauf Exp $ bin/fetchmail man/man1/fetchmail.1 share/doc/fetchmail/README @@ -9,5 +9,4 @@ share/doc/fetchmail/FEATURES share/doc/fetchmail/fetchmail-FAQ.html share/doc/fetchmail/design-notes.html share/doc/fetchmail/fetchmail-features.html -share/doc/fetchmail/sample.rcfile @dirrm share/doc/fetchmail diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index ad6827c84d2..76549d2a0a2 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2001/02/17 18:24:47 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/03/03 12:27:52 frueauf Exp $ -DISTNAME= fetchmail-5.6.0 +DISTNAME= fetchmail-5.7.0 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} CATEGORIES= mail MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/ \ |