1 |
commit: 59aef5a6741547b1c8a27ac7feebe6a307f7aa15 |
2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 23 00:19:16 2015 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 23 02:21:02 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59aef5a6 |
7 |
|
8 |
app-emulation/xen: clean vn. 4.5.2-r1 re sec bug #566842 |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
app-emulation/xen/Manifest | 1 - |
13 |
app-emulation/xen/xen-4.5.2-r1.ebuild | 181 ---------------------------------- |
14 |
2 files changed, 182 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest |
17 |
index 9e27b4f..46d8b48 100644 |
18 |
--- a/app-emulation/xen/Manifest |
19 |
+++ b/app-emulation/xen/Manifest |
20 |
@@ -10,4 +10,3 @@ DIST xen-security-patches-2.tar.gz 7370 SHA256 f24bf4b0cba29b51ee71f6ef82654cddf |
21 |
DIST xen-security-patches-3.tar.gz 7349 SHA256 a1876b918c0a608618f349deed11b547a65c5909c31d72a89340d4908c572f46 SHA512 f5e8e7ab5d9be6aa036e52627931f1b2648de642664b2922f9cab64f44d19ac8682f5beb7fdbcb842ee19346202093fade3f10e39ba60fcb12a101deb4408818 WHIRLPOOL 14ee65babe4edd901914c8b8ddb5d7b54e6738d77642514fe611bf84541ae0a932bcb48f86179d5e7a6741135b9c7b129e8244cc22922c4e592604a696b6082f |
22 |
DIST xen-security-patches-3.tar.xz 17028 SHA256 fb6301beb9a5c2d1e5d4de8783d8670e382b1bef48ec61e73d2d9be6901d289f SHA512 787fee8f7822577c6de91c4cf4d56d0e73ce46bac5524537ff66a718b6d7eae9d362265515743e8577b2c75f2841baed9837f71467b3b7b91a3111220da5f236 WHIRLPOOL 5c136289e654776bf918fe125fbecba7dac0929b236f7ae8158026a6bd6be12bc786a5ec96cb4022c18a5e7ffde82155deb57eb9639600e4c42c9c209f4a2ed6 |
23 |
DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d |
24 |
-DIST xen-security-patches.tar.gz 2105 SHA256 19409f15fdbfbfe41b86627dd929a362563610999fc4b73ab2a9165df0ba8182 SHA512 2733e77b6a9ba25e704e0a15a32a20efe7c74873cabc5e6490f41e8d1b96d9efa83c0d16bbda6169d4bab3f5e9e9a8d7f3400f63e6b2d11cf0c63711a858cc34 WHIRLPOOL 21dda4417d938c45bf46c41f2e9aba524f484b6526fcf59a840ca30aa270148990ffc66536431b2a4b8db6f1a761b02f2266b5935e68e85935ec8dd5511dc892 |
25 |
|
26 |
diff --git a/app-emulation/xen/xen-4.5.2-r1.ebuild b/app-emulation/xen/xen-4.5.2-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 4c01335..0000000 |
29 |
--- a/app-emulation/xen/xen-4.5.2-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,181 +0,0 @@ |
32 |
-# Copyright 1999-2015 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Id$ |
35 |
- |
36 |
-EAPI=5 |
37 |
- |
38 |
-PYTHON_COMPAT=( python2_7 ) |
39 |
- |
40 |
-MY_PV=${PV/_/-} |
41 |
-MY_P=${PN}-${PV/_/-} |
42 |
- |
43 |
-if [[ $PV == *9999 ]]; then |
44 |
- KEYWORDS="" |
45 |
- EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git" |
46 |
- live_eclass="git-2" |
47 |
-else |
48 |
- KEYWORDS="amd64 ~arm ~arm64 -x86" |
49 |
- UPSTREAM_VER= |
50 |
- SECURITY_VER=0 |
51 |
- GENTOO_VER= |
52 |
- |
53 |
- [[ -n ${UPSTREAM_VER} ]] && \ |
54 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
55 |
- [[ -n ${SECURITY_VER} ]] && \ |
56 |
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" |
57 |
- [[ -n ${GENTOO_VER} ]] && \ |
58 |
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" |
59 |
- SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz |
60 |
- ${UPSTREAM_PATCHSET_URI} |
61 |
- ${SECURITY_PATCHSET_URI} |
62 |
- ${GENTOO_PATCHSET_URI} |
63 |
- https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches.tar.gz" |
64 |
- |
65 |
-fi |
66 |
- |
67 |
-inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass} |
68 |
- |
69 |
-DESCRIPTION="The Xen virtual machine monitor" |
70 |
-HOMEPAGE="http://xen.org/" |
71 |
-LICENSE="GPL-2" |
72 |
-SLOT="0" |
73 |
-IUSE="custom-cflags debug efi flask xsm" |
74 |
- |
75 |
-DEPEND="${PYTHON_DEPS} |
76 |
- efi? ( >=sys-devel/binutils-2.22[multitarget] ) |
77 |
- !efi? ( >=sys-devel/binutils-2.22[-multitarget] )" |
78 |
-RDEPEND="" |
79 |
-PDEPEND="~app-emulation/xen-tools-${PV}" |
80 |
- |
81 |
-RESTRICT="test" |
82 |
- |
83 |
-# Approved by QA team in bug #144032 |
84 |
-QA_WX_LOAD="boot/xen-syms-${PV}" |
85 |
- |
86 |
-REQUIRED_USE="flask? ( xsm ) |
87 |
- arm? ( debug )" |
88 |
- |
89 |
-S="${WORKDIR}/${MY_P}" |
90 |
- |
91 |
-pkg_setup() { |
92 |
- python-any-r1_pkg_setup |
93 |
- if [[ -z ${XEN_TARGET_ARCH} ]]; then |
94 |
- if use x86 && use amd64; then |
95 |
- die "Confusion! Both x86 and amd64 are set in your use flags!" |
96 |
- elif use x86; then |
97 |
- export XEN_TARGET_ARCH="x86_32" |
98 |
- elif 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 |
- elif use xsm ; then |
113 |
- export "XSM_ENABLE=y" |
114 |
- fi |
115 |
-} |
116 |
- |
117 |
-src_prepare() { |
118 |
- # Upstream's patchset |
119 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
120 |
- EPATCH_SUFFIX="patch" \ |
121 |
- EPATCH_FORCE="yes" \ |
122 |
- EPATCH_OPTS="-p1" \ |
123 |
- epatch "${WORKDIR}"/patches-upstream |
124 |
- fi |
125 |
- |
126 |
- if [[ -n ${SECURITY_VER} ]]; then |
127 |
- einfo "Try to apply Xen Security patcheset" |
128 |
- source "${WORKDIR}"/patches-security/${PV}.conf |
129 |
- # apply main xen patches |
130 |
- for i in ${XEN_SECURITY_MAIN}; do |
131 |
- EPATCH_SUFFIX="patch" \ |
132 |
- EPATCH_FORCE="yes" \ |
133 |
- epatch "${WORKDIR}"/patches-security/xen/$i |
134 |
- done |
135 |
- fi |
136 |
- epatch "${WORKDIR}"/xsa156-4.5.patch |
137 |
- |
138 |
- # Gentoo's patchset |
139 |
- if [[ -n ${GENTOO_VER} ]]; then |
140 |
- EPATCH_SUFFIX="patch" \ |
141 |
- EPATCH_FORCE="yes" \ |
142 |
- epatch "${WORKDIR}"/patches-gentoo |
143 |
- fi |
144 |
- |
145 |
- # Drop .config |
146 |
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" |
147 |
- |
148 |
- if use efi; then |
149 |
- epatch "${FILESDIR}"/${PN}-4.5-efi.patch |
150 |
- export EFI_VENDOR="gentoo" |
151 |
- export EFI_MOUNTPOINT="boot" |
152 |
- fi |
153 |
- |
154 |
- # if the user *really* wants to use their own custom-cflags, let them |
155 |
- if use custom-cflags; then |
156 |
- einfo "User wants their own CFLAGS - removing defaults" |
157 |
- # try and remove all the default custom-cflags |
158 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
159 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
160 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
161 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
162 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
163 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
164 |
- -i {} \; || die "failed to re-set custom-cflags" |
165 |
- fi |
166 |
- |
167 |
- # remove -Werror for gcc-4.6's sake |
168 |
- find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ |
169 |
- xargs sed -i 's/ *-Werror */ /' |
170 |
- # not strictly necessary to fix this |
171 |
- sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" |
172 |
- |
173 |
- epatch_user |
174 |
-} |
175 |
- |
176 |
-src_configure() { |
177 |
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" |
178 |
- |
179 |
- use debug && myopt="${myopt} debug=y" |
180 |
- |
181 |
- if use custom-cflags; then |
182 |
- filter-flags -fPIE -fstack-protector |
183 |
- replace-flags -O3 -O2 |
184 |
- else |
185 |
- unset CFLAGS |
186 |
- fi |
187 |
-} |
188 |
- |
189 |
-src_compile() { |
190 |
- # Send raw LDFLAGS so that --as-needed works |
191 |
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} |
192 |
-} |
193 |
- |
194 |
-src_install() { |
195 |
- local myopt |
196 |
- use debug && myopt="${myopt} debug=y" |
197 |
- |
198 |
- # The 'make install' doesn't 'mkdir -p' the subdirs |
199 |
- if use efi; then |
200 |
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die |
201 |
- fi |
202 |
- |
203 |
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install |
204 |
-} |
205 |
- |
206 |
-pkg_postinst() { |
207 |
- elog "Official Xen Guide and the unoffical wiki page:" |
208 |
- elog " https://wiki.gentoo.org/wiki/Xen" |
209 |
- elog " http://en.gentoo-wiki.com/wiki/Xen/" |
210 |
- |
211 |
- use efi && einfo "The efi executable is installed in boot/efi/gentoo" |
212 |
-} |