The update script landed without code to apply the patch files we're
carrying against upstream. It's better to do that automatically so
there's less to remember when doing an update.
Also add a patch apparently missing from the existing set to remove
a spurious declaration for 'writeSimpleBock'.
