See blog post for more information.
Automatic:
git apply --whitespace=fix security-update.diff
Manual:
Read manual-update.md.
manual-update.md