gnu: Remove qemu-for-american-fuzzy-lop.

* gnu/packages/debug.scm (qemu-for-american-fuzzy-lop): Delete variable.
* gnu/packages/patches/qemu-glibc-2.27.patch,
gnu/packages/patches/qemu-glibc-2.30.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Unregister patches.

Fixes: guix/guix#5668
Change-Id: I860b2c87fb203fc96b715514064c9a229cbc008b

4 files changed, 0 insertions, 266 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index e058536d31e..611c65cca42 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2243,8 +2243,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/qdigidoc-bundle-config-files.patch       \
   %D%/packages/patches/qdigidoc-bundle-tsl-files.patch          \
   %D%/packages/patches/qemu-build-info-manual.patch             \
-  %D%/packages/patches/qemu-glibc-2.27.patch                    \
-  %D%/packages/patches/qemu-glibc-2.30.patch                    \
   %D%/packages/patches/qemu-fix-agent-paths.patch               \
   %D%/packages/patches/qemu-fix-test-virtio-version.patch       \
   %D%/packages/patches/qemu-disable-aarch64-migration-test.patch        \
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 773da375596..9ccbf9bb9a3 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -303,158 +303,6 @@ and uses the same efficient LLVM-based C/C++ @code{clang_delta} reduction
 tool.")
     (license license:ncsa)))
 
