mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-09 17:40:32 +00:00
apparmor: update to 2.13.2
Drop patch included in update: tool-paths.patch Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
@@ -17,7 +17,6 @@ SRC_URI = " \
|
|||||||
http://archive.ubuntu.com/ubuntu/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \
|
http://archive.ubuntu.com/ubuntu/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \
|
||||||
file://disable_perl_h_check.patch \
|
file://disable_perl_h_check.patch \
|
||||||
file://crosscompile_perl_bindings.patch \
|
file://crosscompile_perl_bindings.patch \
|
||||||
file://tool-paths.patch \
|
|
||||||
file://apparmor.rc \
|
file://apparmor.rc \
|
||||||
file://functions \
|
file://functions \
|
||||||
file://apparmor \
|
file://apparmor \
|
||||||
@@ -25,8 +24,8 @@ SRC_URI = " \
|
|||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "49054f58042f8e51ea92cc866575a833"
|
SRC_URI[md5sum] = "2439b35266b5a3a461b0a2dba6e863c3"
|
||||||
SRC_URI[sha256sum] = "8a2b0cd083faa4d0640f579024be3a629faa7db3b99540798a1a050e2eaba056"
|
SRC_URI[sha256sum] = "844def9926dfda5c7858428d06e44afc80573f9706458b6e7282edbb40b11a30"
|
||||||
|
|
||||||
PARALLEL_MAKE = ""
|
PARALLEL_MAKE = ""
|
||||||
|
|
||||||
@@ -60,6 +59,13 @@ do_configure() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
do_compile () {
|
do_compile () {
|
||||||
|
# Fixes:
|
||||||
|
# | sed -ie 's///g' Makefile.perl
|
||||||
|
# | sed: -e expression #1, char 0: no previous regular expression
|
||||||
|
#| Makefile:478: recipe for target 'Makefile.perl' failed
|
||||||
|
sed -i "s@sed -ie 's///g' Makefile.perl@@" ${S}/libraries/libapparmor/swig/perl/Makefile
|
||||||
|
|
||||||
|
|
||||||
oe_runmake -C ${B}/libraries/libapparmor
|
oe_runmake -C ${B}/libraries/libapparmor
|
||||||
oe_runmake -C ${B}/binutils
|
oe_runmake -C ${B}/binutils
|
||||||
oe_runmake -C ${B}/utils
|
oe_runmake -C ${B}/utils
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
Upstream-Status: Backport
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
||||||
|
|
||||||
From e7edd937adcbf1b3c8d38a31de5bacb2029b1965 Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Johansen <john.johansen@canonical.com>
|
|
||||||
Date: Thu, 4 Oct 2018 23:15:28 -0700
|
|
||||||
Subject: [PATCH] parser: fix Makefile hardcoded paths to flex and bison
|
|
||||||
|
|
||||||
The hardcoded paths for flex and python can break builds on systems
|
|
||||||
where those tools are stored in an alternate location. Use which
|
|
||||||
to lookup where flex and bison are available.
|
|
||||||
|
|
||||||
This fixes issue #4
|
|
||||||
|
|
||||||
Signed-off-by: John Johansen <john.johansen@canonical.com>
|
|
||||||
---
|
|
||||||
parser/Makefile | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/parser/Makefile b/parser/Makefile
|
|
||||||
index 4d370c36..015c218d 100644
|
|
||||||
--- a/parser/Makefile
|
|
||||||
+++ b/parser/Makefile
|
|
||||||
@@ -27,9 +27,9 @@ INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
|
|
||||||
LOCALEDIR=/usr/share/locale
|
|
||||||
MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5
|
|
||||||
|
|
||||||
-YACC := /usr/bin/bison
|
|
||||||
+YACC := bison
|
|
||||||
YFLAGS := -d
|
|
||||||
-LEX := /usr/bin/flex
|
|
||||||
+LEX := flex
|
|
||||||
LEXFLAGS = -B -v
|
|
||||||
WARNINGS = -Wall
|
|
||||||
EXTRA_WARNINGS = -Wsign-compare -Wmissing-field-initializers -Wformat-security -Wunused-parameter
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
Reference in New Issue
Block a user