From 87987928a056812b422f6c4feda5d5b5aa99553e Mon Sep 17 00:00:00 2001 From: ekzyis Date: Tue, 2 Jun 2026 12:02:17 +0200 Subject: [PATCH] aflplusplus: 4.35c -> 4.40c --- .../security/aflplusplus/aflpp-v4.40c.patch | 14 +++++++++++++ pkgs/tools/security/aflplusplus/default.nix | 20 ++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 pkgs/tools/security/aflplusplus/aflpp-v4.40c.patch diff --git a/pkgs/tools/security/aflplusplus/aflpp-v4.40c.patch b/pkgs/tools/security/aflplusplus/aflpp-v4.40c.patch new file mode 100644 index 000000000000..c845e514db95 --- /dev/null +++ b/pkgs/tools/security/aflplusplus/aflpp-v4.40c.patch @@ -0,0 +1,14 @@ +diff --git a/test/test-all.sh b/test/test-all.sh +index 2a47b21e..a45ca580 100755 +--- a/test/test-all.sh ++++ b/test/test-all.sh +@@ -15,7 +15,8 @@ for script in test-*.sh; do + # Skip exclusions + if [ "$script" = "test-pre.sh" ] || \ + [ "$script" = "test-post.sh" ] || \ +- [ "$script" = "test-all.sh" ]; then ++ [ "$script" = "test-all.sh" ] || \ ++ [ "$script" = "test-performance.sh" ]; then + continue + fi + diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 9e92be083985..924944735cb6 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -53,7 +53,7 @@ let aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "4.35c"; + version = "4.40c"; src = fetchFromGitHub { owner = "AFLplusplus"; @@ -61,9 +61,9 @@ let tag = "v${version}"; hash = if withNyx then - "sha256-srHrYPEb0UAP/G9cOxJOZ9D6v9pxqez28suPsa70E2M=" + "sha256-901rJfuMZvgUpQ6zzboa7lu9yhSyX+0u+HUk8oGsqgo=" else - "sha256-j5YH39JKcjYuDqyl+KRMtgn3UoeWEW1z7m4ysf2uilc="; + "sha256-QtGazGShjybvjOONoWjqSg/c+l5sPpaFuuTI2S85YQM="; fetchSubmodules = withNyx; }; @@ -89,10 +89,16 @@ let # warning: "_FORTIFY_SOURCE" redefined hardeningDisable = [ "fortify" ]; - # We build nyx mode dependencies ourselves, so this patch skips - # build_nyx_support.sh in the aflplusplus source code. It also skips - # test-nyx-mode.sh because we can't test nyx mode in the sandbox. - patches = lib.optional withNyx ./nyx_mode/nyx_mode.patch; + patches = [ + # skip performance test: it's skipped anyway, but exits with code 1 + ./aflpp-v4.40c.patch + ] + ++ lib.optionals withNyx [ + # We build nyx mode dependencies ourselves, so this patch skips + # build_nyx_support.sh in the aflplusplus source code. It also skips + # test-nyx-mode.sh because we can't test nyx mode in the sandbox. + ./nyx_mode/nyx_mode.patch + ]; postPatch = '' # Don't care about this. rm Android.bp