From: Matthias Maier <tamiko@gentoo.org>
Date: Mon, 8 Apr 2019 02:26:43 +0000 (-0500)
Subject: app-emulation/qemu: multiple security fixes for 3.1.0
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6fec2a540ce3e7cbd378287ee2837aeba6406eaf;p=gentoo.git

app-emulation/qemu: multiple security fixes for 3.1.0

  CVE-2018-20815
  CVE-2019-9824

Bug: https://bugs.gentoo.org/681850
Bug: https://bugs.gentoo.org/680834
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
---

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 6a1be9e7ed9d..b22856763b7a 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1 +1,2 @@
+DIST qemu-3.1.0-patches-r1.tar.xz 3796 BLAKE2B 4dfb87e4d8cec9eae075f83f83152a01145b2321d9802024007435f0611bd003f7a72a5ef37bbdeb0447d93cc363bf372320a4a5851b21cd32fd34a254f293e7 SHA512 510f663d424936acb7aaf49153d86972a76c40aad15a97eeb70fd9f7346ae024f0cb2fbc2d447a030f9824a91abd4498bcf51a95db5e3d80abe43818ef61cb0e
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
diff --git a/app-emulation/qemu/qemu-3.1.0-r4.ebuild b/app-emulation/qemu/qemu-3.1.0-r4.ebuild
index ace3d191a4ca..58a7196eb09f 100644
--- a/app-emulation/qemu/qemu-3.1.0-r4.ebuild
+++ b/app-emulation/qemu/qemu-3.1.0-r4.ebuild
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 	# Gentoo specific patchsets:
-	#SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -208,9 +208,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
 	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-3.1.0-CVE-2018-20123.patch
-	"${FILESDIR}"/${PN}-3.1.0-CVE-2019-3812.patch
-	#"${WORKDIR}"/patches
+	"${WORKDIR}"/patches
 )
 
 QA_PREBUILT="