diff --git a/extra/opendoas/build b/extra/opendoas/build index b633f7ae..fe9db30f 100755 --- a/extra/opendoas/build +++ b/extra/opendoas/build @@ -1,5 +1,7 @@ #!/bin/sh -e +patch -p1 < bison-3.8.patch + BINOWN="$(id -u)" \ BINGRP="$(id -g)" \ ./configure \ diff --git a/extra/opendoas/checksums b/extra/opendoas/checksums index 5f1bffeb..1d69f8f1 100644 --- a/extra/opendoas/checksums +++ b/extra/opendoas/checksums @@ -1,2 +1,3 @@ c9070ae745d0f1bbe68ef0783a3958cd011b409959f65fd100e6b42b8ad6b162 846a251c646e61329086eda6abde26329f5a358d5eeab1a0f075db36e5997687 +28e74db164d001820ed295573f14610b76282ed15fee5fb819058949419ea860 diff --git a/extra/opendoas/patches/bison-3.8.patch b/extra/opendoas/patches/bison-3.8.patch new file mode 100644 index 00000000..1c66944b --- /dev/null +++ b/extra/opendoas/patches/bison-3.8.patch @@ -0,0 +1,13 @@ +diff --git a/parse.y b/parse.y +index 388c2a5..65fda3d 100644 +--- a/parse.y ++++ b/parse.y +@@ -57,6 +57,8 @@ static size_t maxrules; + + int parse_errors = 0; + ++#define yyerror yyerror ++#define yylex yylex + static void yyerror(const char *, ...); + static int yylex(void); + diff --git a/extra/opendoas/sources b/extra/opendoas/sources index 394ad008..7c4bc226 100644 --- a/extra/opendoas/sources +++ b/extra/opendoas/sources @@ -1,2 +1,3 @@ https://github.com/Duncaen/OpenDoas/archive/vVERSION.tar.gz files/doas.conf +patches/bison-3.8.patch diff --git a/extra/opendoas/version b/extra/opendoas/version index b0a3ed87..2c26db69 100644 --- a/extra/opendoas/version +++ b/extra/opendoas/version @@ -1 +1 @@ -6.8.1 1 +6.8.1 2