From nobody Tue Jun 20 18:54:53 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlwmY4Sfkz4g4CP; Tue, 20 Jun 2023 18:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlwmY3yqSz3MVc; Tue, 20 Jun 2023 18:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687287293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNXCsDZ7ni/6QEgXfbEAgRmREoF2nyi//sEQ+ZLvvNE=; b=OOgwWHhiXkj4CWCqsxJxIorOJhf6d25oBknfqVE+Ww+86jwU39Yn9/0mxrseqL+M0FoPvf louFyXpnJ9/v3OS7pO7TzWWJOUhW4sI+dRp3/lBbhjP0aQ5XVEECy/rH8VnIrHZibZmdmi axdnxTsAnW6wgJlTe5R10NuB2/0yWfqiX7475x5t5kuwA9zBliAgeZGGyvEID5IDkVlmXC WSvGCx5DWo6tjFVw2MktkvYLDaTbPrOfuyK6xRlYWPu5MonXfJV579lQCXBGLzSvwD6BJB YmVXPsYm9YDZXfmV9Dm4oaX7tA4Zo06c5LjBP7Mns8hnRfK9yGwEZFglqUzmsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687287293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNXCsDZ7ni/6QEgXfbEAgRmREoF2nyi//sEQ+ZLvvNE=; b=qpqgV9NCqrmFB+xbXsrv/JKPx9JsW98BKlpLFZhiAkSupAp2TVdPMLWZ1GUhMqI/u3FppA 1ZtvKnTf+XIi2Afn26FCwtHf2fkmFrPHIfM9YmGF7/yNxj9Z5Bc1b/JtHT/q+4m11XYLSk FnKNmAvvdXJ/axN1twUiMkQfnE/lVJAhOru0yjQNyIm4wApVRCZLKOY4xrGhZFPo7v1CMo KHxMZ/tFyQa8EffLV1aTvrNXJfoap7Au9J1jIWMOKpYHDy/DrNx31ZZqxoDTQ8CSl8/Boi v/FqB8v9CS3TvLlFTwZkZYEVOxByZdyoPB3WrG3uCPRjc+ERkfEGxMGQcYmv0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687287293; a=rsa-sha256; cv=none; b=Ayjrt5qkt8etWMbUK8XqDPNuQ1ftXf40NcIEPKfVSsXM4xvnCtb6a9nYQxT7XNA59JlHcW 4nr0zznQvf5rLDlTwNRN5mf4gqcUONUkjiB5CO+whliOet/zfkWv9wtvfKnkpT/r416F6c vrCSyGk/NM3vzmP4gg0BcmkMPJI0GQNOrC2A3owhcBK+DinONJ5bGwaLGFpVwDpBH43FPK I/uVXbYFnS21hF3VheOXAEZboJrZYRQOIuGZpAGtc5IWZPazJp9AOCfFgWT2AnbEnQ0lgi l1yjOAo5Ri0dttwOpvmy6v+ZBDCA7AJ/RIJ1GeSzqDa3JEMR3QRigweXeS4Q5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QlwmY33kPz19vL; Tue, 20 Jun 2023 18:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KIsre3091795; Tue, 20 Jun 2023 18:54:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KIsr7D091794; Tue, 20 Jun 2023 18:54:53 GMT (envelope-from git) Date: Tue, 20 Jun 2023 18:54:53 GMT Message-Id: <202306201854.35KIsr7D091794@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 4b1ed03b1a8f - main - security/klee: Update to 3.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b1ed03b1a8f5a6d15c9e91789cf28e0cd6d8687 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b1ed03b1a8f5a6d15c9e91789cf28e0cd6d8687 commit 4b1ed03b1a8f5a6d15c9e91789cf28e0cd6d8687 Author: Gleb Popov AuthorDate: 2023-06-20 18:54:18 +0000 Commit: Gleb Popov 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