pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail/mutt
Module Name: pkgsrc
Committed By: tron
Date: Sun Nov 8 17:42:46 UTC 2020
Modified Files:
pkgsrc/mail/mutt: Makefile PLIST distinfo
Added Files:
pkgsrc/mail/mutt/patches: patch-Makefile.in patch-color.c
patch-configure patch-doc_Makefile.in patch-lib.h
Removed Files:
pkgsrc/mail/mutt/patches: patch-ab patch-af patch-ag patch-al
Log Message:
mutt: Update to version 2.0.0
Change since version 1.14.7:
+ Domain-literal support for email addresses, e.g user@[IPv6:fcXX:...]
! Buffy completion only occurs for the "change-folder" set of functions.
It has been disabled for <attach-message>, <write-fcc>, the fcc
mailbox prompt, and the autocrypt scan mailbox prompt.
! The "save/copy message to mailbox" set of functions use the "mailbox"
history list, instead of the "filename" list.
! Message-ID extraction permits values missing angle brackets and '@'
to allow properly threading the garbage sent by some providers.
Mutt will add missing angle brackets when sending out replies, however.
! When adding multiple attachments, via <attach-file> in the compose menu,
the browser menu can be exiting via <quit> after tagging the files.
Previously, <select-entry> had to be used.
! ctrl-p/ctrl-n are by default bound to <history-up>/<history-down> in the
editor menu.
+ The "cd" command allows changing the current working directory.
As part of this, Mutt expands relative paths internally. There
may be a change to some "prettified" relative paths because of this.
! Some configuration variable default values are localizable by
translators. Currently these are: $attribution, $compose_format,
$forward_attribution_intro, $forward_attribution_trailer, $status_format,
$ts_icon_format, $ts_status_format.
+ Mutt will try to automatically reconnect to an IMAP mailbox on error,
and will merge unsync'ed changes if possible.
! $crypt_protected_headers_subject defaults to "...", following the
protected headers revised specification.
! Date, From, To, Cc, and Reply-To headers are stored as protected headers.
+ XOAUTH2 support. Please see the manual, contrib script mutt_oauth2.py,
and mutt_oauth.py.README for more details.
+ $tunnel_is_secure, default set, assumes a connection via $tunnel is
encrypted. Unsetting this will cause $ssl_starttls and $ssl_force_tls
to be respected.
+ Patterns are tab-completable in the editor menu.
! $reply_to is consulted before $reply_self.
+ $copy_decode_weed, default unset, controls header weeding for <decode-copy>
and <decode-save>.
+ $pipe_decode_weed, default set, enables header weeding for <pipe-message>.
+ $print_decode_weed, default set, enables header weeding for <print-message>.
! format=flowed attachments are space-unstuffed when viewed, saved,
piped, and printed.
+ The "run" command will execute MuttLisp. $muttlisp_inline_eval, if set, will
execute unquoted parenthesized command arguments as MuttLisp. Please see
the manual for more details about both.
+ $cursor_overlay, when set, will overlay the indicator, tree,
sidebar_highlight, and sidebar_indicator colors onto the current line.
"default" colors will be overridden and attributes will be merged.
! The message-id generation algorithm uses a random number instead of
the step counter and PID.
! $ssl_force_tls defaults set. (Trying this again for 2.0).
! $hostname is set *after* muttrc processing. It can be manually set
in the muttrc to avoid using DNS calls to obtain the FQDN.
+ $attach_save_dir specifies a directory to use when saving attachments.
To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 pkgsrc/mail/mutt/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mail/mutt/PLIST
cvs rdiff -u -r1.85 -r1.86 pkgsrc/mail/mutt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/mutt/patches/patch-Makefile.in \
pkgsrc/mail/mutt/patches/patch-color.c \
pkgsrc/mail/mutt/patches/patch-configure \
pkgsrc/mail/mutt/patches/patch-doc_Makefile.in \
pkgsrc/mail/mutt/patches/patch-lib.h
cvs rdiff -u -r1.18 -r0 pkgsrc/mail/mutt/patches/patch-ab
cvs rdiff -u -r1.8 -r0 pkgsrc/mail/mutt/patches/patch-af
cvs rdiff -u -r1.11 -r0 pkgsrc/mail/mutt/patches/patch-ag
cvs rdiff -u -r1.12 -r0 pkgsrc/mail/mutt/patches/patch-al
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/mutt/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.235 pkgsrc/mail/mutt/Makefile:1.236
--- pkgsrc/mail/mutt/Makefile:1.235 Sat Sep 12 05:23:25 2020
+++ pkgsrc/mail/mutt/Makefile Sun Nov 8 17:42:45 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.235 2020/09/12 05:23:25 kim Exp $
+# $NetBSD: Makefile,v 1.236 2020/11/08 17:42:45 tron Exp $
-DISTNAME= mutt-1.14.7
-PKGREVISION= 2
+DISTNAME= mutt-2.0.0
CATEGORIES= mail
MASTER_SITES= http://ftp.mutt.org/pub/mutt/
Index: pkgsrc/mail/mutt/PLIST
diff -u pkgsrc/mail/mutt/PLIST:1.28 pkgsrc/mail/mutt/PLIST:1.29
--- pkgsrc/mail/mutt/PLIST:1.28 Mon Jun 22 06:24:15 2020
+++ pkgsrc/mail/mutt/PLIST Sun Nov 8 17:42:45 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2020/06/22 06:24:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.29 2020/11/08 17:42:45 tron Exp $
bin/flea
bin/mutt
bin/mutt_dotlock
@@ -67,6 +67,8 @@ share/doc/mutt/samples/iconv/iconv.solar
share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
share/doc/mutt/samples/markdown2html
+share/doc/mutt/samples/mutt_oauth2.py
+share/doc/mutt/samples/mutt_oauth2.py.README
share/doc/mutt/samples/mutt_xtitle
share/doc/mutt/samples/pgp2.rc
share/doc/mutt/samples/pgp5.rc
Index: pkgsrc/mail/mutt/distinfo
diff -u pkgsrc/mail/mutt/distinfo:1.85 pkgsrc/mail/mutt/distinfo:1.86
--- pkgsrc/mail/mutt/distinfo:1.85 Sun Aug 30 07:32:30 2020
+++ pkgsrc/mail/mutt/distinfo Sun Nov 8 17:42:45 2020
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.85 2020/08/30 07:32:30 tron Exp $
+$NetBSD: distinfo,v 1.86 2020/11/08 17:42:45 tron Exp $
-SHA1 (mutt-1.14.7.tar.gz) = 10927a00d0f9e6e53036937098764476a96e2c96
-RMD160 (mutt-1.14.7.tar.gz) = 9bc17efb20a73cb8fd4b01fdfdb702fc97a3781e
-SHA512 (mutt-1.14.7.tar.gz) = dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c
-Size (mutt-1.14.7.tar.gz) = 5009968 bytes
-SHA1 (patch-ab) = 3d094b6bdb2b2ffac8ce6a1d3a306714c9f01835
-SHA1 (patch-af) = fd9eb93b580ce4f2115c3db16b199578fa99ce94
-SHA1 (patch-ag) = a9bfc6041a9b763e77d9174073a3cd905c7b5f93
-SHA1 (patch-al) = 0cb26ce9f89c1f0651eb46117f62ae6275bfaf97
+SHA1 (mutt-2.0.0.tar.gz) = 2554e214f2f0e6ff148a33805af6b00bb57ee988
+RMD160 (mutt-2.0.0.tar.gz) = 778578909487e7182dd0418416e63a002832ca6b
+SHA512 (mutt-2.0.0.tar.gz) = 2f48bf7eb9bb79a477e3fb9bf4bcde6033d7aaa8922eee20b6e6a05f49a1aea152a7987b99f335343175d87180062064c90c5a7b5bfa82aed188eeab0ac4a90b
+Size (mutt-2.0.0.tar.gz) = 5287742 bytes
+SHA1 (patch-Makefile.in) = 646eab10790053fff80bf8012ea85f40412b330c
+SHA1 (patch-color.c) = 69964830c13d4113e78a19539aad1e560825182a
+SHA1 (patch-configure) = cbd7ff52b0b358fff41988d286267046f56ee8d5
+SHA1 (patch-doc_Makefile.in) = 8086887afeec554d0c78047a48ec3eb33d38f26c
+SHA1 (patch-lib.h) = f10c32fc891a3c70c7379e092159e207b6c27b8b
Added files:
Index: pkgsrc/mail/mutt/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/mail/mutt/patches/patch-Makefile.in:1.1
--- /dev/null Sun Nov 8 17:42:46 2020
+++ pkgsrc/mail/mutt/patches/patch-Makefile.in Sun Nov 8 17:42:45 2020
@@ -0,0 +1,28 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/11/08 17:42:45 tron Exp $
+
+- Fix location of locale files
+- Allow build as an unpriviliged user
+
+--- Makefile.in.orig 2020-11-07 20:18:32.000000000 +0000
++++ Makefile.in 2020-11-08 14:57:59.053299992 +0000
+@@ -393,7 +393,7 @@
+ DBX = @DBX@
+ DEBUGGER = @DEBUGGER@
+ DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
+- -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
++ -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \
+ -DHAVE_CONFIG_H=1
+
+ DEPDIR = @DEPDIR@
+@@ -1680,11 +1680,6 @@
+ rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
+ ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
+ fi
+- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
+- chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
+- chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
+- { echo "Can't fix mutt_dotlock's permissions! This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
+- fi
+
+ install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)
Index: pkgsrc/mail/mutt/patches/patch-color.c
diff -u /dev/null pkgsrc/mail/mutt/patches/patch-color.c:1.1
--- /dev/null Sun Nov 8 17:42:46 2020
+++ pkgsrc/mail/mutt/patches/patch-color.c Sun Nov 8 17:42:45 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-color.c,v 1.1 2020/11/08 17:42:45 tron Exp $
+
+Fix build under NetBSD
+
+--- color.c.orig 2020-11-03 17:50:37.000000000 +0000
++++ color.c 2020-11-08 16:39:21.085043268 +0000
+@@ -119,7 +119,7 @@
+
+ #define COLOR_QUOTE_INIT 8
+
+-#ifdef NCURSES_VERSION
++#if defined(NCURSES_VERSION) || defined(__NetBSD__)
+ #define ATTR_MASK (A_ATTRIBUTES ^ A_COLOR)
+ #elif defined (USE_SLANG_CURSES)
+ #define ATTR_MASK (~(unsigned int)A_NORMAL ^ (A_CHARTEXT | A_UNUSED | A_COLOR))
Index: pkgsrc/mail/mutt/patches/patch-configure
diff -u /dev/null pkgsrc/mail/mutt/patches/patch-configure:1.1
--- /dev/null Sun Nov 8 17:42:46 2020
+++ pkgsrc/mail/mutt/patches/patch-configure Sun Nov 8 17:42:45 2020
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure,v 1.1 2020/11/08 17:42:45 tron Exp $
+
+- Allow build as an unpriviliged user
+- Fix Kerberos related build failure under Solaris
+
+--- configure.orig 2020-11-07 20:18:30.000000000 +0000
++++ configure 2020-11-08 15:02:04.178022629 +0000
+@@ -10072,7 +10072,7 @@
+
+ if test x$mutt_cv_setgid = xyes; then
+ DOTLOCK_GROUP='mail'
+- DOTLOCK_PERMISSION=2755
++ DOTLOCK_PERMISSION=2555
+ else
+ DOTLOCK_GROUP=''
+ DOTLOCK_PERMISSION=755
+@@ -10382,6 +10382,7 @@
+ case "`$KRB5CFGPATH --version`" in
+ "Kerberos 5 "*) GSSAPI_IMPL="MIT";;
+ ?eimdal*) GSSAPI_IMPL="Heimdal";;
++ Solaris*) GSSAPI_IMPL="Solaris";;
+ *) GSSAPI_IMPL="Unknown";;
+ esac
+ else
+@@ -10631,7 +10632,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: GSSAPI libraries not found" >&5
+ $as_echo "GSSAPI libraries not found" >&6; }
+ fi
+- if test "$GSSAPI_IMPL" = "Heimdal"
++ if test "$GSSAPI_IMPL" = "Heimdal" || test "$GSSAPI_IMPL" = "Solaris"
+ then
+
+ $as_echo "#define HAVE_HEIMDAL 1" >>confdefs.h
Index: pkgsrc/mail/mutt/patches/patch-doc_Makefile.in
diff -u /dev/null pkgsrc/mail/mutt/patches/patch-doc_Makefile.in:1.1
--- /dev/null Sun Nov 8 17:42:46 2020
+++ pkgsrc/mail/mutt/patches/patch-doc_Makefile.in Sun Nov 8 17:42:46 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_Makefile.in,v 1.1 2020/11/08 17:42:46 tron Exp $
+
+Install manual package under unique name to avoid package conflicts
+
+--- doc/Makefile.in.orig 2020-11-07 20:18:32.000000000 +0000
++++ doc/Makefile.in 2020-11-08 15:01:59.064036129 +0000
+@@ -561,7 +561,7 @@
+ elif [ -f $(srcdir)/muttrc.man ] ; then \
+ ./instdoc $(srcdir)/muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 ; \
+ fi
+- ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
++ ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
+ ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
+ $(MKDIR_P) $(DESTDIR)$(docdir)
+ for f in $(topsrcdir_DOCFILES) ; do \
Index: pkgsrc/mail/mutt/patches/patch-lib.h
diff -u /dev/null pkgsrc/mail/mutt/patches/patch-lib.h:1.1
--- /dev/null Sun Nov 8 17:42:46 2020
+++ pkgsrc/mail/mutt/patches/patch-lib.h Sun Nov 8 17:42:46 2020
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib.h,v 1.1 2020/11/08 17:42:46 tron Exp $
+
+On some systems, curses.h defines TRUE and FALSE, so conditionalise
+them here to avoid compiler complaints about duplicate definitions.
+
+--- lib.h.orig 2020-11-03 17:50:37.000000000 +0000
++++ lib.h 2020-11-08 15:01:50.511710523 +0000
+@@ -54,8 +54,12 @@
+ # define N_(a) a
+ # endif
+
+-# define TRUE 1
+-# define FALSE 0
++# ifndef TRUE
++# define TRUE 1
++# endif
++# ifndef FALSE
++# define FALSE 0
++# endif
+
+ # define HUGE_STRING 8192
+ # define LONG_STRING 1024
Home |
Main Index |
Thread Index |
Old Index