From patchwork Thu Mar 28 19:20:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 62344 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2C5BF27BBE9; Thu, 28 Mar 2024 19:22:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B73E127BBE2 for ; Thu, 28 Mar 2024 19:22:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpvK7-0007mB-Ni; Thu, 28 Mar 2024 15:22:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpvK5-0007lR-UR for guix-patches@gnu.org; Thu, 28 Mar 2024 15:22:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpvK5-0000wt-MT for guix-patches@gnu.org; Thu, 28 Mar 2024 15:22:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpvK6-00082k-76 for guix-patches@gnu.org; Thu, 28 Mar 2024 15:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68296] [PATCH v4 1/2] gnu: Add klee-uclibc. References: <890dc6595ccef88cb60ff0a380be9d323df479aa.1704573641.git.soeren@soeren-tempel.net> In-Reply-To: <890dc6595ccef88cb60ff0a380be9d323df479aa.1704573641.git.soeren@soeren-tempel.net> Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 19:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68296 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68296@debbugs.gnu.org Cc: julien@lepiller.eu Received: via spool by 68296-submit@debbugs.gnu.org id=B68296.171165366230759 (code B ref 68296); Thu, 28 Mar 2024 19:22:02 +0000 Received: (at 68296) by debbugs.gnu.org; 28 Mar 2024 19:21:02 +0000 Received: from localhost ([127.0.0.1]:41176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpvJ7-0007zo-Mk for submit@debbugs.gnu.org; Thu, 28 Mar 2024 15:21:02 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:35282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpvJ3-0007zL-QU; Thu, 28 Mar 2024 15:21:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=kmjPTAzh 5tGvtj+vgxow9t787ukGifhJBvwBBxP93V4=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=zsBKF5rvtoipfStWyhbiwCEz0eU8a9WlkFWvWWhq3nrorfq OD13PcU5PTPD4oPYRR9uki1Xl3duqkFN+MP1XLdUUTTCH0fzLfbOWm3XrgfowXPQh08Q1v YifkDi/jyzIlY0IxnPDHgol8LSWT5hL5czgMIOU1huZ+T+y7FkgAhY= Received: from localhost (dynamic-2a02-3102-49da-001b-e01a-5b4b-a2ca-2e2f.310.pool.telefonica.de [2a02:3102:49da:1b:e01a:5b4b:a2ca:2e2f]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 6c6d7a50 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 28 Mar 2024 20:20:54 +0100 (CET) From: soeren@soeren-tempel.net Date: Thu, 28 Mar 2024 20:20:18 +0100 Message-ID: X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/check.scm (klee-uclibc): New variable. Signed-off-by: Sören Tempel --- Change since v3: Resolve merge conflict, update KLEE website. gnu/packages/check.scm | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) base-commit: daab3da5042a5803ffa13ee759b3f8895dd92de4 diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7fd28c3ac7..9beba88788 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2024 Giacomo Leidi ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Navid Afkhami +;;; Copyright © 2024 Sören Tempel ;;; ;;; This file is part of GNU Guix. ;;; @@ -84,6 +85,7 @@ (define-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -3705,3 +3707,63 @@ (define-public subunit command line filters to process a subunit stream and language bindings for Python, C, C++ and shell. Bindings are easy to write for other languages.") (license (list license:asl2.0 license:bsd-3)))) ;user can pick + +(define-public klee-uclibc + (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) + (package + (name "klee-uclibc") + (version (git-version "20230612" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee-uclibc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) + (build-system gnu-build-system) + ;; Only x86_64 is presently supported by KLEE upstream. + (supported-systems '("x86_64-linux")) + (arguments + `(#:tests? #f ;upstream uClibc tests do not work in the fork + #:phases (modify-phases %standard-phases + ;; Disable locales as these would have to be downloaded and + ;; shouldn't really be needed for symbolic execution either. + (add-after 'unpack 'patch-config + (lambda _ + (substitute* "klee-premade-configs/x86_64/config" + (("UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_HAS_LOCALE=y") + "UCLIBC_HAS_LOCALE=n") + (("UCLIBC_HAS_XLOCALE=y") + "UCLIBC_HAS_XLOCALE=n")))) + + ;; Upstream uses a custom non-GNU configure script written + ;; in Python, replace the default configure phase accordingly. + (replace 'configure + (lambda _ + (invoke "./configure" + "--make-llvm-lib" + "--enable-release"))) + + ;; Custom install phase to only install the libc.a file manually. + ;; This is the only file which is used/needed by KLEE itself. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "lib/libc.a" + (string-append (assoc-ref outputs "out") + "/lib"))))))) + (inputs (list clang-toolchain-13)) + ;; ncurses is only needed for the `make menuconfig` interface. + (native-inputs (list python ncurses)) + (synopsis "Variant of uClibc tailored to symbolic execution") + (description + "Modified version of uClibc for symbolic execution of +Unix userland software. This library can only be used in conjunction +with the @code{klee} package.") + (home-page "https://klee-se.org/") + (license license:lgpl2.1)))) From patchwork Thu Mar 28 19:20:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 62343 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0DD4427BBEA; Thu, 28 Mar 2024 19:22:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F3C0C27BBE2 for ; Thu, 28 Mar 2024 19:22:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpvK8-0007mD-0G; Thu, 28 Mar 2024 15:22:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpvK6-0007lY-4j for guix-patches@gnu.org; Thu, 28 Mar 2024 15:22:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpvK5-0000x0-Sz for guix-patches@gnu.org; Thu, 28 Mar 2024 15:22:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpvK6-00082r-N6 for guix-patches@gnu.org; Thu, 28 Mar 2024 15:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68296] [PATCH v4 2/2] gnu: Add klee. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 19:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68296 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68296@debbugs.gnu.org Cc: julien@lepiller.eu Received: via spool by 68296-submit@debbugs.gnu.org id=B68296.171165366630786 (code B ref 68296); Thu, 28 Mar 2024 19:22:02 +0000 Received: (at 68296) by debbugs.gnu.org; 28 Mar 2024 19:21:06 +0000 Received: from localhost ([127.0.0.1]:41178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpvJB-00080T-J4 for submit@debbugs.gnu.org; Thu, 28 Mar 2024 15:21:06 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:35282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpvJ6-0007zL-Cx; Thu, 28 Mar 2024 15:21:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=lDJEY/6A /R/B2hU2deaRrysHaPiLkwJLkvnWLxmFJnw=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=vNsZk1PWa7pTolUgmy8wT8sQD4/ 7qj7ir5F1nOn5x8DU+2TNsLUQ8CSWjiNNxVd2IB9PxEO14WQEZTFIgPfzGE5B9LSOha+Zp ErqeX8J673tKn+3g14M3c+zEUcOjW/6zLkE0SEc799f8e3SMx4hw5uG7cQekOe42O62Uip ++l8= Received: from localhost (dynamic-2a02-3102-49da-001b-e01a-5b4b-a2ca-2e2f.310.pool.telefonica.de [2a02:3102:49da:1b:e01a:5b4b:a2ca:2e2f]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 66014ca0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 28 Mar 2024 20:20:58 +0100 (CET) From: soeren@soeren-tempel.net Date: Thu, 28 Mar 2024 20:20:19 +0100 Message-ID: <375eabc4693b9416e53c58fead36e0b8d4dde25d.1711653619.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/check.scm (klee): New variable. Signed-off-by: Sören Tempel --- Change since v3: Update KLEE website. gnu/packages/check.scm | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9beba88788..f936bb12c1 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -76,6 +76,7 @@ (define-module (gnu packages check) #:use-module (gnu packages bash) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages glib) @@ -85,6 +86,7 @@ (define-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -94,6 +96,7 @@ (define-module (gnu packages check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages xml) @@ -3767,3 +3770,55 @@ (define-public klee-uclibc with the @code{klee} package.") (home-page "https://klee-se.org/") (license license:lgpl2.1)))) + +(define-public klee + (package + (name "klee") + (version "3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee") + (commit (string-append "v" version)))) + (sha256 + (base32 "0dj20nazkcq84ryr87dihvjznapsbl1n21sa8dhhnb0wsad5d6fb")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + ;; Only x86_64 is presently supported by KLEE upstream. + (supported-systems '("x86_64-linux")) + (arguments + `(#:test-target "systemtests" + ;; Default build type (RelWithDebInfo) causes an internal error + ;; in clang while compiling KLEE, hence use a different build type. + #:build-type "Release" + #:strip-directories '("bin") + #:configure-flags ,#~(list "-DENABLE_KLEE_ASSERTS=OFF" + "-DENABLE_TCMALLOC=ON" + "-DENABLE_POSIX_RUNTIME=ON" + (string-append "-DKLEE_UCLIBC_PATH=" + #$klee-uclibc)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-lit-config + (lambda _ + ;; Make sure that we retain the value of the GUIX_PYTHONPATH + ;; environment variable in the test environmented created by + ;; python-lit. Otherwise, the test scripts won't be able to + ;; find the python-tabulate dependency, causing test failures. + (substitute* "test/lit.cfg" + (("addEnv\\('PWD'\\)" env) + (string-append env "\n" "addEnv('GUIX_PYTHONPATH')")))))))) + ;; KLEE operates on LLVM IR generated by a specific toolchain version. + ;; Propergate the toolchain to allow users to transform code to this version. + (propagated-inputs (list clang-toolchain-13 llvm-13 python python-tabulate)) + (inputs (list z3 gperftools sqlite)) + (native-inputs (list python-lit)) + (synopsis + "Symbolic execution engine built on top of the LLVM compiler infastructure") + (description + "Dynamic symbolic execution engine built on top of +LLVM. Symbolic execution is an automated software testing technique, +KLEE leverage this technique to automatically generate test cases for +software compiled to LLVM IR.") + (home-page "https://klee-se.org/") + (license (list license:expat license:bsd-4))))