From 80a818b6fde463ebfd868dd203a60b9cc3529527 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Wed, 2 Nov 2016 13:45:33 +0100
Subject: Added multiple upstream patches to fix various memory bugs

- Fixes "[abrt] bogofilter: yyrealloc(): bogofilter killed by SIGABRT" (#1246282)
- Fixes "why libdb4" (#1367329) by switching BR to libdb-devel (from db4-devel)
---
 bogofilter.spec | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

(limited to 'bogofilter.spec')

diff --git a/bogofilter.spec b/bogofilter.spec
index 8c9a573..f53f933 100644
--- a/bogofilter.spec
+++ b/bogofilter.spec
@@ -1,7 +1,7 @@
 Summary: Fast anti-spam filtering by Bayesian statistical analysis
 Name: bogofilter
 Version: 1.2.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://bogofilter.sourceforge.net/
@@ -10,11 +10,24 @@ URL: http://bogofilter.sourceforge.net/
 # but due to bug 912694 which identified three files with license
 # problems the following steps are necessary to repack bogofilter
 # wget http://downloads.sourceforge.net/bogofilter/bogofilter-1.2.4.tar.gz
-# tar xf bogofilter-1.2.4.tar.gz 
+# tar xf bogofilter-1.2.4.tar.gz
 # rm bogofilter-1.2.4/doc/bogofilter-SA-20[0-1][0,5]-0[1,2]
 # tar cf bogofilter-1.2.4.repack.tar.gz bogofilter-1.2.4
 Source: bogofilter-%{version}.repack.tar.gz
-BuildRequires: flex db4-devel gsl-devel
+# Patches are taken from upstreams SVN:
+#  svn checkout svn://svn.code.sf.net/p/bogofilter/code/trunk bogofilter-code
+#  cd bogofilter-code
+#  svndiff -c 6995 > patch.r6995
+Patch1: patch.r6995
+# patch.r7009 is adapted to apply without a previous patch
+Patch2: patch.r7009
+Patch3: patch.r7016
+Patch4: patch.r7023
+Patch5: patch.r7030
+Patch6: patch.r7032
+Patch7: patch.r7034
+Patch8: patch.r7035
+BuildRequires: flex libdb-devel gsl-devel
 BuildRequires: /usr/bin/iconv
 BuildRequires: perl-generators
 
@@ -30,7 +43,6 @@ by sites that process a lot of mail.
 %package bogoupgrade
 Summary: Upgrades bogofilter database to current version
 Group: Applications/Internet
-Provides: bogoupgrade
 Requires: %{name} = %{version}-%{release}
 
 %description bogoupgrade
@@ -43,13 +55,21 @@ main bogofilter package.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 iconv -f iso-8859-1 -t utf-8 \
  doc/bogofilter-faq-fr.html > doc/bogofilter-faq-fr.html.utf8
 %{__mv} -f doc/bogofilter-faq-fr.html.utf8 \
  doc/bogofilter-faq-fr.html
 
 %build
-CFLAGS="%{optflags} -I%{_includedir}/libdb4" LDFLAGS="-L%{_libdir}/libdb4" %configure --disable-rpath
+%configure --disable-rpath
 %{__make} %{?_smp_mflags}
 
 %install
@@ -83,6 +103,11 @@ CFLAGS="%{optflags} -I%{_includedir}/libdb4" LDFLAGS="-L%{_libdir}/libdb4" %conf
 %exclude %{_mandir}/man1/bogoupgrade*
 
 %changelog
+* Thu Sep 22 2016 Adrian Reber <adrian@lisas.de> - 1.2.4-7
+- Added multiple upstream patches to fix various memory bugs
+- Fixes "[abrt] bogofilter: yyrealloc(): bogofilter killed by SIGABRT" (#1246282)
+- Fixes "why libdb4" (#1367329) by switching BR to libdb-devel (from db4-devel)
+
 * Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 1.2.4-6
 - Rebuild for gsl 2.1
 
-- 
cgit