Hi,

I've fixed patch apply failure, added one intermediate patch to fix
indentation and move the package to golang-xyz.

Pushed as 008811aef6..8c9bc0e710 to master.

--
Oleg