Index: head/security/klee/files/patch-CMakeLists.txt =================================================================== --- head/security/klee/files/patch-CMakeLists.txt (revision 528036) +++ head/security/klee/files/patch-CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2018-07-12 22:25:49 UTC -+++ CMakeLists.txt -@@ -412,7 +412,7 @@ endif() - ################################################################################ - # Detect libcap - ################################################################################ --check_include_file("sys/capability.h" HAVE_SYS_CAPABILITY_H) -+#check_include_file("sys/capability.h" HAVE_SYS_CAPABILITY_H) - if (HAVE_SYS_CAPABILITY_H) - find_library(LIBCAP_LIBRARIES - NAMES cap Property changes on: head/security/klee/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/klee/files/patch-lib_Core_Executor.cpp =================================================================== --- head/security/klee/files/patch-lib_Core_Executor.cpp (revision 528036) +++ head/security/klee/files/patch-lib_Core_Executor.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/Core/Executor.cpp.orig 2018-07-22 16:43:34 UTC -+++ lib/Core/Executor.cpp -@@ -3885,7 +3885,7 @@ void Executor::prepareForEarlyExit() { - - /// Returns the errno location in memory - int *Executor::getErrnoLocation(const ExecutionState &state) const { --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - /* From /usr/include/errno.h: it [errno] is a per-thread variable. */ - return __errno_location(); - #else Property changes on: head/security/klee/files/patch-lib_Core_Executor.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/klee/files/patch-cmake_find__stp.cmake =================================================================== --- head/security/klee/files/patch-cmake_find__stp.cmake (revision 528036) +++ head/security/klee/files/patch-cmake_find__stp.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- cmake/find_stp.cmake.orig 2018-07-12 22:25:49 UTC -+++ cmake/find_stp.cmake -@@ -13,6 +13,8 @@ - # is displayed in `ccmake` and `cmake-gui`. - set(STP_DIR "" CACHE PATH "Path to directory containing STPConfig.cmake") - find_package(STP CONFIG) -+SET(STP_STATIC_LIBRARY ${FREEBSD_STP_STATIC_LIBRARY}) -+MESSAGE("YURI STP_STATIC_LIBRARY=${STP_STATIC_LIBRARY}") - - # Set the default so that if the following is true: - # * STP was found Property changes on: head/security/klee/files/patch-cmake_find__stp.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/klee/Makefile =================================================================== --- head/security/klee/Makefile (revision 528036) +++ head/security/klee/Makefile (revision 528037) @@ -1,57 +1,48 @@ # $FreeBSD$ PORTNAME= klee DISTVERSIONPREFIX= v -DISTVERSION= 2.0 -PORTREVISION= 1 +DISTVERSION= 2.1 CATEGORIES= security devel MAINTAINER= arrowd@FreeBSD.org COMMENT= Symbolic virtual machine built on top of LLVM LICENSE= NCSA LICENSE_FILE= ${WRKSRC}/LICENSE.TXT BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ gmake:devel/gmake # Should be a LIB_DEPEND, but hard to express in a generic manner RUN_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} USES= cmake compiler:c++14-lang localbase pkgconfig python:3.5+,run \ - shebangfix + shebangfix sqlite USE_GITHUB= yes SHEBANG_FILES= tools/klee-stats/klee-stats tools/ktest-tool/ktest-tool USE_LDCONFIG= yes CMAKE_OFF= ENABLE_POSIX_RUNTIME ENABLE_UNIT_TESTS ENABLE_SYSTEM_TESTS CMAKE_ARGS= -DLLVM_CONFIG_BINARY=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \ -DMAKE_BINARY=${LOCALBASE}/bin/gmake -OPTIONS_DEFINE= TCMALLOC -OPTIONS_SINGLE= SOLVER -OPTIONS_SINGLE_SOLVER= Z3 STP # TODO METASMT -OPTIONS_DEFAULT= TCMALLOC Z3 -SOLVER_DESC= Solver: Use the +# TODO METASMT +OPTIONS_DEFINE= TCMALLOC Z3 STP +OPTIONS_DEFAULT= TCMALLOC Z3 STP TCMALLOC_DESC= Use tcmalloc library for memory management TCMALLOC_CMAKE_BOOL= ENABLE_TCMALLOC TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools -Z3_DESC= Z3 SMT solver +Z3_DESC= Enable Z3 SMT solver Z3_CMAKE_BOOL= ENABLE_SOLVER_Z3 Z3_BUILD_DEPENDS= z3:math/z3 Z3_RUN_DEPENDS= z3:math/z3 -STP_DESC= STP SMT solver +STP_DESC= Enable STP SMT solver STP_CMAKE_BOOL= ENABLE_SOLVER_STP -STP_CMAKE_ON= -DFREEBSD_STP_STATIC_LIBRARY:STRING=${LOCALBASE}/lib/libstp.a STP_BUILD_DEPENDS= stp>0:math/stp - -.include - -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 -LLVM_DEFAULT= 80 -.endif +STP_LIB_DEPENDS= libcryptominisat5.so:math/cryptominisat .include Index: head/security/klee/distinfo =================================================================== --- head/security/klee/distinfo (revision 528036) +++ head/security/klee/distinfo (revision 528037) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553122599 -SHA256 (klee-klee-v2.0_GH0.tar.gz) = e1680086a3a2b0c22ef0b48737b75a897ab1d17e116690f04a940ac07eebc86b -SIZE (klee-klee-v2.0_GH0.tar.gz) = 1023318 +TIMESTAMP = 1583304181 +SHA256 (klee-klee-v2.1_GH0.tar.gz) = bb3db767a159b42611e56367480a1fbfb12783c8920902d57a2b26422036a8fe +SIZE (klee-klee-v2.1_GH0.tar.gz) = 1038275 Index: head/security/klee/pkg-plist =================================================================== --- head/security/klee/pkg-plist (revision 528036) +++ head/security/klee/pkg-plist (revision 528037) @@ -1,12 +1,13 @@ bin/gen-bout bin/gen-random-bout bin/kleaver bin/klee +bin/klee-replay bin/klee-stats bin/ktest-tool include/klee/klee.h lib/klee/runtime/libklee-libc.bca lib/klee/runtime/libkleeRuntimeFreeStanding.bca lib/klee/runtime/libkleeRuntimeIntrinsic.bca lib/libkleeRuntest.so lib/libkleeRuntest.so.1.0