Use upstreamed patch for FUZZOLIC

2 files changed, 4 insertions, 57 deletions

diff --git a/loftix/fuzzing.scm b/loftix/fuzzing.scm
index 61c594d..4f6a26e 100644
--- a/loftix/fuzzing.scm
+++ b/loftix/fuzzing.scm
@@ -202,7 +202,7 @@ for a given bug, as a traditional greybox fuzzer does)."))))
 
 (define-public fuzzolic
   (let* ((base-name "fuzzolic")
-         (commit "0567365dcca1a9b2e1e3a31342e9c9fb7a4f7936")
+         (commit "cf4285aa08d1751fdf6824bfaaf75895055dc495")
          (revision "master")
          (version (git-version "0" revision commit))
          (base-source
@@ -214,7 +214,7 @@ for a given bug, as a traditional greybox fuzzer does)."))))
             (file-name (git-file-name base-name version))
             (sha256
              (base32
-              "0qbpvbq9lqh07b98aingkg2w9vn8w88g4g7zglcz8i6wm8bv6k99"))))
+              "0mi1jyc2p4ynbshscnyvgyxcy6hdaa3fw77j4c8bchw049kc4w3p"))))
          (description "FUZZOLIC is a concolic executor based on QEMU.
 
 It can instrument binary programs at runtime in order to build
@@ -298,8 +298,6 @@ fuzzolic-with-afl = 'fuzzolic.run_afl_fuzzolic:main'
                           "patches/fuzzolic-unbundle.patch"
                           ;; https://github.com/season-lab/fuzzolic/pull/13
                           "patches/fuzzolic-timeout-solver.patch"
-                          ;; https://github.com/season-lab/fuzzolic/pull/16
-                          "patches/fuzzolic-test-driver-include-libc.patch"
                           "patches/fuzzolic-test-fix-runner.patch"
                           "patches/fuzzolic-test-skip-nondeterministic.patch"))))
       (build-system pyproject-build-system)
@@ -309,8 +307,8 @@ fuzzolic-with-afl = 'fuzzolic.run_afl_fuzzolic:main'
                       (lambda* (#:key tests? #:allow-other-keys)
                         (when tests?
                           (invoke "make" "-C" "tests")
-                          (invoke "pytest" "-v" "tests/run.py" "--fuzzy")
-                          (invoke "pytest" "-v" "tests/run.py")))))))
+                          (invoke "pytest" "-vv" "tests/run.py" "--fuzzy")
+                          (invoke "pytest" "-vv" "tests/run.py")))))))
       (native-inputs (list python-flit-core python-pytest))
       (propagated-inputs (list aflplusplus
                                fuzzolic-showmap
diff --git a/patches/fuzzolic-test-driver-include-libc.patch b/patches/fuzzolic-test-driver-include-libc.patch
deleted file mode 100644
index cee7ffa..0000000
--- a/patches/fuzzolic-test-driver-include-libc.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 861d355ae75fc25108650b87a99caac9bdc31b70
-Author: Nguyễn Gia Phong <cnx@loang.net>
-Date:   2025-05-08 11:00:18 +0900
-
-    Fix test driver's missing includes
-
-diff --git a/tests/atoi.c b/tests/atoi.c
-index 06ba5eb9fa5a..0ca45b18a98a 100644
---- a/tests/atoi.c
-+++ b/tests/atoi.c
-@@ -1,3 +1,5 @@
-+#include <stdlib.h>
-+
- int atoi_check(const char* s)
- {
-     if (atoi(s) == 1234)
-diff --git a/tests/driver.c b/tests/driver.c
-index 184f9b2e5af3..7772f37b7ae1 100644
---- a/tests/driver.c
-+++ b/tests/driver.c
-@@ -1,6 +1,8 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdint.h>
-+#include <string.h>
-+#include <unistd.h>
- #include <assert.h>
- 
- int simple_if(uint32_t);
-diff --git a/tests/model_strcmp.c b/tests/model_strcmp.c
-index cd125bb2a0b3..91044a843dbf 100644
---- a/tests/model_strcmp.c
-+++ b/tests/model_strcmp.c
-@@ -1,5 +1,6 @@
- #include <unistd.h>
- #include <stdio.h>
-+#include <string.h>
- 
- int model_strcmp(const char* s1)
- {
-diff --git a/tests/model_strncmp.c b/tests/model_strncmp.c
-index 86d4482afe1a..ae783597268b 100644
---- a/tests/model_strncmp.c
-+++ b/tests/model_strncmp.c
-@@ -1,5 +1,6 @@
- #include <unistd.h>
- #include <stdio.h>
-+#include <string.h>
- 
- int model_strncmp(const char* s1)
- {