diff options
-rw-r--r-- | meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch | 13 | ||||
-rw-r--r-- | meta-oe/recipes-security/audit/audit_4.0.5.bb (renamed from meta-oe/recipes-security/audit/audit_4.0.4.bb) | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch b/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch index f2755d5c08..f37fbf63a7 100644 --- a/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch +++ b/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5cdc667aeb7a014cdc1f8c7df8f8080408773dbe Mon Sep 17 00:00:00 2001 | 1 | From 4f78fcb8728cd4bf31175b3fa610a5c003e915d1 Mon Sep 17 00:00:00 2001 |
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
3 | Date: Sun, 19 Jul 2015 02:42:58 +0900 | 3 | Date: Sun, 19 Jul 2015 02:42:58 +0900 |
4 | Subject: [PATCH] Fixed swig host contamination issue | 4 | Subject: [PATCH] Fixed swig host contamination issue |
@@ -19,7 +19,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
19 | 2 files changed, 3 insertions(+), 2 deletions(-) | 19 | 2 files changed, 3 insertions(+), 2 deletions(-) |
20 | 20 | ||
21 | diff --git a/bindings/swig/python3/Makefile.am b/bindings/swig/python3/Makefile.am | 21 | diff --git a/bindings/swig/python3/Makefile.am b/bindings/swig/python3/Makefile.am |
22 | index c2c6def4..bcc2836c 100644 | 22 | index 428e40fa..f4dd45bc 100644 |
23 | --- a/bindings/swig/python3/Makefile.am | 23 | --- a/bindings/swig/python3/Makefile.am |
24 | +++ b/bindings/swig/python3/Makefile.am | 24 | +++ b/bindings/swig/python3/Makefile.am |
25 | @@ -23,6 +23,7 @@ | 25 | @@ -23,6 +23,7 @@ |
@@ -30,7 +30,7 @@ index c2c6def4..bcc2836c 100644 | |||
30 | LIBS = $(top_builddir)/lib/libaudit.la | 30 | LIBS = $(top_builddir)/lib/libaudit.la |
31 | SWIG_FLAGS = -python | 31 | SWIG_FLAGS = -python |
32 | SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) | 32 | SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) |
33 | @@ -37,7 +38,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/audit_logging.h ${top_builddir}/lib/li | 33 | @@ -35,7 +36,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/audit_logging.h ${top_builddir}/lib/li |
34 | _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la | 34 | _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la |
35 | nodist__audit_la_SOURCES = audit_wrap.c | 35 | nodist__audit_la_SOURCES = audit_wrap.c |
36 | audit.py audit_wrap.c: ${srcdir}/../src/auditswig.i | 36 | audit.py audit_wrap.c: ${srcdir}/../src/auditswig.i |
@@ -40,10 +40,10 @@ index c2c6def4..bcc2836c 100644 | |||
40 | CLEANFILES = audit.py* audit_wrap.c *~ | 40 | CLEANFILES = audit.py* audit_wrap.c *~ |
41 | 41 | ||
42 | diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i | 42 | diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i |
43 | index 6b267844..5a4e442f 100644 | 43 | index 2760e516..5d0ea8b6 100644 |
44 | --- a/bindings/swig/src/auditswig.i | 44 | --- a/bindings/swig/src/auditswig.i |
45 | +++ b/bindings/swig/src/auditswig.i | 45 | +++ b/bindings/swig/src/auditswig.i |
46 | @@ -50,7 +50,7 @@ typedef unsigned uid_t; | 46 | @@ -52,7 +52,7 @@ typedef unsigned uid_t; |
47 | */ | 47 | */ |
48 | %ignore audit_rule_data::buf; | 48 | %ignore audit_rule_data::buf; |
49 | 49 | ||
@@ -52,6 +52,3 @@ index 6b267844..5a4e442f 100644 | |||
52 | #define __extension__ /*nothing*/ | 52 | #define __extension__ /*nothing*/ |
53 | %include <stdint.i> | 53 | %include <stdint.i> |
54 | %include "../lib/audit-records.h" | 54 | %include "../lib/audit-records.h" |
55 | -- | ||
56 | 2.25.1 | ||
57 | |||
diff --git a/meta-oe/recipes-security/audit/audit_4.0.4.bb b/meta-oe/recipes-security/audit/audit_4.0.5.bb index 952a362698..6fa025abd4 100644 --- a/meta-oe/recipes-security/audit/audit_4.0.4.bb +++ b/meta-oe/recipes-security/audit/audit_4.0.5.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;proto | |||
13 | " | 13 | " |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | SRCREV = "81dcded2ed9e407dd1357eda0bdc0855f06085e6" | 16 | SRCREV = "97c4ec3d68b5b199f2796d1e126c2144506bd228" |
17 | 17 | ||
18 | inherit autotools python3targetconfig update-rc.d systemd | 18 | inherit autotools python3targetconfig update-rc.d systemd |
19 | 19 | ||