Merge lp:~xnox/apparmor/bison-3.0 into lp:apparmor/2.12

[Dimitri John Ledkov]

This is my attempt at fixing FTBFS with bison 3.x which is now in Trusty Tahr.
YYLEX_PARAM has been deprecated for a long time, but has been finally removed.

The semantics are different, as one no-longer can pass arbitrary expressions as parameter.

I've attempted to fix this, but in the process lost const qualifier, which I think is bad. Maybe someone who speaks better bison can come up with a better patch.

Also fixed %name-prefix call.

[Tyler Hicks (tyhicks)]

Thanks Dimitri - I've got a pending apparmor upload which cherry-picks the bison 3 FTBFS fix from upstream:

https://launchpadlibrarian.net/160162431/apparmor_2.8.0-0ubuntu36.debdiff

The upload is going to be sponsored by jdstrand and it was in the process of receiving landing approval just before the holidays hit. I'm sure it'll go in early next week once everyone returns from vacation.

As a side note, I'm not familiar enough with bison to say whether or not your fix is better than what we have upstream. Maybe one of the other upstream apparmor devs can comment.

[Dimitri John Ledkov (xnox)]

On 2 January 2014 18:52, Tyler Hicks <email address hidden> wrote:
> Thanks Dimitri - I've got a pending apparmor upload which cherry-picks the bison 3 FTBFS fix from upstream:
>
> https://launchpadlibrarian.net/160162431/apparmor_2.8.0-0ubuntu36.debdiff
>
> The upload is going to be sponsored by jdstrand and it was in the process of receiving landing approval just before the holidays hit. I'm sure it'll go in early next week once everyone returns from vacation.
>
> As a side note, I'm not familiar enough with bison to say whether or not your fix is better than what we have upstream. Maybe one of the other upstream apparmor devs can comment.

Yes, the upstream cherrypick is far supperior and cunning way around
the "blessed" ways of doing this sort of access. It's da-best.

--
Regards,

Dimitri.

[Dimitri John Ledkov (xnox)]

obsolete, superseeded by upstream fix.

review: Disapprove

Unmerged revisions

2294. By Dimitri John Ledkov on 2014-01-01

Fix FTBFS with Bison 3.0+

=== modified file 'parser/libapparmor_re/parse.y'
--- parser/libapparmor_re/parse.y	2013-11-05 22:30:01 +0000
+++ parser/libapparmor_re/parse.y	2014-01-01 03:50:20 +0000
@@ -35,8 +35,7 @@
 %{
 
 void regex_error(Node **, const char *, const char *);
-#define YYLEX_PARAM &text
-int regex_lex(YYSTYPE *, const char **);
+int regex_lex(YYSTYPE *, char *);
 
 static inline Chars *insert_char(Chars* cset, uchar a)
 {
@@ -59,8 +58,9 @@
 /* %error-verbose */
 %lex-param {YYLEX_PARAM}
 %parse-param {Node **root}
-%parse-param {const char *text}
-%name-prefix = "regex_"
+%parse-param {char *text}
+%lex-param {char *text}
+%name-prefix "regex_"
 
 %token <c> CHAR
 %type <c> regex_char cset_char1 cset_char cset_charN
@@ -175,10 +175,12 @@
 		return -1;
 }
 
-int regex_lex(YYSTYPE *val, const char **pos)
+int regex_lex(YYSTYPE *val, char *pos_p)
 {
 	int c;
 
+	char **pos;
+	pos = &(pos_p);
 	val->c = **pos;
 	switch(*(*pos)++) {
 	case '\0':