From 36df03e7ea219bbe855d5132c6cc719c3678d7f4 Mon Sep 17 00:00:00 2001
From: renmingshuai <renmingshuai@huawei.com>
Date: Tue, 13 Dec 2022 20:43:16 +0800
Subject: [PATCH] Add sw64 architecture

---
 openssh-Add-sw64-architecture.patch | 27 +++++++++++++++++++++++++++
 openssh.spec                        | 12 ++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 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..33dfbb9
--- /dev/null
+++ b/openssh-Add-sw64-architecture.patch
@@ -0,0 +1,27 @@
+From 6075cb3ead4cf473d48d0022ec25540707111c10 Mon Sep 17 00:00:00 2001
+From: wzx <wuzx1226@qq.com>
+Date: Thu, 27 Oct 2022 17:19:00 +0800
+Subject: [PATCH] Add sw64 architecture
+
+Signed-off-by: wzx <wuzx1226@qq.com>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 307e974..612f458 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -931,6 +931,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
+ 	aarch64*-*)
+ 		seccomp_audit_arch=AUDIT_ARCH_AARCH64
+ 		;;
++	sw_64*-*)
++		seccomp_audit_arch=AUDIT_ARCH_SW_64
++		;;
+ 	s390x-*)
+ 		seccomp_audit_arch=AUDIT_ARCH_S390X
+ 		;;
+-- 
+2.33.0
+
diff --git a/openssh.spec b/openssh.spec
index 7bfdd84..7a191d0 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -6,7 +6,7 @@
 %{?no_gtk2:%global gtk2 0}
 
 %global sshd_uid    74
-%global openssh_release 9
+%global openssh_release 10
 
 Name:           openssh
 Version:        8.8p1
@@ -92,6 +92,7 @@ Patch6001:	backport-fix-possible-NULL-deref-when-built-without-FIDO.patch
 Patch60:        feature-add-SMx-support.patch
 Patch61:        backport-upstream-a-little-extra-debugging.patch
 Patch62:        backport-upstream-better-debugging-for-connect_next.patch
+Patch63:        openssh-Add-sw64-architecture.patch
 
 Requires:       /sbin/nologin
 Requires:       libselinux >= 2.3-5 audit-libs >= 1.0.8
@@ -233,6 +234,7 @@ popd
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1
+%patch63 -p1
 
 autoreconf
 pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4
@@ -276,7 +278,7 @@ fi
     --without-zlib-version-check --with-ssl-engine --with-ipaddr-display \
     --with-pie=no --without-hardening --with-systemd --with-default-pkcs11-provider=yes \
     --with-pam --with-selinux --with-audit=linux --with-security-key-buildin=yes \
-%ifnarch riscv64	
+%ifnarch riscv64 sw_64	
      --with-sandbox=seccomp_filter \
 %endif
     --with-kerberos5${krb5_prefix:+=${krb5_prefix}} --with-libedit
@@ -434,6 +436,12 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 
 %changelog
+* Tue Dec 13 2022 renmingshuai<renmingshuai@huawei.com> - 8.8p1-10
+- Type:feature
+- CVE:NA
+- SUG:NA
+- DESC:Add sw64 architecture
+
 * Wed Dec 7 2022 duyiwei<duyiwei@kylinos.cn> - 8.8P1-9
 - Type:bugfix
 - CVE:NA
-- 
Gitee