diff --git a/audit-3.0.1-sw.patch b/audit-3.0.1-sw.patch new file mode 100755 index 0000000000000000000000000000000000000000..f8fdd11fd1263965f1088973f7ba4d1aaf7c3ba5 --- /dev/null +++ b/audit-3.0.1-sw.patch @@ -0,0 +1,87 @@ +diff -Nuar audit-3.0.1.org/bindings/swig/python/audit.py audit-3.0.1.sw/bindings/swig/python/audit.py +--- audit-3.0.1.org/bindings/swig/python/audit.py 2021-10-30 15:11:19.420000000 +0000 ++++ audit-3.0.1.sw/bindings/swig/python/audit.py 2021-10-30 15:42:40.950000000 +0000 +@@ -607,6 +607,7 @@ + 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 -Nuar audit-3.0.1.org/config.guess audit-3.0.1.sw/config.guess +--- audit-3.0.1.org/config.guess 2021-10-30 15:11:19.420000000 +0000 ++++ audit-3.0.1.sw/config.guess 2021-10-30 15:39:53.800000000 +0000 +@@ -913,6 +913,14 @@ + UNAME_MACHINE=aarch64_be + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; ++ sw_64:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ sw) UNAME_MACHINE=sw_64 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo "$UNAME_MACHINE"-sunway-linux-"$LIBC" ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +diff -Nuar audit-3.0.1.org/config.sub audit-3.0.1.sw/config.sub +--- audit-3.0.1.org/config.sub 2021-10-30 15:11:19.430000000 +0000 ++++ audit-3.0.1.sw/config.sub 2021-10-30 15:40:08.960000000 +0000 +@@ -1157,6 +1157,7 @@ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ ++ | sw_64 \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ +diff -Nuar audit-3.0.1.org/lib/libaudit.h audit-3.0.1.sw/lib/libaudit.h +--- audit-3.0.1.org/lib/libaudit.h 2021-10-30 15:11:19.420000000 +0000 ++++ audit-3.0.1.sw/lib/libaudit.h 2021-10-30 15:41:46.920000000 +0000 +@@ -561,6 +561,7 @@ + MACH_S390X, + MACH_S390, + MACH_ALPHA, // Deprecated but has to stay ++ MACH_SW_64, // Deprecated but has to stay + MACH_ARM, + MACH_AARCH64, + MACH_PPC64LE +diff -Nuar audit-3.0.1.org/src/libev/ev.c audit-3.0.1.sw/src/libev/ev.c +--- audit-3.0.1.org/src/libev/ev.c 2021-10-30 15:11:19.380000000 +0000 ++++ audit-3.0.1.sw/src/libev/ev.c 2021-10-30 15:39:11.890000000 +0000 +@@ -698,6 +698,8 @@ + #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__ ("") +@@ -1307,6 +1309,7 @@ + || defined __s390__ || defined __s390x__ \ + || defined __mips__ \ + || defined __alpha__ \ ++ || defined __sw_64__ \ + || defined __hppa__ \ + || defined __ia64__ \ + || defined __m68k__ \ +diff -Nuar audit-3.0.1.org/tools/ausyscall/ausyscall.c audit-3.0.1.sw/tools/ausyscall/ausyscall.c +--- audit-3.0.1.org/tools/ausyscall/ausyscall.c 2021-10-30 15:11:19.430000000 +0000 ++++ audit-3.0.1.sw/tools/ausyscall/ausyscall.c 2021-10-30 15:44:36.650000000 +0000 +@@ -73,6 +73,12 @@ + } 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", diff --git a/audit.spec b/audit.spec index d986cfa83d37ee2efb88ec2eeef6c99546aaba71..ca49479a0af2c7777a8363ecbc73c764c7e0d9d2 100644 --- a/audit.spec +++ b/audit.spec @@ -2,7 +2,7 @@ Summary: User space tools for kernel auditing Name: audit Epoch: 1 Version: 3.0.1 -Release: 3 +Release: 4 License: GPLv2+ and LGPLv2+ URL: https://people.redhat.com/sgrubb/audit/ Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz @@ -32,6 +32,9 @@ Patch20: backport-When-interpreting-if-val-is-NULL-return-an-empty-str.p Patch21: backport-auditd.service-Restart-on-failure-ignoring-some-exit.patch Patch22: backport-0001-In-auditd-close-the-logging-file-descriptor-when-log.patch Patch23: backport-0002-In-auditd-close-the-logging-file-descriptor-when-log.patch +%ifarch sw_64 +Patch24: audit-3.0.1-sw.patch +%endif BuildRequires: gcc swig libtool systemd kernel-headers >= 2.6.29 BuildRequires: openldap-devel krb5-devel libcap-ng-devel @@ -369,6 +372,9 @@ fi %attr(644,root,root) %{_mandir}/man8/*.8.gz %changelog +* Tue Oct 18 2022 wuzx - 3.0.1-4 +- add sw64 patch + * Sat Feb 12 2022 yixiangzhike - 3.0.1-3 - Fix failure of stopping auditd before uninstalling