git: 4b1ed03b1a8f - main - security/klee: Update to 3.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 20 Jun 2023 18:54:53 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4b1ed03b1a8f5a6d15c9e91789cf28e0cd6d8687
commit 4b1ed03b1a8f5a6d15c9e91789cf28e0cd6d8687
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2023-06-20 18:54:18 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2023-06-20 18:54:49 +0000
security/klee: Update to 3.0
Reported by: portscout!
---
security/klee/Makefile | 5 ++---
security/klee/distinfo | 6 +++---
security/klee/files/patch-lib_Solver_Z3Solver.cpp | 20 --------------------
security/klee/pkg-plist | 16 ++++++++++++++--
4 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/security/klee/Makefile b/security/klee/Makefile
index 2d59dbad6a83..c9ea1f13e42f 100644
--- a/security/klee/Makefile
+++ b/security/klee/Makefile
@@ -1,7 +1,6 @@
PORTNAME= klee
DISTVERSIONPREFIX= v
-DISTVERSION= 2.3
-PORTREVISION= 2
+DISTVERSION= 3.0
CATEGORIES= security devel
MAINTAINER= arrowd@FreeBSD.org
@@ -16,7 +15,7 @@ NOT_FOR_ARCHS= i386
BUILD_DEPENDS= gmake:devel/gmake
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}
-USES= cmake compiler:c++14-lang llvm:min=9,max=13,build,run localbase \
+USES= cmake compiler:c++14-lang llvm:min=11,max=14,build,run localbase \
pkgconfig python:3.5+,run shebangfix sqlite
USE_GITHUB= yes
SHEBANG_FILES= tools/klee-stats/klee-stats tools/ktest-tool/ktest-tool tools/klee-zesti/klee-zesti
diff --git a/security/klee/distinfo b/security/klee/distinfo
index 90fd56b0e51c..1bfb45051339 100644
--- a/security/klee/distinfo
+++ b/security/klee/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649151525
-SHA256 (klee-klee-v2.3_GH0.tar.gz) = 6155fcaa4e86e7af8a73e8e4b63102abaea3a62d17e4021beeec47b0a3a6eff9
-SIZE (klee-klee-v2.3_GH0.tar.gz) = 1075895
+TIMESTAMP = 1687273109
+SHA256 (klee-klee-v3.0_GH0.tar.gz) = 204ebf0cb739886f574b1190b04fa9ed9088770c0634984782e9633d1aa4bdc9
+SIZE (klee-klee-v3.0_GH0.tar.gz) = 1042635
diff --git a/security/klee/files/patch-lib_Solver_Z3Solver.cpp b/security/klee/files/patch-lib_Solver_Z3Solver.cpp
deleted file mode 100644
index 6b94b085cead..000000000000
--- a/security/klee/files/patch-lib_Solver_Z3Solver.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/Solver/Z3Solver.cpp.orig 2022-04-04 12:37:59 UTC
-+++ lib/Solver/Z3Solver.cpp
-@@ -362,7 +362,7 @@ SolverImpl::SolverRunStatus Z3SolverImpl::handleSolver
- __attribute__((unused))
- bool successfulEval =
- Z3_model_eval(builder->ctx, theModel, initial_read,
-- /*model_completion=*/Z3_TRUE, &arrayElementExpr);
-+ /*model_completion=*/true, &arrayElementExpr);
- assert(successfulEval && "Failed to evaluate model");
- Z3_inc_ref(builder->ctx, arrayElementExpr);
- assert(Z3_get_ast_kind(builder->ctx, arrayElementExpr) ==
-@@ -432,7 +432,7 @@ bool Z3SolverImpl::validateZ3Model(::Z3_solver &theSol
- __attribute__((unused))
- bool successfulEval =
- Z3_model_eval(builder->ctx, theModel, constraint,
-- /*model_completion=*/Z3_TRUE, &rawEvaluatedExpr);
-+ /*model_completion=*/true, &rawEvaluatedExpr);
- assert(successfulEval && "Failed to evaluate model");
-
- // Use handle to do ref-counting.
diff --git a/security/klee/pkg-plist b/security/klee/pkg-plist
index 4110da8a62da..e1d62ea8df7b 100644
--- a/security/klee/pkg-plist
+++ b/security/klee/pkg-plist
@@ -1,10 +1,10 @@
-bin/gen-bout
-bin/gen-random-bout
bin/kleaver
bin/klee
bin/klee-replay
bin/klee-stats
bin/klee-zesti
+bin/ktest-gen
+bin/ktest-randgen
bin/ktest-tool
include/klee/klee.h
%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Debug+Asserts.bca
@@ -55,5 +55,17 @@ lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Asserts.bca
lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Debug+Asserts.bca
lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Debug.bca
lib/klee/runtime/libkleeRuntimeKLEELibc64_Release.bca
+%%32BIT%%lib/klee/runtime/libkleeUBSan32_Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeUBSan32_Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeUBSan32_Release+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeUBSan32_Release+Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeUBSan32_Release+Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeUBSan32_Release.bca
+lib/klee/runtime/libkleeUBSan64_Debug+Asserts.bca
+lib/klee/runtime/libkleeUBSan64_Debug.bca
+lib/klee/runtime/libkleeUBSan64_Release+Asserts.bca
+lib/klee/runtime/libkleeUBSan64_Release+Debug+Asserts.bca
+lib/klee/runtime/libkleeUBSan64_Release+Debug.bca
+lib/klee/runtime/libkleeUBSan64_Release.bca
lib/libkleeRuntest.so
lib/libkleeRuntest.so.1.0