diff --git a/openssh-8.0p1-sw.patch b/openssh-8.0p1-sw.patch index 79873e13b6ceee67081ddaf00fd1188864b81844..ec681630d1997d23011320ff981d6694490f741d 100644 --- a/openssh-8.0p1-sw.patch +++ b/openssh-8.0p1-sw.patch @@ -1,19 +1,32 @@ -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 @@ +From d79f3b68e7eb6638a27bab8853f790d10aa88d93 Mon Sep 17 00:00:00 2001 +From: Weisson +Date: Tue, 21 Nov 2023 10:44:32 +0800 +Subject: [PATCH] Add sw build support. + +Signed-off-by: Weisson +--- + configure.ac | 3 +++ + .../ed25519-donna/ed25519-donna-portable-identify.h | 4 ++++ + 2 files changed, 7 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 6e57635..9e32389 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -879,6 +879,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) arm*-*) seccomp_audit_arch=AUDIT_ARCH_ARM ;; + sw_64*-*) -+ seccomp_audit_arch=AUDIT_ARCH_SW_64 ++ seccomp_audit_arch=AUDIT_ARCH_SW64 + ;; 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 +diff --git a/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h b/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h +index 26a264c..4457e9a 100644 +--- a/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h ++++ b/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-donna-portable-identify.h @@ -79,6 +79,10 @@ #define CPU_HPPA #endif @@ -25,3 +38,6 @@ diff -Naur openssh-8.0p1.org/pam_ssh_agent_auth-0.10.3/ed25519-donna/ed25519-don #if defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA) #define CPU_ALPHA #endif +-- +2.31.1 + diff --git a/openssh.spec b/openssh.spec index fe172901f1597753376e8b064e73c45806fdaed7..a299ec1dce200c749cce1435cbb68c570327cc39 100644 --- a/openssh.spec +++ b/openssh.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.3 +%define anolis_release .0.4 # Do we want SELinux & Audit %if 0%{?!noselinux:1} %global WITH_SELINUX 1 @@ -811,6 +811,9 @@ getent passwd sshd >/dev/null || \ %endif %changelog +* Tue Nov 21 2023 Weisson - 8.0p1-16.0.4 +- adapt macro `seccomp_audit_arch` to kernel-headers. + * Wed Jun 14 2023 wxiat - 8.0p1-16.0.3 - add sw patch