1 |
commit: 507bcd10917cca5314daee207dd5f87283dc722f |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Feb 28 17:58:44 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Feb 28 17:58:44 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=507bcd10 |
7 |
|
8 |
app-emulation/qemu: version bump to 2.8.0-r6 |
9 |
|
10 |
app-emulation/qemu/Manifest | 4 +- |
11 |
app-emulation/qemu/metadata.xml | 4 +- |
12 |
.../{qemu-2.8.0-r4.ebuild => qemu-2.8.0-r6.ebuild} | 170 +++++++++++---------- |
13 |
3 files changed, 92 insertions(+), 86 deletions(-) |
14 |
|
15 |
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest |
16 |
index 058e0d2..da4c713 100644 |
17 |
--- a/app-emulation/qemu/Manifest |
18 |
+++ b/app-emulation/qemu/Manifest |
19 |
@@ -29,5 +29,5 @@ AUX qemu-2.8.0-F_SHLCK-and-F_EXLCK.patch 574 SHA256 d02353daa0ecfe161e938a5e54fe |
20 |
AUX qemu-binfmt.initd-r1 7966 SHA256 5b4b432aa1e44f387c9eb789de0ec6322741fd36dd241f76520f17c6cd6ac49b SHA512 2ba0bff6eb2b6bac4ed440f793771ce9551cad48e38bddb6cf04f804faac2407e80879f66771910344ddcea45f0014095dcc8bfeb0aad5085ef048fd3612dbd8 WHIRLPOOL a2a1fb830a970757d1e203378c7d382b161b1040f3b8aaf0f22bb3b5e46467eff395474ff40d93c9f133bab307b345a6f75d63eae9f8dd8daf67324db41032f9 |
21 |
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5 |
22 |
EBUILD qemu-2.8.0-r3.ebuild 21992 SHA256 a2c7a92d214b05e2c6f58fb0d7263472d6a44259de99afc674df713303b432bb SHA512 80699e92ae269cb6ab33b3ec0be164111b68e25d498d8af3624f04bca799174937f1fd2cf49357e0598f6567873cdc8aac3310a1175e328207de8ca5b97856d1 WHIRLPOOL 2079c97d3aa8589c70288cbcca7e1d8591adb1b40a0846b6a683fc6c72f142892e65b6adfac750931e2e63aa33a9d99f31f9659bd5664e6145059f28ecfced1a |
23 |
-EBUILD qemu-2.8.0-r4.ebuild 23587 SHA256 e2ae21fb366e1c2588174d7ce23922f1163ed3364d933610c53013b61e98a6c4 SHA512 39ec9e32e2539f0daa6fe0f1ae17ec290741f930825ed865f98d7bffec305691680295e9aedc3b30c820570d36b77da014d17667317e2496f92d31ef28d54677 WHIRLPOOL cab8b3faea2b78f30dd8bdf4500ef123fbbc548863d0b27f435e4a89aef18e95e4467798c7a2529f262f225be8fb87871916c1d1aad7ffc604a4ed8ce6db9bfa |
24 |
-MISC metadata.xml 3854 SHA256 326fc14b3867842cc40bc364d91e2ca60ca63651e4a17040254166fa09cec04a SHA512 2e3bbdf84b7b03aedc43621b47e02b8da242fda917dcdf4b2d7532210aaa79c6fbea52a6b8157cdf90cd1e4e282610c0254b96a7a14b285e910d61203acd6461 WHIRLPOOL 539ca48b54055e594e16b76341879540d4f302d502c39d1901ed4fd7cc80b186ba29845759d02c60bf4560b8b14ec4fa40869d341e432a025dc792fb38f8eae1 |
25 |
+EBUILD qemu-2.8.0-r6.ebuild 23200 SHA256 5f27a46c6914629140855bf35eb178b4f1eca69c5410d0215684307420690afb SHA512 f61e39fb20341c8a16df5e80eb14518ec7d7917a714a373818c8332100ffeec55c89923f4e31c82561e83471e979304d034e1d1bdaf8c75dbefcb37f575b4187 WHIRLPOOL 2f7e56c1215b5e68e70feb437eea3b2854d85f23431a14e4977435490134a3d6276e4343434e2120bfe6775b9cac06becdfc93c5f29b26bb2f77de63da839a8e |
26 |
+MISC metadata.xml 3890 SHA256 50fd5960fa2280175116b5ee5ff4a9625f02e38f560061a00b2640cde4846d69 SHA512 f19e826a9daba7f2676f0459f97e7bdc752652ccf8b9dd009fd569977015b0656fee21c74529e53b6bc51c2f19e746f417c3dc1e1472e3767cdefa0746b0876c WHIRLPOOL 03e0dafcdc13beffb0044ce5227b83aa272a21e9835fce9ad16d5bdf56ee1a4c3a1ae4b10d1cdaf405502532b84991b150de262f12fa72497052c2377046845f |
27 |
|
28 |
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml |
29 |
index 1866d8a..9a8a1a3 100644 |
30 |
--- a/app-emulation/qemu/metadata.xml |
31 |
+++ b/app-emulation/qemu/metadata.xml |
32 |
@@ -32,9 +32,9 @@ |
33 |
<flag name="sdl2">Use libsdl2 instead of libsdl</flag> |
34 |
<flag name="spice">Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag> |
35 |
<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag> |
36 |
- <flag name="static-softmmu">Builds the Software MMU (system) targets as static binaries</flag> |
37 |
+ <flag name="static-softmmu">Build the Software MMU (system) targets as static binaries</flag> |
38 |
<flag name="static-user">Build the User targets as static binaries</flag> |
39 |
- <flag name="static">Enables both 'static-softmmu' and 'static-user'</flag> |
40 |
+ <flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag> |
41 |
<flag name="snappy">Enable support for snappy compression</flag> |
42 |
<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag> |
43 |
<flag name="tci">Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag> |
44 |
|
45 |
diff --git a/app-emulation/qemu/qemu-2.8.0-r4.ebuild b/app-emulation/qemu/qemu-2.8.0-r6.ebuild |
46 |
similarity index 84% |
47 |
rename from app-emulation/qemu/qemu-2.8.0-r4.ebuild |
48 |
rename to app-emulation/qemu/qemu-2.8.0-r6.ebuild |
49 |
index a6c842c..8014ef7 100644 |
50 |
--- a/app-emulation/qemu/qemu-2.8.0-r4.ebuild |
51 |
+++ b/app-emulation/qemu/qemu-2.8.0-r6.ebuild |
52 |
@@ -1,7 +1,7 @@ |
53 |
# Copyright 1999-2017 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
|
56 |
-EAPI="5" |
57 |
+EAPI="6" |
58 |
|
59 |
PYTHON_COMPAT=( python2_7 ) |
60 |
PYTHON_REQ_USE="ncurses,readline" |
61 |
@@ -13,7 +13,7 @@ inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ |
62 |
|
63 |
if [[ ${PV} = *9999* ]]; then |
64 |
EGIT_REPO_URI="git://git.qemu.org/qemu.git" |
65 |
- inherit git-2 |
66 |
+ inherit git-r3 |
67 |
SRC_URI="" |
68 |
else |
69 |
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2" |
70 |
@@ -25,19 +25,20 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" |
71 |
|
72 |
LICENSE="GPL-2 LGPL-2 BSD-2" |
73 |
SLOT="0" |
74 |
-IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs \ |
75 |
-gnutls gtk gtk2 infiniband iscsi +jpeg \ |
76 |
-kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs |
77 |
-+png pulseaudio python \ |
78 |
-rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu |
79 |
-static-user systemtap tci test +threads usb usbredir vde +vhost-net \ |
80 |
-virgl virtfs +vnc vte xattr xen xfs" |
81 |
- |
82 |
-COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips |
83 |
-mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 |
84 |
-x86_64" |
85 |
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb" |
86 |
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" |
87 |
+IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt |
88 |
+ glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux |
89 |
+ kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png |
90 |
+ pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy |
91 |
+ spice ssh static static-user systemtap tci test +threads usb usbredir |
92 |
+ vde +vhost-net virgl virtfs +vnc vte xattr xen xfs" |
93 |
+ |
94 |
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel |
95 |
+ mips mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc |
96 |
+ sparc64 x86_64" |
97 |
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} |
98 |
+ lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb" |
99 |
+IUSE_USER_TARGETS="${COMMON_TARGETS} |
100 |
+ armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" |
101 |
|
102 |
use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) |
103 |
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) |
104 |
@@ -52,32 +53,35 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
105 |
qemu_softmmu_targets_ppc? ( fdt ) |
106 |
qemu_softmmu_targets_ppc64? ( fdt ) |
107 |
sdl2? ( sdl ) |
108 |
- static? ( static-softmmu static-user ) |
109 |
- static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 ) |
110 |
+ static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) |
111 |
virtfs? ( xattr ) |
112 |
vte? ( gtk )" |
113 |
|
114 |
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) |
115 |
+# and user/softmmu targets (qemu-*, qemu-system-*). |
116 |
+# |
117 |
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. |
118 |
# |
119 |
# The attr lib isn't always linked in (although the USE flag is always |
120 |
# respected). This is because qemu supports using the C library's API |
121 |
# when available rather than always using the extranl library. |
122 |
# |
123 |
-# Older versions of gnutls are supported, but it's simpler to just require |
124 |
-# the latest versions. This is also why we require nettle. |
125 |
-# |
126 |
-# TODO: Split out tools deps into another var. e.g. bzip2 is only used by |
127 |
-# system binaries and tools, not user binaries. |
128 |
-COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] |
129 |
- sys-libs/zlib[static-libs(+)] |
130 |
- bzip2? ( app-arch/bzip2[static-libs(+)] ) |
131 |
- xattr? ( sys-apps/attr[static-libs(+)] )" |
132 |
-SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} |
133 |
+# To configure and compile qemu user targets or tools alone the following |
134 |
+# dependencies are not strictly necessary: |
135 |
+# alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
136 |
+# fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) |
137 |
+# pulseaudio? ( media-sound/pulseaudio ) |
138 |
+# seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) |
139 |
+# but these are so few it is not worth the effort to separate this list. |
140 |
+TARGETS_DEPEND=" |
141 |
+ >=dev-libs/glib-2.0[static-libs(+)] |
142 |
>=x11-libs/pixman-0.28.0[static-libs(+)] |
143 |
+ sys-libs/zlib[static-libs(+)] |
144 |
accessibility? ( app-accessibility/brltty[static-libs(+)] ) |
145 |
aio? ( dev-libs/libaio[static-libs(+)] ) |
146 |
alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
147 |
bluetooth? ( net-wireless/bluez ) |
148 |
+ bzip2? ( app-arch/bzip2[static-libs(+)] ) |
149 |
caps? ( sys-libs/libcap-ng[static-libs(+)] ) |
150 |
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) |
151 |
fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) |
152 |
@@ -114,6 +118,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} |
153 |
) |
154 |
png? ( media-libs/libpng:0=[static-libs(+)] ) |
155 |
pulseaudio? ( media-sound/pulseaudio ) |
156 |
+ python? ( ${PYTHON_DEPS} ) |
157 |
rbd? ( sys-cluster/ceph[static-libs(+)] ) |
158 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
159 |
sdl? ( |
160 |
@@ -134,13 +139,16 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} |
161 |
>=app-emulation/spice-0.12.0[static-libs(+)] |
162 |
) |
163 |
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) |
164 |
- usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) |
165 |
+ systemtap? ( dev-util/systemtap ) |
166 |
usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) |
167 |
+ usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) |
168 |
vde? ( net-misc/vde[static-libs(+)] ) |
169 |
virgl? ( media-libs/virglrenderer[static-libs(+)] ) |
170 |
virtfs? ( sys-libs/libcap ) |
171 |
+ xattr? ( sys-apps/attr[static-libs(+)] ) |
172 |
+ xen? ( app-emulation/xen-tools:= ) |
173 |
xfs? ( sys-fs/xfsprogs[static-libs(+)] )" |
174 |
-USER_LIB_DEPEND="${COMMON_LIB_DEPEND}" |
175 |
+ |
176 |
X86_FIRMWARE_DEPEND=" |
177 |
>=sys-firmware/ipxe-1.0.0_p20130624 |
178 |
pin-upstream-blobs? ( |
179 |
@@ -153,14 +161,11 @@ X86_FIRMWARE_DEPEND=" |
180 |
sys-firmware/sgabios |
181 |
sys-firmware/vgabios |
182 |
)" |
183 |
+ |
184 |
CDEPEND=" |
185 |
- !static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) ) |
186 |
- !static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) ) |
187 |
+ !static? ( ${TARGETS_DEPEND//\[static-libs(+)]} ) |
188 |
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) |
189 |
- qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) |
190 |
- python? ( ${PYTHON_DEPS} ) |
191 |
- systemtap? ( dev-util/systemtap ) |
192 |
- xen? ( app-emulation/xen-tools:= )" |
193 |
+ qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )" |
194 |
DEPEND="${CDEPEND} |
195 |
dev-lang/perl |
196 |
=dev-lang/python-2* |
197 |
@@ -168,15 +173,46 @@ DEPEND="${CDEPEND} |
198 |
virtual/pkgconfig |
199 |
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
200 |
gtk? ( nls? ( sys-devel/gettext ) ) |
201 |
- static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) ) |
202 |
- static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) ) |
203 |
+ static? ( ${TARGETS_DEPEND} ) |
204 |
+ static-user? ( ${TARGETS_DEPEND} ) |
205 |
test? ( |
206 |
dev-libs/glib[utils] |
207 |
sys-devel/bc |
208 |
)" |
209 |
RDEPEND="${CDEPEND} |
210 |
- selinux? ( sec-policy/selinux-qemu ) |
211 |
-" |
212 |
+ selinux? ( sec-policy/selinux-qemu )" |
213 |
+ |
214 |
+PATCHES=( |
215 |
+ # musl patches |
216 |
+ "${FILESDIR}"/${PN}-2.8.0-F_SHLCK-and-F_EXLCK.patch |
217 |
+ "${FILESDIR}"/${PN}-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch |
218 |
+ "${FILESDIR}"/${PN}-2.2.0-_sigev_un.patch |
219 |
+ |
220 |
+ # gentoo patches |
221 |
+ "${FILESDIR}"/${PN}-2.5.0-cflags.patch |
222 |
+ "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch |
223 |
+ "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8669-1.patch #597108 |
224 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2016-9908.patch #601826 |
225 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2016-9912.patch #602630 |
226 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2016-10028.patch #603444 |
227 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2016-10155.patch #606720 |
228 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-2615.patch #608034 |
229 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-2630.patch #609396 |
230 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5525-1.patch #606264 |
231 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5525-2.patch |
232 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5552.patch #606722 |
233 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5578.patch #607000 |
234 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5579.patch #607100 |
235 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5667.patch #607766 |
236 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5856.patch #608036 |
237 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5857.patch #608038 |
238 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5898.patch #608520 |
239 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5931.patch #608728 |
240 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5973.patch #609334 |
241 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5987.patch #609398 |
242 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-6058.patch #609638 |
243 |
+ "${FILESDIR}"/${PN}-2.8.0-CVE-2017-2620.patch #609206 |
244 |
+) |
245 |
|
246 |
STRIP_MASK="/usr/share/qemu/palcode-clipper" |
247 |
|
248 |
@@ -186,8 +222,7 @@ QA_PREBUILT=" |
249 |
usr/share/qemu/openbios-sparc32 |
250 |
usr/share/qemu/palcode-clipper |
251 |
usr/share/qemu/s390-ccw.img |
252 |
- usr/share/qemu/u-boot.e500 |
253 |
-" |
254 |
+ usr/share/qemu/u-boot.e500" |
255 |
|
256 |
QA_WX_LOAD="usr/bin/qemu-i386 |
257 |
usr/bin/qemu-x86_64 |
258 |
@@ -332,34 +367,7 @@ src_prepare() { |
259 |
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \ |
260 |
Makefile Makefile.target || die |
261 |
|
262 |
- # Patching for musl |
263 |
- epatch "${FILESDIR}"/${PN}-2.8.0-F_SHLCK-and-F_EXLCK.patch |
264 |
- epatch "${FILESDIR}"/${PN}-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch |
265 |
- epatch "${FILESDIR}"/${PN}-2.2.0-_sigev_un.patch |
266 |
- |
267 |
- epatch "${FILESDIR}"/${PN}-2.5.0-cflags.patch |
268 |
- epatch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch |
269 |
- epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8669-1.patch #597108 |
270 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2016-9908.patch #601826 |
271 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2016-9912.patch #602630 |
272 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2016-10028.patch #603444 |
273 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2016-10155.patch #606720 |
274 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-2615.patch #608034 |
275 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-2630.patch #609396 |
276 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5525-1.patch #606264 |
277 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5525-2.patch |
278 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5552.patch #606722 |
279 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5578.patch #607000 |
280 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5579.patch #607100 |
281 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5667.patch #607766 |
282 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5856.patch #608036 |
283 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5857.patch #608038 |
284 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5898.patch #608520 |
285 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5931.patch #608728 |
286 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5973.patch #609334 |
287 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5987.patch #609398 |
288 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-6058.patch #609638 |
289 |
- epatch "${FILESDIR}"/${PN}-2.8.0-CVE-2017-2620.patch #609206 |
290 |
+ default |
291 |
|
292 |
# Fix ld and objcopy being called directly |
293 |
tc-export AR LD OBJCOPY |
294 |
@@ -367,8 +375,6 @@ src_prepare() { |
295 |
# Verbose builds |
296 |
MAKEOPTS+=" V=1" |
297 |
|
298 |
- epatch_user |
299 |
- |
300 |
# Run after we've applied all patches. |
301 |
handle_locales |
302 |
} |
303 |
@@ -382,7 +388,6 @@ qemu_src_configure() { |
304 |
|
305 |
local buildtype=$1 |
306 |
local builddir="${S}/${buildtype}-build" |
307 |
- local static_flag="static-${buildtype}" |
308 |
|
309 |
mkdir "${builddir}" |
310 |
|
311 |
@@ -471,6 +476,7 @@ qemu_src_configure() { |
312 |
--disable-blobs |
313 |
--disable-tools |
314 |
) |
315 |
+ local static_flag="static-user" |
316 |
;; |
317 |
softmmu) |
318 |
# audio options |
319 |
@@ -482,20 +488,23 @@ qemu_src_configure() { |
320 |
conf_opts+=( |
321 |
--disable-linux-user |
322 |
--enable-system |
323 |
+ --disable-tools |
324 |
--with-system-pixman |
325 |
--audio-drv-list="${audio_opts}" |
326 |
) |
327 |
use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) |
328 |
use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) |
329 |
+ local static_flag="static" |
330 |
;; |
331 |
tools) |
332 |
conf_opts+=( |
333 |
--disable-linux-user |
334 |
--disable-system |
335 |
--disable-blobs |
336 |
+ --enable-tools |
337 |
$(use_enable bzip2) |
338 |
) |
339 |
- static_flag="static" |
340 |
+ local static_flag="static" |
341 |
;; |
342 |
esac |
343 |
|
344 |
@@ -551,7 +560,7 @@ src_configure() { |
345 |
|
346 |
[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" |
347 |
[[ -n ${user_targets} ]] && qemu_src_configure "user" |
348 |
- [[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools" |
349 |
+ qemu_src_configure "tools" |
350 |
} |
351 |
|
352 |
src_compile() { |
353 |
@@ -565,10 +574,8 @@ src_compile() { |
354 |
default |
355 |
fi |
356 |
|
357 |
- if [[ -z ${softmmu_targets}${user_targets} ]]; then |
358 |
- cd "${S}/tools-build" |
359 |
- default |
360 |
- fi |
361 |
+ cd "${S}/tools-build" |
362 |
+ default |
363 |
} |
364 |
|
365 |
src_test() { |
366 |
@@ -638,6 +645,7 @@ EOF |
367 |
done |
368 |
cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die |
369 |
} |
370 |
+ |
371 |
src_install() { |
372 |
if [[ -n ${user_targets} ]]; then |
373 |
cd "${S}/user-build" |
374 |
@@ -668,10 +676,8 @@ src_install() { |
375 |
fi |
376 |
fi |
377 |
|
378 |
- if [[ -z ${softmmu_targets}${user_targets} ]]; then |
379 |
- cd "${S}/tools-build" |
380 |
- emake DESTDIR="${ED}" install |
381 |
- fi |
382 |
+ cd "${S}/tools-build" |
383 |
+ emake DESTDIR="${ED}" install |
384 |
|
385 |
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348 |
386 |
pushd "${ED}"/usr/bin >/dev/null |