clean up the openswan patch to work with older patch versions as well