Patch fails due to the fact that the file to patch contains CRLFs. Use
dos2unix to fix build. Quarterly branch is not affected.

Reported by: pkg-fallout
Pointy hat: pkubaj