Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos
..
files 2d7666cde2 simplify add_rcconf %!s(int64=11) %!d(string=hai) anos
patches 2371972204 update snort to latest upstream, add daq package %!s(int64=12) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos