[Midnightbsd-cvs] mports [22928] trunk/mail/mutt: mutt 1.9.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Oct 8 12:10:10 EDT 2017
Revision: 22928
http://svnweb.midnightbsd.org/mports/?rev=22928
Author: laffer1
Date: 2017-10-08 12:10:09 -0400 (Sun, 08 Oct 2017)
Log Message:
-----------
mutt 1.9.1
Modified Paths:
--------------
trunk/mail/mutt/Makefile
trunk/mail/mutt/distinfo
trunk/mail/mutt/files/extra-patch-aspell
trunk/mail/mutt/files/extra-patch-doc-ref
trunk/mail/mutt/files/extra-patch-forcebase64
trunk/mail/mutt/files/extra-patch-forcebase64-nntp
trunk/mail/mutt/files/extra-patch-ifdef
trunk/mail/mutt/files/extra-patch-maildir-mtime
trunk/mail/mutt/files/extra-patch-maildir-mtime-nntp
trunk/mail/mutt/files/extra-patch-parent-child-match
trunk/mail/mutt/files/extra-patch-reverse_reply
trunk/mail/mutt/files/extra-patch-smartdate
trunk/mail/mutt/files/extra-patch-smime-outlook
trunk/mail/mutt/files/patch-doc_Muttrc
trunk/mail/mutt/files/patch-muttlib.c
trunk/mail/mutt/files/patch-smime-sender
trunk/mail/mutt/files/patch-threadcomplete
trunk/mail/mutt/pkg-plist
Added Paths:
-----------
trunk/mail/mutt/files/patch-Makefile.in
trunk/mail/mutt/files/patch-contrib_Makefile.in
trunk/mail/mutt/files/patch-dgc-deepif
trunk/mail/mutt/files/patch-doc_Makefile.in
Removed Paths:
-------------
trunk/mail/mutt/files/extra-patch-pgp-dw
trunk/mail/mutt/files/patch-Makefile.am
trunk/mail/mutt/files/patch-contrib_Makefile.am
trunk/mail/mutt/files/patch-doc_Makefile.am
trunk/mail/mutt/files/patch-examples
trunk/mail/mutt/files/patch-m4_gssapi.m4
trunk/mail/mutt/files/patch-smime-self
Modified: trunk/mail/mutt/Makefile
===================================================================
--- trunk/mail/mutt/Makefile 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/Makefile 2017-10-08 16:10:09 UTC (rev 22928)
@@ -3,8 +3,8 @@
# $MidnightBSD$
PORTNAME= mutt
-PORTVERSION= 1.8.0
-PORTREVISION?= 0
+PORTVERSION= 1.9.1
+PORTREVISION?= 1
CATEGORIES+= mail ipv6
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -18,12 +18,10 @@
PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
- http://home.uchicago.edu/~dgc/sw/mutt/:dgc \
- https://www.schrab.com/aaron/mutt/:ats \
+ https://github.com/aschrab/mutt/compare/dev-base...feature/:ats \
http://vc.org.ua/mutt/:vc
PATCH_DIST_STRIP= -p1
-PATCHFILES= patch-1.5.1.dgc.deepif.1:dgc \
- patch-1.7.0.ats.date_conditional.1:ats
+PATCHFILES= date-conditional.diff:ats
MAINTAINER?= ports at MidnightBSD.org
COMMENT?= Small but powerful text based program for read/writing e-mail
@@ -30,6 +28,8 @@
LICENSE= gpl2
+CONFLICTS?= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
+
DOCSDIR?= ${PREFIX}/share/doc/mutt
EXAMPLESDIR?= ${PREFIX}/share/examples/mutt
DATADIR?= ${PREFIX}/share/mutt
@@ -37,19 +37,16 @@
CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \
--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
--enable-external-dotlock --enable-pop --enable-imap \
- --disable-warnings
+ --enable-compressed --enable-sidebar
USE_OPENSSL= yes
-USES+= cpe shebangfix
-SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
+USES+= cpe ncurses
.if defined(MUTT_CONFIGURE_ARGS)
CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
.endif
-USES+= autoreconf
GNU_CONFIGURE= yes
-AUTOMAKE_ARGS= --add-missing --foreign
OPTIONS_SUB= yes
@@ -56,12 +53,11 @@
.if defined (MUTT_LITE)
OPTIONS_EXCLUDE= NLS DOCS EXAMPLES
.else
-OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
+OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \
FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
- LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH MIXMASTER \
- NLS NNTP PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
- REVERSE_REPLY_PATCH SIDEBAR SMART_DATE SMIME_OUTLOOK_COMPAT \
- SMTP URLVIEW XML
+ LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
+ NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
+ SMIME_OUTLOOK_COMPAT SMTP URLVIEW XML
OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
OPTIONS_RADIO= SPELL
@@ -70,7 +66,6 @@
OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE
OPTIONS_SINGLE_SCREEN= NCURSES SLANG
-COMPRESSED_FOLDERS_DESC= Compressed folders
SASL_DESC= SASL authentication
DEBUG_DESC= Debugging capabilities
FLOCK_DESC= flock() usage
@@ -78,18 +73,15 @@
GPGME_DESC= Gpgme interface
GREETING_PATCH_DESC= Greeting support
HTML_DESC= HTML documentation
-IDN_DESC+= International Domain Names (implies ICONV)
+IDN_DESC= International Domain Names (implies ICONV)
IFDEF_PATCH_DESC= ifdef feature
LOCALES_FIX_DESC= Locales fix
MAILBOX_MANPAGES_DESC= Install mbox.5/mmdf.5 manpages
MAILDIR_MTIME_PATCH_DESC= Maildir mtime patch
-MIXMASTER_DESC= Mixmaster support
NCURSES_DESC= Ncurses support
NLS_DESC= Native language support (implies ICONV)
-PARENT_CHILD_MATCH_PATCH_DESC= Parent/child match
QUOTE_PATCH_DESC= Extended quoting
REVERSE_REPLY_PATCH_DESC= Reverse_reply
-SIDEBAR_DESC= Sidebar support
SLANG_DESC= SLANG support
SMART_DATE_DESC= Dynamic date formatting with "%@"
SMIME_OUTLOOK_COMPAT_DESC= SMIME outlook compatibility
@@ -102,11 +94,10 @@
URLVIEW_DESC= Use urlview for the URL selector menu
XML_DESC= Use XML tools for rebuilding documentation
-OPTIONS_DEFAULT= COMPRESSED_FOLDERS GPGME HTML HCACHE_BDB ICONV IDN \
+OPTIONS_DEFAULT= GPGME HTML HCACHE_BDB ICONV IDN \
IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
- NLS NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
- REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT SASL SMTP \
- URLVIEW XML GSSAPI_NONE
+ NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
+ SMIME_OUTLOOK_COMPAT SASL SMTP URLVIEW XML GSSAPI_NONE
.endif
RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support
@@ -148,7 +139,6 @@
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
-#NLS_CONFIGURE_OFF= --disable-nls
NLS_IMPLIES= ICONV
# Handle GSSAPI from various places
@@ -177,16 +167,11 @@
ICONV_CONFIGURE_OFF= --disable-iconv
ASPELL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aspell
-PARENT_CHILD_MATCH_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-parent-child-match
REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply
SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE}
-#MIXMASTER_BUILD_DEPENDS= mixmaster:mail/mixmaster
-MIXMASTER_RUN_DEPENDS= mixmaster:mail/mixmaster
-MIXMASTER_CONFIGURE_ON= --with-mixmaster=${LOCALBASE}
-
SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smime-outlook
SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate
@@ -198,6 +183,8 @@
IDN_CONFIGURE_WITH= idn
IDN_IMPLIES= ICONV
+IFDEF_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ifdef
+
GPGME_LIB_DEPENDS+= libgpgme.so:security/gpgme
GPGME_LIB_DEPENDS+= libgpg-error.so:security/libgpg-error
GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan
@@ -207,63 +194,35 @@
GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
-COMPRESSED_FOLDERS_ENABLE= compressed
-COMPRESSED_FOLDERS_VARS= XML_NEEDED=yes \
-COMPRESSED_FOLDERS_PLIST_FILES=%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress
-
QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
-QUOTE_PATCH_VARS= XML_NEEDED=yes
-NNTP_DISTFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv \
- patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
+NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
NNTP_CONFIGURE_ON= --enable-nntp
NNTP_VARS= XML_NEEDED=yes
NNTP_CATEGORIES= news
-SIDEBAR_CONFIGURE_ENABLE= sidebar
-SIDEBAR_VARS= XML_NEEDED=yes
-
DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref
.include <bsd.mport.options.mk>
# un/comment as each VERSION is created for PORTVERSION
-VVV_PATCH_VERSION= 1.8.0
-RR_PATCH_VERSION= 1.7.2
-GREETING_PATCH_VERSION= 1.7.2
+#VVV_PATCH_VERSION= 1.8.3
+GREETING_PATCH_VERSION= 1.9.0
.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION= ${PORTVERSION}
.endif
-.if !defined(RR_PATCH_VERSION)
-RR_PATCH_VERSION= ${PORTVERSION}
-.endif
.if !defined(GREETING_PATCH_VERSION)
GREETING_PATCH_VERSION= ${PORTVERSION}
.endif
-# XXX
-# this should be done automagically by aclocal but ....
-# for now, this will have to do
-pre-build::
- @${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
- -e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
- -e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
- -e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
- ${BUILD_WRKSRC}/Makefile
-
LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
-CFLAGS+= ${CFLAGS_ADD}
-LDFLAGS+= ${LDFLAGS_ADD}
-pre-patch-NNTP-on:
- @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
- @${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
- ${WRKDIR}/patch-nntp
- @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
-
post-patch-NNTP-on:
+# Restore timestamps for autotools sources
+ @${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
+ @${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
.endif
@@ -285,33 +244,29 @@
post-install-NNTP-on:
${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
-post-patch-IFDEF_PATCH-on:
- @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
-
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
-post-patch:
+pre-configure::
+ @${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
${WRKSRC}/contrib/gpg.rc
@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
${WRKSRC}/contrib/pgp6.rc
- @${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
- ${WRKSRC}/contrib/Makefile.am
+ @${REINPLACE_CMD} -E -e 's#(/samples|samples/)#share/examples/mutt#g' \
+ ${WRKSRC}/doc/reference.html \
+ ${WRKSRC}/doc/manual.html \
+ ${WRKSRC}/doc/manual.txt \
+ ${WRKSRC}/doc/Muttrc \
+ ${WRKSRC}/INSTALL \
+ ${WRKSRC}/init.h
+ @${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
+ ${WRKSRC}/contrib/Makefile.in
-pre-configure::
- @${RM} ${WRKSRC}/missing
-.if defined(WITH_KRB5_SYS)
- @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
- @${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
- ${WRKSRC}/imap/auth_gss.c
-.endif
+pre-configure-HCACHE_BDB-on:
+ @${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.if ${PORT_OPTIONS:MHCACHE_BDB}
-CONFIGURE_SED= -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /'
-pre-configure::
- @${REINPLACE_CMD} -E ${CONFIGURE_SED} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}.ac
-.endif
-
.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
BUILD_DEPENDS+= xsltproc:textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
@@ -318,7 +273,8 @@
lynx:www/lynx
.else
pre-build::
- @${REINPLACE_CMD} -E -e 's|-xsltproc|@-true xsltproc|g' \
+ @${REINPLACE_CMD} \
+ -e 's,manual.html stamp-doc-rc stamp-doc-chunked manual.txt,stamp-doc-rc,' \
${WRKSRC}/doc/Makefile
.endif
Modified: trunk/mail/mutt/distinfo
===================================================================
--- trunk/mail/mutt/distinfo 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/distinfo 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,17 +1,13 @@
-TIMESTAMP = 1488157778
-SHA256 (mutt/mutt-1.8.0.tar.gz) = 45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab
-SIZE (mutt/mutt-1.8.0.tar.gz) = 4116223
-SHA256 (mutt/patch-1.8.0.vvv.nntp.gz) = 1bd4b83708bb664749a34a188f01bc541cc7ab51628a163d87da119152ed00b9
-SIZE (mutt/patch-1.8.0.vvv.nntp.gz) = 60675
-SHA256 (mutt/patch-1.8.0.vvv.nntp_ru.gz) = ec9be57cdd516748f9ee7ee27b137d6ef7d3346258198940cb3d1eabb12d13ea
-SIZE (mutt/patch-1.8.0.vvv.nntp_ru.gz) = 3465
-SHA256 (mutt/patch-1.5.1.dgc.deepif.1) = d655a2f0003bdb2efb7ee5a8c77c113da661110e9c63289f03eb622773fc7a34
-SIZE (mutt/patch-1.5.1.dgc.deepif.1) = 767
-SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e
-SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415
-SHA256 (mutt/mutt-1.7.2.vc.greeting) = 05dce466675c8692ab4a2c34d309de06e98e965241249e3cfccbb8d10873b9a3
-SIZE (mutt/mutt-1.7.2.vc.greeting) = 4175
-SHA256 (mutt/patch-1.8.0.vvv.initials.gz) = 98c667c86028691ee0e9a8022977a7ba16972854c1f2fd87f83899c30598fedd
-SIZE (mutt/patch-1.8.0.vvv.initials.gz) = 686
-SHA256 (mutt/patch-1.8.0.vvv.quote.gz) = 18d50110ab38a4338284691e081aa06b1b52301eca49633d2c7639b46acf7e2c
-SIZE (mutt/patch-1.8.0.vvv.quote.gz) = 1282
+TIMESTAMP = 1506285098
+SHA256 (mutt/mutt-1.9.1.tar.gz) = 749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1
+SIZE (mutt/mutt-1.9.1.tar.gz) = 4193868
+SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e
+SIZE (mutt/date-conditional.diff) = 2023
+SHA256 (mutt/mutt-1.9.0.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
+SIZE (mutt/mutt-1.9.0.vc.greeting) = 4534
+SHA256 (mutt/patch-1.9.1.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892
+SIZE (mutt/patch-1.9.1.vvv.nntp.gz) = 60687
+SHA256 (mutt/patch-1.9.1.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5
+SIZE (mutt/patch-1.9.1.vvv.initials.gz) = 681
+SHA256 (mutt/patch-1.9.1.vvv.quote.gz) = 22967bd615bd0c10046e264270b6d9cd037fd078365ed3bc1f4d631b8c69b003
+SIZE (mutt/patch-1.9.1.vvv.quote.gz) = 1279
Modified: trunk/mail/mutt/files/extra-patch-aspell
===================================================================
--- trunk/mail/mutt/files/extra-patch-aspell 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-aspell 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,8 +1,8 @@
---- doc/Muttrc.head.orig Thu Jan 24 13:10:47 2002
-+++ doc/Muttrc.head Tue Nov 9 08:53:14 2004
-@@ -19,6 +19,8 @@
- macro index <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
- macro pager <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
+--- doc/Muttrc.head.orig 2017-04-12 23:01:06 UTC
++++ doc/Muttrc.head
+@@ -34,6 +34,8 @@ bind browser y exit
+ # close-hook '\.gz$' "gzip -c '%t' > '%f'"
+ # append-hook '\.gz$' "gzip -c '%t' >> '%f'"
+set ispell="/usr/local/bin/aspell --mode=email check"
+
Modified: trunk/mail/mutt/files/extra-patch-doc-ref
===================================================================
--- trunk/mail/mutt/files/extra-patch-doc-ref 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-doc-ref 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,6 +1,6 @@
--- doc/mutt.man.orig 2009-02-06 13:52:38.000000000 +0100
+++ doc/mutt.man 2009-02-06 13:55:05.000000000 +0100
-@@ -69,7 +69,8 @@
+@@ -67,7 +67,8 @@
.PP
Mutt is a small but very powerful text based program for reading and sending electronic
mail under unix operating systems, including support for color terminals, MIME,
Modified: trunk/mail/mutt/files/extra-patch-forcebase64
===================================================================
--- trunk/mail/mutt/files/extra-patch-forcebase64 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-forcebase64 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,6 +1,6 @@
---- mutt-1.5.24/init.h.orig 2016-03-31 22:09:51.864031000 +0200
-+++ mutt-1.5.24/init.h 2016-03-31 22:12:01.242952000 +0200
-@@ -838,6 +838,11 @@
+--- init.h.orig 2017-04-12 23:01:17 UTC
++++ init.h
+@@ -871,6 +871,11 @@ struct option_t MuttVars[] = {
** sent to both the list and your address, resulting in two copies
** of the same email for you.
*/
@@ -12,19 +12,19 @@
{ "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 },
/*
** .pp
---- mutt-1.5.24-orig/mutt.h 2015-08-30 19:06:38.000000000 +0200
-+++ mutt-1.5.24/mutt.h 2016-02-09 13:48:24.758051324 +0100
-@@ -339,6 +339,7 @@ enum
- OPTFASTREPLY,
+--- mutt.h.orig 2017-04-12 23:01:17 UTC
++++ mutt.h
+@@ -355,6 +355,7 @@ enum
OPTFCCCLEAR,
+ OPTFLAGSAFE,
OPTFOLLOWUPTO,
+ OPTFORCEBASE64,
OPTFORCENAME,
OPTFORWDECODE,
OPTFORWQUOTE,
---- mutt-1.5.24-orig/sendlib.c 2015-08-30 19:06:38.000000000 +0200
-+++ mutt-1.5.24/sendlib.c 2016-02-09 13:48:24.759051309 +0100
-@@ -1168,7 +1168,9 @@ static void mutt_set_encoding (BODY *b,
+--- sendlib.c.orig 2017-04-12 23:01:08 UTC
++++ sendlib.c
+@@ -1171,7 +1171,9 @@ static void mutt_set_encoding (BODY *b,
if (b->type == TYPETEXT)
{
char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
Modified: trunk/mail/mutt/files/extra-patch-forcebase64-nntp
===================================================================
--- trunk/mail/mutt/files/extra-patch-forcebase64-nntp 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-forcebase64-nntp 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,6 +1,6 @@
---- mutt/init.h.orig 2016-04-09 11:37:12.650818818 +0200
-+++ mutt/init.h 2016-04-09 11:57:47.378726695 +0200
-@@ -873,6 +873,11 @@
+--- init.h.orig 2017-09-10 22:12:31 UTC
++++ init.h
+@@ -911,6 +911,11 @@ struct option_t MuttVars[] = {
** message via mail.
*/
#endif
@@ -12,19 +12,19 @@
{ "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 },
/*
** .pp
---- mutt-1.5.24-orig/mutt.h 2015-08-30 19:06:38.000000000 +0200
-+++ mutt-1.5.24/mutt.h 2016-02-09 13:48:24.758051324 +0100
-@@ -339,6 +339,7 @@ enum
- OPTFASTREPLY,
+--- mutt.h.orig 2017-09-10 22:12:31 UTC
++++ mutt.h
+@@ -379,6 +379,7 @@ enum
OPTFCCCLEAR,
+ OPTFLAGSAFE,
OPTFOLLOWUPTO,
+ OPTFORCEBASE64,
OPTFORCENAME,
OPTFORWDECODE,
OPTFORWQUOTE,
---- mutt-1.5.24-orig/sendlib.c 2015-08-30 19:06:38.000000000 +0200
-+++ mutt-1.5.24/sendlib.c 2016-02-09 13:48:24.759051309 +0100
-@@ -1168,7 +1168,9 @@ static void mutt_set_encoding (BODY *b,
+--- sendlib.c.orig 2017-09-10 22:12:31 UTC
++++ sendlib.c
+@@ -1180,7 +1180,9 @@ static void mutt_set_encoding (BODY *b,
if (b->type == TYPETEXT)
{
char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
Modified: trunk/mail/mutt/files/extra-patch-ifdef
===================================================================
--- trunk/mail/mutt/files/extra-patch-ifdef 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-ifdef 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,7 +1,11 @@
---- mutt-1.5.4.orig/init.c 2003-03-04 08:49:48.000000000 +0100
-+++ mutt-1.5.4/init.c 2003-07-22 20:14:47.000000000 +0200
-@@ -349,6 +349,52 @@ static void remove_from_list (LIST **l,
- }
+--- PATCHES.orig 2017-09-04 23:34:26 UTC
++++ PATCHES
+@@ -0,0 +1 @@
++patch-1.5.4.cd.ifdef.1
+--- init.c.orig 2017-09-04 23:34:22 UTC
++++ init.c
+@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table
+ return t;
}
+static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
@@ -53,10 +57,9 @@
static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
{
do
-diff -pruN mutt-1.5.4.orig/init.h mutt-1.5.4/init.h
---- mutt-1.5.4.orig/init.h.orig 2009-06-22 15:48:16.000000000 +0200
-+++ mutt-1.5.4/init.h 2009-06-22 15:49:28.000000000 +0200
-@@ -3658,6 +3658,7 @@
+--- init.h.orig 2017-09-04 23:34:22 UTC
++++ init.h
+@@ -4037,6 +4037,7 @@ static int parse_lists (BUFFER *, BUFFER
static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -64,7 +67,7 @@
static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-@@ -3715,6 +3716,7 @@
+@@ -4099,6 +4100,7 @@ const struct command_t Commands[] = {
{ "hdr_order", parse_list, UL &HeaderOrderList },
#ifdef HAVE_ICONV
{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },
@@ -72,8 +75,3 @@
#endif
{ "ignore", parse_ignore, 0 },
{ "lists", parse_lists, 0 },
-diff -pruN mutt-1.5.4.orig/PATCHES mutt-1.5.4/PATCHES
---- mutt-1.5.4.orig/PATCHES 2003-03-19 22:33:37.000000000 +0100
-+++ mutt-1.5.4/PATCHES 2003-07-22 20:14:47.000000000 +0200
-@@ -0,0 +1 @@
-+patch-1.5.4.cd.ifdef.1
Modified: trunk/mail/mutt/files/extra-patch-maildir-mtime
===================================================================
--- trunk/mail/mutt/files/extra-patch-maildir-mtime 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-maildir-mtime 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,10 +1,10 @@
---- PATCHES Dec 2002 17:44:54 -0000 3.6
-+++ PATCHES Feb 2004 13:19:42 -0000
+--- PATCHES.orig 2017-09-04 15:19:31.167205000 -0400
++++ PATCHES 2017-09-04 15:19:31.168636000 -0400
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig Wed Jan 26 13:41:04 2005
-+++ browser.c Wed Feb 9 09:20:14 2005
-@@ -27,6 +27,7 @@
+--- browser.c.orig 2017-09-04 15:19:27.714342000 -0400
++++ browser.c 2017-09-04 15:19:31.178678000 -0400
+@@ -32,6 +32,7 @@
#ifdef USE_IMAP
#include "imap.h"
#endif
@@ -12,7 +12,7 @@
#include <stdlib.h>
#include <dirent.h>
-@@ -346,6 +347,21 @@
+@@ -413,6 +414,21 @@
menu->data = state->entry;
}
@@ -34,7 +34,7 @@
static int examine_directory (MUTTMENU *menu, struct browser_state *state,
char *d, const char *prefix)
{
-@@ -409,6 +425,7 @@
+@@ -476,6 +492,7 @@
tmp = Incoming;
while (tmp && mutt_strcmp (buffer, tmp->path))
tmp = tmp->next;
@@ -42,9 +42,9 @@
if (tmp && Context &&
!mutt_strcmp (tmp->realpath, Context->realpath))
{
-@@ -454,6 +471,7 @@
- strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
- mutt_pretty_mailbox (buffer, sizeof (buffer));
+@@ -549,6 +566,7 @@
+ s.st_mtime = st2.st_mtime;
+ }
+ check_maildir_times (tmp, &s);
add_folder (menu, state, buffer, &s, tmp);
Modified: trunk/mail/mutt/files/extra-patch-maildir-mtime-nntp
===================================================================
--- trunk/mail/mutt/files/extra-patch-maildir-mtime-nntp 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-maildir-mtime-nntp 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,16 +1,19 @@
---- PATCHES Dec 2002 17:44:54 -0000 3.6
-+++ PATCHES Feb 2004 13:19:42 -0000
+--- PATCHES.orig 2017-09-10 21:57:09 UTC
++++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig Tue Feb 8 10:29:57 2005
-+++ browser.c Tue Feb 8 10:29:58 2005
-@@ -31,4 +31,5 @@
+--- browser.c.orig 2017-09-10 21:56:59 UTC
++++ browser.c
+@@ -35,6 +35,7 @@
+ #ifdef USE_NNTP
#include "nntp.h"
#endif
+#include "mx.h"
#include <stdlib.h>
-@@ -473,4 +474,19 @@
+ #include <dirent.h>
+@@ -545,6 +546,21 @@ static void init_state (struct browser_s
+ menu->data = state->entry;
}
+static void check_maildir_times (BUFFY *buf, struct stat *st)
@@ -30,15 +33,20 @@
+
/* get list of all files/newsgroups with mask */
static int examine_directory (MUTTMENU *menu, struct browser_state *state,
-@@ -562,4 +578,5 @@
+ char *d, const char *prefix)
+@@ -634,6 +650,7 @@ static int examine_directory (MUTTMENU *
+ tmp = Incoming;
while (tmp && mutt_strcmp (buffer, tmp->path))
tmp = tmp->next;
+ check_maildir_times (tmp, &s);
- add_folder (menu, state, de->d_name, &s, NULL, (tmp) ? tmp->new : 0);
- }
-@@ -637,4 +654,5 @@
- mutt_pretty_mailbox (buffer);
+ if (tmp && Context &&
+ !mutt_strcmp (tmp->realpath, Context->realpath))
+ {
+@@ -737,6 +754,7 @@ static int examine_mailboxes (MUTTMENU *
+ s.st_mtime = st2.st_mtime;
+ }
+ check_maildir_times (tmp, &s);
- add_folder (menu, state, buffer, &s, NULL, tmp->new);
+ add_folder (menu, state, buffer, &s, tmp, NULL);
}
+ while ((tmp = tmp->next));
Modified: trunk/mail/mutt/files/extra-patch-parent-child-match
===================================================================
--- trunk/mail/mutt/files/extra-patch-parent-child-match 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-parent-child-match 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,6 +1,6 @@
---- doc/manual.xml.head.orig 2017-02-24 18:29:36 UTC
+--- doc/manual.xml.head.orig 2017-05-30 19:27:52 UTC
+++ doc/manual.xml.head
-@@ -4259,6 +4259,22 @@ variable <quote>all</quote>, which allow
+@@ -4265,6 +4265,22 @@ variable <quote>all</quote>, which allow
their system defaults.
</para>
@@ -23,9 +23,9 @@
</sect2>
<sect2 id="set-myvar">
---- mutt.h.orig 2017-02-24 18:29:36 UTC
+--- mutt.h.orig 2017-06-03 23:16:03 UTC
+++ mutt.h
-@@ -863,6 +863,8 @@ typedef struct pattern_t
+@@ -865,6 +865,8 @@ typedef struct pattern_t
unsigned int alladdr : 1;
unsigned int stringmatch : 1;
unsigned int groupmatch : 1;
@@ -34,7 +34,7 @@
unsigned int ign_case : 1; /* ignore case for local stringmatch searches */
unsigned int isalias : 1;
int min;
---- pattern.c.orig 2017-02-24 18:29:37 UTC
+--- pattern.c.orig 2017-05-30 19:26:40 UTC
+++ pattern.c
@@ -46,6 +46,7 @@ static int eat_regexp (pattern_t *pat, B
static int eat_date (pattern_t *pat, BUFFER *, BUFFER *);
Deleted: trunk/mail/mutt/files/extra-patch-pgp-dw
===================================================================
--- trunk/mail/mutt/files/extra-patch-pgp-dw 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-pgp-dw 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,1039 +0,0 @@
---- PATCHES Dec 2002 17:44:54 -0000 3.6
-+++ PATCHES Feb 2004 06:07:13 -0000
-@@ -0,0 +1,4 @@
-+patch-1.5.6.dw.multiple-crypt-hook.2
-+patch-1.5.6.dw.confirm-crypt-hook.1
-+patch-1.5.6.dw.crypt-autoselectkey.1
-+patch-1.5.6.dw.pgp-menu-traditional.2
---- compose.c Oct 2003 20:34:59 -0000 3.14
-+++ compose.c Feb 2004 06:07:13 -0000
-@@ -133,2 +133,9 @@ static void redraw_crypt_lines (HEADER *
- addstr (_("Clear"));
-+
-+ if ((WithCrypto & APPLICATION_PGP))
-+ if ((msg->security & (ENCRYPT | SIGN)))
-+ if ((msg->security & INLINE))
-+ addstr (_(" (inline)"));
-+ else
-+ addstr (_(" (PGP/MIME)"));
- clrtoeol ();
-@@ -158,2 +165,3 @@ static int pgp_send_menu (HEADER *msg, i
- {
-+ int use_autoinline = 0;
- pgp_key_t p;
-@@ -164,7 +172,10 @@ static int pgp_send_menu (HEADER *msg, i
-
-- switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
-- N_("esabf")))
-+ if (!(msg->security & (SIGN | ENCRYPT)))
-+ use_autoinline = 1;
-+
-+ switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "),
-+ N_("esabif")))
- {
- case 1: /* (e)ncrypt */
-- msg->security |= ENCRYPT;
-+ msg->security ^= ENCRYPT;
- break;
-@@ -172,3 +183,3 @@ static int pgp_send_menu (HEADER *msg, i
- case 2: /* (s)ign */
-- msg->security |= SIGN;
-+ msg->security ^= SIGN;
- break;
-@@ -199,6 +210,16 @@ static int pgp_send_menu (HEADER *msg, i
- case 4: /* (b)oth */
-- msg->security = ENCRYPT | SIGN;
-+ if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN))
-+ msg->security = 0;
-+ else
-+ msg->security |= (ENCRYPT | SIGN);
- break;
-
-- case 5: /* (f)orget it */
-+ case 5: /* (i)nline */
-+ if ((msg->security & (ENCRYPT | SIGN)))
-+ msg->security ^= INLINE;
-+ else
-+ msg->security &= ~INLINE;
-+ break;
-+
-+ case 6: /* (f)orget it */
- msg->security = 0;
-@@ -207,6 +228,16 @@ static int pgp_send_menu (HEADER *msg, i
-
-- if (msg->security && msg->security != APPLICATION_PGP)
-- msg->security |= APPLICATION_PGP;
-- else
-- msg->security = 0;
-+ if (msg->security)
-+ {
-+ if (!(msg->security & (ENCRYPT | SIGN)))
-+ {
-+ msg->security = 0;
-+ }
-+ else
-+ {
-+ msg->security |= APPLICATION_PGP;
-+
-+ if (use_autoinline && option (OPTPGPAUTOINLINE))
-+ msg->security |= INLINE;
-+ }
-+ }
-
---- crypt.c Jan 2004 19:59:38 -0000 3.22
-+++ crypt.c Feb 2004 06:07:13 -0000
-@@ -161,3 +161,3 @@ int crypt_valid_passphrase(int flags)
-
--int mutt_protect (HEADER *msg, HEADER *cur, char *keylist)
-+int mutt_protect (HEADER *msg, char *keylist)
- {
-@@ -166,3 +166,2 @@ int mutt_protect (HEADER *msg, HEADER *c
- BODY *tmp_pgp_pbody = NULL;
-- int traditional = 0;
- int flags = (WithCrypto & APPLICATION_PGP)? msg->security: 0;
-@@ -176,29 +175,9 @@ int mutt_protect (HEADER *msg, HEADER *c
-
-- if ((WithCrypto & APPLICATION_PGP) && (msg->security & APPLICATION_PGP))
-+ if ((WithCrypto & APPLICATION_PGP) && ((msg->security & PGPINLINE) == PGPINLINE))
- {
-- if ((msg->content->type == TYPETEXT) &&
-- !ascii_strcasecmp (msg->content->subtype, "plain"))
-- {
-- if (cur && cur->security && option (OPTPGPAUTOTRAD)
-- && (option (OPTCRYPTREPLYENCRYPT)
-- || option (OPTCRYPTREPLYSIGN)
-- || option (OPTCRYPTREPLYSIGNENCRYPTED)))
-- {
-- if(mutt_is_application_pgp(cur->content))
-- traditional = 1;
-- }
-- else
-- {
-- if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create a traditional (inline) PGP message?"))) == -1)
-- return -1;
-- else if (i == M_YES)
-- traditional = 1;
-- }
-- }
-- if (traditional)
-+ /* they really want to send it inline... go for it */
-+ if (!isendwin ()) mutt_endwin _("Invoking PGP...");
-+ pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist);
-+ if (pbody)
- {
-- if (!isendwin ()) mutt_endwin _("Invoking PGP...");
-- if (!(pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist)))
-- return -1;
--
- msg->content = pbody;
-@@ -206,2 +185,8 @@ int mutt_protect (HEADER *msg, HEADER *c
- }
-+
-+ /* otherwise inline won't work...ask for revert */
-+ if ((i = query_quadoption (OPT_PGPMIMEASK, _("Message can't be sent inline. Revert to using PGP/MIME?"))) != MUTT_YES)
-+ return -1;
-+
-+ /* go ahead with PGP/MIME */
- }
-@@ -393,2 +378,5 @@ int mutt_is_application_pgp (BODY *m)
- }
-+ if (t)
-+ t |= PGPINLINE;
-+
- return t;
---- hook.c Jan 2004 09:52:55 -0000 3.8
-+++ hook.c Feb 2004 06:07:13 -0000
-@@ -119,3 +119,7 @@ int mutt_parse_hook (BUFFER *buf, BUFFER
- {
-+#ifdef MUTT_CRYPTHOOK
-+ if (data & (MUTT_FOLDERHOOK | MUTT_SENDHOOK | MUTT_MESSAGEHOOK | MUTT_ACCOUNTHOOK | MUTT_REPLYHOOK | MUTT_CRYPTHOOK))
-+#else
- if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK))
-+#endif
- {
-@@ -445,5 +449,21 @@ char *mutt_iconv_hook (const char *chs)
-
--char *mutt_crypt_hook (ADDRESS *adr)
-+LIST *mutt_crypt_hook (ADDRESS *adr)
- {
-- return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
-+ HOOK *hook;
-+ LIST *key_list = NULL;
-+
-+ if (!adr && !adr->mailbox)
-+ return (NULL);
-+
-+ for (hook = Hooks; hook; hook = hook->next)
-+ {
-+ if (!hook->command)
-+ continue;
-+ if (!(hook->type & MUTT_CRYPTHOOK))
-+ continue;
-+
-+ if ((regexec (hook->rx.rx, adr->mailbox, 0, NULL, 0) == 0) ^ hook->rx.not)
-+ key_list = mutt_add_list (key_list, hook->command);
-+ }
-+ return (key_list);
- }
---- init.h Feb 2004 17:10:43 -0000 3.43
-+++ init.h Feb 2004 06:07:14 -0000
-@@ -1205,2 +1205,12 @@ struct option_t MuttVars[] = {
- */
-+
-+
-+ { "pgp_autoselectkey", DT_SYN, R_NONE, UL "crypt_autoselectkey", 0 },
-+ { "crypt_autoselectkey", DT_BOOL, R_NONE, OPTCRYPTAUTOSELECT, 0 },
-+ /*
-+ ** .pp
-+ ** If set, then a list of keys is not presented for selection when only
-+ ** one matching key is available. This may be useful in conjunction with
-+ ** the \fIcrypt-hook\fP command.
-+ */
- { "pgp_autosign", DT_SYN, R_NONE, UL "crypt_autosign", 0 },
-@@ -1230,2 +1240,11 @@ struct option_t MuttVars[] = {
- */
-+ { "pgp_confirmhook", DT_SYN, R_NONE, UL "crypt_confirmhook", 1 },
-+ { "crypt_confirmhook", DT_BOOL, R_NONE, OPTCRYPTCONFIRMHOOK, 1 },
-+ /*
-+ ** .pp
-+ ** If set, then you will be prompted for confirmation of keys when using
-+ ** the \fIcrypt-hook\fP command. If unset, no such confirmation prompt will
-+ ** be presented. This is generally considered unsafe, especially where
-+ ** typos are concerned.
-+ */
- { "pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1},
-@@ -1374,2 +1393,44 @@ struct option_t MuttVars[] = {
- */
-+ { "pgp_create_traditional", DT_SYN, R_NONE, UL "pgp_autoinline", 0 },
-+ { "pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, 0 },
-+ /*
-+ ** .pp
-+ ** This option controls whether Mutt generates old-style inline
-+ ** (traditional) PGP encrypted or signed messages under certain
-+ ** circumstances. This can be overridden by use of the \fIpgp-menu\fP,
-+ ** when inline is not required.
-+ ** .pp
-+ ** Note that Mutt might automatically use PGP/MIME for messages
-+ ** which consist of more than a single MIME part. Mutt can be
-+ ** configured to ask before sending PGP/MIME messages when inline
-+ ** (traditional) would not work.
-+ ** See also: ``$$pgp_mime_ask''.
-+ ** .pp
-+ ** Also note that using the old-style PGP message format is \fBstrongly\fP
-+ ** \fBdeprecated\fP.
-+ ** (PGP only)
-+ */
-+ { "pgp_auto_traditional", DT_SYN, R_NONE, UL "pgp_replyinline", 0 },
-+ { "pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, 0 },
-+ /*
-+ ** .pp
-+ ** Setting this variable will cause Mutt to always attempt to
-+ ** create an inline (traditional) message when replying to a
-+ ** message which is PGP encrypted/signed inline. This can be
-+ ** overridden by use of the \fIpgp-menu\fP, when inline is not
-+ ** required. This option does not automatically detect if the
-+ ** (replied-to) message is inline; instead it relies on Mutt
-+ ** internals for previously checked/flagged messages.
-+ ** .pp
-+ ** Note that Mutt might automatically use PGP/MIME for messages
-+ ** which consist of more than a single MIME part. Mutt can be
-+ ** configured to ask before sending PGP/MIME messages when inline
-+ ** (traditional) would not work.
-+ ** See also: ``$$pgp_mime_ask''.
-+ ** .pp
-+ ** Also note that using the old-style PGP message format is \fBstrongly\fP
-+ ** \fBdeprecated\fP.
-+ ** (PGP only)
-+ **
-+ */
- { "pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, 1 },
-@@ -1423,11 +1484,8 @@ struct option_t MuttVars[] = {
- */
-- { "pgp_create_traditional", DT_QUAD, R_NONE, OPT_PGPTRADITIONAL, M_NO },
-+ { "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, MUTT_NO },
- /*
- ** .pp
-- ** This option controls whether Mutt generates old-style inline PGP
-- ** encrypted or signed messages.
-- ** .pp
-- ** Note that PGP/MIME will be used automatically for messages which have
-- ** a character set different from us-ascii, or which consist of more than
-- ** a single MIME part.
-+ ** This option controls whether Mutt will prompt you for
-+ ** automatically sending a (signed/encrypted) message using
-+ ** PGP/MIME when inline (traditional) fails (for any reason).
- ** .pp
-@@ -1435,19 +1493,2 @@ struct option_t MuttVars[] = {
- ** \fBdeprecated\fP.
-- ** (PGP only)
-- */
-- { "pgp_auto_traditional", DT_BOOL, R_NONE, OPTPGPAUTOTRAD, 0 },
-- /*
-- ** .pp
-- ** This option causes Mutt to generate an old-style inline PGP
-- ** encrypted or signed message when replying to an old-style
-- ** message, and a PGP/MIME message when replying to a PGP/MIME
-- ** message. Note that this option is only meaningful when using
-- ** ``$$crypt_replyencrypt'', ``$$crypt_replysign'', or
-- ** ``$$crypt_replysignencrypted''.
-- ** .pp
-- ** Also note that PGP/MIME will be used automatically for messages
-- ** which have a character set different from us-ascii, or which
-- ** consist of more than a single MIME part.
-- ** .pp
-- ** This option overrides ``$$pgp_create_traditional''
- ** (PGP only)
---- mutt.h Feb 2004 17:10:43 -0000 3.23
-+++ mutt.h Feb 2004 06:07:14 -0000
-@@ -278,3 +278,2 @@ enum
- OPT_MOVE,
-- OPT_PGPTRADITIONAL, /* create old-style PGP messages */
- #ifdef USE_POP
-@@ -284,2 +283,3 @@ enum
- OPT_POSTPONE,
-+ OPT_PGPMIMEASK, /* ask to revert to PGP/MIME when inline fails */
- OPT_PRINT,
-@@ -431,2 +431,3 @@ enum
-
-+ OPTCRYPTAUTOSELECT,
- OPTCRYPTAUTOSIGN,
-@@ -442,2 +443,3 @@ enum
- OPTSDEFAULTDECRYPTKEY,
-+ OPTCRYPTCONFIRMHOOK,
- OPTPGPIGNORESUB,
-@@ -445,3 +447,2 @@ enum
- OPTPGPLONGIDS,
-- OPTPGPAUTOTRAD,
- #if 0
-@@ -453,2 +454,4 @@ enum
- OPTPGPSHOWUNUSABLE,
-+ OPTPGPAUTOINLINE,
-+ OPTPGPREPLYINLINE,
-
-@@ -642,4 +645,4 @@ typedef struct header
- {
-- unsigned int security : 9; /* bit 0-6: flags, bit 7,8: application.
-- see: crypt.h pgplib.h, smime.h */
-+ unsigned int security : 10; /* bit 0-7: flags, bit 8,9: application.
-+ see: mutt_crypt.h */
-
---- mutt_crypt.h Dec 2003 13:04:20 -0000 3.5
-+++ mutt_crypt.h Feb 2004 06:07:14 -0000
-@@ -38,6 +38,7 @@
- #define SIGNOPAQUE (1 << 5)
--/* (1 << 6) is used by PGPKEY below. */
-+#define KEYBLOCK (1 << 6) /* KEY too generic? */
-+#define INLINE (1 << 7)
-
--#define APPLICATION_PGP (1 << 7)
--#define APPLICATION_SMIME (1 << 8)
-+#define APPLICATION_PGP (1 << 8)
-+#define APPLICATION_SMIME (1 << 9)
-
-@@ -46,3 +47,4 @@
- #define PGPGOODSIGN (APPLICATION_PGP | GOODSIGN)
--#define PGPKEY (APPLICATION_PGP | (1 << 6))
-+#define PGPKEY (APPLICATION_PGP | KEYBLOCK)
-+#define PGPINLINE (APPLICATION_PGP | INLINE)
-
-@@ -105,3 +107,3 @@ typedef struct pgp_keyinfo *pgp_key_t;
-
--int mutt_protect (HEADER *, HEADER *, char *);
-+int mutt_protect (HEADER *, char *);
-
---- pgp.c Sep 2003 13:03:26 -0000 3.26
-+++ pgp.c Feb 2004 06:07:14 -0000
-@@ -1018,2 +1018,4 @@ char *pgp_findKeys (ADDRESS *to, ADDRESS
- size_t keylist_used = 0;
-+ LIST *hook_list = NULL;
-+ LIST *hook = NULL;
- ADDRESS *tmp = NULL, *addr = NULL;
-@@ -1051,66 +1053,93 @@ char *pgp_findKeys (ADDRESS *to, ADDRESS
- q = p;
-- k_info = NULL;
-
-- if ((keyID = mutt_crypt_hook (p)) != NULL)
-+ /*
-+ * grab the list of matching hooks (matching on recipient address)
-+ * process each entry singly so that auto key selection still works
-+ */
-+ hook_list = mutt_crypt_hook (p);
-+ hook = hook_list;
-+ while (1)
- {
- int r;
-- snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox);
-- if ((r = mutt_yesorno (buf, M_YES)) == M_YES)
-+
-+ k_info = NULL;
-+ key = NULL;
-+
-+ if (hook)
- {
-- if (is_numerical_keyid (keyID))
-+ keyID = (char *)hook->data;
-+ snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox);
-+ if (!option(OPTCRYPTCONFIRMHOOK) || (r = mutt_yesorno (buf, MUTT_YES)) == MUTT_YES)
- {
-- if (strncmp (keyID, "0x", 2) == 0)
-- keyID += 2;
-- goto bypass_selection; /* you don't see this. */
-+ if (is_numerical_keyid (keyID))
-+ {
-+ if (strncmp (keyID, "0x", 2) == 0)
-+ keyID += 2;
-+ goto bypass_selection; /* you don't see this. */
-+ }
-+
-+ /* check for e-mail address */
-+ if ((t = strchr (keyID, '@')) &&
-+ (addr = rfc822_parse_adrlist (NULL, keyID)))
-+ {
-+ if (fqdn) rfc822_qualify (addr, fqdn);
-+ q = addr;
-+ }
-+ else
-+ k_info = pgp_getkeybystr (keyID, KEYFLAG_CANENCRYPT, PGP_PUBRING);
- }
--
-- /* check for e-mail address */
-- if ((t = strchr (keyID, '@')) &&
-- (addr = rfc822_parse_adrlist (NULL, keyID)))
-+ else if (r == -1)
- {
-- if (fqdn) rfc822_qualify (addr, fqdn);
-- q = addr;
-+ /*
-+ * yes, this implies that if one key fails they all do
-+ */
-+ FREE (&keylist);
-+ rfc822_free_address (&tmp);
-+ rfc822_free_address (&addr);
-+ mutt_free_list (&hook_list);
-+ return NULL;
- }
-- else
-- k_info = pgp_getkeybystr (keyID, KEYFLAG_CANENCRYPT, PGP_PUBRING);
- }
-- else if (r == -1)
-- {
-- FREE (&keylist);
-- rfc822_free_address (&tmp);
-- rfc822_free_address (&addr);
-- return NULL;
-- }
-- }
-
-- if (k_info == NULL)
-- pgp_invoke_getkeys (q);
--
-- if (k_info == NULL && (k_info = pgp_getkeybyaddr (q, KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL)
-- {
-- snprintf (buf, sizeof (buf), _("Enter keyID for %s: "), q->mailbox);
-+ if (k_info == NULL)
-+ pgp_invoke_getkeys (q);
-
-- if ((key = pgp_ask_for_key (buf, q->mailbox,
-- KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL)
-+ if (k_info == NULL && (k_info = pgp_getkeybyaddr (q, KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL)
- {
-- FREE (&keylist);
-- rfc822_free_address (&tmp);
-- rfc822_free_address (&addr);
-- return NULL;
-+ snprintf (buf, sizeof (buf), _("Enter keyID for %s: "), q->mailbox);
-+
-+ if ((key = pgp_ask_for_key (buf, q->mailbox,
-+ KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL)
-+ {
-+ FREE (&keylist);
-+ rfc822_free_address (&tmp);
-+ rfc822_free_address (&addr);
-+ mutt_free_list (&hook_list);
-+ return NULL;
-+ }
- }
-- }
-- else
-- key = k_info;
-+ else
-+ key = k_info;
-
-- keyID = pgp_keyid (key);
-+ keyID = pgp_keyid (key);
-
- bypass_selection:
-- keylist_size += mutt_strlen (keyID) + 4;
-- safe_realloc (&keylist, keylist_size);
-- sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "", /* __SPRINTF_CHECKED__ */
-- keyID);
-- keylist_used = mutt_strlen (keylist);
-+ keylist_size += mutt_strlen (keyID) + 4;
-+ safe_realloc (&keylist, keylist_size);
-+ sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "", /* __SPRINTF_CHECKED__ */
-+ keyID);
-+ keylist_used = mutt_strlen (keylist);
-
-- pgp_free_key (&key);
-- rfc822_free_address (&addr);
-+ pgp_free_key (&key);
-+ rfc822_free_address (&addr);
-+
-+ if (!hook_list)
-+ break;
-+
-+ hook = hook->next;
-+ if (!hook)
-+ break;
-+
-+ }
-+ mutt_free_list (&hook_list);
-
---- pgpkey.c Oct 2003 19:55:39 -0000 3.8
-+++ pgpkey.c Feb 2004 06:07:14 -0000
-@@ -437,4 +437,9 @@ static int pgp_id_matches_addr (ADDRESS
-
-+
-+#define pgp_trusted_id(uid) (!option(OPTPGPCHECKTRUST) \
-+ || (pgp_id_is_valid((uid)) \
-+ && pgp_id_is_strong((uid))))
-+
- static pgp_key_t pgp_select_key (pgp_key_t keys,
-- ADDRESS * p, const char *s)
-+ ADDRESS * p, const char *s)
- {
-@@ -452,2 +457,3 @@ static pgp_key_t pgp_select_key (pgp_key
-
-+ int keymatch = 0; /* count matching keys */
- int unusable = 0;
-@@ -481,2 +487,3 @@ static pgp_key_t pgp_select_key (pgp_key
- }
-+ keymatch++;
- }
-@@ -489,2 +496,17 @@ static pgp_key_t pgp_select_key (pgp_key
- }
-+ else if (keymatch == 1 && option(OPTCRYPTAUTOSELECT))
-+ {
-+ /*
-+ * Only one matching key...see if there's an id with enough trust to auto-select
-+ */
-+ kp = KeyTable[0]->parent;
-+ for (a = kp->address; a; a = a->next)
-+ {
-+ if (pgp_trusted_id(a))
-+ {
-+ safe_free ((void **) &KeyTable);
-+ return (kp);
-+ }
-+ }
-+ }
-
-@@ -599,5 +621,3 @@ static pgp_key_t pgp_select_key (pgp_key
-
-- if (option (OPTPGPCHECKTRUST) &&
-- (!pgp_id_is_valid (KeyTable[menu->current])
-- || !pgp_id_is_strong (KeyTable[menu->current])))
-+ if (!pgp_trusted_id(KeyTable[menu->current]))
- {
---- postpone.c Sep 2003 17:22:09 -0000 3.9
-+++ postpone.c Feb 2004 06:07:14 -0000
-@@ -486,2 +486,7 @@ int mutt_parse_crypt_hdr (char *p, int s
-
-+ case 'i':
-+ case 'I':
-+ pgp |= INLINE;
-+ break;
-+
- default:
---- protos.h Feb 2004 17:10:43 -0000 3.19
-+++ protos.h Feb 2004 06:07:14 -0000
-@@ -131,3 +131,3 @@ const char *mutt_get_name (ADDRESS *);
- char *mutt_get_parameter (const char *, PARAMETER *);
--char *mutt_crypt_hook (ADDRESS *);
-+LIST *mutt_crypt_hook (ADDRESS *);
- char *mutt_make_date (char *, size_t);
---- send.c Jan 2004 10:03:46 -0000 3.29
-+++ send.c Feb 2004 06:07:14 -0000
-@@ -1258,2 +1258,9 @@ ci_send_message (int flags, /* send mod
- msg->security |= SIGN;
-+ if ((WithCrypto & APPLICATION_PGP) && (msg->security & (ENCRYPT | SIGN)))
-+ {
-+ if (option (OPTPGPAUTOINLINE))
-+ msg->security |= INLINE;
-+ if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
-+ msg->security |= INLINE;
-+ }
- }
-@@ -1496,3 +1503,3 @@ main_loop:
- if ((crypt_get_keys (msg, &pgpkeylist) == -1) ||
-- mutt_protect (msg, cur, pgpkeylist) == -1)
-+ mutt_protect (msg, pgpkeylist) == -1)
- {
-@@ -1576,3 +1583,3 @@ main_loop:
-
-- if (mutt_protect (msg, cur, pgpkeylist) == -1)
-+ if (mutt_protect (msg, pgpkeylist) == -1)
- {
---- sendlib.c Sep 2003 13:03:26 -0000 3.24
-+++ sendlib.c Feb 2004 06:07:14 -0000
-@@ -2407,2 +2407,4 @@ int mutt_write_fcc (const char *path, HE
- }
-+ if (hdr->security & INLINE)
-+ fputc ('I', msg->fp);
- fputc ('\n', msg->fp);
---- doc/manual.sgml.head Feb 2004 17:45:33 -0000 3.26
-+++ doc/manual.sgml.head Feb 2004 06:07:15 -0000
-@@ -1450,3 +1450,5 @@ normally use. The crypt-hook command pr
- specify the ID of the public key to be used when encrypting messages to
--a certain recipient.
-+a certain recipient. You may use multiple pgp-hook's with the same
-+pattern; multiple matching pgp-hook's result in the use of multiple
-+keyids for recipient.
-
---- doc/muttrc.man.head Feb 2004 17:10:43 -0000 3.10
-+++ doc/muttrc.man.head Feb 2004 06:07:15 -0000
-@@ -297,3 +297,6 @@ to a certain recipient. The meaning of
- broadly: This can be a different e-mail address, a numerical key ID,
--or even just an arbitrary search string.
-+or even just an arbitrary search string. You may use multiple
-+\fBpgp-hook\fPs with the same \fIpattern\fP; multiple matching
-+\fBpgp-hook\fPs result in the use of multiple \fIkey-id\fPs for
-+recipient.
- .TP
---- po/ca.po Feb 2004 18:26:11 -0000 3.13
-+++ po/ca.po Feb 2004 06:07:15 -0000
-@@ -603,10 +603,10 @@ msgstr "Xifra amb: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbd\xF3s, o en (c)lar? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP: (x)ifra, (s)igna, s(i)gna com a, (a)mbd\xF3s, en (l)\xEDnia, o en (c)lar? "
-
- # ivb (2003/03/26)
--# ivb (x)ifra, (s)igna, si(g)na com a, (a)mbd\xF3s, (c)lar
-+# ivb (x)ifra, (s)igna, s(i)gna com a, (a)mbd\xF3s, en (l)\xEDnia, o en (c)lar
- #: compose.c:166
--msgid "esabf"
--msgstr "xsgac"
-+msgid "esabif"
-+msgstr "xsialc"
-
---- po/cs.po Feb 2004 18:26:11 -0000 3.12
-+++ po/cs.po Feb 2004 06:07:16 -0000
-@@ -683,4 +683,4 @@ msgstr "Za\xB9ifrovat pomoc\xED:"
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP - (\xB9)ifrovat, (p)odepsat, podepsat (j)ako, (o)boj\xED, \xE8i (n)ic?"
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP - (\xB9)ifrovat, (p)odepsat, podepsat (j)ako, (o)boj\xED, p\xF8\xED(m)\xFD, \xE8i (n)ic?"
-
-@@ -688,4 +688,4 @@ msgstr "PGP - (\xB9)ifrovat, (p)odepsat, po
- #: compose.c:166
--msgid "esabf"
--msgstr "\xB9pjon"
-+msgid "esabif"
-+msgstr "\xB9pjomn"
-
---- po/da.po Feb 2004 18:26:11 -0000 3.11
-+++ po/da.po Feb 2004 06:07:16 -0000
-@@ -578,8 +578,8 @@ msgstr "Krypt\xE9r"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "(k)rypt\xE9r, (u)nderskriv, underskriv (s)om, (b)egge, (i)ngen PGP"
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "(k)rypt\xE9r, (u)nderskriv, underskriv (s)om, (b)egge, i(n)tegreret, (i)ngen PGP"
-
- #: compose.c:166
--msgid "esabf"
--msgstr "kusbi"
-+msgid "esabif"
-+msgstr "kusbni"
-
---- po/de.po Feb 2004 18:26:11 -0000 3.15
-+++ po/de.po Feb 2004 06:07:16 -0000
-@@ -569,8 +569,8 @@ msgstr "Verschl\xFCsseln mit: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, (k)ein PGP? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, (i)nline, (k)ein PGP? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "vsabk"
-+msgid "esabif"
-+msgstr "vsabik"
-
---- po/el.po Feb 2004 18:26:11 -0000 3.12
-+++ po/el.po Feb 2004 06:07:17 -0000
-@@ -700,4 +700,4 @@ msgstr "\xCA\xF1\xF5\xF0\xF4\xEF\xE3\xF1\xDC\xF6\xE7\xF3\xE7 \xEC\xE5: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, \xDE (f)orget it? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)\xEA\xE5\xDF\xEC\xE5\xED\xEF, \xDE (f)orget it? "
-
-@@ -706,4 +706,4 @@ msgstr "PGP (e)ncrypt, (s)ign, sign (a)s
- #: compose.c:166
--msgid "esabf"
--msgstr "esabf"
-+msgid "esabif"
-+msgstr "esabif"
-
---- po/eo.po Feb 2004 18:26:11 -0000 3.13
-+++ po/eo.po Feb 2004 06:07:17 -0000
-@@ -571,8 +571,8 @@ msgstr "\xC6ifri per: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP \xE6(i)fri, (s)ubskribi, subskribi (k)iel, (a)mba\xFD, a\xFD (f)orgesi? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP \xE6(i)fri, (s)ubskribi, subskribi (k)iel, (a)mba\xFD, \"i(n)line\", a\xFD (f)orgesi? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "iskaf"
-+msgid "esabif"
-+msgstr "iskanf"
-
---- po/es.po Feb 2004 18:26:11 -0000 3.14
-+++ po/es.po Feb 2004 06:07:17 -0000
-@@ -576,4 +576,4 @@ msgstr "Cifrar"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "\xBFco(d)ificar, f(i)rmar (c)omo, amb(o)s o ca(n)celar? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "\xBFco(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
-
-@@ -581,4 +581,4 @@ msgstr "\xBFco(d)ificar, f(i)rmar (c)omo, a
- #, fuzzy
--msgid "esabf"
--msgstr "dicon"
-+msgid "esabif"
-+msgstr "dicoln"
-
---- po/et.po Feb 2004 18:26:11 -0000 3.13
-+++ po/et.po Feb 2004 06:07:18 -0000
-@@ -571,8 +571,8 @@ msgstr "Kr\xFCpti kasutades: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP (k)r\xFCpti, (a)llkiri, allk. ku(i), (m)\xF5lemad v\xF5i (u)nusta? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP (k)r\xFCpti, (a)llkiri, allk. ku(i), (m)\xF5lemad, k(e)hasse, v\xF5i (u)nusta? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "kaimu"
-+msgid "esabif"
-+msgstr "kaimeu"
-
---- po/fr.po Feb 2004 18:26:11 -0000 3.23
-+++ po/fr.po Feb 2004 06:07:18 -0000
-@@ -596,8 +596,8 @@ msgstr "Chiffrer avec : "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, ou (o)ublier ? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, en (l)igne, ou (o)ublier ? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "csedo"
-+msgid "esabif"
-+msgstr "csedlo"
-
---- po/gl.po Feb 2004 18:26:11 -0000 3.11
-+++ po/gl.po Feb 2004 06:07:18 -0000
-@@ -580,8 +580,8 @@ msgstr "Encriptar"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "\xBF(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas ou (o)lvidar? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "\xBF(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "efcao"
-+msgid "esabif"
-+msgstr "efcaio"
-
---- po/hu.po Feb 2004 18:26:11 -0000 3.12
-+++ po/hu.po Feb 2004 06:07:19 -0000
-@@ -571,8 +571,8 @@ msgstr "Titkos\xEDt\xE1s: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP (t)itkos\xEDt, (a)l\xE1\xEDr, al\xE1\xEDr (m)int, titkos\xEDt \xE9(s) al\xE1\xEDr, m\xE9(g)se? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP (t)itkos\xEDt, (a)l\xE1\xEDr, al\xE1\xEDr (m)int, titkos\xEDt \xE9(s) al\xE1\xEDr, (b)e\xE1gyazott, m\xE9(g)se? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "tamsg"
-+msgid "esabif"
-+msgstr "tamsbg"
-
---- po/id.po Feb 2004 18:26:12 -0000 3.14
-+++ po/id.po Feb 2004 06:07:19 -0000
-@@ -572,8 +572,8 @@ msgstr "Enkrip dengan: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, (b)atal? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, (i)nline, (b)atal? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "etsdb"
-+msgid "esabif"
-+msgstr "etsdib"
-
---- po/it.po Feb 2004 18:26:12 -0000 3.11
-+++ po/it.po Feb 2004 06:07:19 -0000
-@@ -582,8 +582,8 @@ msgstr "Crittografa"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "cifra(e), firma(s), firma come(a), entrambi(b), annulla(f) "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "cifra(e), firma(s), firma come(a), entrambi(b), in l(i)nea , annulla(f) "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "esabf"
-+msgid "esabif"
-+msgstr "esabif"
-
---- po/ja.po Feb 2004 18:26:12 -0000 3.21
-+++ po/ja.po Feb 2004 06:07:20 -0000
-@@ -569,8 +569,8 @@ msgstr " \xB0Ź沽\xCA\xFD\xBC\xB0: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP (e)\xB0Ź沽,(s)\xBD\xF0̾,(a)..\xA4Ȥ\xB7\xA4ƽ\xF0̾,(b)ξ\xBC\xD4,(f)\xB2\xF2\xBD\xFC?"
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP (e)\xB0Ź沽,(s)\xBD\xF0̾,(a)..\xA4Ȥ\xB7\xA4ƽ\xF0̾,(b)ξ\xBC\xD4,(i)nline,(f)\xB2\xF2\xBD\xFC?"
-
- #: compose.c:166
--msgid "esabf"
--msgstr "esabf"
-+msgid "esabif"
-+msgstr "esabif"
-
---- po/ko.po Feb 2004 18:26:12 -0000 3.15
-+++ po/ko.po Feb 2004 06:07:20 -0000
-@@ -570,8 +570,8 @@ msgstr "\xBE\xCFȣȭ \xB9\xE6\xBD\xC4: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP \xBE\xCFȣȭ(e), \xBC\xAD\xB8\xED(s), \xBB\xE7\xBF\xEB \xBC\xAD\xB8\xED(a), \xB5\xD1 \xB4\xD9(b), \xC3\xEB\xBC\xD2(f)? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP \xBE\xCFȣȭ(e), \xBC\xAD\xB8\xED(s), \xBB\xE7\xBF\xEB \xBC\xAD\xB8\xED(a), \xB5\xD1 \xB4\xD9(b), (i)nline, \xC3\xEB\xBC\xD2(f)? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "esabf"
-+msgid "esabif"
-+msgstr "esabif"
-
---- po/lt.po Feb 2004 18:26:12 -0000 3.11
-+++ po/lt.po Feb 2004 06:07:20 -0000
-@@ -578,5 +578,5 @@ msgstr "U\xFE\xF0ifruoti"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
- msgstr ""
--"(u)\xFE\xF0ifruot, pa(s)ira\xF0yt, pasira\xF0yt k(a)ip, a(b)u, rinktis (m)ic algoritm\xE0, "
-+"(u)\xFE\xF0ifruot, pa(s)ira\xF0yt, pasira\xF0yt k(a)ip, a(b)u, (l)ai\xF0ke, "
- "ar (p)amir\xF0ti?"
-@@ -585,4 +585,4 @@ msgstr ""
- #, fuzzy
--msgid "esabf"
--msgstr "usabmp"
-+msgid "esabif"
-+msgstr "usablp"
-
-@@ -598,4 +598,3 @@ msgid ""
- msgstr ""
--"(u)\xFE\xF0ifruot, pa(s)ira\xF0yt, pasira\xF0yt k(a)ip, a(b)u, rinktis (m)ic algoritm\xE0, "
--"ar (p)amir\xF0ti?"
-+"(u)\xFE\xF0ifruot, pa(s)ira\xF0yt, u\xFE\xF0ifruo(t) su, pasira\xF0yt k(a)ip, a(b)u, ar (p)amir\xF0ti?"
-
-@@ -604,3 +603,3 @@ msgstr ""
- msgid "eswabf"
--msgstr "usabmp"
-+msgstr "ustabp"
-
---- po/nl.po Feb 2004 18:26:12 -0000 3.16
-+++ po/nl.po Feb 2004 06:07:21 -0000
-@@ -568,8 +568,8 @@ msgstr "Versleutelen met: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, (g)een? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, ber(i)cht, (g)een? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "voabg"
-+msgid "esabif"
-+msgstr "voabig"
-
---- po/pl.po Feb 2004 18:26:12 -0000 3.17
-+++ po/pl.po Feb 2004 06:07:21 -0000
-@@ -571,8 +571,8 @@ msgstr "Zaszyfruj u\xBFywaj\xB1c: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, b(e)z PGP? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, (i)nline, b(e)z PGP? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "zsabe"
-+msgid "esabif"
-+msgstr "zsabie"
-
---- po/pt_BR.po Feb 2004 18:26:13 -0000 3.12
-+++ po/pt_BR.po Feb 2004 06:07:21 -0000
-@@ -581,5 +581,5 @@ msgstr "Encriptar"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
- msgstr ""
--"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, escolhe (m)ic, ou es(q)uece? "
-+"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, em l(i)nha, ou es(q)uece? "
-
-@@ -587,4 +587,4 @@ msgstr ""
- #, fuzzy
--msgid "esabf"
--msgstr "escamq"
-+msgid "esabif"
-+msgstr "escaiq"
-
-@@ -600,3 +600,3 @@ msgid ""
- msgstr ""
--"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, escolhe (m)ic, ou es(q)uece? "
-+"(e)ncripa, a(s)sina, e(n)cripa com, assina (c)omo, (a)mbos, ou es(q)uece? "
-
-@@ -605,3 +605,3 @@ msgstr ""
- msgid "eswabf"
--msgstr "escamq"
-+msgstr "esncaq"
-
---- po/ru.po Feb 2004 18:26:13 -0000 3.19
-+++ po/ru.po Feb 2004 06:07:22 -0000
-@@ -577,8 +577,8 @@ msgstr "\xFA\xC1\xDB\xC9\xC6\xD2\xCF\xD7\xC1\xD4\xD8: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP (e)\xDB\xC9\xC6\xD2, (s)\xD0\xCF\xC4\xD0\xC9\xD3\xD8, (a)\xD0\xCF\xC4\xD0\xC9\xD3\xD8 \xCB\xC1\xCB, (b)\xCF\xC2\xC1, (f)\xCF\xD4\xCB\xC1\xDA\xC1\xD4\xD8\xD3\xD1? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP (e)\xDB\xC9\xC6\xD2, (s)\xD0\xCF\xC4\xD0\xC9\xD3\xD8, (a)\xD0\xCF\xC4\xD0\xC9\xD3\xD8 \xCB\xC1\xCB, (b)\xCF\xC2\xC1, (i)nline, (f)\xCF\xD4\xCB\xC1\xDA\xC1\xD4\xD8\xD3\xD1? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr "esabf"
-+msgid "esabif"
-+msgstr "esabif"
-
---- po/sk.po Feb 2004 18:26:13 -0000 3.11
-+++ po/sk.po Feb 2004 06:07:22 -0000
-@@ -586,5 +586,5 @@ msgstr "Za\xB9ifruj"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
- msgstr ""
--"(e)-\xB9ifr, (s)-podp, podp (a)ko, o(b)e, ozna\xE8 alg. mi(c), alebo (f)-zabudn\xFA\xBB "
-+"(e)-\xB9ifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudn\xFA\xBB "
- "na to? "
-@@ -593,4 +593,4 @@ msgstr ""
- #, fuzzy
--msgid "esabf"
--msgstr "esabmf"
-+msgid "esabif"
-+msgstr "esabif"
-
-@@ -606,4 +606,3 @@ msgid ""
- msgstr ""
--"(e)-\xB9ifr, (s)-podp, podp (a)ko, o(b)e, ozna\xE8 alg. mi(c), alebo (f)-zabudn\xFA\xBB "
--"na to? "
-+"(e)-\xB9ifr, (s)-podp, (w)-\xB9ifr s, podp (a)ko, o(b)e, alebo (f)-zabudn\xFA\xBB na to? "
-
-@@ -612,3 +611,3 @@ msgstr ""
- msgid "eswabf"
--msgstr "esabmf"
-+msgstr "eswabf"
-
---- po/sv.po Feb 2004 18:26:13 -0000 3.12
-+++ po/sv.po Feb 2004 06:07:22 -0000
-@@ -568,8 +568,8 @@ msgstr "Kryptera med: "
- #: compose.c:165
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)\xE5da, eller sk(i)ppa det?"
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)\xE5da, i(n)fogat, eller sk(i)ppa det?"
-
- #: compose.c:166
--msgid "esabf"
--msgstr "ksobi"
-+msgid "esabif"
-+msgstr "ksobni"
-
---- po/tr.po Feb 2004 18:26:13 -0000 3.11
-+++ po/tr.po Feb 2004 06:07:22 -0000
-@@ -577,5 +577,5 @@ msgstr "\xDEifrele"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
- msgstr ""
--"\xFE(i)frele, i(m)zala, (f)arkl\xFD imzala, i(k)isi de, mi(c) algoritmini se\xE7 "
-+"\xFE(i)frele, i(m)zala, (f)arkl\xFD imzala, i(k)isi de, (i)nline, "
- "yoksa i(p)talm\xFD? "
-@@ -583,4 +583,4 @@ msgstr ""
- #: compose.c:166
--msgid "esabf"
--msgstr "imfkcp"
-+msgid "esabif"
-+msgstr "imfkip"
-
---- po/uk.po Feb 2004 18:26:13 -0000 3.12
-+++ po/uk.po Feb 2004 06:07:23 -0000
-@@ -572,8 +572,8 @@ msgstr "\xFB\xC9\xC6\xD2\xD5\xD7\xC1\xCE\xCE\xD1"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "\xDB\xC9\xC6\xD2.(e), Ц\xC4\xD0.(s), Ц\xC4\xD0. \xD1\xCB(a), \xD5\xD3\xC5(b) \xDE\xC9 צ\xC4ͦ\xCE\xC1(f)? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "\xDB\xC9\xC6\xD2.(e), Ц\xC4\xD0.(s), Ц\xC4\xD0. \xD1\xCB(a), \xD5\xD3\xC5(b), (i)nline \xDE\xC9 צ\xC4ͦ\xCE\xC1(f)? "
-
- #: compose.c:166
--msgid "esabf"
--msgstr ""
-+msgid "esabif"
-+msgstr "esabif"
-
---- po/zh_CN.po Feb 2004 18:26:13 -0000 3.11
-+++ po/zh_CN.po Feb 2004 06:07:23 -0000
-@@ -585,5 +585,5 @@ msgstr "\xBC\xD3\xC3\xDC"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
- msgstr ""
--"(e)\xBC\xD3\xC3\xDC, (s)ǩ\xC3\xFB, (a)\xD3ñ\xF0\xB5\xC4\xC9\xED\xB7\xDDǩ, (b)\xC1\xBD\xD5߽\xD4Ҫ, ѡ\xD4\xF1 (m)ic \xD1\xDD\xCB㷨 \xBB\xF2 (f)\xB7\xC5"
-+"(e)\xBC\xD3\xC3\xDC, (s)ǩ\xC3\xFB, (a)\xD3ñ\xF0\xB5\xC4\xC9\xED\xB7\xDDǩ, (b)\xC1\xBD\xD5߽\xD4Ҫ, (i)nline, \xBB\xF2 (f)\xB7\xC5"
- "\xC6\xFA\xA3\xBF"
-@@ -591,4 +591,4 @@ msgstr ""
- #: compose.c:166
--msgid "esabf"
--msgstr ""
-+msgid "esabif"
-+msgstr "esabif"
-
---- po/zh_TW.po Feb 2004 18:26:13 -0000 3.11
-+++ po/zh_TW.po Feb 2004 06:07:24 -0000
-@@ -577,3 +577,3 @@ msgstr "加密"
- #, fuzzy
--msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
- msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
-@@ -581,4 +581,4 @@ msgstr "(1)加密, (2)簽名, (3)用別\xE7
- #: compose.c:166
--msgid "esabf"
--msgstr "12345"
-+msgid "esabif"
-+msgstr "1234i5"
-
Modified: trunk/mail/mutt/files/extra-patch-reverse_reply
===================================================================
--- trunk/mail/mutt/files/extra-patch-reverse_reply 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-reverse_reply 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,13 +1,12 @@
-diff -u PATCHES PATCHES
---- PATCHES
+--- PATCHES.orig 2017-09-04 23:35:30 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
---- init.h.orig 2005-03-01 16:56:02.000000000 +0100
-+++ init.h 2005-05-25 18:20:57.000000000 +0200
-@@ -2257,6 +2257,13 @@
- ** possibly including eventual real names. When it is unset, mutt will
- ** override any such real names with the setting of the $realname variable.
+--- init.h.orig 2017-09-04 23:35:27 UTC
++++ init.h
+@@ -2687,6 +2687,13 @@ struct option_t MuttVars[] = {
+ ** possibly including eventual real names. When it is \fIunset\fP, mutt will
+ ** override any such real names with the setting of the $$realname variable.
*/
+ { "reverse_reply", DT_BOOL, R_NONE, OPTREVREPLY, 0 },
+ /*
@@ -19,9 +18,9 @@
{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
/*
** .pp
---- mutt.h.orig 2005-02-28 16:13:57.000000000 +0100
-+++ mutt.h 2005-05-25 18:20:57.000000000 +0200
-@@ -410,6 +410,7 @@
+--- mutt.h.orig 2017-09-04 23:35:27 UTC
++++ mutt.h
+@@ -448,6 +448,7 @@ enum
OPTREVALIAS,
OPTREVNAME,
OPTREVREAL,
@@ -29,9 +28,9 @@
OPTRFC2047PARAMS,
OPTSAVEADDRESS,
OPTSAVEEMPTY,
---- protos.h.orig Wed Jul 12 01:32:28 2006
-+++ protos.h Mon Jul 17 16:14:16 2006
-@@ -92,6 +92,7 @@
+--- protos.h.orig 2017-09-04 23:35:27 UTC
++++ protos.h
+@@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c
ADDRESS *mutt_lookup_alias (const char *s);
ADDRESS *mutt_remove_duplicates (ADDRESS *);
ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
@@ -38,10 +37,10 @@
+ADDRESS *mutt_reverse_address (ADDRESS *);
ADDRESS *mutt_expand_aliases (ADDRESS *);
ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
-
---- send.c.orig 2005-02-03 19:47:53.000000000 +0100
-+++ send.c 2005-05-25 18:20:57.000000000 +0200
-@@ -588,6 +588,10 @@
+
+--- send.c.orig 2017-09-04 23:35:27 UTC
++++ send.c
+@@ -598,6 +598,10 @@ void mutt_fix_reply_recipients (ENVELOPE
/* the CC field can get cluttered, especially with lists */
env->to = mutt_remove_duplicates (env->to);
env->cc = mutt_remove_duplicates (env->cc);
@@ -50,11 +49,11 @@
+ env->cc = mutt_reverse_address (env->cc);
+ }
env->cc = mutt_remove_xrefs (env->to, env->cc);
- }
-
---- sendlib.c.orig 2005-02-21 05:45:57.000000000 +0100
-+++ sendlib.c 2005-05-25 18:20:57.000000000 +0200
-@@ -2341,6 +2341,35 @@
+
+ if (env->cc && !env->to)
+--- sendlib.c.orig 2017-09-04 23:35:27 UTC
++++ sendlib.c
+@@ -2753,6 +2753,35 @@ static void set_noconv_flags (BODY *b, s
}
}
Modified: trunk/mail/mutt/files/extra-patch-smartdate
===================================================================
--- trunk/mail/mutt/files/extra-patch-smartdate 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-smartdate 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,6 +1,6 @@
---- hdrline.c.orig 2017-02-24 18:29:36 UTC
+--- hdrline.c.orig 2017-06-03 23:31:21 UTC
+++ hdrline.c
-@@ -248,6 +248,89 @@ static char *apply_subject_mods (ENVELOP
+@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
* %Z = status flags */
@@ -90,7 +90,7 @@
static const char *
hdr_format_str (char *dest,
size_t destlen,
-@@ -421,7 +504,13 @@ hdr_format_str (char *dest,
+@@ -469,7 +552,13 @@ hdr_format_str (char *dest,
if (!do_locales)
setlocale (LC_TIME, "C");
@@ -105,7 +105,7 @@
if (!do_locales)
setlocale (LC_TIME, "");
---- mutt.h.orig 2017-02-24 18:29:36 UTC
+--- mutt.h.orig 2017-05-30 19:27:53 UTC
+++ mutt.h
@@ -134,6 +134,16 @@ typedef enum
MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */
Modified: trunk/mail/mutt/files/extra-patch-smime-outlook
===================================================================
--- trunk/mail/mutt/files/extra-patch-smime-outlook 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/extra-patch-smime-outlook 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,6 +1,6 @@
---- crypt.c.orig Fri Mar 7 09:23:44 2003
-+++ crypt.c Fri Mar 21 00:06:48 2003
-@@ -440,7 +440,7 @@
+--- crypt.c.orig 2017-05-30 19:27:52 UTC
++++ crypt.c
+@@ -491,7 +491,7 @@ int mutt_is_application_smime (BODY *m)
{
len++;
if (!ascii_strcasecmp ((t+len), "p7m"))
Deleted: trunk/mail/mutt/files/patch-Makefile.am
===================================================================
--- trunk/mail/mutt/files/patch-Makefile.am 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-Makefile.am 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,30 +0,0 @@
---- Makefile.am.orig 2017-02-27 01:12:49 UTC
-+++ Makefile.am
-@@ -14,7 +14,7 @@ IMAP_SUBDIR = imap
- IMAP_INCLUDES = -I$(top_srcdir)/imap
- endif
-
--SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
-+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)
-
- bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
-
-@@ -161,18 +161,9 @@ install-exec-hook:
- 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)
-- $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
-- -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
-- $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
-- fi
-
- uninstall-local:
- for i in mime.types ; do \
Added: trunk/mail/mutt/files/patch-Makefile.in
===================================================================
--- trunk/mail/mutt/files/patch-Makefile.in (rev 0)
+++ trunk/mail/mutt/files/patch-Makefile.in 2017-10-08 16:10:09 UTC (rev 22928)
@@ -0,0 +1,29 @@
+Index: Makefile.in
+@@ -471,7 +471,7 @@
+ @BUILD_DOC_TRUE at DOC_SUBDIR = doc
+ @BUILD_IMAP_TRUE at IMAP_SUBDIR = imap
+ @BUILD_IMAP_TRUE at IMAP_INCLUDES = -I$(top_srcdir)/imap
+-SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)
+ bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
+ @BUILD_HCACHE_TRUE at HCVERSION = hcversion.h
+ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
+@@ -1359,18 +1359,9 @@
+ 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)
+- $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
+- -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
+- $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
+- fi
+
+ uninstall-local:
+ for i in mime.types ; do \
Property changes on: trunk/mail/mutt/files/patch-Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/mail/mutt/files/patch-contrib_Makefile.am
===================================================================
--- trunk/mail/mutt/files/patch-contrib_Makefile.am 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-contrib_Makefile.am 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,11 +0,0 @@
---- contrib/Makefile.am.orig 2016-10-08 19:30:21 UTC
-+++ contrib/Makefile.am
-@@ -2,7 +2,7 @@
-
- subdir = contrib
-
--SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
- sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
- sample.vimrc-sidebar colors.default colors.linux smime.rc \
- ca-bundle.crt smime_keys_test.pl mutt_xtitle
Added: trunk/mail/mutt/files/patch-contrib_Makefile.in
===================================================================
--- trunk/mail/mutt/files/patch-contrib_Makefile.in (rev 0)
+++ trunk/mail/mutt/files/patch-contrib_Makefile.in 2017-10-08 16:10:09 UTC (rev 22928)
@@ -0,0 +1,10 @@
+Index: contrib/Makefile.in
+@@ -270,7 +270,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ subdir = contrib
+-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
++SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
+ sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
+ sample.muttrc-compress sample.vimrc-sidebar colors.default colors.linux smime.rc \
+ ca-bundle.crt smime_keys_test.pl mutt_xtitle
Property changes on: trunk/mail/mutt/files/patch-contrib_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/mail/mutt/files/patch-dgc-deepif
===================================================================
--- trunk/mail/mutt/files/patch-dgc-deepif (rev 0)
+++ trunk/mail/mutt/files/patch-dgc-deepif 2017-10-08 16:10:09 UTC (rev 22928)
@@ -0,0 +1,30 @@
+--- muttlib.c.orig 2017-06-03 02:20:37 UTC
++++ muttlib.c
+@@ -1378,6 +1378,12 @@ void mutt_FormatString (char *dest, /*
+ count = 0;
+ while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
+ {
++ if (*src == '\\')
++ {
++ src++;
++ if (!*src)
++ break;
++ }
+ *cp++ = *src++;
+ count++;
+ }
+@@ -1390,7 +1396,13 @@ void mutt_FormatString (char *dest, /*
+ count = 0;
+ while (count < sizeof (elsestring) && *src && *src != '?')
+ {
+- *cp++ = *src++;
++ if (*src == '\\')
++ {
++ src++;
++ if (!*src)
++ break;
++ }
++ *cp++ = *src++;
+ count++;
+ }
+ *cp = 0;
Property changes on: trunk/mail/mutt/files/patch-dgc-deepif
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/mail/mutt/files/patch-doc_Makefile.am
===================================================================
--- trunk/mail/mutt/files/patch-doc_Makefile.am 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-doc_Makefile.am 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,29 +0,0 @@
---- doc/Makefile.am.orig 2016-10-08 19:30:21 UTC
-+++ doc/Makefile.am
-@@ -79,14 +79,7 @@ install-data-local: makedoc-all instdoc
- -for f in $(HTML_DOCFILES) ; do \
- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
- done
-- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
-- -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
-- mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
-- elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
-- mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
-- elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
-- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
-- fi
-+ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
-
- uninstall-local:
- for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
-@@ -109,9 +102,7 @@ uninstall-local:
-
- check:
- manual.txt: manual.html
-- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
-- LC_ALL=C w3m -dump manual.html > $@ || \
-- LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
-+ -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@
-
- Muttrc: stamp-doc-rc
-
Added: trunk/mail/mutt/files/patch-doc_Makefile.in
===================================================================
--- trunk/mail/mutt/files/patch-doc_Makefile.in (rev 0)
+++ trunk/mail/mutt/files/patch-doc_Makefile.in 2017-10-08 16:10:09 UTC (rev 22928)
@@ -0,0 +1,28 @@
+Index: doc/Makefile.in
+@@ -667,14 +667,7 @@
+ -for f in $(HTML_DOCFILES) ; do \
+ $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
+ done
+- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+- -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
+- mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
+- elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
+- mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
+- elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
+- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
+- fi
++ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
+
+ uninstall-local:
+ for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
+@@ -697,9 +690,7 @@
+
+ check:
+ manual.txt: manual.html
+- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
+- LC_ALL=C w3m -dump manual.html > $@ || \
+- LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
++ -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@
+
+ Muttrc: stamp-doc-rc
+
Property changes on: trunk/mail/mutt/files/patch-doc_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/mail/mutt/files/patch-doc_Muttrc
===================================================================
--- trunk/mail/mutt/files/patch-doc_Muttrc 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-doc_Muttrc 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,6 +1,6 @@
--- doc/Muttrc.orig 2016-10-08 19:48:13 UTC
+++ doc/Muttrc
-@@ -626,6 +626,7 @@ attachments -I message/external-body
+@@ -649,6 +649,7 @@ attachments -I message/external-body
# will be saved for later references. Also see $record,
# $save_name, $force_name and ``fcc-hook''.
#
Deleted: trunk/mail/mutt/files/patch-examples
===================================================================
--- trunk/mail/mutt/files/patch-examples 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-examples 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,94 +0,0 @@
---- INSTALL.orig 2016-10-08 19:30:21 UTC
-+++ INSTALL
-@@ -228,13 +228,13 @@ If you decide to use your system's iconv
- need to tell mutt about implementation-defined names for some
- character sets. Sample configuration files for various systems can
- be found in the directory contrib/iconv/ in this source
--distribution, and will be installed in the samples/iconv directory
-+distribution, and will be installed in the share/examples/mutt/iconv directory
- as part of mutt's documentation.
-
- In order to use these sample configuration files, just put a line
- like
-
-- source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
-+ source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
-
- into your system's global Muttrc, which normally resides in /etc or
- /usr/local/etc.
---- contrib/Makefile.am.orig 2016-10-08 19:30:21 UTC
-+++ contrib/Makefile.am
-@@ -1,6 +1,7 @@
- # $Id$
-
- subdir = contrib
-+samplesdir = @samplesdir@
-
- SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
- sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
-@@ -14,12 +15,12 @@ EXTRA_DIST = language.txt language50.txt
- iconv/make.sh
-
- install-data-local:
-- $(MKDIR_P) $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+ $(MKDIR_P) $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
- for f in $(SAMPLES) ; do \
-- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \
-+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir) ; \
- done
- for f in $(srcdir)/iconv/*.rc ; do \
-- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \
-+ $(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv ; \
- done
-
- uninstall-local:
---- doc/manual.txt.orig 2016-10-08 19:55:06 UTC
-+++ doc/manual.txt
-@@ -8073,8 +8073,8 @@ set imap_authenticators="gssapi:cram-md5
-
- For examples on how to configure these formats for the various versions
- of PGP which are floating around, see the pgp and gpg sample
-- configuration files in the samples/ subdirectory which has been
-- installed on your system alongside the documentation. (PGP only)
-+ configuration files in the share/examples/mutt/ subdirectory which has
-+ been installed on your system alongside the documentation. (PGP only)
-
- 3.166. pgp_decrypt_command
-
-@@ -9332,8 +9332,8 @@ set sidebar_delim_chars='.'
- or "-CAfile [1766]$$ssmmiimmee__ccaa__llooccaattiioonn".
-
- For examples on how to configure these formats, see the smime.rc in the
-- samples/ subdirectory which has been installed on your system alongside
-- the documentation. (S/MIME only)
-+ share/examples/mutt/ subdirectory which has been installed on your system
-+ alongside the documentation. (S/MIME only)
-
- 3.271. smime_decrypt_use_default_key
-
---- init.h.orig 2016-10-08 19:35:50 UTC
-+++ init.h
-@@ -1814,9 +1814,8 @@ struct option_t MuttVars[] = {
- ** .pp
- ** For examples on how to configure these formats for the various versions
- ** of PGP which are floating around, see the pgp and gpg sample configuration files in
-- ** the \fCsamples/\fP subdirectory which has been installed on your system
-- ** alongside the documentation.
-- ** (PGP only)
-+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
-+ ** your system. (PGP only)
- */
- { "pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, 0},
- /*
-@@ -2942,9 +2941,8 @@ struct option_t MuttVars[] = {
- ** .de
- ** .pp
- ** For examples on how to configure these formats, see the \fCsmime.rc\fP in
-- ** the \fCsamples/\fP subdirectory which has been installed on your system
-- ** alongside the documentation.
-- ** (S/MIME only)
-+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
-+ ** your system. (S/MIME only)
- */
- { "smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
- /*
Deleted: trunk/mail/mutt/files/patch-m4_gssapi.m4
===================================================================
--- trunk/mail/mutt/files/patch-m4_gssapi.m4 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-m4_gssapi.m4 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,10 +0,0 @@
---- m4/gssapi.m4.orig 2016-10-08 19:30:21 UTC
-+++ m4/gssapi.m4
-@@ -27,6 +27,7 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI],
- GSSAPI_LIBS="`$KRB5CFGPATH --libs gssapi`"
- case "`$KRB5CFGPATH --version`" in
- "Kerberos 5 "*) GSSAPI_IMPL="MIT";;
-+ "FreeBSD heimdal"*) GSSAPI_IMPL="Heimdal";;
- ?eimdal*) GSSAPI_IMPL="Heimdal";;
- *) GSSAPI_IMPL="Unknown";;
- esac
Modified: trunk/mail/mutt/files/patch-muttlib.c
===================================================================
--- trunk/mail/mutt/files/patch-muttlib.c 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-muttlib.c 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,6 +1,6 @@
--- muttlib.c.orig 2016-10-08 19:35:50 UTC
+++ muttlib.c
-@@ -779,16 +779,15 @@ void mutt_merge_envelopes(ENVELOPE* base
+@@ -802,16 +802,15 @@ void mutt_merge_envelopes(ENVELOPE* base
void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
const char *src, int line)
{
Deleted: trunk/mail/mutt/files/patch-smime-self
===================================================================
--- trunk/mail/mutt/files/patch-smime-self 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-smime-self 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,63 +0,0 @@
---- contrib/smime.rc.orig 2016-10-08 19:30:21 UTC
-+++ contrib/smime.rc
-@@ -23,8 +23,12 @@ set crypt_verify_sig = yes
-
- # The (default) keyfile for signing/decrypting. Uncomment the following
- # line and replace the keyid with your own.
--set smime_default_key="12345678.0"
-+# set smime_default_key="12345678.0"
-
-+# Uncomment the following line in addition to the one above, if you want that
-+# all encrypted messages are also encrypted with your default key.
-+# set smime_encrypt_self = yes
-+
- # Uncomment to make mutt ask what key to use when trying to decrypt a message.
- # It will use the default key above (if that was set) else.
- # unset smime_decrypt_use_default_key
---- crypt.c.orig 2016-10-08 19:35:50 UTC
-+++ crypt.c
-@@ -231,8 +231,18 @@ int mutt_protect (HEADER *msg, char *key
- if ((WithCrypto & APPLICATION_SMIME)
- && (msg->security & APPLICATION_SMIME))
- {
-- if (!(tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody,
-- keylist)))
-+ char *new_keylist = keylist;
-+
-+ if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == MUTT_YES)
-+ {
-+ int size = mutt_strlen(keylist) + mutt_strlen (SmimeDefaultKey) + 2; /* +1 for NULL, +1 for \n */
-+ new_keylist = safe_malloc(size);
-+ snprintf(new_keylist, size, "%s%s\n", keylist, SmimeDefaultKey);
-+ }
-+
-+ tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, new_keylist);
-+ safe_free((void **)&new_keylist);
-+ if (!tmp_pbody)
- {
- /* signed ? free it! */
- return (-1);
---- init.h.orig 2016-10-08 19:35:50 UTC
-+++ init.h
-@@ -2971,6 +2971,11 @@ struct option_t MuttVars[] = {
- ** possible \fCprintf(3)\fP-like sequences.
- ** (S/MIME only)
- */
-+ { "smime_encrypt_self", DT_QUAD, R_NONE, OPT_SMIMEENCRYPTSELF, 1 },
-+ /*
-+ ** .pp
-+ ** Encrypt the message to smime_default_key too.
-+ */
- { "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, UL "aes256" },
- /*
- ** .pp
---- mutt.h.orig 2016-10-08 19:30:21 UTC
-+++ mutt.h
-@@ -263,6 +263,7 @@ enum
- OPT_FORWEDIT,
- OPT_FCCATTACH,
- OPT_INCLUDE,
-+ OPT_SMIMEENCRYPTSELF,
- OPT_MFUPTO,
- OPT_MIMEFWD,
- OPT_MIMEFWDREST,
Modified: trunk/mail/mutt/files/patch-smime-sender
===================================================================
--- trunk/mail/mutt/files/patch-smime-sender 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-smime-sender 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,4 +1,4 @@
---- commands.c.orig 2016-10-08 19:30:21 UTC
+--- commands.c.orig 2017-09-08 22:18:16 UTC
+++ commands.c
@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
{
@@ -9,24 +9,10 @@
mutt_message ( _("S/MIME signature successfully verified."));
else
mutt_error ( _("S/MIME certificate owner does not match sender."));
---- contrib/smime.rc.orig 2016-10-08 19:30:21 UTC
-+++ contrib/smime.rc
-@@ -8,7 +8,10 @@ set smime_is_default
-
- # Uncomment this if you don't want to set labels for certificates you add.
- # unset smime_ask_cert_label
--
-+
-+# Uncomment this if you don't want to check for sender's email address
-+# set smime_dont_check_sender = yes
-+
- # Passphrase expiration
- set smime_timeout=300
-
---- init.h.orig 2016-10-08 19:35:50 UTC
+--- init.h.orig 2017-09-08 22:18:16 UTC
+++ init.h
-@@ -2946,6 +2946,15 @@ struct option_t MuttVars[] = {
- ** alongside the documentation.
+@@ -3099,6 +3099,15 @@ struct option_t MuttVars[] = {
+ ** to determine the key to use. It will ask you to supply a key, if it can't find one.
** (S/MIME only)
*/
+ { "smime_dont_check_sender", DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },
@@ -38,14 +24,14 @@
+ ** longer needs email-addresses as part of the certificates.
+ ** It is not set by default.
+ */
- { "smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
+ { "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },
+ { "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },
/*
- ** .pp
---- mutt.h.orig 2016-10-08 19:30:21 UTC
+--- mutt.h.orig 2017-09-08 22:18:16 UTC
+++ mutt.h
-@@ -486,6 +486,7 @@ enum
- OPTCRYPTTIMESTAMP,
+@@ -521,6 +521,7 @@ enum
OPTSMIMEISDEFAULT,
+ OPTSMIMESELFENCRYPT,
OPTASKCERTLABEL,
+ OPTSMIMENOSENDER,
OPTSDEFAULTDECRYPTKEY,
Modified: trunk/mail/mutt/files/patch-threadcomplete
===================================================================
--- trunk/mail/mutt/files/patch-threadcomplete 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/files/patch-threadcomplete 2017-10-08 16:10:09 UTC (rev 22928)
@@ -1,6 +1,6 @@
---- mutt.h.orig 2017-02-27 01:20:29 UTC
+--- mutt.h.orig 2017-09-04 23:39:03 UTC
+++ mutt.h
-@@ -201,6 +201,7 @@ enum
+@@ -211,6 +211,7 @@ enum
MUTT_EXPIRED,
MUTT_SUPERSEDED,
MUTT_TRASH,
@@ -8,7 +8,7 @@
/* actions for mutt_pattern_comp/mutt_pattern_exec */
MUTT_AND,
---- pattern.c.orig 2017-02-27 01:20:06 UTC
+--- pattern.c.orig 2017-09-04 23:39:03 UTC
+++ pattern.c
@@ -56,6 +56,7 @@ static const struct pattern_flags
}
@@ -18,7 +18,7 @@
{ 'A', MUTT_ALL, 0, NULL },
{ 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp },
{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },
-@@ -1236,6 +1237,16 @@ mutt_pattern_exec (struct pattern_t *pat
+@@ -1270,6 +1271,16 @@ mutt_pattern_exec (struct pattern_t *pat
else
result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
return (pat->not ^ result);
Modified: trunk/mail/mutt/pkg-plist
===================================================================
--- trunk/mail/mutt/pkg-plist 2017-10-08 15:54:08 UTC (rev 22927)
+++ trunk/mail/mutt/pkg-plist 2017-10-08 16:10:09 UTC (rev 22928)
@@ -75,6 +75,7 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar
More information about the Midnightbsd-cvs
mailing list