From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: 01/01: gnu: qemu: Update to 2.7.0 [fixes CVE-2016-7116]. Date: Tue, 6 Sep 2016 03:34:21 -0400 Message-ID: <20160906073421.GA13088@jasmine> References: <20160906003529.26167.89614@vcs.savannah.gnu.org> <20160906003529.E780B22014F@vcs.savannah.gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="p4qYPpj5QlsIQJ0K" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhAtz-0005hC-6K for guix-devel@gnu.org; Tue, 06 Sep 2016 03:34:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhAtt-0007vl-5C for guix-devel@gnu.org; Tue, 06 Sep 2016 03:34:38 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:40190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhAtr-0007sy-Qr for guix-devel@gnu.org; Tue, 06 Sep 2016 03:34:33 -0400 Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 5F82DCCE65 for ; Tue, 6 Sep 2016 03:34:23 -0400 (EDT) Content-Disposition: inline In-Reply-To: <20160906003529.E780B22014F@vcs.savannah.gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --p4qYPpj5QlsIQJ0K Content-Type: multipart/mixed; boundary="zYM0uCDKw75PZbzx" Content-Disposition: inline --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 06, 2016 at 12:35:29AM +0000, Leo Famulari wrote: > commit 43bec6d06d8dcc4c0f865e492d370a8724bba2ce > Author: Leo Famulari > Date: Sun Sep 4 02:53:37 2016 -0400 >=20 > gnu: qemu: Update to 2.7.0 [fixes CVE-2016-7116]. > =20 > * gnu/packages/qemu.scm (qemu): Update to 2.7.0. > [arguments]: Adjust path in 'disable-test-qga' phase. > (add-before 'check 'disable-test-qga > (lambda _ > - (substitute* "tests/Makefile" > + (substitute* "tests/Makefile.include" > ;; Comment out the test-qga test, which needs /sys and This change broke qemu-for-tests and qemu-2.3.0. In turn, that broke GRUB, American fuzzy lop, and a bunch of the system tests: https://hydra.gnu.org/eval/109151 I adjusted the QEMU variants with the attached patch, but the system test "installed-os" still fails like this: $ guix environment --pure guix --ad-hoc git [env]$ make check-system TESTS=3D"installed-os" Compiling Scheme modules... Running 1 system tests... Backtrace: In ice-9/eval.scm: 432: 19 [eval # #] In ice-9/r4rs.scm: 90: 18 [dynamic-wind # ..= =2E] In guix/store.scm: 1182: 17 [run-with-store # # # ...] In ice-9/r4rs.scm: 39: 16 [call-with-values #= ...] In guix/monads.scm: 371: 15 [# #] 371: 14 [# #] 371: 13 [# #] In gnu/tests/install.scm: 219: 12 [# #] 137: 11 [# #] 137: 10 [# #] In gnu/system/vm.scm: 285: 9 [system-disk-image # # "disk-image" ...] In gnu/system.scm: 612: 8 [operating-system-derivation # # #f] In gnu/services.scm: 585: 7 [loop #] In srfi/srfi-1.scm: 578: 6 [map # (# # # #)] In gnu/services.scm: 585: 5 [loop #< type: # parameters: #t= >] In srfi/srfi-1.scm: 576: 4 [map # (# # #)] In gnu/services.scm: 585: 3 [loop #< type: # parameters= : #t>] In srfi/srfi-1.scm: 578: 2 [map # (# # = # # ...)] In gnu/services/base.scm: 1106: 1 [guix-activation #] In unknown file: ?: 0 [scm-error wrong-type-arg "map" "Not a list: ~S" (#t) #f] ERROR: In procedure scm-error: ERROR: In procedure map: Not a list: #t make: *** [Makefile:4845: check-system] Error 1 --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-qemu-2.3.0-qemu-for-tests-Fix-path.patch" Content-Transfer-Encoding: quoted-printable =46rom 94f52fe26898e6d476630dca746531f7cbe8b882 Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Tue, 6 Sep 2016 03:21:45 -0400 Subject: [PATCH] gnu: qemu-2.3.0, qemu-for-tests: Fix path. This is a followup to commit 43bec6d06d8dcc4c0f865e492d370a8724bba2ce. * gnu/packages/grub.scm (qemu-for-tests)[arguments]: Replace 'disable-test-= qga' phase. * gnu/packages/debug.scm (qemu-2.3.0)[arguments]: Likewise. --- gnu/packages/debug.scm | 11 ++++++++++- gnu/packages/grub.scm | 12 +++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 9da8885..6bcb0f1 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -161,7 +161,16 @@ tools that process C/C++ code.") ;; XXX: Disable tests because of GTester's rejection of duplicate test ;; names, which wasn't addressed in this version of QEMU. `(#:tests? #f - ,@(package-arguments qemu-minimal))))) + ,@(substitute-keyword-arguments (package-arguments qemu-minimal) + ((#:phases phases) + `(modify-phases ,phases + ;; The filename changed in qemu@2.7.0. + (replace 'disable-test-qga + (lambda _ + (substitute* "tests/Makefile" + (("check-unit-.* tests/test-qga" all) + (string-append "# " all))) + #t))))))))) =20 (define-public american-fuzzy-lop (let ((machine (match (or (%current-target-system) diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index 3229b86..298379d 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -24,6 +24,7 @@ #:use-module (guix packages) #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (guix build-system gnu) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages flex) #:use-module (gnu packages disk) @@ -58,7 +59,16 @@ ;; ERROR:tests/rtc-test.c:176:check_time: assertion failed (ABS(t - = s) <=3D wiggle): (382597824 <=3D 2) ;; Simply disable the tests. (arguments `(#:tests? #f - ,@(package-arguments qemu-minimal))) + ,@(substitute-keyword-arguments (package-arguments qemu-m= inimal) + ((#:phases phases) + `(modify-phases ,phases + ;; The filename changed in qemu@2.7.0. + (replace 'disable-test-qga + (lambda _ + (substitute* "tests/Makefile" + (("check-unit-.* tests/test-qga" all) + (string-append "# " all))) + #t))))))) =20 ;; The manual fails to build with Texinfo 5.x. (native-inputs (alist-delete "texinfo" (package-native-inputs qemu))))) --=20 2.10.0 --zYM0uCDKw75PZbzx-- --p4qYPpj5QlsIQJ0K Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXznF5AAoJECZG+jC6yn8IANYQANce7Sq3Z18Be+MDvZFVr/2k SwUcAePnoreVGRXvwCr5I9dEYfFPwtIhwGNNRuihxbY9knL2a6zduq6ytmEJ7T/u asmxLHlQQktmYJPgXwBNrqOOWolHokrMSGEF7raPq11IIcmIbfAEGPk4KdT9GmD+ BQ6sI9+c+ube3Ro0qMi40E5G3NNAissJLkzAxZdMY0S79djW0L+WJr74ao6kirX+ o7PKULxgJOy/hLfVTsQejSYneNdLzaEYHZMSQflkBbvajKltCB7kSMI0a91WFHcd 0kqcGcCxYXDPkz3u+Zqa/QUCLntzW0tJvVk16sXXqn0/NVRVo017Ax6P8K/gKOZO gaqP2lRpO8Qm2W6qrYqVqgWZalcINDKtU5CuIKJgFzcoUWfnin5+0dZZ6bPfVTvs 3U7MlhBcRYvsEXfTSTxfLX57sCtaRp6lrBijCwy1oV6qW3xmB2oxn0+a6mhEtHiw 6Hn8V6K2a8AU6+wB1oYZRJ1rRO0ln/2EOOSDrgaKNfX2bVOd2EbWw7SF07W0bCwn lRd12U8F2ztVMjPb9e6ZwwgTeaPrId7LeKYZiF/MMOmDjYVnKloARN8sQAZVK0pJ ABa43oG/oGwys7hkZpgOGR0qeA0STkx0mKyUn/bU5MQ29D+yoBO2LWQhjZMl+yL3 RjKinVZPlo3ZTazecunY =rCU/ -----END PGP SIGNATURE----- --p4qYPpj5QlsIQJ0K--