aflplusplus: 4.21c -> 4.31c (#380929)

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.21c";
+    version = "4.31c";
 
     src = fetchFromGitHub {
       owner = "AFLplusplus";
       repo = "AFLplusplus";
       tag = "v${version}";
-      hash = "sha256-DKwPRxSO+JEJYWLldnfrAYqzwqukNzrbo4R5FzJqzzg=";
+      hash = "sha256-O3NPtQaxcRRFE6H7O6JTsmQsO+iEl8eQxHGKtc+1g8w=";
     };
 
     enableParallelBuilding = true;
@@ -209,6 +209,7 @@ let
       maintainers = with lib.maintainers; [
         ris
         mindavi
+        msanft
       ];
     };
   };

pkgs/tools/security/aflplusplus/libdislocator.nix

@@ -35,6 +35,9 @@ stdenv.mkDerivation {
       several ways
     '';
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ris ];
+    maintainers = with lib.maintainers; [
+      ris
+      msanft
+    ];
   };
 }

pkgs/tools/security/aflplusplus/libtokencap.nix

@@ -31,6 +31,9 @@ stdenv.mkDerivation {
     homepage = "https://github.com/AFLplusplus/AFLplusplus";
     description = "strcmp & memcmp token capture library";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ris ];
+    maintainers = with lib.maintainers; [
+      ris
+      msanft
+    ];
   };
 }

pkgs/tools/security/aflplusplus/qemu.nix

@@ -25,9 +25,10 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "AFLplusplus";
     repo = "qemuafl";
-    # rev origin: https://github.com/AFLplusplus/AFLplusplus/blob/v4.21c/qemu_mode/QEMUAFL_VERSION
-    rev = "a6f0632a65e101e680dd72643a6128dd180dff72";
-    sha256 = "sha256-4kaQA5KDUqkK+fbjHg47lxZHRN8JrfSC2zdjrbMbDPo=";
+    # 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=";
     fetchSubmodules = true;
   };
 
@@ -139,7 +140,10 @@ stdenv.mkDerivation {
     homepage = "https://github.com/AFLplusplus/qemuafl";
     description = "Fork of QEMU with AFL++ instrumentation support";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ris ];
+    maintainers = with lib.maintainers; [
+      ris
+      msanft
+    ];
     platforms = lib.platforms.linux;
   };
 }