1 |
commit: 24cf06655a5ef421f768e7a26dfa29fbf9c1dc03 |
2 |
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Oct 21 08:02:32 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 26 14:13:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cf0665 |
7 |
|
8 |
app-emulation/xen: drop vulnerable |
9 |
|
10 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/17987 |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
app-emulation/xen/Manifest | 2 - |
15 |
app-emulation/xen/xen-4.13.1-r3.ebuild | 165 --------------------------------- |
16 |
app-emulation/xen/xen-4.14.0-r2.ebuild | 165 --------------------------------- |
17 |
3 files changed, 332 deletions(-) |
18 |
|
19 |
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest |
20 |
index e8ed663dfe8..8e18f8dc978 100644 |
21 |
--- a/app-emulation/xen/Manifest |
22 |
+++ b/app-emulation/xen/Manifest |
23 |
@@ -1,7 +1,5 @@ |
24 |
-DIST xen-4.13.1-upstream-patches-2.tar.xz 53744 BLAKE2B 769b5b8022f7db66f677d8107c6473606376718bffeac7eba09c4270f4005811f472fb9ed2a2804260e0486228edbadfcf8f81bf1dae6d68df37da213d281390 SHA512 b07c865b96c6f48b9d0b4e4c2f3ec19f4dc44884f4024e440a3e537f594f9f5edd6edf805bdefc82e5f1f2520f35f940b64c158972cbf5bfdc8fb2ca7a1b0ac1 |
25 |
DIST xen-4.13.1-upstream-patches-3.tar.xz 87056 BLAKE2B 01d7133b8f7e3c9a42b9771dcb7739777f79f229941114cce70ba2897dd52bf53f08de35602a0b40a120fc155c274dbf91e107856f4afdae2c4f7b4bc0a67cdd SHA512 d67e9ddfbf27dc5a23a77679b1b2524a49c2aec3ff9eb3472f9e075893d87401f8e99707b0652744eb4af7a3ed9a815c3925de49995bcd7c82d97c13a69b5309 |
26 |
DIST xen-4.13.1-upstream-patches-4.tar.xz 100580 BLAKE2B 1ac4ac5fe7aa7da2b486f2ac5ae60b96cf3c012acac50e8472b88ae273d99e9545f48a896f21eebd5e58427a817e11aa9806d9b45750784fc5382cbadf8162d4 SHA512 54230ea6aa2add038a438d46caae3bba83f2cc8b92021e2c34761015ec08a807331767d432bfa2c7bab864f5b8d0d667c68fc04a089fd35eda9a4f0afd4f6df6 |
27 |
DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90 |
28 |
-DIST xen-4.14.0-upstream-patches-1.tar.xz 45360 BLAKE2B 0f72a2cc3d18557b86a2a83f97e4141be46a20e3ba59ccc881a34a4408988eba9827e3b927bc07aba9678123d783303e7d47d789e57323a7f6691d718c019dc8 SHA512 3d5093e4367d27e7f6e8d4cc31841a5c80cc3fb870d6cb32131d064e16cbb559e9a783c70eec1ce13c960b3e2a8d5e23e18d26b936bc418b434df3bb801d3e4f |
29 |
DIST xen-4.14.0-upstream-patches-2.tar.xz 62512 BLAKE2B 0ab30f542809bc09b45ef88e1a60bedfa9273cd13b4f8a7b770c75432eedd5cfcd9c7f34845ebbc6fe98479aded4ea88e4c71071a88c6c12a898392e5f441312 SHA512 50a1452007cb94abb9a535dfba5e1e0fe627b8c79773221203cc960f067861870d610c04ba6811d987bb40423fc9084c9966bac817bd7484f5789a69598397f0 |
30 |
DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0 |
31 |
|
32 |
diff --git a/app-emulation/xen/xen-4.13.1-r3.ebuild b/app-emulation/xen/xen-4.13.1-r3.ebuild |
33 |
deleted file mode 100644 |
34 |
index 11f6a671698..00000000000 |
35 |
--- a/app-emulation/xen/xen-4.13.1-r3.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,165 +0,0 @@ |
38 |
-# Copyright 1999-2020 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=7 |
42 |
- |
43 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
44 |
- |
45 |
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs |
46 |
- |
47 |
-MY_PV=${PV/_/-} |
48 |
-MY_P=${PN}-${MY_PV} |
49 |
- |
50 |
-if [[ $PV == *9999 ]]; then |
51 |
- inherit git-r3 |
52 |
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git" |
53 |
- SRC_URI="" |
54 |
-else |
55 |
- KEYWORDS="amd64 ~arm -x86" |
56 |
- UPSTREAM_VER=2 |
57 |
- SECURITY_VER= |
58 |
- GENTOO_VER= |
59 |
- |
60 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
61 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz |
62 |
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
63 |
- [[ -n ${SECURITY_VER} ]] && \ |
64 |
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
65 |
- [[ -n ${GENTOO_VER} ]] && \ |
66 |
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
67 |
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz |
68 |
- ${UPSTREAM_PATCHSET_URI} |
69 |
- ${SECURITY_PATCHSET_URI} |
70 |
- ${GENTOO_PATCHSET_URI}" |
71 |
-fi |
72 |
- |
73 |
-DESCRIPTION="The Xen virtual machine monitor" |
74 |
-HOMEPAGE="https://www.xenproject.org" |
75 |
-LICENSE="GPL-2" |
76 |
-SLOT="0" |
77 |
-IUSE="debug efi flask" |
78 |
- |
79 |
-DEPEND="${PYTHON_DEPS} |
80 |
- efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
81 |
- !efi? ( >=sys-devel/binutils-2.22 )" |
82 |
-RDEPEND="" |
83 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
84 |
- |
85 |
-# no tests are available for the hypervisor |
86 |
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files |
87 |
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms |
88 |
-RESTRICT="test splitdebug strip" |
89 |
- |
90 |
-# Approved by QA team in bug #144032 |
91 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
92 |
- |
93 |
-REQUIRED_USE="arm? ( debug )" |
94 |
- |
95 |
-S="${WORKDIR}/${MY_P}" |
96 |
- |
97 |
-pkg_setup() { |
98 |
- python-any-r1_pkg_setup |
99 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
100 |
- if use amd64; then |
101 |
- export XEN_TARGET_ARCH="x86_64" |
102 |
- elif use arm; then |
103 |
- export XEN_TARGET_ARCH="arm32" |
104 |
- elif use arm64; then |
105 |
- export XEN_TARGET_ARCH="arm64" |
106 |
- else |
107 |
- die "Unsupported architecture!" |
108 |
- fi |
109 |
- fi |
110 |
- |
111 |
- if use flask ; then |
112 |
- export "XSM_ENABLE=y" |
113 |
- export "FLASK_ENABLE=y" |
114 |
- fi |
115 |
-} |
116 |
- |
117 |
-src_prepare() { |
118 |
- # Upstream's patchset |
119 |
- [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream |
120 |
- |
121 |
- # Security patchset |
122 |
- if [[ -n ${SECURITY_VER} ]]; then |
123 |
- einfo "Try to apply Xen Security patch set" |
124 |
- # apply main xen patches |
125 |
- # Two parallel systems, both work side by side |
126 |
- # Over time they may concdense into one. This will suffice for now |
127 |
- source "${WORKDIR}"/patches-security/${PV}.conf |
128 |
- |
129 |
- local i |
130 |
- for i in ${XEN_SECURITY_MAIN}; do |
131 |
- eapply "${WORKDIR}"/patches-security/xen/$i |
132 |
- done |
133 |
- fi |
134 |
- |
135 |
- # Gentoo's patchset |
136 |
- [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo |
137 |
- |
138 |
- eapply "${FILESDIR}"/${PN}-4.11-efi.patch |
139 |
- |
140 |
- # Drop .config |
141 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
142 |
- |
143 |
- if use efi; then |
144 |
- export EFI_VENDOR="gentoo" |
145 |
- export EFI_MOUNTPOINT="/boot" |
146 |
- fi |
147 |
- |
148 |
- default |
149 |
-} |
150 |
- |
151 |
-src_configure() { |
152 |
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
153 |
- |
154 |
- use debug && myopt="${myopt} debug=y" |
155 |
- |
156 |
- # remove flags |
157 |
- unset CFLAGS |
158 |
- unset LDFLAGS |
159 |
- unset ASFLAGS |
160 |
- |
161 |
- tc-ld-disable-gold # Bug 700374 |
162 |
-} |
163 |
- |
164 |
-src_compile() { |
165 |
- # Send raw LDFLAGS so that --as-needed works |
166 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
167 |
-} |
168 |
- |
169 |
-src_install() { |
170 |
- local myopt |
171 |
- use debug && myopt="${myopt} debug=y" |
172 |
- |
173 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
174 |
- if use efi; then |
175 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
176 |
- fi |
177 |
- |
178 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
179 |
- |
180 |
- # make install likes to throw in some extra EFI bits if it built |
181 |
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi" |
182 |
-} |
183 |
- |
184 |
-pkg_postinst() { |
185 |
- elog "Official Xen Guide:" |
186 |
- elog " https://wiki.gentoo.org/wiki/Xen" |
187 |
- |
188 |
- use efi && einfo "The efi executable is installed in /boot/efi/gentoo" |
189 |
- |
190 |
- elog "You can optionally block the installation of /boot/xen-syms by an entry" |
191 |
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" |
192 |
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" |
193 |
- |
194 |
- ewarn |
195 |
- ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause" |
196 |
- ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems" |
197 |
- ewarn "to work fine." |
198 |
- ewarn |
199 |
- ewarn "Add sched=credit to xen command line options to use the legacy scheduler." |
200 |
- ewarn |
201 |
- ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B" |
202 |
-} |
203 |
|
204 |
diff --git a/app-emulation/xen/xen-4.14.0-r2.ebuild b/app-emulation/xen/xen-4.14.0-r2.ebuild |
205 |
deleted file mode 100644 |
206 |
index 2738d77fd9d..00000000000 |
207 |
--- a/app-emulation/xen/xen-4.14.0-r2.ebuild |
208 |
+++ /dev/null |
209 |
@@ -1,165 +0,0 @@ |
210 |
-# Copyright 1999-2020 Gentoo Authors |
211 |
-# Distributed under the terms of the GNU General Public License v2 |
212 |
- |
213 |
-EAPI=7 |
214 |
- |
215 |
-PYTHON_COMPAT=( python3_{6..9} ) |
216 |
- |
217 |
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs |
218 |
- |
219 |
-MY_PV=${PV/_/-} |
220 |
-MY_P=${PN}-${MY_PV} |
221 |
- |
222 |
-if [[ $PV == *9999 ]]; then |
223 |
- inherit git-r3 |
224 |
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git" |
225 |
- SRC_URI="" |
226 |
-else |
227 |
- KEYWORDS="~amd64 ~arm -x86" |
228 |
- UPSTREAM_VER=1 |
229 |
- SECURITY_VER= |
230 |
- GENTOO_VER= |
231 |
- |
232 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
233 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz |
234 |
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
235 |
- [[ -n ${SECURITY_VER} ]] && \ |
236 |
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
237 |
- [[ -n ${GENTOO_VER} ]] && \ |
238 |
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
239 |
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz |
240 |
- ${UPSTREAM_PATCHSET_URI} |
241 |
- ${SECURITY_PATCHSET_URI} |
242 |
- ${GENTOO_PATCHSET_URI}" |
243 |
-fi |
244 |
- |
245 |
-DESCRIPTION="The Xen virtual machine monitor" |
246 |
-HOMEPAGE="https://www.xenproject.org" |
247 |
-LICENSE="GPL-2" |
248 |
-SLOT="0" |
249 |
-IUSE="debug efi flask" |
250 |
- |
251 |
-DEPEND="${PYTHON_DEPS} |
252 |
- efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
253 |
- !efi? ( >=sys-devel/binutils-2.22 )" |
254 |
-RDEPEND="" |
255 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
256 |
- |
257 |
-# no tests are available for the hypervisor |
258 |
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files |
259 |
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms |
260 |
-RESTRICT="test splitdebug strip" |
261 |
- |
262 |
-# Approved by QA team in bug #144032 |
263 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
264 |
- |
265 |
-REQUIRED_USE="arm? ( debug )" |
266 |
- |
267 |
-S="${WORKDIR}/${MY_P}" |
268 |
- |
269 |
-pkg_setup() { |
270 |
- python-any-r1_pkg_setup |
271 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
272 |
- if use amd64; then |
273 |
- export XEN_TARGET_ARCH="x86_64" |
274 |
- elif use arm; then |
275 |
- export XEN_TARGET_ARCH="arm32" |
276 |
- elif use arm64; then |
277 |
- export XEN_TARGET_ARCH="arm64" |
278 |
- else |
279 |
- die "Unsupported architecture!" |
280 |
- fi |
281 |
- fi |
282 |
- |
283 |
- if use flask ; then |
284 |
- export "XSM_ENABLE=y" |
285 |
- export "FLASK_ENABLE=y" |
286 |
- fi |
287 |
-} |
288 |
- |
289 |
-src_prepare() { |
290 |
- # Upstream's patchset |
291 |
- [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream |
292 |
- |
293 |
- # Security patchset |
294 |
- if [[ -n ${SECURITY_VER} ]]; then |
295 |
- einfo "Try to apply Xen Security patch set" |
296 |
- # apply main xen patches |
297 |
- # Two parallel systems, both work side by side |
298 |
- # Over time they may concdense into one. This will suffice for now |
299 |
- source "${WORKDIR}"/patches-security/${PV}.conf |
300 |
- |
301 |
- local i |
302 |
- for i in ${XEN_SECURITY_MAIN}; do |
303 |
- eapply "${WORKDIR}"/patches-security/xen/$i |
304 |
- done |
305 |
- fi |
306 |
- |
307 |
- # Gentoo's patchset |
308 |
- [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo |
309 |
- |
310 |
- eapply "${FILESDIR}"/${PN}-4.14-efi.patch |
311 |
- |
312 |
- # Drop .config |
313 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
314 |
- |
315 |
- if use efi; then |
316 |
- export EFI_VENDOR="gentoo" |
317 |
- export EFI_MOUNTPOINT="/boot" |
318 |
- fi |
319 |
- |
320 |
- default |
321 |
-} |
322 |
- |
323 |
-src_configure() { |
324 |
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
325 |
- |
326 |
- use debug && myopt="${myopt} debug=y" |
327 |
- |
328 |
- # remove flags |
329 |
- unset CFLAGS |
330 |
- unset LDFLAGS |
331 |
- unset ASFLAGS |
332 |
- |
333 |
- tc-ld-disable-gold # Bug 700374 |
334 |
-} |
335 |
- |
336 |
-src_compile() { |
337 |
- # Send raw LDFLAGS so that --as-needed works |
338 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
339 |
-} |
340 |
- |
341 |
-src_install() { |
342 |
- local myopt |
343 |
- use debug && myopt="${myopt} debug=y" |
344 |
- |
345 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
346 |
- if use efi; then |
347 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
348 |
- fi |
349 |
- |
350 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
351 |
- |
352 |
- # make install likes to throw in some extra EFI bits if it built |
353 |
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi" |
354 |
-} |
355 |
- |
356 |
-pkg_postinst() { |
357 |
- elog "Official Xen Guide:" |
358 |
- elog " https://wiki.gentoo.org/wiki/Xen" |
359 |
- |
360 |
- use efi && einfo "The efi executable is installed in /boot/efi/gentoo" |
361 |
- |
362 |
- elog "You can optionally block the installation of /boot/xen-syms by an entry" |
363 |
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" |
364 |
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" |
365 |
- |
366 |
- ewarn |
367 |
- ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause" |
368 |
- ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems" |
369 |
- ewarn "to work fine." |
370 |
- ewarn |
371 |
- ewarn "Add sched=credit to xen command line options to use the legacy scheduler." |
372 |
- ewarn |
373 |
- ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B" |
374 |
-} |