Index: head/mail/mutt/Makefile =================================================================== --- head/mail/mutt/Makefile (revision 439165) +++ head/mail/mutt/Makefile (revision 439166) @@ -1,307 +1,315 @@ # Created by: Udo Schweigert # $FreeBSD$ PORTNAME= mutt -PORTVERSION= 1.8.0 -PORTREVISION?= 2 +PORTVERSION= 1.8.2 +PORTREVISION?= 0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ https://bitbucket.org/mutt/mutt/downloads/ \ ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \ http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= mutt EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ + https://web-beta.archive.org/web/20161116074212/http://home.uchicago.edu/~dgc/sw/mutt/:dgc \ http://home.uchicago.edu/~dgc/sw/mutt/:dgc \ https://www.schrab.com/aaron/mutt/: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 MAINTAINER?= dereks@lifeofadishwasher.com COMMENT?= Small but powerful text based program for read/writing e-mail LICENSE= GPLv2+ 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 CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \ --with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \ --enable-external-dotlock --enable-pop --enable-imap \ --enable-compressed USES+= cpe shebangfix ssl SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl .if defined(MUTT_CONFIGURE_ARGS) CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} .endif USES+= autoreconf GNU_CONFIGURE= yes AUTOMAKE_ARGS= --add-missing --foreign OPTIONS_SUB= yes .if defined (MUTT_LITE) OPTIONS_EXCLUDE= NLS DOCS EXAMPLES .else OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \ FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \ LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \ NLS NNTP PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \ REVERSE_REPLY_PATCH SIDEBAR SMART_DATE SMIME_OUTLOOK_COMPAT \ SMTP URLVIEW XML OPTIONS_SINGLE= GSSAPI HCACHE SCREEN OPTIONS_RADIO= SPELL OPTIONS_RADIO_SPELL= ASPELL ISPELL OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE OPTIONS_SINGLE_SCREEN= NCURSES SLANG SASL_DESC= SASL authentication DEBUG_DESC= Debugging capabilities FLOCK_DESC= flock() usage FORCEBASE64_DESC= Option to force base64 encoding for compose GPGME_DESC= Gpgme interface GREETING_PATCH_DESC= Greeting support HTML_DESC= HTML documentation 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 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 SMTP_DESC= SMTP relay support HCACHE_DESC= Header Cache support HCACHE_BDB_DESC= Use Berkeley DB (BDB) HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet HCACHE_NONE_DESC= Disable Header Cache URLVIEW_DESC= Use urlview for the URL selector menu XML_DESC= Use XML tools for rebuilding documentation 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 .endif RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support .if !defined (MUTT_LITE) ASPELL_BUILD_DEPENDS= aspell:textproc/aspell ASPELL_RUN_DEPENDS= aspell:textproc/aspell ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell URLVIEW_RUN_DEPENDS= urlview:textproc/urlview .endif .if defined (MUTT_LITE) PKGNAMESUFFIX= -lite USES+= ncurses PLIST_SUB+= MAILBOX_MANPAGES="" PLIST_SUB+= HTML="@comment " PLIST_SUB+= NNTP="@comment " # XXX bug in bpm ? PLIST_SUB+= NLS="@comment " CONFIGURE_ARGS+= --disable-nls --disable-iconv --without-idn .endif .ifmake makesum # for optional distfiles patchfiles PORT_DBDIR= /dev/null OPTIONS_DEFAULT= ${OPTIONS_DEFINE} .endif DEBUG_CONFIGURE_ON= --enable-debug # Handle ncurses/ncurses-port/slang SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE} SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang NCURSES_USES= ncurses NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls #NLS_CONFIGURE_OFF= --disable-nls NLS_IMPLIES= ICONV # Handle GSSAPI from various places GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_NONE_CONFIGURE_ON= --without-gss HCACHE_NONE_CONFIGURE_ON= --disable-hcache HCACHE_NONE_CONFIGURE_OFF= --enable-hcache --without-qdbm --without-gdbm HCACHE_BDB_CONFIGURE_WITH= bdb HCACHE_BDB_USES= bdb:42+ HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet HCACHE_TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet HCACHE_KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet ICONV_USES= iconv:translit ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} 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} SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smime-outlook SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate FLOCK_CONFIGURE_ENABLE= flock LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_CONFIGURE_WITH= idn IDN_IMPLIES= ICONV GPGME_LIB_DEPENDS+= libgpgme.so:security/gpgme GPGME_LIB_DEPENDS+= libgpg-error.so:security/libgpg-error GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan GPGME_CONFIGURE_ENABLE= gpgme SMTP_CONFIGURE_ENABLE= smtp GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \ patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv NNTP_DISTFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv \ patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv NNTP_CONFIGURE_ON= --enable-nntp NNTP_VARS= XML_NEEDED=yes NNTP_CATEGORIES= news SIDEBAR_CONFIGURE_ENABLE= sidebar DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref .include # un/comment as each VERSION is created for PORTVERSION VVV_PATCH_VERSION= 1.8.0 -GREETING_PATCH_VERSION= 1.8.0 +#GREETING_PATCH_VERSION= 1.8.1 .if !defined(VVV_PATCH_VERSION) VVV_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: .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp .endif .if ${PORT_OPTIONS:MFORCEBASE64} @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp .endif post-patch-NNTP-off: .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime .endif .if ${PORT_OPTIONS:MFORCEBASE64} @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64 .endif post-install: ${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5 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: @${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' \ + @${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.am pre-configure:: @${RM} ${WRKSRC}/missing .if defined(WITH_KRB5_SYS) @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/imap/auth_gss.c .endif .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 \ lynx:www/lynx .else pre-build:: @${REINPLACE_CMD} -E -e 's|-xsltproc|@-true xsltproc|g' \ ${WRKSRC}/doc/Makefile .endif .include Index: head/mail/mutt/distinfo =================================================================== --- head/mail/mutt/distinfo (revision 439165) +++ head/mail/mutt/distinfo (revision 439166) @@ -1,17 +1,17 @@ -TIMESTAMP = 1489875322 -SHA256 (mutt/mutt-1.8.0.tar.gz) = 45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab -SIZE (mutt/mutt-1.8.0.tar.gz) = 4116223 +TIMESTAMP = 1492629436 +SHA256 (mutt/mutt-1.8.2.tar.gz) = 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 +SIZE (mutt/mutt-1.8.2.tar.gz) = 4118429 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.8.0.vc.greeting) = 95458c249a81bd61f087c0f82999ba2ad435f762cc5ee2b899fbfb102df117d5 -SIZE (mutt/mutt-1.8.0.vc.greeting) = 4499 +SHA256 (mutt/mutt-1.8.2.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc +SIZE (mutt/mutt-1.8.2.vc.greeting) = 4499 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 Index: head/mail/mutt/files/patch-examples =================================================================== --- head/mail/mutt/files/patch-examples (revision 439165) +++ head/mail/mutt/files/patch-examples (nonexistent) @@ -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 }, - /* Property changes on: head/mail/mutt/files/patch-examples ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/mutt/files/extra-patch-aspell =================================================================== --- head/mail/mutt/files/extra-patch-aspell (revision 439165) +++ head/mail/mutt/files/extra-patch-aspell (revision 439166) @@ -1,11 +1,11 @@ ---- 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 "!less @docdir@/manual.txt\n" "Show Mutt documentation" - macro pager "!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" + # If Mutt is unable to determine your site's domain name correctly, you can # set the default here. # Index: head/mail/mutt/files/extra-patch-forcebase64 =================================================================== --- head/mail/mutt/files/extra-patch-forcebase64 (revision 439165) +++ head/mail/mutt/files/extra-patch-forcebase64 (revision 439166) @@ -1,37 +1,37 @@ ---- 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. */ + { "force_base64", DT_BOOL, R_NONE, OPTFORCEBASE64, 0 }, + /* + ** .pp + ** If you need to encode all text parts to base64, set this option. + */ { "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); - if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM))) + if (option (OPTFORCEBASE64)) + b->encoding = ENCBASE64; + else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM))) b->encoding = ENCQUOTEDPRINTABLE; else if (info->hibin) b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE; Index: head/mail/mutt/files/extra-patch-forcebase64-nntp =================================================================== --- head/mail/mutt/files/extra-patch-forcebase64-nntp (revision 439165) +++ head/mail/mutt/files/extra-patch-forcebase64-nntp (revision 439166) @@ -1,37 +1,37 @@ ---- 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-04-14 01:20:27 UTC ++++ init.h +@@ -903,6 +903,11 @@ struct option_t MuttVars[] = { ** message via mail. */ #endif + { "force_base64", DT_BOOL, R_NONE, OPTFORCEBASE64, 0 }, + /* + ** .pp + ** If you need to encode all text parts to base64, set this option. + */ { "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-14 01:20:27 UTC ++++ mutt.h +@@ -368,6 +368,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-14 01:20:27 UTC ++++ sendlib.c +@@ -1175,7 +1175,9 @@ static void mutt_set_encoding (BODY *b, if (b->type == TYPETEXT) { char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b); - if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM))) + if (option (OPTFORCEBASE64)) + b->encoding = ENCBASE64; + else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM))) b->encoding = ENCQUOTEDPRINTABLE; else if (info->hibin) b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE; Index: head/mail/mutt/files/extra-patch-ifdef =================================================================== --- head/mail/mutt/files/extra-patch-ifdef (revision 439165) +++ head/mail/mutt/files/extra-patch-ifdef (revision 439166) @@ -1,79 +1,77 @@ ---- 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-04-12 23:01:05 UTC ++++ PATCHES +@@ -0,0 +1 @@ ++patch-1.5.4.cd.ifdef.1 +--- init.c.orig 2017-04-12 23:01:17 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) +{ + int i, j, res = 0; + BUFFER token; + + memset (&token, 0, sizeof (token)); + mutt_extract_token (tmp, s, 0); + + /* is the item defined as a variable or a function? */ + if (!(res = (mutt_option_index (tmp->data) != -1))) + for (i = 0; !res && i < MENU_MAX; i++) + { + struct binding_t *b = km_get_table (Menus[i].value); + + if (!b) + continue; + + for (j = 0; b[j].name; j++) + if (!ascii_strncasecmp (tmp->data, b[j].name, mutt_strlen (tmp->data)) + && (mutt_strlen (b[j].name) == mutt_strlen (tmp->data))) + { + res = 1; + break; + } + } + + if (!MoreArgs (s)) + { + snprintf (err->data, err->dsize, _("ifdef: too few arguments")); + return (-1); + } + mutt_extract_token (tmp, s, MUTT_TOKEN_SPACE); + + if (res) + { + if (mutt_parse_rc_line (tmp->data, &token, err) == -1) + { + mutt_error ("Erreur: %s", err->data); + FREE (&token.data); + return (-1); + } + FREE (&token.data); + } + return 0; +} + 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-04-12 23:01:17 UTC ++++ init.h +@@ -3889,6 +3889,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 *); +static int parse_ifdef (BUFFER *, BUFFER *, unsigned long, BUFFER *); 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 @@ +@@ -3951,6 +3952,7 @@ const struct command_t Commands[] = { { "hdr_order", parse_list, UL &HeaderOrderList }, #ifdef HAVE_ICONV { "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK }, + { "ifdef", parse_ifdef, 0 }, #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 Index: head/mail/mutt/files/extra-patch-reverse_reply =================================================================== --- head/mail/mutt/files/extra-patch-reverse_reply (revision 439165) +++ head/mail/mutt/files/extra-patch-reverse_reply (revision 439166) @@ -1,92 +1,91 @@ -diff -u PATCHES PATCHES ---- PATCHES +--- PATCHES.orig 2017-04-12 23:01:05 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-04-12 23:01:17 UTC ++++ init.h +@@ -2575,6 +2575,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 }, + /* + ** .pp + ** When set, this variable uses the name from your aliases in the To and Cc + ** headers of reply mails you send, like $reverse_alias does in the index. + ** When unset, the headers taken from the original mail are left unchanged. + */ { "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-04-12 23:01:17 UTC ++++ mutt.h +@@ -438,6 +438,7 @@ enum OPTREVALIAS, OPTREVNAME, OPTREVREAL, + OPTREVREPLY, 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-04-12 23:01:17 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 *); +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-04-12 23:01:07 UTC ++++ send.c +@@ -585,6 +585,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); + if (option (OPTREVREPLY)){ + env->to = mutt_reverse_address (env->to); + 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-04-12 23:01:08 UTC ++++ sendlib.c +@@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s } } +/* given a list of addresses, return a list of reverse_alias'ed addresses */ +ADDRESS *mutt_reverse_address (ADDRESS *addr) +{ + ADDRESS *top,*tmp,*alias; + + if (addr == NULL) + return NULL; + + if ((alias = alias_reverse_lookup (addr)) && alias->personal) { + tmp = rfc822_cpy_adr_real(alias); + tmp->next = addr->next; + addr->next = NULL; + rfc822_free_address(&addr); + addr = tmp; + } + + for (top = addr; top->next != NULL; top = tmp) { + tmp = top->next; + if ((alias = alias_reverse_lookup (tmp)) && alias->personal) { + top->next = rfc822_cpy_adr_real(alias); + top->next->next = tmp->next; + tmp->next = NULL; + rfc822_free_address(&tmp); + tmp = top->next; + } + } + return addr; +} + int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, char *fcc) { CONTEXT f; Index: head/mail/mutt/files/patch-contrib_Makefile.am =================================================================== --- head/mail/mutt/files/patch-contrib_Makefile.am (revision 439165) +++ head/mail/mutt/files/patch-contrib_Makefile.am (revision 439166) @@ -1,11 +1,11 @@ ---- contrib/Makefile.am.orig 2016-10-08 19:30:21 UTC +--- contrib/Makefile.am.orig 2017-04-12 23:01:05 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 \ + sample.muttrc-compress sample.vimrc-sidebar colors.default colors.linux smime.rc \ ca-bundle.crt smime_keys_test.pl mutt_xtitle Index: head/mail/mutt/files/patch-smime-sender =================================================================== --- head/mail/mutt/files/patch-smime-sender (revision 439165) +++ head/mail/mutt/files/patch-smime-sender (revision 439166) @@ -1,53 +1,53 @@ ---- commands.c.orig 2016-10-08 19:30:21 UTC +--- commands.c.orig 2017-04-12 23:01:17 UTC +++ commands.c @@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur) { if (cur->security & GOODSIGN) { - if (!crypt_smime_verify_sender(cur)) + if (option(OPTSMIMENOSENDER) || !crypt_smime_verify_sender(cur)) 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.orig 2017-04-12 23:01:05 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-04-12 23:01:17 UTC +++ init.h -@@ -2946,6 +2946,15 @@ struct option_t MuttVars[] = { - ** alongside the documentation. +@@ -2980,6 +2980,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 }, + /* + ** .pp + ** This flag controls wether you want the skip the check for the sender's + ** email address against the email address stored in the certificate. + ** This can be useful if most of your email senders use SMIMEv3 which no + ** 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-04-12 23:01:17 UTC +++ mutt.h -@@ -486,6 +486,7 @@ enum +@@ -499,6 +499,7 @@ enum OPTCRYPTTIMESTAMP, OPTSMIMEISDEFAULT, OPTASKCERTLABEL, + OPTSMIMENOSENDER, OPTSDEFAULTDECRYPTKEY, OPTPGPIGNORESUB, OPTPGPCHECKEXIT,