From 749832119554faeae2c05c8fb5754d96bbc6b2c5 Mon Sep 17 00:00:00 2001 From: wxiat Date: Mon, 19 Jun 2023 16:32:44 +0800 Subject: [PATCH] cherry-pick `add sw patch #63160b250a36d3a0326470e2814e9ad8d6b45589` Signed-off-by: wxiat Signed-off-by: Weisson --- audit-add-sw.patch | 91 ++++++++++++++++++++++++++++++++++++++++++++++ audit.spec | 11 +++++- 2 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 audit-add-sw.patch diff --git a/audit-add-sw.patch b/audit-add-sw.patch new file mode 100644 index 0000000..627282a --- /dev/null +++ b/audit-add-sw.patch @@ -0,0 +1,91 @@ +From 34a7470dec3f87d107dc5f42c04721ec0f1a01ef Mon Sep 17 00:00:00 2001 +From: wxiat +Date: Mon, 19 Jun 2023 16:30:44 +0800 +Subject: [PATCH] add sw + +Signed-off-by: wxiat +--- + bindings/swig/python/audit.py | 1 + + bindings/swig/python3/audit.py | 1 + + lib/libaudit.h | 1 + + src/libev/ev.c | 3 +++ + tools/ausyscall/ausyscall.c | 6 ++++++ + 5 files changed, 12 insertions(+) + +diff --git a/bindings/swig/python/audit.py b/bindings/swig/python/audit.py +index 260d7e5..071862a 100644 +--- a/bindings/swig/python/audit.py ++++ b/bindings/swig/python/audit.py +@@ -614,6 +614,7 @@ MACH_PPC = _audit.MACH_PPC + MACH_S390X = _audit.MACH_S390X + MACH_S390 = _audit.MACH_S390 + MACH_ALPHA = _audit.MACH_ALPHA ++MACH_SW_64 = _audit.MACH_SW_64 + MACH_ARM = _audit.MACH_ARM + 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 +--- a/bindings/swig/python3/audit.py ++++ b/bindings/swig/python3/audit.py +@@ -614,6 +614,7 @@ MACH_PPC = _audit.MACH_PPC + MACH_S390X = _audit.MACH_S390X + MACH_S390 = _audit.MACH_S390 + MACH_ALPHA = _audit.MACH_ALPHA ++MACH_SW_64 = _audit.MACH_SW_64 + MACH_ARM = _audit.MACH_ARM + MACH_AARCH64 = _audit.MACH_AARCH64 + MACH_PPC64LE = _audit.MACH_PPC64LE +diff --git a/lib/libaudit.h b/lib/libaudit.h +index 08b7d22..3160f0c 100644 +--- a/lib/libaudit.h ++++ b/lib/libaudit.h +@@ -577,6 +577,7 @@ typedef enum { + MACH_S390X, + MACH_S390, + MACH_ALPHA, // Deprecated but has to stay ++ MACH_SW_64, + MACH_ARM, + MACH_AARCH64, + MACH_PPC64LE +diff --git a/src/libev/ev.c b/src/libev/ev.c +index a4ef36f..8f5e037 100644 +--- a/src/libev/ev.c ++++ b/src/libev/ev.c +@@ -828,6 +828,8 @@ struct signalfd_siginfo + #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory") + #elif defined __alpha__ + #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") ++ #elif defined __sw_64__ ++ #define ECB_MEMORY_FENCE __asm__ __volatile__ ("memb" : : : "memory") + #elif defined __hppa__ + #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") + #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") +@@ -1550,6 +1552,7 @@ ecb_binary32_to_binary16 (uint32_t x) + || defined __s390__ || defined __s390x__ \ + || defined __mips__ \ + || defined __alpha__ \ ++ || defined __sw_64__ \ + || defined __hppa__ \ + || defined __ia64__ \ + || defined __m68k__ \ +diff --git a/tools/ausyscall/ausyscall.c b/tools/ausyscall/ausyscall.c +index 8e59219..ce8d7da 100644 +--- a/tools/ausyscall/ausyscall.c ++++ b/tools/ausyscall/ausyscall.c +@@ -73,6 +73,12 @@ int main(int argc, char *argv[]) + } else if (strcmp("ia64", argv[i]) == 0) { + fputs("IA64 processor support is deprecated\n", + stderr); ++#ifndef WITH_SW_64 ++ } else if (strcmp("sw_64", argv[i]) == 0) { ++ fputs("Sw_64 eabi processor support is not enabled\n", ++ stderr); ++ exit(1); ++#endif + #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 213c49c..f5171f2 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 @@ -16,6 +16,7 @@ Patch3: audit-3.1-fanotify-records.patch Patch4: audit-3.0.8-flex-array-workaround.patch Patch5: audit-3.0.8-undo-flex-array.patch Patch1000: 1000-split-audit-3.0.8-flex-array-workaround.patch +Patch2000: audit-add-sw.patch BuildRequires: gcc swig make BuildRequires: openldap-devel @@ -112,9 +113,12 @@ cp /usr/include/linux/audit.h lib/ %patch -P 2 -p1 %patch -P 3 -p1 %patch -P 4 -p1 -%ifnarch loongarch64 +%ifnarch loongarch64 sw_64 %patch -P 1000 -p1 %endif +%ifarch sw_64 +%patch -P 2000 -p1 +%endif %build %configure --with-python=no \ @@ -276,6 +280,9 @@ fi %doc README ChangeLog init.d/auditd.cron %changelog +* Tue Mar 19 2024 wxiat - 3.0.7-5.0.2 +- cherry-pick `add sw patch #63160b250a36d3a0326470e2814e9ad8d6b45589` + * Mon Dec 25 2023 Zhao Hang - 3.0.7-5.0.1 - Remove unneeded modification - Add doc sub package (Bo Ren) -- Gitee