commit b3ee2345ad67401813e8bf005c83421fb1cab8ac
parent b3c86a9d45492dbc79b7f2f8263c13423905a865
Author: sbyx <steven@midlink.org>
Date: Mon, 20 Oct 2014 07:43:37 +0200
Merge pull request #435 from MikePetullo/bogofilter
bogofilter: depend on db47 with statistics support
Diffstat:
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/bogofilter
SECTION:=mail
CATEGORY:=Mail
- DEPENDS:=+libdb47
+ DEPENDS:=+libdb47-full
TITLE:=bogofilter
MAINTAINER:=W. Michael Petullo <mike@flyn.org>
URL:=http://bogofilter.sourceforge.net/
@@ -39,8 +39,10 @@ CONFIGURE_ARGS += --disable-unicode
define Package/bogofilter/install
$(INSTALL_DIR) $(1)/etc/ \
- $(1)/usr/bin
+ $(1)/usr/bin \
+ $(1)/usr/sbin
$(INSTALL_CONF) $(PKG_BUILD_DIR)/bogofilter.cf.example $(1)/etc/bogofilter.cf
+ $(INSTALL_BIN) ./files/postfix-bogofilter $(1)/usr/sbin/postfix-bogofilter
$(CP) $(PKG_INSTALL_DIR)/usr/bin/bf_compact $(1)/usr/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/bin/bf_copy $(1)/usr/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/bin/bf_tar $(1)/usr/bin/
diff --git a/mail/bogofilter/files/postfix-bogofilter b/mail/bogofilter/files/postfix-bogofilter
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+FILTER=/usr/bin/bogofilter
+FILTER_DIR=/mnt/sda1/var/spool/bogofilter
+# WARNING! The -i is crucial, else you may see
+# messages truncated at the first period that is alone on a line
+# (which can happen with several kinds of messages, particularly
+# quoted-printable)
+# -G is ignored before Postfix 2.3 and tells it that the message
+# does not originate on the local system (Gateway submission),
+# so Postfix avoids some of the local expansions that can leave
+# misleading traces in headers, such as local address
+# canonicalizations.
+POSTFIX="/usr/sbin/sendmail -G -i"
+export BOGOFILTER_DIR=/var/lib/bogofilter
+
+# Exit codes from <sysexits.h>
+EX_TEMPFAIL=75
+EX_UNAVAILABLE=69
+
+cd $FILTER_DIR || \
+ { echo $FILTER_DIR does not exist; exit $EX_TEMPFAIL; }
+
+# Clean up when done or when aborting.
+trap "rm -f msg.$$ ; exit $EX_TEMPFAIL" 0 1 2 3 15
+
+# bogofilter -e returns: 0 for OK, nonzero for error
+rm -f msg.$$ || exit $EX_TEMPFAIL
+$FILTER -p -e > msg.$$ || exit $EX_TEMPFAIL
+
+exec <msg.$$ || exit $EX_TEMPFAIL
+rm -f msg.$$ # safe, we hold the file descriptor
+exec $POSTFIX "$@"
+exit $EX_TEMPFAIL