diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 456cc84efbaa..55cd35e0949e 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -37,13 +37,13 @@ let libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "4.32c"; + version = "4.34c"; src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; tag = "v${version}"; - hash = "sha256-Fhf7dHyHd8IGXq7t1y9TwN9VN8SckLRkgfGGMvmqIqk="; + hash = "sha256-ymHt746cuZ+jyWs0vB3R1qNgpgAu6pUVXp9/g9Km9JI="; }; enableParallelBuilding = true; @@ -81,7 +81,8 @@ let --replace-fail "CLANG_BIN" '"${clang}/bin/clang"' \ --replace-fail '"gcc"' '"${gcc}/bin/gcc"' \ --replace-fail '"g++"' '"${gcc}/bin/g++"' \ - --replace-fail 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" + --replace-fail 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" \ + --replace-fail '#ifndef "${clang}/bin/clang"' '#ifndef CLANG_BIN' substituteInPlace src/afl-ld-lto.c \ --replace-fail 'LLVM_BINDIR' '"/nixpkgs-patched-does-not-exist"' diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 515738fa163d..cc9d54e37a8c 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -25,10 +25,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "AFLplusplus"; repo = "qemuafl"; - # Use a fixed qemuafl version instead of the one in https://github.com/AFLplusplus/AFLplusplus/blob/v4.31c/qemu_mode/QEMUAFL_VERSION. - # See: https://github.com/AFLplusplus/AFLplusplus/issues/2296. - rev = "ef1cd9a8cb1522c918faab42805216f9a4054dda"; - hash = "sha256-tbKDnDoBtFhvtE9nbi9XuHPuFuGezUFngnw4pJyKFgY="; + rev = "0732e079ed3716ef0b81e708cd9dcd372238a07f"; + hash = "sha256-YoMHnJuyOdGcFVrY0I0Oja0qKNKdAa25RByVB5ui2do="; fetchSubmodules = true; };