Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 85a8eebad2 update gnutls and required packages to latest upstream 14 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu