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

Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: xorg-server-1.12.4-r5.ebuild ChangeLog
Date: Tue, 28 Apr 2015 15:38:16
Message-Id: 20150428153809.1771699F@oystercatcher.gentoo.org
1 chithanh 15/04/28 15:38:08
2
3 Modified: ChangeLog
4 Added: xorg-server-1.12.4-r5.ebuild
5 Log:
6 Add fix for security bug #548002.
7
8 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)
9
10 Revision Changes Path
11 1.845 x11-base/xorg-server/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.845&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.845&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.844&r2=1.845
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
20 retrieving revision 1.844
21 retrieving revision 1.845
22 diff -u -r1.844 -r1.845
23 --- ChangeLog 31 Mar 2015 18:08:58 -0000 1.844
24 +++ ChangeLog 28 Apr 2015 15:38:07 -0000 1.845
25 @@ -1,6 +1,12 @@
26 # ChangeLog for x11-base/xorg-server
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.844 2015/03/31 18:08:58 ulm Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.845 2015/04/28 15:38:07 chithanh Exp $
30 +
31 +*xorg-server-1.12.4-r5 (28 Apr 2015)
32 +
33 + 28 Apr 2015; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
34 + +files/xorg-server-1.12-cve-2015-3418.patch, +xorg-server-1.12.4-r5.ebuild:
35 + Add fix for security bug #548002.
36
37 31 Mar 2015; Ulrich Müller <ulm@g.o> xorg-server-1.12.4-r4.ebuild,
38 xorg-server-1.15.2-r2.ebuild, xorg-server-1.16.4.ebuild,
39
40
41
42 1.1 x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild?rev=1.1&content-type=text/plain
46
47 Index: xorg-server-1.12.4-r5.ebuild
48 ===================================================================
49 # Copyright 1999-2015 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild,v 1.1 2015/04/28 15:38:07 chithanh Exp $
52
53 EAPI=5
54
55 XORG_DOC=doc
56 inherit xorg-2 multilib versionator flag-o-matic
57 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
58
59 DESCRIPTION="X.Org X servers"
60 SLOT="0/${PV}"
61 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
62
63 SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz"
64
65 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
66 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
67
68 RDEPEND=">=app-eselect/eselect-opengl-1.0.8
69 dev-libs/openssl
70 media-libs/freetype
71 >=x11-apps/iceauth-1.0.2
72 >=x11-apps/rgb-1.0.3
73 >=x11-apps/xauth-1.0.3
74 x11-apps/xkbcomp
75 >=x11-libs/libpciaccess-0.12.901
76 >=x11-libs/libXau-1.0.4
77 >=x11-libs/libXdmcp-1.0.2
78 >=x11-libs/libXfont-1.4.2
79 <x11-libs/libXfont-1.5.0
80 >=x11-libs/libxkbfile-1.0.4
81 >=x11-libs/pixman-0.21.8
82 >=x11-libs/xtrans-1.2.2
83 >=x11-misc/xbitmaps-1.0.1
84 >=x11-misc/xkeyboard-config-2.4.1-r3
85 dmx? (
86 x11-libs/libXt
87 >=x11-libs/libdmx-1.0.99.1
88 >=x11-libs/libX11-1.1.5
89 >=x11-libs/libXaw-1.0.4
90 >=x11-libs/libXext-1.0.99.4
91 >=x11-libs/libXfixes-5.0
92 >=x11-libs/libXi-1.2.99.1
93 >=x11-libs/libXmu-1.0.3
94 x11-libs/libXrender
95 >=x11-libs/libXres-1.0.3
96 >=x11-libs/libXtst-1.0.99.2
97 )
98 kdrive? (
99 >=x11-libs/libXext-1.0.5
100 x11-libs/libXv
101 )
102 !minimal? (
103 >=x11-libs/libX11-1.1.5
104 >=x11-libs/libXext-1.0.5
105 >=media-libs/mesa-7.8_rc[nptl=]
106 )
107 tslib? ( >=x11-libs/tslib-1.0 )
108 udev? ( >=virtual/udev-150 )
109 >=x11-apps/xinit-1.3
110 selinux? ( sec-policy/selinux-xserver )"
111
112 DEPEND="${RDEPEND}
113 sys-devel/flex
114 >=x11-proto/bigreqsproto-1.1.0
115 >=x11-proto/compositeproto-0.4
116 >=x11-proto/damageproto-1.1
117 >=x11-proto/fixesproto-5.0
118 >=x11-proto/fontsproto-2.0.2
119 <x11-proto/fontsproto-2.1.3
120 >=x11-proto/glproto-1.4.14
121 >=x11-proto/inputproto-2.1.99.3
122 >=x11-proto/kbproto-1.0.3
123 >=x11-proto/randrproto-1.2.99.3
124 >=x11-proto/recordproto-1.13.99.1
125 >=x11-proto/renderproto-0.11
126 >=x11-proto/resourceproto-1.0.2
127 >=x11-proto/scrnsaverproto-1.1
128 >=x11-proto/trapproto-3.4.3
129 >=x11-proto/videoproto-2.2.2
130 >=x11-proto/xcmiscproto-1.2.0
131 >=x11-proto/xextproto-7.1.99
132 >=x11-proto/xf86dgaproto-2.0.99.1
133 >=x11-proto/xf86rushproto-1.1.2
134 >=x11-proto/xf86vidmodeproto-2.2.99.1
135 >=x11-proto/xineramaproto-1.1.3
136 >=x11-proto/xproto-7.0.22
137 dmx? (
138 >=x11-proto/dmxproto-2.2.99.1
139 doc? (
140 || (
141 www-client/links
142 www-client/lynx
143 www-client/w3m
144 )
145 )
146 )
147 !minimal? (
148 >=x11-proto/xf86driproto-2.1.0
149 >=x11-proto/dri2proto-2.6
150 >=x11-libs/libdrm-2.4.20
151 )"
152
153 PDEPEND="
154 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
155
156 REQUIRED_USE="!minimal? (
157 || ( ${IUSE_SERVERS} )
158 )"
159
160 # Security patches taken from Debian from their 1.12 package
161 UPSTREAMED_PATCHES=(
162 "${WORKDIR}"/patches/${PN}-1.12-cve-2014-8091..8103.patch
163 )
164
165 PATCHES=(
166 "${UPSTREAMED_PATCHES[@]}"
167 "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
168 "${FILESDIR}"/${PN}-1.12-cve-2013-1940.patch
169 "${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch
170 "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch
171 "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch
172 "${FILESDIR}"/${PN}-1.12-cve-2015-3418.patch
173 )
174
175 pkg_pretend() {
176 # older gcc is not supported
177 [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
178 die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
179 }
180
181 src_configure() {
182 # localstatedir is used for the log location; we need to override the default
183 # from ebuild.sh
184 # sysconfdir is used for the xorg.conf location; same applies
185 # --enable-install-setuid needed because sparcs default off
186 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
187 # package it somewhere
188 XORG_CONFIGURE_OPTIONS=(
189 $(use_enable ipv6)
190 $(use_enable dmx)
191 $(use_enable kdrive)
192 $(use_enable kdrive kdrive-kbd)
193 $(use_enable kdrive kdrive-mouse)
194 $(use_enable kdrive kdrive-evdev)
195 $(use_enable tslib)
196 $(use_enable !minimal record)
197 $(use_enable !minimal xfree86-utils)
198 $(use_enable !minimal install-libxf86config)
199 $(use_enable !minimal dri)
200 $(use_enable !minimal dri2)
201 $(use_enable !minimal glx)
202 $(use_enable xnest)
203 $(use_enable xorg)
204 $(use_enable xvfb)
205 $(use_enable nptl glx-tls)
206 $(use_enable udev config-udev)
207 $(use_with doc doxygen)
208 $(use_with doc xmlto)
209 --sysconfdir=/etc/X11
210 --localstatedir=/var
211 --enable-install-setuid
212 --with-fontrootdir=/usr/share/fonts
213 --with-xkb-output=/var/lib/xkb
214 --disable-config-hal
215 --without-dtrace
216 --without-fop
217 --with-os-vendor=Gentoo
218 )
219
220 # Xorg-server requires includes from OS mesa which are not visible for
221 # users of binary drivers.
222 mkdir -p "${T}/mesa-symlinks/GL"
223 for i in gl glx glxmd glxproto glxtokens; do
224 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
225 done
226 for i in glext glxext; do
227 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
228 done
229 append-cppflags "-I${T}/mesa-symlinks"
230
231 xorg-2_src_configure
232 }
233
234 src_install() {
235 xorg-2_src_install
236
237 dynamic_libgl_install
238
239 server_based_install
240
241 if ! use minimal && use xorg; then
242 # Install xorg.conf.example into docs
243 dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
244 fi
245
246 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
247 newinitd "${FILESDIR}"/xdm.initd-9 xdm
248 newconfd "${FILESDIR}"/xdm.confd-4 xdm
249
250 # install the @x11-module-rebuild set for Portage
251 insinto /usr/share/portage/config/sets
252 newins "${FILESDIR}"/xorg-sets.conf xorg.conf
253 }
254
255 pkg_postinst() {
256 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
257 eselect opengl set xorg-x11 --use-old
258
259 if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
260 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
261 ewarn "because the ABI changed. If you cannot start X because"
262 ewarn "of module version mismatch errors, this is your problem."
263
264 echo
265 ewarn "You can generate a list of all installed packages in the x11-drivers"
266 ewarn "category using this command:"
267 ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
268 ewarn "or using sets from portage-2.2:"
269 ewarn " emerge @x11-module-rebuild"
270 fi
271 }
272
273 pkg_postrm() {
274 # Get rid of module dir to ensure opengl-update works properly
275 if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
276 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
277 fi
278 }
279
280 dynamic_libgl_install() {
281 # next section is to setup the dynamic libGL stuff
282 ebegin "Moving GL files for dynamic switching"
283 dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
284 local x=""
285 for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
286 if [ -f ${x} -o -L ${x} ]; then
287 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
288 fi
289 done
290 eend 0
291 }
292
293 server_based_install() {
294 if ! use xorg; then
295 rm "${D}"/usr/share/man/man1/Xserver.1x \
296 "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
297 "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
298 "${D}"/usr/share/man/man1/Xserver.1x
299 fi
300 }
Report Message
Find on MARC Find on Google Groups