- no warnings from bison, fixes gigabytes of empty build log on i686

diff --git a/bison.patch b/bison.patch
new file mode 100644 (file)
index 0000000..801545c
--- /dev/null
+++ b/bison.patch
@@ -0,0 +1,12 @@
+diff -ur syslog-ng-syslog-ng-3.22.1.orig/Makefile.am syslog-ng-syslog-ng-3.22.1/Makefile.am
+--- syslog-ng-syslog-ng-3.22.1.orig/Makefile.am        2019-06-25 10:51:09.000000000 +0200
++++ syslog-ng-syslog-ng-3.22.1/Makefile.am     2019-08-24 00:15:37.356000000 +0200
+@@ -24,7 +24,7 @@
+ SUBDIRS                       =
+ DIST_SUBDIRS          =
+ AM_MAKEFLAGS          = --no-print-directory
+-AM_YFLAGS             = -Wno-yacc -Wno-other -Werror=conflicts-sr -Werror=conflicts-rr
++AM_YFLAGS             = -Wnone -Werror=conflicts-sr -Werror=conflicts-rr
+ 
+ AM_TESTS_ENVIRONMENT  = top_srcdir="$(top_srcdir)"
+ 

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 31e0cd437145ae3481f26f7b05b21db35af74865..0e302c9d76a9c78b590bcba57e81aef49b83e92d 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -37,7 +37,7 @@ Summary(pl.UTF-8):    Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
 Version:       3.22.1
-Release:       2
+Release:       3
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
 Source0:       https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
@@ -55,6 +55,7 @@ Patch1:               %{name}-nolibs.patch
 Patch2:                man-paths.patch
 Patch3:                %{name}-link.patch
 Patch4:                no_shared_ivykis.patch
+Patch5:                bison.patch
 URL:           https://syslog-ng.org/
 %{?with_geoip:BuildRequires:   GeoIP-devel >= 1.5.1}
 BuildRequires: autoconf >= 2.59
@@ -320,6 +321,7 @@ mv ivykis-%{libivykis_version} lib/ivykis
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple