Date: Tue, 19 May 2020 07:02:46 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535833 - in head/mail/mutt: . files Message-ID: <202005190702.04J72kZO069194@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Tue May 19 07:02:45 2020 New Revision: 535833 URL: https://svnweb.freebsd.org/changeset/ports/535833 Log: mail/mutt: update 1.14.0 -> 1.14.1 - Rename DEBUG option to DEBUG_LOGS - Add lang/perl5 deps that triggers a Muttrc rebuild - Make smime patch optional due to perl build deps. - Remove unnecessary doc patches and REINPLACE_CMD - Move build changing patches to make targets - ASPELL updates the (pre)built Muttrc to not require a rebuild PR: 246559 Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer) Relnotes: https://marc.info/?l=mutt-users&m=158965668315387&w=2 Added: head/mail/mutt/files/extra-smime-sender - copied unchanged from r535832, head/mail/mutt/files/patch-smime-sender Deleted: head/mail/mutt/files/extra-patch-doc-ref head/mail/mutt/files/patch-Makefile.in head/mail/mutt/files/patch-contrib_Makefile.in head/mail/mutt/files/patch-doc_Makefile.in head/mail/mutt/files/patch-doc_manual.xml.head head/mail/mutt/files/patch-smime-sender Modified: head/mail/mutt/Makefile head/mail/mutt/distinfo head/mail/mutt/pkg-plist Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Tue May 19 06:01:08 2020 (r535832) +++ head/mail/mutt/Makefile Tue May 19 07:02:45 2020 (r535833) @@ -2,7 +2,7 @@ # $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/ \ @@ -46,10 +46,10 @@ 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 @@ -59,7 +59,7 @@ OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET 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 @@ -80,14 +80,15 @@ 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} @@ -109,7 +110,7 @@ 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} @@ -150,10 +151,16 @@ 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 @@ -166,6 +173,8 @@ 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 @@ -175,16 +184,20 @@ 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 <bsd.port.options.mk> # un/comment as each VERSION is created for PORTVERSION @@ -195,30 +208,34 @@ 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 <bsd.port.mk> Modified: head/mail/mutt/distinfo ============================================================================== --- head/mail/mutt/distinfo Tue May 19 06:01:08 2020 (r535832) +++ head/mail/mutt/distinfo Tue May 19 07:02:45 2020 (r535833) @@ -1,6 +1,6 @@ -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 Copied: head/mail/mutt/files/extra-smime-sender (from r535832, head/mail/mutt/files/patch-smime-sender) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mutt/files/extra-smime-sender Tue May 19 07:02:45 2020 (r535833, copy of r535832, head/mail/mutt/files/patch-smime-sender) @@ -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, Modified: head/mail/mutt/pkg-plist ============================================================================== --- head/mail/mutt/pkg-plist Tue May 19 06:01:08 2020 (r535832) +++ head/mail/mutt/pkg-plist Tue May 19 07:02:45 2020 (r535833) @@ -72,6 +72,7 @@ man/man5/muttrc.5.gz %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005190702.04J72kZO069194>