From nobody Mon Oct 28 10:05:12 2024 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 4XcTXS5cw6z5b9GD; Mon, 28 Oct 2024 10:05:12 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XcTXS4V5xz4G0x; Mon, 28 Oct 2024 10:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730109912; 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=K9p+99h6P43W+CtXArIQ8UfFn1VjSzPnJk4TppcMJ3o=; b=FQ7hkzuA4M+7Um31E2eZfUYOmvEOS68j8bRf3cNHp3D5IZRL0tZHAdFGEDeSz4d03C7KRG 37bM7kGdrkOCU0+cxWB676/Nj2uqzh3+v8kdUROuqfx+4M8EFkTXxTba6qiCHPLiuNfm/Z nPE6wqIQCdqYn59KTgF4Sd15xqiNaIzqi9bvRgOjWAiZJBAw+KcOTAelJ3meHINmsLhB7g UaUL1HFs75pvnzuO68kKWe4EtXMc6IZWzxYzwSfzfDmIsq5/sePK8WZ6KquqTji3hDSZJ0 rp+mHdDQb7T5E0XGInZ2mbD/Wlf7sVXNwEiFGmEcdGctIa09fLMYGUoOZ+Tzog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730109912; 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=K9p+99h6P43W+CtXArIQ8UfFn1VjSzPnJk4TppcMJ3o=; b=GV1V04x+EdJjxueLQ0qbf4vyjCJzacGdNtUmFpBzwqyhGPA4FnbMYkni82vAe2B7n0LwbG Sik7Zs/0ScPc8jB/l+futPvrppXwKeCGWaQ19y20IODBm4uotNUloAktElIk6d0Rv8ZwjM mwOkAMGse3KSnnaSEyOTABFDFU9lwCFJWJ2nXEOnN3RodurZNoVuAmene0dQVKgKSOARzr d336JyUbY9o6vKpmibHRdmYtc70acH8OX0gPllPc96lO5RLgASM2JkJo4xIboKytMlZCyd akrk00gmVeVqo9zGnVEvfNbLKbHuEkTkyvfaDe05uOkKfP3cFotb8KuLePbEZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730109912; a=rsa-sha256; cv=none; b=epP4Fwg4/jOIUi+b3WWo7wNU6CyL36+gUFu6py9bDRFEvSyOQyUp/Kg0/huLd0SPpLaoGx gBL8VPyxD9PsNcsBYn+n92b+RRCJulaT2K6qPSmy/k8rC3SrdnJeZ+HtY9ZzjEbq/qd09w /UtnHEOxNwN3lb9/mL2IL+FAURckEGpf/A3DLgZ+6AQRVHI/qIsbvlQeayrFImYoFVBKEj NQGRYfFSP6GcXFfFgbFwhcVMmUJshq38bOZNGzscVthAqhvI6hPjhw1IKgAZHUn6YYfIRM pyzHUOzSzBEvaF0vayA2KOinsvjYpaV/6O2NXGcvmE3+ZZdpH01PZklGHlCaPA== 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 4XcTXS2FMBzZYc; Mon, 28 Oct 2024 10:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49SA5Cs0078591; Mon, 28 Oct 2024 10:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49SA5CYs078588; Mon, 28 Oct 2024 10:05:12 GMT (envelope-from git) Date: Mon, 28 Oct 2024 10:05:12 GMT Message-Id: <202410281005.49SA5CYs078588@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: f7383f1ff559 - main - devel/cbmc: update to 6.3.1 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7383f1ff55926327475489309e0522b60622b1c Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7383f1ff55926327475489309e0522b60622b1c commit f7383f1ff55926327475489309e0522b60622b1c Author: Olivier Cochard AuthorDate: 2024-10-28 10:03:27 +0000 Commit: Olivier Cochard CommitDate: 2024-10-28 10:04:33 +0000 devel/cbmc: update to 6.3.1 --- devel/cbmc/Makefile | 2 +- devel/cbmc/distinfo | 6 ++--- devel/cbmc/files/patch-src_common | 11 -------- .../files/patch-src_solvers_sat_external__sat.cpp | 13 ---------- devel/cbmc/files/patch-src_util_optional.h | 29 ---------------------- 5 files changed, 4 insertions(+), 57 deletions(-) diff --git a/devel/cbmc/Makefile b/devel/cbmc/Makefile index c7f7b3650e63..92743c0170be 100644 --- a/devel/cbmc/Makefile +++ b/devel/cbmc/Makefile @@ -1,5 +1,5 @@ PORTNAME= cbmc -PORTVERSION= 5.95.1 +PORTVERSION= 6.3.1 DISTVERSIONPREFIX= cbmc- CATEGORIES= devel MASTER_SITES= DEBIAN/pool/main/m/minisat2:minisat diff --git a/devel/cbmc/distinfo b/devel/cbmc/distinfo index f3e6d1161c6a..bff667f3f615 100644 --- a/devel/cbmc/distinfo +++ b/devel/cbmc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1706723199 +TIMESTAMP = 1730030005 SHA256 (minisat2_2.2.1.orig.tar.gz) = e54afa3c192c1753bc8075c0c7e126d5c495d9066e3f90a2588091149ac9ca40 SIZE (minisat2_2.2.1.orig.tar.gz) = 44229 -SHA256 (diffblue-cbmc-cbmc-5.95.1_GH0.tar.gz) = fdc1e862752430f8d069eb2f9c33dcd05078cf955bbc900e2cc840bcb01b3783 -SIZE (diffblue-cbmc-cbmc-5.95.1_GH0.tar.gz) = 9073428 +SHA256 (diffblue-cbmc-cbmc-6.3.1_GH0.tar.gz) = cc9183eff2046b41cae28c21e551184e5dbb8125b06c6043ceaceb44dd75886c +SIZE (diffblue-cbmc-cbmc-6.3.1_GH0.tar.gz) = 9120942 diff --git a/devel/cbmc/files/patch-src_common b/devel/cbmc/files/patch-src_common deleted file mode 100644 index 6944a39d7788..000000000000 --- a/devel/cbmc/files/patch-src_common +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common.orig 2024-02-01 00:44:35 UTC -+++ src/common -@@ -64,7 +64,7 @@ else ifeq ($(filter-out FreeBSD,$(BUILD_ENV_)),) - YFLAGS ?= -v - else ifeq ($(filter-out FreeBSD,$(BUILD_ENV_)),) - CP_CXXFLAGS += -- LINKLIB = ar rcT $@ $^ -+ LINKLIB = llvm-ar rcT $@ $^ - LINKBIN = $(CXX) $(LINKFLAGS) -o $@ -Wl,--start-group $^ -Wl,--end-group $(LIBS) - LINKNATIVE = $(HOSTCXX) $(HOSTLINKFLAGS) -o $@ $^ - ifeq ($(origin CC),default) diff --git a/devel/cbmc/files/patch-src_solvers_sat_external__sat.cpp b/devel/cbmc/files/patch-src_solvers_sat_external__sat.cpp deleted file mode 100644 index f0dd61cd9963..000000000000 --- a/devel/cbmc/files/patch-src_solvers_sat_external__sat.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/solvers/sat/external_sat.cpp.orig 2023-10-30 12:11:18 UTC -+++ src/solvers/sat/external_sat.cpp -@@ -119,8 +119,8 @@ external_satt::resultt external_satt::parse_result(std - { - try - { -- signed long long as_long = std::stol(assignment_string); -- size_t index = std::labs(as_long); -+ signed long long as_long = std::stoll(assignment_string); -+ size_t index = std::llabs(as_long); - - if(index >= number_of_variables) - { diff --git a/devel/cbmc/files/patch-src_util_optional.h b/devel/cbmc/files/patch-src_util_optional.h deleted file mode 100644 index 4507ce0ade2b..000000000000 --- a/devel/cbmc/files/patch-src_util_optional.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/util/optional.h.orig 2023-10-30 12:11:18 UTC -+++ src/util/optional.h -@@ -11,20 +11,20 @@ Author: Diffblue Ltd. - #define CPROVER_UTIL_OPTIONAL_H - - #if defined __clang__ -- #pragma clang diagnostic push ignore "-Wall" -- #pragma clang diagnostic push ignore "-Wpedantic" -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wall" -+ #pragma clang diagnostic ignored "-Wpedantic" - #elif defined __GNUC__ -- #pragma GCC diagnostic push ignore "-Wall" -- #pragma GCC diagnostic push ignore "-Wpedantic" -+ #pragma GCC diagnostic push -+ #pragma GCC diagnostic ignored "-Wall" -+ #pragma GCC diagnostic ignored "-Wpedantic" - #elif defined _MSC_VER - #pragma warning(push) - #endif - #include - #if defined __clang__ - #pragma clang diagnostic pop -- #pragma clang diagnostic pop - #elif defined __GNUC__ -- #pragma GCC diagnostic pop - #pragma GCC diagnostic pop - #elif defined _MSC_VER - #pragma warning(pop)