Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ian Delaney (idella4)" <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/xen: xen-4.3.1-r1.ebuild xen-4.3.0-r4.ebuild ChangeLog xen-4.3.1.ebuild xen-4.3.0-r3.ebuild
Date: Fri, 06 Dec 2013 14:13:12
Message-Id: 20131206141304.7852C2004B@flycatcher.gentoo.org
1 idella4 13/12/06 14:13:04
2
3 Modified: ChangeLog
4 Added: xen-4.3.1-r1.ebuild xen-4.3.0-r4.ebuild
5 Removed: xen-4.3.1.ebuild xen-4.3.0-r3.ebuild
6 Log:
7 revbumps; add sec XSA-82.patch, remove old
8
9 (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
10
11 Revision Changes Path
12 1.134 app-emulation/xen/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.134&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.134&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?r1=1.133&r2=1.134
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v
21 retrieving revision 1.133
22 retrieving revision 1.134
23 diff -u -r1.133 -r1.134
24 --- ChangeLog 24 Nov 2013 06:55:49 -0000 1.133
25 +++ ChangeLog 6 Dec 2013 14:13:04 -0000 1.134
26 @@ -1,6 +1,14 @@
27 # ChangeLog for app-emulation/xen
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.133 2013/11/24 06:55:49 idella4 Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.134 2013/12/06 14:13:04 idella4 Exp $
31 +
32 +*xen-4.3.0-r4 (06 Dec 2013)
33 +*xen-4.3.1-r1 (06 Dec 2013)
34 +
35 + 06 Dec 2013; Ian Delaney <idella4@g.o>
36 + +files/xen-CVE-2013-6885-XSA-82.patch, +xen-4.3.0-r4.ebuild,
37 + +xen-4.3.1-r1.ebuild, -xen-4.3.0-r3.ebuild, -xen-4.3.1.ebuild:
38 + revbumps; add sec XSA-82.patch, remove old
39
40 *xen-4.3.1 (24 Nov 2013)
41
42
43
44
45 1.1 app-emulation/xen/xen-4.3.1-r1.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.3.1-r1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.3.1-r1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: xen-4.3.1-r1.ebuild
51 ===================================================================
52 # Copyright 1999-2013 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.1-r1.ebuild,v 1.1 2013/12/06 14:13:04 idella4 Exp $
55
56 EAPI=5
57
58 PYTHON_COMPAT=( python2_7 )
59
60 if [[ $PV == *9999 ]]; then
61 KEYWORDS=""
62 REPO="xen-unstable.hg"
63 EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
64 S="${WORKDIR}/${REPO}"
65 live_eclass="mercurial"
66 else
67 KEYWORDS="~amd64 ~x86"
68 SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
69 fi
70
71 inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
72
73 DESCRIPTION="The Xen virtual machine monitor"
74 HOMEPAGE="http://xen.org/"
75 LICENSE="GPL-2"
76 SLOT="0"
77 IUSE="custom-cflags debug efi flask pae xsm"
78
79 DEPEND="${PYTHON_DEPS}
80 efi? ( >=sys-devel/binutils-2.22[multitarget] )
81 !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
82 RDEPEND=""
83 PDEPEND="~app-emulation/xen-tools-${PV}"
84
85 RESTRICT="test"
86
87 # Approved by QA team in bug #144032
88 QA_WX_LOAD="boot/xen-syms-${PV}"
89
90 REQUIRED_USE="flask? ( xsm )"
91
92 pkg_setup() {
93 python-any-r1_pkg_setup
94 if [[ -z ${XEN_TARGET_ARCH} ]]; then
95 if use x86 && use amd64; then
96 die "Confusion! Both x86 and amd64 are set in your use flags!"
97 elif use x86; then
98 export XEN_TARGET_ARCH="x86_32"
99 elif use amd64; then
100 export XEN_TARGET_ARCH="x86_64"
101 else
102 die "Unsupported architecture!"
103 fi
104 fi
105
106 if use flask ; then
107 export "XSM_ENABLE=y"
108 export "FLASK_ENABLE=y"
109 elif use xsm ; then
110 export "XSM_ENABLE=y"
111 fi
112 }
113
114 src_prepare() {
115 # Drop .config and fix gcc-4.6
116 epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
117
118 if use efi; then
119 epatch "${FILESDIR}"/${PN}-4.2-efi.patch
120 export EFI_VENDOR="gentoo"
121 export EFI_MOUNTPOINT="boot"
122 fi
123
124 # if the user *really* wants to use their own custom-cflags, let them
125 if use custom-cflags; then
126 einfo "User wants their own CFLAGS - removing defaults"
127 # try and remove all the default custom-cflags
128 find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
129 -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
130 -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
131 -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
132 -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
133 -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
134 -i {} \; || die "failed to re-set custom-cflags"
135 fi
136
137 # not strictly necessary to fix this
138 sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
139
140 # Security patches
141 epatch "${FILESDIR}"/${PN}-CVE-2013-4375-XSA-71.patch \
142 "${FILESDIR}"/${PN}-CVE-2013-4494-XSA-73.patch \
143 "${FILESDIR}"/${PN}-4.3-CVE-2013-6375-XSA-75.patch \
144 "${FILESDIR}"/${PN}-CVE-2013-6375-XSA-78.patch \
145 "${FILESDIR}"/${PN}-CVE-2013-6885-XSA-82.patch
146
147 epatch_user
148 }
149
150 src_configure() {
151 use debug && myopt="${myopt} debug=y"
152 use pae && myopt="${myopt} pae=y"
153
154 if use custom-cflags; then
155 filter-flags -fPIE -fstack-protector
156 replace-flags -O3 -O2
157 else
158 unset CFLAGS
159 fi
160 }
161
162 src_compile() {
163 # Send raw LDFLAGS so that --as-needed works
164 emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
165 }
166
167 src_install() {
168 local myopt
169 use debug && myopt="${myopt} debug=y"
170 use pae && myopt="${myopt} pae=y"
171
172 # The 'make install' doesn't 'mkdir -p' the subdirs
173 if use efi; then
174 mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
175 fi
176
177 emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
178 }
179
180 pkg_postinst() {
181 elog "Official Xen Guide and the unoffical wiki page:"
182 elog " http://www.gentoo.org/doc/en/xen-guide.xml"
183 elog " http://en.gentoo-wiki.com/wiki/Xen/"
184
185 use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
186 use efi && einfo "The efi executable is installed in boot/efi/gentoo"
187 }
188
189
190
191 1.1 app-emulation/xen/xen-4.3.0-r4.ebuild
192
193 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.3.0-r4.ebuild?rev=1.1&view=markup
194 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.3.0-r4.ebuild?rev=1.1&content-type=text/plain
195
196 Index: xen-4.3.0-r4.ebuild
197 ===================================================================
198 # Copyright 1999-2013 Gentoo Foundation
199 # Distributed under the terms of the GNU General Public License v2
200 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.0-r4.ebuild,v 1.1 2013/12/06 14:13:04 idella4 Exp $
201
202 EAPI=5
203
204 PYTHON_COMPAT=( python2_7 )
205
206 if [[ $PV == *9999 ]]; then
207 KEYWORDS=""
208 REPO="xen-unstable.hg"
209 EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
210 S="${WORKDIR}/${REPO}"
211 live_eclass="mercurial"
212 else
213 KEYWORDS="~amd64 ~x86"
214 SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
215 fi
216
217 inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
218
219 DESCRIPTION="The Xen virtual machine monitor"
220 HOMEPAGE="http://xen.org/"
221 LICENSE="GPL-2"
222 SLOT="0"
223 IUSE="custom-cflags debug efi flask pae xsm"
224
225 DEPEND="${PYTHON_DEPS}
226 efi? ( >=sys-devel/binutils-2.22[multitarget] )
227 !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
228 RDEPEND=""
229 PDEPEND="~app-emulation/xen-tools-${PV}"
230
231 RESTRICT="test"
232
233 # Approved by QA team in bug #144032
234 QA_WX_LOAD="boot/xen-syms-${PV}"
235
236 REQUIRED_USE="flask? ( xsm )"
237
238 pkg_setup() {
239 python-any-r1_pkg_setup
240 if [[ -z ${XEN_TARGET_ARCH} ]]; then
241 if use x86 && use amd64; then
242 die "Confusion! Both x86 and amd64 are set in your use flags!"
243 elif use x86; then
244 export XEN_TARGET_ARCH="x86_32"
245 elif use amd64; then
246 export XEN_TARGET_ARCH="x86_64"
247 else
248 die "Unsupported architecture!"
249 fi
250 fi
251
252 if use flask ; then
253 export "XSM_ENABLE=y"
254 export "FLASK_ENABLE=y"
255 elif use xsm ; then
256 export "XSM_ENABLE=y"
257 fi
258 }
259
260 src_prepare() {
261 # Drop .config and fix gcc-4.6
262 epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
263
264 if use efi; then
265 epatch "${FILESDIR}"/${PN}-4.2-efi.patch
266 export EFI_VENDOR="gentoo"
267 export EFI_MOUNTPOINT="boot"
268 fi
269
270 # if the user *really* wants to use their own custom-cflags, let them
271 if use custom-cflags; then
272 einfo "User wants their own CFLAGS - removing defaults"
273 # try and remove all the default custom-cflags
274 find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
275 -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
276 -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
277 -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
278 -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
279 -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
280 -i {} \; || die "failed to re-set custom-cflags"
281 fi
282
283 # not strictly necessary to fix this
284 sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
285
286 #Security patches
287 epatch "${FILESDIR}"/${PN}-CVE-2013-1442-XSA-62.patch \
288 "${FILESDIR}"/${PN}-CVE-2013-4355-XSA-63.patch \
289 "${FILESDIR}"/${PN}-CVE-2013-4356-XSA-64.patch \
290 "${FILESDIR}"/${PN}-CVE-2013-4361-XSA-66.patch \
291 "${FILESDIR}"/${PN}-CVE-2013-4368-XSA-67.patch \
292 "${FILESDIR}"/${PN}-CVE-2013-4375-XSA-71.patch \
293 "${FILESDIR}"/${PN}-CVE-2013-4494-XSA-73.patch \
294 "${FILESDIR}"/${PN}-4.3-CVE-2013-6375-XSA-75.patch \
295 "${FILESDIR}"/${PN}-CVE-2013-6375-XSA-78.patch \
296 "${FILESDIR}"/${PN}-CVE-2013-6885-XSA-82.patch
297
298 epatch_user
299 }
300
301 src_configure() {
302 use debug && myopt="${myopt} debug=y"
303 use pae && myopt="${myopt} pae=y"
304
305 if use custom-cflags; then
306 filter-flags -fPIE -fstack-protector
307 replace-flags -O3 -O2
308 else
309 unset CFLAGS
310 fi
311 }
312
313 src_compile() {
314 # Send raw LDFLAGS so that --as-needed works
315 emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
316 }
317
318 src_install() {
319 local myopt
320 use debug && myopt="${myopt} debug=y"
321 use pae && myopt="${myopt} pae=y"
322
323 # The 'make install' doesn't 'mkdir -p' the subdirs
324 if use efi; then
325 mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
326 fi
327
328 emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
329 }
330
331 pkg_postinst() {
332 elog "Official Xen Guide and the unoffical wiki page:"
333 elog " http://www.gentoo.org/doc/en/xen-guide.xml"
334 elog " http://en.gentoo-wiki.com/wiki/Xen/"
335
336 use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
337 use efi && einfo "The efi executable is installed in boot/efi/gentoo"
338 }
Report Message
Find on MARC Find on Google Groups