diff options
| author | marino <marino@pkgsrc.org> | 2012-08-12 09:15:07 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-12 09:15:07 +0000 |
| commit | 5ccf30c0475046bfb985ef8d9d020aaa1dbf8ea7 (patch) | |
| tree | 9b2eead2996ebee9151d3f3ee37ca39c1fe15c6f /security | |
| parent | b47ffd5c7368a75e5e29ea956ab2b70cedb629a1 (diff) | |
| download | pkgsrc-5ccf30c0475046bfb985ef8d9d020aaa1dbf8ea7.tar.gz | |
security/aide06: Fix regression caused by bison 2.6.x
Bison 2.6.x+ handles the yydebug functionality differently by predefining
YYDEBUG. The yacc logic is not expecting YYDEBUG to be defined without
an value, so it breaks on an "#if YYDEBUG" macro in a few places.
In order to make this work with pre-2.6 bison as well as current versions,
hard code the inclusion of debug symbols. It doesn't hurt anything and
it fixes the package.
Diffstat (limited to 'security')
| -rw-r--r-- | security/aide06/distinfo | 5 | ||||
| -rw-r--r-- | security/aide06/patches/patch-src_conf_lex.l | 13 | ||||
| -rw-r--r-- | security/aide06/patches/patch-src_db_lex.c | 13 | ||||
| -rw-r--r-- | security/aide06/patches/patch-src_db_lex.l | 13 |
4 files changed, 43 insertions, 1 deletions
diff --git a/security/aide06/distinfo b/security/aide06/distinfo index 6edb542cb4d..a5d430eb39f 100644 --- a/security/aide06/distinfo +++ b/security/aide06/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2005/05/23 21:24:17 jlam Exp $ +$NetBSD: distinfo,v 1.6 2012/08/12 09:15:07 marino Exp $ SHA1 (aide-0.6.tar.gz) = e6d112193ad96bdbbe1e1b685dac644d958a1155 RMD160 (aide-0.6.tar.gz) = 034fe31c83125b6b0a7d23516122e161da0a2b2d @@ -8,3 +8,6 @@ SHA1 (patch-ab) = 5cc5fdd9fcfde2c5e118bfa4cf68ec7e05215003 SHA1 (patch-ac) = 994de0dc4fc72d9a94f1110c79ece4cc4c0129cb SHA1 (patch-ad) = 95cb43837470eb1316ef3c234abd71e79838e752 SHA1 (patch-ae) = bf37dc4f8f6d32f8357925d05f7cd398c917c317 +SHA1 (patch-src_conf_lex.l) = 71f982518fac9ca78f6e5c17756fffb6f6b7cf88 +SHA1 (patch-src_db_lex.c) = d8ec57425df56fc33fa0a5a86f074bbe758db5f9 +SHA1 (patch-src_db_lex.l) = fc2cef91d2ab6183de7beee069e43f8b05d87560 diff --git a/security/aide06/patches/patch-src_conf_lex.l b/security/aide06/patches/patch-src_conf_lex.l new file mode 100644 index 00000000000..88eb06f5959 --- /dev/null +++ b/security/aide06/patches/patch-src_conf_lex.l @@ -0,0 +1,13 @@ +$NetBSD: patch-src_conf_lex.l,v 1.1 2012/08/12 09:15:07 marino Exp $ + +--- src/conf_lex.l.orig 2000-01-27 14:42:24.000000000 +0000 ++++ src/conf_lex.l +@@ -12,7 +12,7 @@ EX [" "\t]* + + %{ + +-#define YYDEBUG ++#define YYDEBUG 1 + + #include <string.h> + #include "conf_yacc.h" diff --git a/security/aide06/patches/patch-src_db_lex.c b/security/aide06/patches/patch-src_db_lex.c new file mode 100644 index 00000000000..663c4a43f50 --- /dev/null +++ b/security/aide06/patches/patch-src_db_lex.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_db_lex.c,v 1.1 2012/08/12 09:15:07 marino Exp $ + +--- src/db_lex.c.orig 1999-11-25 14:44:34.000000000 +0000 ++++ src/db_lex.c +@@ -418,7 +418,7 @@ extern YYSTYPE yylval; + #define YY_DECL int db_scan(void) + + +-#define YYDEBUG ++#define YYDEBUG 1 + + #include "conf_yacc.h" + #include <string.h> diff --git a/security/aide06/patches/patch-src_db_lex.l b/security/aide06/patches/patch-src_db_lex.l new file mode 100644 index 00000000000..129533adb49 --- /dev/null +++ b/security/aide06/patches/patch-src_db_lex.l @@ -0,0 +1,13 @@ +$NetBSD: patch-src_db_lex.l,v 1.1 2012/08/12 09:15:07 marino Exp $ + +--- src/db_lex.l.orig 1999-11-25 14:22:50.000000000 +0000 ++++ src/db_lex.l +@@ -24,7 +24,7 @@ extern YYSTYPE yylval; + #define YY_DECL int db_scan(void) + + +-#define YYDEBUG ++#define YYDEBUG 1 + + #include "conf_yacc.h" + #include <string.h> |