Skip to content

feat: update openssh to 1:10.0p1-7+deb13u4#17

Merged
Zeno-sole merged 2 commits into
masterfrom
dcbot/debian/10.0p1
Jun 17, 2026
Merged

feat: update openssh to 1:10.0p1-7+deb13u4#17
Zeno-sole merged 2 commits into
masterfrom
dcbot/debian/10.0p1

Conversation

@deepin-community-bot

Copy link
Copy Markdown
Contributor

This pull request is requested by @UTsweetyfish.

Basic Information

Old Version: 1:9.9p2-0deepin7
New Version: 1:10.0p1-7+deb13u4
Old version may contain dde / deepin patches. Please review more precisely.

Patch series

--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,22 +20,24 @@
 gnome-ssh-askpass2-icon.patch
 debian-config.patch
 restore-authorized_keys2.patch
-revert-ipqos-defaults.patch
 systemd-socket-activation.patch
 skip-utimensat-test-on-zfs.patch
 regress-conch-dev-zero.patch
 configure-cache-vars.patch
 pam-avoid-unknown-host.patch
-# mlkem768x25519-big-endian-1.patch
-# mlkem768x25519-big-endian-2.patch
-deepin-extra-version.patch
-deepin-ssh-connect-idle-timeout.patch
-deepin-ssh-keygen-privatekey-file-perm.patch
-add-sm-support.patch
-0033-upstream-Fix-logic-error-in-DisableForwarding-option.patch
-0034-upstream-Make-a-copy-of-the-user-when-handling-ssh-l.patch
-0035-upstream-Improve-rules-for-expansion-of-username.patch
-0036-upstream-don-t-allow-0-characters-in-url-encoded-str.patch
-0037-Add-more-username-validity-checks.patch
-uniontech-fix-duplicate-loginmsg.patch
-0038-upstream-Clear-setuid-setgid-bits-when-downloading-.patch
+CVE-2025-61984.patch
+CVE-2025-61985.patch
+CVE-2025-61984-tests.patch
+fix-max-startups-tracking.patch
+CVE-2026-35388.patch
+CVE-2026-35385.patch
+CVE-2026-35387.patch
+CVE-2026-35414.patch
+CVE-2026-35386-1.patch
+CVE-2026-35386-2.patch
+CVE-2026-35386-3.patch
+ipqos-interactive-ef.patch
+ipqos-deprecate-tos-keywords.patch
+ipqos-set-at-runtime.patch
+ipqos-set-extended-type.patch
+avoid-channel-isatty-overloading.patch

@deepin-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign zccrs for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@deepin-ci-robot

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

@github-actions

github-actions Bot commented May 27, 2026

Copy link
Copy Markdown

TAG Bot

TAG: 1%10.0p1-7+deb13u4deepin1
EXISTED: no
DISTRIBUTION: unstable

@deepin-ci-robot

Copy link
Copy Markdown
Contributor

Closing in favor of PR#19

Cherry-pick the following commits from master that were lost during the
1:10.0p1-7+deb13u4 version update:
- 8f43df3 Force SSH_EXTRAVERSION to Deepin
- 737fe6f fix: ssh.service is disabled by default
- d2260e3 fix: duplicate output
- c080561 feat: add sm support
- 676a880 feat: add sw64 support

Log: backport deepin-specific patches from master

Influence:
1. Verify ssh -V shows "Deepin" in version string
2. Verify ssh.service is disabled by default on uos
3. Verify no duplicate PAM login message on SSH login
4. Verify SM2/SM3/SM4 cipher support works
5. Verify openssh builds on sw64 architecture

feat: 从 master 回合 deepin 特定补丁

从 master 分支回合以下在 1:10.0p1-7+deb13u4 版本更新中丢失的提交:
- 8f43df3 Force SSH_EXTRAVERSION to Deepin
- 737fe6f fix: ssh.service is disabled by default
- d2260e3 fix: duplicate output
- c080561 feat: add sm support
- 676a880 feat: add sw64 support

Log: 从 master 回合 deepin 特定补丁

Influence:
1. 验证 ssh -V 显示 "Deepin" 版本字符串
2. 验证 uos 上 ssh.service 默认不启用
3. 验证 SSH 登录无重复 PAM 登录信息
4. 验证 SM2/SM3/SM4 密码套件支持正常
5. 验证 openssh 在 sw64 架构上能正常编译

repo: openssh #dcbot/debian/10.0p1

fix: add deepin-ssh-keygen privatekey file permission patch

Add deepin-ssh-keygen-privatekey-file-perm.patch to set private key
file permission to 0400 (instead of 0644) when writing with
sshbuf_write_file, preventing overly permissive key file permissions.

This patch was lost during the 1:10.0p1-7+deb13u4 version update.

Log: add deepin-ssh-keygen privatekey file permission patch

Influence:
1. Verify ssh-keygen generates private key files with 0400 permission

fix: 添加 ssh-keygen 私钥文件权限补丁

将 sshbuf_write_file 写入私钥文件的权限从 0644 改为 0400,
防止私钥文件权限过于宽松。

Log: 添加 ssh-keygen 私钥文件权限补丁

Influence:
1. 验证 ssh-keygen 生成的私钥文件权限为 0400

repo: openssh #dcbot/debian/10.0p1

fix: refresh patches to apply cleanly on 10.0p1 source

Refresh all backported patches using quilt to eliminate fuzz/offset
and ensure they apply cleanly with dpkg-source strict checking (-F 0):
- deepin-extra-version.patch: Update version.h context (10.0p1 uses "p2")
- deepin-ssh-connect-idle-timeout.patch: Regenerate sshd_config context
- deepin-ssh-keygen-privatekey-file-perm.patch: Clean format
- add-sm-support.patch: Fix sshd-session.c hunks, add KEX_SM2_SM3 to
  monitor.c (kex setup moved from sshd-session.c to monitor.c in 10.0p1)
- uniontech-fix-duplicate-loginmsg.patch: Fix trailing newline, refresh
  monitor.c hunk offset

Log: refresh patches for clean dpkg-source apply

Influence:
1. Verify dpkg-source --build succeeds
2. Verify quilt push -a applies all patches cleanly

fix: 刷新补丁使其在 10.0p1 源码上干净应用

通过 quilt refresh 消除所有 fuzz/offset,满足 dpkg-source 严格检查

Log: 刷新补丁使其干净应用

Influence:
1. 验证 dpkg-source --build 成功
2. 验证 quilt push -a 干净应用所有补丁

repo: openssh #dcbot/debian/10.0p1
@Zeno-sole

Copy link
Copy Markdown
Contributor

/topic openssh-20260616

@deepin-ci-robot

Copy link
Copy Markdown
Contributor

Add topic: openssh-20260616 successed.

@Zeno-sole

Copy link
Copy Markdown
Contributor

/integr-topic openssh-20260616

@deepin-ci-robot

Copy link
Copy Markdown
Contributor

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

@deepin-ci-robot

Copy link
Copy Markdown
Contributor

Integrated with pr deepin-community/Repository-Integration#4156

@Zeno-sole Zeno-sole merged commit cf3e4d2 into master Jun 17, 2026
6 of 10 checks passed
@github-project-automation github-project-automation Bot moved this from Todo to Done in openssh-20260616 Jun 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants