svn commit: r528037 - in head/security/klee: . files

[Gleb Popov]

Author: arrowd
Date: Sun Mar  8 14:25:29 2020
New Revision: 528037
URL: https://svnweb.freebsd.org/changeset/ports/528037

Log:
  security/klee: Update to 2.1. Enable STP by default.

Deleted:
  head/security/klee/files/
Modified:
  head/security/klee/Makefile
  head/security/klee/distinfo
  head/security/klee/pkg-plist

Modified: head/security/klee/Makefile
==============================================================================
--- head/security/klee/Makefile	Sun Mar  8 13:55:05 2020	(r528036)
+++ head/security/klee/Makefile	Sun Mar  8 14:25:29 2020	(r528037)
@@ -2,8 +2,7 @@
 
 PORTNAME=	klee
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0
-PORTREVISION=	1
+DISTVERSION=	2.1
 CATEGORIES=	security devel
 
 MAINTAINER=	arrowd at FreeBSD.org
@@ -19,7 +18,7 @@ RUN_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LL
 		${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
@@ -28,30 +27,22 @@ CMAKE_OFF=	ENABLE_POSIX_RUNTIME ENABLE_UNIT_TESTS ENAB
 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 <bsd.port.options.mk>
-
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
-LLVM_DEFAULT=	80
-.endif
+STP_LIB_DEPENDS=	libcryptominisat5.so:math/cryptominisat
 
 .include <bsd.port.mk>

Modified: head/security/klee/distinfo
==============================================================================
--- head/security/klee/distinfo	Sun Mar  8 13:55:05 2020	(r528036)
+++ head/security/klee/distinfo	Sun Mar  8 14:25:29 2020	(r528037)
@@ -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

Modified: head/security/klee/pkg-plist
==============================================================================
--- head/security/klee/pkg-plist	Sun Mar  8 13:55:05 2020	(r528036)
+++ head/security/klee/pkg-plist	Sun Mar  8 14:25:29 2020	(r528037)
@@ -2,6 +2,7 @@ bin/gen-bout
 bin/gen-random-bout
 bin/kleaver
 bin/klee
+bin/klee-replay
 bin/klee-stats
 bin/ktest-tool
 include/klee/klee.h