Please test.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 4 May 2007 09:09:31 -0000 1.31
+++ Makefile 28 May 2007 17:36:44 -0000
@@ -2,9 +2,8 @@
COMMENT= "tty-based e-mail client"
-VERSION= 1.4.2.2
-DISTNAME= mutt-${VERSION}i
-PKGNAME= ${DISTNAME}p0
+VERSION= 1.4.2.3
+DISTNAME= mutt-${VERSION}
MASTER_SITES= ${MASTER_SITES_MUTT}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 5 Apr 2007 16:20:03 -0000 1.19
+++ distinfo 28 May 2007 17:36:44 -0000
@@ -1,15 +1,15 @@
-MD5 (mutt-1.4.2.2i.tar.gz) = UaCEKcW9XDSvP0JouMvNow==
-MD5 (patch-1.4.2.2.rr.compressed.1.gz) = a2H2vxB5SjO40pcLg7w2SA==
+MD5 (mutt-1.4.2.3.tar.gz) = 3LlGYYJ90JD6gT5z4SLqDA==
+MD5 (patch-1.4.2.3.rr.compressed.1.gz) = 5oGEW+UVoC9GB9tm177ZGQ==
MD5 (patch-1.5.12.sidebar.20060720.txt-fixed) = D50gbC1jspWBqTT2rt/7wg==
-RMD160 (mutt-1.4.2.2i.tar.gz) = p0nBPptWsPPPCc5eq64/0u3OTAo=
-RMD160 (patch-1.4.2.2.rr.compressed.1.gz) = CuNLBJ21BAcdiAiWEN31nzpm2OA=
+RMD160 (mutt-1.4.2.3.tar.gz) = WeZsMIzUln5YetHcc912x/DQbvE=
+RMD160 (patch-1.4.2.3.rr.compressed.1.gz) = jNJD5iMjfOuSzaUBeqaccviYZEU=
RMD160 (patch-1.5.12.sidebar.20060720.txt-fixed) = vqh6fLv/g4mRLb2VIxYZ9dLQJ+4=
-SHA1 (mutt-1.4.2.2i.tar.gz) = DuEvc08hGGsUP6lqXqefcjl3R/s=
-SHA1 (patch-1.4.2.2.rr.compressed.1.gz) = 9jeXNBmQVa1KvJghu+bZY1b7t14=
+SHA1 (mutt-1.4.2.3.tar.gz) = sj5Ghz8CR+haRBfPM41k6mmMmyw=
+SHA1 (patch-1.4.2.3.rr.compressed.1.gz) = mvc6oKN/H5LM8B1TepshZH9jbwQ=
SHA1 (patch-1.5.12.sidebar.20060720.txt-fixed) = 3t8eNwwIwiTVYrUkk1mKNKe2HP8=
-SHA256 (mutt-1.4.2.2i.tar.gz) = Pn0WudN3EhScaKsq2Dfc+nmb7UMviiFpbc1cBZV5k5c=
-SHA256 (patch-1.4.2.2.rr.compressed.1.gz) =
rJkJR05NE4ondf/BElOQr8aJAvIpzkS5VLLdByWCJsY=
+SHA256 (mutt-1.4.2.3.tar.gz) = Gkkg5e/M1qg5Mq9CI8tWiVYVj2Lp9ZV5isxABKymrOU=
+SHA256 (patch-1.4.2.3.rr.compressed.1.gz) =
YnUw8z8J5xqlCHxqQIQ4ommT74hGrAhBn29tFj2egic=
SHA256 (patch-1.5.12.sidebar.20060720.txt-fixed) =
aodlLbf+M3VRvt3CBISTfnbf6Kf3JxChnJXvfBCyX+M=
-SIZE (mutt-1.4.2.2i.tar.gz) = 2676306
-SIZE (patch-1.4.2.2.rr.compressed.1.gz) = 13567
+SIZE (mutt-1.4.2.3.tar.gz) = 2646433
+SIZE (patch-1.4.2.3.rr.compressed.1.gz) = 13401
SIZE (patch-1.5.12.sidebar.20060720.txt-fixed) = 47421
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 24 Jul 2006 09:44:20 -0000 1.3
+++ patches/patch-Makefile_in 28 May 2007 17:36:44 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2006/07/24 09:44:20 bernd Exp $
---- Makefile.in.orig Fri Jul 14 20:38:58 2006
-+++ Makefile.in Mon Jul 24 11:38:17 2006
-@@ -904,7 +904,7 @@ info: info-recursive
+--- Makefile.in.orig Sun May 27 03:00:00 2007
++++ Makefile.in Mon May 28 19:10:48 2007
+@@ -906,7 +906,7 @@ info: info-recursive
info-am:
Index: patches/patch-browser_c
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/patches/patch-browser_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-browser_c
--- patches/patch-browser_c 16 Jan 2004 01:59:09 -0000 1.3
+++ patches/patch-browser_c 28 May 2007 17:36:44 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-browser_c,v 1.3 2004/01/16 01:59:09 fgsch Exp $
---- browser.c.orig 2002-07-24 06:33:59.000000000 -0300
-+++ browser.c 2004-01-15 23:00:44.000000000 -0300
+--- browser.c.orig Wed May 23 03:17:52 2007
++++ browser.c Mon May 28 19:10:48 2007
@@ -22,6 +22,7 @@
#include "buffy.h"
#include "mapping.h"
@@ -9,7 +9,7 @@ $OpenBSD: patch-browser_c,v 1.3 2004/01/
#include "mailbox.h"
#include "browser.h"
#ifdef USE_IMAP
-@@ -346,6 +347,21 @@ static void init_state (struct browser_s
+@@ -346,6 +347,21 @@ static void init_state (struct browser_state *state, M
menu->data = state->entry;
}
@@ -31,7 +31,7 @@ $OpenBSD: patch-browser_c,v 1.3 2004/01/
static int examine_directory (MUTTMENU *menu, struct browser_state *state,
char *d, const char *prefix)
{
-@@ -409,6 +425,7 @@ static int examine_directory (MUTTMENU *
+@@ -409,6 +425,7 @@ static int examine_directory (MUTTMENU *menu, struct b
tmp = Incoming;
while (tmp && mutt_strcmp (buffer, tmp->path))
tmp = tmp->next;
@@ -39,7 +39,7 @@ $OpenBSD: patch-browser_c,v 1.3 2004/01/
add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0);
}
closedir (dp);
-@@ -454,6 +471,7 @@ static int examine_mailboxes (MUTTMENU *
+@@ -454,6 +471,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
mutt_pretty_mailbox (buffer);
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/patches/patch-doc_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 19 Sep 2005 16:18:36 -0000 1.2
+++ patches/patch-doc_Makefile_in 28 May 2007 17:36:44 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.2 2005/09/19 16:18:36 bernd Exp $
---- doc/Makefile.in.orig Tue Nov 6 20:12:31 2001
-+++ doc/Makefile.in Fri Sep 16 10:11:50 2005
-@@ -60,7 +60,7 @@ srcdir_DOCFILES = PGP-Notes.txt applying
+--- doc/Makefile.in.orig Wed May 23 03:17:52 2007
++++ doc/Makefile.in Mon May 28 19:10:48 2007
+@@ -60,7 +60,7 @@ srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt \
topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
README NEWS TODO README.SECURITY README.SSL
@@ -10,7 +10,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.2 20
try-html: ../makedoc
test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html
./
-@@ -155,8 +155,8 @@ update-doc: ../makedoc stamp-doc-sgml s
+@@ -155,8 +155,8 @@ update-doc: ../makedoc stamp-doc-sgml stamp-doc-man m
muttrc.man stamp-doc-man: ../makedoc $(top_srcdir)/init.h muttrc.man.head
muttrc.man.tail
$(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \
Index: patches/patch-filter_c
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/patches/patch-filter_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-filter_c
--- patches/patch-filter_c 29 Dec 2002 09:34:48 -0000 1.1
+++ patches/patch-filter_c 28 May 2007 17:36:44 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-filter_c,v 1.1 2002/12/29 09:34:48 pvalchev Exp $
---- filter.c.orig Fri Mar 3 03:10:08 2000
-+++ filter.c Sun Dec 29 00:40:44 2002
-@@ -113,7 +113,7 @@ mutt_create_filter_fd (const char *cmd,
+--- filter.c.orig Wed May 23 03:17:53 2007
++++ filter.c Mon May 28 19:10:48 2007
+@@ -113,7 +113,7 @@ mutt_create_filter_fd (const char *cmd, FILE **in, FIL
close (fderr);
}
Index: patches/patch-mbox_c
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/patches/patch-mbox_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-mbox_c
--- patches/patch-mbox_c 19 Feb 2004 20:43:22 -0000 1.3
+++ patches/patch-mbox_c 28 May 2007 17:36:44 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-mbox_c,v 1.3 2004/02/19 20:43:22 brad Exp $
---- mbox.c.orig 2002-02-28 02:59:24.000000000 -0500
-+++ mbox.c 2004-02-17 00:48:33.000000000 -0500
+--- mbox.c.orig Wed May 23 03:17:53 2007
++++ mbox.c Mon May 28 19:10:48 2007
@@ -288,7 +288,7 @@ int mbox_parse_mailbox (CONTEXT *ctx)
if (!ctx->quiet && ReadInc && ((count % ReadInc == 0) || count == 1))
@@ -10,7 +10,7 @@ $OpenBSD: patch-mbox_c,v 1.3 2004/02/19
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
-@@ -796,7 +796,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+@@ -796,7 +796,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint)
j++;
if (!ctx->quiet && WriteInc && ((i % WriteInc) == 0 || j == 1))
mutt_message (_("Writing messages... %d (%d%%)"), i,
Index: patches/patch-mutt_tunnel_c
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/patches/patch-mutt_tunnel_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-mutt_tunnel_c
--- patches/patch-mutt_tunnel_c 29 Dec 2002 09:34:48 -0000 1.1
+++ patches/patch-mutt_tunnel_c 28 May 2007 17:36:44 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-mutt_tunnel_c,v 1.1 2002/12/29 09:34:48 pvalchev Exp $
---- mutt_tunnel.c.orig Tue Sep 4 03:18:32 2001
-+++ mutt_tunnel.c Sun Dec 29 00:40:54 2002
-@@ -91,7 +91,7 @@ static int tunnel_socket_open (CONNECTIO
+--- mutt_tunnel.c.orig Wed May 23 03:17:53 2007
++++ mutt_tunnel.c Mon May 28 19:10:48 2007
+@@ -91,7 +91,7 @@ static int tunnel_socket_open (CONNECTION *conn)
/* Don't let the subprocess think it can use the controlling tty */
setsid ();
Index: patches/patch-muttlib_c
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/patches/patch-muttlib_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-muttlib_c
--- patches/patch-muttlib_c 4 May 2007 09:09:31 -0000 1.2
+++ patches/patch-muttlib_c 28 May 2007 17:36:44 -0000
@@ -1,18 +1,7 @@
$OpenBSD: patch-muttlib_c,v 1.2 2007/05/04 09:09:31 kili Exp $
---- muttlib.c.orig Mon Mar 25 06:29:32 2002
-+++ muttlib.c Thu May 3 14:11:50 2007
-@@ -513,7 +513,9 @@ char *mutt_gecos_name (char *dest, size_t destlen, str
- {
- if (dest[idx] == '&')
- {
-- memmove (&dest[idx + pwnl], &dest[idx + 1],
-+ /* Don't move if destination is outside buffer. */
-+ if (idx + pwnl < destlen)
-+ memmove (&dest[idx + pwnl], &dest[idx + 1],
- MAX(destlen - idx - pwnl - 1, 0));
- memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl));
- dest[idx] = toupper (dest[idx]);
-@@ -809,8 +811,8 @@ void mutt_expand_fmt (char *dest, size_t destlen, cons
+--- muttlib.c.orig Wed May 23 03:19:26 2007
++++ muttlib.c Mon May 28 19:10:48 2007
+@@ -809,8 +809,8 @@ void mutt_expand_fmt (char *dest, size_t destlen, cons
}
else if (p[1] == '%')
p++;
Index: patches/patch-system_c
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/patches/patch-system_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-system_c
--- patches/patch-system_c 29 Dec 2002 09:34:48 -0000 1.1
+++ patches/patch-system_c 28 May 2007 17:36:44 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-system_c,v 1.1 2002/12/29 09:34:48 pvalchev Exp $
---- system.c.orig Fri Mar 3 03:10:14 2000
-+++ system.c Sun Dec 29 00:40:48 2002
-@@ -110,7 +110,7 @@ int _mutt_system (const char *cmd, int f
+--- system.c.orig Wed May 23 03:17:54 2007
++++ system.c Mon May 28 19:10:48 2007
+@@ -110,7 +110,7 @@ int _mutt_system (const char *cmd, int flags)
sigaction (SIGTSTP, &act, NULL);
sigaction (SIGCONT, &act, NULL);
