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.0-r3.ebuild ChangeLog xen-4.3.0-r1.ebuild xen-4.3.0-r2.ebuild xen-4.3.0.ebuild
Date: Fri, 22 Nov 2013 12:32:16
Message-Id: 20131122123212.C5BDA2004E@flycatcher.gentoo.org
1 idella4 13/11/22 12:32:12
2
3 Modified: ChangeLog
4 Added: xen-4.3.0-r3.ebuild
5 Removed: xen-4.3.0-r1.ebuild xen-4.3.0-r2.ebuild
6 xen-4.3.0.ebuild
7 Log:
8 Adding more security patches to 4.3.0 from Bug #486354, drop old
9
10 (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
11
12 Revision Changes Path
13 1.132 app-emulation/xen/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.132&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.132&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?r1=1.131&r2=1.132
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v
22 retrieving revision 1.131
23 retrieving revision 1.132
24 diff -u -r1.131 -r1.132
25 --- ChangeLog 6 Nov 2013 06:45:18 -0000 1.131
26 +++ ChangeLog 22 Nov 2013 12:32:12 -0000 1.132
27 @@ -1,6 +1,14 @@
28 # ChangeLog for app-emulation/xen
29 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.131 2013/11/06 06:45:18 idella4 Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.132 2013/11/22 12:32:12 idella4 Exp $
32 +
33 +*xen-4.3.0-r3 (22 Nov 2013)
34 +
35 + 22 Nov 2013; Ian Delaney <idella4@g.o>
36 + +files/xen-4.3-CVE-2013-6375-XSA-75.patch,
37 + +files/xen-CVE-2013-6375-XSA-78.patch, +xen-4.3.0-r3.ebuild,
38 + -xen-4.3.0-r1.ebuild, -xen-4.3.0-r2.ebuild, -xen-4.3.0.ebuild:
39 + Adding more security patches to 4.3.0 from Bug #486354, drop old
40
41 *xen-4.3.0-r2 (06 Nov 2013)
42
43
44
45
46 1.1 app-emulation/xen/xen-4.3.0-r3.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.3.0-r3.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.3.0-r3.ebuild?rev=1.1&content-type=text/plain
50
51 Index: xen-4.3.0-r3.ebuild
52 ===================================================================
53 # Copyright 1999-2013 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.0-r3.ebuild,v 1.1 2013/11/22 12:32:12 idella4 Exp $
56
57 EAPI=5
58
59 PYTHON_COMPAT=( python2_7 )
60
61 if [[ $PV == *9999 ]]; then
62 KEYWORDS=""
63 REPO="xen-unstable.hg"
64 EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
65 S="${WORKDIR}/${REPO}"
66 live_eclass="mercurial"
67 else
68 KEYWORDS="~amd64 ~x86"
69 SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
70 fi
71
72 inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
73
74 DESCRIPTION="The Xen virtual machine monitor"
75 HOMEPAGE="http://xen.org/"
76 LICENSE="GPL-2"
77 SLOT="0"
78 IUSE="custom-cflags debug efi flask pae xsm"
79
80 DEPEND="${PYTHON_DEPS}
81 efi? ( >=sys-devel/binutils-2.22[multitarget] )
82 !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
83 RDEPEND=""
84 PDEPEND="~app-emulation/xen-tools-${PV}"
85
86 RESTRICT="test"
87
88 # Approved by QA team in bug #144032
89 QA_WX_LOAD="boot/xen-syms-${PV}"
90
91 REQUIRED_USE="flask? ( xsm )"
92
93 pkg_setup() {
94 python-any-r1_pkg_setup
95 if [[ -z ${XEN_TARGET_ARCH} ]]; then
96 if use x86 && use amd64; then
97 die "Confusion! Both x86 and amd64 are set in your use flags!"
98 elif use x86; then
99 export XEN_TARGET_ARCH="x86_32"
100 elif use amd64; then
101 export XEN_TARGET_ARCH="x86_64"
102 else
103 die "Unsupported architecture!"
104 fi
105 fi
106
107 if use flask ; then
108 export "XSM_ENABLE=y"
109 export "FLASK_ENABLE=y"
110 elif use xsm ; then
111 export "XSM_ENABLE=y"
112 fi
113 }
114
115 src_prepare() {
116 # Drop .config and fix gcc-4.6
117 epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
118
119 if use efi; then
120 epatch "${FILESDIR}"/${PN}-4.2-efi.patch
121 export EFI_VENDOR="gentoo"
122 export EFI_MOUNTPOINT="boot"
123 fi
124
125 # if the user *really* wants to use their own custom-cflags, let them
126 if use custom-cflags; then
127 einfo "User wants their own CFLAGS - removing defaults"
128 # try and remove all the default custom-cflags
129 find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
130 -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
131 -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
132 -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
133 -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
134 -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
135 -i {} \; || die "failed to re-set custom-cflags"
136 fi
137
138 # not strictly necessary to fix this
139 sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
140
141 #Security patches
142 epatch "${FILESDIR}"/${PN}-CVE-2013-1442-XSA-62.patch \
143 "${FILESDIR}"/${PN}-CVE-2013-4355-XSA-63.patch \
144 "${FILESDIR}"/${PN}-CVE-2013-4356-XSA-64.patch \
145 "${FILESDIR}"/${PN}-CVE-2013-4361-XSA-66.patch \
146 "${FILESDIR}"/${PN}-CVE-2013-4368-XSA-67.patch \
147 "${FILESDIR}"/${PN}-CVE-2013-4375-XSA-71.patch \
148 "${FILESDIR}"/${PN}-CVE-2013-4494-XSA-73.patch \
149 "${FILESDIR}"/${PN}-4.3-CVE-2013-6375-XSA-75.patch \
150 "${FILESDIR}"/${PN}-CVE-2013-6375-XSA-78.patch
151
152 epatch_user
153 }
154
155 src_configure() {
156 use debug && myopt="${myopt} debug=y"
157 use pae && myopt="${myopt} pae=y"
158
159 if use custom-cflags; then
160 filter-flags -fPIE -fstack-protector
161 replace-flags -O3 -O2
162 else
163 unset CFLAGS
164 fi
165 }
166
167 src_compile() {
168 # Send raw LDFLAGS so that --as-needed works
169 emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
170 }
171
172 src_install() {
173 local myopt
174 use debug && myopt="${myopt} debug=y"
175 use pae && myopt="${myopt} pae=y"
176
177 # The 'make install' doesn't 'mkdir -p' the subdirs
178 if use efi; then
179 mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
180 fi
181
182 emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
183 }
184
185 pkg_postinst() {
186 elog "Official Xen Guide and the unoffical wiki page:"
187 elog " http://www.gentoo.org/doc/en/xen-guide.xml"
188 elog " http://en.gentoo-wiki.com/wiki/Xen/"
189
190 use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
191 use efi && einfo "The efi executable is installed in boot/efi/gentoo"
192 }