Subject: bug#39227: closed (Re: [PATCH 0/2] QEMU updates)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 25 Jan 2020 02:15:03 +0000

Your bug report

#39225: [PATCH 2/2] gnu: QEMU: Update to 4.2.0.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
39225: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=39225
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [PATCH 0/2] QEMU updates
From: Leo Famulari <[email-masked]>
To: [email-masked]
Date: Fri, 24 Jan 2020 21:13:59 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

On Tue, Jan 21, 2020 at 01:55:50PM -0500, Leo Famulari wrote:
> The security updates work with our current QEMU package of 4.1.1 as well
> as 4.2.0.
> 
> I tested both 4.2.0 and the patched 4.1.1 by creating a vm-image and
> running it with the "full" QEMU package, and the SLIRP networking works
> fine in both cases.

Pushed as 3778b3d9d013a443eec7990c31f47f887f72fe59, along with a 3rd
patch that brings back the QEMU man pages. QEMU 4.0 began requiring the
use of Sphinx to build them:

https://wiki.qemu.org/ChangeLog/4.0#Build_Dependencies

Subject: [PATCH 2/2] gnu: QEMU: Update to 4.2.0.
From: Leo Famulari <[email-masked]>
To: [email-masked]
Date: Tue, 21 Jan 2020 13:55:52 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/virtualization.scm (qemu): Update to 4.2.0.
[source]: Use new patch.
* gnu/packages/patches/qemu-fix-documentation-build-failure.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  1 +
 ...qemu-fix-documentation-build-failure.patch | 43 +++++++++++++++++++
 gnu/packages/virtualization.scm               |  7 +--
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/qemu-fix-documentation-build-failure.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1a01a87c40..7893c2a8ad 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1336,6 +1336,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/qemu-glibc-2.27.patch 			\
   %D%/packages/patches/qemu-CVE-2020-7039.patch			\
   %D%/packages/patches/qemu-CVE-2020-7211.patch			\
+  %D%/packages/patches/qemu-fix-documentation-build-failure.patch	\
   %D%/packages/patches/qt4-ldflags.patch			\
   %D%/packages/patches/qtbase-use-TZDIR.patch			\
   %D%/packages/patches/qtscript-disable-tests.patch		\
diff --git a/gnu/packages/patches/qemu-fix-documentation-build-failure.patch b/gnu/packages/patches/qemu-fix-documentation-build-failure.patch
new file mode 100644
index 0000000000..c913c553b2
--- /dev/null
+++ b/gnu/packages/patches/qemu-fix-documentation-build-failure.patch
@@ -0,0 +1,43 @@
+Fix a build failure caused by a texinfo bug:
+
+qemu-doc.texi:41: @menu reference to nonexistent node `QEMU Guest Agent'
+
+Patch copied from upstream source repository:
+
+https://git.qemu.org/?p=qemu.git;a=commitdiff;h=80bc935eaaf93e5b9a4efe97abd7c51d645f2612
+
+From 80bc935eaaf93e5b9a4efe97abd7c51d645f2612 Mon Sep 17 00:00:00 2001
+From: Thomas Huth <[email-masked]>
+Date: Mon, 16 Dec 2019 14:29:41 +0100
+Subject: [PATCH] qemu-doc: Remove the unused "Guest Agent" node
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The node has been removed from the texi file some months ago, so we
+should remove it from the menu section, too.
+
+Fixes: 27a296fce982 ("qemu-ga: Convert invocation documentation to rST")
+Signed-off-by: Thomas Huth <[email-masked]>
+Reviewed-by: Philippe Mathieu-Daudé <[email-masked]>
+Message-Id: <[email-masked]>
+Signed-off-by: Laurent Vivier <[email-masked]>
+---
+ qemu-doc.texi | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/qemu-doc.texi b/qemu-doc.texi
+index eea91a2d1e..39f950471f 100644
+--- a/qemu-doc.texi
++++ b/qemu-doc.texi
+@@ -38,7 +38,6 @@
+ * Introduction::
+ * QEMU PC System emulator::
+ * QEMU System emulator for non PC targets::
+-* QEMU Guest Agent::
+ * QEMU User space emulator::
+ * System requirements::
+ * Security::
+-- 
+2.24.1
+
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 1874cf3d9f..87d7b8669e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -109,16 +109,17 @@
 (define-public qemu
   (package
     (name "qemu")
-    (version "4.1.1")
+    (version "4.2.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://download.qemu.org/qemu-"
                                  version ".tar.xz"))
              (patches (search-patches "qemu-CVE-2020-7039.patch"
-                                      "qemu-CVE-2020-7211.patch"))
+                                      "qemu-CVE-2020-7211.patch"
+                                      "qemu-fix-documentation-build-failure.patch"))
              (sha256
               (base32
-               "1lm1jndfpc5sydwrxyiz5sms414zkcg9jdl0zx318qbjsayxnvzd"))))
+               "1w38hzlw7xp05gcq1nhga7hxvndxy6dfcnzi7q2il8ff110isj6k"))))
     (build-system gnu-build-system)
     (arguments
      '(;; Running tests in parallel can occasionally lead to failures, like:
-- 
2.25.0