Date: Fri, 5 Jan 2007 19:58:56 +0100 From: Stefan Walter <sw@gegenunendlich.de> To: ports@freebsd.org Subject: mail/spamprobe: upcoming update to 1.4c and some other changes Message-ID: <20070105185856.GA971@kyuzo.dunkelkammer.void>
next in thread | raw e-mail | index | archive | help
--mxv5cy4qt+RJ9ypb
Content-Type: multipart/mixed; boundary="wRRV7LY7NUeQGEoC"
Content-Disposition: inline
--wRRV7LY7NUeQGEoC
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi ports@,
the attached patch updates mail/spamprobe to 1.4c and, among a couple of
other things, adds support for PBL databases. Since the update might
require some user interaction (see the UPDATING entry that is also
attached), I'm exposing the patch to the public in advance so users can
shout at me before I commit it. ;)
If you use mail/spamprobe and/or notice something looking wrong with this
patch, let me know.
Stefan
--wRRV7LY7NUeQGEoC
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="spamprobe-1.4c.patch"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /storage/cvs/FreeBSD/ports/mail/spamprobe/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile 1 Jan 2007 18:12:15 -0000 1.18
+++ Makefile 5 Jan 2007 18:55:52 -0000
@@ -4,9 +4,15 @@
#
# $FreeBSD: ports/mail/spamprobe/Makefile,v 1.18 2007/01/01 18:12:15 stefa=
n Exp $
#
+# Available options for this port:
+# WITHOUT_PBL - disable support for PBL database storage
+# WITHOUT_BDB - disable support for BDB database storage
+# WITHOUT_UNGIF - disable analysis of image attachments using libungif
+# (currently only possible if PBL support is disabled, too)
+#
=20
PORTNAME=3D spamprobe
-PORTVERSION=3D 1.4b
+PORTVERSION=3D 1.4c
CATEGORIES=3D mail
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR=3D ${PORTNAME}
@@ -14,26 +20,40 @@
MAINTAINER=3D stefan@FreeBSD.org
COMMENT=3D Spam detector using Bayesian analysis of word counts
=20
-USE_BDB=3D 3+
-INVALID_BDB_VER=3D2
-
GNU_CONFIGURE=3D yes
CONFIGURE_TARGET=3D --build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=3D CPPFLAGS=3D"${CPPFLAGS}" LDFLAGS=3D"${LDFLAGS}"
-CONFIGURE_ARGS=3D --enable-default-8bit --enable-cdb
-CPPFLAGS=3D -I${BDB_INCLUDE_DIR}
-LDFLAGS=3D -L${LOCALBASE}/lib -l${BDB_LIB_NAME}
+CONFIGURE_ARGS=3D --enable-default-8bit
=20
MAN1=3D spamprobe.1
PLIST_FILES=3D bin/spamprobe
=20
-OPTIONS=3D UNGIF "Enable tokenization of GIF attachments with libungif" off
+# PBL support
+.if !defined(WITHOUT_PBL)
+BUILD_DEPENDS+=3D ${LOCALBASE}/include/pbl.h:${PORTSDIR}/databases/libpbl
+CONFIGURE_ARGS+=3D --with-pbl=3D${LOCALBASE}
+CPPFLAGS+=3D -I${LOCALBASE}/include
+LDFLAGS+=3D -L${LOCALBASE}/lib -lpbl
+.endif
=20
-.include <bsd.port.pre.mk>
+# BerkleyDB support
+.if !defined(WITHOUT_BDB)
+USE_BDB=3D 3+
+INVALID_BDB_VER=3D2
+CONFIGURE_ARGS+=3D --enable-cdb
+CPPFLAGS+=3D -I${BDB_INCLUDE_DIR} -DUSE_DB=3D1
+LDFLAGS+=3D -L${LOCALBASE}/lib -l${BDB_LIB_NAME}
+.endif
=20
-.if defined(WITH_UNGIF)
+# libungif support
+.if !defined(WITHOUT_UNGIF)
LIB_DEPENDS+=3D ungif.5:${PORTSDIR}/graphics/libungif
CPPFLAGS+=3D -I${LOCALBASE}/include
+LDFLAGS+=3D -L${LOCALBASE}/lib
+.else
+.if !defined(WITHOUT_PBL)
+BROKEN=3D WITHOUT_UNGIF currently does not work if WITHOUT_PBL is not give=
n, too
+.endif
.endif
=20
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /storage/cvs/FreeBSD/ports/mail/spamprobe/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 18 Feb 2006 21:16:19 -0000 1.13
+++ distinfo 5 Jan 2007 18:55:52 -0000
@@ -1,3 +1,3 @@
-MD5 (spamprobe-1.4b.tar.gz) =3D 735a5ef084ca09a39fb88a0334fcc68e
-SHA256 (spamprobe-1.4b.tar.gz) =3D fe6e5e69c4902850acabbb5ff81fc48c31b8450=
834d378875be522d51d91e21e
-SIZE (spamprobe-1.4b.tar.gz) =3D 255023
+MD5 (spamprobe-1.4c.tar.gz) =3D 665b1c6ca1a9a1100b40a3f2aa34c9b6
+SHA256 (spamprobe-1.4c.tar.gz) =3D 36ba0ecff13c23553ad5b78380ca456c5dd29a3=
4fb23ee8046a36203855c3baf
+SIZE (spamprobe-1.4c.tar.gz) =3D 250313
--wRRV7LY7NUeQGEoC
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="spamprobe-UPDATING.patch"
Content-Transfer-Encoding: quoted-printable
Index: UPDATING
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /storage/cvs/FreeBSD/ports/UPDATING,v
retrieving revision 1.444
diff -u -r1.444 UPDATING
--- UPDATING 5 Jan 2007 08:22:18 -0000 1.444
+++ UPDATING 5 Jan 2007 18:56:31 -0000
@@ -6,6 +6,38 @@
time you update your ports collection, before attempting any port
upgrades.
=20
+20070105:
+ AFFECTS: users of mail/spamprobe
+ AUTHOR: stefan@FreeBSD.org
+
+ With the update to version 1.4c, the SpamProbe port doesn't use the OPTI=
ONS
+ framework any more to allow part of the changes below. That means that
+ options selected for this port won't be saved/used automatically any more
+ and you have to set the appropriate variables in /etc/make.conf or on the
+ command line again to change the port's behaviour; the variables are
+ documented at the top of the port's Makefile.
+ =20
+ The port now has support for the PBL database backend; unless built with
+ WITHOUT_PBL set, SpamProbe will use PBL as the default even if you have =
an
+ existing BerkleyDB or hash database; in that case, use the parameter "-d=
" to
+ specify the type of the existing database on the command line, e.g.
+
+ spamprobe -d bdb:$HOME/.spamprobe receive
+
+ or
+
+ spamprobe -d hash:$HOME/.spamprobe receive
+
+ Using PBL instead of BerkleyDB might be a good idea, though, as the form=
er
+ seems to perform better. You can convert your existing database to PBL u=
sing
+ the following commands (assuming you didn't disable PBL support):
+
+ cd ~
+ mkdir spamprobe.new
+ spamprobe -d bdb:.spamprobe export | spamprobe -d spamprobe.new import
+ mv .spamprobe spamprobe.old
+ mv spamprobe.new .spamprobe
+
20070104:
AFFECTS: users of www/phpsurveyor
AUTHOR: miwi@FreeBSD.org
--wRRV7LY7NUeQGEoC--
--mxv5cy4qt+RJ9ypb
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)
iQGVAwUBRZ6f71aRERsSueCzAQKKUgv+Oev0MJLjA7WH6nH88JWhjAod5R2dP18R
rLZez/YHkOCHifWRCMiCBHXyn1Rr1M6rmw7fEp58fIzNQjS1hQI7k5vntcx6xJCK
/zJ6M2xeCH4CPQu2YV/wjZvbg9NOuJPe8z3+DugehkbD6E7nf2+7FszLGVk0SA8x
RWP5N3MTeQ1SvnzchPVUHmXYu5p4kwmV4YK2LCybtkHAnCQlGzOWIEk4dM5pH7r1
wDMMyVxH2kqfXCZBY4fTTmbswuhPbsyxPIW+iYxvzRg8LbaatPss8PqDDXPTROEv
xZewCK6IJVD0p/0poV8K8dKclVT0G7mpqWNSohBulg99yB24q5Q3dq0AcpU/ygfy
hqyQcHC6cGSPaV4hG6jwN42rzuiVsrzs5MxNit0UP7MKiVuLSdSTYE2le1uSCP/V
olgIHhzLaa3WGpHA/olPBlhzKSfS8/HTgIuf7klK6R/HILc65hcNee50cB/SXGq3
vLb6vpZfEJBDkcSI5TW7D4/FgesEBNXa
=m8bu
-----END PGP SIGNATURE-----
--mxv5cy4qt+RJ9ypb--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070105185856.GA971>