Bug 214365 - mail/dovecot2: pick up a indexer fix for early returns
Summary: mail/dovecot2: pick up a indexer fix for early returns
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Adam Weinberger
URL: https://github.com/dovecot/core/commi...
Keywords: needs-qa, patch
Depends on:
Blocks:
 
Reported: 2016-11-09 19:25 UTC by Larry Rosenman
Modified: 2016-11-09 21:58 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (adamw)


Attachments
update patch (3.42 KB, patch)
2016-11-09 19:25 UTC, Larry Rosenman
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Larry Rosenman freebsd_committer freebsd_triage 2016-11-09 19:25:26 UTC
Created attachment 176823 [details]
update patch

pick up Github commit:
https://github.com/dovecot/core/commit/b284962364068d5e9d60b8b1e98ba61b4b6593ec

lib-http: client: Fixed assert failure occurring when server
 returns error status early while client is still sending blocking payload.

Note: patches re-genned with make makepatch
Comment 1 Adam Weinberger freebsd_committer freebsd_triage 2016-11-09 19:30:02 UTC
The changes to decode2text.sh don't look right. They hardcode /usr/local. There's a REINPLACE_CMD in post-patch: to change /usr to /usr/local. Either they need to stay /usr in the patch, or all instances need to be changed to /usr/local and then have the regex s|/usr/local|${LOCALBASE}|.

Also, what's the change in the CPPFLAGS line?
Comment 2 Larry Rosenman freebsd_committer freebsd_triage 2016-11-09 19:35:52 UTC
the CPPFLAGS line I suspect is just a whitespace change (I only changed PORTREVISION in
the Makefile).

The decode2text.sh patch was re-genned when I did a make makepatch
after make patch, patch -p1 < commit.patch.

up 2 you if you want to just drop that part of my patch....
Comment 3 VK 2016-11-09 19:50:39 UTC
Larry, thanks for the patch. Please confirm these changes pass the QA (portlint, poudriere).

I would also recommend you add a comment to this patch so the next upstream version bump can be easier dealt with, having patches that explain themselves. You can copy the comments from upstream:

https://github.com/dovecot/core/commit/b284962364068d5e9d60b8b1e98ba61b4b6593ec.patch

(note the .patch ending to the URL).
Comment 4 Adam Weinberger freebsd_committer freebsd_triage 2016-11-09 21:53:20 UTC
Ah! I see now. I read too quickly and thought you were making other changes to the decode2text.sh patch at the same time.
Comment 5 commit-hook freebsd_committer freebsd_triage 2016-11-09 21:57:52 UTC
A commit references this bug:

Author: adamw
Date: Wed Nov  9 21:57:25 UTC 2016
New revision: 425810
URL: https://svnweb.freebsd.org/changeset/ports/425810

Log:
  Add an upstream github commit:
  https://github.com/dovecot/core/commit/b284962364068d5e9d60b8b1e98ba61b4b6593ec

  lib-http: client: Fixed assert failure occurring when server eturns
  error status early while client is still sending blocking payload.

  PR:		214365
  Submitted by:	Larry Rosenman

Changes:
  head/mail/dovecot2/Makefile
  head/mail/dovecot2/files/patch-src_lib-http_http-client-request.c
Comment 6 Adam Weinberger freebsd_committer freebsd_triage 2016-11-09 21:58:27 UTC
Committed. Thanks for this, Larry, and sorry about the confusion regarding your patch.