]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #667 in SNORT/snort3 from os-fixups to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 7 Oct 2016 21:54:35 +0000 (17:54 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 7 Oct 2016 21:54:35 +0000 (17:54 -0400)
commit8b0bdd2f1513fdcfa5c595d32e12bf70f1f50768
tree5086f0813eb4094fa14e4a23802042d74d034c5a
parentfc7f2dea4c807c850e13825fea11ecdc628e3a73
Merge pull request #667 in SNORT/snort3 from os-fixups to master

Squashed commit of the following:

commit d7283265f940cf51d95d472fc674fbd8753027aa
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Oct 7 16:43:14 2016 -0400

    cd_eth: Depend on LibSFBPF's DLT definitions

commit 4302574a641bd85ebbd96d70e3881ed94b566a34
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Oct 7 16:38:13 2016 -0400

    extra: Make all codecs depend on LibSFBPF's DLT definitions

commit f1b9c436deb19d441262c6f6cf25b02ab7d8df3f
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Oct 7 16:37:44 2016 -0400

    extra: Kill off i4l_rawip decoder

    This DLT doesn't actually exist anywhere and the decoder was a NOP.

commit ec9dd64ebe5d69fd0f39fe3dbae27851610be372
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Oct 7 15:23:13 2016 -0400

    build: OpenSolaris build fixes
18 files changed:
extra/configure.ac
extra/src/codecs/CMakeLists.txt
extra/src/codecs/Makefile.am
extra/src/codecs/cd_i4l_rawip/CMakeLists.txt [deleted file]
extra/src/codecs/cd_i4l_rawip/Makefile.am [deleted file]
extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc [deleted file]
extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
extra/src/codecs/cd_null/cd_null.cc
extra/src/codecs/cd_pflog/cd_pflog.cc
extra/src/codecs/cd_ppp/cd_ppp.cc
extra/src/codecs/cd_raw4/cd_raw4.cc
extra/src/codecs/cd_raw6/cd_raw6.cc
extra/src/codecs/cd_slip/cd_slip.cc
extra/src/codecs/cd_token_ring/cd_token_ring.cc
extra/src/codecs/cd_wlan/cd_wlan.cc
src/codecs/root/cd_eth.cc
src/network_inspectors/appid/lua_detector_api.cc
src/utils/util.cc