Woops, broken patch with some accidentally commited changes for pdns.
Drop this patch, I will send a new, clean one.
- Stefan
In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or %param.
This commit adds a patch to fix the tests so they still work.
Fixes #10951.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
flex/flex.nm | 2 +- ...fixes-Do-not-use-obsolete-bison-construct.patch | 79 ++++++++++++++++++++++ pdns/pdns.nm | 9 +-- 3 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 flex/patches/0001-bison-test-fixes-Do-not-use -obsolete-bison-construct.patch
diff --git a/flex/flex.nm b/flex/flex.nm index 7bff151..4c5b555 100644 --- a/flex/flex.nm +++ b/flex/flex.nm @@ -5,7 +5,7 @@
name = flex version = 2.5.39 -release = 2 +release = 2.1
groups = Development/Tools url = http://flex.sourceforge.net/ diff --git a/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete -bison-construct.patch b/flex/patches/0001-bison-test-fixes-Do-not -use-obsolete-bison-construct.patch new file mode 100644 index 0000000..eb46be3 --- /dev/null +++ b/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison -construct.patch @@ -0,0 +1,79 @@ +From 35aba3d6e3c99fcd527c677bef8efeb59963fe8a Mon Sep 17 00:00:00 2001 +Message-Id: <35aba3d6e3c99fcd527c677bef8efeb59963fe8a.1397340102.git .srivasta@golden-gryphon.com> +From: Manoj Srivastava srivasta@golden-gryphon.com +Date: Wed, 9 Apr 2014 00:23:07 -0700 +Subject: [PATCH 1/1] [bison-test-fixes] Do not use obsolete bison constructs in tests.
+In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been +removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or +%param. This commit fixes the tests so they still work.
+Signed-off-by: Manoj Srivastava srivasta@golden-gryphon.com +---
- tests/test-bison-yylloc/parser.y | 4 ++--
- tests/test-bison-yylval/parser.y | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
- 50.0% tests/test-bison-yylloc/
- 50.0% tests/test-bison-yylval/
+diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison -yylloc/parser.y +index e8f4e56..224d252 100644 +--- a/tests/test-bison-yylloc/parser.y ++++ b/tests/test-bison-yylloc/parser.y +@@ -22,6 +22,7 @@
- */
- %parse-param { void* scanner }
++%lex-param { void* scanner }
- /*
- How to compile:
+@@ -34,7 +35,6 @@
- #include "config.h"
- #define YYERROR_VERBOSE 1
+-#define YYLEX_PARAM scanner
- extern int testget_lineno(void*);
+@@ -52,7 +52,7 @@ int process_text(char* s) {
- %}
+-%pure_parser ++%pure-parser
- %union {
int lineno;+diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison -yylval/parser.y +index 0ffdb89..626c5e7 100644 +--- a/tests/test-bison-yylval/parser.y ++++ b/tests/test-bison-yylval/parser.y +@@ -26,6 +26,7 @@
- bison --defines --output-file="parser.c" --name-prefix="test"
parser.y
- */
- %parse-param { void* scanner }
++%lex-param { void* scanner }
- %{
- #include <stdio.h>
- #include <stdlib.h>
+@@ -33,7 +34,6 @@
- #include "config.h"
- #define YYERROR_VERBOSE 1
+-#define YYLEX_PARAM scanner
- /* A dummy function. A check against seg-faults in yylval->str. */
+@@ -49,7 +49,7 @@ int process_text(char* s) {
- %}
+-%pure_parser ++%pure-parser
- %union {
long unused;+-- +1.9.2
diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 3c25e9d..4704cec 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -4,8 +4,8 @@ #################################################################### ###########
name = pdns -version = 3.3.1 -release = 2 +version = 3.4.6 +release = 1
groups = Networking/DNS url = http://powerdns.com/ @@ -20,6 +20,7 @@ description end
source_dl = http://downloads.powerdns.com/releases/ +sources = %{thisapp}.tar.bz2
build requires @@ -27,14 +28,14 @@ build chrpath gcc-c++ lua-devel
polarssl-devel
mbedtls-develshadow-utils sqlite-devel zlib-devel end
# No paralilelism build.
- PARALLELISMFLAGS =
#PARALLELISMFLAGS =
configure_options += \ --sysconfdir=%{sysconfdir}/pdns \