[bug#62666] [PATCH v2 1/3] gnu: Add aflplusplus.

[bug#62666] [PATCH v2 1/3] gnu: Add aflplusplus.

[Denis 'GNUtoo' Carikli]

* gnu/packages/debug.scm (aflplusplus): New variable.
---
ChangeLog:
- Updated to 4.08c
---
 gnu/packages/debug.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index e2a29a3ae9..cd1eccbd7b 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -459,6 +459,37 @@ (define-public qemu-for-american-fuzzy-lop
     ;; Several tests fail on MIPS.
     (supported-systems (delete "mips64el-linux" %supported-systems))))))
 
+(define-public aflplusplus
+  (package
+    (inherit american-fuzzy-lop)
+    (name "aflplusplus")
+    (version "4.08c")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/AFLplusplus/AFLplusplus")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "01hxj65if6rkjrj1fqcgq0jl95dirhkn00mi2k65mff6bckaamxg"))))
+    (inputs (list qemu))
+    (home-page "https://aflplus.plus")
+    (description
+     "AFLplusplus is a security-oriented fuzzer that employs a novel type of
+compile-time instrumentation and genetic algorithms to automatically discover
+clean, interesting test cases that trigger new internal states in the targeted
+binary.  This substantially improves the functional coverage for the fuzzed
+code.  The compact synthesized corpora produced by the tool are also useful
+for seeding other, more labor- or resource-intensive testing regimes down the
+road.  It is a fork of American Fuzzy Lop fuzzer and compared to it:
+@itemize
+@item It Supports a more recent qemu version
+@item It supports more algorithms like collision-free coverage, enhanced
+laf-intel & redqueen, AFLfast++ power schedules, MOpt mutators, unicorn_mode,
+etc.
+@end itemize")))
+
 (define-public stress-make
   (let ((commit "97815bed8060de33952475b3498767c91f59ffd9")
         (revision "2"))                 ;No official source distribution
-- 
2.41.0

[bug#62666] [PATCH v2 2/3] gnu: aflplusplus: Add python support

[Denis 'GNUtoo' Carikli]

* gnu/packages/debug.scm (aflplusplus): [inputs]: Add python.
---
ChangeLog: no changes
---
 gnu/packages/debug.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index cd1eccbd7b..04458d0220 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -473,7 +473,7 @@ (define-public aflplusplus
               (sha256
                (base32
                 "01hxj65if6rkjrj1fqcgq0jl95dirhkn00mi2k65mff6bckaamxg"))))
-    (inputs (list qemu))
+    (inputs (list python qemu))
     (home-page "https://aflplus.plus")
     (description
      "AFLplusplus is a security-oriented fuzzer that employs a novel type of
-- 
2.41.0

[bug#62666] [PATCH v2 3/3] gnu: aflplusplus: Build afl-gcc/g++-fast

[Denis 'GNUtoo' Carikli]

* gnu/packages/debug.scm (aflplusplus): [inputs]: Add gcc, gmp.
---
ChangeLog: New patch
---
 gnu/packages/debug.scm | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 04458d0220..c9fdca8c8b 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages debug)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
@@ -59,6 +60,7 @@ (define-module (gnu packages debug)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ninja)
   #:use-module (gnu packages perl)
@@ -473,7 +475,35 @@ (define-public aflplusplus
               (sha256
                (base32
                 "01hxj65if6rkjrj1fqcgq0jl95dirhkn00mi2k65mff6bckaamxg"))))
-    (inputs (list python qemu))
+    (arguments
+     (substitute-keyword-arguments (package-arguments american-fuzzy-lop)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           ;; TODO: Enable to cross compile aflplusplus by also enabling qemu
+           ;; to be cross compiled and by fixing the use-build-gcc phase below.
+           (add-before 'build 'use-build-gcc
+             (lambda _
+               ;; We need to patch it to select the build-time gcc else we get
+               ;; something like that:
+               ;; $ afl-gcc-fast main.c
+               ;; afl-cc++4.08c by [...] - mode: GCC_PLUGIN-DEFAULT
+               ;; cc1: error: cannot load plugin
+               ;; /gnu/[...]-aflplusplus-4.08c/bin/../lib/afl//afl-gcc-pass.so:
+               ;; /gnu/[...]-aflplusplus-4.08c/bin/../lib/afl//afl-gcc-pass.so:
+               ;; undefined symbol:
+               ;; _Z30gimple_build_call_internal_vec11internal_fn3vecIP9tree_node7va_heap6vl_ptrE
+               (substitute* "src/afl-cc.c"
+                 (("alt_cc = \"gcc\";")
+                  (string-append "alt_cc = \""
+                                 (which "gcc") "\";"))
+                 (("alt_cxx = \"g\\+\\+\";")
+                  (string-append "alt_cxx = \""
+                                 (which "g++") "\";")))))))))
+    ;; afl-gcc and g++-fast require gcc and gmp. The gcc-11 input is used
+    ;; instead of gcc because in the Dockerfile inside aflplusplus source code
+    ;; has the following comment: "GCC 12 is producing compile errors for some
+    ;; targets so we stay at GCC 11".
+    (inputs (list gcc-11 gmp python qemu))
     (home-page "https://aflplus.plus")
     (description
      "AFLplusplus is a security-oriented fuzzer that employs a novel type of
-- 
2.41.0