aboutsummaryrefslogtreecommitdiff
path: root/mail/mutt-devel
diff options
context:
space:
mode:
authorJim Mock <jim@FreeBSD.org>2002-01-03 21:58:57 +0000
committerJim Mock <jim@FreeBSD.org>2002-01-03 21:58:57 +0000
commit27adb1c99a4de0bf976eafa4a553f3ef34c47351 (patch)
tree5f96b345ad68c7ae64903ff86eb512bb4601a55f /mail/mutt-devel
parent49342df43b46a416804abb9921138c974707a060 (diff)
downloadports-27adb1c99a4de0bf976eafa4a553f3ef34c47351.tar.gz
ports-27adb1c99a4de0bf976eafa4a553f3ef34c47351.zip
Notes
Diffstat (limited to 'mail/mutt-devel')
-rw-r--r--mail/mutt-devel/Makefile3
-rw-r--r--mail/mutt-devel/distinfo12
-rw-r--r--mail/mutt-devel/files/patch-rfc822-security105
3 files changed, 7 insertions, 113 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 1338b5b3b909..305724525fbf 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= mutt-devel
-PORTVERSION= 1.3.24
-PORTREVISION= 2
+PORTVERSION= 1.3.25
CATEGORIES+= mail
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 2151007706e5..3e5339d6ed70 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (mutt/mutt-1.3.24i.tar.gz) = 19628b9836d204abc23226257e260342
-MD5 (mutt/patch-1.3.24.rr.compressed.gz) = 1693be8a98ca72846cd072830ea6e1cc
-MD5 (mutt/patch-1.3.24.vvv.nntp.gz) = daefef62e90eb52bf3c8450725149c68
-MD5 (mutt/patch-1.3.24.vvv.initials.gz) = 3b31cace25ce4f3410bc07a8f5859815
-MD5 (mutt/patch-1.3.24.vvv.quote.gz) = 49e66afbbfaeb0dbe6f1a8378cda0f08
-MD5 (mutt/patch-1.3.24.vvv.ru.gz) = 71d358000c2ba047c1d91cfb7c10695c
+MD5 (mutt/mutt-1.3.25i.tar.gz) = 4ca669d6697faba8acb5f5b01d574f29
+MD5 (mutt/patch-1.3.25.rr.compressed.gz) = 0f2aed90f0d1689b38e911f9c0e532bd
+MD5 (mutt/patch-1.3.25.vvv.nntp.gz) = dcfbdf264d7f5210c365838ab4b625f2
+MD5 (mutt/patch-1.3.25.vvv.initials.gz) = 2b2bf1a996508ef1b096eaea70df0276
+MD5 (mutt/patch-1.3.25.vvv.quote.gz) = 37040ec6fc316688877f48ad6328e4c9
+MD5 (mutt/patch-1.3.25.vvv.ru.gz) = 516a8b82eb931e1f3ae08736dcb3491e
diff --git a/mail/mutt-devel/files/patch-rfc822-security b/mail/mutt-devel/files/patch-rfc822-security
deleted file mode 100644
index ccb3e1768f79..000000000000
--- a/mail/mutt-devel/files/patch-rfc822-security
+++ /dev/null
@@ -1,105 +0,0 @@
---- rfc822.c.orig Wed Jan 17 09:53:12 2001
-+++ rfc822.c Tue Jan 1 22:29:12 2002
-@@ -33,6 +33,12 @@
- #include "rfc822.h"
- #endif
-
-+#define terminate_string(a, b, c) do { if ((b) < (c)) a[(b)] = 0; else \
-+ a[(c)] = 0; } while (0)
-+
-+#define terminate_buffer(a, b) terminate_string(a, b, sizeof (a) - 1)
-+
-+
- const char RFC822Specials[] = "@.,:;<>[]\\\"()";
- #define is_special(x) strchr(RFC822Specials,x)
-
-@@ -227,12 +233,12 @@
- return NULL;
- }
-
-- token[*tokenlen] = 0;
-+ terminate_string (token, *tokenlen, tokenmax);
- addr->mailbox = safe_strdup (token);
-
- if (*commentlen && !addr->personal)
- {
-- comment[*commentlen] = 0;
-+ terminate_string (comment, *commentlen, commentmax);
- addr->personal = safe_strdup (comment);
- }
-
-@@ -320,9 +326,6 @@
- *last = cur;
- }
-
--#define terminate_string(a, b) do { if (b < sizeof(a) - 1) a[b] = 0; else \
-- a[sizeof(a) - 1] = 0; } while (0)
--
- ADDRESS *rfc822_parse_adrlist (ADDRESS *top, const char *s)
- {
- const char *begin, *ps;
-@@ -344,12 +347,12 @@
- {
- if (phraselen)
- {
-- terminate_string (phrase, phraselen);
-+ terminate_buffer (phrase, phraselen);
- add_addrspec (&top, &last, phrase, comment, &commentlen, sizeof (comment) - 1);
- }
- else if (commentlen && last && !last->personal)
- {
-- terminate_string (comment, commentlen);
-+ terminate_buffer (comment, commentlen);
- last->personal = safe_strdup (comment);
- }
-
-@@ -377,7 +380,7 @@
- else if (*s == ':')
- {
- cur = rfc822_new_address ();
-- terminate_string (phrase, phraselen);
-+ terminate_buffer (phrase, phraselen);
- cur->mailbox = safe_strdup (phrase);
- cur->group = 1;
-
-@@ -401,12 +404,12 @@
- {
- if (phraselen)
- {
-- terminate_string (phrase, phraselen);
-+ terminate_buffer (phrase, phraselen);
- add_addrspec (&top, &last, phrase, comment, &commentlen, sizeof (comment) - 1);
- }
- else if (commentlen && last && !last->personal)
- {
-- terminate_string (phrase, phraselen);
-+ terminate_buffer (phrase, phraselen);
- last->personal = safe_strdup (comment);
- }
- #ifdef EXACT_ADDRESS
-@@ -430,7 +433,7 @@
- }
- else if (*s == '<')
- {
-- terminate_string (phrase, phraselen);
-+ terminate_buffer (phrase, phraselen);
- cur = rfc822_new_address ();
- if (phraselen)
- {
-@@ -473,13 +476,13 @@
-
- if (phraselen)
- {
-- terminate_string (phrase, phraselen);
-- terminate_string (comment, commentlen);
-+ terminate_buffer (phrase, phraselen);
-+ terminate_buffer (comment, commentlen);
- add_addrspec (&top, &last, phrase, comment, &commentlen, sizeof (comment) - 1);
- }
- else if (commentlen && last && !last->personal)
- {
-- terminate_string (comment, commentlen);
-+ terminate_buffer (comment, commentlen);
- last->personal = safe_strdup (comment);
- }
- #ifdef EXACT_ADDRESS