Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[app-emulation/qemu] sync with tree

Browse Source
This commit is contained in:
Robert Förster 2014-08-27 16:00:54 +02:00
parent 895b951d6b
commit 5f65959a3b
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app-emulation/qemu/files/CVE-2014-5388.patch Normal file
View File

@ -0,0 +1,12 @@
https://lists.gnu.org/archive/html/qemu-devel/2014-08/msg03338.html
--- hw/acpi/pcihp.c.orig 2014-08-27 12:53:38.200621592 +0000
+++ hw/acpi/pcihp.c 2014-08-27 12:53:58.390518561 +0000
@@ -231,7 +231,7 @@
uint32_t val = 0;
int bsel = s->hotplug_select;
- if (bsel < 0 || bsel > ACPI_PCIHP_MAX_HOTPLUG_BUS) {
+ if (bsel < 0 || bsel >= ACPI_PCIHP_MAX_HOTPLUG_BUS) {
return 0;
}

3
app-emulation/qemu/qemu-2.1.0.ebuild → app-emulation/qemu/qemu-2.1.0-r1.ebuild
View File

@ -77,7 +77,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
jpeg? ( virtual/jpeg[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] )
lzo? ( dev-libs/lzo:2[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] )
ncurses? ( sys-libs/ncurses[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] )
nfs? ( net-fs/libnfs[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
numa? ( sys-process/numactl[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] )
png? ( media-libs/libpng[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] )
rbd? ( sys-cluster/ceph[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] )
@ -252,6 +252,7 @@ src_prepare() {
use nls || rm -f po/*.po use nls || rm -f po/*.po
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
epatch "${FILESDIR}"/CVE-2014-5388.patch
[[ -n ${BACKPORTS} ]] && \ [[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch epatch