Update binwalk patch for HEAD so it compiles and works

The previous patch would allow it compile but not run. In addition, upstream has made changes incorporating part of the patch so it won't apply anymore.