From 4f73388b878c8136146aa4b9aa2c96b8cc876c6a Mon Sep 17 00:00:00 2001 From: Weisson Date: Tue, 5 Nov 2024 18:55:01 +0800 Subject: [PATCH] cherry-pick `add sw patch #63160b250a36d3a0326470e2814e9ad8d6b45589` (nijie@wxiat.com) Signed-off-by: Weisson --- audit-add-sw.patch | 28 ++++++++++++++-------------- audit.spec | 7 ++++--- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/audit-add-sw.patch b/audit-add-sw.patch index 627282a..301cd9c 100644 --- a/audit-add-sw.patch +++ b/audit-add-sw.patch @@ -1,9 +1,9 @@ -From 34a7470dec3f87d107dc5f42c04721ec0f1a01ef Mon Sep 17 00:00:00 2001 -From: wxiat -Date: Mon, 19 Jun 2023 16:30:44 +0800 -Subject: [PATCH] add sw +From f78e34201ce7ce1fe7690b4f6a9cf5d90e9e592d Mon Sep 17 00:00:00 2001 +From: Weisson +Date: Thu, 7 Nov 2024 00:04:13 +0800 +Subject: [PATCH] Add sw_64 support. -Signed-off-by: wxiat +Signed-off-by: Weisson --- bindings/swig/python/audit.py | 1 + bindings/swig/python3/audit.py | 1 + @@ -13,10 +13,10 @@ Signed-off-by: wxiat 5 files changed, 12 insertions(+) diff --git a/bindings/swig/python/audit.py b/bindings/swig/python/audit.py -index 260d7e5..071862a 100644 +index 2c1bdb6..cc12cea 100644 --- a/bindings/swig/python/audit.py +++ b/bindings/swig/python/audit.py -@@ -614,6 +614,7 @@ MACH_PPC = _audit.MACH_PPC +@@ -606,6 +606,7 @@ MACH_PPC = _audit.MACH_PPC MACH_S390X = _audit.MACH_S390X MACH_S390 = _audit.MACH_S390 MACH_ALPHA = _audit.MACH_ALPHA @@ -25,10 +25,10 @@ index 260d7e5..071862a 100644 MACH_AARCH64 = _audit.MACH_AARCH64 MACH_PPC64LE = _audit.MACH_PPC64LE diff --git a/bindings/swig/python3/audit.py b/bindings/swig/python3/audit.py -index a50e225..b5f1e6e 100644 +index 2c1bdb6..cc12cea 100644 --- a/bindings/swig/python3/audit.py +++ b/bindings/swig/python3/audit.py -@@ -614,6 +614,7 @@ MACH_PPC = _audit.MACH_PPC +@@ -606,6 +606,7 @@ MACH_PPC = _audit.MACH_PPC MACH_S390X = _audit.MACH_S390X MACH_S390 = _audit.MACH_S390 MACH_ALPHA = _audit.MACH_ALPHA @@ -37,17 +37,17 @@ index a50e225..b5f1e6e 100644 MACH_AARCH64 = _audit.MACH_AARCH64 MACH_PPC64LE = _audit.MACH_PPC64LE diff --git a/lib/libaudit.h b/lib/libaudit.h -index 08b7d22..3160f0c 100644 +index f623f63..9468cb4 100644 --- a/lib/libaudit.h +++ b/lib/libaudit.h -@@ -577,6 +577,7 @@ typedef enum { +@@ -594,6 +594,7 @@ typedef enum { MACH_S390X, MACH_S390, MACH_ALPHA, // Deprecated but has to stay + MACH_SW_64, MACH_ARM, MACH_AARCH64, - MACH_PPC64LE + MACH_PPC64LE, diff --git a/src/libev/ev.c b/src/libev/ev.c index a4ef36f..8f5e037 100644 --- a/src/libev/ev.c @@ -70,7 +70,7 @@ index a4ef36f..8f5e037 100644 || defined __ia64__ \ || defined __m68k__ \ diff --git a/tools/ausyscall/ausyscall.c b/tools/ausyscall/ausyscall.c -index 8e59219..ce8d7da 100644 +index bf751f1..ad679fa 100644 --- a/tools/ausyscall/ausyscall.c +++ b/tools/ausyscall/ausyscall.c @@ -73,6 +73,12 @@ int main(int argc, char *argv[]) @@ -86,6 +86,6 @@ index 8e59219..ce8d7da 100644 #ifndef WITH_ARM } else if (strcmp("arm", argv[i]) == 0) { fputs("Arm eabi processor support is not enabled\n", --- +-- 2.31.1 diff --git a/audit.spec b/audit.spec index e209591..3b58e24 100644 --- a/audit.spec +++ b/audit.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: User space tools for kernel auditing @@ -99,9 +99,7 @@ Doc pages for %{name}. cp %{SOURCE1} . #autoreconf -fv --install -%ifarch sw_64 %patch -P 2000 -p1 -%endif %build %configure --with-python=no \ @@ -259,6 +257,9 @@ fi %doc README ChangeLog init.d/auditd.cron %changelog +* Tue Nov 5 2024 Weisson - 3.1.2-1.0.2 +- cherry-pick `add sw patch #63160b250a36d3a0326470e2814e9ad8d6b45589` (nijie@wxiat.com) + * Thu Jul 04 2024 Zhao Hang - 3.1.2-1.0.1 - Add doc sub package (Bo Ren) - cherry-pick `add sw patch #63160b250a36d3a0326470e2814e9ad8d6b45589` (nijie@wxiat.com) -- Gitee