.bogofilter.metadata

@@ -1 +1 @@
-c779c3afb3e57ae0208ee503a854aff716b0cafd SOURCES/bogofilter-1.2.5.tar.xz
+c779c3afb3e57ae0208ee503a854aff716b0cafd bogofilter-1.2.5.tar.xz

.gitignore

@@ -1 +1,6 @@
-SOURCES/bogofilter-1.2.5.tar.xz
+bogofilter-1.2.0.tar.gz
+bogofilter-1.2.2.tar.gz
+/bogofilter-1.2.3.tar.gz
+/bogofilter-1.2.3.repack.tar.gz
+/bogofilter-1.2.4.repack.tar.gz
+/bogofilter-1.2.5.tar.xz

bogofilter.spec

@@ -1,15 +1,16 @@
 Summary: Fast anti-spam filtering by Bayesian statistical analysis
 Name: bogofilter
 Version: 1.2.5
-Release: 2%{?dist}
+Release: 8%{?dist}
 License: GPLv2
-Group: Applications/Internet
 URL: http://bogofilter.sourceforge.net/
-Source: http://downloads.sourceforge.net/bogofilter/bogofilter-%{version}.tar.xz
+Source0: http://downloads.sourceforge.net/bogofilter/bogofilter-%{version}.tar.xz
 BuildRequires: gcc
 BuildRequires: flex libdb-devel gsl-devel
 BuildRequires: /usr/bin/iconv
 BuildRequires: perl-generators
+BuildRequires: make
+BuildRequires: xhtml1-dtds
 
 %description
 Bogofilter is a Bayesian spam filter.  In its normal mode of
@@ -22,7 +23,6 @@ by sites that process a lot of mail.
 
 %package bogoupgrade
 Summary: Upgrades bogofilter database to current version
-Group: Applications/Internet
 Requires: %{name} = %{version}-%{release}
 
 %description bogoupgrade
@@ -35,7 +35,6 @@ main bogofilter package.
 
 %prep
 %setup -q
-
 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 \
@@ -57,33 +56,89 @@ iconv -f iso-8859-1 -t utf-8 \
 
 %{__chmod} -x contrib/*
 
+for d in contrib ; do
+  install -d %{buildroot}%{_docdir}/%{name}/$d
+  files=$(find "$d" -maxdepth 1 -type f -print)
+  for f in $files ; do
+    case $f in
+      *.c|*.o|*.obj|*/Makefile*) continue ;;
+      *.1)
+	cp -p $f %{buildroot}%{_mandir}/man1 ;;
+      *)
+        cp -p $f %{buildroot}%{_docdir}/%{name}/$d ;;
+    esac
+  done
+done
+
+mv bogogrep* contrib
+
+find %{buildroot}%{_docdir}/%{name} -name .dirstamp -print -delete
+
 %check
 %{__make} %{?_smp_mflags} check
 
 %files bogoupgrade
-%defattr(-, root, root, 0755)
 %{_bindir}/bogoupgrade
 %{_mandir}/man1/bogoupgrade*
 
 %files
-%defattr(-, root, root, 0755)
-%doc AUTHORS COPYING NEWS README* RELEASE.NOTES* TODO bogofilter.cf.example
+%doc AUTHORS COPYING GETTING.STARTED NEWS README* RELEASE.NOTES* TODO bogofilter.cf.example
 %doc doc/bogofilter-SA* doc/bogofilter-tuning.HOWTO* doc/integrating* doc/programmer/
-%doc rpm-doc/html/ rpm-doc/xml/ contrib
+%doc doc/README.*db
+%doc rpm-doc/html/ rpm-doc/xml/
 %{_mandir}/man1/bogo*.1*
 %{_mandir}/man1/bf_*.1*
 %config(noreplace) %{_sysconfdir}/bogofilter.cf
 %{_bindir}/bogo*
 %{_bindir}/bf_*
