Waldemar Brodkorb 05d715df3a resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
patches a6bffe8d51 fix musl compile, add missing patch for ipsec-tools %!s(int64=10) %!d(string=hai) anos
Makefile 05d715df3a resolve merge conflict %!s(int64=10) %!d(string=hai) anos