packages/openssh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add sw64 architecture

Browse Source
This commit is contained in:
renmingshuai 2022-12-29 10:48:46 +08:00
parent 4b9333059e
commit 9f3cccab15
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
openssh-Add-sw64-architecture.patch Normal file
View File

@ -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

12
openssh.spec
View File

@ -6,7 +6,7 @@
%{?no_gtk2:%global gtk2 0} %{?no_gtk2:%global gtk2 0}
%global sshd_uid 74 %global sshd_uid 74
%global openssh_release 10 %global openssh_release 11
Name: openssh Name: openssh
Version: 8.8p1 Version: 8.8p1
@ -92,6 +92,7 @@ Patch61: backport-upstream-a-little-extra-debugging.patch
Patch62: backport-upstream-better-debugging-for-connect_next.patch Patch62: backport-upstream-better-debugging-for-connect_next.patch
Patch63: add-loongarch.patch Patch63: add-loongarch.patch
Patch64: backport-upstream-ssh-keygen-Y-check-novalidate-requires-name.patch Patch64: backport-upstream-ssh-keygen-Y-check-novalidate-requires-name.patch
Patch65: openssh-Add-sw64-architecture.patch
Requires: /sbin/nologin Requires: /sbin/nologin
Requires: libselinux >= 2.3-5 audit-libs >= 1.0.8 Requires: libselinux >= 2.3-5 audit-libs >= 1.0.8
@ -234,6 +235,7 @@ popd
%patch62 -p1 %patch62 -p1
%patch63 -p1 %patch63 -p1
%patch64 -p1 %patch64 -p1
%patch65 -p1
autoreconf autoreconf
pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4 pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4
@ -277,7 +279,7 @@ fi
--without-zlib-version-check --with-ssl-engine --with-ipaddr-display \ --without-zlib-version-check --with-ssl-engine --with-ipaddr-display \
--with-pie=no --without-hardening --with-systemd --with-default-pkcs11-provider=yes \ --with-pie=no --without-hardening --with-systemd --with-default-pkcs11-provider=yes \
--with-pam --with-selinux --with-audit=linux --with-security-key-buildin=yes \ --with-pam --with-selinux --with-audit=linux --with-security-key-buildin=yes \
%ifnarch riscv64 loongarch64 %ifnarch riscv64 loongarch64 sw_64
--with-sandbox=seccomp_filter \ --with-sandbox=seccomp_filter \
%endif %endif
--with-kerberos5${krb5_prefix:+=${krb5_prefix}} --with-libedit --with-kerberos5${krb5_prefix:+=${krb5_prefix}} --with-libedit
@ -435,6 +437,12 @@ getent passwd sshd >/dev/null || \
%attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
%changelog %changelog
* Thu Dec 29 2022 renmingshuai <renmingshuai@huawei.com> - 8.8p1-11
- Type:requirement
- CVE:NA
- SUG:NA
- DESC:add sw_64
* Fri Dec 16 2022 renmingshuai <renmingshuai@huawei.com> - 8.8p1-10 * Fri Dec 16 2022 renmingshuai <renmingshuai@huawei.com> - 8.8p1-10
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA