Add additional patch by Salvatore Toribio as an OPTION, on by default
PR: ports/173127
Submitted by: William Olson <wolson@gmail.com>
Approved by: lippe (maintainer)
Obtained from: http://toribio.apollinare.org/qmail-scanner/
While here, convert to OPTIONSng
Approved by: lippe (maintainer)