diff options
-rw-r--r-- | packages/bogofilter/bogofilter_0.96.0.bb | 16 | ||||
-rw-r--r-- | packages/bogofilter/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/bogofilter/files/postfix-filter.sh | 25 | ||||
-rw-r--r-- | packages/bogofilter/files/volatiles | 1 | ||||
-rw-r--r-- | packages/cyrus-sasl/cyrus-sasl_2.1.19.bb | 4 | ||||
-rw-r--r-- | packages/postfix/postfix_2.0.20.bb | 6 |
6 files changed, 46 insertions, 6 deletions
diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb index e552f1b8bd..dcef43d2a6 100644 --- a/packages/bogofilter/bogofilter_0.96.0.bb +++ b/packages/bogofilter/bogofilter_0.96.0.bb @@ -4,14 +4,28 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham ( by a statistical analysis of the message's header and content (body). \ The program is able to learn from the user's classifications and corrections." LICENSE = "GPL" -PR = "r1" +PR = "r2" PRIORITY = "optional" SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \ file://${FILESDIR}/configure.ac.patch;patch=1 \ + file://volatiles \ + file://postfix-filter.sh \ " inherit autotools EXTRA_OECONF = "--with-libdb-prefix=${libdir}" +do_install_append () { + mkdir -p ${D}${sysconfdir}/default/volatiles + install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_bogofilter + install -m 755 ${WORKDIR}/postfix-filter.sh ${D}${bindir}/postfix-filter.sh +} + +pkg_postinst () { + grep filter /etc/group || addgroup filter + grep spam /etc/passwd || adduser --disabled-password --home=/var/spool/filter --ingroup filter -g "Bogofilter" spam + grep bogo /etc/passwd || adduser --disabled-password --home=/home/bogo --ingroup filter -g "Bogofilter" bogo + /etc/init.d/populate-volatile.sh +} diff --git a/packages/bogofilter/files/.mtn2git_empty b/packages/bogofilter/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bogofilter/files/.mtn2git_empty diff --git a/packages/bogofilter/files/postfix-filter.sh b/packages/bogofilter/files/postfix-filter.sh new file mode 100644 index 0000000000..156330b43d --- /dev/null +++ b/packages/bogofilter/files/postfix-filter.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +FILTER=/usr/bin/bogofilter +FILTER_DIR=/var/spool/filter +POSTFIX=/usr/sbin/sendmail +export BOGOFILTER_DIR=/home/bogo + +# 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 -u -e > msg.$$ || exit $EX_TEMPFAIL + +exec <msg.$$ || exit $EX_TEMPFAIL +rm -f msg.$$ # safe, we hold the file descriptor +exec $POSTFIX "$@" +exit $EX_TEMPFAIL + diff --git a/packages/bogofilter/files/volatiles b/packages/bogofilter/files/volatiles new file mode 100644 index 0000000000..4c18681cac --- /dev/null +++ b/packages/bogofilter/files/volatiles @@ -0,0 +1 @@ +d spam filter 0750 /var/spool/filter diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb index ebf892ab3e..c76fe3e8f3 100644 --- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb +++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb @@ -2,7 +2,7 @@ SECTION = "console/network" DEPENDS = "db3 openssl" DESCRIPTION = "Generic client/server library for SASL authentication." LICENSE = "BSD" -PR = "r5" +PR = "r6" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \ file://berkdb.m4.patch;patch=1" @@ -45,7 +45,7 @@ do_stage () { } pkg_postinst () { - grep cyrus /etc/passwd || adduser --disabled-password --home=/var/spool/mail --ingroup mail cyrus + grep cyrus /etc/passwd || adduser --disabled-password --home=/var/spool/mail --ingroup mail -g "Cyrus sasl" cyrus echo "cyrus" | saslpasswd2 -p -c cyrus chgrp mail /etc/sasldb2 } diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb index cbc2e03f1f..66839764b7 100644 --- a/packages/postfix/postfix_2.0.20.bb +++ b/packages/postfix/postfix_2.0.20.bb @@ -1,7 +1,7 @@ SECTION = "console/network" DEPENDS = "db3 pcre postfix-native" LICENSE = "IPL" -PR = "r5" +PR = "r6" SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ file://${FILESDIR}/makedefs.patch;patch=1 \ @@ -47,8 +47,8 @@ pkg_postinst () { grep postfix /etc/group || addgroup postfix grep postdrop /etc/group || addgroup postdrop grep vmail /etc/group || addgroup vmail - grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/postfix --ingroup postfix postfix - grep vmail /etc/passwd || adduser --disabled-password --home=/var/spool/vmail --ingroup vmail vmail + grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/postfix --ingroup postfix -g "Postfix" postfix + grep vmail /etc/passwd || adduser --disabled-password --home=/var/spool/vmail --ingroup vmail -g "Postfix" vmail chgrp postdrop /usr/sbin/postqueue chgrp postdrop /usr/sbin/postdrop chmod g+s /usr/sbin/postqueue |