diff --git a/REUSE.toml b/REUSE.toml
index 7913335..dd7cd6f 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -177,8 +177,7 @@ path = [ 'patches/afl++-*.patch',
'patches/fuzzolic-test-skip-nondeterministic.patch',
'patches/fuzzolic-unbundle.patch',
'patches/fuzzolic-utils-make.patch',
- 'patches/jasper-no-define-int-types.patch',
- 'patches/qemu-for-fuzzolic-static-global.patch' ]
+ 'patches/jasper-no-define-int-types.patch' ]
SPDX-FileCopyrightText = 'Nguyễn Gia Phong'
SPDX-License-Identifier = 'GPL-3.0-or-later'
@@ -205,11 +204,6 @@ SPDX-FileCopyrightText = 'Emilio Coppa'
SPDX-License-Identifier = 'GPL-2.0-or-later'
[[annotations]]
-path = 'patches/fuzzolic-timeout-solver.patch'
-SPDX-FileCopyrightText = 'Andrew Haberlandt'
-SPDX-License-Identifier = 'GPL-2.0-or-later'
-
-[[annotations]]
# https://src.fedoraproject.org/rpms/ming/c/c6f24aedb4f66c5b3167b75bebc55b14fd6b5248
path = 'patches/libming-parallel-make.patch'
SPDX-FileCopyrightText = 'Dominik Mierzejewski'
diff --git a/loftix/emulation.scm b/loftix/emulation.scm
index 770eb15..df369a2 100644
--- a/loftix/emulation.scm
+++ b/loftix/emulation.scm
@@ -81,8 +81,8 @@
(define-public qemu-for-fuzzolic
(let ((base qemu-minimal)
(base-version "4.1.1")
- (commit "a07b82d618b0ed16d7bf1822653a74821cf13dbd")
- (revision "symbolic"))
+ (commit "5dd13fc54ade8ebeedfddf10a98dd2d672467bfd")
+ (revision "0"))
(hidden-package
(package
(inherit base)
@@ -104,11 +104,10 @@
(uri (string-append home-page "/compare/v" base-version
".." commit ".diff"))
(sha256
- (base32 "1cqp0h0glz4pvq10lr7k9z5g9wjl6svlm51rapf3mbsvb1qy3rl1"))
+ (base32 "0z36g2qq0ssqhhcqdzd03wqf21rbpvwwkzz545il32yh8wgdznib"))
(file-name (string-append name ".patch")))
(search-patches
- "patches/qemu-for-fuzzolic-test-opts-range-beyond.patch"
- "patches/qemu-for-fuzzolic-static-global.patch")))))
+ "patches/qemu-for-fuzzolic-test-opts-range-beyond.patch")))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:configure-flags _ #~'())
diff --git a/loftix/fuzzing.scm b/loftix/fuzzing.scm
index 1016688..d66905d 100644
--- a/loftix/fuzzing.scm
+++ b/loftix/fuzzing.scm
@@ -217,8 +217,8 @@ for a given bug, as a traditional greybox fuzzer does)."))))
(define-public fuzzolic
(let* ((base-name "fuzzolic")
- (commit "cf4285aa08d1751fdf6824bfaaf75895055dc495")
- (revision "master")
+ (commit "39937821d5360b139f026f09e2019f214a4929c1")
+ (revision "0")
(version (git-version "0" revision commit))
(base-source
(origin
@@ -229,7 +229,7 @@ for a given bug, as a traditional greybox fuzzer does)."))))
(file-name (git-file-name base-name version))
(sha256
(base32
- "0mi1jyc2p4ynbshscnyvgyxcy6hdaa3fw77j4c8bchw049kc4w3p"))))
+ "0wh452qzia97i34hvxjj8x38wb9h6x51zsjkzdvpfpj5zbpdv495"))))
(description "FUZZOLIC is a concolic executor based on QEMU.
It can instrument binary programs at runtime in order to build
@@ -311,8 +311,6 @@ fuzzolic-with-afl = 'fuzzolic.run_afl_fuzzolic:main'
(patches (search-patches
"patches/fuzzolic-python-package.patch"
"patches/fuzzolic-unbundle.patch"
- ;; https://github.com/season-lab/fuzzolic/pull/13
- "patches/fuzzolic-timeout-solver.patch"
"patches/fuzzolic-relax-perf-test.patch"
"patches/fuzzolic-test-fix-runner.patch"
"patches/fuzzolic-test-skip-nondeterministic.patch"))))
diff --git a/patches/fuzzolic-timeout-solver.patch b/patches/fuzzolic-timeout-solver.patch
deleted file mode 100644
index 95b971b..0000000
--- a/patches/fuzzolic-timeout-solver.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f06525aaf9790b0eecef317e4aaf444189e6042b Mon Sep 17 00:00:00 2001
-From: Andrew Haberlandt <ahaberla@andrew.cmu.edu>
-Date: Sun, 19 May 2024 06:46:05 +0000
-Subject: [PATCH] fix: executor fails to kill solver if it hangs
-
----
- fuzzolic/executor.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fuzzolic/executor.py b/fuzzolic/executor.py
-index 39c6aa6..e660314 100644
---- a/fuzzolic/executor.py
-+++ b/fuzzolic/executor.py
-@@ -449,7 +449,7 @@ def fuzz_one(self, testcase, target, force_smt=False):
- print('[FUZZOLIC] Solver is taking too long. Let us stop it.')
- p_solver.send_signal(signal.SIGUSR2)
- try:
-- p_solver.wait(SOLVER_TIMEOUT)
-+ p_solver.wait(SOLVER_TIMEOUT / 1000)
- except subprocess.TimeoutExpired:
- print('[FUZZOLIC] Solver will be killed.')
- p_solver.send_signal(signal.SIGKILL)
diff --git a/patches/qemu-for-fuzzolic-static-global.patch b/patches/qemu-for-fuzzolic-static-global.patch
deleted file mode 100644
index 0cb52af..0000000
--- a/patches/qemu-for-fuzzolic-static-global.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit a0646eac1b56e4df51e7c6d2e99cb8807c59a1a3
-Author: Nguyễn Gia Phong <cnx@loang.net>
-Date: 2025-04-30 12:10:05 +0900
-
- Avoid global variable in header
-
- Such global would be defined in each compilation unit including the header,
- preventing them from being linked together.
-
-diff --git a/tcg/symbolic/symbolic-struct.h b/tcg/symbolic/symbolic-struct.h
-index 350522935bf9..684d32acfebd 100644
---- a/tcg/symbolic/symbolic-struct.h
-+++ b/tcg/symbolic/symbolic-struct.h
-@@ -503,9 +503,9 @@ static inline size_t get_opkind_width(OPKIND opkind)
- }
-
- #define MAX_PRINT_CHECK (1024 * 1024)
--uint8_t printed[MAX_PRINT_CHECK];
- static inline void print_expr_internal(Expr* expr, uint8_t reset)
- {
-+ static uint8_t printed[MAX_PRINT_CHECK];
- if (reset)
- for (size_t i = 0; i < MAX_PRINT_CHECK; i++)
- printed[i] = 0;
|
