diff --git a/openssh-8.0p1-sw.patch b/openssh-8.0p1-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..ec681630d1997d23011320ff981d6694490f741d --- /dev/null +++ b/openssh-8.0p1-sw.patch @@ -0,0 +1,43 @@ +From d79f3b68e7eb6638a27bab8853f790d10aa88d93 Mon Sep 17 00:00:00 2001 +From: Weisson +Date: Tue, 21 Nov 2023 10:44:32 +0800 +Subject: [PATCH] Add sw build support. + +Signed-off-by: Weisson +--- + configure.ac | 3 +++ + .../ed25519-donna/ed25519-donna-portable-identify.h | 4 ++++ + 2 files changed, 7 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 6e57635..9e32389 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -879,6 +879,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + arm*-*) + seccomp_audit_arch=AUDIT_ARCH_ARM + ;; ++ sw_64*-*) ++ seccomp_audit_arch=AUDIT_ARCH_SW64 ++ ;; + aarch64*-*) + seccomp_audit_arch=AUDIT_ARCH_AARCH64 + ;; +diff --git a/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h b/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h +index 26a264c..4457e9a 100644 +--- a/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h ++++ b/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h +@@ -79,6 +79,10 @@ + #define CPU_HPPA + #endif + ++#if defined(__sw_64__) || defined(__sw_64) || defined(_M_SW_64) ++ #define CPU_SW_64 ++#endif ++ + #if defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA) + #define CPU_ALPHA + #endif +-- +2.31.1 + diff --git a/openssh.spec b/openssh.spec index 117d12f8268e45534b15eba31bc3147c33dac5a2..c5c2b2fd349ee75911f75a7733688566e8bf8dc2 100644 --- a/openssh.spec +++ b/openssh.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.3 # Do we want SELinux & Audit %if 0%{?!noselinux:1} %global WITH_SELINUX 1 @@ -289,6 +289,8 @@ Patch1004: openssh-8.3p1-fix-desynchronised-utimes-failed.patch Patch1005: 1005-terminate-pkcs11-process-for-bad-libraries.patch Patch1006: openssh-8.0p1-CVE-2023-51385.patch +Patch2000: openssh-8.0p1-sw.patch + License: BSD Group: Applications/Internet Requires: /sbin/nologin @@ -533,6 +535,7 @@ popd %patch1004 -p1 %patch1005 -p1 %patch1006 -p1 +%patch2000 -p1 autoreconf pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} @@ -818,6 +821,12 @@ getent passwd sshd >/dev/null || \ %endif %changelog +* Wed Mar 20 2024 Weisson - 8.0p1-20.0.3 +- adapt macro `seccomp_audit_arch` to kernel-headers. + +* Wed Mar 20 2024 wxiat - 8.0p1-20.0.2 +- add sw patch + * Tue Jan 16 2024 Chuanyi Feng - 8.0p1-20.0.1 - Fix CVE-2023-51385