From 224d794780955984f64af0709ca741b8b8549fbb Mon Sep 17 00:00:00 2001 From: wuzx Date: Tue, 2 Sep 2025 17:43:06 +0800 Subject: [PATCH] add sw arch --- openssh-Add-sw64-architecture.patch | 26 ++++++++++++++++++++++++++ openssh.spec | 10 +++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 openssh-Add-sw64-architecture.patch diff --git a/openssh-Add-sw64-architecture.patch b/openssh-Add-sw64-architecture.patch new file mode 100644 index 0000000..b93813d --- /dev/null +++ b/openssh-Add-sw64-architecture.patch @@ -0,0 +1,26 @@ +From 1da37eaee8e3e35a80f34c4956f8d4b03fa2e1ae Mon Sep 17 00:00:00 2001 +From: swcompiler +Date: Mon, 11 Aug 2025 17:20:50 +0800 +Subject: [PATCH] sw + +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 0cb1044..81fda5a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1040,6 +1040,9 @@ int main(void) { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + riscv64-*) + seccomp_audit_arch=AUDIT_ARCH_RISCV64 + ;; ++ sw_64-*) ++ seccomp_audit_arch=AUDIT_ARCH_SW64 ++ ;; + esac + if test "x$seccomp_audit_arch" != "x" ; then + AC_MSG_RESULT(["$seccomp_audit_arch"]) +-- +2.33.0 + diff --git a/openssh.spec b/openssh.spec index aaf6f07..7414029 100644 --- a/openssh.spec +++ b/openssh.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %global WITH_SELINUX 1 @@ -231,6 +231,9 @@ Patch1019: bugfix-for-cve-2025-26465.patch # https://www.qualys.com/2024/07/01/cve-2024-6387/regresshion.txt Patch1020: bugfix-for-cve-2024-6387.patch +#for sw_64 +Patch1021: openssh-Add-sw64-architecture.patch + # https://github.com/openssh/openssh-portable/commit/81c1099d22b81ebfd20a334ce986c4f753b0db29 License: BSD-3-Clause AND BSD-2-Clause AND ISC AND SSH-OpenSSH AND ssh-keyscan AND sprintf AND LicenseRef-Fedora-Public-Domain AND X11-distribute-modifications-variant Requires: /sbin/nologin @@ -450,6 +453,8 @@ popd %patch -P 1019 -p1 %patch -P 1020 -p1 +%patch -P 1021 -p1 + autoreconf pushd pam_ssh_agent_auth-pam_ssh_agent_auth-%{pam_ssh_agent_ver} autoreconf @@ -757,6 +762,9 @@ test -f %{sysconfig_anaconda} && \ %endif %changelog +* Tue Sep 2 2025 wxiat - 9.6p1-3 +- add sw arch + * Tue Aug 19 2025 zjl02254423 - 9.6p1-2 - add patch to fix CVE-2024-6387 -- Gitee