+%{_docdir}/%{name}/contrib/*
 %exclude %{_bindir}/bogoupgrade
 %exclude %{_mandir}/man1/bogoupgrade*
 
 %changelog
-* Mon May 18 2020 Milan Crha <mcrha@redhat.com> - 1.2.5-2
-- Bump version to have OSCI/gating tests rerun with updated tests
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.5-8
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri May 15 2020 Milan Crha <mcrha@redhat.com> - 1.2.5-1
-- Resolves: #1836279 (Update to 1.2.5)
+* Tue Apr 20 2021 Milan Crha <mcrha@redhat.com> - 1.2.5-7
+- Resolves: #1950909 (Change what files are installed)
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.5-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Nov 28 2019 Adrian Reber <adrian@lisas.de> - 1.2.5-1
+- Updated to 1.2.5
+- No longer necessary to re-package sources: All problematic files have
+  been re-licensed
+- All 19 patches are part of the 1.2.5 release and have been removed
+
+* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 1.2.4-18
+- Rebuilt for GSL 2.6.
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Feb 13 2019 Adrian Reber <adrian@lisas.de> - 1.2.4-16
+- Applied 11 patches from Georg Sauthoff (#1676460)
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -0,0 +1 @@
+SHA512 (bogofilter-1.2.5.tar.xz) = 3a7280485cfe5802dd3e9721c153f88ccf28bff7a6a24590e985e860d1f1e0ddea7bde8a8e5ad1ff643e94c9fd7b26b2a5ed5a9fb991cee3fd5b0ce67ce9abfe

tests/builtin-tests.patch

@@ -0,0 +1,49 @@
+diff -up bogofilter-1.2.4/src/tests/t.bogoutil.orig bogofilter-1.2.4/src/tests/t.bogoutil
+--- bogofilter-1.2.4/src/tests/t.bogoutil.orig	2013-06-29 16:52:45.000000000 +0200
++++ bogofilter-1.2.4/src/tests/t.bogoutil	2020-02-10 11:24:34.754000000 +0100
+@@ -78,7 +78,7 @@ if [ $DB_TYPE = db ] ; then
+ fi
+ 
+ #test with wordlist in current directory
+-BOGOUTIL="$VAL`pwd`/${relpath}/bogoutil$EXE_EXT"
++#BOGOUTIL="$VAL`pwd`/${relpath}/bogoutil$EXE_EXT"
+ WORDLIST="wordlist.${DB_EXT}"
+ OPC=$PRINTCORE
+ case $srcdir in
+diff -up bogofilter-1.2.4/src/tests/t.config.orig bogofilter-1.2.4/src/tests/t.config
+--- bogofilter-1.2.4/src/tests/t.config.orig	2020-02-10 11:20:55.340000000 +0100
++++ bogofilter-1.2.4/src/tests/t.config	2020-02-10 11:21:00.668000000 +0100
+@@ -3,3 +3,4 @@ DB_EXT=".db"
+ DB_TYPE="db"
+ USE_TRANSACTIONS=""
+ USE_UNICODE=""
++USE_PREFIX=/usr/bin
+diff -up bogofilter-1.2.4/src/tests/t.frame.orig bogofilter-1.2.4/src/tests/t.frame
+--- bogofilter-1.2.4/src/tests/t.frame.orig	2020-02-10 11:20:47.446000000 +0100
++++ bogofilter-1.2.4/src/tests/t.frame	2020-02-10 11:21:00.671000000 +0100
+@@ -15,7 +15,7 @@ set -e
+ fi
+ 
+ : ${srcdir=.}
+-: ${relpath=..}
++: ${relpath=}
+ : ${BF_TESTDIR=.}
+ 
+ # suck in EXE_EXT and DB_TYPE, export the latter.
+@@ -24,11 +24,11 @@ export DB_TYPE
+ DB_EXT=${DB_EXT#.}
+ export DB_EXT
+ 
+-BOGOFILTER="$VAL${relpath}/bogofilter$EXE_EXT"
+-BOGOLEXER="$VAL${relpath}/bogolexer$EXE_EXT"
+-BOGOTUNE="$VAL${relpath}/bogotune$EXE_EXT"
+-BOGOUTIL="$VAL${relpath}/bogoutil$EXE_EXT"
+-BF_COMPACT="${relpath}/bf_compact"
++BOGOFILTER="${USE_PREFIX}/bogofilter$EXE_EXT"
++BOGOLEXER="${USE_PREFIX}/bogolexer$EXE_EXT"
++BOGOTUNE="${USE_PREFIX}/bogotune$EXE_EXT"
++BOGOUTIL="${USE_PREFIX}/bogoutil$EXE_EXT"
++BF_COMPACT="${USE_PREFIX}/bf_compact"
+ 
+ export BOGOFILTER
+ export BOGOLEXER

tests/builtin.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# without this, when OpenShift has LC_CTYPE=C.UTF-8, some tests fail
+export LC_CTYPE=''
+
+cd source/ && \
+./configure --disable-rpath --prefix=/tmp/bogofilter && \
+make && \
+cd src/tests/ && \
+make check && \
+cd ../../ && \
+patch -p1 <../builtin-tests.patch && \
+cd src/ && \
+rm ./bogo*.o ./bf*.o bogofilter bogolexer bogotune bogoupgrade bogoutil && \
+cd tests/ && \
+make check-TESTS

tests/tests.yml

@@ -0,0 +1,23 @@
+- hosts: localhost
+  roles:
+    - role: standard-test-source
+      tags:
+        - always
+
+    - role: standard-test-basic
+      tags:
+        - atomic
+        - classic
+      required_packages:
+        - bogofilter
+        - flex
+        - gcc
+        - gsl-devel
+        - libdb-devel
+        - make
+        - perl-generators
+        - xmlto
+      tests:
+        - builtin:
+            dir: .
+            run: ./builtin.sh