Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
files 2d7666cde2 simplify add_rcconf 12 lat temu
patches 2371972204 update snort to latest upstream, add daq package 13 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu