summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2015-11-13 04:48:48 -0500
committerJoe MacDonald <joe_macdonald@mentor.com>2015-11-27 09:18:14 -0500
commit2188d5b09b8f79cce935890ad814b0afafa09b9c (patch)
treeb4a55ce2f922f20265393004d253fec8ac794401
parentd3efe540851c37de277e864e436dcfc0ae9465c5 (diff)
downloadmeta-selinux-2188d5b09b8f79cce935890ad814b0afafa09b9c.tar.gz
audit: upgrade 2.4.3 -> 2.4.4
* rebase patch audit-python-configure.patch * 2.4.4 includes CVE-2015-5186 and bug fixes, detials refer to: http://people.redhat.com/sgrubb/audit/ChangeLog Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-security/audit/audit/audit-python-configure.patch7
-rw-r--r--recipes-security/audit/audit_2.4.4.bb (renamed from recipes-security/audit/audit_2.4.3.bb)4
2 files changed, 6 insertions, 5 deletions
diff --git a/recipes-security/audit/audit/audit-python-configure.patch b/recipes-security/audit/audit/audit-python-configure.patch
index d9b0829..b47cf5d 100644
--- a/recipes-security/audit/audit/audit-python-configure.patch
+++ b/recipes-security/audit/audit/audit-python-configure.patch
@@ -7,12 +7,13 @@ Upstream-Status: pending
7 7
8Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> 8Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
9Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 9Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
10Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
10--- 11---
11 configure.ac | 17 ++--------------- 12 configure.ac | 17 ++---------------
12 1 file changed, 2 insertions(+), 15 deletions(-) 13 1 file changed, 2 insertions(+), 15 deletions(-)
13 14
14diff --git a/configure.ac b/configure.ac 15diff --git a/configure.ac b/configure.ac
15index 4be62a3..d1842e2 100644 16index 1f48cb4..cdb5219 100644
16--- a/configure.ac 17--- a/configure.ac
17+++ b/configure.ac 18+++ b/configure.ac
18@@ -94,21 +94,8 @@ if test x$use_python = xno ; then 19@@ -94,21 +94,8 @@ if test x$use_python = xno ; then
@@ -29,7 +30,7 @@ index 4be62a3..d1842e2 100644
29-else 30-else
30- python_found="no" 31- python_found="no"
31- if test x$use_python = xyes ; then 32- if test x$use_python = xyes ; then
32- AC_MSG_ERROR([Python explicitly required and python headers found]) 33- AC_MSG_ERROR([Python explicitly requested and python headers were not found])
33- else 34- else
34- AC_MSG_WARN("Python headers not found - python bindings will not be made") 35- AC_MSG_WARN("Python headers not found - python bindings will not be made")
35- fi 36- fi
@@ -40,5 +41,5 @@ index 4be62a3..d1842e2 100644
40 AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") 41 AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes")
41 42
42-- 43--
431.8.4.2 441.9.1
44 45
diff --git a/recipes-security/audit/audit_2.4.3.bb b/recipes-security/audit/audit_2.4.4.bb
index f0fa949..55a5b12 100644
--- a/recipes-security/audit/audit_2.4.3.bb
+++ b/recipes-security/audit/audit_2.4.4.bb
@@ -17,8 +17,8 @@ SRC_URI = "http://people.redhat.com/sgrubb/audit/audit-${PV}.tar.gz \
17 file://audit-volatile.conf \ 17 file://audit-volatile.conf \
18 file://audit-auvirt-get-inline-functions-work-with-gnu89-gnu11.patch \ 18 file://audit-auvirt-get-inline-functions-work-with-gnu89-gnu11.patch \
19" 19"
20SRC_URI[md5sum] = "544d863af2016b76afd8d1691b251164" 20SRC_URI[md5sum] = "72b0fd94d32846142bc472f0d91e62b4"
21SRC_URI[sha256sum] = "9c914704fecc602e143e37152f3efbab2469692684c1a8cc1b801c1b49c7abc6" 21SRC_URI[sha256sum] = "25f57f465f3230d7b1166b615ffd6748818a3dc225d0e8b396c5b2e951674e23"
22 22
23inherit autotools pythonnative update-rc.d systemd 23inherit autotools pythonnative update-rc.d systemd
24 24