Tue Aug 20 13:08:29 2013 UTC ()
Fix build with bison-3.0.
(just build-tested)
(wiz)
diff -r1.2 -r1.3 pkgsrc/security/openvas-libnasl/distinfo
diff -r0 -r1.1 pkgsrc/security/openvas-libnasl/patches/patch-nasl_nasl__grammar.y
--- pkgsrc/security/openvas-libnasl/Attic/distinfo 2011/07/05 05:02:10 1.2
+++ pkgsrc/security/openvas-libnasl/Attic/distinfo 2013/08/20 13:08:29 1.3
| @@ -1,7 +1,8 @@ | | | @@ -1,7 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.2 2011/07/05 05:02:10 dholland Exp $ | | 1 | $NetBSD: distinfo,v 1.3 2013/08/20 13:08:29 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (openvas-libnasl-2.0.0.tar.gz) = 91d6e0c9e6686aaba6b9bc64df3a941f703381af | | 3 | SHA1 (openvas-libnasl-2.0.0.tar.gz) = 91d6e0c9e6686aaba6b9bc64df3a941f703381af |
| 4 | RMD160 (openvas-libnasl-2.0.0.tar.gz) = 4f1933bfa2c4cdfdd8047e2e5572ed0f045b7719 | | 4 | RMD160 (openvas-libnasl-2.0.0.tar.gz) = 4f1933bfa2c4cdfdd8047e2e5572ed0f045b7719 |
| 5 | Size (openvas-libnasl-2.0.0.tar.gz) = 497973 bytes | | 5 | Size (openvas-libnasl-2.0.0.tar.gz) = 497973 bytes |
| 6 | SHA1 (patch-aa) = da45176003eaf27c61b707a17cef48ee2fcb95da | | 6 | SHA1 (patch-aa) = da45176003eaf27c61b707a17cef48ee2fcb95da |
| 7 | SHA1 (patch-nasl_Makefile) = 395a2da0af5249c9cce0e916f1c0f641bc183a21 | | 7 | SHA1 (patch-nasl_Makefile) = 395a2da0af5249c9cce0e916f1c0f641bc183a21 |
| | | 8 | SHA1 (patch-nasl_nasl__grammar.y) = 1c5eef82e0ffc3277789aaa1573c13f297e5a583 |
$NetBSD: patch-nasl_nasl__grammar.y,v 1.1 2013/08/20 13:08:29 wiz Exp $
Fix build with bison-3.0.
--- nasl/nasl_grammar.y.orig 2008-12-16 13:06:34.000000000 +0000
+++ nasl/nasl_grammar.y
@@ -1,4 +1,6 @@
-%pure_parser
+%pure-parser
+%parse-param {void *parm}
+%lex-param {void *parm}
%expect 1
%{
/* Nessus Attack Scripting Language version 2
@@ -32,7 +34,7 @@
#include "nasl_debug.h"
#include "nasl_signature.h"
-static void naslerror(const char *);
+static void naslerror(void *, char const *);
#define YYERROR_VERBOSE
%}
@@ -470,7 +472,7 @@ glob: GLOBAL arg_decl
#include <stdlib.h>
static void
-naslerror(const char *s)
+naslerror(void *locp, char const *s)
{
fputs(s, stderr);
}