From 422a8cb187ba78f7f17cb8e96214d6fb009c5000 Mon Sep 17 00:00:00 2001
From: Morris Zuss <morris@vlen.org>
Date: May 16 2022 21:17:01 +0000
Subject: updpkg: libre/bogofilter 1.2.5


---

diff --git a/libre/bogofilter/PKGBUILD b/libre/bogofilter/PKGBUILD
index 22eb8a6..d546e93 100644
--- a/libre/bogofilter/PKGBUILD
+++ b/libre/bogofilter/PKGBUILD
@@ -9,9 +9,9 @@
 # tarball.
 
 pkgname=bogofilter
-pkgver=1.2.4
-pkgrel=4
-pkgrel+=.par1
+pkgver=1.2.5
+pkgrel=1
+pkgrel+=.parabola1
 pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files"
 _srcrel=1 # increment this to rebuild the sourceball without bumping pkgver
 pkgdesc="A fast Bayesian spam filtering tool"
@@ -22,32 +22,28 @@ url="http://bogofilter.sourceforge.net"
 depends=('db' 'perl' 'gsl') # 'sqlite'
 makedepends=('valgrind' 'xmlto')
 backup=('etc/bogofilter/bogofilter.cf')
-source=(https://repo.parabola.nu/other/bogofilter-libre/${pkgname}-${pkgver}-libre${_srcrel}.tar.gz
-        bogofilter-1.2.4-test-env.patch)
-sha256sums=('6637eb34f41f99b1c1caf839589896ef0070f2063ad5fe2b3a849be08f64310e'
-            'e24638d2187074f48cfc19e1146b5f5b37167fa3c6576e2f8920295414fbfe0c')
+source=(https://downloads.sourceforge.net/project/${pkgname}/${pkgname}-stable/${pkgname}-${pkgver}.tar.xz{,.asc})
+sha256sums=('3248a1373bff552c500834adbea4b6caee04224516ae581fb25a4c6a6dee89ea'
+            'SKIP')
+validpgpkeys=('DC4A655BD993CD4871FA8210E412B156EFF3855A') # "Matthias Andree <mandree@FreeBSD.org>"
 
 replaces=(bogofilter-libre)
 conflicts=(bogofilter-libre)
 
-mksource=(https://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-mksha256sums=('e10287a58d135feaea26880ce7d4b9fa2841fb114a2154bf7da8da98aab0a6b4')
-mksource() {
-  # Several of the documentation files are nonfree
-  rm "${srcdir}/${pkgname}-${pkgver}"/doc/bogofilter-SA-{2005-0{1,2},2010-01}
-}
-
 # keep Berkeley DB as backend for now
 # sqlite3 based backend doesn't allow
 # to use db-transaction option that is
 # used to bf_compact the wordlist.db
-# other backend aren't available 
+# other backend aren't available
 # currently in Arch repos
+# as of 1.2.5 new backend can be KyotoCabinet and lmdb
 
 prepare() {
+  # Several of the documentation files are nonfree
+  rm "${srcdir}/${pkgname}-${pkgver}"/doc/bogofilter-SA-{2005-0{1,2},2010-01}
+
   cd ${pkgname}-${pkgver}
   # taken from Gentoo
-  patch -Np1 -i $srcdir/bogofilter-1.2.4-test-env.patch
   chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id}
   autoreconf -vfi
 }
@@ -76,3 +72,4 @@ package() {
   install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib"
   install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/"
 }
+
diff --git a/libre/bogofilter/bogofilter-1.2.4-test-env.patch b/libre/bogofilter/bogofilter-1.2.4-test-env.patch
deleted file mode 100644
index 8cf109c..0000000
--- a/libre/bogofilter/bogofilter-1.2.4-test-env.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/tests/Makefile.am
-+++ b/src/tests/Makefile.am
-@@ -67,7 +67,7 @@
- 
- TESTS=$(BUILT_TESTS) $(TESTSCRIPTS)
- 
--TESTS_ENVIRONMENT=RUN_FROM_MAKE=1 AWK=$(AWK) srcdir=$(srcdir) SHELL="$(SHELL)" $(SHELL) $(VERBOSE)
-+TESTS_ENVIRONMENT=RUN_FROM_MAKE=1 AWK=$(AWK) srcdir=$(srcdir) SHELL="$(SHELL)" $(VERBOSE)
- 
- EXTRA_DIST=$(TESTSCRIPTS) t.frame t.save t.skel \
- 	printcore t._abort unsort.pl \