MFH r402745:
Apply upstream patches to fix CVE-2015-8077 and CVE-2015-8078.
Approved by: portmgr (feld@)
Obtained from: https://cyrus.foundation/cyrus-imapd/patch/?id=745e161c834f1eb6d62fc14477f51dae799e1e08,
https://cyrus.foundation/cyrus-imapd/patch/?id=6fb6a272171f49c79ba6ab7c6403eb25b39ec1b2
Security: d62ec98e-97d8-11e5-8c0e-080027b00c2e