Date: Sat, 27 Oct 2007 17:03:43 -0700 From: "Frank Mayhar" <frank@exit.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/117579: PATCH Enable bogofilter plugin in evolution. Message-ID: <1193529823.12260@jill.exit.com> Resent-Message-ID: <200710280030.l9S0U3jK044680@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117579
>Category: ports
>Synopsis: PATCH Enable bogofilter plugin in evolution.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 28 00:30:03 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Frank Mayhar
>Release: FreeBSD 6.2-STABLE amd64
>Organization:
Exit Consulting
>Environment:
System: FreeBSD 6.2-STABLE #7: Sun May 13 13:13:06 PDT 2007
root@jill.exit.com:/usr/obj/usr/src/sys/JILL
>Description:
I've been using the separate bogofilter plugin for evolution spam
filtering and I was please to see that evolution 2.12 supported it out
of the box. Unfortunately the latest gnome update dropped that support
on the floor.
>How-To-Repeat:
>Fix:
--- evolution-bogofilter.patch begins here ---
Index: evolution/Makefile
===================================================================
RCS file: /cvs/repos/ports/mail/evolution/Makefile,v
retrieving revision 1.147
diff -u -r1.147 Makefile
--- evolution/Makefile 24 Oct 2007 23:34:56 -0000 1.147
+++ evolution/Makefile 27 Oct 2007 17:02:13 -0000
@@ -8,7 +8,7 @@
PORTNAME= evolution
PORTVERSION= 2.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
Index: evolution/files/patch-aa
===================================================================
RCS file: /cvs/repos/ports/mail/evolution/files/patch-aa,v
retrieving revision 1.29
diff -u -r1.29 patch-aa
--- evolution/files/patch-aa 24 Oct 2007 23:34:57 -0000 1.29
+++ evolution/files/patch-aa 27 Oct 2007 16:19:46 -0000
@@ -1,6 +1,6 @@
---- configure.orig Tue Jun 19 00:18:59 2007
-+++ configure Tue Jun 19 00:25:55 2007
-@@ -24959,6 +24959,15 @@ case "$host" in
+--- configure.orig Sat Oct 27 09:15:48 2007
++++ configure Sat Oct 27 09:17:25 2007
+@@ -23831,6 +23831,16 @@ case "$host" in
SOFTOKN3_LIB=''
HAL_REQUIREMENT=''
;;
@@ -9,6 +9,7 @@
+ SOCKET_LIBS=''
+ SOEXT='.so'
+ SA_JUNK_PLUGIN=sa-junk-plugin
++ BF_JUNK_PLUGIN=bogo-junk-plugin
+ DL_LIB=''
+ SOFTOKN3_LIB='-lsoftokn3'
+ HAL_REQUIREMENT='hal'
@@ -16,7 +17,7 @@
*) os_win32=no
NO_UNDEFINED=''
SOEXT='.so'
-@@ -26433,6 +26442,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -25449,6 +25459,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
@@ -24,7 +25,7 @@
#define BUFSIZE (sizeof(struct hostent)+10)
-@@ -30930,7 +30940,7 @@ if test "x${with_krb5}" != "xno"; then
+@@ -29382,7 +29393,7 @@ if test "x${with_krb5}" != "xno"; then
LDFLAGS_save="$LDFLAGS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -33,7 +34,7 @@
sunlibs="-lkrb5 -lgss"
{ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; }
-@@ -37393,7 +37403,7 @@ componentdir="$privlibdir/components"
+@@ -37936,7 +37947,7 @@ componentdir="$privlibdir/components"
idldir='${datadir}'/idl/evolution-$BASE_VERSION
@@ -42,3 +43,12 @@
evolutionuidir="$privdatadir/ui"
+@@ -38028,7 +38039,7 @@ plugins_base_always="calendar-file calen
+ plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN"
+ all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
+
+-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore"
++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline mailing-list-actions new-mail-notify default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore"
+ plugins_standard="$plugins_standard_always"
+ all_plugins_standard="$plugins_standard"
+
--- /dev/null Sat Oct 27 10:02:18 2007
+++ evolution/files/patch-plugins-bogo-junk-plugin-bf-junk-filter.c Sat Oct 27 09:15:20 2007
@@ -0,0 +1,11 @@
+--- plugins/bogo-junk-plugin/bf-junk-filter.c.orig Sat Oct 27 09:13:21 2007
++++ plugins/bogo-junk-plugin/bf-junk-filter.c Sat Oct 27 09:13:05 2007
+@@ -41,7 +41,7 @@
+
+
+ #ifndef BOGOFILTER_BINARY
+-#define BOGOFILTER_BINARY "/usr/bin/bogofilter"
++#define BOGOFILTER_BINARY "/usr/local/bin/bogofilter"
+ #endif
+
+ #define BOGOFILTER_ERROR 3
--- evolution-bogofilter.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1193529823.12260>