webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-04 11:01:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts during merge of next and the suricata branch

Browse Source
This commit is contained in:
Stefan Schantl
2018-08-23 10:34:17 +02:00
parent 7fe5bc8261 c5486ccb97
commit cb52183c6a
36 changed files with 3766 additions and 1570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
make.sh
View File

@@ -1314,9 +1314,11 @@ buildipfire() {
lfsmake2 setserial
lfsmake2 setup
lfsmake2 libdnet
lfsmake2 daq
lfsmake2 snort
lfsmake2 yaml
lfsmake2 libhtp
lfsmake2 suricata
lfsmake2 oinkmaster
lfsmake2 ids-ruleset-sources
lfsmake2 squid
lfsmake2 squidguard
lfsmake2 calamaris