vapier 15/05/13 23:11:02
Modified: qemu-2.2.1-r2.ebuild qemu-2.3.0-r1.ebuild
qemu-2.1.3-r1.ebuild ChangeLog
Log:
Move patch to $FILESDIR as it is small and matches what we do everywhere else.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.2 app-emulation/qemu/qemu-2.2.1-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.2.1-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.2.1-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.2.1-r2.ebuild?r1=1.1&r2=1.2
Index: qemu-2.2.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.2.1-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-2.2.1-r2.ebuild 13 May 2015 18:56:43 -0000 1.1
+++ qemu-2.2.1-r2.ebuild 13 May 2015 23:11:02 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.2.1-r2.ebuild,v
1.1 2015/05/13 18:56:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.2.1-r2.ebuild,v
1.2 2015/05/13 23:11:02 vapier Exp $
EAPI=5
@@ -20,8 +20,7 @@
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
-
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}
-
http://git.qemu.org/?p=qemu.git;a=patch;h=e907746266721f305d67bc0718795fedee2e824c
-> qemu-2.3.0-CVE-2015-3456.patch"
+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}";
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
@@ -261,12 +260,11 @@
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
epatch "${FILESDIR}"/${P}-CVE-2015-1779-1.patch #544328
epatch "${FILESDIR}"/${P}-CVE-2015-1779-2.patch #544328
+ epatch "${FILESDIR}"/${PN}-2.3.0-CVE-2015-3456.patch #549404
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch"
EPATCH_SOURCE="${S}/patches" \
epatch
- epatch "${DISTDIR}"/qemu-2.3.0-CVE-2015-3456.patch
-
# Fix ld and objcopy being called directly
tc-export AR LD OBJCOPY
1.2 app-emulation/qemu/qemu-2.3.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r1.ebuild?r1=1.1&r2=1.2
Index: qemu-2.3.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-2.3.0-r1.ebuild 13 May 2015 18:56:43 -0000 1.1
+++ qemu-2.3.0-r1.ebuild 13 May 2015 23:11:02 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r1.ebuild,v
1.1 2015/05/13 18:56:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r1.ebuild,v
1.2 2015/05/13 23:11:02 vapier Exp $
EAPI=5
@@ -19,8 +19,7 @@
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
-
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}
-
http://git.qemu.org/?p=qemu.git;a=patch;h=e907746266721f305d67bc0718795fedee2e824c
-> qemu-2.3.0-CVE-2015-3456.patch"
+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}";
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
@@ -258,12 +257,11 @@
use nls || rm -f po/*.po
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+ epatch "${FILESDIR}"/${P}-CVE-2015-3456.patch #549404
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch"
EPATCH_SOURCE="${S}/patches" \
epatch
- epatch "${DISTDIR}"/qemu-2.3.0-CVE-2015-3456.patch
-
# Fix ld and objcopy being called directly
tc-export AR LD OBJCOPY
1.2 app-emulation/qemu/qemu-2.1.3-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.1.3-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.1.3-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.1.3-r1.ebuild?r1=1.1&r2=1.2
Index: qemu-2.1.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-2.1.3-r1.ebuild 13 May 2015 18:56:43 -0000 1.1
+++ qemu-2.1.3-r1.ebuild 13 May 2015 23:11:02 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.3-r1.ebuild,v
1.1 2015/05/13 18:56:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.3-r1.ebuild,v
1.2 2015/05/13 23:11:02 vapier Exp $
EAPI=5
@@ -20,8 +20,7 @@
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
-
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}
-
http://git.qemu.org/?p=qemu.git;a=patch;h=e907746266721f305d67bc0718795fedee2e824c
-> qemu-2.3.0-CVE-2015-3456.patch"
+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}";
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
@@ -260,12 +259,11 @@
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
epatch "${FILESDIR}"/${PN}-2.1.1-readlink-self.patch
epatch "${FILESDIR}"/${PN}-2.1.2-vnc-sanitize-bits.patch #527088
+ epatch "${FILESDIR}"/${PN}-2.3.0-CVE-2015-3456.patch #549404
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}/patches" epatch
- epatch "${DISTDIR}"/qemu-2.3.0-CVE-2015-3456.patch
-
# Fix ld and objcopy being called directly
tc-export AR LD OBJCOPY
1.326 app-emulation/qemu/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.326&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.326&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.325&r2=1.326
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- ChangeLog 13 May 2015 18:56:43 -0000 1.325
+++ ChangeLog 13 May 2015 23:11:02 -0000 1.326
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.325
2015/05/13 18:56:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.326
2015/05/13 23:11:02 vapier Exp $
+
+ 13 May 2015; Mike Frysinger <[email protected]>
+ +files/qemu-2.3.0-CVE-2015-3456.patch, qemu-2.1.3-r1.ebuild,
+ qemu-2.2.1-r2.ebuild, qemu-2.3.0-r1.ebuild:
+ Move patch to $FILESDIR as it is small and matches what we do everywhere
else.
*qemu-2.2.1-r2 (13 May 2015)
*qemu-2.3.0-r1 (13 May 2015)
