diff options
author | Scott Murray <scott.murray@konsulko.com> | 2020-03-30 16:12:08 -0400 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-04-27 17:12:24 +0200 |
commit | 0607a712c878eec262c9c840e74ce266d22ceaeb (patch) | |
tree | ba94d739ab172e8639a9333f36d89ddb8272018d /meta-security/recipes-security/audit/audit/fix-swig-host-contamination.patch | |
parent | 61becb58b652e04f5d55e160755cd7fb99f66403 (diff) |
meta-security: update to audit 2.8.5
Update audit recipe with version 2.8.5 recipe from meta-selinux (as
of commit 03baa60) to fix build issues against dunfell related to
python2 removal. Adding meta-selinux to the manifest for the one
recipe seems like overkill for now; it might be worthwhile asking
upstream about moving it to meta-security to allow dropping a local
copy altogether.
Bug-AGL: SPEC-3302
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I83a2e65201f9f02fcce843f4bc6b65a2304ef899
Diffstat (limited to 'meta-security/recipes-security/audit/audit/fix-swig-host-contamination.patch')
-rw-r--r-- | meta-security/recipes-security/audit/audit/fix-swig-host-contamination.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/meta-security/recipes-security/audit/audit/fix-swig-host-contamination.patch b/meta-security/recipes-security/audit/audit/fix-swig-host-contamination.patch deleted file mode 100644 index 16bb173ad..000000000 --- a/meta-security/recipes-security/audit/audit/fix-swig-host-contamination.patch +++ /dev/null @@ -1,48 +0,0 @@ -audit: Fixed swig host contamination issue - -The audit build uses swig to generate a python wrapper. -Unfortunately, the swig info file references host include -directories. Some of these were previously noticed and -eliminated, but the one fixed here was not. - -Upstream Status: pending - -Signed-off-by: Anders Hedlund <anders.hedlund@windriver.com> -Signed-off-by: Joe Slater <jslater@windriver.com> - -Index: audit-2.2.1/swig/Makefile.am -=================================================================== ---- audit-2.2.1.orig/swig/Makefile.am -+++ audit-2.2.1/swig/Makefile.am -@@ -25,6 +25,7 @@ AM_CFLAGS = -fPIC -DPIC -fno-strict-alia - PYLIBVER ?= python$(PYTHON_VERSION) - PYINC ?= /usr/include/$(PYLIBVER) - INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I$(PYINC) -+STDINC ?= /usr/include - LIBS = $(top_builddir)/lib/libaudit.la - pyexec_PYTHON = audit.py - pyexec_LTLIBRARIES = _audit.la -@@ -34,7 +35,7 @@ _audit_la_HEADERS: $(top_builddir)/confi - _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudit.la - nodist__audit_la_SOURCES = audit_wrap.c - audit.py audit_wrap.c: ${srcdir}/auditswig.i -- swig -o audit_wrap.c -python ${INCLUDES} ${srcdir}/auditswig.i -+ swig -o audit_wrap.c -python ${INCLUDES} -I$(STDINC) ${srcdir}/auditswig.i - - CLEANFILES = audit.py* audit_wrap.c *~ - -Index: audit-2.2.1/swig/auditswig.i -=================================================================== ---- audit-2.2.1.orig/swig/auditswig.i -+++ audit-2.2.1/swig/auditswig.i -@@ -37,8 +37,8 @@ signed - #define __attribute(X) /*nothing*/ - typedef unsigned __u32; - typedef unsigned uid_t; --%include "/usr/include/linux/audit.h" -+%include "linux/audit.h" - #define __extension__ /*nothing*/ --%include "/usr/include/stdint.h" -+%include "stdint.h" - %include "../lib/libaudit.h" - |