Fix Debian bug #966908

Author: nondeterministic

Makefile.am

@@ -1,7 +1,7 @@
 # Makefile.am: help build sources on mulitiple architectures 
 # $Id: Makefile.am,v 1.20.2.3.2.8 2007/01/01 13:38:40 baueran Exp $
 
-# Copyright (c) 2000 - 2016  Andreas Bauer <baueran@gmail.com>
+# Copyright (c) 2000 - 2020  Andreas Bauer <baueran@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

NEWS

@@ -1,6 +1,11 @@
 Mailfilter NEWS (Summary)
 -=-=-=-=-=-=-=-=-=-=-=-=-
 
+mailfilter 0.8.7 (Sun 09 Aug 2020 09:56:55 AM CEST)
+
+  - Fix for build error w/ bison 3.7:
+    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966908
+
 mailfilter 0.8.6 (Tue Oct 25 20:18:55 CEST 2016)
 
   - Rebuilt the tarball, using more up to date versions of flex and

configure.ac

@@ -1,7 +1,7 @@
 # configure.in: Autoconfigure input file for mailfilter
 # $Id: configure.ac,v 1.1.2.4.2.12 2007/01/01 15:32:29 baueran Exp $
 #
-# Copyright (c) 2000 - 2009  Andreas Bauer <baueran@gmail.com>
+# Copyright (c) 2000 - 2020  Andreas Bauer <baueran@gmail.com>
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.54)
-AC_INIT(mailfilter, 0.8.6, [baueran@gmail.com])
+AC_INIT(mailfilter, 0.8.7, [baueran@gmail.com])
 AC_REVISION($Revision: 1.1.2.4.2.12 $)
 AC_SUBST(PACKAGE_COPYRIGHT)
 AC_DEFINE(PACKAGE_COPYRIGHT,
-	   "Copyright (c) 2000 - 2016  Andreas Bauer <baueran@gmail.com>", 
+	   "Copyright (c) 2000 - 2020  Andreas Bauer <baueran@gmail.com>", 
     	   [Copyright information.])
-AC_COPYRIGHT(Copyright (c) 2000 - 2016  Andreas Bauer <baueran@gmail.com>)
+AC_COPYRIGHT(Copyright (c) 2000 - 2020  Andreas Bauer <baueran@gmail.com>)
 
 AC_CONFIG_SRCDIR([src/mailfilter.cc])
 AC_CONFIG_HEADERS(config.h)

man/mailfilter.1

@@ -72,7 +72,7 @@ Display version information
 .BR procmail (1),
 .BR regex (7)
 .SH COPYRIGHT
-Copyright \(co 2000-2014 Andreas Bauer <baueran@gmail.com>
+Copyright \(co 2000-2020 Andreas Bauer <baueran@gmail.com>
 .PP
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

man/mailfilterex.5

@@ -235,7 +235,7 @@ them.
 .BR procmailex (5),
 .BR regex (7)
 .SH COPYRIGHT
-Copyright \(co 2000-2014 Andreas Bauer <baueran@gmail.com>
+Copyright \(co 2000-2020 Andreas Bauer <baueran@gmail.com>
 .PP
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

man/mailfilterrc.5

@@ -324,7 +324,7 @@ configuration files.
 .BR mailfilterex (5),
 .BR regex (7)
 .SH COPYRIGHT
-Copyright \(co 2000-2014 Andreas Bauer <baueran@gmail.com>
+Copyright \(co 2000-2020 Andreas Bauer <baueran@gmail.com>
 .PP
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

src/Makefile.am

@@ -1,7 +1,7 @@
 # Makefile.am: help build program sources
 # $Id: Makefile.am,v 1.9.2.6.2.22 2006/12/31 21:44:18 baueran Exp $
 
-# Copyright (c) 2000 - 2009  Andreas Bauer <baueran@gmail.com>
+# Copyright (c) 2000 - 2020  Andreas Bauer <baueran@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,26 +26,23 @@ AM_LFLAGS = -+ -i
 
 bin_PROGRAMS = mailfilter
 
-# Some dependencies to invoke flex + bison before compilation of
-# lex output starts:
+# Some dependencies to invoke flex + bison before compilation of lex output starts:
 rcfile.cc: rcfile.ll rcparser.hh
 	   $(LEX) $(AM_LFLAGS) -Prc -o$@ $<
 
 rcparser.hh: rcparser.cc
 rcparser.cc: rcfile.yy
-		   $(YACC) $(YFLAGS) -b rc -p rc $<;  \
-		   mv rc.tab.c rcparser.cc; \
-		   mv rc.tab.h rcparser.hh
+		   $(YACC) $(YFLAGS) -b rc -p rc --defines=rcparser.hh $<;  \
+		   mv rc.tab.c rcparser.cc
 
 # Almost the same as above, but this time for the RFC 822 parser:
 rfc822.cc: rfc822.ll rfc822parser.hh
 	   $(LEX) $(AM_LFLAGS) -Prfc -o$@ $<
 
 rfc822parser.hh: rfc822parser.cc
 rfc822parser.cc: rfc822.yy
-		   $(YACC) $(YFLAGS) -b rfc -p rfc $<;  \
-		   mv rfc.tab.c rfc822parser.cc; \
-		   mv rfc.tab.h rfc822parser.hh
+		   $(YACC) $(YFLAGS) -b rfc -p rfc --defines=rfc822parser.hh $<;  \
+		   mv rfc.tab.c rfc822parser.cc
 
 CLEANFILES = *.output Makefile.in rcfile.cc rcfile.ll.bak rcparser.cc rcparser.hh rfc822.cc rfc822parser.cc rfc822parser.hh