Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/
Date: Fri, 30 Apr 2021 21:48:56
Message-Id: 1619819328.18023eacab3717be38b9f88ffeb0bebf5ee81f56.whissi@gentoo
1 commit: 18023eacab3717be38b9f88ffeb0bebf5ee81f56
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 21:48:39 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 21:48:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18023eac
7
8 x11-base/xorg-server: security cleanup
9
10 Bug: https://bugs.gentoo.org/782679
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 x11-base/xorg-server/Manifest | 1 -
15 x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild | 227 ---------------------
16 x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild | 225 --------------------
17 3 files changed, 453 deletions(-)
18
19 diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
20 index be796cbae5b..fad1256833d 100644
21 --- a/x11-base/xorg-server/Manifest
22 +++ b/x11-base/xorg-server/Manifest
23 @@ -1,2 +1 @@
24 -DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
25 DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
26
27 diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild
28 deleted file mode 100644
29 index 42c430c43f2..00000000000
30 --- a/x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild
31 +++ /dev/null
32 @@ -1,227 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -XORG_DOC=doc
39 -inherit xorg-3 multilib flag-o-matic toolchain-funcs
40 -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
41 -
42 -DESCRIPTION="X.Org X servers"
43 -SLOT="0/${PV}"
44 -if [[ ${PV} != 9999* ]]; then
45 - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
46 -fi
47 -
48 -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
49 -IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
50 -RESTRICT="!test? ( test )"
51 -
52 -CDEPEND="
53 - media-libs/libglvnd[X]
54 - dev-libs/openssl:0=
55 - >=x11-apps/iceauth-1.0.2
56 - >=x11-apps/rgb-1.0.3
57 - >=x11-apps/xauth-1.0.3
58 - x11-apps/xkbcomp
59 - >=x11-libs/libdrm-2.4.89
60 - >=x11-libs/libpciaccess-0.12.901
61 - >=x11-libs/libXau-1.0.4
62 - >=x11-libs/libXdmcp-1.0.2
63 - >=x11-libs/libXfont2-2.0.1
64 - >=x11-libs/libxkbfile-1.0.4
65 - >=x11-libs/libxshmfence-1.1
66 - >=x11-libs/pixman-0.27.2
67 - >=x11-libs/xtrans-1.3.5
68 - >=x11-misc/xbitmaps-1.0.1
69 - >=x11-misc/xkeyboard-config-2.4.1-r3
70 - dmx? (
71 - x11-libs/libXt
72 - >=x11-libs/libdmx-1.0.99.1
73 - >=x11-libs/libX11-1.1.5
74 - >=x11-libs/libXaw-1.0.4
75 - >=x11-libs/libXext-1.0.99.4
76 - >=x11-libs/libXfixes-5.0
77 - >=x11-libs/libXi-1.2.99.1
78 - >=x11-libs/libXmu-1.0.3
79 - x11-libs/libXrender
80 - >=x11-libs/libXres-1.0.3
81 - >=x11-libs/libXtst-1.0.99.2
82 - )
83 - kdrive? (
84 - >=x11-libs/libXext-1.0.5
85 - x11-libs/libXv
86 - )
87 - xephyr? (
88 - x11-libs/libxcb[xkb]
89 - x11-libs/xcb-util
90 - x11-libs/xcb-util-image
91 - x11-libs/xcb-util-keysyms
92 - x11-libs/xcb-util-renderutil
93 - x11-libs/xcb-util-wm
94 - )
95 - !minimal? (
96 - >=x11-libs/libX11-1.1.5
97 - >=x11-libs/libXext-1.0.5
98 - >=media-libs/mesa-18[X(+),egl,gbm]
99 - >=media-libs/libepoxy-1.5.4[X,egl(+)]
100 - )
101 - udev? ( virtual/libudev:= )
102 - unwind? ( sys-libs/libunwind )
103 - wayland? (
104 - >=dev-libs/wayland-1.3.0
105 - >=media-libs/libepoxy-1.5.4[egl(+)]
106 - >=dev-libs/wayland-protocols-1.18
107 - )
108 - >=x11-apps/xinit-1.3.3-r1
109 - systemd? (
110 - sys-apps/dbus
111 - sys-apps/systemd
112 - )
113 - elogind? (
114 - sys-apps/dbus
115 - sys-auth/elogind[pam]
116 - sys-auth/pambase[elogind]
117 - )
118 - !!x11-drivers/nvidia-drivers[-libglvnd(+)]
119 -"
120 -
121 -DEPEND="${CDEPEND}
122 - sys-devel/flex
123 - >=x11-base/xorg-proto-2018.4
124 - dmx? (
125 - doc? (
126 - || (
127 - www-client/links
128 - www-client/lynx
129 - www-client/w3m
130 - )
131 - )
132 - )"
133 -
134 -RDEPEND="${CDEPEND}
135 - selinux? ( sec-policy/selinux-xserver )
136 -"
137 -
138 -PDEPEND="
139 - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
140 -
141 -REQUIRED_USE="!minimal? (
142 - || ( ${IUSE_SERVERS} )
143 - )
144 - elogind? ( udev )
145 - ?? ( elogind systemd )
146 - minimal? ( !wayland )
147 - xephyr? ( kdrive )"
148 -
149 -UPSTREAMED_PATCHES=(
150 -)
151 -
152 -PATCHES=(
153 - "${UPSTREAMED_PATCHES[@]}"
154 - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
155 - # needed for new eselect-opengl, bug #541232
156 - "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
157 -)
158 -
159 -pkg_setup() {
160 - if use wayland && use minimal; then
161 - ewarn "glamor is necessary for acceleration under Xwayland."
162 - ewarn "Performance may be unacceptable without it."
163 - ewarn "Build with USE=-minimal to enable glamor."
164 - fi
165 -
166 - # localstatedir is used for the log location; we need to override the default
167 - # from ebuild.sh
168 - # sysconfdir is used for the xorg.conf location; same applies
169 - # NOTE: fop is used for doc generating; and I have no idea if Gentoo
170 - # package it somewhere
171 - XORG_CONFIGURE_OPTIONS=(
172 - $(use_enable ipv6)
173 - $(use_enable debug)
174 - $(use_enable dmx)
175 - $(use_enable kdrive)
176 - $(use_enable test unit-tests)
177 - $(use_enable unwind libunwind)
178 - $(use_enable wayland xwayland)
179 - $(use_enable !minimal record)
180 - $(use_enable !minimal xfree86-utils)
181 - $(use_enable !minimal dri)
182 - $(use_enable !minimal dri2)
183 - $(use_enable !minimal dri3)
184 - $(use_enable !minimal glamor)
185 - $(use_enable !minimal glx)
186 - $(use_enable xcsecurity)
187 - $(use_enable xephyr)
188 - $(use_enable xnest)
189 - $(use_enable xorg)
190 - $(use_enable xvfb)
191 - $(use_enable udev config-udev)
192 - $(use_with doc doxygen)
193 - $(use_with doc xmlto)
194 - $(use_with systemd systemd-daemon)
195 - --enable-libdrm
196 - --sysconfdir="${EPREFIX}"/etc/X11
197 - --localstatedir="${EPREFIX}"/var
198 - --with-fontrootdir="${EPREFIX}"/usr/share/fonts
199 - --with-xkb-output="${EPREFIX}"/var/lib/xkb
200 - --disable-config-hal
201 - --disable-linux-acpi
202 - --without-dtrace
203 - --without-fop
204 - --with-os-vendor=Gentoo
205 - --with-sha1=libcrypto
206 - CPP="$(tc-getPROG CPP cpp)"
207 - )
208 -
209 - if use systemd || use elogind; then
210 - XORG_CONFIGURE_OPTIONS+=(
211 - "--enable-systemd-logind"
212 - "--disable-install-setuid"
213 - "$(use_enable suid suid-wrapper)"
214 - )
215 - else
216 - XORG_CONFIGURE_OPTIONS+=(
217 - "--disable-systemd-logind"
218 - "--disable-suid-wrapper"
219 - "$(use_enable suid install-setuid)"
220 - )
221 - fi
222 -}
223 -
224 -src_install() {
225 - xorg-3_src_install
226 -
227 - server_based_install
228 -
229 - if ! use minimal && use xorg; then
230 - # Install xorg.conf.example into docs
231 - dodoc "${S}"/hw/xfree86/xorg.conf.example
232 - fi
233 -
234 - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
235 - newinitd "${FILESDIR}"/xdm.initd-11 xdm
236 - newconfd "${FILESDIR}"/xdm.confd-4 xdm
237 -
238 - # install the @x11-module-rebuild set for Portage
239 - insinto /usr/share/portage/config/sets
240 - newins "${FILESDIR}"/xorg-sets.conf xorg.conf
241 -
242 - find "${ED}"/var -type d -empty -delete || die
243 -}
244 -
245 -pkg_postrm() {
246 - # Get rid of module dir to ensure opengl-update works properly
247 - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
248 - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
249 - fi
250 -}
251 -
252 -server_based_install() {
253 - if ! use xorg; then
254 - rm "${ED}"/usr/share/man/man1/Xserver.1x \
255 - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
256 - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
257 - "${ED}"/usr/share/man/man1/Xserver.1x
258 - fi
259 -}
260
261 diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
262 deleted file mode 100644
263 index 241f73b55e2..00000000000
264 --- a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
265 +++ /dev/null
266 @@ -1,225 +0,0 @@
267 -# Copyright 1999-2021 Gentoo Authors
268 -# Distributed under the terms of the GNU General Public License v2
269 -
270 -EAPI=7
271 -
272 -XORG_DOC=doc
273 -inherit xorg-3 multilib flag-o-matic toolchain-funcs
274 -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
275 -
276 -DESCRIPTION="X.Org X servers"
277 -SLOT="0/${PV}"
278 -if [[ ${PV} != 9999* ]]; then
279 - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
280 -fi
281 -
282 -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
283 -IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
284 -RESTRICT="!test? ( test )"
285 -
286 -CDEPEND="
287 - media-libs/libglvnd[X]
288 - dev-libs/openssl:0=
289 - >=x11-apps/iceauth-1.0.2
290 - >=x11-apps/rgb-1.0.3
291 - >=x11-apps/xauth-1.0.3
292 - x11-apps/xkbcomp
293 - >=x11-libs/libdrm-2.4.89
294 - >=x11-libs/libpciaccess-0.12.901
295 - >=x11-libs/libXau-1.0.4
296 - >=x11-libs/libXdmcp-1.0.2
297 - >=x11-libs/libXfont2-2.0.1
298 - >=x11-libs/libxkbfile-1.0.4
299 - >=x11-libs/libxshmfence-1.1
300 - >=x11-libs/pixman-0.27.2
301 - >=x11-misc/xbitmaps-1.0.1
302 - >=x11-misc/xkeyboard-config-2.4.1-r3
303 - dmx? (
304 - x11-libs/libXt
305 - >=x11-libs/libdmx-1.0.99.1
306 - >=x11-libs/libX11-1.1.5
307 - >=x11-libs/libXaw-1.0.4
308 - >=x11-libs/libXext-1.0.99.4
309 - >=x11-libs/libXfixes-5.0
310 - >=x11-libs/libXi-1.2.99.1
311 - >=x11-libs/libXmu-1.0.3
312 - x11-libs/libXrender
313 - >=x11-libs/libXres-1.0.3
314 - >=x11-libs/libXtst-1.0.99.2
315 - )
316 - kdrive? (
317 - >=x11-libs/libXext-1.0.5
318 - x11-libs/libXv
319 - )
320 - xephyr? (
321 - x11-libs/libxcb[xkb]
322 - x11-libs/xcb-util
323 - x11-libs/xcb-util-image
324 - x11-libs/xcb-util-keysyms
325 - x11-libs/xcb-util-renderutil
326 - x11-libs/xcb-util-wm
327 - )
328 - !minimal? (
329 - >=x11-libs/libX11-1.1.5
330 - >=x11-libs/libXext-1.0.5
331 - >=media-libs/mesa-18[X(+),egl,gbm]
332 - >=media-libs/libepoxy-1.5.4[X,egl(+)]
333 - )
334 - udev? ( virtual/libudev:= )
335 - unwind? ( sys-libs/libunwind )
336 - wayland? (
337 - >=dev-libs/wayland-1.3.0
338 - >=media-libs/libepoxy-1.5.4[egl(+)]
339 - >=dev-libs/wayland-protocols-1.18
340 - )
341 - >=x11-apps/xinit-1.3.3-r1
342 - systemd? (
343 - sys-apps/dbus
344 - sys-apps/systemd
345 - )
346 - elogind? (
347 - sys-apps/dbus
348 - sys-auth/elogind[pam]
349 - sys-auth/pambase[elogind]
350 - )
351 - !!x11-drivers/nvidia-drivers[-libglvnd(+)]
352 -"
353 -DEPEND="${CDEPEND}
354 - >=x11-base/xorg-proto-2018.4
355 - >=x11-libs/xtrans-1.3.5
356 - dmx? (
357 - doc? (
358 - || (
359 - www-client/links
360 - www-client/lynx
361 - www-client/w3m
362 - )
363 - )
364 - )
365 -"
366 -RDEPEND="${CDEPEND}
367 - !systemd? ( gui-libs/display-manager-init )
368 - selinux? ( sec-policy/selinux-xserver )
369 -"
370 -BDEPEND="
371 - sys-devel/flex
372 - wayland? ( dev-util/wayland-scanner )
373 -"
374 -PDEPEND="
375 - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
376 -
377 -REQUIRED_USE="!minimal? (
378 - || ( ${IUSE_SERVERS} )
379 - )
380 - elogind? ( udev )
381 - ?? ( elogind systemd )
382 - minimal? ( !wayland )
383 - xephyr? ( kdrive )"
384 -
385 -UPSTREAMED_PATCHES=(
386 -)
387 -
388 -PATCHES=(
389 - "${UPSTREAMED_PATCHES[@]}"
390 - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
391 - # needed for new eselect-opengl, bug #541232
392 - "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
393 -)
394 -
395 -pkg_setup() {
396 - if use wayland && use minimal; then
397 - ewarn "glamor is necessary for acceleration under Xwayland."
398 - ewarn "Performance may be unacceptable without it."
399 - ewarn "Build with USE=-minimal to enable glamor."
400 - fi
401 -
402 - # localstatedir is used for the log location; we need to override the default
403 - # from ebuild.sh
404 - # sysconfdir is used for the xorg.conf location; same applies
405 - # NOTE: fop is used for doc generating; and I have no idea if Gentoo
406 - # package it somewhere
407 - XORG_CONFIGURE_OPTIONS=(
408 - $(use_enable ipv6)
409 - $(use_enable debug)
410 - $(use_enable dmx)
411 - $(use_enable kdrive)
412 - $(use_enable test unit-tests)
413 - $(use_enable unwind libunwind)
414 - $(use_enable wayland xwayland)
415 - $(use_enable !minimal record)
416 - $(use_enable !minimal xfree86-utils)
417 - $(use_enable !minimal dri)
418 - $(use_enable !minimal dri2)
419 - $(use_enable !minimal dri3)
420 - $(use_enable !minimal glamor)
421 - $(use_enable !minimal glx)
422 - $(use_enable xcsecurity)
423 - $(use_enable xephyr)
424 - $(use_enable xnest)
425 - $(use_enable xorg)
426 - $(use_enable xvfb)
427 - $(use_enable udev config-udev)
428 - $(use_with doc doxygen)
429 - $(use_with doc xmlto)
430 - $(use_with systemd systemd-daemon)
431 - --enable-libdrm
432 - --sysconfdir="${EPREFIX}"/etc/X11
433 - --localstatedir="${EPREFIX}"/var
434 - --with-fontrootdir="${EPREFIX}"/usr/share/fonts
435 - --with-xkb-output="${EPREFIX}"/var/lib/xkb
436 - --disable-config-hal
437 - --disable-linux-acpi
438 - --without-dtrace
439 - --without-fop
440 - --with-os-vendor=Gentoo
441 - --with-sha1=libcrypto
442 - CPP="$(tc-getPROG CPP cpp)"
443 - )
444 -
445 - if use systemd || use elogind; then
446 - XORG_CONFIGURE_OPTIONS+=(
447 - "--enable-systemd-logind"
448 - "--disable-install-setuid"
449 - "$(use_enable suid suid-wrapper)"
450 - )
451 - else
452 - XORG_CONFIGURE_OPTIONS+=(
453 - "--disable-systemd-logind"
454 - "--disable-suid-wrapper"
455 - "$(use_enable suid install-setuid)"
456 - )
457 - fi
458 -}
459 -
460 -src_install() {
461 - xorg-3_src_install
462 -
463 - server_based_install
464 -
465 - if ! use minimal && use xorg; then
466 - # Install xorg.conf.example into docs
467 - dodoc "${S}"/hw/xfree86/xorg.conf.example
468 - fi
469 -
470 - # install the @x11-module-rebuild set for Portage
471 - insinto /usr/share/portage/config/sets
472 - newins "${FILESDIR}"/xorg-sets.conf xorg.conf
473 -
474 - find "${ED}"/var -type d -empty -delete || die
475 -}
476 -
477 -pkg_postrm() {
478 - # Get rid of module dir to ensure opengl-update works properly
479 - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
480 - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
481 - fi
482 -}
483 -
484 -server_based_install() {
485 - if ! use xorg; then
486 - rm "${ED}"/usr/share/man/man1/Xserver.1x \
487 - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
488 - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
489 - "${ED}"/usr/share/man/man1/Xserver.1x
490 - fi
491 -}