From 9ebb944a7e3010cbaea6c9ae2c64a8b0cb52b6c3 Mon Sep 17 00:00:00 2001
From: ben <ben@pkgsrc.org>
Date: Mon, 26 Dec 2005 16:45:27 +0000
Subject: Mutt's fetch-mail function using pop3s would fail erroneously when
 the server does not report the TOP capability, which is optional and is not
 used by Mutt.  This patch squelches the error and allows mutt to fetch mail
 from pop3s servers lacking TOP.

---
 mail/mutt/Makefile         |  4 ++--
 mail/mutt/distinfo         |  3 ++-
 mail/mutt/patches/patch-al | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 mail/mutt/patches/patch-al

(limited to 'mail')

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 230c4a648fc..4132faa3df1 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.130 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.131 2005/12/26 16:45:27 ben Exp $
 
 DISTNAME=		mutt-1.4.2.1i
 PKGNAME=		${DISTNAME:C/i$//}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 1ea267b7dd1..10072da87bb 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2005/05/29 03:44:12 minskim Exp $
+$NetBSD: distinfo,v 1.26 2005/12/26 16:45:27 ben Exp $
 
 SHA1 (mutt-1.4.2.1i.tar.gz) = 10fae2eef5a671d1ea6e17acd6e64cd1f37c3961
 RMD160 (mutt-1.4.2.1i.tar.gz) = 314536f77e0494dc6e4a5d57c681de791c8ce0fc
@@ -11,3 +11,4 @@ SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2
 SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde
 SHA1 (patch-aj) = a0ee2bc9a7b9e743e313101899de3d991a9d2cad
 SHA1 (patch-ak) = 689305356812d04bd3b490c436ed898a4b308136
+SHA1 (patch-al) = d05f5a1606bf8a7669db198a0f85f95eb17f74b4
diff --git a/mail/mutt/patches/patch-al b/mail/mutt/patches/patch-al
new file mode 100644
index 00000000000..80686401c13
--- /dev/null
+++ b/mail/mutt/patches/patch-al
@@ -0,0 +1,13 @@
+--- pop_lib.c.orig	2005-12-26 06:28:37.000000000 -0800
++++ pop_lib.c	2005-12-26 06:28:40.000000000 -0800
+@@ -155,8 +155,10 @@
+ 
+       if (!pop_data->expire)
+ 	msg = _("Unable to leave messages on server.");
++/*
+       if (!pop_data->cmd_top)
+ 	msg = _("Command TOP is not supported by server.");
++*/
+       if (!pop_data->cmd_uidl)
+ 	msg = _("Command UIDL is not supported by server.");
+       break;
-- 
cgit v1.2.3