summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorPete Fritchman <petef@FreeBSD.org>2002-06-08 13:32:07 +0000
committerPete Fritchman <petef@FreeBSD.org>2002-06-08 13:32:07 +0000
commit7d9ab0caaf350f76fcb2fb922e845770acda9093 (patch)
tree378371e3f0a48ec6ac67a127daeb8d2063acd24c /mail
parentUpdate to 0.50. (diff)
Fix a bug where asmail wouldn't correctly parse the imap4 port number
correctly. PR: 34804 Submitted by: Fuyuhiko Maruyama <fuyuhik8@is.titech.ac.jp> Approved by: maintainer timeout
Notes
Notes: svn path=/head/; revision=60855
Diffstat (limited to 'mail')
-rw-r--r--mail/asmail/Makefile1
-rw-r--r--mail/asmail/files/patch-asmail-pop.c45
2 files changed, 46 insertions, 0 deletions
diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index 28a910bdcb82..8cce77732396 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asmail
PORTVERSION= 0.56
+PORTREVISION= 1
CATEGORIES= mail afterstep
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://gates.enemy.at/pub/
diff --git a/mail/asmail/files/patch-asmail-pop.c b/mail/asmail/files/patch-asmail-pop.c
new file mode 100644
index 000000000000..15eca827d640
--- /dev/null
+++ b/mail/asmail/files/patch-asmail-pop.c
@@ -0,0 +1,45 @@
+$FreeBSD$
+
+--- pop.c.orig Thu Apr 13 19:08:02 2000
++++ pop.c Sat May 5 04:06:47 2001
+@@ -196,7 +196,8 @@
+ {
+ SOCKET *sock;
+ int sd, i, port = 0, type;
+- char server[100], user[100], password[100], mailbox[100];
++ char server[100], user[100], password[100];
++ char mailbox[100] = "INBOX"; /* default mailbox */
+ char *pnt;
+ static int InDuty = 0;
+
+@@ -229,18 +230,19 @@
+ return -1;
+ }
+
+- /* optional portnumber */
++ /* optional portnumber and mailbox for IMAP4 */
+ pnt += strlen(password) + 1;
+- if (sscanf(pnt, "%d", &port) != 1)
+- switch (type) {
+- case TYPE_POP: port = DEFAULTPORT; break;
+- case TYPE_IMAP: port = DEFAULTIMAPPORT; break;
+- }
+-
+- /* optional mailboxname for IMAP */
+- if (type == TYPE_IMAP)
+- if (sscanf(pnt, "%100s", &mailbox) != 1)
+- strcpy(mailbox, "INBOX");
++ switch (type) {
++ case TYPE_POP:
++ port = DEFAULTPORT;
++ sscanf(pnt, "%d", &port);
++ break;
++ case TYPE_IMAP:
++ port = DEFAULTIMAPPORT;
++ if (sscanf(pnt, "%d %100s", &port, &mailbox) == 0)
++ sscanf(pnt, "%100s", &mailbox);
++ break;
++ }
+
+ /* Feb. 17 2000: Removed toupper() of mailbox names.
+ * Some IMAP servers seem to have troubles with case-insensitive