- added len type fix/update to gperf patch

- added bison patch (fixes for bison 3.6.x)

diff --git a/grok-bison.patch b/grok-bison.patch
new file mode 100644 (file)
index 0000000..7d16bc5
--- /dev/null
+++ b/grok-bison.patch
@@ -0,0 +1,35 @@
+--- grok-a52f42b1fa359db2145a70216ec5b4ef43d57b5c/conf.y.orig  2020-06-02 17:16:54.505830255 +0200
++++ grok-a52f42b1fa359db2145a70216ec5b4ef43d57b5c/conf.y       2020-06-02 18:34:09.336057711 +0200
+@@ -2,10 +2,9 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#include "conf.tab.h"
+ #include "grok_config.h"
+ #include "grok_input.h"
+ #include "grok_matchconf.h"
++#include "conf.tab.h"
+ 
+-int yylineno;
+ void yyerror (YYLTYPE *loc, struct config *conf, char const *s) {
+@@ -49,9 +49,9 @@
+ 
+ %token '{' '}' ';' ':' '\n'
+ 
+-%pure-parser
++%define api.pure
++%define parse.error verbose
+ %parse-param {struct config *conf}
+-%error-verbose
+ %locations
+ 
+ %start config
+@@ -128,7 +128,7 @@
+            | match_block_statement
+ 
+ match_block_statement: /* empty */
+-           | "pattern" ':' QUOTEDSTRING { conf_new_match_pattern(conf, $3) }
++           | "pattern" ':' QUOTEDSTRING { conf_new_match_pattern(conf, $3); }
+            | "reaction" ':' QUOTEDSTRING { CURMATCH.reaction = $3; }
+            | "reaction" ':' "none" { CURMATCH.no_reaction = 1; }
+            | "shell" ':' QUOTEDSTRING { CURMATCH.shell = $3; }

diff --git a/grok-gperf.patch b/grok-gperf.patch
index c67e7e9865267963dd0b04355532cbfbc84b4348..425390e2f71c4a8f0706e3a401655e2f8937c720 100644 (file)
--- a/grok-gperf.patch
+++ b/grok-gperf.patch
@@ -9,3 +9,13 @@
                echo "We require gperf version >= 3.0.3" ; \
                exit 1; \
        fi
+--- grok-a52f42b1fa359db2145a70216ec5b4ef43d57b5c/grok_matchconf_macro.h.orig  2017-07-20 23:49:31.000000000 +0200
++++ grok-a52f42b1fa359db2145a70216ec5b4ef43d57b5c/grok_matchconf_macro.h       2020-06-02 17:11:27.029325821 +0200
+@@ -19,6 +19,6 @@
+ #endif
+ 
+ /* this function is generated by gperf */
+-const struct strmacro *patname2macro(const char *str, unsigned int len);
++const struct strmacro *patname2macro(const char *str, size_t len);
+ 
+ #endif /* _GROK_MATCHCONF_MACRO_ */

diff --git a/grok.spec b/grok.spec
index a9e10b4274227a466d8aa261970d05a1f5f85e7c..8ee2f54b47b2311dd70c394e7457951b87f0d425 100644 (file)
--- a/grok.spec
+++ b/grok.spec
@@ -12,6 +12,7 @@ Group:                Libaries
 Source0:       https://github.com/jordansissel/grok/archive/%{gitref}/%{name}-%{snap}.tar.gz
 # Source0-md5: 1d09b3aa6ebac202680227faa26e742e
 Patch0:                %{name}-gperf.patch
+Patch1:                %{name}-bison.patch
 URL:           https://github.com/jordansissel/grok
 BuildRequires: bison
 BuildRequires: flex
@@ -48,6 +49,7 @@ Pliki nagłówkowe do tworzenia programów z użyciem biblioteki grok.
 %prep
 %setup -q -n %{name}-%{gitref}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \