From 9158aa4fbc75ddc798be36505b9e69572b874bcb Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 26 Nov 2018 12:26:19 +0000 Subject: mutt: Update to version 1.11.0 Changes since version 1.10.1: + inotify is used for local mailbox monitoring on Linux. Configuration flag --disable-filemonitor turns this off. + OAUTHBEARER support for IMAP, SMTP and POP via $imap_oauth_refresh_command, $smtp_oauth_refresh_command, and $pop_oauth_refresh_command. ! $pgp_timeout and $smime_timeout support 32-bit numbers. + manually updates mailbox statistics, the same way $mail_check_stats does when set. ! Thread limited views, e.g. ~(pattern), now show new mail as it arrives. ! Command line argument -z and -Z options also work for IMAP mailboxes. + $imap_condstore and $imap_qresync enable IMAP CONDSTORE and QRESYNC support, respectively. QRESYNC should provide much faster mailbox opening. ! $abort_noattach skips quoted lines (as defined by $quote_regexp and $smileys). ! Initial IMAP header downloading can be aborted with ctrl-c. + composes a message to the sender of the selected message, in the index or attachment menu. ! Address book queries ($query_format) now support multibyte characters. + Finnish translation. ! pgpring has been renamed to mutt_pgpring. ! Certificate prompts show sha-256 instead of md5 fingerprints. ! Non-threaded $sort_aux "reverse-" settings now work properly. + The manual can be generated and installed in GNU Info format. + index-format-hook and the new %@name@ expando for $index_format enable dynamic index formats using pattern matching against the current message. This can be used, for example, to format dates based on the age of the message. ! Relative date matching allows hour, minute, and second units: HMS. --- mail/mutt/Makefile | 6 +++--- mail/mutt/PLIST | 8 +++++--- mail/mutt/distinfo | 17 ++++++++--------- mail/mutt/patches/patch-ab | 27 +++++---------------------- mail/mutt/patches/patch-af | 14 +++++++------- mail/mutt/patches/patch-al | 21 ++++++--------------- mail/mutt/patches/patch-aq | 32 -------------------------------- 7 files changed, 34 insertions(+), 91 deletions(-) delete mode 100644 mail/mutt/patches/patch-aq (limited to 'mail') diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 27480cc5614..0fa692f2c25 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.202 2018/08/22 09:45:27 wiz Exp $ +# $NetBSD: Makefile,v 1.203 2018/11/26 12:26:19 tron Exp $ -DISTNAME= mutt-1.10.1 -PKGREVISION= 1 +DISTNAME= mutt-1.11.0 CATEGORIES= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ @@ -23,6 +22,7 @@ CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ARGS+= --enable-external-dotlock CONFIGURE_ARGS+= --enable-pop CONFIGURE_ARGS+= --enable-imap +INFO_FILES= yes .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" # Force sendmail to /usr/sbin to avoid postfix's diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST index e9f0e1060ef..9153f51a7af 100644 --- a/mail/mutt/PLIST +++ b/mail/mutt/PLIST @@ -1,15 +1,16 @@ -@comment $NetBSD: PLIST,v 1.24 2018/03/04 09:21:55 tron Exp $ +@comment $NetBSD: PLIST,v 1.25 2018/11/26 12:26:19 tron Exp $ bin/flea bin/mutt bin/mutt_dotlock +bin/mutt_pgpring bin/muttbug bin/pgpewrap -bin/pgpring ${PLIST.smime}bin/smime_keys +info/mutt.info man/man1/mutt.1 man/man1/mutt_dotlock.1 +man/man1/mutt_pgpring.1 man/man1/pgpewrap.1 -man/man1/pgpring.1 man/man1/smime_keys.1 man/man5/mmdf.5 man/man5/mutt-mbox.5 @@ -92,6 +93,7 @@ share/locale/eo/LC_MESSAGES/mutt.mo share/locale/es/LC_MESSAGES/mutt.mo share/locale/et/LC_MESSAGES/mutt.mo share/locale/eu/LC_MESSAGES/mutt.mo +share/locale/fi/LC_MESSAGES/mutt.mo share/locale/fr/LC_MESSAGES/mutt.mo share/locale/ga/LC_MESSAGES/mutt.mo share/locale/gl/LC_MESSAGES/mutt.mo diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 790bcb98121..30b876dadae 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,16 +1,15 @@ -$NetBSD: distinfo,v 1.67 2018/07/17 06:54:22 tron Exp $ +$NetBSD: distinfo,v 1.68 2018/11/26 12:26:19 tron Exp $ -SHA1 (mutt-1.10.1.tar.gz) = 584c3a5cd604813749da4d90c8c457a143ccd746 -RMD160 (mutt-1.10.1.tar.gz) = aa86932d3d34fa8f57281fdf0abc8776ccbe595a -SHA512 (mutt-1.10.1.tar.gz) = 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726 -Size (mutt-1.10.1.tar.gz) = 4255890 bytes +SHA1 (mutt-1.11.0.tar.gz) = a6f67ee100792904c968b7d35423480902938a79 +RMD160 (mutt-1.11.0.tar.gz) = 755a910f093425b53bcac827dfa7d2c912ccc277 +SHA512 (mutt-1.11.0.tar.gz) = 1aa26deee563eee63bf8eb7116dbf7d5a796f5c8b5233ccdaf050188186b08fe1de948316cede5059375128b5771095b895e4113ac4f5549ced4aa83c6fa0c54 +Size (mutt-1.11.0.tar.gz) = 4568953 bytes SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 -SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681 +SHA1 (patch-ab) = 3d094b6bdb2b2ffac8ce6a1d3a306714c9f01835 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044 SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344 -SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61 +SHA1 (patch-af) = fd9eb93b580ce4f2115c3db16b199578fa99ce94 SHA1 (patch-ag) = ccf9d69c4fc1017c3a906e86dd8c60f6c8c87683 SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a -SHA1 (patch-al) = 65f22d4ec1536f8eabbee4f6b0f825d725f56ed7 +SHA1 (patch-al) = 0cb26ce9f89c1f0651eb46117f62ae6275bfaf97 SHA1 (patch-ap) = b26c1cbc107831d075edf7ced54d34f10552b666 -SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab index c0f545ca1dc..9bdc2c700f2 100644 --- a/mail/mutt/patches/patch-ab +++ b/mail/mutt/patches/patch-ab @@ -1,17 +1,8 @@ -$NetBSD: patch-ab,v 1.17 2015/09/03 21:04:34 wiz Exp $ +$NetBSD: patch-ab,v 1.18 2018/11/26 12:26:19 tron Exp $ ---- Makefile.in.orig 2015-08-30 17:24:26.000000000 +0000 -+++ Makefile.in -@@ -110,7 +110,7 @@ CONFIG_CLEAN_FILES = intl/Makefile hcach - CONFIG_CLEAN_VPATH_FILES = - am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) --am_mutt_OBJECTS = addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \ -+am_mutt_OBJECTS = mvchgat.$(OBJEXT) addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \ - base64.$(OBJEXT) browser.$(OBJEXT) buffy.$(OBJEXT) \ - color.$(OBJEXT) crypt.$(OBJEXT) cryptglue.$(OBJEXT) \ - commands.$(OBJEXT) complete.$(OBJEXT) compose.$(OBJEXT) \ -@@ -329,7 +329,7 @@ DATADIRNAME = @DATADIRNAME@ +--- Makefile.in.orig 2018-11-25 17:43:43.000000000 +0000 ++++ Makefile.in 2018-11-26 12:03:30.000000000 +0000 +@@ -398,7 +398,7 @@ DBX = @DBX@ DEBUGGER = @DEBUGGER@ DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ @@ -20,15 +11,7 @@ $NetBSD: patch-ab,v 1.17 2015/09/03 21:04:34 wiz Exp $ -DHAVE_CONFIG_H=1 DEPDIR = @DEPDIR@ -@@ -799,6 +799,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@ -@@ -1338,11 +1339,6 @@ install-exec-hook: +@@ -1667,11 +1667,6 @@ rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ fi diff --git a/mail/mutt/patches/patch-af b/mail/mutt/patches/patch-af index e1424b9ad7b..09390f1a330 100644 --- a/mail/mutt/patches/patch-af +++ b/mail/mutt/patches/patch-af @@ -1,10 +1,10 @@ -$NetBSD: patch-af,v 1.7 2016/04/09 08:47:36 tron Exp $ +$NetBSD: patch-af,v 1.8 2018/11/26 12:26:19 tron Exp $ -1.) On some systems, curses.h defines TRUE and FALSE, so conditionalise - them here to avoid compiler complaints about duplicate definitions. +On some systems, curses.h defines TRUE and FALSE, so conditionalise +them here to avoid compiler complaints about duplicate definitions. ---- lib.h.orig 2016-04-02 19:12:22.000000000 +0100 -+++ lib.h 2016-04-09 09:34:25.000000000 +0100 +--- lib.h.orig 2018-10-06 23:43:41.000000000 +0100 ++++ lib.h 2018-11-26 12:02:07.000000000 +0000 @@ -54,8 +54,12 @@ # define N_(a) a # endif @@ -18,5 +18,5 @@ $NetBSD: patch-af,v 1.7 2016/04/09 08:47:36 tron Exp $ +# define FALSE 0 +# endif - # define HUGE_STRING 8192 - # define LONG_STRING 1024 + # define HUGE_STRING 8192 + # define LONG_STRING 1024 diff --git a/mail/mutt/patches/patch-al b/mail/mutt/patches/patch-al index ef8a991c90c..ed98446911d 100644 --- a/mail/mutt/patches/patch-al +++ b/mail/mutt/patches/patch-al @@ -1,17 +1,8 @@ -$NetBSD: patch-al,v 1.11 2017/05/10 12:29:13 jperkin Exp $ +$NetBSD: patch-al,v 1.12 2018/11/26 12:26:19 tron Exp $ ---- configure.orig 2017-04-18 23:07:15.000000000 +0000 -+++ configure -@@ -8406,7 +8406,7 @@ fi - - old_LIBS="$LIBS" - LIBS="$LIBS $MUTTLIBS" -- for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm -+ for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm mvchgat mvwchgat - do - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_func declaration" >&5 -@@ -9463,7 +9463,7 @@ fi +--- configure.orig 2018-11-25 17:43:07.000000000 +0000 ++++ configure 2018-11-26 11:59:44.000000000 +0000 +@@ -9712,7 +9712,7 @@ if test x$mutt_cv_setgid = xyes; then DOTLOCK_GROUP='mail' @@ -20,7 +11,7 @@ $NetBSD: patch-al,v 1.11 2017/05/10 12:29:13 jperkin Exp $ else DOTLOCK_GROUP='' DOTLOCK_PERMISSION=755 -@@ -9772,6 +9772,7 @@ fi +@@ -10022,6 +10022,7 @@ case "`$KRB5CFGPATH --version`" in "Kerberos 5 "*) GSSAPI_IMPL="MIT";; ?eimdal*) GSSAPI_IMPL="Heimdal";; @@ -28,7 +19,7 @@ $NetBSD: patch-al,v 1.11 2017/05/10 12:29:13 jperkin Exp $ *) GSSAPI_IMPL="Unknown";; esac else -@@ -10021,7 +10022,7 @@ rm -f confcache +@@ -10271,7 +10272,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: GSSAPI libraries not found" >&5 $as_echo "GSSAPI libraries not found" >&6; } fi diff --git a/mail/mutt/patches/patch-aq b/mail/mutt/patches/patch-aq deleted file mode 100644 index b4e22348e93..00000000000 --- a/mail/mutt/patches/patch-aq +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2015/09/03 14:49:02 wiz Exp $ - ---- mvchgat.c.orig 2011-07-05 08:47:10.596708000 +0000 -+++ mvchgat.c -@@ -0,0 +1,27 @@ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "mutt.h" -+#include "mutt_curses.h" -+ -+#ifndef USE_SLANG_CURSES -+#ifndef HAVE_MVWCHGAT -+int -+mvwchgat(WINDOW *win, int y, int x, int count, attr_t attr, short color, -+ const void *opts) -+{ -+ wmove(win, y, x); -+ return wattr_set(win, attr, color, opts); -+} -+#endif -+ -+#ifndef HAVE_MVCHGAT -+int -+mvchgat(int y, int x, int count, attr_t attr, short color, -+ const void *opts) -+{ -+ return mvwchgat(stdscr, y, x, count, attr, color, opts); -+} -+#endif -+#endif -- cgit v1.2.3