fix patch file, somehow an .orig file got into there
adjust patches for master