Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/
Date: Mon, 04 Nov 2019 11:52:07
Message-Id: 1572868224.2920d838eeae8c990ab9cfca0a24806f8e4c0a98.dlan@gentoo
1 commit: 2920d838eeae8c990ab9cfca0a24806f8e4c0a98
2 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Mon Nov 4 08:48:55 2019 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 4 11:50:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2920d838
7
8 app-emulation/xen: drop vulnerable version
9
10 Closes: https://github.com/gentoo/gentoo/pull/13543
11 Bug: https://bugs.gentoo.org/699048
12 Package-Manager: Portage-2.3.78, Repoman-2.3.17
13 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
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.ebuild | 171 ------------------------------------
18 2 files changed, 172 deletions(-)
19
20 diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
21 index 522060d34fd..364dcaa0492 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-0.tar.xz 11532 BLAKE2B e36509d6256ac4018f20711baba77619a7c3a684d81e25a94cffba9c9f53ec9e0efdcefcd6a7ffa26b49fd3d4e0dfc2126f1ea620f0bd35ea83188b4587e5b38 SHA512 4a97d1e56cb3e5152372f0c0b99f8838194b2e03ed1255e87611d8bb28af9c9199fe123d3542f5ba9b3f652c29a519b5e4255b8925c0c8dfbd588f83ed8806d9
26 DIST xen-4.11.2-upstream-patches-1.tar.xz 77556 BLAKE2B f95af370f8a99a27bfc762e661364da6f1ef1b08dd5a6b81a5421d32bcad820097a694c5656e174cec7ed53ff140f80d63f57ac31867edf12e68ef4d87ea8b44 SHA512 f41f2ff20648eed76918c865958d42b99d2743188514c63e27797c80e9169f7f5843ac48195e38d269d02edcb9889f042b992b85773ca61c267282e41ea8dae6
27 DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
28 DIST xen-4.12.1-upstream-patches-1.tar.xz 62920 BLAKE2B a7f070e4b48c04fa26b75ccbd46aa1172df306060ae180f29f5ea61a5f0b4c2e854a5d1127ed42c05b21977a0e43b36b7e137c1758496b242f48626c5a00e22b SHA512 d7094b86f297a4b1da7007d73752ca8478a26c675ec5d93ade4599935cd51ebd80220a4ea7223d878e0d2c2209336577d196017c463abe9e47ff20914ffa5021
29
30 diff --git a/app-emulation/xen/xen-4.11.2.ebuild b/app-emulation/xen/xen-4.11.2.ebuild
31 deleted file mode 100644
32 index b5c663a0742..00000000000
33 --- a/app-emulation/xen/xen-4.11.2.ebuild
34 +++ /dev/null
35 @@ -1,171 +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=0
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="custom-cflags 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 - # if the user *really* wants to use their own custom-cflags, let them
147 - if use custom-cflags; then
148 - einfo "User wants their own CFLAGS - removing defaults"
149 - # try and remove all the default custom-cflags
150 - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
151 - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
152 - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
153 - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
154 - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
155 - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
156 - -i {} \; || die "failed to re-set custom-cflags"
157 - fi
158 -
159 - default
160 -}
161 -
162 -src_configure() {
163 - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
164 -
165 - use debug && myopt="${myopt} debug=y"
166 -
167 - if use custom-cflags; then
168 - filter-flags -fPIE -fstack-protector
169 - replace-flags -O3 -O2
170 - else
171 - unset CFLAGS
172 - unset LDFLAGS
173 - unset ASFLAGS
174 - fi
175 -}
176 -
177 -src_compile() {
178 - # Send raw LDFLAGS so that --as-needed works
179 - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
180 -}
181 -
182 -src_install() {
183 - local myopt
184 - use debug && myopt="${myopt} debug=y"
185 -
186 - # The 'make install' doesn't 'mkdir -p' the subdirs
187 - if use efi; then
188 - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
189 - fi
190 -
191 - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
192 -
193 - # make install likes to throw in some extra EFI bits if it built
194 - use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
195 -}
196 -
197 -pkg_postinst() {
198 - elog "Official Xen Guide:"
199 - elog " https://wiki.gentoo.org/wiki/Xen"
200 -
201 - use efi && einfo "The efi executable is installed in boot/efi/gentoo"
202 -
203 - elog "You can optionally block the installation of /boot/xen-syms by an entry"
204 - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
205 - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
206 -}