Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 17:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/jsiwek/new-libmagic'

Browse source 
* origin/topic/jsiwek/new-libmagic:
  Update to libmagic version 5.17, address BIT-1136.
This commit is contained in:
Robin Sommer 2014-02-20 17:27:14 -08:00
commit f18a75e17d
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -56,7 +56,7 @@ set(LIBMAGIC_LIB_DIR ${LIBMAGIC_PREFIX}/lib)
set(LIBMAGIC_LIBRARY ${LIBMAGIC_LIB_DIR}/libmagic.a) set(LIBMAGIC_LIBRARY ${LIBMAGIC_LIB_DIR}/libmagic.a)
ExternalProject_Add(libmagic ExternalProject_Add(libmagic
PREFIX ${LIBMAGIC_PREFIX} PREFIX ${LIBMAGIC_PREFIX}
URL ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/file-5.16.tar.gz URL ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/file-5.17.tar.gz
CONFIGURE_COMMAND ./configure --enable-static --disable-shared CONFIGURE_COMMAND ./configure --enable-static --disable-shared
--prefix=${LIBMAGIC_PREFIX} --prefix=${LIBMAGIC_PREFIX}
--includedir=${LIBMAGIC_INCLUDE_DIR} --includedir=${LIBMAGIC_INCLUDE_DIR}

2
testing/btest/bifs/identify_data.bro
View file

@ -10,7 +10,7 @@ event bro_init()
print identify_data(a, T); print identify_data(a, T);
# PNG image # PNG image
local b = "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a"; local b = "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00";
print identify_data(b, F); print identify_data(b, F);
print identify_data(b, T); print identify_data(b, T);
} }