Skip to content

feat: update xorg-server to 2:21.1.16-1.3+deb13u2#35

Merged
Zeno-sole merged 2 commits into
masterfrom
dcbot/debian/21.1.16
Jun 25, 2026
Merged

feat: update xorg-server to 2:21.1.16-1.3+deb13u2#35
Zeno-sole merged 2 commits into
masterfrom
dcbot/debian/21.1.16

Conversation

@deepin-community-bot

@deepin-community-bot deepin-community-bot Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

This pull request is requested by @Zeno-sole.

Basic Information

Old Version: 2:21.1.10-1deepin25
New Version: 2:21.1.16-1.3+deb13u2
Old version may contain dde / deepin patches. Please review more precisely.

Patch series

--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,41 +1,24 @@
-## Patches with a number < 100 are applied in debian.
-## Ubuntu patches start with 100.
 02_kbsd-input-devd.diff
-03_static-nettle.diff
 05_Revert-Unload-submodules.diff
 06_use-intel-only-on-pre-gen4.diff
 07_use-modesetting-driver-by-default-on-GeForce.diff
 08_apple_silicon_config.diff
-#deepin
-add-device-id.patch
-feat-Xrecord-add-touch-support.patch
-Resolve_xorg_crashing_whith_displaylink_unplugging.patch
-0001-hw-xfree86-workaround-bad-firmware-boot-VGA-reportin.patch
-add-zx-device-id.patch
-add-Glenfly-arise-pci-ids.patch
-0001-config-Preserve-section-data-when-parsing-duplicate-files.patch
-0001-feat-implement-screenshot-protection-for-secure-wind.patch
-#backport: gles support
-glamor-gles/1000-glamor-GLES-fixes-part-1.patch
-glamor-gles/1001-glamor-add-gl_PointSize-for-ES-shaders.patch
-glamor-gles/1002-glamor-handle-EXT_gpu_shader4-in-dual-source-blend-paths.patch
-glamor-gles/1003-glamor-supports-GLES3-shaders.patch
-glamor-gles/1004-glamor-Dont-require-EXT_gpu_shader4-unconditionally.patch
-glamor-gles/1005-glamor-Fix-dual-blend-on-GLES3.patch
-0001-bugfix-revert-render-Break-PICT_a4.patch
-CVE-2022-49737.patch
-0001-fix-randr-use-full-transform-for-CRTC-bounds-checking.patch
-0002-fix-randr-use-mode-space-coordinates-for-CRTC-bounds-checking.patch
-0003-fix-multi-screen-pointer-primary.patch
-CVE-2026-34001.patch
-CVE-2026-33999.patch
-CVE-2026-34002.patch
-CVE-2026-34003.patch
-CVE-2025-49177.patch
-CVE-2026-50256.patch
-CVE-2026-50257.patch
-CVE-2026-50258.patch
-CVE-2026-50259.patch
-CVE-2026-50260.patch
-CVE-2026-50261.patch
-CVE-2026-50264.patch
+09_dix-Hold-input-lock-for-AttachDevice.diff 
+10_render-Avoid-0-or-less-animated-cursors.diff
+11_os-Do-not-overflow-the-integer-size-with-BigRequest.diff
+12_xfixes-Check-request-length-for-SetClientDisconnectM.diff
+13_os-Account-for-bytes-to-ignore-when-sharing-input-bu.diff
+14_record-Check-for-overflow-in-RecordSanityCheckRegist.diff
+15_randr-Check-for-overflow-in-RRChangeProviderProperty.diff
+16_xfree86-Check-for-RandR-provider-functions.diff
+17_os-Check-for-integer-overflow-on-BigRequest-length.diff
+CVE-2025-62229/0001-present-Fix-use-after-free-in-present_create_notifie.patch
+CVE-2025-62230/0001-xkb-Make-the-RT_XKBCLIENT-resource-private.patch
+CVE-2025-62230/0002-xkb-Free-the-XKB-resource-when-freeing-XkbInterest.patch
+CVE-2025-62231/0001-xkb-Prevent-overflow-in-XkbSetCompatMap.patch
+CVE-2026-33999/0001-xkb-fix-buffer-re-use-in-_XkbSetCompatMap.patch
+CVE-2026-34000/0001-xkb-Fix-bounds-check-in-_CheckSetGeom.patch
+CVE-2026-34001/0001-miext-sync-Fix-use-after-free-in-miSyncTriggerFence.patch
+CVE-2026-34002/0001-xkb-Fix-out-of-bounds-read-in-CheckModifierMap.patch
+CVE-2026-34003/0001-xkb-Add-additional-bound-checking-in-CheckKeyTypes.patch
+CVE-2026-34003/0002-xkb-Add-more-_XkbCheckRequestBounds.patch

