Summary: | [patch] mail/mutt: Update mail/mutt to mutt 1.9.5 | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | Ports & Packages | Reporter: | Derek Schrock <dereks> | ||||||||||||
Component: | Individual Port(s) | Assignee: | Jochen Neumeister <joneum> | ||||||||||||
Status: | Closed FIXED | ||||||||||||||
Severity: | Affects Only Me | CC: | joneum | ||||||||||||
Priority: | --- | Keywords: | needs-patch | ||||||||||||
Version: | Latest | ||||||||||||||
Hardware: | Any | ||||||||||||||
OS: | Any | ||||||||||||||
URL: | https://reviews.freebsd.org/D15069 | ||||||||||||||
Attachments: |
|
Description
Derek Schrock
2018-04-14 23:02:16 UTC
Created attachment 192520 [details]
testport for mail/mutt 1.9.5 patch
A commit references this bug: Author: joneum Date: Tue Apr 17 06:47:33 UTC 2018 New revision: 467561 URL: https://svnweb.freebsd.org/changeset/ports/467561 Log: mail/mutt: Update to 1.9.5 Changelog: * GPGME S/MIME non-detached signature handling. * A compilation issue with ncurses-6.1 when tinfow is split out. Hopefully the fix doesn't impact anyone: please let me know of any issues. * Regular expression crashes and weird behavior problems on MacOS (and possibly other BSDs). This was most noticeable with the recent Xcode 9.3 release, but the issue has existed for a while. * GSSAPI authentication issues, which may have affected Exchange users. We've changed behavior to match the RFC. If you are negatively impacted by this, please let me know. PR: 227519 Submitted by: dereks@lifeofadishwasher.com (maintainer) Changes: head/mail/mutt/Makefile head/mail/mutt/distinfo Landed, thanks :-) When OPTIONS_FILE_SET+=NNTP, then: ===> Patching for mutt-1.9.5 ===> Applying distribution patches for mutt-1.9.5 1 out of 2 hunks failed--saving rejects to Makefile.am.rej 1 out of 3 hunks failed--saving rejects to Makefile.in.rej 1 out of 12 hunks failed--saving rejects to doc/Muttrc.rej *** Error code 1 Stop. make[1]: stopped in /usr/ports/mail/mutt *** Error code 1 Stop. Created attachment 192609 [details]
Update mail/mutt for broken NNTP option and greeting version
vvv NNTP 1.9.1 doesn't apply cleanly to mutt 1.9.5. It's possible you could patch the patch here however for the time being NNTP will be broken if set. emailed the maintainer over the issue with 1.9.5. Waiting for vvv NNTP to be updated.
Also, update greeting to match its update to 1.9.5. This patch didn't change.
Created attachment 192670 [details]
Use updated VVV 1.9.5 patches
Use VVV's new 1.9.5 versioned patches
Also align with VC's 1.9.5 patch as well even though it's the same as 1.9.4.
Created attachment 192671 [details]
testport with new VVV update
VVV now applies: $ make clean patch ===> Cleaning for mutt-1.9.5_1 ===> License GPLv2+ accepted by the user ===> mutt-1.9.5_1 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by mutt-1.9.5_1 for building ===> Extracting for mutt-1.9.5_1 => SHA256 Checksum OK for mutt/mutt-1.9.5.tar.gz. => SHA256 Checksum OK for mutt/patch-1.9.5.vvv.nntp.gz. => SHA256 Checksum OK for mutt/patch-1.9.5.vvv.initials.gz. => SHA256 Checksum OK for mutt/patch-1.9.5.vvv.quote.gz. ===> Patching for mutt-1.9.5_1 ===> Applying distribution patches for mutt-1.9.5_1 ===> Applying extra patch /usr/local/poudriere/ports/testing/mail/mutt/files/extra-patch-doc-ref ===> Applying extra patch /usr/local/poudriere/ports/testing/mail/mutt/files/extra-patch-ifdef ===> Applying extra patch /usr/local/poudriere/ports/testing/mail/mutt/files/extra-patch-reverse_reply ===> Applying extra patch /usr/local/poudriere/ports/testing/mail/mutt/files/extra-patch-smartdate ===> Applying extra patch /usr/local/poudriere/ports/testing/mail/mutt/files/extra-patch-smime-outlook ===> Applying FreeBSD patches for mutt-1.9.5_1 Hey :-) +#VVV_PATCH_VERSION= 1.9.5 +#GREETING_PATCH_VERSION= 1.9.5 is this commented out with intent? Yes, if unset those patch versions will use ${PORT_VERSION} A commit references this bug: Author: joneum Date: Fri Apr 20 21:50:42 UTC 2018 New revision: 467848 URL: https://svnweb.freebsd.org/changeset/ports/467848 Log: This is a fix for OPTIONS_FILE_SET+=NNTP ===> Patching for mutt-1.9.5 ===> Applying distribution patches for mutt-1.9.5 1 out of 2 hunks failed--saving rejects to Makefile.am.rej 1 out of 3 hunks failed--saving rejects to Makefile.in.rej 1 out of 12 hunks failed--saving rejects to doc/Muttrc.rej *** Error code 1 PR: 227519 Submitted by: dereks@lifeofadishwasher.com (maintainer) Changes: head/mail/mutt/Makefile head/mail/mutt/distinfo |