From 7624d825c36203fc712bdc6fcb4ba926da9d4cc1 Mon Sep 17 00:00:00 2001 From: wxiat Date: Wed, 14 Jun 2023 14:44:23 +0800 Subject: [PATCH] add sw Signed-off-by: wxiat --- openssh-8.0p1-sw.patch | 27 +++++++++++++++++++++++++++ openssh.spec | 8 +++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 openssh-8.0p1-sw.patch diff --git a/openssh-8.0p1-sw.patch b/openssh-8.0p1-sw.patch new file mode 100644 index 0000000..79873e1 --- /dev/null +++ b/openssh-8.0p1-sw.patch @@ -0,0 +1,27 @@ +diff -Naur openssh-8.0p1.org/configure.ac openssh-8.0p1.sw/configure.ac +--- openssh-8.0p1.org/configure.ac 2023-05-17 14:30:46.480006046 +0800 ++++ openssh-8.0p1.sw/configure.ac 2023-05-17 14:32:34.862821373 +0800 +@@ -879,6 +879,9 @@ + arm*-*) + seccomp_audit_arch=AUDIT_ARCH_ARM + ;; ++ sw_64*-*) ++ seccomp_audit_arch=AUDIT_ARCH_SW_64 ++ ;; + aarch64*-*) + seccomp_audit_arch=AUDIT_ARCH_AARCH64 + ;; +diff -Naur openssh-8.0p1.org/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h openssh-8.0p1.sw/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h +--- openssh-8.0p1.org/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h 2016-11-13 11:24:41.000000000 +0800 ++++ openssh-8.0p1.sw/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h 2023-05-17 14:33:39.453095103 +0800 +@@ -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 diff --git a/openssh.spec b/openssh.spec index 8eacb8d..fe17290 100644 --- a/openssh.spec +++ b/openssh.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.3 # Do we want SELinux & Audit %if 0%{?!noselinux:1} %global WITH_SELINUX 1 @@ -283,6 +283,8 @@ Patch1002: 1000-openssh-anolis-fix-seccomp-error.patch # Fix a one-byte overflow in SSH-banner processing Patch1003: openssh-9.1p1-fix-onebyte-buffer-overflow.patch +Patch1004: openssh-8.0p1-sw.patch + License: BSD Group: Applications/Internet Requires: /sbin/nologin @@ -523,6 +525,7 @@ popd %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 +%patch1004 -p1 autoreconf pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} @@ -808,6 +811,9 @@ getent passwd sshd >/dev/null || \ %endif %changelog +* Wed Jun 14 2023 wxiat - 8.0p1-16.0.3 +- add sw patch + * Sat Mar 18 2023 JiangYong - 8.0p1-16.0.2 - Fix a one-byte overflow in SSH-banner processing -- Gitee