@github-actions

github-actions Bot commented Jun 25, 2026 •
edited
Loading

Copy link
Copy Markdown

TAG Bot

TAG: 2%21.1.16-1deepin1
EXISTED: no
DISTRIBUTION: unstable

@deepin-ci-robot

deepin-ci-robot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@Zeno-sole Zeno-sole force-pushed the dcbot/debian/21.1.16 branch from edcb9f0 to b30faf5 Compare June 25, 2026 07:23
@Zeno-sole
feat: restore deepin patches on top of xorg-server 21.1.16-1.3+deb13u2
e384e42 
Restore deepin-specific patches that were removed during the upstream
version update from 21.1.10 to 21.1.16.
Includes device ID support, Xrecord touch support, DisplayLink crash
fix, screenshot protection, GLES backport, and randr fixes.
Removed duplicate CVE/security patches already included in upstream.

Log: Restore deepin patches for xorg-server 21.1.16

Influence:
1. Verify xserver builds with restored patches
2. Test device ID recognition for zx and Glenfly GPUs
3. Verify Xrecord touch support works correctly
4. Test DisplayLink device hot-plug/unplug
5. Verify screenshot protection for secure windows
6. Test GLES rendering with glamor-gles backport

feat: 在 xorg-server 21.1.16-1.3+deb13u2 基础上恢复 deepin 补丁

恢复在从 21.1.10 升级到 21.1.16 上游版本时被移除的 deepin 特有补丁
包括设备 ID 支持、Xrecord 触摸支持、DisplayLink 崩溃修复、截图保护、
GLES 回退支持和 randr 修复，移除与上游重复的安全补丁

Log: 恢复 xorg-server 21.1.16 的 deepin 补丁

Influence:
1. 验证恢复补丁后 xserver 能正常构建
2. 测试 zx 和 Glenfly GPU 的设备 ID 识别
3. 验证 Xrecord 触摸支持正常工作
4. 测试 DisplayLink 设备热插拔
5. 验证安全窗口的截图保护功能
6. 测试 glamor-gles 回退的 GLES 渲染

repo: xorg-server #dcbot/debian/21.1.16
@Zeno-sole

Zeno-sole commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

/integrate

@github-actions

github-actions Bot commented Jun 25, 2026

Copy link
Copy Markdown

AutoIntegrationPr Bot
auto integrate with pr url: deepin-community/Repository-Integration#4178
PrNumber: 4178
PrBranch: auto-integration-28159384694

@deepin-community-ci-bot deepin-community-ci-bot Bot mentioned this pull request Jun 25, 2026
Open
@deepin-ci-robot

deepin-ci-robot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hudeng-go

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Zeno-sole Zeno-sole marked this pull request as ready for review June 25, 2026 11:10
@deepin-ci-robot

deepin-ci-robot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

/hold
因为该quilt包的上游版本号变更，详情见: deepin-community/infra-settings#134

@Zeno-sole Zeno-sole merged commit dafe81c into master Jun 25, 2026
6 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hudeng-go hudeng-go hudeng-go approved these changes
@BLumia BLumia Awaiting requested review from BLumia
@justforlxz justforlxz Awaiting requested review from justforlxz
@chenchongbiao chenchongbiao Awaiting requested review from chenchongbiao
@myml myml Awaiting requested review from myml

Assignees

No one assigned

Labels

approved do-not-merge/hold

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@deepin-ci-robot @Zeno-sole @hudeng-go