Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/
Date: Mon, 08 Apr 2019 02:52:38
Message-Id: 1554691868.6fec2a540ce3e7cbd378287ee2837aeba6406eaf.tamiko@gentoo
1 commit: 6fec2a540ce3e7cbd378287ee2837aeba6406eaf
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 8 02:26:43 2019 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 8 02:51:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fec2a54
7
8 app-emulation/qemu: multiple security fixes for 3.1.0
9
10 CVE-2018-20815
11 CVE-2019-9824
12
13 Bug: https://bugs.gentoo.org/681850
14 Bug: https://bugs.gentoo.org/680834
15 Package-Manager: Portage-2.3.62, Repoman-2.3.12
16 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
17
18 app-emulation/qemu/Manifest | 1 +
19 app-emulation/qemu/qemu-3.1.0-r4.ebuild | 6 ++----
20 2 files changed, 3 insertions(+), 4 deletions(-)
21
22 diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
23 index 6a1be9e7ed9..b22856763b7 100644
24 --- a/app-emulation/qemu/Manifest
25 +++ b/app-emulation/qemu/Manifest
26 @@ -1 +1,2 @@
27 +DIST qemu-3.1.0-patches-r1.tar.xz 3796 BLAKE2B 4dfb87e4d8cec9eae075f83f83152a01145b2321d9802024007435f0611bd003f7a72a5ef37bbdeb0447d93cc363bf372320a4a5851b21cd32fd34a254f293e7 SHA512 510f663d424936acb7aaf49153d86972a76c40aad15a97eeb70fd9f7346ae024f0cb2fbc2d447a030f9824a91abd4498bcf51a95db5e3d80abe43818ef61cb0e
28 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
29
30 diff --git a/app-emulation/qemu/qemu-3.1.0-r4.ebuild b/app-emulation/qemu/qemu-3.1.0-r4.ebuild
31 index ace3d191a4c..58a7196eb09 100644
32 --- a/app-emulation/qemu/qemu-3.1.0-r4.ebuild
33 +++ b/app-emulation/qemu/qemu-3.1.0-r4.ebuild
34 @@ -22,7 +22,7 @@ else
35 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
36
37 # Gentoo specific patchsets:
38 - #SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
39 + SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
40 fi
41
42 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
43 @@ -208,9 +208,7 @@ PATCHES=(
44 "${FILESDIR}"/${PN}-2.5.0-cflags.patch
45 "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
46 "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
47 - "${FILESDIR}"/${PN}-3.1.0-CVE-2018-20123.patch
48 - "${FILESDIR}"/${PN}-3.1.0-CVE-2019-3812.patch
49 - #"${WORKDIR}"/patches
50 + "${WORKDIR}"/patches
51 )
52
53 QA_PREBUILT="