madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@git.madduck.net.
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged.
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
LOGFILE=${LOGFILE:-$PMVAR/log}
LOGABSTRACT=no
LOGFILE=${LOGFILE:-$PMVAR/log}
LOGABSTRACT=no
-NICE='/usr/bin/nice -20'
+#NICE='/usr/bin/nice -20'
PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
FORMAIL="$NICE /usr/bin/formail -f"
EGREP="$NICE /bin/egrep"
SED="$NICE /bin/sed"
PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
FORMAIL="$NICE /usr/bin/formail -f"
EGREP="$NICE /bin/egrep"
SED="$NICE /bin/sed"
+DELIVER="$NICE /usr/lib/dovecot/deliver"
CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
SA_PREFS="$MAILFILT/spamassassin/user_prefs"
SPAMASSASSIN="$NICE /usr/bin/spamassassin -p $SA_PREFS"
CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
SA_PREFS="$MAILFILT/spamassassin/user_prefs"
SPAMASSASSIN="$NICE /usr/bin/spamassassin -p $SA_PREFS"
-#SPAMC="$NICE /usr/bin/spamc -lxu $ID"
-SPAMC="$SPAMASSASSIN"
+SPAMC="$NICE /usr/bin/spamc -lx"
+#SPAMC="$SPAMASSASSIN"
TRAINER="$MAILFILT/bin/train"
OURDATE=`date -R`
TRAINER="$MAILFILT/bin/train"
OURDATE=`date -R`
-OURDATE_SHORT=`date +%Y.%m.%d.%H.%m.%N`
+OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
+#DEFAULT="|$DELIVER"
+DEFAULT=$BASE/
ORGMAIL=$HOME/BOUNCED-MAIL
# maximum message size for spam checking
ORGMAIL=$HOME/BOUNCED-MAIL
# maximum message size for spam checking
### constants used in rules
NL="
"
### constants used in rules
NL="
"
-RE_MYDOMAIN="(.+\.)?madduck\.net"
+RE_MYDOMAIN="(.+\.)*madduck\.net"
RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
RE_SPACE_NEWLINE="(^|[ ])"
RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
RE_SPACE_NEWLINE="(^|[ ])"
RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
RE_EXTRACT_HEADER_VALUE="[ ]*\/[^ ].*"
NULL=/dev/null
RE_EXTRACT_HEADER_VALUE="[ ]*\/[^ ].*"
NULL=/dev/null
-DISCARD=$INBOX/.discard/
+DISCARD=$BASE/.discard/
+#DISCARD="'|$DELIVER -m BASE.discard'"
### variables from the message
### variables from the message
# a procmail-style flag, which is true if unset and false if set (to !).
# unset by marknew if the message has already been seen by the filter (according
# to the X-Been-There header).
# a procmail-style flag, which is true if unset and false if set (to !).
# unset by marknew if the message has already been seen by the filter (according
# to the X-Been-There header).
# SKIP_SPAMCHECKS
# if set, cuases spamchecks to be skipped, value lists reason
# SKIP_SPAMCHECKS
# if set, cuases spamchecks to be skipped, value lists reason
-# CRM_RETRAIN
-# if set, causes crm114 to be retrained, according to the variable's value
-CRM_RETRAIN
+# RETRAIN
+# if set, causes spamfilters to be retrained, according to the variable's value
+RETRAIN