diff options
| author | Armin Kuster <akuster808@gmail.com> | 2019-03-30 21:36:28 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2019-03-31 11:57:02 -0700 |
| commit | 5dcf7ca44e8b2ef07ec605deb5fdf2c20a10503f (patch) | |
| tree | 567e02d4da878fc0779c2fff29d01d32d3dcda13 /recipes-mac/AppArmor/files/tool-paths.patch | |
| parent | 1460d9b86dfc8100cf6bd112ec01dfc0ce19da39 (diff) | |
| download | meta-security-5dcf7ca44e8b2ef07ec605deb5fdf2c20a10503f.tar.gz | |
apparmor: update to 2.13.2
Drop patch included in update:
tool-paths.patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-mac/AppArmor/files/tool-paths.patch')
| -rw-r--r-- | recipes-mac/AppArmor/files/tool-paths.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/recipes-mac/AppArmor/files/tool-paths.patch b/recipes-mac/AppArmor/files/tool-paths.patch deleted file mode 100644 index aaf08da..0000000 --- a/recipes-mac/AppArmor/files/tool-paths.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 3 | |||
| 4 | From e7edd937adcbf1b3c8d38a31de5bacb2029b1965 Mon Sep 17 00:00:00 2001 | ||
| 5 | From: John Johansen <john.johansen@canonical.com> | ||
| 6 | Date: Thu, 4 Oct 2018 23:15:28 -0700 | ||
| 7 | Subject: [PATCH] parser: fix Makefile hardcoded paths to flex and bison | ||
| 8 | |||
| 9 | The hardcoded paths for flex and python can break builds on systems | ||
| 10 | where those tools are stored in an alternate location. Use which | ||
| 11 | to lookup where flex and bison are available. | ||
| 12 | |||
| 13 | This fixes issue #4 | ||
| 14 | |||
| 15 | Signed-off-by: John Johansen <john.johansen@canonical.com> | ||
| 16 | --- | ||
| 17 | parser/Makefile | 4 ++-- | ||
| 18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/parser/Makefile b/parser/Makefile | ||
| 21 | index 4d370c36..015c218d 100644 | ||
| 22 | --- a/parser/Makefile | ||
| 23 | +++ b/parser/Makefile | ||
| 24 | @@ -27,9 +27,9 @@ INSTALL_CONFDIR=${DESTDIR}${CONFDIR} | ||
| 25 | LOCALEDIR=/usr/share/locale | ||
| 26 | MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 | ||
| 27 | |||
| 28 | -YACC := /usr/bin/bison | ||
| 29 | +YACC := bison | ||
| 30 | YFLAGS := -d | ||
| 31 | -LEX := /usr/bin/flex | ||
| 32 | +LEX := flex | ||
| 33 | LEXFLAGS = -B -v | ||
| 34 | WARNINGS = -Wall | ||
| 35 | EXTRA_WARNINGS = -Wsign-compare -Wmissing-field-initializers -Wformat-security -Wunused-parameter | ||
| 36 | -- | ||
| 37 | 2.11.0 | ||
