From 65e875d6738148cc9222df8b80253c46f62462f7 Mon Sep 17 00:00:00 2001 From: renmingshuai Date: Thu, 29 Dec 2022 18:03:14 +0800 Subject: [PATCH] add loongarch64 --- add-loongarch.patch | 26 ++++++++++++++++++++++++++ openssh.spec | 12 ++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 add-loongarch.patch diff --git a/add-loongarch.patch b/add-loongarch.patch new file mode 100644 index 0000000..ae53632 --- /dev/null +++ b/add-loongarch.patch @@ -0,0 +1,26 @@ +From b87df88468d90292e7c09b8cfd992011cd812a1c Mon Sep 17 00:00:00 2001 +From: zhaozhen +Date: Mon, 5 Dec 2022 13:01:36 +0000 +Subject: [PATCH] add loongarch64 support + +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 307e974..aa3e01b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -972,6 +972,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + riscv64-*) + seccomp_audit_arch=AUDIT_ARCH_RISCV64 + ;; ++ loongarch64-*) ++ seccomp_audit_arch=AUDIT_ARCH_LOONGARCHEL64 ++ ;; + 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 33f2be1..017664a 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,7 +6,7 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 12 +%global openssh_release 13 Name: openssh Version: 8.8p1 @@ -102,6 +102,7 @@ Patch69: backport-upstream-Always-return-allocated-strings-from-the-ke.pa Patch70: backport-Don-t-leak-the-strings-allocated-by-order_h.patch Patch71: backport-Return-ERANGE-from-getcwd-if-buffer-size-is-1.patch Patch72: backport-upstream-double-free-in-error-path-from-Eusgor-via-G.patch +Patch73: add-loongarch.patch Requires: /sbin/nologin Requires: libselinux >= 2.3-5 audit-libs >= 1.0.8 @@ -253,6 +254,7 @@ popd %patch70 -p1 %patch71 -p1 %patch72 -p1 +%patch73 -p1 autoreconf pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4 @@ -296,7 +298,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 sw_64 +%ifnarch riscv64 sw_64 loongarch64 --with-sandbox=seccomp_filter \ %endif --with-kerberos5${krb5_prefix:+=${krb5_prefix}} --with-libedit @@ -454,6 +456,12 @@ getent passwd sshd >/dev/null || \ %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Thu Dec 29 2022 renmingshuai - 8.8p1-13 +- Type:requirement +- CVE:NA +- SUG:NA +- DESC:add loongarch + * Thu Dec 29 2022 renmingshuai - 8.8p1-12 - Type:bugfix - CVE:NA -- Gitee