[pkgsrc/trunk]: pkgsrc/security/aide06 security/aide06: Fix regression caused...

[marino <marino%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c79f2579c91
branches:  trunk
changeset: 607447:7c79f2579c91
user:      marino <marino%pkgsrc.org@localhost>
date:      Sun Aug 12 09:15:07 2012 +0000

description:
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:

 security/aide06/distinfo                     |   5 ++++-
 security/aide06/patches/patch-src_conf_lex.l |  13 +++++++++++++
 security/aide06/patches/patch-src_db_lex.c   |  13 +++++++++++++
 security/aide06/patches/patch-src_db_lex.l   |  13 +++++++++++++
 4 files changed, 43 insertions(+), 1 deletions(-)

diffs (67 lines):

diff -r 6d99cfeb8ea2 -r 7c79f2579c91 security/aide06/distinfo
--- a/security/aide06/distinfo  Sun Aug 12 08:55:54 2012 +0000
+++ b/security/aide06/distinfo  Sun Aug 12 09:15:07 2012 +0000
@@ -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-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 -r 6d99cfeb8ea2 -r 7c79f2579c91 security/aide06/patches/patch-src_conf_lex.l
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/aide06/patches/patch-src_conf_lex.l      Sun Aug 12 09:15:07 2012 +0000
@@ -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 -r 6d99cfeb8ea2 -r 7c79f2579c91 security/aide06/patches/patch-src_db_lex.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/aide06/patches/patch-src_db_lex.c        Sun Aug 12 09:15:07 2012 +0000
@@ -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 -r 6d99cfeb8ea2 -r 7c79f2579c91 security/aide06/patches/patch-src_db_lex.l
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/aide06/patches/patch-src_db_lex.l        Sun Aug 12 09:15:07 2012 +0000
@@ -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>