-(define-public qemu-for-american-fuzzy-lop
-  ;; afl only supports using a single afl-qemu-trace executable, so
-  ;; we only build qemu for the native target.
-  (let ((machine (match (or (%current-target-system)
-                            (%current-system))
-                   ("x86_64-linux"   "x86_64")
-                   ("i686-linux"     "i386")
-                   ("aarch64-linux"  "aarch64")
-                   ("armhf-linux"    "arm")
-                   ("mips64el-linux" "mips64el")
-                   ("powerpc-linux"  "ppc")
-                   ;; Prevent errors when querying this package on unsupported
-                   ;; platforms, e.g. when running "guix package --search="
-                   (_                "UNSUPPORTED"))))
-  (hidden-package
-   (package
-    (name "qemu")
-    (version "2.10.2")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "https://download.qemu.org/qemu-"
-                                 version ".tar.xz"))
-             (sha256
-              (base32
-               "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw"))
-             (patches
-              (search-patches "qemu-glibc-2.27.patch"
-                              "qemu-glibc-2.30.patch"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(;; Running tests in parallel can occasionally lead to failures, like:
-       ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
-       #:parallel-tests? #f
-       #:configure-flags
-       (list (string-append "--target-list=" ,machine "-linux-user"))
-       #:make-flags '("V=1")
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key inputs outputs (configure-flags '())
-                           #:allow-other-keys)
-             ;; The `configure' script doesn't understand some of the
-             ;; GNU options.  Thus, add a new phase that's compatible.
-             (let ((out (assoc-ref outputs "out")))
-               (setenv "SHELL" (which "bash"))
-
-               ;; While we're at it, patch for tests.
-               (substitute* "tests/libqtest.c"
-                 (("/bin/sh") (which "sh")))
-
-               ;; The binaries need to be linked against -lrt.
-               (setenv "LDFLAGS" "-lrt")
-               (apply invoke
-                      `("./configure"
-                        ,(string-append "--cc=" (which "gcc"))
-                        ;; Some architectures insist on using HOST_CC
-                        ,(string-append "--host-cc=" (which "gcc"))
-                        "--disable-debug-info" ; save build space
-                        "--enable-virtfs"      ; just to be sure
-                        ,(string-append "--prefix=" out)
-                        ,(string-append "--sysconfdir=/etc")
-                        ,@configure-flags)))))
-         (add-after
-          'unpack 'apply-afl-patches
-          (lambda* (#:key inputs #:allow-other-keys)
-            (let* ((afl-src (assoc-ref inputs "afl-source"))
-                   (patch-dir "qemu_mode/patches"))
-              (copy-recursively (string-append afl-src "/"
-                                               patch-dir)
-                                patch-dir)
-              (install-file
-               (string-append patch-dir
-                              "/afl-qemu-cpu-inl.h")
-               ".")
-              (copy-file (string-append afl-src "/config.h")
-                         "./afl-config.h")
-              (install-file (string-append afl-src "/types.h")
-                            ".")
-              (substitute* "afl-qemu-cpu-inl.h"
-                (("\\.\\./\\.\\./config.h") "afl-config.h"))
-              (substitute* (string-append patch-dir
-                                          "/cpu-exec.diff")
-                (("\\.\\./patches/") ""))
-
-              ;; These were already applied to qemu-minimal-2.10.
-              (for-each (lambda (obsolete-patch)
-                          (delete-file (string-append
-                                        patch-dir "/"
-                                        obsolete-patch)))
-                        (list "configure.diff"
-                              "memfd.diff"))
-
-              (for-each (lambda (patch-file)
-                          (invoke "patch" "--force" "-p1"
-                                  "--input" patch-file))
-                        (find-files patch-dir
-                                    "\\.diff$"))
-              #t)))
-         (add-before 'check 'disable-unusable-tests
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (substitute* "tests/Makefile.include"
-               ;; Comment out the test-qga test, which needs /sys and
-               ;; fails within the build environment.
-               (("check-unit-.* tests/test-qga" all)
-                (string-append "# " all)))
-             (substitute* "tests/Makefile.include"
-               ;; Comment out the test-char test, which needs networking and
-               ;; fails within the build environment.
-               (("check-unit-.* tests/test-char" all)
-                (string-append "# " all)))
-             #t)))))
-    (native-inputs
-     `(("python-2" ,python-2) ; QEMU 2 needs Python 2
-       ("glib:bin" ,glib "bin")
-       ("perl" ,perl)
-       ("flex" ,flex)
-       ("bison" ,bison)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("afl-source" ,(package-source american-fuzzy-lop))
-       ("alsa-lib" ,alsa-lib)
-       ("attr" ,attr)
-       ("glib" ,glib)
-       ("libaio" ,libaio)
-       ("libattr" ,attr)
-       ("libcap" ,libcap)
-       ("libjpeg" ,libjpeg-turbo)
-       ("libpng" ,libpng)
-       ("ncurses" ,ncurses)
-       ("pixman" ,pixman)
-       ("util-linux" ,util-linux)
-       ("zlib" ,zlib)))
-    (home-page "https://www.qemu.org")
-    (synopsis "Machine emulator and virtualizer (without GUI) for american fuzzy lop")
-    (description
-     "QEMU is a generic machine emulator and virtualizer.  This package
-of QEMU is used only by the american fuzzy lop package.
-
-When used as a machine emulator, QEMU can run OSes and programs made for one
-machine (e.g. an ARM board) on a different machine---e.g., your own PC.  By
-using dynamic translation, it achieves very good performance.
-
-When used as a virtualizer, QEMU achieves near native performances by
-executing the guest code directly on the host CPU.  QEMU supports
-virtualization when executing under the Xen hypervisor or using
-the KVM kernel module in Linux.  When using KVM, QEMU can virtualize x86,
-server and embedded PowerPC, and S390 guests.")
-    ;; Many files are GPLv2+, but some are GPLv2-only---e.g., `memory.c'.
-    (license license:gpl2)
-    ;; Several tests fail on MIPS.
-    (supported-systems (delete "mips64el-linux" %supported-systems))))))
-
 (define-public qemu-for-aflplusplus
   (let ((base qemu-minimal)
         (commit "60ebd5624c60589e276cf287516b925a9ee35b87")
diff --git a/gnu/packages/patches/qemu-glibc-2.27.patch b/gnu/packages/patches/qemu-glibc-2.27.patch
deleted file mode 100644
index b1f354ac1ce..00000000000
--- a/gnu/packages/patches/qemu-glibc-2.27.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Tue, 28 Nov 2017 11:51:27 +0100
-Subject: [PATCH] memfd: fix configure test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Recent glibc added memfd_create in sys/mman.h.  This conflicts with
-the definition in util/memfd.c:
-
-    /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
-
-Fix the configure test, and remove the sys/memfd.h inclusion since the
-file actually does not exist---it is a typo in the memfd_create(2) man
-page.
-
-Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- configure    | 2 +-
- util/memfd.c | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 9c8aa5a..99ccc17 100755
---- a/configure
-+++ b/configure
-@@ -3923,7 +3923,7 @@ fi
- # check if memfd is supported
- memfd=no
- cat > $TMPC << EOF
--#include <sys/memfd.h>
-+#include <sys/mman.h>
- 
- int main(void)
- {
-diff --git a/util/memfd.c b/util/memfd.c
-index 4571d1a..412e94a 100644
---- a/util/memfd.c
-+++ b/util/memfd.c
-@@ -31,9 +31,7 @@
- 
- #include "qemu/memfd.h"
- 
--#ifdef CONFIG_MEMFD
--#include <sys/memfd.h>
--#elif defined CONFIG_LINUX
-+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
- #include <sys/syscall.h>
- #include <asm/unistd.h>
- 
--- 
-1.8.3.1
-
diff --git a/gnu/packages/patches/qemu-glibc-2.30.patch b/gnu/packages/patches/qemu-glibc-2.30.patch
deleted file mode 100644
index 1b74dee4ac7..00000000000
--- a/gnu/packages/patches/qemu-glibc-2.30.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-This patch was taken from NixOS
-https://raw.githubusercontent.com/Mindavi/nixpkgs/1a737743a829746e48f4869ac517ff29c23c9d09/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff
-It is based on an unmerged patch against american-fuzzy-lop and was
-never merged upstream because the author was unable to sign Google's CLA.
-Based on https://github.com/google/AFL/commit/6c917e3d63a2a0685d58c3518524f9615b001893.patch
-
---- qemu-2.10.0-clean/linux-user/syscall.c      2020-03-12 18:47:47.898592169 +0100
-+++ qemu-2.10.0/linux-user/syscall.c    2020-03-13 09:13:42.461809699 +0100
-@@ -34,6 +34,7 @@
- #include <sys/resource.h>
- #include <sys/swap.h>
- #include <linux/capability.h>
-+#include <linux/sockios.h> // https://lkml.org/lkml/2019/6/3/988
- #include <sched.h>
- #include <sys/timex.h>
- #ifdef __ia64__
-@@ -256,7 +257,9 @@ static type name (type1 arg1,type2 arg2,
- #endif
- 
- #ifdef __NR_gettid
--_syscall0(int, gettid)
-+// taken from https://patchwork.kernel.org/patch/10862231/
-+#define __NR_sys_gettid __NR_gettid
-+_syscall0(int, sys_gettid)
- #else
- /* This is a replacement for the host gettid() and must return a host
-    errno. */
-@@ -6219,7 +6222,7 @@ static void *clone_func(void *arg)
-     cpu = ENV_GET_CPU(env);
-     thread_cpu = cpu;
-     ts = (TaskState *)cpu->opaque;
--    info->tid = gettid();
-+    info->tid = sys_gettid();
-     task_settid(ts);
-     if (info->child_tidptr)
-         put_user_u32(info->tid, info->child_tidptr);
-@@ -6363,9 +6366,9 @@ static int do_fork(CPUArchState *env, un
-                mapping.  We can't repeat the spinlock hack used above because
-                the child process gets its own copy of the lock.  */
-             if (flags & CLONE_CHILD_SETTID)
--                put_user_u32(gettid(), child_tidptr);
-+                put_user_u32(sys_gettid(), child_tidptr);
-             if (flags & CLONE_PARENT_SETTID)
--                put_user_u32(gettid(), parent_tidptr);
-+                put_user_u32(sys_gettid(), parent_tidptr);
-             ts = (TaskState *)cpu->opaque;
-             if (flags & CLONE_SETTLS)
-                 cpu_set_tls (env, newtls);
-@@ -11402,7 +11405,7 @@ abi_long do_syscall(void *cpu_env, int n
-         break;
- #endif
-     case TARGET_NR_gettid:
--        ret = get_errno(gettid());
-+        ret = get_errno(sys_gettid());
-         break;
- #ifdef TARGET_NR_readahead
-     case TARGET_NR_readahead: