1 |
commit: 42d847bafda98ec12728acdd9bca716336ae248f |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 14 15:17:01 2019 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 14 15:18:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d847ba |
7 |
|
8 |
app-emulation/xen: cleanup & drop vulnerable version |
9 |
|
10 |
Fix XSA-{304,305} |
11 |
|
12 |
Bug: https://bugs.gentoo.org/699996 |
13 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
14 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
15 |
|
16 |
app-emulation/xen/Manifest | 1 - |
17 |
app-emulation/xen/xen-4.11.2-r1.ebuild | 154 --------------------------------- |
18 |
2 files changed, 155 deletions(-) |
19 |
|
20 |
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest |
21 |
index de910f0e671..5d5ffc07cec 100644 |
22 |
--- a/app-emulation/xen/Manifest |
23 |
+++ b/app-emulation/xen/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
-DIST xen-4.11.2-upstream-patches-1.tar.xz 77556 BLAKE2B f95af370f8a99a27bfc762e661364da6f1ef1b08dd5a6b81a5421d32bcad820097a694c5656e174cec7ed53ff140f80d63f57ac31867edf12e68ef4d87ea8b44 SHA512 f41f2ff20648eed76918c865958d42b99d2743188514c63e27797c80e9169f7f5843ac48195e38d269d02edcb9889f042b992b85773ca61c267282e41ea8dae6 |
26 |
DIST xen-4.11.2-upstream-patches-2.tar.xz 86812 BLAKE2B c2dcb7e031f9dd0a18fed5705f1c81901e94264d8bc0993a8e6c10108ac01efc6a52487076ece078a96395608c6233f26696c6b9d4f89d0f034f5e14dd546793 SHA512 c11b848396258a403c8148c054f9ac5650e149a50aba3ee1554bbacda6e2fcc4c84b8e02a1bb1bcfaf406c637165ac3fe6ea6826365875444098fce30112136e |
27 |
DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e |
28 |
DIST xen-4.12.1-upstream-patches-2.tar.xz 72316 BLAKE2B 6297a52ba39363b71115d1582af7ee05e5fb7aea7b0fb8717d717d212949ce2f249764f5dc3f992ce16b1f82118a8de2018e8dd3e8306bb18e82db6d141b9f9a SHA512 ff4c804c094bd86896e14f8288499a1cf86d7ddb10c566c3998b432787937d782f9ba94b9f0d7affc6ada891c1abeb0012f541d07ab93428b2bbff71c06eae20 |
29 |
|
30 |
diff --git a/app-emulation/xen/xen-4.11.2-r1.ebuild b/app-emulation/xen/xen-4.11.2-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 40dd9f3cfa9..00000000000 |
33 |
--- a/app-emulation/xen/xen-4.11.2-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,154 +0,0 @@ |
36 |
-# Copyright 1999-2019 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-PYTHON_COMPAT=( python2_7 ) |
42 |
- |
43 |
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs |
44 |
- |
45 |
-MY_PV=${PV/_/-} |
46 |
-MY_P=${PN}-${MY_PV} |
47 |
- |
48 |
-if [[ $PV == *9999 ]]; then |
49 |
- inherit git-r3 |
50 |
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git" |
51 |
- SRC_URI="" |
52 |
-else |
53 |
- KEYWORDS="amd64 ~arm -x86" |
54 |
- UPSTREAM_VER=1 |
55 |
- SECURITY_VER= |
56 |
- GENTOO_VER= |
57 |
- |
58 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
59 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz |
60 |
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
61 |
- [[ -n ${SECURITY_VER} ]] && \ |
62 |
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
63 |
- [[ -n ${GENTOO_VER} ]] && \ |
64 |
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
65 |
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz |
66 |
- ${UPSTREAM_PATCHSET_URI} |
67 |
- ${SECURITY_PATCHSET_URI} |
68 |
- ${GENTOO_PATCHSET_URI}" |
69 |
-fi |
70 |
- |
71 |
-DESCRIPTION="The Xen virtual machine monitor" |
72 |
-HOMEPAGE="https://www.xenproject.org" |
73 |
-LICENSE="GPL-2" |
74 |
-SLOT="0" |
75 |
-IUSE="debug efi flask" |
76 |
- |
77 |
-DEPEND="${PYTHON_DEPS} |
78 |
- efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
79 |
- !efi? ( >=sys-devel/binutils-2.22 )" |
80 |
-RDEPEND="" |
81 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
82 |
- |
83 |
-# no tests are available for the hypervisor |
84 |
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files |
85 |
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms |
86 |
-RESTRICT="test splitdebug strip" |
87 |
- |
88 |
-# Approved by QA team in bug #144032 |
89 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
90 |
- |
91 |
-REQUIRED_USE="arm? ( debug )" |
92 |
- |
93 |
-S="${WORKDIR}/${MY_P}" |
94 |
- |
95 |
-pkg_setup() { |
96 |
- python-any-r1_pkg_setup |
97 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
98 |
- if use amd64; then |
99 |
- export XEN_TARGET_ARCH="x86_64" |
100 |
- elif use arm; then |
101 |
- export XEN_TARGET_ARCH="arm32" |
102 |
- elif use arm64; then |
103 |
- export XEN_TARGET_ARCH="arm64" |
104 |
- else |
105 |
- die "Unsupported architecture!" |
106 |
- fi |
107 |
- fi |
108 |
- |
109 |
- if use flask ; then |
110 |
- export "XSM_ENABLE=y" |
111 |
- export "FLASK_ENABLE=y" |
112 |
- fi |
113 |
-} |
114 |
- |
115 |
-src_prepare() { |
116 |
- # Upstream's patchset |
117 |
- [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream |
118 |
- |
119 |
- # Security patchset |
120 |
- if [[ -n ${SECURITY_VER} ]]; then |
121 |
- einfo "Try to apply Xen Security patch set" |
122 |
- # apply main xen patches |
123 |
- # Two parallel systems, both work side by side |
124 |
- # Over time they may concdense into one. This will suffice for now |
125 |
- source "${WORKDIR}"/patches-security/${PV}.conf |
126 |
- |
127 |
- local i |
128 |
- for i in ${XEN_SECURITY_MAIN}; do |
129 |
- eapply "${WORKDIR}"/patches-security/xen/$i |
130 |
- done |
131 |
- fi |
132 |
- |
133 |
- # Gentoo's patchset |
134 |
- [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo |
135 |
- |
136 |
- eapply "${FILESDIR}"/${PN}-4.6-efi.patch |
137 |
- |
138 |
- # Drop .config |
139 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
140 |
- |
141 |
- if use efi; then |
142 |
- export EFI_VENDOR="gentoo" |
143 |
- export EFI_MOUNTPOINT="boot" |
144 |
- fi |
145 |
- |
146 |
- default |
147 |
-} |
148 |
- |
149 |
-src_configure() { |
150 |
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
151 |
- |
152 |
- use debug && myopt="${myopt} debug=y" |
153 |
- |
154 |
- # remove flags |
155 |
- unset CFLAGS |
156 |
- unset LDFLAGS |
157 |
- unset ASFLAGS |
158 |
-} |
159 |
- |
160 |
-src_compile() { |
161 |
- # Send raw LDFLAGS so that --as-needed works |
162 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
163 |
-} |
164 |
- |
165 |
-src_install() { |
166 |
- local myopt |
167 |
- use debug && myopt="${myopt} debug=y" |
168 |
- |
169 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
170 |
- if use efi; then |
171 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
172 |
- fi |
173 |
- |
174 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
175 |
- |
176 |
- # make install likes to throw in some extra EFI bits if it built |
177 |
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi" |
178 |
-} |
179 |
- |
180 |
-pkg_postinst() { |
181 |
- elog "Official Xen Guide:" |
182 |
- elog " https://wiki.gentoo.org/wiki/Xen" |
183 |
- |
184 |
- use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
185 |
- |
186 |
- elog "You can optionally block the installation of /boot/xen-syms by an entry" |
187 |
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" |
188 |
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" |
189 |
-} |