[apparmor] [Merge] lp:~xnox/apparmor/bison-3.0 into lp:apparmor

[Steve Beattie]

On Thu, Jan 02, 2014 at 09:42:17PM -0000, Dimitri John Ledkov wrote:
> Yes, the upstream cherrypick is far supperior and cunning way around
> the "blessed" ways of doing this sort of access. It's da-best.

:)

That said, the bit of your patch that eliminates the bison warning
about "%name-prefix =" should be cherry-picked, IMO:

Signed-off-by: Steve Beattie <steve at nxnw.org>
---
 parser/libapparmor_re/parse.y |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: b/parser/libapparmor_re/parse.y
===================================================================
--- a/parser/libapparmor_re/parse.y
+++ b/parser/libapparmor_re/parse.y
@@ -60,7 +60,7 @@ static inline Chars* insert_char_range(C
 %lex-param {YYLEX_PARAM}
 %parse-param {Node **root}
 %parse-param {const char *text}
-%name-prefix = "regex_"
+%name-prefix "regex_"
 
 %token <c> CHAR
 %type <c> regex_char cset_char1 cset_char cset_charN

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140102/f4d9e362/attachment.pgp>