diff --git a/openssh-Add-sw64-architecture.patch b/openssh-Add-sw64-architecture.patch new file mode 100644 index 0000000000000000000000000000000000000000..33dfbb90cb0b96df60d9ddde454447930fa8cb9d --- /dev/null +++ b/openssh-Add-sw64-architecture.patch @@ -0,0 +1,27 @@ +From 6075cb3ead4cf473d48d0022ec25540707111c10 Mon Sep 17 00:00:00 2001 +From: wzx +Date: Thu, 27 Oct 2022 17:19:00 +0800 +Subject: [PATCH] Add sw64 architecture + +Signed-off-by: wzx +--- + 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 2285e1e50f83f6c98c87f0d2e86ea2b1a08d12b0..c0f94887256bd978c4f6ce1e9d10232d5f5ec9a3 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,7 +6,7 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 10 +%global openssh_release 11 Name: openssh Version: 8.8p1 @@ -93,6 +93,7 @@ Patch60: feature-add-SMx-support.patch Patch61: backport-upstream-a-little-extra-debugging.patch Patch62: backport-upstream-better-debugging-for-connect_next.patch Patch63: backport-upstream-ssh-keygen-Y-check-novalidate-requires-name.patch +Patch64: openssh-Add-sw64-architecture.patch Requires: /sbin/nologin Requires: libselinux >= 2.3-5 audit-libs >= 1.0.8 @@ -235,6 +236,7 @@ popd %patch61 -p1 %patch62 -p1 %patch63 -p1 +%patch64 -p1 autoreconf pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4 @@ -278,7 +280,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 @@ -436,6 +438,12 @@ getent passwd sshd >/dev/null || \ %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Thu Dec 29 2022 renmingshuai - 8.8p1-11 +- Type:requirement +- CVE:NA +- SUG:NA +- DESC:Add sw64 architecture + * Thu Dec 29 2022 renmingshuai - 8.8p1-10 - Type:bugfix - CVE:NA