Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches a6bffe8d51 fix musl compile, add missing patch for ipsec-tools 12 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu