Update mail/mutt-devel to 1.5.21
1.5.21 (2010-09-15):
+ $mail_check_recent controls whether all unread mail or only new mail
since the last mailbox visit will be reported as new
+ %D format expando for $folder_format
! $thorough_search defaults to yes
+ imap-logout-all closes all open IMAP connections
! header/body cache paths are always UTF-8
+ $wrap_headers to control outgoing message's header length
+ all text/* parts can be displayed inline without mailcap
+ send-hooks now run in batch mode; previously only send2-hooks ran.
This commit is contained in:
tonio
parent
a1ed4e18ea
commit
5afda29ea4
10 changed files with 38 additions and 104 deletions
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.79 2010/09/16 08:04:15 adam Exp $
|
||||
# $NetBSD: Makefile,v 1.80 2010/11/07 14:52:47 tonio Exp $
|
||||
|
||||
DISTNAME= mutt-1.5.20
|
||||
PKGREVISION= 4
|
||||
DISTNAME= mutt-1.5.21
|
||||
CATEGORIES= mail
|
||||
MUTT_SITES= ftp://ftp.mutt.org/mutt/ \
|
||||
ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.22 2009/07/16 20:23:41 tonio Exp $
|
||||
@comment $NetBSD: PLIST,v 1.23 2010/11/07 14:52:47 tonio Exp $
|
||||
bin/flea
|
||||
bin/mutt
|
||||
bin/mutt_dotlock
|
||||
|
|
@ -10,6 +10,7 @@ man/man1/flea.1
|
|||
man/man1/mutt.1
|
||||
man/man1/mutt_dotlock.1
|
||||
man/man1/muttbug.1
|
||||
man/man1/smime_keys.1
|
||||
man/man5/mutt-mbox.5
|
||||
man/man5/mutt-mmdf.5
|
||||
man/man5/muttrc.5
|
||||
|
|
|
|||
|
|
@ -1,23 +1,18 @@
|
|||
$NetBSD: distinfo,v 1.64 2009/09/13 22:47:30 wiz Exp $
|
||||
$NetBSD: distinfo,v 1.65 2010/11/07 14:52:47 tonio Exp $
|
||||
|
||||
SHA1 (mutt-1.5.20.tar.gz) = d2bec7a33771f128ca49b1723b06b6d248a35d31
|
||||
RMD160 (mutt-1.5.20.tar.gz) = df582f79364b9fd70a0001e76a119d8f78275ebb
|
||||
Size (mutt-1.5.20.tar.gz) = 3635047 bytes
|
||||
SHA1 (patch-1.5.20.sidebar.20090619.txt) = d72355e39674bb4f892e4af3b84fe49c94415487
|
||||
RMD160 (patch-1.5.20.sidebar.20090619.txt) = 4c693b100a320d11ea94aedb75cff63d9f6cfb3f
|
||||
Size (patch-1.5.20.sidebar.20090619.txt) = 53335 bytes
|
||||
SHA1 (mutt-1.5.21.tar.gz) = a8475f2618ce5d5d33bff85c0affdf21ab1d76b9
|
||||
RMD160 (mutt-1.5.21.tar.gz) = b235a42972ae410592253cdc117a90baf279f47a
|
||||
Size (mutt-1.5.21.tar.gz) = 3716886 bytes
|
||||
SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
|
||||
SHA1 (patch-ab) = 779037e78738a8dcad5115020e4e9eeb540bbf76
|
||||
SHA1 (patch-ab) = 73d7fcd363d0064366c953fa61cfae9a71dcf9d4
|
||||
SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
|
||||
SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
|
||||
SHA1 (patch-ae) = 9523ec98ceeb410f5e9ab468e29727da3ac6bfb5
|
||||
SHA1 (patch-af) = 36ca7b54d42537b1d23d87e58d6e31dbad032c0e
|
||||
SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6
|
||||
SHA1 (patch-ag) = 8b14861fde20edd39fb0b352cbe0f9e890529443
|
||||
SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed
|
||||
SHA1 (patch-ai) = 7ddb35fd4565d37b169c7a45a6a75c649d5beaf5
|
||||
SHA1 (patch-al) = 4de61597f439731e664599b8b0d9f3fe5da557cd
|
||||
SHA1 (patch-al) = 49542905cde263b8d4c79f71cce3759024c804a3
|
||||
SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
|
||||
SHA1 (patch-an) = eae26290a7a03b3ba31d058cd154c4de8effcf98
|
||||
SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
|
||||
SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
|
||||
SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
|
||||
SHA1 (patch-aq) = b26d083f44de7dd641f1176822e4bd943769f35c
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: options.mk,v 1.40 2010/06/02 13:15:48 adam Exp $
|
||||
# $NetBSD: options.mk,v 1.41 2010/11/07 14:52:47 tonio Exp $
|
||||
|
||||
# Global and legacy options
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
|
|||
PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-smtp
|
||||
# Comment the following line out on updates.
|
||||
#PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox
|
||||
PKG_SUPPORTED_OPTIONS+= mutt-sidebar
|
||||
#PKG_SUPPORTED_OPTIONS+= mutt-sidebar
|
||||
#PKG_SUPPORTED_OPTIONS+= mutt-xlabel
|
||||
PKG_SUGGESTED_OPTIONS= ssl smime curses
|
||||
|
||||
|
|
@ -96,7 +96,7 @@ CONFIGURE_ARGS+= --without-gdbm
|
|||
# since the real -I and -L flags are added by buildlink already.
|
||||
CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include
|
||||
CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib
|
||||
CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:Q}
|
||||
CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-hcache
|
||||
.endif
|
||||
|
|
@ -135,7 +135,7 @@ PATCH_FUZZ_FACTOR= -F1
|
|||
###
|
||||
.if !empty(PKG_OPTIONS:Mmutt-xlabel)
|
||||
PATCH_SITES= http://home.uchicago.edu/~dgc/sw/mutt/
|
||||
PATCHFILES+= patch-1.5.14.dgc.xlabel_ext.9
|
||||
PATCHFILES+= patch-1.5.17.dgc.xlabel_ext.9
|
||||
PATCH_DIST_STRIP= -p1
|
||||
.endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ab,v 1.14 2009/08/05 11:41:12 hasso Exp $
|
||||
$NetBSD: patch-ab,v 1.15 2010/11/07 14:52:47 tonio Exp $
|
||||
|
||||
--- Makefile.in.orig 2009-07-25 19:16:56.000000000 +0200
|
||||
--- Makefile.in.orig 2010-08-25 16:31:48.000000000 +0000
|
||||
+++ Makefile.in
|
||||
@@ -65,7 +65,7 @@ CONFIG_CLEAN_FILES = intl/Makefile hcach
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
|
|
@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.14 2009/08/05 11:41:12 hasso Exp $
|
|||
-DHAVE_CONFIG_H=1
|
||||
|
||||
DEPDIR = @DEPDIR@
|
||||
@@ -321,7 +321,7 @@ infodir = @infodir@
|
||||
@@ -322,7 +322,7 @@ infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
|
|
@ -29,24 +29,24 @@ $NetBSD: patch-ab,v 1.14 2009/08/05 11:41:12 hasso Exp $
|
|||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
@@ -344,7 +344,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
|
||||
SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
|
||||
@@ -346,7 +346,7 @@ SUBDIRS = m4 po intl doc contrib $(IMAP_
|
||||
bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
|
||||
BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
|
||||
@BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
|
||||
BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h $(HCVERSION)
|
||||
-mutt_SOURCES = \
|
||||
+mutt_SOURCES = mvchgat.c \
|
||||
addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
|
||||
crypt.c cryptglue.c \
|
||||
commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
|
||||
@@ -665,6 +665,7 @@ distclean-compile:
|
||||
@@ -666,6 +666,7 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc2231.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc3676.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc822.Po@am__quote@
|
||||
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mvchgat.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe_asprintf.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/score.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@
|
||||
@@ -1191,11 +1192,6 @@ install-exec-hook:
|
||||
@@ -1194,11 +1195,6 @@ install-exec-hook:
|
||||
rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
|
||||
ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
$NetBSD: patch-ae,v 1.14 2009/08/27 10:38:19 wiz Exp $
|
||||
|
||||
--- mutt_ssl.c.orig 2009-06-10 05:08:29.000000000 +0000
|
||||
+++ mutt_ssl.c
|
||||
@@ -652,7 +652,7 @@ static int check_host (X509 *x509cert, c
|
||||
char *buf = NULL;
|
||||
int bufsize;
|
||||
/* needed to get the DNS subjectAltNames: */
|
||||
- STACK *subj_alt_names;
|
||||
+ STACK_OF(GENERAL_NAME) *subj_alt_names;
|
||||
int subj_alt_names_count;
|
||||
GENERAL_NAME *subj_alt_name;
|
||||
/* did we find a name matching hostname? */
|
||||
@@ -735,7 +735,7 @@ static int ssl_cache_trusted_cert (X509
|
||||
{
|
||||
dprint (1, (debugfile, "trusted: %s\n", c->name));
|
||||
if (!SslSessionCerts)
|
||||
- SslSessionCerts = sk_new_null();
|
||||
+ SslSessionCerts = sk_X509_new_null();
|
||||
return (sk_X509_push (SslSessionCerts, X509_dup(c)));
|
||||
}
|
||||
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
$NetBSD: patch-ag,v 1.8 2009/01/26 22:35:03 tonio Exp $
|
||||
$NetBSD: patch-ag,v 1.9 2010/11/07 14:52:47 tonio Exp $
|
||||
|
||||
--- doc/Makefile.in.orig 2009-01-05 20:24:14.000000000 +0100
|
||||
--- doc/Makefile.in.orig 2010-08-25 16:31:48.000000000 +0000
|
||||
+++ doc/Makefile.in
|
||||
@@ -492,7 +492,7 @@ uninstall-am: uninstall-local
|
||||
@@ -519,7 +519,7 @@ uninstall-am: uninstall-local
|
||||
|
||||
all: makedoc-all
|
||||
|
||||
-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt
|
||||
-makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt
|
||||
+makedoc-all: mutt.1 muttrc.man
|
||||
|
||||
install-data-local: makedoc-all instdoc
|
||||
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
|
||||
@@ -504,8 +504,8 @@ install-data-local: makedoc-all instdoc
|
||||
@@ -532,8 +532,8 @@ install-data-local: makedoc-all instdoc
|
||||
test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
|
||||
$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
|
||||
./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
$NetBSD: patch-ai,v 1.5 2009/09/13 22:47:30 wiz Exp $
|
||||
|
||||
Two patches from
|
||||
http://bugs.mutt.org/3308
|
||||
and
|
||||
http://bugs.mutt.org/3312
|
||||
fixing bugs in MH handling.
|
||||
|
||||
--- mh.c.orig 2009-06-01 16:29:32.000000000 +0000
|
||||
+++ mh.c
|
||||
@@ -146,7 +146,7 @@ static int mh_read_token (char *t, int *
|
||||
if ((p = strchr (t, '-')))
|
||||
{
|
||||
*p++ = '\0';
|
||||
- if (mutt_atoi (t, first) < 0 || mutt_atoi (t, last) < 0)
|
||||
+ if (mutt_atoi (t, first) < 0 || mutt_atoi (p, last) < 0)
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
@@ -207,7 +207,7 @@ static int mh_read_sequences (struct mh_
|
||||
out:
|
||||
FREE (&buff);
|
||||
safe_fclose (&fp);
|
||||
- return 0;
|
||||
+ return rc;
|
||||
}
|
||||
|
||||
static inline mode_t mh_umask (CONTEXT* ctx)
|
||||
@@ -1155,7 +1155,7 @@ int mh_read_dir (CONTEXT * ctx, const ch
|
||||
|
||||
if (ctx->magic == M_MH)
|
||||
{
|
||||
- if (mh_read_sequences (&mhs, ctx->path) >= 0)
|
||||
+ if (mh_read_sequences (&mhs, ctx->path) < 0)
|
||||
return -1;
|
||||
mh_update_maildir (md, &mhs);
|
||||
mhs_free_sequences (&mhs);
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-al,v 1.10 2009/08/05 11:41:12 hasso Exp $
|
||||
$NetBSD: patch-al,v 1.11 2010/11/07 14:52:47 tonio Exp $
|
||||
|
||||
--- configure.orig 2009-06-09 08:50:42.000000000 +0200
|
||||
--- configure.orig 2010-08-25 16:31:47.000000000 +0000
|
||||
+++ configure
|
||||
@@ -11623,7 +11623,7 @@ fi
|
||||
@@ -7836,7 +7836,7 @@ fi
|
||||
|
||||
old_LIBS="$LIBS"
|
||||
LIBS="$LIBS $MUTTLIBS"
|
||||
|
|
@ -10,8 +10,8 @@ $NetBSD: patch-al,v 1.10 2009/08/05 11:41:12 hasso Exp $
|
|||
+ for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm mvchgat mvwchgat
|
||||
do
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking for $ac_func declaration" >&5
|
||||
@@ -14939,7 +14939,7 @@ docdir=$mutt_cv_docdir
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_func declaration" >&5
|
||||
@@ -8856,7 +8856,7 @@ fi
|
||||
|
||||
if test x$mutt_cv_setgid = xyes; then
|
||||
DOTLOCK_GROUP='mail'
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
$NetBSD: patch-an,v 1.4 2009/07/16 20:23:41 tonio Exp $
|
||||
$NetBSD: patch-an,v 1.5 2010/11/07 14:52:47 tonio Exp $
|
||||
|
||||
Add change_folder_next option.
|
||||
|
||||
--- init.h.orig 2009-06-13 23:35:21.000000000 +0200
|
||||
--- init.h.orig 2010-09-15 15:39:31.000000000 +0000
|
||||
+++ init.h
|
||||
@@ -355,6 +355,13 @@ struct option_t MuttVars[] = {
|
||||
** \fBNote:\fP It should only be set in case Mutt isn't abled to determine the
|
||||
** \fBNote:\fP It should only be set in case Mutt isn't able to determine the
|
||||
** character set used correctly.
|
||||
*/
|
||||
+ { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
|
||||
|
|
|
|||
Loading…
Reference in a new issue