[meta-selinux] audit: Fix compile bug

Submitted by Zheng Ruoqin on Sept. 8, 2020, 2:30 a.m. | Patch ID: 176144

Details

Message ID 1599532226-124109-1-git-send-email-zhengrq.fnst@cn.fujitsu.com
State New
Headers show

Commit Message

Zheng Ruoqin Sept. 8, 2020, 2:30 a.m.
The following error occurred during compile:
ausearch-common.h:53: multiple definition of `event_node_list'

Header definitions need to be external when building with -fno-common.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 ...ns-need-to-be-external-when-building.patch | 26 +++++++++++++++++++
 recipes-security/audit/audit_2.8.5.bb         |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 recipes-security/audit/audit/0001-Header-definitions-need-to-be-external-when-building.patch

Patch hide | download patch | download mbox

diff --git a/recipes-security/audit/audit/0001-Header-definitions-need-to-be-external-when-building.patch b/recipes-security/audit/audit/0001-Header-definitions-need-to-be-external-when-building.patch
new file mode 100644
index 0000000..209d8cf
--- /dev/null
+++ b/recipes-security/audit/audit/0001-Header-definitions-need-to-be-external-when-building.patch
@@ -0,0 +1,26 @@ 
+From 017e6c6ab95df55f34e339d2139def83e5dada1f Mon Sep 17 00:00:00 2001
+From: Steve Grubb <sgrubb@redhat.com>
+Date: Fri, 10 Jan 2020 21:13:50 -0500
+Subject: [PATCH] Header definitions need to be external when building with
+ -fno-common (which is default in GCC 10) - Tony Jones
+
+---
+ src/ausearch-common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ausearch-common.h b/src/ausearch-common.h
+index 6669203..3040547 100644
+--- a/src/ausearch-common.h
++++ b/src/ausearch-common.h
+@@ -50,7 +50,7 @@ extern pid_t event_pid;
+ extern int event_exact_match;
+ extern uid_t event_uid, event_euid, event_loginuid;
+ extern const char *event_tuid, *event_teuid, *event_tauid;
+-slist *event_node_list;
++extern slist *event_node_list;
+ extern const char *event_comm;
+ extern const char *event_filename;
+ extern const char *event_hostname;
+-- 
+2.25.1
+
diff --git a/recipes-security/audit/audit_2.8.5.bb b/recipes-security/audit/audit_2.8.5.bb
index af36ed5..e3e5ddd 100644
--- a/recipes-security/audit/audit_2.8.5.bb
+++ b/recipes-security/audit/audit_2.8.5.bb
@@ -11,6 +11,7 @@  SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=2.8_maintena
            file://Add-substitue-functions-for-strndupa-rawmemchr.patch \
            file://Fixed-swig-host-contamination-issue.patch \
            file://0001-lib-i386_table.h-add-new-syscall.patch \
+           file://0001-Header-definitions-need-to-be-external-when-building.patch \
            file://auditd \
            file://auditd.service \
            file://audit-volatile.conf \