From nobody Wed Feb 15 17:27:53 2023 X-Original-To: dev-commits-ports-all@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 4PH4lt0SbPz3qbQL; Wed, 15 Feb 2023 17:27:54 +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 4PH4ls70fNz3xyx; Wed, 15 Feb 2023 17:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676482074; 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=m7KvtgCXlCQtse/iPE4MuojfmPWWSGSL4f3VnosGiJQ=; b=o5YmoGvPqY8/KWZg2QMAwkdn7k6u61Uj0lz9BmEGgssvG9dcR4Yg1VQPVTaql1wTc69QY7 IeNl2oTR9/P6UDsgpMosIY2kb3j82LH/dVBxujlb94gVsEg3u14JJGFvUQYIqT+l/Q4DLy +XjsiAHIdQK9+kkYklZHj8SUg81Zjso3A+4kIwVmSi1TLNu9F3Orrys9JO3MOfxaSoRITU KxA3uQ2Mj6V1BKwXENsEScwRNilrKxUciTyljz6MibzW7n9R90m8jQ5dXAfIVwYOffMphI MPeLj8VYDho6xYFLEeqhIqWdaxdU40zkjRfo9NfMJa1h1UvsxYRne+uoV7PuXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676482074; 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=m7KvtgCXlCQtse/iPE4MuojfmPWWSGSL4f3VnosGiJQ=; b=A4o+pYb3vVPeaZXzUcxxaoSS65QAo1EKNpxshX9HVi7gPpA8oeBMOAZvTr1XfaVtFvZYHl SRrAVmTotct470eGfOuVkmVahGHa9Gd4TRDEYkqLUxUDxhtPAhQ12XuhobcLqcXjSNJS8b okPczAqgfATGSnm43FyLMG7Wj2wZJJ7i0snk3h+lC61Lcv2wngffQ4DlQFNe5RGu4PNvvm L/Nwe289zprpnDrzyX/UvES2yLxXfS06GyHYPqS9DMTCXWOn5YsbUuoWpnfbhxelu3yyND z7WofKz2RZp7DD9F4TXb18P40+CBXPTgiDggrpSYDpC0kdplkX9WRDAnVDIgiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676482074; a=rsa-sha256; cv=none; b=LKU08v8lyhnDkKGyA43wgoMWuUC+UTsb3cb9rghF66IRIshmSaMVEk8RY3qc75rCCCvVZs nzGWf3bEQIR7vJd3vI7QOLXHf3iWeEkl6dDP/YJ2aEd1V85ZRou0OYHhr3C8XY81FQS8KT c9RRDFYShyX3A8TBOdQXyjAlCy9N1YPLbl936RYQS6h8fPKI2SvUeTuLweh2+Y4X7uK6HT QctkxyFwUJTdDD//L6dZiCdg3amBFjoKo0qA7O+QeKyOApXhiw6apWKoUGhdcUNxjB+BDn 7xviiHF/eYvOWNZWbnqE1i0fmAr+R8dsUtemryJ4UgMxzi6z1MofUepbbg69qA== 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 4PH4ls5y9rzXB5; Wed, 15 Feb 2023 17:27: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 31FHRrrA061058; Wed, 15 Feb 2023 17:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31FHRrhH061057; Wed, 15 Feb 2023 17:27:53 GMT (envelope-from git) Date: Wed, 15 Feb 2023 17:27:53 GMT Message-Id: <202302151727.31FHRrhH061057@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: dfb6785c8be5 - main - security/klee: Unbreak after math/z3 update. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: dfb6785c8be5bbc2819f5cc103f2a6aae4bd3c22 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfb6785c8be5bbc2819f5cc103f2a6aae4bd3c22 commit dfb6785c8be5bbc2819f5cc103f2a6aae4bd3c22 Author: Gleb Popov AuthorDate: 2023-02-15 17:27:10 +0000 Commit: Gleb Popov CommitDate: 2023-02-15 17:27:42 +0000 security/klee: Unbreak after math/z3 update. Reported by: pkg-fallout --- security/klee/files/patch-lib_Solver_Z3Solver.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/security/klee/files/patch-lib_Solver_Z3Solver.cpp b/security/klee/files/patch-lib_Solver_Z3Solver.cpp new file mode 100644 index 000000000000..6b94b085cead --- /dev/null +++ b/security/klee/files/patch-lib_Solver_Z3Solver.cpp @@ -0,0 +1,20 @@ +--- 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.