Index: head/mail/mutt/Makefile =================================================================== --- head/mail/mutt/Makefile (revision 535832) +++ head/mail/mutt/Makefile (revision 535833) @@ -1,224 +1,241 @@ # Created by: Udo Schweigert # $FreeBSD$ PORTNAME= mutt -DISTVERSION= 1.14.0 +DISTVERSION= 1.14.1 CATEGORIES+= mail 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 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 \ http://vc.org.ua/mutt/:vc PATCH_DIST_STRIP= -p1 MAINTAINER= dereks@lifeofadishwasher.com COMMENT= Small but powerful text based program for read/writing e-mail LICENSE= GPLv2+ RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support USES= cpe shebangfix ssl 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]* CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \ --with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \ --enable-external-dotlock --enable-pop --enable-imap \ --enable-compressed --enable-sidebar INFO= ${PORTNAME} 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 GNU_CONFIGURE= yes OPTIONS_SUB= yes -OPTIONS_DEFINE= AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \ +OPTIONS_DEFINE= AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \ GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \ MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \ - REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW + REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW 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 AUTOCRYPT_DESC= Convenient End-to-End Encryption -DEBUG_DESC= Debugging capabilities +DEBUG_LOGS_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 HCACHE_BDB_DESC= Use Berkeley DB (BDB) HCACHE_DESC= Header Cache support HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet HCACHE_NONE_DESC= Disable Header Cache HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet 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) QUOTE_PATCH_DESC= Extended quoting REVERSE_REPLY_PATCH_DESC= Reverse_reply SASL_DESC= SASL authentication +SMIME_DESC= SMIME email check option patch SLANG_DESC= SLANG support SMART_DATE_DESC= Dynamic date formatting with "%@" SMTP_DESC= SMTP relay support URLVIEW_DESC= Use urlview for the URL selector menu -OPTIONS_DEFAULT= AUTOCRYPT DEBUG GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \ +OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \ IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \ - NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW + NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW .ifmake makesum # for optional distfiles patchfiles OPTIONS_OVERRIDE= ${OPTIONS_DEFINE} ${OPTIONS_DEFAULT} .MAKEOVERRIDES+= OPTIONS_OVERRIDE .endif AUTOCRYPT_CONFIGURE_ENABLE= autocrypt AUTOCRYPT_IMPLIES= GPGME IDN AUTOCRYPT_USES= sqlite:3 AUTOCRYPT_CONFIGURE_WITH= sqlite3=${LOCALBASE} AUTOCRYPT_DEPENDS= gnupg>=2.1:security/gnupg \ gpgme>=1.8:security/gpgme AUTOCRYPT_BUILD_DEPENDS= ${AUTOCRYPT_DEPENDS} AUTOCRYPT_RUN_DEPENDS= ${AUTOCRYPT_DEPENDS} 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 -DEBUG_CONFIGURE_ON= --enable-debug +DEBUG_LOGS_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_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_NONE_USES_OFF= perl5 HCACHE_NONE_VARS_OFF= USE_PERL5=build HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE} HCACHE_BDB_USES= bdb:42+ HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet=${LOCALBASE} HCACHE_TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet=${LOCALBASE} HCACHE_KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet ICONV_USES= iconv:translit ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --disable-iconv REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply +REVERSE_REPLY_PATCH_USES= perl5 +REVERSE_REPLY_PATCH_VARS= USE_PERL5=build SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} +SMIME_EXTRA_PATCHES= ${PATCHDIR}/extra-smime-sender +SMIME_USES= perl5 +SMIME_VARS= USE_PERL5=build + SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate FLOCK_CONFIGURE_ENABLE= flock LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring IDN_CONFIGURE_WITH= idn2=${LOCALBASE} IDN_IMPLIES= ICONV IFDEF_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ifdef +IFDEF_PATCH_USES= perl5 +IFDEF_PATCH_VARS= USE_PERL5=build 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 FORCEBASE64_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-forcebase64 +FORCEBASE64_USES= perl5 +FORCEBASE64_VARS= USE_PERL5=build MAILDIR_MTIME_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-maildir-mtime GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc +GREETING_PATCH_USES= perl5 +GREETING_PATCH_VARS= USE_PERL5=build QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \ patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv +QUOTE_PATCH_USES= perl5 +QUOTE_PATCH_VARS= USE_PERL5=build -DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref - .include # un/comment as each VERSION is created for PORTVERSION VVV_PATCH_VERSION= 1.13.0 GREETING_PATCH_VERSION= 1.14.0 post-install: ${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5 pre-configure:: + # Stop make from setgid mutt_dotlock + @${REINPLACE_CMD} \ + -e '/if test.*mutt_dotlock.*DOTLOCK_GROUP/s/if/if ${FALSE} \&\&/' \ + ${WRKSRC}/Makefile.in + # Base FreeBSD krb5-config --version returns "FreeBSD heimdal" @${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \ - ${WRKSRC}/contrib/pgp6.rc - @${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 + # Install contrib samples to ${EXAMPLESDIR} @${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \ ${WRKSRC}/contrib/Makefile.in -pre-configure-ASPELL-on: - @${REINPLACE_CMD} -e '/^# append-hook/p' \ - -e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \ - ${WRKSRC}/doc/Muttrc.head - pre-configure-HCACHE_BDB-on: @${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} pre-build:: @${REINPLACE_CMD} -e '/^BUILD_DOC_TARGETS/s/=.*/=/' ${WRKSRC}/doc/Makefile + +# Undo some dist. installed files +post-stage:: + @${MV} ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.dist \ + ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.sample + @${RM} ${STAGEDIR}/${LOCALBASE}/etc/mime.types* + +# Change default ispell +post-build-ASPELL-on: + @${REINPLACE_CMD} -e '/^# append-hook/p' \ + -e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \ + ${WRKSRC}/doc/Muttrc .include Index: head/mail/mutt/distinfo =================================================================== --- head/mail/mutt/distinfo (revision 535832) +++ head/mail/mutt/distinfo (revision 535833) @@ -1,9 +1,9 @@ -TIMESTAMP = 1588634875 -SHA256 (mutt/mutt-1.14.0.tar.gz) = df2e82a83ad38c9a9fd36f44c5ab2b726defa4bb1a17de794dd3800f3353f9f8 -SIZE (mutt/mutt-1.14.0.tar.gz) = 5220515 +TIMESTAMP = 1589659243 +SHA256 (mutt/mutt-1.14.1.tar.gz) = 35d564c335f7364b8a43349fe0115a7cdc8ebf1ba8bf809d3fc51b9828844425 +SIZE (mutt/mutt-1.14.1.tar.gz) = 5221810 SHA256 (mutt/mutt-1.14.0.vc.greeting) = 5da9ecdded840fd06063bc16bb1934fb4cae9217f0d4f531322ecd5a009e5b4f SIZE (mutt/mutt-1.14.0.vc.greeting) = 4470 SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02 SIZE (mutt/patch-1.13.0.vvv.initials.xz) = 720 SHA256 (mutt/patch-1.13.0.vvv.quote.xz) = 788d25d1439d86d6c5007d141d1c219496e77940b5ce37819471c941f78f03e4 SIZE (mutt/patch-1.13.0.vvv.quote.xz) = 1340 Index: head/mail/mutt/files/patch-contrib_Makefile.in =================================================================== --- head/mail/mutt/files/patch-contrib_Makefile.in (revision 535832) +++ head/mail/mutt/files/patch-contrib_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- contrib/Makefile.in.orig 2020-05-02 21:32:34 UTC -+++ contrib/Makefile.in -@@ -279,7 +279,7 @@ top_build_prefix = @top_build_prefix@ - 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.muttrc-starter \ - sample.vimrc-sidebar colors.default colors.linux smime.rc \ Property changes on: head/mail/mutt/files/patch-contrib_Makefile.in ___________________________________________________________________ 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/patch-doc_manual.xml.head =================================================================== --- head/mail/mutt/files/patch-doc_manual.xml.head (revision 535832) +++ head/mail/mutt/files/patch-doc_manual.xml.head (nonexistent) @@ -1,10 +0,0 @@ ---- doc/manual.xml.head.orig 2020-05-02 21:08:56 UTC -+++ doc/manual.xml.head -@@ -1,6 +1,6 @@ - - -+ "/usr/local/share/xml/docbook/4.2/docbookx.dtd"> - - - Property changes on: head/mail/mutt/files/patch-doc_manual.xml.head ___________________________________________________________________ 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/patch-smime-sender =================================================================== --- head/mail/mutt/files/patch-smime-sender (revision 535832) +++ head/mail/mutt/files/patch-smime-sender (nonexistent) @@ -1,39 +0,0 @@ ---- commands.c.orig 2020-05-02 21:08:56 UTC -+++ commands.c -@@ -302,7 +302,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.")); ---- init.h.orig 2020-05-05 02:09:33 UTC -+++ init.h -@@ -3608,6 +3608,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, {.l=OPTSMIMENOSENDER}, {.l=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_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} }, - { "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} }, - /* ---- mutt.h.orig 2020-05-05 02:09:33 UTC -+++ mutt.h -@@ -596,6 +596,7 @@ enum - OPTSMIMEISDEFAULT, - OPTSMIMESELFENCRYPT, - OPTASKCERTLABEL, -+ OPTSMIMENOSENDER, - OPTSDEFAULTDECRYPTKEY, - OPTPGPIGNORESUB, - OPTPGPCHECKEXIT, Property changes on: head/mail/mutt/files/patch-smime-sender ___________________________________________________________________ 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/patch-Makefile.in =================================================================== --- head/mail/mutt/files/patch-Makefile.in (revision 535832) +++ head/mail/mutt/files/patch-Makefile.in (nonexistent) @@ -1,30 +0,0 @@ ---- Makefile.in.orig 2020-05-02 21:31:42 UTC -+++ Makefile.in -@@ -530,7 +530,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign - @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap - @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt - @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt --SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) -+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) . doc - bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET) - @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h - BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION) -@@ -1660,18 +1660,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 \ Property changes on: head/mail/mutt/files/patch-Makefile.in ___________________________________________________________________ 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-doc-ref =================================================================== --- head/mail/mutt/files/extra-patch-doc-ref (revision 535832) +++ head/mail/mutt/files/extra-patch-doc-ref (nonexistent) @@ -1,12 +0,0 @@ ---- doc/mutt.man.orig 2020-05-02 21:08:56 UTC -+++ doc/mutt.man -@@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent - .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, --OpenPGP, and a threaded sorting mode. -+OpenPGP, and a threaded sorting mode. Details of how to use all of this is -+available in @docdir@. - .PP - .I Note: - .IR Property changes on: head/mail/mutt/files/extra-patch-doc-ref ___________________________________________________________________ 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/patch-doc_Makefile.in =================================================================== --- head/mail/mutt/files/patch-doc_Makefile.in (revision 535832) +++ head/mail/mutt/files/patch-doc_Makefile.in (nonexistent) @@ -1,29 +0,0 @@ ---- doc/Makefile.in.orig 2020-05-02 21:31:43 UTC -+++ doc/Makefile.in -@@ -561,14 +561,7 @@ install-data-local: makedoc-all instdoc - $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \ - fi \ - 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 - -if [ -f mutt.info ] ; then \ - $(MKDIR_P) $(DESTDIR)$(infodir) ; \ - $(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \ -@@ -604,9 +597,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 - Property changes on: head/mail/mutt/files/patch-doc_Makefile.in ___________________________________________________________________ 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-smime-sender =================================================================== --- head/mail/mutt/files/extra-smime-sender (nonexistent) +++ head/mail/mutt/files/extra-smime-sender (revision 535833) @@ -0,0 +1,39 @@ +--- commands.c.orig 2020-05-02 21:08:56 UTC ++++ commands.c +@@ -302,7 +302,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.")); +--- init.h.orig 2020-05-05 02:09:33 UTC ++++ init.h +@@ -3608,6 +3608,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, {.l=OPTSMIMENOSENDER}, {.l=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_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} }, + { "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} }, + /* +--- mutt.h.orig 2020-05-05 02:09:33 UTC ++++ mutt.h +@@ -596,6 +596,7 @@ enum + OPTSMIMEISDEFAULT, + OPTSMIMESELFENCRYPT, + OPTASKCERTLABEL, ++ OPTSMIMENOSENDER, + OPTSDEFAULTDECRYPTKEY, + OPTPGPIGNORESUB, + OPTPGPCHECKEXIT, Property changes on: head/mail/mutt/files/extra-smime-sender ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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 Index: head/mail/mutt/pkg-plist =================================================================== --- head/mail/mutt/pkg-plist (revision 535832) +++ head/mail/mutt/pkg-plist (revision 535833) @@ -1,114 +1,115 @@ bin/flea bin/mutt bin/muttbug @(,mail,2755) bin/mutt_dotlock bin/mutt_pgpring bin/pgpewrap bin/smime_keys @sample etc/Muttrc.sample man/man1/mutt.1.gz man/man1/mutt_dotlock.1.gz man/man1/mutt_pgpring.1.gz man/man1/pgpewrap.1.gz man/man1/smime_keys.1.gz man/man5/mailcap.5.gz %%MAILBOX_MANPAGES%%man/man5/mbox.5.gz %%MAILBOX_MANPAGES%%man/man5/mmdf.5.gz man/man5/muttrc.5.gz %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/GPL %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.SECURITY %%PORTDOCS%%%%DOCSDIR%%/README.SSL %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt %%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/index.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/intro.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/manual.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/miscellany.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/reference.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/security.html %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tuning.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-detectgui.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-screen-tmux.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/markdown2html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp5.rc %%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-starter %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime_keys_test.pl %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo %%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo %%NLS%%share/locale/da/LC_MESSAGES/mutt.mo %%NLS%%share/locale/de/LC_MESSAGES/mutt.mo %%NLS%%share/locale/el/LC_MESSAGES/mutt.mo %%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo %%NLS%%share/locale/es/LC_MESSAGES/mutt.mo %%NLS%%share/locale/et/LC_MESSAGES/mutt.mo %%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo %%NLS%%share/locale/fi/LC_MESSAGES/mutt.mo %%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo %%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo %%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo %%NLS%%share/locale/id/LC_MESSAGES/mutt.mo %%NLS%%share/locale/it/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo %%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo %%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo %%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo %%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo %%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo %%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo %%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo %%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo