diff options
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/Manifest | 4 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch | 59 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild | 195 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 2 |
4 files changed, 258 insertions, 2 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index e1c1c7c05c33..de5305c9197d 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,7 +1,9 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 +AUX xorg-server-21.1.4-BadIDChoice.patch 1950 BLAKE2B eb3ef49d68c526b1484b580ac08b45c4e31b7f263354a8fffc763577c618a1edbf55c8bec5ddb916eefd2c0b4e9429d2a445f221ea0a447d6e26ec1b6f88fa0e SHA512 bbd49c133f33bfad4eb4225d3246ca9814c6bc876a5a606f89ce018de7bd26c1bd84462f4f250c2dbdac82d2fdb366ab722ecf5bbb183f9958ba7f856efc1472 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f +EBUILD xorg-server-21.1.4-r1.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba EBUILD xorg-server-21.1.4.ebuild 4513 BLAKE2B 7a36143b235eeaec435bb21b989d464723ba062fa1d7b223b8f944cd60661662d38cac82973c7f2b1911cb4ba3294357a74677561fe599b636bb6a9896687409 SHA512 7fb72a177b8ef0f61ccb0ca677f118c065846577b9da21317b5343e19ec797b5e7cddf60f47eff50b4b03ee4507bc51c9f92545bd1e52357fe862e9265ced7f0 -EBUILD xorg-server-9999.ebuild 4521 BLAKE2B 734301a62c12a7a3bf89375e2e5d64bca3330f8804d22f4142f2fa8c5afbd66a816b317c5e5ffbcdebd8950ca55f7dae92972d9ecf63457a1aa9b25b66ef9225 SHA512 d452355a73fbcaf59ab8aef919e71fa4b03404babde572356dfc6b267b8688c159cee94a02923c58c1cbb0742f8ff835eacc5332fdca0871c0d7102f3128ad3f +EBUILD xorg-server-9999.ebuild 4516 BLAKE2B 232c7211a805dfca04da95c0c17e71847a57bbb22351e8eecd5d5be51b88653ab7ab67874e66022cf70bfdf382e7e3284de54a2d843763468540453fc46e1592 SHA512 ffa779b6a8fc0127422542863eb4ca25876c352662215bd4ec1a29dccb354514bdf7e043a66b5c5d1aa634f386b75d3528b0c39ace7d4bc745a1593477d205ce MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90 diff --git a/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch b/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch new file mode 100644 index 000000000000..def3c58714b4 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/857483 +https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310 +https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953 + +From f61307631203ab0266c035db07c2f776cf7c6cf4 Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <ofourdan@redhat.com> +Date: Tue, 12 Jul 2022 14:44:48 +0200 +Subject: [PATCH] dix: Fix overzealous caching of ResourceClientBits() + +Commit c7311654 cached the value of ResourceClientBits(), but that value +depends on the `MaxClients` value set either from the command line or +from the configuration file. + +For the latter, a call to ResourceClientBits() is issued before the +configuration file is read, meaning that the cached value is from the +default, not from the maximum number of clients set in the configuration +file. + +That obviously causes all sort of issues, including memory corruption +and crashes of the Xserver when reaching the default limit value. + +To avoid that issue, also keep the LimitClient value, and recompute the +ilog2() value if that changes, as on startup when the value is set from +the the xorg.conf ServerFlags section. + +v2: Drop the `cache == 0` test + Rename cache vars + +Fixes: c7311654 - dix: cache ResourceClientBits() value +Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310 +Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> +Reviewed-by: Adam Jackson <ajax@redhat.com> +(cherry picked from commit 2efa6d659508346358a1ef27b2393e18843f66a3) +--- a/dix/resource.c ++++ b/dix/resource.c +@@ -620,12 +620,15 @@ ilog2(int val) + unsigned int + ResourceClientBits(void) + { +- static unsigned int cached = 0; ++ static unsigned int cache_ilog2 = 0; ++ static unsigned int cache_limit = 0; + +- if (cached == 0) +- cached = ilog2(LimitClients); ++ if (LimitClients != cache_limit) { ++ cache_limit = LimitClients; ++ cache_ilog2 = ilog2(LimitClients); ++ } + +- return cached; ++ return cache_ilog2; + } + + /***************** +-- +GitLab + + diff --git a/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild new file mode 100644 index 000000000000..85f83743b7ff --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" +inherit flag-o-matic xorg-3 meson +EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +IUSE_SERVERS="xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" +RESTRICT="!test? ( test )" + +CDEPEND=" + media-libs/libglvnd[X] + dev-libs/libbsd + dev-libs/openssl:0= + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.89 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + xorg? ( + >=x11-libs/libxcvt-0.1.0 + ) + xnest? ( + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libX11-1.1.5 + ) + xephyr? ( + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=media-libs/mesa-18[X(+),egl(+),gbm(+)] + >=media-libs/libepoxy-1.5.4[X,egl(+)] + ) + udev? ( virtual/libudev:= ) + unwind? ( sys-libs/libunwind:= ) + selinux? ( + sys-process/audit + sys-libs/libselinux:= + ) + systemd? ( + sys-apps/dbus + sys-apps/systemd + ) + elogind? ( + sys-apps/dbus + sys-auth/elogind[pam] + sys-auth/pambase[elogind] + ) + !!x11-drivers/nvidia-drivers[-libglvnd(+)] +" +DEPEND="${CDEPEND} + >=x11-base/xorg-proto-2021.4.99.2 + >=x11-libs/xtrans-1.3.5 + media-fonts/font-util + test? ( >=x11-libs/libxcvt-0.1.0 ) +" +RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) + selinux? ( sec-policy/selinux-xserver ) + xorg? ( >=x11-apps/xinit-1.3.3-r1 ) +" +BDEPEND=" + sys-devel/flex +" +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + elogind? ( udev ) + ?? ( elogind systemd )" + +UPSTREAMED_PATCHES=( + # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953 + "${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch +) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch +) + +src_configure() { + # bug #835653 + use x86 && replace-flags -Os -O2 + + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + local emesonargs=( + --localstatedir "${EPREFIX}/var" + --sysconfdir "${EPREFIX}/etc/X11" + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + $(meson_use !minimal dri1) + $(meson_use !minimal dri2) + $(meson_use !minimal dri3) + $(meson_use !minimal glamor) + $(meson_use !minimal glx) + $(meson_use udev) + $(meson_use udev udev_kms) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + $(meson_use selinux xselinux) + $(meson_use xephyr) + $(meson_use xnest) + $(meson_use xorg) + $(meson_use xvfb) + -Ddocs=false + -Ddrm=true + -Ddtrace=false + -Dipv6=true + -Dhal=false + -Dlinux_acpi=false + -Dlinux_apm=false + -Dsecure-rpc=false + -Dsha1=libcrypto + -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + ) + + if [[ ${PV} == 9999 ]] ; then + # Gone in 21.1.x, but not in master. + emesonargs+=( -Dxwayland=false ) + fi + + if use systemd || use elogind; then + emesonargs+=( + -Dsystemd_logind=true + $(meson_use suid suid_wrapper) + ) + else + emesonargs+=( + -Dsystemd_logind=false + -Dsuid_wrapper=false + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + # The meson build system does not support install-setuid + if ! use systemd && ! use elogind; then + if use suid; then + chmod u+s "${ED}"/usr/bin/Xorg + fi + fi + + if ! use xorg; then + rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x || die + fi + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 316e0c3ba53c..b70fa161d379 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -44,7 +44,7 @@ CDEPEND=" >=x11-libs/libX11-1.1.5 ) xephyr? ( - x11-libs/libxcb[xkb] + x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms |