Hi,
here's an update to bogofilter 1.2.4 - the version we have in-tree is
nearly 7 years old, and even if the motto "if it ain't broken dont fix
it" is strong among some, there's been at least two CVEs since then:
http://bogofilter.sourceforge.net/security/bogofilter-SA-2010-01
http://bogofilter.sourceforge.net/security/bogofilter-SA-2012-01
And lots of crash (and other errors..) fixes are listed on
http://bogofilter.sourceforge.net/NEWS ....
if you use it, please test this update. All flavors build and tests pass
on amd64 and macppc. I'm tempted to remove the qdbm flavor since qdbm
itself looks *very* dead upstream and advertises tokyocabinet instead..
but oh well.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/bogofilter/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 11 Mar 2013 11:23:50 -0000 1.23
+++ Makefile 30 Sep 2014 20:41:20 -0000
@@ -2,8 +2,7 @@
COMMENT = bayesian spam filter
-DISTNAME = bogofilter-1.1.6
-REVISION = 5
+DISTNAME = bogofilter-1.2.4
CATEGORIES = mail
MAINTAINER = Marc Espie <es...@openbsd.org>
@@ -31,7 +30,9 @@
.elif ${FLAVOR} == "qdbm"
DB_ENGINE = qdbm
LIB_DEPENDS += databases/qdbm
-WANTLIB += qdbm>=11
+WANTLIB += qdbm>=11 z
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/" \
+ LDFLAGS="-L${LOCALBASE}/lib/ -liconv -lz"
.else
BROKEN-hppa = configure stuck on testing if BDB supports shared
environments
DB_DIR = db
@@ -43,7 +44,7 @@
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-included-gsl \
--with-database=${DB_ENGINE}
-CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/${DB_DIR}" \
+CONFIGURE_ENV ?= CPPFLAGS="-I${LOCALBASE}/include/${DB_DIR}" \
LDFLAGS="-L${LOCALBASE}/lib/${DB_DIR}"
SAMPLEDIR = ${PREFIX}/share/examples/bogofilter
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/bogofilter/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 19 Dec 2007 21:44:08 -0000 1.7
+++ distinfo 30 Sep 2014 20:41:20 -0000
@@ -1,5 +1,2 @@
-MD5 (bogofilter-1.1.6.tar.gz) = NexS5dLFjeBKHgLdzI0CUg==
-RMD160 (bogofilter-1.1.6.tar.gz) = dNnLd8oRhFlB7rrhAs8PjDXoZVI=
-SHA1 (bogofilter-1.1.6.tar.gz) = GwEcZ9UY/v/5q20SD1tRP84Pj8I=
-SHA256 (bogofilter-1.1.6.tar.gz) = gtsImUBd4VJXkZ7wV+rQkW3rhzFnr1m+z/FfsFjwv40=
-SIZE (bogofilter-1.1.6.tar.gz) = 1044042
+SHA256 (bogofilter-1.2.4.tar.gz) = 0vJZjRMAMHIJt7GQXMBjfS0FPApHAajUQ4OGcplXhHE=
+SIZE (bogofilter-1.2.4.tar.gz) = 1083344
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 19 Dec 2007 21:44:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2007/12/19 21:44:08 bernd Exp $
---- configure.orig Sat Nov 24 05:37:19 2007
-+++ configure Fri Dec 14 18:01:09 2007
-@@ -12520,7 +12520,8 @@ echo "${ECHO_T}$ac_cv_libsqlite3_libs" >&6; }
-
-
-
-- LIBDB="$LIBSQLITE3"
-+ LIBDB="$LTLIBSQLITE3"
-+ LTLIBDB="$LTLIBSQLITE3"
- WITH_DB_ENGINE="sqlite3"
- ;;
- xtokyocabinet)
-@@ -13455,7 +13456,8 @@ echo "${ECHO_T}$ac_cv_libqdbm_libs" >&6; }
-
-
-
-- LIBDB="$LIBQDBM"
-+ LIBDB="$LTLIBQDBM"
-+ LTLIBDB="$LTLIBQDBM"
- saveLIBS="$LIBS"
- LIBS="$LIBS $LIBDB"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -16427,7 +16429,7 @@ DISABLE_UNICODE_TRUE!$DISABLE_UNICODE_TRUE$ac_delim
- DISABLE_UNICODE_FALSE!$DISABLE_UNICODE_FALSE$ac_delim
- ENABLE_UNICODE_TRUE!$ENABLE_UNICODE_TRUE$ac_delim
- ENABLE_UNICODE_FALSE!$ENABLE_UNICODE_FALSE$ac_delim
--LIBICONV!$LIBICONV$ac_delim
-+LIBICONV!$LTLIBICONV$ac_delim
- LTLIBICONV!$LTLIBICONV$ac_delim
- ENCODING!$ENCODING$ac_delim
- DEFAULT_CHARSET!$DEFAULT_CHARSET$ac_delim
-@@ -16442,13 +16444,13 @@
DISABLE_TRANSACTIONS_TRUE!$DISABLE_TRANSACTIONS_TRUE$a
- DISABLE_TRANSACTIONS_FALSE!$DISABLE_TRANSACTIONS_FALSE$ac_delim
- ENABLE_TRANSACTIONS_TRUE!$ENABLE_TRANSACTIONS_TRUE$ac_delim
- ENABLE_TRANSACTIONS_FALSE!$ENABLE_TRANSACTIONS_FALSE$ac_delim
--LIBSQLITE3!$LIBSQLITE3$ac_delim
-+LIBSQLITE3!$LTLIBSQLITE3$ac_delim
- LTLIBSQLITE3!$LTLIBSQLITE3$ac_delim
- LIBTOKYOCABINET!$LIBTOKYOCABINET$ac_delim
- LTLIBTOKYOCABINET!$LTLIBTOKYOCABINET$ac_delim
--LIBQDBM!$LIBQDBM$ac_delim
-+LIBQDBM!$LTLIBQDBM$ac_delim
- LTLIBQDBM!$LTLIBQDBM$ac_delim
--LIBDB!$LIBDB$ac_delim
-+LIBDB!$LTLIBDB$ac_delim
- LTLIBDB!$LTLIBDB$ac_delim
- DB_EXT!$DB_EXT$ac_delim
- DB_TYPE!$DB_TYPE$ac_delim
-@@ -17086,9 +17088,9 @@ echo "$as_me: CFLAGS=$CFLAGS" >&6;}
- echo "$as_me: LDFLAGS=$LDFLAGS" >&6;}
- { echo "$as_me:$LINENO: LIBS=$LIBS" >&5
- echo "$as_me: LIBS=$LIBS" >&6;}
--{ echo "$as_me:$LINENO: LIBDB=$LIBDB" >&5
--echo "$as_me: LIBDB=$LIBDB" >&6;}
-+{ echo "$as_me:$LINENO: LIBDB=$LTLIBDB" >&5
-+echo "$as_me: LIBDB=$LTLIBDB" >&6;}
- { echo "$as_me:$LINENO: GSL_LIBS=$GSL_LIBS" >&5
- echo "$as_me: GSL_LIBS=$GSL_LIBS" >&6;}
--{ echo "$as_me:$LINENO: LIBICONV=$LIBICONV" >&5
--echo "$as_me: LIBICONV=$LIBICONV" >&6;}
-+{ echo "$as_me:$LINENO: LIBICONV=$LTLIBICONV" >&5
-+echo "$as_me: LIBICONV=$LTLIBICONV" >&6;}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/bogofilter/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 19 Dec 2007 21:44:08 -0000 1.4
+++ pkg/PLIST 30 Sep 2014 20:41:20 -0000
@@ -2,11 +2,11 @@
bin/bf_compact
bin/bf_copy
bin/bf_tar
-bin/bogofilter
-bin/bogolexer
-bin/bogotune
+@bin bin/bogofilter
+@bin bin/bogolexer
+@bin bin/bogotune
bin/bogoupgrade
-bin/bogoutil
+@bin bin/bogoutil
@man man/man1/bf_compact.1
@man man/man1/bf_copy.1
@man man/man1/bf_tar.1
