Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 15c84adca9 fix packages to be compile with stack protector 15 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu