diff -Nru spamassassin-3.4.6/backend/nitemc/clienthosts spamassassin-4.0.0~rc3/backend/nitemc/clienthosts --- spamassassin-3.4.6/backend/nitemc/clienthosts 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/clienthosts 2008-09-18 16:06:35.000000000 +0000 @@ -0,0 +1,2 @@ +jm@talon1.pccc.com:-j16 +jm@infiltrator.stdlib.net:-j16 diff -Nru spamassassin-3.4.6/backend/nitemc/corpora_runs spamassassin-4.0.0~rc3/backend/nitemc/corpora_runs --- spamassassin-3.4.6/backend/nitemc/corpora_runs 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/corpora_runs 2017-05-27 18:04:11.000000000 +0000 @@ -0,0 +1,25 @@ +#!/bin/bash + +# Cron script for "release". see "backend/nitemc/crontab.txt" + +TZ=UTC; export TZ + +DIR="/usr/local/spamassassin/release/versions/trunk" + +if [ ! -d $DIR ]; then + echo "Whaaaa?!? No directory?" >&2 + exit 2 +fi + +cd $DIR +svn update > /dev/null +if [ $? -ne 0 ]; then + echo "Problem doing svn update" >&2 + exit 1 +fi + +RREV=`svnversion .` +REV=`echo $RREV | awk -F: '{print $1}' | tr -cd '[0-9]'` +DATE=`date "+%Y-%m-%d"` + +echo -e "$DATE\t$REV" diff -Nru spamassassin-3.4.6/backend/nitemc/corpus.default spamassassin-4.0.0~rc3/backend/nitemc/corpus.default --- spamassassin-3.4.6/backend/nitemc/corpus.default 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/corpus.default 2009-07-21 22:10:28.000000000 +0000 @@ -0,0 +1,9 @@ +opts_weekly="--net -j 8 --reuse" +opts_nightly="--reuse" +opts="--cache --cachedir=/tmpfs/aicache_nightly --restart=500 ham:detect:/export/home/bbmass/uploadedcorpora/__USERNAME__/ham/* --after=-15552000 --tail=50000 spam:detect:/export/home/bbmass/uploadedcorpora/__USERNAME__/spam/*" +tmp=$HOME/tmp +tree=$HOME/svn +prefs_weekly=$HOME/user_prefs.weekly +prefs_nightly=$HOME/user_prefs.nightly +username=bb-__USERNAME__ +password=__RSYNC_PASSWORD__ diff -Nru spamassassin-3.4.6/backend/nitemc/corpus.jm spamassassin-4.0.0~rc3/backend/nitemc/corpus.jm --- spamassassin-3.4.6/backend/nitemc/corpus.jm 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/corpus.jm 2009-07-22 09:57:57.000000000 +0000 @@ -0,0 +1,9 @@ +opts_weekly="--net -j 16 --reuse" +opts_nightly="-j 8 --reuse" +opts="--cache --cachedir=/tmpfs/aicache_nightly --restart=500 ham:detect:/export/home/bbmass/uploadedcorpora/__USERNAME__/ham/* --after=-15552000 --tail=100000 --scanprob=0.3 spam:detect:/export/home/bbmass/uploadedcorpora/__USERNAME__/spam/*" +tmp=$HOME/tmp +tree=$HOME/svn +prefs_weekly=$HOME/user_prefs.weekly +prefs_nightly=$HOME/user_prefs.nightly +username=bb-__USERNAME__ +password=__RSYNC_PASSWORD__ diff -Nru spamassassin-3.4.6/backend/nitemc/corpus.traps spamassassin-4.0.0~rc3/backend/nitemc/corpus.traps --- spamassassin-3.4.6/backend/nitemc/corpus.traps 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/corpus.traps 2009-07-09 21:40:38.000000000 +0000 @@ -0,0 +1,8 @@ +opts_weekly="--net -j 8 --reuse --cache --cachedir=/tmpfs/aicache_nightly --restart=500 ham:detect:/export/home/bbmass/uploadedcorpora/traps/ham/* --after="-15552000" --tail=50000 spam:detect:/export/home/bbmass/uploadedcorpora/doc/spam/*" +opts_nightly=" --reuse --cache --cachedir=/tmpfs/aicache_nightly --restart=500 ham:detect:/export/home/bbmass/uploadedcorpora/traps/ham/* --after="-15552000" --tail=50000 spam:detect:/export/home/bbmass/uploadedcorpora/doc/spam/*" +tmp=$HOME/tmp +tree=$HOME/svn +prefs_weekly=$HOME/user_prefs.weekly +prefs_nightly=$HOME/user_prefs.nightly +username=bb-traps +password=__RSYNC_PASSWORD__ diff -Nru spamassassin-3.4.6/backend/nitemc/crontab.txt spamassassin-4.0.0~rc3/backend/nitemc/crontab.txt --- spamassassin-3.4.6/backend/nitemc/crontab.txt 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/crontab.txt 2009-07-11 21:43:11.000000000 +0000 @@ -0,0 +1,8 @@ +# sudo crontab -e release: + +# Remember, we're in UTC here ... +50 8 * * 0-5 /export/home/svn-trunk/backend/nitemc/corpora_runs >> /home/corpus-rsync/corpus/nightly-versions.txt +53 8 * * 0-5 /export/home/svn-trunk/backend/nitemc/extract_to_rsync_dir nightly /home/corpus-rsync/corpus/nightly-versions.txt > $HOME/extract.log 2>&1 +50 8 * * 6 /export/home/svn-trunk/backend/nitemc/corpora_runs >> /home/corpus-rsync/corpus/weekly-versions.txt +53 8 * * 6 /export/home/svn-trunk/backend/nitemc/extract_to_rsync_dir weekly /home/corpus-rsync/corpus/weekly-versions.txt > $HOME/extract.log 2>&1 + diff -Nru spamassassin-3.4.6/backend/nitemc/empty.mbox spamassassin-4.0.0~rc3/backend/nitemc/empty.mbox --- spamassassin-3.4.6/backend/nitemc/empty.mbox 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/empty.mbox 2009-07-21 22:12:05.000000000 +0000 @@ -0,0 +1,8 @@ +From corpus@jmason.org Tue Feb 1 00:00:00 2008 +Return-Path: +From: nobody@example.com +To: nobody@example.com +Subject: Empty message + +nothing here + diff -Nru spamassassin-3.4.6/backend/nitemc/extract_to_rsync_dir spamassassin-4.0.0~rc3/backend/nitemc/extract_to_rsync_dir --- spamassassin-3.4.6/backend/nitemc/extract_to_rsync_dir 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/extract_to_rsync_dir 2019-10-10 06:52:42.000000000 +0000 @@ -0,0 +1,62 @@ +#!/bin/bash + +# Cron script for "release". See "backend/nitemc/crontab.txt" + +RSYNC_DIR="/usr/local/spamassassin/automc/rsync/tagged_builds" +REPO_URL="http://svn.apache.org/repos/asf/spamassassin/trunk" +PERL=/usr/bin/perl +SVN=/usr/bin/svn + + +type="$1" +versfile="$2" + +if [ -z "$type" ]; then + echo "Type not specified" >&2 + exit 1 +fi + +if [ ! -f $versfile ]; then + echo "Version file not specified" >&2 + exit 1 +fi + +subdir=${type}_mass_check + +echo "Type: $type" +echo "Version File: $versfile" +echo "Subdir: $subdir" + +REV=`tail -1 $versfile | awk '{print $2}'` + +echo "Revision: $REV" + +set -ex + +for retry in 1 2 3 4 5 6 7 8 9 10 ; do + + # sleep on retries + if [ $retry -gt 1 ]; then sleep 60; fi + + # export the main repo: (through a temporary dir) + rm -rf $RSYNC_DIR/${subdir}.tmp + mkdir $RSYNC_DIR/${subdir}.tmp || continue + $SVN export --non-interactive --force -r $REV $REPO_URL $RSYNC_DIR/${subdir}.tmp/ \ + || continue + + cd $RSYNC_DIR/${subdir}.tmp + $PERL build/mkrules --out rules > /dev/null || continue + # create "svn info" file for mass-check + $SVN info $REPO_URL > masses/svninfo.tmp < /dev/null || continue + + cd $RSYNC_DIR + # Success, only now install directory in place + rm -rf $RSYNC_DIR/${subdir}.old && + mv -f $RSYNC_DIR/${subdir} $RSYNC_DIR/${subdir}.old && + mv -f $RSYNC_DIR/${subdir}.tmp $RSYNC_DIR/${subdir} && + exit +done + +echo "FAILED to extract to rsync dir" 1>&2 +exit 2 + diff -Nru spamassassin-3.4.6/backend/nitemc/README spamassassin-4.0.0~rc3/backend/nitemc/README --- spamassassin-3.4.6/backend/nitemc/README 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/README 2005-11-21 19:32:31.000000000 +0000 @@ -0,0 +1,5 @@ + +These files are run by uid "release" on "spamassassin.zones.apache.org", +from cron, in order to tag nightly and weekly mass-check revisions +and build copies of the source tree for those revs. + diff -Nru spamassassin-3.4.6/backend/nitemc/run_all spamassassin-4.0.0~rc3/backend/nitemc/run_all --- spamassassin-3.4.6/backend/nitemc/run_all 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/run_all 2009-07-17 22:47:16.000000000 +0000 @@ -0,0 +1,35 @@ +#!/bin/sh +# +# driver for nightly mass-checks on the zone. run from cron as: +# 0 9 * * * /export/home/svn-trunk/backend/nitemc/run_all +# +# details: http://wiki.apache.org/spamassassin/NightlyMassCheck + +# Ensure we're running after 0900 UTC; complex due to daylight savings. If +# we're running in the 08xx UTC hour-space, sleep for 1 hour; when we wake, we +# will be in 09xx. By doing it this way, we'll work both for (a) mass-checks +# set to run from cron at 09xx (cron doesn't understand DST/UTC issues) and (b) +# mass-checks starting at other times that != 09xx. +( + TIME="%e,%U,%S"; TZ=UTC; export TIME TZ + if date | egrep '^... ... .. 08:'; then + date; echo "sleeping for 1 hour to compensate for DST" + sleep 3600 ; date + fi +) + +echo "nitemc run_all starting at" ; date + +pkill -15 -f -u nitemc perl +pkill -15 -f -u nitemc ssh + +all_users=`ls /export/home/bbmass/uploadedcorpora` +nitedir=/export/home/svn-trunk/backend/nitemc +workdir=/export/home/nitemc + +$nitedir/svn_checkout + +for user in $all_users ; do + $nitedir/run_one_nitemc $user +done + diff -Nru spamassassin-3.4.6/backend/nitemc/run_one_nitemc spamassassin-4.0.0~rc3/backend/nitemc/run_one_nitemc --- spamassassin-3.4.6/backend/nitemc/run_one_nitemc 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/run_one_nitemc 2009-07-21 22:12:05.000000000 +0000 @@ -0,0 +1,78 @@ +#!/bin/sh + +user="$1" +[ "$user" = "" ] && echo "usage: run_one_nitemc username" +[ "$user" = "" ] && exit 99 + +# where the $HOMEs are: +userdir=/export/home/nitemc/$user +svndir=/export/home/nitemc/svn + +mkdir -p $userdir +cd $userdir +mv log log.1 + +( +echo "Starting corpus-nightly for $user ($svndir , $userdir)" + +. /etc/profile +HOME=$userdir +PERL=/local/perl586/bin/perl +TMPDIR=/tmpfs +export HOME PERL TMPDIR + +# create the .corpus file, keeping the rsync password secret; +# the string __RSYNC_PASSWORD__ will be replaced with the +# contents of /export/home/nitemc/USERNAME/rsync_password + +src=$svndir/backend/nitemc/corpus.$user +[ -f $src ] || src=$svndir/backend/nitemc/corpus.default + +if [ ! -f rsync_password ] ; then + cp ../rsync_password.default rsync_password +fi + +perl -pe ' + s{__USERNAME__}{'$user'}g; + s{__RSYNC_PASSWORD__}{ incfile("rsync_password") }eg; + + sub incfile { + my $file = shift; + my $new=`cat $file`; chop $new; $new =~ s/\s+/ /gs; + return "\"".$new."\""; + } +' $src > .corpus + +# clean up any trash from another user's mass-checks +rm -rf $svndir/masses/tmp +rm -rf $svndir/masses/spamassassin +rm -rf $svndir/masses/*.log + +# ensure we use the shared SVN checkout +rm -f svn +ln -s ../svn svn + +# set up default user_prefs, override with a custom one if existing +echo ' + use_bayes 0 + use_auto_whitelist 0 + internal_networks 127/8 + trusted_networks 127/8 +' > user_prefs.default +[ -f user_prefs.nightly ] || cp user_prefs.default user_prefs.nightly +[ -f user_prefs.weekly ] || cp user_prefs.default user_prefs.weekly + +# ensure we always have at least 1 mail of each class for each user +for class in ham spam ; do + corpusdir=/export/home/bbmass/uploadedcorpora/$user/$class + if [ `ls $corpusdir | wc -l` = 0 ] ; then + mkdir -p $corpusdir + cp $svndir/backend/nitemc/empty.mbox $corpusdir + fi +done + +cd $svndir +exec nice bash $svndir/masses/rule-qa/corpus-nightly + +) 2>&1 | tee log + diff -Nru spamassassin-3.4.6/backend/nitemc/svn_checkout spamassassin-4.0.0~rc3/backend/nitemc/svn_checkout --- spamassassin-3.4.6/backend/nitemc/svn_checkout 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/nitemc/svn_checkout 2009-07-17 22:18:40.000000000 +0000 @@ -0,0 +1,20 @@ +#!/bin/sh + +. /etc/profile +HOME=/export/home/nitemc +PERL=/local/perl586/bin/perl +TMPDIR=/tmpfs + +export HOME PERL TMPDIR + +# attempt to ensure the "build" dir and raw .corpus file is up to date +# (don't worry about tags etc. just yet) +( + cd /export/home/nitemc + rm -rf svn + svn co http://svn.apache.org/repos/asf/spamassassin/trunk svn || + svn co http://svn.apache.org/repos/asf/spamassassin/trunk svn || + svn co http://svn.apache.org/repos/asf/spamassassin/trunk svn + +) < /dev/null + diff -Nru spamassassin-3.4.6/backend/root/backup/backup_zone spamassassin-4.0.0~rc3/backend/root/backup/backup_zone --- spamassassin-3.4.6/backend/root/backup/backup_zone 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/root/backup/backup_zone 2009-11-05 23:51:47.000000000 +0000 @@ -0,0 +1,76 @@ +#!/bin/sh +# +# a basic backup script for the stuff on the zone; we can't check it all +# in due to (a) volume and (b) embedded rsync passwords in .corpus files etc. +# +# run as root, a la +# +# sudo /export/home/svn-trunk/backend/root/backup/backup_zone + +bupdir=/zonestorage/spamassassin/backup +[ `uname -n` = spamassassin2 ] && bupdir=/zonestorage/spamassassin2/backup + +########################################################################### + +die () { + echo "$*" 1>&2 + exit 1 +} + +rsyncup () { + dir="$1" + name=$2 + + rsync=rsync + [ -x /usr/sfw/bin/rsync ] && rsync=/usr/sfw/bin/rsync + [ -x /opt/sfw/bin/rsync ] && rsync=/opt/sfw/bin/rsync + [ -x /opt/csw/bin/rsync ] && rsync=/opt/csw/bin/rsync + + excludedir=`dirname $0` + + [ -d rsynced/$name ] || mkdir -p rsynced/$name + chmod 700 rsynced + + touch $name.log + chmod 600 $name.log + + ( + #nice -20 $dtar --create --file=- \ + #--sparse --exclude-from=$excludedir/excludes \ + #--label="Backup of $dir at `date`" \ + #"$dir" | nice -20 gzip -2 + + nice -20 $rsync -a \ + --hard-links --whole-file --delete \ + --sparse --exclude-from=$excludedir/excludes \ + "$dir/." "rsynced/$name/." + + ) > $name.log 2>&1 +} + +########################################################################### + +mkdir -p $bupdir 2>/dev/null +cd $bupdir || die "failed to cd to $bupdir" + +[ -f LOG ] && mv LOG LOG.1 +[ -f LOG.1 ] && mv LOG.1 LOG.2 + +( +for dir in `ls /export/home` ; do + + [ "$dir" = "OBSOLETE" ] && continue + rsyncup /export/home/$dir export-home-$dir + +done + +rsyncup /usr/local usr-local +rsyncup /var/www var-www +rsyncup /opt opt +rsyncup /local local +rsyncup /etc etc + +) 2>&1 | tee LOG + +exit 0 + diff -Nru spamassassin-3.4.6/backend/root/backup/excludes spamassassin-4.0.0~rc3/backend/root/backup/excludes --- spamassassin-3.4.6/backend/root/backup/excludes 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/root/backup/excludes 2009-07-10 09:03:09.000000000 +0000 @@ -0,0 +1,12 @@ +tmp +tmpfs +log +rawcor +uploadedcorpora +*.log +*.bak +*.log.* +*.o +.bash_history +core +OBSOLETE diff -Nru spamassassin-3.4.6/backend/root/backup/rsync_spamassassin2_to_spamassassin spamassassin-4.0.0~rc3/backend/root/backup/rsync_spamassassin2_to_spamassassin --- spamassassin-3.4.6/backend/root/backup/rsync_spamassassin2_to_spamassassin 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/root/backup/rsync_spamassassin2_to_spamassassin 2009-07-10 10:46:31.000000000 +0000 @@ -0,0 +1,13 @@ +#!/bin/sh + +fromdir=/zonestorage/spamassassin2/backup +todir=rbackup@spamassassin.zones.apache.org:/zonestorage/spamassassin/remote_backup/spamassassin2.zones.apache.org + +mv $fromdir/rbackup.log $fromdir/rbackup.log.1 +exec rsync -vre 'ssh -v -i /export/home/rbackup/rsync-key' \ + --rsync-path=/opt/sfw/bin/rsync \ + --delete \ + $fromdir/. \ + $todir \ + > $fromdir/rbackup.log 2>&1 + diff -Nru spamassassin-3.4.6/backend/root/backup/rsync_spamassassin_to_spamassassin2 spamassassin-4.0.0~rc3/backend/root/backup/rsync_spamassassin_to_spamassassin2 --- spamassassin-3.4.6/backend/root/backup/rsync_spamassassin_to_spamassassin2 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/backend/root/backup/rsync_spamassassin_to_spamassassin2 2009-07-10 10:46:31.000000000 +0000 @@ -0,0 +1,13 @@ +#!/bin/sh + +fromdir=/zonestorage/spamassassin/backup +todir=rbackup@spamassassin2.zones.apache.org:/zonestorage/spamassassin2/remote_backup/spamassassin.zones.apache.org + +mv $fromdir/rbackup.log $fromdir/rbackup.log.1 +exec rsync -vre 'ssh -v -i /export/home/rbackup/rsync-key' \ + --rsync-path=/opt/csw/bin/rsync \ + --delete \ + $fromdir/. \ + $todir \ + > $fromdir/rbackup.log 2>&1 + diff -Nru spamassassin-3.4.6/build/announcements/3.4.4.txt spamassassin-4.0.0~rc3/build/announcements/3.4.4.txt --- spamassassin-3.4.6/build/announcements/3.4.4.txt 2020-01-25 02:04:07.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/announcements/3.4.4.txt 2020-01-25 03:09:57.000000000 +0000 @@ -68,7 +68,19 @@ https://spamassassin.apache.org/downloads.cgi - XXX - To be added when built +sha256sum of archive files: + + 4e2bc79e24cdbb3d8262e6ec4f5bb3dde670de9caaa739d50c698b6d45ac453d Mail-SpamAssassin-3.4.4.tar.bz2 + 8ea27a165b81e3ce8c84ae85c3ecba1f2edfa04ef4a86f07fe28ab612fc8ff60 Mail-SpamAssassin-3.4.4.tar.gz + e2fe48929cc35afc28fb9fc7d8c7c42e9e457c560dfaf0f9c3aa27b850e5de7a Mail-SpamAssassin-3.4.4.zip + d4cbd90fa22b9104ee095d1fe08a9d1cd3b3a0f6022c52214c025443ffffe241 Mail-SpamAssassin-rules-3.4.4.r1873061.tgz + +sha512sum of archive files: + + 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f Mail-SpamAssassin-3.4.4.tar.bz2 + b6efa1c733ddf810b189ec69445faeae6488ee2671f87f56b49ec3bf85690bf7950aa5ce251c1f1371b2bbe4fb88dbce0a162c9a24a48ed5e6584f9019611552 Mail-SpamAssassin-3.4.4.tar.gz + 50328424785147ab9ddfead48e7c555b87043364fe4bf3c3e891a0aa1e4c8684fb30cae4897d2b2f618b41905f793b2a65d19d9bd01b04adafef771af40ab96f Mail-SpamAssassin-3.4.4.zip + cc2f6949db4662cdcaf5dcef922e69d18320a591deb7fb98c1fb729d91d37f5164052ab6cd2e294657334874fbfc0cccdefc750910e0453cb8da0b3f263b3ede Mail-SpamAssassin-rules-3.4.4.r1873061.tgz Note that the *-rules-*.tgz files are only necessary if you cannot, or do not wish to, run "sa-update" after install to download the latest diff -Nru spamassassin-3.4.6/build/announcements/3.4.6.txt spamassassin-4.0.0~rc3/build/announcements/3.4.6.txt --- spamassassin-3.4.6/build/announcements/3.4.6.txt 2021-04-08 12:11:38.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/announcements/3.4.6.txt 2021-04-12 10:14:26.000000000 +0000 @@ -66,7 +66,19 @@ https://spamassassin.apache.org/downloads.cgi - XXX - To be added when built +sha256sum of archive files: + + bc4875f3e4bb5979f0c10283213a512c4c9646220ae0132a78c8e3af94789610 Mail-SpamAssassin-3.4.6.tar.bz2 + 500c7e2a7cdf3aa4dd822d97aaff2ab22235a60cf17a68ab817861d215a4e568 Mail-SpamAssassin-3.4.6.tar.gz + 7eb88a4d2d90bc77fe6e22f31e45727392adf023fb5c3ecfef2cf66721c00399 Mail-SpamAssassin-3.4.6.zip + b1efcdc57e6b100735855e24ee8391b0857327d70e1e1d2c2757d5f66e8a1ce6 Mail-SpamAssassin-rules-3.4.6.r1888502.tgz + +sha512sum of archive files: + + bb53ba928917b02071b2e6690a11240e1af503334f292c870a8c49c24b0a58b44c78f827e2f43e71a3ce920481fa0e1e62b78a39452658c57d18f4e11daeb593 Mail-SpamAssassin-3.4.6.tar.bz2 + 7910852f04463a7363a2fc3b70a35adadf5714552e57c5b8ca57beaa534ee18d9f06526cdbcf8bcd5781e5ca778f98d2f84ef2efd1872fa550cfe1689440364a Mail-SpamAssassin-3.4.6.tar.gz + b58b2e5b1e2be9bb7ac323d6de390e47c9a2067fc2eeb568784b35558ec23c68c25cbd0cf157342da9266aa3a92df4ce6de14edea5e34926ce540b29a40626e3 Mail-SpamAssassin-3.4.6.zip + 29167c2ab50de26954181ad53395d4270b8b15b7d3bb13d6c62aa2f13ed3bb7a54adcda944bbd4c8d0cf4fe918a2eb0f542ef420af2bd96a121cb3d9b55dd572 Mail-SpamAssassin-rules-3.4.6.r1888502.tgz Note that the *-rules-*.tgz files are only necessary if you cannot, or do not wish to, run "sa-update" after install to download the latest diff -Nru spamassassin-3.4.6/build/announcements/4.0.0.txt spamassassin-4.0.0~rc3/build/announcements/4.0.0.txt --- spamassassin-3.4.6/build/announcements/4.0.0.txt 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/announcements/4.0.0.txt 2022-08-24 02:23:32.000000000 +0000 @@ -0,0 +1,319 @@ +From: +To: +Bcc: users@spamassassin.apache.org, dev@spamassassin.apache.org, announce@spamassassin.apache.org, announce@apache.org +Reply-to: dev@spamassassin.apache.org +Subject: ANNOUNCE: Apache SpamAssassin 4.0.0 available + +Release Notes -- Apache SpamAssassin -- Version 4.0.0 + + +Introduction +------------ + +Apache SpamAssassin 4.0.0 contains numerous tweaks and bug fixes over +the past releases. In particular, it includes major changes that +significantly improve the handling of text in international language. + +As with any major release, there are countless functional patches and +improvements to upgrade to 4.0.0. Apache SpamAssassin 4.0.0 includes +several years of fixes that significantly improve classification and +performance. It has been thoroughly tested in production systems. We +strongly recommend upgrading as soon as possible. + + +Important Notes +—-------------- + +*** On March 1, 2020, we stopped publishing rulesets with SHA-1 + signatures. If you do not update to 3.4.2 or later, you will be + stuck at the last ruleset with SHA-1 signatures. Such an upgrade + should be to 3.4.6 to obtain the contained security fixes *** + +*** Ongoing development on the 3.4 branch has ceased. All future + releases and bug fixes will be on the 4.0 series, unless a new + security issue is found that necessitates a 3.4.7 release. *** + + +Thanks +—----- + +Many thanks to the committers (see CREDITS file), contributors, rule +testers, mass checkers, and code testers who have made this release +possible. We would also like to thank cPanel for their continued +support of new features. + +Notable features: +================= + + +New plugins +----------- + +There are three new plugins added with this release: + + +#1 Mail::SpamAssassin::Plugin::ExtractText + +This plugin uses external tools to extract text from message parts, +and then sets the text as the rendered part. All SpamAssassin rules +that apply to the rendered part will run on the extracted text as +well. + + +#2 Mail::SpamAssassin::Plugin::DMARC + +This plugin checks if emails match DMARC policy after parsing DKIM and +SPF results. + + +#3 Mail::SpamAssassin::Plugin::DecodeShortURLs + +This plugin looks for URLs shortened by a list of URL shortening +services. Upon finding a matching URL, plugin will send a HTTP request +to the shortening service and retrieve the Location-header which +points to the actual shortened URL. It then adds this URL to the list +of URIs extracted by SpamAssassin which can then be accessed by uri +rules and plugins such as URIDNSBL. + + +Removed plugin +-------------- + +HashCash module, formerly deprecated, has now been removed completely + + +Notable changes +--------------- + +This release includes fixes for the following: + + - Support for international text such as UTF-8 rules has been + completed and significantly improved to include native UTF-8 + processing + + - Bayes plugin has been improved to skip common words aka noise + words written in languages other than English + + - OLEVBMacro plugin has been improved in order to detect more + Microsoft Office macros and dangerous content. It has also been + improved to extract URIs from Office documents for automatic + inclusion in rules such as RBL lookups. + + - You can now use Captured Tags to use tags “captured” in one rule + inside other rules + + - sa-update(1) tool has been improved with three new options: + + #1 forcemirror: forces sa-update to use a specific mirror server, + + #2 score-multiplier: adjust all scores from update channel by a + given multiplier to quickly level set scores to match your + preferred threshold + + #3 score-limit adjusts all scores from update channel over a + specified limit to a new limit + +* SSL client certificate support has been improved and made easier to + implement with spamc/spamd + +* DKIM plugin can now detect ARC signatures + +* More work on improving the configuration and internal coding to use + more inclusive and less divisive language + +* spamc(1) speed has been improved when both SSL and compression are + used + +* The normalize_charset option is now enabled by default. NOTE: Rules + should not expect specific non-UTF-8 or UTF-8 encoding in the body. + Matching is done against the raw body, which may vary depending on + normalize_charset setting and whether UTF-8 decoding was successful. + +* Mail::SPF is now the only supported module used by the SPF plugin. + +* Mail::SPF::Query use is deprecated, along with settings + do_not_use_mail_spf, do_not_use_mail_spf_query. + + * SPF lookups are not done asynchronously and you may consider using + an SPF filter at the MTA level (pypolicyd-spf / spf-engine / etc) + which generates a Received-SPF header that can be parsed by + SpamAssassin. + + * The default sa-update ruleset doesn't make ASN lookups or header + additions anymore. Configure desired methods (asn_use_geodb / + asn_use_dns) and add_header clauses manually, as described in + documentation for the Mail::SpamAssassin::Plugin::ASN. + + +New configuration options +------------------------- + +All rules, functions, command line options and modules that contain +"whitelist" or "blacklist" have been renamed to "welcomelist" and +"blocklist" terms + +Old options will continue to work for backwards compatibility until at +least the Apache SpamAssassin version 4.1.0 release + +New tflag "nolog" added to hide info coming from rules in SpamAssassin +reports + +New dns_options "nov4" and "nov6" added. +IMPORTANT:; You must set nov6 if your DNS resolver is filtering IPv6 +AAAA replies. + +Razor2 razor_fork option added. It will fork separate Razor2 process +and read in the results later asynchronously, increasing +throughput. When this is used, rule priorities are automatically +adjusted to -100. + +Pyzor pyzor_fork option added. It will fork separate Pyzor process and +read in the results later asynchronously, increasing throughput. When +this is used, rule priorities are automatically adjusted to -100 + +urirhsbl and urirhssub rules now support "notrim" tflag, which forces +querying the full hostname, instead of trimmed domain + +report_charset now defaults to UTF-8 which may change the rendering of +SpamAssassin reports + +Notable Internal changes +------------------------ + +Meta rules no longer use priority values, they are evaluated +dynamically when the rules they depend on are finished + +DNS and other asynchronous lookups like DCC or Razor2 plugins are now +launched when priority -100 is reached. This allows short circuiting +at lower priority without sending unneeded DNS queries + +New internal Mail::SpamAssassin::GeoDB module supporting RelayCountry +and URILocalBL plugins provides a unified interface to Geographic IP +modules. These include: + MaxMind::DB::Reader (GeoIP2) + Geo::IP + IP::Country::DB_File + IP::Country::Fast. + +Bayes and TxRep Message-ID tracking now uses a different hashing +method + + +Other updates +------------- + +None noted. + + +Optimizations +------------- + +Apache SpamAssassin 4.0.0 represents years of work by the project with +numerous improvements, new rule types, and internal native handling of +messages in international languages. These three key optimizations +will improve the efficiency of SpamAssassin: + + DNS queries are now done asynchronously for overall speed + improvements + + DCC checks can now use dccifd asynchronously for improved throughput + + Pyzor and Razor fork use separate processes done asynchronously + for increased throughput + + +Downloading and availability +---------------------------- + +Downloads are available from: + +https://spamassassin.apache.org/downloads.cgi + +[INSERT SHA256 and SHA512 HASHES OF FILES HERE AFTER RELEASE IS PREPARED] + +Note that the Rules files, aka *-rules-*.tgz, are only necessary if +you cannot, or do not wish to, run "sa-update" after +installation. Using sa-update will download the latest rules + +See the INSTALL and UPGRADE files in the distribution for important +installation notes + + +GPG Verification Procedure +-------------------------- +The release files also have a .asc accompanying them. The file serves +as an external GPG signature for the given release file. The signing +key is available via the keys.gnupg.net or keys.openpgp.org key +servers, as well as https://www.apache.org/dist/spamassassin/KEYS + + +The following key is used to sign SA releases 3.3.0 and later: + +pub 4096R/F7D39814 2009-12-02 + Key fingerprint = D809 9BC7 9E17 D7E4 9BC2 1E31 FDE5 2F40 F7D3 9814 +uid SpamAssassin Project Management Committee +uid SpamAssassin Signing Key (Code Signing Key, replacement for 1024D/265FA05B) +sub 4096R/7B3265A5 2009-12-02 + +The following key is used to sign rule updates: + +pub 4096R/5244EC45 2005-12-20 + Key fingerprint = 5E54 1DC9 59CB 8BAC 7C78 DFDC 4056 A61A 5244 EC45 +uid updates.spamassassin.org Signing Key +sub 4096R/24F434CE 2005-12-20 + +To verify a release file, download the file with the accompanying .asc +file and run the following commands: + + gpg --verbose --keyserver keys.openpgp.org --recv-key FDE52F40F7D39814 + gpg --verify Mail-SpamAssassin-3.4.6.tar.bz2.asc + gpg --fingerprint FDE52F40F7D39814 + +Then verify that the key matches the signature. + +Note that older versions of gnupg may not be able to complete the +steps above. Specifically, GnuPG v1.0.6, 1.0.7 & 1.2.6 failed while +v1.4.11 worked flawlessly + +See https://www.apache.org/info/verification.html for more information +on verifying Apache releases + + +About Apache SpamAssassin +------------------------- + +Apache SpamAssassin is a mature, widely-deployed open source project +that provides filtering to classify email to block spam, malware, and +phishes. + +Apache SpamAssassin uses a variety of mechanisms including mail header +and text analysis, Bayesian filtering, DNS blocklists, collaborative +filtering databases, and meta concepts to lower incorrect +classification. + +Apache SpamAssassin uses a highly modular architecture that allows +other technologies to be quickly incorporated as plugins to easily add +or replace existing methods. + +Apache SpamAssassin typically runs on a server using either command +line utilities or an API to classify email so a mail system can use +the results before the message reaches mailboxes. + +Most of the Apache SpamAssassin is written in Perl natively supporting +Unix, Linux, and macOS platforms and Microsoft Windows using +Strawberry Perl. + +For more information, visit https://spamassassin.apache.org/ + + +About The Apache Software Foundation +------------------------------------ + +Established in 1999, The Apache Software Foundation provides +organizational, legal, and financial support for more than 100 +freely-available, collaboratively-developed Open Source projects. The +pragmatic Apache License enables individual and commercial users to +easily deploy Apache software; the Foundation's intellectual property +framework limits the legal exposure of its 2,500+ contributors. + +For more information, visit https://www.apache.org/ diff -Nru spamassassin-3.4.6/build/automc/apache2.conf spamassassin-4.0.0~rc3/build/automc/apache2.conf --- spamassassin-3.4.6/build/automc/apache2.conf 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/automc/apache2.conf 2018-09-24 17:46:54.000000000 +0000 @@ -0,0 +1,120 @@ +# Included in sa-vm1.apache.org:/etc/apache2/sites-available/automc.conf: +# Include /usr/local/spamassassin/automc/svn/automc/apache2.conf +# +# Update Apache config like so: +# +# On your local desktop/laptop: +# 1. cd [local checkout of https://svn.apache.org/repos/asf/spamassassin/trunk/build/automc/] +# 2. Update this file +# 3. svn commit automc-apache2.conf -m "Comment" +# On the sa-vm1.apache.org: +# 4. sudo su - +# 5. su - automc +# 6. cd svn/automc +# 7. svn up +# 8. sudo systemctl restart apache2 || journalctl -u apache2 + +# --------------------------------------------------------------------------- + + + DirectoryIndex index.html index.htm index.shtml index.php index.php4 index.php3 index.phtml index.cgi + + +# --------------------------------------------------------------------------- + + + ServerName bbmass.spamassassin.org + ServerAlias buildbot.spamassassin.org + ServerAlias bbmass-trunk.spamassassin.org + ServerAlias bbmass-stable.spamassassin.org + + options indexes SymLinksIfOwnerMatch + AllowOverride indexes + + DocumentRoot /var/www/automc.spamassassin.org + ServerAdmin webmaster@spamassassin.org + + +# --------------------------------------------------------------------------- + + + ServerName updatedist.spamassassin.org + + options indexes SymLinksIfOwnerMatch + AllowOverride indexes + + DocumentRoot /var/www/automc.spamassassin.org/updates + ServerAdmin webmaster@spamassassin.org + + +# --------------------------------------------------------------------------- + + + ServerName ruleqa.spamassassin.org + ServerAlias ruleqa-trunk.spamassassin.org + ServerAlias ruleqa-stable.spamassassin.org + + ErrorLog ${APACHE_LOG_DIR}/ruleqa.spamassassin.org-error.log + CustomLog ${APACHE_LOG_DIR}/ruleqa.spamassassin.org-access.log combined + + + options indexes SymLinksIfOwnerMatch + AllowOverride indexes + + DocumentRoot /var/www/ruleqa.spamassassin.org + ServerAdmin webmaster@spamassassin.org + + + AllowOverride None + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + Include /etc/apache2/custom.d/globalblacklist.conf + + + # debugging: + # RewriteLogLevel 9 + # RewriteLog /var/apache2/logs/rewrite_log + + # "%2F" is used to grep rule subsets, allow it + AllowEncodedSlashes On + + # This will force http to automatically redirect to https. + + RewriteEngine On + RewriteCond %{HTTPS} off + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} + + + # index: straight through + RewriteRule ^/$ /ruleqa.cgi [PT,L] + + RewriteRule ^/ruleqa.css$ /ruleqa.css [PT,L] + + # satisfy local files + RewriteCond /var/www/ruleqa.spamassassin.org/%{REQUEST_FILENAME} !-d + RewriteCond /var/www/ruleqa.spamassassin.org/%{REQUEST_FILENAME} !-f + + # otherwise the CGI + RewriteCond %{REQUEST_URI} !^/ruleqa\.cgi + RewriteRule ^/(.*) /ruleqa.cgi/$1 [PT,L] + + Alias /ruleqa.css /usr/local/spamassassin/automc/svn/masses/rule-qa/automc/ruleqa.css + Alias /sorttable.js /usr/local/spamassassin/automc/svn/masses/rule-qa/automc/sorttable.js + ScriptAlias /ruleqa.cgi /usr/local/spamassassin/automc/svn/masses/rule-qa/automc/ruleqa.cgi + + + +# --------------------------------------------------------------------------- + + + ServerName rsync.spamassassin.org + ServerAlias www-rsync.spamassassin.org + + options indexes SymLinksIfOwnerMatch + AllowOverride indexes + Require all granted + + DocumentRoot /usr/local/spamassassin/automc/rsync/corpus + ServerAdmin webmaster@spamassassin.org + + +# --------------------------------------------------------------------------- diff -Nru spamassassin-3.4.6/build/automc/apache2-le-ssl.conf spamassassin-4.0.0~rc3/build/automc/apache2-le-ssl.conf --- spamassassin-3.4.6/build/automc/apache2-le-ssl.conf 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/automc/apache2-le-ssl.conf 2021-04-08 10:13:35.000000000 +0000 @@ -0,0 +1,197 @@ + +Listen 80 + + + Listen 443 + + +SSLStaplingCache "shmcb:/var/log/apache2/stapling-cache(32768)" + + + ServerName ruleqa.spamassassin.org + ServerAlias ruleqa-trunk.spamassassin.org + ServerAlias ruleqa-stable.spamassassin.org + + ErrorLog ${APACHE_LOG_DIR}/ruleqa.spamassassin.org-error.log + CustomLog ${APACHE_LOG_DIR}/ruleqa.spamassassin.org-access.log combined + + DocumentRoot /var/www/ruleqa.spamassassin.org + ServerAdmin webmaster@spamassassin.org + + RewriteEngine On + RewriteCond %{HTTPS} !=on + RewriteCond %{REMOTE_ADDR} !^(?:127\.0\.0\.1|10\..*)$ + RewriteCond %{REQUEST_URI} !=/robots.txt + RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] + + + + + ServerName ruleqa.spamassassin.org + ServerAlias ruleqa-trunk.spamassassin.org + ServerAlias ruleqa-stable.spamassassin.org + + ErrorLog ${APACHE_LOG_DIR}/ruleqa.spamassassin.org-ssl-error.log + CustomLog ${APACHE_LOG_DIR}/ruleqa.spamassassin.org-ssl-access.log combined + + DocumentRoot /var/www/ruleqa.spamassassin.org + ServerAdmin webmaster@spamassassin.org + + SSLEngine on + SSLCertificateFile /etc/letsencrypt/live/spamassassin.org/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/spamassassin.org/privkey.pem + # https://ssl-config.mozilla.org/#server=apache&version=2.4.41&config=intermediate&openssl=1.1.1f&hsts=false&guideline=5.4 + # intermediate configuration + #SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1 + #SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384 + #SSLHonorCipherOrder off + #SSLSessionTickets off + #SSLUseStapling On + # old configuration + SSLProtocol all -SSLv3 + SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA + SSLHonorCipherOrder on + SSLSessionTickets off + SSLUseStapling On + + + Options Indexes FollowSymLinks ExecCGI + AllowOverride Indexes + Require all granted + + + + AllowOverride None + Options ExecCGI SymLinksIfOwnerMatch + Require all granted + + + ScriptAlias /ruleqa.cgi /usr/local/spamassassin/automc/svn/masses/rule-qa/automc/ruleqa.cgi + + RewriteEngine On + # debugging: + # RewriteLogLevel 9 + # RewriteLog /var/apache2/logs/rewrite_log + + # "%2F" is used to grep rule subsets, allow it + AllowEncodedSlashes On + + # Redirect nagios to simple ok page + RewriteCond %{HTTP_USER_AGENT} ^check_http + RewriteRule .* /ok.html [L] + + # Disallow some pesky robots + RewriteCond %{REMOTE_ADDR} !^(?:127\.0\.0\.1|10\..*)$ + RewriteCond %{REQUEST_URI} !=/robots.txt + RewriteCond %{HTTP_USER_AGENT} "(?:Bot|Spider|Crawl)" [NC,OR] + RewriteCond %{HTTP_USER_AGENT} "(?:Chrome/4|Firefox/4)" + RewriteRule ^ - [F] + + # Serve cached index for all except ourselves (/usr/local/bin/updateRuleqaIndex.sh) + RewriteCond %{REQUEST_URI} ^/$ + RewriteCond %{QUERY_STRING} ^$ + RewriteCond %{REMOTE_ADDR} !^(?:127\.0\.0\.1|10\..*)$ + RewriteRule .* /index_cached.html [L] + + # Index: straight through + RewriteRule ^/$ /ruleqa.cgi [PT,L] + + # Aliases + RewriteRule ^/ruleqa\.css$ /usr/local/spamassassin/automc/svn/masses/rule-qa/automc/ruleqa.css [L] + RewriteRule ^/sorttable\.js$ /usr/local/spamassassin/automc/svn/masses/rule-qa/automc/sorttable.js [L] + + # Satisfy local files + RewriteCond /var/www/ruleqa.spamassassin.org/%{REQUEST_FILENAME} !-d + RewriteCond /var/www/ruleqa.spamassassin.org/%{REQUEST_FILENAME} !-f + # Otherwise the CGI, only send known urls + RewriteCond %{REQUEST_URI} !^/ruleqa\.cgi$ + RewriteRule ^/((?:20\d\d|last-|\d+-days-ago|today).*) /ruleqa.cgi/$1 [PT,L] + + + +# +# spamassassin.org -> spamassassin.apache.org redirects +# + + + ServerName spamassassin.org + ServerAlias www.spamassassin.org + + ErrorLog ${APACHE_LOG_DIR}/spamassassin.org-error.log + CustomLog ${APACHE_LOG_DIR}/spamassassin.org-access.log combined + + RewriteEngine On + RewriteRule ^ https://spamassassin.apache.org/ [R,L] + + + + ServerName spamassassin.org + ServerAlias www.spamassassin.org + + ErrorLog ${APACHE_LOG_DIR}/spamassassin.org-error.log + CustomLog ${APACHE_LOG_DIR}/spamassassin.org-access.log combined + + RewriteEngine On + RewriteRule ^ https://spamassassin.apache.org/ [R,L] + + SSLEngine on + SSLCertificateFile /etc/letsencrypt/live/spamassassin.org/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/spamassassin.org/privkey.pem + # https://ssl-config.mozilla.org/#server=apache&version=2.4.41&config=intermediate&openssl=1.1.1f&hsts=false&guideline=5.4 + # intermediate configuration + #SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1 + #SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384 + #SSLHonorCipherOrder off + #SSLSessionTickets off + #SSLUseStapling On + # old configuration + SSLProtocol all -SSLv3 + SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA + SSLHonorCipherOrder on + SSLSessionTickets off + SSLUseStapling On + + + +# +# wiki.spamassassin.org -> https://cwiki.apache.org/confluence/display/SPAMASSASSIN/ +# + + + ServerName wiki.spamassassin.org + + ErrorLog ${APACHE_LOG_DIR}/wiki.spamassassin.org-error.log + CustomLog ${APACHE_LOG_DIR}/wiki.spamassassin.org-access.log combined + + RewriteEngine On + RewriteRule ^ https://cwiki.apache.org/confluence/display/SPAMASSASSIN/ [R,L] + + + + ServerName wiki.spamassassin.org + + ErrorLog ${APACHE_LOG_DIR}/wiki.spamassassin.org-error.log + CustomLog ${APACHE_LOG_DIR}/wiki.spamassassin.org-access.log combined + + RewriteEngine On + RewriteRule ^ https://cwiki.apache.org/confluence/display/SPAMASSASSIN/ [R,L] + + SSLEngine on + SSLCertificateFile /etc/letsencrypt/live/spamassassin.org/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/spamassassin.org/privkey.pem + # https://ssl-config.mozilla.org/#server=apache&version=2.4.41&config=intermediate&openssl=1.1.1f&hsts=false&guideline=5.4 + # intermediate configuration + #SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1 + #SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384 + #SSLHonorCipherOrder off + #SSLSessionTickets off + #SSLUseStapling On + # old configuration + SSLProtocol all -SSLv3 + SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA + SSLHonorCipherOrder on + SSLSessionTickets off + SSLUseStapling On + + + diff -Nru spamassassin-3.4.6/build/automc/etc-apache-local-conf-httpd.conf spamassassin-4.0.0~rc3/build/automc/etc-apache-local-conf-httpd.conf --- spamassassin-3.4.6/build/automc/etc-apache-local-conf-httpd.conf 2014-05-02 13:30:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/automc/etc-apache-local-conf-httpd.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,193 +0,0 @@ -# Included on spamassassin-vm from /etc/httpd/conf/httpd.conf: -# Include /home/automc/svn/spamassassin/build/automc/etc-apache-local-conf-httpd.conf -# -# Update Apache config like so: -# -# cd /export/home/svn-trunk; sudo -u automc svn up -# sudo /etc/rc.d/init.d/httpd restart ; tail /var/log/httpd/error_log - -# --------------------------------------------------------------------------- - - - DirectoryIndex index.html index.htm index.shtml index.php index.php4 index.php3 index.phtml index.cgi - - -UseCanonicalName On - -NameVirtualHost *:80 - -### jm dec 9 : proxy shouldn't wait for EOF, we want partial files too -### SetEnv force-proxy-request-1.0 1 -##SetEnv proxy-nokeepalive 1 -### try to cause more frequent buf writes with a tiny buf size -##ProxyIOBufferSize 16 -### reverse proxying only! -##ProxyRequests Off - -# --------------------------------------------------------------------------- - - - ServerName bbmass-trunk.spamassassin.org - ServerAlias bbmass.spamassassin.org - ServerAlias buildbot.spamassassin.org - - options indexes SymLinksIfOwnerMatch - AllowOverride All - - DocumentRoot /var/www/bbmass.spamassassin.org - ServerAdmin webmaster@spamassassin.org - userdir disabled - - #RewriteEngine On - - # index: straight through - #RewriteRule ^/$ http://127.0.0.1:8011/ [P] - - # anything else; proxy, if it doesn't exist as a file/dir - #RewriteCond /var/www/bbmass.spamassassin.org/%{REQUEST_FILENAME} !-d - #RewriteCond /var/www/bbmass.spamassassin.org/%{REQUEST_FILENAME} !-f - #RewriteRule ^/(.*) http://127.0.0.1:8011/$1 [P] - - # ProxyRequests Off - # - # Order deny,allow - # Allow from all - # - - - -# --------------------------------------------------------------------------- - - - ServerName ruleqa-trunk.spamassassin.org - ServerAlias ruleqa.spamassassin.org - - options indexes SymLinksIfOwnerMatch - AllowOverride indexes - - DocumentRoot /var/www/ruleqa.spamassassin.org - ServerAdmin webmaster@spamassassin.org - userdir disabled - - Alias /ruleqa.css /export/home/svn-trunk/masses/rule-qa/automc/ruleqa.css - - # debugging: - # RewriteLogLevel 9 - # RewriteLog /var/apache2/logs/rewrite_log - - # "%2F" is used to grep rule subsets, allow it - AllowEncodedSlashes On - - # strip out known-local files and loops; all else goes to the ruleqa code - RewriteEngine On - - # index: straight through - RewriteRule ^/$ /ruleqa.cgi [PT,L] - - RewriteRule ^/ruleqa.css$ /ruleqa.css [PT,L] - - # satisfy local files - RewriteCond /var/www/ruleqa.spamassassin.org/%{REQUEST_FILENAME} !-d - RewriteCond /var/www/ruleqa.spamassassin.org/%{REQUEST_FILENAME} !-f - - # otherwise the CGI - RewriteCond %{REQUEST_URI} !^/ruleqa\.cgi - RewriteRule ^/(.*) /ruleqa.cgi/$1 [PT,L] - - ScriptAlias /ruleqa.cgi /export/home/svn-trunk/masses/rule-qa/automc/ruleqa.cgi - - - -# --------------------------------------------------------------------------- - -# - # ServerName bbmass-stable.spamassassin.org - # - # options indexes SymLinksIfOwnerMatch - # AllowOverride indexes - # - # DocumentRoot /var/www/bbmass-stable.spamassassin.org - # ServerAdmin webmaster@spamassassin.org - # userdir disabled -# - # RewriteEngine On -# - # # index: straight through - # RewriteRule ^/$ http://127.0.0.1:8011/ [P] -# - # # anything else; proxy, if it doesn't exist as a file/dir - # RewriteCond /var/www/bbmass-stable.spamassassin.org/%{REQUEST_FILENAME} !-d - # RewriteCond /var/www/bbmass-stable.spamassassin.org/%{REQUEST_FILENAME} !-f - # RewriteRule ^/(.*) http://127.0.0.1:8011/$1 [P] -# - # ProxyRequests Off - # - # Order deny,allow - # Allow from all - # -# -# - -# --------------------------------------------------------------------------- - -# - # ServerName ruleqa-stable.spamassassin.org - # - # options indexes SymLinksIfOwnerMatch - # AllowOverride indexes - # - # DocumentRoot /var/www/ruleqa-stable.spamassassin.org - # ServerAdmin webmaster@spamassassin.org - # userdir disabled -# - # # debugging: - # # RewriteLogLevel 9 - # # RewriteLog /var/apache2/logs/rewrite_log -# - # # "%2F" is used to grep rule subsets, allow it - # AllowEncodedSlashes On -# - # # strip out known-local files and loops; all else goes to the ruleqa code - # RewriteEngine On -# - # # index: straight through - # RewriteRule ^/$ /ruleqa.cgi [PT,L] -# - # # satisfy local files - # RewriteCond /var/www/ruleqa-stable.spamassassin.org/%{REQUEST_FILENAME} !-d - # RewriteCond /var/www/ruleqa-stable.spamassassin.org/%{REQUEST_FILENAME} !-f -# - # # otherwise the CGI - # RewriteCond %{REQUEST_URI} !^/ruleqa\.cgi - # RewriteRule ^/(.*) /ruleqa.cgi/$1 [PT,L] -# -# - -# --------------------------------------------------------------------------- - - - ServerName rsync.spamassassin.org - - options indexes SymLinksIfOwnerMatch - AllowOverride indexes - - DocumentRoot /export/home/corpus-rsync/corpus - ServerAdmin webmaster@spamassassin.org - userdir disabled - - -# --------------------------------------------------------------------------- - - - ServerName updatedist.spamassassin.org - - options indexes SymLinksIfOwnerMatch - AllowOverride indexes - - DocumentRoot /var/www/buildbot.spamassassin.org/updatestage - ServerAdmin webmaster@spamassassin.org - userdir disabled - - -# --------------------------------------------------------------------------- - diff -Nru spamassassin-3.4.6/build/automc/etc-init.d-freqsd spamassassin-4.0.0~rc3/build/automc/etc-init.d-freqsd --- spamassassin-3.4.6/build/automc/etc-init.d-freqsd 2009-07-09 21:49:27.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/automc/etc-init.d-freqsd 2021-02-20 18:34:58.000000000 +0000 @@ -2,11 +2,18 @@ # # symlinked from # lrwxrwxrwx 1 root root 60 Dec 2 10:03 /etc/init.d/freqsd -> /export/home/svn-trunk/automc/etc-init.d-freqsd* +# +# new paths as of 2020: +# ~automc = /usr/local/spamassassin/automc +# /usr/local/spamassassin/automc/svn/trunk/build/automc/freqsd +# /usr/local/spamassassin/automc/svn/trunk/build/automc/etc-init.d-freqsd +# + . /etc/profile prog=freqsd -HOME=/export/home/automc +HOME=/usr/local/spamassassin/automc export HOME LC_CTYPE=C @@ -15,7 +22,7 @@ start() { echo "Starting $prog: " - cd $HOME/svn/spamassassin + cd $HOME/svn/trunk rm $HOME/freqsd/log.1 mv $HOME/freqsd/log $HOME/freqsd/log.1 @@ -28,7 +35,7 @@ } stop() { - cd $HOME/svn/spamassassin + cd $HOME/svn/trunk su automc -c "./build/automc/freqsd -pidfile $HOME/freqsd/pid -kill" sleep 1 diff -Nru spamassassin-3.4.6/build/automc/etc-rsyncd.conf spamassassin-4.0.0~rc3/build/automc/etc-rsyncd.conf --- spamassassin-3.4.6/build/automc/etc-rsyncd.conf 2014-05-02 03:10:55.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/automc/etc-rsyncd.conf 2017-06-04 22:04:59.000000000 +0000 @@ -3,100 +3,100 @@ uid = rsync gid = rsync use chroot = yes -motd file = /export/home/corpus-rsync/motd +motd file = /usr/local/spamassassin/automc/rsync/motd log file = /var/log/rsyncd.log max connections = 100 # Nightly submissions [corpus] comment = SpamAssassin Corpus upload directory -path = /export/home/corpus-rsync/corpus +path = /usr/local/spamassassin/automc/rsync/corpus read only = false auth users = * -secrets file = /export/home/corpus-rsync/secrets +secrets file = /usr/local/spamassassin/automc/rsync/secrets incoming chmod = a+r ##[stable-corpus] ##comment = SpamAssassin Corpus upload directory (Stable Branch) -##path = /export/home/corpus-rsync/stable-corpus +##path = /usr/local/spamassassin/automc/rsync/stable ##read only = false ##auth users = * -##secrets file = /export/home/corpus-rsync/secrets +##secrets file = /usr/local/spamassassin/automc/rsync/secrets ##incoming chmod = a+r # Rescoring runs [submit] comment = SpamAssassin GA mass-check submissions -path = /export/home/corpus-rsync/corpus/submit +path = /usr/local/spamassassin/automc/rsync/submit read only = false auth users = * -secrets file = /export/home/corpus-rsync/secrets +secrets file = /usr/local/spamassassin/automc/rsync/secrets incoming chmod = a+r [tagged_builds] comment = SpamAssassin tagged builds -path = /export/home/corpus-rsync/tagged_builds +path = /usr/local/spamassassin/automc/rsync/tagged_builds read only = true [anoncorpus] comment = SpamAssassin Corpus anonymous download directory -path = /export/home/corpus-rsync/corpus +path = /usr/local/spamassassin/automc/rsync/download read only = true [updates] comment = SpamAssassin updates (updates.spamassassin.org) -path = /var/www/buildbot.spamassassin.org/updatestage +path = /var/www/automc.spamassassin.org/updates read only = true -exclude = .* +exclude = .* *.sh archive # mail corpora: see http://wiki.apache.org/spamassassin/UploadedCorpora [mailcorpus_doc] - path = /export/home/bbmass/uploadedcorpora/doc - read only = false - auth users = doc - secrets file = /export/home/corpus-rsync/secrets - incoming chmod = a+r +path = /usr/local/spamassassin/automc/rsync/uploadedcorpora/doc +read only = false +auth users = doc +secrets file = /usr/local/spamassassin/automc/rsync/secrets +incoming chmod = a+r [mailcorpus_zmi] - path = /export/home/bbmass/uploadedcorpora/zmi - read only = false - auth users = zmi - secrets file = /export/home/corpus-rsync/secrets - incoming chmod = a+r +path = /usr/local/spamassassin/automc/rsync/uploadedcorpora/zmi +read only = false +auth users = zmi +secrets file = /usr/local/spamassassin/automc/rsync/secrets +incoming chmod = a+r [mailcorpus_fredt] - path = /export/home/bbmass/uploadedcorpora/fredt - read only = false - auth users = fredt - secrets file = /export/home/corpus-rsync/secrets - incoming chmod = a+r +path = /usr/local/spamassassin/automc/rsync/uploadedcorpora/fredt +read only = false +auth users = fredt +secrets file = /usr/local/spamassassin/automc/rsync/secrets +incoming chmod = a+r [mailcorpus_jhardin_fraud] - path = /export/home/bbmass/uploadedcorpora/jhardin_fraud - read only = false - auth users = jhardin_fraud - secrets file = /export/home/corpus-rsync/secrets - incoming chmod = a+r +path = /usr/local/spamassassin/automc/rsync/uploadedcorpora/jhardin_fraud +read only = false +auth users = jhardin_fraud +secrets file = /usr/local/spamassassin/automc/rsync/secrets +incoming chmod = a+r [mailcorpus_kmcgrail] - path = /home/bbmass/uploadedcorpora/kmcgrail - read only = false - auth users = kmcgrail - secrets file = /export/home/corpus-rsync/secrets - incoming chmod = a+r +path = /usr/local/spamassassin/automc/rsync/uploadedcorpora/kmcgrail +read only = false +auth users = kmcgrail +secrets file = /usr/local/spamassassin/automc/rsync/secrets +incoming chmod = a+r [mailcorpus_guenther_fraud] - path = /home/bbmass/uploadedcorpora/guenther_fraud - read only = false - auth users = guenther_fraud - secrets file = /export/home/corpus-rsync/secrets - incoming chmod = a+r +path = /usr/local/spamassassin/automc/rsync/uploadedcorpora/guenther_fraud +read only = false +auth users = guenther_fraud +secrets file = /usr/local/spamassassin/automc/rsync/secrets +incoming chmod = a+r [mailcorpus_jhardin] - path = /home/bbmass/uploadedcorpora/jhardin - read only = false - auth users = jhardin - secrets file = /export/home/corpus-rsync/secrets - incoming chmod = a+r +path = /usr/local/spamassassin/automc/rsync/uploadedcorpora/jhardin +read only = false +auth users = jhardin +secrets file = /usr/local/spamassassin/automc/rsync/secrets +incoming chmod = a+r diff -Nru spamassassin-3.4.6/build/automc/freqsd spamassassin-4.0.0~rc3/build/automc/freqsd --- spamassassin-3.4.6/build/automc/freqsd 2018-02-05 14:10:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/automc/freqsd 2021-02-20 18:34:58.000000000 +0000 @@ -1,7 +1,14 @@ -#!/local/perl586/bin/perl +#!/usr/bin/perl # # freqsd - perform "background" operations required by the automc # infrastructure, such as building indices and "hit-frequencies" reports +# +# new paths as of 2020: +# ~automc = /usr/local/spamassassin/automc +# /usr/local/spamassassin/automc/svn/trunk/build/automc/freqsd +# /usr/local/spamassassin/automc/svn/trunk/build/automc/etc-init.d-freqsd +# + use strict; use warnings; @@ -16,10 +23,10 @@ "kill" => \$opt_kill, ); -my $INHIBIT_SLOW_REPORTS_FLAG_FILE = "/export/home/automc/freqsd/flag.inhibit_slow_reports"; -my $dq_fast = IPC::DirQueue->new({ dir => "/export/home/automc/freqsd/dq_fast" }); -my $dq_slow = IPC::DirQueue->new({ dir => "/export/home/automc/freqsd/dq_slow" }); -$pidfile ||= "/export/home/automc/freqsd/pid"; +my $INHIBIT_SLOW_REPORTS_FLAG_FILE = "/usr/local/spamassassin/automc/freqsd/flag.inhibit_slow_reports"; +my $dq_fast = IPC::DirQueue->new({ dir => "/usr/local/spamassassin/automc/freqsd/dq_fast" }); +my $dq_slow = IPC::DirQueue->new({ dir => "/usr/local/spamassassin/automc/freqsd/dq_slow" }); +$pidfile ||= "/usr/local/spamassassin/automc/freqsd/pid"; umask(002); diff -Nru spamassassin-3.4.6/build/mkrules spamassassin-4.0.0~rc3/build/mkrules --- spamassassin-3.4.6/build/mkrules 2019-02-26 00:13:11.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkrules 2019-06-27 16:22:13.000000000 +0000 @@ -239,6 +239,7 @@ my $pretext = q{ loadplugin Mail::SpamAssassin::Plugin::Check loadplugin Mail::SpamAssassin::Plugin::URIDNSBL + util_rb_tld com # skip "need to run sa-update" warn use_bayes 0 }; diff -Nru spamassassin-3.4.6/build/mkupdates/do-stable-update-with-scores spamassassin-4.0.0~rc3/build/mkupdates/do-stable-update-with-scores --- spamassassin-3.4.6/build/mkupdates/do-stable-update-with-scores 2012-08-20 20:30:34.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/do-stable-update-with-scores 2022-04-25 05:08:21.000000000 +0000 @@ -2,38 +2,42 @@ . /etc/profile -PATH=/home/jm/sabuildtools/bin:$PATH - -cd /home/updatesd/svn/new-rule-score-gen -echo "Changing dirs to /home/updatesd/svn/new-rule-score-gen" +set -x +#PATH=/home/jm/sabuildtools/bin:$PATH #ADDING MORE EXIT STATUS CHECKS FOR BUG 6702 -echo 'Running do-nightly-rescore-example...' -echo '' -/home/updatesd/svn/new-rule-score-gen/do-nightly-rescore-example +echo "'Running do-nightly-rescore-example.sh ..." +echo "" +/usr/local/spamassassin/automc/svn/trunk/masses/rule-update-score-gen/do-nightly-rescore-example.sh $1 RV=$? if [ $RV -ne 0 ] ; then - echo "Exit Status $RV is not zero for do-nightly-rescore-example" - ( - echo "From: nobody@spamassassin.apache.org (UpdatesD Cron)" - echo "Subject: [auto] do-nightly-rescore-example $RV" - echo - echo "Exit Status $RV is not zero for do-nightly-rescore-example." - ) | /usr/sbin/sendmail -oi ruleqa@spamassassin.apache.org + echo "Exit Status $RV is not zero for do-nightly-rescore-example" + ( + echo "From: noreply@spamassassin.apache.org (automc Cron)" + echo "Subject: [auto] do-nightly-rescore-example return code $RV" + echo "" + echo "Exit Status $RV is not zero for do-nightly-rescore-example.sh" + echo "" + echo "=== tail of ~automc/tmp/do-stable-update-with-scores.log ===" + tail -20 /usr/local/spamassassin/automc/tmp/do-stable-update-with-scores.log + ) | /usr/sbin/sendmail -oi ruleqa@spamassassin.apache.org else - echo 'Running mkupdate-with-scores...' - echo '' - /home/updatesd/svn/mkupdates-with-scores/mkupdate-with-scores - RV=$? - if [ $RV -ne 0 ] ; then - echo "Exit Status $RV is not zero for mkupdate-with-scores" - ( - echo "From: nobody@spamassassin.apache.org (UpdatesD Cron)" - echo "Subject: [auto] mkupdate-with-scores $RV" - echo - echo "Exit Status $RV is not zero for mkupdate-with-scores" - ) | /usr/sbin/sendmail -oi ruleqa@spamassassin.apache.org - fi + echo "Running mkupdate-with-scores..." + echo "" + /usr/local/spamassassin/automc/svn/trunk/build/mkupdates/mkupdate-with-scores + RV=$? + if [ $RV -ne 0 ] ; then + echo "Exit Status $RV is not zero for mkupdate-with-scores" + ( + echo "From: noreply@spamassassin.apache.org (automc Cron)" + echo "Subject: [auto] mkupdate-with-scores return code $RV" + echo "" + echo "Exit Status $RV is not zero for mkupdate-with-scores" + echo "" + echo "=== tail of ~automc/tmp/do-stable-update-with-scores.log ===" + tail -20 /usr/local/spamassassin/automc/tmp/do-stable-update-with-scores.log + ) | /usr/sbin/sendmail -oi ruleqa@spamassassin.apache.org + fi fi diff -Nru spamassassin-3.4.6/build/mkupdates/hash_existing_tarballs spamassassin-4.0.0~rc3/build/mkupdates/hash_existing_tarballs --- spamassassin-3.4.6/build/mkupdates/hash_existing_tarballs 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/hash_existing_tarballs 2018-09-02 00:44:43.000000000 +0000 @@ -0,0 +1,29 @@ +#!/bin/bash + +# hash_existing_tarballs + +# This script creates SHA-256 hash files for existing tarballs that do not +# already have one whose basename is all numbers. If $UPDDIR is set in the +# environment, it is used as the directory to look for tarballs and save +# hash files. The default is /var/www/automc.spamassassin.org/updates, +# which is where the scripts on sa-vm1.apache.org put them as of +# 2018-03-30 + +# shasum is part of the Perl core, specifically Digest::SHA +# so let's make sure we prioritize safe places for it... +PATH=/usr/local/bin:/usr/bin:$PATH + +shopt -s extglob +cd ${UPDDIR:=/var/www/automc.spamassassin.org/updates} || { + echo "Cannot cd into $UPDDIR, rc=$?. Exiting without hashing anything!" >&2 + exit 127 +} +for UPF in +([0-9]).tar.gz +do + [[ -s $UPF.sha256 ]] && continue + echo "Hashing $UPF with SHA256" >&2 + shasum -a 256 $UPF > $UPF.sha256 + [[ -s $UPF.sha512 ]] && continue + echo "Hashing $UPF with SHA512" >&2 + shasum -a 512 $UPF > $UPF.sha512 +done diff -Nru spamassassin-3.4.6/build/mkupdates/listpromotable spamassassin-4.0.0~rc3/build/mkupdates/listpromotable --- spamassassin-3.4.6/build/mkupdates/listpromotable 2019-02-27 18:07:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/listpromotable 2021-04-21 10:35:25.000000000 +0000 @@ -24,7 +24,7 @@ # new rules that didn't exist on previous days, however, so new rules # can be published quickly to handle sudden outbreaks without requiring # manual update work) -my @DAYS_REQUIRED = (1, 2, 3); +my @DAYS_REQUIRED = (1, 2, 3, 4, 5); ########################################################################### @@ -32,13 +32,67 @@ my @doc = (); my $cache = 'ruleqa.cache.'; my $submitters = ''; +my $last_net; +my %outputs; + +if (!$FROM_CACHE || !-f "${cache}net" || (-M "${cache}net") > 0.5) { + my $neturl = $cgi_url."last-net?xml=1"; + warn "HTTP get: $neturl\n"; + $last_net = get ($neturl); + if (!$last_net) { + die "HTTP get failed: last-net\n"; + } + if ($MAKE_CACHE) { + open(O, ">${cache}net"); print O $last_net; close O; + } +} else { + open(I, "<${cache}net") or die; $last_net = join('',); close I; +} + +if ($last_net =~ m{ + \s*(.*?)\s* + }sx) + { + + my $netsubs = $1; + ($submitters ne '') and $submitters .= "; "; + $submitters .= "last-net: $netsubs"; +} else { + loghtml_die("no 'mcviewing', 'mcsubmitters' microformats for last-net"); +} + +my $netlist; +while ($last_net =~ m!(.*?)!xg) { + my $xml = $1; + my $obj = { }; + + while ($xml =~ s!<([A-Za-z0-9_]+)>(.*?)!!) { + $obj->{$1} = $2; + } + while ($xml =~ s!<([A-Za-z0-9_]+)\s+esc=["']1["']>(.*?)!!) { + $obj->{$1} = uri_unescape($2); + } + + my $name = $obj->{test}; + $obj->{detailhref} = $cgi_url.$obj->{detailhref}; + + $netlist->{$name} = $obj; +} + +if (!scalar keys %{$netlist}) { + loghtml_die("no rules found? on last-net"); +} my $url; # tracks the last day used my $dayoffset = 0; +my $with_new_offset = 0; + foreach my $day (@DAYS_REQUIRED) { - if (!$FROM_CACHE || !-f $cache.$day || (-M $cache.$day) > 0.5) { + if (!$FROM_CACHE || !-f $cache.$day || (-M $cache.$day) > 0.5 || $with_new_offset) { -with_new_offset: + $with_new_offset = 0; $url = $cgi_url.($day+$dayoffset)."-days-ago?xml=1"; warn "HTTP get: $url\n"; @@ -58,7 +112,7 @@ ########################################################################### # the HTML looks like: - # + # # # ... # ....... @@ -82,7 +136,8 @@ # so the results are untrustworthy. if ($daysubs =~ /(?:^|\s)net-/) { warn "day $day contains a --net mass-check! offsetting by an extra day\n"; - $dayoffset++; goto with_new_offset; + $dayoffset++; + $with_new_offset = 1; redo; } ($submitters ne '') and $submitters .= "; "; @@ -100,6 +155,7 @@ # ruleqa%3Fdaterev%3Dlast-night%26rule%3D__HIGHBITS%26s_detail%3D1 my $plist; +my %ruleslist; foreach my $day (@DAYS_REQUIRED) { while ($doc[$day] =~ m!(.*?)!xg) { my $xml = $1; @@ -113,6 +169,7 @@ } my $name = $obj->{test}; + $ruleslist{$name} = 1; $obj->{detailhref} = $cgi_url.$obj->{detailhref}; $plist->[$day]->{$name} = $obj; @@ -123,6 +180,19 @@ } } +sub median_array { + my @vals = sort {$a <=> $b} @_; + my $len = @vals; + if($len%2) #odd? + { + return $vals[int($len/2)]; + } + else #even + { + return ($vals[int($len/2)-1] + $vals[int($len/2)])/2; + } +} + ########################################################################### ## my $dump = Data::Dumper->Dump([$plist], ['promolist']); print $dump; @@ -170,6 +240,7 @@ $mailsa->lint_rules(); +print "# DO NOT EDIT: file generated by build/mkupdates/listpromotable\n"; print "# active ruleset list, automatically generated from $cgi_url\n"; print "# with results from: $submitters\n"; @@ -178,10 +249,52 @@ die "not generating results; less than 3 submitter results available!\n"; } -# base most of our decisions off day 1 (last night's mass-checks) -foreach my $plistkey (sort keys %{$plist->[1]}) { - my $name = $plistkey; - my $plistobj = $plist->[1]->{$plistkey}; +foreach my $netrule (sort keys %{$netlist}) { + my $name = $netrule; + my $notes = ''; + + next if ($name =~ /^__/); + + my $no_t = $name; + if ($no_t =~ s/^T_//) { + if (defined $mailsa->{conf}->{scores}->{$no_t}) { + $name = $no_t; + } + } + + # now that it's ok to have sandbox rules without a T_ prefix, + # "T_" prefix implies "tflags nopublish" + next if ($name =~ /^T_/); + + # ignore rules that don't exist (if they have a desc or score, + # they exist according to the Conf parser) + next unless ($mailsa->{conf}->{descriptions}->{$name} + || $mailsa->{conf}->{scores}->{$name}); + + my $tfs = $mailsa->{conf}->{tflags}->{$name}; + + # "nopublish" tflags + if ($tfs) { + next if ($tfs =~ /\bnopublish\b/); + } + + next if ($mailsa->{conf}->{testrules}->{$name}); + + if ($tfs && $tfs =~ /\b(net)\b/) { + $notes = "tflags ".$1; + goto publish; + } + + next; +publish: + + $outputs{$name} = $notes unless defined $outputs{$name}; +} + +foreach my $name (keys %ruleslist) { + next if $name =~ /^__/; + + my $plistobj = $plist->[1]->{$name}; my $notes = ''; # rules in sandboxes without a T_ prefix, will be renamed during the @@ -198,7 +311,7 @@ # now that it's ok to have sandbox rules without a T_ prefix, # "T_" prefix implies "tflags nopublish" next if ($name =~ /^T_/); - + # ignore rules that don't exist (if they have a desc or score, # they exist according to the Conf parser) next unless ($mailsa->{conf}->{descriptions}->{$name} @@ -230,13 +343,6 @@ goto publish; } - # ignore rules that are not marked as promotable in ANY of the days. - # ie a rule must be promotable in all 3, to be listed. (Also allow - # rules that weren't in existence in the earlier mass-checks.) - next unless ($plist->[1]->{$plistkey}->{promo}); - next unless ($plist->[2]->{$plistkey}->{promo} or !defined($plist->[2]->{$plistkey}->{promo})); - next unless ($plist->[3]->{$plistkey}->{promo} or !defined($plist->[3]->{$plistkey}->{promo})); - # only rules from "rulesrc" dirs my $src = $mailsa->{conf}->{source_file}->{$name}; next if (!$src || $src !~ /rulesrc/); @@ -244,6 +350,22 @@ # rules that fail lint next if $rules_with_errors{$name}; + # base active on DAYS_REQUIRED days of checks + # Find median for promo + my @promo_arr; + foreach my $day (@DAYS_REQUIRED) { + if (defined $plist->[$day]->{$name}) { + push (@promo_arr, $plist->[$day]->{$name}{promo}); + } + if (defined $plist->[$day]->{"T_$name"}) { + push (@promo_arr, $plist->[$day]->{"T_$name"}{promo}); + } + } + + my $is_promo = median_array(@promo_arr); + + next unless $is_promo gt 0; + # that require a plugin we won't have my $skip = 0; my $ifs = $mailsa->{conf}->{if_stack}->{$name}; @@ -264,11 +386,14 @@ publish: - print "\n# $notes\n$name\n"; + $outputs{$name} = $notes unless defined $outputs{$name}; +} + +foreach my $key (sort(keys %outputs)) { + print "\n# ", $outputs{$key}, "\n", $key, "\n"; } exit; sub loghtml_die { die "$_[0]\nURL: $url\n"; } - diff -Nru spamassassin-3.4.6/build/mkupdates/mkupdate-with-scores spamassassin-4.0.0~rc3/build/mkupdates/mkupdate-with-scores --- spamassassin-3.4.6/build/mkupdates/mkupdate-with-scores 2011-05-20 04:40:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/mkupdate-with-scores 2022-04-28 17:38:37.000000000 +0000 @@ -7,7 +7,7 @@ # # - retrieves the latest gernerated scores for new active.list rules # - checks out the trunk revision of code that those scores were generated for -# - generates an update tarball and associated sha1 and asc files +# - generates an update tarball and associated sha1, sha256, sha512, and asc files # - checks out each of the 3.3 stable release tagged versions, builds and # installs that version (in a tmp dir) and then installs the above generated # update using sa-update --install to make sure it works with each version @@ -39,12 +39,19 @@ umask 022 -UPDATEDIR=/var/www/buildbot.spamassassin.org/updatestage -DNSDIR=/var/named/updates.spamassassin.org.d -KEYDIR=/home/updatesd/key +PROGDIR=`dirname $0` +[[ "$PROGDIR" = "." ]] && PROGDIR=`pwd` +PROGNAME=`basename $0 .sh` +HOST=`hostname -f` + +SVN_BASEURL="https://svn.apache.org/repos/asf/spamassassin" +TMPDIR="/usr/local/spamassassin/automc/tmp/${PROGNAME}" +UPDATEDIR="/var/www/automc.spamassassin.org/updates" +KEYDIR="/usr/local/spamassassin/automc/key" UPDATE_BUILD_DIR=0 REVERT_REVISION=0 + # if $1 is present redirect output files to a test directory structure if [ ${#1} -gt 1 ]; then UPDATEDIR=$1$UPDATEDIR @@ -74,103 +81,60 @@ test_version() { SA_VERSION=$1 - SA_SVN_TAG=$2 + SA_SVN_PATH=$2 # to heck with dealing with svn update failures rm -rf release_$SA_VERSION # test the release on the version(s) of spamassassin the update is meant for - svn co https://svn.apache.org/repos/asf/spamassassin/$SA_SVN_TAG release_$SA_VERSION + svn co $SVN_BASEURL/$SA_SVN_PATH release_$SA_VERSION cd release_$SA_VERSION + # fix for newer perl and <3.4.2: Unescaped left brace in regex is illegal here in regex; + # marked by <-- HERE in m/^(.{ <-- HERE ,200}).*$/ at lib/Mail/SpamAssassin/PerMsgStatus.pm line 921 + perl -p -i -e 's/\.\{,200/.{200/g' lib/Mail/SpamAssassin/PerMsgStatus.pm + # also do requires ./ + perl -p -i -e 's%= "version\.h\.pl"%= "./version.h.pl"%g' spamc/configure.pl + + # need rules directory or build won't work + if [ ! -e rules ]; then cp -a ../trunk/rules .; fi + + # Fix for <4.0 - enable_compat/WelcomeListSubject not yet supported + if [[ $SA_VERSION =~ ^3 ]]; then + perl -p -i -e 's/^\s*(enable_compat)/#$1/' rules/init.pre + perl -p -i -e 's/WelcomeListSubject/WhiteListSubject/g' rules/v310.pre + fi + perl Makefile.PL PREFIX=$TMPDIR/release_$SA_VERSION < /dev/null make make install - set +e - ./sa-update -D --install $TMPDIR/${REVISION}.tar.gz - STATUS=$? - set -e + ./sa-update --install $TMPDIR/${REVISION}.tar.gz 2>&1 || { + echo "FATAL: sa-update test failed for version $SA_VERSION (r$REVISION)" + exit $? + } cd .. rm -rf release_$SA_VERSION $TMPDIR/release_$SA_VERSION - return $STATUS -} - -update_dns_record() { - SA_VERSION=$1 - UPDATE_REVISION=$2 - - if [ $AUTOUPDATESDISABLED -eq 1 -a $REVERT_REVISION -eq 0 ]; then - echo "DNS updating disabled (auto update publishing disabled), skipping DNS record update" - return 0 - fi - - # turn "3.2.0" into "0.2.3" - RVERS=`echo $SA_VERSION | perl -pe 's/^(\d+)\.(\d+)\.(\d+)$/$3.$2.$1/'` - - DNS_RECORD="$RVERS TXT \"$UPDATE_REVISION\"" - echo "DNS Record: $DNS_RECORD" - - DNSFILE="$DNSDIR/$SA_VERSION" - - mkdir $TMPDIR/dns-backup - - set +e - cp $DNSFILE $TMPDIR/dns-backup/. - set -e - - # set -e should catch any errors here - echo $DNS_RECORD > $DNSFILE.mkupdate-with-scores.new - mv $DNSFILE.mkupdate-with-scores.new $DNSFILE - - return 0 -} - -revert_dns_record() { - SA_VERSION=$1 - - if [ $AUTOUPDATESDISABLED -eq 1 -a $REVERT_REVISION -eq 0 ]; then - echo "DNS updating disabled (auto update publishing disabled), skipping DNS record revert" - return 0 - fi - - DNSFILE="$DNSDIR/$SA_VERSION" - - set +e - cp $TMPDIR/dns-backup/$SA_VERSION $DNSFILE - set -e -} - -copy_update_paranoid() { - SRC=$1 - DST=$2 - - set +e - cp $SRC $DST - diff -u $SRC $DST - if [ $? -ne 0 ]; then - set -e - return 1 - fi - set -e return 0 } make_rule_update_from_trunk() { + cd $TMPDIR + # to heck with dealing with svn update failures rm -rf trunk trunk-rulesrc-scores # get the latest scores for new rules - svn co https://svn.apache.org/repos/asf/spamassassin/trunk/rulesrc/scores trunk-rulesrc-scores + svn co $SVN_BASEURL/trunk/rulesrc/scores trunk-rulesrc-scores # get the revision number of the rules # TODO: have the script that make 72_scores.cf include a revision number #REVISION=`head -1 trunk-rulesrc-scores/72_scores.cf | cut -d" " -f6` REVISION=`head -1 trunk-rulesrc-scores/scores-set* | cut -d" " -f9 | sort -rn | head -1` - svn co --revision=$REVISION https://svn.apache.org/repos/asf/spamassassin/trunk trunk + svn co --revision=$REVISION $SVN_BASEURL/trunk trunk cd trunk @@ -180,6 +144,7 @@ perl Makefile.PL PREFIX=$TMPDIR/trunk < /dev/null make + make test TEST_FILES="t/basic_lint.t t/basic_lint_without_sandbox.t t/basic_meta.t" cd .. @@ -198,43 +163,37 @@ # remove files we don't want to ship in updates # remember that 3KB == 1GB of traffic on the mirrors as of Jan 1, 2010 - set +e - rm 70_sandbox.cf 70_inactive.cf - rm STATISTICS-set?.txt - set -e + rm -f 70_sandbox.cf 70_inactive.cf STATISTICS-set?.txt mkdir -p $TMPDIR/trunk/etc/mail/spamassassin #cp *.pre *.cf *.txt languages user_prefs.template $TMPDIR/trunk/etc/mail/spamassassin/. ../spamassassin --lint -D - tar cvf - *.cf *.txt languages user_prefs.template | gzip -9 > $TMPDIR/${REVISION}.tar.gz - - cd ../.. - - shasum $TMPDIR/${REVISION}.tar.gz > $TMPDIR/${REVISION}.tar.gz.sha1 - gpg --batch --homedir $KEYDIR -bas $TMPDIR/${REVISION}.tar.gz || exit $? + tar -cvf $TMPDIR/${REVISION}.tar *.cf *.txt languages user_prefs.template + # 5% better compression than gzip + zopfli $TMPDIR/${REVISION}.tar + + cd $TMPDIR + + tar -ztvf ${REVISION}.tar.gz + shasum -a 1 ${REVISION}.tar.gz >${REVISION}.tar.gz.sha1 + shasum -a 256 ${REVISION}.tar.gz >${REVISION}.tar.gz.sha256 + shasum -a 512 ${REVISION}.tar.gz >${REVISION}.tar.gz.sha512 + gpg --batch --homedir $KEYDIR -bas ${REVISION}.tar.gz || exit $? } copy_existing_update_for_reversion_testing() { - EXIT=0 - ( - copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz" "$TMPDIR/$REVISION.tar.gz" && - copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.asc" "$TMPDIR/$REVISION.tar.gz.asc" && - copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha1" "$TMPDIR/$REVISION.tar.gz.sha1" - ) || EXIT=6 - - # copying the update files went wrong exit - if [ $EXIT -gt 0 ]; then + cp "$UPDATEDIR/$REVERT_REVISION.tar.gz"* "$TMPDIR/" || { echo "Could not copy existing revision $REVERT_REVISION, to temporary testing directory, aborting!" exit $EXIT - fi + } } check_for_disable-automatic-update_file_in_svn() { rm -rf $TMPDIR/svn-scores-latest # checkout the latest scores directory - svn co https://svn.apache.org/repos/asf/spamassassin/trunk/rulesrc/scores/ $TMPDIR/svn-scores-latest + svn co $SVN_BASEURL/trunk/rulesrc/scores/ $TMPDIR/svn-scores-latest AUTOUPDATESDISABLED=0 @@ -273,7 +232,18 @@ echo "New update version/revision will be $REVISION" } -TMPDIR="/tmp/sa-mkupdate-$$" +svn_path_exists() { + SVNINFO=`svn info $1 2>&1 || true` + # W170000 == non-existent revision + if [[ $SVNINFO =~ W170000: ]]; then return 1; fi + # Hardfail on any other error + if [[ ! $SVNINFO =~ Revision: ]]; then + echo "FATAL: svn info failed: $SVNINFO" + exit 1 + fi + return 0 +} + rm -rf $TMPDIR mkdir $TMPDIR cd $TMPDIR @@ -288,7 +258,7 @@ # that we have generated scores for make_rule_update_from_trunk else - if [ ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.asc -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.sha1 ]; then + if [ ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.asc -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.sha1 -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.sha256 -a ! $UPDATEDIR/$REVERT_REVISION.tar.gz.sha512 ]; then echo "Could not find update files for update revision $REVERT_REVISION, aborting." exit 8 fi @@ -303,65 +273,62 @@ fi # test to make sure it works with sa-update --install -UPDATED_VERSIONS=0 -MINOR_VERS=0 +TESTED_VERSIONS="" -for (( MINOR_VERS=0; 1; MINOR_VERS++ )); do - set +e - svn info https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_3_$MINOR_VERS | grep Revision - VERSION_EXISTS=$? - set -e - if [ $VERSION_EXISTS -ne 0 ]; then - break; - fi - test_version 3.3.$MINOR_VERS tags/spamassassin_release_3_3_$MINOR_VERS \ - && update_dns_record "3.3.$MINOR_VERS" "$REVISION" && UPDATED_VERSIONS=$((UPDATED_VERSIONS+1)) +# Iterate through all found 3.4 versions (3.4.1 - 3.4.x) +MAJOR_VERS=3 +MINOR_VERS=4 +for (( UPDATE_VERS=1; 1; UPDATE_VERS++ )); do + REL=${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS} + if ! svn_path_exists $SVN_BASEURL/tags/spamassassin_release_${REL}; then break; fi + test_version ${REL} tags/spamassassin_release_${REL} && + TESTED_VERSIONS="$TESTED_VERSIONS ${REL}" done +# And lastly the HEAD +if svn_path_exists $SVN_BASEURL/branches/${MAJOR_VERS}.${MINOR_VERS}; then + test_version ${MAJOR_VERS}_${MINOR_VERS}_HEAD branches/${MAJOR_VERS}.${MINOR_VERS} && + TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}_${MINOR_VERS}_HEAD" +fi -# we just assume that the next stable version is the branch's current version -test_version 3.3.$MINOR_VERS branches/3.3 \ - && update_dns_record "3.3.$MINOR_VERS" "$REVISION" && UPDATED_VERSIONS=$((UPDATED_VERSIONS+1)) +# Iterate through all found 4.0 versions (4.0.0 - 4.0.x) +MAJOR_VERS=4 +MINOR_VERS=0 +for (( UPDATE_VERS=0; 1; UPDATE_VERS++ )); do + REL=${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS} + if ! svn_path_exists $SVN_BASEURL/tags/spamassassin_release_${REL}; then break; fi + test_version ${REL} tags/spamassassin_release_${REL} && + TESTED_VERSIONS="$TESTED_VERSIONS ${REL}" +done +# And lastly the HEAD +if svn_path_exists $SVN_BASEURL/branches/${MAJOR_VERS}.${MINOR_VERS}; then + test_version ${MAJOR_VERS}_${MINOR_VERS}_HEAD branches/${MAJOR_VERS}.${MINOR_VERS} && + TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}_${MINOR_VERS}_HEAD" +fi -echo "VERSIONS UPDATE PASSED ON: $UPDATED_VERSIONS" +echo "VERSIONS UPDATE PASSED ON: $TESTED_VERSIONS" # publish update -if [ $UPDATED_VERSIONS -gt 0 ]; then - # be careful, we want to make sure that the DNS records are always in a good state; - # even if we end up exiting unexpectedly due to an error - EXIT=0 +if [[ ! -z "$TESTED_VERSIONS" ]]; then ( - copy_update_paranoid "$TMPDIR/$REVISION.tar.gz" "$UPDATEDIR/$REVISION.tar.gz" && - copy_update_paranoid "$TMPDIR/$REVISION.tar.gz.asc" "$UPDATEDIR/$REVISION.tar.gz.asc" && - copy_update_paranoid "$TMPDIR/$REVISION.tar.gz.sha1" "$UPDATEDIR/$REVISION.tar.gz.sha1" && - chmod 544 $UPDATEDIR/$REVISION.tar.gz* - ) || EXIT=5 - - # copying the update files went wrong, revert dns and exit - if [ $EXIT -gt 0 ]; then - for (( I=0; I<=$MINOR_VERS; I++ )); do - revert_dns_record "3.3.$I" - done - exit $EXIT - fi - - # schedule dns commit/reload atq job - # note that we're probably not going to be able to commit the DNS changes - # until the update tarball mirrors have had time to sync since the ASF - # name servers will probably update and reload via a commit hook trigger or - # on a set interval + chmod 644 $TMPDIR/$REVISION.tar.gz* && + # Atomic copy + rsync -a $TMPDIR/$REVISION.tar.gz* $UPDATEDIR/ + ) || exit 5 if [ $AUTOUPDATESDISABLED -eq 1 -a $REVERT_REVISION -eq 0 ]; then echo "DNS updating disabled (auto update publishing disabled), skipping DNS reload" else - # delete any existing jobs in at queue 'n' used for named reloads - for JOB in `at -l -q n | cut -d" " -f1`; do atrm $JOB; done - - # schedule a job to tick the zone serial and reload named in 16 minutes - # (mirror rsyncs are done every 15 minutes) - cd - echo "/export/home/updatesd/svn/spamassassin/build/mkupdates/tick_zone_serial" | at -q n now + 16min + # Wait 20 minutes for the mirrors to update via rsync + sleep 1200 + # Newer versions >= 3.4.1 of SpamAssassin are CNAME'd to 3.3.3 + /usr/local/bin/updateDNS.sh 3.3.3.updates TXT $REVISION + RC=$? + if [[ "$RC" -ne 2 ]]; then + # sa-update for these older versions doesn't support CNAME'ing + /usr/local/bin/updateDNS.sh 0.4.3.updates TXT $REVISION + /usr/local/bin/updateDNS.sh 2.3.3.updates TXT $REVISION + /usr/local/bin/updateDNS.sh 1.3.3.updates TXT $REVISION + /usr/local/bin/updateDNS.sh 0.3.3.updates TXT $REVISION + fi fi fi - -cd -rm -rf $TMPDIR diff -Nru spamassassin-3.4.6/build/mkupdates/revert-stable-update spamassassin-4.0.0~rc3/build/mkupdates/revert-stable-update --- spamassassin-3.4.6/build/mkupdates/revert-stable-update 2011-05-20 04:16:47.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/revert-stable-update 2018-09-02 00:44:43.000000000 +0000 @@ -50,7 +50,7 @@ echo "Usage: ./revert-stable-update 1234567" fi -if [ ! -f $UPDATEDIR/$1.tar.gz -a ! -f $UPDATEDIR/$1.tar.gz.asc -a ! -f $UPDATEDIR/$1.tar.gz.sha1 ]; then +if [ ! -f $UPDATEDIR/$1.tar.gz -a ! -f $UPDATEDIR/$1.tar.gz.asc -a ! -f $UPDATEDIR/$1.tar.gz.sha1 -a ! -f $UPDATEDIR/$1.tar.gz.sha256 -a ! -f $UPDATEDIR/$1.tar.gz.sha512 ]; then echo "Could not find update files for update revision $1" fi diff -Nru spamassassin-3.4.6/build/mkupdates/run_nightly spamassassin-4.0.0~rc3/build/mkupdates/run_nightly --- spamassassin-3.4.6/build/mkupdates/run_nightly 2014-06-15 16:04:10.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/run_nightly 2022-04-19 08:38:39.000000000 +0000 @@ -1,79 +1,289 @@ -#!/bin/sh -# -# driver for cron. -# 30 8 * * * bash /home/updatesd/svn/spamassassin/build/mkupdates/run_nightly > /var/www/buildbot.spamassassin.org/updatesd/mkupdates.txt 2>&1 +#!/bin/bash -set -x +PERL=/usr/bin/perl + +LOGDIR="/var/www/automc.spamassassin.org/mkupdates" +REPDIR="/var/www/ruleqa.spamassassin.org/reports" +UPDDIR="/var/www/automc.spamassassin.org/updates" + +# Tarball creation disabled, see comment near make_tarball_for_version call +#VERSIONS="3.4.4" -cd /home/updatesd/svn/spamassassin +cd /usr/local/spamassassin/automc/svn/trunk . /etc/profile -#Switched to system perl on spamassassin-vm box -PERL=/usr/bin/perl -#PERL=/local/perl586/bin/perl -export PERL -# Will this script be updated? If so, re-run it after updating. -FLAG=NO -if [ "`svn status -uq build/mkupdates/run_nightly | head -1 | cut -b8`" = "*" ]; then - FLAG=YES -fi - -svn cleanup # paranoia -svn update || exit $? - -# Do the restart if we need to ... -if [ "$FLAG" = "YES" ]; then - #THIS IS NOT WORKING CURRENTLY 6-15-2014 - exec $0 "$@" - - # It shouldn't get here, but just in case ... - exit 2 -fi - -$PERL ./build/mkupdates/listpromotable > rules/active.list.new || exit $? -mv rules/active.list.new rules/active.list - -( -echo " - -To commit this and proceed with update tarball creation: - - ssh spamassassin.zones.apache.org - sudo -u updatesd /home/updatesd/svn/spamassassin/build/mkupdates/run_part2 - -" - -svn diff -) > /home/updatesd/LATEST - -cat /home/updatesd/LATEST -# mailx -s "[admin] planned commit for active.list" \ -# dev@Spamassassin.apache.org < /home/updatesd/LATEST - -# cycle the logfiles; keep 6 (3 days worth I think) -( - cd /var/www/buildbot.spamassassin.org/updatesd - rm mkupdates_6.txt - mv mkupdates_5.txt mkupdates_6.txt - mv mkupdates_4.txt mkupdates_5.txt - mv mkupdates_3.txt mkupdates_4.txt - mv mkupdates_2.txt mkupdates_3.txt - mv mkupdates_1.txt mkupdates_2.txt - mv mkupdates.txt mkupdates_1.txt -) - -# create a list of "bad" rules in the current sandboxes, updated daily -$PERL masses/rule-qa/list-bad-rules \ - > /var/www/ruleqa.spamassassin.org/reports/badrules.txt 2>&1 +# --------------------------------------------------------------------------- + +promote_active_rules() { + # should be in ~/svn/trunk + pwd + + # Make sure we have the source, since listpromotable assumes we do. + # Also, make_tarball_for_version removes rulesrc + # Get rules ("static" published rules) as well as rulesrc (dev sandboxes) + # as both are subject to modification at any time + svn co https://svn.apache.org/repos/asf/spamassassin/trunk/rules https://svn.apache.org/repos/asf/spamassassin/trunk/rulesrc + + $PERL build/mkupdates/listpromotable > rules/active.list.new || exit $? + mv rules/active.list.new rules/active.list + + svn diff rules > $REPDIR/LATEST + + cat $REPDIR/LATEST + + echo "Committing promotions in rules/active.list..." + svn commit -m 'promotions validated' rules/active.list + + # create a list of "bad" rules in the current sandboxes, updated daily + $PERL masses/rule-qa/list-bad-rules > $REPDIR/badrules.txt 2>&1 + + #On Wednesday's, we send out a bad sandbox rules report to the list + if [[ `date +%w` = 3 ]] ; then + ( + echo "From: automc@sa-vm.apache.org (Rules Report Cron)" + echo "Subject: [auto] bad sandbox rules report" + echo + cat $REPDIR/badrules.txt + ) | /usr/sbin/sendmail -oi dev@spamassassin.apache.org + fi +} + +# --------------------------------------------------------------------------- + +make_tarball_for_version() { + version="$1" + + tmpdir=$HOME/tmp/stage/$version + rm -rf $tmpdir; mkdir -p $tmpdir || exit $? + + # extract the new rules files. + + # use "make install" logic, since we want rules as close as possible + # to what's installed + # TODO: this *would* be performed in a checkout of the desired + # version's branch. right now we're only using 1 version though + # ... we are using TRUNK for this currently + make clean + $PERL Makefile.PL PREFIX=$tmpdir < /dev/null || exit $? + make || exit $? + + # remove new features, unsupported in existing code in the field + # (TODO: need a better way to exclude files that require new features + # like this; judicious use of "ifplugin" helps) + # rm rules/60_somerandomfeature.cf + + # ensure the basic lint/rule-sanity test suite passes for this ruleset + # before we build an update from it. useful particularly to catch + # "tflags nopublish" leakage (bug 6297) + # ... tested with TRUNK version currently + make test \ + TEST_FILES="t/basic_lint.t t/basic_lint_without_sandbox.t t/basic_meta.t" \ + || exit $? + + # remove the rules files for rules we won't be shipping + rm rules/70_sandbox.cf rules/70_inactive.cf + + # need to put the latest 72_scores.cf in the update.tgz + svn co https://svn.apache.org/repos/asf/spamassassin/trunk/rulesrc + cp -a rulesrc/scores/72_scores.cf rules/ + # I think this is problematic. I don't see how it is needed HERE. + #rm -rf rulesrc + + # double check we still lint without those 2 files + # ... still using TRUNK version + ./spamassassin --lint || exit $? + + rulesdir=`pwd`/rules + + ( + cd $rulesdir + + # Use this to include plugin .pm files: + # tar cvf - *.cf *.pm || exit $? + + # or this, to ban code from the updates: + tar cvf - *.cf || exit $? + + ) | gzip -9 > $tmpdir/update.tgz || exit $? + + # ensure non-empty + [ -s $tmpdir/update.tgz ] || exit 3 -#On Wednesday's, we send out a bad sandbox rules report to the list -if [ `date +%w` = 3 ] ; then + linttmp=$tmpdir/lintdir + rm -rf $linttmp + mkdir $linttmp ( - echo "From: nobody@spamassassin.apache.org (Rules Report Cron)" - echo "Subject: [auto] bad sandbox rules report" - echo - cat /var/www/ruleqa.spamassassin.org/reports/badrules.txt - ) | /usr/sbin/sendmail -oi dev@spamassassin.apache.org -fi + cd $linttmp + # check validity of tarball; also extract + gunzip -cd < $tmpdir/update.tgz | tar xf - || exit $? + ) || exit $? + + sitetmp=$tmpdir/sitetmp + rm -rf $sitetmp + mkdir $sitetmp + cp rules/*.pre $sitetmp + + # now, ensure the ruleset (entirely as distributed) lints, also. + # use "-p /dev/null" so any user_prefs data is ignored. + # ... still using TRUNK version + ./spamassassin -x --configpath=$linttmp --siteconfigpath=$sitetmp \ + -p /dev/null --lint \ + || exit $? + + # additionally build the actual $version and lint with it too + ( + testtag=spamassassin_release_${version//./_} + cd $tmpdir || exit $? + svn co https://svn.apache.org/repos/asf/spamassassin/tags/$testtag/ || exit $? + cd $testtag || exit $? + rm -f rules; ln -s $rulesdir rules + make clean 2>/dev/null || true + perl Makefile.PL $tmpdir/update.tgz.sha1 || exit $? + shasum -a 256 $tmpdir/update.tgz > $tmpdir/update.tgz.sha256 || exit $? + shasum -a 512 $tmpdir/update.tgz > $tmpdir/update.tgz.sha512 || exit $? + + + # get SVN revision number. + # note: use 'Last Changed Rev' instead of 'Revision'. Because we share + # an SVN repository with other projects, this means that the same + # rev of *our* codebase may appear under multiple rev#s, as other projects + # check their changes in. + + tagstamp=`date "+%Y%m%d%H%M%S"` + tagurl=https://svn.apache.org/repos/asf/spamassassin/tags/sa-update_${version}_${tagstamp} + + # this svn copy is critical, to ensure each version's tarball has a different + # rev#. if you remove it, we need to prefix the version# to the svnrev# in + # the filenames instead so each version doesn't clobber others. + svn up + svn copy -m 'promotions validated' . $tagurl < /dev/null + + # for svn 1.3: + # (svn info --non-interactive $tagurl || svn info $tagurl ) < /dev/null \ + # > $tmpdir/svn 2>&1 || exit $? + # for crappy zone svn, 1.2: + ( + rm -rf tmpcheckout + svn co $tagurl tmpcheckout && svn info tmpcheckout + rm -rf tmpcheckout + ) < /dev/null > $tmpdir/svn 2>&1 || exit $? + + svnrev=`(grep 'Last Changed Rev: ' $tmpdir/svn || exit 1) | \ + sed -e 's/^.*: //'` + + if [ "$svnrev" == "" ] ; then + echo "missing SVN revision" + cat $tmpdir/svn + exit 5 + fi + + if [ "$svnrev" -lt 1 ] ; then + echo "bad SVN revision: $svnrev" + cat $tmpdir/svn + exit 5 + fi + + chmod 644 $tmpdir/update.* + + # Integrate with masscheck ruleset updates to prevent duplicates + RECENT=`find $HOME/tmp/mkupdate-with-scores -name \*.tar.gz -mmin -480` + + if [[ -z "$RECENT" ]]; then + + echo "Recent ruleset from mkupdate-with-scores (massheck) NOT found." + echo "Proceeding with a ruleset publish..." + + mv $tmpdir/update.tgz $UPDDIR/${svnrev}.tar.gz || exit $? + mv $tmpdir/update.tgz.sha1 $UPDDIR/${svnrev}.tar.gz.sha1 || exit $? + mv $tmpdir/update.tgz.sha256 $UPDDIR/${svnrev}.tar.gz.sha256 || exit $? + mv $tmpdir/update.tgz.sha512 $UPDDIR/${svnrev}.tar.gz.sha512 || exit $? + mv $tmpdir/update.tgz.asc $UPDDIR/${svnrev}.tar.gz.asc || exit $? + + # Give the mirrors time to pull the new files above + sleep 600 + + # next, create/update the new DNS record.... + + # Versions >= 3.4.1 are CNAMEd to this DNS record: + /usr/local/bin/updateDNS.sh 3.3.3.updates TXT ${svnrev} + RC=$? + if [[ "$RC" -ne 2 ]]; then + # Set older version TXT records for older sa-update + /usr/local/bin/updateDNS.sh 0.4.3.updates TXT ${svnrev} + /usr/local/bin/updateDNS.sh 2.3.3.updates TXT ${svnrev} + /usr/local/bin/updateDNS.sh 1.3.3.updates TXT ${svnrev} + /usr/local/bin/updateDNS.sh 0.3.3.updates TXT ${svnrev} + fi + + else + + echo "Recent ruleset from mkupdate-with-scores (massheck) found:" + ls -l $RECENT + echo "" + + fi + + # clean up 4-day-old (and older) update tarballs. This seems as + # good a place as any to do this! + # note: for manual updates, the file permissions should be 0444 so let's clean + # out only 0644 (automatic) updates. a bit of a kluge, but ... + #find $UPDDIR -mtime +4 -perm 0644 -type f -name '*.tar.*' -delete + +} + +# --------------------------------------------------------------------------- + +cycle_logfiles () { + # cycle the logfiles; keep 6 (3 days worth I think) + if [[ -e "$LOGDIR/mkupdates.txt" ]]; then + X=6 + [[ -e "$LOGDIR/mkupdates_${X}.txt" ]] && rm -f $LOGDIR/mkupdates_${X}.txt + while [[ $X -gt 0 ]]; do + ((X--)) + Y=$((X+1)) + [[ -e "$LOGDIR/mkupdates_${X}.txt" ]] && mv -f $LOGDIR/mkupdates_${X}.txt $LOGDIR/mkupdates_${Y}.txt + done + mv -f $LOGDIR/mkupdates.txt $LOGDIR/mkupdates_${Y}.txt + fi +} + +# --------------------------------------------------------------------------- + +[[ -d $UPDDIR ]] || echo "Updates dir '$UPDDIR' not found." 1>&2 +[[ -d $UPDDIR ]] || exit 6 + +set -x + +promote_active_rules + +### Disabled update.tar.gz creation in run_nightly, not sure what the purpose +### was, as mkupdate-with-scores already creates much more thoroughly tested +### tarball - if that failed, probably not a good idea to make one here +### 19.4.2022 -hk +#for VER in $VERSIONS; do +# make_tarball_for_version $VER +#done + +set +x + +ls -l $UPDDIR/GPG.KEY +ls -l $UPDDIR/MIRRORED.BY +ls -ltr $UPDDIR/*.tar.* | tail -20 + +cycle_logfiles + +rm -rf ruleqa.cache.* +exit diff -Nru spamassassin-3.4.6/build/mkupdates/run_part2 spamassassin-4.0.0~rc3/build/mkupdates/run_part2 --- spamassassin-3.4.6/build/mkupdates/run_part2 2017-04-15 08:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/run_part2 1970-01-01 00:00:00.000000000 +0000 @@ -1,237 +0,0 @@ -#!/bin/bash -# -# Continue the updates-building process, post the user approval step. -# Currently this is interactive as it requires a GPG passphrase entry. -# -# usage: sudo -u updatesd /home/updatesd/svn/spamassassin/build/mkupdates/run_part2 -# -# required setup, in /etc/sudoers or /opt/sfw/etc/sudoers: -# updatesd ALL = NOPASSWD: /usr/sbin/rndc reload - -set -x - -cd /home/updatesd/svn/spamassassin - -. /etc/profile -#Switched to system perl on spamassassin-vm box -PERL=/usr/bin/perl -#PERL=/local/perl586/bin/perl - -# download stage, where update tarballs are deposited for downloaders -# -stagedir=/var/www/buildbot.spamassassin.org/updatestage - -# directory where "0.2.3" and other version-specific files live. -# it's assumed that the *real* zone $INCLUDEs files from this dir. -# it must be writable by the user this script runs as. -# -# dev, testing: -# dnsdir=/var/named/updates.dev.spamassassin.org.d -# live: -# dnsdir=/var/named/updates.spamassassin.org.d -# -dnsdir=/var/named/updates.spamassassin.org.d - -# directory where "counter", "soa_line.tmpl", "soa_line" live. -# it's assumed that the *real* zone $INCLUDEs files from this dir. -# it must be writable by the user this script runs as. -# -soadir=/var/named/spamassassin.org.d - -versions="3.4.2" - -# --------------------------------------------------------------------------- -# TODO: if/when this becomes fully automatic, this commit will be superfluous - -echo "Committing promotions in rules/active.list..." -svn commit -m 'promotions validated' rules/active.list - -# --------------------------------------------------------------------------- - -make_tarball_for_version () { - -# to be honest, right now this is unused. -version="$1" - -tmpdir=/home/updatesd/tmp/stage/$version -rm -rf $tmpdir; mkdir -p $tmpdir || exit $? - - - -# extract the new rules files. - -# use "make install" logic, since we want rules as close as possible -# to what's installed -# TODO: this *would* be performed in a checkout of the desired -# version's branch. right now we're only using 1 version though -make clean -$PERL Makefile.PL PREFIX=$tmpdir < /dev/null || exit $? -make || exit $? - -# remove new features, unsupported in existing code in the field -# (TODO: need a better way to exclude files that require new features -# like this; judicious use of "ifplugin" helps) -# rm rules/60_somerandomfeature.cf - -# ensure the basic lint/rule-sanity test suite passes for this ruleset -# before we build an update from it. useful particularly to catch -# "tflags nopublish" leakage (bug 6297) -make test \ - TEST_FILES="t/basic_lint.t t/basic_lint_without_sandbox.t t/basic_meta.t" \ - || exit $? - -# remove the rules files for rules we won't be shipping -rm rules/70_sandbox.cf rules/70_inactive.cf - -# double check we still lint without those 2 files -./spamassassin --lint || exit $? - -rulesdir=`pwd`/rules - -( - cd $rulesdir - - # Use this to include plugin .pm files: - # tar cvf - *.cf *.pm || exit $? - - # or this, to ban code from the updates: - tar cvf - *.cf || exit $? - -) | gzip -9 > $tmpdir/update.tgz || exit $? - -# ensure non-empty -[ -s $tmpdir/update.tgz ] || exit 3 - -linttmp=$tmpdir/lintdir -rm -rf $linttmp -mkdir $linttmp -( - cd $linttmp - # check validity of tarball; also extract - gunzip -cd < $tmpdir/update.tgz | tar xf - || exit $? -) - -sitetmp=$tmpdir/sitetmp -rm -rf $sitetmp -mkdir $sitetmp -cp rules/*.pre $sitetmp - -# now, ensure the ruleset (entirely as distributed) lints, also. -# use "-p /dev/null" so any user_prefs data is ignored. -./spamassassin -x --configpath=$linttmp --siteconfigpath=$sitetmp \ - -p /dev/null --lint \ - || exit $? - -# sign and get sums -gpg --batch --homedir /home/updatesd/key \ - -bas $tmpdir/update.tgz || exit $? - -$PERL build/sha1sum.pl $tmpdir/update.tgz > $tmpdir/update.tgz.sha1 || exit $? - - - -# get SVN revision number. -# note: use 'Last Changed Rev' instead of 'Revision'. Because we share -# an SVN repository with other projects, this means that the same -# rev of *our* codebase may appear under multiple rev#s, as other projects -# check their changes in. - -tagstamp=`date "+%Y%m%d%H%M%S"` -tagurl=https://svn.apache.org/repos/asf/spamassassin/tags/sa-update_${version}_${tagstamp} - -# this svn copy is critical, to ensure each version's tarball has a different -# rev#. if you remove it, we need to prefix the version# to the svnrev# in -# the filenames instead so each version doesn't clobber others. -svn up -svn copy -m 'promotions validated' . $tagurl < /dev/null - -# for svn 1.3: -# (svn info --non-interactive $tagurl || svn info $tagurl ) < /dev/null \ - # > $tmpdir/svn 2>&1 || exit $? - -# for crappy zone svn, 1.2: -( - rm -rf tmpcheckout - svn co $tagurl tmpcheckout && svn info tmpcheckout - rm -rf tmpcheckout -) < /dev/null > $tmpdir/svn 2>&1 || exit $? - -svnrev=`(grep 'Last Changed Rev: ' $tmpdir/svn || exit 1) | \ - sed -e 's/^.*: //'` - -if [ "$svnrev" == "" ] ; then - echo "missing SVN revision" - cat $tmpdir/svn - exit 5 -fi - -if [ "$svnrev" -lt 1 ] ; then - echo "bad SVN revision: $svnrev" - cat $tmpdir/svn - exit 5 -fi - -mv $tmpdir/update.tgz $stagedir/$svnrev.tar.gz || exit $? -mv $tmpdir/update.tgz.sha1 $stagedir/$svnrev.tar.gz.sha1 || exit $? -mv $tmpdir/update.tgz.asc $stagedir/$svnrev.tar.gz.asc || exit $? - -chmod 644 $stagedir/$svnrev.* - - - -# next, create the new DNS record.... - -# turn "3.2.0" into "0.2.3" -rvers=`echo "$version" | perl -pe 's/^(\d+)\.(\d+)\.(\d+)$/$3.$2.$1/'` - -dnsfile="$dnsdir/$version" -if echo " -$rvers TXT \"$svnrev\" -" > $dnsfile.new -then - mv $dnsfile.new $dnsfile || exit $? -else - echo "failed to create $dnsfile.new" 1>&2 ; exit 1 -fi - -# increment the zone serial. -./build/mkupdates/tick_zone_serial || exit $? - - -# clean up 4-day-old (and older) update tarballs. This seems as -# good a place as any to do this! -# note: for manual updates, the file permissions should be 0444 so let's clean -# out only 0644 (automatic) updates. a bit of a kluge, but ... -find $stagedir -mtime +4 -perm 0644 -type f -name '*.tar.*' | xargs rm - -} - -# --------------------------------------------------------------------------- - -cycle_logfiles () { -# cycle the logfiles; keep 6 (3 days worth I think) -( - cd /var/www/buildbot.spamassassin.org/updatesd - rm mkupdatespt2_6.txt - mv mkupdatespt2_5.txt mkupdatespt2_6.txt - mv mkupdatespt2_4.txt mkupdatespt2_5.txt - mv mkupdatespt2_3.txt mkupdatespt2_4.txt - mv mkupdatespt2_2.txt mkupdatespt2_3.txt - mv mkupdatespt2_1.txt mkupdatespt2_2.txt - mv mkupdatespt2.txt mkupdatespt2_1.txt -) -} - -# --------------------------------------------------------------------------- - -[ -d $stagedir ] || echo "no stagedir" 1>&2 -[ -d $stagedir ] || exit 6 - -for version in $versions ; do - make_tarball_for_version $version -done - -ls -l $stagedir -cycle_logfiles -exit - diff -Nru spamassassin-3.4.6/build/mkupdates/tick_zone_serial spamassassin-4.0.0~rc3/build/mkupdates/tick_zone_serial --- spamassassin-3.4.6/build/mkupdates/tick_zone_serial 2014-06-15 15:26:13.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/tick_zone_serial 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -#!/bin/bash -# -# Increment the spamassassin.org DNS zone's serial number, and trigger -# a zone update against the DNS server. -# -# usage: sudo -u updatesd /home/updatesd/svn/spamassassin/build/mkupdates/tick_zone_serial -# -# required setup, in /etc/sudoers or /opt/sfw/etc/sudoers: -# updatesd ALL = NOPASSWD: /usr/sbin/rndc reload - -set -x - -[ -d /home/updatesd/svn/spamassassin ] && cd /home/updatesd/svn/spamassassin - - -. /etc/profile -PERL=/local/perl586/bin/perl -export PERL - -# directory where "counter", "soa_line.tmpl", "soa_line" live. -# it's assumed that the *real* zone $INCLUDEs files from this dir. -# it must be writable by the user this script runs as. -# -soadir=/var/named/spamassassin.org.d -if [ "$#" -gt 0 ]; then - soadir="$1" -fi - -umask 002 - -# --------------------------------------------------------------------------- - -# increment the zone serial. we use a counter, with rollover at 100, -# and a datestamp too. - -oldcount=`cat $soadir/counter` - -# avoid issues where oldcount=99 and then we can't do any other updates that -# day. if the old counter was last updated before midnight, reset counter to -# 0. -if perl -e 'use Time::Local; @t=localtime; $mn=timelocal 0,0,0,@t[3..6]; ($mtime) = (stat("'"$soadir"'/counter"))[9]; exit($mn<=$mtime);'; then - oldcount=-1 -fi - -newserial=`perl -e ' - - my $count = (($ARGV[0] + 1) % 100); - my @t = localtime time; - printf "%04d%02d%02d%02d", $t[5]+1900, $t[4]+1, $t[3], $count; - - open (INCR, ">'"$soadir"'/counter") or die "open failed '"$soadir"'"; - print INCR $count,"\n"; close INCR or die "close failed '"$soadir"'"; - -' -- $oldcount` - -soafile=$soadir/soa_line -rm -f $soafile.bak \ - $soafile.new - -touch $soafile # this must exist -if sed -e 's/__SERIAL__/'"$newserial"'/' \ - < $soafile.tmpl > $soafile.new && \ - [ -s $soafile.new ] && \ - mv $soafile $soafile.bak && \ - mv $soafile.new $soafile -then - true -else - [ -f $soafile.bak ] && mv $soafile.bak $soafile - echo "failed to create new $soafile" 1>&2 ; exit 1 -fi - - -# trigger a named reload -sudo rndc reload || exit $? - -exit 0 diff -Nru spamassassin-3.4.6/build/mkupdates/update-rules spamassassin-4.0.0~rc3/build/mkupdates/update-rules --- spamassassin-3.4.6/build/mkupdates/update-rules 2018-12-27 23:46:24.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/update-rules 2018-12-27 23:46:24.000000000 +0000 @@ -54,7 +54,9 @@ rm -f $V.tar.gz* mv /tmp/$V.tar.gz . /local/gnupg-1.4.2/bin/gpg --batch --homedir /home/updatesd/key -bas $V.tar.gz -/local/perl586/bin/perl /home/updatesd/svn/spamassassin/build/sha1sum.pl $V.tar.gz > $V.tar.gz.sha1 +shasum -a 1 $V.tar.gz > $V.tar.gz.sha1 +shasum -a 256 $V.tar.gz > $V.tar.gz.sha256 +shasum -a 512 $V.tar.gz > $V.tar.gz.sha512 chmod 0444 $V.tar.* if [ $VERS = 3.1 ]; then diff -Nru spamassassin-3.4.6/build/mkupdates/update-rules-3.3 spamassassin-4.0.0~rc3/build/mkupdates/update-rules-3.3 --- spamassassin-3.4.6/build/mkupdates/update-rules-3.3 2014-06-15 09:32:44.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/mkupdates/update-rules-3.3 2018-09-02 00:44:43.000000000 +0000 @@ -37,153 +37,123 @@ make_tarball_for_version () { -# to be honest, right now this is unused. -version="$1" + # to be honest, right now this is unused. + version="$1" -tmpdir=/home/updatesd/tmp/stage/$version -rm -rf $tmpdir; mkdir -p $tmpdir || exit $? + tmpdir=/home/updatesd/tmp/stage/$version + rm -rf $tmpdir; mkdir -p $tmpdir || exit $? - - -# extract the new rules files. - -# use "make install" logic, since we want rules as close as possible -# to what's installed -# TODO: this *would* be performed in a checkout of the desired -# version's branch. right now we're only using 1 version though -make clean -$PERL Makefile.PL PREFIX=$tmpdir < /dev/null || exit $? -make || exit $? - -# remove new features, unsupported in existing code in the field -# (TODO: need a better way to exclude files that require new features -# like this; judicious use of "ifplugin" helps) -# rm rules/60_somerandomfeature.cf - -# ensure the basic lint/rule-sanity test suite passes for this ruleset -# before we build an update from it. useful particularly to catch -# "tflags nopublish" leakage (bug 6297) -make test \ + # extract the new rules files. + # use "make install" logic, since we want rules as close as possible + # to what's installed + make clean + $PERL Makefile.PL PREFIX=$tmpdir < /dev/null || exit $? + make || exit $? + + # ensure the basic lint/rule-sanity test suite passes for this ruleset + # before we build an update from it. useful particularly to catch + # "tflags nopublish" leakage (bug 6297) + make test \ TEST_FILES="t/basic_lint.t t/basic_lint_without_sandbox.t t/basic_meta.t" \ || exit $? -# remove the rules files for rules we won't be shipping -rm rules/70_sandbox.cf rules/70_inactive.cf - -# double check we still lint without those 2 files -./spamassassin --lint || exit $? + # remove the rules files for rules we won't be shipping + rm rules/70_sandbox.cf rules/70_inactive.cf -rulesdir=`pwd`/rules + # double check we still lint without those 2 files + ./spamassassin --lint || exit $? -( + rulesdir=`pwd`/rules cd $rulesdir - - # Use this to include plugin .pm files: - # tar cvf - *.cf *.pm || exit $? - - # or this, to ban code from the updates: - tar cvf - *.cf || exit $? - -) | gzip -9 > $tmpdir/update.tgz || exit $? - -# ensure non-empty -[ -s $tmpdir/update.tgz ] || exit 3 - -linttmp=$tmpdir/lintdir -rm -rf $linttmp -mkdir $linttmp -( + tar cvzf $tmpdir/update.tgz *.cf || exit $? + + # ensure non-empty + [ -s $tmpdir/update.tgz ] || exit 3 + + linttmp=$tmpdir/lintdir + rm -rf $linttmp + mkdir $linttmp cd $linttmp # check validity of tarball; also extract gunzip -cd < $tmpdir/update.tgz | tar xf - || exit $? -) - -sitetmp=$tmpdir/sitetmp -rm -rf $sitetmp -mkdir $sitetmp -cp rules/*.pre $sitetmp - -# now, ensure the ruleset (entirely as distributed) lints, also. -# use "-p /dev/null" so any user_prefs data is ignored. -./spamassassin -x --configpath=$linttmp --siteconfigpath=$sitetmp \ - -p /dev/null --lint \ - || exit $? - -# sign and get sums -gpg --batch --homedir /home/updatesd/key \ - -bas $tmpdir/update.tgz || exit $? - -$PERL build/sha1sum.pl $tmpdir/update.tgz > $tmpdir/update.tgz.sha1 || exit $? + sitetmp=$tmpdir/sitetmp + rm -rf $sitetmp + mkdir $sitetmp + cp rules/*.pre $sitetmp + + # now, ensure the ruleset (entirely as distributed) lints, also. + # use "-p /dev/null" so any user_prefs data is ignored. + ./spamassassin -x --configpath=$linttmp --siteconfigpath=$sitetmp \ + -p /dev/null --lint || exit $? + + # sign and get sums + gpg --batch --homedir /home/updatesd/key -bas $tmpdir/update.tgz || exit $? + + shasum -a 1 $tmpdir/update.tgz > $tmpdir/update.tgz.sha1 || exit $? + shasum -a 256 $tmpdir/update.tgz > $tmpdir/update.tgz.sha256 || exit $? + shasum -a 512 $tmpdir/update.tgz > $tmpdir/update.tgz.sha512 || exit $? + + # get SVN revision number. + # note: use 'Last Changed Rev' instead of 'Revision'. Because we share + # an SVN repository with other projects, this means that the same + # rev of *our* codebase may appear under multiple rev#s, as other projects + # check their changes in. + + tagstamp=`date "+%Y%m%d%H%M%S"` + tagurl=https://svn.apache.org/repos/asf/spamassassin/tags/sa-update_${version}_${tagstamp} + + # this svn copy is critical, to ensure each version's tarball has a different + # rev#. if you remove it, we need to prefix the version# to the svnrev# in + # the filenames instead so each version doesn't clobber others. + svn update + svn copy -m "tagging latest update release for $VERS" . $tagurl < /dev/null + + ( + rm -rf tmpcheckout + svn co $tagurl tmpcheckout && svn info tmpcheckout + rm -rf tmpcheckout + ) < /dev/null > $tmpdir/svn 2>&1 || exit $? + + svnrev=`(grep 'Last Changed Rev: ' $tmpdir/svn || exit 1) | sed -e 's/^.*: //'` + + if [ "$svnrev" == "" ] ; then + echo "missing SVN revision" + cat $tmpdir/svn + exit 5 + fi + + if [ "$svnrev" -lt 1 ] ; then + echo "bad SVN revision: $svnrev" + cat $tmpdir/svn + exit 5 + fi + + mv $tmpdir/update.tgz $stagedir/$svnrev.tar.gz || exit $? + mv $tmpdir/update.tgz.sha1 $stagedir/$svnrev.tar.gz.sha1 || exit $? + mv $tmpdir/update.tgz.sha256 $stagedir/$svnrev.tar.gz.sha256 || exit $? + mv $tmpdir/update.tgz.sha512 $stagedir/$svnrev.tar.gz.sha512 || exit $? + mv $tmpdir/update.tgz.asc $stagedir/$svnrev.tar.gz.asc || exit $? + + chmod 644 $stagedir/$svnrev.* + # next, create the new DNS record.... -# get SVN revision number. -# note: use 'Last Changed Rev' instead of 'Revision'. Because we share -# an SVN repository with other projects, this means that the same -# rev of *our* codebase may appear under multiple rev#s, as other projects -# check their changes in. + # turn "3.2.0" into "0.2.3" + rvers=`echo "$version" | perl -pe 's/^(\d+)\.(\d+)\.(\d+)$/$3.$2.$1/'` -tagstamp=`date "+%Y%m%d%H%M%S"` -tagurl=https://svn.apache.org/repos/asf/spamassassin/tags/sa-update_${version}_${tagstamp} - -# this svn copy is critical, to ensure each version's tarball has a different -# rev#. if you remove it, we need to prefix the version# to the svnrev# in -# the filenames instead so each version doesn't clobber others. -svn up -svn copy -m "tagging latest update release for $VERS" . $tagurl < /dev/null - -# for svn 1.3: -# (svn info --non-interactive $tagurl || svn info $tagurl ) < /dev/null \ - # > $tmpdir/svn 2>&1 || exit $? - -# for crappy zone svn, 1.2: -( - rm -rf tmpcheckout - svn co $tagurl tmpcheckout && svn info tmpcheckout - rm -rf tmpcheckout -) < /dev/null > $tmpdir/svn 2>&1 || exit $? - -svnrev=`(grep 'Last Changed Rev: ' $tmpdir/svn || exit 1) | \ - sed -e 's/^.*: //'` - -if [ "$svnrev" == "" ] ; then - echo "missing SVN revision" - cat $tmpdir/svn - exit 5 -fi - -if [ "$svnrev" -lt 1 ] ; then - echo "bad SVN revision: $svnrev" - cat $tmpdir/svn - exit 5 -fi - -mv $tmpdir/update.tgz $stagedir/$svnrev.tar.gz || exit $? -mv $tmpdir/update.tgz.sha1 $stagedir/$svnrev.tar.gz.sha1 || exit $? -mv $tmpdir/update.tgz.asc $stagedir/$svnrev.tar.gz.asc || exit $? - -chmod 644 $stagedir/$svnrev.* - - - -# next, create the new DNS record.... - -# turn "3.2.0" into "0.2.3" -rvers=`echo "$version" | perl -pe 's/^(\d+)\.(\d+)\.(\d+)$/$3.$2.$1/'` - -dnsfile="$dnsdir/$version" -if echo " + dnsfile="$dnsdir/$version" + if echo " $rvers TXT \"$svnrev\" " > $dnsfile.new -then - mv $dnsfile.new $dnsfile || exit $? -else - echo "failed to create $dnsfile.new" 1>&2 ; exit 1 -fi - -# increment the zone serial. -./build/mkupdates/tick_zone_serial || exit $? + then + mv $dnsfile.new $dnsfile || exit $? + else + echo "failed to create $dnsfile.new" 1>&2 ; exit 1 + fi + # increment the zone serial. + ./build/mkupdates/tick_zone_serial || exit $? } # --------------------------------------------------------------------------- diff -Nru spamassassin-3.4.6/build/old/sha1sum.pl spamassassin-4.0.0~rc3/build/old/sha1sum.pl --- spamassassin-3.4.6/build/old/sha1sum.pl 2018-09-01 18:01:46.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/old/sha1sum.pl 2020-08-13 13:19:21.000000000 +0000 @@ -1,8 +1,8 @@ #!/usr/bin/perl BEGIN { - eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } - or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } + eval { require Digest::SHA; Digest::SHA->import(qw(sha1_hex)); 1 } + or do { require Digest::SHA1; Digest::SHA1->import(qw(sha1_hex)) } } $/=undef; diff -Nru spamassassin-3.4.6/build/old/update_devel_rules spamassassin-4.0.0~rc3/build/old/update_devel_rules --- spamassassin-3.4.6/build/old/update_devel_rules 2018-09-01 18:01:46.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/old/update_devel_rules 2018-09-01 18:09:11.000000000 +0000 @@ -13,9 +13,6 @@ mkdir -p $RELDIR DISTNAME=Mail-SpamAssassin-rules - -echo 'Making SpamAssassin'; - make || perl Makefile.PL < /dev/null || exit $? make || exit $? make version.env || exit $? @@ -37,12 +34,10 @@ # rm rules/60_somerandomfeature.cf # and ensure the ruleset lints! -echo 'Linting the rules...' ./spamassassin --lint || exit $? rulesdir=rules -echo 'Tarring the rules...' ( cd $rulesdir @@ -54,12 +49,9 @@ ) | gzip -9 > $tmpdir/rules.tgz || exit $? -echo 'Make sure rules file is not empty...' # ensure non-empty [ -s $tmpdir/rules.tgz ] || exit 3 - -echo 'Testing the rules file archive integrity...' linttmp=$tmpdir/lintdir rm -rf $linttmp mkdir $linttmp @@ -76,35 +68,16 @@ # now, ensure the ruleset (entirely as distributed) lints, also. # use "-p /dev/null" so any user_prefs data is ignored. -echo 'Checking the distributed ruleset will lint...' ./spamassassin -x --configpath=$linttmp --siteconfigpath=$sitetmp \ -p /dev/null --lint \ || exit $? # sign and get sums rm -f $tmpdir/rules.*.asc - -#Adding information to run gpg-agent so a non-privileged user can sign - There should be a check to see if this is done -gpg-agent --homedir $HOME/sabuildtools/rulessigningkey --daemon --write-env-file "${HOME}/sabuildtools/rulessigningkey/.gpg-agent-info" - -#for ext in tar.bz2 tar.gz zip ; do -# cp $DISTVNAME.$ext $RELDIR -# -# perl build/sha256sum.pl $DISTVNAME.$ext > $RELDIR/$DISTVNAME.$ext.sha256 || exit $? -# perl build/sha512sum.pl $DISTVNAME.$ext > $RELDIR/$DISTVNAME.$ext.sha512 || exit $? -# -# rm -f $DISTVNAME.$ext.asc* - if [ -d $HOME/sabuildtools/rulessigningkey ]; then - gpg --homedir $HOME/sabuildtools/rulessigningkey --detach-sign --sign --armor < $tmpdir/rules.tgz > $tmpdir/rules.tgz.asc || exit $? - #mv $DISTVNAME.$ext.asc $RELDIR/$DISTVNAME.$ext.asc || exit $? - fi - - #rm -f $DISTVNAME.$ext -done - - -#gpg --homedir /home/updatesd/key -bsa - \ -# < $tmpdir/rules.tgz > $tmpdir/rules.tgz.asc || exit $? +ssh updatesd@spamassassin.zones.apache.org \ + . /etc/profile \; \ + gpg --homedir /home/updatesd/key -bsa - \ + < $tmpdir/rules.tgz > $tmpdir/rules.tgz.asc || exit $? ( cd $tmpdir diff -Nru spamassassin-3.4.6/build/README spamassassin-4.0.0~rc3/build/README --- spamassassin-3.4.6/build/README 2019-12-11 22:44:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/README 2022-09-10 12:21:30.000000000 +0000 @@ -1,53 +1,58 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE ===================================== -- First off, checkout the branch or trunk you wish to build. I usually do - this as a privileged user in a build.tmp directory. +This document contains instructions for producing a release of SpamAssassin. +It is intended to provide instructions and a checklist for the release manager. +This document should also be useful to downstream packagers, although they would +ignore all the details here that have to do with specifics of the Apache release process. +The section on setting up a build and test environment might be useful to someone +having dificulty installing SpamAssassin from source on their own machine. + +Setting up a machine for building and testing: + +The release build should not be done on a machine that is already used to run SpamAssassin. +If SpamAssassin is installed system-wide, it has the potential of files from the existing +installation being visible to and interfering with the build or test processes. +Also some of the tests have the potential of interfering with running processes associated +with the system-installed SpamAssassin. + +The safest course of action for an official release buld is to use a (virtual) machine +made specifically for the purpose. Detailed instructions for installing a build environment +can be found on the Apache SpamAssassin wiki at https://cwiki.apache.org/confluence/x/lRKhD + +Release manager code signing: + +If you are producing a release package authorized by the Apache SpamAssassin PMC, you should +have been given a copy of the project's signing keys and the password to use them. +They are in the form of a tar file that you should unpack into a directory named ~/sabuildtools +on the build machine. It contains a bin subdirectory that contains a symlink to /usr/bin/gpg +which should be installed on the machine. The name ~/sabuildtools is hardcoded in the release +packaging scripts, so be sure to place the files there. The packaging scripts will pronpt you +for the password when it signs the final packages. + +The build process: + +To be certain of producing a clean build, begin by creating a new directory and cd to it. + +Checkout trunk from svn at first, even if you are going to build a branch. + +If you are going to build a branch, checkout the branch. Then create the three symlinks to +directories in trunk as exampled below. + + rm -rf ~/build.tmp + mkdir ~/build..tmp + cd ~/build.tmp + svn co https://svn.apache.org/repos/asf/spamassassin/trunk + ## the rest are only done if going to make a branch build instead of from trunk + mkdir branches + cd branches + svn co https://svn.apache.org/repos/asf/spamassassin/branches/3.4 + cd 3.4 + ln -s ../../trunk/rules + ln -s ../../trunk/rulesrc + ln -s ../../trunk/t.rules -- As the release gets close, consider switching to R-T-C development - mode: https://wiki.apache.org/spamassassin/DevelopmentMode - -- Using DNS resolvers like 8.8.8.8 did NOT work. It causes spurious - failures on things like dnsbl.t. Use a real DNS server. - -- To build a release you need gpg, a few perl modules, re2c - and the signing key for the project. For CentOS 7.5, the following worked: - - - yum install perl* - - yum remover perl-homedir - - - using source and CPAN as root - - compiled razor-agents - - cpan install Net::Patricia - - cpan install Geo::IP - - cpan install Devel::SawAmpersand - - custom compiled re2c with ./configure --prefix=/usr/local - - - when you run perl Makefile.PL, you want full dependencies such as this - snippet: - - checking module dependencies and their versions... - checking binary dependencies and their versions... - - dependency check complete... - - optional binary missing or nonfunctional: fetch - - - NOTE: Missing Fetch is ok if we have wget or curl. You just need 1 of - the 3. - - - You need ~/sabuildtools/bin with a symlink to gpg - - - You need ~/sabuildtoosl/sasigningkey with chmod 700 - - - You need the passphrase to the sasigning key - -- Ensure ExtUtils::MakeMaker is version 6.46 or later, to create - a detailed-enough META.yml - - perl -MExtUtils::MakeMaker -e 'print $ExtUtils::MakeMaker::VERSION' - -- Run "svn status" to ensure you're building/releasing from a pristine +Run "svn status" to ensure you're building/releasing from a pristine checkout: cd [checkedoutdir] @@ -62,35 +67,20 @@ (ie., no "M" or "C" files; any files marked "M" have been locally modified, and should be "svn revert"ed before you continue.) -- Rule Source is only in trunk. If you are building a branch, checkout - trunk as well and symlink it, i.e. rulesrc -> ../trunk/rulesrc/ - -- t.rule Source is only in trunk. If you are building a branch, checkout - trunk as well and symlink it, i.e. t.rules -> ../trunk/t.rules/ - +- The directories rules, rulesrc, and t.rules are only in trunk because + rule development and publishing are only done from trunk. + The symlinks from a branch checkout allow for the build and test process + to work with the valid copy of rules that are in trunk. Those rules are + not included in the install package that is produced. + - Rules are ONLY published from trunk. Rule development should use plugin and version conditions to make it so one ruleset works on all modern - versions of SA. If you are building a branch, checkout trunk as well and - symlink the rules from trunk, i.e. rules -> ../trunk/rules/ + versions of SA. With the rules in trunk symlinked, you can expect MANIFEST warnings when - running things such as make distclean such as: + running things such as make distcheck such as: - No such file: rules/20_aux_tlds.cf - No such file: rules/active.list - No such file: rules/init.pre - No such file: rules/languages - No such file: rules/local.cf - No such file: rules/regression_tests.cf - No such file: rules/sa-update-pubkey.txt - No such file: rules/user_prefs.template - No such file: rules/v310.pre - No such file: rules/v312.pre - No such file: rules/v320.pre - No such file: rules/v330.pre - No such file: rules/v340.pre - No such file: rules/v341.pre - No such file: rules/v342.pre + No such file: rules/v400.pre NOTE: Don't remove the lines from the MANIFEST though! @@ -112,9 +102,11 @@ Full releases: @EXTRA_VERSION is blank and IS_DEVEL_BUILD is 0. -- Ensure the new version number takes hold: +- Ensure that it builds and that the new version number takes hold: - make clean ; perl Makefile.PL < /dev/null ; make + make clean + perl Makefile.PL < /dev/null + make ENABLE_SSL=yes ./spamassassin -L -t < sample-nonspam.txt | grep X-Spam- Verify that the X-Spam-* headers use the correct version string, @@ -133,6 +125,12 @@ you also did development on the same checkout. Use a fresh checkout when making your builds to avoid this issue. + NOTE: The very old version of SVN that is included with CentOS 7 + produces a different format of log than current versions of SVN. + There is no reason to create the Changes file on a CentOS 7 machine + rather than do the following steps with a newer version of SVN and + commit the Changes file, then check it out on the build machine. + MAKE CERTAIN THIS IS RUN IN THE ROOT OF YOUR CHECKOUT! There are two options here: @@ -158,17 +156,20 @@ 3.4.0 release tag revision. r1676613 is the 3.4.1 release tag revision. - To find the release tag revision, use the tags website, i.e.: + To find the release tag revision, first get the tag name using the tags website, i.e.: https://svn.apache.org/repos/asf/spamassassin/tags/ + or on the command line + svn ls https://svn.apache.org/repos/asf/spamassassin/tags/ | grep release + + then the command (using the actual release tag you want to look up) - NOTE: 3.4.1 is currently on trunk and will be branched to 3.4 because - 3.4 branch was not used. + svn log https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_4_6 -v --stop-on-copy -- Exclude some automated changes from the logs: +- Exclude some automated and rule maintenance changes from the logs: cat Changes | perl -ne ' BEGIN{$/=("-"x72)."\n"} chomp; @ln=split/^/; - next if @ln==3 && $ln[2]=~/^\s*(updated scores for revision.*|promotions validated|auto-generated rules|)\s*$/; + next if @ln==3 && $ln[2]=~/^\s*(updated scores for revision.*|promotions validated|auto-generated rules|[Uu]pdate generated ruleset|)\s*$/; print "@ln$/"' > Changes.tmp - Word wrap the Changes file with something like @@ -184,56 +185,37 @@ With the rules in trunk symlinked, you can expect MANIFEST warnings when running things such as make distclean such as: - No such file: rules/20_aux_tlds.cf - No such file: rules/active.list - No such file: rules/init.pre - No such file: rules/languages - No such file: rules/local.cf - No such file: rules/regression_tests.cf - No such file: rules/sa-update-pubkey.txt - No such file: rules/user_prefs.template - No such file: rules/v310.pre - No such file: rules/v312.pre - No such file: rules/v320.pre - No such file: rules/v330.pre - No such file: rules/v340.pre - No such file: rules/v341.pre - No such file: rules/v342.pre + No such file: rules/v400.pre NOTE: Don't remove the lines from the MANIFEST though! - run "make disttest" to ensure all default tests pass once the - distribution is fully packaged. (this takes ~12 1/2 minutes on my system - 2018-09-01) + distribution is fully packaged. make disttest < /dev/null -- run the release test suite, which forces all tests to run and also - applies an additional, more stringent set of tests. This may require - "sudo" privileges on your test box, and unusual CPAN modules like - "Devel::SawAmpersand", so you might have to skip some of this or ignore - some spurious failures. For example, I don't have re2c or dcc installed - on my devel system so I fail xt/50_dcc & xt/50_sa_compile. - - - Additionally, this will run tests such as the spamd prefork which will - kill all running spamd processes. This release test suite is intended - for a development environment. - - NOTE: These likely must run as root. Some tests prompt for sudo. + The point of disttest is that it creates a subdirectory with only the + files from MANIFEST, so it tests in the same environment as that of + an unpacked distribution tar, without the presence of rules files + that are not in MANIFEST. To get the same testing for the root tests + cd into the Mail-Spamassin* subdirectory that make disttest created and run + sudo make test TEST_FILES="t/spamd_root*" + You can similarly cd into that directory to re-run tests such as dcc.t + that can fail due to temporary problems accessing a remote server. + +- Run the release test suite using the command + xt/run_release_test_suite.sh + + This runs all tests, not just the defaults set in t/config.dist and also + runs an additional, more stringent set of tests. There are some tests that + will still be skipped because they are not yet ready for regular use or are + deprecated for now. See the wiki page on setting up a release environment for + information on how to set up to run the sawampersand test. - make test TEST_FILES="xt/*.t" - - FAILURE NOTES: - - 50_razor2.t - you need to register for razor - and the sample of a bad email may have fallen - out of their database. - - A failure on the xt/ tests does not necessarily block a release. - The xt tests are intended for people rolling an SA release or custom - package. Expect the DCC tests to fail if DCC is not installed, etc. +- Run the tests that require sudo privileges. DO NOT run these on a machine that + runs a production copy of SpamAssassin. + sudo make test TEST_FILES="t/root*.t" - Check in the updated Changes file, and SpamAssassin.pm. @@ -314,7 +296,7 @@ NOTE: link rules, t.rules and rulesrc to a trunk checkout if needed! killall gpg-agent - #THESE ARE NOT NEEDED FOR A TRUNK RELEASE + #THESE THREE ln LINES ARE NOT NEEDED FOR A TRUNK RELEASE ln -s ~/usr/src/Mail-SpamAssassin/trunk/rules ln -s ~/usr/src/Mail-SpamAssassin/trunk/rulesrc ln -s ~/usr/src/Mail-SpamAssassin/trunk/t.rules @@ -323,17 +305,7 @@ NOTE: running gpg-agent with the proper homedir is needed for non-privileged users. -# This step is part of the step above already -# -#- run "./build/repackage_latest_update_rules" package a rule file for -# people who can't run sa-update: -# -# ./build/repackage_latest_update_rules -# -# WARNING: this will use the most recently-created "sa-update" tarball for -# the rules tgz, so if changes have been committed to the "rules" dir in -# SVN since then, they will not be released! -# + The above places files in ~/public_html/devel/ - test the files! redo until they work!! ;) @@ -354,7 +326,7 @@ - Check the README file for any items to change. -- Review the CREDITS to update Committers - http://whimsy.apache.org/ +- Review the CREDITS to update Committers - https://whimsy.apache.org/ can help with this. - Review the CREDITS to update Copyright @@ -368,7 +340,7 @@ development mailing list to make the release. Post the URL, SHA sums, and proposed release announcement mail to the dev list. - http://people.apache.org/~kmcgrail/devel/ qualifies as "discreet". + https://people.apache.org/~kmcgrail/devel/ qualifies as "discreet". Pre-releases and RCs require just lazy consensus -- ie. no objections. @@ -378,14 +350,14 @@ https://dist.apache.org/repos/dist/dev/SpamAssassin - (for a pre or rc release), - upload .tar.gz (not .bz2) tarball to CPAN - at http://pause.cpan.org/: + at https://pause.cpan.org/: https://pause.perl.org/pause/authenquery?ACTION=add_uri See notes below for issues on indexing but the tar should be named in a manner that CPAN will process it as a Developer Release per - http://www.cpan.org/modules/04pause.html#developerreleases + https://www.cpan.org/modules/04pause.html#developerreleases As of 2014-02-05, adding -TRIAL to the filename should work. For example: @@ -487,7 +459,7 @@ make it clear that this is an unofficial "test build" by placing it in your public_html dir: - http://people.apache.org/~kmcgrail/devel/ for example + https://people.apache.org/~kmcgrail/devel/ for example NOTE: It's also feasible that you could publish via SVNPubSub as noted below but using the SVN repository at: @@ -503,10 +475,16 @@ files to https://dist.apache.org/repos/dist/release/spamassassin/ once a release vote passes. + NOTE - Since it takes up to 24 hours for all the mirrors of dist.apache.org + to receive changes, for a full release upload the files immediately + when the 72 hour period for a successful PMC vote has completed, then + you can start preparing the various news and announcements that you can't + commit or send until 24 hours after the upload. + [note: Symlinks may not work on all mirrors even though there may be documentation to the contrary.] - As documented at http://www.apache.org/dev/release.html, SpamAssassin + As documented at https://www.apache.org/dev/release.html, SpamAssassin as of 2014-02-26 publishes tarballs by manipulating the repo on svn. svn co https://dist.apache.org/repos/dist/release/spamassassin/ release @@ -516,7 +494,7 @@ Only the most recent version of each supported release line should be stored. The archives will auto update. - See http://www.apache.org/dev/release#archived. + See https://www.apache.org/dev/release#archived. - Commit - Wait 24 hours before you announce to allow mirrors to update @@ -525,15 +503,29 @@ run, so the old downloads page will stick around for a while before it's safe to do so.) -- (for full release builds) update the main website "downloads.html" and - all the links to downloads.cgi on all the pages in svn: +- (for full release builds) Update the files in build/announcements/$vers.txt + to insert the correct checksums for the files that were uploaded. This directory + is not part of the release tarball, so committing it does not change the hashes. + +- (for full release builds) update the main website "downloads.html" to link to + the new version of download files. This will involve changing the version number + in the download links for the install files, their detached GPG signature and hashes, + and the link to the announcement text. https://svn.apache.org/repos/asf/spamassassin/site - When changing the timestamp in the downloads.cgi link URL, ensure you - use a time 2 hours from now. The ASF websites are synced internally to - the public HTTP servers on a bi-hourly basis, so it may take up to this - long for a file-download link to become valid and not a 404. + Previous versions of this README talked about using a timestamp in the + downloads.cgi links. However the instructions in + https://infra.apache.org/release-download-pages.html#less-than-24hr + say not to do that as a main website link. There is no need for a timestamp + once the mirrors have all updated. Also, if the old version that is obsoleted + by the new release is deleted as we are instructed to do, then not having + updated the website download pages will result in 404 links for all the + mirror sites that have already syncronized. It is probably fine to just wait + a few hours for a number of sites to sync, and then just accept the possibility + that there may be some people who try to download the new release and get a 404 + then try the backup mirror site which will probably be the main one which + will work. - Update the "news.html" and the announcement on the home page. @@ -573,7 +565,7 @@ svn delete -m "updating for new release" $repo/tags/spamassassin_current_release_3.4.x svn copy -m "updating for new release" $repo/tags/spamassassin_release_$vers $repo/tags/spamassassin_current_release_3.4.x -- upload release .tar.gz (not .bz2) tarball to CPAN at http://pause.cpan.org/: +- upload release .tar.gz (not .bz2) tarball to CPAN at https://pause.cpan.org/: https://pause.perl.org/pause/authenquery?ACTION=add_uri @@ -607,7 +599,7 @@ - Add the new version to the Bugzilla versions list: - http://issues.apache.org/SpamAssassin/editversions.cgi?product=Spamassassin&action=add + https://issues.apache.org/SpamAssassin/editversions.cgi?product=Spamassassin&action=add - Add a milestone for the next version to the Bugzilla milestones list: @@ -632,7 +624,7 @@ https://issues.apache.org/SpamAssassin/editmilestones.cgi?product=Spamassassin -- Update http://en.wikipedia.org/wiki/SpamAssassin +- Update https://en.wikipedia.org/wiki/SpamAssassin diff -Nru spamassassin-3.4.6/build/repackage_latest_update_rules spamassassin-4.0.0~rc3/build/repackage_latest_update_rules --- spamassassin-3.4.6/build/repackage_latest_update_rules 2018-09-01 18:01:46.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/repackage_latest_update_rules 2019-06-13 02:00:17.000000000 +0000 @@ -35,7 +35,7 @@ DISTVNAME=$DISTNAME-$VERSION.r$SVNVER DISTVBASE=$DISTNAME-$VERSION -MIRROR="http://bbmass.spamassassin.org/updates" +MIRROR="https://ruleqa.spamassassin.org/updates" echo $SVNVER diff -Nru spamassassin-3.4.6/build/sha256sum.pl spamassassin-4.0.0~rc3/build/sha256sum.pl --- spamassassin-3.4.6/build/sha256sum.pl 2018-09-01 18:01:46.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/sha256sum.pl 2020-08-13 13:19:21.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/perl BEGIN { - require Digest::SHA; import Digest::SHA qw(sha256_hex sha512_hex); + require Digest::SHA; Digest::SHA->import(qw(sha256_hex sha512_hex)); } $/=undef; diff -Nru spamassassin-3.4.6/build/sha512sum.pl spamassassin-4.0.0~rc3/build/sha512sum.pl --- spamassassin-3.4.6/build/sha512sum.pl 2018-09-01 18:01:46.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/sha512sum.pl 2020-08-13 13:19:21.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/perl BEGIN { - require Digest::SHA; import Digest::SHA qw(sha256_hex sha512_hex); + require Digest::SHA; Digest::SHA->import(qw(sha256_hex sha512_hex)); } $/=undef; diff -Nru spamassassin-3.4.6/build/update_stable spamassassin-4.0.0~rc3/build/update_stable --- spamassassin-3.4.6/build/update_stable 2018-09-01 21:23:41.000000000 +0000 +++ spamassassin-4.0.0~rc3/build/update_stable 2019-06-13 02:00:17.000000000 +0000 @@ -6,8 +6,9 @@ MAINDISTVNAME=$DISTVNAME -rm -rf $WEBDIR/doc -tar cf - --exclude='.#*' doc | ( cd $WEBDIR ; tar xf - ) +#I think this was to publish the latest docs on the website +#rm -rf $WEBDIR/doc +#tar cf - --exclude='.#*' doc | ( cd $WEBDIR ; tar xf - ) . build/repackage_latest_update_rules diff -Nru spamassassin-3.4.6/Changes spamassassin-4.0.0~rc3/Changes --- spamassassin-3.4.6/Changes 2021-04-08 11:28:39.000000000 +0000 +++ spamassassin-4.0.0~rc3/Changes 2022-09-22 12:52:26.000000000 +0000 @@ -1,3931 +1,3685 @@ ------------------------------------------------------------------------ -r1888513 | hege | 2021-04-08 10:29:27 +0000 (Thu, 08 Apr 2021) | 2 lines +r1904206 | sidney | 2022-09-22 09:53:19 +0000 (Thu, 22 Sep 2022) | 1 line - Bug 7892 - T_KAM_HTML_FONT_INVALID false positive for " -!important" + Bug 8050 - Fix global_state_dir on Windows +------------------------------------------------------------------------ +r1904201 | sidney | 2022-09-21 20:38:43 +0000 (Wed, 21 Sep 2022) | 1 line + Bug 8043 - Don't try and fail to setgid to drop privs when spamd started +with a supplemental group without privs ------------------------------------------------------------------------ -r1888498 | sidney | 2021-04-08 05:13:34 +0000 (Thu, 08 Apr 2021) | 1 line +r1904166 | billcole | 2022-09-20 12:55:16 +0000 (Tue, 20 Sep 2022) | 1 +line - Update PMC list + adjusting to slight fingerprint change ------------------------------------------------------------------------ -r1888492 | sidney | 2021-04-08 04:01:39 +0000 (Thu, 08 Apr 2021) | 1 line +r1904165 | billcole | 2022-09-20 12:46:28 +0000 (Tue, 20 Sep 2022) | 1 +line - preparing to release 3.4.6-rc1 + adjusting to slight fingerprint change ------------------------------------------------------------------------ -r1888435 | hege | 2021-04-06 13:08:42 +0000 (Tue, 06 Apr 2021) | 2 lines +r1904155 | hege | 2022-09-20 05:19:30 +0000 (Tue, 20 Sep 2022) | 2 lines - Revert Revision 1878575,1878574,1878572 (Bugs 7822, 7822), remove any -traces of undocumented check_cleanup from 3.4, metas do not work -correctly with it. URIDNSBL/HashBL revert to logging only first hit, any -improvements will be in 4.0 only. + Deprecate HeaderEval check_for_unique_subject_id(), +word_is_in_dictionary() functions (Bug 8051) ------------------------------------------------------------------------ -r1888433 | hege | 2021-04-06 13:06:49 +0000 (Tue, 06 Apr 2021) | 2 lines +r1904147 | sidney | 2022-09-19 12:57:56 +0000 (Mon, 19 Sep 2022) | 1 line - Bug 7897 - add test case for meta net-rules + Bug 8045 - Drop privileges for the one-time initialization of plugins at +start of spamd +------------------------------------------------------------------------ +r1904140 | sidney | 2022-09-18 23:52:24 +0000 (Sun, 18 Sep 2022) | 1 line + Bug 8048 - Make default for pyzor and raxor2 fork options 0 on Windows ------------------------------------------------------------------------ -r1888042 | sidney | 2021-03-24 23:49:14 +0000 (Wed, 24 Mar 2021) | 1 line +r1904139 | sidney | 2022-09-18 23:48:01 +0000 (Sun, 18 Sep 2022) | 1 line - post-release of 3.4.5 ready new development version 3.4.6 in case there -is any more development required in this branch + Bug 8047 - work around MSG_DONTWAIT not existing on Windows ------------------------------------------------------------------------ -r1888010 | sidney | 2021-03-24 14:27:23 +0000 (Wed, 24 Mar 2021) | 1 line +r1904059 | hege | 2022-09-14 04:53:19 +0000 (Wed, 14 Sep 2022) | 2 lines + + Trivial debug line typo fix - update 3.4.5 announcement file with actual checksums ------------------------------------------------------------------------ -r1887843 | sidney | 2021-03-20 09:14:03 +0000 (Sat, 20 Mar 2021) | 1 line +r1903986 | sidney | 2022-09-10 20:10:55 +0000 (Sat, 10 Sep 2022) | 1 line - preparing to release 3.4.5 (supersedes r1887620) + 4.0.0-rc2 RELEASED ------------------------------------------------------------------------ -r1887653 | sidney | 2021-03-14 21:37:10 +0000 (Sun, 14 Mar 2021) | 1 line +r1903975 | sidney | 2022-09-10 15:04:50 +0000 (Sat, 10 Sep 2022) | 1 line - preparing to release 3.4.5-rc2 + preparing to release 4.0.0-rc2 ------------------------------------------------------------------------ -r1887620 | sidney | 2021-03-14 08:16:27 +0000 (Sun, 14 Mar 2021) | 1 line +r1903966 | sidney | 2022-09-10 12:21:30 +0000 (Sat, 10 Sep 2022) | 1 line - preparing to release 3.4.5 + Minor edit to release build instructions documentation ------------------------------------------------------------------------ -r1887306 | hege | 2021-03-07 21:56:45 +0000 (Sun, 07 Mar 2021) | 2 lines +r1903962 | sidney | 2022-09-10 11:28:35 +0000 (Sat, 10 Sep 2022) | 1 line - Fix previous commit, need to allow multiple AskDNS hits + Bug 8038 - work around quirk of newer Extutils::MakeMaker on Windows +with dmake +------------------------------------------------------------------------ +r1903921 | sidney | 2022-09-08 03:11:07 +0000 (Thu, 08 Sep 2022) | 1 line + Bug 8040 - Add note to test that has a very rare failure due to race +condition ------------------------------------------------------------------------ -r1887305 | hege | 2021-03-07 21:51:31 +0000 (Sun, 07 Mar 2021) | 2 lines +r1903917 | sidney | 2022-09-07 20:51:34 +0000 (Wed, 07 Sep 2022) | 1 line - AskDNS cleanups and fixes for Bug 7777 & Bug 7875 (Multiple DNS -responses) + Bug 8033 - Add PRAGMA to SQLite test to speed test without unreliable +use of /dev/shm +------------------------------------------------------------------------ +r1903904 | sidney | 2022-09-06 21:31:50 +0000 (Tue, 06 Sep 2022) | 1 line + bug 8036 - set -zsh so ps -C spamd works on linux ------------------------------------------------------------------------ -r1886188 | gbechis | 2021-02-04 08:02:07 +0000 (Thu, 04 Feb 2021) | 3 -lines +r1903878 | sidney | 2022-09-05 10:39:38 +0000 (Mon, 05 Sep 2022) | 1 line - do not consider oleobject1.bin files as bad, - they could also be images + Fix typo in pod doc +------------------------------------------------------------------------ +r1903870 | sidney | 2022-09-05 05:54:46 +0000 (Mon, 05 Sep 2022) | 1 line + bug 8033 - Remove use of /dev/shm to speed up test because that causes +test failure on some machines. Label test as long running ------------------------------------------------------------------------ -r1885637 | kmcgrail | 2021-01-18 05:37:09 +0000 (Mon, 18 Jan 2021) | 1 -line +r1903850 | sidney | 2022-09-03 20:18:01 +0000 (Sat, 03 Sep 2022) | 1 line - preparing to release 3.4.5-rc1 + bug 8039 - Remove no longer used code accidentally left in Makefile.PL ------------------------------------------------------------------------ -r1885636 | kmcgrail | 2021-01-18 05:36:12 +0000 (Mon, 18 Jan 2021) | 1 -line +r1903795 | sidney | 2022-09-01 00:29:49 +0000 (Thu, 01 Sep 2022) | 1 line - adding spam that hits razor for testing + Bug 8034 Fix test failure when Net::DNS::Nameserver is not installed ------------------------------------------------------------------------ -r1885345 | kb | 2021-01-11 02:51:19 +0000 (Mon, 11 Jan 2021) | 1 line +r1903794 | billcole | 2022-08-31 19:37:48 +0000 (Wed, 31 Aug 2022) | 1 +line - BodyEval: plaintext_body_sig_ratio eval rules, bug 7879 + Bug #8037 ------------------------------------------------------------------------ -r1885234 | gbechis | 2021-01-07 07:47:53 +0000 (Thu, 07 Jan 2021) | 2 +r1903782 | gbechis | 2022-08-30 20:42:01 +0000 (Tue, 30 Aug 2022) | 3 lines - pod fixes + Mail::SpamAssassin::SubProcBackChannel is needed + fix bz #8035 ------------------------------------------------------------------------ -r1885233 | gbechis | 2021-01-07 07:31:13 +0000 (Thu, 07 Jan 2021) | 2 -lines +r1903693 | hege | 2022-08-26 06:00:47 +0000 (Fri, 26 Aug 2022) | 2 lines - clarify man page + Bug 8032 - DCC meta failure ------------------------------------------------------------------------ -r1885214 | kb | 2021-01-06 21:08:43 +0000 (Wed, 06 Jan 2021) | 1 line +r1903659 | sidney | 2022-08-24 10:32:02 +0000 (Wed, 24 Aug 2022) | 1 line - plaintext_body_sig_ratio: eval() rules for the (first text/plain MIME -part's) body and signature lengths and ratio + 4.0.0-rc1 RELEASED ------------------------------------------------------------------------ -r1884879 | gbechis | 2020-12-28 15:00:10 +0000 (Mon, 28 Dec 2020) | 2 -lines +r1903655 | sidney | 2022-08-24 09:11:42 +0000 (Wed, 24 Aug 2022) | 1 line + + preparing to release 4.0.0-rc1 +------------------------------------------------------------------------ +r1903650 | sidney | 2022-08-24 02:23:32 +0000 (Wed, 24 Aug 2022) | 1 line - update [meta]cpan url + bug 7981 - Update UPGRADE file for 4.0.0 replease. Re-wrap 4.0.0 +announcements file from 72 to 70 columns +------------------------------------------------------------------------ +r1903649 | sidney | 2022-08-24 01:58:14 +0000 (Wed, 24 Aug 2022) | 1 line + bug 8030 - Have spamd save incoming @INC to pass as -I options when it +does a SIGHUP restart of itself ------------------------------------------------------------------------ -r1884876 | gbechis | 2020-12-28 14:38:35 +0000 (Mon, 28 Dec 2020) | 2 +r1903647 | gbechis | 2022-08-23 21:42:53 +0000 (Tue, 23 Aug 2022) | 2 lines - Mention some changes in 3.4.5 + match more custom uris ------------------------------------------------------------------------ -r1884872 | kmcgrail | 2020-12-28 13:56:49 +0000 (Mon, 28 Dec 2020) | 1 -line +r1903607 | sidney | 2022-08-21 05:14:57 +0000 (Sun, 21 Aug 2022) | 1 line - More MANIFEST cleanup + Correct typo force-mirror -> forcemirror ------------------------------------------------------------------------ -r1884871 | kmcgrail | 2020-12-28 13:51:17 +0000 (Mon, 28 Dec 2020) | 1 -line +r1903603 | sidney | 2022-08-20 23:26:52 +0000 (Sat, 20 Aug 2022) | 1 line - MANIFEST clean-up + Announcement file rewritten for 4.0.0, word wrapped at 72 (Thunderbird's +default for plain text), placeholder for file hashes ------------------------------------------------------------------------ -r1884870 | kmcgrail | 2020-12-28 13:48:59 +0000 (Mon, 28 Dec 2020) | 1 -line +r1903602 | sidney | 2022-08-20 20:17:24 +0000 (Sat, 20 Aug 2022) | 1 line - Fixing Copyright on CREDITS file + bug 6439 - Add new test file from previous commit to MANIFEST ------------------------------------------------------------------------ -r1883660 | gbechis | 2020-11-20 07:33:00 +0000 (Fri, 20 Nov 2020) | 2 -lines - - fix GeoIP open_type call, bz #7871 +r1903595 | sidney | 2022-08-20 11:39:17 +0000 (Sat, 20 Aug 2022) | 1 line + bug 8025 - Add a comment referencing this issue to the fix already +committed ------------------------------------------------------------------------ -r1883643 | gbechis | 2020-11-19 15:37:20 +0000 (Thu, 19 Nov 2020) | 2 -lines - - typo +r1903581 | sidney | 2022-08-20 00:19:41 +0000 (Sat, 20 Aug 2022) | 1 line + bug 8029 - Change tests that use a spamd pid file to make use of the one +already set up in SATest.pm ------------------------------------------------------------------------ -r1883642 | gbechis | 2020-11-19 15:35:33 +0000 (Thu, 19 Nov 2020) | 2 +r1903556 | gbechis | 2022-08-19 08:16:08 +0000 (Fri, 19 Aug 2022) | 2 lines - specify in debug message that not all rule types are compatible + pubish rules ------------------------------------------------------------------------ -r1883069 | gbechis | 2020-11-02 18:14:47 +0000 (Mon, 02 Nov 2020) | 3 -lines - - backport TextCat improvements from trunk - fix bz #7866 +r1903543 | sidney | 2022-08-18 23:36:56 +0000 (Thu, 18 Aug 2022) | 1 line + bug 6439 - Add test case to t/extracttext.t to demonstrate using cat to +handle text disguised as octet/stream ------------------------------------------------------------------------ -r1882297 | gbechis | 2020-10-07 08:28:05 +0000 (Wed, 07 Oct 2020) | 2 -lines - - Missing files from previous commit, bz #7860 +r1903528 | sidney | 2022-08-18 16:49:59 +0000 (Thu, 18 Aug 2022) | 1 line + Add DBD::SQLite min version requirement to some tests that didn't check +for it. Cosmetic correction where it said 1.59 ------------------------------------------------------------------------ -r1882269 | gbechis | 2020-10-06 10:20:40 +0000 (Tue, 06 Oct 2020) | 4 -lines - - Make it possible to run the Spamassassin test suite against the installed - SpamAssassin files (rather than those in the source directory) - bz #7860 +r1903510 | sidney | 2022-08-18 04:32:14 +0000 (Thu, 18 Aug 2022) | 1 line + bug 8028 - Fix tests that failed when run in perl built with +uselongdouble that was not a SpamAssassin bug ------------------------------------------------------------------------ -r1881912 | jhardin | 2020-09-21 18:43:37 +0000 (Mon, 21 Sep 2020) | 1 line +r1903469 | sidney | 2022-08-17 00:01:47 +0000 (Wed, 17 Aug 2022) | 1 line - Bug 7857: merge Revision 1881911 from trunk + bug 8028 - SQLite now handles upsert using same syntax as pgsql, fix an +error message ------------------------------------------------------------------------ -r1881784 | gbechis | 2020-09-17 07:17:40 +0000 (Thu, 17 Sep 2020) | 2 +r1903460 | gbechis | 2022-08-16 13:14:59 +0000 (Tue, 16 Aug 2022) | 2 lines - exit if reallyallowplugin option is not specified + test for some html links ------------------------------------------------------------------------ -r1881066 | billcole | 2020-08-21 19:29:57 +0000 (Fri, 21 Aug 2020) | 1 -line +r1903454 | sidney | 2022-08-16 08:33:56 +0000 (Tue, 16 Aug 2022) | 1 line - Understand deprecated charset=ascii correctly. BZ#7851 + Bug 8002 - Exclude another set of PerlCritic policies found on a CPAN +test machine ------------------------------------------------------------------------ -r1880999 | billcole | 2020-08-19 17:31:48 +0000 (Wed, 19 Aug 2020) | 1 -line +r1903420 | sidney | 2022-08-15 05:06:36 +0000 (Mon, 15 Aug 2022) | 1 line - Fix duplicated-word typos in documentation BZ#7850 + More complete fix for taint than in previous commit, using the code +already in sa_t_init() ------------------------------------------------------------------------ -r1880998 | billcole | 2020-08-19 17:26:15 +0000 (Wed, 19 Aug 2020) | 1 -line +r1903411 | sidney | 2022-08-14 11:22:37 +0000 (Sun, 14 Aug 2022) | 1 line - Add man page generation for sa-check_spamd BZ#7849 + bug 8026 - Update extracttest.t with test data that works with more +versions of tesseract ------------------------------------------------------------------------ -r1879979 | hege | 2020-07-17 05:03:52 +0000 (Fri, 17 Jul 2020) | 2 lines +r1903388 | gbechis | 2022-08-13 09:07:22 +0000 (Sat, 13 Aug 2022) | 2 +lines - Bug 7810 - gmail has an extra dot in rDNS + Google storage cloud abuse rule ------------------------------------------------------------------------ -r1879806 | hege | 2020-07-12 10:18:32 +0000 (Sun, 12 Jul 2020) | 2 lines +r1903383 | sidney | 2022-08-13 00:50:00 +0000 (Sat, 13 Aug 2022) | 1 line - Bug 7817 - Pyzor.pm - Show traceback in log + bug 8025 - Use better untaint pattern for Windows file paths than the +incomplete fix for bug 8010 +------------------------------------------------------------------------ +r1903375 | sidney | 2022-08-12 15:48:45 +0000 (Fri, 12 Aug 2022) | 1 line + bug 7666 - Make declared module dependencies more accurate. Reduce noise +in make_install.t, sa_compile.t on macOS ------------------------------------------------------------------------ -r1879731 | kmcgrail | 2020-07-10 04:18:33 +0000 (Fri, 10 Jul 2020) | 1 -line +r1903374 | sidney | 2022-08-12 15:38:44 +0000 (Fri, 12 Aug 2022) | 1 line - Fixing powered by Apache SpamAssassin logo to the correct version 2.0 + bug 7666 - Fix tests running in taint mode that invoke spamassassin when +PERL5LIB is used to pass in module paths ------------------------------------------------------------------------ -r1879727 | billcole | 2020-07-09 21:59:24 +0000 (Thu, 09 Jul 2020) | 1 +r1903372 | mmartinec | 2022-08-12 14:26:43 +0000 (Fri, 12 Aug 2022) | 1 line - Don't assume versions are simple numbers + AskDNS.pm: documentation clarification ------------------------------------------------------------------------ -r1879726 | billcole | 2020-07-09 20:42:56 +0000 (Thu, 09 Jul 2020) | 1 -line +r1903371 | sidney | 2022-08-12 13:19:19 +0000 (Fri, 12 Aug 2022) | 1 line - Don't treat versions like simple numbers + Fix typo in previous commit ------------------------------------------------------------------------ -r1879700 | hege | 2020-07-09 10:47:48 +0000 (Thu, 09 Jul 2020) | 2 lines +r1903369 | sidney | 2022-08-12 11:19:32 +0000 (Fri, 12 Aug 2022) | 1 line - Backport EnvelopeFrom fixes from trunk (Revision 1844628,1864383) (Bug -7834) + Skip part of test if running in perl linked with too old libdb for this +test's db file +------------------------------------------------------------------------ +r1903365 | sidney | 2022-08-12 02:50:04 +0000 (Fri, 12 Aug 2022) | 1 line + Fix taint error in test when run in shell that sets +/Users/sidney/.bashrc in environment, such as FreeBSD ------------------------------------------------------------------------ -r1879123 | billcole | 2020-06-23 18:20:55 +0000 (Tue, 23 Jun 2020) | 4 +r1903359 | gbechis | 2022-08-11 13:24:23 +0000 (Thu, 11 Aug 2022) | 2 lines - - Fix Bug #7830: non-numeric version comparison. - + avoid a lint warning in named capture code ------------------------------------------------------------------------ -r1879052 | kmcgrail | 2020-06-21 02:48:32 +0000 (Sun, 21 Jun 2020) | 1 -line +r1903351 | hege | 2022-08-11 11:11:13 +0000 (Thu, 11 Aug 2022) | 2 lines + + Test that escaping %{} works - preparing to release 3.4.5-pre1 ------------------------------------------------------------------------ -r1878990 | hege | 2020-06-19 14:11:26 +0000 (Fri, 19 Jun 2020) | 2 lines +r1903347 | hege | 2022-08-11 11:00:08 +0000 (Thu, 11 Aug 2022) | 2 lines - Bug 7828 - uri_detail lacks support for key type "host" + Catch regexp warnings ------------------------------------------------------------------------ -r1878575 | hege | 2020-06-08 05:18:37 +0000 (Mon, 08 Jun 2020) | 2 lines - - Log all URIBL hit domains in report +r1903269 | sidney | 2022-08-07 12:21:13 +0000 (Sun, 07 Aug 2022) | 1 line + reorder checks for whether test can be run to avoid a spurious message +when there is no spamc built ------------------------------------------------------------------------ -r1878574 | hege | 2020-06-08 04:44:27 +0000 (Mon, 08 Jun 2020) | 2 lines +r1903240 | mmartinec | 2022-08-05 14:22:30 +0000 (Fri, 05 Aug 2022) | 1 +line - Bug 7822: HashBL not examining all addresses in a message + util: idn_to_ascii logging to include the affected string +------------------------------------------------------------------------ +r1903224 | sidney | 2022-08-04 11:08:11 +0000 (Thu, 04 Aug 2022) | 1 line + Add defined check for a value that can end up undefined ------------------------------------------------------------------------ -r1878572 | hege | 2020-06-08 04:18:44 +0000 (Mon, 08 Jun 2020) | 2 lines +r1903198 | gbechis | 2022-08-02 15:50:25 +0000 (Tue, 02 Aug 2022) | 2 +lines - Backport check_cleanup callback from trunk for internal use, not -documenting since it will only be in 3.4.5 + fix man page ------------------------------------------------------------------------ -r1878568 | hege | 2020-06-07 16:34:50 +0000 (Sun, 07 Jun 2020) | 2 lines - - Clarify some HashBL docs +r1903194 | sidney | 2022-08-02 10:37:01 +0000 (Tue, 02 Aug 2022) | 1 line + bug 7666 - Fix module dependency checks in Makefile.PL so CPAN tests can +install missing modules and continue running ------------------------------------------------------------------------ -r1878559 | hege | 2020-06-07 10:41:22 +0000 (Sun, 07 Jun 2020) | 2 lines +r1903193 | sidney | 2022-08-02 10:32:07 +0000 (Tue, 02 Aug 2022) | 1 line - Bug 7822: HashBL not examining all addresses in a message + bug 7666 - Fix tests that run spamassassin in taint mode not passing +through PERL5LIB path +------------------------------------------------------------------------ +r1903176 | sidney | 2022-08-02 01:16:56 +0000 (Tue, 02 Aug 2022) | 1 line + Remove unnecessary info line about SQL tests when SQL tests are skipped ------------------------------------------------------------------------ -r1877459 | gbechis | 2020-05-06 22:36:46 +0000 (Wed, 06 May 2020) | 2 -lines +r1903131 | sidney | 2022-07-31 05:02:23 +0000 (Sun, 31 Jul 2022) | 1 line - always pass the rulename to bgsend_and_start_lookup + bug 8020 - Make failed NetAddr::IP dependency not fatal when checking +dependencies +------------------------------------------------------------------------ +r1903087 | sidney | 2022-07-29 04:04:40 +0000 (Fri, 29 Jul 2022) | 1 line + Bug 8002 - Exclude another PerlCritic policy found on a CPAN test +machine, add required modules for test ------------------------------------------------------------------------ -r1877139 | gbechis | 2020-04-28 19:21:04 +0000 (Tue, 28 Apr 2020) | 3 +r1903079 | gbechis | 2022-07-28 16:12:23 +0000 (Thu, 28 Jul 2022) | 3 lines - fix warnings that happens when From: is not a proper email address - bz 7811 + some .xls files are erroneously detected as encrypted, + look for a marker not present on encrypted files ------------------------------------------------------------------------ -r1877124 | gbechis | 2020-04-28 09:50:37 +0000 (Tue, 28 Apr 2020) | 3 -lines +r1903078 | jhardin | 2022-07-28 14:08:07 +0000 (Thu, 28 Jul 2022) | 1 line - fix txrep tags, "_" is not an allowed char in tag names - fixes bz 7749 + Add "page.link" as 2TLD for URIBL checks - e.g.: academia.page.link +------------------------------------------------------------------------ +r1903070 | sidney | 2022-07-28 01:57:22 +0000 (Thu, 28 Jul 2022) | 1 line + Bug 8019 - Fix make_install.t so it can be run using prove -T ------------------------------------------------------------------------ -r1876821 | hege | 2020-04-22 10:00:36 +0000 (Wed, 22 Apr 2020) | 2 lines +r1903063 | mmartinec | 2022-07-27 17:35:40 +0000 (Wed, 27 Jul 2022) | 1 +line - Allow undefined suppl_attrib just in case + fix t/root_spamd_*.t tests, they were expecting an extra blank before +the result message line from spamc +------------------------------------------------------------------------ +r1903061 | mmartinec | 2022-07-27 16:04:02 +0000 (Wed, 27 Jul 2022) | 1 +line + t/perlcritic.pl: remove exemption for Perlsecret "Baby Cart", deal with +the only case of its use in ExtractText.pm (the @{[]} hack is no longer +needed around split() in scalar context since perl5.11, we require 5.14 +in SpamAssassin.pm) ------------------------------------------------------------------------ -r1876795 | hege | 2020-04-21 12:28:07 +0000 (Tue, 21 Apr 2020) | 2 lines +r1903050 | sidney | 2022-07-27 09:20:50 +0000 (Wed, 27 Jul 2022) | 1 line - Add some suppl_attrib debugging + Add test dependencies to ensure that CPAN test bots know about them +------------------------------------------------------------------------ +r1903039 | sidney | 2022-07-26 22:19:21 +0000 (Tue, 26 Jul 2022) | 1 line + bug 8003 - fix path syntax when in Windows to let mkrule tests work ------------------------------------------------------------------------ -r1876780 | gbechis | 2020-04-21 09:20:23 +0000 (Tue, 21 Apr 2020) | 2 -lines +r1903033 | mmartinec | 2022-07-26 18:00:47 +0000 (Tue, 26 Jul 2022) | 1 +line - silence a possible warning + t/perlcritic.pl: remove exemption for Perlsecret Goatse, deal with the +only two cases of its use in MIMEEval.pm, reduce perlcritic verbosity +from 10 to 9 +------------------------------------------------------------------------ +r1903032 | sidney | 2022-07-26 15:50:07 +0000 (Tue, 26 Jul 2022) | 1 line + bug 8003 - fix extra noise in test on Windows platform ------------------------------------------------------------------------ -r1876711 | hege | 2020-04-19 06:25:48 +0000 (Sun, 19 Apr 2020) | 2 lines +r1903030 | mmartinec | 2022-07-26 13:35:35 +0000 (Tue, 26 Jul 2022) | 1 +line - Mention Bug 7803 + perlcritic does not appreciate a !! operator +------------------------------------------------------------------------ +r1903010 | mmartinec | 2022-07-25 15:24:41 +0000 (Mon, 25 Jul 2022) | 1 +line + document ARC, cosmetics/style ------------------------------------------------------------------------ -r1876710 | hege | 2020-04-19 06:18:25 +0000 (Sun, 19 Apr 2020) | 2 lines +r1903009 | mmartinec | 2022-07-25 15:21:20 +0000 (Mon, 25 Jul 2022) | 1 +line - Bug 7809 - unwhitelist broken + MS::Plugin::DKIM : must not treat a selector "0" as missing! (also fixes +warnings: call method "result_detail" on an undefined value) +------------------------------------------------------------------------ +r1902917 | mmartinec | 2022-07-21 18:04:30 +0000 (Thu, 21 Jul 2022) | 1 +line + spelling in doc ------------------------------------------------------------------------ -r1876561 | hege | 2020-04-15 15:03:58 +0000 (Wed, 15 Apr 2020) | 2 lines +r1902916 | mmartinec | 2022-07-21 17:55:37 +0000 (Thu, 21 Jul 2022) | 1 +line - DNSEval cleanups, validate hostnames + documentation: match the list of recognized RR types to a regexp in code +------------------------------------------------------------------------ +r1902912 | mmartinec | 2022-07-21 14:23:36 +0000 (Thu, 21 Jul 2022) | 1 +line + set_tag() documentation small fix ------------------------------------------------------------------------ -r1876556 | hege | 2020-04-15 13:59:34 +0000 (Wed, 15 Apr 2020) | 2 lines +r1902889 | hege | 2022-07-20 19:15:25 +0000 (Wed, 20 Jul 2022) | 2 lines - Bug 7808 - Fix check_rbl_headers with multiple same headers + Bug 8016 - Remove uridnsbl_skip_domain(s) ------------------------------------------------------------------------ -r1876381 | hege | 2020-04-10 20:38:45 +0000 (Fri, 10 Apr 2020) | 2 lines +r1902865 | gbechis | 2022-07-19 21:11:55 +0000 (Tue, 19 Jul 2022) | 2 +lines - Fix header rule parsing + improve check for forged Hotmail headers due to Microsoft changes ------------------------------------------------------------------------ -r1876367 | hege | 2020-04-10 14:49:20 +0000 (Fri, 10 Apr 2020) | 2 lines +r1902838 | gbechis | 2022-07-18 13:07:03 +0000 (Mon, 18 Jul 2022) | 2 +lines - Bug 7750 - _DKIMSELECTOR_ template tag is not substituted, when mail is -not DKIM signed + Google translate is used to obfuscate uris ------------------------------------------------------------------------ -r1876350 | hege | 2020-04-10 08:22:55 +0000 (Fri, 10 Apr 2020) | 2 lines +r1902744 | kb | 2022-07-15 18:09:59 +0000 (Fri, 15 Jul 2022) | 7 lines - Bug 7790 - Allow = character in pyzor_options + Bug 7980, plaintext_body_sig_ratio performance: Replaced the one-shot, +prone + to backtrack signature identifying regex. Now doing a fast single-pass +over + the entire string, using a minimal regex to identify signature +delimiters. ------------------------------------------------------------------------- -r1876348 | hege | 2020-04-10 07:51:51 +0000 (Fri, 10 Apr 2020) | 2 lines + Also ignore decoy markers at the end. - Bug 7803 - SQL schema of userpref table, value too short ------------------------------------------------------------------------ -r1876347 | hege | 2020-04-10 07:47:37 +0000 (Fri, 10 Apr 2020) | 2 lines - - Bug 7807 - t/spamd_ssl.t fails due to small key size +r1902710 | sidney | 2022-07-14 04:24:51 +0000 (Thu, 14 Jul 2022) | 1 line + bug 8015 - Remove test for blocked bitly link. Bitly has no permanent +link to test with ------------------------------------------------------------------------ -r1876346 | hege | 2020-04-10 07:44:37 +0000 (Fri, 10 Apr 2020) | 2 lines +r1902571 | gbechis | 2022-07-08 13:44:54 +0000 (Fri, 08 Jul 2022) | 2 +lines - Bug 7763 - ssl tests must be run as root + use DKIM from $suppl_attrib if available ------------------------------------------------------------------------ -r1876320 | hege | 2020-04-09 12:40:52 +0000 (Thu, 09 Apr 2020) | 2 lines - - Bug 7806 - Tainting through concatenation with $^X does not taint +r1902513 | billcole | 2022-07-06 20:34:44 +0000 (Wed, 06 Jul 2022) | 1 +line + New spam-for-hire seen ------------------------------------------------------------------------ -r1876218 | gbechis | 2020-04-07 08:20:15 +0000 (Tue, 07 Apr 2020) | 2 +r1902486 | gbechis | 2022-07-05 13:43:27 +0000 (Tue, 05 Jul 2022) | 2 lines - match few more received lines + adds proper if can() sub ------------------------------------------------------------------------ -r1875134 | gbechis | 2020-03-12 18:32:40 +0000 (Thu, 12 Mar 2020) | 5 +r1902484 | gbechis | 2022-07-05 13:37:53 +0000 (Tue, 05 Jul 2022) | 3 lines - sync OLEVBMacro plugin with trunk - - check for undef before reading mime part - - add a new rule to check if on the doc file there is an url that - triggers a download to an external malicious file + Checks if SPF checks have been skipped because EnvelopeFrom cannot be +determined, + to be used in meta-rules ------------------------------------------------------------------------ -r1874343 | gbechis | 2020-02-21 23:04:46 +0000 (Fri, 21 Feb 2020) | 4 -lines - - put [raw]body_part_scan_size documentation in the right - section of man page - fix bz 7796 +r1902425 | sidney | 2022-07-03 10:22:54 +0000 (Sun, 03 Jul 2022) | 1 line + bug 8003 - after changes made for other tests, re_base_extraction.t now +works on Windows ------------------------------------------------------------------------ -r1874012 | gbechis | 2020-02-14 10:57:25 +0000 (Fri, 14 Feb 2020) | 2 -lines +r1902424 | sidney | 2022-07-03 09:30:08 +0000 (Sun, 03 Jul 2022) | 1 line - another couple of too chatty info messages converted to dbg + Bug 8003 - mass_check.t requires masscheck which is not written to run +on Windows +------------------------------------------------------------------------ +r1902423 | sidney | 2022-07-03 09:23:00 +0000 (Sun, 03 Jul 2022) | 1 line + Bug 8003 - reuse.t requires masscheck which is not written to run on +Windows ------------------------------------------------------------------------ -r1874010 | gbechis | 2020-02-14 10:35:39 +0000 (Fri, 14 Feb 2020) | 2 +r1902385 | gbechis | 2022-07-01 07:26:04 +0000 (Fri, 01 Jul 2022) | 2 lines - switch a too chatty info into a dbg statement + add ARC rules ------------------------------------------------------------------------ -r1873859 | gbechis | 2020-02-10 14:33:45 +0000 (Mon, 10 Feb 2020) | 2 +r1902301 | gbechis | 2022-06-28 07:28:36 +0000 (Tue, 28 Jun 2022) | 3 lines - one more OLEMacro marker + fix sql schema on MariaDB 10.1 + bz #8012 ------------------------------------------------------------------------ -r1873752 | gbechis | 2020-02-07 18:37:10 +0000 (Fri, 07 Feb 2020) | 2 +r1902276 | gbechis | 2022-06-27 10:01:33 +0000 (Mon, 27 Jun 2022) | 2 lines - sync OLEVBMacro plugin with trunk + unbreak DKIM when $suppl_attrib are used (amavisd-new for example) ------------------------------------------------------------------------ -r1873340 | hege | 2020-01-29 21:38:08 +0000 (Wed, 29 Jan 2020) | 2 lines +r1902245 | jhardin | 2022-06-25 18:30:57 +0000 (Sat, 25 Jun 2022) | 1 line - Clarify mimepart limit + Add exclusion for myimages and myphotos to __URI_TRY_3LD +------------------------------------------------------------------------ +r1902055 | sidney | 2022-06-19 04:48:21 +0000 (Sun, 19 Jun 2022) | 1 line + bug 8003 - Reduce noise of warnings in Windows lock file code to make +some tests practical in Windows ------------------------------------------------------------------------ -r1873200 | hege | 2020-01-27 09:43:17 +0000 (Mon, 27 Jan 2020) | 2 lines +r1902053 | sidney | 2022-06-19 04:10:57 +0000 (Sun, 19 Jun 2022) | 1 line - More DKIM test files for different CRLF/LF cases + bug 8003 - Fix bayesbdb.t not closing db files during test, now works on +Windows +------------------------------------------------------------------------ +r1901958 | sidney | 2022-06-16 03:44:43 +0000 (Thu, 16 Jun 2022) | 1 line + bug 8003 - Remove debugging flag accidentally left in last commit ------------------------------------------------------------------------ -r1873123 | kmcgrail | 2020-01-25 02:49:19 +0000 (Sat, 25 Jan 2020) | 1 -line +r1901956 | sidney | 2022-06-15 23:10:44 +0000 (Wed, 15 Jun 2022) | 1 line - preparing to release 3.4.4 (post rc-1) + bug 8011 - Fix Pyzor and Razor tests and various code that supports them +for use in Windows ------------------------------------------------------------------------ -r1873122 | kmcgrail | 2020-01-25 02:04:07 +0000 (Sat, 25 Jan 2020) | 1 -line +r1901955 | sidney | 2022-06-15 22:57:24 +0000 (Wed, 15 Jun 2022) | 1 line - preparing announcement for 3.4.4 + bug 8010 - remove lines obsoleted by other untaint fixes ------------------------------------------------------------------------ -r1872966 | kmcgrail | 2020-01-19 00:30:44 +0000 (Sun, 19 Jan 2020) | 1 -line +r1901954 | sidney | 2022-06-15 22:53:05 +0000 (Wed, 15 Jun 2022) | 1 line - Preparing to release 3.4.4 + bug 8003 - Skip tests or portions that cannot run in Windows, change +other non-portable things in tests to portable equivalents ------------------------------------------------------------------------ -r1872942 | hege | 2020-01-18 08:44:49 +0000 (Sat, 18 Jan 2020) | 2 lines +r1901953 | sidney | 2022-06-15 22:45:51 +0000 (Wed, 15 Jun 2022) | 1 line - Revert DKIM change from Revision 1864870 (Bug 7785) + bug 8003 - Change ip address used in test from one that Windows is too +strict with +------------------------------------------------------------------------ +r1901952 | sidney | 2022-06-15 22:23:22 +0000 (Wed, 15 Jun 2022) | 1 line + bug 8010 - Fix untaint pattern in File::Find in Windows ------------------------------------------------------------------------ -r1872936 | gbechis | 2020-01-17 23:30:50 +0000 (Fri, 17 Jan 2020) | 2 -lines +r1901951 | sidney | 2022-06-15 21:57:36 +0000 (Wed, 15 Jun 2022) | 1 line - catch some more Microsoft Office encrypted documents + bug 8003 - disable these tests i Windows since umask is a no-op there +------------------------------------------------------------------------ +r1901899 | sidney | 2022-06-14 09:15:28 +0000 (Tue, 14 Jun 2022) | 1 line + Bug 8009 - Delete anti-pattern that matches when some optional modules +are missing, and not real errors ------------------------------------------------------------------------ -r1872935 | gbechis | 2020-01-17 23:24:35 +0000 (Fri, 17 Jan 2020) | 2 -lines +r1901887 | billcole | 2022-06-13 18:26:12 +0000 (Mon, 13 Jun 2022) | 1 +line - make SpamAssassin compatible with Perl 5.8.x again + typo in prior comment +------------------------------------------------------------------------ +r1901885 | billcole | 2022-06-13 18:10:09 +0000 (Mon, 13 Jun 2022) | 1 +line + New MID pattern rule, tests very well on private B2B system. ------------------------------------------------------------------------ -r1872912 | gbechis | 2020-01-17 10:31:08 +0000 (Fri, 17 Jan 2020) | 2 +r1901879 | gbechis | 2022-06-13 14:03:50 +0000 (Mon, 13 Jun 2022) | 2 lines - Increase fns_extrachars default value to 50 + mention Authentication-Results header in man page ------------------------------------------------------------------------ -r1872864 | hege | 2020-01-16 07:40:02 +0000 (Thu, 16 Jan 2020) | 2 lines - - Add missing is_admin to (raw)body_part_scan_size +r1901875 | sidney | 2022-06-13 10:09:28 +0000 (Mon, 13 Jun 2022) | 1 line + bug 8007 - POSIX::_exit in forked child on Windows terminates parent, +use exit() instead if on Windows ------------------------------------------------------------------------ -r1872863 | hege | 2020-01-16 07:31:23 +0000 (Thu, 16 Jan 2020) | 2 lines - - Sync CREDITS from trunk +r1901764 | sidney | 2022-06-09 02:12:54 +0000 (Thu, 09 Jun 2022) | 1 line + Bug 8003 - Fix compile time error in Windows in test that is supposed to +be skipped on Windows ------------------------------------------------------------------------ -r1872862 | hege | 2020-01-16 07:17:34 +0000 (Thu, 16 Jan 2020) | 2 lines - - Check priority values +r1901738 | sidney | 2022-06-08 02:26:05 +0000 (Wed, 08 Jun 2022) | 1 line + bug 8005 - sleep() required in test in Windows where select() is needed +in other OS ------------------------------------------------------------------------ -r1872861 | hege | 2020-01-16 07:14:23 +0000 (Thu, 16 Jan 2020) | 2 lines +r1901719 | gbechis | 2022-06-07 08:41:50 +0000 (Tue, 07 Jun 2022) | 3 +lines - Use compiled patterns + Add check_arc_signed() and check_arc_valid() subs to verify ARC +signatures. + bz #7935 ------------------------------------------------------------------------ -r1872800 | kmcgrail | 2020-01-15 02:29:58 +0000 (Wed, 15 Jan 2020) | 1 -line +r1901667 | sidney | 2022-06-05 12:50:11 +0000 (Sun, 05 Jun 2022) | 1 line - FromNameSpoof.pm requires 5.10.1+ so clarifying the docs on 3.4 EOL -branch + Bug 8003 - Fix determining when to skip spamc/spamd tests in Windows ------------------------------------------------------------------------ -r1872785 | hege | 2020-01-14 15:59:37 +0000 (Tue, 14 Jan 2020) | 2 lines +r1901657 | hege | 2022-06-05 08:24:49 +0000 (Sun, 05 Jun 2022) | 2 lines - Improve SUBJ_ALL_CAPS + Fix revision 1901651 ------------------------------------------------------------------------ -r1872772 | hege | 2020-01-14 11:55:35 +0000 (Tue, 14 Jan 2020) | 2 lines +r1901656 | hege | 2022-06-05 08:03:13 +0000 (Sun, 05 Jun 2022) | 2 lines - Fix nosubject and maxhits tflags when sa-compile is used + Remove superfluous return ------------------------------------------------------------------------ -r1872755 | hege | 2020-01-14 06:12:47 +0000 (Tue, 14 Jan 2020) | 2 lines - - Fix debug test +r1901651 | sidney | 2022-06-05 03:43:52 +0000 (Sun, 05 Jun 2022) | 1 line + bug 8003 - skip tests that fail in Windows that need further +investigation to determine if they can be fixed ------------------------------------------------------------------------ -r1871709 | hege | 2019-12-17 21:42:32 +0000 (Tue, 17 Dec 2019) | 2 lines - - Don't canonicalize stuff like #abcdef ?foobar /image.gif as http:// +r1901649 | sidney | 2022-06-05 02:41:19 +0000 (Sun, 05 Jun 2022) | 1 line + bug 8003 - Remove check for sudo when in Windows ------------------------------------------------------------------------ -r1871708 | hege | 2019-12-17 20:40:03 +0000 (Tue, 17 Dec 2019) | 2 lines +r1901581 | hege | 2022-06-03 05:46:32 +0000 (Fri, 03 Jun 2022) | 2 lines - Bug 7776 - Limit Bayes parsed token count + Minor got_hit/rule_ready cleanups (Bug 7999) ------------------------------------------------------------------------ -r1871698 | hege | 2019-12-17 14:28:28 +0000 (Tue, 17 Dec 2019) | 2 lines +r1901580 | hege | 2022-06-03 05:46:17 +0000 (Fri, 03 Jun 2022) | 2 lines - Trim whitespace properly + Add missing semicolon, cosmetic ------------------------------------------------------------------------ -r1871697 | hege | 2019-12-17 14:10:37 +0000 (Tue, 17 Dec 2019) | 2 lines +r1901579 | hege | 2022-06-03 05:12:35 +0000 (Fri, 03 Jun 2022) | 2 lines - Bug 7778 - T_KAM_HTML_FONT_INVALID false positive for "inherit" + Minor rule_ready optimization ------------------------------------------------------------------------ -r1871204 | kmcgrail | 2019-12-11 22:44:50 +0000 (Wed, 11 Dec 2019) | 1 -line +r1901578 | hege | 2022-06-03 05:02:42 +0000 (Fri, 03 Jun 2022) | 2 lines - more tweaks to build process for clarity and syncing 3.4 and trunk ------------------------------------------------------------------------- -r1871200 | kmcgrail | 2019-12-11 22:06:34 +0000 (Wed, 11 Dec 2019) | 1 -line + Clean up plugin, don't call unnecessary got_hit() (Bug 7999) - Updating Build Docs to be clearer ------------------------------------------------------------------------ -r1871194 | kmcgrail | 2019-12-11 21:17:29 +0000 (Wed, 11 Dec 2019) | 1 -line +r1901577 | hege | 2022-06-03 04:59:29 +0000 (Fri, 03 Jun 2022) | 2 lines - 3.4.3 RELEASED ------------------------------------------------------------------------- -r1871193 | kmcgrail | 2019-12-11 21:14:24 +0000 (Wed, 11 Dec 2019) | 1 -line + Check lint_rules correctly - Fixing copyright on CREDITS ------------------------------------------------------------------------ -r1871192 | kmcgrail | 2019-12-11 21:08:12 +0000 (Wed, 11 Dec 2019) | 1 -line +r1901573 | sidney | 2022-06-02 22:41:38 +0000 (Thu, 02 Jun 2022) | 1 line - final 3.4.3 announcement with new hashes + bug 8003 - Untaint PATH in Windows ------------------------------------------------------------------------ -r1871189 | kmcgrail | 2019-12-11 20:53:22 +0000 (Wed, 11 Dec 2019) | 1 -line +r1901534 | hege | 2022-06-02 05:40:27 +0000 (Thu, 02 Jun 2022) | 2 lines - Preparing to release 3.4.3 with a few small updates ------------------------------------------------------------------------- -r1871188 | kmcgrail | 2019-12-11 20:45:11 +0000 (Wed, 11 Dec 2019) | 1 -line + Bug 8003 - Many test failures in Windows due to various platform +dependent things - update of the announcement text prepping for 3.4.3 release ------------------------------------------------------------------------ -r1871122 | hege | 2019-12-10 07:53:03 +0000 (Tue, 10 Dec 2019) | 2 lines +r1901533 | hege | 2022-06-02 05:32:04 +0000 (Thu, 02 Jun 2022) | 2 lines - Some missing OLEMacro -> OLEVBMacro renames + Use find_executable_in_env_path for better Windows support, clean up code ------------------------------------------------------------------------ -r1871075 | billcole | 2019-12-09 07:40:37 +0000 (Mon, 09 Dec 2019) | 3 -lines +r1901532 | hege | 2022-06-02 05:31:47 +0000 (Thu, 02 Jun 2022) | 2 lines - Flesh out "Notable changes," and fix some wrapping + find_executable_in_env_path: search .exe files on Windows +------------------------------------------------------------------------ +r1901489 | sidney | 2022-06-01 11:21:27 +0000 (Wed, 01 Jun 2022) | 1 line + Bug 8002 - Exclude more PerlCritic policies that are checked on CPAN +test machines ------------------------------------------------------------------------ -r1871074 | gbechis | 2019-12-09 07:30:42 +0000 (Mon, 09 Dec 2019) | 2 -lines +r1901451 | hege | 2022-05-31 13:32:39 +0000 (Tue, 31 May 2022) | 2 lines - mention _SUBTESTSCOLLAPSED(,)_ template tag + Skip dcc test on windows, I don't think a native cdcc.exe exists ------------------------------------------------------------------------ -r1871035 | gbechis | 2019-12-08 10:12:35 +0000 (Sun, 08 Dec 2019) | 3 -lines +r1901450 | hege | 2022-05-31 13:28:28 +0000 (Tue, 31 May 2022) | 2 lines - Describe changes to DNSEval and HashBL plugins. - Add info about new subjprefix keyword + Bug 8001 - extracttext.t test failure ------------------------------------------------------------------------ -r1870963 | gbechis | 2019-12-07 08:31:50 +0000 (Sat, 07 Dec 2019) | 2 -lines +r1901439 | sidney | 2022-05-31 06:37:39 +0000 (Tue, 31 May 2022) | 1 line - OLEMacro plugin has been renamed to OLEVBMacro + bug 7986 - Cleanup of fix that was in previous commit +------------------------------------------------------------------------ +r1901434 | sidney | 2022-05-31 03:10:28 +0000 (Tue, 31 May 2022) | 1 line + bug 7986 - Fix by using File::Temp::tempdir() for socketpath in tests ------------------------------------------------------------------------ -r1870943 | kmcgrail | 2019-12-07 01:07:41 +0000 (Sat, 07 Dec 2019) | 1 -line +r1901426 | sidney | 2022-05-30 22:49:16 +0000 (Mon, 30 May 2022) | 1 line - 1st pass at 3.4.3 announcement + 4.0.0-pre2 released ------------------------------------------------------------------------ -r1870940 | kmcgrail | 2019-12-06 23:58:14 +0000 (Fri, 06 Dec 2019) | 1 -line +r1901424 | sidney | 2022-05-30 21:27:07 +0000 (Mon, 30 May 2022) | 1 line - preparing to release 3.4.3 + preparing to release 4.0.0-pr2 ------------------------------------------------------------------------ -r1870809 | gbechis | 2019-12-04 07:53:41 +0000 (Wed, 04 Dec 2019) | 2 +r1901421 | gbechis | 2022-05-30 16:15:13 +0000 (Mon, 30 May 2022) | 2 lines - better regexp + spam from freshdesk.com domain has been reported ------------------------------------------------------------------------ -r1870806 | hege | 2019-12-04 07:41:25 +0000 (Wed, 04 Dec 2019) | 2 lines +r1901419 | hege | 2022-05-30 14:12:23 +0000 (Mon, 30 May 2022) | 4 lines - Don't capture $1 for no reason + - hashbl_email_domain_alias + - warn of undefined acl + - lc base32 for better cosmetics ------------------------------------------------------------------------ -r1870805 | gbechis | 2019-12-04 07:36:57 +0000 (Wed, 04 Dec 2019) | 3 -lines +r1901416 | hege | 2022-05-30 12:49:39 +0000 (Mon, 30 May 2022) | 2 lines - change some default values to catch more macros - seen on the wild + Bug 6995 - specify user to fall back for spamd instead of nobody ------------------------------------------------------------------------ -r1870804 | gbechis | 2019-12-04 07:29:19 +0000 (Wed, 04 Dec 2019) | 3 -lines +r1901405 | hege | 2022-05-30 09:21:09 +0000 (Mon, 30 May 2022) | 2 lines - add more rtf markers to catch dangerous ole objects - in rtf files + Document "return undef" for eval-functions ------------------------------------------------------------------------ -r1870554 | hege | 2019-11-28 10:28:21 +0000 (Thu, 28 Nov 2019) | 2 lines +r1901403 | hege | 2022-05-30 08:57:52 +0000 (Mon, 30 May 2022) | 2 lines - AskDNS should use parsed_metadata instead of extract_metadata + Fix eval functions returning unintended "undef" ------------------------------------------------------------------------ -r1870552 | hege | 2019-11-28 10:04:41 +0000 (Thu, 28 Nov 2019) | 2 lines - - Fix LASTEXTERNAL* tag usage affecting askdns and action_depends_on_tags +r1901399 | sidney | 2022-05-30 07:42:02 +0000 (Mon, 30 May 2022) | 1 line + bug 7998 Add two files to make clean that were dropped from distribution +some time ago ------------------------------------------------------------------------ -r1870501 | hege | 2019-11-27 12:35:58 +0000 (Wed, 27 Nov 2019) | 2 lines +r1901397 | hege | 2022-05-30 05:58:31 +0000 (Mon, 30 May 2022) | 2 lines - Fix various Received parsings + Minor cleaning up, ignore disabled metas (score 0), make unrun meta +reporting foolproof ------------------------------------------------------------------------ -r1870497 | hege | 2019-11-27 10:05:04 +0000 (Wed, 27 Nov 2019) | 2 lines - - Bug 5646 - Postfix with set mail_name option doesn't recognize -authentication +r1901378 | sidney | 2022-05-29 04:53:44 +0000 (Sun, 29 May 2022) | 1 line + fix irrelevant spf warning in test case ------------------------------------------------------------------------ -r1870353 | kmcgrail | 2019-11-25 03:18:21 +0000 (Mon, 25 Nov 2019) | 1 -line +r1901358 | sidney | 2022-05-28 15:06:49 +0000 (Sat, 28 May 2022) | 1 line - preparing to release 3.4.3-rc7 + bug 7997 move non-rule settings from 01_test_rules.cf to +01_test_rules.pre ------------------------------------------------------------------------ -r1870344 | kmcgrail | 2019-11-24 20:31:12 +0000 (Sun, 24 Nov 2019) | 1 -line +r1901350 | hege | 2022-05-28 11:45:22 +0000 (Sat, 28 May 2022) | 2 lines + + Revert skipping last priority do_meta_tests, fixes some issues, but +metas still need a bit more tweaking - More polish on the collapsed subtests work ------------------------------------------------------------------------ -r1870343 | gbechis | 2019-11-24 19:41:30 +0000 (Sun, 24 Nov 2019) | 2 -lines +r1901349 | hege | 2022-05-28 11:43:13 +0000 (Sat, 28 May 2022) | 2 lines - fix a warning + Make some tests run with and without extra rules to catch bugs ------------------------------------------------------------------------ -r1870328 | gbechis | 2019-11-24 18:22:17 +0000 (Sun, 24 Nov 2019) | 4 -lines +r1901348 | hege | 2022-05-28 11:36:17 +0000 (Sat, 28 May 2022) | 2 lines - Add a new SUBTESTSCOLLAPSED template tag - with subtests collapsed similar to what printed - in log file + Don't clear any tstprefs() or tstlocalrules() settings with +clear_localrules() ------------------------------------------------------------------------ -r1870083 | gbechis | 2019-11-21 12:00:48 +0000 (Thu, 21 Nov 2019) | 2 -lines +r1901347 | hege | 2022-05-28 11:00:42 +0000 (Sat, 28 May 2022) | 2 lines - put olevbmacro regression tests into MANIFEST file + Fix Unescaped left brace for %{FOO} templates (Bug 7992) ------------------------------------------------------------------------ -r1870058 | gbechis | 2019-11-20 21:16:01 +0000 (Wed, 20 Nov 2019) | 3 -lines +r1901346 | hege | 2022-05-28 10:38:25 +0000 (Sat, 28 May 2022) | 16 lines - prevent a warning from filling logs with packet dumps - useful only for debugging purposes + Test cleanups and fixes. ------------------------------------------------------------------------- -r1870054 | gbechis | 2019-11-20 18:19:42 +0000 (Wed, 20 Nov 2019) | 2 -lines + Note that %patterns has now two exact patterns styles: - OLEVBMacro plugin regression tests + - Literal strings match exactly the string. Whitespace is no longer +ignored + (any leading and trailing whitelist must match), but consecutive + whitespace is normalized: ------------------------------------------------------------------------- -r1869872 | gbechis | 2019-11-15 18:21:16 +0000 (Fri, 15 Nov 2019) | 3 -lines + q{ FOO } => '' + ' FOO ' => '' - silence some warnings if Archive::Zip - is not installed + - Regular expressions, defined with standard qr// operator: ------------------------------------------------------------------------- -r1869855 | gbechis | 2019-11-15 14:45:11 +0000 (Fri, 15 Nov 2019) | 3 -lines + qr/ FOO / => '' - explain better that Archive::Zip and IO::String Perl - modules are needed for OLEVBMacro plugin ------------------------------------------------------------------------ -r1869761 | gbechis | 2019-11-13 17:44:00 +0000 (Wed, 13 Nov 2019) | 3 -lines +r1901345 | hege | 2022-05-28 10:25:23 +0000 (Sat, 28 May 2022) | 2 lines - fix SRS uri parser - bz #6089 + Remove redundant if ------------------------------------------------------------------------ -r1869726 | gbechis | 2019-11-13 08:25:09 +0000 (Wed, 13 Nov 2019) | 2 -lines +r1901344 | hege | 2022-05-28 10:24:55 +0000 (Sat, 28 May 2022) | 2 lines - Add another debug message + Fix tflags multiple handling for full rules ------------------------------------------------------------------------ -r1869721 | hege | 2019-11-13 06:07:03 +0000 (Wed, 13 Nov 2019) | 2 lines - - Fix pod warnings (Bug 7773) +r1901318 | sidney | 2022-05-27 09:59:23 +0000 (Fri, 27 May 2022) | 1 line + Bug 7989 Remove three more references in tests to deleted plugin Esp.pm ------------------------------------------------------------------------ -r1869700 | gbechis | 2019-11-12 14:07:29 +0000 (Tue, 12 Nov 2019) | 2 -lines +r1901311 | hege | 2022-05-27 06:06:52 +0000 (Fri, 27 May 2022) | 2 lines - explain that olemacro_extended_scan is needed to run -check_olemacro_renamed + Enable HashBL plugin by default per devlist discussion ------------------------------------------------------------------------ -r1869683 | gbechis | 2019-11-12 08:47:07 +0000 (Tue, 12 Nov 2019) | 2 +r1901297 | gbechis | 2022-05-26 17:14:35 +0000 (Thu, 26 May 2022) | 2 lines - Add additional debug message + fix cache where CamelCase configuration options are used ------------------------------------------------------------------------ -r1869642 | billcole | 2019-11-11 05:28:07 +0000 (Mon, 11 Nov 2019) | 1 -line +r1901270 | hege | 2022-05-26 06:27:34 +0000 (Thu, 26 May 2022) | 2 lines - Spelling ------------------------------------------------------------------------- -r1869639 | kmcgrail | 2019-11-11 04:09:44 +0000 (Mon, 11 Nov 2019) | 1 -line + user/host/domain options for check_hashbl_emails() and some cleaning up - Fixing misspellings noted in bz7772 ------------------------------------------------------------------------ -r1869595 | kmcgrail | 2019-11-09 06:08:55 +0000 (Sat, 09 Nov 2019) | 1 -line +r1901268 | hege | 2022-05-26 05:24:05 +0000 (Thu, 26 May 2022) | 2 lines + + Use uridnsbl_skip_domains for HashBL lookups - preparing to release 3.4.3-rc6 ------------------------------------------------------------------------ -r1869333 | gbechis | 2019-11-03 15:13:03 +0000 (Sun, 03 Nov 2019) | 2 -lines +r1901255 | hege | 2022-05-25 19:25:54 +0000 (Wed, 25 May 2022) | 2 lines - Rename OLEMacro plugin to OLEVBMacro to be more clear + Why is stuff like USER_IN_DKIM_WHITELIST in sandbox 10_force_active.cf? +Add WELCOME/BLOCK alternatives. Should clean all of non-sandbox rules +away if it's not necessary. ------------------------------------------------------------------------ -r1869331 | gbechis | 2019-11-03 14:59:44 +0000 (Sun, 03 Nov 2019) | 2 -lines +r1901254 | hege | 2022-05-25 19:22:50 +0000 (Wed, 25 May 2022) | 2 lines - sync with trunk, check .xltx files as well + USER_IN_SPF_WELCOMELIST and USER_IN_DKIM_WELCOMELIST ended up in +72_scores.cf as 0.001? Try to fix? ------------------------------------------------------------------------ -r1869065 | gbechis | 2019-10-28 07:21:12 +0000 (Mon, 28 Oct 2019) | 2 -lines +r1901249 | hege | 2022-05-25 15:48:43 +0000 (Wed, 25 May 2022) | 2 lines - Add more info to subjprefix keyword documentation + Make DMARC rules async to properly wait for SPF and DKIM results ------------------------------------------------------------------------ -r1868828 | kmcgrail | 2019-10-24 01:29:33 +0000 (Thu, 24 Oct 2019) | 1 -line +r1901241 | hege | 2022-05-25 13:46:02 +0000 (Wed, 25 May 2022) | 4 lines + + Unify __URL_SHORTENER usage: + - Replace sandbox __URL_SHORTENER with rules/25_url_shortener.cf + - Migrate __PDS_URISHORTENER list into __URL_SHORTENER - preparing to release 3.4.3-rc5 ------------------------------------------------------------------------ -r1868693 | hege | 2019-10-21 10:58:45 +0000 (Mon, 21 Oct 2019) | 2 lines +r1901240 | hege | 2022-05-25 13:36:17 +0000 (Wed, 25 May 2022) | 2 lines - Remove unused unties + Allow "max_short_urls 0" to disable all HTTP requests, enabling usage of +short_url() as a list lookup only. ------------------------------------------------------------------------ -r1868685 | gbechis | 2019-10-21 09:34:51 +0000 (Mon, 21 Oct 2019) | 16 -lines - - Add a new subjprefix keyword. +r1901228 | hege | 2022-05-25 09:57:47 +0000 (Wed, 25 May 2022) | 2 lines - This keyword will add a prefix in emails Subject if a rule is matched. - To enable this option "rewrite_header Subject" config option must be -enabled - as well. + Make sure checks are done in case of strange rule priorities vs +check_dnsbl - The check "if can(Mail::SpamAssassin::Conf::feature_subjprefix)" - should be used to silence warnings in previous SpamAssassin - versions. +------------------------------------------------------------------------ +r1901227 | hege | 2022-05-25 09:46:02 +0000 (Wed, 25 May 2022) | 3 lines - This feature could not work out-of-the box if the glue - software that calls SpamAssassin (MimeDefang, Amavisd-new, ...) - uses the original email instead of the one produced by SA. - Some improvements to those softwares may be needed before enabling - this feature. + - Add short_url_redir() function to check if a valid redirection was +found + - short_url() will result in hit as long as url_shortener matching URL +was found, no HTTP request required (fixes local tests only or missing +LWP module) ------------------------------------------------------------------------ -r1868631 | gbechis | 2019-10-19 15:33:18 +0000 (Sat, 19 Oct 2019) | 2 -lines +r1901166 | hege | 2022-05-23 12:55:35 +0000 (Mon, 23 May 2022) | 2 lines - fix sought header rules generation + Optimize short url parsing ------------------------------------------------------------------------ -r1868412 | hege | 2019-10-13 19:49:26 +0000 (Sun, 13 Oct 2019) | 2 lines +r1901164 | hege | 2022-05-23 12:31:55 +0000 (Mon, 23 May 2022) | 2 lines - Add test for check_rbl() negative subtest + Improve documentation ------------------------------------------------------------------------ -r1867881 | hege | 2019-10-02 10:25:18 +0000 (Wed, 02 Oct 2019) | 2 lines +r1901157 | hege | 2022-05-23 09:20:21 +0000 (Mon, 23 May 2022) | 2 lines - Add uri test for http://foo/ Firefix like rewrite + Add current tinyurl block example. Remove deprecated go.to. ------------------------------------------------------------------------ -r1867230 | hege | 2019-09-20 14:13:18 +0000 (Fri, 20 Sep 2019) | 2 lines +r1901155 | hege | 2022-05-23 09:09:08 +0000 (Mon, 23 May 2022) | 8 lines - Small fix for escaped quotes + DecodeShortURLs: + - Add url_shortener_get (GET requests) + - Add clear_url_shortener + - Add url_shortener_timeout + - Add max_short_url_redirections + - Detect and warn about legacy short_url_tests() usage + - Improve docs and tests ------------------------------------------------------------------------ -r1867225 | hege | 2019-09-20 13:15:30 +0000 (Fri, 20 Sep 2019) | 2 lines +r1901154 | hege | 2022-05-23 08:32:12 +0000 (Mon, 23 May 2022) | 2 lines - Improve :name :addr parser (Bug 7753) + Use $pms->get_uri_list() as do_uri_tests() argument, otherwise any +add_uri_detail_list additions are not available for uri rules. ------------------------------------------------------------------------ -r1867159 | gbechis | 2019-09-19 06:29:14 +0000 (Thu, 19 Sep 2019) | 2 +r1901152 | gbechis | 2022-05-23 08:15:56 +0000 (Mon, 23 May 2022) | 2 lines - better ipv6 regexp + publish btc rbl ------------------------------------------------------------------------ -r1867055 | hege | 2019-09-17 12:35:39 +0000 (Tue, 17 Sep 2019) | 2 lines +r1901136 | hege | 2022-05-23 04:41:50 +0000 (Mon, 23 May 2022) | 2 lines - Use cleaned list for check_hashbl_uris + Update docs ------------------------------------------------------------------------ -r1866389 | hege | 2019-09-04 13:49:07 +0000 (Wed, 04 Sep 2019) | 2 lines +r1901135 | hege | 2022-05-23 04:38:50 +0000 (Mon, 23 May 2022) | 2 lines - Avoid warning: Use of uninitialized value $dom in pattern match (m//) at -.../RegistryBoundaries.pm + Add url_shortener_user_agent (default Chrome) so request is not blocked +by some services ------------------------------------------------------------------------ -r1866203 | hege | 2019-08-31 11:47:09 +0000 (Sat, 31 Aug 2019) | 2 lines +r1901118 | hege | 2022-05-22 09:21:31 +0000 (Sun, 22 May 2022) | 2 lines - Fix DUPMIN back to default 10.. duh. + Improve tests ------------------------------------------------------------------------ -r1866202 | hege | 2019-08-31 11:43:17 +0000 (Sat, 31 Aug 2019) | 2 lines +r1901117 | hege | 2022-05-22 09:21:22 +0000 (Sun, 22 May 2022) | 2 lines - Fix loglevel for duplicate logline suppressor + Add some debug logging for named captures ------------------------------------------------------------------------ -r1866198 | gbechis | 2019-08-31 09:42:33 +0000 (Sat, 31 Aug 2019) | 2 -lines +r1901116 | hege | 2022-05-22 09:20:58 +0000 (Sun, 22 May 2022) | 2 lines - Install v343.pre as well + Forgot to escape capture name in regex ------------------------------------------------------------------------ -r1866181 | kmcgrail | 2019-08-31 04:33:43 +0000 (Sat, 31 Aug 2019) | 1 -line +r1901115 | hege | 2022-05-22 09:13:08 +0000 (Sun, 22 May 2022) | 2 lines + + Fix renamed hash check - preparing to release 3.4.3-rc4 ------------------------------------------------------------------------ -r1866128 | hege | 2019-08-30 07:49:30 +0000 (Fri, 30 Aug 2019) | 2 lines +r1901114 | hege | 2022-05-22 08:44:07 +0000 (Sun, 22 May 2022) | 6 lines - Bug 7747 - Limit checked mime parts + Bug 7992 - Capturing and reusing strings for matching across rules + - Now uses %{TAGNAME} template format for regex matching + - If any regex rule depends on undefined tag, consider the rule unrun + - Allow tag names to contain underscores + - Add documentation ------------------------------------------------------------------------ -r1865616 | hege | 2019-08-21 10:53:07 +0000 (Wed, 21 Aug 2019) | 2 lines +r1901112 | hege | 2022-05-22 08:39:51 +0000 (Sun, 22 May 2022) | 2 lines - Skip more misparsed uri garbage + Clear out some ancient Perl 5.6 checks ------------------------------------------------------------------------ -r1865612 | hege | 2019-08-21 09:19:39 +0000 (Wed, 21 Aug 2019) | 2 lines +r1901096 | hege | 2022-05-21 08:51:57 +0000 (Sat, 21 May 2022) | 3 lines - Improve schemeless uri parser start boundary + - Named capture cleanups, add tests, new PMS/set_captures, +Parser/parse_captures functions (Bug 7992) + - MIMEHeader: support named regex captures, add tflags multiple support, +improve tests ------------------------------------------------------------------------ -r1865609 | hege | 2019-08-21 08:40:41 +0000 (Wed, 21 Aug 2019) | 2 lines +r1901093 | hege | 2022-05-21 06:21:56 +0000 (Sat, 21 May 2022) | 5 lines - Make uri parser find longer uris (up to 2k) which are common these days + Bug 7992 - Capturing and reusing strings for matching across rules + - Check %- right after regex matching, to prevent got_hit or anything +else potentially messing with it in the future + - Save all matches on tflags multiple rules + - Remove duplicate values from matches/tags ------------------------------------------------------------------------ -r1865409 | hege | 2019-08-19 04:19:58 +0000 (Mon, 19 Aug 2019) | 2 lines +r1901085 | gbechis | 2022-05-20 13:52:25 +0000 (Fri, 20 May 2022) | 3 +lines - DNS name max length is actually 253 chars. Quote % for uniformity. + better limit on regexp, it cannot work with longer strings because of dns + labels limits. ------------------------------------------------------------------------ -r1865107 | hege | 2019-08-14 11:35:47 +0000 (Wed, 14 Aug 2019) | 2 lines +r1901082 | hege | 2022-05-20 08:52:33 +0000 (Fri, 20 May 2022) | 2 lines - More uri email parser tweaks + Bug 7994 - Plugin ASN.pm, AskDNS.pm: return early if $pkt is undefined ------------------------------------------------------------------------ -r1865102 | hege | 2019-08-14 09:37:00 +0000 (Wed, 14 Aug 2019) | 2 lines +r1901080 | hege | 2022-05-20 07:59:04 +0000 (Fri, 20 May 2022) | 2 lines - Commit all uri parser changes from trunk to 3.4 + Add missing header rule logging ------------------------------------------------------------------------ -r1865095 | hege | 2019-08-14 08:34:58 +0000 (Wed, 14 Aug 2019) | 2 lines +r1901068 | hege | 2022-05-19 15:48:50 +0000 (Thu, 19 May 2022) | 2 lines - More email uri parser tweaks + Better validation for rulenames ------------------------------------------------------------------------ -r1865086 | hege | 2019-08-14 05:17:00 +0000 (Wed, 14 Aug 2019) | 2 lines +r1901067 | hege | 2022-05-19 15:43:41 +0000 (Thu, 19 May 2022) | 2 lines - Update html render docs + Automatically adjust priority -100 for tflags net rules ------------------------------------------------------------------------ -r1865051 | hege | 2019-08-13 17:09:47 +0000 (Tue, 13 Aug 2019) | 2 lines +r1901063 | hege | 2022-05-19 13:23:35 +0000 (Thu, 19 May 2022) | 2 lines - More uri parser cleanups + Add tflags net ------------------------------------------------------------------------ -r1865044 | hege | 2019-08-13 13:54:37 +0000 (Tue, 13 Aug 2019) | 2 lines +r1901060 | hege | 2022-05-19 09:47:40 +0000 (Thu, 19 May 2022) | 5 lines - Remove accidental /g + Some meta cleanups and optimizations (Bug 7987) + - Use rule_ready() everywhere instead of direct tests_already_hit modify + - Simple tracking of meta dependency hits, run do_meta_tests only when +needed + - Do not run do_meta_tests on last priority, as finish_meta_tests will +run anyway ------------------------------------------------------------------------ -r1865043 | hege | 2019-08-13 13:53:12 +0000 (Tue, 13 Aug 2019) | 2 lines +r1901042 | gbechis | 2022-05-18 17:59:54 +0000 (Wed, 18 May 2022) | 2 +lines - Strip common schemeless skype: email: prefixes from mails + silence a warning ------------------------------------------------------------------------ -r1865041 | gbechis | 2019-08-13 13:41:52 +0000 (Tue, 13 Aug 2019) | 2 -lines +r1901033 | hege | 2022-05-18 12:40:40 +0000 (Wed, 18 May 2022) | 2 lines - improve debug message + HashBL: add check_hashbl_attachments. Improve documentation. ------------------------------------------------------------------------ -r1865039 | hege | 2019-08-13 13:15:38 +0000 (Tue, 13 Aug 2019) | 2 lines +r1900984 | hege | 2022-05-17 07:52:27 +0000 (Tue, 17 May 2022) | 2 lines - Schemeless uri parser improvements + Revert get_async_pending_rules from do_meta_tests one more time. It's +really not needed, as rule_ready() in run_eval_tests is enough. ------------------------------------------------------------------------ -r1865030 | hege | 2019-08-13 11:58:14 +0000 (Tue, 13 Aug 2019) | 2 lines +r1900983 | hege | 2022-05-17 07:48:20 +0000 (Tue, 17 May 2022) | 2 lines - Further email parsing and canonicalizing fixes + Remove outdated comment ------------------------------------------------------------------------ -r1865025 | hege | 2019-08-13 11:09:53 +0000 (Tue, 13 Aug 2019) | 2 lines +r1900981 | hege | 2022-05-17 06:03:11 +0000 (Tue, 17 May 2022) | 2 lines - Ignore schemeless emails without valid tld + Add HashBL things ------------------------------------------------------------------------ -r1865018 | hege | 2019-08-13 09:10:33 +0000 (Tue, 13 Aug 2019) | 2 lines +r1900979 | hege | 2022-05-17 05:58:09 +0000 (Tue, 17 May 2022) | 2 lines - Ignore empty uris from stripped body + Add local($1) just in case ------------------------------------------------------------------------ -r1865015 | hege | 2019-08-13 08:31:18 +0000 (Tue, 13 Aug 2019) | 2 lines +r1900978 | hege | 2022-05-17 05:48:11 +0000 (Tue, 17 May 2022) | 2 lines - Skip invalid cid: "emails" in schemeless parser + Forgot has_hashbl_sha256 ------------------------------------------------------------------------ -r1864941 | hege | 2019-08-12 07:30:28 +0000 (Mon, 12 Aug 2019) | 2 lines +r1900977 | hege | 2022-05-17 05:43:57 +0000 (Tue, 17 May 2022) | 2 lines - Fix duplicate supressor logic to escape duplicated message properly + Add sha256 option to HashBL (Bug 7993) ------------------------------------------------------------------------ -r1864890 | hege | 2019-08-10 16:45:56 +0000 (Sat, 10 Aug 2019) | 2 lines +r1900976 | hege | 2022-05-17 05:40:33 +0000 (Tue, 17 May 2022) | 2 lines - Let URIDNSBL set URIDOMAINS/URIHOSTS tag even if empty + Add very simple Util/base32_encode function for HashBL ------------------------------------------------------------------------ -r1864886 | hege | 2019-08-10 16:08:10 +0000 (Sat, 10 Aug 2019) | 2 lines +r1900974 | hege | 2022-05-17 04:02:38 +0000 (Tue, 17 May 2022) | 5 lines - Fail more gracefully if missing Net::CIDR::Lite + Bug 7987 - DNSEval.pm,HashBL.pm,URILocalBL.pm: unnecessary use of +rule_pending and rule_ready + For backwards compatibility: + - Use rule_ready() in run_eval_tests to allow async even for "return 0" + - Bring back async pending check in do_meta_tests ------------------------------------------------------------------------ -r1864880 | hege | 2019-08-10 15:48:37 +0000 (Sat, 10 Aug 2019) | 2 lines +r1900961 | hege | 2022-05-16 15:51:19 +0000 (Mon, 16 May 2022) | 4 lines - Don't load OLEMacro, floods unnecessary warnings if Archive::Zip not -installed.. + Bug 7987 - DNSEval.pm,HashBL.pm,URILocalBL.pm: unnecessary use of +rule_pending and rule_ready + - Remove $pms->rule_pending(), $pms->{tests_pending} to make things much +simpler + - Async eval-functions must now "return undef" ------------------------------------------------------------------------ -r1864877 | hege | 2019-08-10 15:20:39 +0000 (Sat, 10 Aug 2019) | 2 lines +r1900942 | gbechis | 2022-05-16 07:46:47 +0000 (Mon, 16 May 2022) | 2 +lines - Bug 7729 - body rules to match body only, not including the Subject (new -tflag nosubject) + Remove Esp plugin ------------------------------------------------------------------------ -r1864875 | hege | 2019-08-10 13:22:28 +0000 (Sat, 10 Aug 2019) | 2 lines +r1900932 | hege | 2022-05-15 17:42:47 +0000 (Sun, 15 May 2022) | 2 lines - Improve logic in tflags multiple + Add missing t/data/spam/hashbl ------------------------------------------------------------------------ -r1864870 | hege | 2019-08-10 10:54:28 +0000 (Sat, 10 Aug 2019) | 2 lines +r1900929 | hege | 2022-05-15 16:07:26 +0000 (Sun, 15 May 2022) | 4 lines - Use fixed string for Message::get_pristine(), save lots of memory + - Add options to check_hashbl_tag, ip/ipv4/ipv6/revip/fqdn/tld/trim + - Cleanup HashBL code + - Add basic HashBL tests ------------------------------------------------------------------------ -r1864819 | hege | 2019-08-09 15:43:02 +0000 (Fri, 09 Aug 2019) | 2 lines +r1900928 | hege | 2022-05-15 15:31:51 +0000 (Sun, 15 May 2022) | 2 lines - Fix some tests, test more non-default modules too + Add $current_checkfile variable to get current log output file ------------------------------------------------------------------------ -r1864805 | hege | 2019-08-09 13:57:25 +0000 (Fri, 09 Aug 2019) | 2 lines +r1900927 | hege | 2022-05-15 13:29:53 +0000 (Sun, 15 May 2022) | 2 lines - More Bug 7740 fixes + Skip empty regex captures ------------------------------------------------------------------------ -r1864760 | hege | 2019-08-09 05:55:28 +0000 (Fri, 09 Aug 2019) | 2 lines +r1900917 | hege | 2022-05-15 09:05:12 +0000 (Sun, 15 May 2022) | 2 lines - Fix phishing test + Add check_hashbl_tag eval ------------------------------------------------------------------------ -r1864730 | hege | 2019-08-08 19:34:39 +0000 (Thu, 08 Aug 2019) | 2 lines +r1900911 | hege | 2022-05-15 05:31:19 +0000 (Sun, 15 May 2022) | 2 lines - Fix html tests from bug 7743 changes + Do not check if captured_rules exists, as all values are now potentially +used as tags ------------------------------------------------------------------------ -r1864713 | hege | 2019-08-08 15:14:13 +0000 (Thu, 08 Aug 2019) | 2 lines +r1900910 | hege | 2022-05-15 05:12:44 +0000 (Sun, 15 May 2022) | 3 lines - Update comments too.. + Bug 7992 - Capturing and reusing strings for matching across rules + - Set captured value(s) as a tag ------------------------------------------------------------------------ -r1864712 | hege | 2019-08-08 15:12:20 +0000 (Thu, 08 Aug 2019) | 2 lines +r1900880 | hege | 2022-05-14 12:38:56 +0000 (Sat, 14 May 2022) | 2 lines - Bug 7743 - Remove legacy HTML parsing + No regex capture for header exists: test ------------------------------------------------------------------------ -r1864686 | hege | 2019-08-08 08:11:36 +0000 (Thu, 08 Aug 2019) | 2 lines +r1900879 | hege | 2022-05-14 12:18:41 +0000 (Sat, 14 May 2022) | 2 lines - Bug 7670 - Documentation about rawbody rules should be changed + Bug 7992 - Capturing and reusing strings for matching across rules ------------------------------------------------------------------------ -r1864685 | hege | 2019-08-08 07:28:25 +0000 (Thu, 08 Aug 2019) | 2 lines +r1900876 | gbechis | 2022-05-14 09:36:03 +0000 (Sat, 14 May 2022) | 2 +lines - TMPDIR fix from trunk + fix Esp regression tests, X-MC-User is a 25 chars string ------------------------------------------------------------------------ -r1864621 | hege | 2019-08-07 13:24:20 +0000 (Wed, 07 Aug 2019) | 2 lines +r1900873 | hege | 2022-05-14 06:58:57 +0000 (Sat, 14 May 2022) | 2 lines - Cleanup body_part_scan_size, split_into_array_of_short_paragraphs, chunk -size handling. Rawbody splitting did not even work properly previously, -sometimes outputting huge parts. Added new t/body_str.t test for splits. + Small code cleanup ------------------------------------------------------------------------ -r1864595 | hege | 2019-08-07 06:03:44 +0000 (Wed, 07 Aug 2019) | 2 lines +r1900871 | hege | 2022-05-14 06:30:45 +0000 (Sat, 14 May 2022) | 2 lines - Optimize split_into_array_of_short_paragraphs + Do not leak options when redefining a header test. Add some actual basic +header tests. ------------------------------------------------------------------------ -r1864510 | hege | 2019-08-06 11:24:29 +0000 (Tue, 06 Aug 2019) | 2 lines +r1900857 | gbechis | 2022-05-13 13:27:05 +0000 (Fri, 13 May 2022) | 4 +lines - Sigh, final fix, finish_parsing_end does not have $pms.. + Official ASF channel should be loaded first in + order to be able to override scores by using custom channels + bz #7991 ------------------------------------------------------------------------ -r1864489 | hege | 2019-08-06 10:09:01 +0000 (Tue, 06 Aug 2019) | 2 lines +r1900849 | hege | 2022-05-13 06:06:33 +0000 (Fri, 13 May 2022) | 8 lines - Fix some dns availability checks + - Bug 7987 + - fix body rules considered unrun when using sa-compile + - fix check_rbl_sub rules considered unrun and other DNSEval cleanups + - improve rule_pending/rule_ready/got_hit() logic + - rename $pms->get_pending_lookups to get_async_pending_rules + - other minor async cleanups + - test and documentation improvements ------------------------------------------------------------------------ -r1864461 | hege | 2019-08-06 06:44:42 +0000 (Tue, 06 Aug 2019) | 2 lines +r1900839 | gbechis | 2022-05-12 14:25:12 +0000 (Thu, 12 May 2022) | 2 +lines - Sync FreeMail from trunk + set DMARC_PASS and DMARC_MISSING rules as immutable ------------------------------------------------------------------------ -r1864424 | hege | 2019-08-05 09:26:17 +0000 (Mon, 05 Aug 2019) | 2 lines +r1900834 | hege | 2022-05-12 11:34:54 +0000 (Thu, 12 May 2022) | 2 lines - Add some unicode dot normalizations to uri_list_canonicalize + Limit fixing net rule priorities to -100 ------------------------------------------------------------------------ -r1864418 | hege | 2019-08-05 08:28:40 +0000 (Mon, 05 Aug 2019) | 2 lines +r1900832 | hege | 2022-05-12 09:39:34 +0000 (Thu, 12 May 2022) | 2 lines - Set User-Agent for wget/curl/fetch + Auto adjust priority to -100 ------------------------------------------------------------------------ -r1864417 | hege | 2019-08-05 07:37:08 +0000 (Mon, 05 Aug 2019) | 2 lines +r1900829 | hege | 2022-05-12 09:29:35 +0000 (Thu, 12 May 2022) | 2 lines - Rollback Bug 6802, was buggy and needs some more throught + Cleanup ASN, add support for tag name in check_asn() ------------------------------------------------------------------------ -r1864416 | hege | 2019-08-05 06:47:21 +0000 (Mon, 05 Aug 2019) | 2 lines +r1900813 | hege | 2022-05-11 15:24:34 +0000 (Wed, 11 May 2022) | 2 lines - 5% overall speedup from Check.pm regex //o, add IS_RULENAME constant + Prettier failure pattern logging ------------------------------------------------------------------------ -r1864377 | hege | 2019-08-04 11:43:10 +0000 (Sun, 04 Aug 2019) | 2 lines +r1900812 | hege | 2022-05-11 15:12:25 +0000 (Wed, 11 May 2022) | 2 lines - Better logging of charset decoding warnings, Bug 7520 related + Don't override existing priority unless it's default 0 ------------------------------------------------------------------------ -r1864341 | hege | 2019-08-03 15:08:46 +0000 (Sat, 03 Aug 2019) | 2 lines +r1900811 | hege | 2022-05-11 14:59:25 +0000 (Wed, 11 May 2022) | 2 lines - Bug 7039 - sa-compile notes inability to write in home dir even though -it successfully uses a /tmp dir + Small Shortcircuit cleanup. Mention network lookups at -100 priority. ------------------------------------------------------------------------ -r1864340 | hege | 2019-08-03 14:40:38 +0000 (Sat, 03 Aug 2019) | 2 lines +r1900800 | jhardin | 2022-05-11 03:28:05 +0000 (Wed, 11 May 2022) | 1 line - Fix _URIDOMAINS_ duplicates (Bug 6966) + Add rule for eval +------------------------------------------------------------------------ +r1900798 | sidney | 2022-05-11 01:56:18 +0000 (Wed, 11 May 2022) | 1 line + use prove for the rule tests too for a better release tester experience ------------------------------------------------------------------------ -r1864337 | hege | 2019-08-03 14:10:07 +0000 (Sat, 03 Aug 2019) | 2 lines +r1900796 | sidney | 2022-05-11 00:28:26 +0000 (Wed, 11 May 2022) | 1 line - Remove hashbl sha256 support, since DNS can't hand 64 character label, -duh.. + update script that runs release tests for change in the perlcritic test +------------------------------------------------------------------------ +r1900794 | sidney | 2022-05-10 23:23:31 +0000 (Tue, 10 May 2022) | 1 line + move percritic test code from xt directory which is not in MANIFEST ------------------------------------------------------------------------ -r1864336 | hege | 2019-08-03 13:55:00 +0000 (Sat, 03 Aug 2019) | 12 lines +r1900793 | gbechis | 2022-05-10 23:11:43 +0000 (Tue, 10 May 2022) | 3 +lines + + refactor some code + improvements on Mailup and Sendinblue matches - 3.4 & trunk: - - new Util::is_fqdn_valid() function to validate hostname (DNS name) -format (Bug 7736). To check if a name contains valid TLD, it's still -needed to additionally use RegistryBoundaries::is_domain_valid(). - - uri_list_canonicalize fixes: fragments, logins, ports (strip :80 -:443), firefox like canon http://foobar -> http://www.foobar.com (Bug -6596) - - reduce DNS errors from warn to info +------------------------------------------------------------------------ +r1900789 | hege | 2022-05-10 16:55:26 +0000 (Tue, 10 May 2022) | 2 lines - trunk only: - - new $pms->add_uri_detail_list function - - improve get_uri_detail_list, documentation - - new uri_detail_list types: unlinked, schemeless - - split_domain, trim_domain, is_domain_valid: new $is_ascii arg skips -idn_to_ascii() conversion to save redundant calls - - improve get() :host :domain + Add t/perlcritic.t in MANIFEST ------------------------------------------------------------------------ -r1864328 | hege | 2019-08-03 12:17:37 +0000 (Sat, 03 Aug 2019) | 2 lines +r1900788 | hege | 2022-05-10 16:53:03 +0000 (Tue, 10 May 2022) | 2 lines - Fix dkim test + Add t/perlcritic.t per dev-list discussion ------------------------------------------------------------------------ -r1864157 | hege | 2019-08-01 14:54:18 +0000 (Thu, 01 Aug 2019) | 2 lines +r1900771 | sidney | 2022-05-10 03:31:25 +0000 (Tue, 10 May 2022) | 1 line - Some uri parser enhancements/fixes + corrected fix to perlcritic error +------------------------------------------------------------------------ +r1900770 | sidney | 2022-05-10 03:22:40 +0000 (Tue, 10 May 2022) | 1 line + make a map non-destructive fixes perlcritic error and makes it not +destroy the list ------------------------------------------------------------------------ -r1864152 | hege | 2019-08-01 13:01:43 +0000 (Thu, 01 Aug 2019) | 2 lines +r1900768 | sidney | 2022-05-10 02:19:01 +0000 (Tue, 10 May 2022) | 1 line - Don't croak on empty selector + Updated build/release instructions - some content moved to wiki +------------------------------------------------------------------------ +r1900764 | sidney | 2022-05-10 00:41:11 +0000 (Tue, 10 May 2022) | 1 line + Fix texcat languages filename not defined warning in t/reuse.t test ------------------------------------------------------------------------ -r1864149 | hege | 2019-08-01 12:28:38 +0000 (Thu, 01 Aug 2019) | 2 lines +r1900741 | hege | 2022-05-09 12:52:20 +0000 (Mon, 09 May 2022) | 2 lines - Bug 5971 - M:SA:Conf::get_rule_value('rbl_evals') tries to coerce array -to hash + Remove non-existing check_rbl_results_for eval ------------------------------------------------------------------------ -r1864140 | hege | 2019-08-01 11:15:10 +0000 (Thu, 01 Aug 2019) | 2 lines +r1900740 | hege | 2022-05-09 12:51:18 +0000 (Mon, 09 May 2022) | 2 lines - Recommend Redis for Bayes + Adjust priority of all eval rules.. ------------------------------------------------------------------------ -r1864132 | hege | 2019-08-01 08:33:48 +0000 (Thu, 01 Aug 2019) | 2 lines +r1900738 | hege | 2022-05-09 11:46:21 +0000 (Mon, 09 May 2022) | 2 lines - Bug 6030 - whitelist_bounce_relays documentation enhancement + Automatically adjust check_rbl* rules to -100 for early async launch ------------------------------------------------------------------------ -r1864120 | gbechis | 2019-08-01 07:45:09 +0000 (Thu, 01 Aug 2019) | 2 +r1900732 | gbechis | 2022-05-09 11:08:33 +0000 (Mon, 09 May 2022) | 2 lines - fix sought body rules generation + add "info" sub ------------------------------------------------------------------------ -r1864044 | hege | 2019-07-31 11:11:02 +0000 (Wed, 31 Jul 2019) | 2 lines +r1900725 | hege | 2022-05-09 09:11:43 +0000 (Mon, 09 May 2022) | 2 lines - Fix ignoring @@ in mailto + Improve logging ------------------------------------------------------------------------ -r1864043 | hege | 2019-07-31 10:43:49 +0000 (Wed, 31 Jul 2019) | 2 lines +r1900723 | hege | 2022-05-09 08:33:22 +0000 (Mon, 09 May 2022) | 2 lines - uri_to_domain - ignore cid:, fix mailto: parameter handling + Use $hitsptr for consistency ------------------------------------------------------------------------ -r1864032 | hege | 2019-07-31 05:04:11 +0000 (Wed, 31 Jul 2019) | 2 lines +r1900719 | hege | 2022-05-09 05:27:43 +0000 (Mon, 09 May 2022) | 2 lines - Bug 6233 - What values are valid/recommended for SYMBOLIC_TEST_NAME? + Small code cleanup, improve logging. Ignore $ent->{key} as documented. ------------------------------------------------------------------------ -r1864015 | hege | 2019-07-30 17:46:25 +0000 (Tue, 30 Jul 2019) | 2 lines +r1900688 | hege | 2022-05-08 12:17:21 +0000 (Sun, 08 May 2022) | 2 lines - Bug 5619 - auto-generated spamassassin(1) man page repetition + Improve tests ------------------------------------------------------------------------ -r1864014 | hege | 2019-07-30 17:15:34 +0000 (Tue, 30 Jul 2019) | 2 lines +r1900680 | hege | 2022-05-08 06:40:12 +0000 (Sun, 08 May 2022) | 2 lines - Bug 7383 - auto_whitelist_path from config not used + Improve rule_pending() documentation ------------------------------------------------------------------------ -r1863985 | hege | 2019-07-30 10:10:16 +0000 (Tue, 30 Jul 2019) | 2 lines +r1900678 | hege | 2022-05-08 06:04:55 +0000 (Sun, 08 May 2022) | 2 lines - Fix timers when running spamassassin against a folder of files + Remove redundant $would_log_rules_all check ------------------------------------------------------------------------ -r1863981 | hege | 2019-07-30 07:50:22 +0000 (Tue, 30 Jul 2019) | 2 lines +r1900676 | sidney | 2022-05-08 05:40:03 +0000 (Sun, 08 May 2022) | 8 lines + + bug 7988 Fixes and updates to regression tests + - All tests now use common initialization in SATest.pm + - Use absolute pathname in @INC to fix breakage caused by chdir + - Some wording changes in test warnings + - Revamp xt tests to use one shell script that calls t/*.t and another 3 +test scripts + - Fix problems in saw-ampersand test and update for newer SpamAssassin +code - Bug 5620 - missing item and raw HTML on man pages ------------------------------------------------------------------------ -r1863980 | hege | 2019-07-30 07:28:04 +0000 (Tue, 30 Jul 2019) | 2 lines +r1900675 | hege | 2022-05-08 05:15:50 +0000 (Sun, 08 May 2022) | 2 lines - Update TextCat documentation a bit + Remove outdated/superfluous suggestion to run prove command, all tests +should be run the way general documentation suggests. (Note: "prove -T" +should always be used, if used..) ------------------------------------------------------------------------ -r1863788 | hege | 2019-07-26 09:20:57 +0000 (Fri, 26 Jul 2019) | 2 lines +r1900674 | kmcgrail | 2022-05-08 04:23:09 +0000 (Sun, 08 May 2022) | 1 +line - Bug 6802 - force regex ascii semantics + BZ 7981 working on release UPGRADE and Announcement files in Google Docs +------------------------------------------------------------------------ +r1900670 | sidney | 2022-05-08 00:24:17 +0000 (Sun, 08 May 2022) | 1 line + Add missing declaration and fix an undefined var error uncovered in +testing that it revealed ------------------------------------------------------------------------ -r1863776 | hege | 2019-07-26 07:27:39 +0000 (Fri, 26 Jul 2019) | 2 lines +r1900667 | hege | 2022-05-07 20:34:59 +0000 (Sat, 07 May 2022) | 2 lines - Bug 7741 - Support City database now properly + Add a some more Bug 7735 comments/documentation ------------------------------------------------------------------------ -r1863742 | hege | 2019-07-25 15:56:36 +0000 (Thu, 25 Jul 2019) | 2 lines +r1900666 | hege | 2022-05-07 20:27:28 +0000 (Sat, 07 May 2022) | 2 lines - Revert Bug 7741 + Fix SA breaking typo, sorry ------------------------------------------------------------------------ -r1863531 | hege | 2019-07-21 17:12:07 +0000 (Sun, 21 Jul 2019) | 2 lines +r1900664 | hege | 2022-05-07 19:03:30 +0000 (Sat, 07 May 2022) | 2 lines - Check for GeoIP2 City.mmdb also + Fix comment/documentation ------------------------------------------------------------------------ -r1863527 | hege | 2019-07-21 15:49:38 +0000 (Sun, 21 Jul 2019) | 2 lines +r1900658 | hege | 2022-05-07 14:41:14 +0000 (Sat, 07 May 2022) | 2 lines - Simplify settings tags a bit + Add few more tests ------------------------------------------------------------------------ -r1863526 | hege | 2019-07-21 15:08:35 +0000 (Sun, 21 Jul 2019) | 2 lines +r1900653 | hege | 2022-05-07 14:00:49 +0000 (Sat, 07 May 2022) | 2 lines - Bug 7741 - Invalid database type 0 error when enabling URILocalBL + Add some more tests. Seems NetAddr::IP has some bug handling stuff like +127.0.0.1/31 (I don't think it should match 127.0.0.0). ------------------------------------------------------------------------ -r1863525 | hege | 2019-07-21 13:53:39 +0000 (Sun, 21 Jul 2019) | 2 lines +r1900651 | hege | 2022-05-07 13:16:03 +0000 (Sat, 07 May 2022) | 2 lines - Missed on regex fix, also clarify documentation about case-insensitivity + Installing Net::CIDR::Lite allows to use dash separated IP range format +(e.g. 192.168.1.1-192.168.255.255) for NetSet tables (internal_networks, +trusted_networks, msa_networks, uri_local_cidr) ------------------------------------------------------------------------ -r1863524 | hege | 2019-07-21 13:48:27 +0000 (Sun, 21 Jul 2019) | 2 lines +r1900648 | hege | 2022-05-07 09:21:33 +0000 (Sat, 07 May 2022) | 2 lines - Bug 7740 - Cannot set OLEMacro regex options, and other small regex -cleanups + No point mapping bayes_ignore_header constantly from array to lc hash, +just make it lc hash from the start. Also make it more standards +conforming, no point having differently named hash from the command. ------------------------------------------------------------------------ -r1862889 | hege | 2019-07-10 17:10:34 +0000 (Wed, 10 Jul 2019) | 2 lines +r1900646 | hege | 2022-05-07 08:13:29 +0000 (Sat, 07 May 2022) | 2 lines - HTML_FONT_FACE_BAD fixes from Bug 5956, 7312 + More DKIM-Signature like headers to "mark presence only" ------------------------------------------------------------------------ -r1862748 | hege | 2019-07-08 13:32:37 +0000 (Mon, 08 Jul 2019) | 2 lines +r1900642 | hege | 2022-05-07 06:01:02 +0000 (Sat, 07 May 2022) | 2 lines - Add Bug 7725 fix to AskDNS too + Remove superfluous version check, it's not possible to be false ------------------------------------------------------------------------ -r1862718 | hege | 2019-07-08 07:30:39 +0000 (Mon, 08 Jul 2019) | 2 lines +r1900630 | hege | 2022-05-06 15:03:13 +0000 (Fri, 06 May 2022) | 2 lines - Add some has_* features just in case + Use primary key for MySQL bayes_expire to make it potentially Galera +compatible ------------------------------------------------------------------------ -r1862690 | hege | 2019-07-07 11:25:00 +0000 (Sun, 07 Jul 2019) | 2 lines +r1900622 | gbechis | 2022-05-06 10:45:31 +0000 (Fri, 06 May 2022) | 2 +lines - Add HashBL changes + better match on X-Mailer ------------------------------------------------------------------------ -r1862689 | hege | 2019-07-07 11:12:36 +0000 (Sun, 07 Jul 2019) | 2 lines +r1900614 | hege | 2022-05-06 05:53:16 +0000 (Fri, 06 May 2022) | 2 lines - Clarify documentation + Make if logic a little more straightforward ------------------------------------------------------------------------ -r1862686 | hege | 2019-07-07 10:53:50 +0000 (Sun, 07 Jul 2019) | 2 lines +r1900613 | hege | 2022-05-06 05:40:14 +0000 (Fri, 06 May 2022) | 2 lines - Add missing register_async_rule_finish + Act as soon as DKIMDOMAIN is ready ------------------------------------------------------------------------ -r1862685 | hege | 2019-07-07 10:50:05 +0000 (Sun, 07 Jul 2019) | 2 lines +r1900607 | hege | 2022-05-06 04:14:21 +0000 (Fri, 06 May 2022) | 2 lines - Sync with trunk version (check_hashbl_uris, hashbl_ignore), use -compile_regexp, fix max=x truncating, logging cleanup + Only mark rule_pending when needed ------------------------------------------------------------------------ -r1862683 | hege | 2019-07-07 09:44:35 +0000 (Sun, 07 Jul 2019) | 2 lines +r1900599 | hege | 2022-05-05 17:58:25 +0000 (Thu, 05 May 2022) | 2 lines - Few more parameter whitespace fixes + Ok fix properly. Apparently checkfile() is only for saving filenames +when error (Output can be examined in..). Fix the path. ------------------------------------------------------------------------ -r1862682 | hege | 2019-07-07 09:34:49 +0000 (Sun, 07 Jul 2019) | 2 lines +r1900597 | hege | 2022-05-05 17:48:29 +0000 (Thu, 05 May 2022) | 2 lines - Few more parameter whitespace fixes + Fix spurious cannot open mkrules_else.0 warnings ------------------------------------------------------------------------ -r1862681 | hege | 2019-07-07 09:31:49 +0000 (Sun, 07 Jul 2019) | 2 lines +r1900596 | hege | 2022-05-05 17:39:36 +0000 (Thu, 05 May 2022) | 2 lines - Tighten up addrlist parameter checks + Fix HAVE_ZLIB ------------------------------------------------------------------------ -r1862678 | hege | 2019-07-07 08:13:38 +0000 (Sun, 07 Jul 2019) | 2 lines +r1900595 | hege | 2022-05-05 17:31:13 +0000 (Thu, 05 May 2022) | 2 lines - Fix regex case sensitive + Fix: "my" variable $dbh masks earlier declaration in same scope ------------------------------------------------------------------------ -r1862625 | gbechis | 2019-07-05 17:40:10 +0000 (Fri, 05 Jul 2019) | 2 -lines +r1900594 | hege | 2022-05-05 17:31:00 +0000 (Thu, 05 May 2022) | 2 lines - sync dependencies check with reality + Fix: Name "main::libidn_done" used only once: possible typo ------------------------------------------------------------------------ -r1862624 | gbechis | 2019-07-05 17:26:47 +0000 (Fri, 05 Jul 2019) | 3 -lines - - Add OLEMacro plugin to 3.4.3 and rename rules/v*.pre - accordingly +r1900586 | sidney | 2022-05-05 13:15:00 +0000 (Thu, 05 May 2022) | 1 line + bug 7986 Partial fix lets tests run when directory path up to 80 long. +Use workdir, remove now obsolete mk_safe_tmpdir() ------------------------------------------------------------------------ -r1862622 | hege | 2019-07-05 16:33:55 +0000 (Fri, 05 Jul 2019) | 2 lines +r1900583 | sidney | 2022-05-05 12:16:01 +0000 (Thu, 05 May 2022) | 1 line - Small X-Relay-Countries-Auth documentation add + 4.0.0-pre1 released +------------------------------------------------------------------------ +r1900572 | sidney | 2022-05-05 02:46:37 +0000 (Thu, 05 May 2022) | 1 line + preparing to release 4.0.0-pr1 ------------------------------------------------------------------------ -r1862620 | hege | 2019-07-05 15:08:59 +0000 (Fri, 05 Jul 2019) | 2 lines +r1900556 | gbechis | 2022-05-04 17:09:39 +0000 (Wed, 04 May 2022) | 2 +lines - More Bug 7731 tweaks, rename MUA to X-Relay-Countries-Auth + basic FromNameSpoof tests ------------------------------------------------------------------------ -r1862608 | hege | 2019-07-05 12:07:13 +0000 (Fri, 05 Jul 2019) | 2 lines +r1900555 | gbechis | 2022-05-04 16:39:55 +0000 (Wed, 04 May 2022) | 2 +lines - Fix handling when geoip not loaded + fix man page formatting ------------------------------------------------------------------------ -r1862607 | hege | 2019-07-05 12:00:21 +0000 (Fri, 05 Jul 2019) | 2 lines +r1900553 | hege | 2022-05-04 13:43:43 +0000 (Wed, 04 May 2022) | 2 lines - Bug 7731 - Add external and msa metadata to RelayCountry + Document parallel testing, also as reminder for everyone.. ------------------------------------------------------------------------ -r1862111 | hege | 2019-06-26 08:49:22 +0000 (Wed, 26 Jun 2019) | 2 lines +r1900552 | hege | 2022-05-04 13:39:36 +0000 (Wed, 04 May 2022) | 2 lines - Bug 5639 - document multiple header matching better + Add FromNameSpoof ------------------------------------------------------------------------ -r1862107 | hege | 2019-06-26 08:05:59 +0000 (Wed, 26 Jun 2019) | 2 lines +r1900549 | hege | 2022-05-04 12:51:24 +0000 (Wed, 04 May 2022) | 2 lines - Remove use bytes from mass-check (Bug 7613) + Clean up code, properly wait for DKIM results, improve docs ------------------------------------------------------------------------ -r1862103 | hege | 2019-06-26 06:53:33 +0000 (Wed, 26 Jun 2019) | 2 lines +r1900547 | sidney | 2022-05-04 11:06:22 +0000 (Wed, 04 May 2022) | 1 line - Fix previous commit logic.. + bug 7982 fix tests failing when run from release tarball, removing +dependency on rules that are in trunk +------------------------------------------------------------------------ +r1900546 | sidney | 2022-05-04 11:01:48 +0000 (Wed, 04 May 2022) | 1 line + Back to development version until we are ready to build the next +pre-release ------------------------------------------------------------------------ -r1862102 | hege | 2019-06-26 06:49:51 +0000 (Wed, 26 Jun 2019) | 2 lines +r1900541 | hege | 2022-05-04 06:56:15 +0000 (Wed, 04 May 2022) | 2 lines - Handle SHA signatures a bit more carefully + Fix typo ------------------------------------------------------------------------ -r1862101 | gbechis | 2019-06-26 06:27:31 +0000 (Wed, 26 Jun 2019) | 3 +r1900538 | gbechis | 2022-05-04 06:43:17 +0000 (Wed, 04 May 2022) | 2 lines - skip regression test if sudo(8) is not installed - fix bz #6665 + Match html files stored on Fleek cloud ------------------------------------------------------------------------ -r1862057 | hege | 2019-06-25 12:51:45 +0000 (Tue, 25 Jun 2019) | 2 lines +r1900536 | hege | 2022-05-04 04:38:59 +0000 (Wed, 04 May 2022) | 2 lines - Also parse image/jpg (commonly used even if not standard) + Don't add listname itself to a list ------------------------------------------------------------------------ -r1862009 | hege | 2019-06-24 14:46:44 +0000 (Mon, 24 Jun 2019) | 2 lines +r1900531 | hege | 2022-05-04 02:52:21 +0000 (Wed, 04 May 2022) | 2 lines - Bug 6582: Implement body_part_scan_size / rawbody_part_scan_size limits + Add missing to MANIFEST ------------------------------------------------------------------------ -r1861977 | hege | 2019-06-24 06:32:24 +0000 (Mon, 24 Jun 2019) | 2 lines +r1900515 | gbechis | 2022-05-03 15:02:40 +0000 (Tue, 03 May 2022) | 2 +lines - Fix 20_saw_ampersand.t + revert r1900506, not correct for general use ------------------------------------------------------------------------ -r1861976 | hege | 2019-06-24 06:24:57 +0000 (Mon, 24 Jun 2019) | 2 lines +r1900514 | gbechis | 2022-05-03 14:56:35 +0000 (Tue, 03 May 2022) | 3 +lines - Fix 20_saw_ampersand.t + silence a warning if uri_to_domain fails. + bz #7984 ------------------------------------------------------------------------ -r1861961 | kmcgrail | 2019-06-24 00:34:10 +0000 (Mon, 24 Jun 2019) | 1 -line +r1900513 | hege | 2022-05-03 14:40:18 +0000 (Tue, 03 May 2022) | 4 lines + + - Add http code caching + - Add short_url_code just in case, to check any non-redirect http code + - Check register_eval_rule type - preparing to release 3.4.3-rc3 ------------------------------------------------------------------------ -r1861944 | hege | 2019-06-23 18:24:45 +0000 (Sun, 23 Jun 2019) | 2 lines +r1900512 | hege | 2022-05-03 13:50:53 +0000 (Tue, 03 May 2022) | 3 lines - Update skipped files + - Add clear_localrules() test function to use only rules defined in *.t +/ tstprefs(). + - Convert sql_based_welcomelist.t to clear_localrules ------------------------------------------------------------------------ -r1861942 | hege | 2019-06-23 16:20:48 +0000 (Sun, 23 Jun 2019) | 2 lines - - Remove unneeded t/mkrules*.t from 3.4 +r1900511 | sidney | 2022-05-03 13:48:24 +0000 (Tue, 03 May 2022) | 1 line + Cosmetic fix that does not affect the test but I could not unsee it once +I noticed it ------------------------------------------------------------------------ -r1861937 | hege | 2019-06-23 14:37:54 +0000 (Sun, 23 Jun 2019) | 2 lines +r1900508 | gbechis | 2022-05-03 12:41:02 +0000 (Tue, 03 May 2022) | 2 +lines - Some taint fixes + missed in previous ------------------------------------------------------------------------ -r1861932 | hege | 2019-06-23 13:51:31 +0000 (Sun, 23 Jun 2019) | 2 lines +r1900507 | gbechis | 2022-05-03 12:39:54 +0000 (Tue, 03 May 2022) | 2 +lines - Apparently make tardist doesn't always output "Created xyz.tar.gz", try -to find latest tarfile with ls -tr instead + test autocleanup ------------------------------------------------------------------------ -r1861926 | hege | 2019-06-23 13:10:00 +0000 (Sun, 23 Jun 2019) | 2 lines +r1900506 | gbechis | 2022-05-03 12:39:04 +0000 (Tue, 03 May 2022) | 3 +lines - Fix URILocalBL requiring Net::CIDR::Lite + cleanup database by checking "modified" field so that frequently checked + urls are always in hot cache ------------------------------------------------------------------------ -r1861909 | hege | 2019-06-23 09:47:18 +0000 (Sun, 23 Jun 2019) | 2 lines +r1900494 | sidney | 2022-05-02 23:53:07 +0000 (Mon, 02 May 2022) | 1 line - Remove exponential sleeps, they don't make much sense, basically -check_mirror_af is the one that croaks if our network is down. There's -already bunch of retries also on external wget/curl commands. Just sleep -few seconds between tries, should be enough. + change a name used in test to make it clearer that a warning message is +expected and can be ignored +------------------------------------------------------------------------ +r1900485 | gbechis | 2022-05-02 16:12:44 +0000 (Mon, 02 May 2022) | 2 +lines + + DecodeShortURLs cache test ------------------------------------------------------------------------ -r1861908 | hege | 2019-06-23 09:26:37 +0000 (Sun, 23 Jun 2019) | 2 lines +r1900483 | hege | 2022-05-02 15:23:50 +0000 (Mon, 02 May 2022) | 2 lines - Few trivial ipv4/ipv6 fixes, handle forcing better + Make TTL handling foolproof, do a cheap delete before select. Tidy +things up a bit. ------------------------------------------------------------------------ -r1861891 | hege | 2019-06-22 18:00:35 +0000 (Sat, 22 Jun 2019) | 2 lines +r1900481 | hege | 2022-05-02 14:56:24 +0000 (Mon, 02 May 2022) | 2 lines - Skip left brace regexp tests which depend on Perl version + Fix logic: Compare TTL to created field, otherwise entry might not never +expire and update itself. ------------------------------------------------------------------------ -r1861889 | hege | 2019-06-22 17:53:31 +0000 (Sat, 22 Jun 2019) | 2 lines +r1900479 | hege | 2022-05-02 14:21:38 +0000 (Mon, 02 May 2022) | 2 lines - Trivial change, don't fail lint on description for non-existent rule -(similar to bug 5514) + Revert back to unix timestamps (int) ------------------------------------------------------------------------ -r1861877 | hege | 2019-06-22 16:00:42 +0000 (Sat, 22 Jun 2019) | 2 lines +r1900477 | gbechis | 2022-05-02 12:56:54 +0000 (Mon, 02 May 2022) | 2 +lines - Bug 7726 - Enable taint for all tests + more tweaks to Paypal rule ------------------------------------------------------------------------ -r1861762 | hege | 2019-06-21 08:35:21 +0000 (Fri, 21 Jun 2019) | 2 lines +r1900474 | gbechis | 2022-05-02 10:33:01 +0000 (Mon, 02 May 2022) | 2 +lines - Bug 7725 - Perl taint bug with URIDNSBL netmask calculations + another white tentacle ------------------------------------------------------------------------ -r1861758 | hege | 2019-06-21 08:23:02 +0000 (Fri, 21 Jun 2019) | 2 lines +r1900468 | gbechis | 2022-05-01 22:31:52 +0000 (Sun, 01 May 2022) | 2 +lines - Some trivial fixes, always latest tardist file, reset sa-compile cache + more Paypal images ------------------------------------------------------------------------ -r1861744 | hege | 2019-06-21 06:26:00 +0000 (Fri, 21 Jun 2019) | 2 lines +r1900467 | gbechis | 2022-05-01 21:40:15 +0000 (Sun, 01 May 2022) | 2 +lines - Fix t/all_modules.t + Check emails with Paypal hosted image but message not from Paypal ------------------------------------------------------------------------ -r1861634 | hege | 2019-06-19 15:43:30 +0000 (Wed, 19 Jun 2019) | 2 lines +r1900464 | hege | 2022-05-01 18:13:16 +0000 (Sun, 01 May 2022) | 2 lines - Bug 7723 - FromNameSpoof warnings with missing To-header + Improve docs ------------------------------------------------------------------------ -r1861633 | hege | 2019-06-19 15:41:21 +0000 (Wed, 19 Jun 2019) | 2 lines +r1900462 | hege | 2022-05-01 17:51:21 +0000 (Sun, 01 May 2022) | 2 lines - Bug 7724 - MIMEEval state not checked properly + Clean up DecodeShortURLs code. Add MySQL/Postgres support. ------------------------------------------------------------------------ -r1861513 | hege | 2019-06-17 14:28:24 +0000 (Mon, 17 Jun 2019) | 2 lines +r1900458 | hege | 2022-05-01 14:10:07 +0000 (Sun, 01 May 2022) | 2 lines - Add --reallyallowplugins in upgrade notes + Fix invalid tr// ------------------------------------------------------------------------ -r1861431 | hege | 2019-06-15 19:34:46 +0000 (Sat, 15 Jun 2019) | 2 lines +r1900446 | hege | 2022-05-01 09:25:11 +0000 (Sun, 01 May 2022) | 2 lines - Tighten up --allowplugins allowed settings + Fix perlcritic ------------------------------------------------------------------------ -r1861429 | hege | 2019-06-15 19:13:30 +0000 (Sat, 15 Jun 2019) | 2 lines +r1900443 | hege | 2022-05-01 09:08:00 +0000 (Sun, 01 May 2022) | 2 lines - Print warning about --allowplugins usage, only allow it with ---reallyallowplugins + run_long_tests is already enabled by default, remove unneeded duplicates +from xt/ ------------------------------------------------------------------------ -r1861424 | hege | 2019-06-15 18:42:17 +0000 (Sat, 15 Jun 2019) | 2 lines +r1900437 | hege | 2022-05-01 06:56:11 +0000 (Sun, 01 May 2022) | 2 lines + + Bug 7983 - t/all_modules.t (OLEVBMacro) fails without +Archive::Zip/IO::String - Bug 6944 - t/dcc.t fails to check if dcc is installed or not before -testing +------------------------------------------------------------------------ +r1900420 | sidney | 2022-04-30 09:39:17 +0000 (Sat, 30 Apr 2022) | 1 line + preparing to release 4.0.0-rc1 ------------------------------------------------------------------------ -r1861423 | hege | 2019-06-15 18:34:48 +0000 (Sat, 15 Jun 2019) | 2 lines +r1900413 | hege | 2022-04-30 06:01:09 +0000 (Sat, 30 Apr 2022) | 2 lines - Retry even if sha/asc download fails, sleep a bit between mirror retries + Some last missing welcome/block changes ------------------------------------------------------------------------ -r1861404 | hege | 2019-06-15 15:29:54 +0000 (Sat, 15 Jun 2019) | 2 lines +r1900393 | hege | 2022-04-29 18:26:21 +0000 (Fri, 29 Apr 2022) | 2 lines - Skip downloading sha256 file needlessly if already having sha512 + Use catfile just to be pedantic ------------------------------------------------------------------------ -r1861402 | hege | 2019-06-15 14:52:03 +0000 (Sat, 15 Jun 2019) | 2 lines +r1900390 | hege | 2022-04-29 16:26:57 +0000 (Fri, 29 Apr 2022) | 2 lines - Bug 7089 - add domains_only function to DNSEval.pm + Purge write testfiles only sometimes, remember to use catdir ------------------------------------------------------------------------ -r1861377 | hege | 2019-06-15 12:01:00 +0000 (Sat, 15 Jun 2019) | 2 lines +r1900389 | hege | 2022-04-29 15:59:29 +0000 (Fri, 29 Apr 2022) | 2 lines - Bug 5258 - implement rules_matching() meta expression + Fix race condition generated warning of trying to -M a disappeared file +after readdir() ------------------------------------------------------------------------ -r1861375 | hege | 2019-06-15 11:55:02 +0000 (Sat, 15 Jun 2019) | 2 lines +r1900388 | hege | 2022-04-29 15:20:40 +0000 (Fri, 29 Apr 2022) | 2 lines - Add t/add_modules.t + Not sure what the previous commit was about, revert ------------------------------------------------------------------------ -r1861357 | hege | 2019-06-14 16:28:44 +0000 (Fri, 14 Jun 2019) | 2 lines +r1900387 | hege | 2022-04-29 15:01:54 +0000 (Fri, 29 Apr 2022) | 2 lines - Add Finnish VS: reply prefix + Apparently if has() isn't supported on SA 3.3... let's just use if +can(), because we are nice.. ------------------------------------------------------------------------ -r1861317 | gbechis | 2019-06-14 07:57:14 +0000 (Fri, 14 Jun 2019) | 3 +r1900386 | gbechis | 2022-04-29 13:47:54 +0000 (Fri, 29 Apr 2022) | 2 lines - Revert part of commit r1831073 that sneak in by fault - fixes #7657, thanks to hege@ for debugging this + check only directories to avoid a warning ------------------------------------------------------------------------ -r1861265 | hege | 2019-06-13 15:03:40 +0000 (Thu, 13 Jun 2019) | 2 lines +r1900371 | hege | 2022-04-29 03:54:35 +0000 (Fri, 29 Apr 2022) | 2 lines - Bug 7374 - Some e-mails create "Complex regular subexpression recursion -limit (32766) exceeded" warning + Make sure mirrors fetches are randomized ------------------------------------------------------------------------ -r1861259 | hege | 2019-06-13 13:57:59 +0000 (Thu, 13 Jun 2019) | 2 lines +r1900368 | hege | 2022-04-28 19:02:15 +0000 (Thu, 28 Apr 2022) | 2 lines - Bug 7681 - Use standard SEE ALSOs + Improve docs and --install errors ------------------------------------------------------------------------ -r1861237 | hege | 2019-06-13 08:05:08 +0000 (Thu, 13 Jun 2019) | 2 lines +r1900365 | hege | 2022-04-28 18:32:59 +0000 (Thu, 28 Apr 2022) | 2 lines - Fix harmless hash assignment warnings in relaycountry tests + It's really pointless to download SHA512/256 checksums if GPG is used, +so don't waste the mirrors with that. ------------------------------------------------------------------------ -r1861236 | hege | 2019-06-13 07:59:37 +0000 (Thu, 13 Jun 2019) | 2 lines +r1900364 | hege | 2022-04-28 17:38:37 +0000 (Thu, 28 Apr 2022) | 2 lines - Fix harmless warning for test if Geo::IP not available + Use zopfli for better compression, clean up paths from hashfiles ------------------------------------------------------------------------ -r1861234 | hege | 2019-06-13 07:53:26 +0000 (Thu, 13 Jun 2019) | 2 lines +r1900308 | hege | 2022-04-27 07:19:16 +0000 (Wed, 27 Apr 2022) | 2 lines - Fix qr_to_string for Perl <5.14 + Re-enable automatic updates ------------------------------------------------------------------------ -r1861222 | hege | 2019-06-13 06:22:31 +0000 (Thu, 13 Jun 2019) | 2 lines +r1900305 | hege | 2022-04-27 06:15:56 +0000 (Wed, 27 Apr 2022) | 2 lines - Remove t/spamc_H.t from manifest since Bug 7046 is not fixed (and -probably wont for 3.4 branch) + Bug 7980 - plaintext_body_sig_ratio performance ------------------------------------------------------------------------ -r1861221 | hege | 2019-06-13 06:19:19 +0000 (Thu, 13 Jun 2019) | 2 lines +r1900294 | hege | 2022-04-26 17:35:35 +0000 (Tue, 26 Apr 2022) | 2 lines - Fix possible t/dnsbl.t failure + Minor fixes ------------------------------------------------------------------------ -r1861220 | hege | 2019-06-13 06:10:14 +0000 (Thu, 13 Jun 2019) | 2 lines +r1900291 | hege | 2022-04-26 14:19:48 +0000 (Tue, 26 Apr 2022) | 2 lines - Define DKIM_INVALID for tests + Only mark presence of Autocrypt header ------------------------------------------------------------------------ -r1861219 | hege | 2019-06-13 06:09:44 +0000 (Thu, 13 Jun 2019) | 2 lines +r1900273 | hege | 2022-04-25 17:17:04 +0000 (Mon, 25 Apr 2022) | 2 lines - Add t/all_modules.t to manifest + Forgot reuse ------------------------------------------------------------------------ -r1861214 | kmcgrail | 2019-06-13 02:49:23 +0000 (Thu, 13 Jun 2019) | 1 -line +r1900272 | hege | 2022-04-25 17:00:36 +0000 (Mon, 25 Apr 2022) | 2 lines + + Add DMARC stock rules - Preparing to release 3.4.3 ------------------------------------------------------------------------ -r1861181 | hege | 2019-06-12 18:33:01 +0000 (Wed, 12 Jun 2019) | 2 lines +r1900271 | hege | 2022-04-25 16:21:08 +0000 (Mon, 25 Apr 2022) | 2 lines - Fix 60_perlcritic.t warnings + Fix typo ------------------------------------------------------------------------ -r1861142 | hege | 2019-06-12 15:06:34 +0000 (Wed, 12 Jun 2019) | 2 lines +r1900270 | hege | 2022-04-25 16:16:16 +0000 (Mon, 25 Apr 2022) | 2 lines - Fix makedist, no external rules required + Minor cleanup ------------------------------------------------------------------------ -r1861141 | hege | 2019-06-12 15:00:18 +0000 (Wed, 12 Jun 2019) | 2 lines +r1900269 | hege | 2022-04-25 16:09:24 +0000 (Mon, 25 Apr 2022) | 2 lines - Define rules internally so make disttest also works without external -rules + Clean up *.pre files ------------------------------------------------------------------------ -r1861131 | kmcgrail | 2019-06-12 13:51:47 +0000 (Wed, 12 Jun 2019) | 1 -line +r1900268 | hege | 2022-04-25 16:05:58 +0000 (Mon, 25 Apr 2022) | 3 lines - Preparing to release 3.4.3 ------------------------------------------------------------------------- -r1860921 | kmcgrail | 2019-06-10 01:27:42 +0000 (Mon, 10 Jun 2019) | 1 -line + - Use DMARC by default like SPF/DKIM. + - Lazy load Mail::DMARC::PurePerl and only dbg() failure if it's missing +(like SPF/DKIM). - updating razor2 spam test file ------------------------------------------------------------------------ -r1860903 | hege | 2019-06-09 13:13:59 +0000 (Sun, 09 Jun 2019) | 2 lines +r1900267 | hege | 2022-04-25 15:47:57 +0000 (Mon, 25 Apr 2022) | 2 lines - Bug 7037 - RelayCountry is leaking file descriptors + Fix ifplugin Dmarc/WhiteListSubject backwards compatibility ------------------------------------------------------------------------ -r1860896 | hege | 2019-06-09 11:42:11 +0000 (Sun, 09 Jun 2019) | 2 lines +r1900253 | hege | 2022-04-25 08:10:56 +0000 (Mon, 25 Apr 2022) | 2 lines - Bug 7689 - reduce lint time from quadratic to linear + Update docs ------------------------------------------------------------------------ -r1860891 | hege | 2019-06-09 10:16:29 +0000 (Sun, 09 Jun 2019) | 2 lines +r1900249 | hege | 2022-04-25 05:41:18 +0000 (Mon, 25 Apr 2022) | 2 lines - Bug 7658 - Pyzor error: Use of uninitialized value $response[0] in -pattern match (m//) + Bug 7979 - tests fail if Mail::DMARC is not installed ------------------------------------------------------------------------ -r1860889 | hege | 2019-06-09 09:54:05 +0000 (Sun, 09 Jun 2019) | 2 lines +r1900247 | hege | 2022-04-25 05:08:21 +0000 (Mon, 25 Apr 2022) | 2 lines - New option --httputil to force used download utility + Fix mkupdates ------------------------------------------------------------------------ -r1860877 | hege | 2019-06-09 08:27:37 +0000 (Sun, 09 Jun 2019) | 2 lines +r1900225 | hege | 2022-04-23 17:17:49 +0000 (Sat, 23 Apr 2022) | 2 lines - Clarify --allowplugins dangerousness + utf8 tweak ------------------------------------------------------------------------ -r1860874 | hege | 2019-06-09 08:09:44 +0000 (Sun, 09 Jun 2019) | 2 lines +r1900221 | hege | 2022-04-23 12:46:04 +0000 (Sat, 23 Apr 2022) | 2 lines - Bug 7703 - sa-update aborts unnecessarily on IPv6-only hosts with valid -proxy + Update doc, Mail::DMARC::PurePerl is part of Mail::DMARC package ------------------------------------------------------------------------ -r1860873 | hege | 2019-06-09 08:05:38 +0000 (Sun, 09 Jun 2019) | 2 lines +r1900216 | hege | 2022-04-23 12:19:33 +0000 (Sat, 23 Apr 2022) | 2 lines - Fix unuinitialized errors when no subrules hit + Disable rule updates temporarily for welcomelists testing (Bug 7826) ------------------------------------------------------------------------ -r1860806 | hege | 2019-06-08 06:59:21 +0000 (Sat, 08 Jun 2019) | 2 lines +r1900215 | hege | 2022-04-23 12:18:23 +0000 (Sat, 23 Apr 2022) | 2 lines - Commit log suppressor from trunk + Merge trunk-welcomelist to trunk (Bug 7826) ------------------------------------------------------------------------ -r1860766 | kmcgrail | 2019-06-07 15:09:53 +0000 (Fri, 07 Jun 2019) | 1 -line +r1900212 | hege | 2022-04-23 12:02:32 +0000 (Sat, 23 Apr 2022) | 2 lines + + Add Net::LibIDN2 support - Improving Debug output for subtest rule hits ------------------------------------------------------------------------ -r1859366 | gbechis | 2019-05-16 10:57:45 +0000 (Thu, 16 May 2019) | 2 -lines +r1900201 | hege | 2022-04-23 08:59:38 +0000 (Sat, 23 Apr 2022) | 2 lines - remove last dot in hostname if present + Update INSTALL ------------------------------------------------------------------------ -r1859210 | gbechis | 2019-05-14 07:11:22 +0000 (Tue, 14 May 2019) | 2 -lines +r1900196 | hege | 2022-04-23 08:32:08 +0000 (Sat, 23 Apr 2022) | 2 lines - fix regexp + Clean up DependencyInfo ------------------------------------------------------------------------ -r1859129 | kmcgrail | 2019-05-12 05:27:31 +0000 (Sun, 12 May 2019) | 1 -line +r1900193 | hege | 2022-04-23 08:29:46 +0000 (Sat, 23 Apr 2022) | 2 lines + + Add IO::String dep - fixed some whitespace issues thanks to Kevin Golding ------------------------------------------------------------------------ -r1859116 | hege | 2019-05-11 15:01:08 +0000 (Sat, 11 May 2019) | 2 lines +r1900192 | hege | 2022-04-23 08:20:56 +0000 (Sat, 23 Apr 2022) | 2 lines - Fix 3.4 async semantics + Update INSTALL documentation ------------------------------------------------------------------------ -r1859114 | kmcgrail | 2019-05-11 13:24:27 +0000 (Sat, 11 May 2019) | 1 -line +r1900187 | hege | 2022-04-23 07:41:02 +0000 (Sat, 23 Apr 2022) | 2 lines + + Remove HTTP::Date dependency - Fixing MANIFEST files ------------------------------------------------------------------------ -r1858971 | gbechis | 2019-05-09 07:40:13 +0000 (Thu, 09 May 2019) | 2 -lines +r1900186 | hege | 2022-04-23 06:45:17 +0000 (Sat, 23 Apr 2022) | 2 lines - info(...) is not defined, use the proper version + Clean up version requirements ------------------------------------------------------------------------ -r1858690 | gbechis | 2019-05-05 14:13:19 +0000 (Sun, 05 May 2019) | 2 -lines +r1900161 | hege | 2022-04-22 17:15:57 +0000 (Fri, 22 Apr 2022) | 2 lines - warn about "please rerun with debug enabled" only if debug is not enabled + DMARC plugin cleanup and rename Dmarc.pm -> DMARC.pm ------------------------------------------------------------------------ -r1858681 | gbechis | 2019-05-05 12:29:04 +0000 (Sun, 05 May 2019) | 2 -lines +r1900138 | hege | 2022-04-22 06:46:06 +0000 (Fri, 22 Apr 2022) | 4 lines - silence a warning in a corner-case code path + - Tokenize From/To/Cc names (Bug 6319) + - Fix *MI *Ad *UA parsing, only last found header value was used, duh + - Improve logging ------------------------------------------------------------------------ -r1858680 | gbechis | 2019-05-05 12:04:24 +0000 (Sun, 05 May 2019) | 3 -lines +r1900137 | hege | 2022-04-22 06:40:42 +0000 (Fri, 22 Apr 2022) | 2 lines - check also urls that are only on plain/text part - fix #bz 7086 + Bug 7674 - sa-learn learns all messages as ham even if --spam is +specified ------------------------------------------------------------------------ -r1858605 | gbechis | 2019-05-04 15:45:34 +0000 (Sat, 04 May 2019) | 2 -lines +r1900131 | hege | 2022-04-22 04:44:26 +0000 (Fri, 22 Apr 2022) | 2 lines - Add more checks to check_rbl_rcvd + More consistent dbg ------------------------------------------------------------------------ -r1857623 | gbechis | 2019-04-16 06:30:43 +0000 (Tue, 16 Apr 2019) | 2 -lines +r1900130 | hege | 2022-04-22 04:40:45 +0000 (Fri, 22 Apr 2022) | 2 lines - Add more improvements recently developed + Remove some unnecessary "warning:" from dbg (Bug 7788) ------------------------------------------------------------------------ -r1857557 | hege | 2019-04-15 10:16:13 +0000 (Mon, 15 Apr 2019) | 2 lines +r1900116 | hege | 2022-04-21 17:54:17 +0000 (Thu, 21 Apr 2022) | 2 lines - Don't add X-ASN-Route metadata, it's just duplicate Bayes data for X-ASN + Update compressed extensions ------------------------------------------------------------------------ -r1857549 | hege | 2019-04-15 06:45:15 +0000 (Mon, 15 Apr 2019) | 2 lines +r1900115 | hege | 2022-04-21 17:48:18 +0000 (Thu, 21 Apr 2022) | 2 lines - Bug 7211 - Support IPv6 ASN lookups with asn_lookup_ipv6 + Bug 7977 - sa-learn --mbox broken in trunk ------------------------------------------------------------------------ -r1857048 | gbechis | 2019-04-06 07:46:52 +0000 (Sat, 06 Apr 2019) | 2 -lines +r1900092 | hege | 2022-04-21 04:15:50 +0000 (Thu, 21 Apr 2022) | 2 lines - check authority values in dns answer + Sigh typo ------------------------------------------------------------------------ -r1856933 | gbechis | 2019-04-04 13:34:49 +0000 (Thu, 04 Apr 2019) | 2 -lines +r1900091 | hege | 2022-04-21 04:15:00 +0000 (Thu, 21 Apr 2022) | 2 lines - convert check_rbl_ns_from to async lookups + cat is not portable ------------------------------------------------------------------------ -r1856896 | gbechis | 2019-04-03 18:27:49 +0000 (Wed, 03 Apr 2019) | 2 -lines +r1900090 | hege | 2022-04-21 03:51:14 +0000 (Thu, 21 Apr 2022) | 2 lines - copy check_hashbl_bodyre from trunk (r1848553) + Add enable_compat dbg ------------------------------------------------------------------------ -r1856894 | gbechis | 2019-04-03 18:18:17 +0000 (Wed, 03 Apr 2019) | 4 -lines +r1900080 | billcole | 2022-04-20 18:02:27 +0000 (Wed, 20 Apr 2022) | 1 +line + + remove .space from TLD lists and remove test rule which demo'd the issue +(BZ#7953) +------------------------------------------------------------------------ +r1900062 | hege | 2022-04-20 06:02:40 +0000 (Wed, 20 Apr 2022) | 2 lines - Add check_hashbl_emails from trunk - Add the possibility to specify an acl to be able - to check only some domains against an hashbl rbl + Fix version ------------------------------------------------------------------------ -r1856892 | gbechis | 2019-04-03 17:57:12 +0000 (Wed, 03 Apr 2019) | 2 -lines +r1900060 | hege | 2022-04-20 05:54:52 +0000 (Wed, 20 Apr 2022) | 2 lines - enable check_rbl_rcvd + Bug 7973 - PerMsgStatus.pm: sub finish_tests never called ------------------------------------------------------------------------ -r1856890 | gbechis | 2019-04-03 17:32:37 +0000 (Wed, 03 Apr 2019) | 3 -lines +r1900058 | hege | 2022-04-20 05:20:16 +0000 (Wed, 20 Apr 2022) | 2 lines - Add check_rbl_rcvd - to check all received headers domains or ip addresses against a specific -rbl. + Fix tests ------------------------------------------------------------------------ -r1856888 | gbechis | 2019-04-03 17:27:06 +0000 (Wed, 03 Apr 2019) | 4 -lines +r1900057 | hege | 2022-04-20 05:05:54 +0000 (Wed, 20 Apr 2022) | 2 lines - Add check_rbl_headers to check specific headers in rbl - Headers to be checked can be specified for all rbl - or for a specific rbl + Add missing $spamtest->finish(); when --linting ------------------------------------------------------------------------ -r1856885 | gbechis | 2019-04-03 17:12:10 +0000 (Wed, 03 Apr 2019) | 3 -lines +r1900054 | hege | 2022-04-20 03:57:17 +0000 (Wed, 20 Apr 2022) | 2 lines - add check_rbl_ns_from - This checks in a rbl the dns server of the from addrs domain name. + Fix make ------------------------------------------------------------------------ -r1856026 | hege | 2019-03-22 05:02:57 +0000 (Fri, 22 Mar 2019) | 2 lines +r1900053 | hege | 2022-04-20 03:56:59 +0000 (Wed, 20 Apr 2022) | 2 lines - fix check_rbl_from_host from bug 7024 + Fix make ------------------------------------------------------------------------ -r1854814 | gbechis | 2019-03-05 07:29:05 +0000 (Tue, 05 Mar 2019) | 2 -lines +r1900050 | hege | 2022-04-20 03:33:17 +0000 (Wed, 20 Apr 2022) | 2 lines - Net::CIDR::Lite is needed to run urilocalbl code + Bug 7974 - SpamAssassin.pm, wrong order of calls in sub finish ------------------------------------------------------------------------ -r1854666 | hege | 2019-03-02 19:27:07 +0000 (Sat, 02 Mar 2019) | 2 lines +r1900049 | hege | 2022-04-20 03:23:48 +0000 (Wed, 20 Apr 2022) | 2 lines - Fix long string header wrapping (bug 7672) + Bug 7976 - Check.pm wrong pointer ------------------------------------------------------------------------ -r1854476 | gbechis | 2019-02-27 18:07:28 +0000 (Wed, 27 Feb 2019) | 3 -lines +r1900048 | hege | 2022-04-20 03:16:17 +0000 (Wed, 20 Apr 2022) | 2 lines - Switch to https and fix some 404 errors - bz #7652 + Fix make ------------------------------------------------------------------------ -r1854354 | gbechis | 2019-02-26 07:39:34 +0000 (Tue, 26 Feb 2019) | 3 -lines +r1900046 | hege | 2022-04-20 02:55:05 +0000 (Wed, 20 Apr 2022) | 2 lines - fix make_install regression test on *BSD, - still passes on Linux + Fix make ------------------------------------------------------------------------ -r1854347 | billcole | 2019-02-26 00:13:11 +0000 (Tue, 26 Feb 2019) | 2 -lines +r1900045 | hege | 2022-04-20 02:49:42 +0000 (Wed, 20 Apr 2022) | 2 lines - Fixing bug 7302 without causing bug 7692 + Bug 7975 - Util.pm, sub domain_to_search_list, code reordering ------------------------------------------------------------------------ -r1854341 | gbechis | 2019-02-25 22:26:38 +0000 (Mon, 25 Feb 2019) | 2 -lines +r1900021 | hege | 2022-04-19 08:38:39 +0000 (Tue, 19 Apr 2022) | 4 lines - fix regression test + - Disable possible run_nightly tarball creation, mkupdate-with-scores +already does it more reliably + - Update tarball lint test much succeed for ALL versions (3.4.1-3.4.6 +currently tested) + - Code fixes and cleanups ------------------------------------------------------------------------ -r1853301 | gbechis | 2019-02-10 08:54:17 +0000 (Sun, 10 Feb 2019) | 2 +r1900016 | gbechis | 2022-04-19 06:45:27 +0000 (Tue, 19 Apr 2022) | 2 lines - Phishing.pm regression tests + if a restartable signal is caught, retry select(2) 3 times before +aborting ------------------------------------------------------------------------ -r1852885 | gbechis | 2019-02-04 09:55:45 +0000 (Mon, 04 Feb 2019) | 3 -lines +r1900011 | hege | 2022-04-19 05:46:22 +0000 (Tue, 19 Apr 2022) | 2 lines - do not try to use Geo::IP constants if GeoIP2 is present - fix #7687 + Error check cd, fix regexp ------------------------------------------------------------------------ -r1852805 | gbechis | 2019-02-02 23:42:59 +0000 (Sat, 02 Feb 2019) | 2 -lines +r1900005 | sidney | 2022-04-19 01:23:31 +0000 (Tue, 19 Apr 2022) | 1 line + + bug 7358 Accomodate certain mailformed nested MIME that some MUAs accept +------------------------------------------------------------------------ +r1899984 | hege | 2022-04-18 15:16:23 +0000 (Mon, 18 Apr 2022) | 2 lines - fix msgcount type for txrep in Postgresql sql file + enable_compat feature (Bug 7972) ------------------------------------------------------------------------ -r1851889 | gbechis | 2019-01-23 07:48:46 +0000 (Wed, 23 Jan 2019) | 2 -lines +r1899954 | hege | 2022-04-17 16:33:29 +0000 (Sun, 17 Apr 2022) | 2 lines - more speed improvements + Add "config: parsing file foo.cf" debug output, to see the actual +parsing order (vs "read file" which is just physical reads not in +"include" order) ------------------------------------------------------------------------ -r1851418 | gbechis | 2019-01-16 07:41:34 +0000 (Wed, 16 Jan 2019) | 3 -lines +r1899923 | hege | 2022-04-17 05:21:13 +0000 (Sun, 17 Apr 2022) | 2 lines - Fix pod errors - bz #7682 + Apply Bug 5771 to TxRep too ------------------------------------------------------------------------ -r1851367 | billcole | 2019-01-15 14:32:48 +0000 (Tue, 15 Jan 2019) | 1 -line +r1899918 | sidney | 2022-04-16 23:09:01 +0000 (Sat, 16 Apr 2022) | 1 line + + Clarify usage and perldoc documentation for -D option +------------------------------------------------------------------------ +r1899917 | sidney | 2022-04-16 23:00:37 +0000 (Sat, 16 Apr 2022) | 1 line - Fixing command-line example formatting. Bug #7679 + bug 7674 make --ham or --spam not optional for first path in command +line, improve documentation ------------------------------------------------------------------------ -r1851021 | hege | 2019-01-11 08:52:30 +0000 (Fri, 11 Jan 2019) | 2 lines +r1899900 | hege | 2022-04-16 07:06:20 +0000 (Sat, 16 Apr 2022) | 2 lines - Fix RDNS_NONE when rdns=[1.2.3.4] (f.e. amavisd-milter) + Bug 7646 - spamd running with virtual-config-dir mkdir error ------------------------------------------------------------------------ -r1851018 | gbechis | 2019-01-11 08:15:08 +0000 (Fri, 11 Jan 2019) | 2 -lines +r1899898 | hege | 2022-04-16 05:57:18 +0000 (Sat, 16 Apr 2022) | 2 lines - Some speed improvements + Bug 5771 - umask issue in UnixNFSSafe.pm ------------------------------------------------------------------------ -r1849822 | billcole | 2018-12-27 23:46:24 +0000 (Thu, 27 Dec 2018) | 1 -line +r1899897 | hege | 2022-04-16 05:18:35 +0000 (Sat, 16 Apr 2022) | 2 lines + + Allow disabling stopwords processing with "bayes_stopword_languages +disable" - correcting URLs to https ------------------------------------------------------------------------ -r1849747 | gbechis | 2018-12-26 09:49:30 +0000 (Wed, 26 Dec 2018) | 3 -lines +r1899896 | hege | 2022-04-16 05:11:33 +0000 (Sat, 16 Apr 2022) | 2 lines - As per Shevek's srs paper, srs scheme should be case insensitive - bz #7673 + Don't try to change uid/gid if not needed ------------------------------------------------------------------------ -r1849441 | billcole | 2018-12-20 21:43:37 +0000 (Thu, 20 Dec 2018) | 1 -line +r1899889 | sidney | 2022-04-15 12:18:08 +0000 (Fri, 15 Apr 2022) | 1 line - Failed lint should fail for real. + bug 5740 spamd tries to bayes learn when reporting even when bayes is +disabled ------------------------------------------------------------------------ -r1848970 | kmcgrail | 2018-12-14 22:22:49 +0000 (Fri, 14 Dec 2018) | 1 -line +r1899876 | sidney | 2022-04-15 05:00:51 +0000 (Fri, 15 Apr 2022) | 1 line - Optimize extract of body rules during sa-compile - Bug 7665 + fix typo in a pkg name ------------------------------------------------------------------------ -r1848969 | kmcgrail | 2018-12-14 21:05:01 +0000 (Fri, 14 Dec 2018) | 1 +r1899866 | billcole | 2022-04-14 18:58:50 +0000 (Thu, 14 Apr 2022) | 1 line - Work on improving evaluation rules and preparing for 3.4.3 + See bug 7971. Limited score on DOS_RCVD_IP_TWICE_B ------------------------------------------------------------------------ -r1848827 | gbechis | 2018-12-13 07:44:12 +0000 (Thu, 13 Dec 2018) | 3 -lines +r1899850 | hege | 2022-04-14 12:01:32 +0000 (Thu, 14 Apr 2022) | 2 lines - Add sqlite database definitions for txrep - fix bz #7668 + Update ArchiveIterator note ------------------------------------------------------------------------ -r1848550 | hege | 2018-12-10 06:03:10 +0000 (Mon, 10 Dec 2018) | 2 lines +r1899849 | hege | 2022-04-14 11:58:05 +0000 (Thu, 14 Apr 2022) | 2 lines - Fix RB warnings + Update outdated message size clause ------------------------------------------------------------------------ -r1848549 | hege | 2018-12-10 05:32:41 +0000 (Mon, 10 Dec 2018) | 2 lines +r1899848 | hege | 2022-04-14 11:50:31 +0000 (Thu, 14 Apr 2022) | 2 lines - Mention RegistryBoundaries 20_aux_tlds.cf fix (commit 1845096) + Further ArchiveIterator improvements, all of gzip/bzip2/xz/lz4/lzip/lzo +are now detected and uncompressed automatically. ------------------------------------------------------------------------ -r1848548 | hege | 2018-12-10 05:22:27 +0000 (Mon, 10 Dec 2018) | 2 lines +r1899844 | gbechis | 2022-04-14 11:09:46 +0000 (Thu, 14 Apr 2022) | 2 +lines - Fix hash warns + add support for 3rd tld url shorteners that creates a random 3rd level +subdomain. ------------------------------------------------------------------------ -r1847473 | hege | 2018-11-26 14:23:41 +0000 (Mon, 26 Nov 2018) | 2 lines +r1899843 | hege | 2022-04-14 11:03:16 +0000 (Thu, 14 Apr 2022) | 4 lines - Document ALL-* pseudo-headers + ArchiveIterator cleanups + - Uncompress gzip regardless of extension (Bug 7598) + - Add .xz support ------------------------------------------------------------------------ -r1846805 | hege | 2018-11-17 14:40:10 +0000 (Sat, 17 Nov 2018) | 2 lines +r1899837 | hege | 2022-04-14 07:18:24 +0000 (Thu, 14 Apr 2022) | 2 lines - Fix Windows-1252 autodetection with normalize_charset (Bug 7656) + Remove unneeded Compress::Zlib mention, has been in Perl core since 5.10 ------------------------------------------------------------------------ -r1846293 | hege | 2018-11-10 10:37:56 +0000 (Sat, 10 Nov 2018) | 2 lines +r1899836 | hege | 2022-04-14 06:56:53 +0000 (Thu, 14 Apr 2022) | 2 lines - Bug 7655 - '/etc/mail/spamassassin/sa-update-keys/': No such file or -directory + ArchiveIterator: skip disappeared files gracefully (Bug 7934) ------------------------------------------------------------------------ -r1845932 | hege | 2018-11-06 16:08:20 +0000 (Tue, 06 Nov 2018) | 2 lines +r1899804 | gbechis | 2022-04-13 10:29:00 +0000 (Wed, 13 Apr 2022) | 2 +lines - Mention parse_dkim_uris in URIDNSBL docs too + fix error message handling ------------------------------------------------------------------------ -r1845736 | hege | 2018-11-04 13:36:22 +0000 (Sun, 04 Nov 2018) | 2 lines +r1899803 | hege | 2022-04-13 09:40:24 +0000 (Wed, 13 Apr 2022) | 2 lines - Skip duplicate lookups + Bug 7267 - no way to set SSL_VERIFY_PEER in spamd ------------------------------------------------------------------------ -r1845723 | hege | 2018-11-04 11:16:11 +0000 (Sun, 04 Nov 2018) | 2 lines +r1899775 | hege | 2022-04-12 10:55:47 +0000 (Tue, 12 Apr 2022) | 2 lines - Bug 7242 - URIBL_SBL and URIBL_SBL_A doing each other's lookups + Bug 7183 - Spamc/Spamd very slow with -z compression and ssl ------------------------------------------------------------------------ -r1845197 | hege | 2018-10-30 06:26:56 +0000 (Tue, 30 Oct 2018) | 2 lines +r1899770 | hege | 2022-04-12 08:39:24 +0000 (Tue, 12 Apr 2022) | 2 lines - Small re fix, don't warn with sa-update lint + Improve accept error handling ------------------------------------------------------------------------ -r1845107 | hege | 2018-10-29 12:03:00 +0000 (Mon, 29 Oct 2018) | 2 lines +r1899762 | hege | 2022-04-12 06:26:37 +0000 (Tue, 12 Apr 2022) | 2 lines - Fix RB tests and case-i + Log SSL version/cipher ------------------------------------------------------------------------ -r1845096 | hege | 2018-10-29 10:29:15 +0000 (Mon, 29 Oct 2018) | 2 lines +r1899744 | hege | 2022-04-11 11:38:39 +0000 (Mon, 11 Apr 2022) | 2 lines - Make RegistryBoundaries actually use 20_aux_tlds.cf, initialize it only -after configuration is parsed. Fix plugins to handle valid_tlds_re at -finish_parsing_end. Remove old hardcoded list, only sa-update is now -supported. + Bug 7941 - sql/txrep_sqlite.sql: typo in UPDATE trigger column name +breaks txrep DB ------------------------------------------------------------------------ -r1845067 | hege | 2018-10-28 22:16:50 +0000 (Sun, 28 Oct 2018) | 2 lines +r1899743 | gbechis | 2022-04-11 11:01:02 +0000 (Mon, 11 Apr 2022) | 2 +lines - Remove unused Data::Dumper + add max_size support ------------------------------------------------------------------------ -r1844916 | hege | 2018-10-26 16:55:46 +0000 (Fri, 26 Oct 2018) | 2 lines +r1899742 | gbechis | 2022-04-11 10:28:47 +0000 (Mon, 11 Apr 2022) | 2 +lines - fix dbg facilities + add support for REPORT and REPORT_IFSPAM commands ------------------------------------------------------------------------ -r1844901 | hege | 2018-10-26 12:35:00 +0000 (Fri, 26 Oct 2018) | 2 lines +r1899741 | hege | 2022-04-11 09:47:45 +0000 (Mon, 11 Apr 2022) | 2 lines - Duh, it's "dns_server" + Revert 1899730 msgcount change due to unforeseen dependencies, cheers +Paul ------------------------------------------------------------------------ -r1844900 | hege | 2018-10-26 12:33:14 +0000 (Fri, 26 Oct 2018) | 2 lines +r1899740 | hege | 2022-04-11 09:39:37 +0000 (Mon, 11 Apr 2022) | 2 lines - Ignore dns_servers in sa-update files, paranoid check + Some SQL documentation updates ------------------------------------------------------------------------ -r1844813 | hege | 2018-10-25 08:32:57 +0000 (Thu, 25 Oct 2018) | 2 lines +r1899739 | hege | 2022-04-11 09:22:36 +0000 (Mon, 11 Apr 2022) | 2 lines - Call test_log instead of got_hit description suffix hackery + Use DBD::SQLite for Bayes tests when available ------------------------------------------------------------------------ -r1844811 | hege | 2018-10-25 07:39:45 +0000 (Thu, 25 Oct 2018) | 2 lines +r1899738 | hege | 2022-04-11 09:20:59 +0000 (Mon, 11 Apr 2022) | 2 lines - Do not resolve things unless is_dns_available() + Fix _token_select_string as SQLite compatible ------------------------------------------------------------------------ -r1844808 | hege | 2018-10-25 06:07:23 +0000 (Thu, 25 Oct 2018) | 2 lines - - Bug 6360 - "negative match" on a "0" string +r1899737 | pds | 2022-04-11 08:36:15 +0000 (Mon, 11 Apr 2022) | 1 line + Add last_hit to schema ------------------------------------------------------------------------ -r1844620 | hege | 2018-10-23 07:07:53 +0000 (Tue, 23 Oct 2018) | 2 lines +r1899734 | hege | 2022-04-11 08:27:40 +0000 (Mon, 11 Apr 2022) | 2 lines - Small ident fix + Use RPAD only in MySQL _token_select_string as originally intended. +SQLite does not have RPAD. ------------------------------------------------------------------------ -r1844618 | hege | 2018-10-23 06:09:01 +0000 (Tue, 23 Oct 2018) | 2 lines +r1899731 | hege | 2022-04-11 07:09:25 +0000 (Mon, 11 Apr 2022) | 2 lines - Fix t/get_all_headers.t + Use DBD::SQLite for AWL tests when available ------------------------------------------------------------------------ -r1844485 | gbechis | 2018-10-21 12:10:40 +0000 (Sun, 21 Oct 2018) | 3 -lines +r1899730 | hege | 2022-04-11 07:05:08 +0000 (Mon, 11 Apr 2022) | 2 lines - Add last_hit to awl table as well - bz #7631 + Increment msgcount in SQL for consistency ------------------------------------------------------------------------ -r1844387 | hege | 2018-10-20 03:19:42 +0000 (Sat, 20 Oct 2018) | 2 lines +r1899728 | hege | 2022-04-11 06:26:28 +0000 (Mon, 11 Apr 2022) | 2 lines - Fix check_illegal_chars ALL:raw usage + Improve test a bit more ------------------------------------------------------------------------ -r1844385 | hege | 2018-10-20 03:05:08 +0000 (Sat, 20 Oct 2018) | 2 lines +r1899727 | hege | 2022-04-11 06:14:08 +0000 (Mon, 11 Apr 2022) | 2 lines - Sync with trunk, ALL fixes + Bug 7965 - SQL storage backend miscalculates mean score for AWL ------------------------------------------------------------------------ -r1844384 | hege | 2018-10-20 02:57:00 +0000 (Sat, 20 Oct 2018) | 2 lines +r1899715 | hege | 2022-04-10 19:23:45 +0000 (Sun, 10 Apr 2022) | 2 lines - Fix typo.. + Properly bind token as SQL_BINARY, allowing DBD::MariaDB driver to work +also ------------------------------------------------------------------------ -r1844383 | hege | 2018-10-20 02:54:21 +0000 (Sat, 20 Oct 2018) | 2 lines +r1899713 | hege | 2022-04-10 19:02:14 +0000 (Sun, 10 Apr 2022) | 2 lines - Make ALL pseudo-header return decoded headers, so it's usage is -consistent with normal header usage + Allow DBI:MariaDB usage ------------------------------------------------------------------------ -r1844334 | hege | 2018-10-19 12:49:51 +0000 (Fri, 19 Oct 2018) | 2 lines - - Bug 7224 - fix get_all_hdrs_in_rcvd_index_range, get(ALL[-*]) should -return unfolded header lines unless :raw called +r1899711 | billcole | 2022-04-10 18:16:37 +0000 (Sun, 10 Apr 2022) | 1 +line + adding some distinctive strings from CAN-SPAM 'compliance' boilerplate ------------------------------------------------------------------------ -r1844306 | gbechis | 2018-10-19 06:36:47 +0000 (Fri, 19 Oct 2018) | 4 -lines +r1899707 | hege | 2022-04-10 16:05:41 +0000 (Sun, 10 Apr 2022) | 2 lines - Starting from SQL-92 "count" is a reserved word - Renamed field count to msgcount, follow UPGRADE notes to update your -database - fixes bz #7578 + Fix validuserplugin.pm load path ------------------------------------------------------------------------ -r1843623 | gbechis | 2018-10-12 06:38:56 +0000 (Fri, 12 Oct 2018) | 3 -lines +r1899706 | hege | 2022-04-10 16:05:14 +0000 (Sun, 10 Apr 2022) | 2 lines - Change an info message into a debug message, not useful for the average -user - bz #7632 + Fix run_awl_sql_tests ------------------------------------------------------------------------ -r1843622 | gbechis | 2018-10-12 06:14:11 +0000 (Fri, 12 Oct 2018) | 3 -lines +r1899653 | hege | 2022-04-07 15:08:03 +0000 (Thu, 07 Apr 2022) | 2 lines - Fix txrep_ipv{4,6}_mask_len option - bz #7640 + Bug 7969 - Parser.pm, sub finish_parsing, small code reorder ------------------------------------------------------------------------ -r1843574 | hege | 2018-10-11 17:03:36 +0000 (Thu, 11 Oct 2018) | 2 lines - - Bug 7641 - FromNameSpoof plugin comments still reference dns_check +r1899617 | billcole | 2022-04-06 14:42:37 +0000 (Wed, 06 Apr 2022) | 1 +line + pegging a zero-FP rule to a higher score, remove old commented line ------------------------------------------------------------------------ -r1843047 | hege | 2018-10-07 07:43:12 +0000 (Sun, 07 Oct 2018) | 2 lines +r1899585 | hege | 2022-04-05 15:42:38 +0000 (Tue, 05 Apr 2022) | 2 lines - Deprecate ancient TieOneStringHash usage, it's an absolute performance -pig + Fix UTF-16 detection ------------------------------------------------------------------------ -r1843010 | gbechis | 2018-10-06 10:45:59 +0000 (Sat, 06 Oct 2018) | 3 -lines - - do not consider Sympa headers in Bayes as we have done - for other mailing lists softwares +r1899571 | billcole | 2022-04-04 20:50:32 +0000 (Mon, 04 Apr 2022) | 1 +line + Fixed 'aliases' per Bug #7968 ------------------------------------------------------------------------ -r1842773 | hege | 2018-10-04 04:49:18 +0000 (Thu, 04 Oct 2018) | 2 lines +r1899551 | hege | 2022-04-04 10:37:27 +0000 (Mon, 04 Apr 2022) | 2 lines - Bug 7589 - Tag optional modules in debug_diagnostics + Add standard license boilerplate ------------------------------------------------------------------------ -r1842645 | gbechis | 2018-10-02 17:40:43 +0000 (Tue, 02 Oct 2018) | 2 +r1899545 | gbechis | 2022-04-04 06:15:29 +0000 (Mon, 04 Apr 2022) | 2 lines - fix spamc file leak, bz #7638 + remove rule that depends on a non existent rule ------------------------------------------------------------------------ -r1842597 | gbechis | 2018-10-02 06:35:44 +0000 (Tue, 02 Oct 2018) | 2 -lines +r1899531 | hege | 2022-04-03 09:39:09 +0000 (Sun, 03 Apr 2022) | 2 lines - typo + Fix and sslify some documentation urls ------------------------------------------------------------------------ -r1842593 | hege | 2018-10-02 04:56:57 +0000 (Tue, 02 Oct 2018) | 2 lines +r1899530 | hege | 2022-04-03 09:14:29 +0000 (Sun, 03 Apr 2022) | 2 lines - Allow decimal number in meta token (Bug 7557) + Bug 7870 - Mail::SpamAssassin::Conf "body" documentation clarification ------------------------------------------------------------------------ -r1842467 | hege | 2018-10-01 10:44:52 +0000 (Mon, 01 Oct 2018) | 2 lines +r1899529 | hege | 2022-04-03 09:03:12 +0000 (Sun, 03 Apr 2022) | 2 lines - Fix doc typo + Add autolearn_body to dcc/pyzor/razor rules (Bug 7904) ------------------------------------------------------------------------ -r1842427 | gbechis | 2018-10-01 06:21:12 +0000 (Mon, 01 Oct 2018) | 3 -lines +r1899528 | hege | 2022-04-03 08:45:07 +0000 (Sun, 03 Apr 2022) | 2 lines - fix a typo and unbreak - bz #7636 + Update tlds ------------------------------------------------------------------------ -r1842426 | hege | 2018-10-01 05:02:34 +0000 (Mon, 01 Oct 2018) | 2 lines +r1899526 | hege | 2022-04-03 08:19:41 +0000 (Sun, 03 Apr 2022) | 2 lines - Actually fastest this way + Add tflags autolearn_header/autolearn_body (Bug 7907) ------------------------------------------------------------------------ -r1842425 | hege | 2018-10-01 04:47:21 +0000 (Mon, 01 Oct 2018) | 2 lines +r1899525 | hege | 2022-04-03 07:34:21 +0000 (Sun, 03 Apr 2022) | 2 lines - Fix very bad optimization + Bug 7905/7906: Rewrote autolearn logic. Meta points are now split +between head/body, according to how many head/body rules it depends on +(not recursive, just first deps are checked). If there are no head/body +deps, nothing is added. No discrimination of network rules anymore. ------------------------------------------------------------------------ -r1842403 | hege | 2018-09-30 18:24:47 +0000 (Sun, 30 Sep 2018) | 2 lines +r1899511 | hege | 2022-04-02 12:04:25 +0000 (Sat, 02 Apr 2022) | 2 lines - Actually tell which meta rules token is considered strange + Improve TextCat. Add new utf8 lms. Add tools for maintaining languages. ------------------------------------------------------------------------ -r1842326 | hege | 2018-09-29 12:10:15 +0000 (Sat, 29 Sep 2018) | 2 lines +r1899507 | hege | 2022-04-02 08:04:26 +0000 (Sat, 02 Apr 2022) | 2 lines - Fix bug 7418 changes, next mirror retry works again. Few cosmetic -updates. + Bug 7950 - sa-learn documentation broken link ------------------------------------------------------------------------ -r1842321 | hege | 2018-09-29 10:20:26 +0000 (Sat, 29 Sep 2018) | 2 lines +r1899506 | hege | 2022-04-02 07:28:58 +0000 (Sat, 02 Apr 2022) | 2 lines - Bug 7623 - sa-update files with mirrors containing paths (or ports) + Optimize domain_to_search_list ------------------------------------------------------------------------ -r1842303 | hege | 2018-09-29 09:41:24 +0000 (Sat, 29 Sep 2018) | 2 lines +r1899446 | gbechis | 2022-03-31 15:57:33 +0000 (Thu, 31 Mar 2022) | 2 +lines - Bug 7623 - sa-update files with mirrors containing paths (or ports) + use rule only if needed plugin is loaded ------------------------------------------------------------------------ -r1842074 | hege | 2018-09-27 08:04:21 +0000 (Thu, 27 Sep 2018) | 2 lines +r1899445 | gbechis | 2022-03-31 15:55:03 +0000 (Thu, 31 Mar 2022) | 2 +lines - Add touch_file() to utils + match a recurring spam pattern ------------------------------------------------------------------------ -r1842029 | hege | 2018-09-26 14:21:12 +0000 (Wed, 26 Sep 2018) | 2 lines - - Bug 7624 - fix fns_ignore_dkim etc cleanup +r1899407 | jhardin | 2022-03-31 01:21:17 +0000 (Thu, 31 Mar 2022) | 1 line + Broaden UNSUB_GOOG_FORM a bit ------------------------------------------------------------------------ -r1842026 | hege | 2018-09-26 13:57:29 +0000 (Wed, 26 Sep 2018) | 2 lines +r1899164 | hege | 2022-03-24 05:16:31 +0000 (Thu, 24 Mar 2022) | 2 lines - HashBL did lookups with only local tests enabled :-( + Bug 7958 - Allow '#' in paths when untainting ------------------------------------------------------------------------ -r1841938 | hege | 2018-09-25 14:29:14 +0000 (Tue, 25 Sep 2018) | 2 lines +r1898895 | hege | 2022-03-13 08:42:41 +0000 (Sun, 13 Mar 2022) | 4 lines - Remove anti-optimization (remember to benchmark these things..) + - Support ALL pseudoheader (has_all_header) (Bug 5582) + - Support tflags range (has_tflags_range) + - Support tflags concat (has_tflags_concat) ------------------------------------------------------------------------ -r1841937 | hege | 2018-09-25 14:28:23 +0000 (Tue, 25 Sep 2018) | 2 lines +r1898892 | hege | 2022-03-13 07:13:13 +0000 (Sun, 13 Mar 2022) | 3 lines - Fix indentation + - Header :first :last modifiers did not work at all before +(feature_header_first_last) + - Allow matching all :addr :name etc modifier results +(feature_header_match_many) ------------------------------------------------------------------------ -r1841821 | hege | 2018-09-24 09:53:55 +0000 (Mon, 24 Sep 2018) | 2 lines +r1898891 | hege | 2022-03-13 06:24:24 +0000 (Sun, 13 Mar 2022) | 2 lines - Bug 7610 - Fix and move DKIM_INVALID to official rules + Not supposed to add t/header.t yet.. ------------------------------------------------------------------------ -r1841820 | hege | 2018-09-24 09:52:33 +0000 (Mon, 24 Sep 2018) | 2 lines +r1898890 | hege | 2022-03-13 06:17:05 +0000 (Sun, 13 Mar 2022) | 2 lines - Add missing t/freemail.t + Add missing t/data/spam/unicode1 ------------------------------------------------------------------------ -r1841804 | hege | 2018-09-24 08:07:48 +0000 (Mon, 24 Sep 2018) | 2 lines +r1898791 | hege | 2022-03-09 14:34:25 +0000 (Wed, 09 Mar 2022) | 11 lines - Add freemail_import_whitelist_auth, freemail_import_def_whitelist_auth -(Bug 6451) + Fix sa-compile with UTF-8 rules, in many cases rules might not hit at +all. ------------------------------------------------------------------------- -r1841802 | hege | 2018-09-24 06:55:34 +0000 (Mon, 24 Sep 2018) | 2 lines + Perlapi says: + "SvPVutf8 is like SvPV, but converts sv to UTF-8 first if not already +UTF-8." - Perldocified and added t/freemail.t test + So change XS code to use SvPV, since SA body is supposed to be in bytes, +*duh*. ------------------------------------------------------------------------- -r1841540 | gbechis | 2018-09-21 06:55:32 +0000 (Fri, 21 Sep 2018) | 3 -lines + Add some more tests. - fix fp FORGED_YAHOO_RCVD - bz# 7625 + Also backport to 3.4. ------------------------------------------------------------------------ -r1841433 | gbechis | 2018-09-20 07:18:53 +0000 (Thu, 20 Sep 2018) | 4 -lines +r1898789 | hege | 2022-03-09 14:15:20 +0000 (Wed, 09 Mar 2022) | 2 lines - revert r1838778, fixing a possible use-after-free, - opt can be used later. - bz #7633 + Add some utf8 body tests ------------------------------------------------------------------------ -r1841427 | hege | 2018-09-20 06:25:02 +0000 (Thu, 20 Sep 2018) | 2 lines +r1898788 | hege | 2022-03-09 14:13:23 +0000 (Wed, 09 Mar 2022) | 2 lines - MANIFEST missing t/relaycountry_geoip2.t + Fix debug print ------------------------------------------------------------------------ -r1841423 | hege | 2018-09-20 05:24:08 +0000 (Thu, 20 Sep 2018) | 2 lines +r1898781 | hege | 2022-03-09 13:20:18 +0000 (Wed, 09 Mar 2022) | 2 lines - Add /var/lib/GeoIP to search path + Use catdir ------------------------------------------------------------------------ -r1841422 | hege | 2018-09-20 05:10:45 +0000 (Thu, 20 Sep 2018) | 2 lines +r1898780 | hege | 2022-03-09 13:17:24 +0000 (Wed, 09 Mar 2022) | 2 lines - Make GeoIP2 default paths configurable, add ubuntu /var/lib/GeoIP, clean -up a bit + Purge old .sawritetest files automatically ------------------------------------------------------------------------ -r1841385 | hege | 2018-09-19 20:35:55 +0000 (Wed, 19 Sep 2018) | 2 lines +r1898776 | hege | 2022-03-09 10:03:59 +0000 (Wed, 09 Mar 2022) | 2 lines - Duh, can add -L arg too + Bug 7645 - Wide character in print at /usr/bin/sa-compile line 433 ------------------------------------------------------------------------ -r1841384 | hege | 2018-09-19 20:26:54 +0000 (Wed, 19 Sep 2018) | 2 lines +r1898724 | hege | 2022-03-08 07:31:44 +0000 (Tue, 08 Mar 2022) | 2 lines - Add relaycountry_geoip2 test, fix all relaycountry tests not requiring -net + Fix typo+https ------------------------------------------------------------------------ -r1841378 | hege | 2018-09-19 20:07:27 +0000 (Wed, 19 Sep 2018) | 2 lines +r1898688 | hege | 2022-03-07 13:42:46 +0000 (Mon, 07 Mar 2022) | 2 lines - Try default database locations for GeoIP2 + Enable pyzor_fork, razor_fork by default ------------------------------------------------------------------------ -r1841359 | hege | 2018-09-19 17:58:01 +0000 (Wed, 19 Sep 2018) | 2 lines +r1898687 | hege | 2022-03-07 13:41:22 +0000 (Mon, 07 Mar 2022) | 2 lines - Reorganize code for simplicity/readability, handle GeoIP2 errors -gracefully + Documentation cleanups ------------------------------------------------------------------------ -r1841346 | hege | 2018-09-19 14:24:48 +0000 (Wed, 19 Sep 2018) | 2 lines +r1898684 | hege | 2022-03-07 13:20:37 +0000 (Mon, 07 Mar 2022) | 2 lines - Fix few badly parsed IPs + Add missing t/data/spam/olevbmacro/target_uri.eml ------------------------------------------------------------------------ -r1841313 | hege | 2018-09-19 10:44:43 +0000 (Wed, 19 Sep 2018) | 2 lines +r1898682 | hege | 2022-03-07 13:19:15 +0000 (Mon, 07 Mar 2022) | 2 lines - Bug 7622: fix IP matching.. + Major code cleanup and logic fixes ------------------------------------------------------------------------ -r1841309 | gbechis | 2018-09-19 10:18:01 +0000 (Wed, 19 Sep 2018) | 4 -lines +r1898679 | hege | 2022-03-07 12:47:46 +0000 (Mon, 07 Mar 2022) | 2 lines - Prevent URILocalBL plugin from using dns in regression tests - and iff there is an ip in uri. - bz #7622 + Strip also non-breaking whitespace (\xA0) from HTML URIs ------------------------------------------------------------------------ -r1841192 | gbechis | 2018-09-18 06:33:48 +0000 (Tue, 18 Sep 2018) | 3 -lines +r1898676 | hege | 2022-03-07 11:56:11 +0000 (Mon, 07 Mar 2022) | 2 lines - geoip regression tests needs network because of - dns + Test cleanup ------------------------------------------------------------------------ -r1841067 | kmcgrail | 2018-09-17 11:21:22 +0000 (Mon, 17 Sep 2018) | 1 -line +r1898675 | hege | 2022-03-07 11:55:14 +0000 (Mon, 07 Mar 2022) | 2 lines - Refining the process for announcing new versions - Bug 7620 ------------------------------------------------------------------------- -r1841065 | kmcgrail | 2018-09-17 11:14:16 +0000 (Mon, 17 Sep 2018) | 1 -line + Add missing https_http_mismatch - spamc fixes to compile for windows - bug 7617 ------------------------------------------------------------------------ -r1841063 | kmcgrail | 2018-09-17 11:11:19 +0000 (Mon, 17 Sep 2018) | 1 -line +r1898674 | hege | 2022-03-07 11:54:14 +0000 (Mon, 07 Mar 2022) | 2 lines - dmake install failure on windows - bug 7255 ------------------------------------------------------------------------- -r1841022 | kmcgrail | 2018-09-16 16:04:35 +0000 (Sun, 16 Sep 2018) | 1 -line + Fix URL whitespace parsing - more tweaks to the build process ------------------------------------------------------------------------ -r1841018 | kmcgrail | 2018-09-16 14:38:05 +0000 (Sun, 16 Sep 2018) | 1 -line +r1898665 | hege | 2022-03-07 08:11:46 +0000 (Mon, 07 Mar 2022) | 2 lines - more cleanup on the build process ------------------------------------------------------------------------- -r1841016 | kmcgrail | 2018-09-16 14:12:15 +0000 (Sun, 16 Sep 2018) | 1 -line + Unify dbg() usage - more tweaks ------------------------------------------------------------------------ -r1841010 | kmcgrail | 2018-09-16 13:42:55 +0000 (Sun, 16 Sep 2018) | 1 -line +r1898654 | hege | 2022-03-06 13:42:39 +0000 (Sun, 06 Mar 2022) | 2 lines - tweaks for updating the website docs ------------------------------------------------------------------------- -r1841005 | kmcgrail | 2018-09-16 13:25:13 +0000 (Sun, 16 Sep 2018) | 1 -line + Remove deprecated --auth-ident from spamd (Bug 7599) - small tweak on announcement ------------------------------------------------------------------------ -r1840976 | kmcgrail | 2018-09-15 19:17:32 +0000 (Sat, 15 Sep 2018) | 1 -line +r1898649 | hege | 2022-03-06 11:49:43 +0000 (Sun, 06 Mar 2022) | 2 lines - Adding another step for release ------------------------------------------------------------------------- -r1840966 | kmcgrail | 2018-09-15 06:25:34 +0000 (Sat, 15 Sep 2018) | 1 -line + Bug 7923 - RFE: Making HashBL email_whitelist a configurable feature - continue to document the release process ------------------------------------------------------------------------ -r1840957 | gbechis | 2018-09-14 22:14:29 +0000 (Fri, 14 Sep 2018) | 2 -lines +r1898645 | hege | 2022-03-06 10:35:45 +0000 (Sun, 06 Mar 2022) | 2 lines - switch all ASF web sites uri to https + Clarify that tag names must be alphanumeric (Bug 6162) ------------------------------------------------------------------------ -r1840872 | kmcgrail | 2018-09-14 01:31:55 +0000 (Fri, 14 Sep 2018) | 1 -line +r1898622 | hege | 2022-03-05 13:51:29 +0000 (Sat, 05 Mar 2022) | 2 lines - build process clean-up and 3.4.2 announcement updates ------------------------------------------------------------------------- -r1840870 | kmcgrail | 2018-09-14 01:25:10 +0000 (Fri, 14 Sep 2018) | 1 -line + Add some string/tag and uri size limits, improve uri parsing - preparing to release 3.4.2 ------------------------------------------------------------------------ -r1840662 | sidney | 2018-09-12 11:35:41 +0000 (Wed, 12 Sep 2018) | 1 line +r1898621 | hege | 2022-03-05 12:54:08 +0000 (Sat, 05 Mar 2022) | 2 lines - Add Paul Stead as committer ------------------------------------------------------------------------- -r1840385 | kmcgrail | 2018-09-08 21:37:32 +0000 (Sat, 08 Sep 2018) | 1 -line + Major code cleanups, improve parsing and matching, add basic unit test - more build updates and new rc1 sums for announcement ------------------------------------------------------------------------ -r1840380 | kmcgrail | 2018-09-08 21:08:05 +0000 (Sat, 08 Sep 2018) | 1 -line +r1898557 | hege | 2022-03-03 08:39:19 +0000 (Thu, 03 Mar 2022) | 2 lines - preparing to release 3.4.2-rc1 again with new sa-update ------------------------------------------------------------------------- -r1840377 | kmcgrail | 2018-09-08 20:40:12 +0000 (Sat, 08 Sep 2018) | 1 -line + Bug 7960 - PDFInfo misses valid metadata - Removing sha-1 sig support from sa-update - bug 7614 ------------------------------------------------------------------------ -r1840330 | kmcgrail | 2018-09-08 01:05:14 +0000 (Sat, 08 Sep 2018) | 1 +r1898546 | billcole | 2022-03-03 04:25:28 +0000 (Thu, 03 Mar 2022) | 1 line - changing to 3.3.3 to 3.3.2 + Assumption about high-bit characters no longer valid. BZ#7960 ------------------------------------------------------------------------ -r1840329 | kmcgrail | 2018-09-08 01:03:42 +0000 (Sat, 08 Sep 2018) | 1 -line +r1898503 | gbechis | 2022-03-01 08:44:20 +0000 (Tue, 01 Mar 2022) | 2 +lines + + add support for Mailgun and Mdirector esp - fixing a small typo in the announcement ------------------------------------------------------------------------ -r1840233 | kmcgrail | 2018-09-06 16:07:14 +0000 (Thu, 06 Sep 2018) | 1 +r1898279 | billcole | 2022-02-21 16:41:15 +0000 (Mon, 21 Feb 2022) | 1 line - updating the hash sigs for the announcement + no need to limit something with 0 FPs ------------------------------------------------------------------------ -r1840230 | kmcgrail | 2018-09-06 15:47:47 +0000 (Thu, 06 Sep 2018) | 1 -line +r1898241 | jhardin | 2022-02-19 23:44:44 +0000 (Sat, 19 Feb 2022) | 1 line - preparing to release 3.4.2-rc1 + FP avoidance tuning URI_TRY_3LD ------------------------------------------------------------------------ -r1840219 | kmcgrail | 2018-09-06 13:02:56 +0000 (Thu, 06 Sep 2018) | 1 +r1898197 | billcole | 2022-02-18 22:20:32 +0000 (Fri, 18 Feb 2022) | 1 line - more cleanup of branding and build process + I think this is abnormal, seen only in malware spam ------------------------------------------------------------------------ -r1840213 | kmcgrail | 2018-09-06 12:04:10 +0000 (Thu, 06 Sep 2018) | 1 -line +r1898196 | jhardin | 2022-02-18 22:03:15 +0000 (Fri, 18 Feb 2022) | 2 +lines - fix for Util wrap pre Perl 5.14 - bug 7616 + Convert lookbehind assertion to lookahead to avoid variable-length +issues with unicode semantics for "ss"/"st" + Bug#7956 ------------------------------------------------------------------------ -r1840170 | kmcgrail | 2018-09-05 23:46:20 +0000 (Wed, 05 Sep 2018) | 1 -line +r1898151 | axb | 2022-02-17 12:40:26 +0000 (Thu, 17 Feb 2022) | 1 line - updating the readme and announcement text + removed alinto.com ------------------------------------------------------------------------ -r1840128 | kmcgrail | 2018-09-05 12:15:57 +0000 (Wed, 05 Sep 2018) | 1 -line +r1898139 | jhardin | 2022-02-17 03:48:13 +0000 (Thu, 17 Feb 2022) | 1 line - sa-update version work - bug 7006 + FP avoidance tuning URI_TRY_3LD ------------------------------------------------------------------------ -r1840072 | billcole | 2018-09-04 22:27:55 +0000 (Tue, 04 Sep 2018) | 1 +r1898129 | billcole | 2022-02-16 15:16:30 +0000 (Wed, 16 Feb 2022) | 1 line - Make leading space/zero for one-digit dates in mbox separator optional -Bug 7445 + Suspect URI host, maybe good TLDs in bad list ------------------------------------------------------------------------ -r1840053 | kmcgrail | 2018-09-04 17:32:36 +0000 (Tue, 04 Sep 2018) | 1 +r1898109 | billcole | 2022-02-15 17:56:01 +0000 (Tue, 15 Feb 2022) | 1 line - Fixing the docs bug 7042 + Wellframe is a well-behaved coordinated care provider whose mail hits +some harsh KAM rules. ------------------------------------------------------------------------ -r1840050 | billcole | 2018-09-04 16:39:43 +0000 (Tue, 04 Sep 2018) | 1 +r1898106 | billcole | 2022-02-15 13:32:13 +0000 (Tue, 15 Feb 2022) | 1 line - document %x token foe Exim-like virtual config dirs + de-test a solid but rare rule ------------------------------------------------------------------------ -r1839962 | hege | 2018-09-03 13:21:42 +0000 (Mon, 03 Sep 2018) | 2 lines - - Optimize loop, run hits only once +r1898041 | jhardin | 2022-02-13 21:20:18 +0000 (Sun, 13 Feb 2022) | 1 line + FP avoidance tuning CONTENT_AFTER_HTML ------------------------------------------------------------------------ -r1839883 | hege | 2018-09-02 13:50:12 +0000 (Sun, 02 Sep 2018) | 2 lines +r1897942 | hege | 2022-02-10 13:38:49 +0000 (Thu, 10 Feb 2022) | 2 lines - Fix SHA512 verification + Test some empty body variations ------------------------------------------------------------------------ -r1839865 | billcole | 2018-09-02 00:44:43 +0000 (Sun, 02 Sep 2018) | 1 -line +r1897706 | kb | 2022-02-03 02:16:28 +0000 (Thu, 03 Feb 2022) | 1 line - Add SHA512 support to build/mkupdates/* scripts and sa-update + plaintext_body_sig_ratio: signature delimiter space optional, spammers +do not adhere strictly to the standard ------------------------------------------------------------------------ -r1839854 | kmcgrail | 2018-09-01 21:23:41 +0000 (Sat, 01 Sep 2018) | 1 +r1897569 | billcole | 2022-01-28 23:15:45 +0000 (Fri, 28 Jan 2022) | 1 line - More SHA256/512issues identified + de-testing ------------------------------------------------------------------------ -r1839851 | kmcgrail | 2018-09-01 21:11:42 +0000 (Sat, 01 Sep 2018) | 1 -line +r1897537 | gbechis | 2022-01-27 08:26:00 +0000 (Thu, 27 Jan 2022) | 2 +lines - preparing to release 3.4.2-pre5 ------------------------------------------------------------------------- -r1839848 | kmcgrail | 2018-09-01 21:05:17 +0000 (Sat, 01 Sep 2018) | 1 -line + warning fix - Preparing 3.4.2-pre4 ------------------------------------------------------------------------ -r1839835 | kmcgrail | 2018-09-01 18:03:57 +0000 (Sat, 01 Sep 2018) | 1 -line +r1897535 | gbechis | 2022-01-27 08:03:55 +0000 (Thu, 27 Jan 2022) | 2 +lines - Minor MANIFEST fix ------------------------------------------------------------------------- -r1839834 | kmcgrail | 2018-09-01 18:01:46 +0000 (Sat, 01 Sep 2018) | 1 -line + Make additional olemacro download marker configurable - Streamlining the build process, Updating the build process for new -infrastructure and switching to sha256/512 - bug 7596 ------------------------------------------------------------------------ -r1839832 | billcole | 2018-09-01 17:46:01 +0000 (Sat, 01 Sep 2018) | 1 +r1897529 | billcole | 2022-01-27 03:58:29 +0000 (Thu, 27 Jan 2022) | 1 line - remove pointless and incompatible modifier from recent patch + adding some nice tflags for subrules ------------------------------------------------------------------------ -r1839826 | kmcgrail | 2018-09-01 14:55:44 +0000 (Sat, 01 Sep 2018) | 1 +r1897511 | billcole | 2022-01-26 15:48:57 +0000 (Wed, 26 Jan 2022) | 1 line - Cleanup on README file + remove T_ from good rules ------------------------------------------------------------------------ -r1839824 | kmcgrail | 2018-09-01 14:21:36 +0000 (Sat, 01 Sep 2018) | 1 +r1897510 | billcole | 2022-01-26 15:40:48 +0000 (Wed, 26 Jan 2022) | 1 line - Placeholder for Upgrade info + Chronic spammer fingerprint ------------------------------------------------------------------------ -r1839807 | kmcgrail | 2018-09-01 05:39:30 +0000 (Sat, 01 Sep 2018) | 1 -line +r1897359 | jhardin | 2022-01-23 00:09:57 +0000 (Sun, 23 Jan 2022) | 1 line - Preparing to release 3.4.2-pre4 + Add XM_RANDOM FP exclusion for "Qi Mail Connector" ------------------------------------------------------------------------ -r1839806 | kmcgrail | 2018-09-01 05:37:42 +0000 (Sat, 01 Sep 2018) | 1 -line +r1897186 | jhardin | 2022-01-19 03:09:13 +0000 (Wed, 19 Jan 2022) | 1 line - Fixing minor logic issue on HAS_DSA + Expose subrule as rule for scoring and publication ------------------------------------------------------------------------ -r1839797 | billcole | 2018-08-31 23:43:25 +0000 (Fri, 31 Aug 2018) | 1 -line +r1897134 | jhardin | 2022-01-16 19:19:38 +0000 (Sun, 16 Jan 2022) | 1 line - skip unparseable Cyrus LMTPA over unix socket Received header + Add subrule for "unsubscribe via this Google Docs form:" for evaluation ------------------------------------------------------------------------ -r1839792 | billcole | 2018-08-31 22:04:32 +0000 (Fri, 31 Aug 2018) | 1 -line +r1897097 | jhardin | 2022-01-15 18:35:44 +0000 (Sat, 15 Jan 2022) | 1 line - Actually implementing use_bayes_rules distinct from use_bayes. Bug #7110 + Recognize "shtml" as HTML file attachment extension ------------------------------------------------------------------------ -r1839684 | kmcgrail | 2018-08-30 15:26:34 +0000 (Thu, 30 Aug 2018) | 1 -line +r1896876 | gbechis | 2022-01-10 09:07:45 +0000 (Mon, 10 Jan 2022) | 2 +lines + + use From:domain if EnvelopeFrom:host cannot be found - Fix warnings on Windows platform in 3.4 - bug 7259 ------------------------------------------------------------------------ -r1839641 | gbechis | 2018-08-30 07:32:41 +0000 (Thu, 30 Aug 2018) | 2 +r1896875 | gbechis | 2022-01-10 09:06:48 +0000 (Mon, 10 Jan 2022) | 2 lines - typo in man page + make the test fail on spf as well ------------------------------------------------------------------------ -r1839639 | gbechis | 2018-08-30 07:30:54 +0000 (Thu, 30 Aug 2018) | 2 +r1896791 | gbechis | 2022-01-07 12:00:49 +0000 (Fri, 07 Jan 2022) | 2 lines - Phishing plugin + do not try to cache urls longer then permitted ------------------------------------------------------------------------ -r1839638 | gbechis | 2018-08-30 07:27:29 +0000 (Thu, 30 Aug 2018) | 6 +r1896786 | gbechis | 2022-01-07 10:48:55 +0000 (Fri, 07 Jan 2022) | 2 lines - Add Mail::SpamAssassin::Plugin::Phishing - This phishing plugin finds uris used in phishing campaigns detected by - OpenPhish or PhishTank feeds. - - bz 7564 + Add a sub to check for exploitable documents ------------------------------------------------------------------------ -r1839529 | kmcgrail | 2018-08-29 01:29:54 +0000 (Wed, 29 Aug 2018) | 1 -line +r1896315 | gbechis | 2021-12-23 13:43:24 +0000 (Thu, 23 Dec 2021) | 1 line - Fixing small perlcritic issue + typo ------------------------------------------------------------------------ -r1839517 | kmcgrail | 2018-08-29 00:27:22 +0000 (Wed, 29 Aug 2018) | 1 +r1896197 | billcole | 2021-12-20 19:09:36 +0000 (Mon, 20 Dec 2021) | 1 line - small spelling error + Interesting hashbusting trick... ------------------------------------------------------------------------ -r1839515 | billcole | 2018-08-28 23:55:29 +0000 (Tue, 28 Aug 2018) | 1 -line +r1896096 | pds | 2021-12-17 10:57:38 +0000 (Fri, 17 Dec 2021) | 1 line - Detect UTF-16 flavor + subrule typo ------------------------------------------------------------------------ -r1839514 | billcole | 2018-08-28 23:44:51 +0000 (Tue, 28 Aug 2018) | 1 -line +r1896078 | gbechis | 2021-12-16 22:28:45 +0000 (Thu, 16 Dec 2021) | 2 +lines + + return undef if the EnvelopeFrom:host cannot be found - switch default for parse_dkim_uris ------------------------------------------------------------------------ -r1839511 | billcole | 2018-08-28 23:12:05 +0000 (Tue, 28 Aug 2018) | 1 -line +r1896052 | pds | 2021-12-16 13:06:13 +0000 (Thu, 16 Dec 2021) | 1 line - Fixing t/util_wrap.t for new tab=>8 spaces accounting + cPanel metas ------------------------------------------------------------------------ -r1839487 | billcole | 2018-08-28 17:16:00 +0000 (Tue, 28 Aug 2018) | 1 -line +r1895737 | kb | 2021-12-10 01:27:46 +0000 (Fri, 10 Dec 2021) | 1 line - Making allowance for tabs in M::SA::Util=>wrap(), tweaking default wrap -width + plaintext_body_sig_ratio: optional carriage return in line breaks ------------------------------------------------------------------------ -r1839410 | gbechis | 2018-08-28 07:45:52 +0000 (Tue, 28 Aug 2018) | 4 +r1895485 | gbechis | 2021-12-02 08:39:35 +0000 (Thu, 02 Dec 2021) | 3 lines - Fix indented rules to be rescored - Give a chance to RCVD_IN_MSPIKE rules. - bz #6400 + Add a sub check_olertfobject to check if a document has + a potencially malicious rtf document embedded + +------------------------------------------------------------------------ +r1895479 | billcole | 2021-12-01 23:00:11 +0000 (Wed, 01 Dec 2021) | 1 +line + typo ------------------------------------------------------------------------ -r1839409 | gbechis | 2018-08-28 07:35:13 +0000 (Tue, 28 Aug 2018) | 2 +r1895473 | gbechis | 2021-12-01 18:08:14 +0000 (Wed, 01 Dec 2021) | 2 lines - Mention 'report_wrap_width' new option + Match every file under xl/embeddings directory ------------------------------------------------------------------------ -r1839390 | kmcgrail | 2018-08-28 02:48:28 +0000 (Tue, 28 Aug 2018) | 1 -line +r1895420 | gbechis | 2021-11-30 07:22:58 +0000 (Tue, 30 Nov 2021) | 2 +lines - Adding more features to WLBLEval - Bug 7354 ------------------------------------------------------------------------- -r1839388 | kmcgrail | 2018-08-28 02:39:26 +0000 (Tue, 28 Aug 2018) | 1 -line + Don't trim spf domain in 'mfrom' scope - Adding FromNameSpoof plugin - bug 7606 ------------------------------------------------------------------------ -r1839367 | billcole | 2018-08-27 19:18:16 +0000 (Mon, 27 Aug 2018) | 1 -line +r1895389 | gbechis | 2021-11-28 10:46:36 +0000 (Sun, 28 Nov 2021) | 2 +lines + + Fix domain source of SPF with `mfrom` scope - Adding configurable wrap width for X-Spam-Report header. Bug #6104 ------------------------------------------------------------------------ -r1839294 | gbechis | 2018-08-27 10:41:59 +0000 (Mon, 27 Aug 2018) | 2 +r1895271 | gbechis | 2021-11-23 15:47:31 +0000 (Tue, 23 Nov 2021) | 2 lines - detect Sympa mailinglists, bz #7523 + improve logging and add regression tests for +check_olemacro_redirect_uri() ------------------------------------------------------------------------ -r1839260 | kmcgrail | 2018-08-26 21:55:00 +0000 (Sun, 26 Aug 2018) | 1 -line +r1895162 | jhardin | 2021-11-18 21:45:20 +0000 (Thu, 18 Nov 2021) | 1 line - build_spamc & build_spamd are options for win32 only - bug 7376 + Also check envelope from header and HELO to try to identify emails from +Shopify ------------------------------------------------------------------------ -r1839147 | kmcgrail | 2018-08-25 23:31:00 +0000 (Sat, 25 Aug 2018) | 1 -line +r1895057 | jhardin | 2021-11-15 15:48:32 +0000 (Mon, 15 Nov 2021) | 1 line - Addig tag for LASTEXTERNALIP - Bug 7334 + FP Avoidance tuning ------------------------------------------------------------------------ -r1839143 | kmcgrail | 2018-08-25 23:17:51 +0000 (Sat, 25 Aug 2018) | 1 -line +r1894685 | gbechis | 2021-11-02 14:29:25 +0000 (Tue, 02 Nov 2021) | 3 +lines + + recognize Arc-Authentication-Results, + first step in supporting Arc headers - allow font names in tickmarks - bug 7312 ------------------------------------------------------------------------ -r1839141 | kmcgrail | 2018-08-25 23:11:53 +0000 (Sat, 25 Aug 2018) | 1 -line +r1894312 | hege | 2021-10-17 10:23:49 +0000 (Sun, 17 Oct 2021) | 2 lines + + Lower required spam count 100k -> 80k - changing socket handling for spamd - bug 7274 ------------------------------------------------------------------------ -r1839140 | kmcgrail | 2018-08-25 23:04:42 +0000 (Sat, 25 Aug 2018) | 1 -line +r1894308 | hege | 2021-10-17 07:17:32 +0000 (Sun, 17 Oct 2021) | 2 lines + + Bug 7931 - Undefined subroutine &Scalar::Util::tainted - Improving razor2 test ------------------------------------------------------------------------ -r1839137 | kmcgrail | 2018-08-25 22:49:01 +0000 (Sat, 25 Aug 2018) | 1 -line +r1894307 | hege | 2021-10-17 07:11:26 +0000 (Sun, 17 Oct 2021) | 2 lines + + Remove Bug 7842 testing leftovers - changing make to $Config{make} for sa-compile - bug 7294 ------------------------------------------------------------------------ -r1839132 | kmcgrail | 2018-08-25 22:35:14 +0000 (Sat, 25 Aug 2018) | 1 -line +r1893711 | gbechis | 2021-09-28 16:22:20 +0000 (Tue, 28 Sep 2021) | 2 +lines + + fix pyzor tests by adding an updated spample email - Add references to plugins - bug 7280 ------------------------------------------------------------------------ -r1839127 | kmcgrail | 2018-08-25 22:08:33 +0000 (Sat, 25 Aug 2018) | 1 +r1893694 | billcole | 2021-09-27 15:51:34 +0000 (Mon, 27 Sep 2021) | 1 line - Adding information rule updates and sha1 to announcement + spam reported from whitelisted domain, BZ#7930 ------------------------------------------------------------------------ -r1839085 | gbechis | 2018-08-25 17:20:14 +0000 (Sat, 25 Aug 2018) | 2 -lines - - revert r1826179, fixes bz #7602 +r1893631 | jhardin | 2021-09-25 22:03:40 +0000 (Sat, 25 Sep 2021) | 1 line + FP avoidance tuning FSL_BULK_SIG ------------------------------------------------------------------------ -r1839015 | billcole | 2018-08-25 05:15:19 +0000 (Sat, 25 Aug 2018) | 1 +r1893523 | billcole | 2021-09-22 21:11:13 +0000 (Wed, 22 Sep 2021) | 1 line - Really skip Devel::SawAmpersand test when it's unneeded + Bug 7913: correct description of SUBJECT_NEEDS_ENCODING ------------------------------------------------------------------------ -r1839005 | kmcgrail | 2018-08-25 01:44:30 +0000 (Sat, 25 Aug 2018) | 1 +r1893522 | billcole | 2021-09-22 20:49:07 +0000 (Wed, 22 Sep 2021) | 1 line - adding a description of why the change exists + Bug 7921 ------------------------------------------------------------------------ -r1839002 | kmcgrail | 2018-08-25 01:22:03 +0000 (Sat, 25 Aug 2018) | 1 +r1893514 | mmartinec | 2021-09-22 14:59:53 +0000 (Wed, 22 Sep 2021) | 1 line - Adding more cases for user_prefs.template to be found - bug 7298 + Plugin/PDFInfo.pm: fix the "no such facility warn", triping the t/debug.t ------------------------------------------------------------------------ -r1838999 | kmcgrail | 2018-08-25 00:47:02 +0000 (Sat, 25 Aug 2018) | 1 +r1893513 | mmartinec | 2021-09-22 14:43:28 +0000 (Wed, 22 Sep 2021) | 1 line - Small fix for new6 bug - reported by ToddR, cPanel + t/all_modules.t: patterns must use distinct names, otherwise the report +is wrong ------------------------------------------------------------------------ -r1838992 | kmcgrail | 2018-08-24 23:58:13 +0000 (Fri, 24 Aug 2018) | 1 +r1893496 | mmartinec | 2021-09-21 12:35:10 +0000 (Tue, 21 Sep 2021) | 1 line - fixing Use of uninitialized value $file in File::Spec->catpath bug 7272 + Documentation mistake in Conf.pm ------------------------------------------------------------------------ -r1838856 | gbechis | 2018-08-24 13:39:02 +0000 (Fri, 24 Aug 2018) | 2 +r1892962 | gbechis | 2021-09-06 07:16:18 +0000 (Mon, 06 Sep 2021) | 2 lines - typo in optional module + Check for url shorteners in webforms ------------------------------------------------------------------------ -r1838854 | gbechis | 2018-08-24 13:29:27 +0000 (Fri, 24 Aug 2018) | 2 +r1892749 | gbechis | 2021-08-31 07:31:43 +0000 (Tue, 31 Aug 2021) | 2 lines - Mention Mail::SpamAssassin::Plugin::ResourceLimit + add a sub has_short_url to differentiate from unofficial plugin ------------------------------------------------------------------------ -r1838779 | kmcgrail | 2018-08-24 01:53:14 +0000 (Fri, 24 Aug 2018) | 1 -line +r1892748 | gbechis | 2021-08-31 06:47:18 +0000 (Tue, 31 Aug 2021) | 3 +lines - fixing an opt not freed. bug 7509 ------------------------------------------------------------------------- -r1838777 | kmcgrail | 2018-08-24 01:45:57 +0000 (Fri, 24 Aug 2018) | 1 -line + read URIs from pdf files and check them against dnsbl + bz #7579 - Reverting previous comment of return - bug 7191 comment 18 ------------------------------------------------------------------------ -r1838775 | kmcgrail | 2018-08-24 01:35:46 +0000 (Fri, 24 Aug 2018) | 1 -line +r1892724 | gbechis | 2021-08-30 09:29:01 +0000 (Mon, 30 Aug 2021) | 2 +lines - logic switch on spamd to fix the unlimited timeout option. bug 6748 ------------------------------------------------------------------------- -r1838771 | kmcgrail | 2018-08-24 00:45:27 +0000 (Fri, 24 Aug 2018) | 1 -line + reduce some fp - Adding ResourceLimits.pm plugin and dependency test for BSD::Resources ------------------------------------------------------------------------ -r1838645 | billcole | 2018-08-22 15:24:51 +0000 (Wed, 22 Aug 2018) | 1 -line +r1892560 | gbechis | 2021-08-24 07:46:25 +0000 (Tue, 24 Aug 2021) | 2 +lines - Restoring required -D flag so that the patterns & antipatterns can -actually work ------------------------------------------------------------------------- -r1838604 | kmcgrail | 2018-08-22 04:41:03 +0000 (Wed, 22 Aug 2018) | 1 -line + add a debug message - Minor version check robustness bug 7095 ------------------------------------------------------------------------ -r1838601 | kmcgrail | 2018-08-22 04:15:31 +0000 (Wed, 22 Aug 2018) | 1 -line +r1892554 | jhardin | 2021-08-24 01:24:00 +0000 (Tue, 24 Aug 2021) | 1 line - Adding info about rules being in root to manifest + Check whether is worthwhile. ------------------------------------------------------------------------ -r1838598 | kmcgrail | 2018-08-22 04:06:35 +0000 (Wed, 22 Aug 2018) | 1 -line +r1892540 | hege | 2021-08-23 08:49:51 +0000 (Mon, 23 Aug 2021) | 2 lines - Commenting a change accidentally committed for Bug 7095 ------------------------------------------------------------------------- -r1838597 | kmcgrail | 2018-08-22 03:56:32 +0000 (Wed, 22 Aug 2018) | 1 -line + More parameter sanitatation - rules, rulesrc and t.rules are only in trunk now ------------------------------------------------------------------------ -r1838596 | kmcgrail | 2018-08-22 03:55:49 +0000 (Wed, 22 Aug 2018) | 1 -line +r1892529 | jhardin | 2021-08-22 17:15:24 +0000 (Sun, 22 Aug 2021) | 1 line - prepping for 3.4.2 release + More low-contrast tuning ------------------------------------------------------------------------ -r1838594 | kmcgrail | 2018-08-22 02:27:45 +0000 (Wed, 22 Aug 2018) | 1 -line +r1892498 | jhardin | 2021-08-21 17:52:32 +0000 (Sat, 21 Aug 2021) | 1 line - Removing 3 experimental/devel plugins + FP Avoidance tuning ------------------------------------------------------------------------ -r1838591 | kmcgrail | 2018-08-21 23:53:30 +0000 (Tue, 21 Aug 2018) | 1 -line +r1892485 | jhardin | 2021-08-21 02:50:31 +0000 (Sat, 21 Aug 2021) | 1 line - Remove pretty command line in ps so pkill can work + Recognize font tag with negative size as tiny. Lots of low-contrast ham +in the masscheck corpora now, retire some poor metas and add some new +ones. ------------------------------------------------------------------------ -r1838588 | kmcgrail | 2018-08-21 23:22:01 +0000 (Tue, 21 Aug 2018) | 1 -line +r1892404 | gbechis | 2021-08-17 22:27:15 +0000 (Tue, 17 Aug 2021) | 2 +lines - Reminder not to leave -D ------------------------------------------------------------------------- -r1838586 | billcole | 2018-08-21 21:34:03 +0000 (Tue, 21 Aug 2018) | 1 -line + Extract uris from Office files, uris can then be accessed by URIDNSBL +and other plugins - tighten up patterns in t/dnsbl.t ------------------------------------------------------------------------ -r1838522 | gbechis | 2018-08-21 07:51:57 +0000 (Tue, 21 Aug 2018) | 2 +r1892255 | gbechis | 2021-08-12 06:26:27 +0000 (Thu, 12 Aug 2021) | 2 lines - Describe some of the code developed and to be released in 3.4.2 + make the check work even if Dkim is not available ------------------------------------------------------------------------ -r1838511 | billcole | 2018-08-20 23:48:03 +0000 (Mon, 20 Aug 2018) | 1 -line +r1892254 | gbechis | 2021-08-12 06:25:20 +0000 (Thu, 12 Aug 2021) | 2 +lines - Check for rules before using them in test ------------------------------------------------------------------------- -r1838509 | kmcgrail | 2018-08-20 23:32:03 +0000 (Mon, 20 Aug 2018) | 1 -line + fix Dmarc check with new Mail::DMARC versions - Updated committer and pmc list ------------------------------------------------------------------------ -r1838499 | billcole | 2018-08-20 21:45:37 +0000 (Mon, 20 Aug 2018) | 1 -line +r1892125 | jhardin | 2021-08-09 03:40:08 +0000 (Mon, 09 Aug 2021) | 1 line - backport trunk sa-compile and t/sa_compile.t fixes + FP Avoidance tuning ------------------------------------------------------------------------ -r1838491 | kmcgrail | 2018-08-20 20:52:44 +0000 (Mon, 20 Aug 2018) | 1 -line +r1892087 | jhardin | 2021-08-07 17:49:13 +0000 (Sat, 07 Aug 2021) | 1 line - rewrite of razor2 test and a sample email for testing + More image hosting sites being abused by spammers ------------------------------------------------------------------------ -r1838489 | kmcgrail | 2018-08-20 20:52:11 +0000 (Mon, 20 Aug 2018) | 1 -line +r1892060 | hege | 2021-08-07 09:05:03 +0000 (Sat, 07 Aug 2021) | 2 lines - rewrite of razor2 test and a sample email for testing ------------------------------------------------------------------------- -r1838485 | kmcgrail | 2018-08-20 20:07:49 +0000 (Mon, 20 Aug 2018) | 1 -line + Bug 7919, fix some more if-if-else bugs - removing prototype on bgread for PerlCritic ------------------------------------------------------------------------ -r1838443 | kmcgrail | 2018-08-20 17:39:25 +0000 (Mon, 20 Aug 2018) | 1 -line +r1892029 | jhardin | 2021-08-06 02:05:38 +0000 (Fri, 06 Aug 2021) | 1 line - moved rules and rules-extra to trunk-only for 3.4 and continue -streamlining build process + Add webp image format, it's starting to show up. Add more free image +hosting sites. More new-product spam tuning. ------------------------------------------------------------------------ -r1838429 | kmcgrail | 2018-08-20 14:20:05 +0000 (Mon, 20 Aug 2018) | 1 -line +r1892008 | hege | 2021-08-04 06:47:35 +0000 (Wed, 04 Aug 2021) | 2 lines - framework for 3.4.2 announcement ------------------------------------------------------------------------- -r1838390 | kmcgrail | 2018-08-19 16:14:03 +0000 (Sun, 19 Aug 2018) | 1 -line + Bug 7917, fix bad if-if-else - Fixing the MANIFEST ------------------------------------------------------------------------ -r1838387 | kmcgrail | 2018-08-19 16:13:01 +0000 (Sun, 19 Aug 2018) | 1 -line +r1892003 | jhardin | 2021-08-04 03:06:12 +0000 (Wed, 04 Aug 2021) | 1 line - Bug 7591 not using this faster untaint + More image hosting sites being abused by spammers ------------------------------------------------------------------------ -r1838374 | gbechis | 2018-08-19 10:10:16 +0000 (Sun, 19 Aug 2018) | 2 +r1891997 | gbechis | 2021-08-03 21:00:26 +0000 (Tue, 03 Aug 2021) | 2 lines - refactor some "require" code + move sub has_olemacro_redirect_uri to the correct place ------------------------------------------------------------------------ -r1838365 | gbechis | 2018-08-19 08:54:59 +0000 (Sun, 19 Aug 2018) | 2 -lines - - skip tests if GeoIP is installed but there are no databases available +r1891986 | gbechis | 2021-08-03 16:54:30 +0000 (Tue, 03 Aug 2021) | 1 line + Add a sub 'feature' for new OLEMacro redirect_uri sub ------------------------------------------------------------------------ -r1838364 | gbechis | 2018-08-19 08:52:11 +0000 (Sun, 19 Aug 2018) | 2 -lines +r1891977 | hege | 2021-08-03 09:35:51 +0000 (Tue, 03 Aug 2021) | 2 lines - better detection of GeoIP installed modules + Lint rule updates with 3.4.4 too, instead of just trunk ------------------------------------------------------------------------ -r1837877 | gbechis | 2018-08-11 18:33:18 +0000 (Sat, 11 Aug 2018) | 2 +r1891970 | gbechis | 2021-08-03 06:44:16 +0000 (Tue, 03 Aug 2021) | 3 lines - typo + Add a new "check_olemacro_redirect_uri" sub that checks + for Office files that redirects to potentially malicious uris ------------------------------------------------------------------------ -r1837876 | gbechis | 2018-08-11 18:23:51 +0000 (Sat, 11 Aug 2018) | 3 -lines - - close file descriptors when they are no more needed - probably only partial fix for #7587 +r1891951 | jhardin | 2021-08-01 20:18:07 +0000 (Sun, 01 Aug 2021) | 1 line + __URI_LONG_REPEAT hit on shorter repeat host+domain parts, spammers are +using shorter ones now ------------------------------------------------------------------------ -r1837466 | gbechis | 2018-08-05 13:39:41 +0000 (Sun, 05 Aug 2018) | 4 +r1891877 | gbechis | 2021-07-29 17:15:37 +0000 (Thu, 29 Jul 2021) | 2 lines - Starting from 04/01/2018 GeoLite Legacy databases have been -discontinued. - Add optional support to new Maxmind database type (GeoIP2). - fixes bz #7529 + unbreak linter on older version ------------------------------------------------------------------------ -r1837465 | gbechis | 2018-08-05 13:38:31 +0000 (Sun, 05 Aug 2018) | 8 +r1891861 | gbechis | 2021-07-28 19:28:23 +0000 (Wed, 28 Jul 2021) | 2 lines - Starting from 04/01/2018 GeoLite Legacy databases have been -discontinued. - Add optional support to new Maxmind database type (GeoIP2). - In addiction to that add support also to IP::Country::DB_File database; - IP::Country::DB_File database is created from official -Ripe/Arin/Afrinic/... - data, it's faster than IP::Country::Fast on updating a database and it -supports ipv6. - - fixes bz #7529 + typo: alias -> aliases ------------------------------------------------------------------------ -r1836883 | gbechis | 2018-07-28 09:38:39 +0000 (Sat, 28 Jul 2018) | 3 -lines - - Add possibility to match multiple rules - for a single uri, bz #7595 +r1891833 | jhardin | 2021-07-27 14:56:42 +0000 (Tue, 27 Jul 2021) | 1 line + FP Avoidance tuning ------------------------------------------------------------------------ -r1836855 | gbechis | 2018-07-27 18:03:13 +0000 (Fri, 27 Jul 2018) | 2 +r1891820 | gbechis | 2021-07-27 07:05:54 +0000 (Tue, 27 Jul 2021) | 2 lines - improve tests + Add [welcome,block]list_from_dkim and [welcome,block]list_from_uri_host ------------------------------------------------------------------------ -r1836516 | gbechis | 2018-07-23 21:23:37 +0000 (Mon, 23 Jul 2018) | 2 -lines - - Add Mail::SpamAssassin::Plugin::URILocalBL regression tests +r1891798 | jhardin | 2021-07-26 00:40:37 +0000 (Mon, 26 Jul 2021) | 1 line + More "new product" spam tuning, including more hosted image sites; +convert meta dependency to subrule; adjust SUBJ_BRKN_WORDNUMS ------------------------------------------------------------------------ -r1836275 | gbechis | 2018-07-19 14:19:48 +0000 (Thu, 19 Jul 2018) | 2 -lines - - Mail::SpamAssassin::Plugin::RelayCountry regression tests +r1891797 | jhardin | 2021-07-26 00:38:12 +0000 (Mon, 26 Jul 2021) | 1 line + Split FORGED_RELAY_MUA_TO_MX to subrule for metas and scored rule; if +only scored rule behaves too poorly to publish, the metas break ------------------------------------------------------------------------ -r1835030 | gbechis | 2018-07-03 22:20:19 +0000 (Tue, 03 Jul 2018) | 2 -lines - - make it work even if SA is not installed +r1891616 | jhardin | 2021-07-17 17:18:59 +0000 (Sat, 17 Jul 2021) | 1 line + subrule performance pretty good, expose scored FACEBOOK_IMG_NOT_RCVD_FB +with some FP Avoidance exclusions ------------------------------------------------------------------------ -r1834725 | gbechis | 2018-06-30 07:01:43 +0000 (Sat, 30 Jun 2018) | 2 -lines - - typo in man page +r1891602 | jhardin | 2021-07-17 02:05:24 +0000 (Sat, 17 Jul 2021) | 1 line + More new-product spammer tuning ------------------------------------------------------------------------ -r1834723 | gbechis | 2018-06-30 06:37:15 +0000 (Sat, 30 Jun 2018) | 3 +r1891584 | gbechis | 2021-07-16 12:51:44 +0000 (Fri, 16 Jul 2021) | 2 lines - correct syntax for GRANT with PostgreSQL - bz 7281 + check for an undefined value ------------------------------------------------------------------------ -r1834722 | gbechis | 2018-06-30 06:12:21 +0000 (Sat, 30 Jun 2018) | 5 -lines +r1891560 | jhardin | 2021-07-15 02:52:36 +0000 (Thu, 15 Jul 2021) | 1 line - remove an extra blank line put on the MIME-parts - array. That way the resultant email analized - by SA was a bit different from the original one. - bz 6708 + more new-product spam tuning +------------------------------------------------------------------------ +r1891460 | jhardin | 2021-07-11 21:28:27 +0000 (Sun, 11 Jul 2021) | 1 line + Add mime type subrules that may help detect Zloader ------------------------------------------------------------------------ -r1834452 | billcole | 2018-06-26 17:37:23 +0000 (Tue, 26 Jun 2018) | 1 -line +r1891436 | jhardin | 2021-07-10 19:25:00 +0000 (Sat, 10 Jul 2021) | 1 line - Test for bug 7591 + More new product spammer tuning ------------------------------------------------------------------------ -r1834327 | billcole | 2018-06-25 13:34:44 +0000 (Mon, 25 Jun 2018) | 1 -line +r1891390 | jhardin | 2021-07-09 03:21:32 +0000 (Fri, 09 Jul 2021) | 1 line - REALLY revert whitewash fix of t/idn_dots.t + Push TAGSTAT_IMG_NOT_RCVD_TGST. More new-product-spam tuning. ------------------------------------------------------------------------ -r1834325 | billcole | 2018-06-25 13:30:17 +0000 (Mon, 25 Jun 2018) | 1 -line +r1891371 | jhardin | 2021-07-08 01:13:03 +0000 (Thu, 08 Jul 2021) | 1 line - Revert whitewash fix of t/idn_dots.t + Add tagstat.com image hosting. More product spam tuning. ------------------------------------------------------------------------ -r1834218 | billcole | 2018-06-23 17:21:42 +0000 (Sat, 23 Jun 2018) | 1 -line +r1891340 | pds | 2021-07-07 08:10:26 +0000 (Wed, 07 Jul 2021) | 1 line - add 'use utf8' for older Perl + FP tweak ------------------------------------------------------------------------ -r1834151 | kmcgrail | 2018-06-22 18:09:19 +0000 (Fri, 22 Jun 2018) | 1 -line +r1891288 | jhardin | 2021-07-05 21:32:05 +0000 (Mon, 05 Jul 2021) | 1 line - Working on idn_dots.t test failures for RC4 + Add Tumblr-image-not-from-tumblr rule, spammers using tumblr-hosted +images. Fix copy-paste error in HOSTED_IMG_MULTI. minor rules and score +tuning. ------------------------------------------------------------------------ -r1833929 | gbechis | 2018-06-20 17:16:33 +0000 (Wed, 20 Jun 2018) | 3 -lines +r1891283 | hege | 2021-07-05 12:47:06 +0000 (Mon, 05 Jul 2021) | 2 lines - silence a warning if GeoIP v6 database is not installed - but a v6 address is on relay headers + Sanitize parameters ------------------------------------------------------------------------ -r1833660 | gbechis | 2018-06-17 09:41:02 +0000 (Sun, 17 Jun 2018) | 11 -lines +r1891234 | jhardin | 2021-07-03 17:41:58 +0000 (Sat, 03 Jul 2021) | 1 line - partial fix for bz 7529 - starting from 04/01/2018, Geolite legacy databases has been - discontinued and they will be no more updates. - Add a "country_db_type" option that will let the user choose - between GeoIP and IP::Country::Fast databases. - By default GeoIP is enabled and there is still a fallback - on IP::Country::Fast as in previuos implementation. + adding/tunning Alibaba spammer rules +------------------------------------------------------------------------ +r1891186 | jhardin | 2021-07-01 19:57:35 +0000 (Thu, 01 Jul 2021) | 1 line - IP::Country::Fast has no ipv6 support, so a better api - should be adopted sooner or later. + Push publication of a rule +------------------------------------------------------------------------ +r1891162 | jhardin | 2021-06-30 15:02:14 +0000 (Wed, 30 Jun 2021) | 1 line + FP avoidance tuning ------------------------------------------------------------------------ -r1833617 | billcole | 2018-06-15 17:33:15 +0000 (Fri, 15 Jun 2018) | 1 -line +r1891151 | jhardin | 2021-06-30 02:59:21 +0000 (Wed, 30 Jun 2021) | 1 line - Reverting prematurely-committed changes + Revive GB's __LINKED_IMG_NOT_RCVD_LINK with new URI pattern, in active +use; freshen some stale rules. ------------------------------------------------------------------------ -r1833615 | billcole | 2018-06-15 17:23:05 +0000 (Fri, 15 Jun 2018) | 1 -line +r1891047 | pds | 2021-06-25 21:28:43 +0000 (Fri, 25 Jun 2021) | 1 line - Corrected link to Pyzor documentation site, replacing OTHER dead SF link. + Adjust to use meta ------------------------------------------------------------------------ -r1832678 | gbechis | 2018-06-01 11:15:23 +0000 (Fri, 01 Jun 2018) | 2 -lines +r1891034 | jhardin | 2021-06-25 03:05:08 +0000 (Fri, 25 Jun 2021) | 1 line - fix custom headers length, fix another fp via Google Groups + FP Avoidance tuning +------------------------------------------------------------------------ +r1890951 | gbechis | 2021-06-21 21:21:58 +0000 (Mon, 21 Jun 2021) | 1 line + Mail::DMARC::PurePerl is needed for Dmarc plugin to work ------------------------------------------------------------------------ -r1831955 | gbechis | 2018-05-21 06:24:55 +0000 (Mon, 21 May 2018) | 2 +r1890950 | gbechis | 2021-06-21 21:17:48 +0000 (Mon, 21 Jun 2021) | 2 lines - more generic regexp to match ipv6 + missing file in MANIFEST ------------------------------------------------------------------------ -r1831837 | gbechis | 2018-05-18 09:04:10 +0000 (Fri, 18 May 2018) | 2 +r1890848 | jhardin | 2021-06-17 00:47:51 +0000 (Thu, 17 Jun 2021) | 1 line + + Add subrule for eval, may help reduce FPs +------------------------------------------------------------------------ +r1890825 | gbechis | 2021-06-15 22:39:15 +0000 (Tue, 15 Jun 2021) | 2 lines - Unbreak FORGED_GMAIL_RCVD + man page format fixes ------------------------------------------------------------------------ -r1831826 | gbechis | 2018-05-18 07:13:02 +0000 (Fri, 18 May 2018) | 2 +r1890811 | gbechis | 2021-06-15 15:20:54 +0000 (Tue, 15 Jun 2021) | 2 lines - Fix another fp on FORGED_GMAIL_RCVD rule + add a Dmarc.pm plugin to check for DMARC compliance ------------------------------------------------------------------------ -r1831443 | gbechis | 2018-05-11 19:44:30 +0000 (Fri, 11 May 2018) | 2 +r1890810 | gbechis | 2021-06-15 12:56:13 +0000 (Tue, 15 Jun 2021) | 2 lines - fix fp for FORGED_GMAIL_RCVD rule + allow needed dns queries ------------------------------------------------------------------------ -r1831329 | billcole | 2018-05-10 12:08:55 +0000 (Thu, 10 May 2018) | 1 -line +r1890669 | gbechis | 2021-06-10 09:20:08 +0000 (Thu, 10 Jun 2021) | 2 +lines - revert r1823175 ------------------------------------------------------------------------- -r1831273 | billcole | 2018-05-09 17:37:07 +0000 (Wed, 09 May 2018) | 1 -line + fix regression tests when BSD::Resource is not installed - Improve spamd PID detection with a fixed pidfile ------------------------------------------------------------------------ -r1831272 | billcole | 2018-05-09 17:35:07 +0000 (Wed, 09 May 2018) | 1 -line +r1890481 | jhardin | 2021-06-05 02:28:17 +0000 (Sat, 05 Jun 2021) | 1 line - Decouple mass-check from "base" perl + Spammers abusing another Amazon domain for hosting images ------------------------------------------------------------------------ -r1831073 | gbechis | 2018-05-07 06:37:50 +0000 (Mon, 07 May 2018) | 3 +r1890326 | gbechis | 2021-05-30 17:51:46 +0000 (Sun, 30 May 2021) | 2 lines - Enforce a C locale when logging to stder - bz #7305 + use pms to store flags ------------------------------------------------------------------------ -r1829671 | gbechis | 2018-04-20 17:45:03 +0000 (Fri, 20 Apr 2018) | 2 -lines +r1890324 | hege | 2021-05-30 09:53:08 +0000 (Sun, 30 May 2021) | 2 lines - Test spamc also with --option=value case + Do not hide error messages. Warn visibly if specifically requested +module failed to load. ------------------------------------------------------------------------ -r1829628 | gbechis | 2018-04-20 06:48:21 +0000 (Fri, 20 Apr 2018) | 3 +r1890323 | gbechis | 2021-05-30 09:45:17 +0000 (Sun, 30 May 2021) | 2 lines - too much free(3) will kill --reporttype=option handling - problem spotted by Reio Remma, thanks + fix sql syntax ------------------------------------------------------------------------ -r1829033 | gbechis | 2018-04-13 06:45:35 +0000 (Fri, 13 Apr 2018) | 5 +r1890322 | gbechis | 2021-05-30 08:49:17 +0000 (Sun, 30 May 2021) | 3 lines - Add an option to score uris per continent. - Possible continent codes are: - af, as, eu, na, oc, sa for Africa, Asia, Europe, North America, - Oceania and South America. + do not print backtrace if we cannot load an optional + module, re-enable now working test ------------------------------------------------------------------------ -r1828218 | kmcgrail | 2018-04-03 11:28:11 +0000 (Tue, 03 Apr 2018) | 1 -line +r1890317 | hege | 2021-05-30 05:14:19 +0000 (Sun, 30 May 2021) | 2 lines - Adding Manifest items fo3 3.42 ------------------------------------------------------------------------- -r1826916 | billcole | 2018-03-16 03:15:19 +0000 (Fri, 16 Mar 2018) | 1 -line + Enable normalize_charset by default (Bug 7656) - added optional support for SHA256 in addition to or instead of SHA1 -validation ------------------------------------------------------------------------ -r1826822 | gbechis | 2018-03-15 14:27:09 +0000 (Thu, 15 Mar 2018) | 2 +r1890313 | gbechis | 2021-05-29 19:51:18 +0000 (Sat, 29 May 2021) | 3 lines - fix for perl older than 5.24 + disable a test for the moment, + regression test fails if GeoIP2 module cannot be initialized. ------------------------------------------------------------------------ -r1826771 | gbechis | 2018-03-15 07:33:00 +0000 (Thu, 15 Mar 2018) | 4 +r1890312 | gbechis | 2021-05-29 19:48:39 +0000 (Sat, 29 May 2021) | 2 lines - If there are rules present in score but not in .cf files a warning is -printed, - shut up the warning. - bz 7535 + load DecodeShortURLs plugin as well ------------------------------------------------------------------------ -r1826742 | gbechis | 2018-03-14 17:36:30 +0000 (Wed, 14 Mar 2018) | 3 +r1890282 | gbechis | 2021-05-28 13:17:24 +0000 (Fri, 28 May 2021) | 2 lines - detect more http[s] url mismatches - bz 6977 + Cope with spammer changes, add a simpler rule for testing ------------------------------------------------------------------------ -r1826740 | gbechis | 2018-03-14 17:26:02 +0000 (Wed, 14 Mar 2018) | 2 -lines +r1890274 | hege | 2021-05-28 09:40:09 +0000 (Fri, 28 May 2021) | 15 lines - fix utf8 mode + Bug 7735 - Meta rules need to handle missing/unrun dependencies ------------------------------------------------------------------------- -r1826582 | billcole | 2018-03-12 17:49:59 +0000 (Mon, 12 Mar 2018) | 1 -line + - Meta rules no longer use priority values, they are evaluated +dynamically + when the rules they depend on are finished. - Update documentation of 'eval' rule method source, sanity-check method -calls. Fixes Bug #7558 ------------------------------------------------------------------------- -r1826356 | billcole | 2018-03-09 16:02:43 +0000 (Fri, 09 Mar 2018) | 1 -line + - API: New $pms->rule_pending() and $pms->rule_ready() functions. + $pms->rule_pending($rulename) must be called from rules eval-function, +if + the result can arrive later than when exiting the function (async + lookups). $pms->rule_ready($rulename) or $pms->got_hit(...) must be + called when the result has arrived. If these are not used, it can +break + depending meta rule evaluation. - Partial fix for bug 7558 ------------------------------------------------------------------------- -r1826202 | gbechis | 2018-03-08 10:48:04 +0000 (Thu, 08 Mar 2018) | 3 -lines + - API: Deprecated $pms->harvest_until_rule_completes, +$pms->is_rule_complete - add homedir parameter in dccproc call - RedHat bz 1532139 ------------------------------------------------------------------------ -r1826187 | gbechis | 2018-03-08 08:17:53 +0000 (Thu, 08 Mar 2018) | 3 +r1890266 | gbechis | 2021-05-28 08:04:45 +0000 (Fri, 28 May 2021) | 2 lines - fix utf8 decoding in some corner cases - bz 7520 + remove legacy "dynamic" rules and use proper 'eval' rules ------------------------------------------------------------------------ -r1826179 | billcole | 2018-03-08 06:41:57 +0000 (Thu, 08 Mar 2018) | 1 -line +r1890263 | hege | 2021-05-28 07:00:33 +0000 (Fri, 28 May 2021) | 2 lines - Fix for Bug #7557 ------------------------------------------------------------------------- -r1826177 | billcole | 2018-03-08 05:33:13 +0000 (Thu, 08 Mar 2018) | 1 -line + Some quick cleanups, check_dnsbl should be used instead of +parsed_metadata - Fix for bug #7556 ------------------------------------------------------------------------ -r1825725 | gbechis | 2018-03-02 13:57:33 +0000 (Fri, 02 Mar 2018) | 2 -lines +r1890261 | hege | 2021-05-28 04:56:38 +0000 (Fri, 28 May 2021) | 2 lines - Add HashBL (Email Blocklist (EBL), http://msbl.org/ebl.html) plugin, bz -#7548 + Fix typo ------------------------------------------------------------------------ -r1825185 | gbechis | 2018-02-24 00:37:46 +0000 (Sat, 24 Feb 2018) | 4 -lines +r1890258 | jhardin | 2021-05-28 01:38:46 +0000 (Fri, 28 May 2021) | 1 line - As per rfc 5322 the time zone is a required field, - so a date without time zone should be considered as invalid - bz #6894 + fix __RCVD_DOTGOV_EXT and __RCVD_DOTEDU_EXT +------------------------------------------------------------------------ +r1890257 | jhardin | 2021-05-28 01:34:32 +0000 (Fri, 28 May 2021) | 1 line + adjust score limit of RCVD_DOTEDU_SHORT and exclude ALL_TRUSTED ------------------------------------------------------------------------ -r1825177 | gbechis | 2018-02-23 22:50:32 +0000 (Fri, 23 Feb 2018) | 3 +r1890251 | gbechis | 2021-05-27 17:35:21 +0000 (Thu, 27 May 2021) | 2 lines - document when --mbox or --mbx parameters are needed - bz #6857 + Add DecodeShortURLs plugin to check urls hidden behind url shorteners ------------------------------------------------------------------------ -r1825175 | gbechis | 2018-02-23 22:44:45 +0000 (Fri, 23 Feb 2018) | 4 +r1890024 | gbechis | 2021-05-19 09:23:41 +0000 (Wed, 19 May 2021) | 2 lines - In OpenBSD /usr/sbin/sysctl is a symlink to /sbin/sysctl - fix path, no functional change - bz #7545 + remove rule with too many fp ------------------------------------------------------------------------ -r1825157 | gbechis | 2018-02-23 18:25:25 +0000 (Fri, 23 Feb 2018) | 5 +r1890021 | gbechis | 2021-05-19 07:18:39 +0000 (Wed, 19 May 2021) | 2 lines - Change a couple of die calls into warnings, - this way pyzor throws a python error, - all other async lookups are not aborted. - bz #7026 + avoid a division by zero error ------------------------------------------------------------------------ -r1825154 | gbechis | 2018-02-23 18:17:29 +0000 (Fri, 23 Feb 2018) | 3 -lines +r1889988 | hege | 2021-05-18 07:43:10 +0000 (Tue, 18 May 2021) | 2 lines - check for freemail for all emails in a Reply-To header - bz #6664 + Minor optimizations and cleanups ------------------------------------------------------------------------ -r1825032 | gbechis | 2018-02-22 08:20:37 +0000 (Thu, 22 Feb 2018) | 3 -lines +r1889987 | hege | 2021-05-18 07:35:35 +0000 (Tue, 18 May 2021) | 2 lines - Check if $socket is defined and print error accordingly - bz 7380 + Minor optimization ------------------------------------------------------------------------ -r1825018 | billcole | 2018-02-21 23:46:08 +0000 (Wed, 21 Feb 2018) | 1 -line +r1889986 | hege | 2021-05-18 07:32:52 +0000 (Tue, 18 May 2021) | 2 lines + + Minor optimizations - Group switching code for bugs #7554 and #7555 ------------------------------------------------------------------------ -r1824931 | gbechis | 2018-02-21 07:33:02 +0000 (Wed, 21 Feb 2018) | 2 +r1889964 | gbechis | 2021-05-17 16:54:58 +0000 (Mon, 17 May 2021) | 2 lines - Add an example of a rule that matches an ASN, bz 6929 + check for fake mailing lists headers ------------------------------------------------------------------------ -r1824688 | gbechis | 2018-02-18 18:35:40 +0000 (Sun, 18 Feb 2018) | 2 -lines +r1889951 | hege | 2021-05-17 10:20:41 +0000 (Mon, 17 May 2021) | 2 lines - fix all pod errors spotted in bz 7168 and many more + Minor optimizations ------------------------------------------------------------------------ -r1824577 | gbechis | 2018-02-17 09:47:43 +0000 (Sat, 17 Feb 2018) | 2 -lines +r1889937 | hege | 2021-05-16 18:21:39 +0000 (Sun, 16 May 2021) | 2 lines - Fix some regression tests on OpenBSD, bz 7499 + Try to clean up some of the setuid/setgid code ------------------------------------------------------------------------ -r1823276 | kmcgrail | 2018-02-06 06:05:37 +0000 (Tue, 06 Feb 2018) | 1 -line +r1889935 | hege | 2021-05-16 16:19:57 +0000 (Sun, 16 May 2021) | 2 lines - Bug 7418 - sa-update change to handle cross platform newline better ------------------------------------------------------------------------- -r1823274 | kmcgrail | 2018-02-06 05:10:42 +0000 (Tue, 06 Feb 2018) | 1 -line + Clean up get_user_groups(), tighten up group matching - Bug 7496 - speed up startup code ------------------------------------------------------------------------ -r1823205 | kmcgrail | 2018-02-05 16:13:03 +0000 (Mon, 05 Feb 2018) | 1 -line +r1889917 | hege | 2021-05-15 17:04:47 +0000 (Sat, 15 May 2021) | 2 lines - Clean-up of unmaintained tools and files that are only maintained in -trunk - see trunk-only/ ------------------------------------------------------------------------- -r1823175 | kmcgrail | 2018-02-05 14:10:22 +0000 (Mon, 05 Feb 2018) | 1 -line + Clean up get_user_groups(), tighten up group matching - Bug 7492 - switch from use vars to our cleanup ------------------------------------------------------------------------ -r1823171 | davej | 2018-02-05 13:34:29 +0000 (Mon, 05 Feb 2018) | 1 line +r1889752 | gbechis | 2021-05-11 10:03:17 +0000 (Tue, 11 May 2021) | 2 +lines - Bug 7417 ------------------------------------------------------------------------- -r1823142 | kmcgrail | 2018-02-05 09:10:12 +0000 (Mon, 05 Feb 2018) | 1 -line + another obfuscation tecnique using Google search spotted in the wild - Bug 7491 switch test framework to Test::More ------------------------------------------------------------------------ -r1823126 | kmcgrail | 2018-02-05 06:20:06 +0000 (Mon, 05 Feb 2018) | 1 -line +r1889744 | gbechis | 2021-05-11 06:42:44 +0000 (Tue, 11 May 2021) | 2 +lines - Bug 7481 - Adding build time specification of re2c binary ------------------------------------------------------------------------- -r1822650 | davej | 2018-01-30 14:19:37 +0000 (Tue, 30 Jan 2018) | 1 line + protect with ifplugin - Bug 6222 ------------------------------------------------------------------------ -r1822649 | davej | 2018-01-30 14:17:16 +0000 (Tue, 30 Jan 2018) | 1 line +r1889731 | hege | 2021-05-10 18:20:22 +0000 (Mon, 10 May 2021) | 2 lines - Bug 7540 ------------------------------------------------------------------------- -r1822483 | davej | 2018-01-28 22:40:16 +0000 (Sun, 28 Jan 2018) | 1 line + Disable duplicate rule merging per +https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7735#c12 - Bug 7534 ------------------------------------------------------------------------ -r1822467 | davej | 2018-01-28 16:03:13 +0000 (Sun, 28 Jan 2018) | 1 line +r1889728 | hege | 2021-05-10 17:38:12 +0000 (Mon, 10 May 2021) | 2 lines - Bug 6946. ------------------------------------------------------------------------- -r1821749 | davej | 2018-01-20 15:26:02 +0000 (Sat, 20 Jan 2018) | 1 line + Fix some anti_pattern logic - Bug 6946 ------------------------------------------------------------------------ -r1819502 | davej | 2017-12-29 18:37:34 +0000 (Fri, 29 Dec 2017) | 1 line +r1889714 | hege | 2021-05-10 04:41:31 +0000 (Mon, 10 May 2021) | 2 lines + + Hashing functions expect bytes - Bug 6420 ------------------------------------------------------------------------ -r1819497 | kmcgrail | 2017-12-29 15:20:04 +0000 (Fri, 29 Dec 2017) | 1 -line +r1889706 | hege | 2021-05-09 16:07:07 +0000 (Sun, 09 May 2021) | 2 lines + + Shave another 50ms from parsing - Bug 7525 - missing includes declarations in spamc ------------------------------------------------------------------------ -r1819449 | kmcgrail | 2017-12-28 23:14:24 +0000 (Thu, 28 Dec 2017) | 1 -line +r1889705 | hege | 2021-05-09 13:55:32 +0000 (Sun, 09 May 2021) | 2 lines + + Shave off 50ms parsing time - bug 7524 logic patch for getoptlong issues in spamc ------------------------------------------------------------------------ -r1819447 | kmcgrail | 2017-12-28 22:49:03 +0000 (Thu, 28 Dec 2017) | 1 -line +r1889704 | hege | 2021-05-09 13:47:33 +0000 (Sun, 09 May 2021) | 2 lines + + Shave off 50ms parsing time - Bug 6970 - adding t.co url shortener ------------------------------------------------------------------------ -r1819442 | kmcgrail | 2017-12-28 22:20:16 +0000 (Thu, 28 Dec 2017) | 1 -line +r1889682 | jhardin | 2021-05-08 16:31:44 +0000 (Sat, 08 May 2021) | 1 line - bug 7524 - opt cant be freed here or getoptlong fails + Expose RATWARE_MS_HASH and RATWARE_OUTLOOK_NONAME to ruleqa due to +reported FPs using the fixed scoring and apparent rule staleness. ------------------------------------------------------------------------ -r1816710 | kmcgrail | 2017-11-30 12:46:21 +0000 (Thu, 30 Nov 2017) | 1 -line +r1889669 | hege | 2021-05-08 10:00:28 +0000 (Sat, 08 May 2021) | 2 lines + + Apply dns_query_restriction to SPF/DKIM queries - Bug 7509 - free for spamc opt ------------------------------------------------------------------------ -r1815854 | jhardin | 2017-11-20 20:54:17 +0000 (Mon, 20 Nov 2017) | 1 line +r1889668 | hege | 2021-05-08 09:59:52 +0000 (Sat, 08 May 2021) | 2 lines + + No reason for domain_to_search_list to return empty last value - Bug 7437 - fix issues with parsing a message having an unclosed HTML - + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + Pass it on... + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + M E D I A U N S P U N
+ + + + + + + What the Press is Reporting and Why (www.mediaunspun.com) + + + + + +
+ + + + + + + + Wednesday, August 14, 2002 + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + +
Top Spins... + + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + SEC Exposes Big Blue's Pink Slips + + + + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + Synergy and Betrayal at Vivendi + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + Other Stories + + + + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 + + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Media Unspun serves business news and analysis, authoritatively and irreverently, every business day. An annual subscription costs $50, less than a dollar a week. If your four-week free trial is coming to an end soon, please visit http://www.mediaunspun.com/subscribe.html and sign up via credit card or check.
+

+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Sponsor + +
+ + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Ken Fisher offers his Quarterly Report for high net worth investors FREE of cost & without obligation. Access the same investment research he uses to guide his clients at:
+http://pcg.fisherinvestments.com/newrespond/letter.asp?site=UNSP&KC=1229EFCAD0000

+ +
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + SEC Exposes Big Blue's Pink Slips + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Does the Securities and Exchange Commission have a press pass yet? It seems to be bringing us all our news lately. On the day of the deadline for companies to certify their financial statements with the SEC, the business press squirmed and waited for the next Enron or WorldCom. (We might eat these words tomorrow, but we doubt it.) In an unrelated confession, IBM gave the commission its latest layoff numbers.

+IBM talked about pink slips during its second-quarter earnings report, but with a vagueness worthy of your daily horoscope. ("Capricorn: Career changes may be on their way...") Only after "months of surreptitious layoff notices" did the company admit that it's cutting more than 15,600 jobs, said the AP. That's about 5% of its workforce, and a lot more than pundits expected. An IBM spokesperson told the Wall Street Journal the higher number was due to "rebalancing" and more employees than +expected taking voluntary layoffs.

+Sorry, we're still back on "rebalancing." Did IBM "rightsize" last quarter, too?

+IBM's news was still trickling out Wednesday morning, but some details were available. About 1,400 workers got cut from IBM's microelectronics unit, and most of the rest were from IT services and consulting. (That ought to make IBM's new employees from PricewaterhouseCoopers feel all warm and fuzzy inside.) Look for news updates from cities that will see the cuts, such as Austin and Raleigh.

+OK, none of this is good. Two years into the tech slump, we're still tired of seeing people get sacked. But was it really so bad that IBM only revealed it because of new accounting regulations? Nah, Big Blue was always known for "stealth layoffs," as CNN put it, but current corporate scrutiny forced it to 'fess up for once. Until now, IBM would acknowledge the latest layoffs if reporters called and asked, but wouldn't give specifics. Yeesh. - Jen Muehlbauer

+IBM Cut 5% of Staff in Period, Double the Expected Number
+http://online.wsj.com/article/0,,SB1029282408667791835,00.html
+(Paid subscription required.)

+IBM to Cut Over 15,000 Employees (AP)
+http://tinyurl.com/10kz

+IBM confirms 15,600 job cuts (Reuters)
+http://www.msnbc.com/news/793777.asp

+IBM cutting 15,000 jobs
+http://news.com.com/2100-1001-949677.html

+IBM job cuts exceed 15,600
+http://money.cnn.com/2002/08/13/technology/ibm/index.htm

+IBM puts job cuts at 15,600, with fewer than 50 in this state
+http://seattlepi.nwsource.com/business/82508_ibm14.shtml

+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Sponsor + +
+ + +
+ + + + + + + + + + + + + +
+ + + + + + + + You've heard about identity management, but do you know about the opportunities and business models that will emerge as a result? Download a free executive summary of Esther Dyson's coverage of identity management in Release 1.0. Learn more about the expanding market for these services and applications. + +
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + Synergy and Betrayal at Vivendi + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Synergy always was a fuzzy concept. Now Vivendi Universal's top man has slammed the lid on it. The French company announced today that it's ready to peddle $9.8 billion in assets to rustle up some cash. First up on the block? Synergy-less U.S. book publisher Houghton Mifflin.

+It's unclear whether new chairman Jean-Rene Fourtou has genuine turnaround muscle, or whether he and Vivendi's board are simply following the winds of post-merger fashion. But when you owe $18.7 billion, you get real practical, real fast. The Guardian reported that Vivendi's share price sank 5% on Tuesday when investors got the willies about the company's impending announcement on its financial health. But the company had positive news to report: It's making money. Revenue in the first half was +up 13%, higher than analysts' estimates of a 7.7% boost.

+Details are scant on the breadth of Fourtou's restructuring efforts, with more information expected at the next board meeting on September 25, according to reporters. Houghton Mifflin, acquired a year ago for $1.7 billion, and a vague explanation that included the "Curious George" character, were the only properties named for sale so far. The Guardian speculated that Vivendi will also sell its U.S. video games business and possibly its stake in the French mobile phone company SFR, a debatable +sale because of the cash it generates, according to the newspaper.

+Meanwhile, Fourtou's predecessor, Jean-Marie Messier, continues to advocate empire-building. The New York Post said its sources say Messier hopes his former employer will feel generous enough to let him continue to reside in his $17 million Manhattan abode. And Bloomberg reported earlier this week that an unrepentant Messier is penning a memoir as he vacations in the Mediterranean. The working title? "How I Was Betrayed." - Deborah Asbrand

+Vivendi to Sell Publisher Houghton Mifflin (Reuters)
+http://www.washingtonpost.com/wp-dyn/articles/A15954-2002Aug14.html

+Vivendi investors expect the worst
+http://www.guardian.co.uk/business/story/0,3604,774190,00.html

+Vivendi to Sell $9.8 Billion In Assets, Including Houghton
+http://online.wsj.com/article/0,,SB102931297119161715,00.html
+(Paid subscription required.)

+Ousted Messier Aims To Score $17m Vivendi Pad
+http://www.nypost.com/business/54701.htm

+Ex-Chief of Vivendi Plans Tell-All Book (Bloomberg)
+http://www.nytimes.com/2002/08/12/business/media/12VIVE.html

+ +
+ + + +
+ + + + + + + + + + Other Stories + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

A Top AOL Manager Has Left Company
+http://www.nytimes.com/2002/08/14/technology/14AOL.html

+Fed Holds Steady on Interest Rates
+http://www.washingtonpost.com/wp-dyn/articles/A14636-2002Aug13.html

+Amtrak halts all high-speed service after finding cracks
+http://www.sunspot.net/bal-te.train14aug14.story

+AOL lets resigning exec keep stock options
+http://www.usatoday.com/money/industries/technology/2002-08-13-aol-pittman_x.htm

+Lucent licensing deal with Winstar focus of probe (AP)
+http://www.bayarea.com/mld/mercurynews/business/3861117.htm

+Study Says Net Could Benefit Music Firms
+http://www.latimes.com/business/la-fi-music14aug14.story

+Eisner Crimping His Own Style
+http://www.latimes.com/business/la-fi-disney14aug14.story

+Severance claims by Enron former execs anger ex-workers
+http://www.chron.com/cs/CDA/story.hts/business/1533657

+Princeton removes dean after Yale Web site flap (AP)
+http://www.siliconvalley.com/mld/siliconvalley/3857890.htm

+Frisbee golf creator dies, may land on someone's roof (SF Chronicle)
+http://seattlepi.nwsource.com/national/82560_frisbee14.shtml

+Will Kinsley's Slate Get Wiped?
+http://www.ojr.org/ojr/kramer/1029281360.php

+Hollywood, Russian Bicker Over Bass
+http://www.cnn.com/2002/SHOWBIZ/News/08/13/bassspace.hollywood.ap/

+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Sponsor + +
+ + +
+ + + + + + + + + + + + + +
+ + + + + + + + Do you want to reach the Net's savviest audience?
+Advertise in Media Unspun.
+Contact Erik Vanderkolk for details at erikvanderkolk@yahoo.com today. + +
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + Staff + + + + + + + + + +
+ + + + + + + + Written by Deborah Asbrand (dasbrand@world.std.com), Keith Dawson (dawson@world.std.com), Jen Muehlbauer (jen@englishmajor.com), and Lori Patel (loripatel@hotmail.com). +

+Copyedited by Jim Duffy (jimduffy86@yahoo.com). +

+Marketing: Cowpoke Productions (cowpokeproductions.com). +

+Advertising: Erik Vanderkolk (erikvanderkolk@yahoo.com). +

+Editor and publisher: Jimmy Guterman (guterman@vineyard.com). +

+Media Unspun is produced by The Vineyard Group Inc. +
Copyright 2002 Media Unspun, Inc., and The Vineyard Group, Inc. +
Subscribe already, willya? http://www.mediaunspun.com +

+Redistribution by email is permitted as long as a link to http://newsletter.mediaunspun.com is included. + +
+ + + +

+ +
+ + + + + + + + + + + + + + + + + + 		+ + + + + + + + + + + + + + + + +
+ + + +
+ + + SUBSCRIBE + + +
+ + + + + + + + + + + + + + + + +
+ +

+ Enter your email address in the box below to receive a free four-week trial of Media Unspun: +

+ + + + + + + + + + + + + + + + + + + + + + + + + +

+
+ + + + + Add + + + + + + Remove
+ + + + SendasHTML
+ + +   + +

+ + + +
+ + +
+
+


Newsletter Services
Provided by
iMakeNews.com

 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + TELL A FRIEND + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
Powered by iMakeNews.com™
+ This email was sent to: xxxxx@yyyyyy.zzz
Click here to be instantly removed from this list.
Click here to receive future messages in plain text format.
Click here to change your subscriber information and preferences.
+ + + + + + + + +

  + + + + + +

+ + + + + +
+ + + + + + + +------------=_1029331990-31627-4-- + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/mlist_mailman_message spamassassin-4.0.0~rc3/t/data/welcomelists/mlist_mailman_message --- spamassassin-3.4.6/t/data/welcomelists/mlist_mailman_message 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/mlist_mailman_message 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,95 @@ +Received: from usw-sf-list2.yyyyyyyyyyyy.net (usw-sf-fw2.yyyyyyyyyyyy.net + [216.136.171.252]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id + g7HFlZ603002 for ; Sat, 17 Aug 2002 16:47:35 +0100 +Received: from usw-sf-list1-b.yyyyyyyyyyyy.net ([10.3.1.13] + helo=usw-sf-list1.yyyyyyyyyyyy.net) by usw-sf-list2.yyyyyyyyyyyy.net with + esmtp (Exim 3.31-VA-mm2 #1 (Debian)) id 17g5m8-000654-00; Sat, + 17 Aug 2002 08:46:04 -0700 +Received: from dogma.slashnull.org ([212.17.35.15]) by + usw-sf-list1.yyyyyyyyyyyy.net with esmtp (Exim 3.31-VA-mm2 #1 (Debian)) id + 17g5lM-0005xL-00 for ; + Sat, 17 Aug 2002 08:45:16 -0700 +Received: (from apache@localhost) by dogma.slashnull.org (8.11.6/8.11.6) + id g7HFj8h02977; Sat, 17 Aug 2002 16:45:08 +0100 +X-Authentication-Warning: dogma.slashnull.org: apache set sender to + zzzzzz@zzzzzz.org using -f +Received: from 194.125.173.146 (SquirrelMail authenticated user zzzzzz) by + zzzzzz.org with HTTP; Sat, 17 Aug 2002 16:45:08 +0100 (IST) +Message-Id: <33025.194.125.173.146.1029599108.squirrel@zzzzzz.org> +From: "Justin Mason" +To: SpamAssassin-talk@lists.yyyyyyyyyyyy.net +X-Mailer: SquirrelMail (version 1.0.6) +MIME-Version: 1.0 +Content-Type: text/plain; charset=iso-8859-1 +Content-Transfer-Encoding: 8bit +Subject: [SAtalk] spam-phrases existing algo +Sender: spamassassin-talk-admin@lists.yyyyyyyyyyyy.net +Errors-To: spamassassin-talk-admin@lists.yyyyyyyyyyyy.net +X-Beenthere: spamassassin-talk@lists.yyyyyyyyyyyy.net +X-Mailman-Version: 2.0.9-sf.net +Precedence: bulk +List-Help: +List-Post: +List-Subscribe: , + +List-Id: Talk about SpamAssassin +List-Unsubscribe: , + +List-Archive: +X-Original-Date: Sat, 17 Aug 2002 16:45:08 +0100 (IST) +Date: Sat, 17 Aug 2002 16:45:08 +0100 (IST) + +BTW, I should not that this algorithm Paul Graham uses is +very close to what we've got in spam-phrases code already. + +To turn it into pcode: + + mass-check for spamphrases: + + - get mail body, strip HTML, attachments and mail formatting + - strip stopwords ("to", "of", "a" etc.) + - find pairs of 3-20 letter words + - foreach pair: + - skip pair if one word is in stoplist of common terms + - ++ the frequency of that word-pair + + settle-phrases -- turn mass-check results into a spamphrases file + + - read all spam word-pairs, let NS = number of word-pairs + - read all nonspam word-pairs, let NN = number of word-pairs + - let bias = NS / NN (compensates for different corpus size) + - foreach nonspam word-pair: + - wpfreq = (freq in spam) - (frequency in nonspam * bias) + - foreach spam word-pair: + - if (wordpair was not found in nonspam): + - wpfreq *= 10 + - note the highest score of all rules + + scoring of an incoming message: + + - get mail body, strip HTML, attachments and mail formatting + - strip stopwords ("to", "of", "a" etc.) + - find pairs of 3-20 letter words + - foreach pair: + - score += ((wpfreq*10) / highest_score_of_all_rules) + - foreach "!" found in text: + - score++ + - return result as "spam phrase score". + +So it's quite close to PG's algo, but he also tracks the non-spam +word-pairs -- which we don't do for SpamAssassin, because they +overfit to the mass-checker's nonspam mail corpus (generally +names of friends, etc.) + +--j. + + + +------------------------------------------------------- +This sf.net email is sponsored by: OSDN - Tired of that same old +cell phone? Get a new here for FREE! +https://www.inphonic.com/r.asp?r=yyyyyyyyyyyy&refcode1=vs3390 +_______________________________________________ +Spamassassin-talk mailing list +Spamassassin-talk@lists.yyyyyyyyyyyy.net +https://lists.yyyyyyyyyyyy.net/lists/listinfo/spamassassin-talk diff -Nru spamassassin-3.4.6/t/data/welcomelists/mlist_yahoo_groups_message spamassassin-4.0.0~rc3/t/data/welcomelists/mlist_yahoo_groups_message --- spamassassin-3.4.6/t/data/welcomelists/mlist_yahoo_groups_message 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/mlist_yahoo_groups_message 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,138 @@ +Received: from dogma.slashnull.org (dogma.slashnull.org [212.17.35.15]) + by sonic.xxxxxxxxx.org (Postfix) with ESMTP id 9424D132505 + for ; Thu, 1 Aug 2002 14:21:59 -0700 (PDT) +Received: from intm3.sparklist.com (intm3.sparklist.com [207.250.144.9]) + by dogma.slashnull.org (8.11.6/8.11.6) with SMTP id g71LMw230398 + for ; Thu, 1 Aug 2002 22:22:58 +0100 +Date: Thu, 2 May 2002 00:02:49 +1200 +Subject: [Sigiii-l] [InfoInternational] REINBERGER FOUNDATION GIFT +To: +From: "Biju K Abraham" +Message-Id: +MIME-Version: 1.0 +Content-type: multipart/alternative; boundary="------=_NextPart_000_0146_01C1F16C.B224C240" + +------=_NextPart_000_0146_01C1F16C.B224C240 +Content-Type: text/plain; + charset="iso-8859-1" +Content-Transfer-Encoding: quoted-printable + +REINBERGER FOUNDATION GIFT TO=20 +KENT STATE UNIVERSITY SLIS=20 + +Kent State University's School of Library and Information Science +received a gift of $240,000 from the Reinberger Foundation of Cleveland +for the construction of a unique national center dedicated to training libr= +arians who=20 +specialize in services for children, young adults and school +librarianship. The gift was announced in anticipation of National +Library Week (April 14-20).=20 +=20 +"The Children's Resource Center will offer an environment similar to +achildren's or elementary school library complete with books, +multimedia, puppets and a storytelling area," said Associate Professor +Dr. Carolyn S.Brodie, who has built the School of Library and +Information Science's collection of materials for youth, and is a +co-recipient of the Reinberger gift. Brodie recently served as chair of +the 2000 John Newbery Award Committee.=20 +=20 +The Children's Resource Center will be unique among the nation's library +schools and will serve as a model classroom for library science programs +for children's librarians. The Center is designed to be much more than a +university classroom and will include a children's + resource area that will house more than=20 +5,000 children's books, materials, and resources to +create a focal point for instruction in children's, young adult, and +school librarianship.=20 + +The 1,700-square-foot resource center will also +include a wireless computer network installed with specialized software +and other resources used in children's and school libraries. For more +information contact Megan Harding, (330) 672-0419.=20 + + - Moderator - + + +------=_NextPart_000_0146_01C1F16C.B224C240 +Content-Type: text/html; charset=US-ASCII +Content-Transfer-Encoding: 7bit + + + + + + + + + + +
REINBERGER FOUNDATION GIFT TO +
+
KENT STATE UNIVERSITY SLIS
+

Kent State University's School of +Library and Information Science
received a gift of $240,000 from the Reinberger Foundation of Cleveland
for +the construction of a unique national center dedicated to training librarians +who
specialize in services for children, young adults and +school
librarianship. The gift was announced in anticipation of +National
Library Week (April 14-20).
 
"The Children's Resource +Center will offer an environment similar to
achildren's or elementary school +library complete with books,
multimedia, puppets and a storytelling area," +said Associate Professor
Dr. Carolyn S.Brodie, who has built the School of +Library and
Information Science's collection of materials for youth, and is +a
co-recipient of the Reinberger gift. Brodie recently served as chair +of
the 2000 John Newbery Award Committee.
 
The Children's Resource Center will be unique among the +nation's library
schools and will serve as a model classroom for library +science programs
for children's librarians. The Center is designed to be much +more than a
university classroom and will include a children's
+
 resource area that will house +more than
+
5,000 children's books, materials, and +resources to
create a focal point for instruction in children's, young adult, +and
school librarianship.
+
 
+
The 1,700-square-foot resource center +will also
include a wireless computer network installed with specialized +software
and other resources used in children's and school libraries. For +more
information contact Megan Harding, (330) +672-0419. 
+
 - +Moderator -
+
+ + + + + + + + + + + +
Yahoo! Groups Sponsor
ADVERTISEMENT
+ + + + +
+ +To unsubscribe from this group, send an email to:
+InfoInternational-unsubscribe@yahoogroups.com
+
+ +
+ +
+Your use of Yahoo! Groups is subject to the Yahoo! Terms of Service. +
+ + + +------=_NextPart_000_0146_01C1F16C.B224C240-- + diff -Nru spamassassin-3.4.6/t/data/welcomelists/mypoints spamassassin-4.0.0~rc3/t/data/welcomelists/mypoints --- spamassassin-3.4.6/t/data/welcomelists/mypoints 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/mypoints 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,22 @@ +Return-Path: +Delivered-To: zzz-zzzzzzz@fffffffff.org +Received: (qmail 6475 invoked by uid 505); 20 Jun 2002 02:01:31 -0000 +Received: from mpmail@mpmlbx06.mypoints.com by zzzzzz.fffffffff.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.243337 secs); 20 Jun 2002 02:01:31 -0000 +Received: from mpmlbx06.mypoints.com (216.33.87.173) + by dsl092-072-213.bos1.dsl.speakeasy.net with SMTP; 20 Jun 2002 02:01:30 -0000 +Received: (from mpmail@localhost) + by mpmlbx06 (8.11.0/8.11.0) id g5K1onT23615; + Wed, 19 Jun 2002 20:50:49 +Date: Wed, 19 Jun 2002 20:50:49 +Message-ID: <2002619205049.g5K1onT23615@mpmlbx06> +To: zzz-zzzzzzz@fffffffff.org +From: BonusMail from MyPoints +Reply-To: BonusMailReply@mypoints.com +Subject: New Deals Just Added! Massive Sheet Liquidation--Now Save up to 84%! +X-Indiv: y6f6f69de10d97c7a932zzc3902bf5331 +X-JobID: 107974 +MIME-Version: 1.0 +Content-Type: text/html;charset=us-ascii +Content-Transfer-Encoding: 7bit + +[MyPoints newsletter] diff -Nru spamassassin-3.4.6/t/data/welcomelists/neat_net_tricks spamassassin-4.0.0~rc3/t/data/welcomelists/neat_net_tricks --- spamassassin-3.4.6/t/data/welcomelists/neat_net_tricks 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/neat_net_tricks 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,205 @@ +From bounce-neatnettricks-1234567@silver.lyris.net Thu Aug 15 10:51:10 2002 +Return-Path: +Delivered-To: aaa@localhost.netnoteinc.com +Received: from localhost (localhost [127.0.0.1]) + by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 8448D43C4F + for ; Thu, 15 Aug 2002 05:49:35 -0400 (EDT) +Received: from phobos [127.0.0.1] + by localhost with IMAP (fetchmail-5.9.0) + for aaa@localhost (single-drop); Thu, 15 Aug 2002 10:49:35 +0100 (IST) +Received: from silver.lyris.net (silver.lyris.net [216.91.57.32]) by + dogma.slashnull.org (8.11.6/8.11.6) with SMTP id g7ENU3408604 for + ; Thu, 15 Aug 2002 00:30:03 +0100 +Message-Id: +X-Sender: jteems@rap.midco.net@pop.midco.net +X-Mailer: QUALCOMM Windows Eudora Version 5.1 +Date: Wed, 14 Aug 2002 16:20:00 -0700 +To: aaaaaa@yyyyyy.zzz +From: NNT@silver.lyris.net +Subject: Neat Net Tricks Standard Issue 131 - August 15, 2002 +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii"; format=flowed +List-Unsubscribe: +Reply-To: NNT@silver.lyris.net +X-Pyzor: Reported 0 times. + +IN THIS ISSUE: + +01. Secure IE +02. Disk cleanup on XP +03. Thanks but no thanks +04. Mouseless way home +05. Kartoo +06. XP time feature +07. Leaf Peeper Alert +08. Saving scraps +09. Quick access +10. Don't believe your email + +And What's Coming Up Next Week in NNT Premium + +01. SECURE IE. For the past month or so, our Software Review Panel has +been giving a grueling test to Secure IE, a piece of software that blocks +Flash and pop-ups, prevents malicious file downloads, lets you customize +Security Zone settings as you browse dozens of Web sites simultaneously up +to five times faster with a tabbed interface, annotate Web page with sticky +notes and highlighter, and save complete Web pages, even secure server +(HTTPS) pages and archive online transaction receipts. For what we believe +is one of the most thorough reviews ever conducted on a single piece of +software, check out what our Panel had to say at +http://www.NeatNetTricks.com/SoftwareReviews . For a free trial download, +visit http://www.secureie.com . And if this one sweeps you off your feet, +go to the NNT Store at http://www.NeatNetTricks.com/store and get a super +deal, just $17.50 if you order before September 14. With a 30-day +guarantee, what's to lose? + +02. DISK CLEANUP ON XP. Windows XP users can do some fast cleaning chores +with Disk Cleanup. Access this tool from the Start menu by right clicking +on your hard drive. Then select Properties and click on the Disk Cleanup +button to determine how many files can be safely deleted. + +03. THANKS BUT NO THANKS. Continuing our periodic feature of +less-than-useful sites on the Web: The International Center for Bathroom +Etiquette at http://www.icbe.org/ gets our recognition this issue. It says +it's working hard to bring you the latest in cutting edge research and +technology regarding bathroom etiquette. We'll resist some obvious puns. + +. . . . . + +West Virginia's Diane Stratton recommended NNT to some friends and is now +enjoying QuicKeys 2.0, a great Windows management software package. Diane +is our latest winner and you could be next. Just go to the NNT Web site at +http://www.NeatNetTricks.com and click on "Recommend NNT." Nothing could +be easier. + +. . . . . + +04. MOUSELESS WAY HOME. To go home quickly in Internet Explorer, touch F6 +to highlight the Address Bar and type two periods (..) there. The Enter +key then takes you home. + +05. KARTOO. Search engines are everywhere on the Internet but Kartoo at +http://www.kartoo.net is quite unusual. It's a meta search engine that +displays results on a map in the form of a ball. The larger the ball, the +more relevant the result. As you mouseover each result, site descriptions +are revealed. If all that sounds confusing, the explanation is more +complicated than the service itself. Just try it. + +. . . . . + +You should make it a habit to visit the NNT Store at +http://www.NeatNetTricks.com/store . We try to have several great products +there at a limited-time price much less than anywhere else on the Net. +Currently, you'll find excellent ebooks, a very effective popup stopper, +and the very useful utility described in item 01 above, along with the +usual opportunity to subscribe to NNT Premium and ArchivesExpress. Check +us out, you'll be glad you did. + +. . . . . + +06. XP TIME FEATURE. Windows XP added a nice feature that heretofore +required a separate software application. It will connect, either at a +programmed time or manually, to a time server via the Internet and reset +that often erroneous internal clock. Just click on the time in the systems +tray, go to Date and Time Properties and click the Internet Time tab. + +07. LEAF PEEPER ALERT. A bit early, but soon the changing colors of autumn +will begin here in the U.S. For those who like to follow the display, +consider http://www.stormfax.com/foliage.htm for a comprehensive collection +of links and toll-free numbers to each state to determine peak color times. + +08. SAVINGS SCRAPS. Some oldies are worth repeating. If you're working +with text in, for example, MS Word or WordPad, and would like a handy way +to save a portion for later easy retrieval, just select (highlight) it and +click/drag it to your desktop. When the newly created icon is clicked on, +it will show the application with which the scrap was created, along with +the first few words of the text. A double click opens the text in the +application with which it was created. + +09. QUICK ACCESS. To go to a frequently used program, you may find +yourself drilling down to the desktop and searching out the shortcut +icon. Consider instead setting up a key combination that will provide +quick access without using the shortcut. Right click on the shortcut and +select Properties. In the Shortcut key window, select any key you can +remember and click OK. Ctrl+Alt and that key will open the application +whenever needed. + +10. DON'T BELIEVE YOUR EMAIL. We've been asked about those emails with +virus attachments that appear to be coming from NNT, asking for a +confirmation of a subscription. Don't believe it, and don't open the +attachments. Maybe this exchange between NNT and Lyris (our mail manager) +will clear things up: + +NNT: Is there anything that can be done about the current strains of virus +that implant on address books and randomly send email asking alleged +subscribers to verify their subscription (when they haven't subscribed at +all)? I've received some of these as well, and I know it's become a +widespread problem with other ezine publishers, creating a lot of ill will +all around. Is there some configuration that we could change to keep +these from going out except to legitimate subscribers? + +Lyris: Unfortunately, there isn't much we can do about this since it +isn't actually ListManager doing the sending. The real problem is that +people sometimes will add the "join" address to their address book and +that is what causes the problems. The best we can do is advise people not +to have their address books set to automatically add any email address +that they send a message to even once. The main culprit here seems to be +Outlook Express. + +WHAT'S COMING NEXT WEEK: Another batch of Neat Net Tricks in the Premium +issue, including: + +* A great collection of information and free downloads to make your system +more secure. + +* Free software to measure and display your real-time Internet speed. + +* Can you handle still another popup stopper - that's interference free - +and at no cost? + +* An easy-to-use tool to store and arrange all your passwords, user IDs, +and other info. + +* A Microsoft Word tip to easily work around that pesky autocompletion +feature. + +* A whole arsenal of tools to combat spam. + +* Software that provides more than 200 interesting facts about your +computer and displays about your CPU, memory, operating system, and your +computer's power source. + +* Our in-depth article discusses how to best manage our important +passwords and get out of trouble when we -inevitably - forget those passwords. + +And more! If you haven't subscribed yet, you won't find a better source of +useful information for just 42 cents per issue. That's $10 for a year's +worth - 24 issues - at the NNT Store, http://www.NeatNetTricks.com/store . + +. . . . . . + +NNT makes no endorsement or warranty, expressed or implied, with regard to +featured products or services. Results may vary based on operating systems +and other variables beyond our control. + +For info on how to subscribe, unsubscribe, or change your address, send a +blank email to info-neatnettricks@silver.lyris.net . + +Sponsor an entire issue of NNT with your exclusive message to our readers +at very low rates. Send a blank email to +advertise-neatnettricks@silver.lyris.net . + +Comments or questions about your computer and the Internet? Visit the NNT +Bulletin Board at http://www.escribe.com/computing/neatnettricks/bb/ . + +NNT is hosted by Lyris.com, the best in email list management. + +Copyright 2002 by Jack Teems. All rights reserved. Neat Net Tricks is +registered with the U.S. Library of Congress ISSN: 1533-4619. + + +--- +You are currently subscribed to neatnettricks as: aaaaaa@yyyyyy.zzz +To unsubscribe send a blank email to leave-neatnettricks-1234567K@silver.lyris.net + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/netcenter-direct_de spamassassin-4.0.0~rc3/t/data/welcomelists/netcenter-direct_de --- spamassassin-3.4.6/t/data/welcomelists/netcenter-direct_de 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/netcenter-direct_de 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,414 @@ +Return-Path: +Received: (qmail 3387 invoked by alias); 15 Jul 2002 20:26:49 -0000 +Received: (qmail 26987 invoked by uid 82); 15 Jul 2002 20:23:30 -0000 +Received: from dms-errors@dms.netcenter.com by mailhost with qmail-scanner-1.00 (uvscan: v4.1.40/v4212. . Clean. Processed in 5.813084 secs); 15 Jul 2002 20:23:30 -0000 +Received: from dms-mail02.netcenter.com (207.200.87.32) + by mi-1.rz.ruhr-uni-bochum.de with SMTP; 15 Jul 2002 20:23:20 -0000 +Received: from dms-www1.netscape.com (dms-mailcaster-s07.netcenter.com) by dms-mail02.netcenter.com (LSMTP for Windows NT v1.1b) with SMTP id <8.00007AB9@dms-mail02.netcenter.com>; Mon, 15 Jul 2002 13:22:22 -0700 +To: xxxxx.yyyyy@ruhr-uni-bochum.de +Subject: Netscape News - Ausgabe Juli +From: Netscape +Date: Mon, 15 Jul 2002 13:24:23 -0800 +Reply-To: Netscape +Content-Type: multipart/alternative; + boundary="______BoundaryOfDocument______" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit + +This is a multi-part message in MIME format. + +--______BoundaryOfDocument______ +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +Netscape News - Ausgabe Juli + +Lieber Netscape-Nutzer, + +in dieser Ausgabe: + +- Mustervertrge, Rechtstipps und mehr + Die neuen Netscape Quickfinder liefern Ihnen direkte Links zu + Themen und Tools wie Downloads, Rechtstipps, Vertrgen und mehr. + +- Der neue Women-Channel + Nicht nur fr Frauen: Die Mode von Morgen, die neusten Trends in + puncto Lifestyle, leckere Rezepte und vieles mehr. + +- Netscape sucht mit Google + Ab sofort bedient sich die Netscape-Suche der Google-Suchengine. So + erhalten Sie die besten Suchergebnisse in krzester Zeit. + +- 0190-Dialer gehen um + Unserise Anbieter von 0190er-Nummern werden immer dreister. Wir zeigen + Ihnen, wie Sie sich schtzen knnen. + +- Flirten erlaubt + Sie fahren als Single in den Urlaub? Sie wollen Spa? Wir zeigen Ihnen + die besten Strnde fr einen heien Sommer-Flirt! + +http://dms-www01.netcenter.com/cgi-bin/gx.cgi/mcp?p=041H1b041H2g55Ep6l012000 +WRnwBz + +------------------------------------------------------------------ +Netscape respektiert Ihre Online-Arbeitszeit und Ihre +Privatsphre. Wenn Sie in Zukunft KEINE E-Mail-Nachrichten +mehr von Netscape erhalten mchten, klicken Sie auf untenstehenden +Link. +HINWEIS: +KLICKEN SIE NUR AUF DIESEN LINK, WENN SIE IHR ABONNEMENT +AUCH WIRKLICH BEENDEN MCHTEN! +http://dms-www01.netcenter.com/cgi-bin/gx.cgi/mcp?p=041H1d3Qxx41H2g55Ep6l012 +000WRnwBz + +Sie sind mit folgender Adresse registriert:[xxxxx.yyyyy@ruhr-uni-bochum.de] + +--______BoundaryOfDocument______ +Content-Type: text/html +Content-Transfer-Encoding: 7bit + + + + + + +Netscape News, Ausgabe +Juli + + + + + + + + + + + + + + + + + + + + +
+ NETSCAPENETSCAPE +Mail +Instant MessengerDownload
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + +
+ + Click here to +visit our advertiser. + + + Click +here to visit our advertiser. +
+
+ Netscape News + Juli, 2002
+
+ + + + + + +
+ + Highlights + +
0190-Dialer gehen um
+ Die +Abzocke nimmt kein Ende: Unserise Anbieter von 0190er-Nummern lassen sich +immer wieder neue Tricks einfallen, um die Verbraucher zu schrpfen. Wir +geben Tipps zur Vorsorge.

+ + Ab in den Urlaub
+ Noch +nichts vor im Sommer? Dann ab in den Urlaub! Unsere Last-Minute-Suche findet +sicher das passende Schnppchen fr Ihren Geldbeutel.

+ + Riester-Rente-Special
+ Jeder +spricht darber, doch wissen Sie wirklich Bescheid? Wir klren Sie ber die +Vor- und Nachteile der staatlich gefrderten Rentenform auf.

+ +
+ + +
+ +
+ 		+
+ + In dieser Ausgabe +
+ + + Zwei starke Partner:
Netscape sucht mit +Google +
Die +Netscape-Suche ist jetzt noch effizienter: Sie bedient sich der +Google-Technologie, +der zur Zeit besten Such-Engine im Internet. Egal nach was Sie also suchen: +Netscape und Google liefern Ihnen in krzester Zeit die Top-Ergebnisse aus +ber 2 Milliarden Webseiten - und das bersichtlich und mit hoher +Relevanz.
 + Mehr... +

+ + Nicht nur fr Frauen:
Der neue +Women-Channel +
+Netscape.de hat Nachwuchs bekommen: Im neuen Women-Channel +finden Sie alles, was das (Frauen-)Herz hher schlagen lsst. Wir verraten +Ihnen zum Beispiel, was in Sachen Mode in diesem Sommer angesagt ist, zeigen +Ihnen die neusten Trends in puncto Lifestyle und stellen leckere Rezepte +fr die leichte Sommerkche vor.
+ Mehr... +

+ + 		+ + + + + + + + + + + + +
+ + Flirten erlaubt
+ Sie fahren als Single in den Urlaub? Sie wollen Spa? Wir +zeigen Ihnen die besten Strnde fr einen heien Sommer-Flirt!
+ Mehr...
+
+ + Grukarten
+ Verschicken Sie Ihre persnlichen Gre einfach per eMail. +Das spart Zeit und kostet Sie keinen Pfennig. Jetzt testen!
+ Mehr...
+

+
+
+
+ + Mustervertrge, Rechtstipps und mehr... +
+ + Die neuen Netscape Quick Finder +
+ Das +Internet stellt eine fast grenzenlose Menge an Informationen bereit. Wer +hat da noch den Durchblick, vor allem, wenn es schnell gehen soll? Die Netscape Quick Finder +schaffen Abhilfe: Hier finden Sie direkte Links zu diversen Themen und Tools +wie Mustervertrge, Rechtstipps, Downloadarchiv, Gebrauchtwagenbewertung +und Jobbrse - um nur einige zu nennen. Schneller geht's wirklich +nicht!
 + Mehr... +
+
+ +
+ +Um den Newsletter abzubestellen, klicken Sie bitte hier -
oder antworten +Sie einfach auf diese email und schreiben "REMOVE" in die Betreffzeile.
+c 2002 Netscape. Alle Rechte vorbehalten. Nutzungsbedingungen und Datenschutz +
+ + + +--______BoundaryOfDocument______-- + + +: +annmn:[041H2g041H2g55Ep6l012000WRnwBz] + + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/netsol_renewal spamassassin-4.0.0~rc3/t/data/welcomelists/netsol_renewal --- spamassassin-3.4.6/t/data/welcomelists/netsol_renewal 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/netsol_renewal 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,58 @@ +From nobody@rs.internic.net Wed Jan 30 09:50:12 2002 +Delivery-Date: Tue, 13 Jun 2000 12:53:06 +0100 +Received: from zzzzzzzzz.yyyy (mail.zzzzzzzzz.yyyy [193.120.211.219]) + by zzzzzzzzzz.yyyyyyyyyyy.com (8.9.3/8.9.3) with ESMTP id MAA04894 + for ; Tue, 13 Jun 2000 12:53:04 +0100 +Received: from opsmail.internic.net (opsmail.internic.net [198.41.0.91]) + by zzzzzzzzz.yyyy (8.9.3/8.9.3) with ESMTP id MAA21530 + for ; Tue, 13 Jun 2000 12:53:03 +0100 +Received: from rs.internic.net (bipwww2.lb.internic.net [192.168.120.8]) + by opsmail.internic.net (8.9.3/8.9.1) with ESMTP id HAA23653 + for ; Tue, 13 Jun 2000 07:52:32 -0400 (EDT) +Received: (from nobody@localhost) + by rs.internic.net (8.9.3/8.8.4) + id HAA02994; Tue, 13 Jun 2000 07:52:32 -0400 (EDT) +Date: Tue, 13 Jun 2000 07:52:32 -0400 (EDT) +From: Nobody +Message-Id: <200006131152.HAA02994@rs.internic.net> +Reply-to: billing@netsol.com +To: foooooooo@yyyyyyyyyyy.com +Subject: Confirmation of yyyyyyyyyyy.com renewal order + +Dear Customer, + +Congratulations! Your Web Address (domain name) has been renewed for +an extended period. + +We will be processing your order within the next 24-48 hours. Renewal +of your domain name is effective on your current expiration date. * + +Here is a summary of your order: + + * Domain Name: yyyyyyyyyyy.com + * Total: $70.00 + * Rebate: $10.50 + +*Subject to receipt of complete and accurate information as requested +in your renewal registration order. If you have any questions, visit +the FAQ section of our website: +http://www.networksolutions.com/help/faq-multiyear-rebate.html + +Be sure to visit your website and learn more about products, services +and free resources offered by Network Solutions: +http://www.networksolutions.com/catalog/ + +Get VeriSign secure encryption on your new website, and you'll give your +customers the confidence to place orders online. Request a FREE Guide, +"Securing Your Web Site for Business." +http://www.verisign.com/cgi-bin/go.cgi?a=w000000000000000 + +Thank you for renewing the registration of your domain name with Network +Solutions! + +Sincerely, + +Network Solutions, Inc. +The dot com people (TM) + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/networkworld spamassassin-4.0.0~rc3/t/data/welcomelists/networkworld --- spamassassin-3.4.6/t/data/welcomelists/networkworld 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/networkworld 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,215 @@ +From NSManagement@bdcimail.com Wed Aug 14 15:30:00 2002 +Return-Path: +Delivered-To: ffffffff@localhost.zzzzzzzzzz-ffffffff.net +Received: from localhost (localhost.localdomain [127.0.0.1]) + by mail.zzzzzzzzzz-ffffffff.net (Postfix) with ESMTP id 707A9BEE4A + for ; Thu, 15 Aug 2002 06:12:03 -0700 (PDT) +Received: from mail.zzzzzzzzzz-ffffffff.com + by localhost with IMAP (fetchmail-5.9.11) + for ffffffff@localhost (single-drop); Thu, 15 Aug 2002 06:12:03 -0700 (PDT) +Received: from mailcontrol.bellevuedata.com (mailcontrol.bellevuedata.com [66.37.227.18]) + by mail44.megamailservers.com (8.12.5/8.12.0.Beta10) with SMTP id g7F78WpU002632 + for ; Thu, 15 Aug 2002 03:11:00 -0400 (EDT) +X-Mailer: ListManager Web Interface +Date: Wed, 14 Aug 2002 17:30:00 -0500 +Subject: Combining point products and suites +To: aaaaaaa@zzzzzzzzzz-ffffffff.com +From: NW on Network/Systems Management +Reply-To: Network/Systems Management Help +Message-Id: +Content-Type: text/plain; + charset="iso-8859-1" +X-SpamBouncer: 1.5 (7/17/02) +X-SBNote: FROM_DAEMON/Listserv +X-SBPass: No Pattern Matching +X-SBPass: No Freemail Filtering +X-SBClass: Bulk +X-Folder: Bulk + +NETWORK WORLD FUSION FOCUS: AUDREY RASMUSSEN on +NETWORK/SYSTEMS MANAGEMENT +08/14/02 +Today's focus: Combining point products and suites + +Dear Robin Frank, + +In this issue: + +* Readers who advocate using both point products and suites +* Links related to Network/Systems Management +* Featured reader resource + +_______________________________________________________________ +This newsletter sponsored by +Lucent + +Do you want to receive calls while online and not need a second +phone line? + +Do you want shorter connect times? + +Could you benefit from faster uploads? +For Next-Generation Dial Access, you need V.92. + +To learn more, click here for the Lucent Technologies V.92 +InfoCenter. http://www.nww1.com/go2/lucent_rc.html +_______________________________________________________________ +A NETWORK WORLD SPECIAL REPORT: BUSINESS CONTINUITY & DISASTER +RECOVERY PLANNING + +Dr. Jim Metzler of Ashton, Metzler & Associates discusses +techniques on how to proactively implement Business Continuity +and Disaster Recovery Planning. Sponsored by Syncsort, this +SPECIAL REPORT emphasizes both the tactical and strategic +considerations necessary for data and infrastructure +protection. Download your FREE copy today at: +http://nww1.com/go/ad306.html (registration required) + +_______________________________________________________________ +Today's focus: Combining point products and suites + +By Audrey Rasmussen + +Today we'll hear from readers who think the best route to take +in the debate between point products and suites is to use a +little of both. + +One reader commented that a company doesn't have to choose one +over the other. He says: + +"It has been my experience that a well-managed enterprise +monitoring system will most likely include some of both: point +solutions to address specific network/systems issues, and a +centralized, single pane of glass from a 'framework' system +providing a common platform for event and problem management." + +Another reader said organizational issues are an important +factor. An approach must work within the organizational and +political structure of a company: + +"The approach with best of breed, plus some integration tools +above it, is probably the less risky route - and for less +integrated organizations, the better way to go. If you go for +an integrated framework, you'd better be sure that you can +handle it from an organizational viewpoint; otherwise it could +be a hard, expensive landing." + +According to yet another reader, there are other factors that +affect the decision on the management approach: + +"Mostly this question is answered based on: + +* How high up in the organization the decision is being made + +* How pragmatically (quick and dirty vs. big and beautiful) + does one want to approach the issue + +* How specific the requirements are + +* Time of decision + +"Each supplier has its rise and fall; the winner of today may +be a loser tomorrow. If the different user [administrator] +groups have a different timing regarding when they need a tool, +they will probably come to different decisions." + +Another user says: + +"My personal favorite solution involves using vendor-supplied +software agents such as IBM Director or Compaq Insight Manager +and integrating them into a suite solution such as Tivoli or CA +Unicenter. This removes not only the cost of the middleware and +integration layers, but also removes the cost of the agent +technology." + +So, there you have opinions from readers who embrace point +products and suites working together. + +_______________________________________________________________ +To contact Audrey Rasmussen: + +Audrey Rasmussen is a research director with Enterprise +Management Associates in Boulder, Colorado, +(http://www.enterprisemanagement.com), a leading analyst +and market research firm focusing exclusively on all aspects +of enterprise management. Audrey has more than 20 years of +experience working with distributed systems, applications +and networks. Her current focus at EMA is e-business, SMB/SME +and MSPs. She can be reached at: +mailto:rasmussen@enterprisemanagement.com. +_______________________________________________________________ +2002 SALARY CALCULATOR + +How has the turbulent market affected your earning potential? +Find out with Network World's 2002 Salary Calculator. We've +updated the Salary Calculator and revised it to reflect the +results of the Network World 2002 Salary Survey. Give us some +details about yourself and we'll tell you if you earn as much +as your peers: http://nww1.com/go/ad324.html +_______________________________________________________________ +RELATED EDITORIAL LINKS + +SLAMming service levels into shape +Network World, 08/12/02 +http://www.nwfusion.com/news/2002/134753_08-12-2002.html + +Archive of the Network/Systems Management newsletter: +http://www.nwfusion.com/newsletters/nsm/index.html +_______________________________________________________________ +If you're concerned about the growing turbulence in the telco +industry, you are not alone. The massive financial and +organizational changes now underway at many of the largest +carriers increase the possibility of service outages, +performance degradation and poor operations support. Find out +what you can do to mitigate your risks. Attend a free web +seminar on the best practices for protecting your business from +telco turbulence. Leading industry expert, David Willis of the +META Group, will analyze the inevitable consequences of the +current environment and share pragmatic steps to shield your +users and applications from carrier failures. +http://nww1.com/go/4531858a.html +_______________________________________________________________ +FEATURED READER RESOURCE + +NW FUSION'S WHITEPAPERS CENTRAL + +A free resource to Network World Fusion visitors is the +Whitepaper Central area on NW Fusion. Here you can find vendor +and Network World produced whitepapers on a variety of network +topics. You can search our whitepapers database by company or +by title. All are available free of charge. Visit +http://www.nwfusion.com/bg/wp/wpbydate.jsp today. +_______________________________________________________________ +May We Send You a Free Print Subscription? +You've got the technology snapshot of your choice delivered +at your fingertips each day. Now, extend your knowledge by +receiving 51 FREE issues to our print publication. Apply +today at http://www.nwwsubscribe.com/nl +_______________________________________________________________ +SUBSCRIPTION SERVICES + +To subscribe or unsubscribe to any Network World e-mail +newsletters, go to: +http://www.nwwsubscribe.com/news/scripts/notprinteditnews.asp + +To unsubscribe from promotional e-mail go to: +http://www.nwwsubscribe.com/ep + +To change your e-mail address, go to: +http://www.nwwsubscribe.com/news/scripts/changeemail.asp + +Subscription questions? Contact Customer Service by replying to +this message. + +Have editorial comments? Write Jeff Caruso, Newsletter Editor, +at: mailto:jcaruso@nww.com + +For advertising information, write Alonna Doucette, V.P. of +Online Development, at: mailto:sponsorships@nwfusion.com + +Copyright Network World, Inc., 2002 + +------------------------ +This message was sent to: aaaaaaa@zzzzzzzzzz-ffffffff.com + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/oracle_net_techblast spamassassin-4.0.0~rc3/t/data/welcomelists/oracle_net_techblast --- spamassassin-3.4.6/t/data/welcomelists/oracle_net_techblast 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/oracle_net_techblast 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,554 @@ +Return-Path: +Received: (qmail 19678 invoked by alias); 10 Jul 2002 13:22:47 -0000 +Received: (qmail 19416 invoked by uid 82); 10 Jul 2002 13:22:42 -0000 +Received: from replies@oracleeblast.com by mailhost with qmail-scanner-1.00 (uvscan: v4.1.40/v4210. . Clean. Processed in 8.59332 secs); 10 Jul 2002 13:22:42 -0000 +Received: from inet-mail6.oracle.com (209.246.10.170) + by mi-1.rz.ruhr-uni-bochum.de with SMTP; 10 Jul 2002 13:22:30 -0000 +Received: from blaster-smtp.oracle.com (eblast01.oracleeblast.com [148.87.9.11]) + by inet-mail6.oracle.com (Switch-2.2.2/Switch-2.2.0) with ESMTP id g6ADMHs25188 + for XXXXXX.YYYYY@RUHR-UNI-BOCHUM.DE; Wed, 10 Jul 2002 06:22:17 -0700 (PDT) +Date: Wed, 10 Jul 2002 06:22:17 -0700 (PDT) +Message-Id: <200207101322.g6ADMHs25188@inet-mail6.oracle.com> +Subject: Oracle Technology Network TechBlast - July 2002 +From: Oracle Technology Network +To: XXXXXX.YYYYY@RUHR-UNI-BOCHUM.DE +Reply-To: replies@oracleeblast.com +Content-Transfer-Encoding: 8bit +MIME-Version: 1.0 +Content-Type: multipart/alternative; + boundary="next_part_of_message" + +--next_part_of_message + + + +e +e +ssage +Content-type: text/plain; charset=iso-8859-1 + + + +--next_part_of_message +Content-Type: text/html + + + +Oracle Technology Network +
OTN + TechBlast
+ July 2002 Issue
+ The monthly TechBlast is also available through the Oracle + Technology Network website.
+
+
+
+
+ + + + + + +
In + this issue: + + + + + + + + + + + + + + + + + + + + + + + + + +
This + Month's Feature
+ News
Software + Downloads
Oracle + University
New + Books
+

Worldwide + Events:
+ Americas | EMEA | APAC

+
+

+ 		+

This + Month's Feature: + New Developer Services on OTN

+

OTN Members: Get + Oracle Software on CD Shipped + to you Today!
+ Order OTN TechTracks + and receive Oracle9i Database Release 2, Oracle9i Application Server Release + 2, and Oracle Developer Suite (including JDeveloper) CDs for the platform + of your choice. TechTracks is a one-year subscription, and it includes + access to Oracle Support's KnowledgeBase and CD updates shipped to you + whenever there are major new releases of Oracle software. Enter promo + code OWC for a $50 savings during the month of July.

+

Exchange your Knowledge + through OTN Community Code Services
+ OTN Community Code + is a web-browsable CVS repository that lets you review, customize, extend, + and share Oracle-related code and coding techniques. OTN populated it + with sample application projects, so that you can view sample code source + online, download it, submit bugs and suggestions to the development teams, + and get email notifications when code is updated. Participate in an Oracle-sponsored + project, and then create your own project and share your code with the + OTN community.

+

Web Services Center + Now Available on OTN
+ The OTN Web Services + Center is a new resource for the development and deployment of Web + services. Visitors to this new Center can experience live Web service + examples, access the latest Web services technical information, and build + their own Web services using Oracle9i + JDeveloper. The Web Services Center offers information of value to + Web services architects, + developers + and newcomers.

+

Win Great Prizes + in the OTN Web Services Challenge
+ Developers are encouraged to submit their own Web services to the OTN + Web Services Challenge. Entering your Web services makes you eligible + for fantastic prizes, including a fully decked-out Dell mobile workstation. + The Challenge starts August 1, so get + a head start today by learning more about the rules. You can even + preregister your + interest in the Challenge.

+

New Internet Seminar: + J2EE and Web Services on Linux with Oracle9iAS Release 2
+ Attend + this on-demand Internet Seminar to learn how to use Oracle9i Application + Server Release 2 to develop high performance J2EE and Web Services applications + on the Linux operating systems.

+

This + Month's Feature | News | Software + Downloads | Oracle University | New + Books | Worldwide Events

+

News

+

Special + Discount on Red Hat Linux Advanced Server
+ Receive up to 45% discount on the initial purchase of Red Hat Linux Advanced + Server. Find + out how! Offer valid July 1- July 31, 2002. To get more information + on Oracle and Linux, click + here.

+

Helping WebGain + Developers Move to Oracle9i JDeveloper
+ With all the consolidation taking place in the Java tools space, developers + are seeking tools that provide a complete and integrated environment for + developing J2EE applications and Web services, and also offer security + and stability for the future. Oracle9i JDeveloper delivers on all counts, + and the new WebGain + Developer Center on OTN has been created to give VisualCafe users + the resources to move + rapidly and smoothly to the integrated development environment of Oracle9i + JDeveloper. Listen + to the interview with Ted Farrell, Oracle's Senior Director of Applications + Tools Technology and former WebGain CTO, on "moving to Oracle9i JDeveloper". +

+

Oracle9i Application + Server # 1 in ECperf Benchmarks
+ In its first ECperf submissions, Oracle9i Application Server Release 2 + achieved the industry's best ever 'performance' benchmark at 61,863 BBops/min, + beating IBM by 39% and BEA by 63%. The proof is in: Oracle9iAS is still + faster than IBM and BEA. Oracle9iAS also achieved the best results in + the ECperf 'price/performance' category at $5/BBop, 28% better than BEA's + top result, and 54% better than IBM's top result. Get the facts: read + the Oracle9iAS ECperf Benchmark Report now and tune + into a Live Internet Seminar and Q&A on Wednesday, July 17 at + 8:00 a.m. PDT for a live presentation and discussion of these record setting + results.

+

Four Internet Seminars + on the New Security Features in Oracle9i Application Server Release 2 +
+ Watch + these four Internet Seminars to learn about the new security features + in Oracle9i Application Server Release 2. Oracle9i Application Server + Release 2 is the first application server to offer integrated support + for Single Sign-On, JAAS and an LDAP compliant directory that together + let you cost efficiently secure all your J2EE applications, portals, and + Web services.

+

OTN Toolbar
+ Search OTN from anywhere on the internet with OTN Toolbar. Download + today to easily gain access to many of the key features of OTN (including + downloads, sample code, documentation, and discussion forums).

+

New Internet Seminar + on Oracle9iAS Web Cache and ESI
+ Watch + this Internet Seminar and learn how Oracle9iAS Web Cache lets you accelerate + any Web application running on any server by up to 20 times. Speed applications + built in Active Server Pages, Java Server Pages, Servlets, EJBs and more. + Deploy with Web servers like Apache and Microsoft IIS as well as application + servers like BEA WebLogic, IBM WebSphere, Sun/iPlanet and, of course, + Oracle9iAS. Best of all, Oracle9iAS Web Cache uniquely supports caching + of both static and dynamically generated content without changing the + application, enabling dynamic Web sites to more efficiently deliver rich + content and therefore improving the user experience.

+

Oracle9i Reports + data source SDK available now
+ The Oracle9i + Reports data source SDK allows you to plug in your own data sources + and benefit from the sophisticated report creation and distribution environment + of Oracle9i + Reports. Check out the new documentation and samples.

+

Putting Forms on + the Web
+ Looking to move your existing Forms application from client/server to + the Web? Want the easy access and maintainability of a web deployed Forms + application? Then check + out this new paper.

+

Struts and Oracle9i + JDeveloper
+ Here's a cool + new article with detailed instructions on how to configure and use + the Jakarta Struts open source Model-View-Controller framework with Oracle9i + JDeveloper.

+

Quickstart with + Oracle9i JDeveloper for BEA developers
+ Are you using BEA's WebLogic and looking for development tools? Here is + the easy way to start + using the award winning Oracle9i JDeveloper with WebLogic. And if you + want to use the fastest J2EE container, check out the migration + kit to Oracle9iAS.

+

Wireless and Voice + Made Easy With Oracle9i Application Server
+ New Internet lessons give viewers the low-down on how to use the wireless + and voice services of Oracle9i Application Server (Oracle9iAS Wireless) + to quickly and easily give access to applications and data using any device, + over any network. Learn why Oracle is a leader in wireless and voice infrastructure + for yourselves! Check + out the new Internet lessons in the FREE Mobile eKit!

+

Snapshot Seminar: + Interwoven & Oracle9iAS Content Management
+ Oracle and Interwoven together offer a portal ready, proven, and flexible + Enterprise Content Management solution. . Watch a 15 minute on-demand + snapshot seminar + and learn how you can let your users control their content through a portal + powered by Oracle and Interwoven.

+

Updated Oracle9iAS + Portal Developer Kit (PDK) - July
+ The updated + Oracle9iAS Portal Developer Kit (PDK) highlights portlet communication. + Using the PDK, you can build smart portlets with such features as inter-portlet + communication, page to portlet communication, and portlet reusability. + This release includes new J2EE-based and Web Services samples.

+

Snapshot Seminar: + Documentum & Oracle9iAS Content Management
+ Oracle and Documentum now offer a joint solution to create, manage and + deliver content through Web sites and portals. Watch a 15 minute on-demand + snapshot + seminar and learn how you can let your users control their content + through a portal powered by Oracle and Documentum.

+

+

This + Month's Feature | News | Software + Downloads | Oracle University | New + Books | Worldwide Events

+

+ New Software Downloads

+

Oracle9i + Application Server Release 2 for Windows NT/2000, AIX, and Compaq Tru64 + UNIX

+

Oracle9iAS + TopLink 4.6 for Linux, UNIX, and Windows NT/2000

+

Oracle9i + Lite Release 5.0.2.0.0 for Sun SPARC Solaris

+

Oracle + Data Provider for .NET (ODP.NET) Beta

+

This + Month's Feature | News | Software + Downloads | Oracle University | New + Books | Worldwide Events

+

Oracle + University

+

Special Offer! + Save 45% on Oracle9i DBA Certification Training
+ The expanded Oracle Certification Program now offers a true certification + levels that are built to fit the needs of IT professionals as well as + organizations looking to hire them. Each level constitutes reaching a + benchmark of experience and expertise that is industry recognized and + approved. And, with each new credential can come increased opportunities, + higher pay, and more benefits to keep Oracle professionals successful. +

+

Oracle9i Certification + Savings Plan – Save 45% on 4 Instructor Led inClass courses. 4 for + the price of 2! Click + here to learn more!

+ 		+
+ + + + +
+ + + + +
+

+

Seeking + a new job? Check out OTN + Skills Marketplace for all open Oracle-trained positions.

+

Need + help implementing technology solutions to business problems? + Oracle9i + by Example Series tutorials can save you time.

+

Taking + an OCP exam? OTN members, take advantage of the 20% exam + discount.

+
+
+
+
+ + + + + + + + + + + + + + + +Untitled Document + + + + + + + + + +
+
 
+ 		+
+

This + Month's Feature | News | Software + Downloads | Oracle University | New + Books | Worldwide Events

+
+
+
+

New + Books

+

Oracle9i + DBA 101
+ Oracle9i + DBA 101 by Marlene Theriault, Rachel Carmichael, & James + Viscusi (ISBN 0-07-222474-6) explains, step-by-step, how to effectively + administer an Oracle database. Readers will find coverage of the + key Oracle9i new features as well as details on the daily responsibilities + of a DBA and tips on how to successfully accomplish those tasks. + From the exclusive publishers of Oracle Press books, this is the + ideal resource for the aspiring Oracle database administrator. +

+

Oracle9i + Mobile
+ Oracle9i + Mobile by Alan Yeung, Philip Stephenson, & Nicholas Pang + (ISBN 0-07-222455-X) helps readers design, deploy, and manage + flexible mobile applications on the Oracle platform. From the + exclusive publishers of Oracle Press books, this resource explains + how to use and extend the mobile services available in Oracle9iAS + Wireless and integrate with other Oracle technologies. Mobilize + any e-business, reach new customers, and deliver critical information + to mobile users with the most scalable and reliable mobile infrastructure + available.

+

+ Oracle Press User Group Program
+ Oracle Press has a new User Group Program! Oracle Press supports + the service that User Groups provide to the technical community. + We value our relationship with community-based groups and welcome + the opportunity to form partnerships with User Groups to disseminate + the latest technological information available in Osborne publications. + Osborne encourages participation by technical User Groups that + meet regularly, discuss, teach, and troubleshoot technical topics, + write book reviews, and publish print and/or online newsletters. +

+
+
+
+
+
+

Oracle Press can + provide User Groups:

+
+
    +
  • +
    Review + copies of Oracle Press books for newsletter reviews
    +
    • +
  • +
    Book + donations and promotional items for User Group events
    +
    • +
  • +
    30% + discount on bulk purchases of 10 or more books
    +
    • +
  • +
    And + more...
    +
    • +
+
+
+
+
+

+ Click + here for complete details about Oracle Press' User Group Program. +

+

This + Month's Feature | News | Software + Downloads | Oracle University | New + Books | Worldwide Events

+

Worldwide + Events

+
+

Americas

+

Oracle + User Group Events
+ Find + out where new user group events are happening in your area. +

+

APAC

+
+
+
+
+ + + + + +
OracleWorld + Online - Beijing
+ Over + 5,000 industry professionals from all over China and the world gathered + to learn how Oracle can help your business reduce costs, improve + efficiencies, and improve the way you run your business. If you + missed OracleWorld in Copenhagen, you can get all the highlights + including keynotes, conference presentations and whitepapers online.
+
+
+

Oracle + iSeminars: Free & Live @ Your Desktop
+ Attend a FREE Oracle APAC iSeminar to learn more about how Oracle9i + - Application Server, Database & Tools could provide you with a complete + and cost-effective e-business infrastructure.

+
+
+
+
+

Please + click + here for further information and online registration for all + iseminars. (Please select correct time zone & click "reset"). + For any + questions, please email + us.

+

EMEA

+ + + + + +
OracleWorld + Online - Copenhagen
+ Thousands + of professionals from all over the world gathered to learn how + Oracle can help your business reduce costs, improve efficiencies, + and improve the way you run your business. If you missed OracleWorld + in Copenhagen, you can get all the highlights including keynotes, + conference presentations and whitepapers online.
+
+
+

+
+
Oracle + Technology Days Belgian & Luxembourg
+ Join us + for the Oracle Technology Days - Featuring Oracle9i Release 2 – + Live, Local, Free!
+
+

Join + us for this executive full-day event :
+ 29/8/2002 - Brussels (sessions in English)
+ 3/9/2002 - Gent (sessies in het Nederlands)
+ 12/9/2002 - Liège (session en français)

+

Click + here for more information and registration.

+

Regards,

+

Oracle + Technology Network Team

+

UNSUBSCRIBE
+ When you registered at OTN, you indicated you + would like to receive e-mail updates from us. If you do not want to receive + future e-mails, please visit our update + section , log in with your username and password, and UNCHECK the + I wish to receive informational e-mails box.

+

USERNAME + AND PASSWORD QUESTIONS?
+ Forget your OTN login information? Use our password + lookup.

+

DUPLICATE + MESSAGES?
+ You may + have multiple accounts on OTN. Please send a message to OTN + with the username you're using to access http://otn.oracle.com. We'll + then contact you and delete the unused account. +

+
+
+ + + +

+
To be removed from Oracle's mailing lists, send an email to: +
unsubscribe@oracleeblast.com +
with the following in the message body: +
REMOVE XXXXXX.YYYYY@RUHR-UNI-BOCHUM.DE +
STOP +

+[250000/116/137209217] + + + + + + + + + + + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/orbitz.com spamassassin-4.0.0~rc3/t/data/welcomelists/orbitz.com --- spamassassin-3.4.6/t/data/welcomelists/orbitz.com 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/orbitz.com 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,27 @@ +Received: (qmail 9304 invoked by uid 505); 12 Aug 2002 16:57:57 -0000 +Delivered-To: zzzzzz@xyz.com +Received: (qmail 19051 invoked by uid 74); 12 Aug 2002 16:58:16 -0000 +Received: from travelercare@orbitz.com by agogo0 by uid 71 with qmail-scanner-1.13 + (clamscan: 0.22. Clear:SA:1(0/0):. + Processed in 0.774434 secs); 12 Aug 2002 16:58:16 -0000 +Received: from unknown (HELO mailhost.wm.orbitz.com) (65.216.67.72) + by mail0.tyva.xyz.com with SMTP; 12 Aug 2002 16:58:15 -0000 +Received: from wl14 (sim-snat-01.wm.orbitz.com [10.50.100.11]) + by mailhost.wm.orbitz.com (8.12.1/8.12.1) with ESMTP id g7CGwEsF005188 + for ; Mon, 12 Aug 2002 11:58:14 -0500 +Message-ID: <17728173.1029171478187.JavaMail.weblogic@wl14> +Date: Mon, 12 Aug 2002 11:57:58 -0500 (CDT) +From: Orbitz Traveler Care +To: Rod +Subject: Orbitz Travel Document +Mime-Version: 1.0 +Content-Type: text/html +Content-Transfer-Encoding: 7bit + + + + + +Orbitz Travel Document + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/paypal.com spamassassin-4.0.0~rc3/t/data/welcomelists/paypal.com --- spamassassin-3.4.6/t/data/welcomelists/paypal.com 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/paypal.com 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,46 @@ +Received: (qmail 18217 invoked from network); 4 Apr 2002 21:41:45 -0000 +Received: from localhost (127.0.0.1) + by localhost with SMTP; 4 Apr 2002 21:41:45 -0000 +Delivered-To: zzzzzz@xyz.com +Received: from mail.xyz.com [64.123.162.104] + by localhost with POP3 (fetchmail-5.9.0) + for xyz@localhost (single-drop); Thu, 04 Apr 2002 16:41:45 -0500 (EST) +Received: (qmail 857 invoked from network); 4 Apr 2002 21:41:11 -0000 +Received: from unknown (HELO web18.nix.paypal.com) (65.206.229.164) + by mail0.tyva.xyz.com with SMTP; 4 Apr 2002 21:41:11 -0000 +Received: (qmail 13807 invoked by uid 99); 4 Apr 2002 21:41:10 -0000 +Date: Thu, 04 Apr 2002 13:41:10 -0800 +Message-Id: <1017000000.00000@paypal.com> +From: service@paypal.com +To: rod@xyz.com +Subject: Receipt for your Payment + +This email confirms that you have paid xyz.com Ltd. $12.00 +using PayPal. + +--------------------------------------------------------------- +This payment was sent using your bank account. + +By using your bank account to send money, you just: + +- Paid instantly and securely +- Sent money faster than writing and mailing paper checks. +- Received an additional entry in our $1,000 Sweepstakes! + +Thanks for using your bank account! + +--------------------------------------------------------------- + + +Thank you, +The PayPal Team + +Note: When you log in to your PayPal account, be sure that the website's URL always begins with "https://www.paypal.com/". The "s" in "https" at the beginning of the URL means you are logging into a secure page. If the URL does not begin with https, you are not on a PayPal page. + + + +Please do not reply to this e-mail. Mail sent to this address +cannot be answered. For assistance, log in to your PayPal +account and choose the "Help" link in the footer of any page. + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/register.com_password spamassassin-4.0.0~rc3/t/data/welcomelists/register.com_password --- spamassassin-3.4.6/t/data/welcomelists/register.com_password 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/register.com_password 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,53 @@ +From customersupport@register.com Wed Jan 30 09:50:12 2002 +Delivery-Date: Mon, 18 Sep 2000 16:41:35 +0100 +Return-Path: +Delivered-To: jm@ooooooooooo.com +Received: from wwwn.register.com (outgoing2.jrcy.register.com [209.67.50.16]) + by mail (Postfix) with ESMTP id 9A73FD894B + for ; Mon, 18 Sep 2000 15:41:33 +0000 (Eire) +Received: (from nobody@localhost) + by wwwn.register.com (8.9.3/8.9.3) id LAA18712 + for ppppp@ooooooooooo.com; Mon, 18 Sep 2000 11:41:22 -0400 +Date: Mon, 18 Sep 2000 11:41:22 -0400 +Message-Id: <200009181541.LAA18712@wwwn.register.com> +X-Authentication-Warning: wwwn.register.com: nobody set sender to customersupport@register.com using -f +From: Domain.Management.System@www.register.com +Reply-To: customersupport@register.com +To: ppppp@ooooooooooo.com +Subject: Domain Manager Password +Sender: customersupport@register.com + +User Name : xxxxxxxxxxxxxxx + +Thank you for using register.com's Domain Manager. + +To change or re-enter your password, please copy and paste the URL below into the "Location" or "Address" field of your web browser and hit the 'Enter' key on your keyboard. Note: If your email program supports HTML, you may be able to click on the link below. + +========================================================================================== +http://mydomain.register.com/change_password.cgi?00000000000 +========================================================================================== +Note: Above link will be expire within three days + +The page displayed will allow you to change or re-enter your Domain Manager password. + +In the event that the email program you are using does not display the URL as a hyperlink or the URL is broken into two lines, do not click on it. Instead, please follow the copy and pasting instructions below to complete the confirmation process. + +- Copy and Pasting Instructions - + +Highlight the URL with your cursor. Once you have highlighted the URL, hit CTRL + C to copy the highlighted area. + +Open an Internet browser window and click in the Address or Location field. Hit CTRL + V to paste the URL into the address field. If necessary, repeat this process with the second line of the URL. Please be sure to delete spaces if there are any embedded in the URL - otherwise you will not be able to connect to the proper confirmation page. + +Once you have entered and looked over the URL, hit the Enter key on your keyboard. The web page displayed will allow you to complete the final step in the confirmation process. + +If you have further questions, please do not hesitate to contact us at: +http://www.register.com/create_ticket.cgi + +Thank you for using register.com, the first step on the web. + +Customer Service +register.com, inc +http://www.register.com + + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/ryanairmail.com spamassassin-4.0.0~rc3/t/data/welcomelists/ryanairmail.com --- spamassassin-3.4.6/t/data/welcomelists/ryanairmail.com 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/ryanairmail.com 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,165 @@ +From webster@ryanairmail.com Fri Aug 16 12:59:01 2002 +Return-Path: +Delivered-To: zzzz@localhost.foofoofoofoo.com +Received: from localhost (localhost [127.0.0.1]) + by phobos.labs.foofoofoofoo.com (Postfix) with ESMTP id E163743C32 + for ; Fri, 16 Aug 2002 07:58:59 -0400 (EDT) +Received: from phobos [127.0.0.1] + by localhost with IMAP (fetchmail-5.9.0) + for zzzz@localhost (single-drop); Fri, 16 Aug 2002 12:58:59 +0100 (IST) +Received: from mail.ryanair2.ie ([193.120.152.8]) by dogma.slashnull.org + (8.11.6/8.11.6) with SMTP id g7GBwca16137 for ; + Fri, 16 Aug 2002 12:58:38 +0100 +From: webster@ryanairmail.com +To: "Customers" +Subject: Incredible Autumn Fares +Date: Fri, 16 Aug 2002 08:41:00 +0100 +X-Assembled-BY: XWall v3.21 +X-Mailer: MailBeamer v3.28 +Message-Id: +MIME-Version: 1.0 +Content-Type: text/plain; charset="iso-8859-1" +List-Unsubscribe: +Reply-To: webster@ryanairmail.com +Content-Transfer-Encoding: 8bit +X-MIME-Autoconverted: from quoted-printable to 8bit by dogma.slashnull.org + id g7GBwca16137 + +Massive seat sale this weekend on Ryanair.com +Fares from 6.25 one way including taxes +Travel between 9 September and 17 December +Sale until midnight Monday 19 August +Travel between 1200 hrs Monday and 1300 hrs Thursday or +Saturdays after 1200hrs to get these fares +Limited availability during school break periods and bank +holiday weekends. All fares quoted are one way including taxes. +Book now at http://www.ryanair.com + + +*********************** Domestic UK ************************* +London Stansted to Glasgow Prestwick from 6.25 +Glasgow Prestwick to London Stansted from 6.25 +London Stansted to City of Derry from 12.99 +City of Derry to London Stansted from 12.99 + +*********************** UK to Scandinavia ************************* +London Stansted to Gothenburg from 9.99 +London Stansted to Stockholm NYO from 12.99 +London Stansted to Stockholm VST from 12.99 +London Stansted to Aarhus from 14.99 +London Stansted to Esbjerg from 14.99 +London Stansted to Oslo Torp from 14.99 +Glasgow Prestwick to Oslo Torp from 19.99 + +****************** UK to Belgium/Netherlands ******************** +London Stansted to Brussels Charleroi from 9.99 +London Stansted to Eindhoven from 12.99 +Liverpool to Brussels Charleroi from 12.99 +Glasgow Prestwick to Brussels Charleroi from 12.99 + +****************** UK to France/Italy ******************** +London Stansted to Dinard from 14.99 +London Stansted to St Etienne from 14.99 +London Stansted to Milan Bergamo from 14.99 +Glasgow Prestwick to Paris Beauvais from 14.99 + +****************** UK to Germany/Austria ******************** +Bournemouth to Frankfurt Hahn from 12.99 +London Stansted to Frankfurt Hahn from 12.99 +London Stansted to Hamburg Lubeck from 14.99 +London Stansted to Klagenfurt from 14.99 + +*********************** UK to Ireland ************************* +Manchester to Dublin from 9.99 +Leeds Bradford to Dublin from 9.99 +Bristol to Dublin from 9.99 +Edinburgh to Dublin from 9.99 +Teesside to Dublin from 9.99 +Glasgow Prestwick to Dublin from 9.99 +Bournemouth to Dublin from 9.99 +Liverpool to Dublin from 9.99 +London Stansted to Knock from 12.99 +London Stansted to Shannon from 14.99 +London Stansted to Cork from 14.99 +London Luton to Dublin from 14.99 +London Gatwick to Dublin from 14.99 +London Stansted to Dublin from 14.99 + +*********************** Ireland to UK ************************* +Dublin to Liverpool from Eur 9.99 +Dublin to Manchester from Eur 9.99 +Dublin to Bournemouth from Eur12.99 +Dublin to Bristol from Eur12.99 +Dublin to Leeds Bradford from Eur12.99 +Dublin to Edinburgh from Eur12.99 +Dublin to Teesside from Eur12.99 +Dublin to Glasgow Prestwick from Eur12.99 +Knock to London Stansted from Eur12.99 +Cork to London Stansted from Eur14.99 +Shannon to London Stansted from Eur14.99 +Dublin to London Stansted from Eur14.99 +**************************************************************** + +==================================================================== + +E-MAIL DISCLAIMER + +This e-mail and any files and attachments transmitted with it +are confidential and may be legally privileged. They are intended +solely for the use of the intended recipient. Any views and +opinions expressed are those of the individual author/sender +and are not necessarily shared or endorsed by Ryanair Holdings plc +or any associated or related company. In particular e-mail +transmissions are not binding for the purposes of forming +a contract to sell airline seats, directly or via promotions, +and do not form a contractual obligation of any type. +Such contracts can only be formed in writing by post or fax, +duly signed by a senior company executive, subject to approval +by the Board of Directors. + +The content of this e-mail or any file or attachment transmitted +with it may have been changed or altered without the consent +of the author. If you are not the intended recipient of this e-mail, +you are hereby notified that any review, dissemination, disclosure, +alteration, printing, circulation or transmission of, or any +action taken or omitted in reliance on this e-mail or any file +or attachment transmitted with it is prohibited and may be unlawful. + +If you have received this e-mail in error +please notify Ryanair Holdings plc by emailing postmaster@ryanair.ie +or contact Ryanair Holdings plc, Dublin Airport, Co Dublin, Ireland. + +===================================================================== + +E-MAIL DISCLAIMER + +This e-mail and any files and attachments transmitted with it +are confidential and may be legally privileged. They are intended +solely for the use of the intended recipient. Any views and +opinions expressed are those of the individual author/sender +and are not necessarily shared or endorsed by Ryanair Holdings plc +or any associated or related company. In particular e-mail +transmissions are not binding for the purposes of forming +a contract to sell airline seats, directly or via promotions, +and do not form a contractual obligation of any type. +Such contracts can only be formed in writing by post or fax, +duly signed by a senior company executive, subject to approval +by the Board of Directors. + +The content of this e-mail or any file or attachment transmitted +with it may have been changed or altered without the consent +of the author. If you are not the intended recipient of this e-mail, +you are hereby notified that any review, dissemination, disclosure, +alteration, printing, circulation or transmission of, or any +action taken or omitted in reliance on this e-mail or any file +or attachment transmitted with it is prohibited and may be unlawful. + +If you have received this e-mail in error +please notify Ryanair Holdings plc by emailing postmaster@ryanair.ie +or contact Ryanair Holdings plc, Dublin Airport, Co Dublin, Ireland. + + +--- +You are currently subscribed to customers as: xxxxx@yyyyyy.zzz +To unsubscribe send a blank email to leave-customers-123546K@mail.ryanairmail.com + diff -Nru spamassassin-3.4.6/t/data/welcomelists/sf.net spamassassin-4.0.0~rc3/t/data/welcomelists/sf.net --- spamassassin-3.4.6/t/data/welcomelists/sf.net 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/sf.net 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,263 @@ +From noreply@sourceforge.net Wed Aug 14 17:36:08 2002 +Return-Path: +Delivered-To: aaaa@localhost.xxxxxxxxxxxx.com +Received: from localhost (localhost [127.0.0.1]) + by phobos.labs.xxxxxxxxxxxx.com (Postfix) with ESMTP id EEAC943C32 + for ; Wed, 14 Aug 2002 12:36:06 -0400 (EDT) +Received: from phobos [127.0.0.1] + by localhost with IMAP (fetchmail-5.9.0) + for aaaa@localhost (single-drop); Wed, 14 Aug 2002 17:36:07 +0100 (IST) +Received: from usw-sf-list2.sourceforge.net (usw-sf-fw2.sourceforge.net + [216.136.171.252]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id + g7EGW3424685 for ; Wed, 14 Aug 2002 17:32:04 +0100 +Received: from usw-sf-db2-b.sourceforge.net ([10.3.1.4] + helo=sourceforge.net ident=tperdue) by usw-sf-list2.sourceforge.net with + smtp (Exim 3.31-VA-mm2 #1 (Debian)) id 17f141-00043a-00 for + ; Wed, 14 Aug 2002 09:32:05 -0700 +From: Mailer +To: "" +Subject: SOURCEFORGE.NET UPDATE: August 14, 2002 +Message-Id: +Date: Wed, 14 Aug 2002 09:32:05 -0700 + + +(You are receiving this email because you subscribed to it (honest). +For information on how to unsubscribe please read the bottom of this +email). + +0. INTRO. [IBM DB2] +1. INCREASED DOWNLOAD CAPACITY. +2. AUDIO OF KERNEL SUMMIT AVAILABLE. +3. BE A SF.NET FOUNDRY GUIDE. +4. WORK FOR SOURCEFORGE.NET +5. SITE STATISTICS + + +0. INTRO + +Hello SourceForge.net Users, + +This week we've made a big announcement. As you likely know, any +large dynamic website is powered by a database that funnels data to +the web servers serving data which ultimately gets sent to you. +These databases manage everything from user authentication, session +management, site searching, etc. SourceForge.net is a database- +dependent website. + +Today we have announced that we are moving SourceForge.net to DB2, +a powerful relational database by IBM. We are doing this because +the site continues to grow at a rapid rate, with 700 new users and +70 new projects a day, and we need a database that can handle this +growth. We feel that DB2 can do this for us, and IBM is giving us +the resources to make this transition successful. You can read the +press release here: + +http://www.vasoftware.com/news/press.php/2002/1070.html + +How will this effect you? In the first phase, you won't see much +difference other then the site will continue to grow and the +SourceForge.net team will be able to handle the growth. In later +phases you will see new features on the site that take advantage of +the databases advanced capabilities. + +Today our mail archives have been converted over. The rest of the +site will make the migration to DB2 in the coming months. + +If you have questions about this or any other aspect of the site, +please feel free to email me, pat@sourceforge.net. I always +appreciate the feedback. + +Thank you for your continued support of SourceForge.net and the +Open Source Community. + +Pat- + +Patrick McGovern +Director, SourceForge.net + + + +1. INCREASED DOWNLOAD CAPACITY + +SourceForge.net continues to grow, and it's appetite for bandwidth +is never-ending. Every day SF.NET serves over 300,000 files to +ensure that developers and end-users within the Open Source +community can always obtain the software released by hosted +projects, SourceForge.net maintains a network of high-capacity +download servers. These servers are located throughout the world, +as to provide better download times regardless of which network +provider you are using, and regardless of your geographic location. + +Three new download servers have recently been added to our network, +further strengthening our file serving capabilities. These latest +additions include servers hosted by: + +Time Warner Telecom (Wisconsin,USA); +http://www.twtelecom.com/ + +University of Minnesota (Minnesota, USA) +http://www.umn.edu/ + +CESNET (Czech Republic) +http://www.cesnet.cz/ + +We thank these sponsors for their commitment to SourceForge.net and +the needs of the Open Source community. + +On a related note, we are looking for a mirror in Japan. If you are +an ISP or University in Japan and are willing to spare 20Mbps for a +SourceForge.net mirror (we'll supply the hardware), please let us +know at bandwidth@sourceforge.net + + + +2. AUDIO OF KERNEL SUMMIT AVAILABLE + +SourceForge.net now has the audio from the entire 2002 OSDN/USENIX +Kernel Summit, held in June. Listen to the Linux kernel master +discuss such hot topics as kernel modules, virtual memory, +block I/O, database scaling, security modules, and async I/O. +You may find this audio repository at: + +http://linuxkernel.foundries.sourceforge.net/article.pl?sid=02/06/26/0116225 + + + +3. CONTRIBUTE TO SOURCEFORGE.NET! BE A FOUNDRY GUIDE! + +Want to contribute to SourceForge.net, but you don't know how to +code? Be a foundry guide! Foundry guides get to hype the cool +projects that they think are worth downloading and testing. +A guide finds all the stuff on the web about their subject of +choice, and gives it prominent placement. How do you become a +foundry guide? Go to http://foundries.sourceforge.net/; find a +topic that interests you; and send email to +foundries@sourceforge.net stating your desired topic and why you +are qualified to be a foundry guide. + + + +4. WORK FOR SOURCEFORGE.NET + +We have a new position for a senior web developer available at +SourceForge.net. We are looking for someone to help us maintain, +upgrade, and add new features to SourceForge.net. Ideal person has +5+ years of development experience on high end, high volume +websites (3+ million page views a day). Has a vast level of +knowledge of Internet technologies: PHP, PostgreSQL, MySQL, DB2, +Linux, PERL, Apache, LDAP, Mailman. A flare for design / UI is a +bonus. SourceForge is a unique site with unique challenges. We are +looking for someone at the top of their game. + +Location of Job is in Fremont, California. Please send resume and +URL's of sites you have worked on to jobs@sourceforge.net. Text +resumes only. (No MS WORD files!) + + + +5. SITE STATISTICS + +Stats: (Monday 12th, 2000) +Hosted Projects: 45,194 +Registered Users: 465,530 +Page Views: 3,344,708 in a single day (Monday) +Files transfered in a single day: 340,838 (Monday) +Emails sent in a single day from Mailing lists: 851,143 (Monday) + + +Top Ten Projects + +1 phpMyAdmin +http://sourceforge.net/projects/phpmyadmin/ +phpMyAdmin is a tool written in PHP intended to handle the +administration of MySQL over the WWW. Currently it can create and +drop databases, create/drop/alter tables, delete/edit/add fields, +execute any SQL statement, manage keys on fields. + +2 Compiere ERP + CRM Business Solution +http://sourceforge.net/projects/compiere/ +Smart ERP+CRM solution for small-medium enterprises (SME) in the +global marketplace covering all areas from customer management, +supply chain and accounting. For $2-200M revenue companies looking +for "brick and click" first tier functionality. + +3 SquirrelMail +http://sourceforge.net/projects/squirrelmail/ +SquirrelMail is a PHP4-based Web email client. It includes built-in +pure PHP support for IMAP and SMTP, and renders all pages in pure +HTML 4.0 for maximum compatibility across browsers. It also has +MIME support, folder manipulation, etc + +4 TUTOS +http://sourceforge.net/projects/tutos/ +TUTOS is the ultimate team organization software, a web-based +groupware or ERP/CRM system to manage events/calendars, addresses, +teams, projects,tasks,bugs,mailboxes,documents and your time spent +with these things + +5 JBoss.org +http://sourceforge.net/projects/jboss/ +The JBoss/Server is the leading Open Source, standards-compliant, +J2EE based application server implemented in 100% Pure Java + +6 Firewall Builder +http://sourceforge.net/projects/fwbuilder/ +Object-oriented GUI and set of compilers for various firewall +platforms. Currently implemented compilers for iptables, ipfilter +and OpenBSD pf + +7 openMosix +http://sourceforge.net/projects/openmosix/ +openMosix is a Linux kernel extension for single-system image +clustering. Taking n PC boxes, openMosix gives users and +applications the illusion of one single computer with n CPUs. +openMosix is perfectly scalable and adaptive. + +8 CDex +http://sourceforge.net/projects/cdexos/ +CDex a CD-Ripper, thus extracting digital audio data from an Audio +CD. The application supports many Audio encoders, like MPEG +(MP2,MP3), VQF, AAC encoders. + +9 phpChrystal - An Open Intranet System +http://sourceforge.net/projects/phpchrystal/ +phpChrystal ist ein OpenSource-Intranetsystem welches vorrangig auf +Lan-Partys eingesetzt werden kann. Vorteile von phpChrystal sind +seine Portierbarkeit, Flexibilitt und Performance, da es vollends +auf PHP, MySQL und XML basiert + +10 Dev-C++ +http://sourceforge.net/projects/dev-cpp/ +Dev-C++ is an full-featured Integrated Development Environment +(IDE) for Win32 and Linux. It uses GCC, Mingw or Cygwin as +compiler and libraries set. + +More Top Projects: +http://sourceforge.net/top/mostactive.php?type=week + + + + + +EMAIL LIST REMOVAL: + +When the SF.NET team sends out a site-wide email, we sometimes see +replies that look like this: "Hey!! I didn't subscribe to this list!!! +You spammer. I hate you! I hate your dog! (insert other colorful +phrases here)". The truth is, when you registered on SourceForge.net +there was a check box that said "Receive Site-wide updates, low +volume". You left it checked when you submitted the registration form, +hence you are receiving this email. We send these updates every 4 to 6 +weeks, so it truly is low volume. However if you want off, this is not +a problem. Simply click on the link below. + + +================================================================== +You receive this message because you subscribed to SourceForge +site mailing(s). You may opt out from some of them selectively +by logging in to SourceForge and visiting your Account Maintenance +page (http://sourceforge.net/account/), or disable them altogether +by visiting following link: + + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/winxpnews.com spamassassin-4.0.0~rc3/t/data/welcomelists/winxpnews.com --- spamassassin-3.4.6/t/data/welcomelists/winxpnews.com 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/winxpnews.com 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,528 @@ +Received: from ooooooooo.net (ns1.ooooooooo.net [216.27.147.130]) + by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g6J6AZJ25232 + for ; Fri, 19 Jul 2002 07:10:35 +0100 +Received: from bounce.winxpnews.com (dal21037lyr001.datareturn.com [216.46.238.20]) + by ooooooooo.net (8.11.3/8.11.1) with SMTP id g6J6ABS16827 + for ; Fri, 19 Jul 2002 02:10:12 -0400 (EDT) + (envelope-from do_not_reply@bounce.winxpnews.com) +Importance: Normal +To: zzzz@zzzzzzzz.com +Reply-To: "WinXPnews" +Content-Type: text/html; + charset="us-ascii" +Content-Transfer-Encoding: 7bit +Date: Fri, 19 Jul 2002 01:10:07 -0600 +From: "WinXPnews" +Subject: WinXPnews: Time To Patch Your Windows Media Player +Message-Id: <5ksc2.105x1y34m@bounce.winxpnews.com> +X-Priority: 3 (Normal) +X-MSMail-Priority: Normal + + +WinXPnews™ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +WinXPnews™ E-Zine
+ + +Tue, Jul 9, 2002 (Vol. 2, 27 - Issue 33) + +
+Feel free to forward this newsletter to other WinXP enthusiasts.
+Read this newsletter online here: + +http://www.winxpnews.com/?id=33
+For a quick unsubscribe (gasp!) click here:
+ +http://www.winxpnews.com/unsubscribe.cfm?email=zzzz@zzzzzzzz.com + + +
+ +Time To Patch Your Windows Media Player + +
 
+ + +  This issue of WinXPnews™ contains:
+ +
 
+ +
    +
  1. EDITOR'S CORNER + +
  2. How to Publish Your Windows XP FTP Server to the Internet + +
  3. HINTS, TIPS, TRICKS & TWEAKS +
      +
    • Allow Dial-up Connections to Synchronize Time with Internet Time Servers +
    +
  4. HOW TO'S: ALL THE NEW XP FEATURES +
      +
    • How to Secure an FTP Server on Windows XP Professional +
    +
  5. WINXP SECURITY: UPDATES & PATCHES +
      +
    • Cumulative Patch for Windows Media Player
    • Cumulative Patches for Excel and Word for Windows +
    +
  6. UPGRADING & COMPATIBILITY ISSUES +
      +
    • A Computer May Hang During a Heavy Load with an Ericsson HIS Modem
    • Knowledge Base Search Center - If it is Not Broke, Do Not Break it! +
    +
  7. WINXP CONFIGURING & TROUBLESHOOTING +
      +
    • A Description of the Repair Option on a Local Area Network or High-Speed Internet Connection
    • Keyboard and Mouse Do Not Work When You Start Windows
    • How to Deploy Windows XP Images from Windows 2000 RIS Servers +
    +
  8. FAVE LINKS +
      +
    • This Week's Links We Like. Tips, Hints And Fun Stuff +
    +
  9. BOOK OF THE WEEK +
      +
    • Windows XP Power Tools +
    +
+ +
 
+ + +  SPONSOR: iHateSpam - Eliminate Irritating Junk Email
+ +
 
+ + + + +Irritated with porn, bogus business offers and viagra ads in your mailbox?
+Angry about losing your valuable time deleting all that junk? Need a spam-
+blocker that eliminates this annoying spam? Stop the spam in your inbox
+with iHateSpam. It gives you control over the ever increasing flood of
+junk email. Runs under Windows 95/98/ME/NT/2000/XP. Best of all, the limited
+time Intro Offer is just $19.95 with online delivery of full product and a
+30-day money back guarantee. This is a real no-brainer. Get Your Copy Now!
+Visit iHateSpam - Eliminate Irritating Junk Email for more information. + +
 
+ + +  EDITOR'S CORNER
+ +
 
+ +

How to Publish Your Windows XP FTP Server to the Internet

+Several of you wrote in about last week's article on installing an FTP Server. You said "that was great, but you only told half the story". You wanted to know two more things: +

    +
  1. How to make the FTP Server available to Internet users +
  2. How to secure the FTP Server +
+There are several ways to make an FTP server on the internal network available to users on the Internet. These methods are referred to as "Server Publishing". You can use a Windows XP computer running Internet Connection Services (ICS) to publish a server on your internal network. +

+Let's take a look at a common scenario. You have a Windows XP computer connected to the Internet with an always-on cable or DSL connection. You have another computer on your private network also running Windows XP. You've installed the FTP Server on this internal network computer and put files into the FTP folder. Now you want Internet users to connect to the FTP Server through the ICS computer directly connected to the Internet. +

+You can do this with the Windows XP ICS! Here's how: +

    +
  1. Go into the Network Connections window. You can get there from the Network applet in the Control Panel. +
  2. Right click the network interface directly connected to the Internet and click Properties. +
  3. Click on the Advanced tab in the connection's Properties dialog box. Put a checkmark in the Internet Connection Firewall checkbox. Always make sure the Internet Connection Firewall (ICF) is enabled when you connect a computer directly to the Internet. +
  4. Click the Settings button, then click on the Services tab in the Advanced Settings dialog box. +
  5. Now click the Add button. This brings up the Service Settings dialog box. Type in My FTP Server in the Description of service text box. In the Name or IP address text box, type in the IP address of the computer on your private network that's running the FTP server. Since you're using ICS, it'll have an IP address like 192.168.0.x, where x is different for each machine on your network. You might want to manually assign the IP address the FTP Server already has, so that it doesn't change in the future. You can find out what IP address your FTP server is using by opening a command prompt at the FTP server and typing in the command ipconfig. That will give you the IP address the FTP Server is using. Back to the Service Settings dialog box, select the TCP option button. For the External Port and the Internet port, put in the port number you assigned to the FTP server on your internal network. Read this week's How To section to see how to change the listening port number. Clic! +k OK +
  6. Click OK, and then click OK one more time! You might need to disable and enable the adapter after making the change. You can do that by right clicking the always-on interface. +
+The procedure is very similar for dial-up connections. However, there are problems with dial-up connections (and many always-on connections) because the IP address on the external interface of the ICS computer changes over time. Next week I'll share with you a cool way you can get around this problem by using something called a "dynamic DNS service". I've used one for years, and it works great. Make sure to tune in next week for the details. +

+There you have it. Is server publishing in your future? Have any questions on the method I described above? If so, let me know! There are lots of ways you can publish services. Tell me how you do it, and tricks you've learned along the way. If you're having problems with server publishing, let me know about those too! I'll be sure to include what I learn from you in upcoming newsletters. +

+Until next week,
+Tom Shinder, Editor
+(email us with feedback: feedback@winxpnews.com) + +

 
+ + +  SPONSOR: Is Your PC Spying On You?
+ +
 
+ + + + +You are surfing the Web. Check out sites, download some music or
+software that might be cool. Guess what? Your PC might have picked up
+a cyber transmitted disease (CTD). These pests might now be monitoring
+what you are doing and report this back to their "black hat" owners
+and reveal your personal information. PestPatrol kills 'em all off.
+Get your copy on the online shop for just 30 bucks with immediate online
delivery. Protect your PC and your confidential data!
+Visit Is Your PC Spying On You? for more information. + +
 
+ + +  HINTS, TIPS, TRICKS & TWEAKS
+ +
 
+ +

Allow Dial-up Connections to Synchronize Time with Internet Time Servers

+Do you use a dial-up connection but can't get your machine to synchronize its clock with an Internet time server when the Internet Connection Firewall (ICF) is enabled? If so, here's a tip Richard Surry sent in on how to fix the problem: +

    +
  1. Open your Network Connections window from the start menu. +
  2. Right click on your modem (or other dial-up connection) and click Properties. +
  3. Click on the Advanced tab. You already have a checkmark in the box that enables the ICF. Click on the Settings button. +
  4. Click on the Services tab, then click on the Add button in the Services tab. +
  5. That should open the Service Settings dialog box. In the Description box, put in Internet Time Service. For the Name or IP address of the computer hosting this service on your network, type in 127.0.0.1. Select the TCP protocol option button. For both the external and internal port numbers, type 123. +
  6. If you're online, disconnect and reconnect. Now synchronize the time by double click on the clock in the system tray and going to the Internet Time tab. +
+This is an interesting tip, and it represents an even more interesting problem. For you network geeks out there, I'll ask you this question: Why should we allow unsolicited inbound connections for the Internet Time Service? The ICF should not block responses to solicited outbound connections, so why should we have to enable reverse NAT to make this work? + +
 
+ + +  HOW TO'S: ALL THE NEW XP FEATURES
+ +
 
+ +

How to Secure an FTP Server on Windows XP Professional

+Last week we went over how to install the Windows XP FTP Server. It will work fine after going through the steps outlined last week, but several of you asked for more information on how to secure the FTP Server because you wanted to connect it to the Internet. It's a very good idea to understand how FTP security works before putting the server on the Internet. Here are some suggestions: +

    +
  1. Open the Internet Information Services console from the Administrative Tools menu. In the left pane of the console, expand your server name and then expand the FTP Sites node. +
  2. Right click on the Default FTP Site and click the Properties command. +
  3. Click on the FTP Site tab. Notice that the default TCP Port is set to 21. This is the well-known port for FTP. You can increase security a bit by changing this port to another value that's in the 1026-65534 range. This secures it from poorly motivated click-kiddies and also allows you to get around your ISP blocking incoming connections to TCP port 21. Friends who connect to your FTP server will need to change the port number on their FTP client software as well. +
  4. The Windows XP FTP server has a hard coded limit of 10 simultaneous connections. You might want to change this to a lower number to reduce the chance of a LAN party on the external interface of the FTP server. +
  5. Put a checkmark in the Enable Logging checkbox. Click the Properties button to the right of the log format drop-down list box. Click the Daily option button on the General Properties tab. On the Extended Properties tab, select all of the Extended Properties. Click OK. +
  6. Click on the Security Accounts tab. Place a checkmark in the Allow only anonymous connections checkbox. This prevents users from sending username and password credentials to the FTP server. You don't want users to send credentials because those credentials are sent in "clear text", which can be read by anyone who's listening on the wire. +
  7. Click the Messages tab. Enter a Welcome message, an Exit message, and a message users will see if there are no available connections. +
  8. Click on the Home Directory tab. Make sure there is a checkmark in the Read and Log Visits checkboxes. REMOVE the checkmark in the Write checkbox. Note the location in the Local Path text box. Navigate to that path in the Windows Explorer. +
  9. Right click on the FTPROOT folder and click Properties. +
  10. Click on the Security tab. Make sure that SYSTEM has Full Control. Assign the IUSR_ account READ access only. Remove all other permissions for the IUSR account. Make sure you give Adminstrators Full Control tool. This allows you, the administrator on the FTP Server computer, to add, remove and change files in the FTPROOT folder. +
+Stop and restart the FTP Server. Now your FTP server is secure and Internet bad guys won't be able to use it to distribute porno and bootlegged software. + +
 
+ + +  WINXP SECURITY: UPDATES & PATCHES
+ +
 
+ +

Cumulative Patch for Windows Media Player

+I think it was a couple months ago when I wrote about some serious problems with the Windows Media Player (WMP). At that time you could download a "cumulative" patch that would update the Media Player with the latest security fixes. Well, it's time to download another "cumulative" patch! A couple other problems were found in WMP that could cause some problems. To read more about the problem head on over to:
+http://www.winxpnews.com/rd/rd.cfm?id=020709SE-WMP_Patch +

+You'll also find the download locations for Windows Media Player versions 6.4, 7.1 and 8.0 (XP) on that page. +

Cumulative Patches for Excel and Word for Windows

+If you run Microsoft Word or Excel, versions 2000 or 2002 (XP), then you need to head on over to the Microsoft site to download some security fixes. These fixes handle security glitches that could get you in trouble if you don't take care of them! Head on over to Microsoft's site where you can find individual fixes for each program. You only need download the fix that applies to your computer:
+http://www.winxpnews.com/rd/rd.cfm?id=020709SE-Word_Excel_Patch + +

 
+ + +  UPGRADING & COMPATIBILITY ISSUES
+ +
 
+ +

A Computer May Hang During a Heavy Load with an Ericsson HIS Modem

+If your computer has a Ericsson HIS modem, you might experience a dreaded blue screen and see the message IRQL_NOT_LESS_OR_EQUAL or DRIVER_CORRUPTED_EXPOOL. The problem is that you're downloading too much and your poor modem can't keep up! Microsoft recognizes that this isn't a problem with the modem, but with the modem driver. To download a fix visit Microsoft's site. After getting the fix, you can download as much as you like without worrying about blue screens!
+http://www.winxpnews.com/rd/rd.cfm?id=020709UP-HIS_Modem +

Knowledge Base Search Center - If it is Not Broke, Do Not Break it!

+It wasn't so long ago when you could search the Microsoft Knowledge Base for articles that came up in the last 3 days, 7 days, 14 days, 30 days, 90 days and 6 months. It was great! But Microsoft decided to "fix" the Knowledge Base search page, and now it really sucks! It's hard to find things that used to come up easily, the site is often down, and searching based on age of articles just doesn't work anymore. +

+Try this: go to:
+http://support.microsoft.com/default.aspx?ln=EN-US&pr=kbinfo&
+and on the left side of the page select Windows XP in the top drop down list box. Don't put anything in the For solutions containing...(optional) text box. Leave the Any of the words entered option selected in the Using drop down list box. For Maximum Age select 3 days. For Results Limit select 150 articles. Click Search Now. Whoa! Nothing. OK, it's reasonable to see no articles related to Windows XP in the last 3 days. Try again, this time using 7 days. Whaat? Still no articles. OK, it was a holiday week in the USA last week. Let's try 14 days. Nothing again! That seems sort of strange, doesn't it? Let's give it another try with 30 days. Still no articles! What's going on here? Keep trying for 6 months and one year. You still won't find anything. It's pretty sad, because this used to work. + +

 
+ + +  WINXP CONFIGURING & TROUBLESHOOTING
+ +
 
+ +

A Description of the Repair Option on a Local Area Network or High-Speed Internet Connection

+Here's the answer to a question I've had for a long time. What the heck does that "Repair" option for a network connection actually do? It's not in the help file, but it's on the Microsoft Web site. Here's what it does: +

    +
  • Sends an ipconfig /renew +
  • Flushes the ARP cache with a arp -d +
  • Reloads the NetBIOS name cache with a nbtstat -R +
  • Updates its WINS server with an nbtstat -RR +
  • Clear out the DNS client cache with an ipconfig /flushdns +
  • Reregisters the client with a DDNS server with a ipconfig /registerdns +
+Check out the original article over at:
+http://www.winxpnews.com/rd/rd.cfm?id=020709CO-Repair_Option +

Keyboard and Mouse Do Not Work When You Start Windows

+Have you been hit with this one? You're working in Windows XP and shut down for the day. The next morning you start up your Windows XP computer and the mouse pointer is stuck! The only way to get it going again is to restart the computer, and for some reason the pointer starts moving again. What's up with that? I still haven't figured that one out, but Microsoft has a KB article that claims it's from a corrupt registry. I doubt that's the case in my situation because the problem is intermittent. But if you find that your mouse is always stuck, you might want to check out:
+http://www.winxpnews.com/rd/rd.cfm?id=020709CO-Frozen_Mouse +

How to Deploy Windows XP Images from Windows 2000 RIS Servers

+Are you planning to roll out lots of Windows XP computers on your network in the near future? If so, you're probably looking for a good way to automate the process. You can use the Windows 2000 Remote Installation Services (RIS) if you're running Windows 2000 Servers on your network. For the basic procedure and some tips, tricks, and gotcha's, check out:
+http://www.winxpnews.com/rd/rd.cfm?id=020709CO-Deploy_XP_Images + +

 
+ + +  FAVE LINKS
+ +
 
+ +

This Week's Links We Like. Tips, Hints And Fun Stuff

  • Be Afraid, be very afraid - the future of Big Brother in computing

    • +http://www.winxpnews.com/rd/rd.cfm?id=020709FA-Palladium_FAQ +
  • Get Revenge on your computer!

    • +http://www.winxpnews.com/rd/rd.cfm?id=020709FA-PC_Revenge +
  • Pringles Super Spud Boxing

    • +http://www.winxpnews.com/rd/rd.cfm?id=020709FA-Spud_Boxing +     +
     
    + + +  BOOK OF THE WEEK
    +     +
     
    + +

    Windows XP Power Tools

    +A book full of personal experiences and anecdotes that will equip you with the tips and tricks you need to become an XP afficionado. Coverage includes automating tasks using scripting, the Command Console Survivor Guide, networking, registry, maximizing security/firewalls, hardware, installation/configuration, and database hosting/accessing. The CD contains the best third party utilities around. +

    +Step-by-Step Instruction Helps You Harness the Full Power of Windows XP. Whether you're running Windows XP Home Edition or Professional, Windows XP Power Tools arms you with the advanced skills you need to become the ultimate power user. Full of undocumented tips and tricks and written by a Windows expert, this book provides you with step-by-step instructions for customization, optimization, troubleshooting and shortcuts for working more efficiently. A must-have for power users and network administrators, Windows XP Power Tools includes a CD filled with power tools including security, e-mail, diagnostic and data recovery utilities. +

    +http://www.winxpnews.com/rd/rd.cfm?id=020709BW-XP_Power_Tools + +

    + + + + + + + + + + + + + + + + + + + + + + +
     
    + + +  ABOUT WINXPNEWS™
    +     +
     
     
    + +What Our Lawyers Make Us Say +
    + +These documents are provided for informational purposes only. The information +contained in this document represents the current view of Sunbelt Software +Distribution on the issues discussed as of the date of publication. Because +Sunbelt must respond to changes in market conditions, it should not be +interpreted to be a commitment on the part of Sunbelt and Sunbelt cannot +guarantee the accuracy of any information presented after the date of +publication. +

    +INFORMATION PROVIDED IN THIS DOCUMENT IS PROVIDED "AS IS" WITHOUT WARRANTY OF +ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND FREEDOM +FROM INFRINGEMENT. +

    +The user assumes the entire risk as to the accuracy and the use of this +document. This document may be copied and distributed subject to the +following conditions: 1) All text must be copied without modification and all pages +must be included; 2) All copies must contain Sunbelt's copyright notice and any +other notices provided therein; and 3) This document may not be distributed +for profit. All trademarks acknowledged. Copyright Sunbelt Software +Distribution, Inc. 1996-2002. + +

     
    + +About Your Subscription to WinXPnews™ +
    + +This is a posting from WinXPnews. You are subscribed as zzzz@zzzzzzzz.com +

    +To manage your profile, please visit our site by clicking on the following link:
    + +http://www.winxpnews.com/login.cfm?id=9665862091709486
    +For a quick unsubscribe (gasp!), click here:
    + +http://www.winxpnews.com/unsubscribe.cfm?email=zzzz@zzzzzzzz.com +     +

    + + + diff -Nru spamassassin-3.4.6/t/data/welcomelists/yahoo-inc.com spamassassin-4.0.0~rc3/t/data/welcomelists/yahoo-inc.com --- spamassassin-3.4.6/t/data/welcomelists/yahoo-inc.com 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/welcomelists/yahoo-inc.com 2004-06-15 02:33:54.000000000 +0000 @@ -0,0 +1,20 @@ +Return-Path: +Delivered-To: zzzzz@xyz.org +Received: (qmail 8790 invoked by uid 505); 29 Jul 2002 03:28:42 -0000 +Received: from yahoo-dev-null@yahoo-inc.com by blazing.xyz.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.195404 secs); 29 Jul 2002 03:28:42 -0000 +Received: from e5.member.yahoo.com (216.136.131.107) + by dsl092-072-xyz.bos1.dsl.speakeasy.net with SMTP; 29 Jul 2002 03:28:42 -0000 +Received: (from yahoo@localhost) + by e5.member.yahoo.com (8.11.3/8.11.3) id g6T3PIh88736; + Sun, 28 Jul 2002 20:25:18 -0700 (PDT) + (envelope-from yahoo-dev-null@yahoo-inc.com) +Date: Sun, 28 Jul 2002 20:25:18 -0700 (PDT) +Message-Id: <200207290325.g6T3PIh88736@e5.member.yahoo.com> +X-Authentication-Warning: e5.member.yahoo.com: yahoo set sender to using -f +From: Yahoo! Member Services +Errors-To: yahoo-dev-null@yahoo-inc.com +To: zzzzz@xyz.org +Subject: Yahoo! Email Verification + +[email from Yahoo!] + diff -Nru spamassassin-3.4.6/t/data/whitelists/action.eff.org spamassassin-4.0.0~rc3/t/data/whitelists/action.eff.org --- spamassassin-3.4.6/t/data/whitelists/action.eff.org 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/action.eff.org 1970-01-01 00:00:00.000000000 +0000 @@ -1,586 +0,0 @@ -From alerts@action.eff.org Mon Aug 12 10:54:52 2002 -Return-Path: -Delivered-To: jm@localhost.netnoteinc.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 265A944100 - for ; Mon, 12 Aug 2002 05:52:11 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for jm@localhost (single-drop); Mon, 12 Aug 2002 10:52:11 +0100 (IST) -Received: from eug-app01.ctsg.com (firewall2.ctsg.com [216.210.226.98]) by - dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g7A6FDb11520 for - ; Sat, 10 Aug 2002 07:15:13 +0100 -Message-Id: <1418893.1028960179734.JavaMail.IWAM_EUG-APP01@eug-app01> -Date: Fri, 9 Aug 2002 23:16:19 -0700 (PDT) -From: Effector List -To: xxxxxxxx@xxxxx.xxx -Subject: EFFector 15.24: EFF Submits Comments to FCC, Johansen Trial - Schedule Update -MIME-Version: 1.0 -Content-Type: text/plain -Content-Transfer-Encoding: 7bit - -EFFector Vol. 15, No. 24 August 9, 2002 ren@eff.org - -A Publication of the Electronic Frontier Foundation ISSN 1062-9424 - - -In the 224th Issue of EFFector: - -* EFF Submits Letter to FCC Chairman Regarding BPDG Proposal -* Update on Intel Corp. v. Hamidi -* DeCSS Author Johansen's Trial Rescheduled -* Bunnie Presents Paper on XBox Reverse Engineering -* Thanks to DefCon! -* EFF Booth at LinuxWorld -* Deep Links: Baen Books' Releases Reader-Friendly E-Books -* Deep Links: Janis Ian on P2P -* Deep Links: Hometown Paper Discusses Rep. Coble's Support of - Berman P2P Hacking Bill -* Administrivia - - -For more information on EFF activities & alerts: http://www.eff.org/ - -To join EFF or make an additional donation: -http://www.eff.org/support/ - -EFF is a member-supported nonprofit. -Please sign up as a member today! --------------------------------------------------------------------- - -* EFF Submits Letter to FCC Chairman Regarding BPDG Proposal - -The Honorable Michael K. Powell Chairman Federal Communications -Commission 445 12th Street, S.W. Suite 8C453 Washington, DC 20554 - - -BY FACSIMILE, ELECTRONIC MAIL, AND POSTAL MAIL - -Dear Chairman Powell: - -I am writing to you today in regards to the digital television -Broadcast Flag; specifically, I write in response to Sen. Hollings' -and Representatives Dingell and Tauzin's letters of July 19, which -urged you to mandate the Broadcast Flag proposal outlined in the -final report of the Broadcast Protection Discussion Group. - -The Electronic Frontier Foundation (EFF) is a donor-supported -non-profit organization that works to uphold civil liberties -interests in technology policy and law. EFF has played a critical -role in safeguarding crucial freedoms related to computers, the -Internet and consumer electronics devices, defeating the restriction -on strong cryptography exports; securing the legal principle that -Internet wiretaps must only proceed in conjunction with a warrant; -and defending academics, researchers and commercial interests -against DMCA-related prosecution. - -EFF was an active participant in the Broadcast Protection Discussion -Group. We attended the group's meetings and conference calls and -participated in the group's policy and technical mailing-lists. EFF -also maintains a web-site that was and is the only public source of -information on the Broadcast Flag negotiations and proposal. The -site can be found at http://bpdg.blogs.eff.org. EFF devoted -thousands of staff-hours to publicizing the existence and nature of -the BPDG to the public, to civil liberties and consumer-advocacy -groups, and to entrepreneurial companies and software authors whose -products were threatened by the proceedings. - -When you and I met at Esther Dyson's PC Forum last March, we spoke -briefly about the civil liberties interests that would be undermined -by the Broadcast Protection Discussion Group's mandate. The BPDG -proposal will have grave consequences for innovation, free -expression, competition and consumer interests. Worst of all, it -will add unnecessary complexity and expense to the DTV transition, -compromising DTV adoption itself. - -As you are aware, technologists have traditionally manufactured -those devices they believed would be successful in the market, often -in spite of the misgivings of rights-holders. From the piano roll to -the PVR, technologists have enjoyed the freedom to ship whatever -products they believe the public will pay for; what's more, -innovation has always thrived best where there were the fewest -regulatory hurdles. NTSC tuners and devices are governed by precious -few regulations, and consequently we see a rich field of products -that interact with them, from the VCR Plus to tuner-cards for PCs to -the PVR. The Broadcast Flag proposal would limit technologists to -shipping those products that met with the approval of MPAA member -companies. No entrepreneur or software author will know, a priori, -whether his innovative DTV product will be legal in the market until -he has gone to the expense of building it and taking it around to -the Hollywood studios for review. - -Consumers and industry alike have benefitted greatly from the "Open -Source" or "Free Software" movement, in which technologies are -distributed in a form that encourages end-user modification. From -server-software like the web-wide success-story apache, to operating -systems like GNU/Linux, to consumer applications like the Mozilla -browser, Free Software is a powerful force for innovation, consumer -benefit and commercial activity. The BPDG proposal implicitly bans -Free Software DTV applications -- such as the DScaler de-interlacer -and the GNU Radio software-defined radio program -- as these -applications are built to be modified by end-users, something that -is banned under the BPDG proposal. The tamper-resistance component -of the BPDG's "Robustness Requirements" will create and entire class -of illegal software applications, abridging the traditional First -Amendment freedom enjoyed by software authors who create expressive -speech in code form under one of several Free Software/Open Source -licenses. - -The BPDG nominally set out to create an objective standard, a bright -line that technologists could hew to in order to avoid liability -when deploying their products. However, the end product of the BPDG -was a "standard" that contained no objective criteria for legal -technology; rather, the standard required that new technologies be -approved by MPAA member companies. Not uncoincidentally, the only -technologies that were approved by the MPAA -- and hence the only -legal technologies -- were those produced by the 4C and 5C -consortia, a group of technology companies that acted as the MPAA's -allies throughout the BPDG process. This is an harbinger of the sort -of regime that the BPDG standard will usher in: technology companies -will be able to shut their competitors out of the marketplace by -allying themselves with Hollywood, brokering deals to allow certain -technologies and outlaw others. - -The marketplace is a proven mechanism for rapidly and efficiently -producing products that increase the value and desirability of new -technologies, such as DTV. A BPDG mandate would subvert the market -for DTV innovation. Competing companies with lower-cost DTV -technology alternatives would be restrained from bringing these to -market if they failed to assuage the MPAA's concerns about -unauthorized redistribution. Furthermore, the universe of -unauthorized-but-lawful uses for DTV programming will be shrunk down -to the much smaller space of explicitly authorized uses. The ability -of the public to make unauthorized-but-lawful uses of television -programming has been an historical force for increasing the value of -broadcast programming, from the VCR to the PVR. - -Ironically, the inevitable damage that a Broadcast Flag mandate -would do to innovation, competition and consumer interests can only -slow down DTV adoption, by driving up the cost of DTV devices while -reducing the number of desirable features that an open market would -create. If the public is offered less functionality for more money, -they will not flock to DTV. - -The most disheartening thing about the Broadcast Flag is that there -is neither a strong case that the Broadcast Flag is a necessary tool -for protecting copyright, nor that the Broadcast Flag would be -effective in that role. The existing practice of Internet -infringement of broadcast programming -- analog captures from -devices that satisfy the requirements of the BPDG proposal -- would -not be stopped by the presence of a Broadcast Flag. -Higher-resolution DTV signals will likewise present no challenge to -determined infringers, who can capture full-quality analog signal -from DTV devices and then re-digitize them, suffering only a single -generation's worth of loss-of-quality before the programming enters -the Internet. - -Meanwhile, the underlying rubric for a Broadcast Flag -- that -infringement will undermine Hollywood's business to the point that -movies will no longer be available to the public, reducing the value -of DTV -- is no more than superstition. No credible study or -analysis, undertaken by a neutral party, has ever been presented to -Congress, the FCC, the CPTWG or the BPDG supporting this notion. The -public is being asked to sacrifice its rights in copyright; industry -is being asked to place its right to innovation in the hands of -entertainers; the US government is being asked to mandate -extraordinary, unprecedented regulation of the $600 billion -technology sector -- all on the uncorroborated opinions of a few -studio executives. - -EFF welcomes the FCC's oversight of the Broadcast Flag issue. The -BPDG proceedings took place behind a shroud of secrecy, in a -looking-glass "public process" where only those participants the -organizers wanted to hear from were made privy to its existence, -where the co-chairs invented rules and processes on the fly to suit -the needs of the entertainment interests and the technology -companies that had privately secured a promise of a legal monopoly -for their products, where the press was banned. - -The FCC has an admirable tradition of seeking and weighing public -opinion in its proceedings. As the FCC considers the Broadcast Flag, -EFF hopes that it will start anew, setting aside the findings of the -BPDG in light of the concerns raised by Microsoft, Philips, Sharp, -Thomson, and Zenith, as well as non-profit organizations including -EFF, Consumers Union, Consumer Federation of America, the Free -Software Foundation, Public Knowledge, digitalconsumer.org, the -Center for Democracy in Technology, and the Computer and -Communications Industry Association. - -Thank you for attention in this matter. Please let me know if we can -be of any further assistance to you. - -Sincerely yours, - -Cory Doctorow for the Electronic Frontier Foundation - - - -Links: - -EFF's BPDG Blog: -http://bpdg.blogs.eff.org - -An overview of our concerns with the broadcast flag: -http://bpdg.blogs.eff.org/archives/one-page.pdf - -Letter from Sen. Hollings: -http://bpdg.blogs.eff.org/archives/000155.html - -Letter from Rep. Tauzin: -http://bpdg.blogs.eff.org/archives/000156.html - - --------------------------------------------------------------------- - -* Update on Intel Corp. v. Hamidi - -Intel Corp. v. Hamidi is now on appeal to the California Supreme -Court. EFF filed an amicus brief in support of Ken Hamidi on Aug. 6, -2002. The facts are simple: Over about two years, Hamidi on six -occasions sent e-mail critical of Intel's employment practices to -between 8,000 and 35,000 Intel employees. Intel demanded that Hamidi -stop, but he refused. Intel obtained an injunction barring Hamidi -from e-mailing Intel employees at their Intel e-mail addresses, -based on the common-law tort of "trespass to chattels." ("Chattel" -is a legal term that refers to personal property, as opposed to -property in land.) - -EFF's amicus brief argues three main points. - -(1) Intel did not qualify for relief under "trespass to chattels" -because Intel's e-mail servers were not themselves harmed by -Hamidi's e-mails. If Intel was harmed, it was because the content of -Hamidi's e-mails affected Intel employees, not because sending the -e-mails affected the functioning of Intel's servers. - -(2) By focusing on unwanted "contact" with the chattel and ignoring -the harm requirement, the court of appeal turned "trespass to -chattels" into a doctrine that threatens common Internet activity -like search engines and linking. For example, if a website posted a -"no trespassing" sign, any "contact" by a search engine could be -considered a trespass even if it caused no harm. - -(3) The court of appeal wrongly held that the injunction did not -infringe Hamidi's freedom of speech. The First Amendment limits -private parties' legal remedies in many areas of law, such as libel, -out of concern that private parties will use the law to suppress -criticism. The same principle should apply here, where Intel's -claims of harm stem from the meaning of Hamidi's speech. - - -Links: - -The Intel v. Hamidi Archive: - -http://www.eff.org/Cases/Intel_v_Hamidi/ - -- end - - --------------------------------------------------------------------- - -* DeCSS Author Johansen's Trial Rescheduled - -The trial of Norwegian teen Jon Johansen, who created the -controversial DeCSS software, has been pushed back again. It is now -scheduled to be heard on December 9, 2002, in Oslo, Norway. In the -fall of 1999, Johansen and his team reverse-engineered the content -scrambling system (CSS) software used to encrypt DVDs in an effort -to build a DVD player for the Linux operating system. In January of -2002, the Norwegian Economic Crime Unit (OKOKRIM) charged Johansen -with a violation of Norwegian Criminal Code Section 145.2, which -outlaws breaking into a third-party's property in order to steal -data that one is not entitled to. This prosecution marks the first -time the law will be used to prosecute a person for accessing his -own property (his own DVD). Johansen faces two years in prison if -convicted. The prosecution is based on a formal complaint filed by -the Motion Picture Association. - -The trial had originally been scheduled to take place in June of -2002 but was rescheduled when the court could not find any qualified -judges to hear Johansen's case. Now the case is scheduled to be -heard by a three-judge panel. Help Jon in his battle against -Hollywood movie studios, donate to his legal defense fund at: - -http://www.eff.org/support/jonfund.html - -Links: - -The DeCSS/Johansen Archive: -http://www.eff.org/IP/Video/DeCSS_prosecutions/Johansen_DeCSS_case/ - -Digital Rights Management Archive: -http://www.eff.org/IP/DRM/ - -- end - - --------------------------------------------------------------------- - -* Bunnie Presents Paper on XBox Reverse Engineering - -Paper Explains Flaw in Videogame Security System - -Researcher Escapes Chilling Effect of Digital Copyright Law - -Electronic Frontier Foundation Media Advisory - -For Immediate Release: Thursday, August 9, 2002 - -San Francisco - The Electronic Frontier Foundation (EFF) is pleased -to announce that former MIT doctoral student Andrew "Bunnie" Huang -will present a paper explaining a security flaw in the Microsoft -Xbox (TM) videogame system. - -Huang will present his paper, "Keeping Secrets in Hardware: the -Microsoft X-BOX Case Study," at 5:25 p.m. PDT on August 13, 2002, at -the 2002 Workshop on Cryptographic Hardware and Embedded Systems -(CHES 2002) in Redwood City, California (Aug. 13-15, 2002). - -The Xbox security system is intended to allow people to play only -videogames authorized by Microsoft. Huang's paper "shows how a -person could defeat that system with a small hardware investment," -said MIT Professor Hal Abelson, one of Huang's advisors. "More -importantly, the paper relates the security vulnerability to a -general design flaw shared by other high-profile security systems -such as the government's Clipper Chip and the movie industry's -Contents Scrambling System (CSS) for DVD players." - -Huang contacted EFF in March after his advisors told him that his -preliminary findings raised potentially significant legal questions. -With the help of Boston College law professor Joe Liu, EFF worked -with Huang, Abelson, and MIT administrators to analyze the legal -issues and draft letters notifying Microsoft of Huang's research -findings and intended publication, one of the steps encouraged by -Digital Millennium Copyright Act (DMCA). - -Microsoft told Huang and Abelson that while it might prefer that the -paper not be published, it would be inappropriate to ask MIT to -withhold the paper. - -"Microsoft deserves praise for making no attempt to control -publication," said Abelson. "Their response shows that they value -academic freedom, and that they appreciate the critical role of -unfettered research and publication in advancing technology." - -Other companies have reacted otherwise, using the DMCA to threaten -researchers. The Recording Industry Association of America last year -warned Princeton Professor Edward Felten after his research team -exposed weaknesses in digital music security technologies. Last -month, Hewlett Packard (HP) threatened research collective SnoSoft -over exposing a security vulnerability in HP's Tru64 Unix operating -system. Soon after, HP clarified that it would not use the DMCA to -stifle research or impede the flow of information that would improve -computer security. - -Huang said that while he is glad he can openly present his paper, -"The DMCA clearly had a chilling effect on my work. I was afraid to -submit my research for peer review until after the EFF's efforts to -clear potential legal restraints." - -"Researchers should be analyzing security, not worrying about -getting sued," said EFF Senior Staff Attorney Lee Tien. - -Links: - -For this release: -http://www.eff.org/IP/DMCA/20020808_eff_bunnie_pr.html - -For Huang's paper: -ftp://publications.ai.mit.edu/ai-publications/2002/AIM-2002-008.pdf - -For the CHES program: http://islab.oregonstate.edu/ches/program.html - -EFF "Unintended Consequences: Three Years Under the DMCA" report: -http://www.eff.org/IP/DMCA/20020503_dmca_consequences.pdf - -RIAA sues Professor Edward Felten over SDMI: -http://www.eff.org/Legal/Cases/Felten_v_RIAA/ - -An article about Hewlett-Packard's threatening SnoSoft: -http://www.wired.com/news/technology/0,1282,54297,00.html - -- end - - --------------------------------------------------------------------- - -* EFF Thanks Defcon - -EFF thanks The Dark Tangent and other organizers of the DEF CON X -convention for their generous donation of exhibition space at DEF -CON (http://www.defcon.org/). DEF CON is an "underground" computer -security conference held each summer in Las Vegas. - -Links: - -Defcon Website: -http://www.defcon.com/ - -- end - - --------------------------------------------------------------------- - -* EFF Booth at LinuxWorld - -Come visit EFF at booth #488 at Linuxworld next week. We'll be -passing out information, good cheer, and a slew of new stickers. - -When: August 13 - 15 - 10a - 5p - -Where: Booth #5 - Moscone Center - 747 Howard Street - San Francisco, CA 94103 - -Links: - -LinuxWorld Conference Website: -http://www.linuxworldexpo.com/ - -Floor Map and EFF Booth: -http://www.linuxworldexpo.com/linuxworldexpo/v31/floorplan/floorplan -.cvn?b=97& exbID=50 - -- end - - --------------------------------------------------------------------- - -Deep Links - -Deep Links is a new department in the EFFector featuring noteworthy -news-items, victories and threats from around the Internet. - - -* Baen Books expands fair-use-friendly e-book program - -Baen Books will bind a CD-ROM into the October 2002 hardcover -edition of *War of Honor,* the latest volume in David Weber's epic -Honor Harrington space-opera. The CD will contain at least 22 -complete novels, all in open formats like html and RTF, with the -fair-use-friendly admonishment "This disk and its contents may be -copied and shared but NOT sold." Included on the disk are the entire -Honor Harrington series to date, as well as other titles from the -Baen line, including Keith Laumer's *Retief!* and Larry Niven and -Jerry Pournelle's *Fallen Angels*. - -Baen has been a banner-carrier for fair-use in electronic -publishing, shipping text and html files that can be played on a -multitude of devices. Other publishers have chosen to publish their -material in copy-controlled formats that make it impossible to -legally loan or resell the titles you purchase, are locked to a -specific device, can't play on every operating system, and -occasionally lock out assistive technology like the screen-readers -employed by the blind. - -Dmitry Skylarov, a Russian scientist, was arrested in July 2001, for -demonstrating how end-users could defeat the copy-prevention -employed by Adobe's e-book technology. Adobe asked the FBI to arrest -Skylarov for violating the Digital Millennium Copyright Act (DMCA), -which makes it a crime to describe techniques for circumventing -copy-prevention technology. Though Skylarov was later released, his -employer, ElcomSoft, is still facing charges in the USA, and the -Russian government has issued an advisory warning Russian scientists -to steer clear of American technical conferences until the DMCA is -repealed. - -Here is Baen's statement on the CD release: - -You are about to start playing with a CD-ROM that has fairly -extraordinary content. As of this writing it includes twenty-two -UNENCRYPTED novels in several formats, the ten Honor Harrington -Novels, 3 Honor Harrington Anthologies and 9 novels by friends of -Honor, and by the time of distribution it may well contain more. -(More than twenty novels for free, and with no stupid codes to work -around. Think of that.) The reason for the plethora of formats is to -try to please the people who want to read the novels on their Palm -Pilots or other text-specialized palm-sized devices. - -Links: - -Baen Books's page for *War of Honor*: -http://www.baen.com/orientation.htm - -Slashdot discussion of *War of Honor* release: -http://slashdot.org/article.pl?sid=02/08/03/2314232&mode=flat&tid= -149 - -EFF documents on Dmitry Skylarov and ElcomSoft: -http://www.eff.org/IP/DMCA/US_v_Elcomsoft/ - -EFF documents on the Digital Millennium Copyright Act (DMCA): -http://www.eff.org/IP/DMCA/ - -- end - - -* Singer/Songwriter Janis Ian on P2P Lucid article on the benefits of -peer-to-peer networks form an artists' perspective. -http://www.janisian.com/article-internet_debacle.html - -- end - - -* Hometown Paper Discusses Rep. Coble's Support of Berman P2P Hacking -Bill Column on how a good Representative can make a bad call. -http://www.news-record.com/news/columnists/staff/cone04.htm - -- end - - - --------------------------------------------------------------------- - -Administrivia - -EFFector is published by: - -The Electronic Frontier Foundation -454 Shotwell Street -San Francisco -CA 94110-1914 USA -+1 415 436 9333 (voice) -+1 415 436 9993 (fax) -http://www.eff.org/ - -Editor: Ren Bucholz, - Activist - ren@eff.org - -To Join EFF online, or make an additional donation, go to: -http://www.eff.org/support/ - -Membership & donation queries: -membership@eff.org - -General EFF, legal, policy or online resources queries: -ask@eff.org - -Reproduction of this publication in electronic media is encouraged. -Signed articles do not necessarily represent the views of EFF. To -reproduce signed articles individually, please contact the authors -for their express permission. Press releases and EFF announcements & -articles may be reproduced individually at will. - -To change your address, plese visit: -http://action.eff.org/subscribe/. - ->>From there, you can update all your information. If you have already -subscribed to the EFF Action Center, please visit: -http://action.eff.org/action/login.asp. - -(Please ask ren@eff.org to manually remove you from the list if this -does not work for you for some reason.) - -Back issues are available at: -http://www.eff.org/effector - -To get the latest issue, send any message to -effector-reflector@eff.org (or er@eff.org), and it will be mailed to -you automatically. You can also get it via the Web at: -http://www.eff.org/pub/EFF/Newsletters/EFFector/current. html - - -++++++++++++++++++++++++ -You received this message because aaaaaa@yyyyyy.zzz is a member of -the mailing list originating from alerts@action.eff.org. To unsubscribe from -all mailing lists originating from alerts@action.eff.org, send an email to -alerts@action.eff.org with "Remove" as the only text in the subject line. - - diff -Nru spamassassin-3.4.6/t/data/whitelists/amazon_com_ship spamassassin-4.0.0~rc3/t/data/whitelists/amazon_com_ship --- spamassassin-3.4.6/t/data/whitelists/amazon_com_ship 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/amazon_com_ship 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Received: (qmail 10120 invoked by uid 505); 14 Jun 2002 19:55:43 -0000 -Received: from ship-confirm@amazon.com by zzzzzzzz.iiiiiiiii.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.174777 secs); 14 Jun 2002 19:55:43 -0000 -Received: from localhost (127.0.0.1) - by localhost with SMTP; 14 Jun 2002 19:55:42 -0000 -Delivered-To: zzzzzzzzz-com-popbox@zzzzzzzzz.com -Received: from mail.zzzzzzzzz.com [64.124.162.104] - by localhost with POP3 (fetchmail-5.9.0) - for zzzzzzzzz@localhost (single-drop); Fri, 14 Jun 2002 15:55:42 -0400 (EDT) -Received: (qmail 32249 invoked by uid 1002); 14 Jun 2002 19:55:17 -0000 -Delivered-To: zzzzzzzzz-com-rod@zzzzzzzzz.com -Received: (qmail 32245 invoked from network); 14 Jun 2002 19:55:17 -0000 -Received: from unknown (HELO sas-dc-mail-102.amazon.com) (207.171.190.155) - by mail0.tyva.netherweb.com with SMTP; 14 Jun 2002 19:55:17 -0000 -Received: by sas-dc-mail-102.amazon.com (Postfix, from userid 1001) - id 0578E3F41; Fri, 14 Jun 2002 19:55:17 +0000 (GMT) -To: rod@zzzzzzzzz.com -From: ship-confirm@amazon.com -Subject: Your Amazon.com order has shipped (#888-4444444-9999999) -Message-Id: <20020614195517.0578E3F41@sas-dc-mail-102.amazon.com> -Date: Fri, 14 Jun 2002 19:55:17 +0000 (GMT) - -[Amazon shipping confirmation] - - diff -Nru spamassassin-3.4.6/t/data/whitelists/amazon_co_uk_ship spamassassin-4.0.0~rc3/t/data/whitelists/amazon_co_uk_ship --- spamassassin-3.4.6/t/data/whitelists/amazon_co_uk_ship 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/amazon_co_uk_ship 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Received: (qmail 24448 invoked by uid 505); 3 Jun 2002 13:35:25 -0000 -Received: from orders@amazon.co.uk by zzzzzzzzz.azzzzzzzzzzz.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.342757 secs); 03 Jun 2002 13:35:25 -0000 -Received: from localhost (127.0.0.1) - by localhost with SMTP; 3 Jun 2002 13:35:24 -0000 -Delivered-To: zzzzzzzzz-com-popbox@zzzzzzzzz.com -Received: from mail.zzzzzzzzz.com [64.124.162.104] - by localhost with POP3 (fetchmail-5.9.0) - for zzzzzzzzz@localhost (single-drop); Mon, 03 Jun 2002 09:35:24 -0400 (EDT) -Received: (qmail 3226 invoked by uid 1002); 3 Jun 2002 13:34:30 -0000 -Delivered-To: zzzzzzzzz-com-rod@zzzzzzzzz.com -Received: (qmail 3224 invoked from network); 3 Jun 2002 13:34:29 -0000 -Received: from unknown (HELO aprilia.amazon.com) (207.171.190.156) - by mail0.tyva.netherweb.com with SMTP; 3 Jun 2002 13:34:29 -0000 -Received: from matchless.amazon.com (matchless.amazon.com [10.16.42.218]) - by aprilia.amazon.com (Postfix) with ESMTP id 2A30D55C - for ; Mon, 3 Jun 2002 06:34:29 -0700 (PDT) -Received: from vdc-dc-batch-101.vdc.amazon.com by matchless.amazon.com with ESMTP - (crosscheck: vdc-dc-batch-101.vdc.amazon.com [10.30.41.134]) - id g53DMcd9000547 - for ; Mon, 3 Jun 2002 06:34:28 -0700 -Received: by vdc-dc-batch-101.vdc.amazon.com -Date: Mon, 3 Jun 2002 13:12:54 GMT -Message-Id: -To: rod@zzzzzzzzz.com -From: orders@amazon.co.uk -Subject: Your Amazon.co.uk order has been dispatched (#999-4444444-3333333) - -[amazon.co.uk order] - diff -Nru spamassassin-3.4.6/t/data/whitelists/cert.org spamassassin-4.0.0~rc3/t/data/whitelists/cert.org --- spamassassin-3.4.6/t/data/whitelists/cert.org 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/cert.org 1970-01-01 00:00:00.000000000 +0000 @@ -1,347 +0,0 @@ -Received: from geb.xxxxxx.gen.nz (geb.xxxxxx.gen.nz [210.55.106.161]) - by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g6N1Tc414637 - for ; Tue, 23 Jul 2002 02:29:38 +0100 -Received: from uuuuuu by geb.xxxxxx.gen.nz with local (Exim 3.35 #1 (Debian)) - id 17WoTo-0002EQ-00 - for ; Tue, 23 Jul 2002 13:28:48 +1200 -Received: from mail by geb.xxxxxx.gen.nz with spam-scanned (Exim 3.35 #1 (Debian)) - id 17WoTm-0002ED-00 - for ; Tue, 23 Jul 2002 13:28:47 +1200 -Received: from firewater.pppppp.co.nz ([203.109.253.55]) - by geb.spit.gen.nz with esmtp (Exim 3.35 #1 (Debian)) - id 17WoTl-0002E6-00 - for ; Tue, 23 Jul 2002 13:28:45 +1200 -Received: from scanner1.pppppp.co.nz (scanner1.pppppp.co.nz [203.109.254.21]) - by firewater.pppppp.co.nz (8.9.2/8.9.2) with ESMTP id NAA13877 - for ; Tue, 23 Jul 2002 13:28:44 +1200 (NZST) -Received: from localhost ([127.0.0.1] helo=grunt2.pppppp.co.nz) - by scanner1.pppppp.co.nz with esmtp (Exim 3.12 #1 (Debian)) - id 17WoTk-0003Uv-00 - for ; Tue, 23 Jul 2002 13:28:44 +1200 -Received: from canaveral.red.cert.org [192.88.209.11] - by grunt2.pppppp.co.nz with esmtp (Exim 3.35 #1 (Debian)) - id 17WoTX-0004oQ-00; Tue, 23 Jul 2002 13:28:32 +1200 -Received: from localhost (lnchuser@localhost) - by canaveral.red.cert.org (8.9.3/8.9.3/1.12) with SMTP id TAA16990; - Mon, 22 Jul 2002 19:11:24 -0400 (EDT) -Date: Mon, 22 Jul 2002 19:11:24 -0400 (EDT) -Received: by canaveral.red.cert.org; Mon, 22 Jul 2002 19:05:32 -0400 -Message-Id: -From: CERT Advisory -To: cert-advisory@cert.org -Organization: CERT(R) Coordination Center - +1 412-268-7090 -List-Help: , -List-Subscribe: -List-Unsubscribe: -List-Post: NO (posting not allowed on this list) -List-Owner: -List-Archive: -Subject: CERT Advisory CA-2002-21 Vulnerability in PHP -X-Rcpt-To: uuuuuu@xxxxxx.gen.nz -Sender: Brent Addis - - - ------BEGIN PGP SIGNED MESSAGE----- - -CERT Advisory CA-2002-21 Vulnerability in PHP - - Original release date: July 22, 2002 - Last revised: -- - Source: CERT/CC - - A complete revision history can be found at the end of this file. - -Systems Affected - - * Systems running PHP versions 4.2.0 or 4.2.1 - -Overview - - A vulnerability has been discovered in PHP. This vulnerability could - be used by a remote attacker to execute arbitrary code or crash PHP - and/or the web server. - -I. Description - - PHP is a popular scripting language in widespread use. For more - information about PHP, see - - http://www.php.net/manual/en/faq.general.php - - The vulnerability occurs in the portion of PHP code responsible for - handling file uploads, specifically multipart/form-data. By sending a - specially crafted POST request to the web server, an attacker can - corrupt the internal data structures used by PHP. Specifically, an - intruder can cause an improperly initialized memory structure to be - freed. In most cases, an intruder can use this flaw to crash PHP or - the web server. Under some circumstances, an intruder may be able to - take advantage of this flaw to execute arbitrary code with the - privileges of the web server. - - You may be aware that freeing memory at inappropriate times in some - implementations of malloc and free does not usually result in the - execution of arbitrary code. However, because PHP utilizes its own - memory management system, the implementation of malloc and free is - irrelevant to this problem. - - Stefan Esser of e-matters GmbH has indicated that intruders cannot - execute code on x86 systems. However, we encourage system - administrators to apply patches on x86 systems as well to guard - against denial-of-service attacks and as-yet-unknown attack techniques - that may permit the execution of code on x86 architectures. - - This vulnerability was discovered by e-matters GmbH and is described - in detail in their advisory. The PHP Group has also issued an - advisory. A list of vendors contacted by the CERT/CC and their status - regarding this vulnerability is available in VU#929115. - - Although this vulnerability only affects PHP 4.2.0 and 4.2.1, - e-matters GmbH has previously identified vulnerabilities in older - versions of PHP. If you are running older versions of PHP, we - encourage you to review - http://security.e-matters.de/advisories/012002.html - -II. Impact - - A remote attacker can execute arbitrary code on a vulnerable system. - An attacker may not be able to execute code on x86 architectures due - to the way the stack is structured. However, an attacker can leverage - this vulnerability to crash PHP and/or the web server running on an - x86 architecture. - -III. Solution - -Apply a patch from your vendor - - Appendix A contains information provided by vendors for this advisory. - As vendors report new information to the CERT/CC, we will update this - section and note the changes in our revision history. If a particular - vendor is not listed below, we have not received their comments. - Please contact your vendor directly. - -Upgrade to the latest version of PHP - - If a patch is not available from your vendor, upgrade to version - 4.2.2. - -Deny POST requests - - Until patches or an update can be applied, you may wish to deny POST - requests. The following workaround is taken from the PHP Security - Advisory: - - If the PHP applications on an affected web server do not rely on - HTTP POST input from user agents, it is often possible to deny POST - requests on the web server. - - In the Apache web server, for example, this is possible with the - following code included in the main configuration file or a - top-level .htaccess file: - - - Order deny,allow - Deny from all - - - Note that an existing configuration and/or .htaccess file may have - parameters contradicting the example given above. - -Disable vulnerable service - - Until you can upgrade or apply patches, you may wish to disable PHP. - As a best practice, the CERT/CC recommends disabling all services that - are not explicitly required. Before deciding to disable PHP, carefully - consider your service requirements. - -Appendix A. - Vendor Information - - This appendix contains information provided by vendors for this - advisory. As vendors report new information to the CERT/CC, we will - update this section and note the changes in our revision history. If a - particular vendor is not listed below, we have not received their - comments. - -Apple Computer Inc. - - Mac OS X and Mac OS X Server are shipping with PHP version - 4.1.2 which does not contain the vulnerability described in - this alert. - -Caldera - - Caldera OpenLinux does not provide either vulnerable version - (4.2.0, 4.2.1) of PHP in their products. Therefore, Caldera - products are not vulnerable to this issue. - -Compaq Computer Corporation - - SOURCE: Compaq Computer Corporation, a wholly-owned subsidiary - of Hewlett-Packard Company and Hewlett-Packard Company HP - Services Software Security Response Team - x-ref: SSRT2300 php post requests - At the time of writing this document, Compaq is currently - investigating the potential impact to Compaq's released - Operating System software products. - As further information becomes available Compaq will provide - notice of the availability of any necessary patches through - standard security bulletin announcements and be available from - your normal HP Services supportchannel. - -Cray Inc. - - Cray, Inc. does not supply PHP on any of its systems. - -Debian - - Debian GNU/Linux stable aka 3.0 is not vulnerable. - Debian GNU/Linux testing is not vulnerable. - Debian GNU/Linux unstable is vulnerable. - The problem effects PHP versions 4.2.0 and 4.2.1. Woody ships - an older version of PHP (4.1.2), that doesn't contain the - vulnerable function. - -FreeBSD - - FreeBSD does not include any version of PHP by default, and so - is not vulnerable; however, the FreeBSD Ports Collection does - contain the PHP4 package. Updates to the PHP4 package are in - progress and a corrected package will be available in the near - future. - -Guardian Digital - - Guardian Digital has not shipped PHP 4.2.x in any versions of - EnGarde, therefore we are not believed to be vulnerable at this - time. - -Hewlett-Packard Company - - SOURCE: Hewlett-Packard Company Security Response Team - At the time of writing this document, Hewlett Packard is - currently investigating the potential impact to HP's released - Operating System software products. - As further information becomes available HP will provide notice - of the availability of any necessary patches through standard - security bulletin announcements and be available from your - normal HP Services support channel. - -IBM - - IBM is not vulnerable to the above vulnerabilities in PHP. We - do supply the PHP packages for AIX through the AIX Toolbox for - Linux Applications. However, these packages are at 4.0.6 and - also incorporate the security patch from 2/27/2002. - -Mandrakesoft - - Mandrake Linux does not ship with PHP version 4.2.x and as such - is not vulnerable. The Mandrake Linux cooker does currently - contain PHP 4.2.1 and will be updated shortly, but cooker - should not be used in a production environment and no advisory - will be issued. - -Microsoft Corporation - - Microsoft products are not affected by the issues detailed in - this advisory. - -Network Appliance - - No Netapp products are vulnerable to this. - -Red Hat Inc. - - None of our commercial releases ship with vulnerable versions - of PHP (4.2.0, 4.2.1). - -SuSE Inc. - - SuSE Linux is not vulnerable to this problem, as we do not ship - PHP 4.2.x. - _________________________________________________________________ - - The CERT/CC acknowledges e-matters GmbH for discovering and reporting - this vulnerability. - _________________________________________________________________ - - Author: Ian A. Finlay. - ______________________________________________________________________ - - This document is available from: - http://www.cert.org/advisories/CA-2002-21.html - ______________________________________________________________________ - -CERT/CC Contact Information - - Email: cert@cert.org - Phone: +1 412-268-7090 (24-hour hotline) - Fax: +1 412-268-6989 - Postal address: - CERT Coordination Center - Software Engineering Institute - Carnegie Mellon University - Pittsburgh PA 15213-3890 - U.S.A. - - CERT/CC personnel answer the hotline 08:00-17:00 EST(GMT-5) / - EDT(GMT-4) Monday through Friday; they are on call for emergencies - during other hours, on U.S. holidays, and on weekends. - -Using encryption - - We strongly urge you to encrypt sensitive information sent by email. - Our public PGP key is available from - http://www.cert.org/CERT_PGP.key - - If you prefer to use DES, please call the CERT hotline for more - information. - -Getting security information - - CERT publications and other security information are available from - our web site - http://www.cert.org/ - - To subscribe to the CERT mailing list for advisories and bulletins, - send email to majordomo@cert.org. Please include in the body of your - message - - subscribe cert-advisory - - * "CERT" and "CERT Coordination Center" are registered in the U.S. - Patent and Trademark Office. - ______________________________________________________________________ - - NO WARRANTY - Any material furnished by Carnegie Mellon University and the Software - Engineering Institute is furnished on an "as is" basis. Carnegie - Mellon University makes no warranties of any kind, either expressed or - implied as to any matter including, but not limited to, warranty of - fitness for a particular purpose or merchantability, exclusivity or - results obtained from use of the material. Carnegie Mellon University - does not make any warranty of any kind with respect to freedom from - patent, trademark, or copyright infringement. - _________________________________________________________________ - - Conditions for use, disclaimers, and sponsorship information - - Copyright 2002 Carnegie Mellon University. - - Revision History -July 22, 2002: Initial release - - - - ------BEGIN PGP SIGNATURE----- -Version: PGP 6.5.8 - -iQCVAwUBPTyOVqCVPMXQI2HJAQGK6QQAp1rR7K18PNxpQZvqKPYWxyrtpiT8mmKN -UuyERmOoX+5MAwH0hbAWCvVcyLH0gKGbTpBkRgToT8IEHZojwHCzqOaMM9kni/FG -QEVeznLfBX4GIgZGPu0XWlph3ZqaayWln57eGueYZ26zBuriIUu2cUCmyYGQkqlI -tuZdnDqUmR0= -=+829 ------END PGP SIGNATURE----- - - diff -Nru spamassassin-3.4.6/t/data/whitelists/debian_bts_reassign spamassassin-4.0.0~rc3/t/data/whitelists/debian_bts_reassign --- spamassassin-3.4.6/t/data/whitelists/debian_bts_reassign 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/debian_bts_reassign 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -Received: from dogma.slashnull.org (dogma.slashnull.org [212.17.35.15]) - by zzzzzzzzzzzzzz.zzz (Postfix) with ESMTP id 498AA132505 - for ; Thu, 1 Aug 2002 14:22:07 -0700 (PDT) -Received: from intm3.sparklist.com (intm3.sparklist.com [207.250.144.9]) - by dogma.slashnull.org (8.11.6/8.11.6) with SMTP id g71LN6230402 - for ; Thu, 1 Aug 2002 22:23:06 +0100 -Message-Id: -To: Colin Watson -Subject: Processed: reassign 126111 to cdimage.debian.org -From: owner@bugs.debian.org (Debian Bug Tracking System) -Date: Thu, 27 Dec 2001 18:48:04 -0600 -Cc: unknown-package@qa.debian.org (pseudo-image-kit-2.0.zip #126111), Debian CD-ROM Team (cdimage.debian.org #126111) -In-Reply-To: -References: -Sender: Debian BTS - -Processing commands for control@bugs.debian.org: - -> reassign 126111 cdimage.debian.org -Bug#126111: 2.2_rev4/i386/binary-i386-1.list not up to date -Bug reassigned from package `pseudo-image-kit-2.0.zip' to `cdimage.debian.org'. - -> -End of message, stopping processing here. - -Please contact me if you need assistance. - -Debian bug tracking system administrator -(administrator, Debian Bugs database) - diff -Nru spamassassin-3.4.6/t/data/whitelists/ibm_enews_de spamassassin-4.0.0~rc3/t/data/whitelists/ibm_enews_de --- spamassassin-3.4.6/t/data/whitelists/ibm_enews_de 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/ibm_enews_de 1970-01-01 00:00:00.000000000 +0000 @@ -1,311 +0,0 @@ -Return-Path: -Received: (qmail 21402 invoked by alias); 4 Jul 2002 13:36:52 -0000 -Received: (qmail 21361 invoked by uid 82); 4 Jul 2002 13:36:51 -0000 -Received: from info@isource.ibm.com by mailhost with qmail-scanner-1.00 (uvscan: v4.1.40/v4210. . Clean. Processed in 2.214854 secs); 04 Jul 2002 13:36:51 -0000 -Received: from isource.boulder.ibm.com (HELO isource.ibm.com) (207.25.249.18) - by mi-1.rz.ruhr-uni-bochum.de with SMTP; 4 Jul 2002 13:36:48 -0000 -Received: from isource.boulder.ibm.com (loopback [127.0.0.1]) - by isource.ibm.com (Postfix) with ESMTP id 0585052807 - for ; Thu, 4 Jul 2002 13:32:05 +0000 (CUT) -From: IBM Deutschland -Reply-To: webmaster@de.ibm.com -Subject: IBM eNews: Aktuelle Informationen von IBM -Content-Type: text/plain; -To: XXXXXX.YYYYYYYYYY@RUHR-UNI-BOCHUM.DE -Message-Id: <20020704133206.0585052807@isource.ibm.com> -Date: Thu, 4 Jul 2002 13:32:06 +0000 (CUT) - -IBM eNews -4. Juli 2002 - -Liebe Leserin, lieber Leser, - -zur Zeit findet in Wimbledon das diesjhrige Tennisturnier -statt - mit Hilfe von IBM auch online unter -http://www.wimbledon.org ein packendes Ereignis. - -Lesen Sie mehr ber diesem Internetauftritt und zu -zahlreichen weiteren Themen aus der IT-Branche in der -aktuellen Ausgabe von IBM eNews. - -Nutzen Sie die Mglichkeit, auf folgender Webseite aus ber -40 Interessensgebieten die Themen fr Ihre persnliche -IBM eNews Ausgabe auszuwhlen. Sie erhalten dann Business- -Informationen nach Ma: -http://www.ibm.com/de/profile/change_interests.html - -Alle Artikel knnen Sie jederzeit online auf dieser Webseite -aufrufen: -http://www.ibm.com/de/news/enews/online/ - -Wir halten Sie auf dem Laufenden -IBM eNews - -Wenn Sie in Zukunft IBM eNews nicht mehr erhalten mchten, -knnen Sie sich auf dieser Webseite abmelden: -http://www.ibm.com/de/profile/unsubscribe.html - - - -In der heutigen Ausgabe: -======================== - -e-business - - o Wimbledon gewinnt: Mit Hilfe von IBM auch online ein packendes Ereignis - http://isource.ibm.com/cgi-bin/goto?on=de020756 - - o Neues Buch "Deutschland Online" weist Weg in die - Informationsgesellschaft - http://isource.ibm.com/cgi-bin/goto?on=de020757 - - o Weitere Artikel aus dem Bereich "e-business" - http://isource.ibm.com/cgi-bin/goto?on=020758 - -Business Lsungen und Services - - o Mehr Training fr alle: IBM Learning Services Corporate Card - http://isource.ibm.com/cgi-bin/goto?on=020721 - - o Weitere Artikel aus dem Bereich "Business Lsungen und Services" - http://isource.ibm.com/cgi-bin/goto?on=020759 - -IT Solutions und Services - - o e-guide aktuell: Produkte und Lsungen fr den Mittelstand - - zusammengefasst im IBM Kundenmagazin! - http://isource.ibm.com/cgi-bin/goto?on=020710 - - o Sprechen Sie mit uns: Sicherheit ist Trumpf - http://isource.ibm.com/cgi-bin/goto?on=020712 - - o Weitere Artikel aus dem Bereich "IT Solutions und Services" - http://isource.ibm.com/cgi-bin/goto?on=020760 - -Software - - o Software fr den Mittelstand - http://isource.ibm.com/cgi-bin/goto?on=020711 - - o WebSphere Integration - http://isource.ibm.com/cgi-bin/goto?on=020724 - - o Weitere Artikel aus dem Bereich "Software" - http://isource.ibm.com/cgi-bin/goto?on=020761 - -Hardware - - o Neu: IBM ThinkPad A31p - Die erste mobile 3D-Workstation! - http://isource.ibm.com/cgi-bin/goto?on=de020707 - - o IBM eServer* pSeries 630 6E4/6C4 - Ankndigung des neuen Entry Servers - http://isource.ibm.com/cgi-bin/goto?on=020713 - - o Weitere Artikel aus dem Bereich "Hardware" - http://isource.ibm.com/cgi-bin/goto?on=020762 - - - ------------------------------------------------------------- -e-business ------------------------------------------------------------- - -Wimbledon gewinnt: Mit Hilfe von IBM auch online ein packendes Ereignis - - Die neue Turnier-Website bietet Tennisfans in aller Welt - sekundenaktuelle Spielstnde, Live-Videos, Kommentare und - Interviews. Mit e-business on demand lsst sich dabei die - erforderliche Kapazitt fr den Ansturm whrend des Turniers - einfach einschalten - und anschlieend ebenso einfach wieder - abschalten. Ein echter Service-Gewinn, Klick fr Klick. - http://isource.ibm.com/cgi-bin/goto?on=de020756 - - - -Neues Buch "Deutschland Online" weist Weg in die - Informationsgesellschaft - - "Die schnelle Transformation in die Informationsgesellschaft ist - Deutschlands letzte Chance, um im Kreis der groen - Wirtschaftsmchte zu verbleiben. Deutschland muss IT-Weltmacht - werden - und das pronto!" Das verlangte der Vorsitzende der - Geschftsfhrung der IBM Deutschland, Erwin Staudt, anlsslich - der Vorstellung des Buches "Deutschland online" - Strategien und - Projekte fr die Informationsgesellschaft - in Berlin. - http://isource.ibm.com/cgi-bin/goto?on=de020757 - - -Weitere Artikel aus dem Bereich "e-business" - - Weitere Artikel aus dem Bereich "e-business" finden Sie online - auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020758 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - ------------------------------------------------------------- -Business Lsungen und Services ------------------------------------------------------------- - -Mehr Training fr alle: IBM Learning Services Corporate Card - - IBM Learning Services bietet Ihnen preisgnstige Trainings: Mit - der IBM Learning Services Corporate Card sparen Sie bis zu 1.650 - Euro. Im Unterschied zur IBM Learning Services Education Card - knnen Sie damit alle Ihre Mitarbeiter/innen zu den Trainings - senden. - http://isource.ibm.com/cgi-bin/goto?on=020721 - - -Weitere Artikel aus dem Bereich "Business Lsungen und Services" - - Weitere Artikel aus dem Bereich "Business Lsungen und Services" - finden Sie online auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020759 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - ------------------------------------------------------------- -IT Solutions und Services ------------------------------------------------------------- - -e-guide aktuell: Produkte und Lsungen fr den Mittelstand - - zusammengefasst im IBM Kundenmagazin! - - Mit dieser Ausgabe bernehmen wir Teile des Heftes auch im Web. - Lesen Sie hier mehr ber den neuen Produkt- und Lsungsteil - oder bestellen Sie sich Ihr Exemplar des IBM Kundenmagazins - "e-guide" 2/2002. - http://isource.ibm.com/cgi-bin/goto?on=020710 - - -Sprechen Sie mit uns: Sicherheit ist Trumpf - - Sie machen sich sicherlich Gedanken darber, ob Ihre e-business - Infrastruktur wirkungsvoll geschtzt ist - insbesondere vor dem - Hintergrund sich ffnender Strukturen. - IBM - als einer der Vorreiter im Bereich e-business Sicherheits- - strategien - bietet Ihnen Lsungen, mit denen Sie Ihre - IT-Infrastruktur sichern knnen. berzeugen Sie sich selbst: - http://isource.ibm.com/cgi-bin/goto?on=020712 - - -Weitere Artikel aus dem Bereich "IT Solutions und Services" - - Weitere Artikel aus dem Bereich "IT Solutions und Services" - finden Sie online auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020760 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - ------------------------------------------------------------- -Software ------------------------------------------------------------- - -Software fr den Mittelstand - - Hier finden Sie ausgewhlte Software-Produkte mit Beispielen - unserer zufriedenen Kunden. Die IBM Produktfamilien WebSphere, - DB2, Lotus und Tivoli sind die Basis fr eine Vielfalt von - e-business Lsungen. Sie sind industrie-spezifisch, skalierbar - ausgerichtet und basieren auf offenen Standards, so dass sie - speziell auf die Bedrfnisse des Mittelstandes zugeschnitten - werden knnen. - http://isource.ibm.com/cgi-bin/goto?on=020711 - - -WebSphere Integration - - Mit WebSphere Integration versucht die IBM keine Technologie zu - vermarkten, die die unberschaubare Vielfalt der Individual- - programmierungen um neue Facetten bereichert. Vielmehr agiert - sie wie ein Katalysator und ermglicht die Erweiterung und - Erneuerung von Systemlandschaften sowie die Migration von - geschftskritischen Daten. Mehr dazu im Software-Schwerpunkt - des Monats. - http://isource.ibm.com/cgi-bin/goto?on=020724 - - -Weitere Artikel aus dem Bereich "Software" - - Weitere Artikel aus dem Bereich "Software" finden Sie online - auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020761 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - ------------------------------------------------------------- -Hardware ------------------------------------------------------------- - -Neu: IBM ThinkPad A31p - Die erste mobile 3D-Workstation! - - Der ThinkPad A31p (TV2N6GE, TV2L3GE, TV2N5GE) ist ausgerstet mit - einem Intel Pentium 4 Notebookprozessor-M, schnellen DDR Speicher- - modulen und einem extrem leistungsfhigen Grafikchip. Auch die - Highspeed Festplatte lsst keine Wnsche offen. Zwei modulare - Laufwerkschchte sorgen fr ein Plus an Flexibilitt. Das Notebook - ist mit einer 10/100 Ethernet-Karte, einem 56K V.92 Modem, - integrierten 802.11b Wireless-Antennen/-Chip, Bluetooth sowie - einem IEEE 1394 (Firewire)-Anschluss ausgerstet. - http://isource.ibm.com/cgi-bin/goto?on=de020707 - - -IBM eServer* pSeries 630 6E4/6C4 - Ankndigung des neuen Entry Servers - - IBM definiert den UNIX Entry Server neu. Zuverlssigkeit und - Verfgbarkeit der POWER4-Prozessortechnologie jetzt vom Entry- - bis zum Enterprise-Bereich, mit Selbstverwaltungsfunktionen aus - dem Projekt eLiza, ultraflaches Rack- oder Deskside-Modell, die - richtige Wahl fr kleine und mittelstndische Unternehmen. - http://isource.ibm.com/cgi-bin/goto?on=020713 - - -Weitere Artikel aus dem Bereich "Hardware" - - Weitere Artikel aus dem Bereich "Hardware" finden Sie online - auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020762 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - - -============================================================ -Sie erhalten diese E-Mail, da Sie zu IBM eNews - angemeldet sind als XXXXXX.YYYYYYYYYY@RUHR-UNI-BOCHUM.DE - - -*Das IBM eServer Warenzeichen besteht aus dem eingefhrten -IBM e-business Logo, gefolgt von dem beschreibenden Begriff -"Server". - -Nach unseren Kundendaten sind Sie an Informationsmaterial von -IBM interessiert. An- und Abmelden sowie Ihre Einstellungen -ndern knnen Sie auf folgender Website: -http://www.ibm.com/de/profile/ - -Kontakt: webmaster@de.ibm.com -Copyright (c) 2002 IBM Deutschland - - - diff -Nru spamassassin-3.4.6/t/data/whitelists/infoworld spamassassin-4.0.0~rc3/t/data/whitelists/infoworld --- spamassassin-3.4.6/t/data/whitelists/infoworld 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/infoworld 1970-01-01 00:00:00.000000000 +0000 @@ -1,188 +0,0 @@ -From Cringely@bdcimail.com Mon Aug 12 10:58:47 2002 -Return-Path: -Delivered-To: ffffff@localhost.aaaaaaaaaaaa.net -Received: from localhost (localhost.localdomain [127.0.0.1]) - by mail.aaaaaaaaaaaa.net (Postfix) with ESMTP id B3DA1BEEB2 - for ; Mon, 12 Aug 2002 14:28:07 -0700 (PDT) -Received: from mail.aaaaaaaaaaaa.com - by localhost with IMAP (fetchmail-5.9.11) - for ffffff@localhost (single-drop); Mon, 12 Aug 2002 14:28:07 -0700 (PDT) -Received: from mailcontrol.bellevuedata.com (mailcontrol.bellevuedata.com [66.37.227.18]) - by mail14.megamailservers.com (8.12.5/8.12.0.Beta10) with SMTP id g7CLKt9N008640 - for ; Mon, 12 Aug 2002 17:21:09 -0400 (EDT) -Date: Mon, 12 Aug 2002 12:58:47 -0500 -From: Cringely@bdcimail.com -Message-Id: -To: zzzzzz@aaaaaaaaaaaa.com -Subject: ROBERT X. CRINGELY(R): "Notes from the Field" from InfoWorld.com, Monday, August 12, 2002 -Reply-To: CringelyHelp@Bellevue.com -Content-Type: text/plain; - charset="iso-8859-1" -X-SpamBouncer: 1.5 (7/17/02) -X-SBNote: FROM_DAEMON/Listserv -X-SBPass: No Pattern Matching -X-SBPass: No Freemail Filtering -X-SBClass: Bulk -X-Folder: Bulk - -======================================================== -ROBERT X. CRINGELY(R): "Notes from the Field" InfoWorld.com -======================================================== - -Monday, August 12, 2002 - -Advertising Sponsor - - - - - - - - - - - - - - - - - - -Business Specials from Gateway -$100 Instant Rebate on select business notebooks, -Plus FREE Shipping (LIMITED TIME OFFER) -or call and ask about wireless networking specials -for business 1.888.851.7359 -http://63.115.136.15/go/infoworld/4524953.html - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -LOOKING TO INNOVATE - -Posted August 9, 2002 01:01 PM Pacific Time - - -AMBER FOUND A brochure I had for Kauai, Hawaii. "What -is this, Cringe? Are you planning to surprise me with -a trip there?" I just hope she doesn't discover that -single plane ticket I bought. - -Gates reveals the awful truth - -At an impromptu meeting over lunch at Microsoft's -Financial Analysts Day in July, Bill Gates said -companies are not "super" innovative and don't produce -reliable products. No earth-shattering revelations -there, but in illustrating his point he asked, "Do you -really need the next version of Office? I don't think -so." Gates' implied he acknowledged users need a -compelling reason to upgrade to the next Office, my -spy said. The only thing that sells software these -days is the innovation factor, Gates claimed. "The -Tablet is going to be the most viral thing ever," -Gates added. Of course, Microsoft has been touting the -Tablet PC for quite some time. - -JavaScript pressure - -Microsoft is looking to innovate, however, at least -when it comes to the European Computer Manufacturers -Association (ECMA). In terms of extending existing -scripting languages to support XML there appears to be -both good and bad news from ECMA, my spy said. The -good news is BEA recently showed ECMA how to better -extend scripting languages to work directly with XML. -The bad news is most people wouldn't recognize the -group today, which seems hell-bent on replacing -JavaScript (now called ECMAscript) with a derivative -that looks a lot like a C# scripting language. - -A lack of chivalry - -Big Blue is cracking the whip against employee -tailgaters, but not the variety typically associated -with college football games. Workers are being -reminded about a no tailgating policy, which means -they are forbidden from sliding their ID badge through -the security system, then holding the door for someone -who doesn't slide their badge. "We have been -instructed chivalry is dead concerning this matter," -my spy said. - -Speaking of chivalry's demise, common courtesy may be -going with it at the newly merged HP. Despite current -geopolitical situations, HP is relying on parts of its -support located in India. In so doing, HP bailed out -on a relationship with The Answer Group (TAG), with -which Compaq had a long-standing relationship. Adding -salt to the wound, though, HP's support folks in India -were telling customers and resellers about the TAG -termination before HP even told TAG. - -"I BOOKED OUR tickets for Kauai," Amber said. I guess -I'm trapped now. No more tranquil escape for me. - -Before vacation, send tips to cringe@infoworld.com. - - - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -MORE NOTES FROM THE FIELD -For a complete archive of his InfoWorld columns visit -http://www2.infoworld.com/cgi/component/columnarchive.wbs?column=notefield - -INFOWORLD OPINIONS -Weekly commentary from the most trusted voices in -IT at: http://www.infoworld.com/community/t_opinions.html - - -To join, or start, a discussion on this or any IT-related -topic, please visit our InfoWorld forums at -http://forums.infoworld.com. Here you can interact and -exchange ideas with InfoWorld staff and other readers. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - -QUOTE OF THE DAY: -"Of course, there is a lot of legislation that is -very favorable to folks that subsist on the exclusive -ownership of their code. We have lobbied against -those bills. It's easy to get negative about other -people's ideas. This is an opportunity to say, -'Here's a better idea: consider open source as an -alternative.' " - ---Jeremy Hogan, community relations manager at Red Hat -Inc., speaking about a planned march on San Francisco -city hall to promote the use of open source software -in government offices. - -http://www.infoworld.com/articles/hn/xml/02/08/09/020809hnrally.xml?0812mncr - - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SUBSCRIBE/UNSUBSCRIBE/CHANGE E-MAIL -To subscribe, unsubscribe or change your e-mail address -for any of InfoWorld's e-mail newsletters, -go to:http://www.iwsubscribe.com/newsletters/ - -To subscribe to InfoWorld.com, or InfoWorld Print, -or both, or to renew or correct a problem with any InfoWorld -subscription, go to http://www.iwsubscribe.com - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Expectations, Great and Not So Great -InfoWorld columnist Bob Lewis knows that both are part -of the job in IT management. That's what makes his Survival -Guide newsletter so fresh, so true, so funny. Do you -wonder why you have to manage up as well as down? -Or why it matters what Larry Ellison wants and Dubya's -likely to do? Bob feels your pain. He can help. Subscribe -to his Survival Guide newsletter free at -http://www.iwsubscribe.com/newsletters/ - - - -Advertising Sponsor - - - - - - - - - - - - - - - - - - -Business Specials from Gateway -$100 Instant Rebate on select business notebooks, -Plus FREE Shipping (LIMITED TIME OFFER) -or call and ask about wireless networking specials -for business 1.888.851.7359 -http://63.115.136.15/go/infoworld/4524953.html - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Copyright 2002 InfoWorld Media Group Inc. - - - - -This message was sent to: zzzzzz@aaaaaaaaaaaa.com - - diff -Nru spamassassin-3.4.6/t/data/whitelists/linuxplanet spamassassin-4.0.0~rc3/t/data/whitelists/linuxplanet --- spamassassin-3.4.6/t/data/whitelists/linuxplanet 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/linuxplanet 1970-01-01 00:00:00.000000000 +0000 @@ -1,197 +0,0 @@ -From listsupport@internet.com Mon Aug 12 12:59:02 2002 -Return-Path: -Delivered-To: ffffffff@localhost.zzzzzzzzzz-ffffffff.net -Received: from localhost (localhost.localdomain [127.0.0.1]) - by mail.zzzzzzzzzz-ffffffff.net (Postfix) with ESMTP id 98624BEE9E - for ; Mon, 12 Aug 2002 14:26:24 -0700 (PDT) -Received: from mail.zzzzzzzzzz-ffffffff.com - by localhost with IMAP (fetchmail-5.9.11) - for ffffffff@localhost (single-drop); Mon, 12 Aug 2002 14:26:24 -0700 (PDT) -Received: from mx3.megamailservers.com (ns3.meganameservers.com [64.29.144.65]) - by mail1.megamailservers.com (8.12.5/8.12.0.Beta10) with ESMTP id g7CKaOs6025662 - for ; Mon, 12 Aug 2002 16:36:24 -0400 (EDT) -Received: from r00l04.lyris.net (r00l04.lyris.net [216.91.57.134]) - by mx3.megamailservers.com (8.12.2/8.12.2) with SMTP id g7CKaNLC013752 - for ; Mon, 12 Aug 2002 16:36:24 -0400 -X-Mailer: Lyris ListManager Web Interface -Date: Mon, 12 Aug 2002 12:59:02 -0700 -Subject: LinuxPlanet Newsletter: August 12, 2002 -To: -From: LinuxPlanet -List-Unsubscribe: -Reply-To: Newsletter Support -Message-Id: -X-SpamBouncer: 1.5 (7/17/02) -X-SBNote: FROM_DAEMON/Listserv -X-SBPass: No Pattern Matching -X-SBPass: No Freemail Filtering -X-SBClass: Bulk -X-Folder: Bulk - -MyDesktop Proudly Presents: - -L I N U X P L A N E T -````` -Your Weekly Source For Linux Updates! -LinuxPlanet Newsletter for August 12, 2002 -http://www.linuxplanet.com - -___________________________ Sponsors ________________________________ - - This newsletter sponsored by: - Thawte - Journyx, Inc. -_____________________________________________________________________ - ------ -IN THIS ISSUE: - * NEW AND NOTEWORTHY - * COMING UP -_____ - - -/-------------------------------------------------------------------\ - -FREE Apache SSL Guide from Thawte Certification - -Do your online customers demand the best available protection of their -personal information? Thawte's guide explains how to give this to your -customers by implementing SSL on your Apache Web Server. Click here to -get our FREE Thawte Apache Guide: http://www.gothawte.com/rd348.html - -\--------------------------------------------------------------adv.-/ - - -NEW AND NOTEWORTHY: - -Using the InterMezzo Distributed Filesystem - -Getting connected is one of the more vital goals of any IT shop. But what -happens when users can't get commected to the network right away? Are they -just cut off altogether from their files? Not necessarily, writes Bill von -Hagen, especially if you are using the InterMezzo distributed filesystem. -In this next installment of the Distributed Filesystems series, von Hagen -examines InterMezzo in detail and shows how to install, configure, and -implement this DFS. - -Building Sounds for your Applications with SoundTracker - -Beeps, bloops, and buzzes. These are the sounds that enrich our computing -experience. When done right, these auditory cues provide instant feedback -to a user from an application. But getting the right sounds for your app -does not have to involve scrounging around for whatever you can find on -the Internet. You can professionally edit your own sounds with the Linux -program SoundTracker, as Dee-Ann LeBlanc and Andrew J.D. Bowman explain in -this tutorial. - -Modern Distributed Filesystems For Linux: An Introduction - -Data and information has become the lifeblood of many organizations of -late, and storing that information safely has led to inventive data -management. Once known as networked filesystems, distributed filesystems -are now one of the best ways of storing your data across multiple machines -on your network. Bill von Hagen begins a series of articles on distributed -filesystems with an introduction to the technology and what it can do for -your organization. - - ------ - -COMING UP: - - * An Open-Source Approach to Fighting Cancer - * Distributed File Systems: The Series Continues - * A Review of Linux Books - ------ - -/-------------------------------------------------------------------\ - -*FREE download of Journyx Timesheet for LINUX* -Have you been looking for an automated solution to -replace your paper timesheets? Do you want something -that is easy to use and integrates with your existing -business applications for payroll, HR, accounting and -project management? You need to try Journyx Timesheet! -Download Journyx Timesheet for FREE today! -http://www.journyx.com/InetL4aug02ezad - -\--------------------------------------------------------------adv.-/ - ------ - -Visit the other sites in the internet.com Linux/Open Source Channel: -Linux Today -LinuxPlanet -AllLinuxDevices -PHPBuilder -BSD Today -Apache Today -Enterprise Linux Today -Linux Central -Linuxnewbie -The ISP-Linux Moderated Digest -. - - - - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -DEDICATED EMAIL LIST SERVERS! -Get the speed, control, and responsiveness you need for your -out-sourced Email Newsletters at an AFFORDABLE price! -100% UPTIME GUARANTEED! -Sign-up by July 15th and the set-up is FREE for your -DEDICATED solution just for mentioning this ad. -Free Quote: mailto:sales@sparklist.com or surf the -website: http://SparkLIST.com/ or direct: 920.490.5901, x1 - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Advertising: If you are interested in advertising in our newsletters, call -Claudia at 1-203-662-2863 or send email to mailto:nsladsales@internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For contact information on sales offices worldwide visit -http://www.internet.com/mediakit/salescontacts.html -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For details on becoming a Commerce Partner, contact David Arganbright -on 1-203-662-2858 or mailto:commerce-licensing@internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To learn about other free newsletters offered by internet.com or -to change your subscription visit http://e-newsletters.internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -internet.com's network of more than 160 Web sites is organized into 16 -channels: -Internet Technology http://internet.com/it -E-Commerce/Marketing http://internet.com/marketing -Web Developer http://internet.com/webdev -Windows Internet Technology http://internet.com/win -Linux/Open Source http://internet.com/linux -Internet Resources http://internet.com/resources -ISP Resources http://internet.com/isp -Internet Lists http://internet.com/lists -Download http://internet.com/downloads -International http://internet.com/international -Internet News http://internet.com/news -Internet Investing http://internet.com/stocks -ASP Resources http://internet.com/asp -Wireless Internet http://internet.com/wireless -Career Resources http://internet.com/careers -EarthWeb http://www.earthweb.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To find an answer - http://search.internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Looking for a job? Filling an opening? - http://jobs.internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -This newsletter is published by INT Media Group, Incorporated -http://internet.com - The Internet & IT Network -Copyright (c) 2002 INT Media Group, Incorporated. All rights reserved. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For information on reprinting or linking to internet.com content: -http://internet.com/corporate/permissions.html -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---- -You are currently subscribed to linuxplanet-text as: lx@zzzzzzzzzz-ffffffff.com -To unsubscribe send a blank email to leave-linuxplanet-text-000000F@list4.internet.com - - diff -Nru spamassassin-3.4.6/t/data/whitelists/lp.org spamassassin-4.0.0~rc3/t/data/whitelists/lp.org --- spamassassin-3.4.6/t/data/whitelists/lp.org 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/lp.org 1970-01-01 00:00:00.000000000 +0000 @@ -1,132 +0,0 @@ -Received: from rs6000.resqnet.com (rs6000.resqnet.com [64.209.23.67]) - by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g6PIph423946 - for ; Thu, 25 Jul 2002 19:51:43 +0100 -Received: from columbia.lp.org (columbia.kia.net [205.252.89.231]) - by rs6000.resqnet.com (8.11.2/8.11.2) with ESMTP id g6PIoqe17480 - for <9999999999@kfdjgdkfgjd.com>; Thu, 25 Jul 2002 14:50:52 -0400 -Received: from localhost (daemon@localhost) - by columbia.lp.org (8.9.3/8.9.3) with SMTP id OAA51643; - Thu, 25 Jul 2002 14:47:50 -0400 (EDT) - (envelope-from owner-announce@hq.lp.org) -Received: by columbia.kia.net (bulk_mailer v1.12); Thu, 25 Jul 2002 12:02:38 -0400 -Received: (from majordom@localhost) - by columbia.lp.org (8.9.3/8.9.3) id MAA40103 - for announce-outgoing; Thu, 25 Jul 2002 12:02:38 -0400 (EDT) - (envelope-from owner-announce@hq.lp.org) -Received: (from lpadmin@localhost) - by columbia.lp.org (8.9.3/8.9.3) id MAA40088; - Thu, 25 Jul 2002 12:02:37 -0400 (EDT) - (envelope-from lpadmin) -Date: Thu, 25 Jul 2002 12:02:37 -0400 (EDT) -Message-Id: <200207251602.MAA40088@columbia.lp.org> -To: announce@hq.lp.org -Subject: LP RELEASE: Outrageous military spending -From: Libertarian Party Announcements -Reply-To: owner-announce@hq.lp.org - ------BEGIN PGP SIGNED MESSAGE----- - -=============================== -NEWS FROM THE LIBERTARIAN PARTY -2600 Virginia Avenue, NW, Suite 100 -Washington DC 20037 -World Wide Web: http://www.LP.org -=============================== -For release: July 25, 2002 -=============================== -For additional information: -George Getz, Press Secretary -Phone: (202) 333-0008 Ext. 222 -E-Mail: pressreleases@hq.LP.org -=============================== - -Thousands spent on strippers, golf memberships -shows Pentagon spending is out of control, Libertarians say - -WASHINGTON, DC -- Quiz question: Which of the following items have been -charged to the taxpayers recently by military personnel wielding -government-issued credit cards? - -(a) $38,000 for lap dancing at strip clubs near military bases. - -(b) $3,400 for a Sumo wrestling suit and $9,800 for Halloween costumes. - -(c) $7,373 for closing costs on a home and $16,000 for a corporate golf -membership. - -(d) $4,600 for white beach sand and $19,000 worth of decorative "river -rock" at a military base in the Arabian desert. - -(e) all of the above. - -"Incredibly, the answer is 'all of the above,' said Steve Dasbach, -Libertarian Party executive director. "Thanks to the federal -government's policy of doling out credit cards with no questions asked, -the military has launched a raid on your wallet." - -The shocking revelations are contained in a General Accounting Office -audit released last week that uncovered $101 million in "seemingly -unneeded expenditures" made by the Air Force and Army in 2000 and -2001. The purchases were made possible by the federal government's lax -credit card policy: At least 1.4 million Defense Department employees -carry credit cards, and last year they used them to splurge on $6.1 -billion in goods and services, the audit found. - -In one case, a group of 200 soldiers used their military IDs and -government-issued travel cards to get cash at adult-entertainment bars, -then spent the money there. The clubs charged a 10 percent fee to -supply the soldiers with cash -- then billed the full amount to their -travel cards as a restaurant charge, the GAO found. - -"Are these warriors really fighting terrorism while frolicking in a -strip club, or defending our country while wearing a Sumo wrestling -suit?" asked Dasbach. "Americans who support a bigger defense budget, -take note: The Pentagon frequently behaves like any other bloated, -reckless government agency. It promises your money will be spent on the -worthiest of causes, then squanders it on things you could never even -imagine." - -Other spending uncovered by the audit included $45,000 for luxury -cruises, $1,800 for executive pillows, and $24,000 for a sofa and -armchair at a military installation in the Middle East, Dasbach noted. - -Some military employees actually defended the purchases, the audit -noted, by saying that recreational items such as golf memberships can -be "a useful tool for building good relations with a host country" -such as Saudi Arabia or the United Arab Emirates. - -Not surprisingly, Dasbach said, the audit found "little evidence of -documented disciplinary action" against those who misused the cards, -so taxpayers may end up paying the tab. - -"It's time to impose a little military discipline on these deadbeat -Defense Department workers, and force them to personally reimburse -taxpayers for every penny of improper spending," he said. - -"Then cut the Pentagon's massive $379 billion budget to help guard -against such wasteful spending in the future. Perhaps that's one way to -force the Pentagon to spend its resources defending the country, -instead of offending the taxpayer." - - ------BEGIN PGP SIGNATURE----- -Version: 2.6.2 - -iQCVAwUBPUA6FdCSe1KnQG7RAQGAKwP/Zpfw0Uq3BPLnXXmnlWQ2aFFb1FSaj+nJ -QOMt9q4TBhiYJhIdgdd+uGxoubiPfvyIweSR1PjOdoFe8dYf2h/V4gNS9hSmkSgC -76RZVuitNf2DbEsaY8TtcUDLDC51m/jgxiGcgPkcyJ+0Wn11RRbktkVEefSNTaBz -M8ibVFiDPyI= -=9fYc ------END PGP SIGNATURE----- - - - ------------------------------------------------------------------------ -The Libertarian Party http://www.lp.org/ -2600 Virginia Ave. NW, Suite 100 voice: 202-333-0008 -Washington DC 20037 fax: 202-333-0072 ------------------------------------------------------------------------ -For subscription changes, please use the WWW form at: -http://www.lp.org/action/email.html - - diff -Nru spamassassin-3.4.6/t/data/whitelists/media_unspun spamassassin-4.0.0~rc3/t/data/whitelists/media_unspun --- spamassassin-3.4.6/t/data/whitelists/media_unspun 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/media_unspun 1970-01-01 00:00:00.000000000 +0000 @@ -1,1962 +0,0 @@ -From guterman@mediaunspun.imakenews.net Wed Aug 14 14:38:59 2002 -Return-Path: -Delivered-To: rrrrrrr@localhost.netnoteinc.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 87FA743C34 - for ; Wed, 14 Aug 2002 09:38:52 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for rrrrrrr@localhost (single-drop); Wed, 14 Aug 2002 14:38:52 +0100 (IST) -Received: from eng.imakenews.com (mailservice4.imakenews.com - [65.214.33.17]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id - g7EDZx416820 for ; Wed, 14 Aug 2002 14:35:59 +0100 -Received: by eng.imakenews.com (PowerMTA(TM) v1.5); Wed, 14 Aug 2002 - 09:35:04 -0400 (envelope-from ) -Content-Transfer-Encoding: binary -Content-Type: multipart/alternative; - boundary="----------=_1029331990-31627-4"; - charset="iso-8859-1" -Date: Wed, 14 Aug 2002 09:33:10 -0400 -Errors-To: -From: "Media Unspun" -MIME-Version: 1.0 -Message-Id: <31627$1029331990$mediaunspun$5114587@imakenews.net> -Precedence: normal -Reply-To: "Media Unspun" -Sender: "Media Unspun" -Subject: SEC Exposes Big Blue's Pink Slips -To: xxxxx@yyyyyy.zzz -X-Imn: mediaunspun,178767,5114587,0 - -This is a multi-part message in MIME format... - -------------=_1029331990-31627-4 -Content-Type: text/plain; charset="iso-8859-1" -Content-Disposition: inline -Content-Transfer-Encoding: 7bit - -To view this newsletter in full-color, visit: -http://newsletter.mediaunspun.com/index000018970.cfm - -M E D I A U N S P U N -What the Press is Reporting and Why (www.mediaunspun.com) ------------------------------------------------------------------ -August 14, 2002 - ------------------------------------------------------------------ -IN THIS ISSUE ------------------------------------------------------------------ -* SEC EXPOSES BIG BLUE'S PINK SLIPS -* SYNERGY AND BETRAYAL AT VIVENDI -* OTHER STORIES - -Media Unspun serves business news and analysis, authoritatively -and irreverently, every business day. An annual subscription -costs $50, less than a dollar a week. If your four-week free -trial is coming to an end soon, please visit -http://www.mediaunspun.com/subscribe.html and sign up via credit card -or check. - - ------------------------------------------------------------------ -ADVERTISEMENT ------------------------------------------------------------------ -Ken Fisher offers his Quarterly Report for high net worth -investors FREE of cost & without obligation. Access the same -investment research he uses to guide his clients at: -http://pcg.fisherinvestments.com/newrespond/letter.asp?site=UNSP&KC=1229EFCAD0000 - - ------------------------------------------------------------------ -SEC EXPOSES BIG BLUE'S PINK SLIPS ------------------------------------------------------------------ -Does the Securities and Exchange Commission have a press pass -yet? It seems to be bringing us all our news lately. On the day -of the deadline for companies to certify their financial -statements with the SEC, the business press squirmed and waited -for the next Enron or WorldCom. (We might eat these words -tomorrow, but we doubt it.) In an unrelated confession, IBM gave -the commission its latest layoff numbers. - -IBM talked about pink slips during its second-quarter earnings -report, but with a vagueness worthy of your daily horoscope. -("Capricorn: Career changes may be on their way...") Only after -"months of surreptitious layoff notices" did the company admit -that it's cutting more than 15,600 jobs, said the AP. That's -about 5% of its workforce, and a lot more than pundits expected. -An IBM spokesperson told the Wall Street Journal the higher -number was due to "rebalancing" and more employees than expected -taking voluntary layoffs. - -Sorry, we're still back on "rebalancing." Did IBM "rightsize" -last quarter, too? - -IBM's news was still trickling out Wednesday morning, but some -details were available. About 1,400 workers got cut from IBM's -microelectronics unit, and most of the rest were from IT -services and consulting. (That ought to make IBM's new employees -from PricewaterhouseCoopers feel all warm and fuzzy inside.) -Look for news updates from cities that will see the cuts, such -as Austin and Raleigh. - -OK, none of this is good. Two years into the tech slump, we're -still tired of seeing people get sacked. But was it really so -bad that IBM only revealed it because of new accounting -regulations? Nah, Big Blue was always known for "stealth -layoffs," as CNN put it, but current corporate scrutiny forced -it to 'fess up for once. Until now, IBM would acknowledge the -latest layoffs if reporters called and asked, but wouldn't give -specifics. Yeesh. - Jen Muehlbauer - -IBM Cut 5% of Staff in Period, Double the Expected Number -http://online.wsj.com/article/0,,SB1029282408667791835,00.html -(Paid subscription required.) - -IBM to Cut Over 15,000 Employees (AP) -http://tinyurl.com/10kz - -IBM confirms 15,600 job cuts (Reuters) -http://www.msnbc.com/news/793777.asp - -IBM cutting 15,000 jobs -http://news.com.com/2100-1001-949677.html - -IBM job cuts exceed 15,600 -http://money.cnn.com/2002/08/13/technology/ibm/index.htm - -IBM puts job cuts at 15,600, with fewer than 50 in this state -http://seattlepi.nwsource.com/business/82508_ibm14.shtml - ------------------------------------------------------------------ -ADVERTISEMENT ------------------------------------------------------------------ -You've heard about identity management, but do you know about -the opportunities and business models that will emerge as a -result? Download a free executive summary of Esther Dyson's coverage of -identity management in Release 1.0. Learn more about the -expanding market for these services and applications. -http://release1.edventure.com/executivesummary.cfm?MCode=Unspun - ------------------------------------------------------------------ -SYNERGY AND BETRAYAL AT VIVENDI ------------------------------------------------------------------ -Synergy always was a fuzzy concept. Now Vivendi Universal's top -man has slammed the lid on it. The French company announced -today that it's ready to peddle $9.8 billion in assets to rustle -up some cash. First up on the block? Synergy-less U.S. book -publisher Houghton Mifflin. - -It's unclear whether new chairman Jean-Rene Fourtou has genuine -turnaround muscle, or whether he and Vivendi's board are simply -following the winds of post-merger fashion. But when you owe -$18.7 billion, you get real practical, real fast. The Guardian -reported that Vivendi's share price sank 5% on Tuesday when -investors got the willies about the company's impending -announcement on its financial health. But the company had -positive news to report: It's making money. Revenue in the first -half was up 13%, higher than analysts' estimates of a 7.7% -boost. - -Details are scant on the breadth of Fourtou's restructuring -efforts, with more information expected at the next board -meeting on September 25, according to reporters. Houghton -Mifflin, acquired a year ago for $1.7 billion, and a vague -explanation that included the "Curious George" character, were -the only properties named for sale so far. The Guardian -speculated that Vivendi will also sell its U.S. video games -business and possibly its stake in the French mobile phone -company SFR, a debatable sale because of the cash it generates, -according to the newspaper. - -Meanwhile, Fourtou's predecessor, Jean-Marie Messier, continues -to advocate empire-building. The New York Post said its sources -say Messier hopes his former employer will feel generous enough -to let him continue to reside in his $17 million Manhattan -abode. And Bloomberg reported earlier this week that an -unrepentant Messier is penning a memoir as he vacations in the -Mediterranean. The working title? "How I Was Betrayed." - -Deborah Asbrand - -Vivendi to Sell Publisher Houghton Mifflin (Reuters) -http://www.washingtonpost.com/wp-dyn/articles/A15954-2002Aug14.html - -Vivendi investors expect the worst -http://www.guardian.co.uk/business/story/0,3604,774190,00.html - -Vivendi to Sell $9.8 Billion In Assets, Including Houghton -http://online.wsj.com/article/0,,SB102931297119161715,00.html -(Paid subscription required.) - -Ousted Messier Aims To Score $17m Vivendi Pad -http://www.nypost.com/business/54701.htm - -Ex-Chief of Vivendi Plans Tell-All Book (Bloomberg) -http://www.nytimes.com/2002/08/12/business/media/12VIVE.html - ------------------------------------------------------------------ -OTHER STORIES ------------------------------------------------------------------ -A Top AOL Manager Has Left Company -http://www.nytimes.com/2002/08/14/technology/14AOL.html - -Fed Holds Steady on Interest Rates -http://www.washingtonpost.com/wp-dyn/articles/A14636-2002Aug13.html - -Amtrak halts all high-speed service after finding cracks -http://www.sunspot.net/bal-te.train14aug14.story - -AOL lets resigning exec keep stock options -http://www.usatoday.com/money/industries/technology/2002-08-13-aol-pittman_x.htm - -Lucent licensing deal with Winstar focus of probe (AP) -http://www.bayarea.com/mld/mercurynews/business/3861117.htm - -Study Says Net Could Benefit Music Firms -http://www.latimes.com/business/la-fi-music14aug14.story - -Eisner Crimping His Own Style -http://www.latimes.com/business/la-fi-disney14aug14.story - -Severance claims by Enron former execs anger ex-workers -http://www.chron.com/cs/CDA/story.hts/business/1533657 - -Princeton removes dean after Yale Web site flap (AP) -http://www.siliconvalley.com/mld/siliconvalley/3857890.htm - -Frisbee golf creator dies, may land on someone's roof (SF -Chronicle) -http://seattlepi.nwsource.com/national/82560_frisbee14.shtml - -Will Kinsley's Slate Get Wiped? -http://www.ojr.org/ojr/kramer/1029281360.php - -Hollywood, Russian Bicker Over Bass -http://www.cnn.com/2002/SHOWBIZ/News/08/13/bassspace.hollywood.ap/ - ------------------------------------------------------------------ -Do you want to reach the Net's savviest audience? -Advertise in Media Unspun. -Contact Erik Vanderkolk for details at erikvanderkolk@yahoo.com -today. - ------------------------------------------------------------------ -STAFF ------------------------------------------------------------------ -Written by Deborah Asbrand (dasbrand@world.std.com), Keith -Dawson (dawson@world.std.com), Jen Muehlbauer -(jen@englishmajor.com), and Lori Patel (loripatel@hotmail.com). - -Copyedited by Jim Duffy (jimduffy86@yahoo.com). - -Marketing: Cowpoke Productions (cowpokeproductions.com). -Advertising: Erik Vanderkolk (erikvanderkolk@yahoo.com). - -Editor and publisher: Jimmy Guterman (guterman@vineyard.com). - -Media Unspun is produced by The Vineyard Group Inc. -Copyright 2002 Media Unspun, Inc., and The Vineyard Group, Inc. -Subscribe already, willya? http://www.mediaunspun.com - -Redistribution by email is permitted as long as a link to -http://newsletter.mediaunspun.com is included. - --|________________ -POWERED BY: http://www.imakenews.com -To be removed from this list, use this link: -http://www.imakenews.com/eletra/remove.cfm?x=mediaunspun%2Cxxxxx@yyyyyy.zzz -To receive future messages in HTML format, use this link: -http://www.imakenews.com/eletra/change.cfm?x=mediaunspun%2Cxxxxx@yyyyyy.zzz%2Chtm -To change your subscriber information, use this link: -http://www.imakenews.com/eletra/update.cfm?x=mediaunspun%2Cxxxxx@yyyyyy.zzz - - -------------=_1029331990-31627-4 -Content-Type: text/html; charset="iso-8859-1" -Content-Disposition: inline -Content-Transfer-Encoding: 7bit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -M E D I A U N S P U N - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    -
    -
    - - - - - - - - - - - - - - - - - - -
    - - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - Pass it on... - - - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - M E D I A U N S P U N
    - -     - - - - - What the Press is Reporting and Why (www.mediaunspun.com) - - - - - -
    - - - - - - - - Wednesday, August 14, 2002 - - - - - - - - - - -
    - -
    - - - - - - - - - - - - - -
    - - -
    - - - - - - - - - - - - - - - - - - - -
    Top Spins...     - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - SEC Exposes Big Blue's Pink Slips - - - - - - - - - - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - Synergy and Betrayal at Vivendi - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - Other Stories - - - - - - - - - - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Media Unspun serves business news and analysis, authoritatively and irreverently, every business day. An annual subscription costs $50, less than a dollar a week. If your four-week free trial is coming to an end soon, please visit http://www.mediaunspun.com/subscribe.html and sign up via credit card or check.
    -

    - -
    - - -     -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Sponsor - -
    - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Ken Fisher offers his Quarterly Report for high net worth investors FREE of cost & without obligation. Access the same investment research he uses to guide his clients at:
    -http://pcg.fisherinvestments.com/newrespond/letter.asp?site=UNSP&KC=1229EFCAD0000

    - -
    - - -     -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - SEC Exposes Big Blue's Pink Slips - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Does the Securities and Exchange Commission have a press pass yet? It seems to be bringing us all our news lately. On the day of the deadline for companies to certify their financial statements with the SEC, the business press squirmed and waited for the next Enron or WorldCom. (We might eat these words tomorrow, but we doubt it.) In an unrelated confession, IBM gave the commission its latest layoff numbers.

    -IBM talked about pink slips during its second-quarter earnings report, but with a vagueness worthy of your daily horoscope. ("Capricorn: Career changes may be on their way...") Only after "months of surreptitious layoff notices" did the company admit that it's cutting more than 15,600 jobs, said the AP. That's about 5% of its workforce, and a lot more than pundits expected. An IBM spokesperson told the Wall Street Journal the higher number was due to "rebalancing" and more employees than -expected taking voluntary layoffs.

    -Sorry, we're still back on "rebalancing." Did IBM "rightsize" last quarter, too?

    -IBM's news was still trickling out Wednesday morning, but some details were available. About 1,400 workers got cut from IBM's microelectronics unit, and most of the rest were from IT services and consulting. (That ought to make IBM's new employees from PricewaterhouseCoopers feel all warm and fuzzy inside.) Look for news updates from cities that will see the cuts, such as Austin and Raleigh.

    -OK, none of this is good. Two years into the tech slump, we're still tired of seeing people get sacked. But was it really so bad that IBM only revealed it because of new accounting regulations? Nah, Big Blue was always known for "stealth layoffs," as CNN put it, but current corporate scrutiny forced it to 'fess up for once. Until now, IBM would acknowledge the latest layoffs if reporters called and asked, but wouldn't give specifics. Yeesh. - Jen Muehlbauer

    -IBM Cut 5% of Staff in Period, Double the Expected Number
    -http://online.wsj.com/article/0,,SB1029282408667791835,00.html
    -(Paid subscription required.)

    -IBM to Cut Over 15,000 Employees (AP)
    -http://tinyurl.com/10kz

    -IBM confirms 15,600 job cuts (Reuters)
    -http://www.msnbc.com/news/793777.asp

    -IBM cutting 15,000 jobs
    -http://news.com.com/2100-1001-949677.html

    -IBM job cuts exceed 15,600
    -http://money.cnn.com/2002/08/13/technology/ibm/index.htm

    -IBM puts job cuts at 15,600, with fewer than 50 in this state
    -http://seattlepi.nwsource.com/business/82508_ibm14.shtml

    - -
    - - -     -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Sponsor - -
    - - -
    - - - - - - - - - - - - - -
    - - - - - - - - You've heard about identity management, but do you know about the opportunities and business models that will emerge as a result? Download a free executive summary of Esther Dyson's coverage of identity management in Release 1.0. Learn more about the expanding market for these services and applications. - -
    - - -     -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - Synergy and Betrayal at Vivendi - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Synergy always was a fuzzy concept. Now Vivendi Universal's top man has slammed the lid on it. The French company announced today that it's ready to peddle $9.8 billion in assets to rustle up some cash. First up on the block? Synergy-less U.S. book publisher Houghton Mifflin.

    -It's unclear whether new chairman Jean-Rene Fourtou has genuine turnaround muscle, or whether he and Vivendi's board are simply following the winds of post-merger fashion. But when you owe $18.7 billion, you get real practical, real fast. The Guardian reported that Vivendi's share price sank 5% on Tuesday when investors got the willies about the company's impending announcement on its financial health. But the company had positive news to report: It's making money. Revenue in the first half was -up 13%, higher than analysts' estimates of a 7.7% boost.

    -Details are scant on the breadth of Fourtou's restructuring efforts, with more information expected at the next board meeting on September 25, according to reporters. Houghton Mifflin, acquired a year ago for $1.7 billion, and a vague explanation that included the "Curious George" character, were the only properties named for sale so far. The Guardian speculated that Vivendi will also sell its U.S. video games business and possibly its stake in the French mobile phone company SFR, a debatable -sale because of the cash it generates, according to the newspaper.

    -Meanwhile, Fourtou's predecessor, Jean-Marie Messier, continues to advocate empire-building. The New York Post said its sources say Messier hopes his former employer will feel generous enough to let him continue to reside in his $17 million Manhattan abode. And Bloomberg reported earlier this week that an unrepentant Messier is penning a memoir as he vacations in the Mediterranean. The working title? "How I Was Betrayed." - Deborah Asbrand

    -Vivendi to Sell Publisher Houghton Mifflin (Reuters)
    -http://www.washingtonpost.com/wp-dyn/articles/A15954-2002Aug14.html

    -Vivendi investors expect the worst
    -http://www.guardian.co.uk/business/story/0,3604,774190,00.html

    -Vivendi to Sell $9.8 Billion In Assets, Including Houghton
    -http://online.wsj.com/article/0,,SB102931297119161715,00.html
    -(Paid subscription required.)

    -Ousted Messier Aims To Score $17m Vivendi Pad
    -http://www.nypost.com/business/54701.htm

    -Ex-Chief of Vivendi Plans Tell-All Book (Bloomberg)
    -http://www.nytimes.com/2002/08/12/business/media/12VIVE.html

    - -
    - - -     -
    - - - - - - - - - - Other Stories - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    A Top AOL Manager Has Left Company
    -http://www.nytimes.com/2002/08/14/technology/14AOL.html

    -Fed Holds Steady on Interest Rates
    -http://www.washingtonpost.com/wp-dyn/articles/A14636-2002Aug13.html

    -Amtrak halts all high-speed service after finding cracks
    -http://www.sunspot.net/bal-te.train14aug14.story

    -AOL lets resigning exec keep stock options
    -http://www.usatoday.com/money/industries/technology/2002-08-13-aol-pittman_x.htm

    -Lucent licensing deal with Winstar focus of probe (AP)
    -http://www.bayarea.com/mld/mercurynews/business/3861117.htm

    -Study Says Net Could Benefit Music Firms
    -http://www.latimes.com/business/la-fi-music14aug14.story

    -Eisner Crimping His Own Style
    -http://www.latimes.com/business/la-fi-disney14aug14.story

    -Severance claims by Enron former execs anger ex-workers
    -http://www.chron.com/cs/CDA/story.hts/business/1533657

    -Princeton removes dean after Yale Web site flap (AP)
    -http://www.siliconvalley.com/mld/siliconvalley/3857890.htm

    -Frisbee golf creator dies, may land on someone's roof (SF Chronicle)
    -http://seattlepi.nwsource.com/national/82560_frisbee14.shtml

    -Will Kinsley's Slate Get Wiped?
    -http://www.ojr.org/ojr/kramer/1029281360.php

    -Hollywood, Russian Bicker Over Bass
    -http://www.cnn.com/2002/SHOWBIZ/News/08/13/bassspace.hollywood.ap/

    - -
    - - -     -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Sponsor - -
    - - -
    - - - - - - - - - - - - - -
    - - - - - - - - Do you want to reach the Net's savviest audience?
    -Advertise in Media Unspun.
    -Contact Erik Vanderkolk for details at erikvanderkolk@yahoo.com today. - -
    - - -     -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - Staff - - - - - - - - - -
    - - - - - - - - Written by Deborah Asbrand (dasbrand@world.std.com), Keith Dawson (dawson@world.std.com), Jen Muehlbauer (jen@englishmajor.com), and Lori Patel (loripatel@hotmail.com). -

    -Copyedited by Jim Duffy (jimduffy86@yahoo.com). -

    -Marketing: Cowpoke Productions (cowpokeproductions.com). -

    -Advertising: Erik Vanderkolk (erikvanderkolk@yahoo.com). -

    -Editor and publisher: Jimmy Guterman (guterman@vineyard.com). -

    -Media Unspun is produced by The Vineyard Group Inc. -
    Copyright 2002 Media Unspun, Inc., and The Vineyard Group, Inc. -
    Subscribe already, willya? http://www.mediaunspun.com -

    -Redistribution by email is permitted as long as a link to http://newsletter.mediaunspun.com is included. - -
    - - -     -

    - -
    - - - - - - - - - - - - - - - - - -     		- - - - - - - - - - - - - - - - -
    - - - -
    - - - SUBSCRIBE - - -
    - - - - - - - - - - - - - - - - -
    - -

    - Enter your email address in the box below to receive a free four-week trial of Media Unspun: -

    - - - - - - - - - - - - - - - - - - - - - - - - - -

    -
    - - - - - Add - - - - - - Remove
    - - - - SendasHTML
    - - -   - -

    - - - -
    - - -
    -
    -


    Newsletter Services
    Provided by
    iMakeNews.com

     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - -
    - - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - TELL A FRIEND - - - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - - -
    Powered by iMakeNews.com™
    - This email was sent to: xxxxx@yyyyyy.zzz
    Click here to be instantly removed from this list.
    Click here to receive future messages in plain text format.
    Click here to change your subscriber information and preferences.
    - - - - - - - - -

      - - - - - -

    - - - - - -
    - - - - - - - -------------=_1029331990-31627-4-- - - diff -Nru spamassassin-3.4.6/t/data/whitelists/mlist_mailman_message spamassassin-4.0.0~rc3/t/data/whitelists/mlist_mailman_message --- spamassassin-3.4.6/t/data/whitelists/mlist_mailman_message 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/mlist_mailman_message 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -Received: from usw-sf-list2.yyyyyyyyyyyy.net (usw-sf-fw2.yyyyyyyyyyyy.net - [216.136.171.252]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id - g7HFlZ603002 for ; Sat, 17 Aug 2002 16:47:35 +0100 -Received: from usw-sf-list1-b.yyyyyyyyyyyy.net ([10.3.1.13] - helo=usw-sf-list1.yyyyyyyyyyyy.net) by usw-sf-list2.yyyyyyyyyyyy.net with - esmtp (Exim 3.31-VA-mm2 #1 (Debian)) id 17g5m8-000654-00; Sat, - 17 Aug 2002 08:46:04 -0700 -Received: from dogma.slashnull.org ([212.17.35.15]) by - usw-sf-list1.yyyyyyyyyyyy.net with esmtp (Exim 3.31-VA-mm2 #1 (Debian)) id - 17g5lM-0005xL-00 for ; - Sat, 17 Aug 2002 08:45:16 -0700 -Received: (from apache@localhost) by dogma.slashnull.org (8.11.6/8.11.6) - id g7HFj8h02977; Sat, 17 Aug 2002 16:45:08 +0100 -X-Authentication-Warning: dogma.slashnull.org: apache set sender to - zzzzzz@zzzzzz.org using -f -Received: from 194.125.173.146 (SquirrelMail authenticated user zzzzzz) by - zzzzzz.org with HTTP; Sat, 17 Aug 2002 16:45:08 +0100 (IST) -Message-Id: <33025.194.125.173.146.1029599108.squirrel@zzzzzz.org> -From: "Justin Mason" -To: SpamAssassin-talk@lists.yyyyyyyyyyyy.net -X-Mailer: SquirrelMail (version 1.0.6) -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-1 -Content-Transfer-Encoding: 8bit -Subject: [SAtalk] spam-phrases existing algo -Sender: spamassassin-talk-admin@lists.yyyyyyyyyyyy.net -Errors-To: spamassassin-talk-admin@lists.yyyyyyyyyyyy.net -X-Beenthere: spamassassin-talk@lists.yyyyyyyyyyyy.net -X-Mailman-Version: 2.0.9-sf.net -Precedence: bulk -List-Help: -List-Post: -List-Subscribe: , - -List-Id: Talk about SpamAssassin -List-Unsubscribe: , - -List-Archive: -X-Original-Date: Sat, 17 Aug 2002 16:45:08 +0100 (IST) -Date: Sat, 17 Aug 2002 16:45:08 +0100 (IST) - -BTW, I should not that this algorithm Paul Graham uses is -very close to what we've got in spam-phrases code already. - -To turn it into pcode: - - mass-check for spamphrases: - - - get mail body, strip HTML, attachments and mail formatting - - strip stopwords ("to", "of", "a" etc.) - - find pairs of 3-20 letter words - - foreach pair: - - skip pair if one word is in stoplist of common terms - - ++ the frequency of that word-pair - - settle-phrases -- turn mass-check results into a spamphrases file - - - read all spam word-pairs, let NS = number of word-pairs - - read all nonspam word-pairs, let NN = number of word-pairs - - let bias = NS / NN (compensates for different corpus size) - - foreach nonspam word-pair: - - wpfreq = (freq in spam) - (frequency in nonspam * bias) - - foreach spam word-pair: - - if (wordpair was not found in nonspam): - - wpfreq *= 10 - - note the highest score of all rules - - scoring of an incoming message: - - - get mail body, strip HTML, attachments and mail formatting - - strip stopwords ("to", "of", "a" etc.) - - find pairs of 3-20 letter words - - foreach pair: - - score += ((wpfreq*10) / highest_score_of_all_rules) - - foreach "!" found in text: - - score++ - - return result as "spam phrase score". - -So it's quite close to PG's algo, but he also tracks the non-spam -word-pairs -- which we don't do for SpamAssassin, because they -overfit to the mass-checker's nonspam mail corpus (generally -names of friends, etc.) - ---j. - - - -------------------------------------------------------- -This sf.net email is sponsored by: OSDN - Tired of that same old -cell phone? Get a new here for FREE! -https://www.inphonic.com/r.asp?r=yyyyyyyyyyyy&refcode1=vs3390 -_______________________________________________ -Spamassassin-talk mailing list -Spamassassin-talk@lists.yyyyyyyyyyyy.net -https://lists.yyyyyyyyyyyy.net/lists/listinfo/spamassassin-talk diff -Nru spamassassin-3.4.6/t/data/whitelists/mlist_yahoo_groups_message spamassassin-4.0.0~rc3/t/data/whitelists/mlist_yahoo_groups_message --- spamassassin-3.4.6/t/data/whitelists/mlist_yahoo_groups_message 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/mlist_yahoo_groups_message 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -Received: from dogma.slashnull.org (dogma.slashnull.org [212.17.35.15]) - by sonic.xxxxxxxxx.org (Postfix) with ESMTP id 9424D132505 - for ; Thu, 1 Aug 2002 14:21:59 -0700 (PDT) -Received: from intm3.sparklist.com (intm3.sparklist.com [207.250.144.9]) - by dogma.slashnull.org (8.11.6/8.11.6) with SMTP id g71LMw230398 - for ; Thu, 1 Aug 2002 22:22:58 +0100 -Date: Thu, 2 May 2002 00:02:49 +1200 -Subject: [Sigiii-l] [InfoInternational] REINBERGER FOUNDATION GIFT -To: -From: "Biju K Abraham" -Message-Id: -MIME-Version: 1.0 -Content-type: multipart/alternative; boundary="------=_NextPart_000_0146_01C1F16C.B224C240" - -------=_NextPart_000_0146_01C1F16C.B224C240 -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: quoted-printable - -REINBERGER FOUNDATION GIFT TO=20 -KENT STATE UNIVERSITY SLIS=20 - -Kent State University's School of Library and Information Science -received a gift of $240,000 from the Reinberger Foundation of Cleveland -for the construction of a unique national center dedicated to training libr= -arians who=20 -specialize in services for children, young adults and school -librarianship. The gift was announced in anticipation of National -Library Week (April 14-20).=20 -=20 -"The Children's Resource Center will offer an environment similar to -achildren's or elementary school library complete with books, -multimedia, puppets and a storytelling area," said Associate Professor -Dr. Carolyn S.Brodie, who has built the School of Library and -Information Science's collection of materials for youth, and is a -co-recipient of the Reinberger gift. Brodie recently served as chair of -the 2000 John Newbery Award Committee.=20 -=20 -The Children's Resource Center will be unique among the nation's library -schools and will serve as a model classroom for library science programs -for children's librarians. The Center is designed to be much more than a -university classroom and will include a children's - resource area that will house more than=20 -5,000 children's books, materials, and resources to -create a focal point for instruction in children's, young adult, and -school librarianship.=20 - -The 1,700-square-foot resource center will also -include a wireless computer network installed with specialized software -and other resources used in children's and school libraries. For more -information contact Megan Harding, (330) 672-0419.=20 - - - Moderator - - - -------=_NextPart_000_0146_01C1F16C.B224C240 -Content-Type: text/html; charset=US-ASCII -Content-Transfer-Encoding: 7bit - - - - - - - - - - -
    REINBERGER FOUNDATION GIFT TO -
    -
    KENT STATE UNIVERSITY SLIS
    -

    Kent State University's School of -Library and Information Science
    received a gift of $240,000 from the Reinberger Foundation of Cleveland
    for -the construction of a unique national center dedicated to training librarians -who
    specialize in services for children, young adults and -school
    librarianship. The gift was announced in anticipation of -National
    Library Week (April 14-20).
     
    "The Children's Resource -Center will offer an environment similar to
    achildren's or elementary school -library complete with books,
    multimedia, puppets and a storytelling area," -said Associate Professor
    Dr. Carolyn S.Brodie, who has built the School of -Library and
    Information Science's collection of materials for youth, and is -a
    co-recipient of the Reinberger gift. Brodie recently served as chair -of
    the 2000 John Newbery Award Committee.
     
    The Children's Resource Center will be unique among the -nation's library
    schools and will serve as a model classroom for library -science programs
    for children's librarians. The Center is designed to be much -more than a
    university classroom and will include a children's
    -
     resource area that will house -more than
    -
    5,000 children's books, materials, and -resources to
    create a focal point for instruction in children's, young adult, -and
    school librarianship.
    -
     
    -
    The 1,700-square-foot resource center -will also
    include a wireless computer network installed with specialized -software
    and other resources used in children's and school libraries. For -more
    information contact Megan Harding, (330) -672-0419. 
    -
     - -Moderator -
    -
    - - - - - - - - - - - -
    Yahoo! Groups Sponsor
    ADVERTISEMENT
    - - - - -
    - -To unsubscribe from this group, send an email to:
    -InfoInternational-unsubscribe@yahoogroups.com
    -
    -     -
    - -
    -Your use of Yahoo! Groups is subject to the Yahoo! Terms of Service. -
    - - - -------=_NextPart_000_0146_01C1F16C.B224C240-- - diff -Nru spamassassin-3.4.6/t/data/whitelists/mypoints spamassassin-4.0.0~rc3/t/data/whitelists/mypoints --- spamassassin-3.4.6/t/data/whitelists/mypoints 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/mypoints 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Return-Path: -Delivered-To: zzz-zzzzzzz@fffffffff.org -Received: (qmail 6475 invoked by uid 505); 20 Jun 2002 02:01:31 -0000 -Received: from mpmail@mpmlbx06.mypoints.com by zzzzzz.fffffffff.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.243337 secs); 20 Jun 2002 02:01:31 -0000 -Received: from mpmlbx06.mypoints.com (216.33.87.173) - by dsl092-072-213.bos1.dsl.speakeasy.net with SMTP; 20 Jun 2002 02:01:30 -0000 -Received: (from mpmail@localhost) - by mpmlbx06 (8.11.0/8.11.0) id g5K1onT23615; - Wed, 19 Jun 2002 20:50:49 -Date: Wed, 19 Jun 2002 20:50:49 -Message-ID: <2002619205049.g5K1onT23615@mpmlbx06> -To: zzz-zzzzzzz@fffffffff.org -From: BonusMail from MyPoints -Reply-To: BonusMailReply@mypoints.com -Subject: New Deals Just Added! Massive Sheet Liquidation--Now Save up to 84%! -X-Indiv: y6f6f69de10d97c7a932zzc3902bf5331 -X-JobID: 107974 -MIME-Version: 1.0 -Content-Type: text/html;charset=us-ascii -Content-Transfer-Encoding: 7bit - -[MyPoints newsletter] diff -Nru spamassassin-3.4.6/t/data/whitelists/neat_net_tricks spamassassin-4.0.0~rc3/t/data/whitelists/neat_net_tricks --- spamassassin-3.4.6/t/data/whitelists/neat_net_tricks 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/neat_net_tricks 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ -From bounce-neatnettricks-1234567@silver.lyris.net Thu Aug 15 10:51:10 2002 -Return-Path: -Delivered-To: aaa@localhost.netnoteinc.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 8448D43C4F - for ; Thu, 15 Aug 2002 05:49:35 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for aaa@localhost (single-drop); Thu, 15 Aug 2002 10:49:35 +0100 (IST) -Received: from silver.lyris.net (silver.lyris.net [216.91.57.32]) by - dogma.slashnull.org (8.11.6/8.11.6) with SMTP id g7ENU3408604 for - ; Thu, 15 Aug 2002 00:30:03 +0100 -Message-Id: -X-Sender: jteems@rap.midco.net@pop.midco.net -X-Mailer: QUALCOMM Windows Eudora Version 5.1 -Date: Wed, 14 Aug 2002 16:20:00 -0700 -To: aaaaaa@yyyyyy.zzz -From: NNT@silver.lyris.net -Subject: Neat Net Tricks Standard Issue 131 - August 15, 2002 -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii"; format=flowed -List-Unsubscribe: -Reply-To: NNT@silver.lyris.net -X-Pyzor: Reported 0 times. - -IN THIS ISSUE: - -01. Secure IE -02. Disk cleanup on XP -03. Thanks but no thanks -04. Mouseless way home -05. Kartoo -06. XP time feature -07. Leaf Peeper Alert -08. Saving scraps -09. Quick access -10. Don't believe your email - -And What's Coming Up Next Week in NNT Premium - -01. SECURE IE. For the past month or so, our Software Review Panel has -been giving a grueling test to Secure IE, a piece of software that blocks -Flash and pop-ups, prevents malicious file downloads, lets you customize -Security Zone settings as you browse dozens of Web sites simultaneously up -to five times faster with a tabbed interface, annotate Web page with sticky -notes and highlighter, and save complete Web pages, even secure server -(HTTPS) pages and archive online transaction receipts. For what we believe -is one of the most thorough reviews ever conducted on a single piece of -software, check out what our Panel had to say at -http://www.NeatNetTricks.com/SoftwareReviews . For a free trial download, -visit http://www.secureie.com . And if this one sweeps you off your feet, -go to the NNT Store at http://www.NeatNetTricks.com/store and get a super -deal, just $17.50 if you order before September 14. With a 30-day -guarantee, what's to lose? - -02. DISK CLEANUP ON XP. Windows XP users can do some fast cleaning chores -with Disk Cleanup. Access this tool from the Start menu by right clicking -on your hard drive. Then select Properties and click on the Disk Cleanup -button to determine how many files can be safely deleted. - -03. THANKS BUT NO THANKS. Continuing our periodic feature of -less-than-useful sites on the Web: The International Center for Bathroom -Etiquette at http://www.icbe.org/ gets our recognition this issue. It says -it's working hard to bring you the latest in cutting edge research and -technology regarding bathroom etiquette. We'll resist some obvious puns. - -. . . . . - -West Virginia's Diane Stratton recommended NNT to some friends and is now -enjoying QuicKeys 2.0, a great Windows management software package. Diane -is our latest winner and you could be next. Just go to the NNT Web site at -http://www.NeatNetTricks.com and click on "Recommend NNT." Nothing could -be easier. - -. . . . . - -04. MOUSELESS WAY HOME. To go home quickly in Internet Explorer, touch F6 -to highlight the Address Bar and type two periods (..) there. The Enter -key then takes you home. - -05. KARTOO. Search engines are everywhere on the Internet but Kartoo at -http://www.kartoo.net is quite unusual. It's a meta search engine that -displays results on a map in the form of a ball. The larger the ball, the -more relevant the result. As you mouseover each result, site descriptions -are revealed. If all that sounds confusing, the explanation is more -complicated than the service itself. Just try it. - -. . . . . - -You should make it a habit to visit the NNT Store at -http://www.NeatNetTricks.com/store . We try to have several great products -there at a limited-time price much less than anywhere else on the Net. -Currently, you'll find excellent ebooks, a very effective popup stopper, -and the very useful utility described in item 01 above, along with the -usual opportunity to subscribe to NNT Premium and ArchivesExpress. Check -us out, you'll be glad you did. - -. . . . . - -06. XP TIME FEATURE. Windows XP added a nice feature that heretofore -required a separate software application. It will connect, either at a -programmed time or manually, to a time server via the Internet and reset -that often erroneous internal clock. Just click on the time in the systems -tray, go to Date and Time Properties and click the Internet Time tab. - -07. LEAF PEEPER ALERT. A bit early, but soon the changing colors of autumn -will begin here in the U.S. For those who like to follow the display, -consider http://www.stormfax.com/foliage.htm for a comprehensive collection -of links and toll-free numbers to each state to determine peak color times. - -08. SAVINGS SCRAPS. Some oldies are worth repeating. If you're working -with text in, for example, MS Word or WordPad, and would like a handy way -to save a portion for later easy retrieval, just select (highlight) it and -click/drag it to your desktop. When the newly created icon is clicked on, -it will show the application with which the scrap was created, along with -the first few words of the text. A double click opens the text in the -application with which it was created. - -09. QUICK ACCESS. To go to a frequently used program, you may find -yourself drilling down to the desktop and searching out the shortcut -icon. Consider instead setting up a key combination that will provide -quick access without using the shortcut. Right click on the shortcut and -select Properties. In the Shortcut key window, select any key you can -remember and click OK. Ctrl+Alt and that key will open the application -whenever needed. - -10. DON'T BELIEVE YOUR EMAIL. We've been asked about those emails with -virus attachments that appear to be coming from NNT, asking for a -confirmation of a subscription. Don't believe it, and don't open the -attachments. Maybe this exchange between NNT and Lyris (our mail manager) -will clear things up: - -NNT: Is there anything that can be done about the current strains of virus -that implant on address books and randomly send email asking alleged -subscribers to verify their subscription (when they haven't subscribed at -all)? I've received some of these as well, and I know it's become a -widespread problem with other ezine publishers, creating a lot of ill will -all around. Is there some configuration that we could change to keep -these from going out except to legitimate subscribers? - -Lyris: Unfortunately, there isn't much we can do about this since it -isn't actually ListManager doing the sending. The real problem is that -people sometimes will add the "join" address to their address book and -that is what causes the problems. The best we can do is advise people not -to have their address books set to automatically add any email address -that they send a message to even once. The main culprit here seems to be -Outlook Express. - -WHAT'S COMING NEXT WEEK: Another batch of Neat Net Tricks in the Premium -issue, including: - -* A great collection of information and free downloads to make your system -more secure. - -* Free software to measure and display your real-time Internet speed. - -* Can you handle still another popup stopper - that's interference free - -and at no cost? - -* An easy-to-use tool to store and arrange all your passwords, user IDs, -and other info. - -* A Microsoft Word tip to easily work around that pesky autocompletion -feature. - -* A whole arsenal of tools to combat spam. - -* Software that provides more than 200 interesting facts about your -computer and displays about your CPU, memory, operating system, and your -computer's power source. - -* Our in-depth article discusses how to best manage our important -passwords and get out of trouble when we -inevitably - forget those passwords. - -And more! If you haven't subscribed yet, you won't find a better source of -useful information for just 42 cents per issue. That's $10 for a year's -worth - 24 issues - at the NNT Store, http://www.NeatNetTricks.com/store . - -. . . . . . - -NNT makes no endorsement or warranty, expressed or implied, with regard to -featured products or services. Results may vary based on operating systems -and other variables beyond our control. - -For info on how to subscribe, unsubscribe, or change your address, send a -blank email to info-neatnettricks@silver.lyris.net . - -Sponsor an entire issue of NNT with your exclusive message to our readers -at very low rates. Send a blank email to -advertise-neatnettricks@silver.lyris.net . - -Comments or questions about your computer and the Internet? Visit the NNT -Bulletin Board at http://www.escribe.com/computing/neatnettricks/bb/ . - -NNT is hosted by Lyris.com, the best in email list management. - -Copyright 2002 by Jack Teems. All rights reserved. Neat Net Tricks is -registered with the U.S. Library of Congress ISSN: 1533-4619. - - ---- -You are currently subscribed to neatnettricks as: aaaaaa@yyyyyy.zzz -To unsubscribe send a blank email to leave-neatnettricks-1234567K@silver.lyris.net - - diff -Nru spamassassin-3.4.6/t/data/whitelists/netcenter-direct_de spamassassin-4.0.0~rc3/t/data/whitelists/netcenter-direct_de --- spamassassin-3.4.6/t/data/whitelists/netcenter-direct_de 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/netcenter-direct_de 1970-01-01 00:00:00.000000000 +0000 @@ -1,414 +0,0 @@ -Return-Path: -Received: (qmail 3387 invoked by alias); 15 Jul 2002 20:26:49 -0000 -Received: (qmail 26987 invoked by uid 82); 15 Jul 2002 20:23:30 -0000 -Received: from dms-errors@dms.netcenter.com by mailhost with qmail-scanner-1.00 (uvscan: v4.1.40/v4212. . Clean. Processed in 5.813084 secs); 15 Jul 2002 20:23:30 -0000 -Received: from dms-mail02.netcenter.com (207.200.87.32) - by mi-1.rz.ruhr-uni-bochum.de with SMTP; 15 Jul 2002 20:23:20 -0000 -Received: from dms-www1.netscape.com (dms-mailcaster-s07.netcenter.com) by dms-mail02.netcenter.com (LSMTP for Windows NT v1.1b) with SMTP id <8.00007AB9@dms-mail02.netcenter.com>; Mon, 15 Jul 2002 13:22:22 -0700 -To: xxxxx.yyyyy@ruhr-uni-bochum.de -Subject: Netscape News - Ausgabe Juli -From: Netscape -Date: Mon, 15 Jul 2002 13:24:23 -0800 -Reply-To: Netscape -Content-Type: multipart/alternative; - boundary="______BoundaryOfDocument______" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit - -This is a multi-part message in MIME format. - ---______BoundaryOfDocument______ -Content-Type: text/plain -Content-Transfer-Encoding: 7bit - -Netscape News - Ausgabe Juli - -Lieber Netscape-Nutzer, - -in dieser Ausgabe: - -- Mustervertrge, Rechtstipps und mehr - Die neuen Netscape Quickfinder liefern Ihnen direkte Links zu - Themen und Tools wie Downloads, Rechtstipps, Vertrgen und mehr. - -- Der neue Women-Channel - Nicht nur fr Frauen: Die Mode von Morgen, die neusten Trends in - puncto Lifestyle, leckere Rezepte und vieles mehr. - -- Netscape sucht mit Google - Ab sofort bedient sich die Netscape-Suche der Google-Suchengine. So - erhalten Sie die besten Suchergebnisse in krzester Zeit. - -- 0190-Dialer gehen um - Unserise Anbieter von 0190er-Nummern werden immer dreister. Wir zeigen - Ihnen, wie Sie sich schtzen knnen. - -- Flirten erlaubt - Sie fahren als Single in den Urlaub? Sie wollen Spa? Wir zeigen Ihnen - die besten Strnde fr einen heien Sommer-Flirt! - -http://dms-www01.netcenter.com/cgi-bin/gx.cgi/mcp?p=041H1b041H2g55Ep6l012000 -WRnwBz - ------------------------------------------------------------------- -Netscape respektiert Ihre Online-Arbeitszeit und Ihre -Privatsphre. Wenn Sie in Zukunft KEINE E-Mail-Nachrichten -mehr von Netscape erhalten mchten, klicken Sie auf untenstehenden -Link. -HINWEIS: -KLICKEN SIE NUR AUF DIESEN LINK, WENN SIE IHR ABONNEMENT -AUCH WIRKLICH BEENDEN MCHTEN! -http://dms-www01.netcenter.com/cgi-bin/gx.cgi/mcp?p=041H1d3Qxx41H2g55Ep6l012 -000WRnwBz - -Sie sind mit folgender Adresse registriert:[xxxxx.yyyyy@ruhr-uni-bochum.de] - ---______BoundaryOfDocument______ -Content-Type: text/html -Content-Transfer-Encoding: 7bit - - - - - - -Netscape News, Ausgabe -Juli - - - - - - - - - - - - - - - - - - - - -
    - NETSCAPENETSCAPE -Mail -Instant MessengerDownload
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - -
    - - -
    - - Click here to -visit our advertiser. - - - Click -here to visit our advertiser. -
    -
    - Netscape News - Juli, 2002
    -
    - - - - - - -
    - - Highlights - -
    0190-Dialer gehen um
    - Die -Abzocke nimmt kein Ende: Unserise Anbieter von 0190er-Nummern lassen sich -immer wieder neue Tricks einfallen, um die Verbraucher zu schrpfen. Wir -geben Tipps zur Vorsorge.

    - - Ab in den Urlaub
    - Noch -nichts vor im Sommer? Dann ab in den Urlaub! Unsere Last-Minute-Suche findet -sicher das passende Schnppchen fr Ihren Geldbeutel.

    - - Riester-Rente-Special
    - Jeder -spricht darber, doch wissen Sie wirklich Bescheid? Wir klren Sie ber die -Vor- und Nachteile der staatlich gefrderten Rentenform auf.

    - -
    - - -
    - -
    -     		-
    - - In dieser Ausgabe -
    - - - Zwei starke Partner:
    Netscape sucht mit -Google     -
    Die -Netscape-Suche ist jetzt noch effizienter: Sie bedient sich der -Google-Technologie, -der zur Zeit besten Such-Engine im Internet. Egal nach was Sie also suchen: -Netscape und Google liefern Ihnen in krzester Zeit die Top-Ergebnisse aus -ber 2 Milliarden Webseiten - und das bersichtlich und mit hoher -Relevanz.
     - Mehr... -

    - - Nicht nur fr Frauen:
    Der neue -Women-Channel     -
    -Netscape.de hat Nachwuchs bekommen: Im neuen Women-Channel -finden Sie alles, was das (Frauen-)Herz hher schlagen lsst. Wir verraten -Ihnen zum Beispiel, was in Sachen Mode in diesem Sommer angesagt ist, zeigen -Ihnen die neusten Trends in puncto Lifestyle und stellen leckere Rezepte -fr die leichte Sommerkche vor.
    - Mehr... -

    - -     		- - - - - - - - - - - - -
    - - Flirten erlaubt
    - Sie fahren als Single in den Urlaub? Sie wollen Spa? Wir -zeigen Ihnen die besten Strnde fr einen heien Sommer-Flirt!
    - Mehr...
    -
    - - Grukarten
    - Verschicken Sie Ihre persnlichen Gre einfach per eMail. -Das spart Zeit und kostet Sie keinen Pfennig. Jetzt testen!
    - Mehr...
    -

    -
    -
    -
    - - Mustervertrge, Rechtstipps und mehr... -
    - - Die neuen Netscape Quick Finder -
    - Das -Internet stellt eine fast grenzenlose Menge an Informationen bereit. Wer -hat da noch den Durchblick, vor allem, wenn es schnell gehen soll? Die Netscape Quick Finder -schaffen Abhilfe: Hier finden Sie direkte Links zu diversen Themen und Tools -wie Mustervertrge, Rechtstipps, Downloadarchiv, Gebrauchtwagenbewertung -und Jobbrse - um nur einige zu nennen. Schneller geht's wirklich -nicht!
     - Mehr... -
    -
    - -
    - -Um den Newsletter abzubestellen, klicken Sie bitte hier -
    oder antworten -Sie einfach auf diese email und schreiben "REMOVE" in die Betreffzeile.
    -c 2002 Netscape. Alle Rechte vorbehalten. Nutzungsbedingungen und Datenschutz     -
    - - - ---______BoundaryOfDocument______-- - - -: -annmn:[041H2g041H2g55Ep6l012000WRnwBz] - - - diff -Nru spamassassin-3.4.6/t/data/whitelists/netsol_renewal spamassassin-4.0.0~rc3/t/data/whitelists/netsol_renewal --- spamassassin-3.4.6/t/data/whitelists/netsol_renewal 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/netsol_renewal 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -From nobody@rs.internic.net Wed Jan 30 09:50:12 2002 -Delivery-Date: Tue, 13 Jun 2000 12:53:06 +0100 -Received: from zzzzzzzzz.yyyy (mail.zzzzzzzzz.yyyy [193.120.211.219]) - by zzzzzzzzzz.yyyyyyyyyyy.com (8.9.3/8.9.3) with ESMTP id MAA04894 - for ; Tue, 13 Jun 2000 12:53:04 +0100 -Received: from opsmail.internic.net (opsmail.internic.net [198.41.0.91]) - by zzzzzzzzz.yyyy (8.9.3/8.9.3) with ESMTP id MAA21530 - for ; Tue, 13 Jun 2000 12:53:03 +0100 -Received: from rs.internic.net (bipwww2.lb.internic.net [192.168.120.8]) - by opsmail.internic.net (8.9.3/8.9.1) with ESMTP id HAA23653 - for ; Tue, 13 Jun 2000 07:52:32 -0400 (EDT) -Received: (from nobody@localhost) - by rs.internic.net (8.9.3/8.8.4) - id HAA02994; Tue, 13 Jun 2000 07:52:32 -0400 (EDT) -Date: Tue, 13 Jun 2000 07:52:32 -0400 (EDT) -From: Nobody -Message-Id: <200006131152.HAA02994@rs.internic.net> -Reply-to: billing@netsol.com -To: foooooooo@yyyyyyyyyyy.com -Subject: Confirmation of yyyyyyyyyyy.com renewal order - -Dear Customer, - -Congratulations! Your Web Address (domain name) has been renewed for -an extended period. - -We will be processing your order within the next 24-48 hours. Renewal -of your domain name is effective on your current expiration date. * - -Here is a summary of your order: - - * Domain Name: yyyyyyyyyyy.com - * Total: $70.00 - * Rebate: $10.50 - -*Subject to receipt of complete and accurate information as requested -in your renewal registration order. If you have any questions, visit -the FAQ section of our website: -http://www.networksolutions.com/help/faq-multiyear-rebate.html - -Be sure to visit your website and learn more about products, services -and free resources offered by Network Solutions: -http://www.networksolutions.com/catalog/ - -Get VeriSign secure encryption on your new website, and you'll give your -customers the confidence to place orders online. Request a FREE Guide, -"Securing Your Web Site for Business." -http://www.verisign.com/cgi-bin/go.cgi?a=w000000000000000 - -Thank you for renewing the registration of your domain name with Network -Solutions! - -Sincerely, - -Network Solutions, Inc. -The dot com people (TM) - - diff -Nru spamassassin-3.4.6/t/data/whitelists/networkworld spamassassin-4.0.0~rc3/t/data/whitelists/networkworld --- spamassassin-3.4.6/t/data/whitelists/networkworld 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/networkworld 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -From NSManagement@bdcimail.com Wed Aug 14 15:30:00 2002 -Return-Path: -Delivered-To: ffffffff@localhost.zzzzzzzzzz-ffffffff.net -Received: from localhost (localhost.localdomain [127.0.0.1]) - by mail.zzzzzzzzzz-ffffffff.net (Postfix) with ESMTP id 707A9BEE4A - for ; Thu, 15 Aug 2002 06:12:03 -0700 (PDT) -Received: from mail.zzzzzzzzzz-ffffffff.com - by localhost with IMAP (fetchmail-5.9.11) - for ffffffff@localhost (single-drop); Thu, 15 Aug 2002 06:12:03 -0700 (PDT) -Received: from mailcontrol.bellevuedata.com (mailcontrol.bellevuedata.com [66.37.227.18]) - by mail44.megamailservers.com (8.12.5/8.12.0.Beta10) with SMTP id g7F78WpU002632 - for ; Thu, 15 Aug 2002 03:11:00 -0400 (EDT) -X-Mailer: ListManager Web Interface -Date: Wed, 14 Aug 2002 17:30:00 -0500 -Subject: Combining point products and suites -To: aaaaaaa@zzzzzzzzzz-ffffffff.com -From: NW on Network/Systems Management -Reply-To: Network/Systems Management Help -Message-Id: -Content-Type: text/plain; - charset="iso-8859-1" -X-SpamBouncer: 1.5 (7/17/02) -X-SBNote: FROM_DAEMON/Listserv -X-SBPass: No Pattern Matching -X-SBPass: No Freemail Filtering -X-SBClass: Bulk -X-Folder: Bulk - -NETWORK WORLD FUSION FOCUS: AUDREY RASMUSSEN on -NETWORK/SYSTEMS MANAGEMENT -08/14/02 -Today's focus: Combining point products and suites - -Dear Robin Frank, - -In this issue: - -* Readers who advocate using both point products and suites -* Links related to Network/Systems Management -* Featured reader resource - -_______________________________________________________________ -This newsletter sponsored by -Lucent - -Do you want to receive calls while online and not need a second -phone line? - -Do you want shorter connect times? - -Could you benefit from faster uploads? -For Next-Generation Dial Access, you need V.92. - -To learn more, click here for the Lucent Technologies V.92 -InfoCenter. http://www.nww1.com/go2/lucent_rc.html -_______________________________________________________________ -A NETWORK WORLD SPECIAL REPORT: BUSINESS CONTINUITY & DISASTER -RECOVERY PLANNING - -Dr. Jim Metzler of Ashton, Metzler & Associates discusses -techniques on how to proactively implement Business Continuity -and Disaster Recovery Planning. Sponsored by Syncsort, this -SPECIAL REPORT emphasizes both the tactical and strategic -considerations necessary for data and infrastructure -protection. Download your FREE copy today at: -http://nww1.com/go/ad306.html (registration required) - -_______________________________________________________________ -Today's focus: Combining point products and suites - -By Audrey Rasmussen - -Today we'll hear from readers who think the best route to take -in the debate between point products and suites is to use a -little of both. - -One reader commented that a company doesn't have to choose one -over the other. He says: - -"It has been my experience that a well-managed enterprise -monitoring system will most likely include some of both: point -solutions to address specific network/systems issues, and a -centralized, single pane of glass from a 'framework' system -providing a common platform for event and problem management." - -Another reader said organizational issues are an important -factor. An approach must work within the organizational and -political structure of a company: - -"The approach with best of breed, plus some integration tools -above it, is probably the less risky route - and for less -integrated organizations, the better way to go. If you go for -an integrated framework, you'd better be sure that you can -handle it from an organizational viewpoint; otherwise it could -be a hard, expensive landing." - -According to yet another reader, there are other factors that -affect the decision on the management approach: - -"Mostly this question is answered based on: - -* How high up in the organization the decision is being made - -* How pragmatically (quick and dirty vs. big and beautiful) - does one want to approach the issue - -* How specific the requirements are - -* Time of decision - -"Each supplier has its rise and fall; the winner of today may -be a loser tomorrow. If the different user [administrator] -groups have a different timing regarding when they need a tool, -they will probably come to different decisions." - -Another user says: - -"My personal favorite solution involves using vendor-supplied -software agents such as IBM Director or Compaq Insight Manager -and integrating them into a suite solution such as Tivoli or CA -Unicenter. This removes not only the cost of the middleware and -integration layers, but also removes the cost of the agent -technology." - -So, there you have opinions from readers who embrace point -products and suites working together. - -_______________________________________________________________ -To contact Audrey Rasmussen: - -Audrey Rasmussen is a research director with Enterprise -Management Associates in Boulder, Colorado, -(http://www.enterprisemanagement.com), a leading analyst -and market research firm focusing exclusively on all aspects -of enterprise management. Audrey has more than 20 years of -experience working with distributed systems, applications -and networks. Her current focus at EMA is e-business, SMB/SME -and MSPs. She can be reached at: -mailto:rasmussen@enterprisemanagement.com. -_______________________________________________________________ -2002 SALARY CALCULATOR - -How has the turbulent market affected your earning potential? -Find out with Network World's 2002 Salary Calculator. We've -updated the Salary Calculator and revised it to reflect the -results of the Network World 2002 Salary Survey. Give us some -details about yourself and we'll tell you if you earn as much -as your peers: http://nww1.com/go/ad324.html -_______________________________________________________________ -RELATED EDITORIAL LINKS - -SLAMming service levels into shape -Network World, 08/12/02 -http://www.nwfusion.com/news/2002/134753_08-12-2002.html - -Archive of the Network/Systems Management newsletter: -http://www.nwfusion.com/newsletters/nsm/index.html -_______________________________________________________________ -If you're concerned about the growing turbulence in the telco -industry, you are not alone. The massive financial and -organizational changes now underway at many of the largest -carriers increase the possibility of service outages, -performance degradation and poor operations support. Find out -what you can do to mitigate your risks. Attend a free web -seminar on the best practices for protecting your business from -telco turbulence. Leading industry expert, David Willis of the -META Group, will analyze the inevitable consequences of the -current environment and share pragmatic steps to shield your -users and applications from carrier failures. -http://nww1.com/go/4531858a.html -_______________________________________________________________ -FEATURED READER RESOURCE - -NW FUSION'S WHITEPAPERS CENTRAL - -A free resource to Network World Fusion visitors is the -Whitepaper Central area on NW Fusion. Here you can find vendor -and Network World produced whitepapers on a variety of network -topics. You can search our whitepapers database by company or -by title. All are available free of charge. Visit -http://www.nwfusion.com/bg/wp/wpbydate.jsp today. -_______________________________________________________________ -May We Send You a Free Print Subscription? -You've got the technology snapshot of your choice delivered -at your fingertips each day. Now, extend your knowledge by -receiving 51 FREE issues to our print publication. Apply -today at http://www.nwwsubscribe.com/nl -_______________________________________________________________ -SUBSCRIPTION SERVICES - -To subscribe or unsubscribe to any Network World e-mail -newsletters, go to: -http://www.nwwsubscribe.com/news/scripts/notprinteditnews.asp - -To unsubscribe from promotional e-mail go to: -http://www.nwwsubscribe.com/ep - -To change your e-mail address, go to: -http://www.nwwsubscribe.com/news/scripts/changeemail.asp - -Subscription questions? Contact Customer Service by replying to -this message. - -Have editorial comments? Write Jeff Caruso, Newsletter Editor, -at: mailto:jcaruso@nww.com - -For advertising information, write Alonna Doucette, V.P. of -Online Development, at: mailto:sponsorships@nwfusion.com - -Copyright Network World, Inc., 2002 - ------------------------- -This message was sent to: aaaaaaa@zzzzzzzzzz-ffffffff.com - - diff -Nru spamassassin-3.4.6/t/data/whitelists/oracle_net_techblast spamassassin-4.0.0~rc3/t/data/whitelists/oracle_net_techblast --- spamassassin-3.4.6/t/data/whitelists/oracle_net_techblast 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/oracle_net_techblast 1970-01-01 00:00:00.000000000 +0000 @@ -1,554 +0,0 @@ -Return-Path: -Received: (qmail 19678 invoked by alias); 10 Jul 2002 13:22:47 -0000 -Received: (qmail 19416 invoked by uid 82); 10 Jul 2002 13:22:42 -0000 -Received: from replies@oracleeblast.com by mailhost with qmail-scanner-1.00 (uvscan: v4.1.40/v4210. . Clean. Processed in 8.59332 secs); 10 Jul 2002 13:22:42 -0000 -Received: from inet-mail6.oracle.com (209.246.10.170) - by mi-1.rz.ruhr-uni-bochum.de with SMTP; 10 Jul 2002 13:22:30 -0000 -Received: from blaster-smtp.oracle.com (eblast01.oracleeblast.com [148.87.9.11]) - by inet-mail6.oracle.com (Switch-2.2.2/Switch-2.2.0) with ESMTP id g6ADMHs25188 - for XXXXXX.YYYYY@RUHR-UNI-BOCHUM.DE; Wed, 10 Jul 2002 06:22:17 -0700 (PDT) -Date: Wed, 10 Jul 2002 06:22:17 -0700 (PDT) -Message-Id: <200207101322.g6ADMHs25188@inet-mail6.oracle.com> -Subject: Oracle Technology Network TechBlast - July 2002 -From: Oracle Technology Network -To: XXXXXX.YYYYY@RUHR-UNI-BOCHUM.DE -Reply-To: replies@oracleeblast.com -Content-Transfer-Encoding: 8bit -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="next_part_of_message" - ---next_part_of_message - - - -e -e -ssage -Content-type: text/plain; charset=iso-8859-1 - - - ---next_part_of_message -Content-Type: text/html - - - -Oracle Technology Network -
    OTN - TechBlast
    -     July 2002 Issue
    - The monthly TechBlast is also available through the Oracle - Technology Network website.
    -
    -
    -
    -
    - - - - - - -
    In - this issue: - - - - - - - - - - - - - - - - - - - - - - - - - -
    This - Month's Feature
    - News
    Software - Downloads
    Oracle - University
    New - Books
    -

    Worldwide - Events:
    - Americas     | EMEA | APAC

    -
    -

    -     		-

    This - Month's Feature: - New Developer Services on OTN

    -

    OTN Members: Get - Oracle Software on CD Shipped - to you Today!
    -     Order OTN TechTracks - and receive Oracle9i Database Release 2, Oracle9i Application Server Release - 2, and Oracle Developer Suite (including JDeveloper) CDs for the platform - of your choice. TechTracks is a one-year subscription, and it includes - access to Oracle Support's KnowledgeBase and CD updates shipped to you - whenever there are major new releases of Oracle software. Enter promo - code OWC for a $50 savings during the month of July.

    -

    Exchange your Knowledge - through OTN Community Code Services
    -     OTN Community Code - is a web-browsable CVS repository that lets you review, customize, extend, - and share Oracle-related code and coding techniques. OTN populated it - with sample application projects, so that you can view sample code source - online, download it, submit bugs and suggestions to the development teams, - and get email notifications when code is updated. Participate in an Oracle-sponsored - project, and then create your own project and share your code with the - OTN community.

    -

    Web Services Center - Now Available on OTN
    - The OTN Web Services - Center is a new resource for the development and deployment of Web - services. Visitors to this new Center can experience live Web service - examples, access the latest Web services technical information, and build - their own Web services using Oracle9i - JDeveloper. The Web Services Center offers information of value to - Web services architects, - developers - and newcomers.

    -

    Win Great Prizes - in the OTN Web Services Challenge
    - Developers are encouraged to submit their own Web services to the OTN - Web Services Challenge. Entering your Web services makes you eligible - for fantastic prizes, including a fully decked-out Dell mobile workstation. - The Challenge starts August 1, so get - a head start today by learning more about the rules. You can even - preregister your - interest in the Challenge.

    -

    New Internet Seminar: - J2EE and Web Services on Linux with Oracle9iAS Release 2
    - Attend - this on-demand Internet Seminar to learn how to use Oracle9i Application - Server Release 2 to develop high performance J2EE and Web Services applications - on the Linux operating systems.

    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -

    News

    -

    Special - Discount on Red Hat Linux Advanced Server
    - Receive up to 45% discount on the initial purchase of Red Hat Linux Advanced - Server. Find - out how! Offer valid July 1- July 31, 2002. To get more information - on Oracle and Linux, click - here.

    -

    Helping WebGain - Developers Move to Oracle9i JDeveloper
    - With all the consolidation taking place in the Java tools space, developers - are seeking tools that provide a complete and integrated environment for - developing J2EE applications and Web services, and also offer security - and stability for the future. Oracle9i JDeveloper delivers on all counts, - and the new WebGain - Developer Center on OTN has been created to give VisualCafe users - the resources to move - rapidly and smoothly to the integrated development environment of Oracle9i - JDeveloper. Listen - to the interview with Ted Farrell, Oracle's Senior Director of Applications - Tools Technology and former WebGain CTO, on "moving to Oracle9i JDeveloper". -

    -

    Oracle9i Application - Server # 1 in ECperf Benchmarks
    - In its first ECperf submissions, Oracle9i Application Server Release 2 - achieved the industry's best ever 'performance' benchmark at 61,863 BBops/min, - beating IBM by 39% and BEA by 63%. The proof is in: Oracle9iAS is still - faster than IBM and BEA. Oracle9iAS also achieved the best results in - the ECperf 'price/performance' category at $5/BBop, 28% better than BEA's - top result, and 54% better than IBM's top result. Get the facts: read - the Oracle9iAS ECperf Benchmark Report now and tune - into a Live Internet Seminar and Q&A on Wednesday, July 17 at - 8:00 a.m. PDT for a live presentation and discussion of these record setting - results.

    -

    Four Internet Seminars - on the New Security Features in Oracle9i Application Server Release 2 -
    - Watch - these four Internet Seminars to learn about the new security features - in Oracle9i Application Server Release 2. Oracle9i Application Server - Release 2 is the first application server to offer integrated support - for Single Sign-On, JAAS and an LDAP compliant directory that together - let you cost efficiently secure all your J2EE applications, portals, and - Web services.

    -

    OTN Toolbar
    - Search OTN from anywhere on the internet with OTN Toolbar. Download - today to easily gain access to many of the key features of OTN (including - downloads, sample code, documentation, and discussion forums).

    -

    New Internet Seminar - on Oracle9iAS Web Cache and ESI
    - Watch - this Internet Seminar and learn how Oracle9iAS Web Cache lets you accelerate - any Web application running on any server by up to 20 times. Speed applications - built in Active Server Pages, Java Server Pages, Servlets, EJBs and more. - Deploy with Web servers like Apache and Microsoft IIS as well as application - servers like BEA WebLogic, IBM WebSphere, Sun/iPlanet and, of course, - Oracle9iAS. Best of all, Oracle9iAS Web Cache uniquely supports caching - of both static and dynamically generated content without changing the - application, enabling dynamic Web sites to more efficiently deliver rich - content and therefore improving the user experience.

    -

    Oracle9i Reports - data source SDK available now
    - The Oracle9i - Reports data source SDK allows you to plug in your own data sources - and benefit from the sophisticated report creation and distribution environment - of Oracle9i - Reports. Check out the new documentation and samples.

    -

    Putting Forms on - the Web
    - Looking to move your existing Forms application from client/server to - the Web? Want the easy access and maintainability of a web deployed Forms - application? Then check - out this new paper.

    -

    Struts and Oracle9i - JDeveloper
    - Here's a cool - new article with detailed instructions on how to configure and use - the Jakarta Struts open source Model-View-Controller framework with Oracle9i - JDeveloper.

    -

    Quickstart with - Oracle9i JDeveloper for BEA developers
    - Are you using BEA's WebLogic and looking for development tools? Here is - the easy way to start - using the award winning Oracle9i JDeveloper with WebLogic. And if you - want to use the fastest J2EE container, check out the migration - kit to Oracle9iAS.

    -

    Wireless and Voice - Made Easy With Oracle9i Application Server
    - New Internet lessons give viewers the low-down on how to use the wireless - and voice services of Oracle9i Application Server (Oracle9iAS Wireless) - to quickly and easily give access to applications and data using any device, - over any network. Learn why Oracle is a leader in wireless and voice infrastructure - for yourselves! Check - out the new Internet lessons in the FREE Mobile eKit!

    -

    Snapshot Seminar: - Interwoven & Oracle9iAS Content Management
    - Oracle and Interwoven together offer a portal ready, proven, and flexible - Enterprise Content Management solution. . Watch a 15 minute on-demand - snapshot seminar - and learn how you can let your users control their content through a portal - powered by Oracle and Interwoven.

    -

    Updated Oracle9iAS - Portal Developer Kit (PDK) - July
    -     The updated - Oracle9iAS Portal Developer Kit (PDK) highlights portlet communication. - Using the PDK, you can build smart portlets with such features as inter-portlet - communication, page to portlet communication, and portlet reusability. - This release includes new J2EE-based and Web Services samples.

    -

    Snapshot Seminar: - Documentum & Oracle9iAS Content Management
    - Oracle and Documentum now offer a joint solution to create, manage and - deliver content through Web sites and portals. Watch a 15 minute on-demand - snapshot - seminar and learn how you can let your users control their content - through a portal powered by Oracle and Documentum.

    -

    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -

    - New Software Downloads

    -

    Oracle9i - Application Server Release 2 for Windows NT/2000, AIX, and Compaq Tru64 - UNIX

    -

    Oracle9iAS - TopLink 4.6 for Linux, UNIX, and Windows NT/2000

    -

    Oracle9i - Lite Release 5.0.2.0.0 for Sun SPARC Solaris

    -

    Oracle - Data Provider for .NET (ODP.NET) Beta

    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -

    Oracle - University

    -

    Special Offer! - Save 45% on Oracle9i DBA Certification Training
    - The expanded Oracle Certification Program now offers a true certification - levels that are built to fit the needs of IT professionals as well as - organizations looking to hire them. Each level constitutes reaching a - benchmark of experience and expertise that is industry recognized and - approved. And, with each new credential can come increased opportunities, - higher pay, and more benefits to keep Oracle professionals successful. -

    -

    Oracle9i Certification - Savings Plan – Save 45% on 4 Instructor Led inClass courses. 4 for - the price of 2! Click - here to learn more!

    -     		-
    - - - - -
    - - - - -
    -

    -

    Seeking - a new job? Check out OTN - Skills Marketplace for all open Oracle-trained positions.

    -

    Need - help implementing technology solutions to business problems? - Oracle9i - by Example Series tutorials can save you time.

    -

    Taking - an OCP exam? OTN members, take advantage of the 20% exam - discount.

    -
    -
    -
    -
    - - - - - - - - - - - - - - - -Untitled Document - - - - - - - - - -
    -
     
    -     		-
    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -
    -
    -
    -

    New - Books

    -

    Oracle9i - DBA 101
    - Oracle9i - DBA 101 by Marlene Theriault, Rachel Carmichael, & James - Viscusi (ISBN 0-07-222474-6) explains, step-by-step, how to effectively - administer an Oracle database. Readers will find coverage of the - key Oracle9i new features as well as details on the daily responsibilities - of a DBA and tips on how to successfully accomplish those tasks. - From the exclusive publishers of Oracle Press books, this is the - ideal resource for the aspiring Oracle database administrator. -

    -

    Oracle9i - Mobile
    - Oracle9i - Mobile by Alan Yeung, Philip Stephenson, & Nicholas Pang - (ISBN 0-07-222455-X) helps readers design, deploy, and manage - flexible mobile applications on the Oracle platform. From the - exclusive publishers of Oracle Press books, this resource explains - how to use and extend the mobile services available in Oracle9iAS - Wireless and integrate with other Oracle technologies. Mobilize - any e-business, reach new customers, and deliver critical information - to mobile users with the most scalable and reliable mobile infrastructure - available.

    -

    - Oracle Press User Group Program
    - Oracle Press has a new User Group Program! Oracle Press supports - the service that User Groups provide to the technical community. - We value our relationship with community-based groups and welcome - the opportunity to form partnerships with User Groups to disseminate - the latest technological information available in Osborne publications. - Osborne encourages participation by technical User Groups that - meet regularly, discuss, teach, and troubleshoot technical topics, - write book reviews, and publish print and/or online newsletters. -

    -
    -
    -
    -
    -
    -

    Oracle Press can - provide User Groups:

    -
    -
      -
    • -
      Review - copies of Oracle Press books for newsletter reviews
      -
      • -
    • -
      Book - donations and promotional items for User Group events
      -
      • -
    • -
      30% - discount on bulk purchases of 10 or more books
      -
      • -
    • -
      And - more...
      -
      • -
    -
    -
    -
    -
    -

    - Click - here for complete details about Oracle Press' User Group Program. -

    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -

    Worldwide - Events

    -
    -

    Americas

    -

    Oracle - User Group Events
    - Find - out where new user group events are happening in your area. -

    -

    APAC

    -
    -
    -
    -
    - - - - - -
    OracleWorld - Online - Beijing
    -     Over - 5,000 industry professionals from all over China and the world gathered - to learn how Oracle can help your business reduce costs, improve - efficiencies, and improve the way you run your business. If you - missed OracleWorld in Copenhagen, you can get all the highlights - including keynotes, conference presentations and whitepapers online.
    -
    -
    -

    Oracle - iSeminars: Free & Live @ Your Desktop
    -     Attend a FREE Oracle APAC iSeminar to learn more about how Oracle9i - - Application Server, Database & Tools could provide you with a complete - and cost-effective e-business infrastructure.

    -
    -
    -
    -
    -

    Please - click - here for further information and online registration for all - iseminars. (Please select correct time zone & click "reset"). - For any - questions, please email - us.

    -

    EMEA

    - - - - - -
    OracleWorld - Online - Copenhagen
    -     Thousands - of professionals from all over the world gathered to learn how - Oracle can help your business reduce costs, improve efficiencies, - and improve the way you run your business. If you missed OracleWorld - in Copenhagen, you can get all the highlights including keynotes, - conference presentations and whitepapers online.
    -
    -
    -

    -
    -
    Oracle - Technology Days Belgian & Luxembourg
    -     Join us - for the Oracle Technology Days - Featuring Oracle9i Release 2 – - Live, Local, Free!
    -
    -

    Join - us for this executive full-day event :
    - 29/8/2002 - Brussels (sessions in English)
    - 3/9/2002 - Gent (sessies in het Nederlands)
    - 12/9/2002 - Liège (session en français)

    -

    Click - here for more information and registration.

    -

    Regards,

    -

    Oracle - Technology Network Team

    -

    UNSUBSCRIBE
    -     When you registered at OTN, you indicated you - would like to receive e-mail updates from us. If you do not want to receive - future e-mails, please visit our update - section , log in with your username and password, and UNCHECK the - I wish to receive informational e-mails box.

    -

    USERNAME - AND PASSWORD QUESTIONS?
    -     Forget your OTN login information? Use our password - lookup.

    -

    DUPLICATE - MESSAGES?
    -     You may - have multiple accounts on OTN. Please send a message to OTN - with the username you're using to access http://otn.oracle.com. We'll - then contact you and delete the unused account. -

    		-
    -
    - - - -

    -
    To be removed from Oracle's mailing lists, send an email to: -
    unsubscribe@oracleeblast.com -
    with the following in the message body: -
    REMOVE XXXXXX.YYYYY@RUHR-UNI-BOCHUM.DE -
    STOP -

    -[250000/116/137209217] - - - - - - - - - - - - diff -Nru spamassassin-3.4.6/t/data/whitelists/orbitz.com spamassassin-4.0.0~rc3/t/data/whitelists/orbitz.com --- spamassassin-3.4.6/t/data/whitelists/orbitz.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/orbitz.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -Received: (qmail 9304 invoked by uid 505); 12 Aug 2002 16:57:57 -0000 -Delivered-To: zzzzzz@xyz.com -Received: (qmail 19051 invoked by uid 74); 12 Aug 2002 16:58:16 -0000 -Received: from travelercare@orbitz.com by agogo0 by uid 71 with qmail-scanner-1.13 - (clamscan: 0.22. Clear:SA:1(0/0):. - Processed in 0.774434 secs); 12 Aug 2002 16:58:16 -0000 -Received: from unknown (HELO mailhost.wm.orbitz.com) (65.216.67.72) - by mail0.tyva.xyz.com with SMTP; 12 Aug 2002 16:58:15 -0000 -Received: from wl14 (sim-snat-01.wm.orbitz.com [10.50.100.11]) - by mailhost.wm.orbitz.com (8.12.1/8.12.1) with ESMTP id g7CGwEsF005188 - for ; Mon, 12 Aug 2002 11:58:14 -0500 -Message-ID: <17728173.1029171478187.JavaMail.weblogic@wl14> -Date: Mon, 12 Aug 2002 11:57:58 -0500 (CDT) -From: Orbitz Traveler Care -To: Rod -Subject: Orbitz Travel Document -Mime-Version: 1.0 -Content-Type: text/html -Content-Transfer-Encoding: 7bit - - - - - -Orbitz Travel Document - - diff -Nru spamassassin-3.4.6/t/data/whitelists/paypal.com spamassassin-4.0.0~rc3/t/data/whitelists/paypal.com --- spamassassin-3.4.6/t/data/whitelists/paypal.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/paypal.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Received: (qmail 18217 invoked from network); 4 Apr 2002 21:41:45 -0000 -Received: from localhost (127.0.0.1) - by localhost with SMTP; 4 Apr 2002 21:41:45 -0000 -Delivered-To: zzzzzz@xyz.com -Received: from mail.xyz.com [64.123.162.104] - by localhost with POP3 (fetchmail-5.9.0) - for xyz@localhost (single-drop); Thu, 04 Apr 2002 16:41:45 -0500 (EST) -Received: (qmail 857 invoked from network); 4 Apr 2002 21:41:11 -0000 -Received: from unknown (HELO web18.nix.paypal.com) (65.206.229.164) - by mail0.tyva.xyz.com with SMTP; 4 Apr 2002 21:41:11 -0000 -Received: (qmail 13807 invoked by uid 99); 4 Apr 2002 21:41:10 -0000 -Date: Thu, 04 Apr 2002 13:41:10 -0800 -Message-Id: <1017000000.00000@paypal.com> -From: service@paypal.com -To: rod@xyz.com -Subject: Receipt for your Payment - -This email confirms that you have paid xyz.com Ltd. $12.00 -using PayPal. - ---------------------------------------------------------------- -This payment was sent using your bank account. - -By using your bank account to send money, you just: - -- Paid instantly and securely -- Sent money faster than writing and mailing paper checks. -- Received an additional entry in our $1,000 Sweepstakes! - -Thanks for using your bank account! - ---------------------------------------------------------------- - - -Thank you, -The PayPal Team - -Note: When you log in to your PayPal account, be sure that the website's URL always begins with "https://www.paypal.com/". The "s" in "https" at the beginning of the URL means you are logging into a secure page. If the URL does not begin with https, you are not on a PayPal page. - - - -Please do not reply to this e-mail. Mail sent to this address -cannot be answered. For assistance, log in to your PayPal -account and choose the "Help" link in the footer of any page. - - diff -Nru spamassassin-3.4.6/t/data/whitelists/register.com_password spamassassin-4.0.0~rc3/t/data/whitelists/register.com_password --- spamassassin-3.4.6/t/data/whitelists/register.com_password 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/register.com_password 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -From customersupport@register.com Wed Jan 30 09:50:12 2002 -Delivery-Date: Mon, 18 Sep 2000 16:41:35 +0100 -Return-Path: -Delivered-To: jm@ooooooooooo.com -Received: from wwwn.register.com (outgoing2.jrcy.register.com [209.67.50.16]) - by mail (Postfix) with ESMTP id 9A73FD894B - for ; Mon, 18 Sep 2000 15:41:33 +0000 (Eire) -Received: (from nobody@localhost) - by wwwn.register.com (8.9.3/8.9.3) id LAA18712 - for ppppp@ooooooooooo.com; Mon, 18 Sep 2000 11:41:22 -0400 -Date: Mon, 18 Sep 2000 11:41:22 -0400 -Message-Id: <200009181541.LAA18712@wwwn.register.com> -X-Authentication-Warning: wwwn.register.com: nobody set sender to customersupport@register.com using -f -From: Domain.Management.System@www.register.com -Reply-To: customersupport@register.com -To: ppppp@ooooooooooo.com -Subject: Domain Manager Password -Sender: customersupport@register.com - -User Name : xxxxxxxxxxxxxxx - -Thank you for using register.com's Domain Manager. - -To change or re-enter your password, please copy and paste the URL below into the "Location" or "Address" field of your web browser and hit the 'Enter' key on your keyboard. Note: If your email program supports HTML, you may be able to click on the link below. - -========================================================================================== -http://mydomain.register.com/change_password.cgi?00000000000 -========================================================================================== -Note: Above link will be expire within three days - -The page displayed will allow you to change or re-enter your Domain Manager password. - -In the event that the email program you are using does not display the URL as a hyperlink or the URL is broken into two lines, do not click on it. Instead, please follow the copy and pasting instructions below to complete the confirmation process. - -- Copy and Pasting Instructions - - -Highlight the URL with your cursor. Once you have highlighted the URL, hit CTRL + C to copy the highlighted area. - -Open an Internet browser window and click in the Address or Location field. Hit CTRL + V to paste the URL into the address field. If necessary, repeat this process with the second line of the URL. Please be sure to delete spaces if there are any embedded in the URL - otherwise you will not be able to connect to the proper confirmation page. - -Once you have entered and looked over the URL, hit the Enter key on your keyboard. The web page displayed will allow you to complete the final step in the confirmation process. - -If you have further questions, please do not hesitate to contact us at: -http://www.register.com/create_ticket.cgi - -Thank you for using register.com, the first step on the web. - -Customer Service -register.com, inc -http://www.register.com - - - diff -Nru spamassassin-3.4.6/t/data/whitelists/ryanairmail.com spamassassin-4.0.0~rc3/t/data/whitelists/ryanairmail.com --- spamassassin-3.4.6/t/data/whitelists/ryanairmail.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/ryanairmail.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,165 +0,0 @@ -From webster@ryanairmail.com Fri Aug 16 12:59:01 2002 -Return-Path: -Delivered-To: zzzz@localhost.foofoofoofoo.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.foofoofoofoo.com (Postfix) with ESMTP id E163743C32 - for ; Fri, 16 Aug 2002 07:58:59 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for zzzz@localhost (single-drop); Fri, 16 Aug 2002 12:58:59 +0100 (IST) -Received: from mail.ryanair2.ie ([193.120.152.8]) by dogma.slashnull.org - (8.11.6/8.11.6) with SMTP id g7GBwca16137 for ; - Fri, 16 Aug 2002 12:58:38 +0100 -From: webster@ryanairmail.com -To: "Customers" -Subject: Incredible Autumn Fares -Date: Fri, 16 Aug 2002 08:41:00 +0100 -X-Assembled-BY: XWall v3.21 -X-Mailer: MailBeamer v3.28 -Message-Id: -MIME-Version: 1.0 -Content-Type: text/plain; charset="iso-8859-1" -List-Unsubscribe: -Reply-To: webster@ryanairmail.com -Content-Transfer-Encoding: 8bit -X-MIME-Autoconverted: from quoted-printable to 8bit by dogma.slashnull.org - id g7GBwca16137 - -Massive seat sale this weekend on Ryanair.com -Fares from 6.25 one way including taxes -Travel between 9 September and 17 December -Sale until midnight Monday 19 August -Travel between 1200 hrs Monday and 1300 hrs Thursday or -Saturdays after 1200hrs to get these fares -Limited availability during school break periods and bank -holiday weekends. All fares quoted are one way including taxes. -Book now at http://www.ryanair.com - - -*********************** Domestic UK ************************* -London Stansted to Glasgow Prestwick from 6.25 -Glasgow Prestwick to London Stansted from 6.25 -London Stansted to City of Derry from 12.99 -City of Derry to London Stansted from 12.99 - -*********************** UK to Scandinavia ************************* -London Stansted to Gothenburg from 9.99 -London Stansted to Stockholm NYO from 12.99 -London Stansted to Stockholm VST from 12.99 -London Stansted to Aarhus from 14.99 -London Stansted to Esbjerg from 14.99 -London Stansted to Oslo Torp from 14.99 -Glasgow Prestwick to Oslo Torp from 19.99 - -****************** UK to Belgium/Netherlands ******************** -London Stansted to Brussels Charleroi from 9.99 -London Stansted to Eindhoven from 12.99 -Liverpool to Brussels Charleroi from 12.99 -Glasgow Prestwick to Brussels Charleroi from 12.99 - -****************** UK to France/Italy ******************** -London Stansted to Dinard from 14.99 -London Stansted to St Etienne from 14.99 -London Stansted to Milan Bergamo from 14.99 -Glasgow Prestwick to Paris Beauvais from 14.99 - -****************** UK to Germany/Austria ******************** -Bournemouth to Frankfurt Hahn from 12.99 -London Stansted to Frankfurt Hahn from 12.99 -London Stansted to Hamburg Lubeck from 14.99 -London Stansted to Klagenfurt from 14.99 - -*********************** UK to Ireland ************************* -Manchester to Dublin from 9.99 -Leeds Bradford to Dublin from 9.99 -Bristol to Dublin from 9.99 -Edinburgh to Dublin from 9.99 -Teesside to Dublin from 9.99 -Glasgow Prestwick to Dublin from 9.99 -Bournemouth to Dublin from 9.99 -Liverpool to Dublin from 9.99 -London Stansted to Knock from 12.99 -London Stansted to Shannon from 14.99 -London Stansted to Cork from 14.99 -London Luton to Dublin from 14.99 -London Gatwick to Dublin from 14.99 -London Stansted to Dublin from 14.99 - -*********************** Ireland to UK ************************* -Dublin to Liverpool from Eur 9.99 -Dublin to Manchester from Eur 9.99 -Dublin to Bournemouth from Eur12.99 -Dublin to Bristol from Eur12.99 -Dublin to Leeds Bradford from Eur12.99 -Dublin to Edinburgh from Eur12.99 -Dublin to Teesside from Eur12.99 -Dublin to Glasgow Prestwick from Eur12.99 -Knock to London Stansted from Eur12.99 -Cork to London Stansted from Eur14.99 -Shannon to London Stansted from Eur14.99 -Dublin to London Stansted from Eur14.99 -**************************************************************** - -==================================================================== - -E-MAIL DISCLAIMER - -This e-mail and any files and attachments transmitted with it -are confidential and may be legally privileged. They are intended -solely for the use of the intended recipient. Any views and -opinions expressed are those of the individual author/sender -and are not necessarily shared or endorsed by Ryanair Holdings plc -or any associated or related company. In particular e-mail -transmissions are not binding for the purposes of forming -a contract to sell airline seats, directly or via promotions, -and do not form a contractual obligation of any type. -Such contracts can only be formed in writing by post or fax, -duly signed by a senior company executive, subject to approval -by the Board of Directors. - -The content of this e-mail or any file or attachment transmitted -with it may have been changed or altered without the consent -of the author. If you are not the intended recipient of this e-mail, -you are hereby notified that any review, dissemination, disclosure, -alteration, printing, circulation or transmission of, or any -action taken or omitted in reliance on this e-mail or any file -or attachment transmitted with it is prohibited and may be unlawful. - -If you have received this e-mail in error -please notify Ryanair Holdings plc by emailing postmaster@ryanair.ie -or contact Ryanair Holdings plc, Dublin Airport, Co Dublin, Ireland. - -===================================================================== - -E-MAIL DISCLAIMER - -This e-mail and any files and attachments transmitted with it -are confidential and may be legally privileged. They are intended -solely for the use of the intended recipient. Any views and -opinions expressed are those of the individual author/sender -and are not necessarily shared or endorsed by Ryanair Holdings plc -or any associated or related company. In particular e-mail -transmissions are not binding for the purposes of forming -a contract to sell airline seats, directly or via promotions, -and do not form a contractual obligation of any type. -Such contracts can only be formed in writing by post or fax, -duly signed by a senior company executive, subject to approval -by the Board of Directors. - -The content of this e-mail or any file or attachment transmitted -with it may have been changed or altered without the consent -of the author. If you are not the intended recipient of this e-mail, -you are hereby notified that any review, dissemination, disclosure, -alteration, printing, circulation or transmission of, or any -action taken or omitted in reliance on this e-mail or any file -or attachment transmitted with it is prohibited and may be unlawful. - -If you have received this e-mail in error -please notify Ryanair Holdings plc by emailing postmaster@ryanair.ie -or contact Ryanair Holdings plc, Dublin Airport, Co Dublin, Ireland. - - ---- -You are currently subscribed to customers as: xxxxx@yyyyyy.zzz -To unsubscribe send a blank email to leave-customers-123546K@mail.ryanairmail.com - diff -Nru spamassassin-3.4.6/t/data/whitelists/sf.net spamassassin-4.0.0~rc3/t/data/whitelists/sf.net --- spamassassin-3.4.6/t/data/whitelists/sf.net 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/sf.net 1970-01-01 00:00:00.000000000 +0000 @@ -1,263 +0,0 @@ -From noreply@sourceforge.net Wed Aug 14 17:36:08 2002 -Return-Path: -Delivered-To: aaaa@localhost.xxxxxxxxxxxx.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.xxxxxxxxxxxx.com (Postfix) with ESMTP id EEAC943C32 - for ; Wed, 14 Aug 2002 12:36:06 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for aaaa@localhost (single-drop); Wed, 14 Aug 2002 17:36:07 +0100 (IST) -Received: from usw-sf-list2.sourceforge.net (usw-sf-fw2.sourceforge.net - [216.136.171.252]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id - g7EGW3424685 for ; Wed, 14 Aug 2002 17:32:04 +0100 -Received: from usw-sf-db2-b.sourceforge.net ([10.3.1.4] - helo=sourceforge.net ident=tperdue) by usw-sf-list2.sourceforge.net with - smtp (Exim 3.31-VA-mm2 #1 (Debian)) id 17f141-00043a-00 for - ; Wed, 14 Aug 2002 09:32:05 -0700 -From: Mailer -To: "" -Subject: SOURCEFORGE.NET UPDATE: August 14, 2002 -Message-Id: -Date: Wed, 14 Aug 2002 09:32:05 -0700 - - -(You are receiving this email because you subscribed to it (honest). -For information on how to unsubscribe please read the bottom of this -email). - -0. INTRO. [IBM DB2] -1. INCREASED DOWNLOAD CAPACITY. -2. AUDIO OF KERNEL SUMMIT AVAILABLE. -3. BE A SF.NET FOUNDRY GUIDE. -4. WORK FOR SOURCEFORGE.NET -5. SITE STATISTICS - - -0. INTRO - -Hello SourceForge.net Users, - -This week we've made a big announcement. As you likely know, any -large dynamic website is powered by a database that funnels data to -the web servers serving data which ultimately gets sent to you. -These databases manage everything from user authentication, session -management, site searching, etc. SourceForge.net is a database- -dependent website. - -Today we have announced that we are moving SourceForge.net to DB2, -a powerful relational database by IBM. We are doing this because -the site continues to grow at a rapid rate, with 700 new users and -70 new projects a day, and we need a database that can handle this -growth. We feel that DB2 can do this for us, and IBM is giving us -the resources to make this transition successful. You can read the -press release here: - -http://www.vasoftware.com/news/press.php/2002/1070.html - -How will this effect you? In the first phase, you won't see much -difference other then the site will continue to grow and the -SourceForge.net team will be able to handle the growth. In later -phases you will see new features on the site that take advantage of -the databases advanced capabilities. - -Today our mail archives have been converted over. The rest of the -site will make the migration to DB2 in the coming months. - -If you have questions about this or any other aspect of the site, -please feel free to email me, pat@sourceforge.net. I always -appreciate the feedback. - -Thank you for your continued support of SourceForge.net and the -Open Source Community. - -Pat- - -Patrick McGovern -Director, SourceForge.net - - - -1. INCREASED DOWNLOAD CAPACITY - -SourceForge.net continues to grow, and it's appetite for bandwidth -is never-ending. Every day SF.NET serves over 300,000 files to -ensure that developers and end-users within the Open Source -community can always obtain the software released by hosted -projects, SourceForge.net maintains a network of high-capacity -download servers. These servers are located throughout the world, -as to provide better download times regardless of which network -provider you are using, and regardless of your geographic location. - -Three new download servers have recently been added to our network, -further strengthening our file serving capabilities. These latest -additions include servers hosted by: - -Time Warner Telecom (Wisconsin,USA); -http://www.twtelecom.com/ - -University of Minnesota (Minnesota, USA) -http://www.umn.edu/ - -CESNET (Czech Republic) -http://www.cesnet.cz/ - -We thank these sponsors for their commitment to SourceForge.net and -the needs of the Open Source community. - -On a related note, we are looking for a mirror in Japan. If you are -an ISP or University in Japan and are willing to spare 20Mbps for a -SourceForge.net mirror (we'll supply the hardware), please let us -know at bandwidth@sourceforge.net - - - -2. AUDIO OF KERNEL SUMMIT AVAILABLE - -SourceForge.net now has the audio from the entire 2002 OSDN/USENIX -Kernel Summit, held in June. Listen to the Linux kernel master -discuss such hot topics as kernel modules, virtual memory, -block I/O, database scaling, security modules, and async I/O. -You may find this audio repository at: - -http://linuxkernel.foundries.sourceforge.net/article.pl?sid=02/06/26/0116225 - - - -3. CONTRIBUTE TO SOURCEFORGE.NET! BE A FOUNDRY GUIDE! - -Want to contribute to SourceForge.net, but you don't know how to -code? Be a foundry guide! Foundry guides get to hype the cool -projects that they think are worth downloading and testing. -A guide finds all the stuff on the web about their subject of -choice, and gives it prominent placement. How do you become a -foundry guide? Go to http://foundries.sourceforge.net/; find a -topic that interests you; and send email to -foundries@sourceforge.net stating your desired topic and why you -are qualified to be a foundry guide. - - - -4. WORK FOR SOURCEFORGE.NET - -We have a new position for a senior web developer available at -SourceForge.net. We are looking for someone to help us maintain, -upgrade, and add new features to SourceForge.net. Ideal person has -5+ years of development experience on high end, high volume -websites (3+ million page views a day). Has a vast level of -knowledge of Internet technologies: PHP, PostgreSQL, MySQL, DB2, -Linux, PERL, Apache, LDAP, Mailman. A flare for design / UI is a -bonus. SourceForge is a unique site with unique challenges. We are -looking for someone at the top of their game. - -Location of Job is in Fremont, California. Please send resume and -URL's of sites you have worked on to jobs@sourceforge.net. Text -resumes only. (No MS WORD files!) - - - -5. SITE STATISTICS - -Stats: (Monday 12th, 2000) -Hosted Projects: 45,194 -Registered Users: 465,530 -Page Views: 3,344,708 in a single day (Monday) -Files transfered in a single day: 340,838 (Monday) -Emails sent in a single day from Mailing lists: 851,143 (Monday) - - -Top Ten Projects - -1 phpMyAdmin -http://sourceforge.net/projects/phpmyadmin/ -phpMyAdmin is a tool written in PHP intended to handle the -administration of MySQL over the WWW. Currently it can create and -drop databases, create/drop/alter tables, delete/edit/add fields, -execute any SQL statement, manage keys on fields. - -2 Compiere ERP + CRM Business Solution -http://sourceforge.net/projects/compiere/ -Smart ERP+CRM solution for small-medium enterprises (SME) in the -global marketplace covering all areas from customer management, -supply chain and accounting. For $2-200M revenue companies looking -for "brick and click" first tier functionality. - -3 SquirrelMail -http://sourceforge.net/projects/squirrelmail/ -SquirrelMail is a PHP4-based Web email client. It includes built-in -pure PHP support for IMAP and SMTP, and renders all pages in pure -HTML 4.0 for maximum compatibility across browsers. It also has -MIME support, folder manipulation, etc - -4 TUTOS -http://sourceforge.net/projects/tutos/ -TUTOS is the ultimate team organization software, a web-based -groupware or ERP/CRM system to manage events/calendars, addresses, -teams, projects,tasks,bugs,mailboxes,documents and your time spent -with these things - -5 JBoss.org -http://sourceforge.net/projects/jboss/ -The JBoss/Server is the leading Open Source, standards-compliant, -J2EE based application server implemented in 100% Pure Java - -6 Firewall Builder -http://sourceforge.net/projects/fwbuilder/ -Object-oriented GUI and set of compilers for various firewall -platforms. Currently implemented compilers for iptables, ipfilter -and OpenBSD pf - -7 openMosix -http://sourceforge.net/projects/openmosix/ -openMosix is a Linux kernel extension for single-system image -clustering. Taking n PC boxes, openMosix gives users and -applications the illusion of one single computer with n CPUs. -openMosix is perfectly scalable and adaptive. - -8 CDex -http://sourceforge.net/projects/cdexos/ -CDex a CD-Ripper, thus extracting digital audio data from an Audio -CD. The application supports many Audio encoders, like MPEG -(MP2,MP3), VQF, AAC encoders. - -9 phpChrystal - An Open Intranet System -http://sourceforge.net/projects/phpchrystal/ -phpChrystal ist ein OpenSource-Intranetsystem welches vorrangig auf -Lan-Partys eingesetzt werden kann. Vorteile von phpChrystal sind -seine Portierbarkeit, Flexibilitt und Performance, da es vollends -auf PHP, MySQL und XML basiert - -10 Dev-C++ -http://sourceforge.net/projects/dev-cpp/ -Dev-C++ is an full-featured Integrated Development Environment -(IDE) for Win32 and Linux. It uses GCC, Mingw or Cygwin as -compiler and libraries set. - -More Top Projects: -http://sourceforge.net/top/mostactive.php?type=week - - - - - -EMAIL LIST REMOVAL: - -When the SF.NET team sends out a site-wide email, we sometimes see -replies that look like this: "Hey!! I didn't subscribe to this list!!! -You spammer. I hate you! I hate your dog! (insert other colorful -phrases here)". The truth is, when you registered on SourceForge.net -there was a check box that said "Receive Site-wide updates, low -volume". You left it checked when you submitted the registration form, -hence you are receiving this email. We send these updates every 4 to 6 -weeks, so it truly is low volume. However if you want off, this is not -a problem. Simply click on the link below. - - -================================================================== -You receive this message because you subscribed to SourceForge -site mailing(s). You may opt out from some of them selectively -by logging in to SourceForge and visiting your Account Maintenance -page (http://sourceforge.net/account/), or disable them altogether -by visiting following link: - - - diff -Nru spamassassin-3.4.6/t/data/whitelists/winxpnews.com spamassassin-4.0.0~rc3/t/data/whitelists/winxpnews.com --- spamassassin-3.4.6/t/data/whitelists/winxpnews.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/winxpnews.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,528 +0,0 @@ -Received: from ooooooooo.net (ns1.ooooooooo.net [216.27.147.130]) - by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g6J6AZJ25232 - for ; Fri, 19 Jul 2002 07:10:35 +0100 -Received: from bounce.winxpnews.com (dal21037lyr001.datareturn.com [216.46.238.20]) - by ooooooooo.net (8.11.3/8.11.1) with SMTP id g6J6ABS16827 - for ; Fri, 19 Jul 2002 02:10:12 -0400 (EDT) - (envelope-from do_not_reply@bounce.winxpnews.com) -Importance: Normal -To: zzzz@zzzzzzzz.com -Reply-To: "WinXPnews" -Content-Type: text/html; - charset="us-ascii" -Content-Transfer-Encoding: 7bit -Date: Fri, 19 Jul 2002 01:10:07 -0600 -From: "WinXPnews" -Subject: WinXPnews: Time To Patch Your Windows Media Player -Message-Id: <5ksc2.105x1y34m@bounce.winxpnews.com> -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal - - -WinXPnews™ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - -WinXPnews™ E-Zine
    -     - -Tue, Jul 9, 2002 (Vol. 2, 27 - Issue 33) - -
    -Feel free to forward this newsletter to other WinXP enthusiasts.
    -Read this newsletter online here: - -http://www.winxpnews.com/?id=33
    -For a quick unsubscribe (gasp!) click here:
    - -http://www.winxpnews.com/unsubscribe.cfm?email=zzzz@zzzzzzzz.com     -     - -
    - -Time To Patch Your Windows Media Player - -
     
    - - -  This issue of WinXPnews™ contains:
    -     -
     
    - -
      -
    1. EDITOR'S CORNER - -
    2. How to Publish Your Windows XP FTP Server to the Internet - -
    3. HINTS, TIPS, TRICKS & TWEAKS -
        -
      • Allow Dial-up Connections to Synchronize Time with Internet Time Servers -
      -
    4. HOW TO'S: ALL THE NEW XP FEATURES -
        -
      • How to Secure an FTP Server on Windows XP Professional -
      -
    5. WINXP SECURITY: UPDATES & PATCHES -
        -
      • Cumulative Patch for Windows Media Player
      • Cumulative Patches for Excel and Word for Windows -
      -
    6. UPGRADING & COMPATIBILITY ISSUES -
        -
      • A Computer May Hang During a Heavy Load with an Ericsson HIS Modem
      • Knowledge Base Search Center - If it is Not Broke, Do Not Break it! -
      -
    7. WINXP CONFIGURING & TROUBLESHOOTING -
        -
      • A Description of the Repair Option on a Local Area Network or High-Speed Internet Connection
      • Keyboard and Mouse Do Not Work When You Start Windows
      • How to Deploy Windows XP Images from Windows 2000 RIS Servers -
      -
    8. FAVE LINKS -
        -
      • This Week's Links We Like. Tips, Hints And Fun Stuff -
      -
    9. BOOK OF THE WEEK -
        -
      • Windows XP Power Tools -
      -
    -     -
     
    - - -  SPONSOR: iHateSpam - Eliminate Irritating Junk Email
    -     -
     
    - - - - -Irritated with porn, bogus business offers and viagra ads in your mailbox?
    -Angry about losing your valuable time deleting all that junk? Need a spam-
    -blocker that eliminates this annoying spam? Stop the spam in your inbox
    -with iHateSpam. It gives you control over the ever increasing flood of
    -junk email. Runs under Windows 95/98/ME/NT/2000/XP. Best of all, the limited
    -time Intro Offer is just $19.95 with online delivery of full product and a
    -30-day money back guarantee. This is a real no-brainer. Get Your Copy Now!
    -Visit iHateSpam - Eliminate Irritating Junk Email for more information. -     -
     
    - - -  EDITOR'S CORNER
    -     -
     
    - -

    How to Publish Your Windows XP FTP Server to the Internet

    -Several of you wrote in about last week's article on installing an FTP Server. You said "that was great, but you only told half the story". You wanted to know two more things: -

      -
    1. How to make the FTP Server available to Internet users -
    2. How to secure the FTP Server -
    -There are several ways to make an FTP server on the internal network available to users on the Internet. These methods are referred to as "Server Publishing". You can use a Windows XP computer running Internet Connection Services (ICS) to publish a server on your internal network. -

    -Let's take a look at a common scenario. You have a Windows XP computer connected to the Internet with an always-on cable or DSL connection. You have another computer on your private network also running Windows XP. You've installed the FTP Server on this internal network computer and put files into the FTP folder. Now you want Internet users to connect to the FTP Server through the ICS computer directly connected to the Internet. -

    -You can do this with the Windows XP ICS! Here's how: -

      -
    1. Go into the Network Connections window. You can get there from the Network applet in the Control Panel. -
    2. Right click the network interface directly connected to the Internet and click Properties. -
    3. Click on the Advanced tab in the connection's Properties dialog box. Put a checkmark in the Internet Connection Firewall checkbox. Always make sure the Internet Connection Firewall (ICF) is enabled when you connect a computer directly to the Internet. -
    4. Click the Settings button, then click on the Services tab in the Advanced Settings dialog box. -
    5. Now click the Add button. This brings up the Service Settings dialog box. Type in My FTP Server in the Description of service text box. In the Name or IP address text box, type in the IP address of the computer on your private network that's running the FTP server. Since you're using ICS, it'll have an IP address like 192.168.0.x, where x is different for each machine on your network. You might want to manually assign the IP address the FTP Server already has, so that it doesn't change in the future. You can find out what IP address your FTP server is using by opening a command prompt at the FTP server and typing in the command ipconfig. That will give you the IP address the FTP Server is using. Back to the Service Settings dialog box, select the TCP option button. For the External Port and the Internet port, put in the port number you assigned to the FTP server on your internal network. Read this week's How To section to see how to change the listening port number. Clic! -k OK -
    6. Click OK, and then click OK one more time! You might need to disable and enable the adapter after making the change. You can do that by right clicking the always-on interface. -
    -The procedure is very similar for dial-up connections. However, there are problems with dial-up connections (and many always-on connections) because the IP address on the external interface of the ICS computer changes over time. Next week I'll share with you a cool way you can get around this problem by using something called a "dynamic DNS service". I've used one for years, and it works great. Make sure to tune in next week for the details. -

    -There you have it. Is server publishing in your future? Have any questions on the method I described above? If so, let me know! There are lots of ways you can publish services. Tell me how you do it, and tricks you've learned along the way. If you're having problems with server publishing, let me know about those too! I'll be sure to include what I learn from you in upcoming newsletters. -

    -Until next week,
    -Tom Shinder, Editor
    -(email us with feedback: feedback@winxpnews.com) -     -

     
    - - -  SPONSOR: Is Your PC Spying On You?
    -     -
     
    - - - - -You are surfing the Web. Check out sites, download some music or
    -software that might be cool. Guess what? Your PC might have picked up
    -a cyber transmitted disease (CTD). These pests might now be monitoring
    -what you are doing and report this back to their "black hat" owners
    -and reveal your personal information. PestPatrol kills 'em all off.
    -Get your copy on the online shop for just 30 bucks with immediate online
    delivery. Protect your PC and your confidential data!
    -Visit Is Your PC Spying On You? for more information. -     -
     
    - - -  HINTS, TIPS, TRICKS & TWEAKS
    -     -
     
    - -

    Allow Dial-up Connections to Synchronize Time with Internet Time Servers

    -Do you use a dial-up connection but can't get your machine to synchronize its clock with an Internet time server when the Internet Connection Firewall (ICF) is enabled? If so, here's a tip Richard Surry sent in on how to fix the problem: -

      -
    1. Open your Network Connections window from the start menu. -
    2. Right click on your modem (or other dial-up connection) and click Properties. -
    3. Click on the Advanced tab. You already have a checkmark in the box that enables the ICF. Click on the Settings button. -
    4. Click on the Services tab, then click on the Add button in the Services tab. -
    5. That should open the Service Settings dialog box. In the Description box, put in Internet Time Service. For the Name or IP address of the computer hosting this service on your network, type in 127.0.0.1. Select the TCP protocol option button. For both the external and internal port numbers, type 123. -
    6. If you're online, disconnect and reconnect. Now synchronize the time by double click on the clock in the system tray and going to the Internet Time tab. -
    -This is an interesting tip, and it represents an even more interesting problem. For you network geeks out there, I'll ask you this question: Why should we allow unsolicited inbound connections for the Internet Time Service? The ICF should not block responses to solicited outbound connections, so why should we have to enable reverse NAT to make this work? -     -
     
    - - -  HOW TO'S: ALL THE NEW XP FEATURES
    -     -
     
    - -

    How to Secure an FTP Server on Windows XP Professional

    -Last week we went over how to install the Windows XP FTP Server. It will work fine after going through the steps outlined last week, but several of you asked for more information on how to secure the FTP Server because you wanted to connect it to the Internet. It's a very good idea to understand how FTP security works before putting the server on the Internet. Here are some suggestions: -

      -
    1. Open the Internet Information Services console from the Administrative Tools menu. In the left pane of the console, expand your server name and then expand the FTP Sites node. -
    2. Right click on the Default FTP Site and click the Properties command. -
    3. Click on the FTP Site tab. Notice that the default TCP Port is set to 21. This is the well-known port for FTP. You can increase security a bit by changing this port to another value that's in the 1026-65534 range. This secures it from poorly motivated click-kiddies and also allows you to get around your ISP blocking incoming connections to TCP port 21. Friends who connect to your FTP server will need to change the port number on their FTP client software as well. -
    4. The Windows XP FTP server has a hard coded limit of 10 simultaneous connections. You might want to change this to a lower number to reduce the chance of a LAN party on the external interface of the FTP server. -
    5. Put a checkmark in the Enable Logging checkbox. Click the Properties button to the right of the log format drop-down list box. Click the Daily option button on the General Properties tab. On the Extended Properties tab, select all of the Extended Properties. Click OK. -
    6. Click on the Security Accounts tab. Place a checkmark in the Allow only anonymous connections checkbox. This prevents users from sending username and password credentials to the FTP server. You don't want users to send credentials because those credentials are sent in "clear text", which can be read by anyone who's listening on the wire. -
    7. Click the Messages tab. Enter a Welcome message, an Exit message, and a message users will see if there are no available connections. -
    8. Click on the Home Directory tab. Make sure there is a checkmark in the Read and Log Visits checkboxes. REMOVE the checkmark in the Write checkbox. Note the location in the Local Path text box. Navigate to that path in the Windows Explorer. -
    9. Right click on the FTPROOT folder and click Properties. -
    10. Click on the Security tab. Make sure that SYSTEM has Full Control. Assign the IUSR_ account READ access only. Remove all other permissions for the IUSR account. Make sure you give Adminstrators Full Control tool. This allows you, the administrator on the FTP Server computer, to add, remove and change files in the FTPROOT folder. -
    -Stop and restart the FTP Server. Now your FTP server is secure and Internet bad guys won't be able to use it to distribute porno and bootlegged software. -     -
     
    - - -  WINXP SECURITY: UPDATES & PATCHES
    -     -
     
    - -

    Cumulative Patch for Windows Media Player

    -I think it was a couple months ago when I wrote about some serious problems with the Windows Media Player (WMP). At that time you could download a "cumulative" patch that would update the Media Player with the latest security fixes. Well, it's time to download another "cumulative" patch! A couple other problems were found in WMP that could cause some problems. To read more about the problem head on over to:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709SE-WMP_Patch -

    -You'll also find the download locations for Windows Media Player versions 6.4, 7.1 and 8.0 (XP) on that page. -

    Cumulative Patches for Excel and Word for Windows

    -If you run Microsoft Word or Excel, versions 2000 or 2002 (XP), then you need to head on over to the Microsoft site to download some security fixes. These fixes handle security glitches that could get you in trouble if you don't take care of them! Head on over to Microsoft's site where you can find individual fixes for each program. You only need download the fix that applies to your computer:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709SE-Word_Excel_Patch -     -

     
    - - -  UPGRADING & COMPATIBILITY ISSUES
    -     -
     
    - -

    A Computer May Hang During a Heavy Load with an Ericsson HIS Modem

    -If your computer has a Ericsson HIS modem, you might experience a dreaded blue screen and see the message IRQL_NOT_LESS_OR_EQUAL or DRIVER_CORRUPTED_EXPOOL. The problem is that you're downloading too much and your poor modem can't keep up! Microsoft recognizes that this isn't a problem with the modem, but with the modem driver. To download a fix visit Microsoft's site. After getting the fix, you can download as much as you like without worrying about blue screens!
    -http://www.winxpnews.com/rd/rd.cfm?id=020709UP-HIS_Modem -

    Knowledge Base Search Center - If it is Not Broke, Do Not Break it!

    -It wasn't so long ago when you could search the Microsoft Knowledge Base for articles that came up in the last 3 days, 7 days, 14 days, 30 days, 90 days and 6 months. It was great! But Microsoft decided to "fix" the Knowledge Base search page, and now it really sucks! It's hard to find things that used to come up easily, the site is often down, and searching based on age of articles just doesn't work anymore. -

    -Try this: go to:
    -http://support.microsoft.com/default.aspx?ln=EN-US&pr=kbinfo&
    -and on the left side of the page select Windows XP in the top drop down list box. Don't put anything in the For solutions containing...(optional) text box. Leave the Any of the words entered option selected in the Using drop down list box. For Maximum Age select 3 days. For Results Limit select 150 articles. Click Search Now. Whoa! Nothing. OK, it's reasonable to see no articles related to Windows XP in the last 3 days. Try again, this time using 7 days. Whaat? Still no articles. OK, it was a holiday week in the USA last week. Let's try 14 days. Nothing again! That seems sort of strange, doesn't it? Let's give it another try with 30 days. Still no articles! What's going on here? Keep trying for 6 months and one year. You still won't find anything. It's pretty sad, because this used to work. -     -

     
    - - -  WINXP CONFIGURING & TROUBLESHOOTING
    -     -
     
    - -

    A Description of the Repair Option on a Local Area Network or High-Speed Internet Connection

    -Here's the answer to a question I've had for a long time. What the heck does that "Repair" option for a network connection actually do? It's not in the help file, but it's on the Microsoft Web site. Here's what it does: -

      -
    • Sends an ipconfig /renew -
    • Flushes the ARP cache with a arp -d -
    • Reloads the NetBIOS name cache with a nbtstat -R -
    • Updates its WINS server with an nbtstat -RR -
    • Clear out the DNS client cache with an ipconfig /flushdns -
    • Reregisters the client with a DDNS server with a ipconfig /registerdns -
    -Check out the original article over at:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709CO-Repair_Option -

    Keyboard and Mouse Do Not Work When You Start Windows

    -Have you been hit with this one? You're working in Windows XP and shut down for the day. The next morning you start up your Windows XP computer and the mouse pointer is stuck! The only way to get it going again is to restart the computer, and for some reason the pointer starts moving again. What's up with that? I still haven't figured that one out, but Microsoft has a KB article that claims it's from a corrupt registry. I doubt that's the case in my situation because the problem is intermittent. But if you find that your mouse is always stuck, you might want to check out:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709CO-Frozen_Mouse -

    How to Deploy Windows XP Images from Windows 2000 RIS Servers

    -Are you planning to roll out lots of Windows XP computers on your network in the near future? If so, you're probably looking for a good way to automate the process. You can use the Windows 2000 Remote Installation Services (RIS) if you're running Windows 2000 Servers on your network. For the basic procedure and some tips, tricks, and gotcha's, check out:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709CO-Deploy_XP_Images -     -

     
    - - -  FAVE LINKS
    -     -
     
    - -

    This Week's Links We Like. Tips, Hints And Fun Stuff

  • Be Afraid, be very afraid - the future of Big Brother in computing

    • -http://www.winxpnews.com/rd/rd.cfm?id=020709FA-Palladium_FAQ -
  • Get Revenge on your computer!

    • -http://www.winxpnews.com/rd/rd.cfm?id=020709FA-PC_Revenge -
  • Pringles Super Spud Boxing

    • -http://www.winxpnews.com/rd/rd.cfm?id=020709FA-Spud_Boxing -     -
     
    - - -  BOOK OF THE WEEK
    -     -
     
    - -

    Windows XP Power Tools

    -A book full of personal experiences and anecdotes that will equip you with the tips and tricks you need to become an XP afficionado. Coverage includes automating tasks using scripting, the Command Console Survivor Guide, networking, registry, maximizing security/firewalls, hardware, installation/configuration, and database hosting/accessing. The CD contains the best third party utilities around. -

    -Step-by-Step Instruction Helps You Harness the Full Power of Windows XP. Whether you're running Windows XP Home Edition or Professional, Windows XP Power Tools arms you with the advanced skills you need to become the ultimate power user. Full of undocumented tips and tricks and written by a Windows expert, this book provides you with step-by-step instructions for customization, optimization, troubleshooting and shortcuts for working more efficiently. A must-have for power users and network administrators, Windows XP Power Tools includes a CD filled with power tools including security, e-mail, diagnostic and data recovery utilities. -

    -http://www.winxpnews.com/rd/rd.cfm?id=020709BW-XP_Power_Tools - -

    - - - - - - - - - - - - - - - - - - - - - - -
     
    - - -  ABOUT WINXPNEWS™
    -     -
     
     
    - -What Our Lawyers Make Us Say -
    - -These documents are provided for informational purposes only. The information -contained in this document represents the current view of Sunbelt Software -Distribution on the issues discussed as of the date of publication. Because -Sunbelt must respond to changes in market conditions, it should not be -interpreted to be a commitment on the part of Sunbelt and Sunbelt cannot -guarantee the accuracy of any information presented after the date of -publication. -

    -INFORMATION PROVIDED IN THIS DOCUMENT IS PROVIDED "AS IS" WITHOUT WARRANTY OF -ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND FREEDOM -FROM INFRINGEMENT. -

    -The user assumes the entire risk as to the accuracy and the use of this -document. This document may be copied and distributed subject to the -following conditions: 1) All text must be copied without modification and all pages -must be included; 2) All copies must contain Sunbelt's copyright notice and any -other notices provided therein; and 3) This document may not be distributed -for profit. All trademarks acknowledged. Copyright Sunbelt Software -Distribution, Inc. 1996-2002. - -

     
    - -About Your Subscription to WinXPnews™ -
    - -This is a posting from WinXPnews. You are subscribed as zzzz@zzzzzzzz.com -

    -To manage your profile, please visit our site by clicking on the following link:
    - -http://www.winxpnews.com/login.cfm?id=9665862091709486
    -For a quick unsubscribe (gasp!), click here:
    - -http://www.winxpnews.com/unsubscribe.cfm?email=zzzz@zzzzzzzz.com -     -

    - - - diff -Nru spamassassin-3.4.6/t/data/whitelists/yahoo-inc.com spamassassin-4.0.0~rc3/t/data/whitelists/yahoo-inc.com --- spamassassin-3.4.6/t/data/whitelists/yahoo-inc.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/data/whitelists/yahoo-inc.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Return-Path: -Delivered-To: zzzzz@xyz.org -Received: (qmail 8790 invoked by uid 505); 29 Jul 2002 03:28:42 -0000 -Received: from yahoo-dev-null@yahoo-inc.com by blazing.xyz.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.195404 secs); 29 Jul 2002 03:28:42 -0000 -Received: from e5.member.yahoo.com (216.136.131.107) - by dsl092-072-xyz.bos1.dsl.speakeasy.net with SMTP; 29 Jul 2002 03:28:42 -0000 -Received: (from yahoo@localhost) - by e5.member.yahoo.com (8.11.3/8.11.3) id g6T3PIh88736; - Sun, 28 Jul 2002 20:25:18 -0700 (PDT) - (envelope-from yahoo-dev-null@yahoo-inc.com) -Date: Sun, 28 Jul 2002 20:25:18 -0700 (PDT) -Message-Id: <200207290325.g6T3PIh88736@e5.member.yahoo.com> -X-Authentication-Warning: e5.member.yahoo.com: yahoo set sender to using -f -From: Yahoo! Member Services -Errors-To: yahoo-dev-null@yahoo-inc.com -To: zzzzz@xyz.org -Subject: Yahoo! Email Verification - -[email from Yahoo!] - diff -Nru spamassassin-3.4.6/t/date.t spamassassin-4.0.0~rc3/t/date.t --- spamassassin-3.4.6/t/date.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/date.t 2022-05-08 05:40:03.000000000 +0000 @@ -1,22 +1,10 @@ #!/usr/bin/perl -w -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; +use lib '.'; use lib 't'; +use SATest; sa_t_init("date"); + use Mail::SpamAssassin; use Mail::SpamAssassin::Util; diff -Nru spamassassin-3.4.6/t/db_awl_path.t spamassassin-4.0.0~rc3/t/db_awl_path.t --- spamassassin-3.4.6/t/db_awl_path.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/db_awl_path.t 2022-06-19 04:48:21.000000000 +0000 @@ -2,10 +2,12 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("db_awl_path"); -use Test::More tests => 4; +use Test::More; +plan tests => 4; use IO::File; # --------------------------------------------------------------------------- +diag "Note: This test when successful displays lockfile warning messages"; %is_spam_patterns = ( q{ X-Spam-Status: Yes}, 'isspam', @@ -15,14 +17,13 @@ # is tell SpamAssassin to use an inaccessible one, then verify that # the address in question was *not* whitelisted successfully. ' -open (OUT, ">log/awl"); +open (OUT, ">$workdir/awl"); print OUT "file created to block AWL from working; AWL expects a dir"; close OUT; tstprefs (" - $default_cf_lines - auto_whitelist_path ./log/awl/shouldbeinaccessible - auto_whitelist_file_mode 0755 + auto_whitelist_path ./$workdir/awl/this_lock_warning_is_ok + auto_whitelist_file_mode 0755 "); my $fh = IO::File->new_tmpfile(); @@ -44,4 +45,4 @@ sarun ("-L -t < data/spam/004", \&patterns_run_cb); ok_all_patterns(); -ok(unlink 'log/awl'); # need a little cleanup +ok(unlink "$workdir/awl"); # need a little cleanup diff -Nru spamassassin-3.4.6/t/db_awl_path_welcome_block.t spamassassin-4.0.0~rc3/t/db_awl_path_welcome_block.t --- spamassassin-3.4.6/t/db_awl_path_welcome_block.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/db_awl_path_welcome_block.t 2022-06-19 04:48:21.000000000 +0000 @@ -0,0 +1,47 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("db_awl_path_welcome_block"); +use Test::More; +plan tests => 4; +use IO::File; + +# --------------------------------------------------------------------------- + +%is_spam_patterns = ( +q{ X-Spam-Status: Yes}, 'isspam', +); + +# We can't easily test to see if a given AWL was used. so what we do +# is tell SpamAssassin to use an inaccessible one, then verify that +# the address in question was *not* welcomelisted successfully. ' + +open (OUT, ">$workdir/awl"); +print OUT "file created to block AWL from working; AWL expects a dir"; +close OUT; + +tstprefs (" + auto_welcomelist_path ./$workdir/awl/this_lock_warning_is_ok + auto_welcomelist_file_mode 0755 +"); + +my $fh = IO::File->new_tmpfile(); +ok($fh); +open(STDERR, ">&=".fileno($fh)) || die "Cannot reopen STDERR"; +sarun("--add-addr-to-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", + \&patterns_run_cb); +seek($fh, 0, 0); +my $error = do { + local $/; + <$fh>; +}; + +diag $error; +like($error, qr/(cannot create tmp lockfile)|(unlink of lock file.*failed)/, "Check we get the right error back"); + +# and this mail should *not* be welcomelisted as a result. +%patterns = %is_spam_patterns; +sarun ("-L -t < data/spam/004", \&patterns_run_cb); +ok_all_patterns(); + +ok(unlink "$workdir/awl"); # need a little cleanup diff -Nru spamassassin-3.4.6/t/db_awl_perms.t spamassassin-4.0.0~rc3/t/db_awl_perms.t --- spamassassin-3.4.6/t/db_awl_perms.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/db_awl_perms.t 2022-06-15 21:57:36.000000000 +0000 @@ -2,27 +2,29 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("db_awl_perms"); -use Test::More tests => 5; use IO::File; +use Test::More; +plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS; +plan tests => 5; # --------------------------------------------------------------------------- # bug 6173 tstprefs (" - $default_cf_lines - use_auto_whitelist 1 - auto_whitelist_path ./log/user_state/awl - auto_whitelist_file_mode 0755 - lock_method flock + use_auto_whitelist 1 + auto_whitelist_path ./$userstate/awl + auto_whitelist_file_mode 0755 + lock_method flock "); -unlink "log/user_state/awl"; -unlink "log/user_state/awl.mutex"; +unlink "$userstate/awl"; +unlink "$userstate/awl.mutex"; umask 022; sarun("--add-addr-to-whitelist whitelist_test\@example.org", \&patterns_run_cb); -untaint_system "ls -l log/user_state"; # for the logs +# in case this test is ever made to work on Windows +untaint_system($RUNNING_ON_WINDOWS?("dir " . File::Spec->canonpath($userstate)):"ls -l $userstate"); # for the logs sub checkmode { my $fname = shift; @@ -31,12 +33,12 @@ return (($mode & 0777) == 0644); } -ok checkmode "log/user_state/awl"; # DB_File -ok checkmode "log/user_state/awl.dir"; # SDBM -ok checkmode "log/user_state/awl.pag"; # SDBM -ok checkmode "log/user_state/awl.mutex"; - -unlink 'log/user_state/awl', - 'log/user_state/awl.dir', - 'log/user_state/awl.pag'; -ok unlink 'log/user_state/awl.mutex'; +ok checkmode "$userstate/awl"; # DB_File +ok checkmode "$userstate/awl.dir"; # SDBM +ok checkmode "$userstate/awl.pag"; # SDBM +ok checkmode "$userstate/awl.mutex"; + +unlink "$userstate/awl", + "$userstate/awl.dir", + "$userstate/awl.pag"; +ok unlink "$userstate/awl.mutex"; diff -Nru spamassassin-3.4.6/t/db_awl_perms_welcome_block.t spamassassin-4.0.0~rc3/t/db_awl_perms_welcome_block.t --- spamassassin-3.4.6/t/db_awl_perms_welcome_block.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/db_awl_perms_welcome_block.t 2022-06-15 21:57:36.000000000 +0000 @@ -0,0 +1,44 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("db_awl_perms_welcome_block"); +use IO::File; +use Test::More; +plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS; +plan tests => 5; + +# --------------------------------------------------------------------------- +# bug 6173 + +tstprefs (" + use_auto_welcomelist 1 + auto_welcomelist_path ./$userstate/awl + auto_welcomelist_file_mode 0755 + lock_method flock +"); + +unlink "$userstate/awl"; +unlink "$userstate/awl.mutex"; +umask 022; +sarun("--add-addr-to-welcomelist whitelist_test\@example.org", + \&patterns_run_cb); + +# in case this test is ever made to work on Windows +untaint_system($RUNNING_ON_WINDOWS?("dir " . File::Spec->canonpath($userstate)):"ls -l $userstate"); # for the logs + +sub checkmode { + my $fname = shift; + if (!-f $fname) { return 1; } + my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size) = stat $fname; + return (($mode & 0777) == 0644); +} + +ok checkmode "$userstate/awl"; # DB_File +ok checkmode "$userstate/awl.dir"; # SDBM +ok checkmode "$userstate/awl.pag"; # SDBM +ok checkmode "$userstate/awl.mutex"; + +unlink "$userstate/awl", + "$userstate/awl.dir", + "$userstate/awl.pag"; +ok unlink "$userstate/awl.mutex"; diff -Nru spamassassin-3.4.6/t/db_based_welcomelist_ips.t spamassassin-4.0.0~rc3/t/db_based_welcomelist_ips.t --- spamassassin-3.4.6/t/db_based_welcomelist_ips.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/db_based_welcomelist_ips.t 2022-04-23 12:18:23.000000000 +0000 @@ -0,0 +1,36 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; + +use SATest; sa_t_init("db_based_welcomelist_ips"); + +use Test::More; +plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); +plan tests => 8; + +# --------------------------------------------------------------------------- + +%is_nonspam_patterns = ( + q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj', +); +%is_spam_patterns = ( + q{ X-Spam-Status: Yes}, 'status', +); + +%patterns = %is_nonspam_patterns; + +ok (sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); + +# 3 times, to get into the welcomelist: +ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb)); +ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb)); +ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb)); + +# Now check +ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb)); +ok_all_patterns(); + +%patterns = %is_spam_patterns; +ok (sarun ("-L -t < data/spam/007", \&patterns_run_cb)); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/db_based_welcomelist.t spamassassin-4.0.0~rc3/t/db_based_welcomelist.t --- spamassassin-3.4.6/t/db_based_welcomelist.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/db_based_welcomelist.t 2022-04-23 12:18:23.000000000 +0000 @@ -0,0 +1,36 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; + +use SATest; sa_t_init("db_based_welcomelist"); + +use Test::More; +plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); +plan tests => 8; + +# --------------------------------------------------------------------------- + +%is_nonspam_patterns = ( + q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj', +); +%is_spam_patterns = ( + q{Subject: 4000 Your Vacation Winning !}, 'subj', +); + +%patterns = %is_nonspam_patterns; + +ok (sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); + +# 3 times, to get into the welcomelist: +ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb)); +ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb)); +ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb)); + +# Now check +ok (sarun ("-L -t < data/nice/002", \&patterns_run_cb)); +ok_all_patterns(); + +%patterns = %is_spam_patterns; +ok (sarun ("-L -t < data/spam/004", \&patterns_run_cb)); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/db_based_whitelist_ips.t spamassassin-4.0.0~rc3/t/db_based_whitelist_ips.t --- spamassassin-3.4.6/t/db_based_whitelist_ips.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/db_based_whitelist_ips.t 2021-04-12 07:43:12.000000000 +0000 @@ -11,10 +11,10 @@ # --------------------------------------------------------------------------- %is_nonspam_patterns = ( -q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj', + q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj', ); %is_spam_patterns = ( -q{ X-Spam-Status: Yes}, 'status', + q{ X-Spam-Status: Yes}, 'status', ); %patterns = %is_nonspam_patterns; diff -Nru spamassassin-3.4.6/t/db_based_whitelist.t spamassassin-4.0.0~rc3/t/db_based_whitelist.t --- spamassassin-3.4.6/t/db_based_whitelist.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/db_based_whitelist.t 2021-04-12 07:43:12.000000000 +0000 @@ -11,10 +11,10 @@ # --------------------------------------------------------------------------- %is_nonspam_patterns = ( -q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj', + q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj', ); %is_spam_patterns = ( -q{Subject: 4000 Your Vacation Winning !}, 'subj', + q{Subject: 4000 Your Vacation Winning !}, 'subj', ); %patterns = %is_nonspam_patterns; @@ -33,3 +33,4 @@ %patterns = %is_spam_patterns; ok (sarun ("-L -t < data/spam/004", \&patterns_run_cb)); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/dcc.t spamassassin-4.0.0~rc3/t/dcc.t --- spamassassin-3.4.6/t/dcc.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/dcc.t 2022-06-09 02:12:54.000000000 +0000 @@ -3,13 +3,14 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("dcc"); -use constant HAS_DCC => eval { $_ = untaint_cmd("which cdcc"); chomp; -x }; +use constant HAS_DCC => !$RUNNING_ON_WINDOWS && eval { $_ = untaint_cmd("which cdcc"); chomp; -x }; use Test::More; +plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS; plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); plan skip_all => "DCC tests disabled" unless conf_bool('run_dcc_tests'); plan skip_all => "DCC executable not found in path" unless HAS_DCC; -plan tests => 4; +plan tests => 16; diag('Note: Failure may not be an SpamAssassin bug, as DCC tests can fail due to problems with the DCC servers.'); @@ -17,26 +18,48 @@ # --------------------------------------------------------------------------- %patterns = ( - q{ spam reported to DCC }, 'dcc report', - ); -tstpre (" - - loadplugin Mail::SpamAssassin::Plugin::DCC - dcc_timeout 30 - +tstprefs (" + full DCC_CHECK eval:check_dcc() + tflags DCC_CHECK net autolearn_body + priority DCC_CHECK 10 + dns_available no + use_dcc 1 + meta X_META_POS DCC_CHECK + meta X_META_NEG !DCC_CHECK + score DCC_CHECK 3.3 + score X_META_POS 3.3 + score X_META_NEG 3.3 "); ok sarun ("-t -D info -r < data/spam/gtubedcc.eml 2>&1", \&patterns_run_cb); ok_all_patterns(); +ok sarun ("-t -D info -r < data/spam/gtubedcc_crlf.eml 2>&1", \&patterns_run_cb); +ok_all_patterns(); %patterns = ( + q{ 3.3 DCC_CHECK }, 'dcc', + q{ 3.3 X_META_POS }, 'pos', +); +%anti_patterns = ( + q{ X_META_NEG }, 'neg', +); - q{ Detected as bulk mail by DCC }, 'dcc', +ok sarun ("-t < data/spam/gtubedcc.eml 2>&1", \&patterns_run_cb); +ok_all_patterns(); +ok sarun ("-t < data/spam/gtubedcc_crlf.eml 2>&1", \&patterns_run_cb); +ok_all_patterns(); +# Local only, metas should not hit as no queries are made +%patterns = ( ); - -ok sarun ("-t < data/spam/gtubedcc.eml", \&patterns_run_cb); +%anti_patterns = ( + q{ DCC_CHECK }, 'dcc', + q{ X_META_POS }, 'pos', + q{ X_META_NEG }, 'neg', +); +ok sarun ("-t -L < data/spam/gtubedcc.eml 2>&1", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/debug.t spamassassin-4.0.0~rc3/t/debug.t --- spamassassin-3.4.6/t/debug.t 2020-01-14 06:12:47.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/debug.t 2022-05-04 13:39:36.000000000 +0000 @@ -1,20 +1,5 @@ #!/usr/bin/perl -w -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; use lib '.'; use lib 't'; use SATest; sa_t_init("debug"); @@ -22,19 +7,20 @@ use Mail::SpamAssassin; use Test::More; -plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan tests => 3; # list of known debug facilities my %facility = map( ($_, 1), - qw( accessdb archive-iterator async auto-whitelist bayes check config daemon - dcc dkim askdns dns eval generic https_http_mismatch facility FreeMail - hashcash ident ignore info ldap learn locker log logger markup HashBL + qw( accessdb archive-iterator async auto-welcomelist bayes check config daemon + dcc dkim askdns dns dnseval eval generic https_http_mismatch facility FreeMail + ident ignore info ldap learn locker log logger markup HashBL message metadata mimeheader netset plugin prefork progress pyzor razor2 received-header replacetags reporter rules rules-all spamd spf textcat - timing TxRep uri uridnsbl util pdfinfo asn )); + timing TxRep uri uridnsbl util pdfinfo asn geodb FromNameSpoof + PHISHTAG resourcelimits https_http_mismatch DMARC )); my $fh = IO::File->new_tmpfile(); +open(OLDERR, ">&STDERR"); open(STDERR, ">&=".fileno($fh)) || die "Cannot reopen STDERR"; ok(sarun("-t -D < data/spam/dnsbl.eml")); @@ -56,7 +42,7 @@ if (/^(?: \[ \d+ \] \s+)? (dbg|info): \s* ([^:\s]+) : \s* (.*)/x) { if (!exists $facility{$2}) { $unlisted++; - print "unlisted debug facility: $2\n"; + print OLDERR "unlisted debug facility: $2\n"; } } elsif (/^(?: \[ \d+ \] \s+)? (warn|error):/x) { diff -Nru spamassassin-3.4.6/t/decodeshorturl.t spamassassin-4.0.0~rc3/t/decodeshorturl.t --- spamassassin-3.4.6/t/decodeshorturl.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/decodeshorturl.t 2022-07-14 04:24:51.000000000 +0000 @@ -0,0 +1,109 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("decodeshorturl"); + +use Test::More; + +use constant HAS_DBI => eval { require DBI; }; +use constant HAS_DBD_SQLITE => eval { require DBD::SQLite; DBD::SQLite->VERSION(1.59_01); }; + +use constant SQLITE => (HAS_DBI && HAS_DBD_SQLITE); + +plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); +my $tests = 7; +$tests += 4 if (SQLITE); +plan tests => $tests; + +tstpre (" +loadplugin Mail::SpamAssassin::Plugin::DecodeShortURLs +"); + +tstprefs(q{ +dns_query_restriction allow bit.ly +dns_query_restriction allow tinyurl.com + +clear_url_shortener +url_shortener tinyurl.com +url_shortener .page.link +url_shortener_get bit.ly + +body HAS_SHORT_URL eval:short_url() +body HAS_SHORT_REDIR eval:short_url_redir() +body SHORT_URL_CHAINED eval:short_url_chained() +body SHORT_URL_404 eval:short_url_404() +body SHORT_URL_C404 eval:short_url_code('404') +uri URI_PAGE_LINK m,^http://activity\.wps\.com/, +}); + +### +### Basic functions, no caching +### + +%patterns = ( + q{ 1.0 HAS_SHORT_URL } => '', + q{ 1.0 HAS_SHORT_REDIR } => '', + q{ 1.0 SHORT_URL_404 } => '', + q{ 1.0 SHORT_URL_C404 } => '', + q{ 1.0 URI_PAGE_LINK } => '', +); +sarun ("-t < data/spam/decodeshorturl/base.eml", \&patterns_run_cb); +ok_all_patterns(); + +%patterns = ( + q{ 1.0 SHORT_URL_CHAINED } => '', +); +sarun ("-t < data/spam/decodeshorturl/chain.eml", \&patterns_run_cb); +ok_all_patterns(); + + +### +### short_url() should hit even without network enabled +### + +%patterns = ( + q{ 1.0 HAS_SHORT_URL } => '', +); +sarun ("-t -L < data/spam/decodeshorturl/base.eml", \&patterns_run_cb); +ok_all_patterns(); + +### +### With SQLITE caching +### + +if (SQLITE) { + +tstprefs(" +dns_query_restriction allow bit.ly +dns_query_restriction allow tinyurl.com + +url_shortener bit.ly +url_shortener tinyurl.com + +url_shortener_cache_type dbi +url_shortener_cache_dsn dbi:SQLite:dbname=$workdir/DecodeShortURLs.db + +body HAS_SHORT_URL eval:short_url() +describe HAS_SHORT_URL Message contains one or more shortened URLs +"); + +%patterns = ( + q{ 1.0 HAS_SHORT_URL } => '', +); +sarun ("-t < data/spam/decodeshorturl/base.eml", \&patterns_run_cb); +ok_all_patterns(); + +my $dbh = DBI->connect("dbi:SQLite:dbname=$workdir/DecodeShortURLs.db","",""); +my @row = $dbh->selectrow_array("SELECT decoded_url FROM short_url_cache WHERE short_url = 'http://bit.ly/30yH6WK'"); +is($row[0], 'http://spamassassin.apache.org/'); + +# Check another email to cleanup old entries from database +sarun ("-t < data/spam/decodeshorturl/base2.eml", \&patterns_run_cb); +ok_all_patterns(); + +$dbh = DBI->connect("dbi:SQLite:dbname=$workdir/DecodeShortURLs.db","",""); +@row = $dbh->selectrow_array("SELECT decoded_url FROM short_url_cache WHERE short_url = 'http://bit.ly/30yH6WK'"); +isnt($row[0], 'https://spamassassin.apache.org/'); + +} + diff -Nru spamassassin-3.4.6/t/desc_wrap.t spamassassin-4.0.0~rc3/t/desc_wrap.t --- spamassassin-3.4.6/t/desc_wrap.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/desc_wrap.t 2021-04-12 07:43:12.000000000 +0000 @@ -16,13 +16,9 @@ ); tstprefs (" - $default_cf_lines - - report_safe 1 - header THIS_IS_A_VERY_LONG_RULE_NAME_WHICH_NEEDS_WRAP Subject =~ /FREE/ - - describe THIS_IS_A_VERY_LONG_RULE_NAME_WHICH_NEEDS_WRAP A very very long rule name and this is a very very long description lorem ipsum etc. blah blah blah blah This mailing is done by an independent marketing co. We apologize if this message has reached you in error. Save the Planet, Save the Trees! Advertise via E mail. No wasted paper! Delete with one simple keystroke! - + report_safe 1 + header THIS_IS_A_VERY_LONG_RULE_NAME_WHICH_NEEDS_WRAP Subject =~ /FREE/ + describe THIS_IS_A_VERY_LONG_RULE_NAME_WHICH_NEEDS_WRAP A very very long rule name and this is a very very long description lorem ipsum etc. blah blah blah blah This mailing is done by an independent marketing co. We apologize if this message has reached you in error. Save the Planet, Save the Trees! Advertise via E mail. No wasted paper! Delete with one simple keystroke! "); ok (sarun ("-L -t < data/spam/001", \&patterns_run_cb)); @@ -39,13 +35,9 @@ ok ($matched_output =~ /^ .{0,60}keystroke!/m); tstprefs (" - $default_cf_lines - - report_safe 0 - header THIS_IS_A_VERY_LONG_RULE_NAME_WHICH_NEEDS_WRAP Subject =~ /FREE/ - - describe THIS_IS_A_VERY_LONG_RULE_NAME_WHICH_NEEDS_WRAP A very very long rule name and this is a very very long description lorem ipsum etc. blah blah blah blah This mailing is done by an independent marketing co. We apologize if this message has reached you in error. Save the Planet, Save the Trees! Advertise via E mail. No wasted paper! Delete with one simple keystroke! - + report_safe 0 + header THIS_IS_A_VERY_LONG_RULE_NAME_WHICH_NEEDS_WRAP Subject =~ /FREE/ + describe THIS_IS_A_VERY_LONG_RULE_NAME_WHICH_NEEDS_WRAP A very very long rule name and this is a very very long description lorem ipsum etc. blah blah blah blah This mailing is done by an independent marketing co. We apologize if this message has reached you in error. Save the Planet, Save the Trees! Advertise via E mail. No wasted paper! Delete with one simple keystroke! "); ok (sarun ("-L -t < data/spam/001", \&patterns_run_cb)); @@ -56,4 +48,3 @@ ok ($matched_output =~ /^\s+\* .{0,60}very very/m); ok ($matched_output =~ /^\s+\* .{0,60}keystroke!/m); - diff -Nru spamassassin-3.4.6/t/dkim.t spamassassin-4.0.0~rc3/t/dkim.t --- spamassassin-3.4.6/t/dkim.t 2020-07-09 21:59:24.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/dkim.t 2022-05-04 11:06:22.000000000 +0000 @@ -12,7 +12,7 @@ use constant HAS_DKIM_VERIFIER => eval { require Mail::DKIM::Verifier; - version->parse(Mail::DKIM::Verifier->VERSION) >= version->parse->(0.31); + version->parse(Mail::DKIM::Verifier->VERSION) >= version->parse(0.31); }; use Test::More; @@ -20,21 +20,6 @@ plan skip_all => "Needs Mail::DKIM::Verifier >= 0.31" unless HAS_DKIM_VERIFIER ; plan tests => 258; -BEGIN { - if (-e 't/test_dir') { - chdir 't'; - } - - if (-e 'test_dir') { - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use IO::File; use Mail::SpamAssassin; @@ -85,6 +70,22 @@ # ensure rules will fire, and disable some expensive ones tstlocalrules(" + full DKIM_SIGNED eval:check_dkim_signed() + full DKIM_VALID eval:check_dkim_valid() + full DKIM_VALID_AU eval:check_dkim_valid_author_sig() + meta DKIM_INVALID DKIM_SIGNED && !DKIM_VALID + header DKIM_ADSP_NXDOMAIN eval:check_dkim_adsp('N') + header DKIM_ADSP_DISCARD eval:check_dkim_adsp('D') + header DKIM_ADSP_ALL eval:check_dkim_adsp('A') + header DKIM_ADSP_CUSTOM_LOW eval:check_dkim_adsp('1') + header DKIM_ADSP_CUSTOM_MED eval:check_dkim_adsp('2') + header DKIM_ADSP_CUSTOM_HIGH eval:check_dkim_adsp('3') + adsp_override sa-test-nxd.spamassassin.org nxdomain + adsp_override sa-test-unk.spamassassin.org unknown + adsp_override sa-test-all.spamassassin.org all + adsp_override sa-test-dis.spamassassin.org discardable + adsp_override sa-test-di2.spamassassin.org + dkim_minimum_key_bits 512 score DKIM_SIGNED -0.1 score DKIM_VALID -0.1 @@ -99,18 +100,14 @@ header DKIM_ADSP_SEL_TEST eval:check_dkim_adsp('*', .spamassassin.org) priority DKIM_ADSP_SEL_TEST -100 score DKIM_ADSP_SEL_TEST 0.1 - score RAZOR2_CHECK 0 - score RAZOR2_CF_RANGE_51_100 0 - score RAZOR2_CF_RANGE_E4_51_100 0 - score RAZOR2_CF_RANGE_E8_51_100 0 "); my $dirname = "data/dkim"; $spamassassin_obj = Mail::SpamAssassin->new({ - rules_filename => "$prefix/t/log/test_rules_copy", - site_rules_filename => "$prefix/t/log/localrules.tmp", - userprefs_filename => "$prefix/masses/spamassassin/user_prefs", + rules_filename => $localrules, + site_rules_filename => $siterules, + userprefs_filename => $userrules, dont_copy_prefs => 1, require_rules => 1, # debug => 'dkim', diff -Nru spamassassin-3.4.6/t/dmarc.t spamassassin-4.0.0~rc3/t/dmarc.t --- spamassassin-3.4.6/t/dmarc.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/dmarc.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,136 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("dmarc"); + +use Test::More; + +use vars qw(%patterns %anti_patterns); + +use constant HAS_MAILSPF => eval { require Mail::SPF; }; +use constant HAS_DKIM_VERIFIER => eval { + require Mail::DKIM::Verifier; + version->parse(Mail::DKIM::Verifier->VERSION) >= version->parse(0.31); +}; +use constant HAS_MAILDMARC => eval { require Mail::DMARC::PurePerl; }; + +plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); +plan skip_all => "Needs Mail::SPF" unless HAS_MAILSPF; +plan skip_all => "Needs Mail::DMARC::PurePerl" unless HAS_MAILDMARC; +plan skip_all => "Needs Mail::DKIM::Verifier >= 0.31" unless HAS_DKIM_VERIFIER ; +plan tests => 18; + +tstprefs(" + +header SPF_PASS eval:check_for_spf_pass() +tflags SPF_PASS nice userconf net +full DKIM_SIGNED eval:check_dkim_signed() +tflags DKIM_SIGNED net + +# Check that rename backwards compatibility works with if's +ifplugin Mail::SpamAssassin::Plugin::Dmarc +if plugin ( Mail::SpamAssassin::Plugin::Dmarc) +ifplugin Mail::SpamAssassin::Plugin::DMARC + +header DMARC_PASS eval:check_dmarc_pass() +tflags DMARC_PASS net + +header DMARC_NONE eval:check_dmarc_none() +tflags DMARC_NONE net + +header DMARC_QUAR eval:check_dmarc_quarantine() +tflags DMARC_QUAR net + +header DMARC_REJECT eval:check_dmarc_reject() +tflags DMARC_REJECT net + +header DMARC_MISSING eval:check_dmarc_missing() +tflags DMARC_MISSING net + +endif +endif +endif +"); + +## +## PASS +## + +%patterns = ( + q{ DMARC_PASS } => '', +); +%anti_patterns = ( + qr/DMARC_(?!PASS)/ => '', +); + +sarun ("-t < data/nice/dmarc/noneok.eml", \&patterns_run_cb); +ok_all_patterns(); + +sarun ("-t < data/nice/dmarc/quarok.eml", \&patterns_run_cb); +ok_all_patterns(); + +sarun ("-t < data/nice/dmarc/rejectok.eml", \&patterns_run_cb); +ok_all_patterns(); + +sarun ("-t < data/nice/dmarc/strictrejectok.eml", \&patterns_run_cb); +ok_all_patterns(); + +## +## REJECT +## + +%patterns = ( + q{ DMARC_REJECT } => '', +); +%anti_patterns = ( + qr/DMARC_(?!REJECT)/ => '', +); + +sarun ("-t < data/spam/dmarc/rejectko.eml", \&patterns_run_cb); +ok_all_patterns(); + +sarun ("-t < data/spam/dmarc/strictrejectko.eml", \&patterns_run_cb); +ok_all_patterns(); + +## +## QUAR +## + +%patterns = ( + q{ DMARC_QUAR } => '', +); +%anti_patterns = ( + qr/DMARC_(?!QUAR)/ => '', +); + +sarun ("-t < data/spam/dmarc/quarko.eml", \&patterns_run_cb); +ok_all_patterns(); + +## +## NONE +## + +%patterns = ( + q{ DMARC_NONE } => '', +); +%anti_patterns = ( + qr/DMARC_(?!NONE)/ => '', +); + +sarun ("-t < data/spam/dmarc/noneko.eml", \&patterns_run_cb); +ok_all_patterns(); + +## +## MISSING +## + +%patterns = ( + q{ DMARC_MISSING } => '', +); +%anti_patterns = ( + qr/DMARC_(?!MISSING)/ => '', +); + +sarun ("-t < data/spam/dmarc/nodmarc.eml", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/dnsbl_sc_meta.t spamassassin-4.0.0~rc3/t/dnsbl_sc_meta.t --- spamassassin-3.4.6/t/dnsbl_sc_meta.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/dnsbl_sc_meta.t 2022-05-28 10:38:25.000000000 +0000 @@ -11,8 +11,8 @@ # --------------------------------------------------------------------------- %patterns = ( - q{ DNSBL_TEST_TOP } => 'DNSBL_TEST_TOP', - q{ SC_DNSBL } => 'SC_DNSBL', + q{ 1.0 DNSBL_TEST_TOP } => 'DNSBL_TEST_TOP', + q{ 1.0 SC_DNSBL } => 'SC_DNSBL', ); %anti_patterns = ( diff -Nru spamassassin-3.4.6/t/dnsbl_subtests.t spamassassin-4.0.0~rc3/t/dnsbl_subtests.t --- spamassassin-3.4.6/t/dnsbl_subtests.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/dnsbl_subtests.t 2022-09-01 00:29:49.000000000 +0000 @@ -10,25 +10,14 @@ use SATest; sa_t_init("dnsbl_subtests"); use vars qw(%patterns %anti_patterns); -use Test::More tests => 46; +use Test::More; -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} +use Errno qw(EADDRINUSE EACCES); -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} +use constant HAS_NET_DNS_NAMESERVER => eval { require Net::DNS::Nameserver; }; +plan skip_all => "Net::DNS::Nameserver in unavailable on this system" unless (HAS_NET_DNS_NAMESERVER); +plan tests => 46; -use Errno qw(EADDRINUSE EACCES); -use Net::DNS::Nameserver; use Mail::SpamAssassin; # Bug 5761 (no 127.0.0.1 in jail, use SPAMD_LOCALHOST if specified) @@ -332,10 +321,10 @@ sleep 1; $spamassassin_obj = Mail::SpamAssassin->new({ - rules_filename => "$prefix/t/log/test_rules_copy", + rules_filename => $localrules, require_rules => 1, - site_rules_filename => "$prefix/t/log/localrules.tmp", - userprefs_filename => "$prefix/masses/spamassassin/user_prefs", + site_rules_filename => $siterules, + userprefs_filename => $userrules, post_config_text => $local_conf, dont_copy_prefs => 1, # debug => 'dns,async,uridnsbl', diff -Nru spamassassin-3.4.6/t/dnsbl.t spamassassin-4.0.0~rc3/t/dnsbl.t --- spamassassin-3.4.6/t/dnsbl.t 2019-10-13 19:49:26.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/dnsbl.t 2022-05-28 11:43:13.000000000 +0000 @@ -1,13 +1,15 @@ #!/usr/bin/perl -T use lib '.'; use lib 't'; -use SATest; sa_t_init("dns"); +use SATest; sa_t_init("dnsbl"); use Test::More; -plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely(); -plan tests => 18; + +# run many times to catch some random natured failures +my $iterations = 5; +plan tests => 22 * $iterations; # --------------------------------------------------------------------------- # bind configuration currently used to support this test @@ -48,27 +50,31 @@ # hits we expect and some hits we don't expect %patterns = ( - q{ [127.0.0.2] } => 'P_1', - q{ [127.0.0.4] } => 'P_2', - q{ [127.0.0.12] } => 'P_3', - q{ [127.0.0.1] } => 'P_4', - q{ [127.0.0.1] } => 'P_5', - q{ [127.0.0.2] } => 'P_6', - q{,DNSBL_TEST_TOP,} => 'P_8', - q{,DNSBL_TEST_WHITELIST,} => 'P_9', - q{,DNSBL_TEST_DYNAMIC,} => 'P_10', - q{,DNSBL_TEST_SPAM,} => 'P_11', - q{,DNSBL_TEST_RELAY,} => 'P_12', - q{,DNSBL_TXT_TOP,} => 'P_13', - q{,DNSBL_TXT_RE,} => 'P_14', - q{,DNSBL_RHS,} => 'P_15', + ' [127.0.0.2]' => '', + ' [127.0.0.4]' => '', + ' [127.0.0.12]' => '', + ' [127.0.0.1]' => '', + ' [127.0.0.1]' => '', + ' [127.0.0.2]' => '', + ' 1.0 DNSBL_TEST_TOP ' => '', + ' -1.0 DNSBL_TEST_WHITELIST ' => '', + ' 1.0 DNSBL_TEST_DYNAMIC ' => '', + ' 1.0 DNSBL_TEST_SPAM ' => '', + ' 1.0 DNSBL_TEST_RELAY ' => '', + ' 1.0 DNSBL_TXT_TOP ' => '', + ' 1.0 DNSBL_TXT_RE ' => '', + ' 1.0 DNSBL_RHS ' => '', + ' 1.0 META_DNSBL_A ' => '', + ' 1.0 META_DNSBL_B ' => '', + ' 1.0 META_DNSBL_C ' => '', ); %anti_patterns = ( - q{,DNSBL_TEST_MISS,} => 'P_19', - q{,DNSBL_TXT_MISS,} => 'P_20', - q{,DNSBL_TEST_WHITELIST_MISS,} => 'P_21', - q{ launching DNS A query for 14.35.17.212.untrusted.dnsbltest.spamassassin.org. } => 'untrusted', + ' 1.0 DNSBL_TEST_MISS ' => '', + ' 1.0 DNSBL_TXT_MISS ' => '', + ' 1.0 DNSBL_TEST_WHITELIST_MISS ' => '', + '14.35.17.212.untrusted.dnsbltest.spamassassin.org' => '', + qr/rules-all: unrun dependencies [^\n]+ (?:__|META_)?DNSBL_/ => '', ); tstprefs(" @@ -83,13 +89,9 @@ add_header all Untrusted _RELAYSUNTRUSTED_ clear_trusted_networks -trusted_networks 127. trusted_networks 10. trusted_networks 150.51.53.1 -# make ,DNSBL, pattern matches work (never allow it first in the tests= list) -meta AAA 1 - header DNSBL_TEST_TOP eval:check_rbl('test', 'dnsbltest.spamassassin.org.') describe DNSBL_TEST_TOP DNSBL A record match tflags DNSBL_TEST_TOP net @@ -138,8 +140,22 @@ describe DNSBL_RHS DNSBL RHS match tflags DNSBL_RHS net +# Bug 7897 - test that meta rules depending on net rules hit +meta META_DNSBL_A DNSBL_TEST_DYNAMIC +# It also needs to hit even if priority is lower than dnsbl (-100) +meta META_DNSBL_B DNSBL_TEST_SPAM +priority META_DNSBL_B -500 +# Or super high +meta META_DNSBL_C DNSBL_TEST_RELAY +priority META_DNSBL_C 2000 +priority DNSBL_TEST_RELAY 2000 + "); -# The -D clobbers test performance but some patterns & antipatterns depend on debug output -sarun ("-D -t < data/spam/dnsbl.eml 2>&1", \&patterns_run_cb); -ok_all_patterns(); +for (1 .. $iterations) { + clear_localrules() if $_ == 3; # do some tests without any other rules to check meta bugs + # rules-all debug needed for unrun check + sarun ("-t -D rules-all < data/spam/dnsbl.eml 2>&1", \&patterns_run_cb); + ok_all_patterns(); +} + diff -Nru spamassassin-3.4.6/t/duplicates.t spamassassin-4.0.0~rc3/t/duplicates.t --- spamassassin-3.4.6/t/duplicates.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/duplicates.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -#!/usr/bin/perl -T - -use lib '.'; use lib 't'; -use SATest; sa_t_init("duplicates"); -use Test::More tests => 21; - -$ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C'; # a cheat, but we need the patterns to work - -# --------------------------------------------------------------------------- - -%patterns = ( - - q{ FOO1 } => '', # use default names - q{ FOO2 } => '', - q{ HDR1 } => '', - q{ HDR2 } => '', - q{ META1 } => '', - q{ META2 } => '', - q{ META3 } => '', - q{ HDREVAL1 } => '', - q{ HDREVAL2 } => '', - q{ ran body rule FOO1 ======> got hit } => '', - q{ ran header rule HDR1 ======> got hit } => '', - q{ rules: FOO1 merged duplicates: FOO2 } => '', - q{ rules: HDR1 merged duplicates: HDR2 } => '', - q{ rules: META3 merged duplicates: META1 } => '', - q{ ran eval rule HDREVAL1 ======> got hit } => '', - q{ ran eval rule HDREVAL2 ======> got hit } => '', -); - -%anti_patterns = ( - - q{ FOO3 } => '', - q{ RAWFOO } => '', - q{ ran body rule FOO2 ======> got hit } => '', - q{ ran header rule HDR2 ======> got hit } => '', - -); - -tstprefs (qq{ - - $default_cf_lines - - loadplugin Mail::SpamAssassin::Plugin::Test - - body FOO1 /click here and e= nter your/i - describe FOO1 Test rule - body FOO2 /click here and e= nter your/i - describe FOO2 Test rule - - # should not be found, not a dup (/i) - body FOO3 /click here and e= nter your/ - describe FOO3 Test rule - - # should not be found, not dup since different type - rawbody RAWFOO /click here and e= nter your/i - describe RAWFOO Test rule - - header HDR1 Subject =~ /stained/ - describe HDR1 Test rule - header HDR2 Subject =~ /stained/ - describe HDR2 Test rule - - # should not be merged -- eval rules (bug 5959) - header HDREVAL1 eval:check_test_plugin() - describe HDREVAL1 Test rule - header HDREVAL2 eval:check_test_plugin() - describe HDREVAL2 Test rule - - meta META1 (1) - describe META1 Test rule - meta META2 (META1 && META3) - describe META2 Test rule - meta META3 (1) - priority META3 -500 - describe META3 Test rule - -}); - -sarun ("-L -t -D < data/spam/006 2>&1", \&patterns_run_cb); -ok ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/enable_compat.t spamassassin-4.0.0~rc3/t/enable_compat.t --- spamassassin-3.4.6/t/enable_compat.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/enable_compat.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,44 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("enable_compat"); +use Test::More tests => 6; + +# --------------------------------------------------------------------------- + +%patterns = ( + q{ 1.0 ANY_RULE }, '', + q{ 1.0 COMPAT_RULE }, '', +); +%anti_patterns = (); + +tstprefs(" + enable_compat foo_testing + body ANY_RULE /./ + if can(Mail::SpamAssassin::Conf::compat_foo_testing) + body COMPAT_RULE /EVOLUTION/ + endif +"); + +ok (sarun ("-t -L < data/nice/001", \&patterns_run_cb)); +ok_all_patterns(); + +# --------------------------------------------------------------------------- + +%patterns = ( + q{ 1.0 ANY_RULE }, '', +); +%anti_patterns = ( + q{ COMPAT_RULE }, '', +); + +tstprefs(" + body ANY_RULE /./ + if can(Mail::SpamAssassin::Conf::compat_foo_testing) + body COMPAT_RULE /EVOLUTION/ + endif +"); + +ok (sarun ("-t -L < data/nice/001", \&patterns_run_cb)); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/extracttext.t spamassassin-4.0.0~rc3/t/extracttext.t --- spamassassin-3.4.6/t/extracttext.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/extracttext.t 2022-08-18 23:36:56.000000000 +0000 @@ -0,0 +1,75 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("extracttext"); +use Mail::SpamAssassin::Util; +use Test::More; + +use constant PDFTOTEXT => Mail::SpamAssassin::Util::find_executable_in_env_path('pdftotext'); +use constant TESSERACT => Mail::SpamAssassin::Util::find_executable_in_env_path('tesseract'); +use constant CAT => Mail::SpamAssassin::Util::find_executable_in_env_path('cat'); + +my $tests = 0; +$tests += 2 if (PDFTOTEXT); +$tests += 1 if (TESSERACT); +$tests += 1 if (CAT); +if ($tests && $tests < 4) { diag("some binaries missing, not running all tests\n"); } + +plan skip_all => "no needed binaries found, pdftotext, tesseract, or cat" unless $tests; +plan tests => $tests; + +%patterns_gtube = ( + q{ 1000 GTUBE }, 'gtube', +); + +if (PDFTOTEXT) { + tstprefs(" + extracttext_external pdftotext ".PDFTOTEXT." -nopgbrk -layout -enc UTF-8 {} - + extracttext_use pdftotext .pdf + extracttext_timeout 30 40 + "); + %anti_patterns = (); + %patterns = %patterns_gtube; + sarun ("-L -t < data/spam/extracttext/gtube_pdf.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); + + # Should fail + tstprefs(" + extracttext_external pdftotext ".PDFTOTEXT." -nopgbrk -layout -enc UTF-8 {} - + extracttext_use pdftotext .FOO + extracttext_timeout 30 40 + "); + %anti_patterns = %patterns_gtube; + %patterns = (); + sarun ("-L -t < data/spam/extracttext/gtube_pdf.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); +} + +if (TESSERACT) { + tstprefs(" + extracttext_external tesseract {OMP_THREAD_LIMIT=1} ".TESSERACT." -c page_separator= {} - + extracttext_use tesseract .jpg .png .bmp .tif .tiff image/(?:jpeg|png|x-ms-bmp|tiff) + extracttext_timeout 30 1 + "); + %anti_patterns = (); + %patterns = %patterns_gtube; + sarun ("-L -t < data/spam/extracttext/gtube_png.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); +} + +if (CAT) { + tstprefs(" + extracttext_external cat ".CAT." {} + extracttext_use cat .txt .html .shtml .xhtml octet/stream + extracttext_timeout 30 1 + "); + %anti_patterns = (); + %patterns = %patterns_gtube; + sarun ("-L -t < data/spam/extracttext/gtube_b64_oct.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); +} + diff -Nru spamassassin-3.4.6/t/freemail.t spamassassin-4.0.0~rc3/t/freemail.t --- spamassassin-3.4.6/t/freemail.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/freemail.t 2022-05-28 10:38:25.000000000 +0000 @@ -1,39 +1,51 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - use lib '.'; use lib 't'; use SATest; sa_t_init("freemail"); use Test::More; -plan tests => 4; +plan tests => 23; # --------------------------------------------------------------------------- -tstpre (" -loadplugin Mail::SpamAssassin::Plugin::FreeMail -"); - +# Global tstprefs (" - header FREEMAIL_FROM eval:check_freemail_from() - freemail_domains gmail.com - freemail_import_whitelist_auth 0 - whitelist_auth test\@gmail.com + freemail_domains gmail.com "); +## Standard + whitelist should not hit + +tstlocalrules (q{ + freemail_import_whitelist_auth 0 + whitelist_auth test@gmail.com + header FREEMAIL_FROM eval:check_freemail_from() + score FREEMAIL_FROM 3.3 + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 + header FREEMAIL_REPLYTO eval:check_freemail_replyto('replyto') + score FREEMAIL_REPLYTO 3.3 + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 + header FREEMAIL_ENVFROM_END_DIGIT eval:check_freemail_header('EnvelopeFrom', '\d@') + score FREEMAIL_ENVFROM_END_DIGIT 3.3 + header FREEMAIL_REPLYTO_END_DIGIT eval:check_freemail_header('Reply-To', '\d@') + score FREEMAIL_REPLYTO_END_DIGIT 3.3 + header FREEMAIL_HDR_REPLYTO eval:check_freemail_header('Reply-To') + score FREEMAIL_HDR_REPLYTO 3.3 +}); + %patterns = ( - q{ FREEMAIL_FROM }, 'FREEMAIL_FROM', - ); + q{ 3.3 FREEMAIL_FROM }, '', +); +%anti_patterns = ( + # No Reply-To or body + q{ FREEMAIL_REPLYTO }, '', + q{ FREEMAIL_REPLYXX }, '', + q{ FREEMAIL_ENVFROM_END_DIGIT }, '', + q{ FREEMAIL_REPLYTO_END_DIGIT }, '', + q{ FREEMAIL_HDR_REPLYTO }, '', +); ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); ok_all_patterns(); @@ -43,15 +55,85 @@ %patterns = (); %anti_patterns = ( - q{ FREEMAIL_FROM }, 'FREEMAIL_FROM', - ); + q{ FREEMAIL_FROM }, '', +); -tstprefs (" - header FREEMAIL_FROM eval:check_freemail_from() - freemail_domains gmail.com - freemail_import_whitelist_auth 1 - whitelist_auth test\@gmail.com -"); +tstlocalrules (q{ + freemail_import_whitelist_auth 1 + whitelist_auth test@gmail.com + header FREEMAIL_FROM eval:check_freemail_from() + score FREEMAIL_FROM 3.3 +}); ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); ok_all_patterns(); + +## From and Reply-To different + +%patterns = ( + q{ 3.3 FREEMAIL_FROM }, '', + q{ 3.3 FREEMAIL_REPLYTO }, '', + q{ 3.3 FREEMAIL_REPLYXX }, '', + q{ 3.3 FREEMAIL_ENVFROM_END_DIGIT }, '', + q{ 3.3 FREEMAIL_REPLYTO_END_DIGIT }, '', + q{ 3.3 FREEMAIL_HDR_REPLYTO }, '', +); +%anti_patterns = (); + +tstlocalrules (q{ + header FREEMAIL_FROM eval:check_freemail_from() + score FREEMAIL_FROM 3.3 + header FREEMAIL_REPLYTO eval:check_freemail_replyto('replyto') + score FREEMAIL_REPLYTO 3.3 + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 + header FREEMAIL_ENVFROM_END_DIGIT eval:check_freemail_header('EnvelopeFrom', '\d@') + score FREEMAIL_ENVFROM_END_DIGIT 3.3 + header FREEMAIL_REPLYTO_END_DIGIT eval:check_freemail_header('Reply-To', '\d@') + score FREEMAIL_REPLYTO_END_DIGIT 3.3 + header FREEMAIL_HDR_REPLYTO eval:check_freemail_header('Reply-To') + score FREEMAIL_HDR_REPLYTO 3.3 +}); + +ok sarun ("-L -t < data/spam/freemail1", \&patterns_run_cb); +ok_all_patterns(); + +## Multiple Reply-To values, no email on body + +%patterns = ( + q{ 3.3 FREEMAIL_REPLYTO }, '', + q{ 3.3 FREEMAIL_REPLYXX }, '', + q{ 3.3 FREEMAIL_REPLYTO_END_DIGIT }, '', + q{ 3.3 FREEMAIL_HDR_REPLYTO }, '', +); +%anti_patterns = (); + +tstlocalrules (q{ + header FREEMAIL_REPLYTO eval:check_freemail_replyto('replyto') + score FREEMAIL_REPLYTO 3.3 + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 + header FREEMAIL_REPLYTO_END_DIGIT eval:check_freemail_header('Reply-To', '\d@') + score FREEMAIL_REPLYTO_END_DIGIT 3.3 + header FREEMAIL_HDR_REPLYTO eval:check_freemail_header('Reply-To') + score FREEMAIL_HDR_REPLYTO 3.3 +}); + +ok sarun ("-L -t < data/spam/freemail2", \&patterns_run_cb); +ok_all_patterns(); + +## No Reply-To, another freemail in body + +%patterns = ( + q{ 3.3 FREEMAIL_REPLYXX }, '', +); +%anti_patterns = (); + +tstlocalrules (q{ + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 +}); + +ok sarun ("-L -t < data/spam/freemail3", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/freemail_welcome_block.t spamassassin-4.0.0~rc3/t/freemail_welcome_block.t --- spamassassin-3.4.6/t/freemail_welcome_block.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/freemail_welcome_block.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,139 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("freemail"); + +use Test::More; + +plan tests => 23; + +# --------------------------------------------------------------------------- + +# Global +tstprefs (" + freemail_domains gmail.com +"); + +## Standard + welcomelist should not hit + +tstlocalrules (q{ + freemail_import_welcomelist_auth 0 + welcomelist_auth test@gmail.com + header FREEMAIL_FROM eval:check_freemail_from() + score FREEMAIL_FROM 3.3 + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 + header FREEMAIL_REPLYTO eval:check_freemail_replyto('replyto') + score FREEMAIL_REPLYTO 3.3 + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 + header FREEMAIL_ENVFROM_END_DIGIT eval:check_freemail_header('EnvelopeFrom', '\d@') + score FREEMAIL_ENVFROM_END_DIGIT 3.3 + header FREEMAIL_REPLYTO_END_DIGIT eval:check_freemail_header('Reply-To', '\d@') + score FREEMAIL_REPLYTO_END_DIGIT 3.3 + header FREEMAIL_HDR_REPLYTO eval:check_freemail_header('Reply-To') + score FREEMAIL_HDR_REPLYTO 3.3 +}); + +%patterns = ( + q{ 3.3 FREEMAIL_FROM }, '', +); +%anti_patterns = ( + # No Reply-To or body + q{ FREEMAIL_REPLYTO }, '', + q{ FREEMAIL_REPLYXX }, '', + q{ FREEMAIL_ENVFROM_END_DIGIT }, '', + q{ FREEMAIL_REPLYTO_END_DIGIT }, '', + q{ FREEMAIL_HDR_REPLYTO }, '', +); + +ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); +ok_all_patterns(); +clear_pattern_counters(); + +## Now test with freemail_import_welcomelist_auth, should not hit + +%patterns = (); +%anti_patterns = ( + q{ FREEMAIL_FROM }, '', +); + +tstlocalrules (q{ + freemail_import_welcomelist_auth 1 + welcomelist_auth test@gmail.com + header FREEMAIL_FROM eval:check_freemail_from() + score FREEMAIL_FROM 3.3 +}); + +ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); +ok_all_patterns(); + +## From and Reply-To different + +%patterns = ( + q{ 3.3 FREEMAIL_FROM }, '', + q{ 3.3 FREEMAIL_REPLYTO }, '', + q{ 3.3 FREEMAIL_REPLYXX }, '', + q{ 3.3 FREEMAIL_ENVFROM_END_DIGIT }, '', + q{ 3.3 FREEMAIL_REPLYTO_END_DIGIT }, '', + q{ 3.3 FREEMAIL_HDR_REPLYTO }, '', +); +%anti_patterns = (); + +tstlocalrules (q{ + header FREEMAIL_FROM eval:check_freemail_from() + score FREEMAIL_FROM 3.3 + header FREEMAIL_REPLYTO eval:check_freemail_replyto('replyto') + score FREEMAIL_REPLYTO 3.3 + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 + header FREEMAIL_ENVFROM_END_DIGIT eval:check_freemail_header('EnvelopeFrom', '\d@') + score FREEMAIL_ENVFROM_END_DIGIT 3.3 + header FREEMAIL_REPLYTO_END_DIGIT eval:check_freemail_header('Reply-To', '\d@') + score FREEMAIL_REPLYTO_END_DIGIT 3.3 + header FREEMAIL_HDR_REPLYTO eval:check_freemail_header('Reply-To') + score FREEMAIL_HDR_REPLYTO 3.3 +}); + +ok sarun ("-L -t < data/spam/freemail1", \&patterns_run_cb); +ok_all_patterns(); + +## Multiple Reply-To values, no email on body + +%patterns = ( + q{ 3.3 FREEMAIL_REPLYTO }, '', + q{ 3.3 FREEMAIL_REPLYXX }, '', + q{ 3.3 FREEMAIL_REPLYTO_END_DIGIT }, '', + q{ 3.3 FREEMAIL_HDR_REPLYTO }, '', +); +%anti_patterns = (); + +tstlocalrules (q{ + header FREEMAIL_REPLYTO eval:check_freemail_replyto('replyto') + score FREEMAIL_REPLYTO 3.3 + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 + header FREEMAIL_REPLYTO_END_DIGIT eval:check_freemail_header('Reply-To', '\d@') + score FREEMAIL_REPLYTO_END_DIGIT 3.3 + header FREEMAIL_HDR_REPLYTO eval:check_freemail_header('Reply-To') + score FREEMAIL_HDR_REPLYTO 3.3 +}); + +ok sarun ("-L -t < data/spam/freemail2", \&patterns_run_cb); +ok_all_patterns(); + +## No Reply-To, another freemail in body + +%patterns = ( + q{ 3.3 FREEMAIL_REPLYXX }, '', +); +%anti_patterns = (); + +tstlocalrules (q{ + header FREEMAIL_REPLYXX eval:check_freemail_replyto('reply') + score FREEMAIL_REPLYXX 3.3 +}); + +ok sarun ("-L -t < data/spam/freemail3", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/fromnamespoof.t spamassassin-4.0.0~rc3/t/fromnamespoof.t --- spamassassin-3.4.6/t/fromnamespoof.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/fromnamespoof.t 2022-05-04 17:09:39.000000000 +0000 @@ -0,0 +1,30 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("fromnamespoof"); + +use Test::More; + +plan tests => 3; + +# --------------------------------------------------------------------------- + +tstpre (" +loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof +"); + +tstlocalrules (" + header FROMNAME_EQUALS_TO eval:check_fromname_equals_to() + score FROMNAME_EQUALS_TO 3.3 + + header FROMNAME_EQUALS_REPLYTO eval:check_fromname_equals_replyto() + score FROMNAME_EQUALS_REPLYTO 3.3 +"); + +%patterns = ( + q{ 3.3 FROMNAME_EQUALS_TO }, 'FROMNAME_EQUALS_TO', + q{ 3.3 FROMNAME_EQUALS_REPLYTO }, 'FROMNAME_EQUALS_REPLYTO', +); + +ok sarun ("-L -t < data/spam/fromnamespoof/spoof1", \&patterns_run_cb); +ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/get_all_headers.t spamassassin-4.0.0~rc3/t/get_all_headers.t --- spamassassin-3.4.6/t/get_all_headers.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/get_all_headers.t 2022-05-28 10:38:25.000000000 +0000 @@ -2,30 +2,53 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("get_all_headers"); -use Test::More tests => 5; +use Test::More; -# --------------------------------------------------------------------------- - -%patterns = ( +use constant HAS_EMAIL_ADDRESS_XS => eval { require Email::Address::XS; }; -q{ MIME-Version: 1.0 } => 'no-extra-space', +$tests = 19; +$tests += 19 if (HAS_EMAIL_ADDRESS_XS); +plan tests => $tests; -q{/text-all-raw: Received: from yahoo\.com\[\\\\n\] \(PPPa33-ResaleLosAngelesMetroB2-2R7452\.dialinx\.net \[4\.48\.136\.190\]\) by\[\\\\n\] www\.goabroad\.com\.cn \(8\.9\.3/8\.9\.3\) with SMTP id TAA96146; Thu,\[\\\\n\] 30 Aug 2001 19:06:45 \+0800 \(CST\) \(envelope-from\[\\\\n\] pertand\@email\.mondolink\.com\)\[\\\\n\]From :\[\\\\n\]X-Mailer: Mozilla 4\.04 \[en\]C-bls40 \(Win95; U\)\[\\\\n\]To: jenny33436\@netscape\.net\[\\\\n\]Subject: via\.gra\[\\\\n\]From:\[\\\\t\] \[\\\\n\]DATE: Fri, 7 Dec 2001 07:01:03\[\\\\n\]MIME-Version: 1\.0\[\\\\n\]Message-Id: <20011206235802\.4FD6F1143D6\@mail\.netnoteinc\.com>\[\\\\n\]Sender: travelincentives\@aol\.com\[\\\\n\]Content-Type: text/plain; charset="us-ascii"\[\\\\n\]/} => 'full-headers-raw', - -q{/text-all-noraw: Received: from yahoo\\.com \\(PPPa33-ResaleLosAngelesMetroB2-2R7452\\.dialinx\\.net \\[4\\.48\\.136\\.190\\]\\) by www\\.goabroad\\.com\\.cn \\(8\\.9\\.3/8\\.9\\.3\\) with SMTP id TAA96146; Thu, 30 Aug 2001 19:06:45 \\+0800 \\(CST\\) \\(envelope-from pertand\\@email\\.mondolink\\.com\\)\[\\\\n\]From: \[\\\\n\]X-Mailer: Mozilla 4\\.04 \\[en\\]C-bls40 \\(Win95; U\\)\[\\\\n\]To: jenny33436\\@netscape\\.net\[\\\\n\]Subject: via\\.gra\[\\\\n\]From: \[\\\\n\]DATE: Fri, 7 Dec 2001 07:01:03\[\\\\n\]MIME-Version: 1\\.0\[\\\\n\]Message-Id: <20011206235802\\.4FD6F1143D6\\@mail\\.netnoteinc\\.com>\[\\\\n\]Sender: travelincentives\\@aol\\.com\[\\\\n\]Content-Type: text/plain; charset="us-ascii"\[\\\\n\]/} => 'full-headers-noraw', +# --------------------------------------------------------------------------- +%patterns = ( + 'MIME-Version: 1.0' => 'no-extra-space', + 'scalar-text-all-raw: Received: from yahoo.com[\n] (PPPa33-ResaleLosAngelesMetroB2-2R7452.dialinx.net [4.48.136.190]) by[\n] www.goabroad.com.cn (8.9.3/8.9.3) with SMTP id TAA96146; Thu,[\n] 30 Aug 2001 19:06:45 +0800 (CST) (envelope-from[\n] pertand@email.mondolink.com)[\n]From :[\n]X-Mailer: Mozilla 4.04 [en]C-bls40 (Win95; U)[\n]To: jenny33436@netscape.net[\n]Subject: via.gra[\n]From:[\t] [\n]DATE: Fri, 7 Dec 2001 07:01:03[\n]MIME-Version: 1.0[\n]Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com>[\n]Sender: travelincentives@aol.com[\n]Content-Type: text/plain; charset="us-ascii"[\n][END]' => 'scalar-text-all-raw', + 'scalar-text-all-noraw: Received: from yahoo.com (PPPa33-ResaleLosAngelesMetroB2-2R7452.dialinx.net [4.48.136.190]) by www.goabroad.com.cn (8.9.3/8.9.3) with SMTP id TAA96146; Thu, 30 Aug 2001 19:06:45 +0800 (CST) (envelope-from pertand@email.mondolink.com)[\n]From: [\n]X-Mailer: Mozilla 4.04 [en]C-bls40 (Win95; U)[\n]To: jenny33436@netscape.net[\n]Subject: via.gra[\n]From: [\n]DATE: Fri, 7 Dec 2001 07:01:03[\n]MIME-Version: 1.0[\n]Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com>[\n]Sender: travelincentives@aol.com[\n]Content-Type: text/plain; charset="us-ascii"[\n][END]' => 'scalar-text-all-noraw', + 'scalar-text-from-raw: [\n][\t] [\n][END]' => 'scalar-text-from-raw', + 'scalar-text-from-noraw: [\n][\n][END]' => 'scalar-text-from-noraw', + 'scalar-text-from-addr: tst1@example.com[END]' => 'scalar-text-from-addr', + 'list-text-all-raw: Received: from yahoo.com[\n] (PPPa33-ResaleLosAngelesMetroB2-2R7452.dialinx.net [4.48.136.190]) by[\n] www.goabroad.com.cn (8.9.3/8.9.3) with SMTP id TAA96146; Thu,[\n] 30 Aug 2001 19:06:45 +0800 (CST) (envelope-from[\n] pertand@email.mondolink.com)[\n][LIST]From :[\n][LIST]X-Mailer: Mozilla 4.04 [en]C-bls40 (Win95; U)[\n][LIST]To: jenny33436@netscape.net[\n][LIST]Subject: via.gra[\n][LIST]From:[\t] [\n][LIST]DATE: Fri, 7 Dec 2001 07:01:03[\n][LIST]MIME-Version: 1.0[\n][LIST]Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com>[\n][LIST]Sender: travelincentives@aol.com[\n][LIST]Content-Type: text/plain; charset="us-ascii"[\n][END]' => 'list-text-all-raw', + 'list-text-all-noraw: Received: from yahoo.com (PPPa33-ResaleLosAngelesMetroB2-2R7452.dialinx.net [4.48.136.190]) by www.goabroad.com.cn (8.9.3/8.9.3) with SMTP id TAA96146; Thu, 30 Aug 2001 19:06:45 +0800 (CST) (envelope-from pertand@email.mondolink.com)[\n][LIST]From: [\n][LIST]X-Mailer: Mozilla 4.04 [en]C-bls40 (Win95; U)[\n][LIST]To: jenny33436@netscape.net[\n][LIST]Subject: via.gra[\n][LIST]From: [\n][LIST]DATE: Fri, 7 Dec 2001 07:01:03[\n][LIST]MIME-Version: 1.0[\n][LIST]Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com>[\n][LIST]Sender: travelincentives@aol.com[\n][LIST]Content-Type: text/plain; charset="us-ascii"[\n][END]' => 'list-text-all-noraw', + 'list-text-from-raw: [\n][LIST][\t] [\n][END]' => 'list-text-from-raw', + 'list-text-from-noraw: [\n][LIST][\n][END]' => 'list-text-from-noraw', + 'list-text-from-addr: tst1@example.com[LIST]tst2@example.com[END]' => 'list-text-from-addr', + 'list-text-from-first-addr: tst1@example.com[END]' => 'list-text-from-first-addr', + 'list-text-from-last-addr: tst2@example.com[END]' => 'list-text-from-last-addr', + 'list-text-msgid-host: mail.netnoteinc.com[END]' => 'list-text-msgid-host', + 'list-text-msgid-domain: netnoteinc.com[END]' => 'list-text-msgid-domain', + 'list-text-received-ip: 4.48.136.190[END]' => 'list-text-received-ip', + 'list-text-received-revip: 190.136.48.4[END]' => 'list-text-received-revip', ); %anti_patterns = ( - -q{/MIME-Version: 1\.0/} => 'extra-space' - + qr/MIME-Version: 1\.0/ => 'extra-space' ); -tstlocalrules (" - loadplugin Dumpheaders ../../data/Dumpheaders.pm +tstprefs (" + loadplugin Dumpheaders ../../../data/Dumpheaders.pm "); +# Internal parser +$ENV{'SA_HEADER_ADDRESS_PARSER'} = 1; ok (sarun ("-L -t < data/spam/008", \&patterns_run_cb)); ok_all_patterns(); +if (HAS_EMAIL_ADDRESS_XS) { + # Email::Address::XS + $ENV{'SA_HEADER_ADDRESS_PARSER'} = 2; + ok (sarun ("-L -t < data/spam/008", \&patterns_run_cb)); + ok_all_patterns(); +} else { warn "Not running Email::Address::XS tests, module missing\n"; } + diff -Nru spamassassin-3.4.6/t/get_headers.t spamassassin-4.0.0~rc3/t/get_headers.t --- spamassassin-3.4.6/t/get_headers.t 2019-09-20 14:13:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/get_headers.t 2021-04-30 18:17:51.000000000 +0000 @@ -1,46 +1,79 @@ #!/usr/bin/perl -w -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} +### +### UTF-8 CONTENT, edit with UTF-8 locale/editor +### use strict; use lib '.'; use lib 't'; use SATest; sa_t_init("get_headers"); +use Test::More; + use Mail::SpamAssassin; -use Test::More tests => 22; +use constant HAS_EMAIL_ADDRESS_XS => eval { require Email::Address::XS; }; + +my $tests = 52; +$tests *= 2 if (HAS_EMAIL_ADDRESS_XS); +plan tests => $tests; ############################################## # initialize SpamAssassin -my $sa = create_saobj({'dont_copy_prefs' => 1}); -$sa->init(0); -my $mail = $sa->parse( get_raw_headers()."\n\nBlah\n" ); -my $msg = Mail::SpamAssassin::PerMsgStatus->new($sa, $mail); +my ($sa,$mail,$pms); +sub new_saobj { + $pms->finish() if $pms; + $mail->finish() if $mail; + $sa->finish() if $sa; + undef $sa; undef $mail; undef $pms; + $sa = create_saobj({'dont_copy_prefs' => 1}); + $sa->init(0); + $mail = $sa->parse( get_raw_headers()."\n\nBlah\n" ); + $pms = Mail::SpamAssassin::PerMsgStatus->new($sa, $mail); +} sub try { my ($try, $expect) = @_; - my $result = $msg->get($try); - # undef might be valid in some situations, so deal with it... + my $result; + my @results = $pms->get($try); + if (!@results) { + $result = undef; + } else { + $result = join("\\n", @results); + } + + my $parser = $Mail::SpamAssassin::Util::header_address_parser == 1 ? + 'internal' : 'Email::Address::XS'; + + # Whitelist some differences + if ($parser eq 'Email::Address::XS') { + # try: Email::Address::XS: 'From5:addr' failed! expect: 'noreply@foobar.com\ninfo=foobar.com@mlsend.com' got: 'noreply@foobar.com' + return 1 if $try eq 'From5:addr' && $result eq 'noreply@foobar.com'; + # try: Email::Address::XS: 'From5:name' failed! expect: undef got: '=?UTF-8?Q? Foobar _' + return 1 if $try eq 'From5:name' && $result eq '=?UTF-8?Q? Foobar _'; + # try: Email::Address::XS: 'From9:name' failed! expect: 'Mr\nSpam' got: 'Mr, Spam \nSpam' + return 1 if $try eq 'From9:name' && $result eq 'Mr, Spam \nSpam'; + } + if (!defined $expect) { - return !defined $result; + if (defined $result) { + my $lr=$result;$lr=~s/\t/\\t/gs;$lr =~s/\n/\\n/gs; + warn "try: $parser: '$try' failed! expect: undef got: '$lr'\n"; + return 0; + } else { + return 1; + } } elsif (!defined $result) { - return 0; + if (defined $expect) { + my $le=$expect;$le=~s/\t/\\t/gs;$le =~s/\n/\\n/gs; + warn "try: $parser: '$try' failed! expect: '$le' got: undef\n"; + return 0; + } else { + return 1; + } } if ($expect eq $result) { @@ -48,7 +81,7 @@ } else { my $le=$expect;$le=~s/\t/\\t/gs;$le =~s/\n/\\n/gs; my $lr=$result;$lr=~s/\t/\\t/gs;$lr =~s/\n/\\n/gs; - warn "try: '$try' failed! expect: '$le' got: '$lr'\n"; + warn "try: $parser: '$try' failed! expect: '$le' got: '$lr'\n"; return 0; } } @@ -75,25 +108,55 @@ To_bug5201_a: =?ISO-2022-JP?B?GyRCQjw+ZRsoQiAbJEI1V0JlGyhC?= To_bug5201_b: =?ISO-2022-JP?B?GyRCNiVHTyM3JSQlcyU1JSQlQCE8PnBKcxsoQg==?= -To_bug5201_c: "joe+@example.com" +To_bug5201_c: "joe+foobar@example.com" +From1: Foo Blah +From2: , "'Foo Blah'" , =?utf-8?Q?'Baz Bl=C3=A4h'?= +From3: =?utf-8?Q?"B=C3=A4z=C3=A4=C3=A4_=28baz=40blah.?= =?utf-8?Q?com=29"?= +From4: "Mr., Spam"(comment) +From5: =?UTF-8?Q?"Foobar"_?=, =?utf-8?Q?"Foobar"?= +X-Note: From6 is really \\\" - escaped perl backslashes.. +From6: "Mr. (foo@bar)\\\\\\"" (comment) +From7: "Mr. \(foo\@bar)\\\\\\\\\\"" (comment) +From8: "Foo Blah \(via Foobar\)" , "Foo Blah (via Foobar)" +From9: Mr, Spam }; } ############################################## + +for (1 .. 2) { ## parser loop + +if ($_ == 2 && !HAS_EMAIL_ADDRESS_XS) { + warn "Not running Email::Address::XS tests, module missing\n"; + next; +} + +$Mail::SpamAssassin::Util::header_address_parser = $_; +new_saobj(); + ok(try('To1:addr', 'jm@foo')); +ok(try('To1:name', undef)); ok(try('To2:addr', 'jm@foo')); +ok(try('To2:name', undef)); ok(try('To3:addr', 'jm@foo')); -ok(try('To4:addr', 'jm@foo')); -ok(try('To5:addr', 'jm@foo')); +ok(try('To3:name', 'Foo Blah')); +ok(try('To4:addr', 'jm@foo\njm@bar')); +ok(try('To4:name', undef)); +ok(try('To5:addr', 'jm@foo\njm@bar')); +ok(try('To5:name', 'Foo Blah')); ok(try('To6:addr', 'jm@foo')); +ok(try('To6:name', 'Foo Blah')); ok(try('To7:addr', 'jm@foo')); +ok(try('To7:name', 'Foo Blah')); ok(try('To8:addr', 'jm@foo')); +ok(try('To8:name', 'Foo Blah')); ok(try('To9:addr', 'jm@foo')); +ok(try('To9:name', '_$B!z8=6b$=$N>l$GEv$?$j!*!zEv_(B_$B$?$k!*!)$/$8!z7|>^%%s%P!')); ok(try('To13:addr', 'jm@foo')); @@ -101,6 +164,33 @@ ok(try('Hdr1', "foo bar baz\n")); ok(try('Hdr1:raw', " foo \n bar\n\tbaz \n \n")); ok(try('To_bug5201_a:addr', 'jm@foo')); +ok(try('To_bug5201_a:name', '村上 久代')); ok(try('To_bug5201_b:addr', 'jm@foo')); -ok(try('To_bug5201_c:addr', '"joe+@example.com"')); +ok(try('To_bug5201_b:name', '競馬７インサイダー情報')); +ok(try('To_bug5201_c:addr', 'joe+foobar@example.com')); +ok(try('To_bug5201_c:name', undef)); +ok(try('From1:addr', undef)); +ok(try('From1:name', 'Foo Blah')); +ok(try('From2:addr', 'jm@foo\njm@bar\nbaz@blaeh')); +ok(try('From2:name', 'Foo Blah\nBaz Bläh')); +ok(try('From3:addr', 'jm@foo')); +ok(try('From3:name', 'Bäzää (baz@blah.com)')); +ok(try('From4:addr', 'spam@blah.com')); +ok(try('From4:name', 'Mr., Spam')); +ok(try('From5:addr', 'noreply@foobar.com\ninfo=foobar.com@mlsend.com')); +ok(try('From5:name', undef)); +ok(try('From6:addr', 'spam@blah.com')); +ok(try('From6:name', 'Mr. (foo@bar)"')); +ok(try('From7:addr', 'spam@blah.com')); +ok(try('From7:name', 'Mr. (foo@bar)"')); +ok(try('From8:addr', 'no-reply@foobar.com\nno-reply@foobar.com')); +ok(try('From8:name', 'Foo Blah (via Foobar)\nFoo Blah (via Foobar)')); +ok(try('From9:addr', 'spam@blah.com')); +ok(try('From9:name', 'Mr\nSpam')); + +} ## end parser loop + +$pms->finish() if $pms; +$mail->finish() if $mail; +$sa->finish() if $sa; diff -Nru spamassassin-3.4.6/t/gtube.t spamassassin-4.0.0~rc3/t/gtube.t --- spamassassin-3.4.6/t/gtube.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/gtube.t 2022-05-28 10:38:25.000000000 +0000 @@ -1,36 +1,21 @@ #!/usr/bin/perl -T use lib '.'; use lib 't'; -use SATest; sa_t_init("spam"); +use SATest; sa_t_init("gtube"); + use Test::More tests => 4; # --------------------------------------------------------------------------- %patterns = ( - -q{ BODY: Generic Test for Unsolicited Bulk Email }, 'gtube', - + q{ 1000 GTUBE }, 'gtube', ); -tstprefs (" - $default_cf_lines - - ifplugin Mail::SpamAssassin::Plugin::AWL - use_auto_whitelist 1 - auto_whitelist_path ./log/awl - auto_whitelist_file_mode 0755 - endif -"); - -$ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C'; # a cheat, but we match the description - ok (sarun ("-L -t < data/spam/gtube.eml", \&patterns_run_cb)); ok_all_patterns(); %patterns = ( - -q{ X-Spam-Status: No }, 'not_marked_as_spam_from_awl_bonus', - + qr/^X-Spam-Status: No/m, 'not_marked_as_spam_from_awl_bonus', ); ok (sarun ("-L -t < data/nice/not_gtube.eml", \&patterns_run_cb)); diff -Nru spamassassin-3.4.6/t/hashbl.t spamassassin-4.0.0~rc3/t/hashbl.t --- spamassassin-3.4.6/t/hashbl.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/hashbl.t 2022-05-30 14:12:23.000000000 +0000 @@ -0,0 +1,145 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("hashbl"); + +use Test::More; +plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); +plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely(); + +# run many times to catch some random natured failures +my $iterations = 5; +plan tests => 12 * $iterations; + +# --------------------------------------------------------------------------- + +%patterns = ( + q{ 1.0 X_HASHBL_EMAIL } => '', + q{ 1.0 X_HASHBL_OSENDR } => '', + q{ 1.0 X_HASHBL_BTC } => '', + q{ 1.0 X_HASHBL_URI } => '', + q{ 1.0 X_HASHBL_TAG } => '', + q{ 1.0 META_HASHBL_EMAIL } => '', + q{ 1.0 META_HASHBL_BTC } => '', + q{ 1.0 META_HASHBL_URI } => '', +); +%anti_patterns = ( + q{ 1.0 X_HASHBL_SHA256 } => '', + q{ warn: } => '', +); + +# Check from debug output log that nothing else than these were queried +@valid_queries = qw( +cb565607a98fbdf1be52cdb86466ab34244bd6fc.hashbltest1.spamassassin.org +bc9f1b35acd338b92b0659cc2111e6b661a8b2bc.hashbltest1.spamassassin.org +62e12fbe4b32adc2e87147d74590372b461f35f6.hashbltest1.spamassassin.org +96b802967118135ef048c2bc860e7b0deb7d2333.hashbltest1.spamassassin.org +1675677ba3d539bdfb0ae8940bf7e6c836f3ad17.hashbltest1.spamassassin.org +2ead26370ef9d238584aa3c86a02e254708370a0.hashbltest1.spamassassin.org +170d83ef2dc9c2de0e65ce4461a3a375.hashbltest2.spamassassin.org +cc205dd956d568ff8524d7fc42868500e4d7d162.hashbltest3.spamassassin.org +jykf2a5v6asavfel3stymlmieh4e66jeroxuw52mc5xhdylnyb7a.hashbltest3.spamassassin.org +6a42acf4133289d595e3875a9d677f810e80b7b4.hashbltest4.spamassassin.org +5c6205960a65b1f9078f0e12dcac970aab0015eb.hashbltest4.spamassassin.org +1234567890.hashbltest5.spamassassin.org +w3hcrlct6yshq5vq6gjv2hf3pzk3jvsk6ilj5iaks4qwewudrr6q.hashbltest6.spamassassin.org +userpart.hashbltest7.spamassassin.org +host.domain.com.hashbltest7.spamassassin.org +domain.com.hashbltest7.spamassassin.org +2qlyngefopecg66lt6pwfpegjaajbzasuxs5vzgii2vfbonj6rua.hashbltest8.spamassassin.org +); + +sub check_queries { + my %invalid; + my %found; + if (!open(WL, $current_checkfile)) { + diag("LOGFILE OPEN FAILED"); + return 0; + } + while () { + my $line = $_; + print STDERR $line if $line =~ /warn:/; + while ($line =~ m,([^\s/]+\.hashbltest\d\.spamassassin\.org)\b,g) { + my $query = $1; + if (!grep { $query eq $_ } @valid_queries) { + $invalid{$query}++; + } else { + $found{$query}++; + } + } + } + close WL; + diag("Unwanted query launched: $_") foreach (keys %invalid); + unless (keys %found == @valid_queries) { + foreach (@valid_queries) { + if (!exists $found{$_}) { + diag("Query not launched: $_"); + } + } + return 0; + } + return !%invalid; +} + +tstlocalrules(q{ + rbl_timeout 30 + + clear_uridnsbl_skip_domain + uridnsbl_skip_domain trusted.com + + header X_HASHBL_EMAIL eval:check_hashbl_emails('hashbltest1.spamassassin.org') + tflags X_HASHBL_EMAIL net + + hashbl_acl_freemail gmail.com + header X_HASHBL_OSENDR eval:check_hashbl_emails('hashbltest2.spamassassin.org/A', 'md5/max=10/shuffle', 'X-Original-Sender', '^127\.', 'freemail') + tflags X_HASHBL_OSENDR net + + body X_HASHBL_BTC eval:check_hashbl_bodyre('hashbltest3.spamassassin.org', 'sha1/max=10/shuffle', '\b([13][a-km-zA-HJ-NP-Z1-9]{25,34})\b') + tflags X_HASHBL_BTC net + + # Not supposed to hit, @valid_queries just checks that sha256 is calculated correctly + body X_HASHBL_SHA256 eval:check_hashbl_bodyre('hashbltest3.spamassassin.org', 'sha256/max=10/shuffle', '\b([13][a-km-zA-HJ-NP-Z1-9]{25,34})\b') + tflags X_HASHBL_SHA256 net + + header X_HASHBL_URI eval:check_hashbl_uris('hashbltest4.spamassassin.org', 'sha1', '127.0.0.2') + tflags X_HASHBL_URI net + + header __X_SOME_ID X-Some-ID =~ /^(?\d{10,20})$/ + header X_HASHBL_TAG eval:check_hashbl_tag('hashbltest5.spamassassin.org/A', 'raw', 'XSOMEID', '^127\.') + tflags X_HASHBL_TAG net + + # Not supposed to hit, @valid_queries just checks that they are launched + hashbl_ignore text/plain + body X_HASHBL_ATT eval:check_hashbl_attachments('hashbltest6.spamassassin.org/A', 'sha256') + describe X_HASHBL_ATT Message contains attachment found on attbl + tflags X_HASHBL_ATT net + + # email user/host/domain + hashbl_acl_domacl host.domain.com + header __X_HASHBL_UHD1 eval:check_hashbl_emails('hashbltest7.spamassassin.org', 'raw/user', 'body', '^', 'domacl') + header __X_HASHBL_UHD2 eval:check_hashbl_emails('hashbltest7.spamassassin.org', 'raw/host', 'body', '^', 'domacl') + header __X_HASHBL_UHD3 eval:check_hashbl_emails('hashbltest7.spamassassin.org', 'raw/domain', 'body', '^', 'domacl') + + hashbl_email_domain_alias domain.com aliasdomain.com + hashbl_acl_domaincom domain.com + header X_HASHBL_ALIAS_NODOT eval:check_hashbl_emails('hashbltest8.spamassassin.org', 'sha256/nodot', 'body', '^127\.', 'domaincom') + tflags X_HASHBL_ALIAS_NODOT net + + # Bug 7897 - test that meta rules depending on net rules hit + meta META_HASHBL_EMAIL X_HASHBL_EMAIL + # It also needs to hit even if priority is lower than dnsbl (-100) + meta META_HASHBL_BTC X_HASHBL_BTC + priority META_HASHBL_BTC -500 + # Or super high + meta META_HASHBL_URI X_HASHBL_URI + priority META_HASHBL_URI 2000 + priority X_HASHBL_URI 2000 +}); + +for (1 .. $iterations) { + clear_localrules() if $_ == 3; # do some tests without any other rules to check meta bugs + ok sarun ("-t -D async,dns,HashBL < data/spam/hashbl 2>&1", \&patterns_run_cb); + ok(check_queries()); + ok_all_patterns(); +} + diff -Nru spamassassin-3.4.6/t/hashcash.t spamassassin-4.0.0~rc3/t/hashcash.t --- spamassassin-3.4.6/t/hashcash.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/hashcash.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -#!/usr/bin/perl -T - -use lib '.'; use lib 't'; -use SATest; sa_t_init("hashcash"); - -# we need DB_File to support the double-spend db. -use constant HAS_DB_FILE => eval { require DB_File }; - -use Test::More; -plan skip_all => "This test requires DB_File" unless HAS_DB_FILE; -plan tests => 4; - -# --------------------------------------------------------------------------- - -%patterns = ( -q{ HASHCASH_24 }, 'hashcash24', -); - -tstprefs (' - hashcash_accept test@example.com test1@example.com test2@example.com - hashcash_doublespend_path log/user_state/hashcash_seen - '); - -sarun ("-L -t < data/nice/001", \&patterns_run_cb); -ok_all_patterns(); - -%patterns = ( -q{ HASHCASH_20 }, 'hashcash20', -); - -sarun ("-L -t < data/nice/001", \&patterns_run_cb); -ok_all_patterns(); - -%patterns = ( -q{ HASHCASH_2SPEND }, '2spend', -); - -sarun ("-L -t < data/nice/001", \&patterns_run_cb); -ok_all_patterns(); - -# try again with a mail with 2 tokens, one unspent. -%patterns = (); -%anti_patterns = ( -q{ HASHCASH_2SPEND }, '2spend', -); -sarun ("-L -t < data/nice/016", \&patterns_run_cb); -ok_all_patterns(); - diff -Nru spamassassin-3.4.6/t/header.t spamassassin-4.0.0~rc3/t/header.t --- spamassassin-3.4.6/t/header.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/header.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,97 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("header"); +use Test::More tests => 23; + +# --------------------------------------------------------------------------- + +tstprefs(' + # exists + header TEST_EXISTS1 exists:To + header TEST_EXISTS2 exists:Not-Exist + + # if-unset + header TEST_UNSET1 Not-Exist =~ /./ + header TEST_UNSET2 Not-Exist =~ /^UNSET$/ [if-unset: UNSET] + header TEST_UNSET3 Not-Exist =~ /^NOT$/ [if-unset: UNSET] + + # exists should not leak to a redefined test + header TEST_LEAK1 exists:Not-Exist + header TEST_LEAK1 To =~ /notexist/ + + # if-unset should not leak to a redefined test + header TEST_LEAK2 Not-Exist =~ /^UNSET$/ [if-unset: UNSET] + header TEST_LEAK2 Not-Exist =~ /^UNSET$/ + + # op should not leak to a redefined test + header TEST_LEAK3 To !~ /./ + header TEST_LEAK3 To =~ /notfound/ + + # Test 4.0 :first :last parser + header HEADER_FIRST1 X-Hashcash:first =~ /^0:040315:test@example.com:69781c87bae95c03$/ + header HEADER_LAST1 X-Hashcash:last =~ /^1:20:040806:test1@example.com:test=foo:482b788d12eb9b56:2a3349$/ + header HEADER_ALL1 X-Hashcash =~ /^0:040315:.*1:20:040806:/s + + # Meta should evaluate all + meta TEST_META (TEST_EXISTS1 && TEST_UNSET2 && HEADER_FIRST1 && HEADER_LAST1 && HEADER_ALL1) +'); + +%patterns = ( + q{ 1.0 TEST_EXISTS1 }, '', + q{ 1.0 TEST_UNSET2 }, '', + q{ 1.0 HEADER_FIRST1 }, '', + q{ 1.0 HEADER_LAST1 }, '', + q{ 1.0 HEADER_ALL1 }, '', + q{ 1.0 TEST_META }, '', +); +%anti_patterns = ( + q{ TEST_EXISTS2 }, '', + q{ TEST_UNSET1 }, '', + q{ TEST_UNSET3 }, '', + q{ TEST_LEAK1 }, '', + q{ TEST_LEAK2 }, '', + q{ TEST_LEAK3 }, '', +); + +ok (sarun ("-L -t < data/nice/001", \&patterns_run_cb)); +ok_all_patterns(); + +########################################## + +tstprefs(' + # Test 4.0 multiple :addr parser + header TO1 To:addr =~ /(?:@.*?){1}/s + header TONEG1 To:addr =~ /(?:@.*?){2}/s + header CC1 Cc:addr =~ /(?:@.*?){5}/s + header CCNEG1 Cc:addr =~ /(?:@.*?){6}/s + header TOCC1 ToCc:addr =~ /(?:@.*?){6}/s + header TOCCNEG1 ToCc:addr =~ /(?:@.*?){7}/s + header __TO_COUNT To:addr =~ /^.+$/m + tflags __TO_COUNT multiple + meta TO2 __TO_COUNT == 1 + header __CC_COUNT Cc:addr =~ /^.+$/m + tflags __CC_COUNT multiple + meta CC2 __CC_COUNT == 5 + header __TOCC_COUNT ToCc:addr =~ /^.+$/m + tflags __TOCC_COUNT multiple + meta TOCC2 __TOCC_COUNT == 6 +'); + +%patterns = ( + q{ 1.0 TO1 }, '', + q{ 1.0 CC1 }, '', + q{ 1.0 TOCC1 }, '', + q{ 1.0 TO2 }, '', + q{ 1.0 CC2 }, '', + q{ 1.0 TOCC2 }, '', +); +%anti_patterns = ( + q{ TONEG }, '', + q{ CCNEG }, '', + q{ TOCCNEG }, '', +); + +ok (sarun ("-L -t < data/nice/006", \&patterns_run_cb)); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/header_utf8.t spamassassin-4.0.0~rc3/t/header_utf8.t --- spamassassin-3.4.6/t/header_utf8.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/header_utf8.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,232 @@ +#!/usr/bin/perl -T + +### +### UTF-8 CONTENT, edit with UTF-8 locale/editor +### + +use lib '.'; use lib 't'; +use SATest; sa_t_init("header_utf8.t"); + +use constant HAS_EMAIL_ADDRESS_XS => eval { require Email::Address::XS; }; +use constant HAS_LIBIDN => eval { require Net::LibIDN; }; +use constant HAS_LIBIDN2 => eval { require Net::LibIDN2; }; + +if (!HAS_EMAIL_ADDRESS_XS) { + warn "Email::Address::XS is not installed, tests will be lacking\n"; +} +if (!HAS_LIBIDN && !HAS_LIBIDN2) { + warn "Net::LibIDN or Net::LibIDN2 is not installed, tests will be lacking\n"; +} + +use Test::More; +plan skip_all => "Test requires Perl 5.8" unless $] > 5.008; # TODO: SA already doesn't support anything below 5.8.1 + +my $tests = 156; +$tests = 305 if (HAS_EMAIL_ADDRESS_XS || (!HAS_EMAIL_ADDRESS_XS && HAS_LIBIDN && HAS_LIBIDN2)); +plan tests => $tests; + +# --------------------------------------------------------------------------- + +%mypatterns = ( + ' 1.0 LT_RPATH ' => '', + ' 1.0 LT_ENVFROM ' => '', + ' 1.0 LT_FROM ' => '', + ' 1.0 LT_FROM_ADDR ' => '', + ' 1.0 LT_FROM_NAME ' => '', + ' 1.0 LT_FROM_RAW ' => '', + ' 1.0 LT_TO_ADDR ' => '', + ' 1.0 LT_TO_NAME ' => '', + ' 1.0 LT_CC_ADDR ' => '', + ' 1.0 LT_SUBJ ' => '', + ' 1.0 LT_SUBJ_RAW ' => '', + ' 1.0 LT_MESSAGEID ' => '', + ' 1.0 LT_MSGID ' => '', + ' 1.0 LT_CT ' => '', + ' 1.0 LT_CT_RAW ' => '', + ' 1.0 LT_AUTH_DOM ' => '', + ' 1.0 LT_NOTE ' => '', + ' 1.0 LT_UTF8SMTP_ANY ' => '', + ' 1.0 LT_SPLIT_UTF8_SUBJ ' => '', + ' 100 USER_IN_BLOCKLIST ' => '', +); + +%mypatterns_utf8 = ( # as it appears in a report body + ' 1.0 LT_ANY_CHARS En-tête contient caractères' => 'LT_ANY_CHARS utf8', +); + +%mypatterns_mime_qp = ( # as it appears in a mail header section + ' 1.0 LT_ANY_CHARS =?UTF-8?Q?En-t=C3=AAte_contient_caract=C3=A8res?=' => 'LT_ANY_CHARS mime encoded', +); + +%mypatterns_mime_b64 = ( # as it appears in a mail header section + ' 1.0 LT_ANY_CHARS =?UTF-8?B?5a2X56ym6KKr5YyF5ZCr5Zyo5raI5oGv5oql5aS06YOo5YiG?=' => 'LT_ANY_CHARS mime encoded', +); + +%mypatterns_mime_b64_bug7307 = ( + ' 1.0 LT_SUBJ2 ' => '', + ' 1.0 LT_SUBJ2_RAW ' => '', +); + +%anti_patterns = ( + ' 1.0 NO_RELAYS ' => 'NO_RELAYS', +# ' 1.0 INVALID_MSGID ' => 'INVALID_MSGID', +); + +my $myrules = <<'END'; + header USER_IN_BLOCKLIST eval:check_from_in_blocklist() + tflags USER_IN_BLOCKLIST userconf nice noautolearn + score USER_IN_BLOCKLIST 100 + add_header all AuthorDomain _AUTHORDOMAIN_ + blocklist_from Marilù.Gioffré@esempio-università.it + header LT_UTF8SMTP_ANY Received =~ /\bwith\s*UTF8SMTPS?A?\b/mi + header LT_RPATH Return-Path:addr =~ /^Marilù\.Gioffré\@esempio-università\.it\z/ + header LT_ENVFROM EnvelopeFrom =~ /^Marilù\.Gioffré\@esempio-università\.it\z/ + header LT_FROM From =~ /^Marilù Gioffré ♥ $/m + header LT_FROM_ADDR From:addr =~ /^Marilù\.Gioffré\@esempio-università\.it\z/ + header LT_FROM_NAME From:name =~ /^Marilù Gioffré ♥\z/ + header LT_FROM_RAW From:raw =~ /^\s*=\?ISO-8859-1\?Q\?Maril=F9\?= Gioffré ♥ $/m + header LT_AUTH_DOM X-AuthorDomain =~ /^xn--esempio-universit-4ob\.it\z/ + header LT_TO_ADDR To:addr =~ /^Dörte\@Sörensen\.example\.com\z/ + header LT_TO_NAME To:name =~ /^Dörte Å\. Sörensen, Jr\./ + header LT_CC_ADDR Cc:addr =~ /^θσερ\@εχαμπλε\.ψομ\z/ + header LT_SUBJ Subject =~ /^Domače omrežje$/m + header LT_SUBJ_RAW Subject:raw =~ /^\s*=\?iso-8859-2\*sl\?Q\?Doma=e8e\?=\s+=\?utf-8\*sl\?Q\?_omre=C5\?=/m + header LT_SUBJ2 Subject =~ /^【重要訊息】台電105年3月電費，委託金融機構扣繳成功電子繳費憑證\(電號07487616730\)$/m + header LT_SUBJ2_RAW Subject:raw =~ /^\s*=\?UTF-8\?B\?44CQ6YeN6KaB6KiK5oGv44CR5Y\+w6Zu7MTA15bm0\?=\s*=\?UTF-8\?B\?M\+aciOmbu\+iyu\+\+8jOWnlOiol\+mHkeiejeapn\+ani\+aJow==\?=\s*=\?UTF-8\?B\?57mz5oiQ5Yqf6Zu75a2Q57mz6LK75oaR6K2JKOmbu\+iZnw==\?=\s*=\?UTF-8\?B\?MDc0ODc2MTY3MzAp\?=$/m + header LT_MSGID Message-ID =~ /^$/m + header LT_MESSAGEID MESSAGEID =~ /^$/m + header LT_CT Content-Type =~ /документы для отдела кадров\.pdf/ + header LT_CT_RAW Content-Type:raw =~ /=\?utf-8\?B\?tdC70LAg0LrQsNC00YDQvtCyLnBkZg==\?="/ + header LT_SPLIT_UTF8_SUBJ Subject:raw =~ m{(=\?UTF-8) (?: \* [^?=<>, \t]* )? (\?Q\?) [^ ?]* =[89A-F][0-9A-F] \?= \s* \1 (?: \* [^ ?=]* )? \2 =[89AB][0-9A-F]}xsmi + header LT_NOTE X-Note =~ /^The above.*char =C5 =BE is invalid, .*wild$/m + header LT_ANY_CHARS From =~ /./ + describe LT_ANY_CHARS Header contains characters + lang fr describe LT_ANY_CHARS En-tête contient caractères + # sorry, Google translate: + lang zh describe LT_ANY_CHARS 字符被包含在消息报头部分 +END + +if (!HAS_LIBIDN && !HAS_LIBIDN2) { + # temporary fudge to prevent a test failing + # until the Net::LibIDN becomes a mandatory module + $myrules =~ s{^(\s*header LT_AUTH_DOM\s+X-AuthorDomain =~)\s*(/.*/)$} + {$1 /esempio-università\.it/}m +} + + + +## Test 1 with internal parser, any libidn +$ENV{'SA_HEADER_ADDRESS_PARSER'} = 1; +if (HAS_LIBIDN) { + $ENV{'SA_LIBIDN'} = 1; +} elsif (HAS_LIBIDN2) { + $ENV{'SA_LIBIDN'} = 2; + $libidn2_done++; +} +run_tests(); +## Test 2 with Email::Address::XS +if (HAS_EMAIL_ADDRESS_XS) { + $ENV{'SA_HEADER_ADDRESS_PARSER'} = 2; + if (HAS_LIBIDN2 && !defined $libidn2_done) { + $ENV{'SA_LIBIDN'} = 2; + $libidn2_done++; + } + run_tests(); +} else { + ## .. or Test 2 with internal parser, libidn2 + if (HAS_LIBIDN2 && !defined $libidn2_done) { + $ENV{'SA_LIBIDN'} = 2; + run_tests(); + } +} + + +sub run_tests { + +$ENV{PERL_BADLANG} = 0; # suppresses Perl warning about failed locale setting +# see Mail::SpamAssassin::Conf::Parser::parse(), also Bug 6992 +$ENV{LANGUAGE} = $ENV{LANG} = 'fr_CH.UTF-8'; + +#--- normalize_charset 1 + +tstprefs ($myrules . ' + report_safe 0 + normalize_charset 1 +'); + +%patterns = (%mypatterns, %mypatterns_mime_qp); +sarun ("-L < data/nice/unicode1", \&patterns_run_cb); +ok_all_patterns(); + +tstprefs ($myrules . ' + report_safe 1 + normalize_charset 1 +'); +%patterns = (%mypatterns, %mypatterns_utf8); +sarun ("-L < data/nice/unicode1", \&patterns_run_cb); +ok_all_patterns(); + +tstprefs ($myrules . ' + report_safe 2 + normalize_charset 1 +'); +%patterns = (%mypatterns, %mypatterns_utf8); +sarun ("-L < data/nice/unicode1", \&patterns_run_cb); +ok_all_patterns(); + +#--- normalize_charset 0 + +tstprefs ($myrules . ' + report_safe 0 + normalize_charset 0 +'); +%patterns = (%mypatterns, %mypatterns_mime_qp); +sarun ("-L < data/nice/unicode1", \&patterns_run_cb); +ok_all_patterns(); + +tstprefs ($myrules . ' + report_safe 1 + normalize_charset 0 +'); +%patterns = (%mypatterns, %mypatterns_utf8); +sarun ("-L < data/nice/unicode1", \&patterns_run_cb); +ok_all_patterns(); + +tstprefs ($myrules . ' + report_safe 2 + normalize_charset 0 +'); +%patterns = (%mypatterns, %mypatterns_utf8); +sarun ("-L < data/nice/unicode1", \&patterns_run_cb); +ok_all_patterns(); + +#--- base64 encoded-words + +$ENV{PERL_BADLANG} = 0; # suppresses Perl warning about failed locale setting +# see Mail::SpamAssassin::Conf::Parser::parse(), also Bug 6992 +$ENV{LANGUAGE} = $ENV{LANG} = 'zh_CN.UTF-8'; + +tstprefs ($myrules . ' + report_safe 0 + normalize_charset 1 +'); +%patterns = (%mypatterns, %mypatterns_mime_b64); +sarun ("-L < data/nice/unicode1", \&patterns_run_cb); +ok_all_patterns(); + +#--- base64 encoded-words - Bug 7307 + +$ENV{LANGUAGE} = $ENV{LANG} = 'en_US.UTF-8'; + +tstprefs ($myrules . ' + report_safe 0 + normalize_charset 1 +'); +%patterns = (%mypatterns_mime_b64_bug7307); +%anti_patterns = (); +sarun ("-L < data/nice/unicode2", \&patterns_run_cb); +ok_all_patterns(); + + +} ## run_tests + diff -Nru spamassassin-3.4.6/t/html_colors.t spamassassin-4.0.0~rc3/t/html_colors.t --- spamassassin-3.4.6/t/html_colors.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/html_colors.t 2022-05-08 05:40:03.000000000 +0000 @@ -1,21 +1,8 @@ #!/usr/bin/perl -w -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; +use lib '.'; use lib 't'; +use SATest; sa_t_init("html_colors"); use Test::More tests => 28; use Mail::SpamAssassin; use Mail::SpamAssassin::HTML; diff -Nru spamassassin-3.4.6/t/html_obfu.t spamassassin-4.0.0~rc3/t/html_obfu.t --- spamassassin-3.4.6/t/html_obfu.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/html_obfu.t 2022-05-28 10:38:25.000000000 +0000 @@ -7,33 +7,33 @@ # --------------------------------------------------------------------------- %patterns = ( -q{ MILLION_EMAIL } => 'MILLION_EMAIL', -q{ GUARANTEE } => 'GUARANTEE', -q{ NATURAL } => 'NATURAL', -q{ OUR_AFFILIATE_PARTNERS } => 'OUR_AFFILIATE_PARTNERS', -q{ VIAGRA } => 'VIAGRA', + q{ 1.0 MILLION_EMAIL } => '', + q{ 1.0 GUARANTEE } => '', + q{ 1.0 NATURAL } => '', + q{ 1.0 OUR_AFFILIATE_PARTNERS } => '', + q{ 1.0 VIAGRA } => '', ); %anti_patterns = ( -q{ OPPORTUNITY } => 'OPPORTUNITY', -q{ BUG5749_P_H2 } => 'BUG5749_P_H2', -q{ BUG5749_H2_H3 } => 'BUG5749_H2_H3', -q{ BUG6168_EXAMPLE } => 'BUG6168_EXAMPLE', + q{ OPPORTUNITY } => '', + q{ BUG5749_P_H2 } => '', + q{ BUG5749_H2_H3 } => '', + q{ BUG6168_EXAMPLE } => '', ); tstlocalrules (' -body NATURAL /\b(?:100.|completely|totally|all) natural/i -body GUARANTEE /\bGUARANTEE\b/ -body MILLION_EMAIL /million (?:\w+ )?(?:e-?mail )?addresses/i -body OUR_AFFILIATE_PARTNERS /our affiliate partners/i -body VIAGRA /viagra/i -body OPPORTUNITY /OPPORTUNITY/ - -body BUG5749_P_H2 /foobar/ -body BUG5749_H2_H3 /foobaz/ -body BUG6168_EXAMPLE /example.orgexample.net/ - + body NATURAL /\b(?:100.|completely|totally|all) natural/i + body GUARANTEE /\bGUARANTEE\b/ + body MILLION_EMAIL /million (?:\w+ )?(?:e-?mail )?addresses/i + body OUR_AFFILIATE_PARTNERS /our affiliate partners/i + body VIAGRA /viagra/i + body OPPORTUNITY /OPPORTUNITY/ + + body BUG5749_P_H2 /foobar/ + body BUG5749_H2_H3 /foobaz/ + body BUG6168_EXAMPLE /example.orgexample.net/ '); sarun ("-L -t < data/spam/011", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/html_utf8.t spamassassin-4.0.0~rc3/t/html_utf8.t --- spamassassin-3.4.6/t/html_utf8.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/html_utf8.t 2022-05-28 10:38:25.000000000 +0000 @@ -1,26 +1,27 @@ #!/usr/bin/perl -T use lib '.'; use lib 't'; -use SATest; sa_t_init("html_obfu"); +use SATest; sa_t_init("html_utf8"); use Test::More; -plan skip_all => "Test requires Perl 5.8.5" unless $] > 5.008004; plan tests => 2; # --------------------------------------------------------------------------- %patterns = ( -q{ QUOTE_YOUR } => 'QUOTE_YOUR', + q{ 1.0 QUOTE_YOUR } => '', ); %anti_patterns = ( -q{ OPPORTUNITY } => 'OPPORTUNITY', + q{ OPPORTUNITY } => '', ); tstlocalrules (' -body OPPORTUNITY /OPPORTUNITY/ -# body QUOTE_YOUR /\x{201c}Your/ -body QUOTE_YOUR /\xE2\x80\x9CYour/ + body OPPORTUNITY /OPPORTUNITY/ + # body QUOTE_YOUR /\x{201c}Your/ + body QUOTE_YOUR /\xE2\x80\x9CYour/ '); + sarun ("-L -t < data/spam/009", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/idn_dots.t spamassassin-4.0.0~rc3/t/idn_dots.t --- spamassassin-3.4.6/t/idn_dots.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/idn_dots.t 2022-04-23 12:02:32.000000000 +0000 @@ -2,62 +2,70 @@ # test URIs with UTF8 IDNA-equivalent dots between domains instead of ordinary '.' -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; use lib '.'; use lib 't'; use SATest; sa_t_init("idn_dots.t"); -use Test::More tests => 6; +use Test::More; use Mail::SpamAssassin; use vars qw(%patterns %anti_patterns); -# initialize SpamAssassin -my $sa = create_saobj({dont_copy_prefs => 1}); -$sa->init(0); # parse rules +use constant HAS_LIBIDN => eval { require Net::LibIDN; }; +use constant HAS_LIBIDN2 => eval { require Net::LibIDN2; }; + +plan skip_all => "module Net::LibIDN or Net::LibIDN2 not available, internationalized domain names with U-labels will not be recognized!" + unless HAS_LIBIDN||HAS_LIBIDN2; +plan tests => 6 * ((HAS_LIBIDN||0) + (HAS_LIBIDN2||0)); # load tests and write mail %patterns = (); %anti_patterns = (); my $message = write_mail(); +my $uris; -my $mail = $sa->parse($message); -my $msg = Mail::SpamAssassin::PerMsgStatus->new($sa, $mail); +if (HAS_LIBIDN) { + $ENV{'SA_LIBIDN'} = 1; + check_sa(); +} +if (HAS_LIBIDN2) { + $ENV{'SA_LIBIDN'} = 2; + check_sa(); +} -my $uris = join("\n", $msg->get_uri_list(), ""); +sub check_sa { + # initialize SpamAssassin + my $sa = create_saobj({dont_copy_prefs => 1}); + $sa->init(0); # parse rules + my $mail = $sa->parse($message); + my $msg = Mail::SpamAssassin::PerMsgStatus->new($sa, $mail); + $uris = join("\n", $msg->get_uri_list(), ""); + $msg->finish(); + $mail->finish(); + $sa->finish(); + check_patterns(); +} -# run patterns and anti-patterns -my $failures = 0; -for my $pattern (keys %patterns) { - if (!ok($uris =~ /${pattern}/m)) { - warn "failure: did not find /$pattern/\n"; - $failures++; - #} else { - # warn "OK: did find /$pattern/\n"; +sub check_patterns { + # run patterns and anti-patterns + my $failures = 0; + for my $pattern (keys %patterns) { + if (!ok($uris =~ /${pattern}/m)) { + warn "failure: did not find /$pattern/\n"; + $failures++; + #} else { + # warn "OK: did find /$pattern/\n"; + } } -} -for my $anti_pattern (keys %anti_patterns) { - if (!ok($uris !~ /${anti_pattern}/m)) { - warn "failure: did find /$anti_pattern/\n"; - $failures++; + for my $anti_pattern (keys %anti_patterns) { + if (!ok($uris !~ /${anti_pattern}/m)) { + warn "failure: did find /$anti_pattern/\n"; + $failures++; + } } -} -if ($failures) { - print "URIs in email from get_uri_list:\n$uris"; + if ($failures) { + print "URIs in email from get_uri_list:\n$uris"; + } } # function to write test email diff -Nru spamassassin-3.4.6/t/if_can.t spamassassin-4.0.0~rc3/t/if_can.t --- spamassassin-3.4.6/t/if_can.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/if_can.t 2022-05-28 10:38:25.000000000 +0000 @@ -2,80 +2,94 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("if_can"); -use Test::More tests => 16; +use Test::More tests => 19; # --------------------------------------------------------------------------- %patterns = ( - q{ GTUBE }, 'gtube', - q{ SHOULD_BE_CALLED1 }, 'should_be_called1', - q{ SHOULD_BE_CALLED2 }, 'should_be_called2', - q{ SHOULD_BE_CALLED3 }, 'should_be_called3', - q{ SHOULD_BE_CALLED4 }, 'should_be_called4', - q{ SHOULD_BE_CALLED5 }, 'should_be_called5', - q{ SHOULD_BE_CALLED6 }, 'should_be_called6', - q{ SHOULD_BE_CALLED7 }, 'should_be_called7', - q{ SHOULD_BE_CALLED8 }, 'should_be_called8', - q{ SHOULD_BE_CALLED9 }, 'should_be_called9', - q{ SHOULD_BE_CALLED10 }, 'should_be_called10', + q{ 1000 GTUBE }, '', + q{ 1.0 SHOULD_BE_CALLED01 }, '', + q{ 1.0 SHOULD_BE_CALLED02 }, '', + q{ 1.0 SHOULD_BE_CALLED03 }, '', + q{ 1.0 SHOULD_BE_CALLED04 }, '', + q{ 1.0 SHOULD_BE_CALLED05 }, '', + q{ 1.0 SHOULD_BE_CALLED06 }, '', + q{ 1.0 SHOULD_BE_CALLED07 }, '', + q{ 1.0 SHOULD_BE_CALLED08 }, '', + q{ 1.0 SHOULD_BE_CALLED09 }, '', + q{ 1.0 SHOULD_BE_CALLED10 }, '', + q{ 1.0 SHOULD_BE_CALLED11 }, '', + q{ 1.0 SHOULD_BE_CALLED12 }, '', ); %anti_patterns = ( - q{ SHOULD_NOT_BE_CALLED1 }, 'should_not_be_called1', - q{ SHOULD_NOT_BE_CALLED2 }, 'should_not_be_called2', - q{ SHOULD_NOT_BE_CALLED3 }, 'should_not_be_called3', - q{ SHOULD_NOT_BE_CALLED4 }, 'should_not_be_called4', + q{ SHOULD_NOT_BE_CALLED01 }, '', + q{ SHOULD_NOT_BE_CALLED02 }, '', + q{ SHOULD_NOT_BE_CALLED03 }, '', + q{ SHOULD_NOT_BE_CALLED04 }, '', + q{ SHOULD_NOT_BE_CALLED05 }, '', ); tstlocalrules (q{ - loadplugin Mail::SpamAssassin::Plugin::Test + loadplugin Mail::SpamAssassin::Plugin::Test - if (has(Mail::SpamAssassin::Plugin::Test::check_test_plugin)) - body SHOULD_BE_CALLED1 /./ - endif - if (has(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_true)) - body SHOULD_BE_CALLED2 /./ - endif - if (has(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_false)) - body SHOULD_BE_CALLED3 /./ - endif - if (can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_true)) - body SHOULD_BE_CALLED4 /./ - endif - if (!can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_false)) - body SHOULD_BE_CALLED5 /./ - endif - if (!has(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_nosuch)) - body SHOULD_BE_CALLED6 /./ - endif - if (!can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_nosuch)) - body SHOULD_BE_CALLED7 /./ - endif - if can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_true) && version > 0.00000 - body SHOULD_BE_CALLED8 /./ - endif - if !can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_false ) && !(! version > 0.00000) - body SHOULD_BE_CALLED9 /./ - endif - if has(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_true) && (!can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_nosuch)) - body SHOULD_BE_CALLED10 /./ - endif - - if !has(Mail::SpamAssassin::Plugin::Test::check_test_plugin) - body SHOULD_NOT_BE_CALLED1 /./ - endif - if (has(Mail::SpamAssassin::Plugin::Test::non_existent_method)) - body SHOULD_NOT_BE_CALLED2 /./ - endif - if (can(Mail::SpamAssassin::Plugin::Test::non_existent_method)) - body SHOULD_NOT_BE_CALLED3 /./ - endif - if (can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_false)) - body SHOULD_NOT_BE_CALLED4 /./ - endif + if (has(Mail::SpamAssassin::Plugin::Test::check_test_plugin)) + body SHOULD_BE_CALLED01 /./ + endif + if (has(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_true)) + body SHOULD_BE_CALLED02 /./ + endif + if (has(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_false)) + body SHOULD_BE_CALLED03 /./ + endif + if (can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_true)) + body SHOULD_BE_CALLED04 /./ + endif + if (!can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_false)) + body SHOULD_BE_CALLED05 /./ + endif + if (!has(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_nosuch)) + body SHOULD_BE_CALLED06 /./ + endif + if (!can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_nosuch)) + body SHOULD_BE_CALLED07 /./ + endif + if can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_true) && version > 0.00000 + body SHOULD_BE_CALLED08 /./ + endif + if !can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_false ) && !(! version > 0.00000) + body SHOULD_BE_CALLED09 /./ + endif + if has(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_true) && (!can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_nosuch)) + body SHOULD_BE_CALLED10 /./ + endif + + if !has(Mail::SpamAssassin::Plugin::Test::check_test_plugin) + body SHOULD_NOT_BE_CALLED01 /./ + endif + if (has(Mail::SpamAssassin::Plugin::Test::non_existent_method)) + body SHOULD_NOT_BE_CALLED02 /./ + endif + if (can(Mail::SpamAssassin::Plugin::Test::non_existent_method)) + body SHOULD_NOT_BE_CALLED03 /./ + endif + if can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_true) + if (can(Mail::SpamAssassin::Plugin::Test::test_feature_xxxx_false)) + body SHOULD_NOT_BE_CALLED04 /./ + else + body SHOULD_BE_CALLED11 /./ + endif + endif + + if can(Mail::SpamAssassin::Conf::feature_local_tests_only) && local_tests_only + body SHOULD_BE_CALLED12 /./ + endif + if can(Mail::SpamAssassin::Conf::feature_local_tests_only) && !local_tests_only + body SHOULD_NOT_BE_CALLED05 /./ + endif }); diff -Nru spamassassin-3.4.6/t/if_else.t spamassassin-4.0.0~rc3/t/if_else.t --- spamassassin-3.4.6/t/if_else.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/if_else.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,114 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("if_else"); +use Test::More tests => 21; + +# --------------------------------------------------------------------------- + +%patterns = ( + + q{ 1000 GTUBE }, '', + q{ 1.0 SHOULD_BE_CALLED01 }, '', + q{ 1.0 SHOULD_BE_CALLED02 }, '', + q{ 1.0 SHOULD_BE_CALLED03 }, '', + q{ 1.0 SHOULD_BE_CALLED04 }, '', + q{ 1.0 SHOULD_BE_CALLED05 }, '', + q{ 1.0 SHOULD_BE_CALLED06 }, '', + q{ 1.0 SHOULD_BE_CALLED07 }, '', + +); +%anti_patterns = ( + + q{ SHOULD_NOT_BE_CALLED01 }, '', + q{ SHOULD_NOT_BE_CALLED02 }, '', + q{ SHOULD_NOT_BE_CALLED03 }, '', + q{ SHOULD_NOT_BE_CALLED04 }, '', + q{ SHOULD_NOT_BE_CALLED05 }, '', + q{ SHOULD_NOT_BE_CALLED06 }, '', + q{ SHOULD_NOT_BE_CALLED07 }, '', + q{ SHOULD_NOT_BE_CALLED08 }, '', + q{ SHOULD_NOT_BE_CALLED09 }, '', + q{ SHOULD_NOT_BE_CALLED10 }, '', + q{ SHOULD_NOT_BE_CALLED11 }, '', + q{ SHOULD_NOT_BE_CALLED12 }, '', + +); + +tstlocalrules (q{ + + if (0) + body SHOULD_NOT_BE_CALLED01 /./ + endif + + if (1) + body SHOULD_BE_CALLED01 /./ + endif + + if (0) + body SHOULD_NOT_BE_CALLED02 /./ + else + body SHOULD_BE_CALLED02 /./ + endif + + if (1) + body SHOULD_BE_CALLED03 /./ + else + body SHOULD_NOT_BE_CALLED03 /./ + endif + + if (1) + if (1) + body SHOULD_BE_CALLED04 /./ + else + body SHOULD_NOT_BE_CALLED04 /./ + endif + else + body SHOULD_NOT_BE_CALLED05 /./ + endif + + if (0) + if (0) + body SHOULD_NOT_BE_CALLED06 /./ + else + # Bug 7848 + body SHOULD_NOT_BE_CALLED07 /./ + endif + else + body SHOULD_BE_CALLED05 /./ + endif + + if (0) + if (1) + body SHOULD_NOT_BE_CALLED08 /./ + else + if (1) + # Bug 7848 + body SHOULD_NOT_BE_CALLED09 /./ + endif + endif + else + body SHOULD_BE_CALLED06 /./ + endif + + if (1) + if (0) + body SHOULD_NOT_BE_CALLED10 /./ + else + if (0) + body SHOULD_NOT_BE_CALLED11 /./ + else + if (0) + body SHOULD_NOT_BE_CALLED12 /./ + else + body SHOULD_BE_CALLED07 /./ + endif + endif + endif + endif + +}); + +ok (sarun ("-L -t < data/spam/gtube.eml", \&patterns_run_cb)); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/ifversion.t spamassassin-4.0.0~rc3/t/ifversion.t --- spamassassin-3.4.6/t/ifversion.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/ifversion.t 2022-05-28 10:38:25.000000000 +0000 @@ -7,25 +7,21 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ GTUBE }, 'gtube', -q{ SHOULD_BE_CALLED }, 'should_be_called' - + q{ 1000 GTUBE }, '', + q{ 1.0 SHOULD_BE_CALLED }, '' ); %anti_patterns = ( - -q{ SHOULD_NOT_BE_CALLED }, 'should_not_be_called' - + q{ SHOULD_NOT_BE_CALLED }, '' ); tstlocalrules (" - if (version > 9.99999) - body SHOULD_NOT_BE_CALLED /./ - endif - if (version <= 9.99999) - body SHOULD_BE_CALLED /./ - endif + if (version > 9.99999) + body SHOULD_NOT_BE_CALLED /./ + endif + if (version <= 9.99999) + body SHOULD_BE_CALLED /./ + endif "); ok (sarun ("-L -t < data/spam/gtube.eml", \&patterns_run_cb)); diff -Nru spamassassin-3.4.6/t/ip_addrs.t spamassassin-4.0.0~rc3/t/ip_addrs.t --- spamassassin-3.4.6/t/ip_addrs.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/ip_addrs.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,20 +1,7 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} +use lib '.'; use lib 't'; +use SATest; sa_t_init("ip_addrs"); use strict; use Test::More tests => 105; @@ -24,8 +11,8 @@ my $sa = Mail::SpamAssassin->new({ require_rules => 1, - site_rules_filename => "$prefix/t/log/localrules.tmp", - rules_filename => "$prefix/rules", + site_rules_filename => $siterules, + rules_filename => $localrules, local_tests_only => 1, dont_copy_prefs => 1, }); diff -Nru spamassassin-3.4.6/t/lang_lint.t spamassassin-4.0.0~rc3/t/lang_lint.t --- spamassassin-3.4.6/t/lang_lint.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/lang_lint.t 2022-05-28 10:38:25.000000000 +0000 @@ -9,8 +9,8 @@ # --------------------------------------------------------------------------- -my @locales = qw( de es fr it nl pl pl pt_BR ); -%patterns = ( q{ }, 'anything', ); +my @locales = qw( de es fr it nl pl pl pt_BR ); +%patterns = ( qr/^/, 'anything', ); for $locale (@locales) { $ENV{'LANGUAGE'} = $locale; @@ -18,3 +18,4 @@ sarun ("-L --lint", \&patterns_run_cb); ok_all_patterns(); } + diff -Nru spamassassin-3.4.6/t/lang_pl_tests.t spamassassin-4.0.0~rc3/t/lang_pl_tests.t --- spamassassin-3.4.6/t/lang_pl_tests.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/lang_pl_tests.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,9 +1,7 @@ #!/usr/bin/perl -T -use lib '.'; -use lib 't'; -use SATest; -sa_t_init("lang_pl_tests"); +use lib '.'; use lib 't'; +use SATest; sa_t_init("lang_pl_tests"); use Test::More; plan skip_all => "pl tests disabled" unless conf_bool('run_pl_tests'); @@ -12,9 +10,7 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ X-Spam-Status: }, 'didnt_hang_at_least', - + q{ X-Spam-Status: }, 'didnt_hang_at_least', ); $ENV{'PERL_BADLANG'} = 0; # Sweep problems under the rug @@ -22,3 +18,4 @@ $ENV{'LC_ALL'} = 'pl_PL'; sarun ("-L -t < data/nice/004", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/line_endings.t spamassassin-4.0.0~rc3/t/line_endings.t --- spamassassin-3.4.6/t/line_endings.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/line_endings.t 2021-04-12 07:43:12.000000000 +0000 @@ -11,8 +11,8 @@ # Use a slightly modified gtube ... my $origtest = 'data/spam/gtube.eml'; -my $test = 'log/report_safe.eml'; -my $test2 = 'log/report_safe2.eml'; +my $test = "$workdir/report_safe.eml"; +my $test2 = "$workdir/report_safe2.eml"; my $original = ''; if (open(OTEST, $origtest) && open(TEST, ">$test") && open(TEST2, ">$test2")) { binmode OTEST; diff -Nru spamassassin-3.4.6/t/lint_nocreate_prefs.t spamassassin-4.0.0~rc3/t/lint_nocreate_prefs.t --- spamassassin-3.4.6/t/lint_nocreate_prefs.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/lint_nocreate_prefs.t 2022-05-28 10:38:25.000000000 +0000 @@ -6,13 +6,13 @@ # --------------------------------------------------------------------------- -%patterns = ( q{ }, 'anything' ); +%patterns = ( qr/^/, 'anything' ); # override locale for this test! $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C'; -sarun ("-L --lint --prefspath=log/prefs", \&patterns_run_cb); +sarun ("-L --lint --prefspath=$workdir/prefs", \&patterns_run_cb); ok_all_patterns(); -ok (!-f "log/prefs"); +ok (!-f "$workdir/prefs"); diff -Nru spamassassin-3.4.6/t/local_tests_only.t spamassassin-4.0.0~rc3/t/local_tests_only.t --- spamassassin-3.4.6/t/local_tests_only.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/local_tests_only.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,25 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("local_tests_only"); + +use Test::More; +plan tests => 1; + +# --------------------------------------------------------------------------- + +# Make sure no plugin is sending DNS with -L + +%anti_patterns = ( + 'dns: bgsend' => 'dns', +); + +tstprefs(" + header DNSBL_TEST_TOP eval:check_rbl('test', 'dnsbltest.spamassassin.org.') + tflags DNSBL_TEST_TOP net +"); + +# we need -D output for patterns +sarun ("-D dns -L -t < data/spam/dnsbl.eml 2>&1", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/make_install.t spamassassin-4.0.0~rc3/t/make_install.t --- spamassassin-3.4.6/t/make_install.t 2019-06-23 13:51:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/make_install.t 2022-07-28 01:57:22.000000000 +0000 @@ -1,33 +1,24 @@ #!/usr/bin/perl -use lib '.'; -use lib 't'; -$ENV{'TEST_PERL_TAINT'} = 'no'; # inhibit for this test -use SATest; -sa_t_init("make_install"); +use lib '.'; use lib 't'; +$ENV{'TEST_PERL_TAINT'} = 'no'; # so $perl_cmd doesn't have -T when used to call Makefile.PL +use SATest; sa_t_init("make_install"); use Config; -use Test::More tests => 25; - -BEGIN { - if (-e 't/test_dir') { - chdir 't'; - } - - if (-e 'test_dir') { - unshift(@INC, '../blib/lib'); - } - -}; - +use Test::More; +plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS; +plan tests => 25; # ------------------------------------------------------------------- use Cwd; my $cwd = getcwd; -my $builddir = "$cwd/log/d.$testname/build"; -my $instbase = "$cwd/log/d.$testname/inst"; -untaint_system("rm -rf $instbase $builddir"); -untaint_system("mkdir -p $instbase $builddir"); +my $builddir = "$cwd/$workdir/d.$testname/build"; +my $instbase = "$cwd/$workdir/d.$testname/inst"; +$builddir = untaint_var($builddir); +$instbase = untaint_var($instbase); +rmtree($instbase, $builddir, { safe => 1 }); +mkdirp($instbase); +mkdirp($builddir); untaint_system("cd .. && make tardist >/dev/null"); $? == 0 or die "tardist failed: $?"; @@ -80,10 +71,20 @@ print "\nDisabling checks for 64 bit lib directories.\n"; } +# bug 8019 - substitute for File::Path:mkpath that can work in -T mode +sub mkdirp { + my $dir = shift; + return if (-d $dir); + mkdirp(dirname($dir)); + mkdir $dir; +} + sub new_instdir { $instdir = $instbase.".".(shift); + $instdir = untaint_var($instdir); print "\nsetting new instdir: $instdir\n"; - untaint_system("rm -rf $instdir; mkdir $instdir"); + rmtree($instdir, { safe => 1 }); + mkdirp($instdir); } sub run_makefile_pl { diff -Nru spamassassin-3.4.6/t/mass_check.t spamassassin-4.0.0~rc3/t/mass_check.t --- spamassassin-3.4.6/t/mass_check.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/mass_check.t 2022-07-03 09:30:08.000000000 +0000 @@ -3,16 +3,18 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("mass_check"); -use Test::More tests => 1; +use Test::More; +plan skip_all => "mass check script does not run on Windows" if $RUNNING_ON_WINDOWS; +plan tests => 1; # --------------------------------------------------------------------------- -mkdir "log/mc_test"; -mkdir "log/mc_test/ham"; -writetofile ("log/mc_test/ham/1", "foo"); +mkdir "$workdir/mc_test"; +mkdir "$workdir/mc_test/ham"; +writetofile ("$workdir/mc_test/ham/1", "foo"); untaint_system "( cd ../masses; ". - "$perl_path ./mass-check -n -o ham:dir:../t/log/mc_test/ham". + "$perl_path ./mass-check -n -o ham:dir:../t/$workdir/mc_test/ham". ")"; ok (($? >> 8) == 0); diff -Nru spamassassin-3.4.6/t/memory_cycles.t spamassassin-4.0.0~rc3/t/memory_cycles.t --- spamassassin-3.4.6/t/memory_cycles.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/memory_cycles.t 2021-04-12 07:43:12.000000000 +0000 @@ -2,21 +2,6 @@ use constant HAVE_DEVEL_CYCLE => eval { require Devel::Cycle; }; -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use lib '.'; use lib 't'; use SATest; sa_t_init("memory_cycles"); @@ -30,9 +15,9 @@ # --------------------------------------------------------------------------- my $spamtest = Mail::SpamAssassin->new({ - rules_filename => "$prefix/t/log/test_rules_copy", - site_rules_filename => "$prefix/t/log/test_default.cf", - userprefs_filename => "$prefix/masses/spamassassin/user_prefs", + rules_filename => $localrules, + site_rules_filename => $siterules, + userprefs_filename => $userrules, local_tests_only => 1, debug => 0, dont_copy_prefs => 1, diff -Nru spamassassin-3.4.6/t/metadata.t spamassassin-4.0.0~rc3/t/metadata.t --- spamassassin-3.4.6/t/metadata.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/metadata.t 2021-04-12 07:43:12.000000000 +0000 @@ -7,15 +7,13 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ GTUBE }, 'gtube', -q{ META_FOUND }, 'META_FOUND', - + q{ GTUBE }, 'gtube', + q{ META_FOUND }, 'META_FOUND', ); -tstlocalrules (" - loadplugin myTestPlugin ../../data/testplugin.pm - header META_FOUND Plugin-Meta-Test =~ /bar/ +tstprefs (" + loadplugin myTestPlugin ../../../data/testplugin.pm + header META_FOUND Plugin-Meta-Test =~ /bar/ "); ok (sarun ("-L -t < data/spam/gtube.eml", \&patterns_run_cb)); diff -Nru spamassassin-3.4.6/t/mimeheader.t spamassassin-4.0.0~rc3/t/mimeheader.t --- spamassassin-3.4.6/t/mimeheader.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/mimeheader.t 2022-05-28 10:38:25.000000000 +0000 @@ -2,34 +2,34 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("mimeheader"); -use Test::More tests => 6; - -$ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C'; # a cheat, but we need the patterns to work +use Test::More tests => 18; # --------------------------------------------------------------------------- %patterns = ( - - q{ MIMEHEADER_TEST1 }, q{ test1 }, - q{ MIMEHEADER_TEST2 }, q{ test2 }, - q{ MATCH_NL_NONRAW }, q{ match_nl_nonraw }, - q{ MATCH_NL_RAW }, q{ match_nl_raw }, - q{ MIMEHEADER_FOUND }, q{ unset_found }, - + q{ 1.0 MIMEHEADER_TEST1 }, '', + q{ 1.0 MIMEHEADER_TEST2 }, '', + q{ 1.0 MATCH_NL_NONRAW }, '', + q{ 1.0 MATCH_NL_RAW }, '', + q{ 1.0 MIMEHEADER_FOUND1 }, '', + q{ 1.0 MIMEHEADER_FOUND2 }, '', + q{ 1.0 MIMEHEADER_CONCAT1 }, '', + q{ 1.0 MIMEHEADER_RANGE1 }, '', + q{ 1.0 MIMEHEADER_RANGE2 }, '', + q{ 1.0 MIMEHEADER_RANGE3 }, '', + q{ 1.0 MIMEHEADER_RANGE4 }, '', + q{ 1.0 MIMEHEADER_MULTI1 }, '', + q{ 1.0 MIMEHEADER_MULTIMETA1 }, '', + q{ 1.0 MIMEHEADER_MULTI2 }, '', + q{ 1.0 MIMEHEADER_MULTIMETA2 }, '', + q{ 1.0 MIMEHEADER_CAPTURE1 }, '', + qr/tag MIMECAP1 is now ready, value: text\/plain\n/, '', ); %anti_patterns = ( - - q{ MIMEHEADER_NOTFOUND }, q{ unset_notfound }, - + 'MIMEHEADER_NOTFOUND', '', ); -tstpre(q{ - - loadplugin Mail::SpamAssassin::Plugin::MIMEHeader - -}); - tstprefs (q{ mimeheader MIMEHEADER_TEST1 content-type =~ /application\/msword/ @@ -38,10 +38,38 @@ mimeheader MATCH_NL_NONRAW Content-Type =~ /msword; name/ mimeheader MATCH_NL_RAW Content-Type:raw =~ /msword;\n\tname/ - mimeheader MIMEHEADER_NOTFOUND xyzzy =~ /foobar/ - mimeheader MIMEHEADER_FOUND xyzzy =~ /foobar/ [if-unset: xyzfoobarxyz] + mimeheader MIMEHEADER_NOTFOUND1 xyzzy =~ /foobar/ + mimeheader MIMEHEADER_FOUND1 xyzzy =~ /foobar/ [if-unset: xyzfoobarxyz] + + mimeheader MIMEHEADER_FOUND2 Content-Type !~ /xyzzy/ - }); + # ALL and concat + mimeheader MIMEHEADER_CONCAT1 ALL =~ /\nContent-Type: multipart\/mixed;.*?\nContent-Type: multipart\/alternative;.*?\nContent-Type: text\/plain/s + tflags MIMEHEADER_CONCAT1 concat + + # range + mimeheader MIMEHEADER_RANGE1 Content-Type =~ /^multipart\/mixed;/ + tflags MIMEHEADER_RANGE1 range=1 + mimeheader MIMEHEADER_RANGE2 Content-Type =~ /^multipart\/alternative.*?text\/plain; charset="iso-8859-2"$/s + tflags MIMEHEADER_RANGE2 range=2-3 concat + mimeheader MIMEHEADER_RANGE3 Content-Type =~ /Jurek/ + tflags MIMEHEADER_RANGE3 range=2- concat + mimeheader MIMEHEADER_RANGE4 Content-Type =~ /Jurek/ + tflags MIMEHEADER_RANGE4 range=-10 + + # multiple + mimeheader MIMEHEADER_MULTI1 Content-Type =~ /-[82]/ # iso-8859-2, two matches + tflags MIMEHEADER_MULTI1 multiple + meta MIMEHEADER_MULTIMETA1 MIMEHEADER_MULTI1 == 2 + mimeheader MIMEHEADER_MULTI2 ALL =~ /^X-/m # Count X- starting headers + tflags MIMEHEADER_MULTI2 multiple + meta MIMEHEADER_MULTIMETA2 MIMEHEADER_MULTI2 == 4 -sarun ("-L -t < data/nice/004", \&patterns_run_cb); + # named regex capture + mimeheader MIMEHEADER_CAPTURE1 Content-Type =~ /(?text\/\w+)/ +}); + +# Check debug needed for tag check +sarun ("-D check -L -t < data/nice/004 2>&1", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/mimeparse.t spamassassin-4.0.0~rc3/t/mimeparse.t --- spamassassin-3.4.6/t/mimeparse.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/mimeparse.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,95 +1,80 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} +use lib '.'; +use lib 't'; +use SATest; +sa_t_init("mimeparse"); use strict; use Test::More tests => 33; use Mail::SpamAssassin; - -BEGIN { - eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } - or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } -} +use Digest::SHA qw(sha1_hex); my %files = ( - "$prefix/t/data/nice/mime1" => [ + "data/nice/mime1" => [ join("\n", 'multipart/alternative','text/plain', 'multipart/mixed,text/plain','application/andrew-inset'), ], - "$prefix/t/data/nice/mime2" => [ + "data/nice/mime2" => [ join("\n",'audio/basic'), ], - "$prefix/t/data/nice/mime3" => [ + "data/nice/mime3" => [ join("\n", 'multipart/mixed','multipart/mixed,text/plain,audio/x-sun', 'multipart/mixed,image/gif,image/gif,application/x-be2,application/atomicmail', 'audio/x-sun'), ], - "$prefix/t/data/nice/mime4" => [ + "data/nice/mime4" => [ join("\n", 'multipart/mixed','text/plain','image/pgm'), ], - "$prefix/t/data/nice/mime5" => [ + "data/nice/mime5" => [ join("\n", 'multipart/mixed','text/plain','image/pbm'), 'cfbc6b4dbe0d6fe764dd0e0f10023afb0eb0faa9', '6c41ae723b78e63e3763473cd737b84fae366f80' ], - "$prefix/t/data/nice/mime6" => [ + "data/nice/mime6" => [ join("\n",'application/postscript'), ], - "$prefix/t/data/nice/mime7" => [ + "data/nice/mime7" => [ join("\n",'multipart/mixed','audio/basic','audio/basic'), ], - "$prefix/t/data/nice/mime8" => [ + "data/nice/mime8" => [ join("\n",'multipart/mixed','application/postscript','binary','message/rfc822,multipart/mixed,text/plain,multipart/parallel,image/gif,audio/basic,application/atomicmail,message/rfc822,audio/x-sun'), '07fdde1c24f216b05813f6a1ae0c7c1c0f84c42b', '03e5acb518e8aca0b3a7b18f2d94b5efe73495b2' ], - "$prefix/t/data/nice/base64.txt" => [ + "data/nice/base64.txt" => [ join("\n",'multipart/mixed','text/plain','text/plain'), '0147e619903eb01721d04c4f05ab9c9d497be193', 'a0f062b1992b25de8607df1b829d29ede5687126' ], - "$prefix/t/data/spam/badmime.txt" => [ + "data/spam/badmime.txt" => [ join("\n",'multipart/alternative','text/plain','text/html'), 'fe56ab5c4b0199cd2811871adc89cf2a9a3d9748', '2e7fea381fe9f0b34f947ddb7a38b81ece68605d' ], - "$prefix/t/data/spam/badmime2.txt" => [ + "data/spam/badmime2.txt" => [ join("\n",'multipart/alternative','text/plain','text/html'), '05c9e1f1f3638a5191542b0c278debe38ac98a83', 'e6e71e824aec0e204367bfdc9a9e227039f42815' ], - "$prefix/t/data/spam/badmime3.txt" => [ + "data/spam/badmime3.txt" => [ join("\n",'multipart/alternative','text/plain'), '1c9972d2708b27f4da2e2ef87dd64d53bd11d086' ], - "$prefix/t/data/nice/mime9" => [ + "data/nice/mime9" => [ join("\n",'multipart/mixed','text/plain','message/rfc822,message/rfc822,multipart/mixed,multipart/alternative,text/plain,text/html,image/jpeg'), '5cdcabdb89c5fbb3a5e0c0473599668927045d9c', 'f80584aff917e03d54663422918b58e4689cf993', @@ -100,9 +85,9 @@ # initialize SpamAssassin my $sa = Mail::SpamAssassin->new({ - rules_filename => "$prefix/t/log/test_rules_copy", - site_rules_filename => "$prefix/t/log/test_default.cf", - userprefs_filename => "$prefix/masses/spamassassin/user_prefs", + rules_filename => $localrules, + site_rules_filename => $siterules, + userprefs_filename => $userrules, local_tests_only => 1, debug => 0, dont_copy_prefs => 1, diff -Nru spamassassin-3.4.6/t/missing_hb_separator.t spamassassin-4.0.0~rc3/t/missing_hb_separator.t --- spamassassin-3.4.6/t/missing_hb_separator.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/missing_hb_separator.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,20 +1,5 @@ #!/usr/bin/perl -w -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; use lib '.'; use lib 't'; diff -Nru spamassassin-3.4.6/t/mkrules_else.t spamassassin-4.0.0~rc3/t/mkrules_else.t --- spamassassin-3.4.6/t/mkrules_else.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/mkrules_else.t 2022-07-26 22:19:21.000000000 +0000 @@ -3,30 +3,27 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("mkrules_else"); -use Test::More tests => 18; +use Test::More; +plan tests => 18; use File::Copy; use File::Path; # --------------------------------------------------------------------------- print "\n rule with 'else'\n\n"; -my $tdir = "log/mkrules_else_t"; -rmtree([ $tdir ]); +$workdir =~ s!\\!/!g if $RUNNING_ON_WINDOWS; +my $tdir = "$workdir/mkrules_else_t"; +mkdir($tdir); %patterns = ( # ensure these have the appropriate conditional attached - "/(?s)ifplugin Mail::SpamAssassin::Plugin::WhateverNonExistent". - "[^\\n]*\\n". - "die_with_a_syntax_error/" => die_with_a_syntax_error_found, - - "/(?s)if !plugin\\(Mail::SpamAssassin::Plugin::WhateverNonExistent\\)". - "[^\\n]*\\n". - "body GOOD \\/foo\\//" => rule_GOOD, + qr/ifplugin Mail::SpamAssassin::Plugin::WhateverNonExistent[^\n]*\ndie_with_a_syntax_error/s => 'die_with_a_syntax_error_found', + qr/if !plugin\(Mail::SpamAssassin::Plugin::WhateverNonExistent\)[^\n]*\nbody GOOD \/foo\//s => 'rule_GOOD', ); %anti_patterns = ( - "ERROR" => ERROR_in_stdout, - "WARNING" => WARNING_in_stdout, + 'ERROR' => 'ERROR_in_stdout', + 'WARNING' => 'WARNING_in_stdout', ); mkpath ([ "$tdir/rulesrc/sandbox/foo", "$tdir/rules" ]); @@ -57,11 +54,9 @@ %patterns = ( ); %anti_patterns = ( - "/(?s)meta\\s+T_B1\\s+\\S+\\n". - "meta\\s+T_B1\\s+\\S+/" => two_metas_in_one_ifplugin_scope, - - "ERROR" => ERROR_in_stdout, - "WARNING" => WARNING_in_stdout, + qr/meta\s+T_B1\s+\S+\nmeta\s+T_B1\s+\S+/s => 'two_metas_in_one_ifplugin_scope', + 'ERROR' => 'ERROR_in_stdout', + 'WARNING' => 'WARNING_in_stdout', ); mkpath ([ "$tdir/rulesrc/sandbox/foo", "$tdir/rules" ]); @@ -101,11 +96,9 @@ %patterns = ( ); %anti_patterns = ( - "/(?s)meta\\s+__B1\\s+\\S+\\n". - "meta\\s+__B1\\s+\\S+/" => two_metas_in_one_ifplugin_scope, - - "ERROR" => ERROR_in_stdout, - "WARNING" => WARNING_in_stdout, + qr/meta\s+__B1\s+\S+\nmeta\s+__B1\s+\S+/s => 'two_metas_in_one_ifplugin_scope', + 'ERROR' => 'ERROR_in_stdout', + 'WARNING' => 'WARNING_in_stdout', ); mkpath ([ "$tdir/rulesrc/sandbox/foo", "$tdir/rules" ]); @@ -136,8 +129,8 @@ checkfile("$tdir/rules/70_sandbox.cf", \&patterns_run_cb); %patterns = ( - "body T_A1" => T_A1_defined, - "meta __B1" => __B1_defined, + 'body T_A1' => 'T_A1_defined', + 'meta __B1' => '__B1_defined', ); checkfile("$tdir/rules/72_active.cf", \&patterns_run_cb); ok ok_all_patterns(); @@ -163,8 +156,8 @@ my $post_redir = ''; $args =~ s/ 2\>\&1$// and $post_redir = ' 2>&1'; - rmtree ("log/outputdir.tmp"); # some tests use this - mkdir ("log/outputdir.tmp", 0755); + rmtree ("$workdir/outputdir.tmp"); # some tests use this + mkdir ("$workdir/outputdir.tmp", 0755); clear_pattern_counters(); @@ -172,10 +165,10 @@ print ("\t$scrargs\n"); my $test_number = test_number(); - untaint_system ("$scrargs > log/$testname.$test_number $post_redir"); + untaint_system ("$scrargs > $workdir/$testname.$test_number $post_redir"); $mk_exitcode = ($?>>8); if ($mk_exitcode != 0) { return undef; } - &checkfile ("$testname.$test_number", $read_sub) if (defined $read_sub); + &checkfile ("$workdir/$testname.$test_number", $read_sub) if (defined $read_sub); 1; } diff -Nru spamassassin-3.4.6/t/mkrules.t spamassassin-4.0.0~rc3/t/mkrules.t --- spamassassin-3.4.6/t/mkrules.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/mkrules.t 2022-07-26 22:19:21.000000000 +0000 @@ -2,17 +2,18 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("mkrules"); -use Test::More tests => 97; +use Test::More; +plan tests => 97; use File::Copy; use File::Path; # --------------------------------------------------------------------------- print " script runs, even with nothing to do\n\n"; -my $tdir = "log/mkrules_t"; -rmtree([ $tdir ]); +$workdir =~ s!\\!/!g if $RUNNING_ON_WINDOWS; +my $tdir = "$workdir/mkrules_t"; -mkpath (["$tdir/rulesrc", "$tdir/rules"]); +mkpath ([$tdir, "$tdir/rulesrc", "$tdir/rules"]); write_file("$tdir/MANIFEST", [ ]); write_file("$tdir/MANIFEST.SKIP", [ "foo2\n" ]); @@ -296,7 +297,7 @@ "describe GOOD desc_found" => rule_line_2, "ifplugin Good" => if1, "endif" => endif_found, - "rulesrc/sandbox/foo/20_foo.cf: WARNING: plugin code file 'log/mkrules_t/rulesrc/sandbox/foo/plugin.pm' not found, line ignored: loadplugin Good plugin.pm" => plugin_not_found, + "rulesrc/sandbox/foo/20_foo.cf: WARNING: plugin code file '$workdir/mkrules_t/rulesrc/sandbox/foo/plugin.pm' not found, line ignored: loadplugin Good plugin.pm" => plugin_not_found, ); %anti_patterns = ( "describe T_GOOD desc_found" => rule_line_2, @@ -331,7 +332,7 @@ "ifplugin Good" => if1, "endif" => endif_found, "tryplugin Good plugin.pm" => 'tryplugin', - "log/mkrules_t/rulesrc/sandbox/foo/20_foo.cf: WARNING: 'log/mkrules_t/rules/plugin.pm' not listed in manifest file, making 'tryplugin': loadplugin Good plugin.pm" => not_found_in_manifest_warning + "$workdir/mkrules_t/rulesrc/sandbox/foo/20_foo.cf: WARNING: '$workdir/mkrules_t/rules/plugin.pm' not listed in manifest file, making 'tryplugin': loadplugin Good plugin.pm" => not_found_in_manifest_warning ); %anti_patterns = ( ); @@ -448,19 +449,18 @@ my $post_redir = ''; $args =~ s/ 2\>\&1$// and $post_redir = ' 2>&1'; - rmtree ("log/outputdir.tmp"); # some tests use this - mkdir ("log/outputdir.tmp", 0755); + rmtree ("$workdir/outputdir.tmp"); # some tests use this + mkdir ("$workdir/outputdir.tmp", 0755); clear_pattern_counters(); my $scrargs = "$perl_path -I../lib ../build/mkrules $args"; print ("\t$scrargs\n"); - my $test_number = test_number(); - untaint_system ("$scrargs > log/$testname.$test_number $post_redir"); + untaint_system ("$scrargs > $workdir/$testname.$test_number $post_redir"); $mk_exitcode = ($?>>8); if ($mk_exitcode != 0) { return undef; } - &checkfile ("$testname.$test_number", $read_sub) if (defined $read_sub); + &checkfile ("$workdir/$testname.$test_number", $read_sub) if (defined $read_sub); 1; } diff -Nru spamassassin-3.4.6/t/nonspam.t spamassassin-4.0.0~rc3/t/nonspam.t --- spamassassin-3.4.6/t/nonspam.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/nonspam.t 2021-04-12 07:43:12.000000000 +0000 @@ -7,10 +7,9 @@ # --------------------------------------------------------------------------- %patterns = ( - q{ X-Spam-Status: No, }, 'nonspam' - ); sarun ("-L -t < data/nice/001", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/olevbmacro.t spamassassin-4.0.0~rc3/t/olevbmacro.t --- spamassassin-3.4.6/t/olevbmacro.t 2019-11-20 18:19:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/olevbmacro.t 2022-05-28 10:38:25.000000000 +0000 @@ -9,17 +9,15 @@ use Test::More; plan skip_all => 'Need Archive::Zip for this test' unless HAS_ARCHIVE_ZIP; plan skip_all => 'Need IO::String for this test' unless HAS_IO_STRING; -plan tests => 7; - -tstpre (" -loadplugin Mail::SpamAssassin::Plugin::OLEVBMacro -"); +plan tests => 12; tstlocalrules (q{ + loadplugin Mail::SpamAssassin::Plugin::OLEVBMacro + olemacro_extended_scan 1 - body OLEMACRO eval:check_olemacro() - score OLEMACRO 0.1 + body OLEMACRO_FOUND eval:check_olemacro() + score OLEMACRO_FOUND 0.1 body OLEMACRO_MALICE eval:check_olemacro_malice() score OLEMACRO_MALICE 0.1 body OLEMACRO_RENAME eval:check_olemacro_renamed() @@ -30,44 +28,49 @@ score OLEMACRO_ZIP_PW 0.1 body OLEMACRO_CSV eval:check_olemacro_csv() score OLEMACRO_CSV 0.1 + body OLEMACRO_TURI eval:check_olemacro_redirect_uri() + score OLEMACRO_TURI 0.1 }); %patterns = ( - q{ OLEMACRO }, 'OLEMACRO', - ); + q{ 0.1 OLEMACRO_FOUND }, '', +); sarun ("-L -t < data/spam/olevbmacro/macro.eml", \&patterns_run_cb); ok_all_patterns(); clear_pattern_counters(); %patterns = ( - q{ OLEMACRO_MALICE }, 'OLEMACRO_MALICE', - ); + q{ 0.1 OLEMACRO_FOUND }, '', + q{ 0.1 OLEMACRO_MALICE }, '', +); sarun ("-L -t < data/spam/olevbmacro/malicemacro.eml", \&patterns_run_cb); ok_all_patterns(); clear_pattern_counters(); %patterns = ( - q{ OLEMACRO_RENAME }, 'OLEMACRO_RENAME', - ); + q{ 0.1 OLEMACRO_FOUND }, '', + q{ 0.1 OLEMACRO_RENAME }, '', +); sarun ("-L -t < data/spam/olevbmacro/renamedmacro.eml", \&patterns_run_cb); ok_all_patterns(); clear_pattern_counters(); %patterns = ( - q{ OLEMACRO_ENCRYPTED }, 'OLEMACRO_ENCRYPTED', - ); + q{ 0.1 OLEMACRO_ENCRYPTED }, '', +); sarun ("-L -t < data/spam/olevbmacro/encrypted.eml", \&patterns_run_cb); ok_all_patterns(); clear_pattern_counters(); %patterns = ( - q{ OLEMACRO_ZIP_PW }, 'OLEMACRO_ZIP_PW', - ); + q{ 0.1 OLEMACRO_FOUND }, '', + q{ 0.1 OLEMACRO_ZIP_PW }, '', +); sarun ("-L -t < data/spam/olevbmacro/zippwmacro.eml", \&patterns_run_cb); ok_all_patterns(); @@ -75,16 +78,25 @@ %patterns = (); %anti_patterns = ( - q{ OLEMACRO }, 'OLEMACRO', - ); + q{ 0.1 OLEMACRO_FOUND }, '', +); sarun ("-L -t < data/spam/olevbmacro/nomacro.eml", \&patterns_run_cb); ok_all_patterns(); %patterns = (); %anti_patterns = ( - q{ OLEMACRO_CSV }, 'OLEMACRO_CSV', - ); + q{ 0.1 OLEMACRO_FOUND }, '', + q{ 0.1 OLEMACRO_CSV }, '', +); sarun ("-L -t < data/spam/olevbmacro/goodcsv.eml", \&patterns_run_cb); ok_all_patterns(); + +%patterns = ( + q{ 0.1 OLEMACRO_TURI }, '', +); +%anti_patterns = (); + +sarun ("-L -t < data/spam/olevbmacro/target_uri.eml", \&patterns_run_cb); +ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/originating_ip_hdr.t spamassassin-4.0.0~rc3/t/originating_ip_hdr.t --- spamassassin-3.4.6/t/originating_ip_hdr.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/originating_ip_hdr.t 2022-05-28 10:38:25.000000000 +0000 @@ -7,14 +7,17 @@ # --------------------------------------------------------------------------- tstlocalrules (q{ + clear_originating_ip_headers + originating_ip_headers X-Yahoo-Post-IP X-Apparently-From + originating_ip_headers X-Originating-IP X-SenderIP header TEST_ORIG_IP_H1 X-Spam-Relays-External =~ /\bip=198\.51\.100\.1\b/ score TEST_ORIG_IP_H1 0.1 header TEST_ORIG_IP_H2 X-Spam-Relays-External =~ /\bip=198\.51\.100\.2\b/ score TEST_ORIG_IP_H2 0.1 }); -%patterns = ( q{ TEST_ORIG_IP_H1 }, 'test_orig_ip_h1' ); -%anti_patterns = ( q{ TEST_ORIG_IP_H2 }, 'test_orig_ip_h2' ); +%patterns = ( q{ 0.1 TEST_ORIG_IP_H1 }, '' ); +%anti_patterns = ( q{ TEST_ORIG_IP_H2 }, '' ); ok(sarun("-L -t < data/nice/orig_ip_hdr.eml", \&patterns_run_cb)); ok_all_patterns(); @@ -32,8 +35,8 @@ score TEST_ORIG_IP_H2 0.1 }); -%patterns = ( q{ TEST_ORIG_IP_H1 }, 'test_orig_ip_h1', - q{ TEST_ORIG_IP_H2 }, 'test_orig_ip_h2' ); +%patterns = ( q{ 0.1 TEST_ORIG_IP_H1 }, '', + q{ TEST_ORIG_IP_H2 }, '' ); %anti_patterns = (); ok(sarun("-L -t < data/nice/orig_ip_hdr.eml", \&patterns_run_cb)); @@ -50,8 +53,8 @@ }); %patterns = (); -%anti_patterns = ( q{ TEST_ORIG_IP_H1 }, 'test_orig_ip_h1', - q{ TEST_ORIG_IP_H2 }, 'test_orig_ip_h2' ); +%anti_patterns = ( q{ 0.1 TEST_ORIG_IP_H1 }, '', + q{ TEST_ORIG_IP_H2 }, '' ); ok(sarun("-L -t < data/nice/orig_ip_hdr.eml", \&patterns_run_cb)); ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/pdfinfo.t spamassassin-4.0.0~rc3/t/pdfinfo.t --- spamassassin-3.4.6/t/pdfinfo.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/pdfinfo.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,59 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("pdfinfo"); + +use Test::More; + +plan tests => 17; + +%patterns = ( + q{ 1.0 PDFINFO_NAMED_REANY }, '', + q{ 1.0 PDFINFO_DETAILS_CREATED }, '', + q{ 1.0 PDFINFO_DETAILS_PRODUCER }, '', + q{ 1.0 PDFINFO_DETAILS_CREATOR }, '', + q{ 1.0 PDFINFO_COUNT_1 }, '', + q{ 1.0 PDFINFO_EMPTY_BODY_0 }, '', + q{ 1.0 PDFINFO_EMPTY_BODY_1000 }, '', +); +%anti_patterns = ( + q{ PDFINFO_DETAILS_AUTHOR }, '', + q{ PDFINFO_DETAILS_TITLE }, '', + q{ PDFINFO_COUNT_2_3 }, '', + q{ PDFINFO_IMAGE_COUNT }, '', + q{ PDFINFO_NAMED_FOO }, '', + q{ PDFINFO_DETAILS_MODIFIED }, '', + q{ PDFINFO_ENCRYPTED }, '', + q{ PDFINFO_DETAILS_MODIFIED }, '', + q{ PDFINFO_ENCRYPTED }, '', + q{ PDFINFO_MD5 }, '', + q{ PDFINFO_FUZZY_MD5 }, '', + q{ PDFINFO_PC }, '' +); + +tstprefs(" +body PDFINFO_COUNT_1 eval:pdf_count(1) +body PDFINFO_COUNT_2_3 eval:pdf_count(2,3) +body PDFINFO_IMAGE_COUNT_1 eval:pdf_image_count(1) +body PDFINFO_IMAGE_COUNT_2_3 eval:pdf_image_count(2,3) +body PDFINFO_PC_1000 eval:pdf_pixel_coverage(1000) +body PDFINFO_PC_10000_100000 eval:pdf_pixel_coverage(10000,100000) +body PDFINFO_NAMED_FOO eval:pdf_named('foo.pdf') +body PDFINFO_NAMED_REANY eval:pdf_name_regex('/.+/') +body PDFINFO_MD5 eval:pdf_match_md5('XXYYZZ') +body PDFINFO_FUZZY_MD5 eval:pdf_match_md5('XXYYZZ') +body PDFINFO_DETAILS_AUTHOR eval:pdf_match_details('author', '/.+/') +body PDFINFO_DETAILS_CREATOR eval:pdf_match_details('creator', '/^Writer\$/') +body PDFINFO_DETAILS_CREATED eval:pdf_match_details('created', '/.+/') +body PDFINFO_DETAILS_MODIFIED eval:pdf_match_details('modified', '/.+/') +body PDFINFO_DETAILS_PRODUCER eval:pdf_match_details('producer', '/.+/') +body PDFINFO_DETAILS_TITLE eval:pdf_match_details('title', '/.+/') +body PDFINFO_ENCRYPTED eval:pdf_is_encrypted() +body PDFINFO_EMPTY_BODY_0 eval:pdf_is_empty_body() +body PDFINFO_EMPTY_BODY_1000 eval:pdf_is_empty_body(1000) +"); + +sarun ("-L -t < data/spam/extracttext/gtube_pdf.eml", \&patterns_run_cb); +ok_all_patterns(); +clear_pattern_counters(); + diff -Nru spamassassin-3.4.6/t/perlcritic.pl spamassassin-4.0.0~rc3/t/perlcritic.pl --- spamassassin-3.4.6/t/perlcritic.pl 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/perlcritic.pl 2022-08-16 08:33:56.000000000 +0000 @@ -0,0 +1,34 @@ +#!/usr/bin/perl + +use lib '.'; use lib 't'; +use SATest; sa_t_init('perlcritic'); + +use strict; +use warnings; +use Test::More; +use English qw(-no_match_vars); + +plan skip_all => "This test requires Test::Perl::Critic" unless (eval { require Test::Perl::Critic; 1} ); +plan skip_all => "PerlCritic test cannot run in Taint mode" if (${^TAINT}); + +open RC, ">../t/log/perlcritic.rc" or die "cannot create t/log/perlcritic.rc"; + +# we should remove some of these excludes if/when we feel like fixing 'em! +print RC q{ + + severity = 5 + verbose = 9 + exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen BuiltinFunctions::ProhibitStringyEval InputOutput::ProhibitInteractiveTest Bangs::ProhibitBitwiseOperators Compatibility::ProhibitThreeArgumentOpen Lax::ProhibitStringyEval::ExceptForRequire Lax::ProhibitLeadingZeros::ExceptChmod ValuesAndExpressions::PreventSQLInjection ControlStructures::ProhibitReturnInDoBlock ValuesAndExpressions::ProhibitAccessOfPrivateData Policy::OTRS:: + + [TestingAndDebugging::ProhibitNoStrict] + allow = refs + + [Perlsecret] + allow_secrets = Venus + +} or die "cannot write t/log/perlcritic.rc"; +close RC or die "cannot close t/log/perlcritic.rc"; + +Test::Perl::Critic->import( -profile => "../t/log/perlcritic.rc" ); +all_critic_ok("../blib"); + diff -Nru spamassassin-3.4.6/t/perlcritic.t spamassassin-4.0.0~rc3/t/perlcritic.t --- spamassassin-3.4.6/t/perlcritic.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/perlcritic.t 2022-08-15 05:06:36.000000000 +0000 @@ -0,0 +1,14 @@ +#!/usr/bin/perl -T +# Wrapper around test until perlcritic fixes bug running under -T + +# sa_t_init handles a number of necessary cross-platform initialization that is necessary +# even though this wrapper doesn't need most things that are also in there +use lib '.'; use lib 't'; +use SATest; sa_t_init('perlcritic'); + +use strict; +use warnings; + +-d "t" && "$^X t/perlcritic.pl" =~ /(.*)/ || + "$^X perlcritic.pl" =~ /(.*)/; +exec($1); diff -Nru spamassassin-3.4.6/t/phishing.t spamassassin-4.0.0~rc3/t/phishing.t --- spamassassin-3.4.6/t/phishing.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/phishing.t 2021-04-12 07:43:12.000000000 +0000 @@ -6,26 +6,25 @@ use Test::More; plan tests => 2; -tstpre (" -loadplugin Mail::SpamAssassin::Plugin::Phishing -"); - tstprefs(" -phishing_openphish_feed data/phishing/openphish-feed.txt -phishing_phishtank_feed data/phishing/phishtank-feed.csv -body URI_PHISHING eval:check_phishing() -describe URI_PHISHING Url match phishing in feed + loadplugin Mail::SpamAssassin::Plugin::Phishing + + phishing_openphish_feed data/phishing/openphish-feed.txt + phishing_phishtank_feed data/phishing/phishtank-feed.csv + + body URI_PHISHING eval:check_phishing() + describe URI_PHISHING Url match phishing in feed "); %patterns_openphish = ( - q{ URI_PHISHING } => 'OpenPhish', - ); + q{ URI_PHISHING } => 'OpenPhish', +); %patterns_phishtank = ( - q{ URI_PHISHING } => 'PhishTank', - ); + q{ URI_PHISHING } => 'PhishTank', +); %patterns = %patterns_openphish; sarun ("-L -t < data/spam/phishing_openphish.eml", \&patterns_run_cb); @@ -35,3 +34,4 @@ %patterns = %patterns_phishtank; sarun ("-L -t < data/spam/phishing_phishtank.eml", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/plugin_file.t spamassassin-4.0.0~rc3/t/plugin_file.t --- spamassassin-3.4.6/t/plugin_file.t 2019-08-09 15:43:02.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/plugin_file.t 2022-05-28 10:38:25.000000000 +0000 @@ -7,32 +7,27 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ GTUBE }, 'gtube', -q{ MY_TEST_PLUGIN }, 'plugin_called', -q{ registered myTestPlugin }, 'registered', -q{ myTestPlugin eval test called }, 'test_called', -q{ myTestPlugin finishing }, 'plugin_finished', - -q{ test: plugins loaded: Mail::SpamAssassin::Plugin::ASN=HASH }, 'plugins_loaded', -q{ myTestPlugin=HASH }, 'plugins_loaded2', - + q{ 1000 GTUBE }, 'gtube', + q{ 1.0 MY_TEST_PLUGIN }, 'plugin_called', + 'registered myTestPlugin', 'registered', + 'myTestPlugin eval test called', 'test_called', + 'myTestPlugin finishing', 'plugin_finished', + 'test: plugins loaded: Mail::SpamAssassin::Plugin::ASN=HASH', 'plugins_loaded', + 'myTestPlugin=HASH', 'plugins_loaded2', ); %anti_patterns = ( - -q{ SHOULD_NOT_BE_CALLED }, 'should_not_be_called' - + 'SHOULD_NOT_BE_CALLED', 'should_not_be_called' ); tstlocalrules (" - loadplugin myTestPlugin ../../data/testplugin.pm - ifplugin FooPlugin - header SHOULD_NOT_BE_CALLED eval:doesnt_exist() - endif - if plugin(myTestPlugin) - header MY_TEST_PLUGIN eval:check_test_plugin() - endif + loadplugin myTestPlugin ../../../data/testplugin.pm + ifplugin FooPlugin + header SHOULD_NOT_BE_CALLED eval:doesnt_exist() + endif + if plugin(myTestPlugin) + header MY_TEST_PLUGIN eval:check_test_plugin() + endif "); ok (sarun ("-L -t < data/spam/gtube.eml", \&patterns_run_cb)); diff -Nru spamassassin-3.4.6/t/plugin_priorities.t spamassassin-4.0.0~rc3/t/plugin_priorities.t --- spamassassin-3.4.6/t/plugin_priorities.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/plugin_priorities.t 2021-04-12 07:43:12.000000000 +0000 @@ -7,18 +7,15 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ META2_FOUND } => '', - + q{ META2_FOUND } => '', ); %anti_patterns = (); tstlocalrules (" - loadplugin myTestPlugin ../../data/testplugin.pm - loadplugin myTestPlugin2 ../../data/testplugin2.pm - header META2_FOUND Plugin-Meta-Test2 =~ /bar2/ - + loadplugin myTestPlugin ../../../data/testplugin.pm + loadplugin myTestPlugin2 ../../../data/testplugin2.pm + header META2_FOUND Plugin-Meta-Test2 =~ /bar2/ "); ok (sarun ("-L -t < data/spam/gtube.eml", \&patterns_run_cb)); diff -Nru spamassassin-3.4.6/t/plugin.t spamassassin-4.0.0~rc3/t/plugin.t --- spamassassin-3.4.6/t/plugin.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/plugin.t 2022-05-28 10:38:25.000000000 +0000 @@ -7,28 +7,24 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ GTUBE }, 'gtube', -q{ MY_TEST_PLUGIN }, 'plugin_called', -q{ registered Mail::SpamAssassin::Plugin::Test }, 'registered', -q{ Mail::SpamAssassin::Plugin::Test eval test called }, 'test_called', - + q{ 1000 GTUBE }, 'gtube', + q{ 1.0 MY_TEST_PLUGIN }, 'plugin_called', + 'registered Mail::SpamAssassin::Plugin::Test', 'registered', + 'Mail::SpamAssassin::Plugin::Test eval test called', 'test_called', ); %anti_patterns = ( - -q{ SHOULD_NOT_BE_CALLED }, 'should_not_be_called' - + 'SHOULD_NOT_BE_CALLED', '', ); tstlocalrules (" - loadplugin Mail::SpamAssassin::Plugin::Test - ifplugin FooPlugin - header SHOULD_NOT_BE_CALLED eval:doesnt_exist() - endif - if plugin(Mail::SpamAssassin::Plugin::Test) - header MY_TEST_PLUGIN eval:check_test_plugin() - endif + loadplugin Mail::SpamAssassin::Plugin::Test + ifplugin FooPlugin + header SHOULD_NOT_BE_CALLED eval:doesnt_exist() + endif + if plugin(Mail::SpamAssassin::Plugin::Test) + header MY_TEST_PLUGIN eval:check_test_plugin() + endif "); ok (sarun ("-L -t < data/spam/gtube.eml", \&patterns_run_cb)); diff -Nru spamassassin-3.4.6/t/prefs_include.t spamassassin-4.0.0~rc3/t/prefs_include.t --- spamassassin-3.4.6/t/prefs_include.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/prefs_include.t 2022-05-28 10:38:25.000000000 +0000 @@ -2,29 +2,27 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("prefs_include"); -use Test::More tests => 2; +use Test::More tests => 3; $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C'; # a cheat, but we need the patterns to work # --------------------------------------------------------------------------- %patterns = ( - - q{X-Spam-Report: =?ISO-8859-1?Q? }, 'qp-encoded-hdr', - q{ Invalid Date: header =ae =af =b0 foo }, 'qp-encoded-desc', - + qr/^X-Spam-Report:\s*$/m, 'qp-encoded-hdr', + qr/^\t\*\s+[0-9.-]+ INVALID_DATE\s+Invalid Date: header =\?UTF-8\?B\?wq4gwq8gwrA=\?=$/m, 'qp-encoded-desc', + qr/^ [0-9.-]+ INVALID_DATE\s+Invalid Date: header ® ¯ °$/m, 'report-desc', ); tstprefs (" - $default_cf_lines - include prefs_include.inc - "); + include prefs_include.inc +"); -open (OUT, ">log/prefs_include.inc") or die "open log/prefs_include.inc failed"; +open (OUT, ">$localrules/prefs_include.inc") or die "open $workdir/prefs_include.inc failed"; print OUT " - report_safe 0 - describe INVALID_DATE Invalid Date: header \xae \xaf \xb0 foo - "; + report_safe 0 + describe INVALID_DATE Invalid Date: header ® ¯ ° +"; close OUT; sarun ("-L -t < data/spam/001", \&patterns_run_cb); diff -Nru spamassassin-3.4.6/t/priorities.t spamassassin-4.0.0~rc3/t/priorities.t --- spamassassin-3.4.6/t/priorities.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/priorities.t 2022-05-04 11:06:22.000000000 +0000 @@ -1,20 +1,5 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/priorities.t", kluge around ... - chdir 't'; - } - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use lib '.'; use lib 't'; use SATest; sa_t_init("priorities"); use strict; @@ -22,8 +7,81 @@ use Mail::SpamAssassin; +disable_compat "welcomelist_blocklist"; + tstlocalrules (q{ + body BAYES_99 eval:check_bayes('0.99', '1.00') + tflags BAYES_99 learn + score BAYES_99 0 0 3.5 3.5 + + header USER_IN_BLOCKLIST eval:check_from_in_blocklist() + describe USER_IN_BLOCKLIST From: user is listed in the block-list + tflags USER_IN_BLOCKLIST userconf nice noautolearn + score USER_IN_BLOCKLIST 100 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_BLACKLIST (USER_IN_BLOCKLIST) + describe USER_IN_BLACKLIST DEPRECATED: See USER_IN_BLOCKLIST + tflags USER_IN_BLACKLIST userconf nice noautolearn + score USER_IN_BLACKLIST 100 + score USER_IN_BLOCKLIST 0.01 + endif + + header USER_IN_WELCOMELIST eval:check_from_in_welcomelist() + describe USER_IN_WELCOMELIST User is listed in 'welcomelist_from' + tflags USER_IN_WELCOMELIST userconf nice noautolearn + score USER_IN_WELCOMELIST -100 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_WHITELIST (USER_IN_WELCOMELIST) + describe USER_IN_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST + tflags USER_IN_WHITELIST userconf nice noautolearn + score USER_IN_WHITELIST -100 + score USER_IN_WELCOMELIST -0.01 + endif + + header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist() + describe USER_IN_DEF_WELCOMELIST From: user is listed in the default welcome-list + tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn + score USER_IN_DEF_WELCOMELIST -15 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST) + describe USER_IN_DEF_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST + tflags USER_IN_DEF_WHITELIST userconf nice noautolearn + score USER_IN_DEF_WHITELIST -15 + score USER_IN_DEF_WELCOMELIST -0.01 + endif + + header USER_IN_BLOCKLIST_TO eval:check_to_in_blocklist() + describe USER_IN_BLOCKLIST_TO User is listed in 'blocklist_to' + tflags USER_IN_BLOCKLIST_TO userconf nice noautolearn + score USER_IN_BLOCKLIST_TO 10 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_BLACKLIST_TO (USER_IN_BLOCKLIST_TO) + describe USER_IN_BLACKLIST_TO DEPRECATED: See USER_IN_BLOCKLIST_TO + tflags USER_IN_BLACKLIST_TO userconf nice noautolearn + score USER_IN_BLACKLIST_TO 10 + score USER_IN_BLOCKLIST_TO 0.01 + endif + header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist() + describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to' + tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn + score USER_IN_WELCOMELIST_TO -6 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO) + describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO + tflags USER_IN_WHITELIST_TO userconf nice noautolearn + score USER_IN_WHITELIST_TO -6 + score USER_IN_WELCOMELIST_TO -0.01 + endif + + header USER_IN_ALL_SPAM_TO eval:check_to_in_all_spam() + tflags USER_IN_ALL_SPAM_TO userconf nice noautolearn + priority USER_IN_WHITELIST -1000 priority USER_IN_DEF_WHITELIST -1000 priority USER_IN_ALL_SPAM_TO -1000 @@ -98,8 +156,8 @@ sub assert_rule_pri { my ($r, $pri) = @_; - if (defined $conf->{rbl_evals}->{$r}) { - # ignore rbl_evals; they do not use the priority system at all + if (defined $conf->{rbl_evals}->{$r} || defined $conf->{meta_tests}->{$r}) { + # ignore rbl_evals and metas; they do not use the priority system at all return 1; } diff -Nru spamassassin-3.4.6/t/priorities_welcome_block.t spamassassin-4.0.0~rc3/t/priorities_welcome_block.t --- spamassassin-3.4.6/t/priorities_welcome_block.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/priorities_welcome_block.t 2022-05-04 11:06:22.000000000 +0000 @@ -0,0 +1,175 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("priorities_welcome_block"); +use strict; +use Test::More tests => 10; + +use Mail::SpamAssassin; + +tstlocalrules (q{ + + body BAYES_99 eval:check_bayes('0.99', '1.00') + tflags BAYES_99 learn + score BAYES_99 0 0 3.5 3.5 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_BLACKLIST (USER_IN_BLOCKLIST) + describe USER_IN_BLACKLIST DEPRECATED: See USER_IN_BLOCKLIST + tflags USER_IN_BLACKLIST userconf nice noautolearn + score USER_IN_BLACKLIST 100 + score USER_IN_BLOCKLIST 0.01 + endif + + header USER_IN_WELCOMELIST eval:check_from_in_welcomelist() + describe USER_IN_WELCOMELIST User is listed in 'welcomelist_from' + tflags USER_IN_WELCOMELIST userconf nice noautolearn + score USER_IN_WELCOMELIST -100 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_WHITELIST (USER_IN_WELCOMELIST) + describe USER_IN_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST + tflags USER_IN_WHITELIST userconf nice noautolearn + score USER_IN_WHITELIST -100 + score USER_IN_WELCOMELIST -0.01 + endif + + header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist() + describe USER_IN_DEF_WELCOMELIST From: user is listed in the default welcome-list + tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn + score USER_IN_DEF_WELCOMELIST -15 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST) + describe USER_IN_DEF_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST + tflags USER_IN_DEF_WHITELIST userconf nice noautolearn + score USER_IN_DEF_WHITELIST -15 + score USER_IN_DEF_WELCOMELIST -0.01 + endif + + header USER_IN_BLOCKLIST_TO eval:check_to_in_blocklist() + describe USER_IN_BLOCKLIST_TO User is listed in 'blocklist_to' + tflags USER_IN_BLOCKLIST_TO userconf nice noautolearn + score USER_IN_BLOCKLIST_TO 10 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_BLACKLIST_TO (USER_IN_BLOCKLIST_TO) + describe USER_IN_BLACKLIST_TO DEPRECATED: See USER_IN_BLOCKLIST_TO + tflags USER_IN_BLACKLIST_TO userconf nice noautolearn + score USER_IN_BLACKLIST_TO 10 + score USER_IN_BLOCKLIST_TO 0.01 + endif + header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist() + describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to' + tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn + score USER_IN_WELCOMELIST_TO -6 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO) + describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO + tflags USER_IN_WHITELIST_TO userconf nice noautolearn + score USER_IN_WHITELIST_TO -6 + score USER_IN_WELCOMELIST_TO -0.01 + endif + + header USER_IN_ALL_SPAM_TO eval:check_to_in_all_spam() + tflags USER_IN_ALL_SPAM_TO userconf nice noautolearn + + priority USER_IN_WELCOMELIST -1000 + priority USER_IN_DEF_WELCOMELIST -1000 + priority USER_IN_ALL_SPAM_TO -1000 + priority SUBJECT_IN_WELCOMELIST -1000 + + priority ALL_TRUSTED -950 + + priority SUBJECT_IN_BLOCKLIST -900 + priority USER_IN_BLOCKLIST_TO -900 + priority USER_IN_BLOCKLIST -900 + + priority BAYES_99 -400 + + header XX_RCVD_IN_SORBS_SMTP eval:check_rbl_sub('sorbs', '127.0.0.5') + tflags XX_RCVD_IN_SORBS_SMTP net + score XX_RCVD_IN_SORBS_SMTP 1 + + meta SC_URIBL_SURBL (URIBL_BLACK && (URIBL_SC_SURBL || URIBL_JP_SURBL || URIBL_OB_SURBL ) && RCVD_IN_SORBS_SMTP) + meta SC_URIBL_HASH ((URIBL_BLACK || URIBL_SC_SURBL || URIBL_JP_SURBL || URIBL_OB_SURBL) && (RAZOR2_CHECK || DCC_CHECK || PYZOR_CHECK)) + meta SC_URIBL_SBL ((URIBL_BLACK || URIBL_SC_SURBL || URIBL_JP_SURBL || URIBL_OB_SURBL) && URIBL_SBL) + meta SC_URIBL_BAYES ((URIBL_BLACK || URIBL_SC_SURBL || URIBL_JP_SURBL || URIBL_OB_SURBL) && BAYES_99) + + shortcircuit SC_URIBL_SURBL spam + shortcircuit SC_URIBL_HASH spam + shortcircuit SC_URIBL_SBL spam + shortcircuit SC_URIBL_BAYES spam + + priority SC_URIBL_SURBL -530 + priority SC_URIBL_HASH -510 + priority SC_URIBL_SBL -510 + priority SC_URIBL_BAYES -510 + + shortcircuit DIGEST_MULTIPLE spam + priority DIGEST_MULTIPLE -300 + + meta FOO1 (FOO2 && FOO3) + meta FOO2 (1) + meta FOO3 (FOO4 && FOO5) + meta FOO4 (2) + meta FOO5 (3) + priority FOO5 -23 + priority FOO1 -28 + +}); + +my $sa = create_saobj({ + dont_copy_prefs => 1, + # debug => 1 +}); + +$sa->init(0); # parse rules +ok($sa); +my $conf = $sa->{conf}; +sub assert_rule_pri; + +ok assert_rule_pri 'USER_IN_WELCOMELIST', -1000; + +ok assert_rule_pri 'SC_URIBL_SURBL', -530; +ok assert_rule_pri 'SC_URIBL_HASH', -510; +ok assert_rule_pri 'SC_URIBL_SBL', -510; +ok assert_rule_pri 'SC_URIBL_BAYES', -510; +ok assert_rule_pri 'XX_RCVD_IN_SORBS_SMTP', -530; + +# SC_URIBL_BAYES will have overridden its base priority setting +ok assert_rule_pri 'BAYES_99', -510; + +ok assert_rule_pri 'FOO5', -28; +ok assert_rule_pri 'FOO1', -28; + +# --------------------------------------------------------------------------- + +sub assert_rule_pri { + my ($r, $pri) = @_; + + if (defined $conf->{rbl_evals}->{$r} || defined $conf->{meta_tests}->{$r}) { + # ignore rbl_evals and metas; they do not use the priority system at all + return 1; + } + + foreach my $ruletype (qw( + body_tests head_tests meta_tests uri_tests rawbody_tests full_tests + full_evals rawbody_evals head_evals body_evals + )) + { + if (defined $conf->{$ruletype}->{$pri}->{$r}) { + return 1; + } + foreach my $foundpri (keys %{$conf->{priorities}}) { + next unless (defined $conf->{$ruletype}->{$foundpri}->{$r}); + warn "FAIL: rule '$r' not found at priority $pri; found at $foundpri\n"; + return 0; + } + } + + warn "FAIL: no rule '$r' found of any type at any priority\n"; + return 0; +} + diff -Nru spamassassin-3.4.6/t/pyzor.t spamassassin-4.0.0~rc3/t/pyzor.t --- spamassassin-3.4.6/t/pyzor.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/pyzor.t 2022-06-15 23:10:44.000000000 +0000 @@ -0,0 +1,55 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("pyzor"); + +use Mail::SpamAssassin::Util; +use constant HAS_PYZOR => Mail::SpamAssassin::Util::find_executable_in_env_path('pyzor'); + +use Test::More; +plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); +plan skip_all => "Pyzor executable not found in path" unless HAS_PYZOR; +plan tests => 8; + +diag('Note: Failures may not be an SpamAssassin bug, as Pyzor tests can fail due to problems with the Pyzor servers.'); + +# --------------------------------------------------------------------------- + +tstprefs (" + full PYZOR_CHECK eval:check_pyzor() + tflags PYZOR_CHECK net autolearn_body + dns_available no + use_pyzor 1 + pyzor_count_min 1 + score PYZOR_CHECK 3.3 +"); + +#PYZOR file was from real-world spam in October 2021 + +#TESTING FOR SPAM +%patterns = ( + q{ 3.3 PYZOR_CHECK }, 'spam', +); + +# Windows cmd doesn't recognize ' character +sarun ("--cf=\"pyzor_fork 0\" -t < data/spam/pyzor", \&patterns_run_cb); +ok_all_patterns(); +# Same with fork +sarun ("--cf=\"pyzor_fork 1\" -t < data/spam/pyzor", \&patterns_run_cb); +ok_all_patterns(); + +#TESTING FOR HAM +%patterns = ( + 'pyzor: got response: public.pyzor.org' => 'response', + 'pyzor: result: COUNT=0' => 'zerocount', +); +%anti_patterns = ( + q{ 3.3 PYZOR_CHECK }, 'nonspam', +); + +sarun ("-D pyzor --cf=\"pyzor_fork 0\" -t < data/nice/001 2>&1", \&patterns_run_cb); +ok_all_patterns(); +# same with fork +sarun ("-D pyzor --cf=\"pyzor_fork 1\" -t < data/nice/001 2>&1", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/razor2.t spamassassin-4.0.0~rc3/t/razor2.t --- spamassassin-3.4.6/t/razor2.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/razor2.t 2022-05-04 11:06:22.000000000 +0000 @@ -1,9 +1,7 @@ #!/usr/bin/perl -T -use lib '.'; -use lib 't'; -use SATest; -sa_t_init("razor2"); +use lib '.'; use lib 't'; +use SATest; sa_t_init("razor2"); use constant HAS_RAZOR2 => eval { require Razor2::Client::Agent; }; use constant HAS_RAZOR2_IDENT => eval { -r $ENV{'HOME'}.'/.razor/identity'; }; @@ -12,39 +10,45 @@ plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); plan skip_all => "Needs Razor2" unless HAS_RAZOR2; plan skip_all => "Needs Razor2 Identity File Needed. razor-register / razor-admin -register has not been run, or identity file ($ENV{'HOME'}/.razor/identity) is unreadable." unless HAS_RAZOR2_IDENT; -plan tests => 2; +plan tests => 8; diag('Note: Failures may not be an SpamAssassin bug, as Razor tests can fail due to problems with the Razor servers.'); # --------------------------------------------------------------------------- -#report the email as spam so it fails below. This process is not likely to work and I can't find a test point for razor. KAM 2018-08-20 -#unless (HAS_RAZOR2 or HAS_RAZOR2_IDENT) { -# system ("razor-report < data/spam/001"); -# if (($? >> 8) != 0) { -# warn "'razor-report < data/spam/001' failed. This may cause this test to fail.\n"; -# } -#} - -tstpre (" -loadplugin Mail::SpamAssassin::Plugin::Razor2 +tstprefs (" + full RAZOR2_CHECK eval:check_razor2() + tflags RAZOR2_CHECK net autolearn_body + dns_available no + use_razor2 1 + score RAZOR2_CHECK 3.3 "); -#RAZOR2 file was from real-world spam in June 2019 +#RAZOR2 file contains a test string supplied by Razor tech support #TESTING FOR SPAM %patterns = ( - q{ Listed in Razor2 }, 'spam', - ); + q{ 3.3 RAZOR2_CHECK }, 'spam', +); sarun ("-t < data/spam/razor2", \&patterns_run_cb); ok_all_patterns(); +# Same with fork +sarun ("--cf='razor_fork 1' -t < data/spam/razor2", \&patterns_run_cb); +ok_all_patterns(); #TESTING FOR HAM -%patterns = (); +%patterns = ( + 'Connection established', 'connection', + 'razor2: part=0 engine=8 contested=0 confidence=0', 'result', +); %anti_patterns = ( - q{ Listed in Razor2 }, 'nonspam', - ); + q{ 3.3 RAZOR2_CHECK }, 'nonspam', +); -sarun ("-t < data/nice/001", \&patterns_run_cb); +sarun ("-D razor2 -t < data/nice/001 2>&1", \&patterns_run_cb); ok_all_patterns(); +# same with fork +sarun ("-D razor2 --cf='razor_fork 1' -t < data/nice/001 2>&1", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/rcvd_parser.t spamassassin-4.0.0~rc3/t/rcvd_parser.t --- spamassassin-3.4.6/t/rcvd_parser.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/rcvd_parser.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,21 +1,5 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use lib '.'; use lib 't'; use SATest; sa_t_init("rcvd_parser"); use Test::More tests => 147; diff -Nru spamassassin-3.4.6/t/README spamassassin-4.0.0~rc3/t/README --- spamassassin-3.4.6/t/README 2020-10-06 10:20:40.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/README 2022-05-04 13:43:43.000000000 +0000 @@ -16,6 +16,11 @@ See the INSTALL file for details on the build and installation process. +For faster testing with multiple CPUs, you can activate parallel processing +with HARNESS_OPTIONS=j. For example, this would run 8 tests in parallel: + + make test HARNESS_OPTIONS=j8 + Regression Test Options ----------------------- @@ -80,9 +85,9 @@ SPAMD_HOST SPAMD_PORT SPAMD_LOCALHOST +SPAMD_SCRIPT SPAMASSASSIN_SCRIPT SPAMC_SCRIPT -SPAMD_SCRIPT SAAWL_SCRIPT SACHECKSPAMD_SCRIPT SALEARN_SCRIPT diff -Nru spamassassin-3.4.6/t/re_base_extraction.t spamassassin-4.0.0~rc3/t/re_base_extraction.t --- spamassassin-3.4.6/t/re_base_extraction.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/re_base_extraction.t 2022-07-03 10:22:54.000000000 +0000 @@ -10,20 +10,9 @@ use warnings; my $debug = 0; -my $running_perl56 = ($] < 5.007); -# perl 5.6.1 on Solaris fails all tests here if PERL_DL_NONLAZY=1 -# but works fine if it is =0. ho hum -$ENV{'PERL_DL_NONLAZY'} = 0; - -close STDIN; # inhibits noise from sa-compile - -BEGIN { - if (-e 't/test_dir') { chdir 't'; } - if (-e 'test_dir') { unshift(@INC, '../blib/lib'); } -} - -use Test::More tests => 128; +use Test::More; +plan tests => 128; use lib '../lib'; # --------------------------------------------------------------------------- @@ -199,11 +188,7 @@ # skip this one for perl 5.6.*; it does not truncate the long strings in the # same place as 5.8.* and 5.9.*, although they still work fine -($running_perl56) and ok(1); -($running_perl56) and ok(1); -($running_perl56) and ok(1); -($running_perl56) and ok(1); -(!$running_perl56) and try_extraction (' +try_extraction (' body VIRUS_WARNING345 /(This message contained attachments that have been blocked by Guinevere|This is an automatic message from the Guinevere Internet Antivirus Scanner)\./ body VIRUS_WARNING345I /(This message contained attachments that have been blocked by Guinevere|This is an automatic message from the Guinevere Internet Antivirus Scanner)\./i @@ -224,11 +209,7 @@ # --------------------------------------------------------------------------- -# also not suitable for perl 5.6.x -($running_perl56) and ok(1); -($running_perl56) and ok(1); -($running_perl56) and ok(1); -(!$running_perl56) and try_extraction (' +try_extraction (' body FOO /foobar\x{e2}\x{82}\x{ac}baz/ @@ -445,9 +426,9 @@ my ($rules, $params, $output, $notoutput) = @_; my $sa = Mail::SpamAssassin->new({ - rules_filename => "log/test_rules_copy", - site_rules_filename => "log/test_default.cf", - userprefs_filename => "log/userprefs.cf", + rules_filename => $localrules, + site_rules_filename => $siterules, + userprefs_filename => $userrules, local_tests_only => 1, debug => $debug, dont_copy_prefs => 1, @@ -456,18 +437,19 @@ ok($sa); # remove all rules and plugins; we want just our stuff - untaint_system("rm -f log/test_rules_copy/*.pre"); - untaint_system("rm -f log/test_rules_copy/*.pm"); + foreach (<$siterules/*.pre>, <$siterules/*.pm>) { + unlink(untaint_var($_)); + } # keep 20_aux_tlds.cf to suppress RB warnings - rename("log/test_rules_copy/20_aux_tlds.cf", "log/test_rules_copy/20_aux_tlds.cf.tmp"); - untaint_system("rm -f log/test_rules_copy/*.cf"); - rename("log/test_rules_copy/20_aux_tlds.cf.tmp", "log/test_rules_copy/20_aux_tlds.cf"); + foreach (<$localrules/*.cf>) { + unlink(untaint_var($_)) unless $_ =~ /20_aux_tlds.cf$/; + } { # suppress unnecessary warning: # "Filehandle STDIN reopened as STDOUT only for output" # See https://rt.perl.org/rt3/Public/Bug/Display.html?id=23838 no warnings 'io'; - open (OUT, ">log/test_rules_copy/00_test.cf") + open (OUT, ">$localrules/99_test.cf") or die "failed to write rule"; } print OUT " diff -Nru spamassassin-3.4.6/t/recips.t spamassassin-4.0.0~rc3/t/recips.t --- spamassassin-3.4.6/t/recips.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/recips.t 2022-05-28 10:38:25.000000000 +0000 @@ -7,22 +7,22 @@ # --------------------------------------------------------------------------- -%patterns = ( q{ SORTED_RECIPS } => 'SORTED_RECIPS', - q{ SUSPICIOUS_RECIPS } => 'SUSPICIOUS_RECIPS'); +%patterns = ( q{ SORTED_RECIPS } => '', + q{ SUSPICIOUS_RECIPS } => ''); %anti_patterns = ( ); sarun ("-L -t < data/spam/010", \&patterns_run_cb); ok_all_patterns(); -%patterns = ( q{ SUSPICIOUS_RECIPS } => 'SUSPICIOUS_RECIPS'); -%anti_patterns = ( q{ SORTED_RECIPS } => 'SORTED_RECIPS'); +%patterns = ( q{ SUSPICIOUS_RECIPS } => ''); +%anti_patterns = ( q{ SORTED_RECIPS } => ''); sarun ("-L -t < data/spam/011", \&patterns_run_cb); ok_all_patterns(); %patterns = ( ); -%anti_patterns = ( q{ SORTED_RECIPS } => 'SORTED_RECIPS', - q{ SUSPICIOUS_RECIPS } => 'SUSPICIOUS_RECIPS'); +%anti_patterns = ( q{ SORTED_RECIPS } => '', + q{ SUSPICIOUS_RECIPS } => ''); sarun ("-L -t < data/nice/006", \&patterns_run_cb); ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/recreate.t spamassassin-4.0.0~rc3/t/recreate.t --- spamassassin-3.4.6/t/recreate.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/recreate.t 2021-04-12 07:43:12.000000000 +0000 @@ -5,25 +5,10 @@ use SATest; sa_t_init("recreate"); use Test::More tests => 9; -BEGIN { - if (-e 't/test_dir') { - chdir 't'; - } - - if (-e 'test_dir') { - unshift(@INC, '../blib/lib'); - } -}; - use strict; use warnings; use Mail::SpamAssassin; -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - our $warning = 0; $SIG{'__WARN__'} = sub { @@ -41,9 +26,9 @@ }; my $spamtest = Mail::SpamAssassin->new({ - rules_filename => "$prefix/t/log/test_rules_copy", - site_rules_filename => "$prefix/t/log/localrules.tmp", - userprefs_filename => "$prefix/masses/spamassassin/user_prefs", + rules_filename => $localrules, + site_rules_filename => $siterules, + userprefs_filename => $userrules, local_tests_only => 1, debug => 0, dont_copy_prefs => 1, @@ -66,9 +51,9 @@ $spamtest->finish(); $spamtest = Mail::SpamAssassin->new({ - rules_filename => "$prefix/t/log/test_rules_copy", - site_rules_filename => "$prefix/t/log/localrules.tmp", - userprefs_filename => "$prefix/masses/spamassassin/user_prefs", + rules_filename => $localrules, + site_rules_filename => $siterules, + userprefs_filename => $userrules, local_tests_only => 1, debug => 0, dont_copy_prefs => 1, diff -Nru spamassassin-3.4.6/t/recursion.t spamassassin-4.0.0~rc3/t/recursion.t --- spamassassin-3.4.6/t/recursion.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/recursion.t 2021-04-12 07:43:12.000000000 +0000 @@ -81,7 +81,7 @@ $text = $newmsg; } - open (OUT, ">log/recurse.eml") or die; + open (OUT, ">$workdir/recurse.eml") or die; print OUT $text; close OUT or die; } @@ -103,7 +103,7 @@ $boundstr++; } - open (OUT, ">log/recurse.eml") or die; + open (OUT, ">$workdir/recurse.eml") or die; print OUT $text; close OUT or die; } @@ -112,7 +112,7 @@ my $fh = IO::File->new_tmpfile(); ok($fh); open(STDERR, ">&=".fileno($fh)) || die "Cannot reopen STDERR"; - sarun("-D -L -t < log/recurse.eml", + sarun("-D -L -t < $workdir/recurse.eml", \&patterns_run_cb); seek($fh, 0, 0); my $error = do { @@ -134,4 +134,4 @@ create_test_message_3(); try_scan(); -ok(unlink 'log/recurse.eml'); +ok(unlink "$workdir/recurse.eml"); diff -Nru spamassassin-3.4.6/t/regexp_named_capture.t spamassassin-4.0.0~rc3/t/regexp_named_capture.t --- spamassassin-3.4.6/t/regexp_named_capture.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/regexp_named_capture.t 2022-08-11 11:11:13.000000000 +0000 @@ -0,0 +1,50 @@ +#!/usr/bin/perl -T + +use lib '.'; +use lib 't'; +use SATest; sa_t_init("regexp_named_capture"); + +use Test::More; +plan tests => 14; + +# --------------------------------------------------------------------------- + +%patterns = ( + q{ 1.0 TEST_CAPTURE_1 } => '', + q{ 1.0 TEST_CAPTURE_2 } => '', + q{ 1.0 TEST_CAPTURE_3 } => '', + q{ 1.0 TEST_CAPTURE_4 } => '', + q{ 1.0 TEST_CAPTURE_5 } => '', + q{ 1.0 TEST_CAPTURE_6 } => '', + q{ 1.0 TEST_CAPTURE_7 } => '', + qr/tag TESTCAP1 is now ready, value: Ximian\n/ => '', + qr/tag TESTCAP2 is now ready, value: Ximian\n/ => '', + qr/tag TESTCAP3 is now ready, value: gnome\.org\n/ => '', + qr/tag TESTCAP4 is now ready, value: milkplus\n/ => '', + qr/tag TESTCAP5 is now ready, value: release\n/ => '', +); +%anti_patterns = ( + q{ warn: } => '', + q{ 1.0 TEST_CAPTURE_8 } => '', +); + +tstlocalrules (q{ + body TEST_CAPTURE_1 /release of (?\w+)/ + rawbody TEST_CAPTURE_2 /release of (?\w+)/ + uri TEST_CAPTURE_3 /ftp\.(?[\w.]+)/ + header TEST_CAPTURE_4 Message-ID =~ /@(?\w+)/ + full TEST_CAPTURE_5 /X-Spam-Status.* preview (?\w+)/s + + # Use some captured tag + body TEST_CAPTURE_6 m,www\.%{TESTCAP1}\.,i + + # We can also use common tags like HEADER() + body TEST_CAPTURE_7 m{www\.%{HEADER(From:addr:domain)}/} + + # Should not hit + body TEST_CAPTURE_8 m,www\.\%{TESTCAP1}\.,i +}); + +sarun ("-D check,config -L -t < data/nice/001 2>&1", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/regexp_valid.t spamassassin-4.0.0~rc3/t/regexp_valid.t --- spamassassin-3.4.6/t/regexp_valid.t 2019-06-22 18:00:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/regexp_valid.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,20 +1,6 @@ #!/usr/bin/perl -w -T # test regexp validation -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ... - chdir 't'; - } - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; use lib '.'; use lib 't'; use SATest; sa_t_init("regexp_valid"); diff -Nru spamassassin-3.4.6/t/relative_scores.t spamassassin-4.0.0~rc3/t/relative_scores.t --- spamassassin-3.4.6/t/relative_scores.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/relative_scores.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,16 +1,5 @@ #!/usr/bin/perl -T -# Leave this part, or else it'll use the live modules which is BAD! -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib', '.'); - } -} - use lib '.'; use lib 't'; use SATest; sa_t_init("relative_scores"); @@ -18,21 +7,21 @@ use vars qw/ $error /; tstlocalrules (" - # test that a single relative score applies to all scoresets - body FOO /foo/ - score FOO 1 2 3 4 - score FOO (1) - - # test that multiple relative scores apply to the scoresets - # appropriately, also that # and #.0 are equal - body BAR /bar/ - score BAR 1 - score BAR (1.0) (2) (3) (4.0) - - # verify that negative decimal versions work - body BAZ /bar/ - score BAZ 1 - score BAZ (-1.0) (-2.1) (-3.2) (-4.3) + # test that a single relative score applies to all scoresets + body FOO /foo/ + score FOO 1 2 3 4 + score FOO (1) + + # test that multiple relative scores apply to the scoresets + # appropriately, also that # and #.0 are equal + body BAR /bar/ + score BAR 1 + score BAR (1.0) (2) (3) (4.0) + + # verify that negative decimal versions work + body BAZ /bar/ + score BAZ 1 + score BAZ (-1.0) (-2.1) (-3.2) (-4.3) "); my $sa = create_saobj(); @@ -78,3 +67,4 @@ } } ok($error); + diff -Nru spamassassin-3.4.6/t/relaycountry_fast.t spamassassin-4.0.0~rc3/t/relaycountry_fast.t --- spamassassin-3.4.6/t/relaycountry_fast.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/relaycountry_fast.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -#!/usr/bin/perl -T - -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -use lib '.'; use lib 't'; -use SATest; sa_t_init("relaycountry"); - -use constant HAS_COUNTRY_FAST => eval { require IP::Country::Fast; }; - -use Test::More; - -plan skip_all => "IP::Country::Fast not installed" unless HAS_COUNTRY_FAST; -plan tests => 2; - -# --------------------------------------------------------------------------- - -tstpre (" -loadplugin Mail::SpamAssassin::Plugin::RelayCountry -"); - -tstprefs (" - dns_available no - country_db_type Fast - add_header all Relay-Country _RELAYCOUNTRY_ - "); - -# Check for country of gmail.com mail server -%patterns = ( - q{ X-Spam-Relay-Country: US }, '', - ); - -ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); -ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/relaycountry_geoip2.t spamassassin-4.0.0~rc3/t/relaycountry_geoip2.t --- spamassassin-3.4.6/t/relaycountry_geoip2.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/relaycountry_geoip2.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -#!/usr/bin/perl -T - -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -use lib '.'; use lib 't'; -use SATest; sa_t_init("relaycountry"); - -use constant HAS_GEOIP2 => eval { require GeoIP2::Database::Reader; }; - -# TODO: get the list from RelayCountry.pm / geoip2_default_db_path -use constant HAS_GEOIP2_DB => eval { - -f "/usr/local/share/GeoIP/GeoIP2-Country.mmdb" or - -f "/usr/share/GeoIP/GeoIP2-Country.mmdb" or - -f "/var/lib/GeoIP/GeoIP2-Country.mmdb" or - -f "/usr/local/share/GeoIP/GeoLite2-Country.mmdb" or - -f "/usr/share/GeoIP/GeoLite2-Country.mmdb" or - -f "/var/lib/GeoIP/GeoLite2-Country.mmdb" -}; - -use Test::More; - -plan skip_all => "GeoIP2::Database::Reader not installed" unless HAS_GEOIP2; -plan skip_all => "GeoIP2 database not found from default locations" unless HAS_GEOIP2_DB; - -plan tests => 2; - -# --------------------------------------------------------------------------- - -tstpre (" -loadplugin Mail::SpamAssassin::Plugin::RelayCountry -"); - -tstprefs (" - dns_available no - country_db_type GeoIP2 - add_header all Relay-Country _RELAYCOUNTRY_ - "); - -# Check for country of gmail.com mail server -%patterns = ( - q{ X-Spam-Relay-Country: US }, '', - ); - -ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); -ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/relaycountry_geoip.t spamassassin-4.0.0~rc3/t/relaycountry_geoip.t --- spamassassin-3.4.6/t/relaycountry_geoip.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/relaycountry_geoip.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -#!/usr/bin/perl -T - -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -use lib '.'; use lib 't'; -use SATest; sa_t_init("relaycountry"); - -use constant HAS_GEOIP => eval { require Geo::IP; }; -use constant HAS_GEOIP_CONF => eval { Geo::IP->new(Geo::IP::GEOIP_STANDARD); }; - -use Test::More; - -plan skip_all => "Geo::IP not installed" unless HAS_GEOIP; -plan skip_all => "Geo::IP not configured" unless HAS_GEOIP_CONF; - -plan tests => 2; - -# --------------------------------------------------------------------------- - -tstpre (" -loadplugin Mail::SpamAssassin::Plugin::RelayCountry -"); - -tstprefs (" - dns_available no - country_db_type GeoIP - add_header all Relay-Country _RELAYCOUNTRY_ - "); - -# Check for country of gmail.com mail server -%patterns = ( - q{ X-Spam-Relay-Country: US }, '', - ); - -ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); -ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/relaycountry.t spamassassin-4.0.0~rc3/t/relaycountry.t --- spamassassin-3.4.6/t/relaycountry.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/relaycountry.t 2022-08-12 13:19:19.000000000 +0000 @@ -0,0 +1,102 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("relaycountry"); + +my $tests = 0; +my %has; +eval { require MaxMind::DB::Reader; $tests += 2; $has{GEOIP2} = 1 }; +eval { require Geo::IP; $tests += 2; $has{GEOIP} = 1 }; +eval { require IP::Country::Fast; $tests += 2; $has{FAST} = 1 }; +eval { require IP::Country::DB_File; + if ($DB_File::db_ver > 1 and $DB_File::db_version > 1) { + $tests += 2; + $has{DB_FILE} = 1; + } + }; + +use Test::More; + +plan skip_all => "No supported GeoDB module installed" unless $tests; +plan tests => $tests; + +# --------------------------------------------------------------------------- + +tstpre (" + loadplugin Mail::SpamAssassin::Plugin::RelayCountry +"); + +if (defined $has{GEOIP2}) { + tstprefs (" + geodb_module GeoIP2 + geodb_search_path data/geodb + add_header all Relay-Country _RELAYCOUNTRY_ + "); + # Check for country of gmail.com mail server + %patterns = ( + q{ X-Spam-Relay-Country: US }, '', + ); + ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); +} +else { + diag "skipping MaxMind::DB::Reader (GeoIP2) tests (not installed)\n"; +} + + +if (defined $has{GEOIP}) { + tstprefs (" + geodb_module Geo::IP + geodb_search_path data/geodb + add_header all Relay-Country _RELAYCOUNTRY_ + "); + # Check for country of gmail.com mail server + %patterns = ( + q{ X-Spam-Relay-Country: US }, '', + ); + ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); +} +else { + diag "skipping Geo::IP tests (not installed)\n"; +} + + +if (defined $has{DB_FILE}) { + tstprefs (" + geodb_module DB_File + geodb_options country:data/geodb/ipcc.db + add_header all Relay-Country _RELAYCOUNTRY_ + "); + # Check for country of gmail.com mail server + %patterns = ( + q{ X-Spam-Relay-Country: US }, '', + ); + ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); +} +else { + diag "skipping IP::Country::DB_File tests (not installed or DB_File bdb version too old)\n"; +} + + +if (defined $has{FAST}) { + tstprefs (" + geodb_module Fast + add_header all Relay-Country _RELAYCOUNTRY_ + "); + # Check for country of gmail.com mail server + %patterns = ( + q{ X-Spam-Relay-Country: US }, '', + ); + ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); +} +else { + diag "skipping IP::Country::Fast tests (not installed)\n"; +} + diff -Nru spamassassin-3.4.6/t/reportheader_8bit.t spamassassin-4.0.0~rc3/t/reportheader_8bit.t --- spamassassin-3.4.6/t/reportheader_8bit.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/reportheader_8bit.t 2022-05-28 10:38:25.000000000 +0000 @@ -2,24 +2,23 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("reportheader"); -use Test::More tests => 2; + +use Test::More tests => 3; $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C'; # a cheat, but we need the patterns to work # --------------------------------------------------------------------------- %patterns = ( - - q{X-Spam-Report: =?ISO-8859-1?Q? }, 'qp-encoded-hdr', - q{ Invalid Date: header =ae =af =b0 foo }, 'qp-encoded-desc', - + qr/^X-Spam-Report:\s*$/m, 'qp-encoded-hdr', + qr/^\t\*\s+[0-9.-]+ INVALID_DATE\s+Invalid Date: header =\?UTF-8\?B\?wq4gwq8gwrA=\?= foo$/m, 'qp-encoded-desc', + qr/^ [0-9.-]+ INVALID_DATE\s+Invalid Date: header ® ¯ ° foo$/m, 'report-desc', ); tstprefs (" - $default_cf_lines - report_safe 0 - describe INVALID_DATE Invalid Date: header \xae \xaf \xb0 foo - "); + report_safe 0 + describe INVALID_DATE Invalid Date: header ® ¯ ° foo +"); sarun ("-L -t < data/spam/001", \&patterns_run_cb); ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/reportheader.t spamassassin-4.0.0~rc3/t/reportheader.t --- spamassassin-3.4.6/t/reportheader.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/reportheader.t 2022-05-04 11:06:22.000000000 +0000 @@ -10,25 +10,48 @@ # --------------------------------------------------------------------------- %patterns = ( + q{ Spam detection software, running on the system "}, 'spam-report-body', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ From: ends in many numbers}, 'endsinnums', + q{ From: does not include a real name}, 'noreal', + q{ BODY: Nobody's perfect }, 'remove', + q{ Message-Id is not valid, }, 'msgidnotvalid', + q{ 'From' yahoo.com does not match }, 'fromyahoo', + q{ Invalid Date: header (not RFC 2822) }, 'invdate', + q{ Uses a dotted-decimal IP address in URL }, 'dotteddec', +); -q{ Spam detection software, running on the system "}, 'spam-report-body', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ From: ends in many numbers}, 'endsinnums', -q{ From: does not include a real name}, 'noreal', -q{ BODY: Nobody's perfect }, 'remove', -q{ Message-Id is not valid, }, 'msgidnotvalid', -q{ 'From' yahoo.com does not match }, 'fromyahoo', -q{ Invalid Date: header (not RFC 2822) }, 'invdate', -q{ Uses a dotted-decimal IP address in URL }, 'dotteddec', - -); #' - -tstprefs (" - $default_cf_lines - report_safe 0 - "); +# This test checks that the report template feature works. +# Define a representative example default template here to test out +tstprefs (' + clear_report_template + report Spam detection software, running on the system "_HOSTNAME_", + report has_YESNO(, NOT)_ identified this incoming email as_YESNO( possible,)_ spam. The original + report message has been attached to this so you can view it or label + report similar future email. If you have any questions, see + report _CONTACTADDRESS_ for details. + report + report Content preview: _PREVIEW_ + report + report Content analysis details: (_SCORE_ points, _REQD_ required) + report + report " pts rule name description" + report ---- ---------------------- -------------------------------------------------- + report _SUMMARY_ + + report_contact @@CONTACT_ADDRESS@@ + + clear_headers + + add_header all Checker-Version SpamAssassin _VERSION_ (_SUBVERSION_) on _HOSTNAME_ + add_header spam Flag _YESNOCAPS_ + add_header all Level _STARS(*)_ + add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_" + report_safe 0 +'); sarun ("-L -t < data/spam/001", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/report_safe.t spamassassin-4.0.0~rc3/t/report_safe.t --- spamassassin-3.4.6/t/report_safe.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/report_safe.t 2021-04-12 07:43:12.000000000 +0000 @@ -9,7 +9,7 @@ # Use a slightly modified gtube ... my $origtest = 'data/spam/gtube.eml'; -my $test = 'log/report_safe.eml'; +my $test = "$workdir/report_safe.eml"; my $original = ''; if (open(OTEST, $origtest) && open(TEST, ">$test")) { local $/=undef; @@ -61,3 +61,4 @@ tstprefs ("report_safe 2\n"); sarun ("-L < $test", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/reuse.t spamassassin-4.0.0~rc3/t/reuse.t --- spamassassin-3.4.6/t/reuse.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/reuse.t 2022-07-03 09:23:00.000000000 +0000 @@ -1,20 +1,5 @@ #!/usr/bin/perl -w -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; use lib '.'; use lib 't'; use SATest; sa_t_init("reuse"); @@ -25,6 +10,7 @@ use Test::More; plan skip_all => "no mass check" unless (-e '../masses/mass-check'); +plan skip_all => "mass check script does not run on Windows" if $RUNNING_ON_WINDOWS; plan tests => 37; # Tests the following cases: @@ -37,62 +23,68 @@ # - Reuse works in positive and negative cases # - Rules defined only by "reuse" can have arbitrary scores and priorities set -tstlocalrules(' - -# suppress RB warnings -util_rb_tld com +# Need all files under $localrules for mass-check +foreach my $tainted (<$siterules/*.pre $siterules/languages>) { + $tainted =~ /(.*)/; + my $file = $1; + copy ($file, "$localrules") + or warn "cannot copy $file to $localrules: $!"; +} -# Check that order of reuse/body lines for BODY_RULE_* does not matter -reuse BODY_RULE_1 +tstlocalrules(' + # suppress RB warnings + util_rb_tld com -body BODY_RULE_1 /./ -score BODY_RULE_1 1.0 + # Check that order of reuse/body lines for BODY_RULE_* does not matter + reuse BODY_RULE_1 -body BODY_RULE_2 /\bfoobar\b/ -score BODY_RULE_2 1.0 + body BODY_RULE_1 /./ + score BODY_RULE_1 1.0 -header HEADER_RULE_1 Subject =~ /\bmessage\b/ + body BODY_RULE_2 /\bfoobar\b/ + score BODY_RULE_2 1.0 -meta META_RULE_1 BODY_RULE_1 || BODY_RULE_2 + header HEADER_RULE_1 Subject =~ /\bmessage\b/ -reuse BODY_RULE_2 -priority BODY_RULE_2 -2 -score BODY_RULE_2 1.5 + meta META_RULE_1 BODY_RULE_1 || BODY_RULE_2 -reuse NEW_RULE OTHER_RULE -priority NEW_RULE -3 -score NEW_RULE 0.5 + reuse BODY_RULE_2 + priority BODY_RULE_2 -2 + score BODY_RULE_2 1.5 -reuse OTHER_RULE -priority OTHER_RULE -4 + reuse NEW_RULE OTHER_RULE + priority NEW_RULE -3 + score NEW_RULE 0.5 -reuse RENAMED_RULE OLD_RULE_1 OLD_RULE_2 OLD_RULE_3 + reuse OTHER_RULE + priority OTHER_RULE -4 -reuse SCORED_RULE OLD_RULE_2 -score SCORED_RULE 2.0 -priority SCORED_RULE -1 + reuse RENAMED_RULE OLD_RULE_1 OLD_RULE_2 OLD_RULE_3 + reuse SCORED_RULE OLD_RULE_2 + score SCORED_RULE 2.0 + priority SCORED_RULE -1 '); # reuse on, mail has no X-Spam-Status write_mail(0); -ok_system("$perl_path -w ../masses/mass-check -c=log/localrules.tmp --reuse --file log/mail.txt > log/noxss.out"); +ok_system("$perl_path -w ../masses/mass-check -c=$localrules --reuse --file $workdir/mail.txt > $workdir/noxss.out"); %patterns = ( - 'BODY_RULE_1' => 'BODY_RULE_1', - 'HEADER_RULE_1' => 'HEADER_RULE_1', - 'META_RULE_1' => 'META_RULE_1' - ); + 'BODY_RULE_1' => '', + 'HEADER_RULE_1' => '', + 'META_RULE_1' => '', +); %anti_patterns = ( - 'NEW_RULE' => 'NEW_RULE', - 'OTHER_RULE' => 'OTHER_RULE', - 'RENAMED_RULE' => 'RENAMED_RULE', - 'NONEXISTANT_RULE' => 'NONEXISTANT_RULE', - 'BODY_RULE_2' => 'BODY_RULE_2', - 'SCORED_RULE' => 'SCORED_RULE' - ); + 'NEW_RULE' => '', + 'OTHER_RULE' => '', + 'RENAMED_RULE' => '', + 'NONEXISTANT_RULE' => '', + 'BODY_RULE_2' => '', + 'SCORED_RULE' => '', +); -checkfile("noxss.out", \&patterns_run_cb); +checkfile("$workdir/noxss.out", \&patterns_run_cb); ok_all_patterns(); clear_pattern_counters(); @@ -100,79 +92,77 @@ write_mail(1); # test without reuse -ok_system("$perl_path -w ../masses/mass-check -c=log/localrules.tmp --file log/mail.txt > log/noreuse.out"); +ok_system("$perl_path -w ../masses/mass-check -c=$localrules --file $workdir/mail.txt > $workdir/noreuse.out"); %patterns = ( - 'BODY_RULE_1' => 'BODY_RULE_1', - 'HEADER_RULE_1' => 'HEADER_RULE_1', - 'META_RULE_1' => 'META_RULE_1' - ); + 'BODY_RULE_1' => '', + 'HEADER_RULE_1' => '', + 'META_RULE_1' => '', +); %anti_patterns = ( - 'NEW_RULE' => 'NEW_RULE', - 'OTHER_RULE' => 'OTHER_RULE', - 'RENAMED_RULE' => 'RENAMED_RULE', - 'NONEXISTANT_RULE' => 'NONEXISTANT_RULE', - 'BODY_RULE_2' => 'BODY_RULE_2', - 'SCORED_RULE' => 'SCORED_RULE' - ); -checkfile("noreuse.out", \&patterns_run_cb); + 'NEW_RULE' => '', + 'OTHER_RULE' => '', + 'RENAMED_RULE' => '', + 'NONEXISTANT_RULE' => '', + 'BODY_RULE_2' => '', + 'SCORED_RULE' => '', +); +checkfile("$workdir/noreuse.out", \&patterns_run_cb); ok_all_patterns(); clear_pattern_counters(); # test with reuse -ok_system("$perl_path -w ../masses/mass-check -c=log/localrules.tmp --reuse --file log/mail.txt > log/reuse.out"); +ok_system("$perl_path -w ../masses/mass-check -c=$localrules --reuse --file $workdir/mail.txt > $workdir/reuse.out"); %patterns = ( - 'HEADER_RULE_1' => 'HEADER_RULE_1', - 'BODY_RULE_2' => 'BODY_RULE_2', - 'META_RULE_1' => 'META_RULE_1', - 'NEW_RULE' => 'NEW_RULE', - 'OTHER_RULE' => 'OTHER_RULE', - 'RENAMED_RULE' => 'RENAMED_RULE', - 'SCORED_RULE' => 'SCORED_RULE', - 'Y 8' => 'score' - ); + 'HEADER_RULE_1' => '', + 'BODY_RULE_2' => '', + 'META_RULE_1' => '', + 'NEW_RULE' => '', + 'OTHER_RULE' => '', + 'RENAMED_RULE' => '', + 'SCORED_RULE' => '', + 'Y 8' => '', +); %anti_patterns = ( - 'BODY_RULE_1' => 'BODY_RULE_1', - 'NONEXISTANT_RULE' => 'NONEXISTANT_RULE' - ); + 'BODY_RULE_1' => '', + 'NONEXISTANT_RULE' => '', +); -checkfile("reuse.out", \&patterns_run_cb); +checkfile("$workdir/reuse.out", \&patterns_run_cb); ok_all_patterns(); clear_pattern_counters(); tstlocalrules(' + # suppress RB warnings + util_rb_tld com -# suppress RB warnings -util_rb_tld com - -meta META_RULE_1 RULE_A && !RULE_B - -body RULE_A /./ -reuse RULE_B OTHER_RULE + meta META_RULE_1 RULE_A && !RULE_B -body RULE_C / does not hit / + body RULE_A /./ + reuse RULE_B OTHER_RULE -meta META_RULE_2 (RULE_A && RULE_B) || RULE_C + body RULE_C / does not hit / + meta META_RULE_2 (RULE_A && RULE_B) || RULE_C '); write_mail(1); # test with reuse -ok_system("$perl_path -w ../masses/mass-check -c=log/localrules.tmp --reuse --file log/mail.txt > log/metareuse.out"); +ok_system("$perl_path -w ../masses/mass-check -c=$localrules --reuse --file $workdir/mail.txt > $workdir/metareuse.out"); %patterns = ( - 'META_RULE_2' => 'META_RULE_2', - 'RULE_A' => 'RULE_A', - 'RULE_B' => 'RULE_B', - ); + 'META_RULE_2' => '', + 'RULE_A' => '', + 'RULE_B' => '', +); %anti_patterns = ( - 'META_RULE_1' => 'META_RULE_1', - 'RULE_C' => 'RULE_C', - ); -checkfile("metareuse.out", \&patterns_run_cb); + 'META_RULE_1' => '', + 'RULE_C' => '', +); +checkfile("$workdir/metareuse.out", \&patterns_run_cb); ok_all_patterns(); clear_pattern_counters(); diff -Nru spamassassin-3.4.6/t/root_spamd.t spamassassin-4.0.0~rc3/t/root_spamd.t --- spamassassin-3.4.6/t/root_spamd.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd.t 2022-09-19 12:57:56.000000000 +0000 @@ -1,11 +1,9 @@ #!/usr/bin/perl -T -# run with: sudo prove -v t/root_spamd* - use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -16,20 +14,20 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; +# ensure it is writable by all +chmod 01755, $workdir; ok(start_spamd("-L")); @@ -37,12 +35,12 @@ ok_all_patterns(); %patterns = ( -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - ); - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', +); ok (spamcrun("< data/spam/018", \&patterns_run_cb)); ok_all_patterns(); ok(stop_spamd()); + diff -Nru spamassassin-3.4.6/t/root_spamd_tell_paranoid.t spamassassin-4.0.0~rc3/t/root_spamd_tell_paranoid.t --- spamassassin-3.4.6/t/root_spamd_tell_paranoid.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_tell_paranoid.t 2022-07-27 17:35:40.000000000 +0000 @@ -3,7 +3,7 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_tell_paranoid"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -14,22 +14,23 @@ # --------------------------------------------------------------------------- %patterns = ( -q{ Message successfully } => 'learned', + q{Message successfully } => 'learned', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; # remove these first -unlink('log/user_state/bayes_seen.dir'); -unlink('log/user_state/bayes_toks.dir'); +unlink("$userstate/bayes_seen.dir"); +unlink("$userstate/bayes_toks.dir"); # ensure it is writable by all -use File::Path; mkpath("log/user_state"); chmod 01777, "log/user_state"; +chmod 01755, $workdir; +chmod 01777, $userstate; # use SDBM so we do not need DB_File -tstlocalrules (" - bayes_store_module Mail::SpamAssassin::BayesStore::SDBM +tstprefs (" + bayes_store_module Mail::SpamAssassin::BayesStore::SDBM "); ok(start_spamd("-L --allow-tell --paranoid")); @@ -40,8 +41,8 @@ ok(stop_spamd()); # ensure these are not owned by root -ok check_owner('log/user_state/bayes_seen.dir'); -ok check_owner('log/user_state/bayes_toks.dir'); +ok check_owner("$userstate/bayes_seen.dir"); +ok check_owner("$userstate/bayes_toks.dir"); sub check_owner { my $f = shift; @@ -61,3 +62,4 @@ return 1; } } + diff -Nru spamassassin-3.4.6/t/root_spamd_tell.t spamassassin-4.0.0~rc3/t/root_spamd_tell.t --- spamassassin-3.4.6/t/root_spamd_tell.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_tell.t 2022-07-27 17:35:40.000000000 +0000 @@ -3,7 +3,7 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_tell"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -14,22 +14,23 @@ # --------------------------------------------------------------------------- %patterns = ( -q{ Message successfully } => 'learned', + q{Message successfully } => 'learned', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; # remove these first -unlink('log/user_state/bayes_seen.dir'); -unlink('log/user_state/bayes_toks.dir'); +unlink("$userstate/bayes_seen.dir"); +unlink("$userstate/bayes_toks.dir"); # ensure it is writable by all -use File::Path; mkpath("log/user_state"); chmod 01777, "log/user_state"; +chmod 01755, $workdir; +chmod 01777, $userstate; # use SDBM so we do not need DB_File -tstlocalrules (" - bayes_store_module Mail::SpamAssassin::BayesStore::SDBM +tstprefs (" + bayes_store_module Mail::SpamAssassin::BayesStore::SDBM "); ok(start_spamd("-L --allow-tell")); @@ -40,8 +41,8 @@ ok(stop_spamd()); # ensure these are not owned by root -ok check_owner('log/user_state/bayes_seen.dir'); -ok check_owner('log/user_state/bayes_toks.dir'); +ok check_owner("$userstate/bayes_seen.dir"); +ok check_owner("$userstate/bayes_toks.dir"); sub check_owner { my $f = shift; @@ -61,3 +62,4 @@ return 1; } } + diff -Nru spamassassin-3.4.6/t/root_spamd_tell_x_paranoid.t spamassassin-4.0.0~rc3/t/root_spamd_tell_x_paranoid.t --- spamassassin-3.4.6/t/root_spamd_tell_x_paranoid.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_tell_x_paranoid.t 2022-07-27 17:35:40.000000000 +0000 @@ -3,7 +3,7 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_tell_x_paranoid"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -14,22 +14,23 @@ # --------------------------------------------------------------------------- %patterns = ( -q{ Message successfully } => 'learned', + q{Message successfully } => 'learned', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; # remove these first -unlink('log/user_state/bayes_seen.dir'); -unlink('log/user_state/bayes_toks.dir'); +unlink("$userstate/bayes_seen.dir"); +unlink("$userstate/bayes_toks.dir"); # ensure it is writable by all -use File::Path; mkpath("log/user_state"); chmod 01777, "log/user_state"; +chmod 01755, $workdir; +chmod 01777, $userstate; # use SDBM so we do not need DB_File -tstlocalrules (" - bayes_store_module Mail::SpamAssassin::BayesStore::SDBM +tstprefs (" + bayes_store_module Mail::SpamAssassin::BayesStore::SDBM "); ok(start_spamd("-L --allow-tell --create-prefs -x --paranoid")); @@ -40,8 +41,8 @@ ok(stop_spamd()); # ensure these are not owned by root -ok check_owner('log/user_state/bayes_seen.dir'); -ok check_owner('log/user_state/bayes_toks.dir'); +ok check_owner("$userstate/bayes_seen.dir"); +ok check_owner("$userstate/bayes_toks.dir"); sub check_owner { my $f = shift; @@ -61,3 +62,4 @@ return 1; } } + diff -Nru spamassassin-3.4.6/t/root_spamd_tell_x.t spamassassin-4.0.0~rc3/t/root_spamd_tell_x.t --- spamassassin-3.4.6/t/root_spamd_tell_x.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_tell_x.t 2022-07-27 17:35:40.000000000 +0000 @@ -3,7 +3,7 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_tell_x"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -14,22 +14,23 @@ # --------------------------------------------------------------------------- %patterns = ( -q{ Message successfully } => 'learned', + q{Message successfully } => 'learned', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; # remove these first -unlink('log/user_state/bayes_seen.dir'); -unlink('log/user_state/bayes_toks.dir'); +unlink("$userstate/bayes_seen.dir"); +unlink("$userstate/bayes_toks.dir"); # ensure it is writable by all -use File::Path; mkpath("log/user_state"); chmod 01777, "log/user_state"; +chmod 01755, $workdir; +chmod 01777, $userstate; # use SDBM so we do not need DB_File -tstlocalrules (" - bayes_store_module Mail::SpamAssassin::BayesStore::SDBM +tstprefs (" + bayes_store_module Mail::SpamAssassin::BayesStore::SDBM "); ok(start_spamd("-L --allow-tell --create-prefs -x")); @@ -40,8 +41,8 @@ ok(stop_spamd()); # ensure these are not owned by root -ok check_owner('log/user_state/bayes_seen.dir'); -ok check_owner('log/user_state/bayes_toks.dir'); +ok check_owner("$userstate/bayes_seen.dir"); +ok check_owner("$userstate/bayes_toks.dir"); sub check_owner { my $f = shift; @@ -61,3 +62,4 @@ return 1; } } + diff -Nru spamassassin-3.4.6/t/root_spamd_u_dcc.t spamassassin-4.0.0~rc3/t/root_spamd_u_dcc.t --- spamassassin-3.4.6/t/root_spamd_u_dcc.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_u_dcc.t 2022-09-19 12:57:56.000000000 +0000 @@ -1,12 +1,11 @@ #!/usr/bin/perl -T # # test for http://issues.apache.org/SpamAssassin/show_bug.cgi?id=5574#c12 . -# run with: sudo prove -v t/root_spamd* use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_u_dcc"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -18,14 +17,12 @@ # --------------------------------------------------------------------------- %patterns = ( - q{ spam reported to DCC }, 'dcc report', - ); - -tstpre (" + q{ spam reported to DCC }, 'dcc report', +); +tstprefs (" loadplugin Mail::SpamAssassin::Plugin::DCC dcc_timeout 30 - "); ok sarun ("-t -D info -r < data/spam/gtubedcc.eml 2>&1", \&patterns_run_cb); @@ -43,6 +40,8 @@ # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; +# ensure it is writable by all +chmod 01755, $workdir; $SIG{ALRM} = sub { stop_spamd(); die "timed out"; }; alarm 60; diff -Nru spamassassin-3.4.6/t/root_spamd_u.t spamassassin-4.0.0~rc3/t/root_spamd_u.t --- spamassassin-3.4.6/t/root_spamd_u.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_u.t 2022-09-19 12:57:56.000000000 +0000 @@ -1,11 +1,9 @@ #!/usr/bin/perl -T -# run with: sudo prove -v t/root_spamd* - use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_u"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -16,20 +14,20 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; +# ensure it is writable by all +chmod 01755, $workdir; ok(start_spamd("-L -u nobody")); @@ -40,3 +38,4 @@ ok_all_patterns(); ok(stop_spamd()); + diff -Nru spamassassin-3.4.6/t/root_spamd_virtual.t spamassassin-4.0.0~rc3/t/root_spamd_virtual.t --- spamassassin-3.4.6/t/root_spamd_virtual.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_virtual.t 2022-09-19 12:57:56.000000000 +0000 @@ -1,11 +1,9 @@ #!/usr/bin/perl -T -# run with: sudo prove -v t/root_spamd* - use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_virtual"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -16,33 +14,33 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; +# ensure it is writable by all +chmod 01755, $workdir; -ok (start_spamd ("--virtual-config-dir=log/virtualconfig/%u -L -u nobody")); +ok (start_spamd ("--virtual-config-dir=$workdir/virtualconfig/%u -L -u nobody")); ok(spamcrun("< data/spam/001", \&patterns_run_cb)); ok_all_patterns(); %patterns = ( -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - ); - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', +); ok (spamcrun("< data/spam/018", \&patterns_run_cb)); ok_all_patterns(); ok(stop_spamd()); + diff -Nru spamassassin-3.4.6/t/root_spamd_x_paranoid.t spamassassin-4.0.0~rc3/t/root_spamd_x_paranoid.t --- spamassassin-3.4.6/t/root_spamd_x_paranoid.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_x_paranoid.t 2022-09-19 12:57:56.000000000 +0000 @@ -3,7 +3,7 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_x_paranoid"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -14,20 +14,20 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; +# ensure it is writable by all +chmod 01755, $workdir; ok(start_spamd("-L --create-prefs -x --paranoid")); @@ -35,12 +35,12 @@ ok_all_patterns(); %patterns = ( -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - ); - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', +); ok (spamcrun("< data/spam/018", \&patterns_run_cb)); ok_all_patterns(); ok(stop_spamd()); + diff -Nru spamassassin-3.4.6/t/root_spamd_x.t spamassassin-4.0.0~rc3/t/root_spamd_x.t --- spamassassin-3.4.6/t/root_spamd_x.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_x.t 2022-09-19 12:57:56.000000000 +0000 @@ -3,7 +3,7 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_x"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -14,20 +14,20 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; +# ensure it is writable by all +chmod 01755, $workdir; ok(start_spamd("-L --create-prefs -x")); @@ -35,12 +35,12 @@ ok_all_patterns(); %patterns = ( -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - ); - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', +); ok (spamcrun("< data/spam/018", \&patterns_run_cb)); ok_all_patterns(); ok(stop_spamd()); + diff -Nru spamassassin-3.4.6/t/root_spamd_x_u.t spamassassin-4.0.0~rc3/t/root_spamd_x_u.t --- spamassassin-3.4.6/t/root_spamd_x_u.t 2019-06-26 06:27:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/root_spamd_x_u.t 2022-09-19 12:57:56.000000000 +0000 @@ -1,11 +1,9 @@ #!/usr/bin/perl -T -# run with: sudo prove -v t/root_spamd* - use lib '.'; use lib 't'; use SATest; sa_t_init("root_spamd_x_u"); -use constant HAS_SUDO => eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; +use constant HAS_SUDO => $RUNNING_ON_WINDOWS || eval { $_ = untaint_cmd("which sudo 2>/dev/null"); chomp; -x }; use Test::More; plan skip_all => "root tests disabled" unless conf_bool('run_root_tests'); @@ -16,20 +14,20 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); # run spamc as unpriv uid $spamc = "sudo -u nobody $spamc"; +# ensure it is writable by all +chmod 01755, $workdir; ok (start_spamd ("-L -x -u nobody")); @@ -37,12 +35,12 @@ ok_all_patterns(); %patterns = ( -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - ); - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', +); ok (spamcrun("< data/spam/018", \&patterns_run_cb)); ok_all_patterns(); ok(stop_spamd()); + diff -Nru spamassassin-3.4.6/t/rule_multiple.t spamassassin-4.0.0~rc3/t/rule_multiple.t --- spamassassin-3.4.6/t/rule_multiple.t 2019-08-10 13:22:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/rule_multiple.t 2022-05-28 11:43:13.000000000 +0000 @@ -2,123 +2,123 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("rule_multiple"); -use Test::More tests => 21; +use Test::More tests => 42; # --------------------------------------------------------------------------- %patterns = ( - -q{ META_HEADER_RULE }, 'header', -q{ META_URI_RULE }, 'uri', -q{ META_BODY_RULE }, 'body', -q{ META_RAWBODY_RULE }, 'rawbody', -q{ META_FULL_RULE }, 'full', -q{ META_META_RULE }, 'meta', -q{ META_RULE_6 }, 'meta', -q{ META_EVAL_RULE }, 'eval', - -q{ META_HEADER_RULE_MAX }, 'header_max', -q{ META_URI_RULE_MAX }, 'uri_max', -q{ META_BODY_RULE_MAX }, 'body_max', -q{ META_RAWBODY_RULE_MAX }, 'rawbody_max', -q{ META_FULL_RULE_MAX }, 'full_max', - + q{ 1.0 META_BODY_RULE }, '', + q{ 1.0 META_BODY_RULE_MAX }, '', + q{ 1.0 META_EVAL_RULE }, '', + q{ 1.0 META_FULL_RULE }, '', + q{ 1.0 META_FULL_RULE_MAX }, '', + q{ 1.0 META_HEADER_RULE }, '', + q{ 1.0 META_HEADER_RULE_MAX }, '', + q{ 1.0 META_META_RULE }, '', + q{ 1.0 META_RAWBODY_RULE }, '', + q{ 1.0 META_RAWBODY_RULE_MAX }, '', + q{ 1.0 META_RULE_6 }, '', + q{ 1.0 META_URI_RULE }, '', + q{ 1.0 META_URI_RULE_MAX }, '', ); %anti_patterns = ( - -q{ META_HEADER_RULE_2 }, 'header_2', -q{ META_BODY_RULE_2 }, 'body_2', -q{ META_FULL_RULE_2 }, 'full_2', - -q{ META_HEADER_RULE_MAX_2 }, 'header_max_2', -q{ META_URI_RULE_MAX_2 }, 'uri_max_2', -q{ META_BODY_RULE_MAX_2 }, 'body_max_2', -q{ META_RAWBODY_RULE_MAX_2 }, 'rawbody_max_2', -q{ META_FULL_RULE_MAX_2 }, 'full_max_2', - + q{ META_BODY_RULE_2 }, '', + q{ META_BODY_RULE_MAX_2 }, '', + q{ META_FULL_RULE_2 }, '', + q{ META_FULL_RULE_MAX_2 }, '', + q{ META_HEADER_RULE_2 }, '', + q{ META_HEADER_RULE_MAX_2 }, '', + q{ META_RAWBODY_RULE_MAX_2 }, '', + q{ META_URI_RULE_MAX_2 }, '', ); tstlocalrules (' + header HEADER_RULE Subject =~ /--/ + tflags HEADER_RULE multiple + meta META_HEADER_RULE HEADER_RULE > 1 -header HEADER_RULE Subject =~ /--/ -tflags HEADER_RULE multiple -meta META_HEADER_RULE HEADER_RULE > 1 + header HEADER_RULE_2 Subject =~ /--/ + meta META_HEADER_RULE_2 HEADER_RULE_2 > 1 -header HEADER_RULE_2 Subject =~ /--/ -meta META_HEADER_RULE_2 HEADER_RULE_2 > 1 + body BODY_RULE /WWW.SUPERSITESCENTRAL.COM/i + tflags BODY_RULE multiple + meta META_BODY_RULE BODY_RULE == 3 -uri URI_RULE /WWW.SUPERSITESCENTRAL.COM/i -tflags URI_RULE multiple -meta META_URI_RULE URI_RULE == 3 + body BODY_RULE_2 /WWW.SUPERSITESCENTRAL.COM/i + meta META_BODY_RULE_2 BODY_RULE_2 > 2 -body BODY_RULE /WWW.SUPERSITESCENTRAL.COM/i -tflags BODY_RULE multiple -meta META_BODY_RULE BODY_RULE == 3 + rawbody RAWBODY_RULE /WWW.SUPERSITESCENTRAL.COM/i + tflags RAWBODY_RULE multiple + meta META_RAWBODY_RULE RAWBODY_RULE == 3 -rawbody RAWBODY_RULE /WWW.SUPERSITESCENTRAL.COM/i -tflags RAWBODY_RULE multiple -meta META_RAWBODY_RULE RAWBODY_RULE == 3 + full FULL_RULE /WWW.SUPERSITESCENTRAL.COM/i + tflags FULL_RULE multiple + meta META_FULL_RULE FULL_RULE == 3 -body BODY_RULE_2 /WWW.SUPERSITESCENTRAL.COM/i -meta META_BODY_RULE_2 BODY_RULE_2 > 2 + full FULL_RULE_2 /WWW.SUPERSITESCENTRAL.COM/i + meta META_FULL_RULE_2 FULL_RULE_2 > 2 -full FULL_RULE /WWW.SUPERSITESCENTRAL.COM/i -tflags FULL_RULE multiple -meta META_FULL_RULE FULL_RULE == 3 + header HEADER_RULE_MAX Subject =~ /--/ + tflags HEADER_RULE_MAX multiple maxhits=2 + meta META_HEADER_RULE_MAX HEADER_RULE_MAX > 1 -full FULL_RULE_2 /WWW.SUPERSITESCENTRAL.COM/i -meta META_FULL_RULE_2 FULL_RULE_2 > 2 + header HEADER_RULE_MAX_2 Subject =~ /--/ + tflags HEADER_RULE_MAX_2 multiple maxhits=1 + meta META_HEADER_RULE_MAX_2 HEADER_RULE_MAX_2 > 1 -header HEADER_RULE_MAX Subject =~ /--/ -tflags HEADER_RULE_MAX multiple maxhits=2 -meta META_HEADER_RULE_MAX HEADER_RULE_MAX > 1 + body BODY_RULE_MAX /WWW.SUPERSITESCENTRAL.COM/i + tflags BODY_RULE_MAX multiple maxhits=3 + meta META_BODY_RULE_MAX BODY_RULE_MAX == 3 -header HEADER_RULE_MAX_2 Subject =~ /--/ -tflags HEADER_RULE_MAX_2 multiple maxhits=1 -meta META_HEADER_RULE_MAX_2 HEADER_RULE_MAX_2 > 1 + body BODY_RULE_MAX_2 /WWW.SUPERSITESCENTRAL.COM/i + tflags BODY_RULE_MAX_2 multiple maxhits=2 + meta META_BODY_RULE_MAX_2 BODY_RULE_MAX_2 > 2 -uri URI_RULE_MAX /WWW.SUPERSITESCENTRAL.COM/i -tflags URI_RULE_MAX multiple maxhits=2 -meta META_URI_RULE_MAX URI_RULE_MAX > 1 + rawbody RAWBODY_RULE_MAX /WWW.SUPERSITESCENTRAL.COM/i + tflags RAWBODY_RULE_MAX multiple maxhits=3 + meta META_RAWBODY_RULE_MAX RAWBODY_RULE_MAX == 3 -uri URI_RULE_MAX_2 /WWW.SUPERSITESCENTRAL.COM/i -tflags URI_RULE_MAX_2 multiple maxhits=1 -meta META_URI_RULE_MAX_2 URI_RULE_MAX_2 > 1 + rawbody RAWBODY_RULE_MAX_2 /WWW.SUPERSITESCENTRAL.COM/i + tflags RAWBODY_RULE_MAX_2 multiple maxhits=2 + meta META_RAWBODY_RULE_MAX_2 RAWBODY_RULE_MAX_2 > 2 -body BODY_RULE_MAX /WWW.SUPERSITESCENTRAL.COM/i -tflags BODY_RULE_MAX multiple maxhits=3 -meta META_BODY_RULE_MAX BODY_RULE_MAX == 3 + full FULL_RULE_MAX /WWW.SUPERSITESCENTRAL.COM/i + tflags FULL_RULE_MAX multiple maxhits=3 + meta META_FULL_RULE_MAX FULL_RULE_MAX == 3 -body BODY_RULE_MAX_2 /WWW.SUPERSITESCENTRAL.COM/i -tflags BODY_RULE_MAX_2 multiple maxhits=2 -meta META_BODY_RULE_MAX_2 BODY_RULE_MAX_2 > 2 + full FULL_RULE_MAX_2 /WWW.SUPERSITESCENTRAL.COM/i + tflags FULL_RULE_MAX_2 multiple maxhits=2 + meta META_FULL_RULE_MAX_2 FULL_RULE_MAX_2 > 2 -rawbody RAWBODY_RULE_MAX /WWW.SUPERSITESCENTRAL.COM/i -tflags RAWBODY_RULE_MAX multiple maxhits=3 -meta META_RAWBODY_RULE_MAX RAWBODY_RULE_MAX == 3 + # Note that this is supposed to hit 2 times -> 2 unique urls + uri URI_RULE /WWW.SUPERSITESCENTRAL.COM/i + tflags URI_RULE multiple + meta META_URI_RULE URI_RULE == 2 -rawbody RAWBODY_RULE_MAX_2 /WWW.SUPERSITESCENTRAL.COM/i -tflags RAWBODY_RULE_MAX_2 multiple maxhits=2 -meta META_RAWBODY_RULE_MAX_2 RAWBODY_RULE_MAX_2 > 2 + uri URI_RULE_MAX /WWW.SUPERSITESCENTRAL.COM/i + tflags URI_RULE_MAX multiple maxhits=1 + meta META_URI_RULE_MAX URI_RULE_MAX == 1 -full FULL_RULE_MAX /WWW.SUPERSITESCENTRAL.COM/i -tflags FULL_RULE_MAX multiple maxhits=3 -meta META_FULL_RULE_MAX FULL_RULE_MAX == 3 + uri URI_RULE_MAX_2 /WWW.SUPERSITESCENTRAL.COM/i + tflags URI_RULE_MAX_2 multiple maxhits=1 + meta META_URI_RULE_MAX_2 URI_RULE_MAX_2 > 1 -full FULL_RULE_MAX_2 /WWW.SUPERSITESCENTRAL.COM/i -tflags FULL_RULE_MAX_2 multiple maxhits=2 -meta META_FULL_RULE_MAX_2 FULL_RULE_MAX_2 > 2 + meta META_RULE META_BODY_RULE + META_RAWBODY_RULE + meta META_META_RULE META_RULE == 2 -meta META_RULE META_BODY_RULE + META_RAWBODY_RULE -meta META_META_RULE META_RULE == 2 + meta META_RULE_6 BODY_RULE + RAWBODY_RULE == 6 -meta META_RULE_6 META_BODY_RULE + META_RAWBODY_RULE == 6 + loadplugin myTestPlugin ../../../data/testplugin.pm + header EVAL_RULE eval:check_return_2() + meta META_EVAL_RULE EVAL_RULE > 1 +'); -loadplugin myTestPlugin ../../data/testplugin.pm -header EVAL_RULE eval:check_return_2() -meta META_EVAL_RULE EVAL_RULE > 1 - '); +sarun ("-L -t < data/spam/002 2>&1", \&patterns_run_cb); +ok_all_patterns(); -sarun ("-L -t < data/spam/002", \&patterns_run_cb); +# do some tests without any other rules to check meta bugs +clear_localrules(); +sarun ("-L -t < data/spam/002 2>&1", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/rule_names.t spamassassin-4.0.0~rc3/t/rule_names.t --- spamassassin-3.4.6/t/rule_names.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/rule_names.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,20 +1,5 @@ #!/usr/bin/perl -w -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use lib '.'; use lib 't'; use SATest; sa_t_init("rule_names"); @@ -22,8 +7,8 @@ use Mail::SpamAssassin; BEGIN { - eval { require Digest::SHA; import Digest::SHA qw(sha1); 1 } - or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) } + eval { require Digest::SHA; Digest::SHA->import(qw(sha1)); 1 } + or do { require Digest::SHA1; Digest::SHA1->import(qw(sha1)) } } our $RUN_THIS_TEST; @@ -49,7 +34,7 @@ } # run tests -my $mail = 'log/rule_names.eml'; +my $mail = "$workdir/rule_names.eml"; write_mail(); %patterns = (); my $i = 1; @@ -77,12 +62,12 @@ tstprefs (" - # set super low threshold, so always marked as spam - required_score -10000.0 - # add two fake lexically high tests so every other hit will always be - # followed by a comma in the X-Spam-Status header - body ZZZZZZZZ /./ - body zzzzzzzz /./ + # set super low threshold, so always marked as spam + required_score -10000.0 + # add two fake lexically high tests so every other hit will always be + # followed by a comma in the X-Spam-Status header + body ZZZZZZZZ /./ + body zzzzzzzz /./ "); sarun ("-L < $mail", \&patterns_run_cb); ok_all_patterns(); @@ -141,3 +126,4 @@ map { [$_, sha1($_ . $i)] } @_; } + diff -Nru spamassassin-3.4.6/t/rule_tests.t spamassassin-4.0.0~rc3/t/rule_tests.t --- spamassassin-3.4.6/t/rule_tests.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/rule_tests.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,23 +1,7 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - -use lib '.'; -use SATest; -sa_t_init("rule_tests"); +use lib '.'; use lib 't'; +use SATest; sa_t_init("rule_tests"); use strict; use Test::More; diff -Nru spamassassin-3.4.6/t/rule_types.t spamassassin-4.0.0~rc3/t/rule_types.t --- spamassassin-3.4.6/t/rule_types.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/rule_types.t 2021-04-12 07:43:12.000000000 +0000 @@ -25,17 +25,22 @@ # for the commandline scanner). Try to exercise some of the # different rule types we support, header-name macros etc. (TODO: all ;) # -tstprefs (' +tstlocalrules (' + header LAST_RCVD_LINE Received =~ /www.fasttrec.com/ -header LAST_RCVD_LINE Received =~ /www.fasttrec.com/ -header MESSAGEID_MATCH MESSAGEID =~ /fasttrec.com/ -header ENV_FROM EnvelopeFrom =~ /jm.netnoteinc.com/ -body SUBJ_IN_BODY /YOUR BRAND NEW HOUSE/ -uri URI_RULE /WWW.SUPERSITESCENTRAL.COM/i -body BODY_LINE_WRAP /making obscene amounts of money from the/ -header RELAYS X-Spam-Relays-Untrusted =~ / helo=www.fasttrec.com / + header MESSAGEID_MATCH MESSAGEID =~ /fasttrec.com/ - '); + header ENV_FROM EnvelopeFrom =~ /jm.netnoteinc.com/ + + body SUBJ_IN_BODY /YOUR BRAND NEW HOUSE/ + + uri URI_RULE /WWW.SUPERSITESCENTRAL.COM/i + + body BODY_LINE_WRAP /making obscene amounts of money from the/ + + header RELAYS X-Spam-Relays-Untrusted =~ / helo=www.fasttrec.com / +'); sarun ("-L -t < data/spam/002", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/sa_awl.t spamassassin-4.0.0~rc3/t/sa_awl.t --- spamassassin-3.4.6/t/sa_awl.t 2020-10-06 10:20:40.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/sa_awl.t 2022-06-15 22:53:05.000000000 +0000 @@ -12,16 +12,15 @@ ); tstprefs (" - $default_cf_lines - auto_whitelist_path ./log/awltest - auto_whitelist_file_mode 0755 + auto_whitelist_path ./$userstate/awltest + auto_whitelist_file_mode 0755 "); sarun("--add-addr-to-whitelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb); -untaint_system("pwd"); -saawlrun("--clean --min 9999 ./log/awltest"); +print cwd() . "\n"; +saawlrun("--clean --min 9999 ./$userstate/awltest"); sarun ("-L -t < data/spam/004", \&patterns_run_cb); ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/sa_awl_welcome_block.t spamassassin-4.0.0~rc3/t/sa_awl_welcome_block.t --- spamassassin-3.4.6/t/sa_awl_welcome_block.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/sa_awl_welcome_block.t 2022-06-15 22:53:05.000000000 +0000 @@ -0,0 +1,27 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("sa_awl"); + +use Test::More tests => 1; + +# --------------------------------------------------------------------------- + +%patterns = ( + q{ X-Spam-Status: Yes}, 'isspam', +); + +tstprefs (" + auto_welcomelist_path ./$userstate/awltest + auto_welcomelist_file_mode 0755 +"); + +sarun("--add-addr-to-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", + \&patterns_run_cb); + +print cwd() . "\n"; +saawlrun("--clean --min 9999 ./$userstate/awltest"); + +sarun ("-L -t < data/spam/004", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/sa_check_spamd.t spamassassin-4.0.0~rc3/t/sa_check_spamd.t --- spamassassin-3.4.6/t/sa_check_spamd.t 2020-10-06 10:20:40.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/sa_check_spamd.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/perl -T use lib '.'; use lib 't'; -use SATest; sa_t_init("sa-check_spamd"); +use SATest; sa_t_init("sa_check_spamd"); use Test::More; plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS; @@ -10,10 +10,8 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', ); ok(start_spamd("-L")); @@ -29,3 +27,4 @@ sacheckspamdrun("--hostname $spamdhost --port $p --verbose"); ok (($? >> 8) != 0); + diff -Nru spamassassin-3.4.6/t/sa_compile.t spamassassin-4.0.0~rc3/t/sa_compile.t --- spamassassin-3.4.6/t/sa_compile.t 2019-06-23 13:51:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/sa_compile.t 2022-06-15 22:53:05.000000000 +0000 @@ -1,16 +1,14 @@ #!/usr/bin/perl -T -use lib '.'; -use lib 't'; +### +### UTF-8 CONTENT, edit with UTF-8 locale/editor +### +use lib '.'; use lib 't'; $ENV{'TEST_PERL_TAINT'} = 'no'; # inhibit for this test -use SATest; - -sa_t_init("sa_compile"); +use SATest; sa_t_init("sa_compile"); use Config; -use File::Basename; -use File::Path qw/mkpath/; my $temp_binpath = $Config{sitebinexp}; $temp_binpath =~ s|^\Q$Config{siteprefixexp}\E/||; @@ -19,25 +17,16 @@ plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS; plan skip_all => "RE2C isn't new enough" unless re2c_version_new_enough(); -plan tests => 5; - -BEGIN { - if (-e 't/test_dir') { - chdir 't'; - } - if (-e 'test_dir') { - unshift(@INC, '../blib/lib'); - } -} +plan tests => 24; # ------------------------------------------------------------------- use Cwd; my $cwd = getcwd; -my $builddir = "$cwd/log/d.$testname/build"; -my $instbase = "$cwd/log/d.$testname/inst"; -untaint_system("rm -rf $instbase $builddir"); -untaint_system("mkdir -p $instbase $builddir"); +my $builddir = untaint_var("$cwd/$workdir/d.$testname/build"); +my $instbase = untaint_var("$cwd/$workdir/d.$testname/inst"); +rmtree("$instbase", "$builddir", { safe => 1 }); +mkpath("$instbase", "$builddir", { error => \my $err_list }); untaint_system("cd .. && make tardist >/dev/null"); $? == 0 or die "tardist failed: $?"; @@ -54,44 +43,77 @@ $scr = "$instdir/$temp_binpath/spamassassin"; $scr_localrules_args = $scr_cf_args = ""; # use the default rules dir, from our "install" -&set_rules("body FOO /You have been selected to receive/"); +&set_rules(' +body FOO1 /You have been selected to receive/ +body FOO2 /You have bee[n] selected to receive/ +body FOO3 /You have bee(?:xyz|\x6e) selected to receive/ +body FOO4 /./ +body FOO5 /金融機/ +body FOO6 /金融(?:xyz|機)/ +body FOO7 /\xe9\x87\x91\xe8\x9e\x8d\xe6\xa9\x9f/ +body FOO8 /.\x87(?:\x91|\x00)[\xe8\x00]\x9e\x8d\xe6\xa9\x9f/ +# Test that meta rules work for sa-compiled body rules +# (loosely related to Bug 7987) +meta META1 FOO1 && FOO2 && FOO3 && FOO4 +meta META2 FOO5 && FOO6 && FOO7 && FOO8 +'); # ensure we don't use compiled rules -untaint_system("rm -rf $instdir/var/spamassassin/compiled"); +rmtree("$instdir/var/spamassassin/compiled", { safe => 1 }); %patterns = ( - - q{ check: tests=FOO }, 'FOO' - + qr/ check: tests=FOO1,FOO2,FOO3,FOO4,META1\n/, '', ); - -print "\nRunning spam checks uncompiled\n"; -ok sarun ("-D -Lt < $cwd/data/spam/001 2>&1", \&patterns_run_cb); +%anti_patterns = ( + 'zoom: able to use', '', +); +ok sarun ("-D check,zoom -L -t --cf 'normalize_charset 1' < $cwd/data/spam/001 2>&1", \&patterns_run_cb); +ok_all_patterns(); +ok sarun ("-D check,zoom -L -t --cf 'normalize_charset 0' < $cwd/data/spam/001 2>&1", \&patterns_run_cb); ok_all_patterns(); -clear_pattern_counters(); - -# ------------------------------------------------------------------- - -print "\nRunning spam checks compiled\n"; -untaint_system "rm -rf \$HOME/.spamassassin/sa-compile.cache"; # reset test -system_or_die "$instdir/$temp_binpath/sa-compile --keep-tmps 2>&1"; # --debug %patterns = ( + qr/ check: tests=FOO4,FOO5,FOO6,FOO7,FOO8,META2\n/, '', +); +%anti_patterns = ( + 'zoom: able to use', '', +); +ok sarun ("-D check,zoom -L -t --cf 'normalize_charset 1' < $cwd/data/spam/unicode1 2>&1", \&patterns_run_cb); +ok_all_patterns(); +ok sarun ("-D check,zoom -L -t --cf 'normalize_charset 0' < $cwd/data/spam/unicode1 2>&1", \&patterns_run_cb); +ok_all_patterns(); - q{ able to use 1/1 'body_0' compiled rules }, 'able-to-use', - q{ check: tests=FOO }, 'FOO' +# ------------------------------------------------------------------- -); +rmtree( glob "~/.spamassassin/sa-compile.cache". { safe => 1 }); # reset test +system_or_die "TMP=$instdir TMPDIR=$instdir $instdir/$temp_binpath/sa-compile --quiet -p $cwd/$workdir/user.cf --keep-tmps -D 2>$instdir/sa-compile.debug"; # --debug $scr = "$instdir/$temp_binpath/spamassassin"; $scr_localrules_args = $scr_cf_args = ""; # use the default rules dir, from our "install" -ok sarun ("-D -Lt < $cwd/data/spam/001 2>&1", \&patterns_run_cb); +%patterns = ( + ' zoom: able to use 5/5 \'body_0\' compiled rules ', '', + qr/ check: tests=FOO1,FOO2,FOO3,FOO4,META1\n/, '', +); +%anti_patterns = (); +ok sarun ("-D check,zoom -L -t --cf 'normalize_charset 1' < $cwd/data/spam/001 2>&1", \&patterns_run_cb); +ok_all_patterns(); +ok sarun ("-D check,zoom -L -t --cf 'normalize_charset 0' < $cwd/data/spam/001 2>&1", \&patterns_run_cb); +ok_all_patterns(); + +%patterns = ( + ' zoom: able to use 5/5 \'body_0\' compiled rules ', '', + qr/ check: tests=FOO4,FOO5,FOO6,FOO7,FOO8,META2\n/, '', +); +%anti_patterns = (); +ok sarun ("-D check,zoom -L -t --cf 'normalize_charset 1' < $cwd/data/spam/unicode1 2>&1", \&patterns_run_cb); +ok_all_patterns(); +ok sarun ("-D check,zoom -L -t --cf 'normalize_charset 0' < $cwd/data/spam/unicode1 2>&1", \&patterns_run_cb); ok_all_patterns(); # ------------------------------------------------------------------- # Cleanup after testing (todo, sa-compile should have option for userstatedir) -untaint_system "rm -rf \$HOME/.spamassassin/sa-compile.cache"; +rmtree( glob "~/.spamassassin/sa-compile.cache". { safe => 1 }); # reset test # ------------------------------------------------------------------- @@ -113,7 +135,8 @@ sub new_instdir { $instdir = untaint_var($instbase.".".(shift)); print "\nsetting new instdir: $instdir\n"; - untaint_system("rm -rf $instdir; mkdir $instdir"); + rmtree("$instdir", { safe => 1 }); + mkpath($instdir, { error => \my $listerrs }); } sub run_makefile_pl { @@ -143,13 +166,8 @@ open RULES, ">$file" or die "cannot write $file - $!"; - print RULES qq{ - - use_bayes 0 - - $rules - - }; + print RULES "use_bayes 0"; + print RULES $rules; close RULES or die; #Create the dir for the pre file @@ -181,3 +199,4 @@ }; close RULES or die; } + diff -Nru spamassassin-3.4.6/t/SATest.pm spamassassin-4.0.0~rc3/t/SATest.pm --- spamassassin-3.4.6/t/SATest.pm 2020-10-07 08:28:05.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/SATest.pm 2022-08-20 00:19:41.000000000 +0000 @@ -2,6 +2,8 @@ # imported into main for ease of use. package main; +require v5.14.0; + # use strict; # use warnings; # use re 'taint'; @@ -12,6 +14,7 @@ use File::Copy; use File::Path; use File::Spec; +use File::Temp qw(tempdir); use Test::Builder (); use Test::More (); @@ -21,8 +24,11 @@ use vars qw($RUNNING_ON_WINDOWS $SSL_AVAILABLE $SKIP_SPAMD_TESTS $SKIP_SPAMC_TESTS $NO_SPAMC_EXE $SKIP_SETUID_NOBODY_TESTS $SKIP_DNSBL_TESTS - $have_inet4 $have_inet6 $spamdhost $spamdport); + $have_inet4 $have_inet6 $spamdhost $spamdport + $workdir $siterules $localrules $userrules $userstate + $keep_workdir $mainpid $spamd_pidfile); +my $sa_code_dir; BEGIN { require Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK); @@ -58,11 +64,43 @@ }; # Clean PATH so taint doesn't complain - $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin'; - # Remove tainted envs, at least ENV used in FreeBSD - delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; + if (!$RUNNING_ON_WINDOWS) { + $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin'; + # Remove tainted envs, at least ENV used in FreeBSD + delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; + } else { + # Windows might need non-system directories in PATH to run a Perl installation + # The best we can do is clean out obviously bad stuff such as relative paths or \..\ + my @pathdirs = split(';', $ENV{'PATH'}); + $ENV{'PATH'} = + join(';', # filter for only dirs that are canonical absolute paths that exist + map { + my $pathdir = $_; + $pathdir =~ s/\\*\z//; + my $abspathdir = File::Spec->canonpath(Cwd::realpath($pathdir)); + if (defined $abspathdir) { + $abspathdir =~ /^(.*)\z/s; + $abspathdir = $1; # untaint it + } + ((defined $abspathdir) and (lc $pathdir eq lc $abspathdir) and (-d $abspathdir))?($abspathdir):() + } + @pathdirs); + } + + # Fix INC to point to absolute path of built SA + if (-e 't/test_dir') { $sa_code_dir = 'blib/lib'; } + elsif (-e 'test_dir') { $sa_code_dir = '../blib/lib'; } + else { die "FATAL: not in or below test directory?\n"; } + File::Spec->rel2abs($sa_code_dir) =~ /^(.*)\z/s; + $sa_code_dir = $1; + if (not -d $sa_code_dir) { + die "FATAL: not in expected directory relative to built code tree?\n"; + } } +# use is run at compile time, but after the variable has been computed in the BEGIN block +use lib $sa_code_dir; + # Set up for testing. Exports (as global vars): # out: $home: $HOME env variable # out: $cwd: here @@ -72,6 +110,7 @@ # sub sa_t_init { my $tname = shift; + $mainpid = $$; if ($config{PERL_PATH}) { $perl_path = $config{PERL_PATH}; @@ -100,6 +139,31 @@ $perl_cmd .= " -T" if !defined($ENV{'TEST_PERL_TAINT'}) or $ENV{'TEST_PERL_TAINT'} ne 'no'; $perl_cmd .= " -w" if !defined($ENV{'TEST_PERL_WARN'}) or $ENV{'TEST_PERL_WARN'} ne 'no'; + # Copy directories in PERL5LIB into -I options in perl_cmd because -T suppresses use of PERL5LIB in call to ./spamassassin + # If PERL5LIB is empty copy @INC instead because on some platforms like FreeBSD MakeMaker clears PER5LIB and sets @INC + # Filter out relative paths, and canonicalize so no symlinks or /../ will be left in untainted result as a nod to security + # Since this is only used to run tests, the security considerations are not as strict as with more general situations. + my @pathdirs = @INC; + if ($ENV{'PERL5LIB'}) { + @pathdirs = split($Config{path_sep}, $ENV{'PERL5LIB'}); + } + my $inc_opts = + join(' -I', # filter for only dirs that are absolute paths that exist, then canonicalize them + map { + my $pathdir = $_; + my $canonpathdir = File::Spec->canonpath(Cwd::realpath($pathdir)) if (File::Spec->file_name_is_absolute($pathdir)); + if (defined $canonpathdir) { + $canonpathdir =~ /^(.*)\z/s; + $canonpathdir = $1; # untaint it + } + ((defined $canonpathdir) and (-d $canonpathdir))?($canonpathdir):() + } + @pathdirs); + $perl_cmd .= " -I$inc_opts" if ($inc_opts); + + # To work in Windows, the perl scripts have to be launched by $perl_cmd and + # the ones that are exe files have to be directly called in the command lines + $scr = $ENV{'SPAMASSASSIN_SCRIPT'}; $scr ||= "$perl_cmd ../spamassassin.raw"; @@ -113,10 +177,10 @@ $salearn ||= "$perl_cmd ../sa-learn.raw"; $saawl = $ENV{'SAAWL_SCRIPT'}; - $saawl ||= "../sa-awl"; + $saawl ||= "$perl_cmd ../sa-awl"; $sacheckspamd = $ENV{'SACHECKSPAMD_SCRIPT'}; - $sacheckspamd ||= "../sa-check_spamd"; + $sacheckspamd ||= "$perl_cmd ../sa-check_spamd"; $spamdlocalhost = $ENV{'SPAMD_LOCALHOST'}; if (!$spamdlocalhost) { @@ -124,36 +188,74 @@ } $spamdhost = $ENV{'SPAMD_HOST'}; $spamdhost ||= $spamdlocalhost; - $spamdport = $ENV{'SPAMD_PORT'}; - $spamdport ||= probably_unused_spamd_port(); # optimisation -- don't setup spamd test parameters unless we're # not skipping all spamd tests and this particular test is called # called "spamd_something" or "spamc_foo" # We still run spamc tests when there is an external SPAMD_HOST, but don't have to set up the spamd parameters for it - if ($SKIP_SPAMD_TESTS or ($tname !~ /spam[cd]/)) { - $NO_SPAMD_REQUIRED = 1; + if ($tname !~ /spam[cd]/) { + $TEST_DOES_NOT_RUN_SPAMC_OR_D = 1; + } else { + $spamdport = $ENV{'SPAMD_PORT'}; + $spamdport ||= probably_unused_spamd_port(); } - $spamd_cf_args = "-C log/test_rules_copy"; - $spamd_localrules_args = " --siteconfigpath log/localrules.tmp"; - $scr_localrules_args = " --siteconfigpath log/localrules.tmp"; - $salearn_localrules_args = " --siteconfigpath log/localrules.tmp"; - - $scr_cf_args = "-C log/test_rules_copy"; - $scr_pref_args = "-p log/test_default.cf"; - $salearn_cf_args = "-C log/test_rules_copy"; - $salearn_pref_args = "-p log/test_default.cf"; + (-f "t/test_dir") && chdir("t"); # run from .. + -f "test_dir" or die "FATAL: not in test directory?\n"; + + unless (-d "log") { + mkdir ("log", 0755) or die ("Error creating log dir: $!"); + } + chmod (0755, "log"); # set in case log already exists with wrong permissions + + if (!$RUNNING_ON_WINDOWS) { + untaint_system("chacl -B log 2>/dev/null || setfacl -b log 2>/dev/null"); # remove acls that confuse test + } + + # clean old workdir if sa_t_init called multiple times + if (defined $workdir) { + if (!$keep_workdir) { + rmtree($workdir); + } + } + + # individual work directory to make parallel tests possible + $workdir = tempdir("$tname.XXXXXX", DIR => "log"); + die "FATAL: failed to create workdir: $!" unless -d $workdir; + $keep_workdir = 0; + # $siterules contains all stock *.pre files + $siterules = "$workdir/siterules"; + # $localrules contains all stock *.cf files + $localrules = "$workdir/localrules"; + # $userrules contains user rules + $userrules = "$workdir/user.cf"; + # user_state directory + $userstate = "$workdir/user_state"; + + mkdir($siterules) or die "FATAL: failed to create $siterules\n"; + mkdir($localrules) or die "FATAL: failed to create $localrules\n"; + open(OUT, ">$userrules") or die "FATAL: failed to create $userrules\n"; + close(OUT); + mkdir($userstate) or die "FATAL: failed to create $userstate\n"; + + $spamd_pidfile = "$workdir/spamd.pid"; + $spamd_cf_args = "-C $localrules"; + $spamd_localrules_args = " --siteconfigpath $siterules"; + $scr_localrules_args = " --siteconfigpath $siterules"; + $salearn_localrules_args = " --siteconfigpath $siterules"; + + $scr_cf_args = "-C $localrules"; + $scr_pref_args = "-p $userrules"; + $salearn_cf_args = "-C $localrules"; + $salearn_pref_args = "-p $userrules"; $scr_test_args = ""; $salearn_test_args = ""; - $set_test_prefs = 0; + $set_user_prefs = 0; $default_cf_lines = " - bayes_path ./log/user_state/bayes - auto_whitelist_path ./log/user_state/auto-whitelist + bayes_path ./$userstate/bayes + auto_welcomelist_path ./$userstate/auto-welcomelist "; - (-f "t/test_dir") && chdir("t"); # run from .. - read_config(); # if running as root, ensure "nobody" can write to it too @@ -168,77 +270,45 @@ $tmp_dir_mode = 0755; } - if (!$NO_SPAMD_REQUIRED) { - $NO_SPAMC_EXE = ($RUNNING_ON_WINDOWS && + $NO_SPAMC_EXE = $TEST_DOES_NOT_RUN_SPAMC_OR_D || + ($RUNNING_ON_WINDOWS && !$ENV{'SPAMC_SCRIPT'} && !(-e "../spamc/spamc.exe")); - $SKIP_SPAMC_TESTS = ($NO_SPAMC_EXE || - ($RUNNING_ON_WINDOWS && !$ENV{'SPAMD_HOST'})); - $SSL_AVAILABLE = ((!$SKIP_SPAMC_TESTS) && # no SSL test if no spamc - (!$SKIP_SPAMD_TESTS) && # or if no local spamd - (untaint_cmd("$spamc -V") =~ /with SSL support/) && - (untaint_cmd("$spamd --version") =~ /with SSL support/)); - } - # do not remove prior test results! - # rmtree ("log"); - - unless (-d "log") { - mkdir ("log", 0755) or die ("Error creating log dir: $!"); - } - chmod (0755, "log"); # set in case log already exists with wrong permissions - - if (!$RUNNING_ON_WINDOWS) { - untaint_system("chacl -B log 2>/dev/null || setfacl -b log 2>/dev/null"); # remove acls that confuse test - } - - rmtree ("log/user_state"); - rmtree ("log/outputdir.tmp"); + $SKIP_SPAMC_TESTS = ($NO_SPAMC_EXE || + ($RUNNING_ON_WINDOWS && !$ENV{'SPAMD_HOST'})); + $SSL_AVAILABLE = (!$TEST_DOES_NOT_RUN_SPAMC_OR_D) && + (!$SKIP_SPAMC_TESTS) && # no SSL test if no spamc + (!$SKIP_SPAMD_TESTS) && # or if no local spamd + (untaint_cmd("$spamc -V") =~ /with SSL support/) && + (untaint_cmd("$spamd --version") =~ /with SSL support/); - rmtree ("log/test_rules_copy"); - mkdir ("log/test_rules_copy", 0755); - - for $tainted (<../rules/*.cf>, <../rules/*.pm>, <../rules/*.pre>) { + for $tainted (<../rules/*.pm>, <../rules/*.pre>, <../rules/languages>) { $tainted =~ /(.*)/; my $file = $1; $base = basename $file; - copy ($file, "log/test_rules_copy/$base") - or warn "cannot copy $file to log/test_rules_copy/$base: $!"; + copy ($file, "$siterules/$base") + or warn "cannot copy $file to $siterules/$base: $!"; } - copy ("data/01_test_rules.pre", "log/test_rules_copy/01_test_rules.pre") - or warn "cannot copy data/01_test_rules.cf to log/test_rules_copy/01_test_rules.pre: $!"; - copy ("data/01_test_rules.cf", "log/test_rules_copy/01_test_rules.cf") - or warn "cannot copy data/01_test_rules.cf to log/test_rules_copy/01_test_rules.cf: $!"; - - rmtree ("log/localrules.tmp"); - mkdir ("log/localrules.tmp", 0755); - - for $tainted (<../rules/*.pm>, <../rules/*.pre>) { + for $tainted (<../rules/*.cf>) { $tainted =~ /(.*)/; my $file = $1; $base = basename $file; - copy ($file, "log/localrules.tmp/$base") - or warn "cannot copy $file to log/localrules.tmp/$base: $!"; + copy ($file, "$localrules/$base") + or warn "cannot copy $file to $localrules/$base: $!"; } - copy ("../rules/user_prefs.template", "log/test_rules_copy/99_test_default.cf") - or die "user prefs copy failed: $!"; + copy ("data/01_test_rules.pre", "$localrules/01_test_rules.pre") + or warn "cannot copy data/01_test_rules.cf to $localrules/01_test_rules.pre: $!"; + copy ("data/01_test_rules.cf", "$localrules/01_test_rules.cf") + or warn "cannot copy data/01_test_rules.cf to $localrules/01_test_rules.cf: $!"; - open (PREFS, ">>log/test_rules_copy/99_test_default.cf") - or die "cannot append to log/test_rules_copy/99_test_default.cf: $!"; + open (PREFS, ">>$localrules/99_test_default.cf") + or die "cannot append to $localrules/99_test_default.cf: $!"; print PREFS $default_cf_lines - or die "error writing to log/test_rules_copy/99_test_default.cf: $!"; + or die "error writing to $localrules/99_test_default.cf: $!"; close PREFS - or die "error closing log/test_rules_copy/99_test_default.cf: $!"; - - # create an empty .prefs file - open (PREFS, ">>log/test_default.cf") - or die "cannot append to log/test_default.cf: $!"; - close PREFS - or die "error closing log/test_default.cf: $!"; - - mkdir("log/user_state",$tmp_dir_mode); - chmod ($tmp_dir_mode, "log/user_state"); # unaffected by umask + or die "error closing $localrules/99_test_default.cf: $!"; $home = $ENV{'HOME'}; $home ||= $ENV{'WINDIR'} if (defined $ENV{'WINDIR'}); @@ -250,10 +320,26 @@ $spamd_run_as_user = ($RUNNING_ON_WINDOWS || ($> == 0)) ? "nobody" : (getpwuid($>))[0] ; } -# a port number between 32768 and 65535; used to allow multiple test +# remove all rules - $localrules/*.cf +# when you want to only use rules declared inside a specific *.t +sub clear_localrules { + for $tainted (<$localrules/*.cf>) { + $tainted =~ /(.*)/; + my $file = $1; + # Keep some useful, should not contain any rules + next if $file =~ /10_default_prefs.cf$/; + next if $file =~ /20_aux_tlds.cf$/; + # Keep our own tstprefs() or tstlocalrules() + next if $file =~ /99_test_prefs.cf$/; + next if $file =~ /99_test_rules.cf$/; + unlink $file; + } +} + +# a port number between 40000 and 65520; used to allow multiple test # suite runs on the same machine simultaneously sub probably_unused_spamd_port { - return 0 if $NO_SPAMD_REQUIRED; + return 0 if $SKIP_SPAMD_TESTS; my $port; my @nstat; @@ -263,11 +349,9 @@ @nstat = grep(/^\s*tcp/i, ); close(NSTAT); } - my $delta = ($$ % 32768) || int(rand(32768)); - for (1..10) { - $port = 32768 + $delta; + for (1..20) { + $port = 40000 + int(rand(65500-40000)); last unless (getservbyport($port, "tcp") || grep(/[:.]$port\s/, @nstat)); - $delta = int(rand(32768)); } return $port; } @@ -291,31 +375,35 @@ sub tstfile { my $file = shift; - open (OUT, ">log/mail.txt") or die; + open (OUT, ">$workdir/mail.txt") or die; print OUT $file; close OUT; } -sub tstlocalrules { +sub tstprefs { my $lines = shift; - $set_local_rules = 1; + open (OUT, ">$localrules/99_test_prefs.cf") or die; + print OUT $lines; close OUT; +} + +sub tstlocalrules { + my $lines = shift; - open (OUT, ">log/localrules.tmp/00test.cf") or die; + open (OUT, ">$localrules/99_test_rules.cf") or die; print OUT $lines; close OUT; } -sub tstprefs { +sub tstuserprefs { my $lines = shift; - $set_test_prefs = 1; + $set_user_prefs = 1; # TODO: should we use -p, or modify the test_rules_copy/99_test_default.cf? # for now, I'm taking the -p route, since we have to be able to test # the operation of user-prefs in general, itself. - open (OUT, ">log/tst.cf") or die; + open (OUT, ">$userrules") or die; print OUT $lines; close OUT; - $scr_pref_args = "-p log/tst.cf"; } # creates a .pre file in the localrules dir to be parsed alongside init.pre @@ -324,10 +412,25 @@ sub tstpre { my $lines = shift; - open (OUT, ">log/localrules.tmp/zz_tst.pre") or die; + open (OUT, ">$siterules/zz_test.pre") or die; print OUT $lines; close OUT; } +# remove default compatibility option +sub disable_compat { + my $compat = shift; + return unless defined $compat; + open (IN, "$siterules/init.pre") or die; + open (OUT, ">$siterules/init.pre.new") or die; + while () { + next if $_ =~ /^\s*enable_compat\s+\Q$compat\E(?:\s|$)/i; + print OUT $_; + } + close OUT or die; + close IN or die; + rename("$siterules/init.pre.new", "$siterules/init.pre"); +} + # Run spamassassin. Calls back with the output. # in $args: arguments to run with # in $read_sub: callback for the output (should read from ). @@ -355,14 +458,15 @@ my $scrargs = "$scr $args"; $scrargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i); print ("\t$scrargs\n"); - (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755); + (-d "$workdir/d.$testname") or mkdir ("$workdir/d.$testname", 0755); my $test_number = test_number(); - - untaint_system("$scrargs > log/d.$testname/$test_number $post_redir"); + $current_checkfile = "$workdir/d.$testname/$test_number"; +#print STDERR "RUN: $scrargs\n"; + untaint_system("$scrargs > $workdir/d.$testname/$test_number $post_redir"); $sa_exitcode = ($?>>8); if ($sa_exitcode != 0) { return undef; } - &checkfile ("d.$testname/$test_number", $read_sub) if (defined $read_sub); + &checkfile ("$workdir/d.$testname/$test_number", $read_sub) if (defined $read_sub); 1; } @@ -392,14 +496,15 @@ my $salearnargs = "$salearn $args"; $salearnargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i); print ("\t$salearnargs\n"); - (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755); + (-d "$workdir/d.$testname") or mkdir ("$workdir/d.$testname", 0755); my $test_number = test_number(); + $current_checkfile = "$workdir/d.$testname/$test_number"; - untaint_system("$salearnargs > log/d.$testname/$test_number"); + untaint_system("$salearnargs > $workdir/d.$testname/$test_number"); $salearn_exitcode = ($?>>8); if ($salearn_exitcode != 0) { return undef; } - &checkfile ("d.$testname/$test_number", $read_sub) if (defined $read_sub); + &checkfile ("$workdir/d.$testname/$test_number", $read_sub) if (defined $read_sub); 1; } @@ -451,14 +556,14 @@ $spamcargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i); print ("\t$spamcargs\n"); - (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755); + (-d "$workdir/d.$testname") or mkdir ("$workdir/d.$testname", 0755); my $test_number = test_number(); if ($capture_stderr) { - untaint_system ("$spamcargs > log/d.$testname/out.$test_number 2>&1"); + untaint_system ("$spamcargs > $workdir/d.$testname/out.$test_number 2>&1"); } else { - untaint_system ("$spamcargs > log/d.$testname/out.$test_number"); + untaint_system ("$spamcargs > $workdir/d.$testname/out.$test_number"); } $sa_exitcode = ($?>>8); @@ -468,7 +573,7 @@ %found = (); %found_anti = (); - &checkfile ("d.$testname/out.$test_number", $read_sub) if (defined $read_sub); + &checkfile ("$workdir/d.$testname/out.$test_number", $read_sub) if (defined $read_sub); if ($expect_failure) { ($sa_exitcode != 0); @@ -497,10 +602,10 @@ $spamcargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i); print ("\t$spamcargs &\n"); - (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755); + (-d "$workdir/d.$testname") or mkdir ("$workdir/d.$testname", 0755); my $test_number = test_number(); - untaint_system ("$spamcargs > log/d.$testname/bg.$test_number &") and return 0; + untaint_system ("$spamcargs > $workdir/d.$testname/bg.$test_number &") and return 0; 1; } @@ -518,15 +623,15 @@ } sub recreate_outputdir_tmp { - rmtree ("log/outputdir.tmp"); # some tests use this - mkdir ("log/outputdir.tmp", $tmp_dir_mode); - chmod ($tmp_dir_mode, "log/outputdir.tmp"); # unaffected by umask + rmtree ("$workdir/outputdir.tmp"); # some tests use this + mkdir ("$workdir/outputdir.tmp", $tmp_dir_mode); + chmod ($tmp_dir_mode, "$workdir/outputdir.tmp"); # unaffected by umask } # out: $spamd_stderr sub start_spamd { return if $SKIP_SPAMD_TESTS; - die "NO_SPAMD_REQUIRED in start_spamd! oops" if $NO_SPAMD_REQUIRED; + die "TEST_DOES_NOT_RUN_SPAMC_OR_D; in start_spamd! oops" if $TEST_DOES_NOT_RUN_SPAMC_OR_D; my $spamd_extra_args = shift; @@ -571,13 +676,12 @@ warn "oops! SATest.pm: a test prefs file was created, but spamd isn't reading it\n"; } - (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755); + (-d "$workdir/d.$testname") or mkdir ("$workdir/d.$testname", 0755); my $test_number = test_number(); - my $spamd_stdout = "log/d.$testname/spamd.out.$test_number"; - $spamd_stderr = "log/d.$testname/spamd.err.$test_number"; # global - my $spamd_stdlog = "log/d.$testname/spamd.log.$test_number"; - my $spamd_pidfile = "log/spamd.pid"; + my $spamd_stdout = "$workdir/d.$testname/spamd.out.$test_number"; + $spamd_stderr = "$workdir/d.$testname/spamd.err.$test_number"; # global + my $spamd_stdlog = "$workdir/d.$testname/spamd.log.$test_number"; my $spamd_forker = $ENV{'SPAMD_FORKER'} ? $ENV{'SPAMD_FORKER'} : $RUNNING_ON_WINDOWS ? @@ -599,7 +703,7 @@ # DEBUG instrumentation to trace spamd processes. See bug 5731 for history # if (-f "/home/jm/capture_spamd_straces") { - # $spamd_cmd = "strace -ttt -fo log/d.$testname/spamd.strace.$test_number $spamd_cmd"; + # $spamd_cmd = "strace -ttt -fo $workdir/d.$testname/spamd.strace.$test_number $spamd_cmd"; # } unlink ($spamd_stdout, $spamd_stderr, $spamd_stdlog, $spamd_pidfile); @@ -616,7 +720,11 @@ sleep $wait ; while ($spamd_pid <= 0) { my $spamdlog = ''; - my $pidstr = untaint_cmd("cat $spamd_pidfile 2>/dev/null"); + my $pidstr; + if (open(PID, $spamd_pidfile)) { + $pidstr = ; + close PID; + } if ($pidstr) { chomp $pidstr; $spamd_pid = $pidstr; @@ -641,7 +749,7 @@ } my $sleep = (int($wait++ / 4) + 1); - warn "spam_pid not found: Sleeping $sleep - Retry # $retries\n"; + warn "spam_pid not found: Sleeping $sleep - Retry # $retries\n" if $retries && $retries < 20; sleep $sleep if $retries > 0; @@ -658,7 +766,7 @@ sub stop_spamd { return 0 if ( defined($spamd_already_killed) || $SKIP_SPAMD_TESTS); - die "NO_SPAMD_REQUIRED in stop_spamd! oops" if $NO_SPAMD_REQUIRED; + die "TEST_DOES_NOT_RUN_SPAMC_OR_D; in stop_spamd! oops" if $TEST_DOES_NOT_RUN_SPAMC_OR_D; $spamd_pid ||= 0; $spamd_pid = untaint_var($spamd_pid); @@ -688,10 +796,10 @@ # YUCK, these file/dir names should be some sort of variable, at # least we keep their definition in the same file for the moment. - my %setup_args = ( rules_filename => 'log/test_rules_copy', - site_rules_filename => 'log/localrules.tmp', - userprefs_filename => 'log/test_default.cf', - userstate_dir => 'log/user_state', + my %setup_args = ( rules_filename => $localrules, + site_rules_filename => $siterules, + userprefs_filename => $userrules, + userstate_dir => $userstate, local_tests_only => 1, # debug => 'all', ); @@ -701,7 +809,6 @@ $setup_args{$arg} = $args->{$arg}; } - # We'll assume that the test has setup INC correctly require Mail::SpamAssassin; my $sa = Mail::SpamAssassin->new(\%setup_args); @@ -712,7 +819,6 @@ sub create_clientobj { my $args = shift; - # We'll assume that the test has setup INC correctly require Mail::SpamAssassin::Client; my $client = Mail::SpamAssassin::Client->new($args); @@ -727,15 +833,11 @@ my $read_sub = shift; # print "Checking $filename\n"; - if (!open (IN, "< log/$filename")) { - # could be it already contains the "log/" prefix? - if (!open (IN, "< $filename")) { - warn "cannot open log/$filename or $filename"; return undef; - } else { - push @files_checked, "$filename"; - } + if (!open (IN, "< $filename")) { + warn "cannot open $filename"; + return undef; } else { - push @files_checked, "log/$filename"; + push @files_checked, "$filename"; } &$read_sub(); close IN; @@ -743,53 +845,64 @@ # --------------------------------------------------------------------------- -sub pattern_to_re { - my $pat = shift; - - if ($pat =~ /^\/(.*)\/$/) { - return $1; - } - - $pat = quotemeta($pat); - - # make whitespace irrelevant; match any amount as long as the - # non-whitespace chars are OK. - $pat =~ s/\\\s/\\s\*/gs; - $pat; -} - -# --------------------------------------------------------------------------- - sub patterns_run_cb { - local ($_); my $string = shift; - if (defined $string) { - $_ = $string; - } else { - $_ = join ('', ); + if (!defined $string) { + $string = join ('', ); } - $matched_output = $_; + $matched_output = $string; # create default names == the pattern itself, if not specified + my %seen; foreach my $pat (keys %patterns) { if ($patterns{$pat} eq '') { $patterns{$pat} = $pat; } + if ($seen{$patterns{$pat}}++) { + die "ERROR: duplicate pattern name found: '$patterns{$pat}'\n"; + } + } + %seen = (); + foreach my $pat (keys %anti_patterns) { + if ($anti_patterns{$pat} eq '') { + $anti_patterns{$pat} = $pat; + } + if ($seen{$anti_patterns{$pat}}++) { + die "ERROR: duplicate anti_pattern name found: '$anti_patterns{$pat}'\n"; + } } foreach my $pat (sort keys %patterns) { - my $safe = pattern_to_re ($pat); - # print "JMD $patterns{$pat}\n"; - if ($_ =~ /${safe}/s) { - $found{$patterns{$pat}}++; + if (index($pat, '(?^') == 0) { # Detect qr// regex, it's a string now + if ($string =~ $pat) { + $found{$patterns{$pat}}++; + } + } else { + my $re = $pat; + $re =~ s/([^A-Za-z_0-9\s])/\\$1/gs; # quotemeta + $re =~ s/\s+/\\s+/gs; # normalize whitespace + eval { $re = qr/$re/; 1; }; + if ($@) { die "ERROR: failed to compile regex: '$re'\n"; } + if ($string =~ $re) { + $found{$patterns{$pat}}++; + } } } foreach my $pat (sort keys %anti_patterns) { - my $safe = pattern_to_re ($pat); - # print "JMD $patterns{$pat}\n"; - if ($_ =~ /${safe}/s) { - $found_anti{$anti_patterns{$pat}}++; + if (index($pat, '(?^') == 0) { # Detect qr// regex, it's a string now + if ($string =~ $pat) { + $found_anti{$anti_patterns{$pat}}++; + } + } else { + my $re = $pat; + $re =~ s/([^A-Za-z_0-9\s])/\\$1/gs; # quotemeta + $re =~ s/\s+/\\s+/gs; # normalize whitespace + eval { $re = qr/$re/; 1; }; + if ($@) { die "ERROR: failed to compile regex: '$re'\n"; } + if ($string =~ $re) { + $found_anti{$anti_patterns{$pat}}++; + } } } } @@ -806,8 +919,10 @@ ok ($found{$type} == 1) or warn "Found more than once: $type at $file line $line.\n"; } } else { - warn "\tNot found: $type = $pat at $file line $line.\n"; + my $typestr = $type eq $pat ? "" : "$type = "; + warn "\tNot found: $typestr$pat at $file line $line.\n"; if (!$dont_ok) { + $keep_workdir = 1; ok (0); # keep the right # of tests } $wasfailure++; @@ -817,7 +932,8 @@ my $type = $anti_patterns{$pat}; print "\tChecking for anti-pattern $type at $file line $line.\n"; if (defined $found_anti{$type}) { - warn "\tFound anti-pattern: $type = $pat at $file line $line.\n"; + my $typestr = $type eq $pat ? "" : "$type = "; + warn "\tFound anti-pattern: $typestr$pat at $file line $line.\n"; if (!$dont_ok) { ok (0); } $wasfailure++; } @@ -830,6 +946,7 @@ if ($wasfailure) { warn "Output can be examined in: ". join(' ', @files_checked)."\n" if @files_checked; + $keep_workdir = 1; return 0; } else { return 1; @@ -849,7 +966,8 @@ if ($skip) { warn "\tTest skipped: $skip at $file line $line.\n"; } else { - warn "\tNot found: $type = $pat at $file line $line.\n"; + my $typestr = $type eq $pat ? "" : "$type = "; + warn "\tNot found: $typestr$pat at $file line $line.\n"; } skip ($skip, 0); # keep the right # of tests } @@ -858,7 +976,8 @@ my $type = $anti_patterns{$pat}; print "\tChecking for anti-pattern $type\n"; if (defined $found_anti{$type}) { - warn "\tFound anti-pattern: $type = $pat at $file line $line.\n"; + my $typestr = $type eq $pat ? "" : "$type = "; + warn "\tFound anti-pattern: $typestr$pat at $file line $line.\n"; skip ($skip, 0); } else @@ -937,40 +1056,10 @@ return 0; # n or 0 } -sub mk_safe_tmpdir { - return $safe_tmpdir if defined($safe_tmpdir); - - my $dir = File::Spec->tmpdir() || 'log'; - - # be a little paranoid, since we're using a public tmp dir and - # are exposed to race conditions - my $retries = 10; - my $tmp; - while (1) { - $tmp = "$dir/satest.$$.".rand(99999); - if (!-d $tmp && mkdir ($tmp, 0755)) { - if (-d $tmp && -o $tmp) { # check we own it - lstat($tmp); - if (-d _ && -o _) { # double-check, ignoring symlinks - last; # we got it safely - } - } - } - - die "cannot get tmp dir, giving up" if ($retries-- < 0); - - warn "failed to create tmp dir '$tmp' safely, retrying..."; - sleep 1; - } - - $safe_tmpdir = $tmp; - return $tmp; -} - -sub cleanup_safe_tmpdir { - if ($safe_tmpdir) { - rmtree($safe_tmpdir) or warn "cannot rmtree $safe_tmpdir"; - } +sub mk_socket_tempdir { + my $dir = tempdir(CLEANUP => 1); + die "FATAL: failed to create socket_tempdir: $!" unless -d $dir; + return $dir; } sub wait_for_file_to_change_or_disappear { @@ -1157,4 +1246,11 @@ } } +END { + # Cleanup workdir (but not if inside forked process) + if (defined $workdir && !$keep_workdir && $$ == $mainpid) { + rmtree($workdir); + } +} + 1; diff -Nru spamassassin-3.4.6/t/sha1.t spamassassin-4.0.0~rc3/t/sha1.t --- spamassassin-3.4.6/t/sha1.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/sha1.t 2022-05-08 05:40:03.000000000 +0000 @@ -1,28 +1,11 @@ #!/usr/bin/perl -w -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; +use lib '.'; use lib 't'; +use SATest; sa_t_init("sha1"); use Mail::SpamAssassin; - -BEGIN { - eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } - or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } -} +use Digest::SHA qw(sha1_hex); use Test::More tests => 15; @@ -30,7 +13,7 @@ my ($data, $want) = @_; if ($want ne sha1_hex($data)) { - print "Digest::SHA(1) sha1 mismatch\n"; + print "Digest::SHA sha1 mismatch\n"; return 0; } return 1; diff -Nru spamassassin-3.4.6/t/shortcircuit_before_dns.t spamassassin-4.0.0~rc3/t/shortcircuit_before_dns.t --- spamassassin-3.4.6/t/shortcircuit_before_dns.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/shortcircuit_before_dns.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,69 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("shortcircuit_before_dns"); + +use Test::More; +plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); +plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely(); +plan tests => 5; + +# --------------------------------------------------------------------------- + +%patterns = ( + q{ 1.0 SC_TEST_NO_DNS } => '', +); + +%anti_patterns = ( + q{ DNSBL_TEST_TOP } => '', + 'dns: bgsend' => '', +); + + +my $conf = " + + loadplugin Mail::SpamAssassin::Plugin::Shortcircuit + + rbl_timeout 60 + + clear_trusted_networks + trusted_networks 127. + trusted_networks 10. + trusted_networks 150.51.53.1 + + header DNSBL_TEST_TOP eval:check_rbl('test', 'dnsbltest.spamassassin.org.') + tflags DNSBL_TEST_TOP net + + # No DNS lookups are supposed to start before priority -100, + # so our shortcircuit is at -101 .. + + body SC_TEST_NO_DNS /./ + priority SC_TEST_NO_DNS -101 + shortcircuit SC_TEST_NO_DNS on + +"; + +tstprefs($conf); + +# we need -D output for patterns +sarun ("-D dns,async -t < data/spam/dnsbl.eml 2>&1", \&patterns_run_cb); +ok_all_patterns(); +clear_pattern_counters(); + +# +# Try again, this time we want to see DNS +# + +# Should see DNS at -100 +$conf =~ s/SC_TEST_NO_DNS -101/SC_TEST_NO_DNS -100/; + +%patterns = ( + q{ 1.0 SC_TEST_NO_DNS } => '', + 'dns: bgsend' => '', +); +%anti_patterns = (); + +tstprefs($conf); +sarun ("-D dns -t < data/spam/dnsbl.eml 2>&1", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/shortcircuit.t spamassassin-4.0.0~rc3/t/shortcircuit.t --- spamassassin-3.4.6/t/shortcircuit.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/shortcircuit.t 2022-05-28 10:38:25.000000000 +0000 @@ -8,16 +8,18 @@ # --------------------------------------------------------------------------- %anti_patterns = ( -q{ autolearn=ham } => 'autolearned as ham' + q{ autolearn=ham } => 'autolearned as ham' ); tstpre (' - loadplugin Mail::SpamAssassin::Plugin::Shortcircuit - '); + tstlocalrules (' + header SHORTCIRCUIT eval:check_shortcircuit() + describe SHORTCIRCUIT Not all rules were run, due to a shortcircuited rule + tflags SHORTCIRCUIT userconf noautolearn add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ shortcircuit=_SCTYPE_ autolearn=_AUTOLEARN_ version=_VERSION_" # hits spam/001 @@ -41,29 +43,29 @@ '); %patterns = ( - q{ SC_PRI_SPAM_001 }, 'hit', - q{ shortcircuit=spam }, 'sc', - q{ X-Spam-Status: Yes, score=103.0 required=5.0 }, 'shortcircuit_spam_score', - q{ 100 SHORTCIRCUIT Not all rules were run }, 'shortcircuit rule desc', - + ' 1.0 SC_PRI_SPAM_001 ', 'hit', + 'shortcircuit=spam', 'sc', + qr/X-Spam-Status: Yes, score=103.0 required=5.0 /m, 'shortcircuit_spam_score', + ' 100 SHORTCIRCUIT Not all rules were run', 'shortcircuit rule desc', ); ok (sarun ("-L -t < data/spam/001", \&patterns_run_cb)); ok_all_patterns(); %patterns = ( - q{ SC_002 }, 'hit', - q{ shortcircuit=spam }, 'sc', - q{ X-Spam-Status: Yes, score=50.0 required=5.0 }, 'SC_002 score', - q{ 0.0 SHORTCIRCUIT Not all rules were run }, 'shortcircuit rule desc', + ' 50 SC_002 ', 'hit', + 'shortcircuit=spam', 'sc', + qr/^X-Spam-Status: Yes, score=50.0 required=5.0 /m, 'SC_002 score', + ' 0.0 SHORTCIRCUIT Not all rules were run', 'shortcircuit rule desc', ); ok (sarun ("-L -t < data/spam/002", \&patterns_run_cb)); ok_all_patterns(); %patterns = ( - q{ SC_HAM_001 }, 'SC_HAM_001', - q{ shortcircuit=ham }, 'sc_ham', - q{ X-Spam-Status: No, score=-101.0 required=5.0 }, 'SC_HAM_001 score', - q{ -100 SHORTCIRCUIT Not all rules were run }, 'shortcircuit rule desc', + ' -1.0 SC_HAM_001 ', 'SC_HAM_001', + 'shortcircuit=ham', 'sc_ham', + qr/^X-Spam-Status: No, score=-101.0 required=5.0 /m, 'SC_HAM_001 score', + ' -100 SHORTCIRCUIT Not all rules were run', 'shortcircuit rule desc', ); ok (sarun ("-L -t < data/nice/001", \&patterns_run_cb)); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/spamc_bug6176.t spamassassin-4.0.0~rc3/t/spamc_bug6176.t --- spamassassin-3.4.6/t/spamc_bug6176.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_bug6176.t 2021-04-12 07:43:12.000000000 +0000 @@ -12,9 +12,7 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ TO GET THE EVOLUTION PREVIEW RELEASE }, 'evolution', - + q{ TO GET THE EVOLUTION PREVIEW RELEASE }, 'evolution', ); # connect on port 9 (discard): should always fail. diff -Nru spamassassin-3.4.6/t/spamc_cf.t spamassassin-4.0.0~rc3/t/spamc_cf.t --- spamassassin-3.4.6/t/spamc_cf.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_cf.t 2022-05-31 06:37:39.000000000 +0000 @@ -10,23 +10,19 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - - + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', ); -my $sockpath = mk_safe_tmpdir()."/spamd.sock"; +my $sockpath = mk_socket_tempdir()."/spamd.sock"; start_spamd("-D -L --socketpath=$sockpath"); -open (OUT, ">log/spamc_cf.cf"); +open (OUT, ">$workdir/spamc_cf.cf"); print OUT "-U $sockpath\n"; close OUT; -ok (spamcrun ("-F log/spamc_cf.cf < data/spam/001", \&patterns_run_cb)); +ok (spamcrun ("-F $workdir/spamc_cf.cf < data/spam/001", \&patterns_run_cb)); ok_all_patterns(); stop_spamd(); -cleanup_safe_tmpdir(); diff -Nru spamassassin-3.4.6/t/spamc_headers.t spamassassin-4.0.0~rc3/t/spamc_headers.t --- spamassassin-3.4.6/t/spamc_headers.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_headers.t 2022-05-28 10:38:25.000000000 +0000 @@ -10,16 +10,13 @@ # --------------------------------------------------------------------------- %patterns = ( - - q{ Message-Id: <78w08.t365th3y6x7h@yahoo.com> } => 'msgid', - q{ X-Spam-Status: Yes, } => 'xss', - q{ TEST_NOREALNAME}, 'noreal', - q{ subscription cancelable at anytime } => 'body', - + qr/^Message-Id: <78w08\.t365th3y6x7h\@yahoo\.com>/m => 'msgid', + qr/^X-Spam-Status: Yes/m => 'xss', + 'TEST_NOREALNAME', 'noreal', + 'subscription cancelable at anytime' => 'body', ); %anti_patterns = ( - ); start_spamd("-L --cf='report_safe 0'"); diff -Nru spamassassin-3.4.6/t/spamc_H.t spamassassin-4.0.0~rc3/t/spamc_H.t --- spamassassin-3.4.6/t/spamc_H.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_H.t 2021-04-12 07:43:12.000000000 +0000 @@ -12,10 +12,8 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ X-Spam-Flag: YES}, 'flag', -q{ TEST_ENDSNUMS}, 'endsinnums', - + q{ X-Spam-Flag: YES}, 'flag', + q{ TEST_ENDSNUMS}, 'endsinnums', ); ok(start_spamd("-L")); @@ -25,3 +23,4 @@ \&patterns_run_cb)); ok_all_patterns(); ok(stop_spamd()); + diff -Nru spamassassin-3.4.6/t/spamc_l.t spamassassin-4.0.0~rc3/t/spamc_l.t --- spamassassin-3.4.6/t/spamc_l.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_l.t 2021-04-13 10:22:18.000000000 +0000 @@ -7,18 +7,14 @@ plan skip_all => "No SPAMC exe" if $NO_SPAMC_EXE; plan tests => 4; -diag("NOTE: Failure might be because some other process is running on port 8. Test assumes nothing is listening on port 8."); - # --------------------------------------------------------------------------- my $errmsg = ($RUNNING_ON_WINDOWS?"10061":"Connection refused"); %patterns = ( - -q{ hello world }, 'spamc_l', -q{ spamc: connect to spamd on }, 'connfailed_a', -q{ failed, retrying (#1 of 3): } . $errmsg, 'connfailed_b', - + q{ hello world }, 'spamc_l', + q{ spamc: connect to spamd on }, 'connfailed_a', + q{ failed, retrying (#1 of 3): } . $errmsg, 'connfailed_b', ); # connect on port 8 (unassigned): should always fail diff -Nru spamassassin-3.4.6/t/spamc_optC.t spamassassin-4.0.0~rc3/t/spamc_optC.t --- spamassassin-3.4.6/t/spamc_optC.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_optC.t 2021-04-12 07:43:12.000000000 +0000 @@ -9,10 +9,12 @@ # --------------------------------------------------------------------------- -tstlocalrules (" - loadplugin reporterplugin ../../data/reporterplugin.pm +tstprefs (" + loadplugin reporterplugin ../../../data/reporterplugin.pm "); +unlink "log/rptfail"; + start_spamd("-L --allow-tell"); %patterns = ( 'Message successfully reported/revoked' => 'reported spam' ); @@ -41,4 +43,5 @@ stop_spamd(); -ok(unlink 'log/rptfail'); # need a little cleanup +ok(unlink "log/rptfail"); # need a little cleanup + diff -Nru spamassassin-3.4.6/t/spamc_optL.t spamassassin-4.0.0~rc3/t/spamc_optL.t --- spamassassin-3.4.6/t/spamc_optL.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_optL.t 2021-04-12 07:43:12.000000000 +0000 @@ -2,6 +2,7 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("spamc_optL"); + use constant HAS_SDBM_FILE => eval { require SDBM_File; }; use Test::More; @@ -11,8 +12,8 @@ # --------------------------------------------------------------------------- -tstlocalrules (" - bayes_store_module Mail::SpamAssassin::BayesStore::SDBM +tstprefs (" + bayes_store_module Mail::SpamAssassin::BayesStore::SDBM "); start_spamd("-L --allow-tell"); @@ -55,3 +56,4 @@ ok_all_patterns(); stop_spamd(); + diff -Nru spamassassin-3.4.6/t/spamc.t spamassassin-4.0.0~rc3/t/spamc.t --- spamassassin-3.4.6/t/spamc.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc.t 2022-05-28 10:38:25.000000000 +0000 @@ -10,9 +10,7 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ hello world }, 'spamc', - + 'hello world', 'spamc', ); # connect on port 9 (discard): should always fail diff -Nru spamassassin-3.4.6/t/spamc_x_E_R.t spamassassin-4.0.0~rc3/t/spamc_x_E_R.t --- spamassassin-3.4.6/t/spamc_x_E_R.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_x_E_R.t 2022-05-28 10:38:25.000000000 +0000 @@ -47,10 +47,10 @@ # max-size of 512 bytes; EX_TOOBIG, pass through message despite -x %patterns = ( - q{ Subject: There yours for FREE!}, 'subj', + 'Subject: There yours for FREE!', 'subj', ); %anti_patterns = ( - q{ X-Spam-Flag: }, 'flag', + 'X-Spam-Flag:', 'flag', ); # this should have exit code == 0, and pass through the full @@ -66,11 +66,11 @@ ok ok_all_patterns(); %patterns = ( - q{ 0/0 }, '0/0', + '0/0', '0/0', ); %anti_patterns = ( - q{ Subject: There yours for FREE!}, 'subj', - q{ X-Spam-Flag: }, 'flag', + 'Subject: There yours for FREE!', 'subj', + 'X-Spam-Flag:', 'flag', ); # this should have exit code == 0, and emit "0/0" @@ -94,8 +94,8 @@ # we do not want to see the output with -x on error %patterns = (); %anti_patterns = ( - q{ Subject: There yours for FREE!}, 'subj', - q{ X-Spam-Flag: YES}, 'flag', + 'Subject: There yours for FREE!', 'subj', + 'X-Spam-Flag: YES', 'flag', ); # this should have exit code != 0 @@ -117,3 +117,4 @@ clear_pattern_counters(); ok(scrunwantfail("--connect-retries 1 -x -E < data/spam/001", \&patterns_run_cb)); ok ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/spamc_x_e.t spamassassin-4.0.0~rc3/t/spamc_x_e.t --- spamassassin-3.4.6/t/spamc_x_e.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_x_e.t 2021-04-12 07:43:12.000000000 +0000 @@ -6,7 +6,7 @@ use Test::More; plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS; plan tests => 7; -diag "Failure may indicate some other process running on port 8. Test assumes nothing is listening on port 8."; + # --------------------------------------------------------------------------- # test case for bug 5478: spamc -x -e diff -Nru spamassassin-3.4.6/t/spamc_y.t spamassassin-4.0.0~rc3/t/spamc_y.t --- spamassassin-3.4.6/t/spamc_y.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_y.t 2022-05-28 10:38:25.000000000 +0000 @@ -10,14 +10,11 @@ # --------------------------------------------------------------------------- %patterns = ( - ); %anti_patterns = ( - # the text should NOT be output, bug 4991 - q{ hello world }, 'spamc_y', - + 'hello world', 'spamc_y', ); # connect on port 8 (unassigned): should always fail diff -Nru spamassassin-3.4.6/t/spamc_z.t spamassassin-4.0.0~rc3/t/spamc_z.t --- spamassassin-3.4.6/t/spamc_z.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamc_z.t 2022-08-07 12:21:13.000000000 +0000 @@ -5,29 +5,27 @@ use lib '.'; use lib 't'; use SATest; sa_t_init("spamc_z"); -untaint_system("$spamc -z < /dev/null"); -my $SPAMC_Z_AVAILABLE = ($? >> 8 == 0); - use Test::More; plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS; plan skip_all => "ZLIB REQUIRED" unless HAVE_ZLIB; + +untaint_system("$spamc -z < /dev/null"); +my $SPAMC_Z_AVAILABLE = ($? >> 8 == 0); + plan skip_all => "SPAMC Z unavailable" unless $SPAMC_Z_AVAILABLE; plan tests => 9; # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); ok (sdrun ("-L", diff -Nru spamassassin-3.4.6/t/spamd_allow_user_rules.t spamassassin-4.0.0~rc3/t/spamd_allow_user_rules.t --- spamassassin-3.4.6/t/spamd_allow_user_rules.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_allow_user_rules.t 2022-05-28 10:38:25.000000000 +0000 @@ -10,23 +10,21 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ 1.0 MYFOO }, 'myfoo', - + q{ 1.0 MYFOO }, 'myfoo', ); %anti_patterns = ( -q{ redefined at }, 'redefined_errors_in_spamd_log', + 'redefined at', 'redefined_errors_in_spamd_log', ); -tstlocalrules (" - allow_user_rules 1 - loadplugin myTestPlugin ../../data/testplugin.pm +tstprefs (" + allow_user_rules 1 + loadplugin myTestPlugin ../../../data/testplugin.pm "); -rmtree ("log/virtualconfig/testuser", 0, 1); -mkpath ("log/virtualconfig/testuser", 0, 0755); -open (OUT, ">log/virtualconfig/testuser/user_prefs"); +rmtree ("$workdir/virtualconfig/testuser", 0, 1); +mkpath ("$workdir/virtualconfig/testuser", 0, 0755); +open (OUT, ">$workdir/virtualconfig/testuser/user_prefs"); print OUT q{ header MYFOO Content-Transfer-Encoding =~ /quoted-printable/ @@ -53,7 +51,7 @@ }; close OUT; -ok (start_spamd ("--virtual-config-dir=log/virtualconfig/%u -L -u $spamd_run_as_user")); +ok (start_spamd ("--virtual-config-dir=$workdir/virtualconfig/%u -L -u $spamd_run_as_user")); ok (spamcrun ("-u testuser < data/spam/009", \&patterns_run_cb)); ok (stop_spamd ()); diff -Nru spamassassin-3.4.6/t/spamd_client.t spamassassin-4.0.0~rc3/t/spamd_client.t --- spamassassin-3.4.6/t/spamd_client.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_client.t 2022-05-31 06:37:39.000000000 +0000 @@ -1,21 +1,5 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use lib '.'; use lib 't'; use SATest; sa_t_init("spamd_client"); @@ -47,9 +31,9 @@ ok($testmsg); %patterns = ( -q{ X-Spam-Flag: YES}, 'flag', -q{ BODY: Generic Test for Unsolicited Bulk Email }, 'gtube', -q{ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X }, 'gtube string', + qr/^X-Spam-Flag: YES/m, 'flag', + q{ 1000 GTUBE }, 'gtube', + 'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X', 'gtube string', ); ok(start_spamd("-L")); @@ -82,11 +66,11 @@ clear_pattern_counters(); %patterns = ( -q{ X-Spam-Flag: YES}, 'flag', +qr/^X-Spam-Flag: YES/m, 'flag', ); %anti_patterns = ( -q{ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X }, 'gtube string', + 'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X', 'gtube string', ); $result = $client->headers($testmsg); @@ -106,14 +90,14 @@ $spamd_already_killed = undef; %patterns = ( - q{ X-Spam-Flag: YES}, 'flag', - q{ BODY: Generic Test for Unsolicited Bulk Email }, 'gtube', - q{ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X }, 'gtube string', + qr/^X-Spam-Flag: YES/m, 'flag', + q{ 1000 GTUBE }, 'gtube', + 'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X', 'gtube string', ); %anti_patterns = (); - my $sockpath = mk_safe_tmpdir()."/spamd.sock"; + my $sockpath = mk_socket_tempdir()."/spamd.sock"; ok(start_spamd("-L --socketpath=$sockpath")); $client = create_clientobj({ @@ -142,15 +126,15 @@ ok_all_patterns(); ok(stop_spamd()); - cleanup_safe_tmpdir(); } if (HAS_SDBM_FILE) { clear_pattern_counters(); $spamd_already_killed = undef; - tstlocalrules (" - bayes_store_module Mail::SpamAssassin::BayesStore::SDBM + + tstprefs (" + bayes_store_module Mail::SpamAssassin::BayesStore::SDBM "); ok(start_spamd("-L --allow-tell")); @@ -218,3 +202,4 @@ return $msg; } + diff -Nru spamassassin-3.4.6/t/spamd_hup.t spamassassin-4.0.0~rc3/t/spamd_hup.t --- spamassassin-3.4.6/t/spamd_hup.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_hup.t 2022-08-20 00:19:41.000000000 +0000 @@ -12,17 +12,16 @@ # --------------------------------------------------------------------------- -my $pid_file = "log/spamd.pid"; my($pid1, $pid2); dbgprint "Starting spamd...\n"; -start_spamd("-L -r ${pid_file}"); +start_spamd("-L"); sleep 1; for $retry (0 .. 9) { - ok ($pid1 = read_from_pidfile($pid_file)); - ok (-e $pid_file) or warn "$pid_file is not there before SIGHUP"; - ok (!-z $pid_file) or warn "$pid_file is empty before SIGHUP"; + ok ($pid1 = read_from_pidfile($spamd_pidfile)); + ok (-e $spamd_pidfile) or warn "$spamd_pidfile is not there before SIGHUP"; + ok (!-z $spamd_pidfile) or warn "$spamd_pidfile is empty before SIGHUP"; ok ($pid1 != 0); dbgprint "HUPing spamd at pid $pid1, loop try $retry...\n"; @@ -31,18 +30,18 @@ # load we could have missed the unlink, exec, create part. dbgprint "Waiting for PID file to change...\n"; - wait_for_file_to_change_or_disappear($pid_file, 20, sub { + wait_for_file_to_change_or_disappear($spamd_pidfile, 20, sub { $pid1 and kill ('HUP', $pid1); }); dbgprint "Waiting for spamd at pid $pid1 to restart...\n"; # 26 iterations is 98 seconds, RPi ARM6 takes about 66 seconds - wait_for_file_to_appear ($pid_file, 26); + wait_for_file_to_appear ($spamd_pidfile, 26); - ok (-e $pid_file) or warn "$pid_file does not exist post restart"; - ok (!-z $pid_file) or warn "$pid_file is empty post restart"; + ok (-e $spamd_pidfile) or warn "$spamd_pidfile does not exist post restart"; + ok (!-z $spamd_pidfile) or warn "$spamd_pidfile is empty post restart"; - ok ($pid2 = read_from_pidfile($pid_file)); + ok ($pid2 = read_from_pidfile($spamd_pidfile)); dbgprint "Looking for new spamd at pid $pid2...\n"; #ok ($pid2 != $pid1); # no longer guaranteed with SIGHUP ok ($pid2 != 0 and kill (0, $pid2)); diff -Nru spamassassin-3.4.6/t/spamd_kill_restart_rr.t spamassassin-4.0.0~rc3/t/spamd_kill_restart_rr.t --- spamassassin-3.4.6/t/spamd_kill_restart_rr.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_kill_restart_rr.t 2022-08-20 00:19:41.000000000 +0000 @@ -13,21 +13,20 @@ # --------------------------------------------------------------------------- -my $pid_file = "log/spamd.pid"; my($pid1, $pid2); -tstlocalrules(" - use_auto_whitelist 0 - "); +tstprefs(" + use_auto_whitelist 0 +"); dbgprint "Starting spamd...\n"; -start_spamd("-L --round-robin -r ${pid_file}"); +start_spamd("-L --round-robin"); sleep 1; for $retry (0 .. 9) { - ok ($pid1 = read_from_pidfile($pid_file)); - ok (-e $pid_file) or warn "$pid_file is not there before SIGINT"; - ok (!-z $pid_file) or warn "$pid_file is empty before SIGINT"; + ok ($pid1 = read_from_pidfile($spamd_pidfile)); + ok (-e $spamd_pidfile) or warn "$spamd_pidfile is not there before SIGINT"; + ok (!-z $spamd_pidfile) or warn "$spamd_pidfile is empty before SIGINT"; ok ($pid1 != 0); dbgprint "killing spamd at pid $pid1, loop try $retry...\n"; @@ -36,12 +35,12 @@ # load we could have missed the unlink, exec, create part. dbgprint "Waiting for PID file to change...\n"; - wait_for_file_to_change_or_disappear($pid_file, 20, sub { + wait_for_file_to_change_or_disappear($spamd_pidfile, 20, sub { $pid1 and kill ('INT', $pid1); }); # in the SIGINT case, the file will not change -- it will be unlinked - ok (!-e $pid_file); + ok (!-e $spamd_pidfile); # override this so the old logs are still visible and the new # spamd will be started even though stop_spamd() was not called @@ -49,14 +48,14 @@ dbgprint "starting new spamd, loop try $retry...\n"; my $startat = time; - start_spamd("-D -L --round-robin -r ${pid_file}"); + start_spamd("-D -L --round-robin"); dbgprint "Waiting for spamd at pid $pid1 to restart...\n"; - wait_for_file_to_appear ($pid_file, 40); - ok (-e $pid_file) or warn "$pid_file does not exist post restart; started at $startat, gave up at ".time; + wait_for_file_to_appear ($spamd_pidfile, 40); + ok (-e $spamd_pidfile) or warn "$spamd_pidfile does not exist post restart; started at $startat, gave up at ".time; - ok (!-z $pid_file) or warn "$pid_file is empty post restart"; - ok ($pid2 = read_from_pidfile($pid_file)); + ok (!-z $spamd_pidfile) or warn "$spamd_pidfile is empty post restart"; + ok ($pid2 = read_from_pidfile($spamd_pidfile)); dbgprint "Looking for new spamd at pid $pid2...\n"; ok ($pid2 != 0 and kill (0, $pid2)); @@ -79,4 +78,3 @@ dbgprint "Stopping spamd...\n"; stop_spamd; - diff -Nru spamassassin-3.4.6/t/spamd_kill_restart.t spamassassin-4.0.0~rc3/t/spamd_kill_restart.t --- spamassassin-3.4.6/t/spamd_kill_restart.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_kill_restart.t 2022-08-20 00:19:41.000000000 +0000 @@ -13,21 +13,20 @@ # --------------------------------------------------------------------------- -my $pid_file = "log/spamd.pid"; my($pid1, $pid2); -tstlocalrules(" - use_auto_whitelist 0 - "); +tstprefs(" + use_auto_whitelist 0 +"); dbgprint "Starting spamd...\n"; -start_spamd("-L -r ${pid_file}"); +start_spamd("-L"); sleep 1; for $retry (0 .. 9) { - ok ($pid1 = read_from_pidfile($pid_file)); - ok (-e $pid_file) or warn "$pid_file is not there before SIGINT"; - ok (!-z $pid_file) or warn "$pid_file is empty before SIGINT"; + ok ($pid1 = read_from_pidfile($spamd_pidfile)); + ok (-e $spamd_pidfile) or warn "$spamd_pidfile is not there before SIGINT"; + ok (!-z $spamd_pidfile) or warn "$spamd_pidfile is empty before SIGINT"; ok ($pid1 != 0); dbgprint "killing spamd at pid $pid1, loop try $retry...\n"; @@ -36,25 +35,25 @@ # load we could have missed the unlink, exec, create part. dbgprint "Waiting for PID file to change...\n"; - wait_for_file_to_change_or_disappear($pid_file, 20, sub { + wait_for_file_to_change_or_disappear($spamd_pidfile, 20, sub { $pid1 and kill ('INT', $pid1); }); # in the SIGINT case, the file will not change -- it will be unlinked - ok (!-e $pid_file); + ok (!-e $spamd_pidfile); # override this so the old logs are still visible and the new # spamd will be started even though stop_spamd() was not called $spamd_pid = 0; dbgprint "starting new spamd, loop try $retry...\n"; - start_spamd("-D -L -r ${pid_file}"); + start_spamd("-D -L"); dbgprint "Waiting for spamd at pid $pid1 to restart...\n"; - wait_for_file_to_appear ($pid_file, 20); - ok (-e $pid_file) or warn "$pid_file does not exist post restart"; - ok (!-z $pid_file) or warn "$pid_file is empty post restart"; - ok ($pid2 = read_from_pidfile($pid_file)); + wait_for_file_to_appear ($spamd_pidfile, 20); + ok (-e $spamd_pidfile) or warn "$spamd_pidfile does not exist post restart"; + ok (!-z $spamd_pidfile) or warn "$spamd_pidfile is empty post restart"; + ok ($pid2 = read_from_pidfile($spamd_pidfile)); dbgprint "Looking for new spamd at pid $pid2...\n"; ok ($pid2 != 0 and kill (0, $pid2)); @@ -77,4 +76,3 @@ dbgprint "Stopping spamd...\n"; stop_spamd; - diff -Nru spamassassin-3.4.6/t/spamd_ldap.t spamassassin-4.0.0~rc3/t/spamd_ldap.t --- spamassassin-3.4.6/t/spamd_ldap.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_ldap.t 2021-04-12 07:43:12.000000000 +0000 @@ -12,22 +12,19 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ X-Spam-Foo: LDAP read}, 'ldap_config_read', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', - - + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ X-Spam-Foo: LDAP read}, 'ldap_config_read', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', ); -tstlocalrules (" - user_scores_dsn ldap://localhost/o=stooges?spamassassin?sub?uid=__USERNAME__ - user_scores_ldap_username cn=StoogeAdmin,o=stooges - user_scores_ldap_password secret1 +tstprefs (" + user_scores_dsn ldap://localhost/o=stooges?spamassassin?sub?uid=__USERNAME__ + user_scores_ldap_username cn=StoogeAdmin,o=stooges + user_scores_ldap_password secret1 "); ok (sdrun ("-L --ldap-config", "-u curley < data/spam/001", \&patterns_run_cb)); diff -Nru spamassassin-3.4.6/t/spamd_maxchildren.t spamassassin-4.0.0~rc3/t/spamd_maxchildren.t --- spamassassin-3.4.6/t/spamd_maxchildren.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_maxchildren.t 2021-04-12 07:43:12.000000000 +0000 @@ -10,14 +10,11 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', - - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', ); start_spamd("-L -m1"); @@ -37,4 +34,3 @@ ok_all_patterns(); ok (stop_spamd()); - diff -Nru spamassassin-3.4.6/t/spamd_maxsize.t spamassassin-4.0.0~rc3/t/spamd_maxsize.t --- spamassassin-3.4.6/t/spamd_maxsize.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_maxsize.t 2021-04-12 07:43:12.000000000 +0000 @@ -13,9 +13,7 @@ # test for size limit issues like in Bug 5412 %patterns = ( - -q{ Subject: There yours for FREE! }, 'subj', - + q{ Subject: There yours for FREE! }, 'subj', ); sdrun ("-L", "-s 512 < data/spam/001", \&patterns_run_cb); diff -Nru spamassassin-3.4.6/t/spamd_parallel.t spamassassin-4.0.0~rc3/t/spamd_parallel.t --- spamassassin-3.4.6/t/spamd_parallel.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_parallel.t 2021-04-12 07:43:12.000000000 +0000 @@ -10,14 +10,11 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', - - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', ); start_spamd("-L"); @@ -35,4 +32,3 @@ ok_all_patterns(); stop_spamd(); - diff -Nru spamassassin-3.4.6/t/spamd_plugin.t spamassassin-4.0.0~rc3/t/spamd_plugin.t --- spamassassin-3.4.6/t/spamd_plugin.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_plugin.t 2022-09-08 03:11:07.000000000 +0000 @@ -9,22 +9,23 @@ plan skip_all => "UID nobody tests" if $SKIP_SETUID_NOBODY_TESTS; plan tests => 6; +diag("NOTE: A rare single failure in this test may be a race condition in the test that can be ignored"); # --------------------------------------------------------------------------- -tstlocalrules (' - loadplugin myTestPlugin ../../data/testplugin.pm - header MY_TEST_PLUGIN eval:check_test_plugin() +tstprefs (' + loadplugin myTestPlugin ../../../data/testplugin.pm + header MY_TEST_PLUGIN eval:check_test_plugin() '); # create a shared counter file for this test use Cwd; -$ENV{'SPAMD_PLUGIN_COUNTER_FILE'} = getcwd."/log/spamd_plugin.tmp"; -open(COUNTER,">log/spamd_plugin.tmp"); +$ENV{'SPAMD_PLUGIN_COUNTER_FILE'} = getcwd."/$workdir/spamd_plugin.tmp"; +open(COUNTER,">$workdir/spamd_plugin.tmp"); print COUNTER "0"; close COUNTER; -chmod (0666, "log/spamd_plugin.tmp"); +chmod (0666, "$workdir/spamd_plugin.tmp"); -my $sockpath = mk_safe_tmpdir()."/spamd.sock"; +my $sockpath = mk_socket_tempdir()."/spamd.sock"; start_spamd("-D -L --socketpath=$sockpath"); %patterns = ( @@ -50,5 +51,4 @@ ok_all_patterns(); stop_spamd(); -cleanup_safe_tmpdir(); diff -Nru spamassassin-3.4.6/t/spamd_port.t spamassassin-4.0.0~rc3/t/spamd_port.t --- spamassassin-3.4.6/t/spamd_port.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_port.t 2021-04-12 07:43:12.000000000 +0000 @@ -10,14 +10,12 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - - + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', ); my $port = probably_unused_spamd_port(); ok(sdrun ("-L -p $port", "-p $port < data/spam/001", \&patterns_run_cb)); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/spamd_prefork_stress_2.t spamassassin-4.0.0~rc3/t/spamd_prefork_stress_2.t --- spamassassin-3.4.6/t/spamd_prefork_stress_2.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_prefork_stress_2.t 2021-04-12 07:43:12.000000000 +0000 @@ -30,14 +30,11 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', - - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', ); start_spamd("-L -m1 --round-robin"); @@ -57,4 +54,3 @@ ok_all_patterns(); ok (stop_spamd()); - diff -Nru spamassassin-3.4.6/t/spamd_prefork_stress_3.t spamassassin-4.0.0~rc3/t/spamd_prefork_stress_3.t --- spamassassin-3.4.6/t/spamd_prefork_stress_3.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_prefork_stress_3.t 2021-04-12 07:43:12.000000000 +0000 @@ -4,7 +4,6 @@ use SATest; sa_t_init("spamd_prefork_stress_3"); use Test::More; -diag("NOTE: this test requires both 'run_spamd_prefork_stress_test' and 'run_long_tests' set to 'y'."); plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS; plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); @@ -13,20 +12,17 @@ # --------------------------------------------------------------------------- -tstlocalrules (' - loadplugin myTestPlugin ../../data/testplugin.pm - header PLUGIN_SLEEP eval:sleep_based_on_header() +tstprefs (' + loadplugin myTestPlugin ../../../data/testplugin.pm + header PLUGIN_SLEEP eval:sleep_based_on_header() '); - %patterns = ( - -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', ); my $tmpnum = 0; @@ -74,7 +70,7 @@ sub mk_mail { my $secs = shift; - my $tmpf = "log/tmp.$testname.$tmpnum"; $tmpnum++; + my $tmpf = "$workdir/tmp.$testname.$tmpnum"; $tmpnum++; open (IN, "$tmpf") or die "cannot write $tmpf"; @@ -92,4 +88,3 @@ @pending_unlinks = (); } - diff -Nru spamassassin-3.4.6/t/spamd_prefork_stress_4.t spamassassin-4.0.0~rc3/t/spamd_prefork_stress_4.t --- spamassassin-3.4.6/t/spamd_prefork_stress_4.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_prefork_stress_4.t 2021-04-12 07:43:12.000000000 +0000 @@ -4,7 +4,7 @@ use SATest; sa_t_init("spamd_prefork_stress_4"); use Test::More; -diag("NOTE: this test requires both 'run_spamd_prefork_stress_test' and 'run_long_tests' set to 'y'."); + plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS; plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan skip_all => "Spamd prefork stress tests disabled" unless conf_bool('run_spamd_prefork_stress_test'); @@ -12,20 +12,18 @@ # --------------------------------------------------------------------------- -# tstlocalrules (' - # loadplugin myTestPlugin ../../data/testplugin.pm +# tstprefs (' + # loadplugin myTestPlugin ../../../data/testplugin.pm # header PLUGIN_SLEEP eval:sleep_based_on_header() # '); %patterns = ( - -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', ); my $tmpnum = 0; @@ -113,5 +111,3 @@ ok (spamcrun (" eval { require DBI; }; -use constant HAS_DBD_SQLITE => eval { require DBD::SQLite; }; +use constant HAS_DBD_SQLITE => eval { require DBD::SQLite; DBD::SQLite->VERSION(1.59_01); }; use Test::More; plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS; @@ -14,7 +14,7 @@ # --------------------------------------------------------------------------- -my $userprefdb = mk_safe_tmpdir()."/userpref.db"; +my $userprefdb = $workdir."/userpref.db"; my $dbh = DBI->connect("dbi:SQLite:dbname=$userprefdb","",""); ok($dbh); @@ -26,36 +26,34 @@ ok($dbh->do("INSERT INTO userpref VALUES('testuser', 'score', 'DATE_IN_PAST_03_06 0')")); ok($dbh->do("INSERT INTO userpref VALUES('testuser', 'add_header', 'all tTEST2 FOO2')")); -tstlocalrules (" - user_scores_dsn dbi:SQLite:dbname=$userprefdb +tstprefs (" + user_scores_dsn dbi:SQLite:dbname=$userprefdb "); ok(start_spamd("-L --sql-config -u $spamd_run_as_user")); %patterns = ( - q{ X-Spam-tTEST1: FOO1 }, 'Added Header tTEST1', - q{ X-Spam-Flag: YES}, 'Spam Flag', - q{ BODY: Generic Test for Unsolicited Bulk Email }, 'GTUBE Test', - q{ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X }, 'GTUBE String', + qr/^X-Spam-tTEST1: FOO1$/m, 'Added Header tTEST1', + qr/^X-Spam-Flag: YES/m, 'Spam Flag', + q{ 1000 GTUBE }, 'GTUBE Test', + 'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X', 'GTUBE String', ); - %anti_patterns = ( - q{ X-Spam-tTEST2: FOO2 }, 'Added Header', - ); + 'X-Spam-tTEST2: FOO2', 'Added Header', +); ok (spamcrun("-u nobody < data/spam/018", \&patterns_run_cb)); ok_all_patterns(); clear_pattern_counters(); %patterns = ( - q{ X-Spam-tTEST1: FOO1 }, 'Added Header tTEST1', - q{ X-Spam-tTEST2: FOO2 }, 'Added Header tTEST2', - q{ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X }, 'GTUBE String', - ); + qr/^X-Spam-tTEST1: FOO1$/m, 'Added Header tTEST1', + qr/^X-Spam-tTEST2: FOO2$/m, 'Added Header tTEST2', + 'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X', 'GTUBE String', +); %anti_patterns = ( - q{ BODY: Generic Test for Unsolicited Bulk Email }, 'GTUBE Test', - q{ X-Spam-Flag: YES}, 'Spam Flag', - ); - + q{ 1000 GTUBE }, 'GTUBE Test', + 'X-Spam-Flag: YES', 'Spam Flag', +); ok (spamcrun("-u testuser < data/spam/018", \&patterns_run_cb)); ok_all_patterns(); clear_pattern_counters(); @@ -63,32 +61,29 @@ ok($dbh->do("INSERT INTO userpref VALUES('testuser', 'required_score', '1000')")); %patterns = ( - q{ X-Spam-tTEST1: FOO1 }, 'Added Header tTEST1', - q{ X-Spam-tTEST2: FOO2 }, 'Added Header tTEST2', - q{ X-Spam-Status: No }, 'Spam Status No', - q{ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X }, 'GTUBE String', - ); + qr/^X-Spam-tTEST1: FOO1\n/m, 'Added Header tTEST1', + qr/^X-Spam-tTEST2: FOO2\n/m, 'Added Header tTEST2', + qr/^X-Spam-Status: No/m, 'Spam Status No', + 'XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X', 'GTUBE String', +); %anti_patterns = ( - q{ X-Spam-Flag: YES}, 'Spam Flag YES', - q{ BODY: Generic Test for Unsolicited Bulk Email }, 'GTUBE Test', - ); - + 'X-Spam-Flag: YES', 'Spam Flag YES', + q{ 1000 GTUBE }, 'GTUBE Test', +); ok (spamcrun("-u testuser < data/spam/018", \&patterns_run_cb)); ok_all_patterns(); clear_pattern_counters(); %patterns = ( - q{ dbg: config: retrieving prefs for }, 'Retrieving Prefs', - ); + q{ dbg: config: retrieving prefs for }, 'Retrieving Prefs', +); %anti_patterns = ( - q{ warn: closing dbh with active statement handles }, 'Closing Active Handles', - ); - + q{ warn: closing dbh with active statement handles }, 'Closing Active Handles', +); checkfile ($spamd_stderr, \&patterns_run_cb); ok_all_patterns(); ok(stop_spamd()); -cleanup_safe_tmpdir(); - ok($dbh->disconnect()); + diff -Nru spamassassin-3.4.6/t/spamd_ssl_accept_fail.t spamassassin-4.0.0~rc3/t/spamd_ssl_accept_fail.t --- spamassassin-3.4.6/t/spamd_ssl_accept_fail.t 2020-04-10 07:44:37.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_ssl_accept_fail.t 2021-04-12 07:43:12.000000000 +0000 @@ -12,17 +12,14 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); my $port = probably_unused_spamd_port(); diff -Nru spamassassin-3.4.6/t/spamd_ssl.t spamassassin-4.0.0~rc3/t/spamd_ssl.t --- spamassassin-3.4.6/t/spamd_ssl.t 2020-04-10 07:44:37.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_ssl.t 2021-04-12 07:43:12.000000000 +0000 @@ -11,17 +11,14 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); my $port = probably_unused_spamd_port(); @@ -29,3 +26,4 @@ "--ssl --port $port < data/spam/001", \&patterns_run_cb)); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/spamd_ssl_z.t spamassassin-4.0.0~rc3/t/spamd_ssl_z.t --- spamassassin-3.4.6/t/spamd_ssl_z.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_ssl_z.t 2022-07-26 15:50:07.000000000 +0000 @@ -0,0 +1,37 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("spamd_ssl_z"); + +use constant HAVE_ZLIB => eval { require Compress::Zlib; }; + +use Test::More; +plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS; +plan skip_all => "SSL is unavailble" unless $SSL_AVAILABLE; +plan skip_all => "ZLIB REQUIRED" unless HAVE_ZLIB; + +untaint_system("$spamc -z < /dev/null"); +my $SPAMC_Z_AVAILABLE = ($? >> 8 == 0); +plan skip_all => "SPAMC Z unavailable" unless $SPAMC_Z_AVAILABLE; + +plan tests => 9; + +# --------------------------------------------------------------------------- + +%patterns = ( + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', +); + +my $port = probably_unused_spamd_port(); +ok (sdrun ("-L --ssl --port $port --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert", + "-z -t 5 --ssl --port $port < data/spam/001", + \&patterns_run_cb)); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/spamd_stop.t spamassassin-4.0.0~rc3/t/spamd_stop.t --- spamassassin-3.4.6/t/spamd_stop.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_stop.t 2021-04-12 07:43:12.000000000 +0000 @@ -10,9 +10,7 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ X-Spam-Status: Yes,}, 'status', - + q{ X-Spam-Status: Yes,}, 'status', ); ok (sdrun ("-L", "< data/spam/001", \&patterns_run_cb)); diff -Nru spamassassin-3.4.6/t/spamd_symbols.t spamassassin-4.0.0~rc3/t/spamd_symbols.t --- spamassassin-3.4.6/t/spamd_symbols.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_symbols.t 2022-05-28 10:38:25.000000000 +0000 @@ -10,11 +10,8 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ TEST_ENDSNUMS, }, 'endsinnums', -q{ TEST_NOREALNAME, }, 'noreal', - - + ',TEST_ENDSNUMS,', 'endsinnums', + ',TEST_NOREALNAME,', 'noreal', ); ok (sdrun ("-L", "-y < data/spam/001", \&patterns_run_cb)); diff -Nru spamassassin-3.4.6/t/spamd_syslog.t spamassassin-4.0.0~rc3/t/spamd_syslog.t --- spamassassin-3.4.6/t/spamd_syslog.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_syslog.t 2021-04-12 07:43:12.000000000 +0000 @@ -10,15 +10,12 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', - - + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', ); $spamd_inhibit_log_to_err = 1; diff -Nru spamassassin-3.4.6/t/spamd.t spamassassin-4.0.0~rc3/t/spamd.t --- spamassassin-3.4.6/t/spamd.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd.t 2021-04-12 07:43:12.000000000 +0000 @@ -10,17 +10,14 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS}, 'endsinnums', -q{ TEST_NOREALNAME}, 'noreal', -q{ This must be the very last line}, 'lastline', - - + q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS}, 'endsinnums', + q{ TEST_NOREALNAME}, 'noreal', + q{ This must be the very last line}, 'lastline', ); ok(start_spamd("-L")); @@ -29,12 +26,12 @@ ok_all_patterns(); %patterns = ( -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - ); - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', +); ok (spamcrun("< data/spam/018", \&patterns_run_cb)); ok_all_patterns(); ok(stop_spamd()); + diff -Nru spamassassin-3.4.6/t/spamd_unix_and_tcp.t spamassassin-4.0.0~rc3/t/spamd_unix_and_tcp.t --- spamassassin-3.4.6/t/spamd_unix_and_tcp.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_unix_and_tcp.t 2022-05-31 06:37:39.000000000 +0000 @@ -10,7 +10,7 @@ # --------------------------------------------------------------------------- -my $sockpath = mk_safe_tmpdir()."/spamd.sock"; +my $sockpath = mk_socket_tempdir()."/spamd.sock"; start_spamd("-D -L --socketpath=$sockpath --port $spamdport -A $spamdhost -i $spamdhost"); %patterns = ( q{ Subject: There yours for FREE!}, 'subj', @@ -42,5 +42,4 @@ ok_all_patterns(); stop_spamd(); -cleanup_safe_tmpdir(); diff -Nru spamassassin-3.4.6/t/spamd_unix.t spamassassin-4.0.0~rc3/t/spamd_unix.t --- spamassassin-3.4.6/t/spamd_unix.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_unix.t 2022-05-31 06:37:39.000000000 +0000 @@ -11,22 +11,17 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - - + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', ); -tstlocalrules(" - use_auto_whitelist 0 - "); +tstprefs(" + use_auto_whitelist 0 +"); -my $sockpath = mk_safe_tmpdir()."/spamd.sock"; +my $sockpath = mk_socket_tempdir()."/spamd.sock"; start_spamd("-D -L --socketpath=$sockpath"); ok (spamcrun ("-U $sockpath < data/spam/001", \&patterns_run_cb)); ok_all_patterns(); stop_spamd(); -cleanup_safe_tmpdir(); - diff -Nru spamassassin-3.4.6/t/spamd_user_rules_leak.t spamassassin-4.0.0~rc3/t/spamd_user_rules_leak.t --- spamassassin-3.4.6/t/spamd_user_rules_leak.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_user_rules_leak.t 2022-05-28 10:38:25.000000000 +0000 @@ -6,24 +6,24 @@ use Test::More; plan skip_all => 'Spamd tests disabled' if $SKIP_SPAMD_TESTS; -plan tests => 28; +plan tests => 20; # --------------------------------------------------------------------------- # If user A defines a user rule (when allow_user_rules is enabled) it affects # user B if they also set a score for that same rule name or create a user rule # with the same name. -tstlocalrules (" - allow_user_rules 1 +tstprefs (" + allow_user_rules 1 "); -rmtree ("log/virtualconfig/testuser1", 0, 1); -mkpath ("log/virtualconfig/testuser1", 0, 0755); -rmtree ("log/virtualconfig/testuser2", 0, 1); -mkpath ("log/virtualconfig/testuser2", 0, 0755); -rmtree ("log/virtualconfig/testuser3", 0, 1); -mkpath ("log/virtualconfig/testuser3", 0, 0755); -open (OUT, ">log/virtualconfig/testuser1/user_prefs"); +rmtree ("$workdir/virtualconfig/testuser1", 0, 1); +mkpath ("$workdir/virtualconfig/testuser1", 0, 0755); +rmtree ("$workdir/virtualconfig/testuser2", 0, 1); +mkpath ("$workdir/virtualconfig/testuser2", 0, 0755); +rmtree ("$workdir/virtualconfig/testuser3", 0, 1); +mkpath ("$workdir/virtualconfig/testuser3", 0, 0755); +open (OUT, ">$workdir/virtualconfig/testuser1/user_prefs"); print OUT q{ header MYFOO Content-Transfer-Encoding =~ /quoted-printable/ @@ -37,7 +37,7 @@ }; close OUT; -open (OUT, ">log/virtualconfig/testuser2/user_prefs"); +open (OUT, ">$workdir/virtualconfig/testuser2/user_prefs"); print OUT q{ # create a new user rule with same name @@ -50,7 +50,7 @@ }; close OUT; -open (OUT, ">log/virtualconfig/testuser3/user_prefs"); +open (OUT, ">$workdir/virtualconfig/testuser3/user_prefs"); print OUT q{ # no user rules here @@ -59,33 +59,29 @@ close OUT; %patterns = ( - q{ 3.0 MYFOO }, 'MYFOO', - q{ 3.0 MYBODY }, 'MYBODY', - q{ 3.0 MYRAWBODY }, 'MYRAWBODY', - q{ 3.0 MYFULL }, 'MYFULL', + q{ 3.0 MYFOO }, '', + q{ 3.0 MYBODY }, '', + q{ 3.0 MYRAWBODY }, '', + q{ 3.0 MYFULL }, '', ); %anti_patterns = ( - q{ redefined at }, 'redefined_errors_in_spamd_log', + 'redefined at', 'redefined_errors_in_spamd_log', ); # use -m1 so all scans use the same child -ok (start_spamd ("--virtual-config-dir=log/virtualconfig/%u -L -u $spamd_run_as_user -m1")); +ok (start_spamd ("--virtual-config-dir=$workdir/virtualconfig/%u -L -u $spamd_run_as_user -m1")); ok (spamcrun ("-u testuser1 < data/spam/009", \&patterns_run_cb)); ok_all_patterns(); clear_pattern_counters(); %patterns = ( - q{ does not include a real name }, 'TEST_NOREALNAME', + q{ does not include a real name }, '', ); %anti_patterns = ( - q{ 1.0 MYFOO }, 'MYFOO', - q{ 1.0 MYBODY }, 'MYBODY', - q{ 1.0 MYRAWBODY }, 'MYRAWBODY', - q{ 1.0 MYFULL }, 'MYFULL', - q{ 3.0 MYFOO }, 'MYFOO', - q{ 3.0 MYBODY }, 'MYBODY', - q{ 3.0 MYRAWBODY }, 'MYRAWBODY', - q{ 3.0 MYFULL }, 'MYFULL', + qr/\d MYFOO /, '', + qr/\d MYBODY /, '', + qr/\d MYRAWBODY /, '', + qr/\d MYFULL /, '', ); ok (spamcrun ("-u testuser2 < data/spam/009", \&patterns_run_cb)); checkfile ($spamd_stderr, \&patterns_run_cb); @@ -93,17 +89,13 @@ clear_pattern_counters(); %patterns = ( - q{ does not include a real name }, 'TEST_NOREALNAME', + q{ does not include a real name }, '', ); %anti_patterns = ( - q{ 1.0 MYFOO }, 'MYFOO', - q{ 1.0 MYBODY }, 'MYBODY', - q{ 1.0 MYRAWBODY }, 'MYRAWBODY', - q{ 1.0 MYFULL }, 'MYFULL', - q{ 3.0 MYFOO }, 'MYFOO', - q{ 3.0 MYBODY }, 'MYBODY', - q{ 3.0 MYRAWBODY }, 'MYRAWBODY', - q{ 3.0 MYFULL }, 'MYFULL', + qr/\d MYFOO /, '', + qr/\d MYBODY /, '', + qr/\d MYRAWBODY /, '', + qr/\d MYFULL /, '', ); ok (spamcrun ("-u testuser3 < data/spam/009", \&patterns_run_cb)); ok (stop_spamd ()); diff -Nru spamassassin-3.4.6/t/spamd_utf8.t spamassassin-4.0.0~rc3/t/spamd_utf8.t --- spamassassin-3.4.6/t/spamd_utf8.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_utf8.t 2021-04-12 07:43:12.000000000 +0000 @@ -26,18 +26,11 @@ $ENV{'LANG'} = $testlocale; -# --------------------------------------------------------------------------- - %patterns = ( - -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', - - + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', ); ok (sdrun ("-L", "< data/spam/008", \&patterns_run_cb)); ok_all_patterns(); -exit; -# --------------------------------------------------------------------------- diff -Nru spamassassin-3.4.6/t/spamd_welcomelist_leak.t spamassassin-4.0.0~rc3/t/spamd_welcomelist_leak.t --- spamassassin-3.4.6/t/spamd_welcomelist_leak.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_welcomelist_leak.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,60 @@ +#!/usr/bin/perl -T +# bug 4179 + +use lib '.'; use lib 't'; +use SATest; sa_t_init("spamd_welcomelist_leak"); + +use Test::More; +plan skip_all => 'Spamd tests disabled.' if $SKIP_SPAMD_TESTS; +plan tests => 8; + +# --------------------------------------------------------------------------- +# bug 6003 + +tstlocalrules (q{ + header USER_IN_WELCOMELIST eval:check_from_in_welcomelist() + tflags USER_IN_WELCOMELIST userconf nice noautolearn + score USER_IN_WELCOMELIST -100 + body MYBODY /LOSE WEIGHT/ + score MYBODY 99 +}); + +rmtree ("$workdir/virtualconfig/testuser1", 0, 1); +mkpath ("$workdir/virtualconfig/testuser1", 0, 0755); +rmtree ("$workdir/virtualconfig/testuser2", 0, 1); +mkpath ("$workdir/virtualconfig/testuser2", 0, 0755); +open (OUT, ">$workdir/virtualconfig/testuser1/user_prefs"); +print OUT q{ + welcomelist_from sb55sb123456789@yahoo.com + welcomelist_from_rcvd sb55sb123456789@yahoo.com cgocable.ca + welcomelist_from_rcvd sb55sb123456789@yahoo.com webnote.net +}; +close OUT; +open (OUT, ">$workdir/virtualconfig/testuser2/user_prefs"); +print OUT ''; +close OUT; + +%patterns = ( + q{ 99 MYBODY }, '', + q{ -100 USER_IN_WELCOMELIST }, '', +); +%anti_patterns = ( +); + +# use -m1 so all scans use the same child +ok (start_spamd ("--virtual-config-dir=$workdir/virtualconfig/%u -L -u $spamd_run_as_user -m1")); +ok (spamcrun ("-u testuser1 < data/spam/001", \&patterns_run_cb)); +ok_all_patterns(); +clear_pattern_counters(); + +%patterns = ( + q{ 99 MYBODY }, '', +); +%anti_patterns = ( + qr/\d USER_IN_WELCOMELIST /, '', +); +ok (spamcrun ("-u testuser2 < data/spam/001", \&patterns_run_cb)); +checkfile ($spamd_stderr, \&patterns_run_cb); +ok_all_patterns(); +ok stop_spamd(); + diff -Nru spamassassin-3.4.6/t/spamd_whitelist_leak.t spamassassin-4.0.0~rc3/t/spamd_whitelist_leak.t --- spamassassin-3.4.6/t/spamd_whitelist_leak.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spamd_whitelist_leak.t 2022-05-28 10:38:25.000000000 +0000 @@ -11,50 +11,55 @@ # --------------------------------------------------------------------------- # bug 6003 -tstlocalrules (q{ - - body MYBODY /LOSE WEIGHT/ - score MYBODY 99 +disable_compat "welcomelist_blocklist"; - }); - -rmtree ("log/virtualconfig/testuser1", 0, 1); -mkpath ("log/virtualconfig/testuser1", 0, 0755); -rmtree ("log/virtualconfig/testuser2", 0, 1); -mkpath ("log/virtualconfig/testuser2", 0, 0755); -open (OUT, ">log/virtualconfig/testuser1/user_prefs"); +tstlocalrules (q{ + header USER_IN_WELCOMELIST eval:check_from_in_welcomelist() + tflags USER_IN_WELCOMELIST userconf nice noautolearn + meta USER_IN_WHITELIST (USER_IN_WELCOMELIST) + tflags USER_IN_WHITELIST userconf nice noautolearn + score USER_IN_WHITELIST -100 + score USER_IN_WELCOMELIST -0.01 + body MYBODY /LOSE WEIGHT/ + score MYBODY 99 +}); + +rmtree ("$workdir/virtualconfig/testuser1", 0, 1); +mkpath ("$workdir/virtualconfig/testuser1", 0, 0755); +rmtree ("$workdir/virtualconfig/testuser2", 0, 1); +mkpath ("$workdir/virtualconfig/testuser2", 0, 0755); +open (OUT, ">$workdir/virtualconfig/testuser1/user_prefs"); print OUT q{ - - whitelist_from sb55sb123456789@yahoo.com - whitelist_from_rcvd sb55sb123456789@yahoo.com cgocable.ca - whitelist_from_rcvd sb55sb123456789@yahoo.com webnote.net - + whitelist_from sb55sb123456789@yahoo.com + whitelist_from_rcvd sb55sb123456789@yahoo.com cgocable.ca + whitelist_from_rcvd sb55sb123456789@yahoo.com webnote.net }; close OUT; -open (OUT, ">log/virtualconfig/testuser2/user_prefs"); +open (OUT, ">$workdir/virtualconfig/testuser2/user_prefs"); print OUT ''; close OUT; %patterns = ( - q{ 99 MYBODY }, 'MYBODY', - q{-100 USER_IN_WHITELIST }, 'USER_IN_WHITELIST', + q{ 99 MYBODY }, '', + q{ -100 USER_IN_WHITELIST }, '', ); %anti_patterns = ( ); # use -m1 so all scans use the same child -ok (start_spamd ("--virtual-config-dir=log/virtualconfig/%u -L -u $spamd_run_as_user -m1")); +ok (start_spamd ("--virtual-config-dir=$workdir/virtualconfig/%u -L -u $spamd_run_as_user -m1")); ok (spamcrun ("-u testuser1 < data/spam/001", \&patterns_run_cb)); ok_all_patterns(); clear_pattern_counters(); %patterns = ( - q{ 99 MYBODY }, 'MYBODY', + q{ 99 MYBODY }, '', ); %anti_patterns = ( - q{-100 USER_IN_WHITELIST }, 'USER_IN_WHITELIST', + q{ -100 USER_IN_WHITELIST }, '', ); ok (spamcrun ("-u testuser2 < data/spam/001", \&patterns_run_cb)); checkfile ($spamd_stderr, \&patterns_run_cb); ok_all_patterns(); ok stop_spamd(); + diff -Nru spamassassin-3.4.6/t/spam.t spamassassin-4.0.0~rc3/t/spam.t --- spamassassin-3.4.6/t/spam.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spam.t 2021-04-12 07:43:12.000000000 +0000 @@ -8,15 +8,14 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Subject: There yours for FREE!}, 'subj', -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: **********}, 'stars', -q{ TEST_ENDSNUMS }, 'endsinnums', -q{ TEST_NOREALNAME }, 'noreal', - + q{ Subject: There yours for FREE!}, 'subj', + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: **********}, 'stars', + q{ TEST_ENDSNUMS }, 'endsinnums', + q{ TEST_NOREALNAME }, 'noreal', ); ok (sarun ("-L -t < data/spam/001", \&patterns_run_cb)); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/spf.t spamassassin-4.0.0~rc3/t/spf.t --- spamassassin-3.4.6/t/spf.t 2020-04-19 06:18:25.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spf.t 2022-05-28 10:38:25.000000000 +0000 @@ -4,38 +4,43 @@ use SATest; sa_t_init("spf"); use Test::More; -use constant HAS_SPFQUERY => eval { require Mail::SPF::Query; }; use constant HAS_MAILSPF => eval { require Mail::SPF; }; -# bug 3806: -# Do not run this test with version of Sys::Hostname::Long older than 1.4 -# on non-Linux unices as root, due to a bug in Sys::Hostname::Long -# (it is used by Mail::SPF::Query, which is now obsoleted by Mail::SPF) -use constant IS_LINUX => $^O eq 'linux'; -use constant IS_OPENBSD => $^O eq 'openbsd'; -use constant IS_WINDOWS => ($^O =~ /^(mswin|dos|os2)/i); -use constant AM_ROOT => $< == 0; - -use constant HAS_UNSAFE_HOSTNAME => # Bug 3806 - module exists and is old - eval { require Sys::Hostname::Long && Sys::Hostname::Long->VERSION < 1.4 }; - plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); -plan skip_all => "Need Mail::SPF or Mail::SPF::Query" unless (HAS_SPFQUERY || HAS_MAILSPF); -plan skip_all => "Sys::Hostname::Long > 1.4 required." if HAS_UNSAFE_HOSTNAME; -plan skip_all => "Test only designed for Windows, Linux or OpenBSD" unless (IS_LINUX || IS_OPENBSD || IS_WINDOWS); +plan skip_all => "Need Mail::SPF" unless HAS_MAILSPF; +plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely(); -if(HAS_SPFQUERY && HAS_MAILSPF) { - plan tests => 110; -} -else { - plan tests => 62; # TODO: These should be skips down in the code, not changing the test count. -} +plan tests => 72; # --------------------------------------------------------------------------- +disable_compat "welcomelist_blocklist"; + # ensure all rules will fire tstlocalrules (" + header SPF_PASS eval:check_for_spf_pass() + header SPF_NEUTRAL eval:check_for_spf_neutral() + header SPF_FAIL eval:check_for_spf_fail() + header SPF_SOFTFAIL eval:check_for_spf_softfail() + header SPF_HELO_PASS eval:check_for_spf_helo_pass() + header SPF_HELO_NEUTRAL eval:check_for_spf_helo_neutral() + header SPF_HELO_FAIL eval:check_for_spf_helo_fail() + header SPF_HELO_SOFTFAIL eval:check_for_spf_helo_softfail() + tflags SPF_PASS nice userconf net + tflags SPF_HELO_PASS nice userconf net + tflags SPF_NEUTRAL net + tflags SPF_FAIL net + tflags SPF_SOFTFAIL net + tflags SPF_HELO_NEUTRAL net + tflags SPF_HELO_FAIL net + tflags SPF_HELO_SOFTFAIL net + header USER_IN_SPF_WELCOMELIST eval:check_for_spf_welcomelist_from() + tflags USER_IN_SPF_WELCOMELIST userconf nice noautolearn net + header USER_IN_DEF_SPF_WL eval:check_for_def_spf_welcomelist_from() + tflags USER_IN_DEF_SPF_WL userconf nice noautolearn net + meta USER_IN_SPF_WHITELIST (USER_IN_SPF_WELCOMELIST) + tflags USER_IN_SPF_WHITELIST userconf nice noautolearn net score SPF_FAIL 0.001 score SPF_HELO_FAIL 0.001 score SPF_HELO_NEUTRAL 0.001 @@ -45,372 +50,333 @@ score SPF_PASS -0.001 score SPF_HELO_PASS -0.001 score USER_IN_DEF_SPF_WL -0.001 + score USER_IN_SPF_WELCOMELIST -0.001 score USER_IN_SPF_WHITELIST -0.001 "); -# test both of the SPF modules we support -for $disable_an_spf_module ('do_not_use_mail_spf 1', 'do_not_use_mail_spf_query 1') { +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); - # only do the tests if the module that wasn't disabled is available - next if ($disable_an_spf_module eq 'do_not_use_mail_spf 1' && !HAS_SPFQUERY); - next if ($disable_an_spf_module eq 'do_not_use_mail_spf_query 1' && !HAS_MAILSPF); - - tstprefs(" - $disable_an_spf_module - "); - - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - ); +sarun ("-t < data/nice/spf1", \&patterns_run_cb); +ok_all_patterns(); - sarun ("-t < data/nice/spf1", \&patterns_run_cb); - ok_all_patterns(); +%patterns = ( + q{ 0.0 SPF_NEUTRAL }, 'neutral', + q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral', +); - %patterns = ( - q{ SPF_NEUTRAL }, 'neutral', - q{ SPF_HELO_NEUTRAL }, 'helo_neutral', - ); +sarun ("-t < data/spam/spf1", \&patterns_run_cb); +ok_all_patterns(); - sarun ("-t < data/spam/spf1", \&patterns_run_cb); - ok_all_patterns(); +%patterns = ( + q{ 0.0 SPF_SOFTFAIL }, 'softfail', + q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail', +); - %patterns = ( - q{ SPF_SOFTFAIL }, 'softfail', - q{ SPF_HELO_SOFTFAIL }, 'helo_softfail', - ); +sarun ("-t < data/spam/spf2", \&patterns_run_cb); +ok_all_patterns(); +%patterns = ( + q{ 0.0 SPF_FAIL }, 'fail', + q{ 0.0 SPF_HELO_FAIL }, 'helo_fail', +); - sarun ("-t < data/spam/spf2", \&patterns_run_cb); - ok_all_patterns(); - %patterns = ( - q{ SPF_FAIL }, 'fail', - q{ SPF_HELO_FAIL }, 'helo_fail', - ); +sarun ("-t < data/spam/spf3", \&patterns_run_cb); +ok_all_patterns(); - sarun ("-t < data/spam/spf3", \&patterns_run_cb); - ok_all_patterns(); +# Test using an assortment of trusted and internal network definitions + +# 9-10: Trusted networks contain first header. - # Test using an assortment of trusted and internal network definitions +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); - # 9-10: Trusted networks contain first header. +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 65.214.43.157 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - ); +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); - sarun ("-t < data/nice/spf2", \&patterns_run_cb); - ok_all_patterns(); +# 11-12: Internal networks contain first header. +# Trusted networks not defined. - # 11-12: Internal networks contain first header. - # Trusted networks not defined. +tstprefs(" + clear_trusted_networks + clear_internal_networks + internal_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); - tstprefs(" - clear_trusted_networks - clear_internal_networks - internal_networks 65.214.43.157 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - ); +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); - sarun ("-t < data/nice/spf2", \&patterns_run_cb); - ok_all_patterns(); +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); - # 13-14: Internal networks contain first header. - # Trusted networks contain some other IP. - # jm: commented; this is now an error condition. - - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 1.2.3.4 - internal_networks 65.214.43.157 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %patterns = ( - q{ SPF_HELO_NEUTRAL }, 'helo_neutral', - q{ SPF_NEUTRAL }, 'neutral', - ); - - if (0) { - sarun ("-t < data/nice/spf2", \&patterns_run_cb); - ok_all_patterns(); - } else { - ok(1); # skip the tests - ok(1); - } - - - # 15-16: Trusted+Internal networks contain first header. - - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 65.214.43.157 - internal_networks 65.214.43.157 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - ); +# 13-14: Internal networks contain first header. +# Trusted networks contain some other IP. +# jm: commented; this is now an error condition. +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 1.2.3.4 + internal_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); + +%patterns = ( + q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral', + q{ 0.0 SPF_NEUTRAL }, 'neutral', +); + +if (0) { sarun ("-t < data/nice/spf2", \&patterns_run_cb); ok_all_patterns(); +} else { + ok(1); # skip the tests + ok(1); +} - # 17-18: Trusted networks contain first and second header. - # Internal networks contain first header. +# 15-16: Trusted+Internal networks contain first header. - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 65.214.43.157 64.142.3.173 - internal_networks 65.214.43.157 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - ); +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 + internal_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); - sarun ("-t < data/nice/spf2", \&patterns_run_cb); - ok_all_patterns(); +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); - # 19-26: Trusted networks contain first and second header. - # Internal networks contain first and second header. - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 65.214.43.157 64.142.3.173 - internal_networks 65.214.43.157 64.142.3.173 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %anti_patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_HELO_FAIL }, 'helo_fail', - q{ SPF_HELO_SOFTFAIL }, 'helo_softfail', - q{ SPF_HELO_NEUTRAL }, 'helo_neutral', - q{ SPF_PASS }, 'pass', - q{ SPF_FAIL }, 'fail', - q{ SPF_SOFTFAIL }, 'softfail', - q{ SPF_NEUTRAL }, 'neutral', - ); - %patterns = (); +# 17-18: Trusted networks contain first and second header. +# Internal networks contain first header. - sarun ("-t < data/nice/spf2", \&patterns_run_cb); - ok_all_patterns(); +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 64.142.3.173 + internal_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); - # 27-28: Trusted networks contain first header. - # Internal networks contain first and second header. +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 65.214.43.157 - internal_networks 65.214.43.157 64.142.3.173 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %anti_patterns = (); - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - ); - sarun ("-t < data/nice/spf2", \&patterns_run_cb); - ok_all_patterns(); +# 19-26: Trusted networks contain first and second header. +# Internal networks contain first and second header. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 64.142.3.173 + internal_networks 65.214.43.157 64.142.3.173 + always_trust_envelope_sender 1 +"); +%anti_patterns = ( + q{ SPF_HELO_PASS }, 'helo_pass', + q{ SPF_HELO_FAIL }, 'helo_fail', + q{ SPF_HELO_SOFTFAIL }, 'helo_softfail', + q{ SPF_HELO_NEUTRAL }, 'helo_neutral', + q{ SPF_PASS }, 'pass', + q{ SPF_FAIL }, 'fail', + q{ SPF_SOFTFAIL }, 'softfail', + q{ SPF_NEUTRAL }, 'neutral', +); +%patterns = (); - # 29-30: Trusted networks contain top 5 headers. - # Internal networks contain first header. +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 - internal_networks 65.214.43.158 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %anti_patterns = (); - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - ); - sarun ("-t < data/nice/spf3", \&patterns_run_cb); - ok_all_patterns(); +# 27-28: Trusted networks contain first header. +# Internal networks contain first and second header. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 + internal_networks 65.214.43.157 64.142.3.173 + always_trust_envelope_sender 1 +"); +%anti_patterns = (); +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); - # 31-32: Trusted networks contain top 5 headers. - # Internal networks contain top 2 headers. +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 - internal_networks 65.214.43.158 64.142.3.173 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %anti_patterns = (); - %patterns = ( - q{ SPF_HELO_FAIL }, 'helo_fail', - q{ SPF_FAIL }, 'fail', - ); - sarun ("-t < data/nice/spf3", \&patterns_run_cb); - ok_all_patterns(); +# 29-30: Trusted networks contain top 5 headers. +# Internal networks contain first header. +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 + internal_networks 65.214.43.158 + always_trust_envelope_sender 1 +"); - # 33-34: Trusted networks contain top 5 headers. - # Internal networks contain top 3 headers. +%anti_patterns = (); +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 - internal_networks 65.214.43.158 64.142.3.173 65.214.43.155 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %anti_patterns = (); - %patterns = ( - q{ SPF_HELO_SOFTFAIL }, 'helo_softfail', - q{ SPF_SOFTFAIL }, 'softfail', - ); +sarun ("-t < data/nice/spf3", \&patterns_run_cb); +ok_all_patterns(); - sarun ("-t < data/nice/spf3", \&patterns_run_cb); - ok_all_patterns(); +# 31-32: Trusted networks contain top 5 headers. +# Internal networks contain top 2 headers. - # 35-36: Trusted networks contain top 5 headers. - # Internal networks contain top 4 headers. +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 + internal_networks 65.214.43.158 64.142.3.173 + always_trust_envelope_sender 1 +"); - tstprefs(" - clear_trusted_networks - clear_internal_networks - trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 - internal_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 - always_trust_envelope_sender 1 - $disable_an_spf_module - "); - - %anti_patterns = (); - %patterns = ( - q{ SPF_HELO_NEUTRAL }, 'helo_neutral', - q{ SPF_NEUTRAL }, 'neutral', - ); +%anti_patterns = (); +%patterns = ( + q{ 0.0 SPF_HELO_FAIL }, 'helo_fail', + q{ 0.0 SPF_FAIL }, 'fail', +); - sarun ("-t < data/nice/spf3", \&patterns_run_cb); - ok_all_patterns(); +sarun ("-t < data/nice/spf3", \&patterns_run_cb); +ok_all_patterns(); - # 37-40: same as test 1-2 with some spf whitelisting added +# 33-34: Trusted networks contain top 5 headers. +# Internal networks contain top 3 headers. - tstprefs(" - whitelist_from_spf newsalerts-noreply\@dnsbltest.spamassassin.org - def_whitelist_from_spf *\@dnsbltest.spamassassin.org - $disable_an_spf_module - "); - - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist', - q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', - ); +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 + internal_networks 65.214.43.158 64.142.3.173 65.214.43.155 + always_trust_envelope_sender 1 +"); - sarun ("-t < data/nice/spf1", \&patterns_run_cb); - ok_all_patterns(); +%anti_patterns = (); +%patterns = ( + q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail', + q{ 0.0 SPF_SOFTFAIL }, 'softfail', +); +sarun ("-t < data/nice/spf3", \&patterns_run_cb); +ok_all_patterns(); - # 41-44: same as test 1-2 with some spf whitelist entries that don't match - tstprefs(" - whitelist_from_spf *\@example.com - def_whitelist_from_spf nothere\@dnsbltest.spamassassin.org - $disable_an_spf_module - "); - - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - ); - - %anti_patterns = ( - q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist', - q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', - ); +# 35-36: Trusted networks contain top 5 headers. +# Internal networks contain top 4 headers. - sarun ("-t < data/nice/spf1", \&patterns_run_cb); - ok_all_patterns(); +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 + internal_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 + always_trust_envelope_sender 1 +"); - # clear these out before we loop - %anti_patterns = (); - %patterns = (); - - - # 45-48: same as test 37-40 with whitelist_auth added - - tstprefs(" - whitelist_auth newsalerts-noreply\@dnsbltest.spamassassin.org - def_whitelist_auth *\@dnsbltest.spamassassin.org - $disable_an_spf_module - "); - - %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', - q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist', - q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', - ); +%anti_patterns = (); +%patterns = ( + q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral', + q{ 0.0 SPF_NEUTRAL }, 'neutral', +); + +sarun ("-t < data/nice/spf3", \&patterns_run_cb); +ok_all_patterns(); - sarun ("-t < data/nice/spf1", \&patterns_run_cb); - ok_all_patterns(); -} # for each SPF module +# 37-40: same as test 1-2 with some spf whitelisting added +tstprefs(" + whitelist_from_spf newsalerts-noreply\@dnsbltest.spamassassin.org + def_whitelist_from_spf *\@dnsbltest.spamassassin.org +"); -# test to see if the plugin will select an SPF module on its own +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', + q{ -0.0 USER_IN_SPF_WHITELIST }, 'spf_whitelist', + q{ -0.0 USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', +); -tstprefs(""); +sarun ("-t < data/nice/spf1", \&patterns_run_cb); +ok_all_patterns(); + + +# 41-44: same as test 1-2 with some spf whitelist entries that don't match + +tstprefs(" + whitelist_from_spf *\@example.com + def_whitelist_from_spf nothere\@dnsbltest.spamassassin.org +"); %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +%anti_patterns = ( + q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist', + q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', +); + +sarun ("-t < data/nice/spf1", \&patterns_run_cb); +ok_all_patterns(); + +# clear these out before we loop +%anti_patterns = (); +%patterns = (); + + +# 45-48: same as test 37-40 with whitelist_auth added + +tstprefs(" + whitelist_auth newsalerts-noreply\@dnsbltest.spamassassin.org + def_whitelist_auth *\@dnsbltest.spamassassin.org +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', + q{ -0.0 USER_IN_SPF_WHITELIST }, 'spf_whitelist', + q{ -0.0 USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', ); sarun ("-t < data/nice/spf1", \&patterns_run_cb); @@ -430,12 +396,21 @@ %anti_patterns = (); %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', ); sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb); ok_all_patterns(); +# Test same with nonfolded headers +sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb); +ok_all_patterns(); +# Test same with crlf line endings +sarun ("-t < data/nice/spf5-received-spf-crlf", \&patterns_run_cb); +ok_all_patterns(); +# Test same with crlf line endings (bug 7785) +sarun ("-t < data/nice/spf6-received-spf-crlf2", \&patterns_run_cb); +ok_all_patterns(); # test usage of Received-SPF headers added by internal relays @@ -452,12 +427,15 @@ %anti_patterns = (); %patterns = ( - q{ SPF_HELO_FAIL }, 'helo_fail_ignore_header', - q{ SPF_FAIL }, 'fail_ignore_header', + q{ 0.0 SPF_HELO_FAIL }, 'helo_fail_ignore_header', + q{ 0.0 SPF_FAIL }, 'fail_ignore_header', ); sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb); ok_all_patterns(); +# Test same with nonfolded headers +sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb); +ok_all_patterns(); # test usage of Received-SPF headers added by internal relays @@ -473,12 +451,15 @@ %anti_patterns = (); %patterns = ( - q{ SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header', - q{ SPF_NEUTRAL }, 'neutral_from_header', + q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header', + q{ 0.0 SPF_NEUTRAL }, 'neutral_from_header', ); sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb); ok_all_patterns(); +# Test same with nonfolded headers +sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb); +ok_all_patterns(); # test usage of Received-SPF headers added by internal relays @@ -495,12 +476,14 @@ %anti_patterns = (); %patterns = ( - q{ SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header', - q{ SPF_FAIL }, 'fail_from_header', + q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header', + q{ 0.0 SPF_FAIL }, 'fail_from_header', ); sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb); - +ok_all_patterns(); +# Test same with nonfolded headers +sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb); ok_all_patterns(); @@ -517,8 +500,8 @@ "); %patterns = ( - q{ SPF_HELO_PASS }, 'helo_pass', - q{ SPF_PASS }, 'pass', + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', ); %anti_patterns = ( diff -Nru spamassassin-3.4.6/t/spf_welcome_block.t spamassassin-4.0.0~rc3/t/spf_welcome_block.t --- spamassassin-3.4.6/t/spf_welcome_block.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/spf_welcome_block.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,511 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("spf_welcome_block"); +use Test::More; + +use constant HAS_MAILSPF => eval { require Mail::SPF; }; + +plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); +plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); +plan skip_all => "Need Mail::SPF" unless HAS_MAILSPF; +plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely(); + +plan tests => 72; + +# --------------------------------------------------------------------------- + +# ensure all rules will fire +tstlocalrules (" + header SPF_PASS eval:check_for_spf_pass() + header SPF_NEUTRAL eval:check_for_spf_neutral() + header SPF_FAIL eval:check_for_spf_fail() + header SPF_SOFTFAIL eval:check_for_spf_softfail() + header SPF_HELO_PASS eval:check_for_spf_helo_pass() + header SPF_HELO_NEUTRAL eval:check_for_spf_helo_neutral() + header SPF_HELO_FAIL eval:check_for_spf_helo_fail() + header SPF_HELO_SOFTFAIL eval:check_for_spf_helo_softfail() + tflags SPF_PASS nice userconf net + tflags SPF_HELO_PASS nice userconf net + tflags SPF_NEUTRAL net + tflags SPF_FAIL net + tflags SPF_SOFTFAIL net + tflags SPF_HELO_NEUTRAL net + tflags SPF_HELO_FAIL net + tflags SPF_HELO_SOFTFAIL net + header USER_IN_SPF_WELCOMELIST eval:check_for_spf_welcomelist_from() + tflags USER_IN_SPF_WELCOMELIST userconf nice noautolearn net + header USER_IN_DEF_SPF_WL eval:check_for_def_spf_welcomelist_from() + tflags USER_IN_DEF_SPF_WL userconf nice noautolearn net + meta USER_IN_SPF_WHITELIST (USER_IN_SPF_WELCOMELIST) + tflags USER_IN_SPF_WHITELIST userconf nice noautolearn net + score SPF_FAIL 0.001 + score SPF_HELO_FAIL 0.001 + score SPF_HELO_NEUTRAL 0.001 + score SPF_HELO_SOFTFAIL 0.001 + score SPF_NEUTRAL 0.001 + score SPF_SOFTFAIL 0.001 + score SPF_PASS -0.001 + score SPF_HELO_PASS -0.001 + score USER_IN_DEF_SPF_WL -0.001 + score USER_IN_SPF_WELCOMELIST -0.001 +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +sarun ("-t < data/nice/spf1", \&patterns_run_cb); +ok_all_patterns(); + +%patterns = ( + q{ 0.0 SPF_NEUTRAL }, 'neutral', + q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral', +); + +sarun ("-t < data/spam/spf1", \&patterns_run_cb); +ok_all_patterns(); + +%patterns = ( + q{ 0.0 SPF_SOFTFAIL }, 'softfail', + q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail', +); + +sarun ("-t < data/spam/spf2", \&patterns_run_cb); +ok_all_patterns(); +%patterns = ( + q{ 0.0 SPF_FAIL }, 'fail', + q{ 0.0 SPF_HELO_FAIL }, 'helo_fail', +); + +sarun ("-t < data/spam/spf3", \&patterns_run_cb); +ok_all_patterns(); + + +# Test using an assortment of trusted and internal network definitions + +# 9-10: Trusted networks contain first header. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); + + +# 11-12: Internal networks contain first header. +# Trusted networks not defined. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + internal_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); + + +# 13-14: Internal networks contain first header. +# Trusted networks contain some other IP. +# jm: commented; this is now an error condition. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 1.2.3.4 + internal_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); + +%patterns = ( + q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral', + q{ 0.0 SPF_NEUTRAL }, 'neutral', +); + +if (0) { + sarun ("-t < data/nice/spf2", \&patterns_run_cb); + ok_all_patterns(); +} else { + ok(1); # skip the tests + ok(1); +} + + +# 15-16: Trusted+Internal networks contain first header. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 + internal_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); + + +# 17-18: Trusted networks contain first and second header. +# Internal networks contain first header. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 64.142.3.173 + internal_networks 65.214.43.157 + always_trust_envelope_sender 1 +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); + + +# 19-26: Trusted networks contain first and second header. +# Internal networks contain first and second header. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 64.142.3.173 + internal_networks 65.214.43.157 64.142.3.173 + always_trust_envelope_sender 1 +"); + +%anti_patterns = ( + q{ SPF_HELO_PASS }, 'helo_pass', + q{ SPF_HELO_FAIL }, 'helo_fail', + q{ SPF_HELO_SOFTFAIL }, 'helo_softfail', + q{ SPF_HELO_NEUTRAL }, 'helo_neutral', + q{ SPF_PASS }, 'pass', + q{ SPF_FAIL }, 'fail', + q{ SPF_SOFTFAIL }, 'softfail', + q{ SPF_NEUTRAL }, 'neutral', +); +%patterns = (); + +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); + + +# 27-28: Trusted networks contain first header. +# Internal networks contain first and second header. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.157 + internal_networks 65.214.43.157 64.142.3.173 + always_trust_envelope_sender 1 +"); + +%anti_patterns = (); +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +sarun ("-t < data/nice/spf2", \&patterns_run_cb); +ok_all_patterns(); + + +# 29-30: Trusted networks contain top 5 headers. +# Internal networks contain first header. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 + internal_networks 65.214.43.158 + always_trust_envelope_sender 1 +"); + +%anti_patterns = (); +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +sarun ("-t < data/nice/spf3", \&patterns_run_cb); +ok_all_patterns(); + + +# 31-32: Trusted networks contain top 5 headers. +# Internal networks contain top 2 headers. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 + internal_networks 65.214.43.158 64.142.3.173 + always_trust_envelope_sender 1 +"); + +%anti_patterns = (); +%patterns = ( + q{ 0.0 SPF_HELO_FAIL }, 'helo_fail', + q{ 0.0 SPF_FAIL }, 'fail', +); + +sarun ("-t < data/nice/spf3", \&patterns_run_cb); +ok_all_patterns(); + + +# 33-34: Trusted networks contain top 5 headers. +# Internal networks contain top 3 headers. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 + internal_networks 65.214.43.158 64.142.3.173 65.214.43.155 + always_trust_envelope_sender 1 +"); + +%anti_patterns = (); +%patterns = ( + q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail', + q{ 0.0 SPF_SOFTFAIL }, 'softfail', +); + +sarun ("-t < data/nice/spf3", \&patterns_run_cb); +ok_all_patterns(); + + +# 35-36: Trusted networks contain top 5 headers. +# Internal networks contain top 4 headers. + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 65.214.43.157 + internal_networks 65.214.43.158 64.142.3.173 65.214.43.155 65.214.43.156 + always_trust_envelope_sender 1 +"); + +%anti_patterns = (); +%patterns = ( + q{ 0.0 SPF_HELO_NEUTRAL }, 'helo_neutral', + q{ 0.0 SPF_NEUTRAL }, 'neutral', +); + +sarun ("-t < data/nice/spf3", \&patterns_run_cb); +ok_all_patterns(); + + +# 37-40: same as test 1-2 with some spf whitelisting added + +tstprefs(" + whitelist_from_spf newsalerts-noreply\@dnsbltest.spamassassin.org + def_whitelist_from_spf *\@dnsbltest.spamassassin.org +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', + q{ -0.0 USER_IN_SPF_WELCOMELIST }, 'spf_whitelist', + q{ -0.0 USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', +); + +sarun ("-t < data/nice/spf1", \&patterns_run_cb); +ok_all_patterns(); + + +# 41-44: same as test 1-2 with some spf whitelist entries that don't match + +tstprefs(" + whitelist_from_spf *\@example.com + def_whitelist_from_spf nothere\@dnsbltest.spamassassin.org +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +%anti_patterns = ( + q{ USER_IN_SPF_WELCOMELIST }, 'spf_whitelist', + q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', +); + +sarun ("-t < data/nice/spf1", \&patterns_run_cb); +ok_all_patterns(); + +# clear these out before we loop +%anti_patterns = (); +%patterns = (); + + +# 45-48: same as test 37-40 with welcomelist_auth added + +tstprefs(" + welcomelist_auth newsalerts-noreply\@dnsbltest.spamassassin.org + def_welcomelist_auth *\@dnsbltest.spamassassin.org +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', + q{ -0.0 USER_IN_SPF_WELCOMELIST }, 'spf_whitelist', + q{ -0.0 USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', +); + +sarun ("-t < data/nice/spf1", \&patterns_run_cb); +ok_all_patterns(); + + +# test usage of Received-SPF headers added by internal relays +# the Received-SPF headers shouldn't be used in this test + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 + internal_networks 65.214.43.158 + always_trust_envelope_sender 1 +"); + +%anti_patterns = (); +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb); +ok_all_patterns(); +# Test same with nonfolded headers +sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb); +ok_all_patterns(); +# Test same with crlf line endings +sarun ("-t < data/nice/spf5-received-spf-crlf", \&patterns_run_cb); +ok_all_patterns(); +# Test same with crlf line endings (bug 7785) +sarun ("-t < data/nice/spf6-received-spf-crlf2", \&patterns_run_cb); +ok_all_patterns(); + + +# test usage of Received-SPF headers added by internal relays +# the Received-SPF headers shouldn't be used in this test + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 + internal_networks 65.214.43.158 64.142.3.173 + always_trust_envelope_sender 1 + ignore_received_spf_header 1 +"); + +%anti_patterns = (); +%patterns = ( + q{ 0.0 SPF_HELO_FAIL }, 'helo_fail_ignore_header', + q{ 0.0 SPF_FAIL }, 'fail_ignore_header', +); + +sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb); +ok_all_patterns(); +# Test same with nonfolded headers +sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb); +ok_all_patterns(); + + +# test usage of Received-SPF headers added by internal relays +# the bottom 2 Received-SPF headers should be used in this test + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 + internal_networks 65.214.43.158 64.142.3.173 + always_trust_envelope_sender 1 +"); + +%anti_patterns = (); +%patterns = ( + q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header', + q{ 0.0 SPF_NEUTRAL }, 'neutral_from_header', +); + +sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb); +ok_all_patterns(); +# Test same with nonfolded headers +sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb); +ok_all_patterns(); + + +# test usage of Received-SPF headers added by internal relays +# the top 2 Received-SPF headers should be used in this test + +tstprefs(" + clear_trusted_networks + clear_internal_networks + trusted_networks 65.214.43.158 64.142.3.173 + internal_networks 65.214.43.158 64.142.3.173 + use_newest_received_spf_header 1 + always_trust_envelope_sender 1 +"); + +%anti_patterns = (); +%patterns = ( + q{ 0.0 SPF_HELO_SOFTFAIL }, 'helo_softfail_from_header', + q{ 0.0 SPF_FAIL }, 'fail_from_header', +); + +sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb); +ok_all_patterns(); +# Test same with nonfolded headers +sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb); +ok_all_patterns(); + + +# test unwelcomelist_auth and unwhitelist_from_spf + +tstprefs(" + welcomelist_auth newsalerts-noreply\@dnsbltest.spamassassin.org + def_welcomelist_auth newsalerts-noreply\@dnsbltest.spamassassin.org + unwelcomelist_auth newsalerts-noreply\@dnsbltest.spamassassin.org + + whitelist_from_spf *\@dnsbltest.spamassassin.org + def_whitelist_from_spf *\@dnsbltest.spamassassin.org + unwhitelist_from_spf *\@dnsbltest.spamassassin.org +"); + +%patterns = ( + q{ -0.0 SPF_HELO_PASS }, 'helo_pass', + q{ -0.0 SPF_PASS }, 'pass', +); + +%anti_patterns = ( + q{ USER_IN_SPF_WELCOMELIST }, 'spf_whitelist', + q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist', +); + +sarun ("-t < data/nice/spf1", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/sql_based_welcomelist.t spamassassin-4.0.0~rc3/t/sql_based_welcomelist.t --- spamassassin-3.4.6/t/sql_based_welcomelist.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/sql_based_welcomelist.t 2022-08-18 16:49:59.000000000 +0000 @@ -0,0 +1,144 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; +use Test::More; + +use constant HAS_DBI => eval { require DBI; }; +use constant HAS_DBD_SQLITE => eval { require DBD::SQLite; DBD::SQLite->VERSION(1.59_01); }; + +use constant SQLITE => (HAS_DBI && HAS_DBD_SQLITE); +use constant SQL => conf_bool('run_awl_sql_tests'); + +plan skip_all => "run_awl_sql_tests not enabled or DBI/SQLite not found" unless (SQLITE || SQL); + +my $tests = 0; +$tests += 23 if (SQLITE); +$tests += 23 if (SQL); +plan tests => $tests; + +diag "Note: If there is a failure it may be due to an incorrect SQL configuration." if (SQL); + +sa_t_init("sql_based_welcomelist"); + +# only use rules defined here in tstprefs() +clear_localrules(); + +my $rules = q( + add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_" + # Needed for AWL to run + header AWL eval:check_from_in_auto_welcomelist() + priority AWL 1000 + # Fixed message scores to keep track of correct scoring + body NICE_002 /happy mailing list/ + score NICE_002 -1.2 + body SPAM_004_007 /MAKE MONEY FAST/ + score SPAM_004_007 5.5 +); + +if (SQLITE) { + my $dbh = DBI->connect("dbi:SQLite:dbname=$workdir/awl.db","",""); + $dbh->do(" + CREATE TABLE awl ( + username varchar(100) NOT NULL default '', + email varchar(255) NOT NULL default '', + ip varchar(40) NOT NULL default '', + msgcount bigint NOT NULL default '0', + totscore float NOT NULL default '0', + signedby varchar(255) NOT NULL default '', + last_hit timestamp NOT NULL default CURRENT_TIMESTAMP, + PRIMARY KEY (username,email,signedby,ip) + ); + ") or die "Failed to create $workdir/awl.db"; + + tstprefs (" + use_auto_welcomelist 1 + auto_welcomelist_factory Mail::SpamAssassin::SQLBasedAddrList + user_awl_dsn dbi:SQLite:dbname=$workdir/awl.db + $rules + "); + + run_awl(); +} + +if (SQL) { + my $dbconfig = ''; + foreach my $setting (qw( + user_awl_dsn + user_awl_sql_username + user_awl_sql_password + user_awl_sql_table + )) { + my $val = conf($setting); + $dbconfig .= "$setting $val\n" if $val; + } + + my $testuser = 'tstusr.'.$$.'.'.time(); + + tstprefs (" + use_auto_welcomelist 1 + auto_welcomelist_factory Mail::SpamAssassin::SQLBasedAddrList + $dbconfig + user_awl_sql_override_username $testuser + $rules + "); + + run_awl(); +} + +# --------------------------------------------------------------------------- +sub run_awl { + +%is_nonspam_patterns = ( + ' Subject: Re: [SAtalk] auto-whitelisting', 'subj', +); +%is_spam_patterns = ( + 'Subject: 4000 Your Vacation Winning !', 'subj', +); +%is_spam_patterns2 = ( + ' X-Spam-Status: Yes', 'status', +); + +%patterns = %is_nonspam_patterns; +ok(sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); + +# 3 times, to get into the welcomelist: # verify correct ip/score/msgcount from debug output +%patterns = (%is_nonspam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0.0, msgcount 0' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = (%is_nonspam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -1.2, msgcount 1' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = (%is_nonspam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -2.4, msgcount 2' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb)); +ok_all_patterns(); + +# Now check +%patterns = (%is_nonspam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -3.6, msgcount 3' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb)); +ok_all_patterns(); + +%patterns = (%is_spam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -4.8, msgcount 4' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb)); +ok_all_patterns(); + +# Should be raised after last spam +%patterns = (%is_spam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0.7, msgcount 5' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb)); +ok_all_patterns(); + +%patterns = (%is_spam_patterns2, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|210.73 scores 0.0, msgcount 0' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/spam/007 2>&1", \&patterns_run_cb)); +ok_all_patterns(); + +ok(sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); + +} +# --------------------------------------------------------------------------- diff -Nru spamassassin-3.4.6/t/sql_based_whitelist.t spamassassin-4.0.0~rc3/t/sql_based_whitelist.t --- spamassassin-3.4.6/t/sql_based_whitelist.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/sql_based_whitelist.t 2022-08-18 16:49:59.000000000 +0000 @@ -2,68 +2,143 @@ use lib '.'; use lib 't'; use SATest; - use Test::More; -plan skip_all => 'AWL SQL Tests not enabled.' if conf_bool('run_awl_sql_tests'); -plan tests => 11; -diag "Note: Failure may be due to an incorrect config"; + +use constant HAS_DBI => eval { require DBI; }; +use constant HAS_DBD_SQLITE => eval { require DBD::SQLite; DBD::SQLite->VERSION(1.59_01); }; + +use constant SQLITE => (HAS_DBI && HAS_DBD_SQLITE); +use constant SQL => conf_bool('run_awl_sql_tests'); + +plan skip_all => "run_awl_sql_tests not enabled or DBI/SQLite not found" unless (SQLITE || SQL); + +my $tests = 0; +$tests += 23 if (SQLITE); +$tests += 23 if (SQL); +plan tests => $tests; + +diag "Note: If there is a failure it may be due to an incorrect SQL configuration." if (SQL); sa_t_init("sql_based_whitelist"); -my $dbconfig = ''; -foreach my $setting (qw( - user_awl_dsn - user_awl_sql_username - user_awl_sql_password - user_awl_sql_table - )) -{ - my $val = conf($setting); - $dbconfig .= "$setting $val\n" if $val; +# only use rules defined here in tstprefs() +clear_localrules(); + +my $rules = q( + add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_" + # Needed for AWL to run + header AWL eval:check_from_in_auto_whitelist() + priority AWL 1000 + # Fixed message scores to keep track of correct scoring + body NICE_002 /happy mailing list/ + score NICE_002 -1.2 + body SPAM_004_007 /MAKE MONEY FAST/ + score SPAM_004_007 5.5 +); + +if (SQLITE) { + my $dbh = DBI->connect("dbi:SQLite:dbname=$workdir/awl.db","",""); + $dbh->do(" + CREATE TABLE awl ( + username varchar(100) NOT NULL default '', + email varchar(255) NOT NULL default '', + ip varchar(40) NOT NULL default '', + msgcount bigint NOT NULL default '0', + totscore float NOT NULL default '0', + signedby varchar(255) NOT NULL default '', + last_hit timestamp NOT NULL default CURRENT_TIMESTAMP, + PRIMARY KEY (username,email,signedby,ip) + ); + ") or die "Failed to create $workdir/awl.db"; + + tstprefs (" + use_auto_whitelist 1 + auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList + user_awl_dsn dbi:SQLite:dbname=$workdir/awl.db + $rules + "); + + run_awl(); } -my $testuser = 'tstusr.'.$$.'.'.time(); +if (SQL) { + my $dbconfig = ''; + foreach my $setting (qw( + user_awl_dsn + user_awl_sql_username + user_awl_sql_password + user_awl_sql_table + )) { + my $val = conf($setting); + $dbconfig .= "$setting $val\n" if $val; + } + + my $testuser = 'tstusr.'.$$.'.'.time(); + + tstprefs (" + use_auto_whitelist 1 + auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList + $dbconfig + user_awl_sql_override_username $testuser + $rules + "); -tstlocalrules (" -use_auto_whitelist 1 -auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList -$dbconfig -user_awl_sql_override_username $testuser -"); + run_awl(); +} # --------------------------------------------------------------------------- +sub run_awl { %is_nonspam_patterns = ( -q{ Subject: Re: [SAtalk] auto-whitelisting}, 'subj', + ' Subject: Re: [SAtalk] auto-whitelisting', 'subj', ); %is_spam_patterns = ( -q{Subject: 4000 Your Vacation Winning !}, 'subj', + 'Subject: 4000 Your Vacation Winning !', 'subj', ); - %is_spam_patterns2 = ( -q{ X-Spam-Status: Yes}, 'status', + ' X-Spam-Status: Yes', 'status', ); - %patterns = %is_nonspam_patterns; - ok(sarun ("--remove-addr-from-whitelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); -# 3 times, to get into the whitelist: -ok(sarun ("-L -t < data/nice/002", \&patterns_run_cb)); -ok(sarun ("-L -t < data/nice/002", \&patterns_run_cb)); -ok(sarun ("-L -t < data/nice/002", \&patterns_run_cb)); +# 3 times, to get into the whitelist: # verify correct ip/score/msgcount from debug output +%patterns = (%is_nonspam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0.0, msgcount 0' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = (%is_nonspam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -1.2, msgcount 1' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = (%is_nonspam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -2.4, msgcount 2' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb)); +ok_all_patterns(); # Now check -ok(sarun ("-L -t < data/nice/002", \&patterns_run_cb)); +%patterns = (%is_nonspam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -3.6, msgcount 3' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb)); ok_all_patterns(); -%patterns = %is_spam_patterns; -ok(sarun ("-L -t < data/spam/004", \&patterns_run_cb)); +%patterns = (%is_spam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores -4.8, msgcount 4' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb)); ok_all_patterns(); -%patterns = %is_spam_patterns2; -ok(sarun ("-L -t < data/spam/007", \&patterns_run_cb)); +# Should be raised after last spam +%patterns = (%is_spam_patterns, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|144.137 scores 0.7, msgcount 5' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb)); +ok_all_patterns(); + +%patterns = (%is_spam_patterns2, + ('sql-based whitelist_test@whitelist.spamassassin.taint.org|210.73 scores 0.0, msgcount 0' => 'scores')); +ok(sarun ("-L -t -D auto-welcomelist < data/spam/007 2>&1", \&patterns_run_cb)); ok_all_patterns(); ok(sarun ("--remove-addr-from-whitelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); + +} +# --------------------------------------------------------------------------- diff -Nru spamassassin-3.4.6/t/stop_always_matching_regexps.t spamassassin-4.0.0~rc3/t/stop_always_matching_regexps.t --- spamassassin-3.4.6/t/stop_always_matching_regexps.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/stop_always_matching_regexps.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,16 +1,5 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - use lib '.'; use lib 't'; use SATest; sa_t_init("stop_always_matching_regexps"); use Test::More tests => 12; diff -Nru spamassassin-3.4.6/t/strip2.t spamassassin-4.0.0~rc3/t/strip2.t --- spamassassin-3.4.6/t/strip2.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/strip2.t 2022-06-15 22:53:05.000000000 +0000 @@ -4,13 +4,14 @@ use SATest; sa_t_init("strip2"); use Test::More; -plan skip_all => 'Long running tests disabled' if conf_bool('run_long_tests'); +plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests'); plan tests => 98; # --------------------------------------------------------------------------- use File::Copy; use File::Compare qw(compare_text); +use Text::Diff; my @files = qw( data/nice/crlf-endings @@ -28,7 +29,6 @@ # Make sure all the files can do "report_safe 0" and "report_safe 1" foreach $input (@files) { tstprefs (" - $default_cf_lines report_safe 0 body TEST_ALWAYS /./ score TEST_ALWAYS 100 @@ -36,7 +36,7 @@ # create report_safe 0 output my $test_number = test_number(); - my $d_input = "log/d.$testname/$test_number"; + my $d_input = "$workdir/d.$testname/$test_number"; unlink $d_input; ok sarun ("-L < $input"); @@ -46,16 +46,15 @@ { print "output: $d_input\n"; $test_number = test_number(); - my $d_output = "log/d.$testname/$test_number"; + my $d_output = "$workdir/d.$testname/$test_number"; unlink $d_output; - ok sarun ("-d < $d_input"); + ok sarun ("-L -d < $d_input"); ok (-f $d_output); ok(!compare_text($input,$d_output)) or diffwarn( $input, $d_output ); } tstprefs (" - $default_cf_lines report_safe 1 body TEST_ALWAYS /./ score TEST_ALWAYS 100 @@ -63,16 +62,16 @@ # create report_safe 1 and -t output $test_number = test_number(); - $d_input = "log/d.$testname/$test_number"; + $d_input = "$workdir/d.$testname/$test_number"; unlink $d_input; ok sarun ("-L -t < $input"); ok (-f $d_input); { print "output: $d_input\n"; $test_number = test_number(); - my $d_output = "log/d.$testname/$test_number"; + my $d_output = "$workdir/d.$testname/$test_number"; unlink $d_output; - ok sarun ("-d < $d_input"); + ok sarun ("-L -d < $d_input"); ok (-f $d_output); ok(!compare_text($input,$d_output)) or diffwarn( $input, $d_output ); @@ -84,7 +83,6 @@ $input = $files[0]; tstprefs (" - $default_cf_lines report_safe 2 body TEST_ALWAYS /./ score TEST_ALWAYS 100 @@ -92,16 +90,16 @@ # create report_safe 2 output my $test_number = test_number(); -$d_input = "log/d.$testname/$test_number"; +$d_input = "$workdir/d.$testname/$test_number"; unlink $d_input; ok sarun ("-L < $input"); ok (-f $d_input); { print "output: $d_input\n"; $test_number = test_number(); - my $d_output = "log/d.$testname/$test_number"; + my $d_output = "$workdir/d.$testname/$test_number"; unlink $d_output; - ok sarun ("-d < $d_input"); + ok sarun ("-L -d < $d_input"); ok (-f $d_output); ok(!compare_text($input,$d_output)) or diffwarn( $input, $d_output ); @@ -109,18 +107,17 @@ # Work directly on regular message, as though it was not spam $test_number = test_number(); -my $d_output = "log/d.$testname/$test_number"; +my $d_output = "$workdir/d.$testname/$test_number"; unlink $d_output; -ok sarun ("-d < $input"); +ok sarun ("-L -d < $input"); ok (-f $d_output); ok(!compare_text($input,$d_output)) or diffwarn( $input, $d_output ); - sub diffwarn { my ($f1, $f2) = @_; - print "# Diff is as follows:\n"; - untaint_system "diff -u $f1 $f2"; + print STDERR "# Diff is as follows:\n"; + diff ($f1, $f2, { STYLE => 'unified', OUTPUT => \*STDERR }); print "\n\n"; } diff -Nru spamassassin-3.4.6/t/stripmarkup.t spamassassin-4.0.0~rc3/t/stripmarkup.t --- spamassassin-3.4.6/t/stripmarkup.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/stripmarkup.t 2022-05-28 10:38:25.000000000 +0000 @@ -7,22 +7,15 @@ # --------------------------------------------------------------------------- %patterns = ( - -q{ Content-Type: text/html }, 'contenttype', -q{ - Sender: pertand@email.mondolink.com - Content-Type: text/html - -

    - }, 'startofbody', - - q{Subject: "100% HERBALSENSATION"}, 'subj', - + qr/^Content-Type: text\/html$/m, 'contenttype', + qr/\nSender: pertand\@email\.mondolink\.com\nContent-Type: text\/html\n\n<\/P>/, 'startofbody', + qr/^Subject: "100% HERBALSENSATION"$/m, 'subj', ); tstprefs ( " -rewrite_header subject *****SPAM***** + rewrite_header subject *****SPAM***** " ); ok (sarun ("-d < data/spam/003", \&patterns_run_cb)); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/strip_no_subject.t spamassassin-4.0.0~rc3/t/strip_no_subject.t --- spamassassin-3.4.6/t/strip_no_subject.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/strip_no_subject.t 2021-04-12 07:43:12.000000000 +0000 @@ -4,7 +4,6 @@ use SATest; sa_t_init("strip_no_subject"); use Test::More; -plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan tests => 4; # --------------------------------------------------------------------------- @@ -13,10 +12,9 @@ use File::Compare qw(compare_text); my $INPUT = 'data/spam/014'; -my $MUNGED = 'log/strip_no_subject.munged'; +my $MUNGED = "$workdir/strip_no_subject.munged"; tstprefs (" - $default_cf_lines report_safe 1 rewrite_header subject ***SPAM*** "); @@ -24,9 +22,9 @@ # create report_safe 1 and -t output sarun ("-L -t < $INPUT"); my $test_number = test_number(); -if (move("log/d.$testname/$test_number", $MUNGED)) { +if (move("$workdir/d.$testname/$test_number", $MUNGED)) { sarun ("-d < $MUNGED"); - ok(!compare_text($INPUT,"log/d.$testname/$test_number")); + ok(!compare_text($INPUT,"$workdir/d.$testname/$test_number")); } else { warn "move failed: $!\n"; @@ -34,7 +32,6 @@ } tstprefs (" - $default_cf_lines report_safe 2 rewrite_header subject ***SPAM*** "); @@ -42,9 +39,9 @@ # create report_safe 2 output sarun ("-L < $INPUT"); $test_number = test_number(); -if (move("log/d.$testname/$test_number", $MUNGED)) { +if (move("$workdir/d.$testname/$test_number", $MUNGED)) { sarun ("-d < $MUNGED"); - ok(!compare_text($INPUT,"log/d.$testname/$test_number")); + ok(!compare_text($INPUT,"$workdir/d.$testname/$test_number")); } else { warn "move failed: $!\n"; @@ -52,7 +49,6 @@ } tstprefs (" - $default_cf_lines report_safe 0 rewrite_header subject ***SPAM*** "); @@ -60,9 +56,9 @@ # create report_safe 0 output sarun ("-L < $INPUT"); $test_number = test_number(); -if (move("log/d.$testname/$test_number", $MUNGED)) { +if (move("$workdir/d.$testname/$test_number", $MUNGED)) { sarun ("-d < $MUNGED"); - ok(!compare_text($INPUT,"log/d.$testname/$test_number")); + ok(!compare_text($INPUT,"$workdir/d.$testname/$test_number")); } else { warn "move failed: $!\n"; @@ -72,4 +68,4 @@ # Work directly on regular message, as though it was not spam sarun ("-d < $INPUT"); $test_number = test_number(); -ok(!compare_text($INPUT,"log/d.$testname/$test_number")); +ok(!compare_text($INPUT,"$workdir/d.$testname/$test_number")); diff -Nru spamassassin-3.4.6/t/tainted_msg.t spamassassin-4.0.0~rc3/t/tainted_msg.t --- spamassassin-3.4.6/t/tainted_msg.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/tainted_msg.t 2022-06-05 12:50:11.000000000 +0000 @@ -1,17 +1,5 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -$NO_SPAMD_REQUIRED=1; use lib '.'; use lib 't'; use SATest; sa_t_init("tainted_msg"); @@ -24,7 +12,6 @@ # --------------------------------------------------------------------------- %patterns = ( - q{ tainted get_header found } => '', q{ tainted get_pristine found } => '', q{ tainted get_pristine_body found } => '', @@ -33,12 +20,11 @@ q{ tainted get_visible_rendered_body_text_array found } => '', q{ tainted get_decoded_body_text_array found } => '', q{ tainted get_rendered_body_text_array found } => '', - ); %anti_patterns = (); -tstlocalrules (" - loadplugin myTestPlugin ../../data/taintcheckplugin.pm +tstprefs (" + loadplugin myTestPlugin ../../../data/taintcheckplugin.pm "); use Mail::SpamAssassin::Util; diff -Nru spamassassin-3.4.6/t/testrules.yml spamassassin-4.0.0~rc3/t/testrules.yml --- spamassassin-3.4.6/t/testrules.yml 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/testrules.yml 2022-05-21 08:51:57.000000000 +0000 @@ -0,0 +1,21 @@ +--- +seq: + # run some common tests first + - par: + - t/all_modules.t + - t/basic*.t + - t/html*.t + - t/mime*.t + - t/uri*.t + - t/get*.t + - t/header*.t + - t/regexp*.t + - t/*dns*.t + - t/rule*.t + # tests that are not parallel-ready (will run in isolation) + - seq: + - t/extracttext.t + - t/spamd_prefork_stress.t + - t/spamd_prefork_stress_2.t + # rest of the tests + - par: ** diff -Nru spamassassin-3.4.6/t/text_bad_ctype.t spamassassin-4.0.0~rc3/t/text_bad_ctype.t --- spamassassin-3.4.6/t/text_bad_ctype.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/text_bad_ctype.t 2022-05-28 10:38:25.000000000 +0000 @@ -10,7 +10,7 @@ body NATURAL /\btotally
    natural/i '); -%patterns = ( q{ NATURAL } => 'NATURAL',); +%patterns = ( q{ 1.0 NATURAL } => 'NATURAL',); %anti_patterns = (); sarun ("-L -t < data/spam/badctype1", \&patterns_run_cb); ok_all_patterns(); @@ -19,3 +19,4 @@ %anti_patterns = ( q{ NATURAL } => 'NATURAL',); sarun ("-L -t < data/spam/badctype2", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/timeout.t spamassassin-4.0.0~rc3/t/timeout.t --- spamassassin-3.4.6/t/timeout.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/timeout.t 2022-06-08 02:26:05.000000000 +0000 @@ -1,21 +1,5 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use lib '.'; use lib 't'; use SATest; sa_t_init("timeout"); use Test::More tests => 33; @@ -29,11 +13,16 @@ # attempt to circumvent an advice not to mix alarm() with sleep(); # interaction between alarms and sleeps is unspecified; -# select() might be restarted on a signal +# select() might be restarted on a signal. +# Windows alarm emulation works with sleep, doesn't work with select() timeouts # sub mysleep($) { my($dt) = @_; - select(undef, undef, undef, 0.1) for 1..int(10*$dt); + if ($RUNNING_ON_WINDOWS) { + sleep($dt); + } else { + select(undef, undef, undef, 0.1) for 1..int(10*$dt); + } } my($r,$t,$t1,$t2); diff -Nru spamassassin-3.4.6/t/trust_path.t spamassassin-4.0.0~rc3/t/trust_path.t --- spamassassin-3.4.6/t/trust_path.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/trust_path.t 2022-05-04 11:06:22.000000000 +0000 @@ -1,29 +1,13 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - our $have_patricia = 0; eval { require Net::Patricia; Net::Patricia->VERSION(1.16); # need AF_INET6 support - import Net::Patricia; + Net::Patricia->import; $have_patricia = 1; }; -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use lib '.'; use lib 't'; use SATest; sa_t_init("trust_path"); @@ -41,6 +25,13 @@ # quiet "used only once" warnings 1 if *OLDERR; +tstlocalrules (" + clear_originating_ip_headers + originating_ip_headers X-Yahoo-Post-IP X-Originating-IP X-Apparently-From + originating_ip_headers X-SenderIP X-AOL-IP + originating_ip_headers X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp +"); + my @data = ( # --------------------------------------------------------------------------- @@ -672,7 +663,7 @@ } my $sa = create_saobj({ - userprefs_filename => "log/tst.cf", + userprefs_filename => $userrules, # debug => 1 }); diff -Nru spamassassin-3.4.6/t/uribl_all_types.t spamassassin-4.0.0~rc3/t/uribl_all_types.t --- spamassassin-3.4.6/t/uribl_all_types.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/uribl_all_types.t 2021-04-12 07:43:12.000000000 +0000 @@ -6,7 +6,6 @@ use SATest; sa_t_init("uribl_all_types"); use Test::More; -plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely(); plan tests => 3; @@ -14,12 +13,9 @@ # --------------------------------------------------------------------------- %patterns = ( - - q{ X_URIBL_IPSONLY [URIs: 144.137.3.98] } => 'X_URIBL_IPSONLY', - - # can be either uribl-example-b.com or uribl-example-c.com - q{ X_URIBL_DOMSONLY [URIs: uribl-example} => 'X_URIBL_DOMSONLY', - + q{ X_URIBL_IPSONLY [URI: 144.137.3.98] } => 'X_URIBL_IPSONLY', + # can be either uribl-example-b.com or uribl-example-c.com + q{ X_URIBL_DOMSONLY [URI: uribl-example} => 'X_URIBL_DOMSONLY', ); tstlocalrules(q{ diff -Nru spamassassin-3.4.6/t/uribl_domains_only.t spamassassin-4.0.0~rc3/t/uribl_domains_only.t --- spamassassin-3.4.6/t/uribl_domains_only.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/uribl_domains_only.t 2022-05-28 10:38:25.000000000 +0000 @@ -5,14 +5,15 @@ use SATest; sa_t_init("uribl_domains_only"); use Test::More; -plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely(); plan tests => 4; # --------------------------------------------------------------------------- -%anti_patterns = ( q{ X_URIBL_DOMSONLY } => 'A' ); +%anti_patterns = ( + q{ X_URIBL_DOMSONLY } => 'A' +); tstlocalrules(q{ @@ -30,7 +31,7 @@ ok sarun ("-t < data/spam/dnsbl_domsonly.eml 2>&1", \&patterns_run_cb); ok_all_patterns(); -%patterns = ( q{ X_URIBL_DOMSONLY } => 'A' ); +%patterns = ( q{ 1.0 X_URIBL_DOMSONLY } => 'A' ); %anti_patterns = (); clear_pattern_counters(); diff -Nru spamassassin-3.4.6/t/uribl_ips_only.t spamassassin-4.0.0~rc3/t/uribl_ips_only.t --- spamassassin-3.4.6/t/uribl_ips_only.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/uribl_ips_only.t 2022-05-28 10:38:25.000000000 +0000 @@ -5,7 +5,6 @@ use SATest; sa_t_init("uribl_ips_only"); use Test::More; -plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely(); plan tests => 4; @@ -13,7 +12,7 @@ # --------------------------------------------------------------------------- %anti_patterns = ( - q{ X_URIBL_IPSONLY } => 'A', + q{ X_URIBL_IPSONLY } => 'A', ); tstlocalrules(q{ @@ -32,7 +31,7 @@ ok sarun ("-t < data/spam/dnsbl_ipsonly.eml 2>&1", \&patterns_run_cb); ok_all_patterns(); -%patterns = ( q{ X_URIBL_IPSONLY } => 'A' ); +%patterns = ( q{ 1.0 X_URIBL_IPSONLY } => 'A' ); %anti_patterns = (); clear_pattern_counters(); diff -Nru spamassassin-3.4.6/t/uribl.t spamassassin-4.0.0~rc3/t/uribl.t --- spamassassin-3.4.6/t/uribl.t 2021-04-06 13:06:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/uribl.t 2022-05-28 11:43:13.000000000 +0000 @@ -4,23 +4,28 @@ use SATest; sa_t_init("uribl"); use Test::More; -plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests'); plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely(); -plan tests => 7; + +# run many times to catch some random natured failures +my $iterations = 5; +plan tests => 10 * $iterations; # --------------------------------------------------------------------------- %patterns = ( - q{ X_URIBL_A } => 'A', - q{ X_URIBL_B } => 'B', - q{ X_URIBL_NS } => 'NS', - q{ X_URIBL_DOMSONLY } => 'X_URIBL_DOMSONLY', - q{ META_URIBL_A } => 'META_URIBL_A', + q{ 1.0 X_URIBL_A } => '', + q{ 1.0 X_URIBL_B } => '', + q{ 1.0 X_URIBL_NS } => '', + q{ 1.0 X_URIBL_DOMSONLY } => '', + q{ 1.0 META_URIBL_A } => '', + q{ 1.0 META_URIBL_B } => '', + q{ 1.0 META_URIBL_NS } => '', + q{ 1.0 X_URIBL_NOTRIM } => '', ); %anti_patterns = ( - q{ X_URIBL_FULL_NS } => 'FULL_NS', + q{ X_URIBL_FULL_NS } => '', ); tstlocalrules(q{ @@ -51,10 +56,24 @@ # Bug 7897 - test that meta rules depending on net rules hit meta META_URIBL_A X_URIBL_A + # It also needs to hit even if priority is lower than dnsbl (-100) + meta META_URIBL_B X_URIBL_B + priority META_URIBL_B -500 + # Or super high + meta META_URIBL_NS X_URIBL_NS + priority META_URIBL_NS 2000 + priority X_URIBL_NS 2000 + + # Bug 7835 - tflags notrim + urirhssub X_URIBL_NOTRIM dnsbltest.spamassassin.org. A 16 + body X_URIBL_NOTRIM eval:check_uridnsbl('X_URIBL_NOTRIM') + tflags X_URIBL_NOTRIM net domains_only notrim }); -# note: don't leave -D here, it causes spurious passes -ok sarun ("-t < data/spam/dnsbl.eml 2>&1", \&patterns_run_cb); -ok_all_patterns(); +for (1 .. $iterations) { + clear_localrules() if $_ == 3; # do some tests without any other rules to check meta bugs + ok sarun ("-t < data/spam/dnsbl.eml", \&patterns_run_cb); + ok_all_patterns(); +} diff -Nru spamassassin-3.4.6/t/uri_html.t spamassassin-4.0.0~rc3/t/uri_html.t --- spamassassin-3.4.6/t/uri_html.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/uri_html.t 2021-04-12 07:43:12.000000000 +0000 @@ -2,21 +2,6 @@ # test URI redirecton patterns -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; use lib '.'; use lib 't'; use SATest; sa_t_init("uri_html"); diff -Nru spamassassin-3.4.6/t/uri_list.t spamassassin-4.0.0~rc3/t/uri_list.t --- spamassassin-3.4.6/t/uri_list.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/uri_list.t 2022-06-15 22:53:05.000000000 +0000 @@ -2,27 +2,12 @@ # Tests for Bug #7591, which is actually a bug seen in the EL7 build of Perl. # The real root cause is obscure, so we test for the bug not the Perl version. - -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} -use lib '.'; use lib 't'; use strict; +use lib '.'; use lib 't'; +use SATest; sa_t_init("uri_list"); use Test::More tests=> 12; use Mail::SpamAssassin::Util; -use SATest; sa_t_init("uri_list"); use warnings; use Cwd; @@ -126,8 +111,7 @@ http://host6.example.com EOT -my $tmpdir = mk_safe_tmpdir(); -warn "temp dir is $tmpdir\n"; +my $tmpdir = $workdir; for my $mail ($twoplus, $threeurls, $threeplus, $foururls, $fiveurls, $sixurls) { my @urls = grep(/\bhttp:/m,$mail); @@ -146,8 +130,9 @@ # this is ugly, but it actually demos the bug. open (my $mfh, ">", "$tmpdir/msg"); print $mfh "$mail"; - my $haverules = ( -f "../rules/25_uribl.cf" ) ; - my $sarcnt = qx/..\/spamassassin -D all < $tmpdir\/msg 2>&1 |grep -c 'uridnsbl:.*skip'/; + my $haverules = ( -f "../rules/25_uribl.cf" ); + use vars qw($sarcnt); + sarun("-D all < $tmpdir/msg 2>&1", \&sarcount); # test isn't very useful without this component, but this will at least skip the subtest when it can't be run SKIP: { skip "No rules found!\n", 1 if (! $haverules ); @@ -155,6 +140,8 @@ warn "Simple grep for http:// found $count URLs, get_uri_list found $ulcnt URLs, spamassassin script found $sarcnt\n"; } } + sub sarcount { + $sarcnt = grep(/uridnsbl:.*skip/, ); + } } -cleanup_safe_tmpdir(); diff -Nru spamassassin-3.4.6/t/urilocalbl_geoip.t spamassassin-4.0.0~rc3/t/urilocalbl_geoip.t --- spamassassin-3.4.6/t/urilocalbl_geoip.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/urilocalbl_geoip.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -#!/usr/bin/perl -T - -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -use lib '.'; use lib 't'; -use SATest; sa_t_init("urilocalbl"); - -use constant HAS_CIDR_LITE => eval { require Net::CIDR::Lite; }; -use constant HAS_GEOIP => eval { require Geo::IP; }; -use constant HAS_GEOIP_CONF => eval { Geo::IP->new(); }; - -use Test::More; - -plan skip_all => "Net::CIDR::Lite not installed" unless HAS_CIDR_LITE; -plan skip_all => "Geo::IP not installed" unless HAS_GEOIP; -plan skip_all => "Geo::IP not configured" unless HAS_GEOIP_CONF; -plan tests => 3; - -# --------------------------------------------------------------------------- - -tstpre (" -loadplugin Mail::SpamAssassin::Plugin::URILocalBL -"); - -%patterns = ( - q{ X_URIBL_USA } => 'USA', - q{ X_URIBL_NA } => 'north America', -); - -tstlocalrules (q{ - dns_available no - uri_block_cc X_URIBL_USA us - describe X_URIBL_USA uri located in USA - - uri_block_cont X_URIBL_NA na - describe X_URIBL_NA uri located in north America -}); - -ok sarun ("-t < data/spam/relayUS.eml", \&patterns_run_cb); -ok_all_patterns(); diff -Nru spamassassin-3.4.6/t/urilocalbl.t spamassassin-4.0.0~rc3/t/urilocalbl.t --- spamassassin-3.4.6/t/urilocalbl.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/urilocalbl.t 2021-04-12 07:43:12.000000000 +0000 @@ -0,0 +1,186 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("urilocalbl"); + +$tests = 0; +eval { require MaxMind::DB::Reader; $tests += 8; $has{GEOIP2} = 1 }; +eval { require Geo::IP; $tests += 8; $has{GEOIP} = 1 }; +eval { require IP::Country::DB_File; $tests += 8; $has{DB_FILE} = 1 }; +eval { require IP::Country::Fast; $tests += 8; $has{FAST} = 1 }; + +use Test::More; + +plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); +plan skip_all => "No supported GeoDB module installed" unless $tests; + +$net = conf_bool('run_net_tests'); +$ipv6 = $net && conf_bool('run_ipv6_dns_tests'); + +$tests *= 2 if $net; +$tests += 1 if $ipv6 && defined $has{GEOIP2}; +$tests += 1 if $ipv6 && defined $has{DB_FILE}; + +plan tests => $tests; + +# --------------------------------------------------------------------------- + +tstpre (" +loadplugin Mail::SpamAssassin::Plugin::URILocalBL +"); + +%patterns_ipv4 = ( + q{ X_URIBL_USA } => 'USA', + q{ X_URIBL_FINEG } => 'except Finland', + q{ X_URIBL_NA } => 'north America', + q{ X_URIBL_EUNEG } => 'except Europe', + q{ X_URIBL_CIDR1 } => 'our TestIP1', + q{ X_URIBL_CIDR2 } => 'our TestIP2', + q{ X_URIBL_CIDR3 } => 'our TestIP3', +); + +%patterns_ipv6 = ( + q{ X_URIBL_CIDR4 } => 'our TestIP4', +); + +my $rules = " + + dns_query_restriction allow google.com + + uri_block_cc X_URIBL_USA us + describe X_URIBL_USA uri located in USA + + uri_block_cc X_URIBL_FINEG !fi + describe X_URIBL_FINEG uri located anywhere except Finland + + uri_block_cont X_URIBL_NA na + describe X_URIBL_NA uri located in north America + + uri_block_cont X_URIBL_EUNEG !eu !af + describe X_URIBL_EUNEG uri located anywhere except Europe/Africa + + uri_block_cidr X_URIBL_CIDR1 8.0.0.0/8 1.2.3.4 + describe X_URIBL_CIDR1 uri is our TestIP1 + + uri_block_cidr X_URIBL_CIDR2 8.8.8.8 + describe X_URIBL_CIDR2 uri is our TestIP2 + + uri_block_cidr X_URIBL_CIDR3 8.8.8.0/24 + describe X_URIBL_CIDR3 uri is our TestIP3 +"; + +my $rules_ipv6 = " + + uri_block_cidr X_URIBL_CIDR4 2001:4860:4860::8888 + describe X_URIBL_CIDR4 uri is our TestIP4 +"; + +if (defined $has{GEOIP2}) { + my $lrules = " + geodb_module GeoIP2 + geodb_search_path data/geodb + $rules + "; + tstlocalrules ($lrules); + %patterns = %patterns_ipv4; + ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); + + if ($net) { + $lrules .= $rules_ipv6 if $ipv6; + tstlocalrules ($lrules); + if ($ipv6) { + %patterns = (%patterns_ipv4, %patterns_ipv6); + } else { + %patterns = %patterns_ipv4; + warn "skipping IPv6 DNS lookup tests (run_ipv6_dns_tests=n)\n"; + } + ok sarun ("-t < data/spam/urilocalbl_net.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); + } else { + warn "skipping DNS lookup tests (run_net_tests=n)\n"; + } +} else { + warn "skipping MaxMind::DB::Reader (GeoIP2) tests (not installed)\n"; +} + + +if (defined $has{GEOIP}) { + tstlocalrules (" + geodb_module Geo::IP + geodb_search_path data/geodb + $rules + "); + %patterns = %patterns_ipv4; + ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); + + if ($net) { + ok sarun ("-t < data/spam/urilocalbl_net.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); + } else { + warn "skipping DNS lookup tests (run_net_tests=n)\n"; + } +} else { + warn "skipping Geo::IP tests (not installed)\n"; +} + + +if (defined $has{DB_FILE}) { + my $lrules = " + geodb_module DB_File + geodb_options country:data/geodb/ipcc.db + $rules + "; + tstlocalrules ($lrules); + %patterns = %patterns_ipv4; + ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); + + if ($net) { + $lrules .= $rules_ipv6 if $ipv6; + tstlocalrules ($lrules); + if ($ipv6) { + %patterns = (%patterns_ipv4, %patterns_ipv6); + } else { + %patterns = %patterns_ipv4; + warn "skipping IPv6 DNS lookup tests (run_ipv6_dns_tests=n)\n"; + } + ok sarun ("-t < data/spam/urilocalbl_net.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); + } else { + warn "skipping DNS lookup tests (run_net_tests=n)\n"; + } +} else { + warn "skipping IP::Country::DB_File tests (not installed)\n"; +} + + +if (defined $has{FAST}) { + tstlocalrules (" + geodb_module Fast + $rules + "); + %patterns = %patterns_ipv4; + ok sarun ("-L -t < data/spam/relayUS.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); + + if ($net) { + ok sarun ("-t < data/spam/urilocalbl_net.eml", \&patterns_run_cb); + ok_all_patterns(); + clear_pattern_counters(); + } else { + warn "skipping DNS lookup tests (run_net_tests=n)\n"; + } +} else { + warn "skipping IP::Country::Fast tests (not installed)\n"; +} + + diff -Nru spamassassin-3.4.6/t/uri_saferedirect.t spamassassin-4.0.0~rc3/t/uri_saferedirect.t --- spamassassin-3.4.6/t/uri_saferedirect.t 2020-09-21 18:43:37.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/uri_saferedirect.t 2021-04-12 07:43:12.000000000 +0000 @@ -2,21 +2,6 @@ # test URI redirecton patterns -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; use lib '.'; use lib 't'; use SATest; sa_t_init("uri_html"); diff -Nru spamassassin-3.4.6/t/uri.t spamassassin-4.0.0~rc3/t/uri.t --- spamassassin-3.4.6/t/uri.t 2019-10-02 10:25:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/uri.t 2022-04-23 17:17:49.000000000 +0000 @@ -1,38 +1,29 @@ #!/usr/bin/perl -w -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; -use Test::More tests => 102; +use Test::More; use lib '.'; use lib 't'; use SATest; sa_t_init("uri"); +use constant HAS_LIBIDN => eval { require Net::LibIDN; }; +use constant HAS_LIBIDN2 => eval { require Net::LibIDN2; }; + +my $tests = 104; +$tests += 7 if (HAS_LIBIDN); +$tests += 7 if (HAS_LIBIDN2); + +plan tests => $tests; + use Mail::SpamAssassin; use Mail::SpamAssassin::HTML; use Mail::SpamAssassin::Util; ############################################## - -tstlocalrules (' - +tstlocalrules (" util_rb_2tld live.com util_rb_3tld three.3ldlive.com - -'); +"); # initialize SpamAssassin my $sa = create_saobj({'dont_copy_prefs' => 1, @@ -116,6 +107,33 @@ ok(try_domains('bar..example.com', undef)); ok(try_domains('http://example..com', undef)); +sub try_libidn { + ok(try_domains("Cin\x{E9}ma.ca", 'xn--cinma-dsa.ca')); + ok(try_domains("marcaespa\x{F1}a.es", 'xn--marcaespaa-19a.es')); + ok(try_domains("\x{E4}k\x{E4}slompolo.fi", 'xn--kslompolo-u2ab.fi')); + ok(try_domains("\N{U+00E4}k\N{U+00E4}slompolo.fi", 'xn--kslompolo-u2ab.fi')); + ok(try_domains("\x{C3}\x{A4}k\x{C3}\x{A4}slompolo.fi", 'xn--kslompolo-u2ab.fi')); + ok(try_domains("foo.xn--fiqs8s", 'foo.xn--fiqs8s')); + ok(try_domains("foo\x2e\xe9\xa6\x99\xe6\xb8\xaf", 'foo.xn--j6w193g')); +} + +if (HAS_LIBIDN) { + $Mail::SpamAssassin::Util::have_libidn = 1; + $Mail::SpamAssassin::Util::have_libidn2 = 0; + try_libidn(); +} +if (HAS_LIBIDN2) { + $Mail::SpamAssassin::Util::have_libidn = 0; + $Mail::SpamAssassin::Util::have_libidn2 = 1; + try_libidn(); +} + +# Without LibIDN, should not produce results, +# as is_fqdn_valid() will fail +$Mail::SpamAssassin::Util::have_libidn = 0; +$Mail::SpamAssassin::Util::have_libidn2 = 0; +ok(try_domains("Cin\x{E9}ma.ca", undef)); + ############################################## sub array_cmp { @@ -130,7 +148,7 @@ sub try_canon { my($input, $expect) = @_; my $redirs = $sa->{conf}->{redirector_patterns}; - my @input = sort { $a cmp $b } Mail::SpamAssassin::Util::uri_list_canonify($redirs, @{$input}); + my @input = sort { $a cmp $b } Mail::SpamAssassin::Util::uri_list_canonicalize($redirs, $input, $sa->{registryboundaries}); my @expect = sort { $a cmp $b } @{$expect}; # output what we want/get for debugging @@ -284,6 +302,12 @@ 'http://foo/', 'http://www.foo.com/', ])); +# Bug 7891 +ok (try_canon([ + 'http://www.ch/', + ], [ + 'http://www.ch/' + ])); ############################################## diff -Nru spamassassin-3.4.6/t/uri_text.t spamassassin-4.0.0~rc3/t/uri_text.t --- spamassassin-3.4.6/t/uri_text.t 2019-08-14 09:37:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/uri_text.t 2021-04-12 07:43:12.000000000 +0000 @@ -2,21 +2,6 @@ # test URIs as grabbed from text/plain messages -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use strict; use lib '.'; use lib 't'; use SATest; sa_t_init("uri_text"); @@ -27,8 +12,8 @@ # initialize SpamAssassin my $sa = create_saobj({ require_rules => 0, - site_rules_filename => "$prefix/t/log/localrules.tmp", - rules_filename => "$prefix/rules", + site_rules_filename => $siterules, + rules_filename => $localrules, local_tests_only => 1, dont_copy_prefs => 1, }); diff -Nru spamassassin-3.4.6/t/utf8.t spamassassin-4.0.0~rc3/t/utf8.t --- spamassassin-3.4.6/t/utf8.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/utf8.t 2022-03-09 14:15:20.000000000 +0000 @@ -1,18 +1,55 @@ #!/usr/bin/perl -T +### +### UTF-8 CONTENT, edit with UTF-8 locale/editor +### + use lib '.'; use lib 't'; use SATest; sa_t_init("utf8"); -use Test::More tests => 4; +use Test::More tests => 14; # --------------------------------------------------------------------------- %patterns = ( + q{ X-Spam-Status: Yes, score=}, 'status', + q{ X-Spam-Flag: YES}, 'flag', + q{ X-Spam-Level: ****}, 'stars', +); +%anti_patterns = (); + +ok (sarun ("-L -t < data/spam/009", \&patterns_run_cb)); +ok_all_patterns(); + +# --------------------------------------------------------------------------- -q{ X-Spam-Status: Yes, score=}, 'status', -q{ X-Spam-Flag: YES}, 'flag', -q{ X-Spam-Level: ****}, 'stars', +my $rules = ' + body FOO1 /金融機/ + body FOO2 /金融(?:xyz|機)/ + body FOO3 /\xe9\x87\x91\xe8\x9e\x8d\xe6\xa9\x9f/ + body FOO4 /.\x87(?:\x91|\x00)[\xe8\x00]\x9e\x8d\xe6\xa9\x9f/ +'; +%patterns = ( + q{ 1.0 FOO1 }, '', + q{ 1.0 FOO2 }, '', + q{ 1.0 FOO3 }, '', + q{ 1.0 FOO4 }, '', ); +%anti_patterns = (); -ok (sarun ("-L -t < data/spam/009", \&patterns_run_cb)); +# normalize_charset 1 +tstprefs(" + $rules + normalize_charset 1 +"); +ok (sarun ("-L -t < data/spam/unicode1", \&patterns_run_cb)); ok_all_patterns(); + +# normalize_charset 0 +tstprefs(" + $rules + normalize_charset 0 +"); +ok (sarun ("-L -t < data/spam/unicode1", \&patterns_run_cb)); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/util_wrap.t spamassassin-4.0.0~rc3/t/util_wrap.t --- spamassassin-3.4.6/t/util_wrap.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/util_wrap.t 2021-04-12 07:43:12.000000000 +0000 @@ -1,21 +1,5 @@ #!/usr/bin/perl -T -BEGIN { - if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ... - chdir 't'; - } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -my $prefix = '.'; -if (-e 'test_dir') { # running from test directory, not .. - $prefix = '..'; -} - use lib '.'; use lib 't'; use SATest; sa_t_init("util_wrap"); use Test::More tests => 5; diff -Nru spamassassin-3.4.6/t/welcomelist_addrs.t spamassassin-4.0.0~rc3/t/welcomelist_addrs.t --- spamassassin-3.4.6/t/welcomelist_addrs.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/welcomelist_addrs.t 2022-05-04 11:06:22.000000000 +0000 @@ -0,0 +1,244 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("welcomelist_addrs"); +use IO::File; + +use constant HAS_DB_FILE => eval { require DB_File }; + +use Test::More; +plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests'); +plan skip_all => 'Need DB_File for this test' unless HAS_DB_FILE; +plan tests => 35; + +# --------------------------------------------------------------------------- + +tstprefs (" + header AWL eval:check_from_in_auto_welcomelist() + tflags AWL userconf noautolearn + priority AWL 1000 +"); + +%added_address_welcomelist_patterns = ( + q{SpamAssassin auto-welcomelist: adding address to welcomelist:}, 'added address to welcomelist', +); +%added_address_blocklist_patterns = ( + q{SpamAssassin auto-welcomelist: adding address to blocklist:}, 'added address to blocklist', +); +%removed_address_patterns = ( + q{SpamAssassin auto-welcomelist: removing address:}, 'removed address', +); +%is_nonspam_patterns = ( + q{X-Spam-Status: No}, 'spamno', +); +%is_spam_patterns = ( + q{X-Spam-Status: Yes}, 'spamyes', +); + + +%patterns = %added_address_welcomelist_patterns; +ok(sarun ("--add-addr-to-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = %is_nonspam_patterns; +ok (sarun ("-L < data/nice/002", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = %is_nonspam_patterns; +sarun ("-L < data/spam/004", \&patterns_run_cb); +ok_all_patterns(); + +%patterns = %removed_address_patterns; +ok(sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = %is_spam_patterns; +sarun ("-L < data/spam/004", \&patterns_run_cb); +ok_all_patterns(); + +%patterns = %added_address_blocklist_patterns; +ok(sarun ("--add-addr-to-blocklist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = %is_spam_patterns; +sarun ("-L < data/nice/002", \&patterns_run_cb); +ok_all_patterns(); + +ok(sarun ("--remove-addr-from-welcomelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb)); + + +# The following section tests the object oriented interface to adding/removing welcomelist +# and blocklist entries. Primarily this is testing basic functionality and that the +# "print" commands that are present in the command line interface are not being printed +# when you call the methods directly. This is why we are manipulating STDOUT. + +open my $oldout, ">&STDOUT" || die "Cannot dup STDOUT"; + +my $fh = IO::File->new_tmpfile(); +ok($fh); +open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT"; +select STDOUT; $| = 1; + +my $sa = create_saobj(); + +$sa->init(); + +$sa->add_address_to_welcomelist("whitelist_test\@whitelist.spamassassin.taint.org"); + +seek($fh, 0, 0); + +my $error = do { + local $/; + <$fh>; +}; +$fh->close(); +open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!"; +select STDOUT; $| = 1; + +#warn "# $error\n"; +ok($error !~ /SpamAssassin auto-welcomelist: /); + +%patterns = %is_nonspam_patterns; +ok (sarun ("-L < data/nice/002", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = %is_nonspam_patterns; +sarun ("-L < data/spam/004", \&patterns_run_cb); +ok_all_patterns(); + +$fh = IO::File->new_tmpfile(); +ok($fh); +open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT"; +select STDOUT; $| = 1; + +$sa->remove_address_from_welcomelist("whitelist_test\@whitelist.spamassassin.taint.org"); + +seek($fh, 0, 0); + +$error = do { + local $/; + <$fh>; +}; +$fh->close(); +open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!"; +select STDOUT; $| = 1; + +#warn "# $error\n"; +ok($error !~ /SpamAssassin auto-welcomelist: /); + +%patterns = %is_spam_patterns; +sarun ("-L < data/spam/004", \&patterns_run_cb); +ok_all_patterns(); + +$fh = IO::File->new_tmpfile(); +ok($fh); +open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT"; +select STDOUT; $| = 1; + +$sa->add_address_to_blocklist("whitelist_test\@whitelist.spamassassin.taint.org"); + +seek($fh, 0, 0); + +$error = do { + local $/; + <$fh>; +}; +$fh->close(); +open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!"; +select STDOUT; $| = 1; + +#warn "# $error\n"; +ok($error !~ /SpamAssassin auto-welcomelist: /); + +%patterns = %is_spam_patterns; +sarun ("-L < data/nice/002", \&patterns_run_cb); +ok_all_patterns(); + +$sa->remove_address_from_welcomelist("whitelist_test\@whitelist.spamassassin.taint.org"); + +# Now we can test the "all" methods + +open(MAIL,"< data/nice/002"); + +my $raw_message = do { + local $/; + ; +}; + +close(MAIL); +ok($raw_message); + +my $mail = $sa->parse( $raw_message ); + +$fh = IO::File->new_tmpfile(); +ok($fh); +open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT"; +select STDOUT; $| = 1; + +$sa->add_all_addresses_to_welcomelist($mail); + +seek($fh, 0, 0); + +$error = do { + local $/; + <$fh>; +}; +$fh->close(); +open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!"; +select STDOUT; $| = 1; + +#warn "# $error\n"; +ok($error !~ /SpamAssassin auto-welcomelist: /); + +%patterns = %is_nonspam_patterns; +ok (sarun ("-L < data/nice/002", \&patterns_run_cb)); +ok_all_patterns(); +%patterns = %is_nonspam_patterns; +sarun ("-L < data/spam/004", \&patterns_run_cb); +ok_all_patterns(); + +$fh = IO::File->new_tmpfile(); +ok($fh); +open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT"; +select STDOUT; $| = 1; + +$sa->remove_all_addresses_from_welcomelist($mail); + +seek($fh, 0, 0); + +$error = do { + local $/; + <$fh>; +}; +$fh->close(); +open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!"; +select STDOUT; $| = 1; + +#warn "# $error\n"; +ok($error !~ /SpamAssassin auto-welcomelist: /); + +%patterns = %is_spam_patterns; +sarun ("-L < data/spam/004", \&patterns_run_cb); +ok_all_patterns(); + +$fh = IO::File->new_tmpfile(); +ok($fh); +open(STDOUT, ">&=".fileno($fh)) || die "Cannot reopen STDOUT"; +select STDOUT; $| = 1; + +$sa->add_all_addresses_to_blocklist($mail); + +seek($fh, 0, 0); + +$error = do { + local $/; + <$fh>; +}; +$fh->close(); +open STDOUT, ">&".fileno($oldout) || die "Cannot dupe \$oldout: $!"; +select STDOUT; $| = 1; + +#warn "# $error\n"; +ok($error !~ /SpamAssassin auto-welcomelist: /); + +%patterns = %is_spam_patterns; +sarun ("-L < data/nice/002", \&patterns_run_cb); +ok_all_patterns(); + +$sa->remove_all_addresses_from_welcomelist($mail); + diff -Nru spamassassin-3.4.6/t/welcomelist_from.t spamassassin-4.0.0~rc3/t/welcomelist_from.t --- spamassassin-3.4.6/t/welcomelist_from.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/welcomelist_from.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,91 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("welcomelist_from"); + +use Test::More; +plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests'); +plan tests => 32; + +# --------------------------------------------------------------------------- + +tstprefs (" + header USER_IN_WELCOMELIST eval:check_from_in_welcomelist() + tflags USER_IN_WELCOMELIST userconf nice noautolearn + score USER_IN_WELCOMELIST -100 + header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist() + tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn + score USER_IN_DEF_WELCOMELIST -15 + def_welcomelist_from_rcvd *\@paypal.com paypal.com + def_welcomelist_from_rcvd *\@paypal.com ebay.com + def_welcomelist_from_rcvd mumble\@example.com example.com + welcomelist_from_rcvd foo\@example.com spamassassin.org + welcomelist_from_rcvd foo\@example.com example.com + welcomelist_from_rcvd bar\@example.com example.com + welcomelist_allows_relays bar\@example.com + welcomelist_from baz\@example.com + welcomelist_from bam\@example.com + unwelcomelist_from bam\@example.com + unwelcomelist_from_rcvd mumble\@example.com +"); + +# tests 1 - 4 does welcomelist_from work? +%patterns = ( + q{ -100 USER_IN_WELCOMELIST }, '', +); + +%anti_patterns = ( + q{ FORGED_IN_WELCOMELIST }, '', + q{ USER_IN_DEF_WELCOMELIST }, '', + q{ FORGED_IN_DEF_WELCOMELIST }, '', +); +sarun ("-L -t < data/nice/008", \&patterns_run_cb); +ok_all_patterns(); + +# tests 5 - 8 does welcomelist_from_rcvd work? +sarun ("-L -t < data/nice/009", \&patterns_run_cb); +ok_all_patterns(); + +# tests 9 - 12 second relay specified for same addr in welcomelist_from_rcvd +sarun ("-L -t < data/nice/010", \&patterns_run_cb); +ok_all_patterns(); + +%patterns = ( + q{ -15 USER_IN_DEF_WELCOMELIST }, '', +); + +%anti_patterns = ( + q{ USER_IN_WELCOMELIST }, '', + q{ FORGED_IN_WELCOMELIST }, '', + q{ FORGED_IN_DEF_WELCOMELIST }, '', +); + +# tests 13 - 16 does def_welcomelist_from_rcvd work? +sarun ("-L -t < data/nice/011", \&patterns_run_cb); +ok_all_patterns(); + +# tests 17 - 20 second relay specified for same addr in def_welcomelist_from_rcvd +sarun ("-L -t < data/nice/012", \&patterns_run_cb); +ok_all_patterns(); + +%patterns = (); + +%anti_patterns = ( + q{ USER_IN_WELCOMELIST }, '', + q{ FORGED_IN_WELCOMELIST }, '', + q{ USER_IN_DEF_WELCOMELIST }, '', + q{ FORGED_IN_DEF_WELCOMELIST }, '', +); +# tests 21 - 24 does welcomelist_allows_relays suppress the forged rule without +# putting the address on the welcomelist? +sarun ("-L -t < data/nice/013", \&patterns_run_cb); +ok_all_patterns(); + +# tests 25 - 28 does unwelcomelist_from work? +sarun ("-L -t < data/nice/014", \&patterns_run_cb); +ok_all_patterns(); + +# tests 29 - 32 does unwelcomelist_from_rcvd work? +sarun ("-L -t < data/nice/015", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/welcomelist_subject.t spamassassin-4.0.0~rc3/t/welcomelist_subject.t --- spamassassin-3.4.6/t/welcomelist_subject.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/welcomelist_subject.t 2022-05-04 11:06:22.000000000 +0000 @@ -0,0 +1,45 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("welcomelist_subject"); +use Test::More tests => 4; + +# --------------------------------------------------------------------------- + +%is_welcomelist_patterns = ( + q{ SUBJECT_IN_WELCOMELIST }, 'welcomelist-subject' +); + +%is_blocklist_patterns = ( + q{ SUBJECT_IN_BLOCKLIST }, 'blocklist-subject' +); + +tstprefs (" + loadplugin Mail::SpamAssassin::Plugin::WelcomeListSubject + header SUBJECT_IN_WELCOMELIST eval:check_subject_in_welcomelist() + tflags SUBJECT_IN_WELCOMELIST userconf nice noautolearn + score SUBJECT_IN_WELCOMELIST -100 + header SUBJECT_IN_BLOCKLIST eval:check_subject_in_blocklist() + tflags SUBJECT_IN_BLOCKLIST userconf noautolearn + score SUBJECT_IN_BLOCKLIST 100 + + # Check that rename backwards compatibility works with if's + ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject + if plugin(Mail::SpamAssassin::Plugin::WelcomeListSubject) + welcomelist_subject [HC Anno*] + blocklist_subject whitelist test + endif + endif +"); + +%patterns = %is_welcomelist_patterns; + +ok(sarun ("-L -t < data/nice/016", \&patterns_run_cb)); +ok_all_patterns(); + +%patterns = %is_blocklist_patterns; + +# force us to blocklist a nice msg +ok(sarun ("-L -t < data/nice/015", \&patterns_run_cb)); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/welcomelist_to.t spamassassin-4.0.0~rc3/t/welcomelist_to.t --- spamassassin-3.4.6/t/welcomelist_to.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/welcomelist_to.t 2022-05-04 11:06:22.000000000 +0000 @@ -0,0 +1,22 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("welcomelist_to"); +use Test::More tests => 1; + +# --------------------------------------------------------------------------- + +%patterns = ( + q{ USER_IN_WELCOMELIST_TO }, 'hit-wl', +); + +tstprefs (" + header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist() + tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn + score USER_IN_WELCOMELIST_TO -6 + welcomelist_to announce* +"); + +sarun ("-L -t < data/nice/016", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/whitelist_addrs.t spamassassin-4.0.0~rc3/t/whitelist_addrs.t --- spamassassin-3.4.6/t/whitelist_addrs.t 2019-11-11 04:09:44.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/whitelist_addrs.t 2022-05-04 11:06:22.000000000 +0000 @@ -6,16 +6,6 @@ use constant HAS_DB_FILE => eval { require DB_File }; -BEGIN { - if (-e 't/test_dir') { - chdir 't'; - } - - if (-e 'test_dir') { - unshift(@INC, '../blib/lib'); - } -} - use Test::More; plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests'); plan skip_all => 'Need DB_File for this test' unless HAS_DB_FILE; @@ -23,20 +13,26 @@ # --------------------------------------------------------------------------- +tstprefs (" + header AWL eval:check_from_in_auto_welcomelist() + tflags AWL userconf noautolearn + priority AWL 1000 +"); + %added_address_whitelist_patterns = ( -q{SpamAssassin auto-whitelist: adding address to whitelist:}, 'added address to whitelist', + q{SpamAssassin auto-welcomelist: adding address to welcomelist:}, 'added address to welcomelist', ); %added_address_blacklist_patterns = ( -q{SpamAssassin auto-whitelist: adding address to blacklist:}, 'added address to blacklist', + q{SpamAssassin auto-welcomelist: adding address to blocklist:}, 'added address to blocklist', ); %removed_address_patterns = ( -q{SpamAssassin auto-whitelist: removing address:}, 'removed address', + q{SpamAssassin auto-welcomelist: removing address:}, 'removed address', ); %is_nonspam_patterns = ( -q{X-Spam-Status: No}, 'spamno', + q{X-Spam-Status: No}, 'spamno', ); %is_spam_patterns = ( -q{X-Spam-Status: Yes}, 'spamyes', + q{X-Spam-Status: Yes}, 'spamyes', ); @@ -96,7 +92,7 @@ select STDOUT; $| = 1; #warn "# $error\n"; -ok($error !~ /SpamAssassin auto-whitelist: /); +ok($error !~ /SpamAssassin auto-welcomelist: /); %patterns = %is_nonspam_patterns; ok (sarun ("-L < data/nice/002", \&patterns_run_cb)); @@ -123,7 +119,7 @@ select STDOUT; $| = 1; #warn "# $error\n"; -ok($error !~ /SpamAssassin auto-whitelist: /); +ok($error !~ /SpamAssassin auto-welcomelist: /); %patterns = %is_spam_patterns; sarun ("-L < data/spam/004", \&patterns_run_cb); @@ -147,7 +143,7 @@ select STDOUT; $| = 1; #warn "# $error\n"; -ok($error !~ /SpamAssassin auto-whitelist: /); +ok($error !~ /SpamAssassin auto-welcomelist: /); %patterns = %is_spam_patterns; sarun ("-L < data/nice/002", \&patterns_run_cb); @@ -187,7 +183,7 @@ select STDOUT; $| = 1; #warn "# $error\n"; -ok($error !~ /SpamAssassin auto-whitelist: /); +ok($error !~ /SpamAssassin auto-welcomelist: /); %patterns = %is_nonspam_patterns; ok (sarun ("-L < data/nice/002", \&patterns_run_cb)); @@ -214,7 +210,7 @@ select STDOUT; $| = 1; #warn "# $error\n"; -ok($error !~ /SpamAssassin auto-whitelist: /); +ok($error !~ /SpamAssassin auto-welcomelist: /); %patterns = %is_spam_patterns; sarun ("-L < data/spam/004", \&patterns_run_cb); @@ -238,10 +234,11 @@ select STDOUT; $| = 1; #warn "# $error\n"; -ok($error !~ /SpamAssassin auto-whitelist: /); +ok($error !~ /SpamAssassin auto-welcomelist: /); %patterns = %is_spam_patterns; sarun ("-L < data/nice/002", \&patterns_run_cb); ok_all_patterns(); $sa->remove_all_addresses_from_whitelist($mail); + diff -Nru spamassassin-3.4.6/t/whitelist_from.t spamassassin-4.0.0~rc3/t/whitelist_from.t --- spamassassin-3.4.6/t/whitelist_from.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/whitelist_from.t 2022-05-28 10:38:25.000000000 +0000 @@ -9,30 +9,44 @@ # --------------------------------------------------------------------------- +disable_compat "welcomelist_blocklist"; + tstprefs (" - def_whitelist_from_rcvd *\@paypal.com paypal.com - def_whitelist_from_rcvd *\@paypal.com ebay.com - def_whitelist_from_rcvd mumble\@example.com example.com - whitelist_from_rcvd foo\@example.com spamassassin.org - whitelist_from_rcvd foo\@example.com example.com - whitelist_from_rcvd bar\@example.com example.com - whitelist_allows_relays bar\@example.com - whitelist_from baz\@example.com - whitelist_from bam\@example.com - unwhitelist_from bam\@example.com - unwhitelist_from_rcvd mumble\@example.com - "); + header USER_IN_WELCOMELIST eval:check_from_in_welcomelist() + tflags USER_IN_WELCOMELIST userconf nice noautolearn + header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist() + tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn + meta USER_IN_WHITELIST (USER_IN_WELCOMELIST) + tflags USER_IN_WHITELIST userconf nice noautolearn + score USER_IN_WHITELIST -100 + score USER_IN_WELCOMELIST -0.01 + meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST) + tflags USER_IN_DEF_WHITELIST userconf nice noautolearn + score USER_IN_DEF_WHITELIST -15 + score USER_IN_DEF_WELCOMELIST -0.01 + def_whitelist_from_rcvd *\@paypal.com paypal.com + def_whitelist_from_rcvd *\@paypal.com ebay.com + def_whitelist_from_rcvd mumble\@example.com example.com + whitelist_from_rcvd foo\@example.com spamassassin.org + whitelist_from_rcvd foo\@example.com example.com + whitelist_from_rcvd bar\@example.com example.com + whitelist_allows_relays bar\@example.com + whitelist_from baz\@example.com + whitelist_from bam\@example.com + unwhitelist_from bam\@example.com + unwhitelist_from_rcvd mumble\@example.com +"); # tests 1 - 4 does whitelist_from work? %patterns = ( - q{ USER_IN_WHITELIST }, 'w1' - ); + q{ -100 USER_IN_WHITELIST }, '', +); %anti_patterns = ( - q{ FORGED_IN_WHITELIST }, 'a2', - q{ USER_IN_DEF_WHITELIST }, 'a3', - q{ FORGED_IN_DEF_WHITELIST }, 'a4' - ); + q{ FORGED_IN_WHITELIST }, '', + q{ USER_IN_DEF_WHITELIST }, '', + q{ FORGED_IN_DEF_WHITELIST }, '', +); sarun ("-L -t < data/nice/008", \&patterns_run_cb); ok_all_patterns(); @@ -45,14 +59,14 @@ ok_all_patterns(); %patterns = ( - q{ USER_IN_DEF_WHITELIST }, 'w5' - ); + q{ -15 USER_IN_DEF_WHITELIST }, '', +); %anti_patterns = ( - q{ USER_IN_WHITELIST }, 'a6', - q{ FORGED_IN_WHITELIST }, 'a7', - q{ FORGED_IN_DEF_WHITELIST }, 'a8' - ); + q{ USER_IN_WHITELIST }, '', + q{ FORGED_IN_WHITELIST }, '', + q{ FORGED_IN_DEF_WHITELIST }, '', +); # tests 13 - 16 does def_whitelist_from_rcvd work? sarun ("-L -t < data/nice/011", \&patterns_run_cb); @@ -65,11 +79,11 @@ %patterns = (); %anti_patterns = ( - q{ USER_IN_WHITELIST }, 'a9', - q{ FORGED_IN_WHITELIST }, 'a10', - q{ USER_IN_DEF_WHITELIST }, 'a11', - q{ FORGED_IN_DEF_WHITELIST }, 'a12' - ); + q{ USER_IN_WHITELIST }, '', + q{ FORGED_IN_WHITELIST }, '', + q{ USER_IN_DEF_WHITELIST }, '', + q{ FORGED_IN_DEF_WHITELIST }, '', +); # tests 21 - 24 does whitelist_allows_relays suppress the forged rule without # putting the address on the whitelist? sarun ("-L -t < data/nice/013", \&patterns_run_cb); diff -Nru spamassassin-3.4.6/t/whitelist_subject.t spamassassin-4.0.0~rc3/t/whitelist_subject.t --- spamassassin-3.4.6/t/whitelist_subject.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/whitelist_subject.t 2022-05-04 11:06:22.000000000 +0000 @@ -6,25 +6,48 @@ # --------------------------------------------------------------------------- +disable_compat "welcomelist_blocklist"; + %is_whitelist_patterns = ( -q{ SUBJECT_IN_WHITELIST }, 'whitelist-subject' + q{ SUBJECT_IN_WHITELIST }, 'whitelist-subject' ); %is_blacklist_patterns = ( -q{ SUBJECT_IN_BLACKLIST }, 'blacklist-subject' + q{ SUBJECT_IN_BLACKLIST }, 'blacklist-subject' ); -tstpre(" -loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject -"); - tstprefs (" -use_bayes 0 -use_auto_whitelist 0 -$default_cf_lines -whitelist_subject [HC Anno*] -blacklist_subject whitelist test - "); + loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject + header SUBJECT_IN_WELCOMELIST eval:check_subject_in_welcomelist() + tflags SUBJECT_IN_WELCOMELIST userconf nice noautolearn + score SUBJECT_IN_WELCOMELIST -100 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta SUBJECT_IN_WHITELIST (SUBJECT_IN_WELCOMELIST) + tflags SUBJECT_IN_WHITELIST userconf nice noautolearn + score SUBJECT_IN_WHITELIST -100 + score SUBJECT_IN_WELCOMELIST -0.01 + endif + + header SUBJECT_IN_BLOCKLIST eval:check_subject_in_blocklist() + tflags SUBJECT_IN_BLOCKLIST userconf noautolearn + score SUBJECT_IN_BLOCKLIST 100 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta SUBJECT_IN_BLACKLIST (SUBJECT_IN_BLOCKLIST) + tflags SUBJECT_IN_BLACKLIST userconf noautolearn + score SUBJECT_IN_BLACKLIST 100 + score SUBJECT_IN_BLOCKLIST 0.01 + endif + + # Check that rename backwards compatibility works with if's + ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject + if plugin(Mail::SpamAssassin::Plugin::WelcomeListSubject) + whitelist_subject [HC Anno*] + blacklist_subject whitelist test + endif + endif +"); %patterns = %is_whitelist_patterns; @@ -36,3 +59,4 @@ # force us to blacklist a nice msg ok(sarun ("-L -t < data/nice/015", \&patterns_run_cb)); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/whitelist_to.t spamassassin-4.0.0~rc3/t/whitelist_to.t --- spamassassin-3.4.6/t/whitelist_to.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/whitelist_to.t 2022-05-04 11:06:22.000000000 +0000 @@ -7,15 +7,16 @@ # --------------------------------------------------------------------------- %patterns = ( - - q{ USER_IN_WHITELIST_TO }, 'hit-wl', - + q{ USER_IN_WELCOMELIST_TO }, 'hit-wl', ); tstprefs (" - $default_cf_lines - whitelist_to announce* - "); + header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist() + tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn + score USER_IN_WELCOMELIST_TO -6 + whitelist_to announce* +"); sarun ("-L -t < data/nice/016", \&patterns_run_cb); ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/wlbl_uri.t spamassassin-4.0.0~rc3/t/wlbl_uri.t --- spamassassin-3.4.6/t/wlbl_uri.t 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/wlbl_uri.t 2022-05-28 10:38:25.000000000 +0000 @@ -0,0 +1,109 @@ +#!/usr/bin/perl -T + +use lib '.'; use lib 't'; +use SATest; sa_t_init("wlbl_uri"); +use Test::More tests => 12; + +# copied from 60_welcome.cf +# should do the right thing with the different disable/enable compat settings +my $myrules = <<'END'; + if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist) + body URI_HOST_IN_BLOCKLIST eval:check_uri_host_in_blocklist() + tflags URI_HOST_IN_BLOCKLIST userconf noautolearn + score URI_HOST_IN_BLOCKLIST 100 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta URI_HOST_IN_BLACKLIST (URI_HOST_IN_BLOCKLIST) + tflags URI_HOST_IN_BLACKLIST userconf noautolearn + score URI_HOST_IN_BLACKLIST 100 + score URI_HOST_IN_BLOCKLIST 0.01 + endif + endif + if !can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist) + if (version >= 3.004000) + body URI_HOST_IN_BLOCKLIST eval:check_uri_host_in_blacklist() + tflags URI_HOST_IN_BLOCKLIST userconf noautolearn + score URI_HOST_IN_BLOCKLIST 0.01 + + meta URI_HOST_IN_BLACKLIST (URI_HOST_IN_BLOCKLIST) + tflags URI_HOST_IN_BLACKLIST userconf noautolearn + score URI_HOST_IN_BLACKLIST 100 + endif + endif + + if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist) + body URI_HOST_IN_WELCOMELIST eval:check_uri_host_in_welcomelist() + tflags URI_HOST_IN_WELCOMELIST userconf nice noautolearn + score URI_HOST_IN_WELCOMELIST -100 + + if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist) + meta URI_HOST_IN_WHITELIST (URI_HOST_IN_WELCOMELIST) + tflags URI_HOST_IN_WHITELIST userconf nice noautolearn + score URI_HOST_IN_WHITELIST -100 + score URI_HOST_IN_WELCOMELIST -0.01 + endif + endif + if !can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist) + if (version >= 3.004000) + body URI_HOST_IN_WELCOMELIST eval:check_uri_host_in_whitelist() + tflags URI_HOST_IN_WELCOMELIST userconf nice noautolearn + score URI_HOST_IN_WELCOMELIST -0.01 + + meta URI_HOST_IN_WHITELIST (URI_HOST_IN_WELCOMELIST) + tflags URI_HOST_IN_WHITELIST userconf nice noautolearn + score URI_HOST_IN_WHITELIST -100 + endif + endif +END + +disable_compat "welcomelist_blocklist"; + +%patterns = ( + q{ 0.0 URI_HOST_IN_BLOCKLIST }, '', + q{ 100 URI_HOST_IN_BLACKLIST }, '', + q{ -0.0 URI_HOST_IN_WELCOMELIST }, '', + q{ -100 URI_HOST_IN_WHITELIST }, '', +); + +### + +tstprefs($myrules . " + blocklist_uri_host ximian.com + welcomelist_uri_host helixcode.com +"); + +sarun ("-L -t < data/nice/001", \&patterns_run_cb); +ok_all_patterns(); + +### + +tstprefs($myrules . " + blacklist_uri_host ximian.com + whitelist_uri_host helixcode.com +"); + +sarun ("-L -t < data/nice/001", \&patterns_run_cb); +ok_all_patterns(); + +### + +%patterns = ( + q{ 100 URI_HOST_IN_BLOCKLIST }, '', + q{ -100 URI_HOST_IN_WELCOMELIST }, '', +); +%anti_patterns = ( + q{ URI_HOST_IN_BLACKLIST }, '', + q{ URI_HOST_IN_WHITELIST }, '', +); + +tstpre(" + enable_compat welcomelist_blocklist +"); +tstprefs($myrules . " + blocklist_uri_host ximian.com + welcomelist_uri_host helixcode.com +"); + +sarun ("-L -t < data/nice/001", \&patterns_run_cb); +ok_all_patterns(); + diff -Nru spamassassin-3.4.6/t/zz_cleanup.t spamassassin-4.0.0~rc3/t/zz_cleanup.t --- spamassassin-3.4.6/t/zz_cleanup.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/t/zz_cleanup.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -#!/usr/bin/perl -T - -use lib '.'; use lib 't'; -use SATest; sa_t_init("zz_cleanup"); -use Test::More tests => 1; - -use File::Path; - -# jm: off! we want to keep the logs around in case something failed, -# so we can see what it was. esp. important in case of intermittent -# failures. -# rmtree ("log"); - -ok (1); diff -Nru spamassassin-3.4.6/textcat/languages_to_lm.pl spamassassin-4.0.0~rc3/textcat/languages_to_lm.pl --- spamassassin-3.4.6/textcat/languages_to_lm.pl 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/textcat/languages_to_lm.pl 2022-04-04 10:37:27.000000000 +0000 @@ -0,0 +1,71 @@ +#!/usr/bin/perl + +# <@LICENSE> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Usage: languages_to_lm.pl +# +# Unpacks contents of SA "languages" file as .lm files into +# + +die "Outdir not given" unless $ARGV[1]; +die "Languages file not found" unless -f $ARGV[0]; +unless (-d $ARGV[1]) { + mkdir $ARGV[1] or die $@; +} + +dump_models($ARGV[0]); + +sub dump_models { + my ($languages_filename) = @_; + + local *LM; + if (!open(LM, $languages_filename)) { + die "textcat: cannot open languages file $languages_filename: $!\n"; + } + + { my($inbuf,$nread,$text); $text = ''; + while ( $nread=read(LM,$inbuf,16384) ) { $text .= $inbuf } + defined $nread or die "error reading $languages_filename: $!"; + @lm = split(/\n/, $text, -1); + } + + close(LM) or die "error closing $languages_filename: $!"; + + my @ngram; + # create language ngram maps once + for (@lm) { + # look for end delimiter + if (/^0 (.+)/) { + my $lang = $1; + open(OUT, ">$ARGV[1]/$lang.lm"); + binmode OUT or die; + foreach my $n (@ngram) { + print OUT $n."\n"; + } + close OUT or die; + print "Wrote $ARGV[1]/$lang.lm\n"; + # reset for next language + @ngram = (); + } + else { + push @ngram, $_; + } + } +} + Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/af.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/af.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/am.utf-8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/am.utf-8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ar.iso-8859-6.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ar.iso-8859-6.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ar.windows-1256.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ar.windows-1256.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/be.windows-1251.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/be.windows-1251.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/bg.iso-8859-5.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/bg.iso-8859-5.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/bs.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/bs.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ca.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ca.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ca.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ca.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/cs.iso-8859-2.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/cs.iso-8859-2.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/cy.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/cy.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/da.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/da.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/da.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/da.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/de.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/de.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/de.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/de.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/el.iso-8859-7.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/el.iso-8859-7.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/en.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/en.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/eo.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/eo.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/eo.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/eo.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/es.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/es.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/es.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/es.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/et.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/et.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/et.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/et.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/eu.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/eu.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/fa.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/fa.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/fi.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/fi.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/fi.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/fi.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/fr.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/fr.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/fr.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/fr.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/fy.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/fy.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/fy.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/fy.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ga.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ga.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ga.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ga.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/gd.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/gd.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/he.iso-8859-8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/he.iso-8859-8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/hi.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/hi.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/hr.us-ascii.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/hr.us-ascii.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/hu.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/hu.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/hu.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/hu.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/hy.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/hy.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/id.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/id.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/is.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/is.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/is.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/is.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/it.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/it.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/it.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/it.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ja.euc-jp.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ja.euc-jp.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ja.iso-2022-jp.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ja.iso-2022-jp.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ja.shift-jis.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ja.shift-jis.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ka.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ka.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ko.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ko.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/la.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/la.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/lt.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/lt.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/lt.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/lt.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/lv.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/lv.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/lv.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/lv.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/mr.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/mr.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ms.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ms.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ne.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ne.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/nl.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/nl.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/no.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/no.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/no.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/no.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/pl.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/pl.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/pt.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/pt.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/pt.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/pt.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/qu.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/qu.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/qu.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/qu.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/rm.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/rm.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/rm.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/rm.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ro.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ro.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ru.iso-8859-5.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ru.iso-8859-5.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ru.koi8-r.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ru.koi8-r.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ru.utf-8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ru.utf-8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ru.windows-1251.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ru.windows-1251.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sa.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sa.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sco.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sco.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sk.us-ascii.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sk.us-ascii.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sk.utf-8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sk.utf-8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sk.windows-1250.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sk.windows-1250.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sl.iso-8859-2.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sl.iso-8859-2.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sl.us-ascii.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sl.us-ascii.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sq.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sq.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sr.us-ascii.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sr.us-ascii.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sv.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sv.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sv.utf8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sv.utf8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/sw.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/sw.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/ta.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/ta.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/th.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/th.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/tl.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/tl.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/tr.iso-8859-9.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/tr.iso-8859-9.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/tr.unknown.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/tr.unknown.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/uk.koi8-r.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/uk.koi8-r.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/vi.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/vi.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/yi.utf-8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/yi.utf-8.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/zh.big5.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/zh.big5.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/zh.gb2312.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/zh.gb2312.lm differ Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/textcat/lms/zh.utf-8.lm and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/textcat/lms/zh.utf-8.lm differ diff -Nru spamassassin-3.4.6/textcat/lm_to_languages.pl spamassassin-4.0.0~rc3/textcat/lm_to_languages.pl --- spamassassin-3.4.6/textcat/lm_to_languages.pl 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/textcat/lm_to_languages.pl 2022-04-04 10:37:27.000000000 +0000 @@ -0,0 +1,63 @@ +#!/usr/bin/perl + +# <@LICENSE> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Usage: lm_to_languages.pl +# +# Packs directory of .lm files into SA "languages" file +# + +die "Invalid languages" unless $ARGV[1]; +die "Invalid indir" unless -d $ARGV[0]; + +load_models($ARGV[0]); + +sub load_models { + my ($indir) = @_; + + opendir(IN, $indir) or die; + my @files = grep { /\.lm$/ } readdir(IN); + closedir(IN) or die; + die unless @files; + + open(LANGUAGES, ">$ARGV[1]") or die; + binmode LANGUAGES or die; + + foreach my $f (sort @files) { + my $outl = $f; + $outl =~ s/\.lm$//; + $outl =~ s!.*/!!; + open(IN, "$indir/$f") or die; + binmode IN or die; + my $cnt = 0; + while () { + s/\r?\n$//; + /^([^0-9\s]+)/ or die; + print LANGUAGES "$1\n" or die; + $cnt++; + } + close IN or die; + print LANGUAGES "0 $outl\n" or die; + print STDERR "Read $outl ($cnt)\n"; + } + + close LANGUAGES or die; + print STDERR "Wrote $ARGV[1]\n"; +} + diff -Nru spamassassin-3.4.6/textcat/lm_to_utf8.pl spamassassin-4.0.0~rc3/textcat/lm_to_utf8.pl --- spamassassin-3.4.6/textcat/lm_to_utf8.pl 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/textcat/lm_to_utf8.pl 2022-04-04 10:37:27.000000000 +0000 @@ -0,0 +1,112 @@ +#!/usr/bin/perl + +# <@LICENSE> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# RUN AND EDIT THIS SCRIPT IN ISO-8859-1 LOCALE +# +# Usage: lm_to_utf8.pl [xx.utf8.lm] +# +# Helper to convert to latin1 based .lm into utf8. +# +# Run without output parameter to see what happens: +# lm_to_utf8.pl fi.lm +# +# Check that no obvious unknown chars are found (add to %conv_utf8 as needed) +# When satisfied, give output file: +# lm_to_utf8.pl fi.lm fi.utf8.lm +# + +die "Missing lm" unless -f $ARGV[0]; + +my %conv_utf8 = ( + '' => "\xC3\xAB", + '' => "\xC3\xBB", + '' => "\xC3\x9D", + '' => "\xC3\x9E", + '' => "\xC3\x9F", + '' => "\xC3\xA0", + '' => "\xC3\xA1", + '' => "\xC3\xA2", + '' => "\xC3\xA3", + '' => "\xC3\xA4", + '' => "\xC3\xA5", + '' => "\xC3\xA6", + '' => "\xC3\xA7", + '' => "\xC3\xA8", + '' => "\xC3\xA9", + '' => "\xC3\xAA", + '' => "\xC3\xAC", + '' => "\xC3\xAD", + '' => "\xC3\xAE", + '' => "\xC3\xAF", + '' => "\xC3\xB0", + '' => "\xC3\xB1", + '' => "\xC3\xB2", + '' => "\xC3\xB3", + '' => "\xC3\xB4", + '' => "\xC3\xB5", + '' => "\xC3\xB6", + '' => "\xC3\xB7", + '' => "\xC3\xB8", + '' => "\xC3\xB9", + '' => "\xC3\xBA", + '' => "\xC3\xBB", + '' => "\xC3\xBC", + '' => "\xC3\xBD", + '' => "\xC3\xBE", + '' => "\xC3\xB8", +); +my $conv_chars = join('', keys %conv_utf8); + +load_models($ARGV[0]); + +sub load_models { + my ($indir) = @_; + + if ($ARGV[1]) { + open(OUT, ">$ARGV[1]") or die; + binmode OUT or die; + } + + open(IN, $ARGV[0]) or die; + binmode IN or die; + my $changes = 0; + while () { + s/\r?\n$//; + /^([^0-9\s]+)/ or die; + my $orig_g = $1; + my $g = $orig_g; + unless ($g =~ /^[a-zA-Z${conv_chars},.':;!`*"?()\-\x00]+$/) { + print "UNKNOWN CHAR FOUND: $g\n" + } + foreach (keys %conv_utf8) { + if ($g =~ s/$_/$conv_utf8{$_}/g) { + $changes++; + print "Changing: $orig_g -> $g\n" or die; + } + } + if ($ARGV[1]) { + print OUT "$g\n" or die; + } + } + close OUT if $ARGV[1]; + close IN or die; + print "Total changes: $changes\n"; +} + diff -Nru spamassassin-3.4.6/textcat/README spamassassin-4.0.0~rc3/textcat/README --- spamassassin-3.4.6/textcat/README 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/textcat/README 2022-04-02 12:04:25.000000000 +0000 @@ -0,0 +1,8 @@ + +Sources to create rules/languages file. + +Most latin1 based languages have utf8 alternatives named xx.utf8. Only name +file xx.utf8 if it has xx also. Native UTF-8 languages should be named +xx.utf-8. TextCat will convert xx.utf8 name into xx, as results will depend +on normalize_charset and mail encoding. + diff -Nru spamassassin-3.4.6/tools/convert_awl_dbm_to_sql spamassassin-4.0.0~rc3/tools/convert_awl_dbm_to_sql --- spamassassin-3.4.6/tools/convert_awl_dbm_to_sql 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/convert_awl_dbm_to_sql 2022-04-23 12:18:23.000000000 +0000 @@ -0,0 +1,100 @@ +#!/usr/bin/perl + +# WARNING: This script is VERY rough and provided only as a template +# for moving a DB based autowelcomelist to a SQL based one. You should +# do backups and that sort of thing before attempting to use this +# script. + +use strict; +use Fcntl; + +use Getopt::Long; + +use DBI; + +use DB_File; +my ( %h $k $v ); + +sub usage { + print "This program takes the following required arguments:\n"; + print "--username - This is who's welcomelist you are loading.\n"; + print " It should match exactly what spassassin or\n"; + print " spamd will be using.\n"; + print "--dsn - This is the database DSN. It should be in the form:\n"; + print " DBI:driver:database:hostname[:port]\n"; + print " Consult your database drivers docs for more info.\n"; + print "--ok - Basically a sanity check that you understand how dangerous this script is.\n"; + print "\n"; + print "This program take the following optional arguments:\n"; + print "--dbautowelcomelist - path to the auto-welcomelist you wish to\n"; + print " convert. Default is to use \n"; + print " \$ENV{HOME}/.spamassassin/auto-welcomelist\n"; + print "--sqlusername - Needed if your DBI driver requires a username.\n"; + print "--sqlpassword - Needed if your DBI driver requires a password.\n"; + print "\n\n"; + print "WARNING: This script is VERY rough and not well tested. You should\n"; + print "use extreme caution when working with it. Including backing up your\n"; + print "data and all that other good stuff.\n"; + print "Passing of the --ok flag means you read this warning.\n"; + print "\n"; + exit; +} + +my %opt; + +GetOptions('dsn=s' => \$opt{'dsn'}, + 'sqlusername=s' => \$opt{'sqlusername'}, + 'sqlpassword=s' => \$opt{'sqlpassword'}, + 'dbautowelcomelist=s' => \$opt{'dbautowelcomelist'}, + 'username=s' => \$opt{'username'}, + 'help' => \$opt{'help'}, + 'ok' => \$opt{'ok'}, + ); + +if ($opt{'help'}) { + usage(); +} + +if (!$opt{'ok'}) { + usage(); +} + + +if (!$opt{'username'} || !$opt{'dsn'}) { + usage(); +} + +my $db; +if ($opt{'dbautowelcomelist'}) { + $db = $opt{'dbautowelcomelist'}; +} +else { + $db = $ENV{HOME}."/.spamassassin/auto-welcomelist"; +} + +tie %h, "DB_File",$db, O_RDONLY,0600 + or die "Cannot open file $db: $!\n"; + +my $dbh = DBI->connect($opt{'dsn'}, $opt{'sqlusername'}, $opt{'sqlpassword'}) + or die $DBI::errstr; + +my $sth = $dbh->prepare("DELETE FROM awl WHERE username = ?"); +$sth->execute($opt{'username'}); + +my $sth = $dbh->prepare("INSERT INTO awl (username,email,ip,count,totscore) VALUES (?,?,?,?,?)"); + +my @k = grep(!/totscore$/,keys(%h)); +for my $key (@k) { + my $totscore = $h{"$key|totscore"}; + my $count = $h{$key}; + if(defined($totscore)) { + my ($email, $ip) = split(/\|ip=/, $key); + + if ($email && $ip) { + my $rc = $sth->execute($opt{'username'}, $email, $ip, $count, $totscore); + printf "% 8.1f %15s -- %s\n", $totscore/$count, (sprintf "(%.1f/%d)",$totscore/$count, $count), $key; + } + } +} +untie %h; +$dbh->disconnect(); diff -Nru spamassassin-3.4.6/tools/desc_length.pl spamassassin-4.0.0~rc3/tools/desc_length.pl --- spamassassin-3.4.6/tools/desc_length.pl 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/desc_length.pl 2005-05-24 22:45:55.000000000 +0000 @@ -0,0 +1,96 @@ +#!/usr/bin/perl -w + +# This script is really sketchy and probably should be re-written to +# be less sketchy. + +# These numbers for lengths are correct AFAIK for 2.60. You'll need to +# change them manually if they change. + +# read descriptions into the hash descriptions +# find max length and save it into length + +use strict; + +my (%description, %length, %file); +my $len; + +while (<>) { + + if (/^describe\s+(\S+)\s+(.*)$/) { + $description{$1} = $2; + $file{$1} = $ARGV; + next; + } + + if (/^header\s+(\S+)\s+rbleval:/) { + $length{$1} = 45; + next; + } + if (/^header\s+(\S+)\s+/) { + $length{$1} = 50; + next; + } + if (/^body\s+(\S+)\s+/) { + $length{$1} = 44; + next; + } + if (/^uri\s+(\S+)\s+/) { + $length{$1} = 45; + next; + } + if (/^rawbody\s+(\S+)\s+eval/) { + $length{$1} = 45; + next; + } + if (/^rawbody\s+(\S+)\s+/) { + $length{$1} = 44; + next; + } + if (/^full\s+(\S+)\s+eval:/) { + $length{$1} = 50; + next; + } + if (/^full\s+(\S+)\s+/) { + $length{$1} = 44; + next; + } + if (/^meta\s+(\S+)\s+/) { + $length{$1} = 50; + next; + } +} + +print "The following tests have names that are too long:\n"; +print "-" x 22 . "\n"; +foreach my $test (sort keys %length) { + next if ($test =~ /^[T_]_/); + print "$test\n" if length($test) > 22; +} + +print "\nThe following tests have descriptions but are not defined:\n"; +foreach my $test (sort keys %description) { + next if $length{$test}; + print "$test\n"; + delete $description{$test}; +} + +# find descs that are too long +print "\nThe following tests have no description:\n"; +foreach my $test (sort keys %length) { + if (($test !~ /^[T_]_/) && !$description{$test}) { + print "$test\n"; + } + delete $length{$test} if !$description{$test}; + delete $file{$test} if !$description{$test}; +} + +print "\nThe following tests have descriptions that are too long:\n"; +foreach my $test (sort {$file{$a} cmp $file{$b} || $a cmp $b} (keys %file)) { + $len = length($description{$test}); + if ($len > $length{$test}) { + print "$test: max $length{$test}, cur $len ($file{$test})\n"; + print " $description{$test}\n"; + } +} + + diff -Nru spamassassin-3.4.6/tools/mboxsplit spamassassin-4.0.0~rc3/tools/mboxsplit --- spamassassin-3.4.6/tools/mboxsplit 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/mboxsplit 2018-02-05 14:11:02.000000000 +0000 @@ -0,0 +1,81 @@ +#!/usr/bin/perl -w + +# mboxsplit - split a mailbox into separate files +# +# <@LICENSE> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +my $prog = $0; +$prog =~ s@.*/@@; + +our ($opt_h, $opt_f, $opt_i, $opt_n); +use Getopt::Std; +getopts("hf:in:"); + +sub usage { + my $status = shift; + + my $out = $status ? STDERR : STDOUT; + print $out <) { + if ($file_open == 1 && $line =~ /^From /) { + close(OUTFILE); + $file_no++; + $file_open = 0; + } + if ($file_open == 0) { + if ($file_no == 0) { + next if $opt_i && $line !~ /^From /; + $file_no++; + } + open(OUTFILE, '>' . sprintf($opt_f, $file_no)); + $file_open = 1; + } + print OUTFILE $line; +} + +if ($file_open == 1) { + close(OUTFILE); +} diff -Nru spamassassin-3.4.6/tools/README.speedtest spamassassin-4.0.0~rc3/tools/README.speedtest --- spamassassin-3.4.6/tools/README.speedtest 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/README.speedtest 2005-02-25 14:28:10.000000000 +0000 @@ -0,0 +1,39 @@ +How to use speedtest +-------------------- + +Run it like this: + +perl -d:DProf speedtest + +That will run SA over the individual messages listed as arguments, and produce a timings output file called tmon.out, which can be read by dprofpp + +So you'll then want to do something like: + +dprofpp + +Which will dump something like: + +Total Elapsed Time = 3.318045 Seconds + User+System Time = 2.408151 Seconds +Exclusive Times +%Time ExclSec CumulS #Calls sec/call Csec/c Name + 22.0 0.530 1.228 8 0.0662 0.1535 Mail::SpamAssassin::PerMsgStatus::_body_tests + 6.64 0.160 0.160 8 0.0200 0.0200 Mail::SpamAssassin::PerMsgStatus::porn_word_test + 5.81 0.140 1.377 8 0.0175 0.1722 Mail::SpamAssassin::PerMsgStatus::do_body_tests + 5.77 0.139 1.703 21 0.0066 0.0811 Mail::SpamAssassin::PerMsgStatus::BEGIN + 5.56 0.134 0.178 1 0.1338 0.1775 Mail::SpamAssassin::Conf::_parse + 5.40 0.130 0.116 970 0.0001 0.0001 Mail::SpamAssassin::NoMailAudit::_get_header_list + 5.40 0.130 0.758 13 0.0100 0.0583 Mail::SpamAssassin::BEGIN + 5.36 0.129 0.302 924 0.0001 0.0003 Mail::SpamAssassin::PerMsgStatus::get + 4.15 0.100 0.189 970 0.0001 0.0002 Mail::SpamAssassin::NoMailAudit::get_header + 3.28 0.079 0.204 14 0.0057 0.0146 Razor::Client::BEGIN + 3.11 0.075 0.184 8 0.0094 0.0230 Mail::SpamAssassin::PerMsgStatus::_rawbody_tests + 2.91 0.070 0.085 8 0.0087 0.0107 Mail::SpamAssassin::PerMsgStatus::do_body_uri_tests + 2.49 0.060 0.079 8 0.0075 0.0099 Mail::SpamAssassin::PerMsgStatus::RATWARE_head_test + 2.49 0.060 0.067 8 0.0075 0.0084 Mail::SpamAssassin::PerMsgStatus::get_decoded_stripped_body_text_array + 2.49 0.060 0.085 30 0.0020 0.0028 Net::DNS::RR::BEGIN + + +The functions in the final column which you care about are the ones that match /_test$/ + +You can increase the number of functions listed using the "-O xxxx" option to dprofpp. \ No newline at end of file diff -Nru spamassassin-3.4.6/tools/sare-sa-stats.pl spamassassin-4.0.0~rc3/tools/sare-sa-stats.pl --- spamassassin-3.4.6/tools/sare-sa-stats.pl 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/sare-sa-stats.pl 2016-04-15 08:06:51.000000000 +0000 @@ -0,0 +1,333 @@ +#!/usr/bin/perl + +# @hourly /usr/local/bin/sa-stats.pl --web --n=25 > /var/www/html/spamstat/index.html + + +# ------------------------------------------------------------- +# file: sa-stats.pl (SARE release) +# created: 2005-01-31 +# updated: 2007-01-30 +# version: 1.03 +# author: Dallas +# desc: Generates Top Spam/Ham Rules fired for SA 3.1.x installations. +# +# IMPORTANT NOTES +# +# SA 3.0.x log files do not have user= in +# the report: log entries, so this does not work with 3.0. +# See http://www.rulesemporium.com/programs/sa-stats.txt for +# a SA 3.0.x version ( no per-domain / per-user support ) +# +# If your top 5 does not contain URIBL_BLACK, see +# http://www.uribl.com/usage.shtml +# ------------------------------------------------------------- + +# Per User and Per Domain Statistics... +# ------------------------------------------------------------- +# +# ./sa-stats -r postmaster +# - this would give all stats for postmaster users, +# regardless of which domain it was for. handy if you +# have alot of domain aliases +# +# ./sa-stats -r @domain +# - this would give all stats for the domain specified. +# make sure you include the '@' sign before the +# domain or the script will assume you wanted a user +# name instead. +# +# ./sa-stats -r user@domain.com +# - this would give all stats for a specific email address. +# this assumes you pass 'spamc -u ' vs. +# 'spamc -u '. If you do the latter, you simply +# want to call -r instead. +# +# ------------------------------------------------------------- + +use Getopt::Long; +use Pod::Usage; + +my ($LOG_DIR,$FILE,$TOPRULES,$PRINT_TO_WEB,$HELP,$RECIP); + +GetOptions ( + 'logdir|l=s' => \$LOG_DIR, + 'filename|f=s' => \$FILE, + 'recip|r=s' => \$RECIP, + 'num|n=i' => \$TOPRULES, + 'web|w' => \$PRINT_TO_WEB, + 'help|h' => \$HELP +); + +if ($HELP) { + print "usage: $0 [-l     ] [-f ] [-n ] [-w]\n"; + print "\t--logdir|-l \tDirectory containing spamd logs\n"; + print "\t--filename|-f \tFile names or regex to look for in the logdir\n"; + print "\t--num|-n \tNumber of top rules to display\n"; + print "\t--web|-w\tMake it web friendly output\n"; + print "\t--help|-h\tPrints this help\n"; + exit; +} + +if (!defined $TOPRULES) { $TOPRULES=20 } +if (!defined $LOG_DIR) { $LOG_DIR="/var/log" } +if (!defined $FILE) { $FILE='^maillog$' } # regex + +# LEAVE THE REST ALONE UNLESS YOU KNOW WHAT YOU ARE DOING... +################################################################ + +my $NUM_EMAIL=0; my $NUM_SPAM=0; my $NUM_HAM=0; +my $EMAIL_HITS=0; my $SPAM_HITS=0; my $HAM_HITS=0; +my %SPAM_RULES=(); my %HAM_RULES=(); +my $TOTAL_SPAM_RULES=0; my $TOTAL_HAM_RULES=0; +my $ALSPAM=0; my $ALHAM=0; my $ALNO=0; +my $HAM_SEC=0; my $SPAM_SEC=0; my $EMAIL_SEC=0; + +my $footer = ''; + +opendir (DIR,"$LOG_DIR"); +my @logs = grep /$FILE/i, readdir DIR; +closedir DIR; + +foreach my $log (@logs) { + &calcstats($LOG_DIR."/".$log); +} + +&summarize(); +exit; + +############################# + +sub calcstats { + + my $log=shift; + + if (!-e $log || -d $log) { + print "$log not found..\n"; + return; + } + + open(F,"$log"); + while() { + + my ($result,$score,$rules,$time,$size,$learn,$recip); + my $spam=0; + # for user=, it may be %domain or $GLOBAL or @GLOBAL or user@domain.. + + + if (/.*result:\s+(\w|\.)\s+(\-?\d+)\s+\-\s+(.*)\s+scantime\=([\d\.]+)\,size\=(\d+).*user=([^\,]+).*autolearn=(\w+)/) { + $result=$1; + $score=$2; + $rules=$3; + $time=$4; + $size=$5; + $recip=$6; + $learn=$7; + } + else { + next; + } + + my ($user,$domain); + + if ($recip =~ m/^[\%\@](.+)/) { + $user = undef; + $domain = '@'.$1; + } + if ($recip =~ m/(.+)\@(.+)/) { + $user=$1; + $domain='@'.$2; + } + else { + $user=$recip; + $domain='@localhost'; + } + + my $email = $user.$domain; + + + next if ($RECIP && $RECIP !~ m/\@/ && $RECIP ne $user); + next if ($RECIP =~ m/^[\%\@](.+)/ && $RECIP ne $domain); + next if ($RECIP =~ m/(.+)\@(.+)/ && $RECIP ne $email); + + if ($result eq "Y") { + $SPAM_SEC+=$time; + } + else { + $HAM_SEC+=$time; + } + $EMAIL_SEC+=$time; + + $spam=1 if ($result =~ m/Y/); + if ($learn =~ /ham/) { + $ALHAM++; + } + elsif ($learn =~ /spam/) { + $ALSPAM++; + } + else { + $ALNO++; + } + + my @tmprules=split(/\,/,$rules); + foreach my $r (@tmprules) { + if ($spam) { + $TOTAL_SPAM_RULES++; + if (defined $SPAM_RULES{$r}) { + $SPAM_RULES{$r}++; + } + else { + $SPAM_RULES{$r}=1; + } + } + else { + $TOTAL_HAM_RULES++; + if (defined $HAM_RULES{$r}) { + $HAM_RULES{$r}++; + } + else { + $HAM_RULES{$r}=1; + } + } + } + + if ($spam) { + $NUM_SPAM++; + $SPAM_HITS += $score; + } + else { + $NUM_HAM++; + $HAM_HITS += $score; + } + $NUM_EMAIL++; + $EMAIL_HITS += $score; +} +close(F); + +} + + +sub summarize { + + my ($avgspamhits,$avghamhits,$avgemailhits); + + print "Content-type: text/html\n\n" if ($PRINT_TO_WEB); + print "
    " if ($PRINT_TO_WEB);
+
+  if ($NUM_SPAM > 0) {
+     $avgspamhits= sprintf("%.2f",$SPAM_HITS/$NUM_SPAM);
+     $avgspamtime= sprintf("%.2f",$SPAM_SEC/$NUM_SPAM);
+  }
+  else {
+     $avgspamhits=0;
+     $avgspamtime=0;
+  }
+
+  if ($NUM_HAM > 0) {
+     $avghamhits= sprintf("%.2f",$HAM_HITS/$NUM_HAM);
+     $avghamtime= sprintf("%.2f",$HAM_SEC/$NUM_HAM);
+  }
+  else {
+     $avghamhits=0;
+     $avghamtime=0;
+  }
+
+  if ($NUM_EMAIL > 0) {
+     $avgemailhits= sprintf("%.2f",$EMAIL_HITS/$NUM_EMAIL);
+     $avgemailtime= sprintf("%.2f",$EMAIL_SEC/$NUM_EMAIL);
+  }
+  else {
+     $avgemailhits=0;
+     $avgemailtime=0;
+  }
+
+
+  print "\n\n";
+
+  if ($RECIP) {
+    print "SPAM STATS FOR $RECIP\n";
+    print "-" x 60 . "\n";
+  }
+
+  my $ALTOT=$ALSPAM+$ALHAM;
+  printf("Email: %8s  Autolearn: %5s  AvgScore: %6.2f  AvgScanTime: %5.2f sec\n",$NUM_EMAIL,$ALTOT,$avgemailhits,$avgemailtime);
+  printf("Spam:  %8s  Autolearn: %5s  AvgScore: %6.2f  AvgScanTime: %5.2f sec\n",$NUM_SPAM,$ALSPAM,$avgspamhits,$avgspamtime);
+  printf("Ham:   %8s  Autolearn: %5s  AvgScore: %6.2f  AvgScanTime: %5.2f sec\n",$NUM_HAM,$ALHAM,$avghamhits,$avghamtime);
+
+  &br;
+  printf "Time Spent Running SA:      %7.2f hours\n",$EMAIL_SEC/60/60;
+  printf "Time Spent Processing Spam: %7.2f hours\n",$SPAM_SEC/60/60;
+  printf "Time Spent Processing Ham:  %7.2f hours\n",$HAM_SEC/60/60;
+
+  &br;
+
+  my $count=0;
+  print "TOP SPAM RULES FIRED";
+  print " FOR $RECIP" if ($RECIP);
+  print "\n";
+
+  &hr;
+  printf("%4s\t%-24s\t%5s %8s %7s %7s %7s\n","RANK","RULE NAME","COUNT","\%OFMAIL","\%OFSPAM","\%OFHAM");
+  &hr;
+  foreach my $key (sort { $SPAM_RULES{$b} <=> $SPAM_RULES{$a} } keys %SPAM_RULES) {
+    #my $perc1=sprintf("%.2f",($SPAM_RULES{$key}/$NUM_EMAIL)*100);
+    my $perc1=sprintf("%.2f",(($SPAM_RULES{$key}+$HAM_RULES{$key})/$NUM_EMAIL)*100);
+    my $perc2=sprintf("%.2f",($SPAM_RULES{$key}/$NUM_SPAM)*100);
+    my $perc3=sprintf("%.2f",($HAM_RULES{$key}/$NUM_HAM)*100);
+    printf("%4d\t%-24s\t%5s\t%6.2f\t%6.2f\t%6.2f\n",$count+1,$key,$SPAM_RULES{$key},$perc1,$perc2,$perc3);
+    $count++;
+    if ($count >= $TOPRULES && $TOPRULES > 0) {
+       last;
+    }
+  }
+  &hr;
+  &br;
+
+  $count=0;  # thanks mike.
+  print "TOP HAM RULES FIRED";
+  print " FOR $RECIP" if ($RECIP);
+  print "\n";
+  &hr;
+  printf("%4s\t%-24s\t%5s %8s %7s %7s %7s\n","RANK","RULE NAME","COUNT","\%OFMAIL","\%OFSPAM","\%OFHAM");
+  &hr;
+  foreach my $key (sort { $HAM_RULES{$b} <=> $HAM_RULES{$a} } keys %HAM_RULES) {
+    #my $perc1=sprintf("%.2f",($HAM_RULES{$key}/$NUM_EMAIL)*100);
+    my $perc1=sprintf("%.2f",(($SPAM_RULES{$key}+$HAM_RULES{$key})/$NUM_EMAIL)*100);
+    my $perc2=sprintf("%.2f",($SPAM_RULES{$key}/$NUM_SPAM)*100);
+    my $perc3=sprintf("%.2f",($HAM_RULES{$key}/$NUM_HAM)*100);
+    printf("%4d\t%-24s\t%5s\t%6.2f\t%6.2f\t%6.2f\n",$count+1,$key,$HAM_RULES{$key},$perc1,$perc2,$perc3);
+    $count++;
+    if ($count >= $TOPRULES && $TOPRULES > 0) {
+       last;
+    }
+  }
+  &hr;
+  &br;
+  print "
    \n" if ($PRINT_TO_WEB); + print $footer if ($PRINT_TO_WEB && $footer ne ""); + print "\n"; +} + +####################### +sub hr { + if ($PRINT_TO_WEB) { + print "
    "; + } + else { + print "-" x 70 ."\n"; + } +} +####################### +sub br { + if ($PRINT_TO_WEB) { + print "
    "; + } + else { + print "\n"; + } +} + + + + + + diff -Nru spamassassin-3.4.6/tools/sa-stats.pl spamassassin-4.0.0~rc3/tools/sa-stats.pl --- spamassassin-3.4.6/tools/sa-stats.pl 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/sa-stats.pl 2006-08-16 04:28:06.000000000 +0000 @@ -0,0 +1,974 @@ +#!/usr/bin/perl -w +#Purpose : Produce stats for SpamAssassin package +#Authors : Brad Rathbun http://www.computechnv.com/ +# : Bob Apthorpe http://www.cynistar.net/~apthorpe/ +# : Duncan Findlay +# +# <@LICENSE> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +use strict; + +# Configuration section +my %opt = (); +$opt{'logfile'} = '/var/log/maillog'; # Log file +$opt{'sendmail'} = '/usr/sbin/sendmail'; # Path to sendmail stub +$opt{'from'} = 'SpamAssassin System Admin'; # Who is the mail from +$opt{'end'} = ""; +$opt{'start'} = "today"; + +my $diag = ''; +$diag .= "Default options:\n" . join('', map { "opt{$_} => " . ($opt{$_} || '') . "\n" } (sort keys %opt)); +# &vdbg($diag); # This won't work until *after* getopt() is called. Duh. + +########################################################## +############# Nothing to edit below here ################# +########################################################## + +my $VERSION = '$Id: sa-stats.pl 431796 2006-08-16 04:28:06Z felicity $'; +my ($VER_NUM) = '$Revision: 6256 $' =~ m#\$Revision:\s+(\S+)#o; + +# internal modules (part of core perl distribution) +use Getopt::Long; +use Pod::Usage; +use POSIX qw/strftime floor/; +use Time::Local; +use Date::Manip; +use Parse::Syslog; + +my %timing = (); +$timing{'start'} = 0; +$timing{'end'} = 0; +$timing{'hrsinperiod'} = 0; +$timing{'telapsed'} = time; + +Getopt::Long::Configure("bundling"); +GetOptions('logfile|l=s' => \$opt{'logfile'}, + 'mail=s' => \$opt{'mail'}, + 'sendmail=s' => \$opt{'sendmail'}, + 'from=s' => \$opt{'from'}, + 'debug|D' => \$opt{'debug'}, + 'userstats|u' => \$opt{'userstats'}, + 'verbose|v' => \$opt{'verbose'}, + 'html|H' => \$opt{'html'}, + 'top|T:25' => \$opt{'topusers'}, + 'help|h' => \$opt{'help'}, + 'version|V' => \$opt{'version'}, + 'start|s=s' => \$opt{'start'}, + 'end|e=s' => \$opt{'end'}) + or pod2usage({-verbose => 0, -message => "Unknown options.", -exitval => 2}); + +if ($opt{'help'}) { + pod2usage({-verbose => 1, -message => "For more information, try perldoc sa-stats.pl"}); +} + +if ($opt{'version'}) { + print "sa-stats.pl version ", $VERSION, "\n"; + exit 0; +} + +# No point in specifying topusers w/o specifying userstats; coerce -u if -T +if ($opt{'topusers'}) { + $opt{'userstats'} = 1; +} + +$diag .= "\nUser options:\n" . join('', map { "opt{$_} => " . ($opt{$_} || '') . "\n" } (sort keys %opt)); +&vdbg($diag . "\n"); + +# Local variables + +# %stats is a multidimensional hash with the following structure: +my %stats = (); + +$stats{'spam'}{'mean_score'} = 0; +$stats{'spam'}{'mean_time'} = 0; +$stats{'spam'}{'mean_bytes'} = 0; + +$stats{'ham'}{'mean_score'} = 0; +$stats{'ham'}{'mean_time'} = 0; +$stats{'ham'}{'mean_bytes'} = 0; + +$stats{'total'}{'bytes'} = 0; +$stats{'total'}{'count'} = 0; +$stats{'total'}{'time'} = 0; +$stats{'total'}{'score'} = 0; +# $stats{'total'}{'byhour'}{$hr} +$stats{'total'}{'threshold'} = 0; + +$stats{'ham'}{'bytes'} = 0; +$stats{'ham'}{'count'} = 0; +$stats{'ham'}{'time'} = 0; +$stats{'ham'}{'score'} = 0; +# $stats{'ham'}{'byhour'}{$hr} + +$stats{'spam'}{'bytes'} = 0; +$stats{'spam'}{'count'} = 0; +$stats{'spam'}{'time'} = 0; +$stats{'spam'}{'score'} = 0; +# $stats{'spam'}{'byhour'}{$hr} + +my %userstats = (); +# $userstats{$recipient}{'total'}{'bytes'} +# $userstats{$recipient}{'total'}{'count'} +# $userstats{$recipient}{'total'}{'time'} +# $userstats{$recipient}{'ham'}{'bytes'} +# $userstats{$recipient}{'ham'}{'count'} +# $userstats{$recipient}{'ham'}{'time'} +# $userstats{$recipient}{'ham'}{'score'} +# $userstats{$recipient}{'spam'}{'bytes'} +# $userstats{$recipient}{'spam'}{'count'} +# $userstats{$recipient}{'spam'}{'time'} +# $userstats{$recipient}{'spam'}{'score'} + +# my ($start, $end) = parse_arg($opt{'start'}, $opt{'end'}); +($timing{'start'}, $timing{'end'}) = parse_arg($opt{'start'}, $opt{'end'}); + +&vdbg("Timing:\nstart = $timing{'start'} " . UnixDate("epoch " . $timing{'start'}, '%C') + . "\n end = $timing{'end'} " . UnixDate("epoch " . $timing{'end'}, '%C') . "\n\n"); + +die "Can't find " . $opt{'logfile'} . " $!\n" unless (-e $opt{'logfile'} || ($opt{'logfile'} eq '-')); + +my $logyear = UnixDate("epoch " . $timing{'start'}, "%Y"); +my $logmonth = UnixDate("epoch " . $timing{'start'}, "%m") - 1; + +&vdbg("Creating log parser: Parse::Syslog->new(" . $opt{'logfile'} + . ", year => $logyear, _last_mon => $logmonth,)\n" + . "Note that _last_mon = month - 1\n\n"); + +my $parser = Parse::Syslog->new( $opt{'logfile'} , + year => $logyear, + _last_mon => $logmonth,); +# Hack for end-of-year support -- sets _last_mon to current month (0 based, not +# 1 based) + +&vdbg("##### Entering parseloop:\n\n"); + +parseloop: +while (my $sl = $parser->next) { + &vdbg('Found log entry at ' . $sl->{'timestamp'} . ' for ' . $sl->{'program'} . ' containing ' . $sl->{'text'} . "\n"); + next parseloop unless ($sl->{'program'} eq 'spamd'); + if ($sl->{'text'} =~ m/ + (clean\smessage|identified\sspam)\s # Status + \(([-0-9.]+)\/([-0-9.]+)\)\s # Score, Threshold + for\s + ([^:]+):\d+\s # for daf:1000 + in\s + ([0-9.]+)\sseconds,\s+ + ([0-9]+)\sbytes\. + /x) { + + # discard records outside defined analysis interval + next parseloop if ($sl->{'timestamp'} < $timing{'start'}); + # We can assume that logs are chronological + last parseloop if ($sl->{'timestamp'} > $timing{'end'}); + + my $status = $1; + my $score = $2; + my $threshold = $3; + my $recipient = $4; + my $time_processed = $5; + my $bytes_processed = $6; + + dbg("Found: " . $sl->{'text'} . "\n"); + dbg(" tstamp : " . $sl->{'timestamp'} . "\n"); + dbg(" status: $status\n"); + dbg(" score : $score\n"); + dbg(" thresh: $threshold\n"); + dbg(" recip : $recipient\n"); + dbg(" time : $time_processed\n"); + dbg(" bytes : $bytes_processed\n\n"); + + my $clean_recipient = lc($recipient); + $clean_recipient =~ s#\+[^@]*(@?)#$1#; + + my $abstime = $sl->{'timestamp'}; + + my $abshour = floor ($sl->{'timestamp'} / 3600); # Hours since the epoch + + # aggregate stats + my $tag = 'unknown'; + if ($status eq "identified spam") { + $tag = 'spam'; + } elsif ($status eq "clean message") { + $tag = 'ham'; + } else { + warn "Strange error in regexp - " . $sl->{'text'} . "\n"; + $tag = 'unknown'; + } + + # Ham/spam stats + $stats{$tag}{'count'}++; + $stats{$tag}{'score'} += $score; + $stats{$tag}{'bytes'} += $bytes_processed; + $stats{$tag}{'time'} += $time_processed; + $stats{$tag}{'byhour'}{$abshour}++; + + # Total score + $stats{'total'}{'count'}++; + $stats{'total'}{'score'} += $score; + $stats{'total'}{'bytes'} += $bytes_processed; + $stats{'total'}{'time'} += $time_processed; + $stats{'total'}{'byhour'}{$abshour}++; + $stats{'total'}{'threshold'} += $threshold; + + if ($opt{'userstats'}) { + # per-user ham/spam stats + $userstats{$clean_recipient}{$tag}{'count'}++; + $userstats{$clean_recipient}{$tag}{'bytes'} += $bytes_processed; + $userstats{$clean_recipient}{$tag}{'time'} += $time_processed; + $userstats{$clean_recipient}{$tag}{'score'} += $score; + + # per-user total stats + $userstats{$clean_recipient}{'total'}{'count'}++; + $userstats{$clean_recipient}{'total'}{'bytes'} += $bytes_processed; + $userstats{$clean_recipient}{'total'}{'time'} += $time_processed; + } + + } else { + next parseloop; + } +} + +&vdbg("##### Exiting parseloop:\n\n"); + +#Calculate some numbers +my %aggregate_stats = (); + +$aggregate_stats{'threshavg'} = 0; +$aggregate_stats{'spampercent'} = 0; +$aggregate_stats{'hampercent'} = 0; +$aggregate_stats{'bytesperhour'} = 0; +$aggregate_stats{'emailperhour'} = 0; +$aggregate_stats{'secperhour'} = 0; + +$timing{'hrsinperiod'} = (($timing{'end'} - $timing{'start'}) / 3600); + +if ($stats{'total'}{'count'} > 0) { + $stats{'total'}{'mean_score'} = ($stats{'total'}{'score'} || 0) / $stats{'total'}{'count'}; + + if ($stats{'spam'}{'count'} > 0) { + $stats{'spam'}{'mean_score'} = $stats{'spam'}{'score'} / $stats{'spam'}{'count'}; + $stats{'spam'}{'mean_time'} = $stats{'spam'}{'time'} / $stats{'spam'}{'count'}; + $stats{'spam'}{'mean_bytes'} = $stats{'spam'}{'bytes'} / $stats{'spam'}{'count'}; + $aggregate_stats{'spampercent'} = (($stats{'spam'}{'count'}/$stats{'total'}{'count'}) * 100); + } + + if ($stats{'ham'}{'count'} > 0) { + $stats{'ham'}{'mean_score'} = $stats{'ham'}{'score'} / $stats{'ham'}{'count'}; + $stats{'ham'}{'mean_time'} = $stats{'ham'}{'time'} / $stats{'ham'}{'count'}; + $stats{'ham'}{'mean_bytes'} = $stats{'ham'}{'bytes'} / $stats{'ham'}{'count'}; + $aggregate_stats{'hampercent'} = (($stats{'ham'}{'count'}/$stats{'total'}{'count'}) * 100); + } + + $aggregate_stats{'threshavg'} = $stats{'total'}{'threshold'} / $stats{'total'}{'count'}; + $aggregate_stats{'emailperhour'} = ($stats{'total'}{'count'}/$timing{'hrsinperiod'}); + $aggregate_stats{'bytesperhour'} = ($stats{'total'}{'bytes'} / $timing{'hrsinperiod'}); + $aggregate_stats{'secperhour'} = ($stats{'total'}{'time'} / $timing{'hrsinperiod'}); + + foreach my $partition (qw(ham spam total)) { + $stats{$partition}{'d_mean_score'} = sprintf("%.2f", $stats{$partition}{'mean_score'}); + $stats{$partition}{'d_kbytes'} = sprintf("%.2f", $stats{$partition}{'bytes'} / 1024); + $stats{$partition}{'d_mbytes'} = sprintf("%.2f", $stats{$partition}{'bytes'} / (1024 * 1024)); + foreach my $metric (qw(count bytes time)) { + if ($partition eq 'total') { + $stats{'total'}{'percent'}{$metric} = '100%'; + } else { + if (defined($stats{'total'}{$metric}) && ($stats{'total'}{$metric} > 0)) { + $stats{$partition}{'percent'}{$metric} = + sprintf("%.2f%%", 100 * ($stats{$partition}{$metric} || 0) / $stats{'total'}{$metric}); + } else { + $stats{$partition}{'percent'}{$metric} = '-- %'; + } + } + + $stats{$partition}{'perhour'}{$metric} = + sprintf("%.2f", ($stats{$partition}{$metric} || 0) / $timing{'hrsinperiod'}); + } + $stats{$partition}{'d_time'} = sprintf("%.1f", $stats{$partition}{'time'}); + $stats{$partition}{'perhour'}{'d_kbytes'} = sprintf("%.2f", $stats{$partition}{'perhour'}{'bytes'} / 1024); + $stats{$partition}{'perhour'}{'d_mbytes'} = sprintf("%.2f", $stats{$partition}{'perhour'}{'bytes'} / (1024 * 1024)); + } + +} + +$timing{'telapsed'} = time - $timing{'telapsed'}; + +# build report +my $rpt = ''; +if ($opt{'html'}) { + $rpt = &build_html_report(\%timing, \%stats, \%userstats, \%aggregate_stats, ); +} else { + $rpt = &build_text_report(\%timing, \%stats, \%userstats, \%aggregate_stats, ); +} + +# send report via mail or just print it out +if ($opt{'mail'}) { + open (SENDMAIL, "|$opt{'sendmail'} -oi -t -odq") or die "Can't open sendmail: $!\n"; + print SENDMAIL "From: $opt{'from'}\n"; + print SENDMAIL "To: $opt{'mail'}\n"; + print SENDMAIL "Subject: SpamAssassin statistics\n\n"; + print SENDMAIL $rpt; + close (SENDMAIL); +} else { + print $rpt; +} + +#All done +exit 0; + +############################################################################# +# Subroutines ############################################################### +############################################################################# + + +######################################## +# Build text report # +######################################## +sub build_text_report { + my $Rh_timing = shift; + my $Rh_stats = shift; + my $Rh_userstats = shift; + my $Rh_aggregate_stats = shift; + + my $rpt = ''; + $rpt .= "Report Title : SpamAssassin - Spam Statistics\n"; + $rpt .= "Report Date : " . strftime("%Y-%m-%d", localtime) . "\n"; + $rpt .= "Period Beginning : " . strftime("%c", localtime($Rh_timing->{'start'})) . "\n"; + $rpt .= "Period Ending : " . strftime("%c", localtime($Rh_timing->{'end'})) . "\n"; + $rpt .= "\n"; + $rpt .= sprintf("Reporting Period : %.2f hrs\n", $Rh_timing->{'hrsinperiod'}); + $rpt .= "--------------------------------------------------\n"; + $rpt .= "\n"; + $rpt .= "Note: 'ham' = 'nonspam'\n"; + $rpt .= "\n"; + $rpt .= sprintf("Total spam detected : %8d (%7.2f%%)\n", $Rh_stats->{'spam'}{'count'}, $Rh_aggregate_stats->{'spampercent'} || 0); + $rpt .= sprintf("Total ham accepted : %8d (%7.2f%%)\n", $Rh_stats->{'ham'}{'count'}, $Rh_aggregate_stats->{'hampercent'} || 0); + $rpt .= " -------------------\n"; + $rpt .= sprintf("Total emails processed : %8d (%5.f/hr)\n", $Rh_stats->{'total'}{'count'}, $Rh_aggregate_stats->{'emailperhour'} || 0); + $rpt .= "\n"; + $rpt .= sprintf("Average spam threshold : %11.2f\n", $Rh_aggregate_stats->{'threshavg'} || 0); + $rpt .= sprintf("Average spam score : %11.2f\n", $Rh_stats->{'spam'}{'mean_score'} || 0); + $rpt .= sprintf("Average ham score : %11.2f\n", $Rh_stats->{'ham'}{'mean_score'} || 0); + $rpt .= "\n"; + $rpt .= sprintf("Spam kbytes processed : %8d (%5.f kb/hr)\n", + $Rh_stats->{'spam'}{'bytes'}/1024, + $Rh_stats->{'spam'}{'bytes'}/(1024 * $Rh_timing->{'hrsinperiod'})); + $rpt .= sprintf("Ham kbytes processed : %8d (%5.f kb/hr)\n", + $Rh_stats->{'ham'}{'bytes'}/1024, + $Rh_stats->{'ham'}{'bytes'}/(1024 * $Rh_timing->{'hrsinperiod'})); + $rpt .= sprintf("Total kbytes processed : %8d (%5.f kb/hr)\n", + $Rh_stats->{'total'}{'bytes'}/1024, $Rh_aggregate_stats->{'bytesperhour'}/1024); + $rpt .= "\n"; + $rpt .= sprintf("Spam analysis time : %8d s (%5.f s/hr)\n", + $Rh_stats->{'spam'}{'time'}, + $Rh_stats->{'spam'}{'time'}/$Rh_timing->{'hrsinperiod'}); + $rpt .= sprintf("Ham analysis time : %8d s (%5.f s/hr)\n", + $Rh_stats->{'ham'}{'time'}, + $Rh_stats->{'ham'}{'time'}/$Rh_timing->{'hrsinperiod'}); + $rpt .= sprintf("Total analysis time : %8d s (%5.f s/hr)\n", + $Rh_stats->{'total'}{'time'}, $Rh_aggregate_stats->{'secperhour'}); + $rpt .= "\n\n"; + $rpt .= "Statistics by Hour\n"; + $rpt .= "----------------------------------------------------\n"; + $rpt .= "Hour Spam Ham\n"; + $rpt .= "------------- ----------------- --------------\n"; + + my $hour = floor($Rh_timing->{'start'}/3600); + + while ($hour < $Rh_timing->{'end'}/3600) { + + my $hourly_spam_percent = 0; + my $hourly_ham_percent = 0; + + if (defined($Rh_stats->{'total'}{'byhour'}{$hour}) && ($Rh_stats->{'total'}{'byhour'}{$hour} > 0)) { + if (!defined($Rh_stats->{'spam'}{'byhour'}{$hour}) || $Rh_stats->{'spam'}{'byhour'}{$hour} == 0) { + $Rh_stats->{'spam'}{'byhour'}{$hour} = 0; + $hourly_ham_percent = 100; + } elsif (!defined($Rh_stats->{'ham'}{'byhour'}{$hour}) || $Rh_stats->{'ham'}{'byhour'}{$hour} == 0) { + $Rh_stats->{'ham'}{'byhour'}{$hour} = 0; + $hourly_spam_percent = 100; + } else { + $hourly_spam_percent = 100 * $Rh_stats->{'spam'}{'byhour'}{$hour} / $Rh_stats->{'total'}{'byhour'}{$hour}; + $hourly_ham_percent = 100 * $Rh_stats->{'ham'}{'byhour'}{$hour} / $Rh_stats->{'total'}{'byhour'}{$hour}; + } + } + + $rpt .= sprintf("%-16s %8d (%3d%%) %8d (%3d%%)\n", + strftime("%Y-%m-%d %H", localtime($hour*3600)), + $Rh_stats->{'spam'}{'byhour'}{$hour} || 0, + $hourly_spam_percent, + $Rh_stats->{'ham'}{'byhour'}{$hour} || 0, + $hourly_ham_percent); + $hour++; + } + $rpt .= "\n\n"; + + if ($opt{'userstats'}) { + my $topusers = 25; + if (defined($opt{'topusers'}) && ($opt{'topusers'} > 0)) { + $topusers = $opt{'topusers'}; + } + my $usercount = scalar(keys(%{$Rh_userstats})); + if ($usercount > 0) { + my $upper_userlimit = ($usercount > $topusers) ? $topusers : $usercount; + + $rpt .= "Top $upper_userlimit spam victims:\n"; + $rpt .= "User S AvScr H AvScr Count % Count Bytes % Bytes Time % Time\n"; + $rpt .= "-------------------------------- ------- ------- -------- ---------- -------- ---------- -------- ----------\n"; + foreach my $user (sort { + $Rh_userstats->{$b}{'total'}{'count'} <=> $Rh_userstats->{$a}{'total'}{'count'} + } keys %{$Rh_userstats}) { + + foreach my $partition (qw(spam ham total)) { + foreach my $metric (qw(score bytes count time)) { + $Rh_userstats->{$user}{$partition}{$metric} ||= 0; + } + } + + $rpt .= sprintf("%-32s %7.2f %7.2f %8d (%7.2f%%) %8d (%7.2f%%) %8d (%7.2f%%)\n", + $user, + ($Rh_userstats->{$user}{'spam'}{'count'} > 0) ? + $Rh_userstats->{$user}{'spam'}{'score'} / $Rh_userstats->{$user}{'spam'}{'count'} : 0, + ($Rh_userstats->{$user}{'ham'}{'count'} > 0) ? + $Rh_userstats->{$user}{'ham'}{'score'} / $Rh_userstats->{$user}{'ham'}{'count'} : 0, + $Rh_userstats->{$user}{'spam'}{'count'}, + ($Rh_userstats->{$user}{'total'}{'count'} > 0) ? + 100 * $Rh_userstats->{$user}{'spam'}{'count'} / $Rh_userstats->{$user}{'total'}{'count'} : 0, + $Rh_userstats->{$user}{'spam'}{'bytes'}, + ($Rh_userstats->{$user}{'total'}{'bytes'} > 0) ? + 100 * $Rh_userstats->{$user}{'spam'}{'bytes'} / $Rh_userstats->{$user}{'total'}{'bytes'} : 0, + $Rh_userstats->{$user}{'spam'}{'time'}, + ($Rh_userstats->{$user}{'total'}{'time'} > 0) ? + 100 * $Rh_userstats->{$user}{'spam'}{'time'} / $Rh_userstats->{$user}{'total'}{'time'} : 0, + ); + } + } + $rpt .= "\n"; + } + + my $codename = $0; + $codename =~ s#^.*/##o; + $rpt .= "Done. Report generated in " . $Rh_timing->{'telapsed'} . " sec by $codename, version $VER_NUM.\n"; + + return $rpt; +} + +######################################## +# Build HTML report # +######################################## +sub build_html_report { + my $Rh_timing = shift; + my $Rh_stats = shift; + my $Rh_userstats = shift; + my $Rh_aggregate_stats = shift; + + my $rpt = ''; + + my $d_now = strftime("%c", localtime(time)); + my $d_start = strftime("%A, %B %e %Y %T %Z", localtime($Rh_timing->{'start'})); + my $d_end = strftime("%A, %B %e %Y %T %Z", localtime($Rh_timing->{'end'})); + my $d_telapsed = $Rh_timing->{'telapsed'}; + my $d_period = sprintf("%.2f", $Rh_timing->{'hrsinperiod'}); + + my $d_mean_thresh = sprintf("%.2f", $Rh_aggregate_stats->{'threshavg'}); + + my $t_spam_overview =<<"T_OVERVIEW"; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MessagesSizeTimeMean Score
    [#][#/hr][%][Kb][Kb/hr][%][s][s/hr][%][#]
    Ham$Rh_stats->{'ham'}{'count'}$Rh_stats->{'ham'}{'perhour'}{'count'}$Rh_stats->{'ham'}{'percent'}{'count'}$Rh_stats->{'ham'}{'d_kbytes'}$Rh_stats->{'ham'}{'perhour'}{'d_kbytes'}$Rh_stats->{'ham'}{'percent'}{'bytes'}$Rh_stats->{'ham'}{'d_time'}$Rh_stats->{'ham'}{'perhour'}{'time'}$Rh_stats->{'ham'}{'percent'}{'time'}$Rh_stats->{'ham'}{'d_mean_score'}
    Spam$Rh_stats->{'spam'}{'count'}$Rh_stats->{'spam'}{'perhour'}{'count'}$Rh_stats->{'spam'}{'percent'}{'count'}$Rh_stats->{'spam'}{'d_kbytes'}$Rh_stats->{'spam'}{'perhour'}{'d_kbytes'}$Rh_stats->{'spam'}{'percent'}{'bytes'}$Rh_stats->{'spam'}{'d_time'}$Rh_stats->{'spam'}{'perhour'}{'time'}$Rh_stats->{'spam'}{'percent'}{'time'}$Rh_stats->{'spam'}{'d_mean_score'}
    Total$Rh_stats->{'total'}{'count'}$Rh_stats->{'total'}{'perhour'}{'count'}$Rh_stats->{'total'}{'percent'}{'count'}$Rh_stats->{'total'}{'d_kbytes'}$Rh_stats->{'total'}{'perhour'}{'d_kbytes'}$Rh_stats->{'total'}{'percent'}{'bytes'}$Rh_stats->{'total'}{'d_time'}$Rh_stats->{'total'}{'perhour'}{'time'}$Rh_stats->{'total'}{'percent'}{'time'}$Rh_stats->{'total'}{'d_mean_score'}
    +T_OVERVIEW + + my $t_hourly =<<"T_HOURLY"; + + + + + + + + + + + + + + + + + + + + + +T_HOURLY + + my $hour = floor($Rh_timing->{'start'}/3600); + my $prev_day = ''; + + my $null_color = 'bgcolor="#CCCCFF"'; + my $spam_color = 'bgcolor="#FFCCCC"'; + my $ham_color = 'bgcolor="#CCFFCC"'; +# my $spam_mark = qq{}; +# my $ham_mark = qq{}; + while ($hour < $Rh_timing->{'end'}/3600) { + foreach my $partition (qw(spam ham total)) { + $Rh_stats->{$partition}{'byhour'}{$hour} = 0 unless + (defined($Rh_stats->{$partition}{'byhour'}{$hour}) && + ($Rh_stats->{$partition}{'byhour'}{$hour} > 0)); + } + + my $curr_hour = strftime("%H:00", localtime($hour*3600)); + my $curr_day = strftime("%Y-%m-%d", localtime($hour*3600)); + if ($curr_day ne $prev_day) { + $curr_hour = "$curr_day $curr_hour"; + } + $prev_day = $curr_day; + + my $ham_fraction = 0; + my $spam_fraction = 0; + my $check_total = $Rh_stats->{'ham'}{'byhour'}{$hour} + $Rh_stats->{'spam'}{'byhour'}{$hour}; + my $tab_graph = qq{}; + if ($Rh_stats->{'total'}{'byhour'}{$hour} > 0) { + $spam_fraction = int(10 * ($Rh_stats->{'spam'}{'byhour'}{$hour} / $check_total)); + $ham_fraction = 10 - $spam_fraction; + if ($spam_fraction == 10) { + $tab_graph = qq{}; + } elsif ($spam_fraction == 9) { + $tab_graph = qq{}; + $tab_graph .= ""; + } elsif ($spam_fraction == 1) { + $tab_graph = ""; + $tab_graph .= qq{}; + } elsif ($spam_fraction == 0) { + $tab_graph = qq{}; + } else { + $tab_graph = qq{}; + $tab_graph .= qq{}; + } +# $tab_graph = ($spam_mark x $spam_fraction) . ($ham_mark x $ham_fraction); + } + + $t_hourly .= sprintf(qq{%s\n}, + $curr_hour, + $Rh_stats->{'spam'}{'byhour'}{$hour}, + $Rh_stats->{'ham'}{'byhour'}{$hour}, + $tab_graph,); + + $hour++; + } + $t_hourly .= "
    Statistics by hour          
    HourSpamHam
               
    %s%d%d
    \n"; + + my $t_userstats = ''; + if ($opt{'userstats'} && defined($Rh_stats->{'total'}{'count'}) && + ($Rh_stats->{'total'}{'count'} > 0)) { + my $topusers = 25; + if (defined($opt{'topusers'}) && ($opt{'topusers'} > 0)) { + $topusers = $opt{'topusers'}; + } + + my $usercount = scalar(keys(%{$Rh_userstats})); + if ($usercount > 0) { + my $upper_userlimit = ($usercount > $topusers) ? $topusers : $usercount; + + $t_userstats =<<"T_USERSTATS"; + + + + + + + + + + + + + + + + + + + + + + +T_USERSTATS + +# $rpt .= "Top $upper_userlimit spam victims:\n"; +# $rpt .= "User S AvScr H AvScr Count % Count Bytes % Bytes Time % Time\n"; +# $rpt .= "-------------------------------- ------- ------- -------- ---------- -------- ---------- -------- ----------\n"; + foreach my $user (sort { + $Rh_userstats->{$b}{'total'}{'count'} <=> $Rh_userstats->{$a}{'total'}{'count'} + } keys %{$Rh_userstats}) { + + foreach my $partition (qw(spam ham total)) { + foreach my $metric (qw(score bytes count)) { + $Rh_userstats->{$user}{$partition}{$metric} ||= 0; + } + } + + my %avg_score = (); + foreach my $partition (qw(ham spam total)) { + + foreach my $metric (qw(count bytes time)) { + $Rh_userstats->{$user}{$partition}{$metric} = 0 unless + (defined($Rh_userstats->{$user}{$partition}{$metric})); + } + + if ($partition ne 'total') { + if (defined($Rh_userstats->{$user}{$partition}{'count'}) + && ($Rh_userstats->{$user}{$partition}{'count'} > 0)) { + $avg_score{$partition} = sprintf('%.2f', + $Rh_userstats->{$user}{$partition}{'score'} + / $Rh_userstats->{$user}{$partition}{'count'}); + } else { + $avg_score{$partition} = 0; + } + } + } + + $t_userstats .= sprintf(qq{\n}, + $user, + $avg_score{'spam'}, + $avg_score{'ham'}, + $Rh_userstats->{$user}{'spam'}{'count'}, + (defined($Rh_userstats->{$user}{'total'}{'count'}) && ($Rh_userstats->{$user}{'total'}{'count'} > 0)) ? + 100 * $Rh_userstats->{$user}{'spam'}{'count'} / $Rh_userstats->{$user}{'total'}{'count'} : 0, + $Rh_userstats->{$user}{'spam'}{'bytes'}, + (defined($Rh_userstats->{$user}{'total'}{'bytes'}) && ($Rh_userstats->{$user}{'total'}{'bytes'} > 0)) ? + 100 * $Rh_userstats->{$user}{'spam'}{'bytes'} / $Rh_userstats->{$user}{'total'}{'bytes'} : 0, + $Rh_userstats->{$user}{'spam'}{'time'}, + (defined($Rh_userstats->{$user}{'total'}{'time'}) && ($Rh_userstats->{$user}{'total'}{'time'} > 0)) ? + 100 * $Rh_userstats->{$user}{'spam'}{'time'} / $Rh_userstats->{$user}{'total'}{'time'}: 0, + ); + } + + $t_userstats .= "
    Top $upper_userlimit spam victimsSpam
    UserAvg. ScoreMessages ReceivedBytes ReceivedProcessing Time
    SpamHam[#]%[bytes]%[s]%
    %s%.2f%.2f%d%.2f%%%d%.2f%%%d%.2f%%
    \n
    \n"; + + } + } + + my $codename = $0; + $codename =~ s#^.*/##o; + + $rpt .=<<"HTMLPAGE"; + + + +SpamAssassin Statistics: $d_start - $d_end + + +

    SpamAssassin Statistics:

    +

    +Period of $d_period hour(s) extending from
    +$d_start to
    +$d_end +

    +

    +Generated on $d_now in $d_telapsed second(s) by $codename, version $VER_NUM. +

    +
    +

    +Note: 'ham' = 'nonspam' +

    +

    +The mean spam threshold score is $d_mean_thresh; mail scoring below the threshold is ham, mail scoring at or above the threshold is spam. +

    +$t_spam_overview +
    +$t_hourly +
    +$t_userstats +

    +Generated on $d_now in $d_telapsed second(s) by $codename, version $VER_NUM. +

    + + +HTMLPAGE + + return $rpt; +} + + +######################################## +# Process parms # +######################################## +sub parse_arg { + my $startdate = shift; + my $enddate = shift; + + my $secsinday = 86400; + my $time = 0; + + my $start = UnixDate($startdate,"%s"); + my $end = UnixDate($enddate, "%s"); + + if(!$start && !$end) { + $end = time; + $start = $end - $secsinday; + return ($start, $end); + } + + if(!$start) { + $start = $end - $secsinday; + return ($start, $end); + } + + if(!$end) { + $end = $start + $secsinday; + return ($start, $end); + } + + if($start > $end) { + return ($end, $start); + } + + # This assertion should always fail. + die "Warning: start time = end time -> $startdate = $enddate\n" + if ($start == $end); + + return ($start, $end); + +} + +sub dbg { + print STDERR @_ if ($opt{debug}); +} + +sub vdbg { + print STDERR @_ if ($opt{debug} && $opt{verbose}); +} + +__END__ + +=head1 NAME + +sa-stats.pl - Builds received spam/ham report from mail log + +=head1 VERSION + + $Revision: 1.17 $ + +=head1 SYNOPSIS + + Usage: sa-stats.pl [options] + + Options: + -l, --logfile=filename logfile to read + (default: /var/log/maillog) + -s, --start Sets date/time for start of reporting period + -e, --end Sets date/time for end of reporting period + -u, --userstats Generates stats for the top spam victims + (default is 25; see -T) + -H, --html Generates HTML report + (default: plain text) + -T, --top=# Display top # spam victims + (# defaults to 25; -T implies -u) + -h, --help Displays this message + -V, --version Display version info + --mail=emailaddress Sends report to emailaddress + --sendmail=/path/to/sendmail Location of sendmail binary + (default: /usr/sbin/sendmail) + --from=emailaddress Sets From: field of mail + -v, --verbose Sets verbose mode (requires -D) + -D, --debug Sets debug mode + +=head1 DESCRIPTION + +Creates simple text report of spam/ham detected by SpamAssassin by +parsing spamd entries in the mail log (generally /var/log/maillog) + +=head1 EXAMPLES + +To generate a text report from midnight to present using /var/log/maillog: + + ./sa-stats.pl -s 'midnight' -e 'now' > sa_stats.txt + +To generate an HTML report including the top 5 spam victims for the month of +January 2004 from compressed mail logs: + + gunzip -c /var/log/maillog-200401*.gz | ./sa-stats.pl -H -T 5 -l - \ + -s '2001-01-01 00:00:00' -e '2004-01-31 23:59:59' > jan_2004_stats.html + +Note the use of '-' as a filename to represent STDIN. + +To generate a text report with per-user stats from yesterday, reading from +/var/log/mail and turning on all debugging output: + + ./sa-stats.pl -v -D -u -l /var/log/mail \ + -s 'yesterday midnight' 1>stats.txt 2>stats.err + +=head1 TIPS + +=over 4 + +=item * + +Are you running spamd? Currently sa-stats.pl only reads syslog entries from +spamd; it doesn't work with MTA-level calls to Mail::SpamAssassin or with logs +generated by the spamassassin perl script. + +=item * + +Are there spamd entries in your mail log? Use 'grep spamd /var/log/maillog' to find out. + +=item * + +Are there spamd entries in your mail log within the analysis interval? Run +'sa-stats.pl -v -D ...' to see the entries that are found and discarded as well +as to see the actual analysis interval. + +=back + +=head1 DEPENDENCIES + +=over 4 + +=item * + +Getopt::Long + +=item * + +POSIX + +=item * + +Time::Local + +=item * + +Date::Manip + +=item * + +Parse::Syslog; + +=back + +=head1 BUGS + +=over 4 + +=item * + +Because of poor year handling in Parse::Syslog, the script may not +work well when the log file dates back to the previous year. + +=back + +=head1 TO DO + +=over 4 + +=item * + +Find bugs + +=item * + +Fix bugs + +=item * + +Don't call /usr/sbin/sendmail directly; use Mail::Internet or Net::SMTP or other standard module + +=item * + +Add support for compressed logs (see gzopen() from Compress::Zlib) + +=item * + +Have --verbose work without --debug + +=back + +=head1 AUTHORS + +Brad Rathbun http://www.computechnv.com/ + +Bob Apthorpe http://www.cynistar.net/~apthorpe/ + +Duncan Findlay + +=head1 SEE ALSO + +Mail::SpamAssassin, Date::Manip, spamd(1) + +=cut diff -Nru spamassassin-3.4.6/tools/speedtest spamassassin-4.0.0~rc3/tools/speedtest --- spamassassin-3.4.6/tools/speedtest 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/speedtest 2006-08-16 04:28:06.000000000 +0000 @@ -0,0 +1,43 @@ +#!/usr/bin/perl -w +# <@LICENSE> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +use strict; + +use FindBin; +use lib "$FindBin::Bin/../lib"; +use Mail::SpamAssassin; + +my $spamtest = Mail::SpamAssassin->new({ + rules_filename => 'rules', + dont_copy_prefs => 1, + local_tests_only => 1, + debug => 0, + paranoid => 0, +}); + +for($_=shift @ARGV; defined($_); $_=shift @ARGV) +{ + open (FILE, "<$_"); + my $mail = $spamtest->parse (\*FILE); + close(FILE); + + my $status = $spamtest->check($mail); + print $status->get_hits," $_ ",$status->get_names_of_tests_hit,"\n"; + $status->finish(); + $mail->finish(); +} diff -Nru spamassassin-3.4.6/tools/split_corpora spamassassin-4.0.0~rc3/tools/split_corpora --- spamassassin-3.4.6/tools/split_corpora 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/split_corpora 2020-08-13 13:19:21.000000000 +0000 @@ -0,0 +1,92 @@ +#!/usr/bin/perl -w + +use FindBin; +use lib "$FindBin::Bin/../lib"; + +use strict; + +use Mail::SpamAssassin::ArchiveIterator; +use Getopt::Std; +use FileHandle; + +########### + +sub usage { + print STDERR "split-corpora [-n num_buckets] [-p outfile_prefix] ". + "[-l max_messages] ". + "folder1 ....\n"; + exit(1); +} # usage() + +########### + +our ($opt_n, $opt_p, $opt_h, $opt_l); + +getopt('n:p:l:h'); + +usage() if ($opt_h); + +my $num_buckets = $opt_n || 2; +my $prefix = $opt_p || "bucket"; +my @IN_FILES = @ARGV; + +usage() if (@IN_FILES == 0); + +my @targets = (); +foreach (@IN_FILES) { + if (-d $_) { + push (@targets, "ham:dir:$_"); + } else { + push (@targets, "ham:mbox:$_"); + } +} + +my @bucket_fhs = (); +foreach my $bucket (1 .. $num_buckets) { + my $bucket_fh = FileHandle->new(); + + if (!$bucket_fh->open(">$prefix.$bucket")) { + die "Could not open '$prefix.$bucket' for writing: $!\n"; + } + + push(@bucket_fhs, $bucket_fh); +} # foreach my $bucket (1 .. $num_buckets) + +my $current_bucket = 0; + +my $iter = Mail::SpamAssassin::ArchiveIterator->new({ + 'opt_all' => 1, + }); + +$iter->set_functions(\&wanted, sub { }); +my $messagecount = 0; + +eval { + $iter->run(@targets); +}; +if ($@) { die $@ unless ($@ =~ /HITLIMIT/); } + +foreach my $fh (@bucket_fhs) { + $fh->close(); +} +if ($opt_l && $messagecount < $opt_l) { + warn "warning: only found $messagecount messages instead of $opt_l\n"; +} + +############################################# + +sub wanted { + my (undef, $msg_id, $time, $data_ref) = @_; + + if ($opt_l && $messagecount++ > $opt_l) { die 'HITLIMIT'; } + + # Make sure message can be used for outputing mbox format + if ($data_ref->[0] !~ /^From \S+ +... ... /) { + unshift(@$data_ref, "From abc\@xyz.com Mon Jan 1 00:00:00 2000\n"); + } + + $bucket_fhs[$current_bucket]->print( join("", @$data_ref) ); + + $current_bucket = ($current_bucket + 1) % $num_buckets; +} # wanted() + diff -Nru spamassassin-3.4.6/tools/sysreport spamassassin-4.0.0~rc3/tools/sysreport --- spamassassin-3.4.6/tools/sysreport 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/sysreport 2004-09-30 15:00:12.000000000 +0000 @@ -0,0 +1,107 @@ +#!/usr/bin/perl -w + +use strict; +no strict 'refs'; + + +my %vars = (); + +foreach (@ARGV) { + my ($n, $v) = split('=', $_); + $vars{$n} = $v; +} + +my @checks = qw( + PERL CC AUTOMAKE AUTOCONF LIBTOOL +); + +foreach my $check (@checks) { + my @check = &{"check_$check"}; + $check = sprintf("% 10s %s %s", $check, shift(@check), shift(@check)); + $check .= sprintf(" (%s)", join('; ', @check)) if @check; + $check .= "\n"; + print $check; +} + + +sub check_PERL { + my @meta; + + my $pl = $vars{'PERL_BIN'} || ''; + $pl = '' if $pl eq 'this'; + $pl ||= $vars{'PERL'} || "perl"; + $pl = (split(/\s+/, $pl))[0]; + + my @plver = split(/\s+/, `$pl --version 2>&1` || ''); + my $plver; + if($plver[4] ne 'version') { + $plver = $plver[4]; + $plver =~ s/^v//; + } else { + $plver = sprintf("%i.%i.%i", split(/[._]/, $plver[5]), 0); + } + + push(@meta, 'override') if $vars{'PERL'} and $pl ne $vars{'PERL'}; + return($pl, $plver, @meta); +} + +sub check_CC { + my @meta; + my $cc = $vars{'CC'} || "cc"; + + my $ccver = (`$cc --version 2>&1`)[0] || 0; + chomp($ccver); + my $gnucc = grep("gnu", `$cc --help 2>&1` || ''); + + push(@meta, 'gnu') if $gnucc; + return($cc, $ccver, @meta); +} + +sub check_LIBC { + my @meta; + my $lc = grep(/libc/, (`ldd /bin/sh 2>&1`)); + $lc = (split(/\s+/, $lc))[3]; + + return($lc, 0, @meta); +} + +sub check_LDD { + my @meta; + +} + +sub check_AUTOMAKE { + my @meta; + my $am = $vars{'AUTOMAKE'} || "automake"; + + my @amver = split(/\s+/, `$am --version 2>&1` || ''); + my $gnuam = $amver[1] =~ /GNU/i; + my $amver = $gnuam ? $amver[3] : 0; + + push(@meta, 'gnu') if $gnuam; + return($am, $amver, @meta); +} + +sub check_AUTOCONF { + my @meta; + my $ac = $vars{'AUTOCONF'} || "autoconf"; + + my @acver = split(/\s+/, `$ac --version 2>&1` || ''); + my $gnuac = $acver[1] =~ /GNU/i; + my $acver = $gnuac ? $acver[3] : 0; + + push(@meta, 'gnu') if $gnuac; + return($ac, $acver, @meta); +} + +sub check_LIBTOOL { + my @meta; + my $lt = $vars{'LIBTOOL'} || "libtool"; + + my @ltver = split(/\s+/, `$lt --version 2>&1` || ''); + my $gnult = $ltver[1] =~ /GNU/i; + my $ltver = $gnult ? $ltver[3] : 0; + + push(@meta, 'gnu') if $gnult; + return($lt, $ltver, @meta); +} diff -Nru spamassassin-3.4.6/tools/test_extract spamassassin-4.0.0~rc3/tools/test_extract --- spamassassin-3.4.6/tools/test_extract 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/tools/test_extract 2005-05-24 22:45:55.000000000 +0000 @@ -0,0 +1,40 @@ +#!/usr/bin/perl -w + +# Duncan Findlay + +# Remove regression tests from the rules to a separate file, so they +# aren't included with the default config (somewhat useless!) + +my $num_tests = 0; + +my @files = <./*.cf>; + +open (TESTS, ">> regression_tests.cf"); + +foreach my $file (@files) { + if ($file =~ /regression_tests\.cf/) { + next; + } + + rename "$file", "$file.bak" or die "Can't rename: $!"; + open IN, "$file.bak"; + open OUT, ">>$file"; + + while () { + if (/^test/) { + print TESTS $_; + $num_tests++; + } else { + print OUT $_; + } + }; + close IN; + close OUT; + unlink "$file.bak" or die "Can't delete: $!"; + +} + +close TESTS; + +print "All done! $num_tests moved.\n"; + diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/clienthosts spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/clienthosts --- spamassassin-3.4.6/trunk-only/backend/nitemc/clienthosts 2008-09-18 16:06:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/clienthosts 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -jm@talon1.pccc.com:-j16 -jm@infiltrator.stdlib.net:-j16 diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/corpora_runs spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/corpora_runs --- spamassassin-3.4.6/trunk-only/backend/nitemc/corpora_runs 2014-06-16 02:14:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/corpora_runs 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#!/bin/sh - -# Cron script for "release". see "backend/nitemc/crontab.txt" - -TZ=UTC; export TZ -DIR=$HOME/versions/trunk -#Changed for spamassassin-vm -SVN=/usr/bin/svn -SVNVERS=/usr/bin//svnversion - -if [ ! -d $DIR ]; then - echo "Whaaaa?!? No directory?" >&2 - exit 2 -fi - -cd $DIR -$SVN update > /dev/null -if [ $? -ne 0 ]; then - echo "Problem doing svn update" >&2 - exit 1 -fi - -RREV=`$SVNVERS .` -REV=`echo $RREV | awk -F: '{print $1}' | tr -cd '[0-9]'` -DATE=`date "+%Y-%m-%d"` - -echo -e "$DATE\t$REV" diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/corpus.default spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/corpus.default --- spamassassin-3.4.6/trunk-only/backend/nitemc/corpus.default 2009-07-21 22:10:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/corpus.default 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -opts_weekly="--net -j 8 --reuse" -opts_nightly="--reuse" -opts="--cache --cachedir=/tmpfs/aicache_nightly --restart=500 ham:detect:/export/home/bbmass/uploadedcorpora/__USERNAME__/ham/* --after=-15552000 --tail=50000 spam:detect:/export/home/bbmass/uploadedcorpora/__USERNAME__/spam/*" -tmp=$HOME/tmp -tree=$HOME/svn -prefs_weekly=$HOME/user_prefs.weekly -prefs_nightly=$HOME/user_prefs.nightly -username=bb-__USERNAME__ -password=__RSYNC_PASSWORD__ diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/corpus.jm spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/corpus.jm --- spamassassin-3.4.6/trunk-only/backend/nitemc/corpus.jm 2009-07-22 09:57:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/corpus.jm 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -opts_weekly="--net -j 16 --reuse" -opts_nightly="-j 8 --reuse" -opts="--cache --cachedir=/tmpfs/aicache_nightly --restart=500 ham:detect:/export/home/bbmass/uploadedcorpora/__USERNAME__/ham/* --after=-15552000 --tail=100000 --scanprob=0.3 spam:detect:/export/home/bbmass/uploadedcorpora/__USERNAME__/spam/*" -tmp=$HOME/tmp -tree=$HOME/svn -prefs_weekly=$HOME/user_prefs.weekly -prefs_nightly=$HOME/user_prefs.nightly -username=bb-__USERNAME__ -password=__RSYNC_PASSWORD__ diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/corpus.traps spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/corpus.traps --- spamassassin-3.4.6/trunk-only/backend/nitemc/corpus.traps 2009-07-09 21:40:38.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/corpus.traps 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -opts_weekly="--net -j 8 --reuse --cache --cachedir=/tmpfs/aicache_nightly --restart=500 ham:detect:/export/home/bbmass/uploadedcorpora/traps/ham/* --after="-15552000" --tail=50000 spam:detect:/export/home/bbmass/uploadedcorpora/doc/spam/*" -opts_nightly=" --reuse --cache --cachedir=/tmpfs/aicache_nightly --restart=500 ham:detect:/export/home/bbmass/uploadedcorpora/traps/ham/* --after="-15552000" --tail=50000 spam:detect:/export/home/bbmass/uploadedcorpora/doc/spam/*" -tmp=$HOME/tmp -tree=$HOME/svn -prefs_weekly=$HOME/user_prefs.weekly -prefs_nightly=$HOME/user_prefs.nightly -username=bb-traps -password=__RSYNC_PASSWORD__ diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/crontab.txt spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/crontab.txt --- spamassassin-3.4.6/trunk-only/backend/nitemc/crontab.txt 2009-07-11 21:43:11.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/crontab.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -# sudo crontab -e release: - -# Remember, we're in UTC here ... -50 8 * * 0-5 /export/home/svn-trunk/backend/nitemc/corpora_runs >> /home/corpus-rsync/corpus/nightly-versions.txt -53 8 * * 0-5 /export/home/svn-trunk/backend/nitemc/extract_to_rsync_dir nightly /home/corpus-rsync/corpus/nightly-versions.txt > $HOME/extract.log 2>&1 -50 8 * * 6 /export/home/svn-trunk/backend/nitemc/corpora_runs >> /home/corpus-rsync/corpus/weekly-versions.txt -53 8 * * 6 /export/home/svn-trunk/backend/nitemc/extract_to_rsync_dir weekly /home/corpus-rsync/corpus/weekly-versions.txt > $HOME/extract.log 2>&1 - diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/empty.mbox spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/empty.mbox --- spamassassin-3.4.6/trunk-only/backend/nitemc/empty.mbox 2009-07-21 22:12:05.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/empty.mbox 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -From corpus@jmason.org Tue Feb 1 00:00:00 2008 -Return-Path: -From: nobody@example.com -To: nobody@example.com -Subject: Empty message - -nothing here - diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/extract_to_rsync_dir spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/extract_to_rsync_dir --- spamassassin-3.4.6/trunk-only/backend/nitemc/extract_to_rsync_dir 2014-06-16 20:25:08.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/extract_to_rsync_dir 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -#!/bin/sh - -# Cron script for "release". See "backend/nitemc/crontab.txt" - -RSYNC_DIR=/home/corpus-rsync/tagged_builds -REPO_URL=http://svn.apache.org/repos/asf/spamassassin/trunk -#switched to system perl for spamassassin-vm and system svn -PERL=/usr/bin/perl -SVN=/usr/bin/svn -#PERL=/local/perl586/bin/perl -#SVN=/opt/subversion-current/bin/svn - - -type="$1" -versfile="$2" - -if [ -z "$type" ]; then - echo "Type not specified" >&2 - exit 1 -fi - -if [ ! -f $versfile ]; then - echo "Version file not specified" >&2 - exit 1 -fi - -subdir=${type}_mass_check - -# No Idea why this command is here even AFTER reading the docs... -# bash man for set -# -# Without options, the name and value of each shell variable are displayed in a format that can be reused as input for setting or resetting the currently-set variables. Read-only variables cannot be -# reset. In posix mode, only shell variables are listed. The output is sorted according to the current locale. When options are specified, they set or unset shell attributes. Any arguments remain- -# ing after option processing are treated as values for the positional parameters and are assigned, in order, to $1, $2, ... $n. Options, if specified, have the following meanings: -# -e Exit immediately if a pipeline (which may consist of a single simple command), a subshell command enclosed in parentheses, or one of the commands executed as part of a command list enclosed -# by braces (see SHELL GRAMMAR above) exits with a non-zero status. The shell does not exit if the command that fails is part of the command list immediately following a while or until key- -# word, part of the test following the if or elif reserved words, part of any command executed in a && or ││ list except the command following the final && or ││, any command in a pipeline but -# the last, or if the command’s return value is being inverted with !. A trap on ERR, if set, is executed before the shell exits. This option applies to the shell environment and each sub- -# shell environment separately (see COMMAND EXECUTION ENVIRONMENT above), and may cause subshells to exit before executing all the commands in the subshell. -# -x After expanding each simple command, for command, case command, select command, or arithmetic for command, display the expanded value of PS4, followed by the command and its expanded argu- -# ments or associated word list. -set -ex - -echo "Type: $type" -echo "Version File: $versfile" -echo "Subdir: $subdir" - -REV=`tail -1 $versfile | awk '{print $2}'` - -echo "Revision: $REV" - -for retry in 1 2 3 4 5 6 7 8 9 10 ; do - - # export the main repo: - rm -rf $RSYNC_DIR/$subdir - echo Command: $SVN export --non-interactive \ - -r $REV $REPO_URL $RSYNC_DIR/$subdir - $SVN export --non-interactive -r $REV $REPO_URL $RSYNC_DIR/$subdir \ - || continue - - cd $RSYNC_DIR/$subdir - $PERL build/mkrules --out rules > /dev/null || continue - - # create "svn info" file for mass-check - # we assume that the current directory was updated via cron to the correct - # revision, so just info it. (can't do remote info with the svn version - # installed on the zones machine, nor will it accept "--non-interactive") - $SVN info $HOME/versions/trunk \ - > $RSYNC_DIR/$subdir/masses/svninfo.tmp \ - < /dev/null || continue - - exit # assume success at this point -done - -echo "FAILED to extract to rsync dir" 1>&2 -exit 2 - diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/README spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/README --- spamassassin-3.4.6/trunk-only/backend/nitemc/README 2005-11-21 19:32:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ - -These files are run by uid "release" on "spamassassin.zones.apache.org", -from cron, in order to tag nightly and weekly mass-check revisions -and build copies of the source tree for those revs. - diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/run_all spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/run_all --- spamassassin-3.4.6/trunk-only/backend/nitemc/run_all 2009-07-17 22:47:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/run_all 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/sh -# -# driver for nightly mass-checks on the zone. run from cron as: -# 0 9 * * * /export/home/svn-trunk/backend/nitemc/run_all -# -# details: http://wiki.apache.org/spamassassin/NightlyMassCheck - -# Ensure we're running after 0900 UTC; complex due to daylight savings. If -# we're running in the 08xx UTC hour-space, sleep for 1 hour; when we wake, we -# will be in 09xx. By doing it this way, we'll work both for (a) mass-checks -# set to run from cron at 09xx (cron doesn't understand DST/UTC issues) and (b) -# mass-checks starting at other times that != 09xx. -( - TIME="%e,%U,%S"; TZ=UTC; export TIME TZ - if date | egrep '^... ... .. 08:'; then - date; echo "sleeping for 1 hour to compensate for DST" - sleep 3600 ; date - fi -) - -echo "nitemc run_all starting at" ; date - -pkill -15 -f -u nitemc perl -pkill -15 -f -u nitemc ssh - -all_users=`ls /export/home/bbmass/uploadedcorpora` -nitedir=/export/home/svn-trunk/backend/nitemc -workdir=/export/home/nitemc - -$nitedir/svn_checkout - -for user in $all_users ; do - $nitedir/run_one_nitemc $user -done - diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/run_one_nitemc spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/run_one_nitemc --- spamassassin-3.4.6/trunk-only/backend/nitemc/run_one_nitemc 2009-07-21 22:12:05.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/run_one_nitemc 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -#!/bin/sh - -user="$1" -[ "$user" = "" ] && echo "usage: run_one_nitemc username" -[ "$user" = "" ] && exit 99 - -# where the $HOMEs are: -userdir=/export/home/nitemc/$user -svndir=/export/home/nitemc/svn - -mkdir -p $userdir -cd $userdir -mv log log.1 - -( -echo "Starting corpus-nightly for $user ($svndir , $userdir)" - -. /etc/profile -HOME=$userdir -PERL=/local/perl586/bin/perl -TMPDIR=/tmpfs -export HOME PERL TMPDIR - -# create the .corpus file, keeping the rsync password secret; -# the string __RSYNC_PASSWORD__ will be replaced with the -# contents of /export/home/nitemc/USERNAME/rsync_password - -src=$svndir/backend/nitemc/corpus.$user -[ -f $src ] || src=$svndir/backend/nitemc/corpus.default - -if [ ! -f rsync_password ] ; then - cp ../rsync_password.default rsync_password -fi - -perl -pe ' - s{__USERNAME__}{'$user'}g; - s{__RSYNC_PASSWORD__}{ incfile("rsync_password") }eg; - - sub incfile { - my $file = shift; - my $new=`cat $file`; chop $new; $new =~ s/\s+/ /gs; - return "\"".$new."\""; - } -' $src > .corpus - -# clean up any trash from another user's mass-checks -rm -rf $svndir/masses/tmp -rm -rf $svndir/masses/spamassassin -rm -rf $svndir/masses/*.log - -# ensure we use the shared SVN checkout -rm -f svn -ln -s ../svn svn - -# set up default user_prefs, override with a custom one if existing -echo ' - use_bayes 0 - use_auto_whitelist 0 - internal_networks 127/8 - trusted_networks 127/8 -' > user_prefs.default -[ -f user_prefs.nightly ] || cp user_prefs.default user_prefs.nightly -[ -f user_prefs.weekly ] || cp user_prefs.default user_prefs.weekly - -# ensure we always have at least 1 mail of each class for each user -for class in ham spam ; do - corpusdir=/export/home/bbmass/uploadedcorpora/$user/$class - if [ `ls $corpusdir | wc -l` = 0 ] ; then - mkdir -p $corpusdir - cp $svndir/backend/nitemc/empty.mbox $corpusdir - fi -done - -cd $svndir -exec nice bash $svndir/masses/rule-qa/corpus-nightly - -) 2>&1 | tee log - diff -Nru spamassassin-3.4.6/trunk-only/backend/nitemc/svn_checkout spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/svn_checkout --- spamassassin-3.4.6/trunk-only/backend/nitemc/svn_checkout 2009-07-17 22:18:40.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/nitemc/svn_checkout 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh - -. /etc/profile -HOME=/export/home/nitemc -PERL=/local/perl586/bin/perl -TMPDIR=/tmpfs - -export HOME PERL TMPDIR - -# attempt to ensure the "build" dir and raw .corpus file is up to date -# (don't worry about tags etc. just yet) -( - cd /export/home/nitemc - rm -rf svn - svn co http://svn.apache.org/repos/asf/spamassassin/trunk svn || - svn co http://svn.apache.org/repos/asf/spamassassin/trunk svn || - svn co http://svn.apache.org/repos/asf/spamassassin/trunk svn - -) < /dev/null - diff -Nru spamassassin-3.4.6/trunk-only/backend/root/backup/backup_zone spamassassin-4.0.0~rc3/trunk-only/backend/root/backup/backup_zone --- spamassassin-3.4.6/trunk-only/backend/root/backup/backup_zone 2009-11-05 23:51:47.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/root/backup/backup_zone 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -#!/bin/sh -# -# a basic backup script for the stuff on the zone; we can't check it all -# in due to (a) volume and (b) embedded rsync passwords in .corpus files etc. -# -# run as root, a la -# -# sudo /export/home/svn-trunk/backend/root/backup/backup_zone - -bupdir=/zonestorage/spamassassin/backup -[ `uname -n` = spamassassin2 ] && bupdir=/zonestorage/spamassassin2/backup - -########################################################################### - -die () { - echo "$*" 1>&2 - exit 1 -} - -rsyncup () { - dir="$1" - name=$2 - - rsync=rsync - [ -x /usr/sfw/bin/rsync ] && rsync=/usr/sfw/bin/rsync - [ -x /opt/sfw/bin/rsync ] && rsync=/opt/sfw/bin/rsync - [ -x /opt/csw/bin/rsync ] && rsync=/opt/csw/bin/rsync - - excludedir=`dirname $0` - - [ -d rsynced/$name ] || mkdir -p rsynced/$name - chmod 700 rsynced - - touch $name.log - chmod 600 $name.log - - ( - #nice -20 $dtar --create --file=- \ - #--sparse --exclude-from=$excludedir/excludes \ - #--label="Backup of $dir at `date`" \ - #"$dir" | nice -20 gzip -2 - - nice -20 $rsync -a \ - --hard-links --whole-file --delete \ - --sparse --exclude-from=$excludedir/excludes \ - "$dir/." "rsynced/$name/." - - ) > $name.log 2>&1 -} - -########################################################################### - -mkdir -p $bupdir 2>/dev/null -cd $bupdir || die "failed to cd to $bupdir" - -[ -f LOG ] && mv LOG LOG.1 -[ -f LOG.1 ] && mv LOG.1 LOG.2 - -( -for dir in `ls /export/home` ; do - - [ "$dir" = "OBSOLETE" ] && continue - rsyncup /export/home/$dir export-home-$dir - -done - -rsyncup /usr/local usr-local -rsyncup /var/www var-www -rsyncup /opt opt -rsyncup /local local -rsyncup /etc etc - -) 2>&1 | tee LOG - -exit 0 - diff -Nru spamassassin-3.4.6/trunk-only/backend/root/backup/excludes spamassassin-4.0.0~rc3/trunk-only/backend/root/backup/excludes --- spamassassin-3.4.6/trunk-only/backend/root/backup/excludes 2009-07-10 09:03:09.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/root/backup/excludes 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -tmp -tmpfs -log -rawcor -uploadedcorpora -*.log -*.bak -*.log.* -*.o -.bash_history -core -OBSOLETE diff -Nru spamassassin-3.4.6/trunk-only/backend/root/backup/rsync_spamassassin2_to_spamassassin spamassassin-4.0.0~rc3/trunk-only/backend/root/backup/rsync_spamassassin2_to_spamassassin --- spamassassin-3.4.6/trunk-only/backend/root/backup/rsync_spamassassin2_to_spamassassin 2009-07-10 10:46:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/root/backup/rsync_spamassassin2_to_spamassassin 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/bin/sh - -fromdir=/zonestorage/spamassassin2/backup -todir=rbackup@spamassassin.zones.apache.org:/zonestorage/spamassassin/remote_backup/spamassassin2.zones.apache.org - -mv $fromdir/rbackup.log $fromdir/rbackup.log.1 -exec rsync -vre 'ssh -v -i /export/home/rbackup/rsync-key' \ - --rsync-path=/opt/sfw/bin/rsync \ - --delete \ - $fromdir/. \ - $todir \ - > $fromdir/rbackup.log 2>&1 - diff -Nru spamassassin-3.4.6/trunk-only/backend/root/backup/rsync_spamassassin_to_spamassassin2 spamassassin-4.0.0~rc3/trunk-only/backend/root/backup/rsync_spamassassin_to_spamassassin2 --- spamassassin-3.4.6/trunk-only/backend/root/backup/rsync_spamassassin_to_spamassassin2 2009-07-10 10:46:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/backend/root/backup/rsync_spamassassin_to_spamassassin2 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/bin/sh - -fromdir=/zonestorage/spamassassin/backup -todir=rbackup@spamassassin2.zones.apache.org:/zonestorage/spamassassin2/remote_backup/spamassassin.zones.apache.org - -mv $fromdir/rbackup.log $fromdir/rbackup.log.1 -exec rsync -vre 'ssh -v -i /export/home/rbackup/rsync-key' \ - --rsync-path=/opt/csw/bin/rsync \ - --delete \ - $fromdir/. \ - $todir \ - > $fromdir/rbackup.log 2>&1 - diff -Nru spamassassin-3.4.6/trunk-only/contrib/HOWTO.Bayes-Redis/readme.txt spamassassin-4.0.0~rc3/trunk-only/contrib/HOWTO.Bayes-Redis/readme.txt --- spamassassin-3.4.6/trunk-only/contrib/HOWTO.Bayes-Redis/readme.txt 2014-10-29 15:27:26.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/contrib/HOWTO.Bayes-Redis/readme.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - - -# Updated: 2014-09-04 (axb@apache.org) - -What's so cool about Bayes/Redis - -- speed, speed, speed -- zero maintenance -- cheap to run - all it needs is cheap memory - the more the better. -- Hint: feed spam from trap box with longer expiration times than production traffic - - ------------------------------------------- -Get Redis "Stable" from - -http://redis.io/download - -Follow steps in "Installation" - -Redis docs: http://redis.io/documentation - -run "redis-cli info" to get an idea of what's going on. - -see Redis cli commands -http://redis.io/commands - -If you need help, pls use the SA user's mailing list -If you're a Redis/Bayes user please post some feedback in the SA user's mailing list - - -Resources usage to give you an idea how much memory you may need on a biggish system -with a token TTL of 10 days. - -sa-learn --dump magic -0.000 0 3 0 non-token data: bayes db version -0.000 0 30125835 0 non-token data: nspam -0.000 0 13887519 0 non-token data: nham - -30 MILLION! use: - -# Memory -used_memory:5787709376 -used_memory_human:5.39G -used_memory_rss:5909553152 -used_memory_peak:5808814272 -used_memory_peak_human:5.41G -used_memory_lua:104448 -mem_fragmentation_ratio:1.02 -mem_allocator:jemalloc-3.2.0 diff -Nru spamassassin-3.4.6/trunk-only/contrib/HOWTO.Bayes-Redis/Redis-server/redis.conf spamassassin-4.0.0~rc3/trunk-only/contrib/HOWTO.Bayes-Redis/Redis-server/redis.conf --- spamassassin-3.4.6/trunk-only/contrib/HOWTO.Bayes-Redis/Redis-server/redis.conf 2014-06-07 12:27:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/contrib/HOWTO.Bayes-Redis/Redis-server/redis.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ - -# Axb 2014-06-07 -# /etc/redis/redis.conf - -#NOTE: We're not using authentication assuming the redis server/port should not be reachable form the "outside" - -daemonize yes -port 6379 - -pidfile /var/run/redis.pid -logfile /var/log/redis.log -#loglevel notice -loglevel verbose - -databases 16 -save 600 1 - -dir /var/lib/redis -dbfilename dump.rdb - -maxclients 1024 -timeout 30 - -# I DON'T WANT A MEMORY LIMIT! -# 100 MB -# maxmemory 104857600 - - - diff -Nru spamassassin-3.4.6/trunk-only/contrib/HOWTO.Bayes-Redis/Redis-server/RH-redis-server.init spamassassin-4.0.0~rc3/trunk-only/contrib/HOWTO.Bayes-Redis/Redis-server/RH-redis-server.init --- spamassassin-3.4.6/trunk-only/contrib/HOWTO.Bayes-Redis/Redis-server/RH-redis-server.init 2014-06-07 12:19:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/contrib/HOWTO.Bayes-Redis/Redis-server/RH-redis-server.init 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -#!/bin/sh -# -# redis - this script starts and stops the redis-server daemon -# -# chkconfig: - 85 15 -# description: Redis is a persistent key-value database -# processname: redis-server -# config: /etc/redis/redis.conf -# config: /etc/sysconfig/redis -# pidfile: /var/run/redis.pid - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -# Check that networking is up. -[ "$NETWORKING" = "no" ] && exit 0 - -redis="/usr/local/bin/redis-server" -prog=$(basename $redis) - -REDIS_CONF_FILE="/etc/redis/redis.conf" - -[ -f /etc/sysconfig/redis ] && . /etc/sysconfig/redis - -lockfile=/var/lock/subsys/redis - -start() { - [ -x $redis ] || exit 5 - [ -f $REDIS_CONF_FILE ] || exit 6 - echo -n $"Starting $prog: " - daemon $redis $REDIS_CONF_FILE - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc $prog -QUIT - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - echo -n $"Reloading $prog: " - killproc $redis -HUP - RETVAL=$? - echo -} - -force_reload() { - restart -} - -rh_status() { - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart|configtest) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac diff -Nru spamassassin-3.4.6/trunk-only/contrib/HOWTO.Bayes-Redis/SA-rule/bayes_redis.cf spamassassin-4.0.0~rc3/trunk-only/contrib/HOWTO.Bayes-Redis/SA-rule/bayes_redis.cf --- spamassassin-3.4.6/trunk-only/contrib/HOWTO.Bayes-Redis/SA-rule/bayes_redis.cf 2017-04-11 03:15:10.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/contrib/HOWTO.Bayes-Redis/SA-rule/bayes_redis.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -# Updated-Axb 2014-08-20 -# This goes in /etc/mail/spamassassin - - -# You'll need to set IP to your Redis server's IP -# Redis-server-ip:Redis server listening port -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -# Tell SA to use Bayes/Redis backend -bayes_store_module Mail::SpamAssassin::BayesStore::Redis - - -# NOTE: In this example, we're not using Redis authentication assuming -# the Redis server/port will not be reachable from the "outside". -# See Redis docs for authentication syntax - -bayes_sql_dsn server=192.168.1.2:6379,database=0 - -use_bayes 1 -use_bayes_rules 1 - -# Your choice if you want to use auto_learn -bayes_auto_learn 1 - -use_learner 1 -bayes_learn_to_journal 0 - - - -# THIS IS MANDATORY - You do NOT need to run sa-learn to expire tokens -# *_ttl below takes care of it. -bayes_auto_expire 1 - -# You will need to changes this according to your need -# This replaces sa-learn's sql/file based expire routines. -bayes_token_ttl 30d -bayes_seen_ttl 14d - diff -Nru spamassassin-3.4.6/trunk-only/contrib/mbox-to-check spamassassin-4.0.0~rc3/trunk-only/contrib/mbox-to-check --- spamassassin-3.4.6/trunk-only/contrib/mbox-to-check 2006-08-16 04:28:06.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/contrib/mbox-to-check 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -#! /usr/bin/perl -w -use strict; - -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Written by Theo Van Dinter -# Please feel free to mail with any questions. :) - -# This goes with the run-masses script to take the ham/spam directories -# and spit out the appropriate spam:mbox:path statements for mass-check. -# The directory structure is assumed to look something like this: -# -# $CORPUS (this script, run-masses, etc) -# |-- ham (dir with mbox files for ham) -# | |-- hamtrap (dirs split into YYYY/MM/DD) -# | `-- personal (dirs split into YYYY/MM/DD) -# `-- spam (empty) -# |-- personal (dirs split into YYYY/MM/DD) -# `-- spamtrap (dirs split into YYYY/MM/DD) - - -# if you don't have {ham,spam}trap mail broken out, set this to 0. -my $include_traps = 1; - -# which dirs have mbox files? -my @dirs = ( 'ham' ); - -# how many days should we limit to searching for the dir areas? -# ie: assuming we have years of messages in YYYY/MM/DD directories, only look -# at the most recent X so that mass-check will go faster in the scan stage. -# comment out the line if you don't want to limit. -my $RECENT = 120; - - -my $actualdir = "./"; -if (@ARGV) { - $actualdir = shift(@ARGV) . "/"; - chdir $actualdir; -} - -my @do_dirs; - -foreach ( 'ham', 'spam' ) { - push(@do_dirs, "$_/personal"); - push(@do_dirs, "$_/${_}trap") if $include_traps; -} - -# mbox laden areas -while (my $dir = shift @dirs) { - if (-d $dir) { - $dir =~ m@^([^/]+)@; - print "$1:mbox:$actualdir$dir\n"; - } - else { - die "$dir isn't a directory!\n"; - } -} - -# Ok, now figure out the most recent X days of spam ... -foreach my $pdir ( @do_dirs ) { - $pdir =~ m@^([^/]+)@; - my $type = $1; - - my @dlist = (); - - if (opendir(DIR1, $pdir)) { - while(my $dir = readdir(DIR1)) { - next unless ($dir =~ /^\d+$/); - - $dir = "$pdir/$dir"; - next unless (opendir(DIR2, $dir)); - - while(my $dir2 = readdir(DIR2)) { - next unless ($dir2 =~ /^\d+$/ && opendir(DIR3, "$dir/$dir2")); - $dir2 = "$dir/$dir2"; - - push(@dlist, map { "$type:dir:$actualdir$dir2/$_" } grep(-d "$dir2/$_" && /^\d+$/, readdir(DIR3))); - closedir(DIR3); - } - closedir(DIR2); - } - closedir(DIR1); - @dlist = reverse sort @dlist; - splice @dlist, $RECENT if (defined $RECENT && @dlist > $RECENT); - push(@dirs, @dlist); - } -} - -print join("\n", @dirs, ""); -exit; diff -Nru spamassassin-3.4.6/trunk-only/contrib/run-corpora spamassassin-4.0.0~rc3/trunk-only/contrib/run-corpora --- spamassassin-3.4.6/trunk-only/contrib/run-corpora 2006-08-16 04:28:06.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/contrib/run-corpora 1970-01-01 00:00:00.000000000 +0000 @@ -1,200 +0,0 @@ -#!/bin/sh - -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Written by Theo Van Dinter -# Please feel free to mail with any questions. :) - -# This is a small script used to interact with run-masses to do a full -# corpus mass-check run, including the rsync to the SA server. -# -# NOTE: you MUST set RSYNC_USER and RSYNC_PASSWORD outside of this script so -# that your results can be sent up for review. -# -# By default, it'll do a nightly (set0) run. If you want to do a weekly -# (set1) run, add "--net" to the commandline. -# -# Defaults for mass-check parameters: -# no commandline parameters -# use DEF_AFTER for --after option -# adds "-n" -# use nightly-versions.txt for updates -# --net -# switches to NET_AFTER for --after option -# adds "-j 4", "--net", "--reuse" -# use weekly-versions.txt for updates -# -# ie: "run-corpora" equates to: "mass-check -n" -# "run-corpora --net" equates to: "mass-check -n -j 4 --net --reuse" - -# Set the path appropriately -PATH=/bin:/usr/bin:/usr/local/bin -if [ -d /sw/bin ]; then - PATH=${PATH}:/sw/bin -fi -export PATH - -# Where do things live? - -# CORPUS is the directory that houses your mail corpus and these scripts. -CORPUS=$HOME/SA/corpus - -# SA_VER is the directory that you want updated and will use for the -# nightly/weekly run -SA_VER=$HOME/SA/spamassassin-corpora - -# OUTDIR is the directory which will be used for the temporary log files -# during the run, etc. If you don't know, leave it blank and it'll use -# "SA_VER/masses" -OUTDIR= - -# FINALDIR, if set, is where you want the files moved to after processing is -# completed. -FINALDIR= - -# These are paths to various programs. If PATH is set appropriately, you can -# just let the shell find them. -SVN=svn -SVNVERS=svnversion -WGET=wget -RSYNC=rsync - -# DEF_AFTER is used for the set0 run --after parameter -# NET_AFTER is used for the set1 run --after parameter -# this needs to be specially handled since there are problems with shell -# parameter parsing that make these not work without it. -# -DEF_AFTER="-120 days" -NET_AFTER="-60 days" - - - -if [ -z "$RSYNC_USER" -o -z "$RSYNC_PASSWORD" ]; then - echo "You need to specify RSYNC_USER and RSYNC_PASSWORD via the environment!" >&2 - exit 2 -fi - -if [ -z "$OUTDIR" ]; then - OUTDIR="$SA_VER/masses" -fi - -cd $OUTDIR -if [ -f ham.log -o -f spam.log ]; then - echo "A previous run still has log files, exiting." >&2 - exit 2 -fi - -NET=0 -OPTS="-n" -VERS=nightly -FILENAME=$RSYNC_USER -umask 002 - -while [ ! -z "$1" ]; do - if [ "$1" = "--net" ]; then - NET=1 - fi - shift -done - -if [ $NET -eq 1 ]; then - FILENAME="net-$FILENAME" - OPTS="$OPTS --net --reuse" - AFTER="$NET_AFTER" - VERS=weekly - - # We want to do this with more parallelization... - OPTS="$OPTS -j 4" -else - AFTER="$DEF_AFTER" -fi - -# Verify appropriate version to run with -echo "[Updating $SA_VER]" -COUNT=0 -while ! $WGET -q -nd -m http://rsync.spamassassin.org/$VERS-versions.txt ; do - sleep 60 - COUNT=`expr $COUNT + 1` - if [ $COUNT -gt 5 ]; then - echo "Couldn't get the $VERS revision version, aborting!" >&2 - exit 2 - fi -done - -NREV=`tail -1 $VERS-versions.txt | awk '{print $2}'` -if [ -f "$SA_VER/masses/svninfo.tmp" ]; then - CREV=`grep ^Revision: $SA_VER/masses/svninfo.tmp | awk '{print $2}'` - if [ $CREV -eq $NREV ]; then - echo "Looks like a problem with the $VERS-versions.txt update, same rev ($CREV)" >&2 - exit 2 - fi -fi - -if ! $RSYNC -uaqrC --exclude masses/spamassassin/ --delete rsync.spamassassin.org::tagged_builds/${VERS}_mass_check/ $SA_VER; then - echo "Couldn't rsync update the $VERS spamassassin corpora code" >&2 - exit 2 -fi - -CREV=`grep ^Revision: $SA_VER/masses/svninfo.tmp | awk '{print $2}'` -if [ $CREV -ne $NREV ]; then - echo "Looks like a problem with the rsync area, found rev $CREV but expected rev $NREV" >&2 - exit 2 -fi - -# do the run, treat $AFTER differently due to commandline parsing and "-" -echo "[Running mass-check '$OPTS' in $CORPUS]" -if [ -z "$AFTER" ]; then - $CORPUS/run-masses $SA_VER $OPTS > /dev/null -else - echo "[Using '$AFTER' for --after setting]" - $CORPUS/run-masses $SA_VER $OPTS --after "$AFTER" > /dev/null -fi - -if [ ! -s ham.log -o ! -s spam.log ]; then - echo "There seems to be a problem with either ham.log or spam.log, aborting!" >&2 - exit 1 -fi - -# now we have our ham.log and spam.log files... -echo "[Uploading daily corpus logs]" -mv ham.log ham-$FILENAME.log -mv spam.log spam-$FILENAME.log -mv results.log results-$FILENAME.log - -if ! $RSYNC -qPcvzb ham-$FILENAME.log spam-$FILENAME.log $RSYNC_USER@rsync.spamassassin.org::corpus/; then - echo "There was an error during rsync!" >&2 -fi - -RESULTDIR=. -if [ "$FINALDIR" ]; then - mv -f ham-$FILENAME.log spam-$FILENAME.log $FINALDIR - - if [ -f "ham-$FILENAME.log" -o -f "spam-$FILENAME.log" ]; then - echo "There was an error moving files around, aborting!" >&2 - exit 1 - fi - - RESULTDIR=$FINALDIR - if [ -d "$FINALDIR/hf" ]; then - RESULTDIR="$FINALDIR/hf" - fi - mv -f results-$FILENAME.log $RESULTDIR -fi - -echo "[Our results]" -cat $RESULTDIR/results-$FILENAME.log diff -Nru spamassassin-3.4.6/trunk-only/contrib/run-masses spamassassin-4.0.0~rc3/trunk-only/contrib/run-masses --- spamassassin-3.4.6/trunk-only/contrib/run-masses 2006-08-16 04:28:06.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/contrib/run-masses 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -#!/bin/sh - -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Written by Theo Van Dinter -# Please feel free to mail with any questions. :) - -# This script will run a mass-check against all targets specified on the -# commandline, or optionally via a program called "mbox-to-check" located in -# the same directory as this script. -# -# At the end, you will have a ham.log, spam.log, and results.log in the -# current directory. - -# Parameters -# -# The first parameter is the directory to use for mass-check (if there -# is no parameter or the path isn't a directory, "../spamassassin-head" will -# be the default). On my machine, spamassassin-head is the latest version -# from SVN. -# -# All other parameters are passed directly to mass-check. -# Default parameters: --progress -c $SADIR/rules -j $PROCS -# (PROCS is determined by running $SADIR/masses/cpucount) -# -# Example: -# ./run-masses -n -# ./run-masses -n ham:mbox:mboxfile spam:mbox:mboxfile - - -# DEFOPTS sets default options to be passes to mass-check. I like -# "--all --cache", but ymmv. -DEFOPTS="" - -# TARGETS should include your list of mbox/mbx/dir/file targets for mass-check -# or if you use the mbox-to-check script, you can leave this blank. -TARGETS= - - -# go through and limit out resource usage -# (-c) no core files -# (-v -m) max memory of 200MB -# (-n) max open files of 256 -# (-u) max child procs of 32 -ulimit -c 0 -ulimit -v 204800 -ulimit -m 204800 -ulimit -n 256 -ulimit -u 32 - -# fix the umask so group write is available -umask 002 - -# Setup the path as necessary -PATH=/bin:/usr/bin:/usr/local/bin -if [ -d /sw/bin ]; then - PATH=${PATH}:/sw/bin -fi -export PATH - -# Use the specified directory for tests -if [ -z "$1" -o ! -d "$1" ]; then - DIR=../spamassassin-head -else - DIR="$1" - shift -fi - -# Where are our files located? -MASS=$DIR/masses -RULES=$DIR/rules - -# if mbox-to-check is setup, go ahead and run it for additional targets -CORPUS="`dirname $0`" -if [ -x "$CORPUS/mbox-to-check" ]; then - TARGETS="$TARGETS `$CORPUS/mbox-to-check $CORPUS`" -fi - -# Make sure the old rules.pl file is gone -rm -rf $MASS/tmp - -# How many processes should we run at once? -PROCS=`$MASS/cpucount` - -# do the mass-check -$MASS/mass-check --progress -c $RULES -j $PROCS $DEFOPTS "$@" $TARGETS - -if [ -f spam.log -a -f ham.log ]; then - echo "Generating hit frequency results" - $MASS/hit-frequencies -c $RULES -x -p -a > results.log -fi - -# remove the parse-rules-for-masses tmp directory -echo "Removing temporary files" -rm -rf ./tmp diff -Nru spamassassin-3.4.6/trunk-only/contrib/samailoffset spamassassin-4.0.0~rc3/trunk-only/contrib/samailoffset --- spamassassin-3.4.6/trunk-only/contrib/samailoffset 2007-01-25 22:12:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/contrib/samailoffset 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -#!/usr/bin/perl -w - -# -# samailoffset - Easy way to get messages from mass-check log output -# -# By: Theo Van Dinter (felicity@apache.org) (c) 1998-2007 -# Revision Info: $Id: samailoffset 500015 2007-01-25 22:12:53Z felicity $ -# - -# this script will grab messages out of a corpus and display the headers (by -# default) or the full message (-b). typically this lets you do something -# like "grep RULE_NAME ham.log | samailoffset" and get the right thing. - -use strict; -$|++; -my $body = 0; - -# if "-b" is given on the command, this will output the body of the message as -# well as the header. -if ( @ARGV && $ARGV[0] =~ /^-+b/ ) { $body=1; shift; } -unless (@ARGV) { - @ARGV=; -} - -foreach ( @ARGV ) { - next if /^#/; - - if (/^[.Y]\s+-?\d+\s(.+?)\s(?:[A-Za-z0-9_,]+\s)?[a-z]+=/) { - $_ = $1; - } - - my $count = 0; - /^(.+?)(?:\.(\d+))?$/; - my($file,$offset) = ($1,$2); - - if ($file =~ /\.gz$/) { - $file = "gunzip -cd $file |"; - } - elsif ($file =~ /\.bz2$/) { - $file = "bzip2 -cd $file |"; - } - - open(T,$file) || die "Can't open $file: $!"; - seek T, $offset, 0 if (defined $offset); - while(defined(my $l=)) { - last if ($count++ && $l=~/^From /); - print $l; - last if (!$body && $l=~/^$/); - } - close(T); -} diff -Nru spamassassin-3.4.6/trunk-only/debian/65_debian.cf spamassassin-4.0.0~rc3/trunk-only/debian/65_debian.cf --- spamassassin-3.4.6/trunk-only/debian/65_debian.cf 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/65_debian.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# Special SpamAssassin rules for Debian -# Duncan Findlay - -header D_SENT_BY_DEBCONF Subject =~ /^Debconf:/ -score D_SENT_BY_DEBCONF -5.0 -describe D_SENT_BY_DEBCONF Sent by Debconf - -body D_SENT_BY_AFBACKUP /^\[Afbackup\]: Overall exit status:/ -score D_SENT_BY_AFBACKUP -5.0 -describe D_SENT_BY_AFBACKUP Sent by Afbackup - -header D_SENT_BY_APTLC Subject =~ /^apt-listchanges: (changelogs|news) for/ -score D_SENT_BY_APTLC -5.0 -describe D_SENT_BY_APTLC Sent by apt-listchanges - -header __ANACRON_SUBJ Subject =~ /^Anacron job '[a-z0-9_.-]+' on/i -header __ANACRON_FROM From =~ /^Anacron/ -meta D_SENT_BY_ANACRON __ANACRON_SUBJ && __ANACRON_FROM -score D_SENT_BY_ANACRON -5.0 -describe D_SENT_BY_ANACRON Sent by Anacron Daemon - - -header __CRON_FROM From =~ /^Cron Daemon/ -header __CRON_HEADER X-Cron-Env =~ /./ -meta D_SENT_BY_CRON __CRON_FROM && __CRON_HEADER -score D_SENT_BY_CRON -5.0 -describe D_SENT_BY_CRON Sent by Cron Daemon diff -Nru spamassassin-3.4.6/trunk-only/debian/changelog spamassassin-4.0.0~rc3/trunk-only/debian/changelog --- spamassassin-3.4.6/trunk-only/debian/changelog 2011-10-28 14:29:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/changelog 1970-01-01 00:00:00.000000000 +0000 @@ -1,1081 +0,0 @@ -spamassassin (3.3.2-2) unstable; urgency=low - - * Remove dependencies on libdigest-sha1-perl, since it's being - removed from Debian. (Closes: #629612) - - -- Noah Meyerhans Thu, 18 Aug 2011 17:07:05 -0700 - -spamassassin (3.3.2-1) unstable; urgency=low - - * New upstream rc release. (Closes: 615590, 626191, 630327, 626751, 631583) - * Bump standards version to 3.9.2 (no changes) - * Add a README.source indicating that our orig.tar.gz differs from - upstream in that we need to delete their debian/ subdirectory. - * Delete patches that have been incorporated upstream. - - -- Noah Meyerhans Sat, 14 May 2011 12:06:12 -0700 - -spamassassin (3.3.1-2) unstable; urgency=low - - * Disable SSLv2 support due to its removal from OpenSSL (Closes: 622053) - * Apply a patch from Dominic Hargreaves to register - spamassassin for the perl-major-upgrade trigger (Closes: 619817) - * Bump standards version to 3.9.1. - - -- Noah Meyerhans Sun, 10 Apr 2011 20:58:34 -0700 - -spamassassin (3.3.1-1) unstable; urgency=low - - * New upstream version. - * Update several patches now that bugfixes have been incorporated - upstream. - - -- Noah Meyerhans Sun, 21 Mar 2010 23:20:31 -0700 - -spamassassin (3.3.0-2) unstable; urgency=low - - * Document the fact that auto-whitelist is now disabled by default and that - this may affect upgrades from version <3.3.0 (Closes: #570734) - * Stop ignoring output from sa-compile and instead use its undocumented - "quiet" option. (Closes: #563802) - * Don't ignore output from /etc/init.d/spamassassin when reloading spamd - after sa-update downloads updates (Closes: #565227) - * Run the contents of /etc/spamassassin/sa-update-hooks.d/ using - run-parts following a successful download of new rules via sa-update - in the daily cron script. (Closes: #315961, #567205) - * Fix a problem in debian/rules where manpage generation for sa-awl and - sa-check_spamd happened in the wrong rule. - * Bump standards compliance to 3.8.4 (no changes needed) - - -- Noah Meyerhans Mon, 01 Mar 2010 00:57:24 -0800 - -spamassassin (3.3.0-1) unstable; urgency=low - - * New upstream version. - * Switch to dpkg-source 3.0 (quilt) format - - -- Noah Meyerhans Tue, 26 Jan 2010 22:53:12 -0500 - -spamassassin (3.2.5-7) unstable; urgency=high - - * Fix a bunch of spelling errors in spamassassin documentation. - * Add ${misc:Depends} to spamassassin Depends. - * Fix FH_DATE_PAST_20XX so dates in 2010 aren't considered "grossly - in the future" - - -- Noah Meyerhans Fri, 01 Jan 2010 12:51:32 -0500 - -spamassassin (3.2.5-6) unstable; urgency=low - - * Fix call to "make install" in debian/rules to handle changes to - ExtUtils::MakeMaker in perl. (Closes: #549726) - * Fix Makefile.PL so DESTDIR actually works when provided on the - "make install" commandline. - * Updated to standards compliance 3.8.3, dropping versioned build-dep on - perl (>= 5.6.0) - * Switch from dh_clean -k to dh_prep in debian/rules - * Add versioned build-dep on debhelper 7 - - -- Noah Meyerhans Tue, 06 Oct 2009 17:51:02 -0400 - -spamassassin (3.2.5-5) unstable; urgency=low - - * Remove open-whois.org as it is cybersquatted (Closes: #537477) - * Update debhelper compatibility level to 7. - * Apply patch to init script to provide a "status" command (Closes: #530896) - * Fix missing documentation of spamc exit code 98 (Closes: #539148) - * Backport IPv6 support for the Received header parser (Closes: #510711) - * Fix additional pod2man errors. We're finally lintian-clean! - * Update Standards-Version to 3.8.2 (no changes needed). - * Fix typo in spamd manpage (Closes: #509273) - - -- Noah Meyerhans Mon, 10 Aug 2009 12:07:10 -0400 - -spamassassin (3.2.5-4) unstable; urgency=low - - * "Lintian, you will torment me no more!" - * Add patches/60_fix-pod.dpatch to fix a whole mess of pod warnings - * set -e in prerm, preinst, and postinst per policy - * Add patches/70_fix-whatis.dpatch to fix lintian's complaints about - missing whatis entries in several manpages. - * Fix some more man errors by shortening some long lines. - - -- Noah Meyerhans Mon, 23 Feb 2009 12:21:57 -0500 - -spamassassin (3.2.5-3) unstable; urgency=low - - * Add an alternate dependency on libio-zlib-perl (>= 1.04) to ease - backporting (yeah, should have been done three uploads ago...) - * Set myself as the Maintainer per Duncan's request. - * Explicity set a umask (022) in /etc/cron.daily/spamassassin - * Don't compress GPG.KEY, since we need to use it during postinst and - it's small. - * Add Andrew Schulman's fix for sa-learn to properly handle a case - where an empty folder list is given as a source of training data. - (Closes: 491159) - - -- Noah Meyerhans Wed, 18 Feb 2009 22:15:20 -0500 - -spamassassin (3.2.5-2) unstable; urgency=low - - [ Duncan Findlay ] - * Add Recommends: on libio-socket-inet6-perl (Closes: 481696) - * Ship GPG.KEY and call sa-update --import in the postinst to work - around broken key. (Closes: 486408) - * Work around permissions issues from sa-compile and sa-update. (Closes: - 491232, 470834) - - [ Noah Meyerhans ] - * Remove obsolete DSBL blacklist (Closes: #501122) - * Bump standards version to 3.8.0. This should have been done with - 3.2.5-1, since that's where we made the changes to support this - version. - * Document the fact that spamhaus and SURBL are free only for smaller - sites and may require sites exceeding a certain threshold of mail - volume to pay for service. (Closes: #505273) - - -- Noah Meyerhans Mon, 17 Nov 2008 00:53:11 -0500 - -spamassassin (3.2.5-1) unstable; urgency=low - - * New upstream version. (Closes: 482010, 475526) - * Remove debian/patches/91_pg_8.1_bayes.dpatch, which is now in upstream's - release. - * Stop shipping the entire text of the Apache license now that it's in - common-licenses. - - -- Noah Meyerhans Tue, 17 Jun 2008 21:18:16 -0400 - -spamassassin (3.2.4-2) unstable; urgency=low - - * Fix Vcs-Svn entry in debian/control - * Add $syslog to Should-Start in the LSB header in spamassassin.init, - since we'd like spamd to be able to send its logs somewhere. - * replaced versioned dependency on libio-zlib-perl with dependency on - perl-modules >= 5.10 (Closes: #479462) - * Add myself to Uploaders - * Incorporate a patch from Ubuntu containing upstream's fix to the SQL - Bayes store on postgresql 8.1 and above - - -- Noah Meyerhans Tue, 13 May 2008 21:58:00 -0400 - -spamassassin (3.2.4-1) unstable; urgency=low - - * New upstream release (Closes: #466620) - * Stop creating directories /etc/logcheck/ignore.d.paranoid and - /etc/logcheck/violations.ignore.d - * Modify preinst to find and delete old, unchanged - /etc/logcheck/ignore.d.paranoid/spamassassin and - /logcheck/violations.ignore.d/spamassassin files (Closes: #454370) - * Add LSB init info to /etc/init.d/spamassassin (Closes: #451726) - - Patch from Petter Reinholdtsen. - - Note that this probably doesn't really show all the dependencies, - further patches welcome. - * Replace Recommends: on libmail-spf-query-perl with one on libmail-spf-perl - (Closes: #448671) - * Drop Suggests: on dcc-client, as it has been removed from Debian - (Closes: #434169) - * Drop version on libarchive-tar-perl dependency to avoid issues - with perl-modules 5.10.0 (Closes: #466903) - - -- Duncan Findlay Sun, 02 Mar 2008 07:18:07 -0800 - -spamassassin (3.2.3-1) unstable; urgency=low - - * New upstream release (Closes: #435144) - - Fixes errors with allow_user_rules (Closes: #437816) - - Fix "spamc -x" (Closes: #376380) - * Avoid DOSing with sa-update by sleeping a random interval less than an - hour before downloading and compiling updates. (Closes: #428319) - * Check for existence of Makefile instead of using "-$(MAKE) veryclean" - in debian/rules (to satisfy lintian) - * Fix spurious inclusion of INSTALL.orig in - 10_change_config_paths.dpatch, causing debian/rules clean to - fail. (Closes: #442734) - - -- Duncan Findlay Sun, 28 Oct 2007 22:52:20 -0700 - -spamassassin (3.2.1-1) unstable; urgency=low - - * New upstream release - - Fixes security vulnerability CVE-2007-2873 - - Silences loud warning message (Closes: #425685) - - Properly document message size "limit" (Closes: #402241) - * Recommends: gcc, libc6-dev, make for sa-compile (Closes: #427725) - * Fixed out of date section in README.Debian discussing sa-update - (Closes: #428316) - * Clarified how sa-compile works in README.Debian (Closes: #427862) - * Check in cron.daily that /var/lib/spamassassin/compiled exists - (i.e. only compile rules if sa-compile has previously been run) - * Recompile rules in postinst if /var/lib/spamassassin/compiled - exists (and sa-update and re2c exist) - - -- Duncan Findlay Mon, 11 Jun 2007 14:36:38 -0700 - -spamassassin (3.2.0-2) unstable; urgency=low - - * Fix cron script to exit 0 if sa-update does not find new updates - (Closes: #425962) - * Add libnet-dns-perl to Build-Depends. (Closes: #425932) - - -- Duncan Findlay Sun, 27 May 2007 22:25:07 -0400 - -spamassassin (3.2.0-1) unstable; urgency=low - - * New upstream release (Closes: #422692, #411022) - - New plugin and script "sa-compile" should greatly improve - performance if enabled (Closes: #394939) - - Fix ordering of lines in sa-update generated files (Closes: #413978) - - Fix parsing of Exim received headers (Closes: #357696) - - Stop requiring Crypt::OpenSSL::Bignum with DKIM (Closes: #400437) - - Better handling of trusted_networks (Closes: #290927) - - More robust prefork mechanism for spamd (multiple bugs fixed) - (Closes: #336236, #396500, #341055) - - Better handling of Unicode (Closes: #333882) - - Different rules, scores (Closes: #337617) - - Doesn't flag certain PGP/MIME messages as empty (Closes: #367635) - - sa-learn man-page now looks okay in 80 columns (Closes: #312263) - * Put 65_debian.cf in /etc/spamassassin instead of - /usr/share/spamassassin/ (Closes: #376610) - * Recommend libsys-syslog-perl, gnupg (Closes: #395872, #402572, #374435) - * Depend on libsys-hostname-perl (libnet-dns-perl needs it?) (Closes: #400435) * Suggest libmail-dkim-perl (Closes: #391655) - * Change the init script to properly restart spamd (would fail if it had - been previously HUP'd) - * Install daily cronjob that will automatically update to the newest - rules (off by default, enable in /etc/default/spamassassin) (Closes: #374432) - * Make sa-update's prerequisites Depends instead of Recommends. (Closes: - #408472) - * Stop pointing to the README for mail stream integration help in README.Debian (Closes: - #374714) - * Remove reference to libnet-dns-perl now that it's required in README.Debian (Closes: #319478) - -- Duncan Findlay Mon, 21 May 2007 10:08:17 -0400 - -spamassassin (3.1.7-2) unstable; urgency=high - - * Security fixes backported from 3.1.8: - - CVE-2007-0451: potential DoS with long URIs found in the message - content (Closes: #410843) - - Prevents perl code from being loaded via sa-update by default - (override with --allowplugins) (SpamAssassin bug 5240) - - -- Duncan Findlay Wed, 14 Feb 2007 21:46:52 -0500 - -spamassassin (3.1.7-1) unstable; urgency=low - - * New upstream release (Closes: #385450, #396600) - - Fixes handling of PGP/MIME messages (Closes: #367365) - - Fixes URIDNSBL warning of invalid bitwise or (Closes: #373914) - - Fix date handling bug (Closes: #362913) - - * Fix README.Debian now that libnet-dns-perl isn't a dependency anymore - (Closes: #374377) - - -- Duncan Findlay Thu, 2 Nov 2006 01:43:42 -0500 - -spamassassin (3.1.4-1) unstable; urgency=low - - * New upstream release - - Fixed a bug where sa-update's failure would leave SA without rules - (Closes: #370357) - - Fix BSMTP with exim (Closes: #375286) - - gtube.t test failed with non-english locales. - - Fixed memory leak with Bayes and BayesStore. - - -- Jesus Climent Thu, 10 Aug 2006 22:40:09 +0300 - -spamassassin (3.1.3-1) unstable; urgency=high - - * New upstream release - - Fixes spamd --vpopmail/--paranoid remote command execution bug. This - has been assigned CVE-2006-2447. - - -- Duncan Findlay Sun, 4 Jun 2006 18:24:05 -0400 - -spamassassin (3.1.2-1) unstable; urgency=low - - * New upstream release - - Razor2 support re-enabled by default - - sa-learn should now return an error code when it can't find the - target file (Closes: #261346) - * Now really depends on libarchive-tar-perl; depends on libwww-perl, - libio-zlib-perl for sa-update (Closes: #348884, #359874, #366700, - #368424) - - -- Duncan Findlay Sun, 4 Jun 2006 14:56:56 -0400 - -spamassassin (3.1.1-1) unstable; urgency=low - - * New upstream release (Closes: #356995, #360994) - - Better error handling when DNS is broken (Closes: #340753) - - bayes_storage_module documented better (Closes: #333792) - - Fix typo in UPGRADE (Closes: #335794) - - Better exception handling (Closes: #333330, #333131) - - Fix sa-learn --restore with SDBM (Closes: #333793) - * Document broken identd servers (Closes: #355475) - * Now depends on libarchive-tar-perl (Closes: #348884) - * Add reference on how to force bayes expiry using a cronjob (Closes: #334829, #300490) - * Drop logcheck files -- these should/will be in the logcheck-database package. (See bug #) - * Move libnet-dns-perl back to a Recommends:. The loud warnings should - have been silenced upstream. - - -- Duncan Findlay Wed, 9 Nov 2005 16:55:03 -0500 - -spamassassin (3.1.0a-2) unstable; urgency=low - - * Greatly improved the usefulness of spamassassin's README.Debian - * Moved libnet-dns-perl to a dependency and added libsocket6-perl as a - dependency to avoid an obscure IPv6 related bug, and loud warnings - (Closes: #332906, #335279, #335671, #327832) - * Fixed the logcheck filters (Closes: #333430, #304363) - - -- Duncan Findlay Wed, 9 Nov 2005 16:52:41 -0500 - -spamassassin (3.1.0a-1) unstable; urgency=low - - * Upload to unstable - * Clean up NEWS.Debian, so it isn't so verbose for people upgrading from - 3.0.x - - -- Duncan Findlay Wed, 5 Oct 2005 17:03:50 -0400 - -spamassassin (3.1.0-1) experimental; urgency=low - - * New upstream release. - * Add libdigest-sha1-perl to Build-Depends. - - -- Jesus Climent Sun, 25 Sep 2005 17:19:15 +0300 - -spamassassin (3.0.99pre3.1.0+rc2-1) experimental; urgency=low - - * New upstream release - * Upstream bug fixes: - - MIME boundary regexp improved (Closes: #288617) - - -- Duncan Findlay Tue, 30 Aug 2005 00:01:11 -0400 - -spamassassin (3.0.99pre3.1.0+rc1-1) experimental; urgency=low - - * New major upstream release: - - More Bayes storage options -- SDBM, MySQL, PostgreSQL - - Apache preforking algorithm; number of children scaled according to - demand - - New plugins: DomainKeys (off by default), MIMEHeader, ReplaceTags, - WhiteListSubject - - Razor2, DCC disabled by deafult because they are no longer free for - non-personal use - - AWL is now a plugin (Closes: #292610) - - Includes sa-update which can be used to update rules between - releases (currently must be manually invoked) - - * Bugs in BTS fixed upstream: - - Stop checking for long descriptions (Closes: #274194) - - No longer uses Storable (Closes: #293485) - - Minor doc fixes (Closes: #276621, #290660) - - Avoid unitialized value error in Reporter.pm (Closes: #290615) - - Logging and error messages improved throughout (Closes: #318349) - - SIGHUP now works when running with -u on a privileged port (Closes: - #296682) - - Avoid ALL_TRUSTED misfire when Received: parsing fails (Closes: - #300809) - - Fix __FROM_PHONE to be more permissive (Closes: #238613) - - Avoid MSN Groups FPs (Closes: #290978) - - Better handling of UTF-8 (Closes: #291093, #297899, #306496, - #319014) - - BAYES_* scores manually set (Closes: #292327) - - local.cf has more comments (Closes: #271869) - - sa-learn is quieter (Closes: #268035) - - spamassassin --debug more verbose, displays files read (Closes: - #276778) - - * No longer support the upgrade path for versions prior to - sarge. Including: - - Debconf questions about upgrading from 2.20-1woody and 2.4x - - Explanation of the libdb problems caused by upgrades from perl 5.6 - to 5.8 recent versions of spamassassin (not an issue with - woody->testing) (Closes: #318360, #298372) - - Downgrade spamassassin's Depends: on spamc to Recommends: (Closes: - #316368) - - Remove the woody build hack with debconf - - * Correct Suggest: on libnet-smtp-perl to libnet-perl (Closes: #317355) - * Upgrade to Standards Version 3.6.2.0 (by incrementing the number in - debian/control) - * Updated the way debian/rules uses dpatch to be the "new - way". (i.e. calls dpatch directly) - * No longer use debconf *at all*. As soon as I find questions worth - asking, we'll go back. - - -- Duncan Findlay Fri, 19 Aug 2005 02:22:22 -0400 - -spamassassin (3.0.4-2) unstable; urgency=high - - * Added Russian debconf translation from Yuriy Talakan - (Closes: #311920) - - -- Duncan Findlay Wed, 8 Jun 2005 00:53:18 -0400 - -spamassassin (3.0.4-1) unstable; urgency=high - - * New upstream release - - Fixed parsing to not rely on MIME boundary (Closes: #307526, #281756) - - Improfed FORGED_YAHOO_RCVD to not FP (Closes: #310958) - - -- Duncan Findlay Tue, 7 Jun 2005 00:30:18 -0400 - -spamassassin (3.0.3-1) unstable; urgency=low - - * New upstream release (Closes: #307904) - - Fixed possible memory bloat from large AutoWhitelist db files - - Fixed where user defined rules scores became ignored (Closes: #291561) - - Updated parsing code for several Received: header formats - - Document plugin API for set/get tags (Closes: #299118) - - More bug fixes - * Added note about needing libnet-dns-perl to README.Debian (Closes: #293502) - * Would like this to get to sarge, if all goes well. - - -- Duncan Findlay Fri, 29 Apr 2005 14:09:56 -0400 - -spamassassin (3.0.2-1) unstable; urgency=low - - * New upstream release (Closes: #284663, #286595) - - Number of URLs now limited for URIDNSBL plugin (Closes: #279180) - - Handles obscure exim Recieved: header format (Closes: #279504) - * Updated logcheck messages (Closes: #281560) - * Updated README.Debian to explain a bit more about configuring - spamd as non-root and for sitewide bayes. (Closes: #271870, #273187) - * Updated README.Debian to explain issues with performance and spamd - (Closes: #279981) - * Updated watch file to handle the apache.org layout better. (Closes: #281468) - - -- Duncan Findlay Sat, 1 Jan 2005 15:29:19 -0500 - -spamassassin (3.0.1-1) unstable; urgency=low - - * New upstream release - - Fix problems with broken configs with spamd (Closes: #276366) - - Fixes some memory consuming bugs (Closes: #275232, #222783) - - Fixes file descriptior issue with pyzor or dccifd and amavis (Closes: #273290) - * Conflict with packages broken with SpamAssassin 3.0.0 (Closes: - #274993) - * Create PIDFILE option in /etc/default/spamassassin so that init - script works with spamd -u (Closes: #275370) - * Note in /etc/default/spamassassin to use --max-children with no - more than 5 due to preforking. (Closes: #275308) - * Rewrote package dependencies in control, added Suggests: on - dcc-client (Closes: #276729), versioned recommends on - libnet-dns-perl (Closes: #274825) - * Include procmailrc.example again (Closes: #276152) - * Fix muttrc example to use --no-sync instead of --no-rebuild (Closes: - #273670) - * Fixed typo in README.Debian for spamassassin -- if - /usr/share/spamassassin is edited you will NOT be prompted about it. - (Closes: #275675) - - -- Duncan Findlay Wed, 27 Oct 2004 00:28:33 -0400 - -spamassassin (3.0.0-1) unstable; urgency=low - - * New upstream release - * Features since 2.6x: - - New license (Now Apache Software License 2.0) - - Support for Sender Policy Framework (SPF) - - Web links checked against SURBL and SBL (Closes: #265604) - - Third party plug-in support - - Optional SQL storage for Bayes and automatic-whitelist - - More accurate MIME + HTML handling - - * Bugfixes (not yet documented here) - - Document --home-helper-dir option in SYNOPSIS (Closes: #265887) - - More documentation fixes: --user-config is on by default (Closes: #263845, #263846) - - Doc: Typo "on" -> "or" (Closes: #271865) - - * Changed /etc/default/spamassassin to be more verbose (Closes: #265518) - * Got rid of spamassassin-tools since it was more pain than it was worth. - - -- Duncan Findlay Sun, 5 Sep 2004 22:05:47 -0400 - -spamassassin (2.99pre3.0.0+rc2-2) experimental; urgency=low - - * sysv-rc has a bug in the man page: use "defaults XX YY" instead of - "defaults NN-start NN-stop" as stated in the man. Filling bug... - Well, is more complicated than that. See #268713 - - -- Jesus Climent Sat, 28 Aug 2004 17:28:44 +0000 - -spamassassin (2.99pre3.0.0+rc2-1) experimental; urgency=low - - * New upstream release candidate. - * Upstream closed the following bugs: - - sa-learn should have a long option for -f (Closes: #265888) - - ignore X-Bogosity (Closes: #265899) - - -- Jesus Climent Sat, 28 Aug 2004 07:53:33 +0000 - -spamassassin (2.99pre3.0.0+rc1-1) experimental; urgency=low - - * New upstream release candidate. - * init.d script starts at S19 and now stops at K21 (Closes: #267540). - - -- Jesus Climent Mon, 23 Aug 2004 09:47:47 +0000 - -spamassassin (2.99pre3.0.0+pre4-2) experimental; urgency=low - - * libdigest-sha1-perl is also a requirement for building the package. - - -- Jesus Climent Thu, 5 Aug 2004 22:28:55 +0300 - -spamassassin (2.99pre3.0.0+pre4-1) experimental; urgency=low - - * New upstream pre-release. - * Man pages reorganized (Closes: #263481) - - -- Jesus Climent Thu, 5 Aug 2004 12:22:55 +0300 - -spamassassin (2.99pre3.0.0+pre2-1) experimental; urgency=low - - * New upstream pre-release. - * debian/control - - Added dependency on libdigest-sha1-perl - - -- Jesus Climent Sat, 10 Jul 2004 21:03:28 -0300 - -spamassassin (2.99pre3.0.0+pre1-2) experimental; urgency=low - - * Fix bad upload (bad changelog, stupid svn-buildpackage...) - - -- Duncan Findlay Sun, 20 Jun 2004 23:17:45 -0400 - -spamassassin (2.99pre3.0.0+pre1-1) experimental; urgency=low - - * New upstream release - - -- Duncan Findlay Thu, 17 Jun 2004 00:50:06 -0400 - -spamassassin (2.99pre3.0.0svn20040616-1) experimental; urgency=low - - * New upstream release - * Includes preliminary scores (not great, but better) - * Created spamassassin-tools package, containing stuff to make your own rules. - * Added logcheck violations.ignore.d file for "result:" lines (Closes: - #252375) - * Changed logcheck for processing messages to allow unknown message - ids (Closes: #252406) - * Added german debconf translation from Helge Kreutzmann - (Closes: #253589) - - -- Duncan Findlay Thu, 17 Jun 2004 00:20:08 -0400 - -spamassassin (2.99pre3.0.0svn20040529-2) experimental; urgency=low - - * Added logcheck entry for lines like: - spamd[19233]: result Y 997 GTUBE..... - - -- Duncan Findlay Sat, 29 May 2004 21:50:44 -0400 - -spamassassin (2.99pre3.0.0svn20040529-1) experimental; urgency=low - - * New upstream release - * Added italian debconf translation from Luca Monducci - (Closes: #251279) - * Fix /etc/init.d/spamassassin to actually exit when ENABLED=0. - (Closes: #251481, #251598) - - -- Duncan Findlay Sat, 29 May 2004 21:18:01 -0400 - -spamassassin (2.99pre3.0.0svn20040525-1) experimental; urgency=low - - * New upstream release - Many many changes... - API changed drastically, new plugin interface and plugins (Like - SURBL (Closes: #243546)), LDAP + SQL config - (Closes: #242121, #177012), ident authentication for spamd - (Closes: #242148), New license (ASL 2.0), ... - Bug Fixes: - Fix handling of empty User: line (Closes: #225139) - Handle out of diskspace in Bayes (Closes: #202422) - Fix how spamc handles bad hostnames (Closes: #214008) - Fix sa-learn on filenames with spaces (Closes: #218004) - Fixed which IPs to lookup in DNSBLs (Closes: #227828) - _STARS_ works in Subject line (Closes: #239979) - Make --lint catch misspeld scores (Closes: #214880) - Allow combining of spamassassin -d and -t (Closes: #192779) - Removed -w option from spamassassin (Closes: #216255) - Remove -P from spamassassin manpage (Closes: #234584) - FAKED_HOTMAIL_DAV removed (Closes: #233600) - Fix BUGGY_CGI to allow NMS FormMail (Closes: #209377) - Split ok_languages zh into zh.gb2312, zh.big5 (Closes: #224116) - Put all error output on one fd for spamc (Closes: #197879) - man Mail::SpamAssassin::Conf clearer about raw headers (Closes: #236431) - - * Converted packaging to use dpatch in order to allow for easier - creation of SVN packages (Because Daniel Quinlan has been bugging - me to do figure out a better system!) - - * Improved debian specific rules in 65_debian.cf (Closes: #237995, #240983) - * Changed dependencies for 3.0.0. Now suggest pyzor (Closes: #242456) - * Fixed logcheck files for whitespace (Closes: #243820) - * Changed /etc/init.d/spamassassin to warn when disabled (Closes: #247058) - * Changed /etc/default/spamassassin to not say "/etc/default/spamd.conf" - (Closes: #243431) - * Include Danish debconf translation from Claus Hindsgaul - (Closes: #233072) - * Added courier integration example (from Charles Fry + Jeronimo Pellegrini) - (Closes: #229393) - - -- Duncan Findlay Sun, 23 May 2004 23:51:34 -0400 - -spamassassin (2.63-1) unstable; urgency=low - - * New upstream release (Closes: #228366) - * Fixed logcheck file for users with hyphens (Closes: #226316) - - -- Duncan Findlay Wed, 21 Jan 2004 00:03:16 -0500 - -spamassassin (2.61-2) unstable; urgency=low - - * Improve copyright file in response to mail from Peter Palfrader - to debian-devel-announce - * Drop versioned libhtml-parser-perl -- it was incorrect. (Closes: #224933) - - * Added patch from Colin Watson / Marc Haber to ease backports. (Closes: #224237) - * Added patch from Francesco Potorti to allow setting of spamd's nice level (Closes: #224369) - - -- Duncan Findlay Sun, 28 Dec 2003 16:46:53 -0500 - -spamassassin (2.61-1) unstable; urgency=low - - * The "We really don't need lame release names" release - * New upstream release (Closes: #224088) - Messages that hit BAYES_99 will not be autolearned as ham (Closes: #217528) - Microsoft related forgery issues should be fixed (Closes: #198106, #188480) - Remove gnus notation in Bayes.pm (Closes: #211741) - * New/updated translations: - nl Luk Claes (Closes: #217248) - pt_BR Andre Luis Lopes (Closes: #220904) - es Carlos Valdivia (Closes: #220927) - * Move sample-spam.txt and sample-nonspam.txt to examples/ (Closes: #223032) - - -- Duncan Findlay Mon, 15 Dec 2003 20:49:35 -0500 - -spamassassin (2.60-2) unstable; urgency=low - - * The "Where is Duncan?" release ;) - * Small FRIEND_AT_PUBLIC change (Closes: #212722) - * README modified to reflect the actual status of Razor2 (Closes: #212799) - * Versioned dependency on libhtml-parser-perl (Closes: #214019) - * Modified postinst to avoid critical session (Closes: #213023) - - -- Jesus Climent Thu, 23 Oct 2003 13:10:29 +0000 - -spamassassin (2.60-1) unstable; urgency=low - - * New upstream release - Fixes blacklist problems caused by verisign (Closes: #211233, #211157) - * Many fixes since previous testing/unstable release, see below. - - -- Duncan Findlay Tue, 23 Sep 2003 14:57:02 -0400 - -spamassassin (2.59pre2.60rc5-1) experimental; urgency=low - - * New upstream release - - -- Duncan Findlay Tue, 16 Sep 2003 10:48:16 -0400 - -spamassassin (2.59pre2.60rc4-1) experimental; urgency=low - - * New upstream release - * Enabled SSL in spamc (Closes: #194701) - * Kenshi Muto's Japanese debconf translations installed. (Closes: #210722) - - -- Duncan Findlay Sat, 13 Sep 2003 15:07:22 -0400 - -spamassassin (2.59pre2.60rc3-1) experimental; urgency=low - - * New upstream release (candidate) includes: - Numerous rule improvements and bug fixes. - GA-assigned scores (previous cvs packages did not). - New Bayes backend with different DB format (automatic upgrade). - dccifd support added. - Better support for personal installation (Closes: #199217) - Dropped support for database formats other than DB_File (which most - should already be using). (See README.Upgrade) - * Works around symlinks being left behind in /etc/logcheck on upgrade. - (Closes: #201324) - * Added symlink from /etc/mail/spamassassin to /etc/spamassassin - (Closes: #207233, #207234) - - -- Duncan Findlay Thu, 28 Aug 2003 20:59:24 -0400 - -spamassassin (2.59pre2.60pre3-1) experimental; urgency=low - - * New upstream pre-release, before mass-check verification. Use at your own - risk. - * This version solves: - + French typo (Closes: #200468) - * Added README.postfix which explains how to integrate spamassassin with - postfix for incoming tagging. - * Spamd supports unix sockets (Closes: #204853) - - -- Jesus Climent Thu, 7 Aug 2003 22:39:30 +0000 - -spamassassin (2.59pre2.60cvs20030619-1) experimental; urgency=low - - * Pre-release 2.60 packages. Use at own risk! :-) (Hence, experimental) - * Also experimental since the scores in this release are very - sub-optimal. You will probably want to use a higher threshold, as - all the negative scoring tests have been removed. - * This upload is to facilitate the transition of maintenance (temporarily) - to Jesus Climent (Added to the - Uploaders: field) - * New upstream version includes: - Better rules to thwart new spam tactics (Closes: #192953) - Fix some bugs relating to autolearning (Closes: #191371) - Fix problem with reloading and syslog-ng (Closes: #191837) - More verbose error from spamassassin -r (Closes: #192133, #197881) - Improved configurability of headers (Closes: #178648, #193872) - Able to add charset to safe reports (Closes: #183810) - * Added a few more "default" options to spamd in /etc/default/spamassassin - * Fixed spamc's manpage to refer to spamd(8) not spamd(1) (Closes: #197880) - * Added doc on integrating spamassassin sitewide with Exim3 from - John Girash (Closes: #196706) - * Added example configuration for gnus from Andreas Kneib - (Closes: #196557) - * Noted the perl5.6->perl5.8 upgrade bug in README.Debian - - -- Duncan Findlay Thu, 19 Jun 2003 21:02:34 -0400 - -spamassassin (2.55-2) unstable; urgency=medium - - * Really fix warnings in spamassassin.config (D'oh!) - (Closes: #194989, #195076, #195076, #195335) - * Set TMPDIR in init script (Closes: #195290) - * urgency=medium because 2.55-1 is 9 days old, and testing deserves 2.55 - soon, and these changes are fairly simple - * Updated french debconf templates (Closes: #195011) - - -- Duncan Findlay Fri, 30 May 2003 23:57:06 -0400 - -spamassassin (2.55-1) unstable; urgency=low - - * New upstream release - * Fix warning in spamassassin.config (Closes: #193770) - - -- Duncan Findlay Tue, 20 May 2003 17:53:18 -0400 - -spamassassin (2.54-3) unstable; urgency=low - - * Handle the possibility of debconf not being installed when - spamassassin.preinst is run. (Why didn't lintian catch this?) - - -- Duncan Findlay Sat, 17 May 2003 18:38:58 -0400 - -spamassassin (2.54-2) unstable; urgency=low - - * Improves debconf handling of upgrade from previous versions (like - woody). (Closes: #191872, #192721) - * Rewritten spamassassin.config in perl - * This no longer bends over backwards to fix stuff I broke in 2.11 - (which was never in a stable release, and is over a year old) - - -- Duncan Findlay Wed, 14 May 2003 18:39:53 -0400 - -spamassassin (2.54-1) unstable; urgency=low - - * New upstream release - Include improved Bayes documentation (Closes: #185221) - Updates documentation in USAGE.gz (Closes: #185763) - Better scores (Closes: #191280) - Added rule TOO_MANY_MUA (Closes: #190380) - Fixed pyzor reporting (Closes: #184574) - * Tightened up logcheck messages, for use in - /etc/logcheck/ignore.d.paranoid (Closes: #187742) - * Applied patch from Andre Luis Lopes to fix pt_BR tranlations. - (Closes: #187745) - * Added french debconf translation (From Christian Perrier - ) (Closes: #190113) - * Added automatic call to debconf-updatepo in debian/rules - * Added example .muttrc snippet (Closes: #192713) - - -- Duncan Findlay Wed, 14 May 2003 00:24:42 -0400 - -spamassassin (2.53-1) unstable; urgency=low - - * New upstream release (Closes: #185887) - Fixes false positives in SUBJ_ALL_CAPS from KOI8 mail (Closes: - #168682) - Fixes problems with --syslog-socket=none (Closes: #179925) - Fixes --nouser-config (Closes: #164284) - base64 and utf-8 no longer penalized (Closes: #165393) - spamd now does setgid in addition to setuid (Closes: #182869) - sa-learn docs explain ham as non-spam (Closes: #183286) - Fixes some Bayes corruption - * Fixes logcheck format. (Closes: #182838) - * Added -m option by default. (Closes: #183323) - * Added po-debconf support (Patch from Andre Luis Lopes - ) (Closes: #184126) - * Added a debian/watch file for uscan - - -- Duncan Findlay Thu, 3 Apr 2003 19:23:43 -0500 - -spamassassin (2.50-1) unstable; urgency=low - - * New upstream release: (Closes: #181836) - Bayesian learner component - Better scores (Closes: #177317) - New (and improved!) report format - Bugfixes! - Closes: #179641, #166567, #180115, #180117, #164367, #161067, - #165428, #165731, #170881, #154812, #163179, #164960, #161696, - #163297, #163328 - - * Added rules/STATISTICS.txt to /usr/share/doc/spamassassin (Closes: #179799) - - -- Duncan Findlay Wed, 26 Feb 2003 22:58:58 -0500 - -spamassassin (2.44-1) unstable; urgency=low - - * New upstream release (mainly bugfixes) (Closes: #160206) - * Acknowledge NMU (Closes: #178936) - * Bumped priority of debconf question to high - (Closes: #167451, #167452, #169751 - * Removed dependency on libnet-smtp-server-perl (Closes: #175129) - * Fixed debian/rules CFLAGS with patch from - (Closes: #176659) - * Fix lintian warning: - "W: spamassassin: init-script-suggests-versioned-depends postinst" - - -- Duncan Findlay Fri, 31 Jan 2003 19:19:25 -0500 - -spamassassin (2.43-1.1) unstable; urgency=high - - * Non-maintainer upload at maintainer request - * Apply patch for overflow as reported to BUGTRAQ - "SpamAssassin / spamc+BSMTP remote buffer overflow" - (spamd/libspamc.c) - * Depending on how spamc is built, this may or may not be - exploitable - - -- Matt Zimmerman Wed, 29 Jan 2003 11:08:12 -0500 - -spamassassin (2.43-1) unstable; urgency=low - - * New upstream release - * The -m option is no longer recommended. It is buggy. - - -- Duncan Findlay Tue, 15 Oct 2002 23:18:01 -0400 - -spamassassin (2.42-1) unstable; urgency=low - - * New upstream release - (Closes: #160309, #160901, #162013, #159704, #163143, #156263) - Various AWL fixes - -m fixed (better) - Various misc bug fixes. - * Added SENT_BY_AFBACKUP and SENT_BY_APTLC to 65_debian.cf - (Closes: #155527, #155634) - * Added --oknodo's in /etc/init.d/spamassassin (Closes: #161981) - - -- Duncan Findlay Fri, 4 Oct 2002 18:18:10 -0400 - -spamassassin (2.41-2) unstable; urgency=low - - * Applies perl-5.8 / -m patch for spamd. - (Closes: #159826, #159038, #159984) - * Adds debconf note for removal of spamproxyd (Closes: #159930) - - -- Duncan Findlay Sat, 7 Sep 2002 11:23:40 -0400 - -spamassassin (2.41-1) unstable; urgency=low - - * New upstream release - - -- Duncan Findlay Thu, 5 Sep 2002 18:07:13 -0400 - -spamassassin (2.40-1) unstable; urgency=low - - * New upstream release: - Spamproxyd removed -- WILL BREAK CONFIGS -- sorry! (Closes: #156938) - Spamassassin will no longer deliver mail, only filter (-P flag by - default/can't negate) - all_spam_to improved to be smarter (Closes: #151320) - config option to avoid checking dns before use (Closes: #153245) - - * Init script will not fail on stop if spamd not running - (Closes: #158913) - * Logcheck files fixed (symlinks removed, messages updated) - (Closes: #146221, #155295) - * "N16" fix applied. (Will be in upstream 2.41) - * Added link to dman's exim integration stuff in README.Debian - (Closes: #151526) - - -- Duncan Findlay Tue, 3 Sep 2002 01:47:17 -0400 - -spamassassin (2.31-2) unstable; urgency=low - - * Changed Recommends: spamc to Depends: spamc - - -- Duncan Findlay Tue, 25 Jun 2002 13:38:15 -0400 - -spamassassin (2.31-1) unstable; urgency=low - - * New upstream release - - -- Duncan Findlay Thu, 20 Jun 2002 23:09:42 -0400 - -spamassassin (2.30-2) unstable; urgency=low - - * Changed init script to use /var/run/spamd.pid - * Fixed logcheck file to match setuid succeeded messages - * Split spamc into a separate package. Let the bug reports begin! - (Closes: #137140) - - -- Duncan Findlay Mon, 17 Jun 2002 14:49:38 -0400 - -spamassassin (2.30-1) unstable; urgency=low - - * New upstream release (Closes: #140300, #147625, #144482, #143316, - #146588, #13977) - * Added debconf e-mails to whitelist (Closes: #147465) - * Added depends on libtime-hires-perl - * Moved to section mail (interpreters doesn't make sense - spamassassin - isn't just a perl module) - * Removed README.Upgrade. I doubt anyone still uses 1.15 - - -- Duncan Findlay Sat, 15 Jun 2002 01:24:15 -0400 - -spamassassin (2.20-2) unstable; urgency=low - - * Added depends on libnet-smtp-server-perl (Closes: #145297). Depending on - the outcome of bug 119517, this may be downgraded to a Recommends:. - * Removed extra empty dir /usr/share/spamassassin (Closes: #145323) - * Added recommends: for libmailtools-perl (Closes: #143935) - - -- Duncan Findlay Fri, 10 May 2002 20:37:08 -0400 - -spamassassin (2.20-1) unstable; urgency=medium - - * New upstream release. (Closess: #140300, #140910, #143324, #134669, - #136329, #140422, #140910) - * This fixes the "razor 1.20-1 bug" (143324) - * New features. Yay! (including the -S (short-ciruit) flag for spamd) - * Urgency=medium to beat razor 1.20-1 to woody. - - -- Duncan Findlay Sat, 20 Apr 2002 00:05:40 -0400 - -spamassassin (2.11-4) unstable; urgency=medium - - * "Fixes" configuration files "problem"/"bug." I'm really not happy with - putting upstream rules and scores in /etc/spamassassin. But I guess I - don't have a choice. Do I? (Closes: #141484) - * Fixes pathes in Mail::SpamAssassin::Conf docs. (Closes: #141172) - * Fixes "spelling" mistake in description. (Closes: #141512) - - -- Duncan Findlay Sun, 7 Apr 2002 22:02:29 -0400 - -spamassassin (2.11-3) unstable; urgency=low - - * Fixes, and undoes previous damage relating to the logcheck bug (Closes: - #140773) - - -- Duncan Findlay Tue, 2 Apr 2002 17:57:17 -0500 - -spamassassin (2.11-2) unstable; urgency=low - - * Fixes the logcheck bug (Closes: #139201) - * Set SUBJ_FULL_OF_8BITS to 0 (Closes: #140344) - * Set RCVD_IN_ORBZ to 0 (Closes: #139204) - - -- Duncan Findlay Sat, 30 Mar 2002 14:48:22 -0500 - -spamassassin (2.11-1) unstable; urgency=medium - - * New upstream release (mainly saner scores) - * Fixed description in user_prefs file to be less confusing (Closes: - #136648) - * urgency=medium since the last upload never quite got to testing - - -- Duncan Findlay Mon, 4 Mar 2002 19:23:08 -0500 - -spamassassin (2.10-1) unstable; urgency=medium - - * New upstream release - Closes: #131442, #131317, #133026, #131438, #131193, #136047, #134660, - #134557 - * New features: _HITS_ and _REQD_ in subject_tag display number - of hits/required hits, more tests, etc. - * Fixed minor dependency thing (Closes: #131797) - * Included logcheck files (Closes: #131161) - * Actually added README.Upgrade (Closes: #131188) - * Fixed some postrm to purge old files (from 1.5) - * Added a line to /etc/init.d/spamassassin to clarify (stupid) - misconceptions (Closes: #134566) - * Moved manpages to their proper place (ie. .3perl and .8) - * Included (fixed) check_whitelist in examples dir (Closes: #135383) - * Put daemons in /usr/sbin (Closes: #135703) - - -- Duncan Findlay Sun, 17 Feb 2002 19:49:28 -0500 - -spamassassin (2.01-1) unstable; urgency=low - - * New upstream release (lots of new features!) - Closes: #129738, #130260, #126461, #123630, #123886, #123889, #128415 - * Added Debian specific config. (Closes: #126073) - * Moved spamd to boot up earlier than exim (i.e. 19) (Closes: #131028) - - -- Duncan Findlay Sat, 26 Jan 2002 17:24:05 -0500 - -spamassassin (1.5-5) unstable; urgency=low - - * Fixed postinst (Closes: #123954) - * Fixed typo in init. (I really need to learn to spel!) (Closes: #124077) - * Fixed the dpkg dependency to 1.8.1 (Closes: #123320 again!) - * Disables foreign character set tests by default (bug 126073, but - still have to deal with other half) - - -- Duncan Findlay Sat, 22 Dec 2001 16:28:56 -0500 - -spamassassin (1.5-4) unstable; urgency=low - - * Fixed my (ahem...) little typo (that caused spamassassin to not work at - all) (Closes: #123721) - * Moved /etc/default/spamd.conf to /etc/default/spamassassin (Closes: - #123722) - * Fixed hang bug in spamassassin.cf (VERY_SUSP_RECIPS and - VERY_SUSP_CC_RECIPS) - - -- Duncan Findlay Wed, 12 Dec 2001 21:09:21 -0500 - -spamassassin (1.5-3) unstable; urgency=low - - * Changed the regexp for SUBJ_HAS_UNIQ_ID so it doesn't get triggered on - stuff like "Subject: Broken: tar -zxvf" (Closes: #123196) - * Moved /usr/share/perl5/spamassassin.cf and .prefs to - /usr/share/spamassassin/ (Closes: #123475) - * Fixed "name" in init script to spamd (not spamassassin) like it was in - 1.5-1 (Closes: #123545) - * Fixed -e option. (Closes: #123551) - * Added Depends on dpkg >= 1.9.0 (I still don't know what version it - should be. (Closes: #123320 (again!) - * Got rid of the Conflicts and Replaces on libmail-spamassassin-perl. I - figure everyone has upgraded by now, or can figure it out! - * Got rid of explicit razor depends, now just librazor-perl - - -- Duncan Findlay Tue, 11 Dec 2001 20:14:07 -0500 - -spamassassin (1.5-2) unstable; urgency=low - - * Added Build-Depends for ia64 (bind-dev) (Closes some bug yet to be - filed) - * Clarfied README.Debian (Closes: #123194, #123240) - * Fixed word_in_dictionary bug - * Added warning to spamd users using an old version of dpkg - (Closes: #123320) - * Added mass-check to examples (for bug 123290) - - -- Duncan Findlay Mon, 10 Dec 2001 11:37:57 -0500 - -spamassassin (1.5-1) unstable; urgency=low - - * Initial Release. (Closes: #120975) - - -- Duncan Findlay Fri, 7 Dec 2001 20:54:03 -0500 diff -Nru spamassassin-3.4.6/trunk-only/debian/compat spamassassin-4.0.0~rc3/trunk-only/debian/compat --- spamassassin-3.4.6/trunk-only/debian/compat 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -7 diff -Nru spamassassin-3.4.6/trunk-only/debian/control spamassassin-4.0.0~rc3/trunk-only/debian/control --- spamassassin-3.4.6/trunk-only/debian/control 2011-10-28 14:29:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -Source: spamassassin -Section: mail -Priority: optional -Maintainer: Noah Meyerhans -Uploaders: Jesus Climent -Build-Depends: debhelper (>= 7), perl, libssl-dev, - libhtml-parser-perl (>= 3.24), libnet-dns-perl (>= 0.34), libnetaddr-ip-perl -Standards-Version: 3.9.2 -Homepage: http://www.spamassassin.org/ -Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/spamassassin/trunk -Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/spamassassin/trunk/ - -Package: spamassassin -Architecture: all -Conflicts: spamass-milter (<< 0.2.0-7), gotmail (<= 0.8.1-1) -Depends: perl (>= 5.8.0), libhtml-parser-perl (>= 3.43), - libsocket6-perl, libsys-hostname-long-perl, libarchive-tar-perl, - libwww-perl, libnet-dns-perl (>= 0.34), libnetaddr-ip-perl, - perl-modules (>= 5.10) | libio-zlib-perl (>= 1.04), ${misc:Depends} -Recommends: spamc (>= 2.30), libmail-spf-perl, - re2c, libsys-syslog-perl, gnupg, gcc, libc6-dev, make, libio-socket-inet6-perl -Suggests: razor (>= 2.361-2), - libnet-ident-perl, libio-socket-ssl-perl, libdbi-perl, pyzor, - libcompress-zlib-perl, libmail-dkim-perl -Provides: libmail-spamassassin-perl -Description: Perl-based spam filter using text analysis - SpamAssassin is a very powerful and fully configurable spam filter - with numerous features including automatic white-listing, RBL - testing, Bayesian analysis, header and body text analysis. It is - designed to be called from a user's .procmail or .forward file, but - can also be integrated into a Mail Transport Agent (MTA). - . - Included in this package is a daemonized form of spamassassin (spamd) - which communicates with its client (spamc) via TCP, to reduce the - overhead of loading perl with each message. To take advantage of - this, you must install the spamc package. - -Package: spamc -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: spamassassin -Conflicts: spamassassin (<< 2.30-2) -Description: Client for SpamAssassin spam filtering daemon - spamc is the client to communicate with spamd, the daemonized form of - SpamAssassin (see the spamassassin package). It is written in C for - maximum speed and minimum loading overhead. - . - spamc is quite useful for integrating spamassassin into an MTA or - into a .procmailrc file because of its speed. - . - This package is useless unless you have spamassassin installed, - either on this machine or another local machine (i.e. a mail server). - diff -Nru spamassassin-3.4.6/trunk-only/debian/copyright spamassassin-4.0.0~rc3/trunk-only/debian/copyright --- spamassassin-3.4.6/trunk-only/debian/copyright 2011-05-19 01:27:02.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -This package was debianized by Duncan Findlay on -Sat, 24 Nov 2001 18:37:39 -0500. - -It was downloaded from http://www.spamassassin.org/ - -Upstream Authors: Justin Mason , - Craig Hughes - Daniel Quinlan - Theo van Dinter - and others - -Copyright 2000-2004 Justin Mason and others -Copyright 2004-2008 Apache Software Foundation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. - -On Debian GNU/Linux systems, the complete text of the License can be -found in /usr/share/common-licenses/Apache-2.0. - -You may also obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - diff -Nru spamassassin-3.4.6/trunk-only/debian/examples/courier spamassassin-4.0.0~rc3/trunk-only/debian/examples/courier --- spamassassin-3.4.6/trunk-only/debian/examples/courier 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/examples/courier 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Some notes on how to integrate spamassassin with courier --------------------------------------------------------- - -Contributed by: -Charles Fry -Jeronimo Pellegrini - -1) In /etc/courier/courierd set: - -DEFAULTDELIVERY="| /usr/bin/maildrop" - -2) In /etc/courier/maildroprc add the line: - -xfilter "/usr/bin/spamassassin" -or -xfilter "/usr/bin/spamc" - -OR, for a more detailed setup add the following lines. Note that this -only checks mails less than 250k in size and sends spam to a .spam/ -folder. (spamc by default only scans messages that are 250k in size, -so you can get away without using the size check.) - -if ($SIZE lt 250000) -{ - xfilter "/usr/bin/spamc -f" -} - -if (/^X-Spam-Flag: YES/:h || /^X-Spam-Status: Yes/:h) -{ - to .spam/ -} - diff -Nru spamassassin-3.4.6/trunk-only/debian/examples/filter.sh spamassassin-4.0.0~rc3/trunk-only/debian/examples/filter.sh --- spamassassin-3.4.6/trunk-only/debian/examples/filter.sh 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/examples/filter.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#!/bin/sh -# -# filter.sh -# -# Simple filter to plug Anomy Sanitizer and SpamAssassin -# into the Postfix MTA -# -# From http://advosys.ca/papers/postfix-filtering.html -# Advosys Consulting Inc., Ottawa -# Modified by Jesus Climent -# -# For use with: -# Postfix 20010228 or later -# SpamAssassin 2.42 or later -# -# Note: Modify the file locations to match your particular -# server and installation of SpamAssassin. - -# File locations: -# (CHANGE AS REQUIRED TO MATCH YOUR SERVER) - -SENDMAIL=/usr/sbin/sendmail -SPAMASSASSIN=/usr/bin/spamc - -/bin/cat | ${SPAMASSASSIN} -f | ${SENDMAIL} -i "$@" - -exit $? diff -Nru spamassassin-3.4.6/trunk-only/debian/examples/gnus spamassassin-4.0.0~rc3/trunk-only/debian/examples/gnus --- spamassassin-3.4.6/trunk-only/debian/examples/gnus 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/examples/gnus 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -;; F10 pipe the message as spam -(global-set-key [(f10)] - '(lambda () (interactive) (shell-command "sa-learn --spam --single "))) - -;; F9 pipe the message as ham -(global-set-key [(f9)] - '(lambda () (interactive) (shell-command "sa-learn --ham --single "))) diff -Nru spamassassin-3.4.6/trunk-only/debian/examples/muttrc spamassassin-4.0.0~rc3/trunk-only/debian/examples/muttrc --- spamassassin-3.4.6/trunk-only/debian/examples/muttrc 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/examples/muttrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -# Add this to your ~/.muttrc to integrate spamassassin and mutt -# spamassassin report and classify as spam -macro index S "|/usr/bin/spamassassin -r" -# spamassassin classify as ham -macro index H "|/usr/bin/sa-learn --ham --no-sync" -# rebuild the spamassassin bayes filter db -macro index R "!/usr/bin/sa-learn --sync" diff -Nru spamassassin-3.4.6/trunk-only/debian/GPG.KEY spamassassin-4.0.0~rc3/trunk-only/debian/GPG.KEY --- spamassassin-3.4.6/trunk-only/debian/GPG.KEY 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/GPG.KEY 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -This is the GPG key that updates are signed with (currently, -as of Wed Dec 21 19:31:38 PST 2005. Please contact with any questions. - - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.2 (SunOS) - -mQILBEOnbDQBEADBfda+hU8cGXD/2WYrIHsZ5CmvC2eCYKgQ87W706tzwmxoZWQS -JfnRpkZnBqS5WDhXhNBOhk9CgF5/e9yHnDQCusNYfRstKd+t0XTFvq30/tacrJNe -67zgq+DtWqIK9C7akfElc+2M5NkX6mF4cjaMXZoW17ltPy0XSSeirf584nvK3pXf -oEFLYQ/0AUV9EBpo9+i2DkMUd8d5tz7A6O5foB3ijYPzIcVtVJ1eyCg6gO1I4cIA -YbIZCH0WIVx5MQjydfKyCR4D7VFPpZgwcZ1PmyZSsy3lrigGVvYEoUS2fWTt2jUO -pB3wg5pgzuu9hN5CpChZGvq65t4PGtAeShnBkddIH4l+iDC6sAc6W06KidSaUCW1 -BKvNMa39lyEkO4bfLblZRjoZbj7Tjq3wQV/PLpPyKDa8ZZ88GfWaeRDUNRgZG6Qq -e6UKlFGfrw2RXOImUje7Sjy/eG4Ud/BOeGkV913yWBm9CHsPNtaVDK+iQI6vkAWS -3QkiPjBkXGTZFHsUx9/i3k5Iga6d4Gq2cBIVBur3sDxjKuuSazLwA9OAybpzQe2s -PvTzbGc/f1P7plT++HBFlBHwFtl/v68Q8pkbMWlEc5M9nYJ6yXHATHZzFfThxBwt -OYfF25XGaclUMkOMX++RiRkmjaEaT7Whv5aPbeb3+H3v6Omjvnebge24lQAGKbQ/ -dXBkYXRlcy5zcGFtYXNzYXNzaW4ub3JnIFNpZ25pbmcgS2V5IDxyZWxlYXNlQHNw -YW1hc3Nhc3Npbi5vcmc+iQI2BBMBAgAgBQJDp2w0AhsDBgsJCAcDAgQVAggDBBYC -AwECHgECF4AACgkQQFamGlJE7EVkfg//ZjBQ6UXDizX9UPsEmogWXIqbBsyP5DJH -uToaFa6OzCbOJqcYnXNfOjovYdDOTje+x3ZEkwbx+y6MSfhmDuHPDPqBU7hXenxx -oRktC68mJasKo0wXym2YfyWFnhSZMlXXFQ9We48zNGcVRckzaxLzM67BFJuRUfOM -EV6Lf3HxMvoUK3/Xzq9YPEq2sqFO1Eu+qPC3nq726Tj/aYBBFHgHmbjDrZTaQNyV -fHvEjDzPcDRjlJI+vZw1UEuXG+BKATPpiT7U7I1OGLDa2ExDIxh0+eJnsmA3YyHG -VweE7nDN2GmkXMVfa5vXHH49Ae9Ee8jIIRipfgMgZWnkZ0XYDvLj2ueH0Ixu4o9R -D2zJIwqzRh1sytG+1YOfHrOMUCplImJaY/ARgOM324ZdBvhkgIi1XvT7Sy/ZmGWd -DKFo+GjX0r2cujR8Pd4i7VlKsF9wRypk+n/aupXiaz5GY44EIVbnweyS5IlCNrwn -4UtqcB9/9uk1tmUNIcC5xjbq5ud/Y+iMIqCKCH0C9WUwSNSdsg+K+9xoZuvlaXY0 -JeXWNcDdq+tMir+x+/o0U4ENVYBkSFesnotmHwN6jZj4lSMRmvcFHPBljXqLqzM+ -y5wZxnCo1N7T+erZaI7BUrpJYm8JxcJ2VCWV0JFoO1Ec//B6XYB0pckbRuSTX/Zw -pKEkNqOdmjm5AgsEQ6dsigEQAKvdggbwqJgfDbRE2Lcy2gsn4j7haqu3IVBbyUDn -kGuuDuEtSeoRjCZXEb5DaKibIpEy5vzvRGvCFFkrBs4KXk/uamkgCpGnQZFnoz/S -rNZ8U7+e1pecEePpIkhQyafUKox9+p43UVoq4UybdPRDvE9SmQ1qaNUhyQY2FP9S -WT1a63u5GA73aH4puGO0BuZ9R3MNaDYZe/MOlRRjmlAsbY4oqWOudlNVaZ71EV3O -FFmOH4pnpxdO0X0l6sF6nvqvO5/gdZ3dI5iqrJjUneVgVOmPkREq7tQ5qHS/2pny -rDrH8NZCDNT5TXciBxBrt53bxxL/V/HWaolmtJi8gK82uXt8YlmT6zuEsofufDmu -P/HMDZ+BhGI+ggNzY2AVwERTRD6ecHDOI3iIuCP4Ck26YNHRCLyocL3CSlIpjQPu -tb3qfdAcqKLJ/fVyLtGkXr24crel6IeJY7/AGjYBrfh47DWnK7Xds8bAqJ8VCjOc -/q1usFTHgGkYocvtv0gmcjbu8YypzuG8HxOg9Yk9qRLQgg1fNhzXE2lqEPyMlBfj -eLmMNRvKP70fH8CK8adinPIegaRrS6gZ/iIdv8+YV+1rlEt28qzzGJxnmzUEmW6X -Xj44u91umg9WOsLxTOCQWdjGHonytHqj/xIsf45N2JIGLhU0lF04hYfEo5p65AyM -PpYhAAYpiQIfBBgBAgAJBQJDp2yKAhsCAAoJEEBWphpSROxFungP/iWKe7o8szOz -VmXkj89xDVFZ69nthVKkbgSYIZYQC+QLF8P1MWRnNWO/8TY+XsaCT3SrqxDFQ/R/ -9mlAPGUM1ySVihOPmP/DPiOlWLCsc0mb6OzYF2olcOR33s05MqvJlqXSmIrdB+hI -KkC7G5byZ+XZwPXVj4XlxIEOzs18+0YJqy0IPZPXTiMet4k2KyWyWkJpJYUCb19G -R6QC8hZQD97EYTbkbr5Ss26jjY/9AqLofW5F1/98pLDo+ron7pI2k8Ymn5DngEsa -XoGsQuyvPfTAjS4p9q/XwExJcX3gvQesdw18mpoSaGAOgDISolBPRqpHpy7v7vuw -3UMnsefKOX3F0Rossevw+c2/JCulnGmJDlgz6nHSR6FhHsbrDKF8oBeYPfGW/Kjw -NvzB1i9yubAMrsTQVu1Q8e5LsnL/MNYKb6oEJbBywdeHxBkehGWFXVdSoFvVSih/ -VNqX9f7jlybpLZW/n8cQ2r1ax19v7FleO/xSGvkYm7B1+4BW0mjy6A5dta5+e5WG -D5R06Uya3/xRAPGdmV6t4Mw8fFsuyCvs+vC73PR3+eS1UvCYsDpcQD8KpVBnsHaA -duWRKKhjuFL0vdOWAr25tFOTKAj5Ywas47PBukO0isov2WBCA1rVqOr6FUvdP76y -mqHv/0E6/vnTLxFoNsu4Ce42nAQ/A/jRiQQ+BBgBAgAJAhsCBQJHhbheAinBXSAE -GQECAAYFAkOnbIoACgkQbFU5eCT0NM68MQ/8DvYqxRm3vP0Gwnr+63kzET8S+6vf -gxOghnU+eMlqUeUu/ajqnVDMzoAIRDw9QgQc9ZZoklOSJQwOuloAbdpL4TwQ2XfJ -MLU60JkZWnEOXJwClb0qG1GqtcBPbMEUPfZcQfphdRL3jpWZlaexFiJRSD+A0riw -7q3NZKPDt4FrF7F3GY9krFy+P0nRt5f462DeDhCYZgguBQH+oGtjc5Hx+kOVWDsS -txo5xkt4/0DG50ZklPkTlCohmJwRLACy+NswdQ9q83eWAhzKOPgkal7xF6a+LyE+ -ytVYy2EgEU74r2gVw5iizy92FDj//Z2QAUyf/c4BMuAhvfwVIHd8n2DPHvpMP15L -6fwoymh0OjzmhwK94Z2u1YqNC1CK27/hfB6okQ/Tct7/Ik61dBjtiYdUC9tTA5Ze -W8X5ouSmttS1QFixx+Z4hiXV7Qj12lgVKuJohjrVshfcbVzTHljjAo3YkOZIHIoA -IJTUMRNzTIx9k4hrPVbxbVQhKjKTwFNtBuxvmptGTcLEIv9THpqlq8jkcStJ2Zrd -hhofPCWRT/Kzo+WE+Kgefv88T5Li7Ku12U/UpiK85+6nRspXj3rnkfDOUbLZjGM+ -1NET0xQTPuyxN6CXF7MMxfGCpszCudYxMANDQqNXu9brcPN/+EIxGRjqin4E7q+h -kYUaY7Ki8mXtJ8cJEEBWphpSROxFktcQALWQv996bFq1iFcGuQ0ITxNDlOWCsses -bgEM5zR10DH+6s2bXEO8xyDHQJtrvdCPetRDosnuOToBMnGMXTYVytnWzwwAzwq1 -YM+bGAeTHaIX+2UmxwFyX4GMOdqsNB+xDZ8pmRKjamJSgUQt6e18YpZlg1Y4QkxS -Vptq7OZBjiKeLUhLhGJ6GWgEIedLcoCtFzKCfz3zwn0Oxl+1EnVu8yqN+quWTf8P -7EZn+0ztqZY059BrcK2jmOyXvtOZBcAHXCUknh/uPHwAJV2WFWSNid2kNiLOrV+J -3eLTs5sF9wNhxWRhl6/10cwTzjy0Onv5cJh2tjdwksigMRMwz4c839zXORni/tnY -+IY22kNTKu84gB8rBuqUq8MQXNdS3bbROwwNUzpC0D1C1z1fBvyXDL1EwJdz70Wc -2m/Sw6tIid5g98+XMW+Ibt43Jk2XbK71JLhbVbePbAcHVh/UXEtnjhRfX7oyWlwS -a+lkKMiJd/6CQ6bvYsgklE7uEzTpRskpkkOcCk1O+8jfl+DsDwKrvVaNu8tpx45k -TtV4JDA6iEHKakD/zZdVTR79W2CFqBvRfRikc5INOl1OfMQ4ODmjkMl3yI9wrHwS -SQQxdq2XsS7xbU9HDFBEguQDu0rfzILZ9DuKIVHyr/CsRoJ5joj+JvKaUQC81ywQ -aB8EKy5bg4U6 -=IbYW ------END PGP PUBLIC KEY BLOCK----- diff -Nru spamassassin-3.4.6/trunk-only/debian/NEWS spamassassin-4.0.0~rc3/trunk-only/debian/NEWS --- spamassassin-3.4.6/trunk-only/debian/NEWS 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -spamassassin (3.3.1-2) unstable; urgency=low - - This version of spamassassin introduces a change in behavior when - using SSL to encrypt communication between spamc and spamd. This - change only affects usage of spamc or spamd with the --ssl option. - Due to protocol insecurity, OpenSSL has removed support for SSL - version 2. Consequently, the "sslv2" and "sslv23" options have been - removed from spamc and spamd. The default option is sslv3. - - This change should be transparent unless you are using spamc or spamd - with a peer that is explicitly configured to use only sslv2 - - -- Noah Meyerhans Sun, 10 Apr 2011 18:27:36 -0700 - -spamassassin (3.3.0-2) unstable; urgency=low - - Prior to version 3.3.0, spamassassin defaulted to having the - auto-whitelist plugin enabled. This is no longer the case. If you - wish to continue using it, you will want to add - loadplugin Mail::SpamAssassin::Plugin::AWL - to /etc/spamassassin/local.pre - Additionally, note that if you have added any custom configuration - options related to the auto-whitelist plugin (e.g. - auto_whitelist_factory), the upgrade from to 3.3.0 from prior - versions may fail unless you explicitly enable the plugin. - - -- Noah Meyerhans Sun, 28 Feb 2010 19:37:34 -0800 - -spamassassin (3.2.5-7) unstable; urgency=high - - This version of SpamAssassin fixes a bug which caused mails sent - in 2010 to be flagged as suspiciously spammy. If upgrading to this - version, you are recommended to update any per-user caches previously - created by sa-compile, and to check mail already in your spam folder - for false positives more carefully than usual. - - -- Joey Hess Fri, 01 Jan 2010 12:03:40 -0500 - -spamassassin (3.2.0-1) unstable; urgency=low - - This version of SpamAssassin contains a new feature which can be - used to greatly improve the performance of SpamAssassin. Read - README.Debian and the sa-compile man page for more information. - - This version now includes a cron job to automatically update the - SpamAssassin rules on a daily basis. To enable it, edit - /etc/default/spamassassin - - -- Duncan Findlay Mon, 21 May 2007 11:17:49 -0400 - -spamassassin (3.1.1-1) unstable; urgency=low - - This is a new upstream release containing mostly bug fixes. The - largest change is the inclusion of a (fixed) script called sa-update - that can be used to download the latest rules from upstream. To use - it run sa-update as root. In the future, this may, by default, run - from a cron job automatically, but in the interim it is a manual - process. - - -- Duncan Findlay Sun, 7 May 2006 17:27:34 -0400 - -spamassassin (3.1.0a-1) unstable; urgency=low - - This is a new major upstream release with many new - features. Detailed information on the upgrade is available in - /usr/share/doc/spamassassin/UPGRADE.gz. The most important changes - are documented here. If you have made local configuration changes, - you will probably want to read that documentation to ensure you - configuration is still correct. - - DCC and Razor support have been disabled by default, since they are - no longer free for non-personal use. To re-enable them, edit - /etc/spamassassin/v310.pre - - More Bayes storage modules have been added. The default, using - perl's DB_File module, is the slowest. You may wish to switch to the - SDBM storage module (uses perl's SDBM_File module). If you are - currently using the SQL module, you may wish to switch to using the - MySQL or PgSQL modules. To switch storage modules, follow the steps - listed in the "MIGRATION" section of the sa-learn(1) man page. - - Spamd and spamc now support Bayes learning, if the --allow-tell or - -l option is given to spamd. Please note that there may be security - implications with enabling this option. (Command line options to - spamd are changed in /etc/default/spamassassin) - - -- Duncan Findlay Wed, 5 Oct 2005 14:40:41 -0400 diff -Nru spamassassin-3.4.6/trunk-only/debian/patches/10_change_config_paths spamassassin-4.0.0~rc3/trunk-only/debian/patches/10_change_config_paths --- spamassassin-3.4.6/trunk-only/debian/patches/10_change_config_paths 2011-08-12 16:49:27.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/patches/10_change_config_paths 1970-01-01 00:00:00.000000000 +0000 @@ -1,330 +0,0 @@ -Index: spamassassin_release_3_3_2_rc_1/INSTALL -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/INSTALL 2011-05-14 09:04:39.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/INSTALL 2011-05-14 11:55:36.000000000 -0700 -@@ -455,7 +455,7 @@ - perl interpreter. Version 2.83 or later fixes this. - - If you do not plan to use this plugin, be sure to comment out -- its loadplugin line in "/etc/mail/spamassassin/v310.pre". -+ its loadplugin line in "/etc/spamassassin/v310.pre". - - - What Next? -Index: spamassassin_release_3_3_2_rc_1/README -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/README 2011-05-14 09:04:39.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/README 2011-05-14 11:55:36.000000000 -0700 -@@ -111,13 +111,13 @@ - not modify these, as they are overwritten when you run - "sa-update". - -- - /etc/mail/spamassassin/*.cf: -+ - /etc/spamassassin/*.cf: - - Site config files, for system admins to create, modify, and - add local rules and scores to. Modifications here will be - appended to the config loaded from the above directory. - -- - /etc/mail/spamassassin/*.pre: -+ - /etc/spamassassin/*.pre: - - Plugin control files, installed from the distribution. These are - used to control what plugins are loaded. Modifications here will -@@ -126,7 +126,7 @@ - - You want to modify these files if you want to load additional - plugins, or inhibit loading a plugin that is enabled by default. -- If the files exist in /etc/mail/spamassassin, they will not -+ If the files exist in /etc/spamassassin, they will not - be overwritten during future installs. - - - /usr/share/spamassassin/user_prefs.template: -@@ -134,14 +134,14 @@ - Distributed default user preferences. Do not modify this, as it is - overwritten when you upgrade. - -- - /etc/mail/spamassassin/user_prefs.template: -+ - /etc/spamassassin/user_prefs.template: - - Default user preferences, for system admins to create, modify, and - set defaults for users' preferences files. Takes precedence over - the above prefs file, if it exists. - - Do not put system-wide settings in here; put them in a file in the -- "/etc/mail/spamassassin" directory ending in ".cf". This file is -+ "/etc/spamassassin" directory ending in ".cf". This file is - just a template, which will be copied to a user's home directory - for them to change. - -Index: spamassassin_release_3_3_2_rc_1/UPGRADE -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/UPGRADE 2011-05-14 09:04:39.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/UPGRADE 2011-05-14 11:55:36.000000000 -0700 -@@ -49,7 +49,7 @@ - perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc) - - - There are now multiple files read to enable plugins in the -- /etc/mail/spamassassin directory; previously only one, "init.pre" was -+ /etc/spamassassin directory; previously only one, "init.pre" was - read. Now both "init.pre", "v310.pre", and any other files ending - in ".pre" will be read. As future releases are made, new plugins - will be added to new files named according to the release they're -@@ -207,7 +207,7 @@ - - If you are using a UNIX machine with all database files on local disks, - and no sharing of those databases across NFS filesystems, you can use a - more efficient, but non-NFS-safe, locking mechanism. Do this by adding -- the line "lock_method flock" to the /etc/mail/spamassassin/local.cf -+ the line "lock_method flock" to the /etc/spamassassin/local.cf - file. This is strongly recommended if you're not using NFS, as it is - much faster than the NFS-safe locker. - -Index: spamassassin_release_3_3_2_rc_1/USAGE -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/USAGE 2011-05-14 09:04:39.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/USAGE 2011-05-14 11:55:36.000000000 -0700 -@@ -117,7 +117,7 @@ - CPU-intensive task before they can send mail to you, so we give that - some bonus points. However, it requires that you list what addresses - you expect to receive mail for, by adding 'hashcash_accept' lines to -- your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf -+ your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf - files. See the Mail::SpamAssassin::Plugin::Hashcash manual page for - details on how to specify these. - -@@ -129,14 +129,14 @@ - - - - You can create your own system-wide rules files in -- /etc/mail/spamassassin; their filenames should end in ".cf". Multiple -+ /etc/spamassassin; their filenames should end in ".cf". Multiple - files will be read, and SpamAssassin will not overwrite these files - when installing a new version. - - - - You should not modify the files in /usr/share/spamassassin; these - will be overwritten when you upgrade. Any changes you make in -- files in the /etc/mail/spamassassin directory, however, will -+ files in the /etc/spamassassin directory, however, will - override these files. - - -Index: spamassassin_release_3_3_2_rc_1/ldap/README -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/ldap/README 2011-05-14 09:04:33.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/ldap/README 2011-05-14 11:55:36.000000000 -0700 -@@ -13,7 +13,7 @@ - database or LDAP server. - - SpamAssassin will check the global configuration file (ie. any file matching --/etc/mail/spamassassin/*.cf) for the following settings: -+/etc/spamassassin/*.cf) for the following settings: - - user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__ - user_scores_ldap_username bind dn -Index: spamassassin_release_3_3_2_rc_1/lib/Mail/SpamAssassin/Conf.pm -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/lib/Mail/SpamAssassin/Conf.pm 2011-05-14 09:04:33.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/lib/Mail/SpamAssassin/Conf.pm 2011-05-14 11:55:36.000000000 -0700 -@@ -40,7 +40,7 @@ - =head1 DESCRIPTION - - SpamAssassin is configured using traditional UNIX-style configuration files, --loaded from the C and C -+loaded from the C and C - directories. - - The following web page lists the most important configuration settings -@@ -1956,7 +1956,7 @@ - - These settings differ from the ones above, in that they are considered - 'privileged'. Only users running C from their procmailrc's or --forward files, or sysadmins editing a file in C, can -+forward files, or sysadmins editing a file in C, can - use them. C users cannot use them in their C files, for - security and efficiency reasons, unless C is enabled (and - then, they may only add rules from below). -Index: spamassassin_release_3_3_2_rc_1/lib/Mail/SpamAssassin/Plugin/Test.pm -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/lib/Mail/SpamAssassin/Plugin/Test.pm 2011-05-14 09:04:33.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/lib/Mail/SpamAssassin/Plugin/Test.pm 2011-05-14 11:55:36.000000000 -0700 -@@ -27,7 +27,7 @@ - =head1 DESCRIPTION - - To try this plugin, write the above two lines in the synopsis to --C. -+C. - - =cut - -Index: spamassassin_release_3_3_2_rc_1/lib/spamassassin-run.pod -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/lib/spamassassin-run.pod 2011-05-14 09:04:33.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/lib/spamassassin-run.pod 2011-05-14 11:55:36.000000000 -0700 -@@ -41,7 +41,7 @@ - -p prefs, --prefspath=file, --prefs-file=file - Set user preferences file - --siteconfigpath=path Path for site configs -- (def: /etc/mail/spamassassin) -+ (def: /etc/spamassassin) - --cf='config line' Additional line of configuration - -x, --nocreate-prefs Don't create user preferences file - -e, --exit-code Exit with a non-zero exit code if the -@@ -239,7 +239,7 @@ - =item B<--siteconfigpath>=I - - Use the specified path for locating site-specific configuration files. Ignore --the default directories (usually C or similar). -+the default directories (usually C or similar). - - =item B<--cf='config line'> - -Index: spamassassin_release_3_3_2_rc_1/rules/user_prefs.template -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/rules/user_prefs.template 2011-05-14 09:04:34.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/rules/user_prefs.template 2011-05-14 11:55:36.000000000 -0700 -@@ -5,7 +5,7 @@ - #* directory. At runtime, if a user has no preferences in their home directory - #* already, it will be copied for them, allowing them to perform personalised - #* customisation. If you want to make changes to the site-wide defaults, --#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead. -+#* create a file in /etc/spamassassin instead. - ########################################################################### - - # How many points before a mail is considered spam. -Index: spamassassin_release_3_3_2_rc_1/sa-compile.raw -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/sa-compile.raw 2011-05-14 09:04:39.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/sa-compile.raw 2011-05-14 11:55:36.000000000 -0700 -@@ -674,7 +674,7 @@ - -p prefs, --prefspath=file, --prefs-file=file - Set user preferences file - --siteconfigpath=path Path for site configs -- (default: /etc/mail/spamassassin) -+ (default: /etc/spamassassin) - --updatedir=path Directory to place updates - (default: @@LOCAL_STATE_DIR@@/compiled//@@VERSION@@) - --cf='config line' Additional line of configuration -@@ -736,7 +736,7 @@ - =item B<--siteconfigpath>=I - - Use the specified path for locating site-specific configuration files. Ignore --the default directories (usually C or similar). -+the default directories (usually C or similar). - - =item B<--updatedir> - -Index: spamassassin_release_3_3_2_rc_1/sa-learn.raw -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/sa-learn.raw 2011-05-14 09:04:39.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/sa-learn.raw 2011-05-14 11:55:36.000000000 -0700 -@@ -643,7 +643,7 @@ - -p prefs, --prefspath=file, --prefs-file=file - Set user preferences file - --siteconfigpath=path Path for site configs -- (default: /etc/mail/spamassassin) -+ (default: /etc/spamassassin) - --cf='config line' Additional line of configuration - -D, --debug [area=n,...] Print debugging messages - -V, --version Print version -@@ -800,7 +800,7 @@ - =item B<--siteconfigpath>=I - - Use the specified path for locating site-specific configuration files. Ignore --the default directories (usually C or similar). -+the default directories (usually C or similar). - - =item B<--cf='config line'> - -Index: spamassassin_release_3_3_2_rc_1/spamc/spamc.pod -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/spamc/spamc.pod 2011-05-14 09:04:36.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/spamc/spamc.pod 2011-05-14 11:55:36.000000000 -0700 -@@ -273,8 +273,8 @@ - - If the B<-F> switch is specified, that file will be used. Otherwise, - C will attempt to load spamc.conf in C (default: --/etc/mail/spamassassin). If that file doesn't exist, and the B<-F> --switch is not specified, no configuration file will be read. -+/etc/spamassassin). If that file doesn't exist, and the B<-F> switch -+is not specified, no configuration file will be read. - - Example: - -Index: spamassassin_release_3_3_2_rc_1/spamd/README -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/spamd/README 2011-05-14 09:04:39.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/spamd/README 2011-05-14 11:55:36.000000000 -0700 -@@ -105,7 +105,7 @@ - If you plan to use Bayesian classification (the BAYES rules) with spamd, - you will need to either - -- 1. modify /etc/mail/spamassassin/local.cf to use a shared database of -+ 1. modify /etc/spamassassin/local.cf to use a shared database of - tokens, by setting the 'bayes_path' setting to a path all users can read - and write to. You will also need to set the 'bayes_file_mode' setting - to 0666 so that created files are shared, too. -Index: spamassassin_release_3_3_2_rc_1/spamd/README.vpopmail -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/spamd/README.vpopmail 2011-05-14 09:04:39.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/spamd/README.vpopmail 2011-05-14 11:55:36.000000000 -0700 -@@ -43,7 +43,7 @@ - /home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs - - 5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work. --This is specified in your /etc/mail/spamassassin/local.cf file. Perhaps a -+This is specified in your /etc/spamassassin/local.cf file. Perhaps a - future enhancement would be to add the capability to have personal AWL db. - - 6. Of course vpopmail must have the seekable patch installed (see -Index: spamassassin_release_3_3_2_rc_1/spamd/spamd.raw -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/spamd/spamd.raw 2011-05-14 09:04:39.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/spamd/spamd.raw 2011-05-14 11:55:36.000000000 -0700 -@@ -2951,7 +2951,7 @@ - =item B<--siteconfigpath>=I - - Use the specified path for locating site-specific configuration files. Ignore --the default directories (usually C or similar). -+the default directories (usually C or similar). - - =item B<--cf='config line'> - -Index: spamassassin_release_3_3_2_rc_1/sql/README -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/sql/README 2011-05-14 09:04:35.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/sql/README 2011-05-14 11:55:36.000000000 -0700 -@@ -18,7 +18,7 @@ - SQL preferences. - - SpamAssassin will check the global configuration file (ie. any file matching --/etc/mail/spamassassin/*.cf) for the following settings: -+/etc/spamassassin/*.cf) for the following settings: - - user_scores_dsn DBI:driver:connection - user_scores_sql_username dbusername -Index: spamassassin_release_3_3_2_rc_1/sql/README.awl -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/sql/README.awl 2011-05-14 09:04:35.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/sql/README.awl 2011-05-14 11:55:36.000000000 -0700 -@@ -15,7 +15,7 @@ - auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList - - SpamAssassin will check the global configuration file (ie. any file --matching /etc/mail/spamassassin/*.cf) for the following settings: -+matching /etc/spamassassin/*.cf) for the following settings: - - user_awl_dsn DBI:driver:database:hostname[:port] - user_awl_sql_username dbusername -Index: spamassassin_release_3_3_2_rc_1/t/data/testplugin.pm -=================================================================== ---- spamassassin_release_3_3_2_rc_1.orig/t/data/testplugin.pm 2011-05-14 09:04:37.000000000 -0700 -+++ spamassassin_release_3_3_2_rc_1/t/data/testplugin.pm 2011-05-14 11:55:36.000000000 -0700 -@@ -1,6 +1,6 @@ - =head1 testplugin.pm - --To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf: -+To try this out, write these lines to /etc/spamassassin/plugintest.cf: - - loadplugin myTestPlugin - header MY_TEST_PLUGIN eval:check_test_plugin() diff -Nru spamassassin-3.4.6/trunk-only/debian/patches/20_edit_spamc_pod spamassassin-4.0.0~rc3/trunk-only/debian/patches/20_edit_spamc_pod --- spamassassin-3.4.6/trunk-only/debian/patches/20_edit_spamc_pod 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/patches/20_edit_spamc_pod 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: spamassassin-3.3.1/spamc/spamc.pod -=================================================================== ---- spamassassin-3.3.1.orig/spamc/spamc.pod 2010-03-21 23:14:12.000000000 -0700 -+++ spamassassin-3.3.1/spamc/spamc.pod 2010-03-21 23:14:28.000000000 -0700 -@@ -321,7 +321,7 @@ - - =head1 SEE ALSO - --spamd(1) -+spamd(8) - spamassassin(1) - Mail::SpamAssassin(3) - diff -Nru spamassassin-3.4.6/trunk-only/debian/patches/30_edit_README spamassassin-4.0.0~rc3/trunk-only/debian/patches/30_edit_README --- spamassassin-3.4.6/trunk-only/debian/patches/30_edit_README 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/patches/30_edit_README 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Index: b/README -=================================================================== ---- a/README 2010-01-26 23:16:56.000000000 -0500 -+++ b/README 2010-01-26 23:16:57.000000000 -0500 -@@ -129,11 +129,6 @@ - If the files exist in /etc/spamassassin, they will not - be overwritten during future installs. - -- - /usr/share/spamassassin/user_prefs.template: -- -- Distributed default user preferences. Do not modify this, as it is -- overwritten when you upgrade. -- - - /etc/spamassassin/user_prefs.template: - - Default user preferences, for system admins to create, modify, and diff -Nru spamassassin-3.4.6/trunk-only/debian/patches/series spamassassin-4.0.0~rc3/trunk-only/debian/patches/series --- spamassassin-3.4.6/trunk-only/debian/patches/series 2011-05-27 22:23:34.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -10_change_config_paths -20_edit_spamc_pod -30_edit_README diff -Nru spamassassin-3.4.6/trunk-only/debian/README.postfix spamassassin-4.0.0~rc3/trunk-only/debian/README.postfix --- spamassassin-3.4.6/trunk-only/debian/README.postfix 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/README.postfix 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -Integration SpamAssassin with Postfix - -This file contains information on how to integrate SpamAssassin with Postfix -for incoming mails. - -1. Set SpamAssassin to start after booting the system - -Edit /etc/defaults/spamassassin and set SpamAssassin to start after a reboot. - -2. Start SpamAssassin - -/etc/init.d/spamassassin start - -3. Create a filter user. - -adduser --disabled-password --disabled-login --gecos "Postfix Filter User" filter - -4. Create the filter script. - -Under ~filter, create filter.sh: - -#!/bin/sh -/bin/cat | /usr/bin/spamc -f | /usr/sbin/sendmail -i "$@" -exit $? - -Be sure to chmod it to 750, at least. - -A more complete example can be found under /usr/share/doc/spamassassin/examples - -5. Set /etc/postfix/master.cf - -It must contain the following lines: - -localhost:smtp inet n - - - - smtpd -:smtp inet n - - - - smtpd - -o content_filter=filter: - -[...] - -filter unix - n n - - pipe - flags=Rq user=filter argv=/home/filter/filter.sh -f ${sender} -- ${recipient} - -6. Reload postfix - -As root, exec: - -#> postfix reload - - - -That should be it. - -Aug 2003, Jesus Climent diff -Nru spamassassin-3.4.6/trunk-only/debian/rules spamassassin-4.0.0~rc3/trunk-only/debian/rules --- spamassassin-3.4.6/trunk-only/debian/rules 2011-05-19 01:27:02.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,184 +0,0 @@ -#!/usr/bin/make -f - -# SpamAssassin debian/rules -# Duncan Findlay - -# Based on sample debian/rules by Joey Hess -# And patches from various people (see changelog) - -#export DH_VERBOSE=1 - -# The architecture-dependent portion of this package can be built separately -# (i.e. without building the rest). - -# Bad things could probably happen if we run this in parallel -.NOTPARALLEL: - -CFLAGS=-O2 -Wall - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -# For building both spamc and spamassassin -configure: configure-stamp -configure-stamp: - - dh_testdir - - perl Makefile.PL INSTALLDIRS=vendor \ - DESTDIR=$(CURDIR)/debian/spamassassin \ - CONFDIR=/etc/spamassassin \ - ENABLE_SSL=yes < /dev/null - - touch configure-stamp - -build: build-indep build-arch - -install: install-indep install-arch - -binary: binary-indep binary-arch - -clean: clean1 -clean1: - dh_testdir - dh_testroot - rm -f build-indep-stamp build-arch-stamp configure-stamp - - [ ! -f Makefile ] || $(MAKE) veryclean - - rm -f spamd/spamc.1p sa-awl.1p sa-check_spamd.1p - rm -Rf t/log/* - rm -f debian/semantic.cache - - dh_clean - -#debian/po/templates.pot: debian/spamassassin.templates -# -debconf-updatepo - -# Spamassassin ONLY - -build-indep: build-indep-stamp -#build-indep-stamp: configure debian/po/templates.pot -build-indep-stamp: configure - - dh_testdir - - $(MAKE) CFOPTIMIZE="$(CFLAGS)" CFCCFLAGS="" CFLIBS="" CFLDFLAGS="" - - pod2man sa-awl.raw sa-awl.1p - pod2man sa-check_spamd.raw sa-check_spamd.1p - - touch build-arch-stamp - - touch build-indep-stamp - - -install-indep: install-spamassassin - -# SpamAssassin - -install-spamassassin: build-indep - dh_testdir - dh_testroot - dh_prep - dh_installdirs -i - - $(MAKE) install DESTDIR=`pwd`/debian/spamassassin - - -# Get rid of SPAMC stuff. - rm debian/spamassassin/usr/bin/spamc debian/spamassassin/usr/share/man/man1/spamc.1p - - -# Move spamd to /usr/sbin + fix the man file - sed 's#SPAMD 1#SPAMD 8#' \ - debian/spamassassin/usr/share/man/man1/spamd.1p \ - > debian/spamassassin/usr/share/man/man8/spamd.8p - rm debian/spamassassin/usr/share/man/man1/spamd.1p - - mv debian/spamassassin/usr/bin/spamd debian/spamassassin/usr/sbin/ - -# Install Debian specific files - cp debian/65_debian.cf debian/spamassassin/etc/spamassassin/65_debian.cf - - -rmdir -p debian/spamassassin/usr/lib/perl5 - -# dh_installdocs isn't flexible enough to install all the docs to the right place -# Do it here! - cp debian/copyright debian/GPG.KEY debian/spamassassin/usr/share/doc/spamassassin/ - cp debian/spamassassin.README.Debian debian/spamassassin/usr/share/doc/spamassassin/README.Debian - cp CREDITS README TRADEMARK UPGRADE USAGE NOTICE debian/spamassassin/usr/share/doc/spamassassin/ - cp ldap/README debian/spamassassin/usr/share/doc/spamassassin/README.ldap - cp rules/STATISTICS*.txt debian/spamassassin/usr/share/doc/spamassassin/rules/ - cp spamd/README debian/spamassassin/usr/share/doc/spamassassin/README.spamd - cp spamd/README.vpopmail debian/spamassassin/usr/share/doc/spamassassin/README.spamd-vpopmail - cp -r sql/ debian/spamassassin/usr/share/doc/spamassassin/ - - cp pkgrules/* debian/spamassassin/usr/share/spamassassin - -binary-indep: build-indep install-indep - dh_testdir -i - dh_testroot -i -# dh_installdebconf -i -# dh_installlogcheck -i - dh_installman -i sa-awl.1p sa-check_spamd.1p - dh_installdocs -i - dh_installexamples -i - dh_installinit -i -- defaults 19 21 - dh_installcron -i - dh_installchangelogs Changes -i - dh_link -i - dh_compress -i -XGPG.KEY - dh_fixperms -i - dh_installdeb -i - dh_perl -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# spamc ONLY - -build-arch: build-arch-stamp -#build-arch-stamp: configure debian/po/templates.pot -build-arch-stamp: configure - - dh_testdir - - -mkdir -p blib/man1 - - $(MAKE) CFOPTIMIZE="$(CFLAGS)" CFCCFLAGS="" CFLIBS="" CFLDFLAGS="" spamc/spamc - - pod2man spamc/spamc.pod blib/man1/spamc.1p - - touch build-arch-stamp - -install-arch: DH_OPTIONS= -install-arch: build-arch - dh_testdir - dh_testroot - dh_prep - dh_installdirs -a - - cp spamc/spamc debian/spamc/usr/bin/spamc - -binary-arch: build-arch install-arch - dh_testdir -a - dh_testroot -a -# dh_installlogcheck -a - dh_installdocs -a - dh_installman -a - dh_installchangelogs Changes -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -.PHONY: build build-indep build-arch clean clean1 binary-indep binary-arch binary install configure install-indep install-indep-docs install-arch diff -Nru spamassassin-3.4.6/trunk-only/debian/source/format spamassassin-4.0.0~rc3/trunk-only/debian/source/format --- spamassassin-3.4.6/trunk-only/debian/source/format 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.cron.daily spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.cron.daily --- spamassassin-3.4.6/trunk-only/debian/spamassassin.cron.daily 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.cron.daily 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -#!/bin/sh - -# Duncan Findlay -# duncf@debian.org - -# Daily cronjob for SpamAssassin updates. This isn't pretty but it -# should do the job. - -CRON=0 - -test -f /etc/default/spamassassin && . /etc/default/spamassassin - -test -x /usr/bin/sa-update || exit 0 -test -x /etc/init.d/spamassassin || exit 0 - -if [ "$CRON" = "0" ] ; then - exit 0 -fi - -# If there's a problem with the ruleset or configs, print the output -# of spamassassin --lint (which will typically get emailed to root) -# and abort. -die_with_lint() { - spamassassin --lint -D 2>&1 - exit 1 -} - -do_compile() { -# Compile, if rules have previously been compiled, and it's possible - if [ -x /usr/bin/re2c -a -x /usr/bin/sa-compile \ - -a -d /var/lib/spamassassin/compiled ]; then - sa-compile --quiet - # Fixup perms -- group and other should be able to - # read and execute, but never write. Works around - # sa-compile's failure to obey umask. - if [ -d /var/lib/spamassassin ]; then - chmod -R go-w,go+rX /var/lib/spamassassin/ - fi - fi -} - -# Tell a running spamd to reload its configs and rules. -reload() { - # Reload - if which invoke-rc.d >/dev/null 2>&1; then - invoke-rc.d spamassassin reload > /dev/null - else - /etc/init.d/spamassassin reload > /dev/null - fi - if [ -d /etc/spamassassin/sa-update-hooks.d ]; then - run-parts --lsbsysinit /etc/spamassassin/sa-update-hooks.d - fi -} - -# Sleep for up to 3600 seconds -RANGE=3600 -number=`od -vAn -N2 -tu4 < /dev/urandom` -number=`expr $number "%" $RANGE` -sleep $number - - -# Update -umask 022 -sa-update - -case $? in - 0) - # got updates! - spamassassin --lint || die_with_lint - do_compile - reload - ;; - 1) - # no updates - exit 0 - ;; - 2) - # lint failed! - die_with_lint - ;; - *) - echo "sa-update failed for unknown reasons" 1>&2 - ;; -esac - diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.default spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.default --- spamassassin-3.4.6/trunk-only/debian/spamassassin.default 2011-05-19 01:27:02.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.default 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -# /etc/default/spamassassin -# Duncan Findlay - -# WARNING: please read README.spamd before using. -# There may be security risks. - -# Change to one to enable spamd -ENABLED=0 - -# Options -# See man spamd for possible options. The -d option is automatically added. - -# SpamAssassin uses a preforking model, so be careful! You need to -# make sure --max-children is not set to anything higher than 5, -# unless you know what you're doing. - -OPTIONS="--create-prefs --max-children 5 --helper-home-dir" - -# Pid file -# Where should spamd write its PID to file? If you use the -u or -# --username option above, this needs to be writable by that user. -# Otherwise, the init script will not be able to shut spamd down. -PIDFILE="/var/run/spamd.pid" - -# Set nice level of spamd -#NICE="--nicelevel 15" - -# Cronjob -# Set to anything but 0 to enable the cron job to automatically update -# spamassassin's rules on a nightly basis -CRON=0 diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.dirs spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.dirs --- spamassassin-3.4.6/trunk-only/debian/spamassassin.dirs 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -etc -etc/init.d -etc/default -etc/spamassassin -etc/spamassassin/sa-update-hooks.d -usr/share/doc/spamassassin -usr/share/doc/spamassassin/rules -usr/share/spamassassin -usr/share/man/man8 -usr/sbin diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.examples spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.examples --- spamassassin-3.4.6/trunk-only/debian/spamassassin.examples 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -sample-spam.txt -sample-nonspam.txt -debian/examples/* -procmailrc.example diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.init spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.init --- spamassassin-3.4.6/trunk-only/debian/spamassassin.init 2011-05-19 01:27:02.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.init 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -#! /bin/sh - -### BEGIN INIT INFO -# Provides: spamassassin -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Should-Start: $network $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -# Spamd init script -# June 2002 -# Duncan Findlay - -# Based on skeleton by Miquel van Smoorenburg and Ian Murdock - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/spamd -NAME=spamd -SNAME=spamassassin -DESC="SpamAssassin Mail Filter Daemon" -PIDFILE="/var/run/$NAME.pid" -XNAME=/usr/bin/perl - -export TMPDIR=/tmp -# Apparently people have trouble if this isn't explicitly set... - -# Defaults - don't touch, edit /etc/default/spamassassin -ENABLED=0 -OPTIONS="" -NICE= - -. /lib/lsb/init-functions - -test -f /etc/default/spamassassin && . /etc/default/spamassassin - -DOPTIONS="-d --pidfile=$PIDFILE" - -if [ "$ENABLED" = "0" ]; then - echo "$DESC: disabled, see /etc/default/spamassassin" - exit 0 -fi - -test -f $DAEMON || exit 0 - -set -e - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon --start --pidfile $PIDFILE --exec $XNAME \ - $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS - echo "$NAME." - ;; - - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop --pidfile $PIDFILE --exec $XNAME --oknodo - echo "$NAME." - ;; - - reload|force-reload) - echo -n "Reloading $DESC: " - start-stop-daemon --stop --pidfile $PIDFILE --signal HUP --exec $XNAME - echo "$NAME." - ;; - - restart) - echo -n "Restarting $DESC: " - start-stop-daemon --stop --pidfile $PIDFILE --exec $XNAME \ - --retry 5 --oknodo - start-stop-daemon --start --pidfile $PIDFILE --exec $XNAME \ - $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS - - echo "$NAME." - ;; - status) - status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? - ;; - *) - N=/etc/init.d/$SNAME - echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.links spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.links --- spamassassin-3.4.6/trunk-only/debian/spamassassin.links 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -etc/spamassassin etc/mail/spamassassin diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.postinst spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.postinst --- spamassassin-3.4.6/trunk-only/debian/spamassassin.postinst 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -#!/bin/sh - -set -e - -sa_compile() { - # Compile, if rules have previously been compiled, and it's possible - if [ -x /usr/bin/re2c -a -x /usr/bin/sa-compile -a -d /var/lib/spamassassin/compiled ]; then - echo "Running sa-compile (may take a long time)" - sa-compile --quiet - fi -} - -sa_fix_broken_gpg_key () { - # Work around broken key caused by gpg upgrade - if [ -f /etc/spamassassin/sa-update-keys/pubring.gpg -a -f /usr/share/doc/spamassassin/GPG.KEY ]; then - sa-update --import /usr/share/doc/spamassassin/GPG.KEY - fi -} - -if [ "$1" = "configure" ]; then - sa_compile - sa_fix_broken_gpg_key -fi - -if [ "$1" = "triggered" ] && [ "$2" = "perl-major-upgrade" ]; then - sa_compile - invoke-rc.d spamassassin restart -fi - -#DEBHELPER# diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.preinst spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.preinst --- spamassassin-3.4.6/trunk-only/debian/spamassassin.preinst 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -# Adapted from http://wiki.debian.org/DpkgConffileHandling - -# spamassassin no longer distributes logcheck files for spamd. -# Luckily, the logcheck-database package which distributes these files -# now doesn't reuse the same file names. This script now deletes old -# (unchanged) versions of the file, but leaves and warns about changed -# versions. - -# Remove a no-longer used conffile -rm_conffile() { - PKGNAME="$1" - CONFFILE="$2" - if [ -e "$CONFFILE" ]; then - md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" - if [ "$md5sum" != "$old_md5sum" ]; then - echo "Obsolete conffile $CONFFILE has been modified by you." - echo "Leaving $CONFFILE in place; you may wish to remove it." - else - echo "Removing obsolete conffile $CONFFILE ..." - rm -f "$CONFFILE" - fi - fi -} -case "$1" in -install|upgrade) - if dpkg --compare-versions "$2" le "3.2.3-1"; then - rm_conffile spamassassin "/etc/logcheck/ignore.d.paranoid/spamassassin" - rm_conffile spamassassin "/etc/logcheck/violations.ignore.d/spamassassin" - fi -esac - -#DEBHELPER# diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.prerm spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.prerm --- spamassassin-3.4.6/trunk-only/debian/spamassassin.prerm 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -# In theory sa-update-keys is probably a config file, but I don't -# think it should be and I don't know how to get rid of it and -# /etc/spamassassin without causing dpkg to complain on purge. - -if [ "$1" = "remove" ]; then - rm -Rf /var/lib/spamassassin - rm -Rf /etc/spamassassin/sa-update-keys -fi diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.README.Debian spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.README.Debian --- spamassassin-3.4.6/trunk-only/debian/spamassassin.README.Debian 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,158 +0,0 @@ - -READ "UPGRADE" IF YOU ARE UPGRADING FROM A PREVIOUS VERSION - -Cron job --------- - -There is a cron job in /etc/cron.daily/spamassassin that will -automatically run sa-update and reload spamd every day if it is -enabled. To enable this script, edit -/etc/default/spamassassin. sa-update, when run as root, downloads the -latest set of rules distributed by upstream to a directory under -/var/lib/spamassassin. This script will work correctly with sa-compile -(see below). - -sa-compile ----------- - -This package now includes a new plugin to greatly improve the -performance of SpamAssassin by compiling a ruleset using re2c. Please -read the "sa-compile" manpage for more information. To enable this -enhancement, you will need to uncomment a line in -/etc/spamassassin/v320.pre and make sure the following packages are -installed: - - aptitude install re2c libc6-dev gcc make - -The "compiled" ruleset is used whenever possible to speed spamassassin -up. If you disable or change a rule in the configuration, the compiled -version will no longer be used. If you create or change a rule, you -will want to run sa-compile to generate the compiled version to -improve performance, but if you don't you will simply use the -un-compiled version. - -Trusted Networks ----------------- - -SpamAssassin has a built in guessing algorithm to determine which -Received headers in a message are trustworthy and which are not. You -should ensure that the configuration option trusted_networks and -internal_networks are set correctly, especially if you are -experiencing false positives from tests referring to Received headers. - -Please read man Mail::SpamAssassin::Conf for more information on this. - -Plugins -------- - -As of version 3.1.0, much of the functionality in SpamAssassin -relating to external programs and perl modules has been removed and -placed in plugins. For example, Razor, DCC and Pyzor have been -"pluginized". - -Plugins can be enabled and disabled in /etc/spamassassin/init.pre and -/etc/spamassassin/v310.pre. You may wish to read through those files -to see which plugins you might want to install. In general, plugins -may have dependencies that you may need to install for them to -function. For example, the Razor2 plugin requires that you install -razor. You should read the manpage before enabling a plugin. - -Please note that DCC is disabled by default as it is not free. - -Configuring spamd ------------------ - -spamd, the daemonized form of spamassassin, is generally the preferred -way of running spamassassin. Please read man spamd and README.spamd -for more information. Init scripts are provided with this package in -/etc/init.d/spamassassin. To change the command line options, please -edit /etc/default/spamassassin. - -If you intend to use Bayes sitewide, it is recommended that you set up -an SQL-based Bayes storage module. (You may also want to store scores -and other prefences in SQL too.) Please read the documentation in -/usr/share/doc/spamassassin/sql/ for more information. - -Please note that SQL storage is not very private -- anyone that has -access to the database can read and write it freely, meaning users -could corrupt other users' Bayes databases. - -Please note that the --auth-ident option does not work with pidentd or -gidentd. See http://bugs.debian.org/278030 for more information. - -Poor Performance ----------------- - -If you experience poor performance with spamd, please ensure that you -have not set the --max-children option too high. spamd now uses a -"Apache httpd style scaling" algorithm to prefork children, so these -children will always be present. Please note also that there seems to be -a bug with respect to how memory usage is reported by the kernel to -programs such as top. Multiple spamd children share much more memory -than is indicated. - -One common problem with spamd is that load spikes whenever the Bayes -database needs to be sync'd. This is especially true right after an -upgrade. It's often a good idea to do this manually right after you -upgrade with the command: sa-learn --sync for each user/Bayes DB. (You -can use the --dbpath option to specify the database path) - -You can also disable automatic expiry by setting the -"bayes_auto_expire 0" option in your configuration and running -sa-learn --force-expire from a cronjob. See -http://wiki.spamassassin.org/BayesForceExpire - -Mail stream integration ------------------------ - -There is also a very incomplete set of examples in the examples/ -directory. More examples are welcome! Please file a bug against -spamassassin with the minor or wishlist severity and attach a file or -patch. - -There is a large amount of information on setting spamassassin up with -your mail system at -http://wiki.apache.org/spamassassin/UsingSpamAssassin. - -Configuration Files -------------------- - -To add rules, change scores or edit the report template, edit -/etc/spamassassin/local.cf. Please don't touch the files in -/usr/share/spamassassin, as you will NOT be prompted to overwrite them -on upgrade. Configuration file details are available in the -Mail::SpamAssassin::Conf(3) man page. - -User-specific configuration is the automatically created -~/.spamassassin/user_prefs, which is copied from -/etc/spamassassin/user_prefs.template. It is automatically created -whenever spamassassin is called, or when spamc is used with 'spamd --c'. - -Semi-free RBLs --------------- - -The spamhaus SURBL blacklists are both offer free service to relatively -small mail systems (less than approximately 1,000 mailboxes or 250,000 -emails per day). Larger systems require a paid service. These -blacklists are enabled by default in this package, but should be -disabled if you run a large system and do not pay for these services. - -Non-free RBLs -------------- - -By default, spamassassin checks certain free RBLs. Other, commercial -RBLs can easily be enabled. See the README for more -information. Furthermore, SpamAssassin supports using third-party -programs Razor, DCC and Pyzor, but Razor and DCC are disabled by -default since they are not free for non-personal use. Feel free to -enable them in /etc/spamassassin/init.pre - -IPv6 ----- - -Some users have reported difficulty running spamd with an IPv6 -listening address. As a work around, please ensure you have -libio-socket-inet6-perl installed. - - -- Duncan Findlay , Mon, 21 May 2007 23:53:57 -0400 diff -Nru spamassassin-3.4.6/trunk-only/debian/spamassassin.triggers spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.triggers --- spamassassin-3.4.6/trunk-only/debian/spamassassin.triggers 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamassassin.triggers 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -interest perl-major-upgrade diff -Nru spamassassin-3.4.6/trunk-only/debian/spamc.dirs spamassassin-4.0.0~rc3/trunk-only/debian/spamc.dirs --- spamassassin-3.4.6/trunk-only/debian/spamc.dirs 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamc.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/bin diff -Nru spamassassin-3.4.6/trunk-only/debian/spamc.docs spamassassin-4.0.0~rc3/trunk-only/debian/spamc.docs --- spamassassin-3.4.6/trunk-only/debian/spamc.docs 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamc.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -CREDITS -README -TRADEMARK -USAGE -sample-nonspam.txt -sample-spam.txt -procmailrc.example diff -Nru spamassassin-3.4.6/trunk-only/debian/spamc.manpages spamassassin-4.0.0~rc3/trunk-only/debian/spamc.manpages --- spamassassin-3.4.6/trunk-only/debian/spamc.manpages 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamc.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -blib/man1/spamc.1p diff -Nru spamassassin-3.4.6/trunk-only/debian/spamc.README.Debian spamassassin-4.0.0~rc3/trunk-only/debian/spamc.README.Debian --- spamassassin-3.4.6/trunk-only/debian/spamc.README.Debian 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/spamc.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -spamc has been separated from the spamassassin package to accommodate -people who wish to install spamd on a server, and just run spamc from -other computers. - -Unless you are using spamc to connect to a spamd server on the local -network, it is strongly recommended that you install spamassassin. - -Duncan Findlay -duncf@debian.org diff -Nru spamassassin-3.4.6/trunk-only/debian/watch spamassassin-4.0.0~rc3/trunk-only/debian/watch --- spamassassin-3.4.6/trunk-only/debian/watch 2011-05-19 01:27:23.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -version=2 - -http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-(.*)\.tar\.gz \ - debian uupdate diff -Nru spamassassin-3.4.6/trunk-only/lm/af.lm spamassassin-4.0.0~rc3/trunk-only/lm/af.lm --- spamassassin-3.4.6/trunk-only/lm/af.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/af.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 23602 -e 8036 -a 4087 -n 3782 -i 3726 -o 3314 -r 2951 -s 2885 -t 2749 -d 2479 -e_ 2118 -l 1854 -k 1741 -ie 1670 -g 1601 -n_ 1447 -m 1440 -_d 1219 -t_ 1143 -er 1124 -h 1124 -u 1110 -ie_ 1079 -y 1048 -w 986 -s_ 982 -_s 969 -_h 956 -di 924 -an 922 -r_ 912 -aa 882 -v 876 -en 807 -_di 807 -. 790 -y_ 747 -_v 709 -et 706 -._ 694 -die 691 -die_ 667 -_n 666 -_die 651 -p 639 -_m 634 -_die_ 633 -_w 632 -ee 607 -ge 606 -_o 598 -b 586 -te 568 -, 560 -in 555 -k_ 550 -_e 550 -,_ 548 -oo 516 -et_ 511 -de 509 -el 489 -_g 486 -f 461 -ar 451 -ni 450 -nd 442 -an_ 440 -en_ 437 -_i 426 -he 423 -g_ 418 -_t 412 -oe 410 -at 406 -er_ 400 -om 381 -wa 378 -_a 378 -_b 377 -_k 371 -nie 371 -_he 370 -aar 355 -_ge 351 -es 351 -_ni 348 -da 346 -m_ 342 -ou 338 -it 335 -_nie 335 -d_ 332 -l_ 330 -_wa 329 -or 327 -le 326 -we 326 -ek 324 -het 321 -me 319 -_het 319 -is 318 -j 315 -at_ 311 -on 309 -se 308 -_en 298 -ma 294 -st 291 -as 280 -va 277 -_en_ 270 -re 270 -" 269 -' 265 -het_ 261 -_het_ 260 -om_ 254 -al 252 -ar_ 250 -li 248 -te_ 247 -aar_ 247 -_da 245 -u_ 242 -nde 241 -ou_ 237 -_l 231 -be 229 -_' 226 -rd 224 -_va 224 -ig 223 -ng 222 -ns 221 -ve 220 -it_ 218 -_j 216 -_me 216 -sy 215 -ke 213 -_sy 212 -aan 212 -van 212 -_in 210 -is_ 210 -in_ 208 -sy_ 206 -_sy_ 206 -'n 205 -ro 205 -ko 204 -_'n 203 -ra 203 -'n_ 203 -_'n_ 202 -so 202 -D 202 -ho 201 -rs 200 -eer 200 -ik 199 -la 198 -_te 196 -_van 196 -_ma 195 -as_ 194 -ui 194 -ver 192 -e. 192 -der 191 -to 188 -op 187 -van_ 184 -ag 184 -_ve 182 -and 180 -_van_ 178 -ha 178 -f_ 176 -ka 176 -ne 175 -_is 175 -sk 174 -e._ 174 -oor 174 -_ver 170 -ek_ 170 -_hy 170 -hy 170 -p_ 168 -_be 168 -ri 168 -ur 167 -nie_ 165 -_so 165 -_D 164 -si 164 -ll 164 -no 164 -_in_ 163 -_hy_ 162 -hy_ 162 -ed 161 -ers 160 -_r 156 -ak 156 -_ho 155 -_nie_ 153 -eg 153 -nt 152 -de_ 152 -_p 151 -_we 148 -_is_ 148 -ei 147 -es_ 142 -maa 142 -wee 142 -na 141 -nder 139 -a_ 138 -ing 138 -ew 138 -S 135 -lle 135 -_om 135 -_te_ 134 -eu 134 -ie. 134 -wo 132 -em 132 -wat 131 -_no 130 -_" 130 -vo 130 -E 129 -H 128 -_wat 127 -ti 126 -mo 126 -A 126 -e, 126 -_ha 125 -vi 125 -el_ 125 -ter 125 -e,_ 124 -dat 124 -eer_ 124 -wat_ 124 -le_ 124 -ta 124 -Di 123 -dat_ 123 -_wat_ 122 -ie._ 122 -was 121 -ste 121 -_H 121 -_se 121 -se_ 120 -ul 120 -al_ 120 -_was 120 -_om_ 119 -_st 119 -lik 118 -"_ 118 -_ko 118 -_maa 118 -lo 117 -_to 117 -ns_ 115 -aan_ 115 -nie. 114 -_vi 114 -met 114 -_nie. 111 -nk 110 -_Di 110 -- 110 -_op 109 -_oo 109 -_on 108 -ir 108 -ord 108 -uit 106 -ens 105 -_was_ 105 -was_ 105 -een 105 -_met 105 -os 105 -_S 104 -nie._ 104 -ig_ 103 -_sk 102 -op_ 101 -_ek 101 -_wee 101 -ir_ 101 -met_ 100 -_met_ 100 -rt 100 -ik_ 99 -end 99 -nd_ 99 -gt 99 -ond 98 -ot 98 -_aa 97 -og 97 -vir_ 95 -vir 95 -_ka 94 -hu 94 -_mo 94 -_vir_ 94 -_vir 94 -_dit 93 -kr 93 -am 93 -ol 93 -dit 93 -_ek_ 93 -ki 93 -sa 93 -_aan 92 -man 92 -jy 92 -ng_ 92 -aak 92 -lle_ 91 -_hu 91 -_na 91 -_vo 90 -ewe 90 -of 90 -jy_ 90 -_dit_ 90 -dit_ 90 -_jy 89 -der_ 89 -jo 89 -_f 88 -_u 88 -sie 87 -_dat 87 -_jy_ 87 -daa 87 -do 87 -vr 87 -wi 86 -ry 86 -_dat_ 86 -eur 86 -rs_ 85 -_jo 85 -_wo 84 -_ne 84 -jie 84 -ji 84 -pe 83 -moe 83 -my 82 -ull 82 -Die 81 -maar 81 -_hom 81 -ulle 81 -_maar 81 -hom 81 -_uit 80 -_ui 80 -ges 80 -raa 80 -or_ 80 -ies 80 -jou 79 -_la 79 -maar_ 79 -ulle_ 79 -_daa 79 -Die_ 79 -daar 78 -_daar 78 -ien 78 -_my 78 -_jou 78 -ok 78 -il 78 -lik_ 77 -sta 77 -_Die 77 -ur_ 77 -ga 77 -ag_ 77 -kan 77 diff -Nru spamassassin-3.4.6/trunk-only/lm/am.utf-8.lm spamassassin-4.0.0~rc3/trunk-only/lm/am.utf-8.lm --- spamassassin-3.4.6/trunk-only/lm/am.utf-8.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/am.utf-8.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ - 21403 -_ 10092 - 7734 - 6558 -_ 5003 - 4717 - 4401 - 4274 - 4176 - 4054 - 3868 - 2728 - 1656 - 1591 - 1579 - 1425 - 1402 -_ 1261 -_ 1231 - 1217 - 1187 - 1183 -_ 1160 - 1145 - 1123 - 1097 -ን 1043 - 1043 - 1041 - 1004 -_ 991 - 936 - 880 - 855 -ው 855 - 849 - 805 - 783 -ት 783 -_ 763 - 709 - 704 - 682 -በ 682 - 679 - 670 - 667 -በ 666 - 666 - 658 - 643 -የ 637 - 637 - 627 -የ 627 -ለ 614 - 614 - 611 -ር 611 -_ 588 -_ 583 -ት_ 583 -_የ 577 -_የ 574 -ለ 573 - 573 -ን 570 - 570 -መ 563 - 563 - 557 -መ 557 - 554 -አ 554 -አ 553 -ተ 553 - 553 - 553 -ተ 547 - 547 -ም 534 - 534 - 532 -- 531 -ስ 525 - 525 --- 521 -ል 515 - 515 ---- 512 ----- 503 -_በ 499 ------ 494 -_በ 487 - 479 - 477 -_ 473 - 469 -ው 469 -ን_ 468 -_ 468 - 465 - 464 -ያ 457 - 457 - 444 -_አ 424 -_አ 424 -ስ 423 - 423 -_ 415 - 402 - 401 - 390 - 389 - 382 -_ 378 -ው_ 378 - 365 - 364 -ያ 364 - 363 -ል 357 - 357 - 356 -_ 351 - 347 -ች 347 - 341 -ነ 341 -ይ 337 - 337 -። 337 - 337 -_ 337 -።_ 337 - 336 - 334 - 320 -እ 320 - 320 - 320 - 318 -እ 318 -_ 314 -ር_ 314 - 312 - 311 - 301 -ና 300 -ገ 300 - 300 - 300 - 299 - 297 -ር 294 - 294 -ግ 294 - 294 - 293 - 291 -ከ 291 - 291 - 291 - 291 -ም 291 -ገ 291 -ነ 291 -ደ 288 - 288 -_እ 285 -_እ 283 - 279 - 279 -ከ 279 - 279 -በ 279 -ን 276 - 276 - 276 -_ 272 - 270 -ብ 270 -_ 269 -ግ 264 - 264 - 262 - 262 -መ 262 - 262 -ይ 261 - 261 - 260 -ማ 260 -ደ 259 - 259 -ራ 254 - 254 -ባ 254 - 254 - 253 - 249 - 247 - 245 - 244 -ላ 242 - 242 -የ 242 - 242 -ማ 238 - 238 - 237 -ረ 237 - 237 - 236 -ተ 236 -ም_ 235 -_ 235 - 234 - 233 - 233 - 230 - 230 -ባ 230 -ሚ 230 -ድ 228 - 228 -_መ 227 - 227 -_መ 226 - 225 -ረ 225 - 225 -። 222 -።_ 222 - 216 -እ 214 -ሚ 214 - 214 - 214 - 213 - 212 - 210 - 209 -ላ 209 - 208 - 207 - 206 -_ 206 - 205 -ብ 205 - 202 - 200 -ታ 200 - 200 -ሰ 200 - 199 -ራ 199 -ሰ 198 - 198 -ት 195 -ወ 195 - 195 - 195 - 194 -ወ 194 - 191 - 191 -_ 189 -ች_ 189 - 188 - 186 - 186 -_ለ 184 -_ለ 183 -ለ 183 - 183 -ን 180 - 179 -የ 179 - 178 - 177 -ን 177 -_ከ 175 - 174 -ጥ 174 - 172 -አ 172 -_ከ 170 - 170 -_ 169 -ን 169 - 166 - 166 -ል 165 -_ 165 - 165 -ና_ 163 -_ 163 - 160 -ቸ 160 -ቸ 160 - 160 - 160 - 159 - 159 - 158 -ቀ 158 - 158 - 156 -ቀ 155 - 155 -ች 154 - 154 -ል_ 154 - 154 -ው 154 -ቸ 154 -_ 154 - 152 - 151 -ው 151 - 150 -_ነ 150 - 150 -_ነ 150 - 150 -_ይ 150 -_ይ 150 - 149 -ታ 149 -። 148 - 147 -ደ 147 - 147 -በ 147 - 146 -_ተ 146 -_ተ 146 -ለ 145 - 145 -ድ 144 - 144 - 144 - 144 -ቅ 143 - 143 -_ 143 -ግ 142 - 142 - 141 -ዳ 141 - 139 -ህ 138 - 138 - 137 -ና 137 - 137 -ን 136 - 136 -አ 135 - 135 - 135 -ስ 134 - 134 -ጠ 133 -ዳ 133 - 133 -ሆ 133 - 133 -ሆ 133 - 133 - 133 -ሆ 132 - 132 -ተ 131 -ያ 131 -ተ 131 - 131 - 129 - 128 - 128 -ክ 128 -ፍ 128 - 128 - 127 - 127 -ጠ 127 - 126 -ካ 126 - 124 -በ 123 - 123 -ያ 123 - 123 - 123 - 122 -ከ 122 - 121 -ገ 121 diff -Nru spamassassin-3.4.6/trunk-only/lm/ar.iso-8859-6.lm spamassassin-4.0.0~rc3/trunk-only/lm/ar.iso-8859-6.lm --- spamassassin-3.4.6/trunk-only/lm/ar.iso-8859-6.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ar.iso-8859-6.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 9692 - 7361 - 6120 -ا 2417 - 2417 -_ 1691 -ل 1587 - 1587 -ا 1415 - 1415 - 1241 -_ 1129 -_ا 987 -ل 978 -ال 978 - 952 -_ا 894 -م 869 - 869 -ل 801 - 801 - 798 -ي 798 -_ال 771 - 757 -ت 757 -ا 738 - 738 -و 680 - 680 -ن 659 - 659 - 622 -ل 619 - 619 -ل 574 -ال 574 - 547 -ع 547 -ر 541 - 541 - 527 - 512 -ة 512 - 504 -م 504 - 496 - 492 -ب 490 - 490 -ة_ 482 -_ 482 - 477 -_ 470 - 461 -ي 461 -. 430 -_ 405 -ل 352 -ال 352 -ك 350 - 350 - 340 -د 339 - 339 -ت 334 - 334 - 324 - 314 -ف 314 - 302 -_و 289 - 278 -م 278 -ن 276 - 276 -ع 270 - 270 - 267 -و 263 - 263 -ن_ 262 -_ 262 -_م 259 - 258 -ه 258 - 258 -س 258 -لا 258 -ا 258 -_ 257 -ب 252 - 252 - 252 -و 252 - 252 -_ 250 -ا_ 250 - 242 -_ 235 -ت_ 226 -_ 226 -._ 223 - 213 -ر 213 -ت 206 -ات 206 - 202 -ح 202 -_ 200 - 199 -ر 199 - 199 - 198 -ع 198 - 196 -ب 196 -ك 193 - 193 -ت 191 -لم 191 - 191 -م 191 -.. 188 -ق 184 - 184 -ج 183 -ان 180 -ن 180 -لا 178 -_ 176 -ية 176 -ة 176 -ي_ 176 - 175 -ف 175 - 175 -_ب 171 - 171 -لم 170 - 166 -_ 165 -و_ 165 -ه 163 -_ف 163 - 163 - 162 -ش 162 -ل_ 162 -_ 162 - 161 -ي 161 - 160 - 159 -ية_ 158 -ة_ 158 - 155 -ى 155 -س 153 - 153 -ى_ 150 -_ 150 - 150 - 148 -ت_ 147 -ات_ 147 - 144 -_ 144 -ص 144 -_ 142 -م 139 -لم 139 -_ف 136 -_م 133 -ما 130 -_ب 130 -ا 130 -ش 129 - 129 -_و_ 129 - 128 -د 128 -_ 127 - 127 -_م 126 -ر_ 124 -_ 124 -عل 123 -ل 123 -في 122 -ي 122 -ق 121 -_ 121 - 121 - 119 -ح 119 -لا 118 -ا 118 - 117 -_ 117 -_ع 117 - 116 - 115 -_ت 115 -ن 115 - 113 - 113 -د 113 -ن 111 -مع 111 -ع 111 -من 111 -عل 110 -ل 110 -_ 109 -_ل 108 -ك 108 - 108 -ي_ 102 -ها 102 -لا 102 -ا 102 -في_ 102 -ا 102 - 101 - 101 -خ 101 -_و 100 -ج 100 -_في 99 -ف 99 - 99 - 98 -_ 97 -ام 97 -م 97 -د_ 97 -... 94 -_من 94 -ا 93 - 93 -با 93 -_ا 93 -ط 93 -ا 92 - 92 -وا 92 -نت 91 -ت 91 -_ 90 - 89 -_ 89 -_ 88 - 87 -_ع 87 -لى 85 -ى 85 - 84 -ذ 84 -ن_ 84 -س 84 - 84 -ى_ 84 - 84 -لى_ 84 -من_ 84 - 84 -- 83 - 83 -خ 83 -_ 82 -_ 82 -س 82 -اس 82 -م_ 82 -_ 81 -م 80 - 80 -وم 80 -_ 79 -ان 79 -ن 79 -_ 78 -ا 78 -ا 78 -عا 78 -ر 78 -ها_ 78 -ع_ 78 -_ 78 -ا_ 78 -را 78 -ار 78 - 78 -ص 78 -.._ 77 -أ 77 -..._ 77 - 77 - 77 -ي 76 -لي 76 -ر 75 -تر 75 - 74 -لك 73 -ان_ 73 -ض 73 -ث 73 - 73 -ج 73 - 73 -ن_ 73 -ك 73 -مع 72 -ع 72 - 71 - 70 -ا 70 -نا 70 - 69 -_ 69 -ح 69 - 69 -ت 68 -لت 68 -ا 68 - 68 -_ت 68 -يا 68 -_ 67 - 66 -. 66 - 66 -__ 65 -ت 65 - 65 -ست 65 -_ 65 - 65 - 64 -وم 64 - 64 -م 64 - 63 -اس 63 - 63 -س 63 -_ 62 --_ 62 - 61 -_- 61 -و 61 -لو 61 -_ان 61 - 61 -_ 61 -_ 60 -د 60 -_و 60 - 60 - 60 -اد 60 - 60 -ت 59 - 59 -_-_ 59 -_عل 59 -نت 59 - 58 -ه 58 - 58 -جا 58 - 58 -ب 58 -لب 58 -_ي 58 -_ 58 -ز 58 -_ل 58 -ا 58 -ا 57 -نت 57 -ل 57 -كا 57 -ول 57 -.. 56 -شب 56 -..._ 56 -ب 56 -_ 56 -... 56 -ي 56 -بي 56 -تع 55 -عم 55 -لى 55 -_ك 55 -ع 55 -_._ 55 diff -Nru spamassassin-3.4.6/trunk-only/lm/ar.windows-1256.lm spamassassin-4.0.0~rc3/trunk-only/lm/ar.windows-1256.lm --- spamassassin-3.4.6/trunk-only/lm/ar.windows-1256.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ar.windows-1256.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 3974 - 1252 - 958 - 626 - 534 - 498 - 496 - 482 -_ 473 -_ 408 - 345 -. 335 - 326 - 303 - 269 - 260 -_ 258 - 244 -_ 235 - 202 -_ 200 -.. 188 - 175 - 173 - 166 - 162 - 157 - 150 - 150 -_ 145 -_ 143 -._ 130 - 129 -_ 129 -_ 124 -_ 120 - 117 - 116 - 115 -_ 109 - 98 -... 94 - 92 -_ 92 -_ 90 - 90 -_ 90 -_ 88 - 87 - 86 - 84 -_ 83 -_ 82 - 80 -_ 79 - 77 -.._ 77 -..._ 77 - 72 - 71 -_ 69 - 69 - 69 - 69 -_ 68 - 68 -_ 67 - 67 - 67 - 66 -. 66 - 65 - 64 - 63 - 63 - 63 -_ 62 - 62 - 62 -_ 62 - 61 - 60 - 60 - 60 -_ 60 -__ 58 -_ 58 -_ 58 -_ 57 -..._ 56 -.. 56 -... 56 --_ 53 -- 53 -_- 52 -_-_ 52 -_ 51 -_ 50 - 50 - 50 -_ 50 - 49 -_ 48 - 48 - 47 -_ 47 -_ 47 -_ 46 -_ 45 -_ 45 - 44 - 44 -_ 44 -_ 43 -_ 43 -_ 43 -_ 43 -__ 43 -_ 42 -_ 42 - 42 - 41 - 41 - 41 -_ 40 -_ 40 - 40 -_ 40 - 40 -_ 39 - 39 - 39 -_ 38 - 38 - 37 - 37 -_ 37 -__ 36 -_ 36 - 35 -_ 35 - 35 - 35 -__ 35 - 35 - 34 -_ 34 -_ 34 - 34 - 34 - 34 - 33 - 33 - 33 - 33 -_ 32 - 32 - 31 - 31 - 31 - 31 -_ 31 -_ 30 - 30 - 30 - 30 -_ 30 - 30 - 30 - 30 - 30 -_ 30 - 29 - 29 - 29 -_ 29 - 29 - 29 - 29 - 29 -_ 29 - 29 - 29 -__ 28 - 28 -_ 28 -_ 28 -_ 28 - 27 -_ 27 -_ 27 - 27 - 27 - 27 - 27 - 27 - 27 -_ 26 -_. 26 -_ 26 - 26 -_ 26 - 26 -_ 26 - 26 -_ 26 -_._ 26 -_ 25 - 25 - 25 -_ 25 -_ 25 - 24 - 24 - 24 - 24 -_ 24 - 23 -_ 23 - 23 -_ 23 - 23 - 23 - 23 - 23 - 23 - 23 - 23 - 23 - 23 - 23 - 23 -_ 23 -_ 23 - 23 - 23 - 23 -_ 23 - 23 - 23 - 23 -_ 23 -_ 22 - 22 - 22 - 22 - 22 -_ 22 -_ 22 - 22 -_ 22 -_ 22 -_ 22 -_ 21 -_ 21 - 21 - 21 - 21 - 21 - 21 -_ 21 - 21 - 21 -_ 20 - 20 -_ 20 - 20 - 20 -_ 20 - 20 - 20 -_ 20 - 20 - 20 - 19 - 19 - 19 -_ 19 - 19 - 19 - 19 -_ 19 -_ 19 -_ 19 - 19 -_ 18 - 18 - 18 -_ 18 -_ 18 - 18 - 18 -_ 18 -_ 18 - 18 - 18 - 18 -_ 18 - 18 -_ 18 -_ 18 - 18 - 18 - 18 - 18 - 18 - 18 - 18 -_ 17 - 17 - 17 - 17 - 17 -_ 17 -_ 17 - 17 -_ 17 -_ 17 - 17 -. 17 - 17 - 17 - 17 - 17 - 17 - 17 -__ 17 - 17 -_ 17 - 16 - 16 -_ 16 -_ 16 -_ 16 - 16 -_ 16 - 16 -_ 16 -_ 16 - 16 - 16 - 16 - 16 - 16 -_ 16 - 16 - 16 - 16 - 16 - 16 -_ 15 - 15 -_ 15 - 15 - 15 -_ 15 - 15 -_ 15 - 15 -_ 15 -_ 15 - 15 -_ 15 - 15 -_ 15 - 15 - 15 - 15 -_ 15 - 15 - 14 - 14 -_ 14 -! 14 -_ 14 - 14 -_ 14 - 14 - 14 -_ 14 - 14 - 14 - 14 -_ 14 - 14 - 14 - 14 -__ 14 -_ 14 - 14 -. 14 - 14 - 13 -_ 13 - 13 -_ 13 - 13 -_ 13 - 13 - 13 diff -Nru spamassassin-3.4.6/trunk-only/lm/be.windows-1251.lm spamassassin-4.0.0~rc3/trunk-only/lm/be.windows-1251.lm --- spamassassin-3.4.6/trunk-only/lm/be.windows-1251.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/be.windows-1251.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 9440 - 4377 - 1855 -i 1544 - 1436 - 1345 - 1246 - 1233 - 1215 - 1093 - 1090 - 1050 - 934 - 860 - 811 - 792 -_ 740 - 724 - 699 - 643 - 589 - 580 - 531 -. 480 - 467 - 458 -_ 432 -i_ 430 -._ 418 -, 402 -,_ 402 - 391 - 373 - 361 - 350 - 340 - 335 - 330 - 329 -_ 328 - 315 - 307 -_ 306 -_ 305 -_ 296 - 279 - 279 -_ 274 - 271 - 269 - 250 -_ 247 - 244 -_ 240 -_ 236 -_ 221 - 221 - 220 -i 218 - 210 - 203 -_ 199 - 197 - 195 -__ 194 - 193 -i 193 - 192 -_ 190 -i 190 -_i 189 - 187 - 185 -_ 179 -_ 178 - 176 - 174 - 171 -_ 169 - 167 -_ 166 -_ 166 - 162 -_ 161 - 160 -i 158 -_ 154 - 154 - 154 - 151 - 151 -_ 149 -i 148 - 147 - 146 - 145 - 142 - 141 - 140 -_i_ 140 -_ 140 -" 137 - 135 - 135 - 131 - 129 -_ 129 -_ 126 - 126 - 125 - 125 - 123 -_ 122 - 122 -_ 121 - 120 -_ 120 - 120 - 119 - 119 - 116 -- 113 - 112 - 112 - 112 -_ 111 - 109 - 109 -_ 107 -i 106 -_ 105 - 103 -_ 102 - 101 -_ 100 -_ 100 -_ 99 - 99 - 98 - 96 - 95 - 94 - 94 -i 92 - 92 -_ 91 - 91 - 91 - 91 - 91 - 90 - 88 - 88 -_ 87 - 87 -_ 87 -_ 86 - 84 - 84 -i 83 - 83 - 83 - 83 - 82 - 81 -_ 79 - 79 - 79 - 79 - 79 - 79 -__ 78 -i_ 78 -_ 78 - 77 -i_ 75 - 74 -_ 74 -i 74 - 73 - 73 - 72 - 72 - 72 - 72 - 71 - 71 - 71 - 71 -_ 70 - 70 - 70 -__ 70 -i 69 -i 68 - 68 -. 68 - 68 - 68 -_ 68 -_ 67 -_ 67 - 67 - 67 - 67 -_" 67 - 67 -i, 67 -._ 67 - 67 -i,_ 67 - 66 -i 66 - 66 - 66 - 66 - 66 - 66 - 66 -_ 65 - 65 - 65 - 65 -_ 65 -_ 65 - 64 -_ 64 - 64 - 64 -_ 64 - 63 - 63 - 63 - 62 - 62 -_ 62 -i 62 - 62 -_ 62 - 62 -i 62 - 62 - 61 -, 61 - 61 -_ 61 -,_ 61 - 61 - 60 -i 60 -_ 60 -_ 60 -I 59 - 59 - 59 -_I 59 -_ 59 - 59 - 59 -_ 59 - 59 - 59 -i 59 -_ 59 -. 59 -_ 58 -._ 58 -_ 57 - 57 - 57 -i 57 -_ 57 - 57 - 56 - 56 - 56 -i 56 - 56 -_ 55 -_ 55 -_ 54 - 54 -_ 54 - 53 - 53 -i 53 - 53 - 53 - 53 -i 53 - 53 - 53 -_i 52 -_ 52 - 52 - 51 - 51 - 51 - 50 -,_ 50 -,_ 50 - 50 - 50 -_ 50 -, 50 -, 50 - 50 -_ 50 -_ 50 - 49 - 49 -i 49 - 49 -_ 49 -_ 48 - 48 -_ 48 -_ 47 - 47 - 47 -i 47 -_. 47 - 47 - 47 -i 46 - 46 - 46 -_._ 46 - 46 -_ 46 - 46 -_ 46 - 45 -_ 45 - 45 -_- 45 -_ 45 -_ 45 - 45 -_ 45 -i 44 -_ 44 -_ 44 - 44 -i 44 -_ 44 - 43 - 43 - 43 - 43 -_ 43 - 43 -_ 43 - 43 -i_ 42 -_ 42 - 42 - 42 - 42 - 42 - 42 -.. 42 -_ 42 -_ 42 - 42 - 42 - 41 -_ 41 - 41 - 41 - 41 - 41 - 41 - 41 - 40 - 40 -_ 40 -. 40 -i 40 -i 40 -_ 40 - 40 - 40 -"_ 40 -( 40 -_ 40 - 40 - 40 - 40 -_ 40 -i 40 -_ 40 -_( 40 - 40 - 40 -) 40 - 40 -_ 39 -i 39 -_ 39 diff -Nru spamassassin-3.4.6/trunk-only/lm/bg.iso-8859-5.lm spamassassin-4.0.0~rc3/trunk-only/lm/bg.iso-8859-5.lm --- spamassassin-3.4.6/trunk-only/lm/bg.iso-8859-5.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/bg.iso-8859-5.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 11056 - 3428 - 3007 - 2501 - 2490 - 2179 - 2166 - 1596 - 1492 - 1159 -_ 1144 - 1093 - 918 - 803 -_ 803 - 724 - 720 - 702 -_ 642 - 613 -_ 577 -_ 569 -_ 556 -. 537 - 534 - 473 -._ 467 - 462 - 455 -_ 452 -_ 446 -,_ 440 -, 440 - 439 - 432 -_ 422 - 405 - 382 - 376 - 360 - 360 - 355 -_ 353 - 334 - 330 -_ 324 - 322 -__ 316 - 310 - 308 - 305 - 303 - 301 - 281 -_ 278 -_ 275 - 262 - 262 - 262 -_ 250 -_ 248 - 242 - 236 - 235 - 230 -_ 226 - 222 - 216 - 214 - 210 -_ 203 - 198 -__ 196 - 196 -_ 195 - 189 - 189 -_ 189 -_ 186 - 185 - 185 -_ 184 - 178 - 177 - 175 - 175 -_ 172 - 171 - 170 -_ 169 -_ 169 -_ 165 -_ 163 - 162 - 161 - 160 -_ 159 - 156 - 156 - 155 - 154 -__ 152 -_ 152 - 151 - 151 -_ 150 - 149 - 148 -_ 146 - 145 - 143 - 141 -_ 138 - 137 - 135 - 134 - 133 -_ 133 - 131 - 129 - 128 - 127 -_ 126 - 124 - 123 - 123 -_ 123 - 122 - 121 -_ 120 - 119 - 118 - 116 -_ 115 - 113 -_ 112 - 112 -- 111 -_ 111 - 110 -_ 109 - 108 -__ 108 - 108 - 107 - 107 - 107 -_ 106 -_ 105 - 103 -_ 103 -__ 101 - 101 - 100 -_ 99 -" 99 - 99 - 99 - 98 - 97 - 97 - 97 -__ 97 - 96 - 96 - 93 -_ 93 - 92 - 92 - 92 - 92 - 91 - 90 - 90 - 89 - 89 -_ 89 - 88 -_ 88 -_ 88 - 88 -, 87 - 87 - 87 -,_ 87 -__ 85 -__ 83 - 83 - 83 -_ 83 - 82 - 81 -_ 81 -_ 81 -_ 80 - 80 - 79 - 78 - 78 - 78 - 78 - 77 - 77 -_ 77 - 77 -_ 76 -_ 76 - 75 - 75 - 75 - 75 - 74 - 73 -_ 73 - 73 -_ 73 - 73 -_ 72 - 72 - 72 - 72 - 72 - 71 - 71 -,_ 71 - 71 -_ 71 - 71 - 71 -_ 71 -, 71 - 70 - 70 - 70 - 70 - 70 - 70 -_ 70 -_ 69 - 68 - 68 - 67 - 67 - 66 - 66 - 66 -_ 66 - 66 - 65 - 65 - 64 - 64 - 64 - 64 -_ 64 - 63 - 63 -_ 63 -_ 62 -_ 62 -_ 62 - 62 -_ 62 -_. 62 - 61 - 61 - 61 - 61 - 61 -_ 61 - 60 - 60 -( 60 -) 60 - 59 - 59 - 59 - 59 - 59 -. 58 - 58 - 58 -_( 58 -_ 58 - 58 - 58 -_ 57 -_ 57 - 57 - 57 - 56 -._ 56 - 56 - 56 - 56 -_ 55 - 55 - 55 - 55 -__ 55 - 55 -_,_ 55 -_ 55 - 55 - 55 - 55 -_, 55 -_ 54 - 54 - 54 - 54 -_- 54 - 54 --_ 53 - 53 - 53 -_ 53 - 53 - 53 -_ 53 - 53 -_ 52 - 52 - 52 -_-_ 52 - 51 -_ 51 - 51 - 51 -_ 50 -_ 50 - 50 - 50 - 50 - 50 -_ 50 -_ 50 -_" 50 - 49 -_ 49 - 49 - 49 - 48 - 48 -_ 48 - 48 - 48 -_ 48 - 48 -_._ 48 - 48 - 48 - 48 - 48 - 48 - 47 - 47 - 47 - 47 -_ 47 - 47 - 47 - 47 - 47 - 47 - 47 - 47 - 47 - 46 - 46 -_ 46 -_ 46 - 46 - 46 -_ 45 - 45 - 45 - 45 - 45 - 45 -_ 45 - 45 -_ 45 - 45 - 45 - 45 - 44 - 44 -_ 44 - 44 -_ 44 -_ 44 -_ 44 - 44 -_ 44 - 44 - 43 - 43 - 43 - 43 diff -Nru spamassassin-3.4.6/trunk-only/lm/bs.lm spamassassin-4.0.0~rc3/trunk-only/lm/bs.lm --- spamassassin-3.4.6/trunk-only/lm/bs.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/bs.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 9464 -a 2787 -i 2108 -e 2077 -o 2018 -j 1396 -n 1328 -s 1170 -u 1010 -r 988 -d 957 -a_ 889 -e_ 833 -t 774 -je 771 -k 756 -l 743 -m 702 -v 685 -p 604 -c 538 -i_ 538 -_s 522 -u_ 476 -z 463 -_p 450 -o_ 433 -,_ 381 -, 381 -_i 369 -_n 358 -b 349 -_d 349 -. 346 -na 341 -je_ 337 -._ 321 -_j 307 -g 299 -ra 292 -st 283 -ko 278 -_je 274 -ij 254 -_o 245 -ni 240 -_k 236 -an 228 -oj 227 -da 226 -_u 222 -pr 221 -no 219 -ma 219 -la 211 -ri 206 -_je_ 203 -po 203 -ci 196 -_pr 191 -os 190 -od 187 -ka 186 -im 185 -ti 184 -li 182 -vo 178 -_po 174 -ja 171 -_i_ 169 -ov 169 -al 168 -re 167 -ne 167 -m_ 164 -ta 160 -na_ 158 -ed 157 -_m 157 -_na 157 -se 156 -_u_ 154 -en 153 -ic 151 -sa 151 -_b 149 -ak 141 -va 140 -ad 137 -h 136 -ju 135 -su 134 -dj 133 -ije 133 -ar 127 -ca 127 -_z 126 -nj 125 -ji 124 -da_ 124 -_ko 123 -_da 122 -il 121 -" 120 -av 120 -_t 118 -aj 116 -ob 115 -ro 114 -am 114 -vi 114 -_su 113 -om 112 -dje 112 -za 112 -at 111 -le 111 -di 110 -su_ 107 -iz 107 -ve 107 -lj 106 -_se 105 -ev 105 -is 105 -es 103 -se_ 103 -do 101 -ih 100 -a, 99 -_su_ 99 -a,_ 99 -on 98 -bi 98 -in 97 -voj 97 -az 96 -ac 95 -_da_ 95 -la_ 95 -_r 93 -_g 93 -jev 92 -ma_ 92 -er 92 -or 91 -h_ 90 -_sa 90 -e, 90 -e,_ 90 -ba 90 -ima 89 -a. 88 -ol 88 -_do 87 -dn 87 -it 87 -ko_ 86 -ne_ 86 -ost 85 -ek 85 -to 85 -d_ 84 -as 84 -ju_ 84 -ao 84 -ih_ 84 -a._ 84 -te 83 -evo 83 -koj 83 -pri 82 -jevo 82 -ce 81 -_se_ 81 -og 80 -go 80 -jevoj 79 -de 79 -uc 79 -evoj 79 -_od 78 -_za 78 -tr 78 -S 77 -_koj 76 -ke 75 -_v 75 -ao_ 75 -_dje 74 -_bi 74 -sta 74 -_dj 74 -cij 74 -ik 74 -djev 73 -sl 73 -_djev 72 -ga 72 -djevo 72 -_ka 71 -rij 71 -_iz 71 -P 71 -_pri 70 -_a 69 -us 68 -_S 68 -mo 67 -el 67 -sk 66 -me 66 -zi 66 -ija 65 -n_ 65 -ku 64 -im_ 63 -_st 63 -ica 63 -_na_ 62 -_ne 62 -em 61 -edn 61 -jk 61 -io 61 -li_ 60 -ojk 60 -evojk 60 -_" 60 -zn 60 -vojk 60 -pro 59 -lo 59 -ije_ 59 -jed 58 -ke_ 58 -om_ 58 -jen 58 -sti 57 -_im 57 -le_ 57 -_ra 56 -e. 56 -ze 55 -_pro 55 -nu 55 -nje 55 -ti_ 55 -ec 55 -pre 55 -oc 54 -aci 54 -no_ 54 -et 54 -oji 53 -si 53 -ara 53 -ama 53 -z_ 53 -pos 52 -rad 52 -ran 52 -ima_ 52 -ru 52 -_P 52 -tu 52 -mu 51 -e._ 51 -ja_ 50 -_pre 50 -sa_ 49 -io_ 49 -od_ 48 -ni_ 48 -_nj 48 -j_ 48 -_pos 47 -_c 47 -ila 47 -K 46 -_sa_ 46 -uz 46 -N 46 -_ni 45 -zna 45 -U 45 -za_ 45 -_no 45 -ako 45 -u, 44 -lu 44 -ali 44 -u,_ 44 -sto 44 -ste 44 -ve_ 44 -ani 44 -oli 44 -aka 44 -_jed 43 -i,_ 43 -ji_ 43 -uci 43 -i, 43 -ci_ 43 -osti 43 -_N 42 -dr 42 -so 42 -ust 41 -ila_ 41 -B 41 -- 41 -red 41 -jke 41 -sv 41 -_go 41 -bar 41 -g_ 41 -est 40 -D 40 -iv 40 -vojke 40 -aju 40 -ta_ 40 -A 40 -lje 40 -jedn 40 -bil 40 -ojke 40 -ova 40 -ati 39 -_mu 39 -pa 39 -M 39 -_ba 39 -ca_ 39 -O 39 -ka_ 39 -_a_ 38 -_B 38 -_ima 38 -sn 38 -nu_ 38 -T 38 -to_ 38 -eg 38 -ava 38 -ros 37 -ir 37 -ala 37 -og_ 37 -osl 37 -ovi 37 -koji 37 -_sv 37 -dv 36 -ric 36 -_za_ 36 -br 36 -_on 36 -odi 36 -_koji 36 -_jedn 35 -nik 35 -dno 35 -_D 35 -jo 35 -tra 35 -_M 35 -sp 35 -iz_ 35 -oz 35 -vr 35 -u. 35 -eri 35 -I 35 -eko 35 -ale 35 -_ma 34 -lik 34 -_bil 34 -c_ 34 -ut 34 -je,_ 34 -u._ 34 -str 34 -je, 34 -adi 34 -tit 34 -_iz_ 34 -iti 34 -i. 33 -_rad 33 -ici 33 -rost 33 -aju_ 33 -va_ 33 -_ob 33 -nog 33 diff -Nru spamassassin-3.4.6/trunk-only/lm/build.pl spamassassin-4.0.0~rc3/trunk-only/lm/build.pl --- spamassassin-3.4.6/trunk-only/lm/build.pl 2006-08-16 04:28:06.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/build.pl 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/usr/bin/perl -w - -# *.lm = old format, uses '_' as separator -# *.ln = new format, uses NULL as separator -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -@files = <*.l[mn]>; -open(STDOUT, "> ../rules/languages"); -foreach $file (sort @files) { - $lang = $file; - $lang =~ s@(.*/)?(.*)\.l[mn]$@$2@; - open(L, $file); - while() { - s/^([^0-9\s]+).*/$1/; - if ($file =~ /\.lm$/) { - s/^_/\000/; - s/_$/\000/; - } - print; - } - close(L); - print "0 $lang\n"; -} diff -Nru spamassassin-3.4.6/trunk-only/lm/ca.lm spamassassin-4.0.0~rc3/trunk-only/lm/ca.lm --- spamassassin-3.4.6/trunk-only/lm/ca.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ca.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 16604 -e 5091 -a 4937 -s 3120 -r 3037 -i 2987 -l 2747 -n 2641 -t 2466 -o 2274 -d 1775 -c 1740 -u 1515 -a_ 1460 -s_ 1416 -_d 1116 -e_ 1067 -p 1014 -m 995 -es 985 -de 972 -_de 842 -en 700 -_l 691 -re 652 -_e 637 -de_ 611 -el 602 -_de_ 601 -_a 600 -, 599 -,_ 599 -er 598 -la 584 -ar 583 -_p 550 -l_ 547 -ci 522 -n_ 518 -es_ 515 -an 515 -ra 499 -nt 495 -ta 495 -b 476 -_c 452 -al 450 -v 440 -g 428 -. 420 -on 420 -or 404 -t_ 402 -at 396 -._ 377 -r_ 372 -i_ 371 -la_ 368 -_i 364 -_la 351 -_la_ 325 -f 325 -le 322 -te 312 -' 311 -_s 308 -st 308 -se 305 - 302 -ue 302 -na 301 -os 301 -qu 300 -q 300 -el_ 299 -it 292 -co 290 -ri 277 -ca 277 -ti 273 -ac 272 -in 268 -ll 264 -ic 264 -me 259 -un 257 -que 248 -C 248 -tr 244 -ns 242 -i 238 -_i_ 236 -ad 233 -ent 232 -_el 227 -ne 226 -_t 223 -_co 221 -_m 221 -_C 217 -en_ 217 -li 217 -ia 212 - 212 -pe 207 -_a_ 207 -pr 206 -ci 203 -_ 203 -pa 203 -ro 202 -o_ 198 -E 198 -di 197 -io 197 -ls 196 -h 192 -_q 192 -_qu 192 -_en 187 -aci 186 -am 186 -ec 183 -to 183 -as 180 -om 180 -ni 180 -da 179 -i_ 179 -si 178 -ls_ 176 -L 175 -ma 172 -res 172 -ur 171 -_el_ 162 -rt 162 -ue_ 160 -A 160 -os_ 159 -_que 159 -que_ 158 -_r 158 -po 157 -_es 155 -er_ 155 -_que_ 155 -M 155 -_se 153 -va 153 -del 153 -ci_ 151 -_pr 151 -is 150 -_en_ 149 -P 147 -_pe 146 -_del 145 -ts 145 -lo 145 -_M 144 -ct 144 -_u 144 -ol 143 -ve 141 -_L 140 -x 140 -y 140 -a,_ 139 -a, 139 -nc 138 -men 137 -al_ 137 -_f 137 -_re 137 -_P 136 -aci 136 -les 136 -rs 134 -est 133 -tu 131 -_E 130 -et 130 -s,_ 129 -_un 129 -na_ 129 -_v 129 -s, 129 -ion 127 -per 126 -so 125 -em 125 -at_ 124 -no 124 -j 124 -br 123 -nt_ 122 -ar_ 122 -sa 121 -_n 119 -les_ 118 - 118 -ce 117 -il 117 -ell 116 -_per 114 - 114 -ob 113 -re_ 113 -ir 113 -_A 112 -ons 112 -do 112 -ua 112 -con 112 -ment 111 -gu 111 -ts_ 110 -ss 110 -ns_ 109 -ant 109 -ra_ 109 -Co 109 -par 108 -l' 107 -d' 107 -_l' 107 -els 107 -tat 107 -sc 106 -_d' 106 -an_ 105 -_Co 105 -vi 104 -els_ 104 -ica 104 -ran 103 -ul 102 -iv 102 -S 102 -_del_ 102 -del_ 102 -mb 101 -mi 101 -ita 101 -nta 100 -_pa 99 -_o 99 -_con 98 -aci_ 97 -rn 96 -_in 96 -ia_ 96 -z 96 -im 95 -rr 95 -art 94 -ta_ 93 -com 93 -tre 92 -_h 92 -s. 91 -mp 90 -ie 90 -J 90 -s._ 89 -cio 89 -_le 89 -bre 88 -_ca 88 -_al 88 -sta 88 -_com 88 -cu 88 -_ 87 -pre 87 -fe 86 -ba 86 -tra 86 -ge 85 -pro 85 -_les 84 -des 84 -ter 84 -_po 84 -_les_ 84 -T 84 -_J 84 -nd 84 -cion 84 -_S 84 -ura 83 -nci 82 -va_ 81 -ha 81 -ona 81 -ent_ 80 -ues 80 -oc 80 -ea 80 -nte 80 -s 80 -_di 79 -ui 79 -as_ 78 -ut 78 -ici 78 -res_ 78 -us 77 -ot 77 -ara 77 -ip 75 -rm 75 -ab 75 -eg 75 -_per_ 75 -ng 75 -'a 75 -I 75 -per_ 75 -rec 74 -du 74 -_tr 74 - 73 -cia 73 -_no 73 -b_ 73 -_par 72 -ep 72 -id 72 -lle 71 -rc 71 -_pro 70 -D 69 -G 69 -ga 69 -fo 69 -una 68 -El 68 -lit 68 -un_ 68 -ques 68 -amb 67 -ix 67 -s_ 67 -_G 67 -era 67 -cr 67 -) 66 -da_ 66 -- 66 -sp 66 -y_ 66 -ada 66 -tor 66 -( 66 -_( 66 -_T 65 -ment_ 65 -B 65 -_es_ 65 -Ma 65 -V 65 -uc 65 -ect 65 -ame 64 -iu 64 -_Ma 64 -orn 64 -_B 64 -_D 64 -Ca 64 -sti 64 -_g 63 -esc 63 -rd 63 -una_ 63 -l 62 -" 62 -ed 62 -amen 61 -mo 61 -ions 61 -_El 61 -_Ca 61 -Jo 61 -eu 61 -ari 61 -lt 61 -F 61 -u_ 61 -ament 60 -_V 60 -m_ 60 -fi 60 -au 60 -ev 60 -La 60 -itat 59 -_ha 59 diff -Nru spamassassin-3.4.6/trunk-only/lm/cs.iso-8859-2.lm spamassassin-4.0.0~rc3/trunk-only/lm/cs.iso-8859-2.lm --- spamassassin-3.4.6/trunk-only/lm/cs.iso-8859-2.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/cs.iso-8859-2.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 26378 -o 5870 -e 5354 -a 4740 -n 4462 -t 3745 -s 3438 -i 3187 -v 3118 -l 2891 -r 2754 -k 2566 -d 2508 -m 2198 -u 2197 -p 2032 - 1924 -c 1678 -h 1572 -z 1544 - 1522 -_p 1299 -e_ 1266 -y 1231 -a_ 1219 -j 1219 -_s 1156 -b 1079 -o_ 1065 - 1043 -_v 1038 -, 952 -,_ 946 -st 945 -_n 911 - 878 -. 870 -_ 848 - 822 -._ 803 -n 782 -ov 757 -_z 723 -i_ 716 -u_ 684 -ro 674 -en 656 - 647 - 639 -po 630 -ch 629 - 625 -na 599 -_a 598 -sk 592 - 563 -ho 552 -_d 551 -ra 545 -m_ 539 -y_ 530 -_t 512 -ko 504 -_k 503 -le 502 -_j 501 -_o 486 -to 479 -pr 471 -ne 468 -n_ 462 -je 458 -_ 456 -ti 455 -od 433 -li 432 -va 432 -_po 429 -_m 428 -al 424 -te 424 -ou 423 -ed 418 -se 415 -la 410 -no 397 -os 382 -lo 377 -an 376 -_pr 375 - 375 -v_ 372 -e 370 -_a_ 364 -em 363 -at 360 -ta 359 -do 357 -t_ 357 -_b 355 -or 349 -h_ 345 -_v_ 338 -ch_ 327 -S 325 -ce 323 -av 323 -p 322 -ni 319 -k 316 -er 315 -n 315 -_na 313 -na_ 312 -_ne 311 -de 308 -ic 307 -in 306 -_se 306 -l_ 304 -dn 302 -za 298 -_p 293 -_ 291 -ol 290 -_je 281 -ob 280 -is 277 -ve 274 -ho_ 272 -es 270 -ot 268 -ak 265 -vo 263 -n 260 -il 257 -se_ 257 -it 256 -et 253 -ad 250 -by 249 -P 242 -_r 242 -k_ 242 -ost 241 -_se_ 241 -tr 238 -me 237 -pro 234 -e 234 -ka 230 -_za 227 -om 224 -el 223 -_P 223 -on 218 -_pro 216 -ou_ 216 -tu 215 -O 212 -mi 212 -ku 211 -_u 210 -_do 208 -_l 207 -_na_ 206 -N 205 -sk 205 -m 205 -c 205 -_ 203 -m 203 -_S 200 -oz 200 -V 200 -ze 198 -da 194 -sl 192 -_ 191 -ova 190 -mo 190 -re 189 -so 187 -vy 186 -ej 185 -r 184 -ar 184 -s_ 183 -v 183 -A 181 -ru 180 -_st 178 -f 178 -h 177 -ho 176 -kt 176 -tn 175 -g 174 -bo 174 -ez 173 -ci 172 -k 172 -n 170 -M 170 -n 169 -as 168 -vi 167 -i 167 -ac 166 -e_ 165 -c 165 -_ 165 -ck 164 -K 164 -B 164 -ch 164 -v 162 -_c 162 -ho_ 162 -en 161 -l 160 -_ 160 - 160 -pe 159 -ec 158 -_ 157 -J 156 -vn 156 -_h 155 -k_ 155 -ok 154 -sta 154 -to_ 152 -v 152 -nt 151 -ch_ 149 -lo_ 149 -_by 149 -dy 149 -_pe 148 -ce_ 147 -R 146 -n_ 146 -d 146 -pa 145 -v 145 -am 145 -mu 145 -n 145 -ud 144 -_ 144 -_B 142 -ter 141 -n_ 141 -e 140 -e 140 -_V 140 -_ko 140 -li_ 139 -d 137 -hl 137 -je_ 137 -ji 137 -ist 135 -j 135 -- 134 -ik 133 -si 133 -l 132 -em_ 132 -_to 132 -_vy 131 -sp 130 -ut 130 -_J 130 -_e 130 -_M 129 -di 129 -kon 128 -la_ 128 -t 128 -_ro 127 -ns 127 -ek 126 -ick 126 -T 126 -yl 125 -n 125 -rn 125 -_e_ 124 -op 124 -sti 124 -kte 124 -ed 124 -edn 123 -us 121 -m_ 120 -" 119 -z_ 119 -str 118 -ti_ 118 -m 118 -vat 118 -d_ 118 -_ve 118 -v 118 -en_ 117 -iv 117 -oj 117 -_kt 117 -l 117 -val 116 -eb 116 -_K 115 -t 115 -_kte 115 -t 115 -_i 114 -_N 114 -D 114 -kl 114 -ny 114 -byl 113 -ev 113 -ri 113 - 113 -ky 111 -sm 111 -oh 111 -E 110 -ma 110 -t 110 -sk 110 -kter 109 -nu 109 -le_ 108 -ja 107 -z 107 -t 106 -t 106 -zn 106 -let 105 -aj 105 -sto 105 - 105 -me_ 105 --_ 105 -u, 105 -sv 104 -_le 104 -pol 104 -L 104 -_- 104 -ln 104 -pod 104 -H 103 -zi 103 -kh 103 -kho 103 -_n 103 -ent 102 -u,_ 102 -_od 102 -n_ 101 -_-_ 101 -al_ 101 -_kter 101 -do_ 100 -nos 100 -c 100 -rav 99 -ran 99 -_sv 99 -k 98 -e 98 -nm 98 -bu 97 -_z_ 97 -ch 97 -_byl 97 -n 96 -rov 96 -kr 96 -d 95 -ov 95 -dl 95 -uj 95 -nost 95 -m_ 95 -ech 94 -ly 94 -oc 94 -v_ 93 -_o_ 93 -dy_ 93 -ak_ 93 -nsk 93 -_so 93 -_ob 92 -nc 92 diff -Nru spamassassin-3.4.6/trunk-only/lm/cy.lm spamassassin-4.0.0~rc3/trunk-only/lm/cy.lm --- spamassassin-3.4.6/trunk-only/lm/cy.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/cy.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 78614 -a 18113 -d 17890 -y 16837 -e 14108 -n 13902 -r 13869 -i 12928 -o 9972 -l 9188 -h 7454 -g 7165 -w 7010 -t 6296 -f 6080 -u 5400 -n_ 5159 -_y 5051 -dd 4946 -s 4884 -r_ 4547 -m 4364 -d_ 4223 -yn 4082 -_a 4020 -c 3707 -th 3301 -u_ 2900 -yd 2900 -ae 2649 -l_ 2588 -_g 2547 -. 2460 -' 2458 -._ 2408 -wy 2334 -yn_ 2331 -_d 2307 -b 2267 -ym 2262 -ra 2261 -an 2235 -ar 2228 -ol 2218 -ia 2212 -i_ 2199 -ed 2191 -_yn 2038 -_i 2020 -y_ 1983 -_c 1934 -_yn_ 1861 -ei 1815 -it 1796 -g_ 1787 -ith 1779 -dd_ 1745 -h_ 1741 -ydd 1731 -ai 1709 -au 1708 -'r_ 1655 -'r 1655 -_y_ 1621 -di 1615 -, 1613 -,_ 1608 -da 1585 -od 1546 -_o 1535 -ad 1532 -th_ 1510 -ll 1494 -au_ 1492 -_s 1415 -er 1359 -o_ 1350 -io 1311 -a_ 1299 -ol_ 1294 -_e 1273 -_h 1249 -cy 1246 -yr 1243 -en 1228 -p 1217 -_f 1212 -_cy 1203 -mr 1200 -gy 1193 -ymr 1185 -ha 1172 -hy 1164 -eg 1159 -do 1151 -edd 1147 -G 1134 -we 1107 -C 1089 -_ar 1078 -_m 1075 -yf 1057 -de 1048 -fe 1047 -_G 1045 -ch 1043 -rae 1023 -el 1016 -no 1010 -ni 1010 -_b 1009 -ne 1001 -ef 992 -ri 983 -et 978 -_C 957 -_gy 952 -_a_ 943 -eth 943 -_. 940 -_._ 939 -eit 930 -eith 927 -ys 921 -wyd 912 -ga 901 -_i_ 893 -s_ 887 -mrae 878 -mraeg 878 -raeg 878 -ymrae 878 -aeg 878 -ymra 878 -mra 878 -_p 856 -aet 850 -aeth 850 -_n 844 -un 838 -on 836 -ait 833 -aith 833 -nn 830 -at 827 -oe 823 -li 805 -_r 801 -ddi 795 -gw 789 -ma 783 -le 777 -nt 772 -ho 769 -ff 766 -yr_ 764 -na 753 -la 748 -rh 747 -eg_ 734 -si 733 -ng 732 -dol 732 -ro 718 -al 712 -_dd 706 -wn 705 -oed 705 -Gy 704 -dy 701 -Cy 696 -o' 692 -ar_ 691 -ny 690 -Gym 678 -wr 677 -id 676 -_Gy 672 -_o_ 668 -Gymr 667 -if 662 -ith_ 662 -_ar_ 660 -iad 657 -_w 657 -fo 656 -eu 655 -aeg_ 650 -raeg_ 650 -aith_ 648 -or 648 -_Gym 646 -fa 642 -re 638 -_Cy 638 -_Gymr 635 -_gw 633 -fy 633 -oedd 633 -edd_ 629 -rd 627 -od_ 622 -ac 619 -ddo 612 -an_ 607 -Gymra 606 -er_ 605 -A 604 -eth_ 601 -hw 596 -ydd_ 591 -o'r 586 -o'r_ 586 -es 583 -ir 579 -dw 573 -go 559 -yl 548 -rw 545 -aeth_ 545 -wydd 543 -aw 539 -_rh 539 -dr 537 -ly 537 -fn 534 -dau 533 -_hy 531 -t_ 531 -sg 529 -'n 529 -* 528 -'n_ 523 -_* 522 -nyd 521 -nydd 521 -M 519 -st 518 -Y 516 -sy 515 -yd_ 513 -lw 512 -_ga 508 -iai 503 -il 502 -_l 499 -rt 494 -ad_ 493 -_yr 493 -_yr_ 492 -as 492 -dol_ 492 -f_ 491 -dda 491 -ig 490 -og 484 -wa 479 -he 478 -iaith 477 -iait 477 -oedd_ 475 -_ma 473 -c_ 472 -Cym 470 -te 469 -_ym 467 -am 467 -_M 465 -_ia 462 -efn 462 -i' 460 -ie 458 -_Cym 458 -_ac 457 -dau_ 456 -yw 455 -ew 453 -fr 441 -fod 441 -_A 441 -du 437 -_sy 434 -e_ 432 -wi 426 -Cymr 426 -se 425 -B 424 -D 424 -_Cymr 423 -bl 423 -lu 420 -in 417 -_t 417 -tr 414 -ac_ 413 -wed 410 -os 410 -_iai 407 -_iait 407 -el_ 405 -_ac_ 405 -rha 404 -m_ 404 -is 403 -on_ 401 -eu_ 393 -hi 393 -rdd 393 -id_ 389 -_Y 388 -ry 387 -odd 387 -rwy 387 -rf 386 -io_ 380 -ynn 380 -cyf 380 -hr 380 -_cyf 379 -yddi 379 -cyn 372 -_de 372 -rth 371 -ru 368 -S 363 -wei 363 -ysg 362 -_B 362 -u' 361 -yddo 360 -wn_ 360 -so 359 -dio 359 -_ei 358 -N 356 -dwy 355 -_da 353 -me 353 -gan 353 -gyf 353 -w_ 352 -_o' 351 -fer 349 -nol 347 -hyn 346 -ddy 346 -af 346 -ta 343 -ddol 343 -_fe 340 -nd 340 -mae 338 -_cyn 338 -efnyd 337 -fnydd 337 -fny 337 -efny 337 -fnyd 337 -iad_ 335 -_mae 333 -ion 333 -_ll 330 -def 330 -_gyf 327 -nt_ 326 -i'r_ 326 -- 326 -i'r 326 -weith 325 -weit 325 -defn 325 -defny 325 -bo 324 -hyd 323 -by 322 -_si 321 -ir_ 321 -hau 318 -nod 318 -edi 315 -I 314 -fyd 313 -wyr 313 -ada 311 -ddio 310 -rif 309 -sia 307 -sa 306 -fel 305 -tha 305 -_S 302 -_ne 302 -_u 301 -fod_ 300 -_o'r 300 -yg 300 -_o'r_ 300 -_i' 299 -ge 299 -dia 299 diff -Nru spamassassin-3.4.6/trunk-only/lm/da.lm spamassassin-4.0.0~rc3/trunk-only/lm/da.lm --- spamassassin-3.4.6/trunk-only/lm/da.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/da.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 21274 -e 9291 -r 5307 -n 4733 -i 3976 -t 3948 -s 3751 -a 3296 -l 3063 -d 3025 -o 2868 -g 2471 -er 2164 -k 2002 -m 1680 -e_ 1655 -en 1613 -f 1507 -de 1484 -r_ 1379 -v 1245 -u 1176 -t_ 1081 -n_ 1032 -er_ 992 -b 942 -. 870 -ge 868 -._ 831 -re 816 -h 816 -et 813 -te 813 -p 806 -in 788 -or 775 -_s 753 -_a 749 -en_ 712 -_e 691 -ti 689 -an 687 -, 681 -,_ 677 -_f 655 -_d 645 -el 642 -ng 635 -nd 634 -g_ 634 -se 615 -le 615 -st 607 -s_ 601 -_o 572 -ne 560 -li 537 -et_ 524 -es 521 -_i 512 -ri 511 -sk 510 -_de 498 - 497 -ar 475 -ed 473 -ig 463 -at 452 -_m 446 -is 443 -fo 441 - 441 -ve 438 -_k 434 - 432 -der 429 -ke 428 -ing 427 -og 426 -_b 412 -me 408 -il 407 -for 405 -ns 394 -y 389 -_h 380 -_t 374 -on 371 -d_ 370 -al 362 -be 359 -_fo 351 -af 336 -de_ 335 -_og 333 -_p 332 -og_ 325 -om 325 -_for 324 -_og_ 313 -l_ 308 -nge 302 -i_ 295 -_v 294 -c 289 -ter 283 -ll 280 -ni 278 -nde 278 -rs 277 -_af 277 -un 275 -ra 271 -ko 271 -den 270 -_i_ 268 -id 265 -til 265 -j 265 -vi 264 -D 260 -ere 256 -ma 255 -si 253 -f_ 252 -af_ 238 -_af_ 235 -ik 235 -m_ 234 -_ 232 -_ti 227 -_D 226 -_u 226 -_er 225 -nt 224 -_en 224 -ls 221 -es_ 216 -lig 216 -ger 216 -re_ 210 -ag 210 -_me 207 -at_ 204 -lle 200 -ge_ 200 -_til 200 -ige 199 -_er_ 199 -der_ 199 -em 199 -ds 197 -r. 195 -io 195 -r._ 195 -ud 193 -_at 192 -_at_ 191 -ta 190 -els 190 -_l 190 -ha 190 -il_ 189 -or_ 189 -ke_ 186 -rt 185 -gen 184 -ka 183 -- 180 -rk 180 -ning 178 -ol 178 -nin 178 -la 177 -ld 175 -De 175 -it 173 -ede 172 -ed_ 171 -_ko 171 -lse 171 -ek 168 -else 167 -inge 167 -p 167 -ng_ 167 -_p 167 -iv 166 -r 166 -so 165 -he 165 -ens 165 -ske 165 -ind 164 -til_ 163 -rn 163 -ide 162 -ev 162 -den_ 162 -to 162 -sen 160 -_be 160 -sa 160 -bl 158 -_g 158 -an_ 157 -det 156 -om_ 156 -ru 156 -va 155 -_til_ 155 -ste 154 -rd 153 -_p_ 152 -k_ 152 -p_ 152 -di 152 -kr 152 -K 151 -_De 149 -for_ 148 -te_ 148 -kon 148 -ver 147 -mm 146 -am 146 -_en_ 145 -_r 145 -ne_ 144 -ing_ 144 -tr 143 -le_ 142 -del 142 -_in 142 -gt 140 -_st 138 -S 138 -eg 138 -gs 138 -tt 138 -r, 137 -ser 137 -r,_ 137 -er. 137 -ro 137 -er._ 137 -_for_ 136 -ent 136 -kt 136 -eri 135 -ur 134 -lin 134 -B 133 -A 133 -sti 133 -ner 133 -da 133 -ris 132 -ion 132 -_K 131 -ern 131 -ers 130 -ist 130 -r 130 -ige_ 130 -_si 130 -tte 129 -E 128 -_n 128 -nn 127 -_B 126 -_ha 126 -_. 126 -rne 125 -H 125 -_ud 125 -rin 124 -na 124 -und 124 -ft 124 -_der 124 -ku 123 -_A 122 -ler 120 -and 120 -end 120 -ns_ 120 -rg 119 -op 119 -er,_ 119 -er, 119 -ar_ 118 -P 118 -_S 117 -_H 117 -_._ 116 -ov 116 -erne 115 -tio 115 -med 115 -tion 115 -_E 115 -_P 115 -det_ 114 -pr 114 -e. 113 -ter_ 113 -: 113 -kk 113 -e._ 113 -e,_ 113 -e, 113 -od 113 -kke 113 -ten 113 -ling 113 -:_ 112 -mi 112 -eli 112 -lo 111 -som 111 -_den 111 -rb 110 -se_ 110 -ell 110 -sid 110 -nne 109 -fi 108 -lt 107 -v_ 107 -_de_ 107 -ark 106 -lige 106 -ngen 106 -ie 105 -_med 105 -_der_ 105 -ring 105 -a_ 105 -_vi 104 --_ 104 -ys 103 -gel 103 -_so 103 -ia 103 -ive 102 -ej 101 -ati 101 -ren 101 -_det 101 -side 101 -ske_ 101 -br 100 -gi 100 -F 100 -M 100 -ul 99 -isk 99 -men 99 -n,_ 99 -age 99 -fr 99 -n, 99 -tu 98 -ts 98 -_ma 98 -nder 98 -ot 97 -dt 97 -R 97 -med_ 96 -ho 96 -ans 95 -_kon 95 -pe 95 -ce 94 -gr 93 -mme 92 -ret 92 -lige_ 92 -mu 91 -_med_ 91 -hv 91 -v 91 -Det 91 -ens_ 91 -kl 91 -_M 90 -T 90 -ingen 90 -rm 90 -ill 89 -elle 89 -ef 89 -ene 89 -nds 89 -ove 89 -som_ 89 -C 88 -_den_ 88 diff -Nru spamassassin-3.4.6/trunk-only/lm/de.lm spamassassin-4.0.0~rc3/trunk-only/lm/de.lm --- spamassassin-3.4.6/trunk-only/lm/de.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/de.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 31586 -e 15008 -n 9058 -i 7299 -r 6830 -t 5662 -s 5348 -a 4618 -h 4176 -d 4011 -er 3415 -en 3412 -u 3341 -l 3266 -n_ 2848 -c 2636 -ch 2460 -g 2407 -o 2376 -e_ 2208 -r_ 2128 -m 2077 -_d 1948 -de 1831 -en_ 1786 -ei 1718 -er_ 1570 -in 1568 -te 1505 -ie 1505 -b 1458 -t_ 1425 -f 1306 -k 1176 -ge 1144 -s_ 1137 -un 1113 -, 1104 -,_ 1099 -w 1099 -z 1060 -nd 1039 -he 1004 -st 989 -_s 952 -_de 949 -. 909 -_e 906 -ne 906 -der 880 -._ 847 -be 841 -es 829 -ic 796 -_a 791 -ie_ 779 -is 769 -ich 763 -an 755 -re 749 -di 732 -ein 730 -se 730 -" 720 -ng 709 -_i 706 -sc 683 -sch 681 -it 673 -der_ 652 -h_ 651 -ch_ 642 -S 630 -le 609 -p 609 - 607 - 603 -au 603 -v 602 -che 599 -_w 596 -d_ 585 -die 576 -_di 572 -m_ 562 -_die 559 -el 548 -_S 540 -_der 529 -li 527 -_der_ 523 -si 515 -al 514 -ns 507 -on 501 -or 495 -ti 490 -ten 487 -ht 486 -die_ 485 -_die_ 483 -D 479 -rt 478 -nd_ 476 -_u 470 -nt 468 -A 466 -in_ 464 -den 461 -cht 447 -und 443 -me 440 -_z 429 -ung 426 -ll 423 -_un 421 -_ei 419 -_n 415 -hr 412 -ine 412 -_A 408 -_ein 405 -ar 404 -ra 403 -_v 400 -_g 400 -as 395 -zu 392 -et 389 -em 385 -_D 380 -eine 376 -gen 376 -g_ 376 -da 368 -we 366 -K 365 -lt 360 -B 354 -_" 353 -nde 349 -ni 347 -und_ 345 -E 345 -ur 345 -_m 342 -ri 341 -ha 340 -eh 339 -ten_ 338 -es_ 336 -_K 336 -_und 335 -ig 335 -_b 335 -hen 334 -_und_ 332 -_au 329 -_B 327 -_da 325 -_zu 324 -_in 322 -at 321 -us 318 -wi 307 -n, 305 -n,_ 304 -nn 304 -te_ 301 -eit 301 -_h 300 -ter 299 -M 298 -n. 295 - 294 -ng_ 289 -sche 289 -- 283 -rs 282 -den_ 282 -_si 280 -G 280 -im 278 -_ge 277 -chen 276 -rd 273 -_E 273 -n._ 270 -icht 270 -rn 268 -uf 267 -isch 264 -isc 264 -nen 263 -_in_ 262 -_M 260 -_er 257 -ich_ 255 -ac 253 -lic 252 -_G 252 -ber 252 -la 251 -vo 251 -eb 250 -ke 249 -F 248 -as_ 248 -hen_ 248 -ach 245 -en, 244 -ung_ 243 -lich 243 -ste 243 -en,_ 243 -_k 241 -ben 241 -_f 241 -en. 241 -_be 239 -it_ 239 -L 238 -_se 237 -mi 236 -ve 236 -na 236 -on_ 236 -P 235 -ss 234 -ist 234 - 234 -ht_ 233 -ru 233 -st_ 229 -_F 229 -ts 227 -ab 226 -W 226 -ol 225 -_eine 225 -hi 225 -so 224 -em_ 223 -"_ 223 -ren 222 -en._ 221 -chen_ 221 -R 221 -ta 221 -ere 220 -ische 219 -ers 218 -ert 217 -_P 217 -tr 217 -ed 215 -ze 215 -eg 215 -ens 215 -r 213 -ah 212 -_vo 212 -ne_ 211 -cht_ 210 -uc 209 -_wi 209 -nge 208 -lle 208 -fe 207 -_L 207 -ver 206 -hl 205 -V 204 -ma 203 -wa 203 -auf 201 -H 198 -_W 195 -T 195 -nte 193 -uch 193 -l_ 192 -sei 192 -nen_ 190 -u_ 189 -_den 189 -_al 189 -_V 188 -t. 188 -lte 187 -ut 186 -ent 184 -sich 183 -sic 183 -il 183 -ier 182 -am 181 -gen_ 180 -sen 179 -f 178 -um 178 -t._ 177 -f_ 174 -he_ 174 -ner 174 -nst 174 -ls 174 -_sei 173 -ro 173 -ir 173 -ebe 173 -mm 173 -ag 172 -ern 169 -t,_ 169 -t, 169 -eu 169 -ft 168 -icht_ 167 -hre 167 -Be 166 -nz 165 -nder 165 -_T 164 -_den_ 164 -iche 163 -tt 163 -zu_ 162 -and 162 -J 161 -rde 160 -rei 160 -_we 159 -_H 159 -ige 159 -_Be 158 -rte 157 -hei 156 -das 155 -aus 155 -che_ 154 -_das 154 -_zu_ 154 -tz 154 -_ni 153 -das_ 153 -_R 153 -N 153 -des 153 -_ve 153 -_J 152 -I 152 -_das_ 152 -men 151 -_so 151 -_ver 151 -_auf 150 -ine_ 150 -_ha 150 -rg 149 -ind 148 -eben 148 -kt 147 -mit 147 -_an 147 -her 146 -Ge 146 -Sc 145 -_sich 145 -U 145 -Sch 145 -_sic 145 -end 145 -Di 144 -abe 143 -ck 143 -sse 142 -r_ 142 -ell 142 -ik 141 -o_ 141 -nic 141 -nich 141 -sa 141 -_f 140 -hn 140 -zi 140 -no 140 -nicht 140 -im_ 139 -von_ 139 -von 139 -_nic 139 -_nich 139 -eine_ 139 -oc 138 -wei 138 -io 138 -schen 138 -gt 138 diff -Nru spamassassin-3.4.6/trunk-only/lm/el.iso-8859-7.lm spamassassin-4.0.0~rc3/trunk-only/lm/el.iso-8859-7.lm --- spamassassin-3.4.6/trunk-only/lm/el.iso-8859-7.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/el.iso-8859-7.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 89284 - 19666 - 16086 - 15826 - 14848 - 12766 - 12189 - 8776 - 8653 - 8399 - 7761 - 7529 - 6850 - 6284 -_ 5918 - 5802 - 5371 -_ 5272 - 5236 - 4739 - 4609 - 4489 - 4461 -_ 4111 - 4075 -_ 4033 -_ 4019 -. 3916 -_ 3897 -_ 3836 -._ 3810 -_ 3661 -_ 3414 -_ 3333 -" 3247 -_ 3242 -_ 3118 -, 3106 -,_ 3068 - 3058 -_ 2912 - 2689 - 2593 - 2455 - 2420 - 2411 - 2406 - 2406 -_ 2353 -- 2335 --_ 2192 - 2171 - 2162 - 2151 - 2141 -_ 2133 - 2100 - 2053 - 1989 -_ 1974 - 1889 -_ 1882 - 1864 -_ 1802 - 1771 -_ 1727 - 1709 -_ 1647 -_" 1619 -_ 1609 - 1602 -_ 1518 - 1501 - 1501 - 1495 - 1460 -_ 1407 -_ 1405 -_ 1396 - 1364 - 1359 - 1300 - 1298 - 1274 - 1252 -_ 1241 -_ 1231 - 1223 - 1220 -__ 1196 - 1187 - 1184 -_ 1183 -_ 1177 - 1158 -_ 1150 -_ 1150 -_ 1124 - 1115 - 1110 -_ 1093 -_ 1082 - 1078 -_ 1061 -__ 1060 -__ 1053 - 1049 - 1048 - 1036 - 1024 -_ 1018 - 1003 - 993 -_ 984 -_ 974 - 973 -_ 967 - 947 - 936 -_ 935 - 901 - 892 -_ 890 - 884 -_ 871 -_ 869 - 865 -__ 854 - 841 -_ 840 - 834 - 833 - 832 - 824 - 820 - 808 -_ 804 - 796 - 796 - 783 - 777 - 772 - 766 - 762 - 759 - 745 - 742 -_ 740 - 738 -_ 730 -_ 728 - 717 - 714 -_ 711 - 705 - 704 - 697 -_ 688 - 684 -_ 683 -_ 680 -_ 675 - 671 -_ 670 - 663 -_ 658 -_ 647 -_ 645 -_ 638 -_ 633 -__ 631 -", 630 -_ 626 -_ 624 - 624 - 623 -",_ 623 - 620 - 619 - 618 - 617 - 617 -_ 616 - 612 -_ 611 - 607 - 604 - 595 -_ 594 - 590 -__ 586 - 580 -_ 577 - 577 -_ 575 -_ 572 - 570 - 570 -__ 569 - 562 - 554 - 553 - 552 -_ 551 - 547 - 547 - 544 -_ 540 - 536 -_ 534 - 528 -__ 525 - 520 -". 519 -_ 516 -_ 515 -"._ 513 -_ 512 -. 510 - 508 -_ 504 -_ 503 -._ 501 -_ 500 - 497 -_ 496 - 493 - 492 - 491 -__ 490 - 489 - 489 - 485 -_ 483 -_ 483 -_ 482 -__ 481 - 480 - 480 -_ 479 - 477 -__ 475 - 473 -_ 468 -"_ 463 - 463 - 461 - 452 -_ 452 - 451 - 451 -_ 450 -_ 449 - 447 - 446 - 446 -_ 445 -__ 443 -. 441 -._ 441 - 439 - 439 - 439 - 438 - 437 - 432 -_ 428 -_ 427 -_ 427 - 423 -; 423 -_ 422 - 421 - 421 -_ 418 - 415 - 411 - 408 - 405 -. 403 - 402 - 402 -, 402 -,_ 401 -._ 398 - 397 -_ 397 - 396 -_ 395 -_ 393 -_ 392 - 391 - 391 - 390 - 389 - 389 - 388 - 388 -_ 387 -_ 386 - 384 - 384 - 383 - 382 -_ 376 - 375 - 372 -_ 370 -__ 367 -_ 365 -_ 362 -_ 361 - 361 - 359 -_ 358 - 358 -_ 354 -_ 354 - 352 -. 352 -._ 351 - 351 - 350 - 348 - 348 -_ 348 -_ 347 - 346 - 346 -. 346 -_ 346 -._ 345 - 345 -_ 345 -, 344 -,_ 344 -_ 344 - 343 - 343 -- 342 - 341 -_. 340 - 339 - 339 -_._ 339 - 339 --_ 338 - 338 - 338 - 338 - 338 -_ 338 -_ 338 -_ 337 - 336 - 336 - 336 - 336 - 336 -_ 334 - 334 -_ 334 - 334 -_ 333 - 332 -_ 331 - 331 - 330 - 330 -_ 329 -_ 328 - 328 - 326 -_ 325 -__ 325 - 324 -_ 324 - 324 - 323 -_ 323 - 322 -_ 321 - 321 -_ 321 -_ 321 -_ 321 - 320 -__ 320 - 320 - 318 -;" 316 -;"_ 316 - 315 - 314 -_ 313 -_ 312 - 312 -__ 310 - 309 -. 309 diff -Nru spamassassin-3.4.6/trunk-only/lm/en.lm spamassassin-4.0.0~rc3/trunk-only/lm/en.lm --- spamassassin-3.4.6/trunk-only/lm/en.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/en.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 20326 -e 6617 -t 4843 -o 3834 -n 3653 -i 3602 -a 3433 -s 2945 -r 2921 -h 2507 -e_ 2000 -d 1816 -_t 1785 -c 1639 -l 1635 -th 1535 -he 1351 -_th 1333 -u 1309 -f 1253 -m 1175 -p 1151 -_a 1145 -the 1142 -_the 1060 -s_ 978 -er 968 -_o 967 -he_ 928 -d_ 888 -t_ 885 -the_ 844 -_the_ 843 -on 842 -in 817 -y 783 -n_ 773 -b 761 -re 754 -, 734 -,_ 732 -an 732 -g 728 -w 718 -_i 707 -en 676 -f_ 599 -y_ 595 -of 594 -_of 592 -es 589 -ti 587 -v 580 -_of_ 575 -of_ 575 -nd 568 -at 549 -r_ 540 -_w 534 -it 522 -ed 496 -_p 494 -nt 485 -_c 462 -o_ 457 -io 450 -_an 439 -te 432 -or 425 -_b 418 -nd_ 407 -to 406 -st 402 -is 401 -_s 396 -_in 389 -ion 385 -and 385 -de 384 -ve 382 -ha 375 -ar 366 -_m 361 -and_ 360 -_and 360 -_and_ 358 -se 353 -_to 347 -me 346 -to_ 344 -ed_ 339 -. 330 -be 329 -_f 329 -._ 329 -_to_ 320 -co 317 -ic 316 -ns 308 -al 307 -le 304 -ou 304 -ce 293 -ent 279 -l_ 278 -_co 277 -tio 275 -on_ 274 -_d 274 -tion 268 -ri 266 -_e 264 -ng 253 -hi 251 -er_ 249 -ea 246 -as 245 -_be 242 -pe 242 -h_ 234 -_r 232 -ec 227 -ch 223 -ro 222 -ct 220 -_h 219 -pr 217 -in_ 217 -ne 214 -ll 214 -rt 213 -s,_ 210 -s, 210 -li 209 -ra 208 -T 207 -wh 204 -a_ 203 -ac 201 -_wh 199 -_n 196 -ts 196 -di 196 -es_ 195 -si 194 -re_ 193 -at_ 192 -nc 192 -ie 190 -_a_ 188 -_in_ 185 -ing 184 -us 182 -_re 182 -g_ 179 -ng_ 178 -op 178 -con 177 -tha 175 -_l 174 -_tha 174 -ver 173 -ma 173 -ion_ 171 -_con 171 -ci 170 -ons 170 -_it 170 -po 169 -ere 168 -is_ 167 -ta 167 -la 166 -_pr 165 -fo 164 -ho 164 -ir 162 -ss 161 -men 160 -be_ 160 -un 159 -ty 159 -_be_ 158 -ing_ 157 -om 156 -ot 156 -hat 155 -ly 155 -_g 155 -em 153 -_T 151 -rs 150 -mo 148 -ch_ 148 -wi 147 -we 147 -ad 147 -ts_ 145 -res 143 -_wi 143 -I 143 -hat_ 142 -ei 141 -ly_ 141 -ni 140 -os 140 -ca 139 -ur 139 -A 138 -ut 138 -that 138 -_that 137 -ati 137 -_fo 137 -st_ 137 -il 136 -or_ 136 -for 136 -pa 136 -ul 135 -ate 135 -ter 134 -it_ 134 -nt_ 133 -that_ 132 -_ha 129 -al_ 128 -el 128 -as_ 127 -ll_ 127 -_ma 125 -no 124 -ment 124 -an_ 124 -tion_ 122 -su 122 -bl 122 -_de 122 -nce 120 -pl 120 -fe 119 -tr 118 -so 118 -int 115 -ov 114 -e, 114 -e,_ 114 -_u 113 -ent_ 113 -Th 113 -her 113 -j 112 -atio 112 -ation 112 -_Th 111 -le_ 110 -ai 110 -_it_ 110 -_on 110 -_for 109 -ect 109 -k 109 -hic 108 -est 108 -der 107 -tu 107 -na 106 -_by_ 106 -by_ 106 -E 106 -by 106 -_by 106 -ve_ 106 -_di 106 -en_ 104 -vi 104 -m_ 103 -_whi 102 -iv 102 -whi 102 -ns_ 102 -_A 101 -ich 100 -ge 100 -pro 99 -ess 99 -_whic 99 -ers 99 -hich 99 -ce_ 99 -which 99 -whic 99 -all 98 -ove 98 -_is 98 -ich_ 97 -ee 97 -hich_ 97 -n,_ 96 -n, 96 -im 95 -ir_ 94 -hei 94 -ions 94 -sti 94 -se_ 94 -per 93 -The 93 -_pa 93 -heir 93 -id 93 -eir 93 -eir_ 93 -ig 93 -heir_ 93 -_no 93 -ev 93 -era 92 -_int 92 -ted 91 -_The 91 -ies 91 -art 91 -thei 90 -_ar 90 -_thei 90 -their 90 -_pro 90 -et 89 -_pe 88 -_mo 88 -ther 88 -x 87 -gh 87 -S 87 -_is_ 87 -ol 87 -ty_ 87 -_I 86 -nde 86 -am 86 -rn 86 -nte 86 -mp 85 -_su 84 -_we 84 -par 84 -_v 84 -pu 82 -his 82 -ow 82 -mi 82 -go 81 -N 81 -ue 81 -ple 81 -ep 80 -ab 80 -;_ 80 -; 80 -ex 80 -ain 80 -over 80 -_un 79 -q 79 -qu 79 -pp 79 -ith 79 -ry 79 -_as 79 -ber 79 -ub 78 -av 78 -uc 78 -s._ 77 -s. 77 -enc 77 -are 77 -iti 77 -gr 76 -his_ 76 -ua 76 -part 76 -ff 75 -eve 75 -O 75 -rea 74 -ous 74 -ia 74 -The_ 73 -ag 73 -mb 73 -_go 73 -fa 72 -on,_ 72 -ern 72 -t,_ 72 -on, 72 -t, 72 -_me 71 diff -Nru spamassassin-3.4.6/trunk-only/lm/eo.lm spamassassin-4.0.0~rc3/trunk-only/lm/eo.lm --- spamassassin-3.4.6/trunk-only/lm/eo.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/eo.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 57050 -a 16035 -i 12706 -e 12227 -o 12102 -n 10393 -s 8344 -l 7707 -r 7492 -t 7134 -k 5376 -u 4558 -j 3946 -a_ 3875 -m 3783 -d 3710 -p 3693 -la 2840 -s_ 2769 -e_ 2751 -. 2706 -_l 2635 -_k 2619 -v 2531 -n_ 2504 -o_ 2444 -i_ 2333 -._ 2278 -on 2238 -, 2193 -,_ 2182 -_la 2100 -en 2080 -j_ 2050 -as 2028 -la_ 2012 -ta 1956 -_la_ 1907 -an 1882 -_p 1850 -g 1831 -_e 1791 -_d 1778 -is 1737 -aj 1658 -st 1635 -_s 1575 -c 1526 -de 1517 -oj 1498 -er 1476 -ti 1456 -f 1443 -_a 1442 -b 1427 -ro 1379 -_m 1351 -ra 1341 -nt 1293 -ka 1270 -ri 1258 -al 1249 -as_ 1248 -aj_ 1213 -to 1209 -_de 1203 -_t 1200 -te 1179 -_n 1176 -is_ 1171 -in 1151 -ko 1145 -or 1114 -es 1083 -re 1034 -ia 1029 -li 1022 -de_ 1016 -_de_ 979 -ar 974 -_v 966 -vi 942 -lo 932 -x 928 -io 917 -ne 855 -no 848 -ni 843 -mi 835 -ma 819 -_ka 816 -el 815 -pr 771 -z 744 -un 734 -l_ 732 -po 730 -_f 725 - 724 -est 691 -na 687 -ki 679 -kaj 676 -si 665 -u_ 663 -kaj_ 660 -" 654 -tas 651 -le 650 -oj_ 648 -_i 643 -tr 642 -_pr 630 -_es 628 -jn 626 -pe 618 -_kaj 616 -ig 616 -_kaj_ 611 -do 608 -sta 606 -on_ 602 -ek 602 -ci 597 -r_ 595 - 594 -_r 593 -il 592 -_est 587 -di 586 -am 586 -_mi 582 -a 578 -_vi 577 -mo 575 -ant 565 -_ne 562 -en_ 561 -o. 559 - 543 -iu 538 -o, 529 -ur 527 -o._ 527 -om 525 -o,_ 524 -at 521 -va 521 -- 519 -_en 518 -: 513 -:_ 512 -_ti 500 -M 496 -h 488 -nd 484 -me 484 -_al 481 -_ko 479 -ve 478 -ie 478 -_ki 473 -it 473 -L 466 -_b 465 -se 462 -em 452 -ol 450 -nta 449 -tu 448 -ik 444 -ov 443 -da 443 -_M 440 -_po 439 -tas_ 438 -ne_ 437 -et 437 -_ma 436 -_en_ 435 -su 429 -pl 426 -_L 425 -pa 420 -_o 417 -vo 408 -an_ 407 -ro_ 406 -sti 406 -nu 399 -kon 396 -stas 391 -m_ 391 -ir 388 -n. 386 -fa 386 -jn_ 382 -ku 382 -os 376 -ke 375 -n, 375 -esta 374 -n,_ 372 -_su 362 -ta_ 362 -stas_ 359 -xi 359 -Mi 358 -_ne_ 356 -al_ 355 -nk 353 -so 353 -n._ 352 -id 349 -_g 348 -estas 347 -ga 346 -_h 345 -per 345 -_Mi 340 -ok 339 -K 339 -mp 337 -_esta 337 -s,_ 335 -s, 335 -_se 333 -anta 332 -ul 326 -ran 325 -_" 323 -_ 322 -te_ 320 -ak 320 -a_ 320 -ed 320 -rt 319 -ojn 318 -gi 318 -_ 317 -tis 316 -gx 316 -mal 316 -ia_ 315 -ks 310 -_al_ 310 -mi_ 309 -S 309 -lu 309 -ns 308 -kt 305 -io_ 302 -ent 300 -? 300 -_K 300 -ec 300 -el_ 299 -_- 299 -li_ 299 -E 298 - 298 -_li 297 -fo 296 -ter 296 -_re 296 -A 295 -nto 294 -vi_ 292 -La 292 -_mal 290 -nte 288 -sp 287 -sa 287 -_mi_ 279 -ut 278 -op 278 -_ke 277 -bo 277 -ajn 276 -un_ 276 -T 274 -to_ 272 --_ 272 -bl 272 -_an 271 -_La 271 -i 269 -_S 268 -_pl 267 -_fa 266 -ni_ 266 -La_ 265 -_E 264 -N 263 -tis_ 263 -_tr 263 -' 262 -! 262 -_-_ 262 -pro 261 -iu_ 261 -i 261 -nc 260 -_si 259 -du 257 -_kon 256 -ru 255 -_vi_ 254 -_j 253 -ce 251 -ke_ 249 -ap 248 -us 247 -be 247 -im 247 -B 246 -_ku 246 -_La_ 246 -tra 245 -ad 245 -uj 245 -ac 245 -ita 243 -pre 242 -_pro 242 -co 241 -rm 241 -_ni 238 -_pe 236 -?_ 234 -on. 234 -toj 234 -"_ 234 -j. 234 -_ke_ 233 -s. 232 -_A 231 -av 230 -ri_ 230 -_el 229 -por 229 -` 224 -ev 224 -las 223 -P 223 -j._ 221 -eni 220 -_T 220 -_B 219 -j,_ 218 -j, 218 -era 217 -_in 216 -on._ 216 -cx 216 -_N 215 -ion 215 -ab 215 -.. 214 -) 213 -fi 213 -or_ 212 -pri 212 -s._ 212 -_por 210 -ez 210 -in_ 210 -am_ 209 -on,_ 209 -ll 209 -i 209 -on, 209 -_ve 208 -ris 208 -esti 208 -!_ 207 -men 206 -vas 205 -iel 204 -taj 203 -_c 201 -aro 201 -ank 200 -_pri 200 -jo 200 -ja 200 -ont 200 -lt 199 -_P 199 -igi 199 -_pa 197 -oj. 197 -( 196 -au 195 -oro 195 -ng 195 -_( 194 -sto 194 -ast 194 -ag 193 diff -Nru spamassassin-3.4.6/trunk-only/lm/es.lm spamassassin-4.0.0~rc3/trunk-only/lm/es.lm --- spamassassin-3.4.6/trunk-only/lm/es.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/es.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 25044 -e 7830 -a 7437 -o 5102 -s 4394 -n 4358 -i 4065 -r 3998 -l 3634 -d 3118 -c 2931 -t 2834 -u 2316 -a_ 2269 -e_ 2211 -s_ 1862 -de 1679 -p 1673 -_d 1644 -m 1447 -_de 1443 -n_ 1332 -o_ 1301 -en 1295 -_e 1216 -es 1177 -_l 1132 -de_ 1080 -la 1060 -os 1028 -_de_ 1027 -_p 963 -l_ 910 -ci 890 -_c 866 -_a 866 -os_ 801 -ar 777 -er 775 -as 768 -ra 746 -nt 736 -_la 727 -re 726 -,_ 724 -, 724 -el 722 -ta 708 -ue 701 -g 678 -on 674 -al 670 -_s 666 -co 653 -b 637 -an 622 -v 616 -la_ 616 -or 612 -te 599 -st 596 -el_ 580 -_la_ 573 -y 545 -to 543 -r_ 517 -ad 512 - 511 -do 504 -ro 504 -se 488 -as_ 488 -q 487 -qu 487 -. 479 -._ 478 -en_ 475 -ca 460 -in 459 -un 456 -_co 450 -es_ 449 -ic 449 -_en 440 -ac 440 -que 439 -na 439 -lo 430 -_m 430 -f 429 -ent 428 -da 412 -ue_ 411 -po 405 -le 399 -_q 399 -_qu 399 -que_ 393 -_que 388 -ie 386 -h 385 -pa 382 -y_ 371 -ti 367 -_que_ 365 -_en_ 365 -_y 361 -tr 358 -_el 353 -ri 349 -ia 342 -_el_ 333 -_se 330 -i 330 -_y_ 330 -io 329 -pr 320 -n 317 -ec 317 -no 314 -id 301 - 300 -mi 299 -_t 299 -in 292 -nte 292 -me 286 -aci 283 -do_ 279 -li 276 -con 276 -nd 273 -est 272 -ni 272 - 271 -di 270 -_es 268 -_lo 267 -ci 265 -ma 265 -n_ 264 -_pr 263 -_r 261 -cin 255 -z 254 -ra_ 251 -si 247 -in_ 246 -oc 245 -nc 244 -_u 244 -_po 243 -los 243 -or_ 242 -_con 241 -is 239 -del 238 -_del 237 -ado 236 -se_ 233 -_i 233 -los_ 231 -_re 231 -por 229 -_del_ 228 -sta 228 -del_ 228 -al_ 228 -ne 226 -_h 226 -cu 225 -_n 225 -_a_ 224 -_v 224 -_un 223 -ce 222 -so 220 -cin_ 218 -res 218 -vi 217 -om 216 -te_ 212 -_pa 211 -ien 210 -j 209 -E 208 -_los 207 -_los_ 207 -to_ 206 -ol 204 -it 203 -am 202 -aci 201 -rt 201 -acin 201 -pe 197 -ha 190 -_se_ 189 -nto 188 -_o 184 -_E 184 -on_ 184 -sa 183 -na_ 182 -ta_ 181 -su 180 -cia 180 -mo 180 -ct 178 -par 178 -_f 177 -_por 176 -eg 172 -_in 172 -ur 170 -L 168 -ve 166 -im 164 -ga 163 -_est 161 -ar_ 161 -ab 160 -_L 159 -tu 158 -at 158 -no_ 157 -s, 157 -s,_ 157 -_por_ 156 -por_ 156 -las 156 -ba 154 -o,_ 154 -o, 154 -ento 151 -et 150 -C 150 -_ha 149 -A 149 -tra 148 -ient 148 -_al 147 -a,_ 146 -ica 146 -a, 146 -pro 146 -ado_ 145 -ici 144 -_ca 144 -an_ 144 -las_ 143 -ara 143 -nci 143 -ente 142 - 142 -rr 142 -ir 142 -da_ 141 -em 141 -ll 140 -il 139 -a 138 -iv 138 -_su 138 -_par 136 -ul 136 -ant 136 -_A 135 -mp 135 -_las_ 134 -_las 134 -_C 134 -_pro 133 -men 132 -P 132 -des 131 -com 130 -ion 130 -era 130 -ed 129 -ida 129 -sp 128 -gu 127 -nte_ 127 -ns 127 -za 126 -dos 125 -M 125 -cio 125 -les 125 -_P 124 -bl 124 -_com 122 -s._ 122 -s. 122 -_M 121 -ua 120 -nta 120 -mu 119 -_no 118 -dad 118 - 117 - 116 -un_ 116 -va 116 -ist 116 -nes 116 -iento 115 -one 114 -ara_ 113 -S 113 -ada 113 -_un_ 113 -fi 111 -pre 110 -tos 110 -ter 109 -ot 109 -esta 108 -_me 107 -ido 107 -ob 107 -_g 105 -br 105 -go 105 -ea 104 -nto_ 104 -ona 103 -pu 103 -dos_ 103 -tro 103 -ier 103 -para 102 -ment 101 -ag 101 -ero 101 -gr 101 -rec 101 -bi 101 -ia_ 100 -una 100 -nic 99 -ncia 99 -a_ 98 -a._ 98 -tos_ 98 -a. 98 -ran 98 -lo_ 97 -ones 97 -rm 96 -lu 96 -ron 95 -con_ 95 -_ 95 -nes_ 95 -_ci 95 -ante 94 -ch 94 -_con_ 94 -_para 94 -ntr 93 -una_ 93 -para_ 93 -mie 92 -ico 92 -fe 92 -les_ 92 -uc 92 -ip 91 -sto 91 -_ma 91 -ui 91 -sta_ 91 -_ve 90 -cion 90 -" 90 -op 90 -cal 89 -_mu 89 -_S 89 -ro_ 89 -_pe 88 -ste 88 -ras 88 -pl 88 -_una 88 -_di 87 -ento_ 86 -ita 86 -ione 85 -ect 85 -_una_ 85 -mien 85 -tan 85 -du 84 -den 84 -ndo 84 -per 84 -eri 84 diff -Nru spamassassin-3.4.6/trunk-only/lm/et.lm spamassassin-4.0.0~rc3/trunk-only/lm/et.lm --- spamassassin-3.4.6/trunk-only/lm/et.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/et.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 20738 -a 7004 -e 5699 -i 5321 -s 4731 -t 3769 -l 3448 -u 3446 -n 2902 -k 2584 -d 2202 -m 2043 -a_ 1758 -o 1684 -r 1429 -g 1174 -v 1151 -e_ 1139 -i_ 1136 -_k 1136 -s_ 1077 -h 1009 -, 995 -,_ 995 -_t 953 -p 953 -j 940 - 900 -is 896 -st 851 -se 841 -_s 822 -. 821 -as 801 -d_ 801 -le 800 -ta 794 -in 793 -_m 790 - 754 -._ 753 -t_ 746 -ma 710 -_p 680 -si 677 -_v 660 -es 636 -al 626 -us 619 -el 602 -_o 596 -_e 586 -ja 580 -_j 563 -te 562 - 549 -li 532 -va 515 -id 501 -ol 498 -tu 497 -da 490 -_n 480 -ku 478 -ud 459 -nu 455 -na 438 -ei 432 -ks 418 -mi 411 -ee 411 -u_ 407 -ka 400 -n_ 394 -b 394 -ga 386 -_l 384 -_a 380 -an 366 -ja_ 365 -et 358 -me 358 -l_ 350 -at 348 -la 341 -ad 340 -st_ 339 -ne 336 -ll 333 -_ta 332 -ra 330 -_ja 328 -ik 323 -en 318 -ni 308 -ul 305 -sa 302 -_ol 302 -nd 299 -_ja_ 299 -nud 296 -ii 291 -ko 286 -_se 285 -le_ 283 -aa 281 -is_ 281 -gi 270 -_te 269 -ag 269 -_va 268 -_ku 267 -ed 262 -em 255 -_mi 255 -ma_ 247 -ti 246 -ri 245 -_h 242 -gu 239 -id_ 238 -ast 237 -it 236 -ga_ 236 -un 232 -de 230 -ud_ 230 -ha 230 -ak 228 -ah 228 -uu 228 -il 227 -i 226 -as_ 223 -ke 222 -ar 220 -a, 220 -am 220 -_ko 220 -a,_ 220 -_ka 220 -ai 220 -eg 216 -sin 214 -est 214 -ui 214 -he 214 -ks_ 213 - 213 -oo 213 -ju 207 -r 205 -ut 203 -in_ 203 -oli 201 -ki 199 -su 199 -es_ 199 -lt 198 -ist 188 -li_ 186 -ea 186 -vi 184 -im 181 -mu 181 -se_ 180 -ts 180 -on 178 -ise 178 -ta_ 177 -ek 176 -_oli 176 -sel 173 -nud_ 173 -_ 172 -a. 171 -nn 170 -ema 169 -ng 168 -lu 168 -ge 167 -_si 166 -_ei 165 -_i 165 -_ei_ 164 -ei_ 164 -_r 163 -ole 161 -pa 160 -lle 160 -a._ 160 -ust 159 -du 156 -er 156 -v 153 -da_ 153 -min 152 -et_ 151 -d,_ 149 -_M 149 -ht 149 -d, 149 -M 149 -kui 148 -_et 147 -K 147 -_K 146 -pe 145 -gi_ 145 -_v 145 -or 144 -_tu 142 -lt_ 141 -_ma 141 -asi 140 -ve 139 -us_ 138 -ig 136 -sin_ 136 -ur 135 -_ta_ 134 -di 134 -_et_ 134 -s,_ 132 -tas 132 -s, 132 -_kui 131 -sk 131 -re 130 -po 129 -oli_ 129 -om 129 -i 128 -inu 128 -_na 128 -_oli_ 128 -_sa 128 -aj 128 -mis 127 -ui_ 127 -_me 127 -_pa 126 -tus 125 -pi 125 -te_ 124 -l 123 -- 123 -est_ 122 -_on 121 -kk 121 -tt 120 -aga 119 -na_ 119 -_T 119 -T 119 -b_ 118 -al_ 118 -sta 118 -_mu 116 -_ju 116 -ida 116 -aks 116 -gu_ 116 -_ni 116 -s. 116 -ad_ 116 -_pe 114 -eks 114 -ev 114 -end 113 -s._ 113 -use 111 -ra 111 -_po 111 -_min 110 -S 110 -aja 110 -_la 110 -ele 109 -el_ 108 -on_ 108 -ab 108 -_S 108 -av 107 -ing 107 -kui_ 106 -_on_ 106 -au 104 -ne_ 104 -ti_ 104 -ell 103 -ae 101 -k 101 -ed_ 100 -_ke 99 -ata 99 -iis 99 -! 98 -!_ 98 -sid 98 -nda 98 -eh 98 -lle_ 97 -pu 97 - 97 -vi 97 -ine 96 -t, 96 -e,_ 96 -ale 96 -_vi 96 -t,_ 96 -e, 96 -eda 96 -uk 95 -ast_ 95 -ld 95 -? 94 -_kui_ 94 -_sel 93 -_k 93 -tul 93 -ega 93 -lg 92 -sii 92 -val 92 -e. 92 -_su 92 -ug 92 -oh 92 -k 92 -d. 91 -ee_ 91 -see 91 -e._ 91 - 91 -oma 91 -_ole 90 -ses 90 -stu 90 -t 90 - 90 -_om 89 -me_ 89 -ot 89 -d._ 89 -_sii 88 -to 88 -_en 87 -atu 87 -?_ 87 -A 86 -J 86 -pea 86 -j 85 -_A 85 -_see 85 -ime 84 -_pi 84 -_ha 84 -m 84 -n 84 -_J 84 -les 84 -ste 84 -kas 84 -_ 84 -v 83 -E 83 -p 83 -_ve 83 -_E 83 -eis 82 -_j 81 -_pea 81 -_m 80 -um 80 -_k 80 -iku 80 -d 80 -all 79 -eid 79 -ba 79 -_v 79 -ina 78 -lj 78 -sid_ 78 -hu 78 -tun 78 -l 78 -_oma 77 -i,_ 77 -i, 77 -agu 77 -uh 77 -lm 76 -ras 76 -ss 76 -k 76 -ees 76 diff -Nru spamassassin-3.4.6/trunk-only/lm/eu.lm spamassassin-4.0.0~rc3/trunk-only/lm/eu.lm --- spamassassin-3.4.6/trunk-only/lm/eu.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/eu.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 12114 -a 5537 -e 4040 -i 3103 -t 2567 -n 2474 -r 2406 -o 1937 -k 1761 -z 1627 -u 1561 -d 1367 -l 1075 -s 1048 -b 995 -n_ 958 -a_ 957 -en 802 -g 772 -_e 736 -er 680 -ra 669 -. 625 -at 610 -_b 594 -ar 589 -an 585 -_d 580 -, 569 -,_ 569 -h 563 -ta 563 -te 555 -._ 520 -ko 513 -m 503 -o_ 486 -al 481 -en_ 471 -tz 458 -re 435 -_a 423 -ik 416 -in 409 -it 392 -za 391 -ak 388 -ba 358 -et 357 -da 352 -di 351 -ka 350 -ze 349 -ai 347 -p 340 -ri 335 -la 329 -an_ 327 -de 322 -ez 318 -na 314 -ti 307 -be 305 -i_ 302 -iz 294 -k_ 293 -tu 289 -eta 287 -( 280 -) 280 -_i 279 -or 276 -_( 270 -ko_ 269 -ek 265 -rr 264 -_h 263 -e_ 260 -es 260 -_ba 258 -nt 258 -ha 255 -_g 247 -era 246 -ia 240 -_be 234 -oa 229 -un 229 -ta_ 218 -ma 212 -on 211 -z_ 209 -du 207 -(_ 205 -_(_ 205 -: 204 -tze 204 -:_ 204 -us 191 -u_ 191 -_da 188 -ren 183 -az 183 -_) 183 -ur 182 -st 182 -ea 181 -_et 181 -eta_ 179 -zi 178 -si 177 -zen 177 -as 176 -_n 175 -go 175 -_eta 172 -il 169 -tik 169 -_z 167 -_eta_ 167 -ne 167 -bi 166 -zk 166 -sk 165 -ag 163 -t_ 162 -le 160 -rt 160 -ke 158 -- 150 -gu 148 -au 148 -tza 147 -_de 147 -ati 146 -ut 146 -A 145 -li 145 -hi 145 -E 144 -bat 144 -_o 143 -a, 142 -a,_ 142 -_m 141 -ntz 141 -ad 140 -ren_ 139 -_er 138 -io 138 -)_ 138 -_ez 138 -ir 137 -eh 137 -ab 135 -ate 135 -ak_ 134 -sa 134 -ra_ 134 -_bat 133 -nd 133 -_l 133 -ki 132 -ere 131 -ika 125 -ku 125 -f 124 -ga 123 -ld 122 -_di 121 -arr 120 -el 120 -eg 119 -uz 119 -are 116 -ng 116 -os 116 -_E 115 -gi 113 -_p 113 -_du 113 -mo 113 -zen_ 112 -ib 111 -_k 110 -ber 109 -ako 108 -_iz 107 -iza 107 -ala 107 -itz 107 -har 106 -eko 106 -adi 105 -l_ 105 -ie 105 -ste 105 -atu 104 -am 104 -ska 104 -ah 104 -_. 104 -r_ 104 -zt 103 -rri 103 -ait 103 -ua 103 -tzen 103 -ald 103 -usk 102 -aren 102 -_._ 102 -ro 102 -id 100 -la_ 99 -_s 98 -ue 98 -tek 97 -uska 97 -atz 96 -aren_ 96 -_ha 95 -rre 95 -" 94 -atik 94 -tzen_ 94 -ara 94 -in_ 93 -ni 93 -j 92 -ge 91 -ez_ 91 -ain 91 -od 91 -no 91 -na_ 91 -ri_ 90 -tan 90 -mat 90 -do 89 -_mo 88 -ho 88 -iko 88 -beh 88 -_ad 88 -al_ 87 -_iza 87 -I 87 -zan 87 -_ze 87 -_adi 87 -_A 86 -uk 86 -eha 85 -dit 85 -ru 85 -pe 85 -eko_ 84 -ela 84 -ed 84 -kar 84 -n,_ 83 -ari 83 -bil 83 -_beh 83 -bai 83 -tu_ 83 -n, 83 -ehar 83 -_izan 82 -itu 82 -_ho 82 -is 82 -ean 82 -ama 82 -izan 82 -_)_ 81 -ik_ 81 -B 80 -koa 80 -ot 80 -_na 79 -zu 79 -beha 78 -behar 78 -_t 78 -H 78 -_ko 78 -dir 77 -mati 76 -_j 75 -at_ 75 -em 74 -tika 74 -K 74 -_B 74 -zte 74 -ten 74 -_beha 74 -ter 74 -matik 73 -egi 73 -_dir 73 -a. 72 -ago 72 -kal 72 -ram 72 -ena 72 -unt 71 -lt 71 -_H 71 -su 71 -mod 71 -bo 71 -G 70 -_ber 70 -lde 70 -c 69 -te_ 69 -ar_ 69 -me 69 -ina 69 -dal 69 -ako_ 68 -L 68 -rik 68 -a._ 68 -ori 68 -ite 68 -raz 67 -alde 67 -)._ 67 -). 67 -zio 66 -_ez_ 66 -tan_ 66 -amat 66 -atika 66 -est 66 -ntza 65 -dut 65 -izk 65 -_ga 65 -ia_ 65 -s_ 65 -ita 65 -tea 64 -ei 64 -hal 64 -_mod 64 -pa 64 -bu 64 -re_ 63 -eu 63 -ert 63 -oa_ 63 -_era 63 -ten_ 63 -_G 63 -_eg 63 -rama 63 -odal 63 -ramat 63 -oda 63 -amati 62 -atze 62 -gr 62 -untz 62 -eza 62 -gra 62 -_ge 61 -gram 61 -kat 61 -abi 61 -_gr 60 -_gram 60 -_gra 60 -int 60 -rd 60 -_in 60 -k, 59 -_hi 59 -zko 59 -k,_ 59 -pr 59 -rab 59 -da_ 59 -ide 58 -_)._ 57 -tat 57 -ing 57 -ira 57 -tak 57 -x 57 -_). 57 -_ed 57 -_es 57 -_bi 57 -rak 56 -_- 56 diff -Nru spamassassin-3.4.6/trunk-only/lm/fa.lm spamassassin-4.0.0~rc3/trunk-only/lm/fa.lm --- spamassassin-3.4.6/trunk-only/lm/fa.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/fa.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 12318 -? 5938 - 2613 -?_ 1815 - 1745 - 1569 - 1546 - 1422 -- 1333 - 1155 - 991 - 841 -_ 778 - 761 - 693 - 664 -_ 663 - 660 -? 631 -_ 624 -_? 601 -? 598 - 589 -_ 565 -?? 564 - 513 -_ 486 -_ 473 -_ 469 -? 459 - 428 -_ 427 -_ 398 -_ 392 - 390 - 384 -? 379 -? 361 -_ 337 -_- 334 -> 327 - 324 -_? 319 -? 313 -__ 308 - 305 - 303 -_ 297 -? 290 -? 285 - 272 --_ 271 -S 266 -_? 265 - 259 -- 255 - 255 -??_ 255 -? 254 -? 250 -Y 246 -_ 245 - 243 -_? 238 -? 234 -_ 229 - 229 -_S 228 - 216 - 215 -? 215 -? 214 -_ 214 - 208 -?_ 207 - 203 -?- 202 -_ 199 -?_ 199 - 195 -_ 190 -?_ 190 -_?? 189 -? 188 -. 188 -__ 185 -_ 183 -? 181 -_ 180 -? 177 -* 176 -_ 176 -_?_ 174 -? 173 - 172 -_ 170 - 164 - 161 - 158 --? 156 -_ 155 -?_ 155 -_? 152 - 151 - 150 -_? 146 -?_ 144 - 143 - 141 -?_ 140 -*_ 138 - 137 -? 136 - 133 - 132 -_ 131 -- 131 -? 130 -? 129 -_. 129 - 129 -_ 128 - 124 - 121 -- 120 -_ 120 -_ 120 -_??_ 119 -? 119 --?_ 119 - 118 --? 118 ->_ 116 -? 114 -_ 111 - 109 -_?_ 109 -_ 109 -__ 108 -_? 107 -? 107 - 106 -_ 106 -. 104 -? 103 -_? 103 - 103 -? 103 - 103 -? 102 - 100 -? 100 -?? 98 -_ 98 -? 96 - 95 -?_ 95 -_ 94 - 94 -Y_ 94 -_? 93 -_? 93 - 92 - 91 -_? 91 -_?_ 91 -?_ 90 -?_ 90 - 90 -?_ 90 -- 90 - 89 -: 89 -_ 88 -? 88 - 88 -_ 87 -- 86 - 85 -_ 83 -, 82 -_ 82 - 82 -?_ 80 - 80 -? 79 -_? 79 - 77 -??? 77 - 76 -_-? 75 - 75 -? 75 -? 75 - 74 -_ 73 -_ 73 - 73 -? 73 - 72 - 71 - 71 -?> 71 -? 70 -_?_ 70 -_. 70 - 69 - 69 -_ 68 - 68 -_ 67 -_- 67 - 67 -_ 67 - 67 -_ 67 - 67 -_ 66 -?-_ 65 - 65 -? 65 - 64 -? 64 -_ 64 -? 63 -?- 63 -- 63 -_? 62 -?_ 62 -_ 62 -_- 61 - 61 - 60 - 60 - 60 -? 60 - 60 -_ 60 - 60 -_ 60 --? 60 -_ 60 - 60 -? 60 - 59 - 59 -? 59 -_? 59 - 59 -_ 59 -?? 58 -? 58 -_ 58 -.- 58 -? 58 - 57 - 57 - 57 -??_ 57 -? 57 -- 57 -_ 56 -? 56 -_ 56 -?? 56 -? 56 - 56 -? 56 -_ 55 -? 55 -? 55 -_ 55 --? 55 -_ 55 -? 55 -_ 55 -S 55 - 54 -_S 53 -_ 53 -_ 53 - 53 - 53 -_ 53 -_ 52 -? 52 - 52 -? 52 -> 52 -- 52 -? 52 - 52 -? 52 -_ 52 -? 52 - 52 -?? 52 - 51 - 51 -- 51 -_? 51 -? 50 -_ 50 -_ 50 -.- 50 -? 50 - 50 -_? 50 - 50 -_? 49 -. 49 - 49 -?? 49 -- 48 -_ 48 -_? 48 -?_ 48 -_ 48 - 48 -?_ 48 -_ 47 - 47 - 47 -.-? 47 -_ 47 -> 47 - 47 -? 47 - 47 -??_ 47 -? 47 - 46 -_.- 46 -_?? 46 - 46 - 46 -- 46 -_ 46 - 46 - 45 - 45 -_ 45 -?- 45 - 45 -_ 45 -f 45 -- 44 -_- 44 - 44 -_? 44 -- 44 -- 44 - 44 -?? 44 - 44 -.-?_ 44 -_ 44 - 44 -_-? 44 -? 43 -? 43 - 43 -?_ 43 -_ 43 - 43 -? 43 -?_ 43 -_ 43 -_ 43 - 43 -?? 42 -Y? 42 -_ 42 - 42 - 42 -_ 42 -? 42 - 42 -/ 42 -_ 42 -???_ 42 -_ 42 -_ 42 -s 42 - 42 -?- 41 - 41 -? 41 -?* 41 -S 41 -_? 41 - 41 -_.- 41 - 41 - 41 - 41 -S 41 - 41 -??_ 40 - 40 diff -Nru spamassassin-3.4.6/trunk-only/lm/fi.lm spamassassin-4.0.0~rc3/trunk-only/lm/fi.lm --- spamassassin-3.4.6/trunk-only/lm/fi.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/fi.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 19984 -a 9133 -i 8384 -t 7797 -e 6481 -n 6431 -s 5897 -l 4504 -o 4163 -u 4106 -k 4013 - 3354 -n_ 2868 -m 2569 -a_ 1987 -v 1905 -r 1827 -ta 1580 -en 1553 -is 1515 -h 1508 -y 1462 -st 1390 -in 1375 -p 1342 -j 1333 -an 1139 -si 1073 -tt 1030 -te 1008 -en_ 982 -_k 980 -it 974 -ll 947 -aa 942 -_ 902 -va 878 -el 855 -_t 851 -ka 846 -i_ 835 -. 832 -se 818 -li 806 -t 804 -oi 767 -ai 744 -._ 739 -tu 734 -_o 719 -mi 715 -al 703 -on 684 -d 681 -_v 662 -et 654 -_j 641 -t_ 635 -ti 632 -_m 628 -_s 620 -ja 616 -ma 596 -sa 595 -la 582 -ist 575 -_e 565 -to 565 -ks 557 -in_ 554 -es 551 -il 538 -an_ 536 -ki 527 -, 525 -ku 525 -,_ 524 -us 520 -as 514 -nt 512 -ri 495 -ke 494 -at 491 -_p 485 -le 484 -ik 483 -ss 477 -ut 469 - 469 -sta 460 -ee 459 -uu 458 -ol 457 -ta_ 451 -ne 445 - 445 -ei 443 -uo 436 -ko 433 -un 430 -lu 421 -ii 420 -e_ 418 -nn 413 -_h 412 -ar 408 -er 402 -n 396 -ja_ 386 -im 381 -on_ 365 -_va 363 -aan 354 -_a 352 -me 350 -ak 345 -ssa 331 -na 330 -ie 329 -pa 327 -_ja 326 -ia 325 -t_ 322 -_l 319 -vi 317 -ise 316 -tta 315 -de 314 -os 312 -lli 309 -_ja_ 304 -jo 295 -v 290 -su 289 -au 287 -lis 286 -_on 285 -s 284 -uk 280 -am 280 -ot 280 -ty 275 -ett 271 -tt 270 -ni 269 -l 267 -ksi 264 -nk 264 -ht 263 -ul 261 -ell 261 -sa_ 259 -ha 257 -sen 257 -a. 254 -isi 253 -ste 253 -aan_ 252 -_on_ 252 -_ka 252 -sk 251 -kk 246 -itt 245 -ok 242 -a._ 239 -all 239 -yt 239 -m 237 -mu 237 -av 237 -_y 236 -lla 233 -taa 231 -ais 231 -een 230 -K 230 -lt 228 -s_ 227 -ast 227 -iv 226 -ssa_ 225 -ra 225 -- 223 -kse 223 -oit 220 -om 220 -T 219 -_ku 218 -n_ 216 -aa_ 214 -at_ 214 -tel 211 -ui 210 -si_ 208 -rk 207 -sta_ 207 -_jo 203 -k 202 -_K 201 -est 200 -em 200 -he 199 -_n 199 -vo 198 -_ta 196 -eh 196 -_ol 196 -S 196 -nta 196 -_ko 194 -je 194 -st 194 -r 193 -ust 191 -mis 191 -ns 190 -pu 189 -nen 188 -t 188 -toi 188 -iin 187 -ten 187 -min 186 -ista 185 -hd 184 -a, 184 -a,_ 184 -sen_ 183 -E 182 -lle 181 -vat 179 -ill 177 -no 176 -p 176 -lm 176 -llis 175 -n. 175 -io 172 -ine 171 -n._ 170 -pi 169 -uks 168 -ava 168 -n 166 -nen_ 165 -ah 165 -_mu 164 -tus 163 -mm 162 -_to 162 -ek 160 -int 159 -_r 159 -lin 158 -oim 158 -_T 158 -A 158 -imi 157 -t 157 -la_ 157 -j 157 -aj 156 -yh 155 -o_ 154 -lo 154 -oli 153 -een_ 153 -le_ 153 -_si 153 -g 152 -aik 151 -vat_ 150 -L 149 -ur 149 -ti_ 149 -sia 148 -ite 147 -inen 147 -ain 146 -sti 146 -lla_ 146 -ys 145 -_mi 145 -val 144 -stu 144 -m 144 -alli 143 -pe 143 -utt 142 -et_ 141 -_tu 141 -eri 140 -_E 140 -: 140 -nki 139 -ir 139 -ll 138 -up 138 -i 137 -ama 137 -_ha 135 -id 135 -_se 135 -po 134 -inen_ 134 -tte 133 -nna 133 -ten_ 132 -or 132 -ts 131 -n 131 -yk 131 -s 131 -_S 130 -ses 130 -ve 130 -ess 129 -l 129 -ita 129 -lai 129 -H 129 -van 127 -k 127 -kin 127 -N 127 -_te 126 -den 126 -tee 126 -P 126 -kaa 126 -iin_ 125 -kun 125 -ois 125 -sit 125 -oh 124 -V 124 -y 124 -v 124 -tav 124 -voi 124 -ia_ 123 -I 123 -oll 123 -maa 122 -ih 122 -oj 122 -rj 121 -ro 121 -ikk 120 -so 120 -oo 120 -oimi 120 -do 120 -pp 119 -M 119 -_ei 118 -toim 118 -op 118 -uut 118 -tet 118 -_i 118 -_ma 117 -vai 117 -l_ 116 -u_ 116 -sy 116 -kau 116 -utta 116 -un_ 115 -eu 115 -ss 115 -tti 115 -_sa 115 -mp 114 -eis 114 -ka_ 112 -ett 112 -taa_ 111 -_et 111 -hu 111 -itu 111 -suu 111 -den_ 111 -ksen 110 -ap 110 -_ke 110 -uv 110 -tam 110 -yv 109 -aup 109 -st_ 109 -asta 109 -y 109 -kan 108 -nu 108 -ukse 108 -_toi 107 -ien 107 -hi 107 -iss 107 diff -Nru spamassassin-3.4.6/trunk-only/lm/fr.lm spamassassin-4.0.0~rc3/trunk-only/lm/fr.lm --- spamassassin-3.4.6/trunk-only/lm/fr.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/fr.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 20800 -e 7258 -i 4051 -s 4003 -a 3972 -n 3903 -r 3650 -t 3590 -u 2968 -o 2823 -l 2723 -e_ 2632 -d 2241 -s_ 1721 -_d 1693 -c 1663 -p 1528 - 1320 -m 1297 -es 1164 -t_ 1106 -_l 1079 -de 1048 -on 959 -_de 940 -en 939 -_p 852 -nt 825 -le 808 -es_ 791 -re 777 -, 721 -,_ 720 -n_ 703 -de_ 685 -' 670 -an 667 -_de_ 645 -v 641 -_s 610 -r_ 596 -_c 594 -er 585 -ai 575 -_a 558 -_e 554 -ou 554 -q 549 -qu 538 -is 530 -te 528 -ti 525 -ur 519 -it 514 -g 498 -a_ 490 -f 480 -la 476 -in 475 -_le 441 -me 436 -nt_ 432 -. 427 -b 427 -ra 423 -io 416 -ent 415 -._ 404 -ne 395 -ns 392 -ion 383 -h 381 -ue 376 -se 371 -le_ 370 -ar 370 -ie 362 -co 361 -at 359 -tr 359 -et 349 -pr 342 -ce 336 -au 328 -u_ 321 -il 314 -_r 313 -_la 304 -un 303 -eu 303 -st 300 -re_ 296 -ro 290 -la_ 288 -on_ 287 -_m 286 -_la_ 283 -que 281 -_qu 280 -_q 280 -po 275 -tio 273 -tion 273 -pa 273 -li 271 -_t 269 -nc 268 -si 266 -_pr 265 -ri 264 -al 263 -ui 262 -_co 259 -i_ 255 -ta 255 -_ 251 -x 247 -em 244 -l_ 243 -et_ 238 -_l' 236 -l' 236 -les 233 -ns_ 233 -ir 232 -_le_ 228 -ent_ 227 -or 226 -r 224 -_f 224 -ne_ 222 - 221 -ve 220 -ch 220 -it_ 219 -di 219 -oi 217 -- 216 -ni 215 -_ 215 -les_ 215 -d' 214 -el 212 -ss 212 -_n 212 -ut 211 -our 210 -des 210 -" 208 -ur_ 207 -nd 207 -er_ 206 -ait 206 -ion_ 204 -rs 202 -_en 201 -_et 200 -j 200 -_d' 200 -ll 199 -_des 198 -des_ 197 -_pa 197 -t 196 -_et_ 195 -_ 195 -__ 195 -om 193 -ma 192 -ati 190 -_des_ 189 -L 188 -so 187 -_u 185 - 184 -_" 183 -sa 182 -_po 181 -tre 181 -d 181 -ue_ 180 -pe 179 -en_ 179 -ont 178 -_un 178 -_L 178 -us 176 -_les 176 -_les_ 176 -rt 176 -is_ 173 -_i 173 -du 172 -e,_ 171 -e, 171 -na 171 -s, 170 -s,_ 170 -as 169 -men 169 -M 167 -ait_ 167 -'a 166 -vi 162 -ci 159 -ant 158 -_au 158 -da 157 -_M 157 -ation 155 -atio 155 -con 154 -que_ 153 -ons 153 -eur 151 -est 149 -me_ 149 -mi 149 -par 148 -tion_ 148 -_so 147 -te_ 147 -res 144 -lo 144 -ment 144 -s 144 -ans 143 -_du 142 -du_ 141 -ux 141 -un_ 140 -y 138 -pro 138 -_du_ 136 -_d 136 -ce_ 135 -_se 134 -_re 134 -pl 133 -A 132 -ge 131 -ic 131 -su 130 -x_ 129 -ien 129 -nce 129 -"_ 129 -ac 128 -il_ 128 -qui 128 -_pro 127 -no 127 -av 126 -_v 125 -_o 125 -rs_ 125 -ans_ 124 -eme 124 -bl 123 -emen 122 -_en_ 122 -iqu 122 -ct 122 -iq 122 -lle 122 -nn 121 -ts 121 -ement 121 -t 120 -_"_ 120 -r 119 -t_ 119 -_ce 119 -mp 119 -ire 119 -ui_ 119 -to 118 -he 117 -_ 117 -ca 117 -_j 116 -ec 116 -va 116 -_par 116 -e 115 -_con 115 -se_ 114 -tre_ 113 -ique 112 -dan 111 -c 111 -ha 110 -une 110 -P 110 -lu 110 -ux_ 109 -_b 108 -s. 108 -pou 108 -_pou 108 -ier 107 -C 107 -ais 106 -s._ 105 -ain 104 -_un_ 104 -nte 103 -'e 103 -mo 103 -mm 103 -ment_ 102 -une_ 102 -com 101 -_P 101 -'i 101 -_ma 100 -do 99 -ant_ 98 -anc 98 -che 97 -ap 97 -ont_ 97 -_que 97 -os 97 -urs 96 -_di 96 -fi 96 -im 96 -pour 96 -_pour 96 - 95 -ts_ 95 -_g 95 -our_ 94 -_sa 94 -ntr 94 -_da 94 -_r 93 -rai 93 -rm 93 -_qui 93 -e. 92 -am 92 -_com 91 -uv 91 -_C 91 -D 91 -qui_ 90 -e._ 90 -pu 89 -_qui_ 88 -ia 87 -_dan 87 -_dans 87 -dans 87 -ter 87 -fo 87 -son 87 -dans_ 87 -id 86 -ag 86 -ine 86 -tu 85 -ran 85 -au_ 85 -ol 85 -oc 84 -est_ 84 -st_ 84 -enc 84 -F 82 -_tr 81 -'u 81 -tai 81 -ell 80 -R 79 -_su 79 -S 79 -ions 79 -pr 79 -s 78 -ab 78 -n 77 -_que_ 77 -_in 77 -_av 76 -pour_ 76 -fa 76 -rr 76 -air 75 -_ch 75 -_a_ 75 -ba 74 -_pl 74 -gr 74 -tt 74 -ssi 74 -rd 73 -pas 73 -bi 73 diff -Nru spamassassin-3.4.6/trunk-only/lm/fy.lm spamassassin-4.0.0~rc3/trunk-only/lm/fy.lm --- spamassassin-3.4.6/trunk-only/lm/fy.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/fy.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 46446 -e 15767 -n 9616 -i 7837 -a 7830 -t 7562 -r 7297 -s 6307 -o 4784 -n_ 4595 -d 4564 -e_ 4213 -l 4032 -k 3951 -t_ 3079 -en 2863 -m 2605 -er 2492 -y 2462 -f 2371 -_d 2253 -de 2124 -h 1943 -in 1899 -w 1898 -en_ 1857 -_i 1815 -u 1769 -g 1738 -an 1690 -j 1678 -p 1651 -r_ 1619 -_f 1602 -. 1601 -ar 1561 -te 1545 -b 1488 -s_ 1476 -._ 1435 -_s 1370 -de_ 1235 -_de 1224 -_w 1181 -it 1172 -ie 1140 -, 1078 -_o 1056 -,_ 1056 -oa 1045 -_e 1040 -st 1038 -an_ 1010 -_b 972 -_de_ 965 -ke 949 -_m 947 -_t 933 -ne 920 -er_ 895 -at 863 -sk 856 -c 850 -it_ 848 -_h 838 -ei 832 -k_ 817 -yn 790 -ch 784 -le 772 -is 769 -je 765 -el 761 -me 758 -ea 754 -_k 740 -fa 736 -in_ 735 -' 733 -_it 733 -_it_ 727 -ge 727 -re 725 -al 724 -_fa 684 -yn_ 640 -aa 628 -fan 626 -_y 618 -ar_ 617 -et 616 -ri 615 -_fan 613 -_n 612 -li 611 -_yn 610 -_en 598 -fan_ 594 -oe 589 -_fan_ 584 -_en_ 583 -at_ 581 -_in 570 -oar 565 -_in_ 560 -y_ 555 -F 549 -es 540 -_a 536 -ng 523 -be 514 -sj 512 -nt 510 -l_ 510 -_F 506 -ns 506 -D 499 -te_ 499 -der 497 -_yn_ 497 -ti 493 -ek 490 -ro 476 -rs 474 -rd 473 -se 470 -fo 470 -ys 462 -op 461 - 461 -we 456 -ry 451 -da 445 -d_ 443 -is_ 442 -_D 440 -ur 433 -i_ 432 -ha 426 -_me 425 -ear 422 -_l 417 -ed 410 -as 409 -om 407 -ei_ 406 -Fr 405 -nd 404 -_fo 394 -_p 393 -oc 390 -rys 389 -ol 386 -_Fr 386 -och 383 -fe 381 -ik 379 -ma 379 -ra 377 -nn 374 -_g 368 -_da 367 -di 363 -ts 362 -ta 361 -a_ 360 -ko 359 -et_ 358 -ysk 356 -Fry 354 -Frys 354 -z 354 -ll 350 -_be 349 -ke_ 348 -I 347 -ing 346 -_' 345 -m_ 343 -h_ 340 -ske 339 -_ha 338 -sje 336 -_Fry 336 -_Frys 336 -wi 335 -_op 334 -p_ 334 -_is 333 -ch_ 333 -tr 330 -ten 328 -ers 327 -wa 325 -ter 322 -ji 322 -rysk 319 -_ne 319 -je_ 312 -foa 311 - 309 -jo 307 -_is_ 307 -ste 307 -_te 306 - 301 -n. 301 -nne 300 -rt 300 -foar 299 -S 299 -mei 299 -_r 298 -_oa 297 -wu 293 -ak 291 -si 290 -wur 290 -ni 290 -pe 288 -Frysk 287 -oan 286 -n._ 285 -_mei 284 -der_ 281 -_foar 281 -_foa 281 -ht 278 -cht 277 -- 275 - 275 -_j 274 -ne_ 273 -ken 273 -fer 271 -n 270 -am 270 -on 268 -nde 264 -_S 264 -B 262 -ki 261 -id 261 -le_ 261 -dat 260 -v 259 -_I 256 -oar_ 255 -op_ 254 -lle 252 -la 244 -tt 243 -dat_ 242 -_fe 242 -mm 240 -inn 239 -_wi 239 -_dat 237 -g_ 236 -mei_ 236 -al_ 235 -_B 234 -e. 234 -ld 231 -_al 230 -_wur 230 -urd 230 -_wu 230 -_op_ 230 -De 229 -inne 228 -ng_ 227 -_mei_ 227 -'t 226 -ks 226 -'t_ 224 -_dat_ 224 -_ko 223 -_st 220 -n 219 -rk 219 -sa 219 -e._ 219 -tte 218 -en. 218 -n, 217 -ier 216 -ten_ 216 -_fer 215 -mi 215 -hi 215 -ien 214 -_wa 213 -n,_ 213 -no 213 -_te_ 212 -ig 212 -_De 212 -ske_ 212 -_der 212 -W 211 -H 211 -_oan 210 -ee 209 -dy 208 -ek_ 207 -en._ 207 -ic 207 -mme 206 -yk 204 -pr 204 -net 203 -foar_ 203 -he 203 -wurd 201 -_der_ 199 -jen 199 -_dy 199 -kr 198 -ka 197 -im 196 -_H 196 -il 196 -ze 196 -_ma 195 -by 194 -oer 194 -kt 193 -us 193 -M 193 -sk_ 192 -wo 192 -_hi 191 -or 190 -ing_ 190 -_W 190 -ich 189 -De_ 187 -rr 186 -int 185 -_ 184 -: 184 -ij 184 -_ek 183 -eg 182 -:_ 180 -gen 180 -as_ 180 -_se 179 -e, 178 -_net 177 -e,_ 177 -ins 177 -N 177 -ls 176 -st_ 176 -_wurd 176 -ie_ 175 -E 175 -nne_ 175 -_De_ 175 -sy 175 -wer 174 -gr 174 -f_ 173 -nk 172 -och_ 172 -net_ 169 -ad 169 -_we 169 -rde 168 -sl 168 -bi 168 -of 168 -so 168 -_no 167 -_ta 167 -re_ 167 -to 167 -den 167 -J 167 -t. 166 -It 165 -t 165 -inne_ 165 -ysk_ 165 -lik 164 -sp 163 -_ek_ 162 -ou 162 -tsj 162 -It_ 161 -_sa 160 -A 160 -wol 160 -l 159 -_wo 159 -ge_ 159 -ln 159 -ige 158 diff -Nru spamassassin-3.4.6/trunk-only/lm/ga.lm spamassassin-4.0.0~rc3/trunk-only/lm/ga.lm --- spamassassin-3.4.6/trunk-only/lm/ga.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ga.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 8010 -a 2622 -i 1573 -h 1334 -n 1247 -r 968 -_a 847 -e 830 -s 817 -t 747 -l 639 -c 636 -g 598 -o 590 -d 554 -n_ 501 -a_ 487 -m 432 -an 415 -u 413 -b 379 -h_ 352 -ai 350 -ch 350 -ea 346 -r_ 346 - 334 - 321 -_s 309 - 306 -in 281 -ar 277 -. 269 -_d 266 -s_ 254 -ir 253 -_b 250 -f 250 -an_ 246 -, 241 -,_ 226 -ag 225 -_an 221 -bh 218 -_c 216 -._ 212 -ac 210 -ha 208 -_a_ 201 -" 199 -_m 199 -th 198 -_t 190 -ach 182 -_ag 180 -_an_ 179 -_ 176 -_l 168 -na 168 -nn 160 -e_ 159 -ar_ 158 -_g 157 - 156 -_i 152 -il 150 -le 150 -is 143 - 142 -_bh 138 -ei 138 -g_ 135 -_f 135 -dh 135 -l_ 126 -t_ 125 -ig 123 -_ 122 -_n 120 -gu 120 -_ 120 -mh 118 -id 117 -ch_ 117 -ad 116 -he 114 -ir_ 114 -ra 109 -o_ 109 -ach_ 107 -ia 105 -_ar 105 -us 104 -ui 104 -_" 101 -us_ 100 -T 99 -am 99 -ta 98 -gus 98 -gus_ 98 -_le 97 -gh 97 -_ch 97 -agus 94 -agus_ 94 -agu 94 -a 93 -_agus 93 -_agu 93 -ean 93 -na_ 92 -d_ 92 -i 91 -p 89 -it 89 -A 89 -_ar_ 88 -rt 86 -al 85 -oi 84 -sa 84 -"_ 82 -hai 81 -_r 79 -nn_ 79 -hu 79 -as 79 -i 78 -_T 78 -ma 77 -air 77 -at 77 -ann 76 -B 76 -s 76 -h 75 -igh 74 -st 74 -ga 73 -go 71 -ua 71 -ne 71 -la 71 -- 71 -de 71 -te 71 -re 70 -inn 70 -ith 69 -eac 69 -_s 69 -in_ 68 -_go 68 -hi 68 -each 68 -dh_ 68 -si 67 -ag_ 67 -_go_ 66 -hea 66 -go_ 66 -tha 64 -om 64 -_s_ 63 -s_ 63 -h_ 63 -on 62 -se 61 -i 60 -nt 60 -C 60 -D 59 -i_ 58 -_ag_ 58 -is_ 58 -o 58 -_de 57 -_B 56 -il_ 56 -or 56 -_th 54 -ca 53 -fa 53 -amh 53 -_A 53 -le_ 52 -? 52 -S 51 -io 51 -_in 51 -s 51 -li 51 -rai 50 -hf 50 -ht 50 -eo 50 -sc 50 -ri 49 -: 49 -igh_ 49 -gh_ 49 -_s 49 -:_ 49 -h 49 -_D 49 -be 49 -aig 49 -h 48 -oc 48 -idh 48 -rt_ 48 -ho 47 -os 47 -ann_ 47 -_C 46 -! 46 -Bh 46 -bhf 45 -_si 45 -lt 45 -_bhf 45 -irt 45 -ear 44 -_na 44 -ta_ 44 -air_ 44 -_p 44 -im 44 -aga 44 -_ma 44 -_S 44 -aigh 43 -n 43 -_dh 43 -uai 43 -ao 43 -cht 43 -ain 42 -bhe 42 -ait 42 -fh 42 -sa_ 41 -m_ 41 -adh 41 -ile 41 -_ 41 -ail 41 -eir 41 -i 41 -_Bh 40 -as_ 40 -cha 40 -idh_ 40 -hi 39 -_i_ 39 -bh_ 39 -th_ 39 -ad_ 39 -och 39 -mh_ 39 -tr 39 -rea 38 -_se 38 -ro 38 -r 38 -hair 38 -_is 38 -uil 37 -i 37 -in 37 -I 37 -ll 37 -m 37 -_be 36 -ba 36 -eann 36 -t 36 -_o 36 -M 36 -aid 36 -aith 36 -ib 36 -' 36 -tea 36 -_m 35 -chu 35 -ibh 35 -each_ 35 -ean_ 34 -irt_ 34 -_na_ 34 -N 34 -ist 34 -fu 34 -mha 34 -bea 34 -h. 34 -_bhe 34 -l 34 -ic 34 -_s_ 33 -eis 33 -bh 33 -ni 33 -ha 33 -_sa 33 -ith_ 33 -s_ 33 -har 33 -_bh 33 -ig_ 32 -ur 32 -a 32 -hr 32 -_am 32 -_bh_ 31 -da 31 -ir 31 -hfu 31 -_chu 31 -ol 31 -ne_ 31 -_fa 31 -An 31 -Bh_ 31 -Bh 31 -n, 31 -_ac 31 -bh_ 31 -_bhfu 30 -_ 30 -ana 30 -_M 30 -m_ 30 -_fh 30 -aigh_ 30 -bhfu 30 -_m_ 30 -t 29 -_le_ 29 -t_ 29 -hean 29 -hin 29 -sin 29 -eir_ 29 -nne 29 -c 29 -_aga 29 -h._ 29 -T 29 -ibh_ 29 -iste 28 -An_ 28 -do 28 -hui 28 -fui 28 -n 28 -ste 28 -acht 28 -n,_ 28 -co 28 -dea 28 -ng 28 -nach 28 -id_ 28 -hfui 28 -.. 28 -lei 28 -nac 28 -ce 27 -a. 27 -c_ 27 -lea 27 -hfuil 27 -_Bh_ 27 -_bea 27 -adh_ 27 -di 27 -fuil 27 -." 27 -T_ 27 -ha_ 27 -_ 27 -uil_ 27 -."_ 27 -bhfui 27 -_Bh 27 -an 27 -_do 27 -lta 27 -aoi 27 -_lei 27 -_mh 26 -d 26 -fuil_ 26 -eat 26 --_ 26 -teac 26 -ath 26 diff -Nru spamassassin-3.4.6/trunk-only/lm/gd.lm spamassassin-4.0.0~rc3/trunk-only/lm/gd.lm --- spamassassin-3.4.6/trunk-only/lm/gd.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/gd.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 12634 -a 5353 -h 3268 -i 2898 -n 2792 -e 1651 -r 1563 -d 1455 -_a 1425 -c 1245 -n_ 1236 -s 1165 -l 1152 -an 1121 -t 980 -ai 979 -g 962 -u 905 -ch 902 -ha 836 -h_ 833 -a_ 829 -ea 821 -o 794 -dh 726 -an_ 711 -b 639 -m 585 -na 514 -nn 506 -ac 498 -r_ 495 -s_ 482 -ir 480 -ach 466 -id 458 -_an 450 -_c 427 -th 403 - 388 -he 383 -in 379 -bh 367 -idh 358 -ad 342 -_n 341 -il 332 -nn_ 323 -_t 322 -_d 319 -ar 317 -e_ 311 -dh_ 307 -_an_ 303 -_b 302 -_na 294 -air 289 -ig 279 -. 275 -ir_ 272 -ag 272 -_ai 272 -, 270 -gu 269 -,_ 269 -._ 265 -ean 264 -ch_ 261 -f 259 -? 258 -_s 255 -ann 250 -ra 241 -ei 241 -_a_ 241 -ha_ 241 -d_ 238 -- 235 -_m 231 -gh 230 -hea 228 -le 226 -_f 224 -ui 223 -is 223 -as 218 -adh 218 -l_ 216 -g_ 208 -i 207 - 207 -hai 205 -cha 205 -air_ 204 -na_ 201 -inn 198 -tha 190 -C 189 -G 188 -ann_ 187 -_ag 186 -_air 186 -eac 185 -_g 185 -_na_ 184 -ach_ 184 -_C 183 -us 183 -_ch 183 -la 182 -_G 182 -each 181 -us_ 178 -al 178 -gus 176 -gus_ 176 -_th 169 -_air_ 168 -_agus 167 -agus_ 167 -_agu 167 -agus 167 -agu 167 -ta 164 -aid 163 -hi 163 -hd 163 -chd 160 -T 157 -A 156 -ic 152 -_T 152 -adh_ 150 -idh_ 148 -mh 147 -?_ 146 -ar_ 145 -oi 144 -da 143 -aidh 143 -_bh 139 -ean_ 138 -sa 138 -ig_ 138 -_r 136 -_A 134 - 134 -te 134 -achd 131 -hu 131 -_e 130 -aig 130 -_l 130 -_ann 129 -ain 127 -ne 127 -dhe 125 -_dh 125 -id 123 -o_ 121 -hl 119 -acha 119 -ga 118 -idh 118 -on 118 -it 117 -aidh_ 116 -de 115 -nan 115 -ua 115 -_ann_ 115 -ich 115 -il_ 114 -m_ 114 -eil 114 -ri 112 -at 112 -ma 111 -li 109 -ao 109 -re 109 -inn_ 108 -_tha 107 -fh 106 -as_ 106 -bh_ 106 -nan_ 103 -lea 103 -lt 103 -S 103 -a? 103 -a?_ 102 -io 102 -E 101 -am 101 -' 100 -_a? 100 -igh 100 -_a?_ 99 -_gu 99 -idhe 99 -t_ 99 -se 99 -si 98 -ba 97 - 97 -tha_ 96 -bha 95 -B 94 -is_ 94 -u_ 94 -_B 94 -_i 93 -ile 92 -aic 91 -hei 91 -ia 90 -ho 89 -Th 88 -ath 88 -_Th 88 -rt 87 -ib 87 -Gid 86 -_Gi 86 -_G 86 -Gi 86 -r 86 -G 86 -Gidh 86 -_Gid 86 -had 85 -ibh 85 -_fh 85 -p 84 -ad_ 83 -_? 83 -_E 83 -hd_ 82 -dhea 82 -chd_ 82 -ear 81 -ith 81 -_tha_ 80 -h- 79 -eal 78 -hean 78 -sg 77 -rea 77 -_S 76 -ais 75 -ll 75 -han 74 -h 74 -achd_ 74 -ead 74 -idhea 73 -am_ 72 -dha 72 -_nan 71 -_nan_ 71 -hadh 71 -gh_ 71 -ail 70 -hui 70 -Ch 69 -eachd 69 -h. 69 -aich 69 -hli 69 -chai 69 -om 68 -fa 68 -chad 68 -I 67 -h._ 67 -_Ch 67 -tea 67 -nea 66 -chadh 66 -achad 66 -rai 66 -lig 66 -haid 66 -dea 66 -rt_ 65 -r 65 -dhl 65 -ana 64 -eann 64 -Ei 64 -le_ 64 -hn 64 -ilt 64 -uid 64 -_fa 63 -_Tha 63 -Tha 63 -ob 63 -_si 62 -ro 62 -cu 62 -ainn 62 -un 62 -dhli 61 -idhli 61 -lean 61 -idhl 61 -idhl 61 -hlig 61 -dhlig 61 -in_ 60 -_ 60 -st 60 -rr 60 -_cu 60 -hr 60 -_aig 60 -bhe 59 -i_ 59 -aigh 59 -Tha_ 59 - 59 -_ri 59 -_Tha_ 59 -lb 58 -che 58 -ran 58 -nac 58 -haidh 58 -hadh_ 58 -aig_ 58 -Gh 58 -ilea 58 -_Gh 58 -lte 58 -_le 58 -ru 58 -idhe 57 -_I 57 -ilte 57 -eadh 57 -M 56 -hlig_ 56 -L 56 -chu 56 -nach 56 -_ma 56 -lig_ 56 -h,_ 55 -th_ 55 -ibh_ 55 -_aig_ 55 -D 55 -atha 55 -_Ei 55 -h, 55 -gu_ 54 -_gu_ 54 -im 54 -eil_ 54 -eu 53 -_M 53 -Al 53 -irt 53 -_L 53 -iad 53 -sea 52 -lba 52 -Alba 52 -F 52 -Alb 52 -uai 52 -ich_ 52 -_F 51 -ilean 51 -has 51 -tai 51 -each_ 50 -eacha 50 -har 50 -ni 50 -_de 50 -irt_ 50 -n,_ 50 -mha 50 -n, 50 -_e_ 50 -ide 49 -neach 49 -neac 49 -ur 49 -rd 49 -_h 49 -hean_ 49 -oc 49 -e 49 -te_ 49 -han_ 49 -on_ 49 diff -Nru spamassassin-3.4.6/trunk-only/lm/he.iso-8859-8.lm spamassassin-4.0.0~rc3/trunk-only/lm/he.iso-8859-8.lm --- spamassassin-3.4.6/trunk-only/lm/he.iso-8859-8.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/he.iso-8859-8.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 81560 - 23072 - 19215 - 15606 - 12612 - 11293 - 11070 - 10090 - 9648 - 9601 - 9081 -_ 7811 - 6685 - 6326 -_ 5878 - 5542 - 5019 - 4669 -_ 4570 -_ 4267 - 3984 -_ 3812 - 3769 - 3699 -_ 3693 - 3535 -_ 3489 - 3374 -_ 3362 - 3130 -, 3067 -_ 3037 -_, 3035 -_ 2936 -_ 2886 -_ 2840 - 2768 - 2626 - 2424 -_ 2395 -_ 2291 -. 2256 - 2215 -_. 2205 - 2144 -_ 2003 -_ 1959 -_ 1913 -" 1815 - 1797 - 1742 - 1687 - 1665 -_ 1647 - 1620 -_ 1578 - 1525 - 1475 -_ 1469 - 1411 - 1383 - 1353 - 1351 - 1343 - 1343 - 1315 - 1285 - 1236 -_ 1211 - 1206 - 1192 - 1163 - 1155 - 1146 - 1138 -_ 1137 - 1134 - 1087 -_ 1080 - 1074 - 1067 -_ 1062 - 1059 - 1052 - 1047 -- 1024 -_ 1008 - 973 - 967 - 954 -_ 951 - 948 -_ 941 - 896 - 888 - 883 - 873 - 871 - 867 - 850 - 843 -_- 830 -_ 830 - 824 - 820 -_ 806 - 805 -_ 799 - 784 - 773 -__ 748 - 746 - 743 -_ 726 -__ 723 - 720 -_ 719 --_ 716 -_-_ 713 - 709 - 706 - 699 -_ 690 - 686 - 683 - 678 - 675 -_ 672 - 669 -_ 668 -_ 659 -_ 655 - 652 - 649 -_ 640 - 635 - 635 -_ 632 -_ 631 - 628 - 627 -_ 624 - 624 -_ 621 - 619 - 600 -_ 599 - 599 - 596 - 595 - 586 - 578 - 575 -_ 569 - 564 -__ 561 - 560 - 557 -_ 557 - 554 - 548 -_ 548 - 548 - 546 - 542 - 540 -"_ 540 - 539 -_ 538 - 538 - 535 - 534 - 533 - 532 - 530 - 530 - 530 - 527 - 525 -_ 518 - 518 -_ 511 -_ 510 -_ 509 - 506 - 502 -_ 500 - 498 - 497 - 497 - 494 -_ 485 -_ 481 - 477 -_ 477 - 472 - 470 -, 470 -_, 470 -_ 469 - 468 -_ 467 - 467 -_ 466 -__ 463 - 462 - 462 -_ 461 - 455 - 454 - 454 - 453 - 453 - 452 - 451 -_ 447 - 443 -_ 441 - 440 - 439 -_ 439 -' 435 -_ 430 -. 429 - 429 -_. 428 - 427 - 423 - 417 - 417 -_ 414 - 413 - 408 -_ 405 - 400 - 400 - 399 -, 399 -_, 399 - 397 -_ 396 - 396 - 394 -_ 393 - 393 - 389 -_ 385 - 384 -_ 384 - 384 - 381 - 378 -_ 377 - 374 -_ 374 - 374 - 373 - 373 - 371 - 370 - 370 -_ 370 - 367 -_ 366 -_ 364 - 363 -_ 362 -_ 360 - 360 -_ 360 - 359 -, 358 -_, 357 - 356 - 353 - 353 -_ 349 - 348 - 348 - 345 - 345 - 344 - 340 -_ 340 - 338 - 338 -_ 336 - 335 -_ 335 -_ 332 - 331 -_ 329 -_ 325 - 325 -_ 325 -: 324 - 324 -_ 324 - 322 - 321 - 320 -_ 320 -_ 319 -_ 319 -_: 319 - 316 - 315 -_ 315 - 315 - 315 - 313 -_ 312 - 312 -_ 310 - 309 -_ 305 -_ 305 -. 305 -_. 304 - 303 - 303 -_' 303 - 302 -_ 302 -_ 301 - 298 - 294 - 293 - 293 - 292 - 292 - 292 - 292 - 290 - 289 - 289 - 289 - 287 -_ 286 -, 285 -_, 285 - 284 - 282 - 282 -_ 281 - 281 -_ 281 - 280 - 278 -_ 276 -_ 276 -__ 275 - 274 -_ 274 - 274 -_ 271 -_ 271 - 270 -_ 269 - 268 - 267 - 267 -. 266 -_ 266 -_ 266 - 266 -_. 265 - 265 - 265 - 265 - 264 - 263 - 262 - 260 -_. 260 -. 260 -_ 260 -_ 259 - 258 - 258 - 258 - 257 - 257 -_ 256 -_ 256 - 255 - 255 -_ 254 - 254 - 252 - 251 -_ 251 -_ 251 - 251 -_ 249 -_ 249 -_ 249 - 248 - 247 -_ 247 diff -Nru spamassassin-3.4.6/trunk-only/lm/hi.lm spamassassin-4.0.0~rc3/trunk-only/lm/hi.lm --- spamassassin-3.4.6/trunk-only/lm/hi.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/hi.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 75620 - 19109 -U 16333 - 11131 - 11107 - 10241 - 7855 - 6993 -U 6598 - 6322 - 6151 - 5887 -_ 5800 - 5370 - 5168 -U_ 5118 -_ 4935 - 4508 - 4467 - 4292 -_ 3962 -_ 3937 -_ 3904 - 3718 -_ 3609 - 3563 -U 3514 -_ 3394 - 3363 - 2962 - 2907 -U_ 2851 -_ 2668 -_ 2632 -_ 2575 - 2527 - 2513 -_ 2512 - 2451 -U 2336 - 2314 -_ 2280 -_ 2260 - 2187 - 2082 - 2078 - 1988 - 1913 - 1886 - 1881 - 1877 - 1860 - 1842 -_ 1830 -_ 1746 - 1714 - 1703 -_ 1695 -_ 1694 - 1631 - 1610 -_ 1579 -_ 1567 -_ 1556 -U 1536 - 1528 - 1525 -U 1515 -__ 1488 -_ 1411 -_ 1407 - 1390 -_ 1357 - 1357 - 1337 -_ 1319 -_ 1315 - 1300 - 1279 - 1270 -_ 1258 -_ 1209 -緤 1203 - 1195 -_ 1187 - 1181 - 1166 - 1163 - 1162 - 1157 - 1155 -_ 1150 -_ 1140 - 1127 -_ 1092 -_ 1086 -__ 1077 -U 1075 -_U 1071 -_ 1065 -U 1062 -_U 1062 - 1053 - 1052 - 1038 - 1035 -_ 1009 -U 972 - 970 -_緤 967 -_ 959 -U 936 -U 930 -__ 929 - 928 - 926 -_ 904 -U 904 - 904 - 890 - 887 -U 885 -U 866 -_ 865 -_U 862 -_ 854 -_ 850 -_ 847 -_ 837 -S 834 -U 831 -_ 830 -U_ 823 -_ 798 - 788 -_ 783 -_U 773 -U_ 770 - 753 - 752 - 749 -_ 732 - 732 -_ 704 -_ 704 - 704 -_ 697 - 695 -U 693 -_ 690 -_ 688 -U_ 685 -, 684 -_ 682 -_ 679 -,_ 674 -_ 670 - 665 -U 664 - 648 -_ 647 -U 644 -_ 643 -_ 641 -緤_ 639 -_ 639 - 633 -__ 633 - 623 -U 621 -_ 615 -_U 611 -U_ 599 -U_ 595 - 594 -U 589 -U 580 -_U 580 -U 580 -_ 576 -_ 573 -U_ 572 -U_ 572 - 569 -_ 569 -_ 569 - 561 -_緤_ 557 - 556 - 552 - 550 -U 549 - 544 - 538 -__ 535 -_ 532 - 525 - 523 - 519 -_ 502 - 501 - 498 -__ 495 - 494 -_ 493 - 493 -_ 490 -_U 485 - 484 - 481 - 478 - 469 -. 459 -U_ 458 - 449 - 449 -_ 445 - 444 -U_ 443 - 442 -_ 440 -_U_ 439 - 437 -_ 435 - 434 -_ 433 -U 431 - 431 -_ 430 - 427 - 425 -_ 420 -_ 419 -U 415 - 412 - 412 - 410 -U 405 -U 399 - 399 -U_ 394 -U 394 -_ 393 - 393 -_ 392 -_ 392 - 389 -U 385 - 385 -Ǹ 383 -_ 382 - 381 - 379 - 375 -_ 374 -U 374 -U 374 - 373 -_ 372 -__ 371 -_ 369 - 364 -U 364 -U_ 362 - 358 -Ȥ 357 -U 354 - 353 - 352 -_ 350 -U 349 - 346 - 346 - 346 - 345 - 344 -U 342 - 342 -_ 341 -_ 341 -_ 340 -U_ 337 -_U_ 337 - 337 -U_ 337 - 336 -U_ 334 - 334 - 334 -__ 332 - 327 -U 327 - 326 -_ 325 -U 323 -U 323 -U 322 -U 321 -_ 320 -ǸU 319 -_ 319 - 319 -U_ 319 -_U 318 - 317 -_ 316 -_ 316 - 313 - 310 -_U 309 - 309 - 308 -U 308 -_ 308 -_U 307 -_ 304 -_ 304 - 304 -_U 304 -_ 304 -U 304 -U_ 303 -_ 303 -U_ 300 -U_ 300 -_S 300 - 300 -U 298 -U_ 296 - 296 - 294 -U_ 294 -_ 293 - 292 - 291 -_ 290 -_ 290 - 290 -_ 289 -UU 288 -U 288 -U 288 -_U 286 -_ 286 -_U 285 -_ 285 -U 285 -淤 284 -_ 284 -U 283 -U_ 282 - 280 -_ 280 -U 280 - 279 -_ 278 -_U 278 -U 278 -_ 277 -_ 275 - 274 -_ 273 - 272 - 272 - 272 -_ 272 -_U 272 -_ 272 -- 271 -U 271 -U 271 -_ 271 -_ 270 -U_ 270 -_U 269 -UU 268 - 267 - 265 - 263 - 263 -_ 262 -_ 262 - 262 -U 258 -_ 258 -_ 258 -_ 257 -U 256 -v 253 - 252 -_U 252 - 249 - 247 - 246 -_ 246 -U 246 - 245 -._ 245 -U 244 -U 243 diff -Nru spamassassin-3.4.6/trunk-only/lm/hr.us-ascii.lm spamassassin-4.0.0~rc3/trunk-only/lm/hr.us-ascii.lm --- spamassassin-3.4.6/trunk-only/lm/hr.us-ascii.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/hr.us-ascii.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 36598 -a 9456 -o 9050 -i 8526 -e 7955 -n 5513 -j 5379 -s 4971 -t 4125 -r 3889 -u 3423 -je 3281 -l 3231 -e_ 3177 -d 3128 -k 2992 -v 2891 -a_ 2835 -o_ 2679 -m 2645 -p 2316 -_s 2212 -i_ 2205 -y 2174 -c 1894 -z 1867 -je_ 1613 -_n 1593 -g 1581 -_p 1490 -b 1386 -u_ 1382 -, 1208 -,_ 1208 -st 1203 -_j 1202 -na 1159 -_je 1118 -_d 1105 -_i 1104 -. 1069 -._ 1058 -ra 1017 -ko 981 -ni 980 -_je_ 918 -ij 914 -ti 911 -no 891 -da 884 -to 879 -_k 863 -_o 856 -cy 839 -li 838 -ne 790 -sy 786 -- 785 -pr 760 -_u 748 -po 734 -ta 711 -_b 705 -_t 704 -la 699 -ja 699 -an 691 -m_ 680 -ov 674 -ije 673 -_z 669 -ka 662 -ri 652 -lo 651 -vo 643 -re 641 -is 626 -in 623 -se 623 -va 622 -_m 617 -oj 614 -_po 594 -_pr 592 -bi 588 -en 582 -il 578 -os 576 -vi 572 -nj 569 -ak 564 -_na 558 -im 558 -da_ 553 -od 550 -ao 550 -al 549 -om 545 -na_ 533 -_se 524 -_i_ 523 -h 517 -_g 511 -ma 508 -at 502 -cj 501 -og 497 --- 493 -ro 493 -on 485 -av 480 -_da 474 -_ne 474 -ed 472 -zy 471 -se_ 466 -_se_ 458 -_bi 457 -ao_ 452 -ad 452 -lj 445 -es 444 -ji 441 -_v 433 -_c 430 -za 421 -go 418 -_r 413 -_u_ 411 -yi 410 -ek 406 -di 403 -sa 396 -et 393 -ic 391 -io 390 -_da_ 389 -to_ 389 -as 386 -_ko 383 -ye 378 -ar 378 -mo 373 -le 367 -or 364 -ju 363 -el 354 -tr 354 -io_ 352 -ve 345 -lo_ 344 -su 344 -ol 344 -am 344 -iz 343 -li_ 338 -ti_ 336 -sto 323 -n_ 321 -it 319 -_za 319 -sta 317 -_ni 316 -te 312 -nu 312 -a, 309 -a,_ 309 -ya 309 -do 304 -om_ 303 -la_ 300 -no_ 299 -_na_ 299 -d_ 297 -ko_ 296 -aj 294 -ik 292 -ru 291 -ga 291 -em 288 -nje 283 -dj 281 -ne_ 281 -k_ 277 -_st 276 -koj 276 -ec 274 -_ka 272 -_su 270 -ob 265 --_ 263 -az 261 -sv 260 -_koj 260 -im_ 260 -ije_ 259 -pa 258 -ot 257 -yt 256 -ok 255 -su_ 255 -ih 254 -me 253 -dn 253 -_cy 253 -iv 251 -syt 248 -g_ 247 ---_ 246 -_- 246 -kr 246 ---- 246 -a. 245 -e,_ 245 ----_ 245 -e, 245 -er 245 -a._ 244 -_iz 244 -mi 243 -_---_ 242 -cyi 242 -_-- 242 -_--- 242 -jed 240 -h_ 239 -_a 239 -_sa 237 -j_ 236 -_l 231 -_sv 229 -_to 229 -sk 228 -ih_ 224 -ja_ 223 -pro 223 -yn 222 -t_ 222 -ost 221 -_do 221 -oc 219 -gl 218 -_su_ 216 -og_ 216 -uc 214 -s_ 214 -bil 213 -oz 213 -ki 212 -ni_ 212 -nij 209 -ako 208 -eg 208 -ut 205 -pre 205 -ci 204 -ji_ 203 -_od 203 -ilo 202 -ati 202 -ac 201 -ns 200 -_mo 197 -rij 196 -bo 195 -ovo 195 -ku 195 -dje 194 -ma_ 192 -_bil 191 -cje 186 -sti 186 -_go 186 -de 185 -sl 183 -_pro 182 -ju_ 182 -nije 181 -tv 180 -lje 179 -isy 179 -pri 178 -_pre 177 -dr 177 -e._ 177 -e. 177 -op 176 -ima 176 -anj 175 -jen 175 -us 172 -ilo_ 172 -_ra 170 -S 167 -ecj 166 -iti 166 -sp 163 -_S 161 -vr 161 -i. 161 -i._ 161 -zn 161 -ali 161 -i,_ 160 -i, 160 -ap 157 -nije_ 157 -nst 156 -pi 156 -ga_ 156 -_sy 155 -_nj 155 -jes 155 -ran 155 -vo_ 155 -yto 154 -ev 153 -_to_ 152 -_pri 151 -est 150 -N 150 -ins 150 -ist 149 -ir 149 -o, 148 -vj 148 -vje 148 -o,_ 148 -B 148 -zi 147 -jec 147 -gov 147 -yto_ 147 -syto 146 -ton 146 -od_ 145 -O 144 -rije 144 -lik 143 -on_ 142 -ocy 142 -W 142 -ba 142 -_W 141 -kao 141 -Wi 141 -_N 141 -inst 141 -_nij 141 -_nije 140 -_Wi 140 -syto_ 140 -lic 139 -P 139 -ovi 138 -_tr 138 -rs 137 -ez 137 -edn 136 -_P 136 -si 136 -ili 136 -du 136 -Winst 135 -cye 135 -nston 135 -ston 135 -ud 135 -kao_ 135 -Wins 135 -insto 135 -oji 135 -nsto 135 -Win 135 -raz 135 -zye 135 -_Win 134 -ova 134 -_Wins 134 -_on 133 -ako_ 133 -odi 133 -cya 133 -ila 133 -icy 133 -oj_ 133 -ke 133 -va_ 132 -ija 132 -_is 132 -jel 132 -oje 130 -pu 130 -cje_ 130 -bi_ 129 -rat 128 -ce 128 -tu 128 -mu 128 -ve_ 127 diff -Nru spamassassin-3.4.6/trunk-only/lm/hu.lm spamassassin-4.0.0~rc3/trunk-only/lm/hu.lm --- spamassassin-3.4.6/trunk-only/lm/hu.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/hu.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 19186 -e 5753 -a 4627 -t 4522 -s 3480 -l 3437 -n 3137 -k 3036 -i 2527 -r 2437 -z 2399 -o 2303 - 2039 - 1995 -g 1978 -m 1695 -y 1338 -_a 1256 -b 1186 -d 1148 -a_ 1108 -v 1057 -t_ 901 -sz 889 -el 832 -, 819 -,_ 818 -h 792 -k_ 769 -. 767 -et 743 -gy 711 -s_ 705 -_m 702 -_a_ 695 -en 671 - 662 -n_ 646 -_k 645 -j 623 -._ 613 -i_ 606 -eg 601 -p 586 -_e 580 -u 579 -le 576 - 542 -er 495 -f 485 -ek 477 -te 477 -s 473 -_s 471 -al 464 -ta 458 - 453 -_h 444 -_t 442 -an 426 -ze 425 -me 406 -at 405 -l_ 401 -es 395 - 387 -y_ 381 -z_ 375 -tt 374 -ke 372 -_v 369 -s 368 -ak 367 -_ 365 -ny 363 -t 359 -c 358 -re 350 -to 347 -A 343 -e_ 340 - 332 -ne 330 -os 326 -l 320 -_f 320 -az 317 -zt 317 -r 317 -_n 315 -ko 312 -_A 303 -_sz 302 -is 301 -ve 299 -gy_ 297 -t 293 -_b 293 -ra 291 -or 289 -ol 284 -_i 281 -em 279 -_l 274 -la 264 -ez 262 -be 260 -lt 260 -ok 260 -ye 256 -_me 252 -on 251 -en_ 247 -ar 245 -_az 245 -in 243 -n 242 -se 242 -g 238 -egy 237 -ha 237 -r_ 237 -t 237 -r 235 -sze 233 -n 226 -ly 224 -g_ 221 -" 221 -ll 219 -iz 214 -de 214 -ek_ 213 -mi 212 -rt 211 -ba 209 -ho 209 -A_ 209 -s_ 209 -az_ 205 -va 204 -ag 203 -ka 202 -na 202 -og 201 -ik 201 -nt 200 -_A_ 199 - 199 -- 198 -tt_ 198 -_az_ 197 -ni 195 -cs 194 -ki 190 -k 187 -t 187 -_eg 187 -nd 186 -fe 185 -_s 185 -l 182 -bi 181 -nk 180 -_le 179 -an_ 179 -_s_ 177 -ts 175 -k 174 -meg 173 -_egy 172 -ma 171 -as 170 -sa 170 -s 169 -ge 167 -ot 167 -za 167 -E 166 -m_ 165 -_meg 165 -_el 165 -bb 164 -ro 164 -z 163 -he 162 -m 161 -s 160 -_r 160 -st 160 -tos 159 -ti 159 -st 158 -_j 158 -l 157 -it 156 -_ho 156 -l 156 -_ha 155 -v 154 -am 152 -oz 152 -ele 151 -ya 151 -zto 150 - 149 -biz 147 -so 147 -et_ 145 -izto 144 -izt 144 -ap 141 -"_ 141 -ed 141 -ss 140 -bizt 140 -k 140 -bizto 140 -iztos 139 -t 139 -ztos 139 -ost 138 -zet 138 -os 138 -m 137 -_is 137 -t, 136 -tost 136 -tos 136 -t,_ 136 -_ 135 -agy 135 -ztos 135 -li 134 -om 134 -_fe 134 -ere 133 -g 133 -t. 132 -nek 131 -vi 129 -_d 129 -zo 128 -k,_ 128 -k, 128 -_k 127 -_p 127 -M 126 -let 126 -ak_ 125 -j 125 -ett 125 - 124 -si 124 -sz 123 -_E 123 -p 123 -v 123 -r 123 -t._ 123 -is_ 123 -S 123 -ts 122 -t 122 -kor 121 -ai 121 -fel 120 -da 120 -_mi 120 -pe 119 -ogy 118 -ban 118 -ad 117 -ga 116 -_va 116 -ott 114 -_ne 114 -_ki 113 -r 113 -z 112 -ben 112 -_te 111 -zi 111 -s 110 -sg 109 -do 109 -t 108 -em_ 108 -_" 108 -_ta 108 -_M 107 -ogy_ 107 -_ 107 -k. 106 -l 105 -_ke 105 -_g 104 -: 103 -gye 102 -k 102 -hog 102 -ri 102 -mo 101 -ok_ 101 -:_ 101 -hogy 101 -il 101 -el_ 100 -zer 100 -ete 99 -nn 99 -nak 98 -je 98 -st 98 -sz 98 -yo 98 -ost 98 -sts 98 -_k 98 -_hog 98 -l 97 -_S 97 -_hogy 97 -ig 97 -_- 96 -hogy_ 96 -ban_ 96 -ese 95 -_bi 94 -fo 94 -ja 94 -ul 94 -_ 94 -k._ 94 -_c 93 -k 91 -es_ 91 -n 91 -ny 91 -g 91 -s_ 91 -egy_ 90 -b 90 -rd 89 -I 89 -ny 89 -_biz 89 -_fel 88 -v 88 -ala 88 -szer 88 -po 88 -_ma 88 -leg 88 -t 88 -ket 87 -un 87 -di 87 -ai_ 87 -nek_ 87 -rm 86 -tal 86 -v 85 -_is_ 85 -nem 85 -ti_ 84 -z 84 -szt 84 -ut 83 -ter 83 -d 83 -kk 83 -or_ 83 -b_ 82 -n 82 -os_ 82 -re_ 82 -rs 82 -_bizt 82 -min 82 -ben_ 81 -ra_ 81 -ik_ 81 -go 80 -len 80 -lm 80 -t 80 -ely 80 -aj 80 -l 80 -_sze 80 -_be 79 -ev 79 -r 79 -ssz 79 -nt_ 79 -gya 79 -K 79 -si_ 79 -sza 78 diff -Nru spamassassin-3.4.6/trunk-only/lm/hy.lm spamassassin-4.0.0~rc3/trunk-only/lm/hy.lm --- spamassassin-3.4.6/trunk-only/lm/hy.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/hy.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 49002 - 12626 - 9480 - 8485 - 7623 - 7071 - 7010 - 6370 - 6320 - 5012 - 4656 - 4607 - 4506 - 4210 - 3775 - 3655 - 3369 - 3320 - 3208 - 3016 - 2832 - 2755 - 2552 - 2519 -, 2502 -,_ 2492 -_ 2177 - 2099 - 2034 - 2007 - 1918 - 1748 - 1703 - 1605 -_ 1587 - 1558 - 1528 -ϳ 1502 -: 1483 -:_ 1482 - 1420 -_ 1403 -_ 1382 -_ 1335 - 1307 - 1294 -ݻ 1281 - 1274 - 1264 - 1229 - 1218 - 1184 - 1170 - 1154 -_ 1139 - 1130 -_ 1121 - 1085 - 1065 -_ 1046 -_ 1036 - 1019 - 1017 - 1001 - 993 - 987 -_ 964 - 962 -_ 961 - 952 -ٳ 951 -_ 945 - 941 - 938 -ѳ 934 - 929 -ݻ 919 - 918 - 915 -_ 911 - 910 -ݳ 910 -_ 882 - 863 - 846 - 834 - 827 - 824 - 818 - 817 - 804 - 804 -_ 791 - 787 - 787 - 781 - 753 -_ 750 -_ 748 -_ 747 - 747 - 744 -_ 732 - 730 - 723 - 710 -_ 710 - 709 -_ѳ 708 -_ 705 - 703 - 702 - 697 - 695 -_ 684 -_ 683 - 682 - 672 -ϳ 671 - 669 - 666 - 659 - 659 - 658 - 658 - 653 - 649 - 641 - 641 - 640 - 636 - 635 - 631 -_ 626 - 623 -۳ 620 -_ 616 -_ 615 -_ 614 -_ 613 - 601 -ϳ 597 - 596 -_ 590 - 590 - 582 -_ 581 - 576 - 574 - 574 - 566 - 564 - 555 -_ 532 - 527 - 527 - 526 -_ 524 - 517 -_ 511 - 510 -_ 507 - 500 - 500 - 497 - 496 - 488 - 485 - 480 -_ 480 -_ 478 -_ 477 - 476 - 475 - 475 -ϳ 473 -_ 469 -_ 466 - 465 - 465 - 464 -_ 463 - 459 - 459 - 459 - 454 - 449 -_ 449 - 444 -_ 442 -_ 431 -ٻ 428 -_ 427 -_ϳ 422 - 422 - 421 -_ 416 - 416 -_ 415 - 414 -_ 413 - 408 - 405 - 405 -_ 404 - 400 -󑩯 399 -󑩯 399 -󑩯 399 -_ 398 -_ 395 -۳ 394 -_ 387 -- 385 - 383 - 382 - 380 -_ 379 - 377 - 377 -_ 377 - 376 -ݻ 374 - 371 - 371 -_ 371 -_ 371 - 370 - 368 - 367 -__ 366 - 363 - 361 - 358 -. 357 - 356 -_ 351 - 347 -_ 345 -۳ 342 - 341 -_ 341 -_ 340 -ϳ_ 339 - 338 -_ 337 -_ 331 -_ 330 -۳ 328 -۳ 328 - 328 - 327 -_ 324 -_ 324 - 324 -__ 322 - 321 -_ 321 -_ٻ 318 - 317 - 317 -ٳ 316 -_ 314 - 314 - 309 -_ 309 -ϳ_ 307 - 306 - 306 -_ 303 - 302 - 302 - 302 - 300 - 299 -۳ 299 - 299 -_ 299 -__ 299 - 298 - 298 - 297 -_ 294 -_ 293 -_ 292 - 291 - 291 -۳ 288 - 288 - 287 -_ 286 -_ 286 - 284 - 284 - 284 -˳ 283 - 283 -_ 281 -_ 281 -۳_ 281 -` 280 - 279 -`_ 279 - 279 -ٳ 278 -_ 274 - 271 - 268 -_ٳ 266 - 266 - 266 - 266 -ݻ_ 266 - 264 -, 263 - 263 -_ 262 - 262 -,_ 262 - 259 - 258 -_ 258 -ϻ 257 - 257 -_ 255 - 255 -_ 255 -__ 255 - 255 - 253 -ݻ 252 -_ 252 - 250 - 248 -ݻ 248 -__ 247 -ݹ 246 -_ 246 - 245 - 244 - 244 - 244 - 244 - 243 -۳_ 243 -󑩁 242 -󑩁 242 - 241 - 239 - 238 -_ 238 -ݳ 237 - 237 - 237 - 237 -_ 236 - 234 - 234 -_ 233 -_ 233 -ٳ 233 - 232 - 232 - 231 - 230 - 230 - 230 -_ 228 - 228 - 228 -û 227 - 227 -_ 226 -ݳ 223 -_ 223 -_- 222 - 222 -_ 222 - 220 -_ 220 -_ 218 -ϳ 217 - 216 -_ 216 - 216 - 215 - 215 -󑩁 214 - 214 -_ 213 - 213 - 213 - 212 -ѳ 211 - 210 - 210 -__ 210 -_ 209 - 209 -__ 208 diff -Nru spamassassin-3.4.6/trunk-only/lm/id.lm spamassassin-4.0.0~rc3/trunk-only/lm/id.lm --- spamassassin-3.4.6/trunk-only/lm/id.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/id.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 19406 -a 10666 -n 5455 -e 4535 -i 4387 -r 2936 -t 2902 -an 2853 -u 2841 -k 2761 -s 2311 -m 2178 -d 2134 -g 2105 -l 1780 -a_ 1506 -n_ 1476 -ng 1449 -p 1397 -b 1275 -an_ 1270 -o 1246 -h 1130 -i_ 1108 -er 1038 -ka 1032 -_d 1006 -y 997 -, 951 -en 941 -ar 914 -,_ 900 -_m 880 -ya 842 -ta 838 -ang 797 -di 787 -da 773 -. 754 -la 742 -._ 738 -me 732 -ak 728 -_s 718 -at 690 -ra 688 -ga 683 -_k 671 -_me 650 -in 628 -ah 601 -_t 583 -_p 570 -g_ 551 -_b 551 -_di 548 -ng_ 544 -ma 536 -se 526 -tu 511 -na 506 -al 500 -ri 490 -as 483 -k_ 482 -j 480 -si 470 -ny 467 -h_ 457 -sa 452 -ang_ 439 -it 424 -kan 423 -ti 418 -_se 417 -pe 412 -S 409 -ba 407 -ke 407 -em 405 -men 405 -be 403 -un 401 -te 401 -am 396 -pa 395 -nya 390 -_men 374 -el 374 -t_ 371 -_a 360 -_i 356 -u_ 355 -kan_ 345 -_ke 339 -is 335 -ah_ 324 -_S 324 -eng 321 -nga 320 -ia 318 -_pe 316 -ha 313 -ap 311 -r_ 308 -w 305 -li 301 -_da 300 -s_ 299 -P 296 -nd 290 -_be 287 -ik 283 -ja 281 -yan 281 -ad 275 -ek 273 -uk 272 -di_ 270 -bu 269 -ya_ 268 -yang 268 -ak_ 266 -ber 265 -_y 265 -_ya 264 -_P 263 -ru 260 -K 259 -yang_ 256 -_yang 256 -_yan 256 -nt 255 -de 253 -_te 250 -wa 249 -et 247 -at_ 246 -ara 245 -gan 243 -A 237 -ari 235 -ala 230 -itu 229 -c 225 -ol 225 -ni 225 -us 225 -dan 224 -_K 224 -M 224 -B 223 -ata 222 -ai 221 -ur 219 -nya_ 217 -ua 215 -_ka 214 -_ber 210 -eb 209 -ran 206 -D 206 -ela 206 -_di_ 205 -_l 204 -ngan 204 -ter 203 -re 201 -- 199 -aka 198 -l_ 194 -_A 191 -era 191 -a, 191 -e_ 190 -ir 187 -I 186 -tan 185 -_B 184 -ut 184 -ku 183 -a,_ 183 -il 182 -J 181 -um 180 -_it 180 -_itu 180 -_ta 179 -su 179 -dan_ 177 -es 177 -on 177 -or 177 -_dan 176 -lu 174 -_M 172 -tu_ 172 -_dan_ 172 -enga 171 -mb 169 -R 169 -si_ 168 -per 168 -gan_ 168 -ngan_ 165 -" 162 -_ter 162 -a. 161 -man 161 -gk 160 -a._ 160 -asi 160 -ngk 160 -ep 160 -ag 159 -ul 158 -da_ 157 -m_ 155 -du 155 -ada 153 -ki 153 -rt 150 -mp 150 -T 150 -ama 148 -ing 148 -na_ 147 -_J 147 -_D 145 -ung 145 -ana 145 -n, 144 -ju 144 -ud 144 -rin 143 -gi 143 -aw 141 -lah 138 -lan 138 -_sa 136 -ri_ 136 -meng 136 -_meng 135 -_ma 134 -n,_ 134 -awa 134 -st 134 -eka 133 -mi 133 -mu 132 -_T 132 -po 131 -ge 131 -ar_ 130 -id 129 -ko 129 -le 128 -_h 128 -ena 127 -_j 126 -emb 126 -ina 125 -_r 124 -itu_ 124 -ay 123 -ngg 123 -gg 123 -rang 123 -pi 120 -nan 120 -_ba 119 -_la 119 -apa 119 -_I 118 -p_ 118 -bi 117 -ai_ 117 -ta_ 116 -san 116 -Ke 116 -ro 115 -eri 114 -kar 113 -lah_ 113 -_itu_ 112 -aya 111 -i, 110 -an, 110 -ra_ 110 -_per 110 -im 110 -ika 109 -isi 109 -mem 109 -tah 108 -_Ke 108 -ian 108 -_mem 108 -akan 108 -Se 108 -to 107 -ab 107 -ngka 106 -rs 106 -gka 106 -uk_ 105 -seb 104 -_de 104 -pu 104 -i,_ 104 -ita 104 -nda 103 -_ti 103 -ni_ 103 -ca 103 -_Se 103 -ers 103 -pen 103 -ini 102 -an,_ 102 -angk 101 -uh 101 -han 101 -nta 100 -_in 99 -f 99 -nj 99 -ok 99 -aga 99 -_R 98 -as_ 98 -tr 98 -mer 97 -lam 97 -and 97 -end 96 -anga 96 -ne 96 -Sa 96 -ka_ 96 -arin 95 -gu 95 -_ha 94 -Z 94 -al_ 94 -ga_ 94 -_Z 93 -_pen 93 -dar 93 -Ad 93 -i._ 93 -ada_ 93 -atan 93 -tak 93 -i. 93 -ia_ 92 -asa 92 -ap_ 92 -ari_ 92 -kat 92 -_seb 92 -_Za 91 -Za 91 -den 91 -n. 90 -_u 90 -_Ad 90 -engan 89 -ib 89 -any 89 -n._ 89 -o_ 89 -Zar 88 -Zari 88 -rina 88 -_Zar 88 -_Zari 88 -Zarin 88 -arina 88 -ks 88 -angka 87 -oli 87 -eg 87 -kt 86 -_Sa 86 -hu 85 -ih 85 -us_ 85 -adi 85 -om 85 -eba 85 -anya 85 -_bu 84 -denga 83 -L 83 -ed 83 -dak 83 -deng 83 -ma_ 82 -asi_ 82 diff -Nru spamassassin-3.4.6/trunk-only/lm/inactive/br.lm spamassassin-4.0.0~rc3/trunk-only/lm/inactive/br.lm --- spamassassin-3.4.6/trunk-only/lm/inactive/br.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/inactive/br.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 21447 -e 6375 -a 5414 -n 3228 -r 3039 -o 2968 -t 2392 -i 1812 -h 1751 -u 1650 -l 1630 -d 1506 -a_ 1352 -z 1319 -t_ 1310 -_e 1168 -_a 1168 -e_ 1133 -m 1105 -s 1100 -g 1090 -r_ 998 -k 997 -n_ 958 -et 941 -v 888 -_d 868 -an 859 -. 846 -' 841 -en 836 -b 757 -, 749 -,_ 743 -._ 716 -ar 703 -ou 700 -et_ 689 -c 686 -ez 572 -'h 572 -_g 565 -er 555 -p 553 -_k 535 -c'h 530 -c' 530 -nt 513 -_h 505 -re 505 -ra 478 -ha 466 - 458 -ne 456 -oa 454 -_o 442 -_b 434 -- 432 -zh 422 -ar_ 415 -_m 414 -_e_ 414 -nn 384 -el 376 -_a_ 356 -ur 350 -o_ 346 -h_ 345 -ve 340 -nt_ 340 -w 339 -ke 338 -de 333 -a 332 -_p 332 -s_ 327 -he 325 -on 318 -le 318 -ga 316 -ma 315 -_ar 312 -eu 312 -_n 310 -an_ 298 -ant 296 -enn 285 -z_ 282 -_ar_ 281 -be 280 -_v 276 -_r 272 -al 270 -en_ 268 -_ke 267 -l_ 264 -em 264 -_c 263 -_ 262 -da 262 -_s 261 -ho 260 -di 259 -_ha 252 -ll 250 -tr 248 -oa_ 247 -me 246 -us 242 -_ga 234 -la 231 -ket 227 -ant_ 219 -_da 219 -_l 216 -ur_ 216 -_oa 215 -in 214 -ket_ 211 -gan 211 -_c' 207 -_u 207 -_c'h 207 -ad 207 -a_ 207 -ao 204 -_ma 204 -_t 204 -_ket 201 -_an 199 -_di 197 -ezh 196 - 196 -o 196 -_de 195 -ev 193 -? 192 -st 192 -ro 192 -P 192 -_ket_ 188 -er_ 188 -f 186 -na 186 -ue 185 -da_ 184 -?_ 184 -_gan 184 -_da_ 184 -_ne 183 -ed 182 -_P 180 -g_ 180 -pe 179 -m_ 178 -A 177 -ri 176 -us_ 175 -ta 174 -ze 174 -gant 174 -ka 174 -i_ 172 -d_ 171 -G 167 -te 167 -ae 166 -zh_ 164 -ha_ 163 -_ha_ 163 -_he 161 -_gant 159 -do 159 -oue 159 -_G 158 -eus 158 -eo 158 -'h_ 157 -_en 157 -go 157 -am 157 -c'h_ 157 -_be 156 -we 156 -iz 154 -_an_ 151 -_A 150 -eus_ 147 -sk 147 -li 146 -as 146 -_pe 146 -j 146 -_oa_ 146 -av 144 -gant_ 143 -ut 142 -no 141 -vez 140 -va 140 -_ra 140 -ge 138 -ez_ 138 -bo 137 - 137 -_ur 136 -lo 134 -he_ 134 -o_ 133 -_ 133 -_ur_ 132 -es 130 -'ho 129 -ni 129 -uz 129 -tra 127 -se 126 -it 125 -ra_ 125 -out 125 -is 125 -at 125 -hi 125 -eg 125 -ig 124 -ko 124 -io 123 -k_ 123 -ch 123 -_w 121 -or 121 -Pe 121 -_ma_ 119 -ma_ 119 -gw 118 -_em 118 -_Pe 118 -un 118 -eme 117 -ne_ 117 -nn_ 117 -c'ho 117 -ol 116 -ag 116 -M 115 -'ha 115 -_en_ 115 -iv 115 -vi 113 -_ka 113 -K 113 -ud 112 -_he_ 111 -ont 110 -oc 110 -vo 110 -ec 109 -wa 109 -.. 107 -_M 107 -_z 107 -br 107 -om 106 -to 105 -_f 105 -N 105 -_c'ho 104 -ti 104 -ut_ 104 -D 104 -_o_ 103 -_la 103 -_go 101 -az 101 -out_ 101 -ba 101 -enn_ 101 -c'ha 101 -our 100 -oc'h 100 -ell 100 -oc' 100 -etr 99 -el_ 99 -_K 99 -_D 99 -: 99 -:_ 99 -eve 98 -_d' 97 -all 97 -d' 97 -E 97 -_ne_ 97 -_me 95 -eo_ 95 -ak 95 -bet 95 -_eu 95 -rc 94 -_do 94 -_gw 94 -zi 93 -oz 93 -aou 93 -etra 92 -pa 91 -ab 90 -on_ 90 -ei 90 -tra_ 90 -n, 89 -zo 89 -ag_ 89 -_ev 88 -ul 88 -'e 88 -n' 88 -n,_ 88 -ouz 87 -v_ 86 -_n' 86 -_eus 84 -H 83 -za 83 -S 83 -etra_ 83 -_eo 82 -t,_ 82 -t, 82 -il 81 -ent 81 -fe 81 -rc'h 81 -rc' 81 -_eus_ 80 -ie 80 -_bo 79 -ele 79 -_ve 79 -mp 79 -_bet 78 -B 78 -it_ 77 -_vo 77 -'a 77 -n. 76 -_S 76 -hag 76 -hoa 75 -_hag 75 -len 75 -_N 75 -'hoa 74 -_E 74 -ir 74 -hag_ 74 -_hag_ 74 -ma 74 -as_ 73 -eze 73 -ont_ 73 -_. 73 -i 73 -r, 72 -pr 72 -ed_ 72 -n._ 72 -re_ 72 -in_ 72 -r,_ 72 -_H 71 -'he 70 -t. 70 -gou 70 -em_ 70 -_br 70 -rae 70 -rez 69 -t._ 69 -bet_ 69 -net 69 -dr 68 -_eo_ 68 -ll_ 68 -mo 67 -po 67 -oul 67 -rou 67 -c'hoa 67 -a- 67 -vel 67 -oc'h_ 67 -nna 66 -_B 66 -met 65 -ec' 65 -ec'h 65 -R 64 -den 64 diff -Nru spamassassin-3.4.6/trunk-only/lm/inactive/gv.lm spamassassin-4.0.0~rc3/trunk-only/lm/inactive/gv.lm --- spamassassin-3.4.6/trunk-only/lm/inactive/gv.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/inactive/gv.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 36004 -e 9455 -a 8302 -y 6395 -n 6395 -h 5736 -r 4939 -s 4799 -o 4429 -i 4129 -l 3462 -y_ 2896 -g 2731 -n_ 2549 -d 2232 -t 2160 -_a 1836 -m 1823 -sh 1774 -e_ 1746 -h_ 1645 -yn 1550 -c 1531 -ee 1515 -gh 1461 -s_ 1460 -_s 1388 -ey 1345 -_e 1316 -ag 1312 -a_ 1201 -r_ 1173 -agh 1165 -in 1148 -as 1136 -_d 1136 -u 1124 -he 1060 -yn_ 1025 -oo 1012 -ey_ 1005 -_m 1002 -er 965 -v 949 -_y 941 -_v 895 -_c 891 -_as 880 -' 869 -, 866 -_n 832 -ll 828 -,_ 827 -_sh 818 -. 802 -hi 797 -as_ 770 -ee_ 768 -ne 767 -_as_ 764 -b 762 -re 735 -ay 730 -._ 730 -an 726 -ar 725 -gh_ 722 -ny 709 -en 703 -_r 697 -ch 688 -agh_ 687 -dy 686 -t_ 677 -le 667 -k 658 -er_ 616 -oi 612 -ea 607 -_t 601 -yr 596 -_er 585 -ra 574 -_dy 572 -in_ 570 -l_ 564 -f 557 -_l 556 -ha 551 -_g 548 -_ny 534 -nn 530 -" 528 -_ch 527 -_y_ 524 -ie 514 -dy_ 514 -_dy_ 513 -aa 510 -_f 509 -j 504 -sh_ 487 -oa 480 -is 478 -_h 470 -rr 468 -ny_ 467 -_ny_ 463 -_er_ 454 -ish 445 -ho 442 -ai 441 -d_ 435 -ro 423 -ht 418 -ei 417 -shi 416 -il 409 -me 408 -_ay 403 -_b 403 -la 400 -_j 400 -my 394 -va 391 -ns 386 -on 385 -_o 381 -ys 380 -_shi 379 -ia 377 -ayn 373 -_va 371 -hen 362 -she 356 -ri 345 -lle 342 -ooi 342 -mee 340 -ley 335 -_me 331 -el 330 -rt 328 -ie_ 327 -eh 324 -w 316 -_ayn 313 -al 311 -g_ 309 -ish_ 308 -lley 307 -mee_ 305 -_mee 304 -ill 301 -es 299 -na 299 -je 298 -yns 296 -C 294 -_my 291 -_she 290 -ley_ 282 -V 280 -_yn 278 -_" 278 -_mee_ 277 -ta 272 -_V 271 -ys_ 268 -- 268 -lley_ 265 -hin 264 -_ro 259 -shin 256 -_yn_ 255 -_je 255 -do 253 -va_ 253 -ne_ 253 -_va_ 252 -ns_ 252 -_shin 251 -yns_ 250 -ayns 248 -en_ 247 -che 246 -_ayns 246 -eh_ 246 -_do 242 -ad 241 -ney 240 -o_ 240 -ym 240 -ed 239 -yr_ 239 -ayns_ 237 -ur 237 -st 234 -_C 234 -rt_ 234 -'n 232 -m_ 232 -p 231 -li 231 -or 230 -ow 228 -hin_ 225 -da 225 -shen 223 -"_ 223 -'n_ 223 -Va 221 -ght 220 -shin_ 219 -tr 217 -_Va 217 -ry 216 -ve 216 -_shen 215 -ty 214 -mo 206 -_' 205 -_ve 205 -ma 203 -be 203 -te 203 -hie 203 -hey 203 -nag 202 -ll_ 201 -yl 200 -w_ 200 -ss 200 -aa_ 198 -nagh 198 -an_ 197 -io 195 -ow_ 194 -it 194 -sy 193 -ayr 193 -ney_ 192 -E 192 -sht 192 -ni 191 -_k 190 -ha_ 190 -ain 189 -u_ 189 -hy 189 -aght 188 -oo_ 188 -ree 188 -lh 187 -_tr 186 -esh 186 -_che 183 -yrt 182 -_da 182 -oar 182 -doo 181 -k_ 181 -se 180 -au 180 -ille 179 -ar_ 179 -_lh 179 -ki 177 -arr 176 -ec 176 -ol 175 -_doo 175 -T 175 -row 175 -_row 174 -ge 173 -so 172 -oy 171 -oil 170 -_re 170 -_ag 170 -'e 169 -rey 169 -illey 169 -ck 168 -ad_ 168 -ann 168 -n, 166 -eea 166 -_ta 166 -ht_ 165 -ae 162 -_row_ 162 -! 162 -row_ 162 -ane 161 -fe 161 -dd 160 -go 159 -tyn 159 -oin 158 -ooa 158 -n. 158 -eg 156 -_ec 156 -_ma 156 -_agh 155 -n,_ 154 -_fe 154 -Ch 154 -nyn 153 -fo 152 -eay 152 -nagh_ 152 -n._ 152 -_go 151 -S 150 -ke 150 -hey_ 150 -enn 150 -cha 149 -rre 149 -_fo 149 -ghe 149 -raa 149 -G 148 -lan 148 -mm 147 -ym_ 147 -A 146 -c_ 146 -oill 145 -hee 144 -ooar 144 -_E 144 -nne 143 -tey 142 -ir 141 -de 141 -hyn 140 -_he 140 -nyn_ 140 -'s 139 -_gh 139 -_cha 138 -L 138 -yrt_ 138 -_Ch 137 -e, 137 -lla 136 -Va_ 136 -ooin 136 -ell 135 -a' 135 -os 135 -_oo 134 -am 134 -rish 133 -th 133 -_mo 133 -ris 133 -iag 133 -gg 133 -_Va_ 132 -iagh 132 -_G 132 -e,_ 132 -ass 132 -!_ 132 -my_ 132 -hoo 131 -_T 131 -nee 130 -a'n_ 129 -rag 129 -a'n 129 -_'s 129 -_so 128 -co 128 -rey_ 128 -_eh 126 -_my_ 126 -nni 126 -ou 126 -_'sy 125 -'sy 125 -_p 125 -vo 125 -_S 125 -H 125 -_agh_ 125 -tra 124 -moo 124 -hu 123 -ooy 123 -ragh 123 -al_ 123 -it_ 123 -hia 122 -id 122 diff -Nru spamassassin-3.4.6/trunk-only/lm/inactive/haw.lm spamassassin-4.0.0~rc3/trunk-only/lm/inactive/haw.lm --- spamassassin-3.4.6/trunk-only/lm/inactive/haw.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/inactive/haw.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 35416 -a 12973 -i 6074 -o 5151 -a_ 5093 -k 5083 -e 4551 -l 3544 -u 3442 -n 3100 -_k 2908 -e_ 2600 -i_ 2556 -h 2489 -o_ 2245 -m 2060 -ka 1994 -' 1943 -_i 1899 -_a 1620 -, 1539 -,_ 1516 -_m 1372 -_ka 1339 -ma 1338 -na 1325 -p 1235 - 1233 - 1192 - 1189 -ka_ 1085 -la 1070 -ua 1065 -ak 997 -_i_ 995 -ai 989 -ke 977 -_h 968 -K 941 -_' 938 -_l 933 -u_ 920 -_K 912 -_n 894 -_ka_ 891 -. 890 -an 847 -_ma 836 -ia 812 -le 804 -ke_ 753 -._ 749 -na_ 748 -au 736 -ho 700 -a, 674 -ah 670 -a,_ 666 -_ 662 -ku 660 -lo 654 -hi 619 -_ke 617 -_o 616 -_p 613 -ia_ 605 -'o 589 -Ka 586 -_Ka 581 -el 570 -ana 569 -_a_ 566 -_ 564 -la_ 561 -w 555 -al 549 -_ 539 -ko 528 -_ke_ 518 -ik 515 -_o_ 502 -'a 495 -a' 484 -ol 465 -ha 462 -ua_ 462 - 459 -pu 454 -no 454 -_'o 445 -ne 438 -aku 432 -le_ 427 -_ia 422 -am 420 -o 419 -wa 415 -he 414 -ahi 412 -li 410 -_ak 394 -ai_ 393 -ele 388 -o 388 -ki 382 -H 382 -on 381 -'o_ 369 -_ho 367 -au_ 366 -_aku 364 -_e 358 -pua 357 -_H 355 -me 355 -_'o_ 352 -il 352 -ama 351 -pa 348 -in 346 -mai 345 -_e_ 345 -O 342 -_mai 336 -A 333 -_ia_ 332 -a. 331 -oh 319 -Kam 317 -_Kam 316 -P 310 -aka 308 -ul 307 -_me 307 -ap 306 -" 304 -a 302 -Kama 299 -_Kama 298 -ana_ 296 -_P 294 -a._ 292 -_ko 291 -i, 289 -a'a 288 -i,_ 288 -'i 285 -a 278 -_w 273 -_o 270 -ei 269 -ele_ 261 -M 260 -oa 259 -o_ 259 -_la 257 -un 255 -_o 253 -lu 250 -n 249 -l 248 -apu 245 -_M 243 -ea 243 -i 243 - 242 -ua' 241 -a 240 -o_ 239 -ih 239 -iki 238 -_he 235 -apua 233 -ua'a 229 -hi_ 228 -mapu 226 -Kamap 226 -amapu 226 -mapua 226 -amap 226 -pua' 226 -map 226 -pua'a 226 -ma_ 222 -_o_ 221 -_wa 218 -_no 214 -e, 214 -ila 214 -ona 213 -no_ 213 -he_ 210 -I 209 -e,_ 209 -ok 208 -ail 206 -ula 206 -lo_ 205 -n_ 205 - 204 -mak 204 -me_ 204 -oe 202 -aila 201 -nu 201 -_o_ 200 -_me_ 200 -_l 200 -O_ 199 -i 197 -_i 195 -_i_ 195 -i_ 195 -_ 195 -i 195 -una 191 -ake 191 -k 189 -_u 187 -ou 185 -_n 185 -ni 185 -apua' 184 -nei 183 -_ma_ 182 -i. 181 -kau 180 -Ma 180 -iho 179 -_pa 176 -ahi_ 176 -mo 176 -_Ma 174 -ona_ 174 -o 173 -"_ 171 -ki_ 171 -_lo 170 -kah 168 -ho_ 167 -hu 167 -'a_ 166 -kua 165 -_I 165 -_n_ 164 -kul 162 -ne_ 162 - 162 -mai_ 162 -N 161 -n 160 -alo 159 -iki_ 159 -kai 159 -ila_ 158 -_mai_ 158 -i._ 155 -a'a_ 155 -_mak 153 -_k 153 -aila_ 152 -He 151 -li_ 151 -akul 150 -kula 149 -_pu 149 -ao 149 -_akul 149 -akula 149 -kon 148 -na, 147 -kona 147 -na,_ 147 -ole 147 -L 147 -_ne 146 -i' 146 -E 145 -hik 144 -_kona 144 -aa 144 -_kon 144 -ula_ 144 -loa 142 -o' 141 -_nei 141 -_'a 141 -_an 139 -_He 139 -_ha 139 -kona_ 138 -_kau 137 -_N 137 -oe_ 137 -nak 137 -_ih 137 -_A 136 -hiki 136 -_ana 135 -a 133 -_" 133 -aka_ 133 -ku_ 132 -ala 132 -mail 132 - 132 -aua 132 -'i_ 132 -maila 131 -_mail 131 -aw 131 -ha_ 130 -kahi 129 -i_ 129 -hel 128 -ea_ 128 -ui 127 -_L 127 -_iho 126 -op 126 -_al 126 -I_ 125 -Pe 125 -wah 125 -aha 125 -uk 124 -lel 124 -o 124 -hin 123 -_Pe 123 -ali 123 -hol 123 -_ai 123 -po 122 -akua 122 -hele 122 -kula_ 121 -_a 121 -ola 121 -ua'a_ 120 -aik 120 -ou_ 120 -'O 119 -_wah 119 -eh 119 -una_ 119 -u, 118 -ake_ 118 -kou 117 -_I_ 117 -Pel 116 -_he_ 116 -Pele 116 -'e 116 -_Pele 116 -_Pel 116 -hine 115 -la, 115 -ani 115 -kan 115 -ine 115 -aku_ 114 -naka 114 -A_ 114 -la,_ 114 -e 113 -_'O 113 -u,_ 112 -ahin 112 -_ku 111 -'O_ 111 -wahi 111 -ole_ 110 -ahine 110 -ho 110 -." 110 -ono 110 -_pua 109 -wai 109 -i'i 109 -'u 109 -_ho 108 -make 108 -_O 108 -_hi 108 -_'O_ 108 -ek 107 -oa_ 107 -."_ 107 -_wahi 107 - 107 -ola_ 106 -_ 106 -ko_ 106 -k 106 -ika 105 -olo 104 -_no_ 104 -_ua 104 -_aku_ 104 diff -Nru spamassassin-3.4.6/trunk-only/lm/inactive/middle-frisian.lm spamassassin-4.0.0~rc3/trunk-only/lm/inactive/middle-frisian.lm --- spamassassin-3.4.6/trunk-only/lm/inactive/middle-frisian.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/inactive/middle-frisian.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 60524 -e 20138 -n 10664 -t 8674 -i 7833 -a 7549 -o 7278 -r 6963 -n_ 5391 -s 5087 -d 4731 -t_ 4327 -l 4306 -e_ 4271 -en 4068 -k 3483 -m 3346 -g 2990 -er 2965 -en_ 2835 -y 2597 -w 2481 -h 2475 -j 2441 -_d 2375 -r_ 2250 -u 2059 -s_ 1921 -ie 1780 -_h 1725 -z 1710 -de 1666 -_m 1652 -_w 1629 -_i 1611 -et 1550 -te 1540 -b 1538 -. 1517 -er_ 1481 -in 1420 -an 1408 -p 1392 -f 1311 -, 1280 -,_ 1273 -k_ 1266 -._ 1258 -y_ 1238 -_z 1230 -oe 1162 -v 1144 -et_ 1138 -ne 1131 -ee 1125 -st 1120 -_o 1107 -_s 1107 -_e 1076 -_n 1068 -_b 989 -_t 988 -l_ 983 -oo 981 -ge 975 -je 963 -_g 952 -at 949 -me 946 -ij 943 -is 913 -he 899 -' 892 -aa 882 -el 870 -_v 864 -re 843 -ar 837 -_de 805 -on 800 -ke 796 -de_ 788 -ei 782 -_a 776 -_' 770 -le 744 -at_ 742 -it 741 -_k 738 -or 734 -an_ 729 -in_ 723 -da 715 -te_ 703 -_he 680 -_l 664 -H 661 -al 652 -_H 652 -a_ 650 -_da 648 -D 648 -d_ 646 -_D 643 -es 617 -g_ 608 -is_ 606 - 596 -_f 594 -'t 591 -_'t 584 -'t_ 583 -_me 580 -c 576 -_'t_ 576 -ri 571 -_en 564 -yn 563 -_en_ 559 -ze 538 -m_ 535 -om 535 -ik 522 -_de_ 522 -ed 521 -be 517 -wi 509 -ch 509 -ol 498 -ar_ 498 -ha 496 -_ne 495 -we 494 -ou 486 -nd 474 -ma 474 -ik_ 470 -J 459 -_ik 456 -_ik_ 451 -_J 451 -ll 450 -M 446 -li 443 -wa 442 -_M 442 -ien 435 -ro 432 -di 421 -nn 418 -ste 415 -wo 415 -yn_ 415 -_r 413 -_ha 411 -it_ 409 -tt 408 -ve 407 -S 404 -_j 399 -_S 398 -_in 395 -as 395 -der 395 -hi 389 -_al 388 -uw 384 -tte 384 -ng 381 -_wi 381 -nne 381 -het 380 -_het 378 -lle 376 -nt 374 -ns 373 -op 373 -je_ 367 -E 366 -ek 363 -B 363 -dat 362 -_B 362 -_ma 362 -_in_ 361 -_dat 359 -_wo 359 -ier 358 -og 357 -_E 354 -_ge 352 -dat_ 349 -ne_ 349 -eer 349 -het_ 348 -_het_ 348 -_is 348 -_dat_ 348 -ey 347 -W 346 -_W 343 -_te 339 -eg 337 -ra 335 -rs 335 -! 332 -zi 332 -gt 329 -_He 327 -He 327 -_be 324 -j_ 320 -ij_ 320 -u_ 319 -f_ 317 -_di 316 -; 315 -_we 315 -_is_ 314 -rt 313 -!_ 313 -;_ 312 -n. 311 -p_ 310 -la 310 -_wa 310 -ea 308 -_u 308 -pe 304 -ta 304 -il 301 -my 300 -ig 300 -n, 300 -n,_ 298 -iet 297 -sc 297 -ter 296 -sch 296 -oor 295 -no 294 -_my 293 -n._ 291 -ti 290 -_zi 289 -st_ 288 -el_ 283 -gen 282 -se 280 -K 279 -_oo 278 -ui 278 -e, 275 -ten 274 -net 274 -oon 274 -ho 274 -jn 273 -e,_ 273 -ijn 272 -ien_ 272 -ko 272 -N 271 -ni 271 -_N 269 -den 269 -za 268 -_net 267 -i_ 266 -wol 266 -een 264 -va 264 -am 264 -do 263 -ol_ 262 -le_ 261 -_te_ 260 -rd 260 -ke_ 259 -ey_ 259 -ers 258 -_K 255 -_ie 255 -ver 254 -to 254 -_hi 253 -nde 253 -: 253 -der_ 252 -jo 251 -net_ 251 -al_ 250 -_wol 250 -_p 250 -_no 250 -aar 248 -_za 245 -_net_ 245 -nk 242 -est 241 -om_ 241 -_va 241 -ak 241 -tj 239 -ae 238 -_op 237 -mo 236 -tr 236 -_st 233 -ier_ 233 -_ve 233 -mm 232 -T 231 -eu 229 -_ze 228 -:_ 228 -mi 228 -ag 227 -zo 227 -_ko 226 -vo 225 -_T 225 -nne_ 225 -F 224 -.. 224 -fo 224 -_F 223 -en, 223 -oe_ 222 -wie 222 -en,_ 221 -kk 221 -_ien 220 -on_ 218 -wol_ 218 -_fo 218 -I 217 -_do 216 -eit 214 -ei_ 214 -mme 214 -G 213 -_I 213 -as_ 213 -or_ 211 -A 211 -_G 210 -_A 210 -lle_ 209 -Da 208 -_Da 207 -_wol_ 207 -ren 206 -_ee 206 -e. 205 -van 205 -jen 205 -een_ 205 -_van 204 -kke 204 -en. 204 -O 204 -_vo 204 -V 203 -_O 203 -_V 203 -ken 203 -_mo 203 -ot 202 -ie_ 201 -ou_ 201 -ur 201 -tte_ 200 -em 200 -_van_ 199 -L 199 -van_ 199 -_zo 199 -op_ 199 -_L 197 -iet_ 196 -of 194 -ten_ 194 -oer 193 -_ien_ 193 -e._ 193 -oed 192 -hie 192 -zy 191 -en._ 191 -De 191 -_ver 191 -_ho 189 -_De 189 -oa 189 -den_ 188 -_zy 188 -lo 187 -dan 187 -nt_ 186 diff -Nru spamassassin-3.4.6/trunk-only/lm/inactive/mingo.lm spamassassin-4.0.0~rc3/trunk-only/lm/inactive/mingo.lm --- spamassassin-3.4.6/trunk-only/lm/inactive/mingo.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/inactive/mingo.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 3156 -' 991 -a 829 -t 788 -k 788 -n 752 -e 640 -h 602 - 551 -s 495 -w 466 - 422 -y 403 -u 397 -'_ 368 -_n 330 -i 269 -. 269 -._ 240 -e' 238 - 219 -a' 209 -ne 209 -e_ 194 -_ne 184 -wa 172 -_k 164 -kw 162 - 154 -e'_ 146 -_t 145 -'t 141 -" 141 -' 134 - 132 -_h 131 - 129 -ak 129 -ne_ 126 -ta 123 -_ne_ 123 -at 121 -u' 121 -hu 118 -_u 108 -ka 107 - 106 -n 105 -N 103 -' 100 -hs 95 -ha 95 -te 94 -ya 93 -_ 92 -kh 90 -'k 86 - 85 - 84 -ni 84 -'. 84 -w 83 -ny 83 -sh 80 -_N 80 -'._ 76 -_ 76 -k 72 -_" 71 -n 70 -th 69 -yu 66 -_w 66 -h 66 -t_ 66 -_ 66 -Ne 65 -Ne' 65 -'s 64 -ne' 64 -"_ 64 -_. 63 -_._ 61 -Ne'_ 61 -, 60 -ne'_ 58 -n 58 -kwa 57 -_ne' 57 -t 57 -a't 57 -ek 56 -s_ 56 -t 55 -i' 55 -_hu 54 -T 54 -_ 54 -_s 54 -_Ne 53 -t 53 -t 53 -_Ne' 53 -_ne'_ 53 -ht 53 -- 53 -ts 52 -ya' 52 -'_ 51 -_wa 51 -_Ne'_ 51 -' 50 -y 50 -_ka 50 -as 50 -n 49 -un 49 -_ 49 -ty 48 -hu_ 48 -ke 48 -u_ 48 -,_ 47 -y 46 -he 46 -ye 46 -k 45 -si 45 -n 44 -khu 44 -a'k 44 -_a 43 -k 43 -wat 42 -' 42 -n' 42 -w 42 -aw 41 -an 41 -we 41 -t 41 -i_ 41 -_kh 41 -tak 41 -_te 41 -ik 41 -_khu 40 -s 40 -y 40 -k_ 39 -khu_ 39 -yu' 38 -h 38 -wn 38 -n- 38 -hs 38 -_ha 38 -wa' 38 -_n- 37 -sa 37 -? 37 -_T 37 -' 37 -_un 36 -h 36 -w 36 -ah 36 -_khu_ 35 -iy 35 -k 35 -ut 35 -k 35 -h 35 -te' 35 -u'_ 35 -_k 34 -y_ 34 -ha' 34 -st 34 -ti 34 -ta' 34 -u't 33 -ya't 33 -'t_ 33 -'_ 33 -akw 33 -k 33 -ny 32 -'ta 32 -ku 32 -ui 32 -_sh 32 -aa 31 -n 31 -ay 31 -n 31 - 30 -se 30 -tw 30 -y 30 -(_ 29 -_(_ 29 -_)_ 29 -us 29 -_hs 29 -( 29 -k 29 -_h 29 -ae 29 -h 29 -_) 29 -)_ 29 -_( 29 -sy 29 -) 29 - 28 -n 28 -sk 28 -t 28 -t 28 -tk 28 -n 28 -k_ 28 -a_ 28 -n 27 -_huik 27 -n 27 -_hui 27 -kw 27 -huik 27 -k 27 -hui 27 -uik 27 -_na 27 -na 27 -a'_ 26 -uik 26 -_ni 26 -." 26 - 26 -wi 26 -huik 26 -ik 26 -nya 25 -."_ 25 -?" 25 -t' 25 -yu 25 -aw 25 -sn 25 -n_ 24 -'_ 24 -ik_ 24 -ekh 24 -'ke 24 -uik_ 24 -?"_ 24 -tek 24 -t 24 -', 24 -"N 23 -_ta 23 -'a 23 -hk 23 -t 23 -tsi 23 -w 23 -yu'_ 23 -_"N 23 -yu' 23 -nyu 23 -a'ta 23 -' 23 -nyu' 23 -sh 22 -wn 22 -kwa' 22 -n 22 -kw 22 -_u' 22 -ey 22 -nyu 22 -K 22 -ai 22 -_sh 22 -w 22 -a 22 -ht 22 -ny 22 -kwe 22 -wny 22 -_he 22 -_te' 21 -n 21 -s. 21 -nh 21 - 21 -_k 21 -'sh 21 -k' 21 -ht 21 -H 21 -ata 21 -U 20 -'h 20 -_ha' 20 -' 20 -ae_ 20 -a'ke 20 -ny 20 -un 20 -we' 20 -w' 20 -i'_ 20 -ks 20 -ya'ta 19 -es 19 -awn 19 -h_ 19 -uk 19 -awn 19 -hw 19 -'. 19 -' 19 -t' 19 -s 19 -' 19 -'._ 19 -' 19 -hkw 19 --a 19 -twa 19 -'kw 18 -he_ 18 -_K 18 -nt 18 -hsa 18 -hsi 18 -ni 18 -aya 18 -is 18 -' 18 -k 18 -skw 18 -uw 18 -',_ 18 -e't 18 -k 18 -ka' 18 -nae 17 -sh_ 17 -sat 17 -niy 17 -ts 17 -ath 17 -ye' 17 -_ 17 -'' 17 -'u 17 -_t 17 -s_ 17 -_ks 17 -_y 17 -kak 17 -' 17 -kat 17 -_th 17 -'_ 17 -t 17 -u'k 17 -_H 17 -tekh 17 -s._ 17 -w 17 -_nae 17 -kw 17 -_sh_ 17 -y 17 -te 16 -sha 16 -ke_ 16 -k. 16 -si' 16 -h' 16 -y 16 -hta 16 -kn 16 -_nae_ 16 -hse 16 -k 16 -'_ 16 -un 16 -nya' 16 -nae_ 16 -n 16 -' 16 -s 16 -t 16 -a's 16 -a'u 16 diff -Nru spamassassin-3.4.6/trunk-only/lm/inactive/README spamassassin-4.0.0~rc3/trunk-only/lm/inactive/README --- spamassassin-3.4.6/trunk-only/lm/inactive/README 2005-02-25 14:28:10.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/inactive/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -These language models are for extinct languages, seriously endangered -languages, and languages/codesets almost never used in electronic mail. - -The overhead of each additional language is minimal, so place language -models into this directory sparingly. - -Breton br.lm -Hawaiian haw.lm -Manx Gaelic gv.lm -Middle Frisian middle-frisian.lm -Mingo mingo.lm diff -Nru spamassassin-3.4.6/trunk-only/lm/is.lm spamassassin-4.0.0~rc3/trunk-only/lm/is.lm --- spamassassin-3.4.6/trunk-only/lm/is.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/is.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 26104 -a 6496 -r 6044 -n 5160 -i 5123 -s 3987 -e 3891 -u 3582 -t 3300 - 3126 -l 3071 -g 2726 -m 2459 -k 2256 -f 2230 -r_ 1967 -v 1641 -ar 1472 -_ 1420 -_s 1332 - 1248 -o 1221 - 1197 -a_ 1155 -in 1150 -i_ 1114 -h 1023 -j 975 -d 974 -st 929 -a 925 -. 922 -n_ 875 -._ 875 -_v 874 -m_ 854 -nn 842 -_f 840 -ur 824 -_a 806 - 785 -_h 782 - 779 -i 771 -er 765 -um 727 -g_ 716 -y 711 -_e 709 - 672 -b 672 -ir 671 -ri 670 -an 667 - 650 -_ 648 -a_ 645 -u_ 633 -na 631 -_ 625 -ar_ 622 -_ 608 -_ 606 -_ 595 -ta 567 -ei 566 -la 558 -_m 549 -__ 549 -um_ 547 -t_ 535 -ti 529 -_o 524 -ur_ 523 -_a 519 -i_ 512 -i 496 -ve 494 -og 494 - 482 -og_ 479 -_og 478 -_og_ 478 -nd 469 -p 464 -ra 455 -un 454 -ir_ 452 -_a_ 451 -ni 439 -en 439 -u 439 -__ 436 -ng 434 -il 404 -ga 395 -_t 395 -nu 393 -ki 392 -ja 383 -inn 379 -_b 375 -sk 352 -s_ 350 -vi 349 -r 347 -a 345 -ef 339 -ag 336 -_u 330 -se 324 -lu 324 -af 321 -_ve 320 -tu 318 -em 307 -eg 304 -nn_ 303 -_l 303 -va 301 -_k 296 -, 295 -ns 292 -re 292 -tt 291 -,_ 291 -l_ 286 -am 286 -es 285 -yr 285 -al 281 -da 277 -S 275 -gu 273 -_se 271 -ver 268 -_g 266 -ing 266 -_n 262 -is 258 -_er 257 -sa 256 -ur 255 -le 255 -_st 255 -_S 254 -sem 254 -ll 254 -me 253 -ha 251 -li 249 -kk 249 -rs 247 -_vi 247 -rn 246 -sl 244 -gi 243 -ss 242 -rf 241 -fy 240 -i_ 240 -mi 238 -ka 237 -ma 231 -ld 230 - 229 -rir 227 -sta 227 -fyr 227 -v 227 -di 226 -ru 224 -var 224 -_fy 222 -ku 221 -em_ 221 -nar 220 -_sem_ 220 -_sem 220 -sem_ 220 -he 219 -yri 217 -_fyr 216 -si 216 -yrir 215 -au 212 -er_ 212 -ek 211 -_ha 210 -e 209 -fyri 207 -fyrir 207 -_e 205 -fi 204 -fr 203 -ge 201 -or 200 -ne 200 -ann 198 -j 198 -_va 196 -_fyri 196 -_ver 194 -fl 192 -_er_ 191 -_um 189 -k 188 -til 187 -_he 186 -fa 186 -il_ 182 -_ti 178 -_til 177 -gar 176 -_var 176 -na_ 176 - 175 -e 171 -fu 170 -nni 169 -_me 168 -ki_ 167 -vi 166 -ey 165 -fn 165 -arf 164 -til_ 163 -st_ 162 -_til_ 162 -a 161 -num 161 -_a 161 -as 160 -_vi 160 -rt 159 -el 158 -u 156 -inn_ 155 -_um_ 154 -ra_ 153 -b 153 -tar 151 -ta_ 151 -er 151 -r 148 -and 148 -_sa 146 -ig 146 -_en 146 -nga 145 -rir_ 145 -us 144 -jar 143 -et 143 -r 142 -_sk 140 -ndi 140 - 139 -var_ 139 -_r 138 -av 138 -k 137 -nna 137 -ur_ 136 -l 136 -ko 135 -nin 135 -vi_ 135 -l 135 -ins 134 -ik 133 -E 133 -K 133 -yrir_ 133 -ns_ 133 -on 133 -ein 132 -_vi_ 132 -g 132 -j 132 - 132 -l 132 -s 132 -_mi 131 -f_ 131 -s 131 -sj 131 -stu 131 -nda 130 -_var_ 130 -gr 129 -s 128 -t 127 -ri_ 126 -haf 126 -_s 125 -vk 124 -rin 124 -te 124 -r. 124 -r._ 123 -H 123 -nes 123 -t 123 -ru_ 123 -kr 122 -F 122 -r 121 -num_ 121 -k_ 121 -a. 121 -_H 121 -_fr 120 -_ge 120 -r 120 -_E 120 -_ 120 -ug 120 -ngu 119 -an_ 119 -inga 118 -_K 118 -_haf 118 -enn 117 -ars 117 -ri 117 -en_ 117 -sin 116 -kur 116 -it 116 -a_ 116 -ti_ 115 -ri 114 -tj 114 -ni_ 114 -at 114 -tarf 114 -br 113 -slu 113 -kki 113 -rg 113 -m 113 -kv 113 -_en_ 113 -a._ 112 -gar_ 112 -du 112 -ju 110 -ei 110 -und 110 -lag 110 -tur 110 -ega 109 -h 109 - 109 -gn 109 -hef 109 -kj 109 -_hef 109 -_sta 108 -B 108 -V 108 -sam 107 -_ei 106 -_B 106 -ft 106 -ga_ 106 -G 106 -_G 105 -l 105 -kki_ 105 -star 104 -in_ 104 -R 104 -me 104 -_r 103 -_me 103 -ekk 103 -inu 103 -t 103 -_V 103 -m. 103 -ai 103 -j 102 -j 102 -_b 102 -ess 102 -hs 101 -ut 101 -gs 101 -av 101 -mu 101 -_R 101 -_ 101 -rst 100 -jar 100 -leg 100 -ja 100 -ja_ 99 -avk 99 diff -Nru spamassassin-3.4.6/trunk-only/lm/it.lm spamassassin-4.0.0~rc3/trunk-only/lm/it.lm --- spamassassin-3.4.6/trunk-only/lm/it.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/it.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 25028 -a 7570 -e 6477 -i 5481 -o 5104 -l 3905 -n 3866 -r 3502 -t 2934 -c 2862 -s 2862 -a_ 2504 -e_ 2404 -d 2004 -i_ 1749 -o_ 1679 -u 1650 -v 1611 -p 1561 -m 1414 -_c 1325 -, 1192 -,_ 1192 -_s 1190 -_d 1094 -g 1067 -an 925 -er 915 -_a 914 -_p 895 -la 858 -_l 830 -re 799 -ar 769 -h 762 -no 753 -co 726 -va 698 -_e 657 -n_ 656 -on 656 -ra 653 -to 651 -f 638 -di 638 -_i 634 -ch 634 -ll 633 -l_ 624 -la_ 598 -ta 593 -el 576 -in 567 -_m 558 -en 529 -b 528 -ri 525 -_co 523 -_n 523 -_di 522 -li 513 -av 507 -al 501 -le 494 -ia 492 -se 484 -ol 479 -_f 477 -or 477 -te 469 -_e_ 467 -ve 454 -at 449 -de 447 -. 443 -ne 429 -va_ 428 -ca 426 -._ 422 -tt 422 -re_ 415 -nt 415 -io 411 -_v 407 -pe 405 -z 392 -to_ 391 -_ch 389 -na 384 -si 384 -' 383 -he 382 -no_ 379 -ci 374 -_la 373 -ro 371 -_g 370 -st 368 -cc 366 -he_ 362 -di_ 362 -ma 358 -ev 354 -che 354 -es 352 -me 352 -pa 351 -_t 349 -ti 348 -_di_ 347 -ss 345 -che_ 344 -a,_ 337 -a, 337 -nd 335 -o, 333 -o,_ 333 -ell 330 -gl 323 -sa 322 -il 322 -gli 321 -da 318 -as 318 -do 314 -_che 308 -_che_ 306 -eva 306 -_la_ 300 -lla 298 -le_ 293 -un 291 -_pe 290 -_de 288 -q 283 -qu 283 -ava 280 -po 277 -on_ 275 -r_ 273 -li_ 273 -_b 269 -_il 268 -_il_ 268 -il_ 268 -lo 267 -om 263 -e, 263 -e,_ 263 -ni 258 -tr 258 -so 255 -ra_ 253 -os 251 -_in 249 -_u 248 -per 244 -are 243 -et 243 -_se 240 -ano 239 -si_ 238 -_ca 238 -_qu 238 -lla_ 238 -_q 238 -_a_ 236 -ac 236 -_r 234 -ic 233 -_no 232 -ie 227 -fa 227 -hi 226 -del 225 -ua 222 -_per 218 -ce 218 -_ma 216 -sc 216 -_del 215 -mi 212 -_un 208 -chi 206 -era 205 -i, 205 -i,_ 205 -su 203 -and 202 -vo 202 -_fa 201 -eva_ 200 -ano_ 199 -gli_ 197 -non 196 -pi 196 -vi 195 -er_ 195 -_al 194 -se_ 193 -_ne 192 -_non 191 -am 190 -is 187 -ava_ 187 -_non_ 186 -non_ 186 -in_ 185 -ent 185 -_si 184 -_pa 184 -com 183 -! 182 -_le 182 -_su 181 -uo 181 -el_ 180 -!_ 180 -l' 178 -ue 177 -te_ 177 -_com 177 -are_ 176 -pr 176 -_in_ 176 -van 172 -mo 172 -ta_ 171 -gn 167 -ere 166 -na_ 166 -tto 163 -it 161 -_per_ 161 -per_ 161 - 161 -all 160 -ess 159 -ut 159 -col 158 -acc 157 -gi 155 -lo_ 154 -oc 154 -vano 153 -io_ 153 -_av 151 -ndo 151 -_ 151 -ato 149 -ave 148 -_st 147 -me_ 147 -'a 146 -ia_ 144 -con 143 -mp 143 -fi 142 -ett 142 -_si_ 141 -_pi 140 -era_ 140 -ti_ 140 - 140 -vano_ 140 -_gl 139 -qua 139 -ella 139 -sta 138 -ome 137 -S 137 -_gli 137 -_S 137 -ad 136 -_ve 134 -ant 134 -ne_ 134 -_ 133 -sp 133 -do_ 133 -_po 132 -ro_ 132 -ov 132 -_le_ 131 -ella_ 130 -sse 129 -_con 128 -ir 128 -_vi 128 -ig 127 -_gli_ 127 -_ave 127 -vev 127 -un_ 126 -ot 126 -veva 125 -dell 125 -que 125 -a. 125 -_o 125 -a._ 124 -tu 124 -cia 123 -za 123 -_que 123 -_da 121 -par 121 -_pr 120 -cch 120 -_dell 120 -eg 119 -_sa 119 -o._ 119 -o. 119 -_col 118 -lt 118 -_un_ 118 -rt 118 -ur 117 -_vo 117 -_me 117 -ome_ 117 -L 116 -ap 116 -_L 116 -zi 116 -nto 116 -og 115 -_an 115 -_so 115 -em 114 -ag 114 -be 111 -ni_ 111 -im 110 -cchi 110 -ver 110 -lle 109 -nz 109 -cci 109 -_ri 109 -nc 108 -_er 108 -come_ 107 -come 107 -aveva 107 -ui 107 -avev 107 -tto_ 107 -_come 106 -ed 106 -P 105 -man 105 -_P 105 -rs 105 -occ 104 -ndo_ 103 -ato_ 103 -_qua 103 -_era 103 -ari 102 -ba 100 -_mo 100 -nel 100 -id 99 -men 98 -_fi 98 -_all 98 -rr 97 -_do 97 -_avev 97 -att 97 -l'a 96 -ei 96 -zz 96 -; 96 -vol 95 -pp 95 -tra 95 -;_ 95 -ere_ 94 -lle_ 94 -nda 94 -utt 94 -est 93 -_nel 93 -ul 92 -ola 92 -iv 92 -ando 90 -ale 90 -lu 90 -rn 90 -e. 89 -e._ 89 -ll' 89 -tta 88 -nte 87 -_l' 87 -uel 87 diff -Nru spamassassin-3.4.6/trunk-only/lm/ja.euc-jp.lm spamassassin-4.0.0~rc3/trunk-only/lm/ja.euc-jp.lm --- spamassassin-3.4.6/trunk-only/lm/ja.euc-jp.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ja.euc-jp.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ - 78988 - 57258 -_ 34456 - 22280 - 18223 - 11290 - 11237 - 10621 - 9502 - 8859 - 8812 - 8266 - 8180 - 7520 - 7325 - 6982 - 6930 - 6929 - 6896 - 6865 - 6858 - 6261 - 6067 - 5926 - 5888 - 5878 - 5806 - 5562 - 5426 - 5314 - 5228 - 5011 - 4836 - 4775 - 4385 -_ 4323 - 4310 - 4305 -_ 4294 - 4253 - 4090 - 4075 - 4032 - 4029 - 3975 - 3947 - 3923 - 3853 - 3845 - 3759 - 3583 - 3485 - 3475 - 3367 - 3366 - 3366 - 3314 - 3313 - 3282 - 3273 - 3255 - 3207 -å 3188 - 3182 - 3175 -å 3170 - 3131 - 3058 - 3035 - 3024 - 3000 -롣 2952 -롣_ 2948 -롣 2947 -롣_ 2943 - 2905 - 2893 - 2865 - 2848 - 2819 -Ȥ 2791 - 2776 - 2749 - 2730 - 2729 - 2729 - 2697 - 2689 - 2545 - 2543 - 2525 - 2473 - 2459 - 2399 -. 2395 - 2381 -, 2380 - 2357 - 2346 - 2340 - 2328 - 2326 - 2316 - 2314 - 2293 - 2283 - 2283 - 2253 -._ 2251 - 2227 - 2222 - 2200 -_ 2189 -Ǥ 2172 - 2145 -ӥ 2137 - 2112 - 2110 - 2110 - 2100 - 2061 - 2027 - 2017 - 2011 - 2007 -ӥ 2002 -ˤ 1995 - 1983 - 1983 - 1947 - 1913 - 1861 - 1847 - 1834 - 1834 - 1826 - 1795 - 1791 - 1782 - 1782 -ˤ 1763 -Ȥ 1760 - 1716 - 1713 - 1709 - 1696 -ʤ 1691 - 1688 -_ 1686 - 1679 - 1669 - 1668 - 1666 - 1659 -Ǥ 1655 - 1638 - 1637 - 1612 - 1598 - 1584 - 1584 -ʤ 1570 - 1568 - 1565 - 1562 - 1554 - 1544 -Ƥ 1541 -ƥ 1538 - 1526 - 1525 - 1523 - 1523 - 1517 - 1510 - 1509 -- 1490 - 1476 - 1465 - 1465 - 1464 - 1454 - 1454 -å 1453 -å 1453 - 1453 -å 1453 -å 1453 - 1453 -å 1453 - 1453 - 1453 -å 1453 -å 1453 -å 1453 - 1453 - 1452 - 1450 - 1445 - 1441 - 1420 - 1419 - 1418 - 1415 - 1413 - 1413 - 1413 - 1413 - 1413 - 1411 -ӥ 1406 -ӥ 1406 -ӥ 1406 -ӥ 1406 - 1406 - 1406 - 1403 - 1403 -ӥ 1403 -ƥ 1396 - 1392 - 1383 - 1378 - 1372 -_ 1368 -Υ 1358 -T 1354 -ϡ 1341 - 1338 - 1337 - 1325 - 1323 -Τ 1314 -Υ 1312 - 1311 - 1311 -Ԥ 1308 -) 1302 -_. 1297 - 1294 - 1294 - 1292 - 1289 - 1284 -Ƥ 1284 - 1273 - 1260 -_._ 1244 - 1244 - 1238 - 1211 - 1190 - 1182 -_ 1182 - 1152 -ȥ 1151 - 1145 - 1130 -ǽ 1129 -ե 1126 - 1120 -ե 1113 -ϡ 1105 - 1103 - 1101 - 1084 - 1080 - 1062 - 1060 - 1051 - 1050 - 1043 - 1033 - 1033 - 1033 - 1032 - 1032 -ϡ 1030 -ϡ 1030 -Ǥ 1022 -Ǥ 1021 -Ǥ 1021 -Ǥ 1020 -ǥ 1012 - 1006 - 997 - 995 - 991 -ͣ 988 - 985 - 984 -ͣ 983 - 981 - 976 - 974 -Τ 971 - 971 - 962 - 955 - 955 - 954 -ȥ 953 -ǥ 951 - 942 - 929 - 920 - 918 - 909 - 904 - 904 -Ԥ 903 - 900 - 900 -_ 894 - 893 --_ 892 -, 887 -Ȥ 886 -, 886 -_ 884 - 881 - 881 -( 878 -C 877 -Ǥ 877 -I 877 - 875 -롣 875 -i 872 - 865 - 860 -֤ 857 - 856 - 855 - 855 - 846 - 841 -ޤ 834 - 834 -e 825 - 825 - 819 - 818 - 818 - 808 - 802 -ǥ 796 -ǥ 796 -_ 792 -a 776 -å 771 -å 771 - 770 - 770 - 767 -Ѥ 748 - 743 - 743 -ǥ 741 -ǥ 741 -_ 738 - 732 -N 729 - 728 - 728 - 727 - 724 -롣 722 - 718 -ˤ 716 -ˤ 716 -ˤ 715 - 715 - 715 -ˤ 715 -ץ 715 -ץ 711 - 710 - 710 - 710 -Ĥ 705 - 702 - 701 -_ 699 - 696 -_ 694 - 694 - 692 - 692 - 692 - 686 -Ѥ 685 -ʤ 685 -ʤ 685 - 684 -Ƥ 684 -n 682 - 682 - 681 - 681 Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/trunk-only/lm/ja.iso-2022-jp.ln and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/trunk-only/lm/ja.iso-2022-jp.ln differ diff -Nru spamassassin-3.4.6/trunk-only/lm/ja.shift-jis.lm spamassassin-4.0.0~rc3/trunk-only/lm/ja.shift-jis.lm --- spamassassin-3.4.6/trunk-only/lm/ja.shift-jis.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ja.shift-jis.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ - 9970 - 2204 -_ 1555 - 1214 - 891 -A 885 - 846 - 836 -A 831 - 818 - 815 - 790 - 739 - 729 - 618 - 607 - 589 - 568 - 566 - 555 - 552 - 528 - 527 - 500 - 489 - 481 - 461 - 460 - 453 - 449 - 449 - 445 - 440 -B 419 - 411 -B 405 - 404 - 404 - 401 - 396 - 389 - 387 - 368 - 366 - 363 - 361 - 357 - 352 - 352 - 349 - 345 - 330 - 321 - 320 - 320 - 306 - 305 - 292 - 284 -@ 282 -_ 281 -܂ 275 - 268 -v 263 -܂ 258 -Ȃ 256 - 251 -Ȃ 240 - 239 - 238 -Ă 234 - 232 -Ƃ 231 -ł 226 -@ 220 - 217 -Ƃ 214 -ł 211 -_ 210 -Ă 205 - 204 - 203 - 199 - 198 -̂ 195 - 194 - 194 - 182 - 182 - 181 - 180 -ɂ 180 -A 176 - 176 - 173 -ɂ 172 -̂ 172 -v 169 - 169 - 167 - 167 -B_ 166 -N 166 -B_ 166 -O 165 - 165 -A 165 - 164 -P 163 - 163 - 159 - 159 -_@ 157 - 156 - 155 -[ 153 - 153 -X 153 - 148 -i 148 - 148 - 147 -B 146 - 146 -B 145 -j 142 - 142 -P 141 - 141 - 141 -͂ 141 - 141 - 137 -V 137 - 135 - 135 - 134 -u 133 -[ 132 - 131 -l 129 - 129 -s 128 - 128 - 125 - 125 -S 125 -g 124 - 123 - 123 - 123 - 122 - 122 - 120 - 120 - 120 - 120 -\ 119 -́ 119 -u 119 -v 119 - 119 -߂ 118 -W 118 -́ 117 -܂ 117 -R 117 - 117 -܂ 117 - 114 - 114 - 113 - 113 -{ 113 -N 112 - 111 - 111 - 111 -o 108 -܂ 107 -܂ 107 -Q 106 - 106 - 105 -܂B 104 - 103 - 103 - 103 - 103 - 102 - 102 - 100 - 100 - 100 -߂ 99 - 98 - 98 - 97 - 96 - 96 - 96 -I 95 -[ 95 -[ 95 -́A 94 - 94 -́A 94 - 93 -Ă 92 - 92 -Ă 92 - 92 -E 92 -Q 91 - 90 -w 90 -Ă 89 -Ă 89 - 89 - 88 - 87 -x 87 - 86 -P 86 - 86 - 86 -n 86 - 85 - 85 - 85 - 84 - 84 - 84 -͂ 84 - 84 - 83 -B 83 -B 83 - 83 - 83 - 82 - 82 -v 80 - 80 -P 80 - 79 - 79 -A 77 - 77 - 77 - 77 -Ă 77 -Ă 77 - 76 -B 75 -X 75 - 75 - 74 -c 74 - 74 -O 73 - 73 - 72 -i 72 - 71 - 71 -B 71 - 70 - 70 - 70 -y 70 -ǂ 69 -T 69 -p 69 - 68 - 68 - 68 -B_ 67 -l 67 -Z 67 - 67 - 67 - 67 - 67 -B_ 67 - 67 -X 66 - 66 - 66 - 66 - 66 -A 66 - 65 - 65 -A 65 -U 65 - 64 - 64 - 63 - 62 -C 62 - 62 - 62 -R 62 - 62 - 62 - 62 - 62 -_ 61 -܂ 61 - 61 - 61 -^ 61 - 61 -܂ 61 - 61 -l 61 - 61 - 60 -v 60 - 60 - 60 -v 60 -v 60 - 60 - 60 - 60 - 60 -A 60 - 59 - 59 -Ȃ 59 -Ȃ 59 - 59 - 59 -W 59 - 58 -i 58 - 58 -Q 58 -j 58 - 58 -N 58 -{ 57 - 57 - 57 - 57 - 57 -̐ 56 -Ɂ 56 -A 56 -e 56 -g 56 -A 56 -ʂ 56 -@ 56 -‚ 55 -z 55 -I 55 -Y 55 -ł 55 - 55 -A 55 -A 55 - 54 - 54 -X 54 - 54 -t 54 -ł 54 -j 54 - 53 -Ɂ 53 -Ƃ 53 - 53 -Ƃ 53 - 53 -I 53 - 53 - 53 -A 53 -U 53 -~ 53 - 52 -A 52 -x 52 -A 52 -̐ 52 -n 52 -S 51 -A 51 -b 51 -j 51 -ǂ 51 -Q 51 - 51 -E 51 - 51 -A 51 - 51 diff -Nru spamassassin-3.4.6/trunk-only/lm/ka.lm spamassassin-4.0.0~rc3/trunk-only/lm/ka.lm --- spamassassin-3.4.6/trunk-only/lm/ka.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ka.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 14926 - 7221 - 5780 - 4137 - 2966 - 2908 - 2607 - 2372 - 2260 - 2080 - 2078 - 2005 - 1598 - 1383 - 1363 -_ 1248 -_ 1149 - 1145 - 1009 - 974 -_ 965 -_ 964 - 912 - 901 - 897 - 820 -. 813 - 767 -" 762 -._ 735 -, 720 -,_ 718 - 684 -_ 669 - 653 - 631 - 622 - 575 - 570 - 567 - 551 -_ 550 - 542 -_ 526 - 518 - 517 - 485 - 479 - 478 -_ 474 - 468 -_ 436 - 435 - 420 - 419 - 418 - 416 - 412 -_ 407 -_ 404 -_ 393 - 384 - 382 - 376 -_" 374 -_ 371 - 369 - 364 - 360 - 358 - 353 - 349 - 349 - 342 - 341 - 335 - 334 - 332 - 326 -_ 322 - 321 - 319 -_ 319 -_ 319 - 317 -_ 316 - 316 - 306 -_ 299 -_ 288 - 279 - 273 - 271 - 270 -_ 267 - 267 -_ 266 - 263 - 260 -_ 256 - 255 - 238 - 238 - 234 - 233 - 230 - 229 -_ 227 -"_ 225 - 224 -: 224 -:_ 223 -. 221 -__ 217 - 215 - 213 -, 213 -,_ 212 -_ 211 -_ 209 -_ 208 - 208 - 206 -_ 204 - 203 - 203 - 203 -._ 201 -. 200 -- 193 - 192 - 192 -_ 189 - 188 - 188 - 187 -_ 185 - 183 - 179 -._ 177 -_ 177 - 174 - 174 - 173 - 172 -_ 172 - 172 - 171 -_ 170 -_ 170 -_ 170 -_ 169 - 166 - 166 -_ 165 -_ 165 -_ 163 - 162 -_ 160 - 158 -_ 155 - 154 - 153 - 151 -_ 149 - 148 -,_ 147 -, 147 - 147 - 145 - 145 - 143 - 143 - 143 - 142 - 142 - 141 - 140 - 139 -_ 139 - 139 - 138 -_ 136 -_ 135 - 133 -_ 132 - 131 - 130 - 130 - 130 - 128 - 125 - 125 - 125 -_ 124 - 124 -_ 124 - 123 -_ 123 - 122 -_ 121 - 121 -_ 120 - 120 - 116 -_ 114 - 113 - 113 - 113 - 112 - 112 - 112 - 112 - 111 - 111 - 109 - 109 - 107 -_ 107 -_ 107 - 107 -_ 106 - 106 -_ 106 -_ 105 - 104 - 104 -_ 104 - 103 -_ 103 - 103 - 103 -_ 103 - 102 -_ 102 - 102 - 102 - 102 -_ 101 -_ 101 - 100 -_ 100 - 99 - 99 - 99 - 99 - 97 - 97 - 96 - 94 - 94 -_ 94 -,_ 93 - 93 - 93 -_ 93 -, 93 -_ 93 - 93 - 92 - 92 -_ 92 - 91 - 91 - 91 - 90 -_ 90 - 89 - 89 - 89 - 89 - 89 - 89 -" 89 -. 88 - 88 - 88 -_ 87 -_ 87 - 87 - 87 - 87 - 87 - 87 - 85 -_ 85 - 85 - 85 - 85 -_ 84 -. 84 -_ 83 -._ 83 -_ 83 -_ 83 - 83 -._ 82 - 82 -_ 82 - 82 - 81 -_ 81 -" 81 - 80 -_" 80 - 80 -__ 79 -_ 79 - 79 - 79 - 79 -_ 79 - 79 - 78 -, 78 - 78 - 78 - 78 - 78 -,_ 78 - 78 - 78 -__ 77 - 77 - 77 - 77 -_ 77 - 77 - 77 - 77 - 76 -_ 75 -_ 75 - 75 - 75 -_ 75 - 75 - 74 - 74 - 74 -_ 74 - 73 - 73 - 73 - 73 - 73 - 73 - 73 - 72 - 72 -_ 72 - 71 -_ 71 - 71 - 71 - 71 - 71 - 71 - 70 -_ 70 - 69 -_ 69 - 69 -_ 67 - 67 - 67 - 67 - 67 - 67 - 67 - 66 -_ 66 - 66 - 66 - 66 - 66 - 66 -_ 66 - 65 - 65 - 65 - 65 -_ 65 - 65 - 65 -_ 64 -_ 63 - 63 -", 63 - 63 - 63 - 63 - 63 - 62 -" 62 - 62 -? 62 -",_ 62 -! 62 -_ 62 diff -Nru spamassassin-3.4.6/trunk-only/lm/ko.lm spamassassin-4.0.0~rc3/trunk-only/lm/ko.lm --- spamassassin-3.4.6/trunk-only/lm/ko.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ko.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 11636 - 2659 - 1629 - 1578 - 1458 - 1397 - 1299 - 1118 - 1005 - 928 - 849 - 840 -_ 809 - 808 - 780 - 773 - 764 - 674 - 640 - 591 - 580 - 538 - 526 - 519 - 518 -_ 518 - 506 - 483 - 464 - 463 - 454 - 451 - 404 - 395 - 384 -_ 382 - 377 -. 374 - 373 - 358 -._ 347 -_ 344 - 338 -_ 333 -_ 329 - 327 -_ 319 -_ 317 -. 313 -. 313 - 308 - 308 -._ 301 -._ 301 -_ 299 -_ 291 - 288 - 282 - 279 - 278 - 274 -_ 271 -_ 269 -, 266 - 266 - 261 - 258 -,_ 258 - 250 - 248 -_ 246 - 245 - 244 -_ 243 -_ 243 -_ 242 - 238 - 235 - 234 -_ 234 - 234 -_ 233 - 228 - 227 - 222 - 222 -_ 215 - 212 -_ 210 -_ 208 -_ 206 -_ 206 -_ 205 -_ 205 -_ 204 - 198 - 198 -_ 194 -_ 193 - 193 -_ 193 -_ 192 - 192 -_ 190 -_ 189 -_ 189 -_ 189 - 188 - 188 -_ 188 -_ 186 - 177 - 175 - 171 - 161 - 154 -_ 153 - 152 - 151 - 150 - 147 - 147 - 145 - 143 - 142 - 142 -_ 141 - 140 - 139 - 138 - 138 - 137 - 136 - 134 - 134 -_ 133 - 132 -_ 127 - 125 -_ 123 - 122 -_ 121 - 121 - 118 - 117 - 116 -_ 115 - 115 -_ 115 - 114 -ִ 113 - 112 - 111 - 109 - 109 - 108 - 108 -_ 108 - 107 -_ 107 - 107 - 106 -ִ 105 -ȸ 103 - 101 -_ 101 - 100 -_ִ 100 -õ 100 - 100 -" 98 - 97 - 97 - 97 - 95 -_ 94 - 94 - 94 -_ 94 - 94 - 94 - 92 - 92 -_ 91 - 91 -ϰ 90 - 90 -_ 90 - 89 - 89 -_ 89 -_ 89 -_ 89 - 89 - 88 - 88 - 88 - 88 - 87 -_ 87 - 85 -_ 85 -_ 84 - 84 - 84 - 84 - 83 - 83 -_ 82 -ϰ 82 - 81 - 80 -_ 79 -_ 79 -_ 78 - 78 - 78 -_ 78 - 78 -' 77 - 77 - 77 - 77 - 77 -_ 76 -_ 76 - 76 -_ 75 -( 74 -) 74 - 74 - 74 - 73 -_ 72 -_ 72 -_ 72 -- 72 - 72 -ִ 72 - 71 -ִ 71 - 70 - 70 - 70 - 69 - 69 -_ 69 -_ִ 69 -_ 69 -_ 69 -ߴ 69 - 68 - 68 -_ 68 -_ 68 -_ 67 -ü 67 - 66 -__ 66 -ߴ 66 - 65 - 65 -_ 65 -_ 65 -ߴ 64 -ߴ 64 -_ 63 - 62 - 62 -ϴ 62 - 62 -_ 62 - 61 - 61 -ϰ 61 -̴ 60 - 60 -ϰ 60 - 59 -__ 59 -_ 59 - 59 - 58 -_ 58 -_ 58 -_ 58 - 57 -ߴ. 57 - 57 - 57 -ߴ. 57 - 57 - 57 -ִ. 56 -_ 56 -ִ. 56 - 56 -ߴ._ 56 - 56 - 55 - 55 - 55 -Ʈ 55 - 55 -̴ 55 -ִ._ 54 -_ 54 -_ 53 - 53 - 53 - 53 -_ 53 - 53 - 53 -_ 53 - 53 - 52 -_ 52 -_ 52 - 52 -_ 51 - 51 - 51 - 51 -ȭ 51 - 50 -_ 50 - 50 -ġ 50 -ϰ_ 49 -ϰ_ 49 -_ 49 - 49 - 49 -_" 48 - 48 - 48 -̴ 48 - 48 -_ 48 -̴ 48 - 47 -̴. 47 -_ 47 -̴. 47 -_ 47 -_ 47 - 47 - 47 -_ 46 - 46 -_ 46 -_ 46 - 46 -ϴ 46 -_ 45 -_ 45 -_ 45 - 45 - 45 - 45 -̴._ 45 - 44 - 44 - 44 -_ 43 -(_ 43 - 43 - 43 -_ 43 - 42 - 42 -_ 42 -_ 42 -__ 42 -_ 42 - 42 - 41 - 41 - 41 - 41 - 40 -õ 40 - 40 - 40 - 40 -_ 40 - 40 - 40 -_ 40 -_ 39 -_ 39 - 39 - 39 -_ 39 -_ 39 - 38 - 38 - 38 -_ 38 diff -Nru spamassassin-3.4.6/trunk-only/lm/la.lm spamassassin-4.0.0~rc3/trunk-only/lm/la.lm --- spamassassin-3.4.6/trunk-only/lm/la.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/la.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 20136 -e 6892 -i 5604 -a 5443 -u 4581 -t 4552 -s 4354 -r 3923 -n 3375 -m 3063 -o 2921 -c 2224 -l 1805 -e_ 1625 -s_ 1503 -p 1424 -d 1397 -, 1285 -,_ 1276 -er 1077 -qu 1028 -q 1028 -a_ 1019 -t_ 1018 -is 942 -_a 921 -re 902 -m_ 891 -v 858 -b 821 -um 808 -_s 773 -us 772 -en 766 -nt 733 -in 729 -ue 727 -te 720 -g 718 -_i 710 -_p 679 -it 676 -_c 669 -et 653 -que 652 -_e 643 -at 643 -ue_ 616 -ra 614 -que_ 611 -f 601 -or 598 -ri 576 -ti 572 -ta 559 -tu 552 -an 551 -ae 527 -_m 513 -am 501 -_t 493 -us_ 488 -is_ 487 -es 479 -em 479 -_f 451 -um_ 443 -_v 442 -ia 442 -li 438 -_d 436 -. 432 -i_ 430 -et_ 429 -ni 412 -ne 409 -h 406 -de 404 -ur 396 -._ 392 -ar 388 -os 388 -mi 382 -pe 382 -la 376 -st 371 -s, 368 -di 367 -_et 366 -s,_ 365 -_in 363 -on 360 -o_ 359 -_n 351 -_et_ 351 -as 346 -im 336 -na 327 -se 320 -ma 315 -cu 307 -vi 306 -si 303 -ro 303 -r_ 302 -su 299 -un 295 -_l 291 -to 291 -ec 290 -ci 288 -co 287 -_r 287 -ere 286 -ce 284 -tr 280 -re_ 278 -ent 275 -x 275 -ct 274 -ve 271 -ru 259 -ul 256 -me 255 -ui 255 -c_ 252 -_o 250 -ic 249 -ns 247 -_qu 242 -_q 242 -no 241 -ant 235 -am_ 235 -_co 233 -sa 231 -ca 230 -t, 226 -mu 225 -t,_ 225 -_re 223 -el 222 -ib 222 -id 218 -om 212 -_te 211 -al 209 -le 209 -it_ 208 -mo 208 -ol 206 -_u 203 -; 199 -_h 199 -ac 198 -;_ 198 -bu 197 -nu 196 -ua 195 -n_ 195 -ll 194 -tis 191 -A 189 -rt 188 -ge 188 -nd 187 -au 187 -lu 186 -iu 185 -squ 185 -per 185 -sq 185 -ter 185 -pa 183 -_A 183 -em_ 183 -ia_ 180 -ed 179 -_pe 178 -m, 176 -sque 175 -_su 175 -ae_ 175 -m,_ 175 -pr 175 -bi 175 -bus 174 -_vi 174 -os_ 173 -ta_ 172 -mqu 171 -mq 171 -ss 170 -sque_ 169 -ibu 167 -ad 166 -ibus 165 -I 164 -nte 163 -ra_ 163 -mque 162 -_de 162 -po 161 -_se 160 -ere_ 160 -nc 160 -qua 159 -T 159 -lo 157 -oc 156 -mque_ 156 -_T 155 -_pa 155 -_pr 155 -tem 154 -bus_ 152 -nti 149 -rum 149 -er_ 149 -ab 148 -ir 148 -da 147 -_ve 146 -ibus_ 146 -ex 146 -ut 145 -pi 145 -tur 145 -_ca 143 -_me 142 -es_ 142 -gi 142 -te_ 141 -_I 141 -vo 141 -do 141 -_si 140 -tus 139 -il 137 -_ar 136 -du 133 -nt_ 133 -uc 133 -fa 132 -as_ 132 -rr 131 -ba 130 -_ad 128 -ne_ 127 -_ma 127 -ens 127 -gn 126 -s. 126 -y 126 -min 125 -ris 124 -in_ 123 -tum 123 -P 123 -_g 123 -mp 123 -e, 122 -io 122 -_P 122 -ea 122 -hi 122 -e,_ 121 -era 120 -sc 120 -_la 120 -qui 120 -unt 120 -fe 119 -_in_ 118 -_no 118 -ore 118 -iam 118 -va 117 -tis_ 117 -s._ 117 -at_ 117 -eri 116 -d_ 116 -con 115 -fu 115 -pu 114 -cum 114 -ub 114 -ng 114 -ine 113 -_au 113 -: 113 -_di 112 -ag 111 -_con 111 -ect 111 -i, 111 -equ 111 -i,_ 111 -be 111 -eq 111 -_po 110 -so 110 -:_ 110 -nis 109 -ha 109 -uo 109 -_fa 108 -na_ 107 -ip 107 -is, 107 -_cu 106 -cr 106 -ate 105 -is,_ 105 -ig 105 -tor 105 -rat 104 -_qua 103 -eg 103 -a, 103 -a,_ 102 -tra 102 -_mo 101 -sp 101 -mis 100 -itu 100 -D 99 -ali 99 -eb 99 -eni 99 -_sa 98 -ie 98 -imu 98 -_ex 97 -_D 96 -res 95 -est 94 -tri 94 -ene 94 -_mi 94 -str 94 -enti 93 -t. 92 -av 92 -_per 91 -ur_ 91 -ora 91 -lt 91 -umqu 90 -_vo 90 -umq 90 -up 89 -t._ 88 -quo 88 -_ne 88 -gen 88 -rum_ 87 -tqu 87 -tq 87 -_fu 86 -ep 86 -ma_ 86 -umque 86 -it,_ 85 -ine_ 85 -it, 85 -men 85 -mus 84 -ort 83 -ven 83 -ina 83 -us,_ 83 -us, 83 -tque 82 -_ge 82 -per_ 82 -mor 82 -inc 82 -are 81 -tus_ 81 -_an 81 -rim 81 -tque_ 81 -ot 81 -ani 80 -H 80 -_tu 80 -ho 80 -tem_ 80 -u_ 80 -ser 79 -um,_ 79 -um, 79 -S 79 -ten 79 -ver 79 -sti 79 -ntu 78 -fer 78 diff -Nru spamassassin-3.4.6/trunk-only/lm/lt.lm spamassassin-4.0.0~rc3/trunk-only/lm/lt.lm --- spamassassin-3.4.6/trunk-only/lm/lt.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/lt.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 23070 -i 8196 -a 7763 -s 5179 -e 3458 -o 3425 -u 3371 -t 3344 -r 3240 -n 3070 -k 3019 -l 2060 -p 1889 -s_ 1756 -m 1680 -d 1640 -v 1590 -, 1501 -,_ 1497 - 1400 -g 1302 -j 1200 -o_ 1138 -. 1128 -ai 1113 - 1075 -_p 1047 -_k 1035 -i_ 990 -._ 984 -as 975 -b 937 -au 903 -is 863 -_n 815 -ka 811 -si 804 -_s 799 -ia 796 - 759 -ta 735 -ie 731 -ti 728 -y 721 -_t 711 -in 697 -_i 686 -us 675 -pa 658 -ir 640 -ar 633 - 620 -_a 617 -r_ 609 -ne 583 -a_ 578 -ri 569 -_v 558 -_pa 541 -al 540 -ra 531 -li 522 - 509 -u_ 493 -vi 490 -_ka 489 -da 487 -_ne 482 -_j 481 -en 478 -_ 445 -os 444 -ki 442 - 441 -an 440 -ik 434 -ma 433 -as_ 430 -st 420 -_d 420 -ai_ 417 -s,_ 396 -am 396 -is_ 396 -s, 396 -_ir 390 -jo 387 -ir_ 385 -at 384 -_ir_ 383 -i 381 -ni 377 -ga 376 -_b 367 -na 366 -e_ 365 -to 352 -pr 337 -_g 332 -_m 332 - 328 - 326 -io 323 -ei 323 -_ 321 -su 320 -i 320 -uo 319 -la 317 -er 303 -va 299 -vo 298 -i 293 -es 291 -- 290 -_ 286 --_ 285 -_vi 284 -_- 283 -ko 283 -_-_ 283 -iau 281 -sa 278 -s. 278 -iu 276 -et 274 -nu 265 -ja 262 -_ 262 -_ta 262 -s._ 259 -el 258 -j 258 -os_ 256 -im 255 -it 254 -_pr 253 -no 252 -av 251 -ur 251 -_ 248 -mi 246 -ve 245 -ak 245 -ku 243 -ek 241 -tu 241 -_ 241 -ad 241 - 238 -_l 238 -_i 236 -us_ 236 -_su 232 -oj 231 -au_ 231 -ba 224 -nt 218 -me 214 -te 210 -jo_ 208 -ro 205 -s 204 -i 203 -tai 203 -_ 201 -l 201 -pas 200 -ip 198 -iai 197 -di 195 -usi 194 -vo_ 193 -kai 190 -i, 189 -i,_ 189 -sk 187 -_r 186 -aus 184 -ap 183 -gi 182 -mo 182 -uk 181 -t_ 180 -_da 177 -be 176 -ien 176 -o, 174 -il 174 -o,_ 173 -ti_ 173 -re 172 -_nu 171 -ia 171 -_pas 169 -pri 169 -_ 169 -ok 168 -d 166 -l 162 -bu 161 -i 160 -on 160 -asi 159 -id 158 -ul 157 -ji 157 -aip 156 -ia_ 155 -_sa 154 -ot 154 -gal 153 -nk 153 -om 152 -p_ 151 -_pri 151 -od 151 -vis 150 -_at 150 -vie 150 -uv 150 -ab 150 -i_ 149 -ama 149 -n 149 -A 149 -sta 148 -kr 148 -_A 145 -ais 144 -rt 143 -J 142 -_J 142 -jo 142 -__ 141 -K 140 -_K 139 -pi 139 -avo 139 -ng 139 -mas 138 -du 138 -ug 137 -_ga 137 -ol 136 -tik 135 -ali 135 -.. 135 -_vis 135 -iek 134 -ini 133 -kad 133 -a, 133 -le 133 -k 133 -T 133 -t 132 -i. 132 -_T 131 -d 131 -a,_ 131 -go 131 -ip_ 131 -aip_ 131 -r 129 -a 129 -di 129 -ke 128 -k_ 128 -d_ 127 -ad_ 127 -_ti 127 -_ma 126 -_va 125 -i._ 124 -z 123 -k 123 -iau_ 121 -m_ 120 -kar 119 -um 119 -t 119 -_kad 118 -u 117 -tr 117 -_kai 117 -as, 116 -og 116 -kad_ 116 -as,_ 116 -_ji 116 -rie 115 -yt 114 -_ja 114 -_ko 114 -v 114 -ys 114 -jau 113 -ar_ 113 -pra 112 -a 112 -ant 112 -kl 111 -tas 111 -gu 111 -_ku 110 -si_ 110 -pe 109 -eb 109 -N 109 -jo_ 108 -_kad_ 108 -se 108 -_ki 108 -or 107 -ly 107 -lo 107 -iai_ 107 -_la 106 -ts 106 -s 106 -ig 105 -_N 105 -ut 105 -_u 105 -s_ 105 -avo_ 104 -ie_ 104 -a. 104 -kt 104 -em 103 -do 103 -je 102 -ks 102 -ats 101 -_be 101 -ris 101 -l_ 101 -_vie 101 -tin 101 -ag 100 -dam 100 -_st 100 -a._ 99 -_bu 99 -? 99 -V 98 -io_ 98 -kas 98 -_jo 98 -vien 97 -_gal 97 -t 97 -kia 97 -lia 96 -c 96 -uri 96 -_V 96 -?_ 96 -uvo 95 -ru 95 -ty 95 -ep 94 -nd 94 -lai 94 -_tai 94 -ju 93 -man 92 -o. 92 -buv 92 -t 92 -_i 91 -i_ 91 -_i_ 91 -ik 90 -o._ 90 -_to 90 -bi 90 -up 89 -po 89 -rs 89 -_prie 88 -,_ 88 -aik 88 -ui 88 -_tik 88 -ij 88 -, 88 -pat 88 -prie 88 -I 87 -ies 87 -tai_ 87 -n_ 87 -pasi 87 -ius 87 -t 87 -eik 86 -_me 86 -ina 86 diff -Nru spamassassin-3.4.6/trunk-only/lm/lv.lm spamassassin-4.0.0~rc3/trunk-only/lm/lv.lm --- spamassassin-3.4.6/trunk-only/lm/lv.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/lv.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 24504 -a 8735 -i 7353 -s 6064 -t 5176 -e 4390 -r 4339 -u 4200 -n 3422 - 3055 -m 2817 -p 2755 -k 2703 -o 2643 -s_ 2595 -d 2131 -l 2035 -j 1972 - 1958 -ie 1887 -v 1822 -as 1530 -u_ 1396 -_p 1380 -b 1357 -z 1311 - 1267 -a_ 1261 -as_ 1217 -. 1065 -, 1048 -,_ 1033 -g 1010 -ar 970 - 965 -ti 962 -c 922 -_a 876 -ja 838 -st 828 -_i 822 -_v 805 -pa 792 -_t 775 -._ 774 -um 760 -_k 749 -_ 734 -_n 728 -es 712 -i_ 706 -at 703 -is 695 -_s 680 -ai 649 -ta 635 -an 631 -ka 621 -r_ 615 -b 586 -ij 585 -_u 568 -_pa 548 -un 541 -no 539 -va 537 -ma 525 -ra 522 -ri 515 -iz 512 -in 509 -vi 508 -pr 506 -sa 487 -ju 486 -t 483 -ik 473 -n_ 472 -am 454 -en 452 -tie 440 -na 432 -a 430 -tu 420 -ija 420 -ir 419 -o_ 415 -m_ 414 -li 411 -ci 409 -ku 404 -mi 401 -_no 398 -ek 398 -_un 397 -t_ 395 -_l 394 -un_ 393 -_d 393 -ot 392 -_un_ 392 -ies 391 -ar_ 388 -n 387 -da 387 -ei 385 -em 382 -_ti 382 -pi 380 -al 368 -ba 356 -ts 355 -_iz 353 -ap 350 -jas 349 -ko 346 -au 345 -an 339 -re 339 -ni 337 -k 328 -ro 327 -et 326 -r 325 -ga 323 -mu 322 -jas_ 321 -tr 317 -_va 312 -te 310 -_pr 307 -sp 298 -sk 297 -ne 295 -ba 293 -s 289 -ijas 287 -_ar 283 -la 283 -to 282 -ad 280 -dz 278 -g 277 -t 277 -j 277 -_sa 277 -j 274 -_m 273 -ties 273 -l 272 -ijas_ 269 -_at 269 -ed 267 -_pi 267 - 267 -s, 265 -s,_ 265 -r 261 -gu 258 -f 258 -si 257 -m 256 -nt 254 -tu_ 254 -_r 253 -ru 252 -j 251 -jum 251 -s_ 250 -t 249 -iem 248 -_b 248 -_vi 245 -par 244 -pie 244 -rt 243 -v 242 -_ne 240 -r 240 -ai_ 239 -_. 239 -_j 237 -us 237 -_ka 236 -er 232 -bas 232 -_tie 232 -_par 230 -di 229 - 228 -ms 228 -d 226 -bas 224 -om 220 -bu 219 -umu 217 -iek 216 -kt 216 -it 216 -r 215 -_ko 214 -ana 211 -k 211 -or 210 -de 210 -in 207 -d 204 -ur 203 -pri 203 -_c 202 -ta_ 202 -bas_ 201 -es_ 201 -_pie 200 -il 200 -os 199 -ana 199 -id 198 -L 198 -_ie 197 -bi 194 -ak 194 -ja_ 194 -bas_ 193 -t 192 -bu 192 -_g 191 - 189 -ma_ 189 -ien 188 -kum 187 - 187 -_ir 186 -on 186 -_ties 185 -z 185 -ce 185 -ied 184 -ist 183 -ts_ 183 -_ 183 -_ 182 -m 181 -vie 180 -__ 180 -cij 180 -ka_ 179 -_ap 175 -s 174 -ir_ 174 -zi 174 -uma 173 -l 172 -_ir_ 172 -o 171 -_da 169 -_ 168 -ar 168 -) 167 -do 166 -ve 166 -( 165 -ls 165 -bu_ 164 -val 164 -mu_ 164 -isk 163 -uz 161 -av 160 -par_ 160 -_v 159 -_par_ 158 -vr 158 -_ar_ 157 -rie 157 -_uz 157 -aj 156 -bu_ 156 -oj 155 -k_ 155 -ld 154 -iet 154 -iku 154 -ks 153 -du 153 -ep 153 -ms_ 152 -ec 152 -V 151 -ais 150 -str 150 -nie 149 -am_ 149 -ums 148 -_( 147 -ju_ 146 -z_ 142 -ru_ 142 -j 142 -gum 142 -u,_ 141 -u, 141 -i 141 -uma_ 141 -rt 141 -gu 141 -me 140 -d 140 -t 140 -ent 139 -ikum 138 -p 138 -em_ 138 -_L 138 -lie 136 -sta 136 -r_ 136 -lst 136 -eik 135 -se 135 -s. 134 -pro 134 -rs 134 -s._ 134 -tik 134 -l 134 -ska 133 -pap 133 -kas 133 -rm 133 -ju 133 -p 132 -nu 132 -T 132 -p 131 -tei 131 -nas 131 -_V 131 -jo 131 -lg 131 -ut 131 -iem_ 130 -ras 129 -pu 129 -_li 129 -_ga 128 -dar 128 -_k 128 -umu_ 127 -v 126 -gum 126 -kas_ 126 -tb 125 -vai 125 -lgu 125 -P 125 -ar_ 125 -ev 124 -lai 124 -r 124 -lgum 124 -tv 123 -a 123 -_ar_ 122 -_ar 122 -_vie 121 -S 121 -_T 120 -ju 120 -teik 120 -cija 119 -rb 119 -_ 119 -j_ 119 -nas_ 118 -tj 118 -vrt 118 -iec 118 -_la 117 -d 116 -_vai 116 -jum 116 -vien 116 -als 116 -_l 116 -apr 115 -rts 115 -isi 115 -pr 115 -pap 115 -papr 115 -ap 115 -tsp 115 -m 114 -im 114 -be 114 -is_ 114 -alst 114 -_ja 114 -rtspa 113 diff -Nru spamassassin-3.4.6/trunk-only/lm/mr.lm spamassassin-4.0.0~rc3/trunk-only/lm/mr.lm --- spamassassin-3.4.6/trunk-only/lm/mr.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/mr.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ - 17815 -_ 14534 - 4035 -_ 3087 - 2180 - 1762 - 1669 - 1654 - 1534 - 1480 - 1433 - 1342 - 1289 - 1237 - 1163 - 1158 - 1153 -_ 1133 - 1099 - 1084 - 1062 - 1059 -_ 1054 - 1054 - 1050 - 1039 - 989 - 983 - 968 - 965 - 949 -_ 936 -. 936 - 915 - 859 - 842 - 838 - 836 - 769 - 764 - 710 - 710 - 684 - 681 -._ 670 -_ 637 - 609 - 578 -_ 578 -_ 569 -_ 543 - 530 -_ 530 - 524 -_ 523 - 511 - 504 -_ 495 -_ 477 - 476 - 474 -_ 474 -_ 457 -_ 447 -_ 447 -_ 446 - 444 - 438 - 423 - 422 - 409 - 388 - 387 - 381 -_ 366 - 359 - 339 - 334 -_ 332 - 331 - 324 - 320 -_ 320 - 318 - 315 -_ 315 -_ 314 - 313 - 306 -_ 303 - 301 - 297 - 297 - 295 - 284 - 280 - 274 -_ 272 - 270 - 268 -_ 268 - 264 - 264 - 263 -, 258 - 256 - 256 -_ 256 -,_ 255 - 255 - 249 - 247 - 243 - 241 -_ 234 -_ 233 - 232 - 232 - 231 -_ 231 - 230 - 228 - 227 - 226 - 225 -_ 223 - 221 - 220 -_ 220 - 219 -_ 218 - 217 -. 216 - 215 -_ 213 -.. 209 -_ 209 - 205 - 205 - 204 - 204 - 203 -_ 202 -_ 202 - 201 - 198 -_ 198 - 193 -_ 191 - 190 -._ 189 - 188 - 188 - 187 - 186 - 186 - 185 -_ 180 -_ 180 -_ 180 - 179 - 178 -_ 176 -_ 175 -_ 175 - 175 -_ 175 - 174 - 171 - 170 -_ 170 -... 168 - 167 - 166 -_ 164 - 164 - 163 - 163 - 162 - 162 -_ 162 -_ 161 - 160 -_ 159 - 159 - 157 - 154 - 154 -_ 154 -_ 154 - 153 - 153 - 151 - 151 -_ 151 - 150 - 150 - 150 -. 149 -_ 149 - 148 - 148 - 147 - 147 -ţ 146 -_ 146 -_ 145 -._ 145 - 144 - 143 - 142 - 140 - 140 - 139 - 139 - 137 - 136 -_ 136 - 136 -_ 135 -. 135 - 135 -' 135 -ţ 134 -_ 132 - 131 -_ 131 - 129 -'_ 129 -_ 129 -._ 128 - 127 -.... 127 - 127 - 126 - 125 -_ 124 -_ 123 - 123 - 122 -; 122 -_ 121 -_ 119 - 118 - 115 - 114 -_ 114 - 113 - 113 - 113 -b 113 - 112 -_' 112 -s 111 -& 111 - 111 - 111 - 111 -p 111 - 111 -_ 110 - 110 -bs 109 - 109 -n 109 - 109 -_ 108 -&n 107 -bsp; 107 -nbsp; 107 -sp; 107 -nb 107 -bsp 107 -nbs 107 -sp 107 -nbsp 107 -&nb 107 -  107 -p; 107 -&nbs 107 - 106 -_'_ 106 - 106 - 106 - 106 -_ 105 - 104 - 104 - 104 - 104 -_ 103 - 103 - 103 - 102 - 101 - 100 - 99 -, 99 -_ 98 -,_ 98 -_ţ 98 - 98 -_ 98 -_ 97 -;& 97 -_ 97 - 97 -_ 96 - 96 - 96 - 96 - 96 -;&nb 95 -p;&nb 95 -;&n 95 -p;& 95 -;&nbs 95 -bsp;& 95 -..... 95 -_ 95 -sp;&n 95 -sp;& 95 -p;&n 95 - 94 -_ 94 - 94 -_ 94 - 93 - 93 -_ 93 -_ 93 - 93 -_ 92 - 92 -_ 92 -_ 92 - 92 -_ 91 - 91 -_ 90 -_ 90 -_ 90 - 90 - 90 - 90 - 89 - 89 - 89 -_ 89 - 89 - 89 - 89 - 89 - 89 -_ 88 - 88 - 88 -_ 88 -_ 88 - 87 - 87 - 87 - 87 -_ 87 - 87 - 87 - 86 -_ 86 -_ 85 - 85 - 85 -_ 85 - 85 -_ 84 - 84 - 83 - 83 - 83 - 83 - 83 -_ 83 -_ 82 -_ 82 -_ 82 -_ 82 - 82 - 82 -_ 82 -_ 82 -_ 82 -_ 81 - 81 -._ 80 - 80 -_ 80 -. 80 - 79 -_ 79 -_ 79 - 79 diff -Nru spamassassin-3.4.6/trunk-only/lm/ms.lm spamassassin-4.0.0~rc3/trunk-only/lm/ms.lm --- spamassassin-3.4.6/trunk-only/lm/ms.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ms.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 87128 -a 50232 -n 25424 -e 18746 -i 18605 -an 14419 -u 12470 -k 11955 -t 11875 -r 11007 -d 9856 -g 9545 -m 9390 -s 8926 -l 8631 -n_ 8004 -an_ 7095 -p 6890 -a_ 6739 -b 6645 -ng 6630 -h 5964 -da 5153 -_d 5107 -er 4625 -ka 4448 -la 4339 -y 4323 -i_ 4295 -en 4159 -ya 3800 -ang 3778 -_m 3750 -o 3593 -. 3539 -._ 3310 -at 3288 -ah 3216 -_b 3199 -_s 3177 -ta 3076 -ra 3036 -_k 2949 -g_ 2939 -ng_ 2933 -ar 2915 -_p 2906 -me 2884 -ga 2781 -di 2778 -ak 2727 -al 2705 -_me 2671 -ang_ 2524 -h_ 2509 -ba 2508 -pa 2454 -kan 2449 -in 2437 -tu 2411 -_t 2376 -sa 2338 -_da 2276 -j 2276 -pe 2225 -, 2150 -k_ 2147 -ma 2143 -se 2138 -am 2131 -kan_ 2117 -_di 2082 -,_ 2079 -ke 2048 -un 2004 -be 1947 -_a 1925 -na 1871 -ti 1868 -ri 1861 -u_ 1857 -as 1854 -ny 1827 -ha 1789 -te 1788 -_pe 1768 -em 1750 -it 1737 -_i 1732 -_ke 1711 -yan 1706 -ad 1698 -ia 1673 -yang 1673 -_y 1668 -_ya 1655 -yang_ 1653 -_se 1648 -ah_ 1646 -_yan 1639 -_yang 1639 -ala 1612 -nya 1587 -el 1576 -ik 1571 -t_ 1568 -ai 1549 -men 1531 -eng 1522 -_men 1464 -nga 1441 -dan 1366 -_be 1365 -si 1343 -uk 1328 -ada 1299 -nt 1291 -__ 1287 -ap 1276 -ua 1265 -___ 1238 -- 1213 -ja 1211 -ber 1204 -gan 1203 -_ba 1193 -____ 1189 -ni 1181 -_te 1169 -c 1143 -ran 1141 -_____ 1140 -m_ 1127 -ara 1118 -per 1099 -le 1084 -_dan 1083 -dan_ 1079 -ngan 1060 -_dan_ 1050 -ya_ 1046 -at_ 1044 -da_ 1021 -li 1016 -aka 1013 -A 999 -r_ 999 -w 997 -eb 995 -lah 980 -ata 980 -ak_ 978 -nd 974 -_ber 955 -gi 936 -is 933 -il 931 -tu_ 923 -s_ 920 -gan_ 915 -mb 913 -wa 904 -ag 903 -ngan_ 898 -ter 887 -nya_ 877 -S 873 -ek 853 -ru 852 -_l 838 -ela 828 -itu 824 -ol 822 -aha 822 -ada_ 820 -pu 812 -di_ 807 -bu 807 -am_ 804 -ur 801 -tan 790 -mp 790 -_per 786 -_sa 784 -M 782 -ut 781 -us 779 -era 779 -lam 778 -lah_ 775 -asa 767 -ki 761 -ir 759 -de 756 -enga 750 -su 748 -du 741 -id 739 -" 733 -akan 732 -apa 728 -_S 724 -ul 721 -lu 717 -ari 717 -dal 704 -et 698 -es 698 -pad 688 -_ma 688 -_M 685 -ana 684 -bi 679 -pada 673 -dala 673 -l_ 671 -ep 664 -f 662 -_di_ 658 -B 655 -ing 655 -_j 654 -ika 653 -ku 650 -_. 644 -akan_ 642 -ama 637 -pen 636 -alam 634 -eh 634 -pada_ 633 -ai_ 632 -_ter 632 -K 631 -mu 628 -ju 628 -P 626 -mem 625 -au 622 -_mem 614 -lan 612 -_._ 611 -ntu 608 -lam_ 605 -um 601 -on 600 -gk 597 -_in 597 -ngk 597 -a. 584 -meng 582 -_meng 578 -alam_ 577 -_A 576 -aa 575 -uk_ 572 -_pen 569 -ban 569 -or 569 -st 566 -ay 566 -dar 565 -_pa 564 -a._ 564 -_h 562 -bah 562 -_P 560 -D 559 -ri_ 558 -ini 552 -_de 551 -rt 550 -aan 545 -_it 542 -_itu 542 -nda 540 -eri 540 -dalam 537 -_B 533 -_dal 532 -ip 532 -_dala 532 -ta_ 528 -_u 527 -ung 525 -ih 524 -aw 520 -_n 519 -atu 517 -ila 513 -mi 513 -leh 513 -ian 512 -tuk 509 -awa 508 -gu 506 -ert 506 -engan 505 -ole 504 -_K 501 -seb 497 -ca 496 -gg 493 -_ta 489 -ra_ 488 -ngg 488 -itu_ 487 -emb 482 -ni_ 482 -ida 482 -nj 482 -_ti 479 -man 478 -den 477 -_D 474 -_ka 473 -aj 470 -oleh 468 -n. 468 -n._ 464 -ngka 464 -gka 464 -dak 464 -anga 461 -ena 459 -san 458 -pat 458 -rk 458 -( 455 -ent 454 -agi 453 -) 451 -ia_ 450 -ge 450 -ab 449 -im 447 -_ini 446 -ntuk 445 -I 445 -ar_ 440 -N 439 -aan_ 436 -_la 433 -pi 432 -baha 431 -deng 430 -han 430 -bag 429 -eh_ 429 -hu 429 -denga 428 -_o 427 -na_ 427 -T 425 -leh_ 422 -_den 422 -ka_ 419 -any 415 -ud 415 -rang 414 -anya 413 -gi_ 412 -angan 412 -a, 411 -_deng 410 -ita 409 -kat 408 -re 408 -_( 406 -tuk_ 403 -aga 401 -ne 400 -and 399 -aya 398 -_dar 397 -a,_ 396 -ro 396 -ntuk_ 393 -eba 392 -aran 390 -_" 387 -ed 385 -end 384 -ko 383 -sa_ 381 -p_ 381 -ara_ 380 -_seb 379 -alah 379 -oleh_ 379 -an. 378 -dak_ 378 -eg 378 -hi 376 -dari 375 -an._ 375 -au_ 373 -bo 373 -ti_ 371 -ula 371 diff -Nru spamassassin-3.4.6/trunk-only/lm/ne.lm spamassassin-4.0.0~rc3/trunk-only/lm/ne.lm --- spamassassin-3.4.6/trunk-only/lm/ne.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ne.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 7044 -f 2698 -] 1196 -g 933 -s 815 -l 781 -/ 698 -; 662 -k 645 -d 635 -]_ 630 -f_ 611 -sf 549 -f] 541 -n 526 -t 460 -o 412 -j 399 -f]_ 374 -L 365 -_; 364 -x 356 -_k 353 -{ 337 -b 323 -u 321 -' 303 -df 299 -sf] 290 -_l 283 -sf]_ 265 -g] 245 -G 232 -e 231 -| 227 -a 222 -/_ 222 -L_ 211 -_g 210 -c 207 -df_ 207 -{_ 207 -_c 201 -g_ 201 -kf 184 -f/ 177 -_u 171 -/f 168 -P 163 -_/ 162 -k| 161 -_s 161 -} 159 -+ 158 -h 151 -fn 150 -n] 145 -of 141 -tf 140 -: 136 -p 136 -t_ 134 -. 133 -_k| 133 -._ 133 -_e 131 -_d 131 -_f 129 -_._ 127 -_. 127 -n]_ 123 -;f 119 -lj 118 -O 118 -? 118 -q 118 -nf 118 -y 116 -_a 113 -m 111 -Ps 110 -r 110 -fg 106 -w 105 -sf_ 103 -lg 102 -g]_ 100 -gf 94 -_g] 91 -Psf 90 -x? 89 -fd 88 -fO 88 -_lj 85 -]s 85 -z 85 -s_ 84 -_p 82 -_sf 80 -D 79 -kl 78 -_;f 78 -f/_ 77 -cf 77 -}_ 76 -Psf] 76 -jf 76 -, 75 -fl 75 -\ 75 -_x 74 -kfn 74 -f{ 74 -_/f 74 -]k 73 -of] 73 -,_ 72 -v 72 -lt 72 -_cf 72 -_b 71 -O{ 70 -i 69 -xf 68 -]kf 68 -_/_ 68 -Psf]_ 68 -_h 67 -g]kfn 67 -g]k 67 -d_ 67 -g]kf 67 -O{_ 67 -]kfn 67 -_g]k 66 -g' 66 -_g]kf 66 -o_ 64 -" 64 -;b 63 -Gq 63 -f+ 63 -n_ 63 -fk 62 -sf/ 62 -/L 62 -_kl 62 -I 61 -T 61 -/s 61 -If 61 -dG 60 -_j 60 -]sf 60 -;_ 59 -u_ 59 -yf 59 -dGq 58 -fO{ 58 -af 57 -eP 57 -fs 57 -fO{_ 57 -fj 56 -f; 56 -qL 56 -l/ 55 -\_ 55 -;D 54 -dGqL 54 -GqL 54 -;+ 53 -g\ 53 -/sf 52 -nfO 51 -_kf 51 -ug 51 -pg 51 -:t 51 -fp 50 -_ug 50 -u/ 50 -lg_ 49 -ePs 49 -fdf 48 -cl 48 -nfO{_ 48 -nfO{ 48 -;/ 48 -_cl 47 -F 47 -'/ 47 -g\_ 47 -_r 47 -fo 47 -_eP 47 -]{ 46 -Z 46 -/L_ 46 -_f_ 45 -ePsf 45 -gd 45 -_;D 45 -if 45 -Gb 44 -lb 44 -Q 44 -_n 44 -fsf 44 -]sf] 43 -+; 43 -nL 43 -lx 43 -_t 43 -_: 42 -+;b 42 -_o 42 -fdf_ 42 -bf 42 -hf 42 -_lg 42 -ePsf] 41 -j_ 41 -ln 41 -ef 41 -/] 41 -_df 41 -To 40 -klg_ 40 -_klg_ 40 -]sf]_ 40 -klg 40 -_klg 40 -_u/ 40 -f{_ 40 -_ePs 40 -'g 40 -Gg 39 -:y 39 -_g\ 39 -f} 39 -kf_ 39 -:tf 38 -]{_ 38 -fpg 38 -b' 38 -hg 38 -g]{ 38 -jZ 38 -_;+ 37 -gs 37 -wf 37 -o{ 37 -GqL_ 37 -l_ 37 -qL_ 37 -dGqL_ 37 -gf_ 37 -]; 37 -_ePsf 36 -x' 36 -?_ 36 -! 36 -fx 35 -u| 34 -;d 34 -_lb 34 -fn_ 34 -_P 34 -fg_ 34 -= 34 -bn 34 -Zj 34 -o; 34 -g]{_ 34 -_g\_ 34 -kIf 33 -dl 33 -kI 33 -ljZj 33 -jZj 33 -rf 33 -+u 33 -]d 33 -ljZ 33 -nL_ 32 -f+; 32 -fnL 32 -gL 32 -;/sf 32 -tf_ 32 -wfg 32 -_;/ 32 -Qm 32 -fb 32 -f;_ 32 -ld 32 -;/sf/ 32 -/sf/ 32 -_x' 32 -;/s 32 -;f+ 32 -_;f+ 32 -fu 32 -x?_ 32 -;f+; 31 -_k|:t 31 -s' 31 -_kI 31 -_k|: 31 -of]_ 31 -_kIf 31 -_;f+; 31 -]l 31 -k|: 31 -bg 31 -_;/s 31 -|: 31 -f+;b 31 -_;/sf 31 -|:t 31 -|] 31 -k|:t 31 -m_ 31 -;f+;b 31 -Jo 30 -k|wf 30 -|w 30 -|wf 30 -k|w 30 -km 30 -J 30 -k|wfg 30 -|wfg 30 -]t 30 -@ 30 -;f] 30 -b_ 29 -> 29 -kfn_ 29 -fn] 29 -gsf 29 -sf+ 29 -Zjf 29 -]kfn_ 29 -jif 29 -ji 29 -jf; 29 -_k|w 29 -fgd 29 -_k|wf 29 -Zjf; 29 -ljZjf 28 -jZjf; 28 -]n 28 -_z 28 -_s' 28 -_dG 28 -|]; 28 -_;d 28 -jZjf 28 -u|] 27 -gdGq 27 -gdG 27 -?n 27 -x'g 27 -|wfgd 27 -wfgd 27 -gdGqL 27 -+u|] 27 -f+u 27 -fgdG 27 -u|]; 27 -+u|]; 27 -wfgdG 27 -dfg 27 -a} 27 -_dGq 27 -f+u| 27 -fgdGq 27 -sf+u| 27 -_sf+u 27 -f+u|] 27 -+u| 27 -sf+u 27 -_sf+ 27 -x?n 27 -S 26 -_To 26 -]kfnL 26 -_! 26 -_T 26 -ul 26 -/f] 26 -fsf] 26 -af_ 26 -;s 26 -kfnL 26 -|:tf 26 -k|:tf 26 diff -Nru spamassassin-3.4.6/trunk-only/lm/nl.lm spamassassin-4.0.0~rc3/trunk-only/lm/nl.lm --- spamassassin-3.4.6/trunk-only/lm/nl.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/nl.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 20104 -e 9848 -n 5323 -a 3733 -t 3683 -i 3490 -r 3195 -d 2876 -o 2845 -n_ 2443 -en 2439 -s 2195 -e_ 1842 -l 1837 -g 1522 -en_ 1500 -de 1489 -er 1388 -t_ 1377 -v 1253 -u 1217 -k 1204 -_d 1136 -h 1102 -m 1084 -an 939 -te 875 -j 857 -in 810 -_v 793 -r_ 751 -de_ 742 -ee 737 -p 732 -et 718 -ge 716 -aa 708 -b 703 -_e 686 -st 669 -z 668 -ie 662 -_de 655 -w 631 -c 611 -. 604 -s_ 582 -_de_ 576 -_h 572 -el 570 -ij 564 -._ 554 -et_ 531 -an_ 522 -he 505 -_o 497 -nd 478 -_i 475 -ar 459 -_m 451 -re 442 -ve 441 -' 428 -or 424 -ng 421 -at 418 -_s 415 -oo 403 -_z 401 -le 395 -_b 394 -_a 391 -_he 386 -va 385 -er_ 381 -me 372 -_w 368 -f 361 -on 351 -_t 351 -_va 345 -_g 342 -di 342 -nt 340 -, 335 -g_ 335 -,_ 334 -van 327 -ch 326 -is 326 -ing 325 -be 325 -ni 320 -it 317 -een 316 -_van 315 -al 310 -den 309 -ti 309 -van_ 307 -oe 302 -ke 302 -_van_ 299 -aar 299 -d_ 295 -we 293 -da 292 -tu 290 -_ee 290 -ud 287 -een_ 286 -li 284 -es 282 -_st 281 -ver 281 -ten 281 -ri 275 -nde 275 -der 274 -_in 270 -k_ 268 -vo 267 -het 266 -oor 264 -_het 262 -het_ 262 -_het_ 259 -_een 258 -l_ 258 -ze 257 -_n 254 -ro 248 -gen 243 -_een_ 241 -at_ 240 -op 238 -n. 238 -_en 237 -rs 237 -_da 235 -stu 232 -in_ 230 -_be 229 -_ge 228 -_k 226 -rd 226 -tud 220 -_en_ 220 -n._ 217 -te_ 209 -ei 208 -ent 206 -_me 203 -la 202 -ek 202 -ed 201 -ra 200 -stud 200 -en. 200 -ie_ 197 -ste 196 -_vo 195 -_in_ 193 -_stu 191 -zi 191 -om 189 -ui 189 -en._ 186 -ten_ 185 -_stud 185 -ude 184 -die 183 -ns 183 -_j 181 -D 179 -aan 179 -se 179 -ma 178 -_ve 176 -ne 174 -_p 174 -eg 173 -p_ 172 -ar_ 172 -aar_ 171 -_te 170 -ng_ 169 -_we 169 -'' 167 -_D 165 -ers 164 -_op 163 -dat 161 -dat_ 160 -ig 160 -ere 159 -eer 158 -_zi 158 -voor 156 -voo 156 -nge 155 -nder 151 -nte 151 -or_ 150 -ta 150 -je 149 -ing_ 148 -ll 148 -_ver 147 -jk 146 -oor_ 146 -_dat 145 -ijk 145 -ren 145 -is_ 145 -_dat_ 144 -_l 144 -and 144 -lij 143 -ter 143 -na 142 -uden 139 -tude 138 -_voor 136 -_voo 136 -ond 136 -ken 135 -cht 135 -_al 135 -ht 135 -wa 134 -ho 133 -em 133 -den_ 133 -pe 132 -sc 132 -un 131 -ur 131 -_di 130 -gen_ 130 -zo 129 -rt 129 -ev 128 -mo 128 -lijk 127 -_is 126 -stude 124 -ha 123 -to 122 -el_ 121 -og 121 -op_ 121 -sch 120 -ol 120 -ente 119 -_u 118 -pr 118 -end 118 -mi 117 -iet 116 -_aa 116 -eli 115 -dent 115 -ijn 115 -jn 115 -ou 115 -men 114 -_' 114 -tie 113 -_is_ 113 -nie 113 -tr 112 -ak 112 -id 112 -udent 111 -tuden 111 -uit 110 -_te_ 109 -aan_ 109 -ld 109 -S 108 -_aan 108 -ede 108 -ja 107 -nten 107 -it_ 107 -je_ 107 -ts 107 -erd 106 -est 106 -E 105 -_op_ 105 -ad 104 -al_ 104 -_ze 104 -_on 104 -rk 104 -lle 103 -ens 103 -gel 103 -m_ 103 -len 103 -_r 102 -ec 102 -inge 102 -met 102 -_met 101 -si 100 -die_ 100 -us 100 -onde 99 -_ni 99 -De 99 -eu 99 -dente 99 -enten 99 -ic 99 -_met_ 98 -f_ 98 -met_ 98 -no 97 -ko 96 -voor_ 96 -rde 96 -H 96 -ngen 95 -lo 95 -ot 95 -as 94 -zij 93 -_nie 92 -vi 92 -eb 92 -_De 92 -_zij 91 -ep 91 -wi 91 -_zo 91 -kt 91 -ege 91 -G 91 -bi 90 -j_ 90 -ij_ 90 -ze_ 90 -do 90 -lan 89 -ov 89 -udi 89 -ord 89 -onder 89 -V 88 -elij 88 -_wa 88 -elijk 88 -ef 88 -_die 87 -ag 86 -erk 86 -eren 86 -R 85 -ik 85 -_ma 85 -gr 85 -am 85 -_mo 84 -ul 84 -nn 83 -eve 83 -De_ 83 -maa 83 -ingen 83 -wo 83 -_'' 83 -O 83 -tudi 82 -I 82 -nt_ 82 -tudie 81 -ven 81 -udie 81 -nten_ 81 -_die_ 81 -jaa 80 -ka 80 -eke 80 -ite 80 -a_ 80 -_je 80 -ac 80 -jaar 80 -_je_ 79 -_H 79 -_zijn 79 -zijn 79 -n, 78 -nen 78 -N 78 -n,_ 78 -ijn_ 77 diff -Nru spamassassin-3.4.6/trunk-only/lm/no.lm spamassassin-4.0.0~rc3/trunk-only/lm/no.lm --- spamassassin-3.4.6/trunk-only/lm/no.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/no.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 22970 -e 6833 -n 4206 -r 3516 -t 3112 -a 2587 -s 2440 -i 2112 -l 1901 -o 1900 -n_ 1875 -r_ 1761 -k 1713 -g 1630 -en 1615 -m 1508 -e_ 1450 -d 1444 -er 1436 -h 1306 -t_ 1300 -_h 1180 -_s 1148 -er_ 1105 -v 982 -en_ 976 -an 919 -. 901 -._ 791 -_. 781 -et 770 -g_ 762 -_._ 726 - 725 -u 719 -f 709 -p 702 -ha 682 -_ha 672 -de 657 -te 651 -_e 621 -et_ 614 -re 581 -ne 565 -_o 554 -an_ 544 -ke 534 -_, 522 -,_ 522 -, 522 -_,_ 522 -_f 519 -_m 515 -or 503 -_d 483 -_i 480 -_ 479 -se 476 -m_ 469 -nn 454 -b 449 -me 441 - 434 -_a 413 -st 404 -_t 398 -og 380 -_v 377 -_og 366 -ar 364 -el 364 -le 361 -i_ 356 -om 353 -og_ 351 -_og_ 351 -li 350 -_k 346 -_de 339 -ge 339 -han 337 -y 333 -_han 332 -ve 330 -kk 323 -in 311 -_b 307 -fo 301 -j 301 -il 298 -_H 291 -H 291 -han_ 288 -_han_ 288 -for 287 -ik 281 -l_ 278 -kke 277 -tt 276 -ti 270 -ne_ 270 -d_ 269 -ed 269 -om_ 268 -nne 266 -_me 264 -ng 257 -_er 257 -_fo 256 -eg 256 -_se 256 -_g 256 -un 255 -ig 255 -sk 253 -_er_ 252 -_p 252 -_for 250 -ke_ 249 -_n 238 -_l 233 -al 232 -r 222 -s_ 221 -ar_ 215 -at 214 -_en 211 -he 211 -pe 209 -_i_ 208 -am 200 -es 200 -si 200 -enn 197 -det 195 -or_ 193 -vi 190 -ns 189 -ikk 188 -det_ 185 -so 185 -un_ 183 -il_ 181 -nd 181 -te_ 181 -"_ 180 -" 180 -_"_ 180 -_" 180 -em 179 -_ti 176 -kke_ 176 -lig 174 -ten 174 -Ha 173 -_Ha 173 -re_ 172 -ikke 168 -je 165 -Han 165 -ter 165 -_Han 165 -eg_ 164 -p 164 -_p 163 -_si 163 -_ 163 -_Han_ 162 -Han_ 162 -p_ 162 -_p_ 161 -til 160 -som 160 -_so 159 -den 159 -_det 157 -ed_ 155 -ll 155 -_ik 155 -rt 155 -som_ 153 -ra 152 -a_ 152 -har 152 -nt 152 -de_ 152 -tr 151 -v_ 151 -_har 151 -ka 151 -ig_ 150 -_som 150 -for_ 150 -_som_ 150 -_en_ 149 -hu 149 -_ikk 148 -_ham 148 -ham 148 -ste 148 -_det_ 148 -_ikke 148 -enne 148 -ikke_ 148 -har_ 147 -nge 147 -D 147 -_har_ 147 -_D 147 -am_ 147 -ere 147 -ham_ 146 -_ham_ 146 -it 145 -_he 144 -_til 144 -av 143 -va 140 -men 140 -r 140 -_ve 140 -_hu 139 -ta 139 -pen 137 -sp 137 -_st 135 -tte 135 -la 135 -_E 133 -E 133 -den_ 130 -is 130 -til_ 128 -_r 128 -tt_ 128 -r_ 127 -k_ 124 -__ 124 -ri 124 -_til_ 124 -at_ 123 -ene 123 -seg 123 -_av 123 -med 122 -_vi 122 -_seg 122 -seg_ 121 -_seg_ 121 -_for_ 120 -nne_ 120 -ut 120 -_u 119 -mm 119 -mme 119 -De 118 -_De 118 -_at 118 -_hun 117 -hun 117 -ko 117 -be 116 -_at_ 115 -ter_ 115 -pen_ 114 -ker 113 -hun_ 113 -_hun_ 113 -on 111 -lig_ 111 -.. 110 -hen 107 -_med 107 -rs 106 -ser 106 -med_ 105 -_men 104 -_hen 104 -_sk 104 -_med_ 104 -ak 103 -ans 103 -ker_ 102 -av_ 101 -_ka 101 -no 100 -ver 100 -ler 99 -J 99 -spe 99 -ten_ 99 -_J 99 -ene_ 98 -ld 98 -hv 98 -_av_ 98 -ger 97 -ni 96 -gen 96 -ie 95 -ser_ 94 -_et 94 -spen 94 -_hv 94 -men_ 93 -Espe 92 -Es 92 -_Esp 92 -_Es 92 -_Espe 92 -Esp 92 -_al 92 -Espen 92 -lle 89 -rem 89 -id 89 -f 89 -ei 88 -inn 88 -rd 88 -enne_ 88 -_henn 87 -henne 87 -henn 87 -kt 86 -spen_ 86 -_om 86 -ler_ 86 -da 86 -ett 86 -itt 86 -bl 85 -to 85 -_Je 84 -ger_ 84 -Je 84 - 84 -ma 83 -ing 83 -r 83 -ns_ 83 -eli 82 -ang 82 -_be 82 -s 82 -_den 82 -pp 81 -rk 81 -dr 81 -oe 81 -ss 81 -_f 80 -ek 80 -le_ 79 -_no 79 -kj 78 -elig 78 -nes 78 -nn_ 77 -nk 77 -fr 77 -sl 77 -my 77 -kan 77 -s_ 76 -as 76 -_om_ 76 -_kan 75 -_ko 75 -_bl 73 -Hu 73 -nen 73 -_Hu 73 -eng 73 -gj 73 -rt_ 72 -ge_ 72 -ba 72 -lv 71 -rer 71 -nde 71 -ls 70 -lo 70 -ga 70 -_noe 70 -ro 70 -_den_ 70 -_ut 70 -noe 70 -Hun 69 -Hun_ 69 -_in 69 -_Hun 69 -_Hun_ 69 -ren 68 -re 68 -r_ 68 -sen 68 -sa 67 diff -Nru spamassassin-3.4.6/trunk-only/lm/pl.lm spamassassin-4.0.0~rc3/trunk-only/lm/pl.lm --- spamassassin-3.4.6/trunk-only/lm/pl.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/pl.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 31480 -a 7945 -i 7766 -e 7462 -o 6838 -z 5104 -n 5077 -r 4178 -w 4139 -s 3596 -c 3580 -y 3569 -t 3381 -d 3027 -k 2819 -p 2639 -m 2494 -ie 2484 -u 2016 -l 1947 -j 1932 -ni 1930 -e_ 1746 -_p 1712 - 1649 -a_ 1496 -o_ 1431 -, 1368 -,_ 1366 -b 1296 -_w 1257 -g 1249 -i_ 1140 -. 1118 -_s 1045 -ze 1041 -._ 1035 -_n 997 -nie 958 -cz 956 -rz 952 -h 950 -_z 933 - 918 -ow 911 -ie_ 902 -y_ 899 -na 885 -ch 871 -po 864 -pr 863 -wi 851 -st 847 - 835 - 832 -an 814 - 800 -ra 778 -zy 766 -ia 726 -za 718 -_t 699 -wa 692 -ro 692 -_d 683 -_pr 675 - 661 -w_ 658 -sz 652 -_po 649 -_o 628 -m_ 613 -li 613 -dz 611 -ki 611 -en 609 -mi 593 -ta 571 -ci 564 -ej 562 -nie_ 558 -_m 553 -_k 549 -ar 543 -go 541 -_i 540 -em 532 -od 525 -yc 520 -a 511 -rze 508 -do 504 -eg 503 -ko 502 -ac 482 -to 478 -_na 467 -_ni 467 -h_ 466 -ch_ 466 - 465 -i 461 -_b 458 -on 458 -u_ 458 -zi 454 -ka 450 -er 448 -sk 447 -si 447 -wy 444 -te 437 -ak 434 -_ 431 -_j 429 -je 429 -z_ 427 -ny 422 -aw 422 -ne 420 -w 418 -_w_ 415 -_c 414 -ego 412 -prz 412 -_r 410 -al 407 -a 405 -" 405 -re 405 -es 401 -_nie 396 -dzi 394 -ty 389 -j_ 380 -ic 380 -_prz 379 -ad 367 -ej_ 364 -le 359 -_ 358 -ed 354 -ych 346 -_za 346 -_do 344 -zn 344 -go_ 344 -ani 343 -_i_ 342 -no 339 -or 337 -o 336 -tr 334 -P 330 -os 329 -am 329 -da 328 -ec 327 -ol 325 -_ 325 -by 322 -ego_ 321 -at 321 -e 319 -ym 317 -wie 314 -_ 312 -- 310 -na_ 309 -_si 303 -W 301 -as 301 -wo 300 -pa 299 -si 295 -nia 293 -owa 292 -o 286 -_P 283 -el 282 -_si 279 -ja 278 -rzy 276 -prze 276 -_wy 275 -i_ 269 -in 267 -_- 267 -de 267 -kie 267 -dn 264 -ob 262 -_u 261 -ych_ 260 --_ 258 -ez 257 -_-_ 256 -c 255 -ws 255 -ci 254 -em_ 253 -_si_ 253 -si_ 253 -_nie_ 253 -kt 252 -ski 252 -we 251 -_g 251 -_W 250 -t_ 249 -_prze 249 -_je 248 -aj 247 -_a 247 -e_ 246 -_ 244 -ia_ 243 -eni 241 -om 240 -la 240 -k_ 235 -mo 235 -f 234 -pi 232 -is 231 -cze 231 -_z_ 230 - 228 -nt 227 -ce 224 -sta 221 -ry 220 -ma 219 -cj 219 -zie 218 -ek 216 -oc 213 -dy 212 -owi 208 -sp 208 -K 208 -t 205 -_" 204 -ud 203 -S 202 -ier 202 -pra 202 -czn 201 -ys 200 -nia_ 199 -j 198 -_e 196 -oz 194 -N 192 -zo 191 -dzie 190 -ku 190 -w_ 189 -czy 189 -_mi 188 -_e_ 187 -mie 186 -do_ 186 -iej 185 -ym_ 185 -_do_ 184 -cy 184 -_pa 183 -y 182 -_na_ 181 -zy_ 181 -ew 180 -_l 180 -_cz 178 -_by 178 -ru 177 -to_ 175 -c 175 -_wi 175 -ln 174 -_K 171 -ok 170 -ot 170 -raw 169 -nych 168 -nyc 168 -az 168 -ik 167 -bi 167 -i,_ 166 -i, 166 -_te 165 -tu 163 -wan 163 -et 162 -J 162 -r 161 -cie 160 -_od 160 -ba 160 -oj 159 -oc 158 -i 158 -_ro 158 -og 158 -mu 158 -A 158 -oci 158 -d_ 157 -tw 156 -io 155 -gr 155 -_J 155 -_N 155 -_to 155 -us 155 -_ 154 -a 154 -ach 154 -yd 153 -_kt 153 -_ko 152 -_st 152 -pow 151 -yt 150 -kr 149 -_S 149 -a_ 149 -ak_ 149 -li_ 148 -T 148 -ur 148 -sa 148 -op 147 -yw 147 -ent 147 -bo 146 -_sp 145 -O 145 -a,_ 144 -a, 144 -iem 144 -kt 143 -praw 143 -wn 142 -tr 142 -i 141 -y 141 -zu 141 -dni 140 -im 139 -icz 139 -r 139 -e 138 -ktr 137 -my 137 -est 136 -awi 135 -przy 134 -nych_ 134 -e,_ 132 -e, 132 -ki_ 132 -pro 131 -_kt 131 -_ktr 131 -_przy 130 -_ja 129 -szy 127 -ia 127 -Po 127 -ania 127 -M 126 -ze_ 125 -ne_ 125 -s 124 -_ty 124 -sze 124 -a 124 -nn 124 -pod 124 -a_ 122 -B 122 -za_ 122 -cza 122 -o_ 122 -Z 122 -_to_ 121 -iu 120 -zc 119 -esz 119 -skie 118 -i. 118 -_ka 117 -so 117 -trz 117 -o 116 -ieg 116 -nik 116 -ga 116 diff -Nru spamassassin-3.4.6/trunk-only/lm/pt.lm spamassassin-4.0.0~rc3/trunk-only/lm/pt.lm --- spamassassin-3.4.6/trunk-only/lm/pt.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/pt.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 35328 -a 10423 -e 10132 -o 8919 -s 6795 -r 6033 -i 5443 -n 4588 -d 4531 -t 4217 -m 3476 -u 3404 -o_ 3240 -a_ 3029 -e_ 2879 -c 2756 -s_ 2461 -_d 2379 -l 2307 -p 2242 -_a 1753 -de 1751 -, 1660 -,_ 1658 -_e 1454 -es 1447 -os 1412 -ra 1343 -_p 1328 -nt 1302 -_de 1248 -do 1215 -en 1176 -re 1150 -as 1123 -v 1115 -m_ 1113 -de_ 1096 -er 1082 -g 1053 -_c 1047 -da 1008 -co 986 -os_ 975 -te 974 -ar 950 -or 943 -q 938 -qu 938 -_s 908 -ta 902 -_de_ 901 -_o 858 -se 841 -ue 831 -to 799 -ad 777 -. 761 -que 752 -em 751 -an 748 -f 746 -r_ 745 -b 732 -st 718 -is 716 -al 712 -_qu 706 -_q 706 -in 701 -as_ 696 - 695 -do_ 685 -ent 678 -o 677 -_n 671 -_co 660 -_a_ 654 -_m 646 -on 645 - 624 -ri 623 -_que 619 -ma 602 -po 581 -ia 580 -o_ 575 -._ 573 -na 572 -me 564 -ro 554 -_t 544 -pa 533 -da_ 528 -h 523 -ue_ 515 -ca 511 -que_ 509 -nte 503 -no 499 -tr 498 -am 496 -em_ 491 -_que_ 487 -_se 485 -om 471 -io 460 -_do 459 -ti 448 -ci 445 -_da 444 -nd 442 -ei 435 -ra_ 435 -pr 427 -_r 423 -_e_ 420 -_f 420 -ss 412 -es_ 412 -el 407 -id 406 -_o_ 399 -_pa 390 -um 379 -pe 378 -_po 376 -la 374 -ir 371 - 371 -ic 362 -di 362 -li 359 - 359 -_re 353 -ve 353 -mo 350 -s, 349 -s,_ 349 -ou 347 -com 340 -sa 338 -si 338 -men 337 -rt 331 -_i 330 -con 330 -o, 327 -_da_ 326 -o,_ 326 -se_ 325 -_com 325 -ado 323 -to_ 322 -ai 322 -it 320 -A 319 -ec 316 -dos 316 -_em 312 -o 310 -a 310 - 310 -ara 305 -so 299 -tu 299 -res 297 -im 296 -_pr 295 -mi 293 -ua 292 -nto 291 -ment 290 - 290 -par 288 -_do_ 287 -ce 286 -est 286 -u_ 284 -ente 284 -S 278 -l_ 278 -_u 278 -" 276 -ni 276 -z 274 -sta 273 -nc 272 -_em_ 270 -P 269 -o_ 267 -_v 267 -at 267 -dos_ 266 -_es 262 - 259 -_ 259 -te_ 258 - 257 -va 255 -le 252 -ur 252 -_um 252 -vi 251 -_par 250 -a, 247 -a,_ 247 -_con 247 -ant 242 -lo 240 -ia_ 240 -gu 237 -ar_ 235 -ac 235 -e,_ 234 -e, 234 -no_ 232 -eg 232 -il 232 -ns 232 -er_ 231 -_ma 230 -por 230 -_in 228 -_l 226 - 225 -ont 224 -_no 223 -_P 222 -tra 220 -E 219 -ida 218 -is_ 217 -ol 216 -a 215 -ter 215 -ao 215 -_A 211 -un 211 -- 210 -_te 210 -or_ 209 -ma_ 208 -_pe 208 -ara_ 208 -C 206 -ist 202 -para 202 -nta 201 -ais 201 -ut 198 -nte_ 198 -j 197 -dad 196 -_na 195 -am_ 195 -ade 193 -ica 191 -x 190 -al_ 189 -O 188 -des 187 -_para 187 -ada 187 -nh 186 -_se_ 186 -mp 185 -ndo 184 -R 183 -_por 181 -ao_ 181 -para_ 179 -eir 177 -ui 177 -vo 177 -ou_ 177 -ta_ 177 -M 176 -ria 175 -tos 175 -rr 174 -D 174 -io_ 174 -br 174 -_di 173 - 173 -e 173 -fo 173 -I 172 -es 172 -_C 171 -mo_ 171 -ov 170 -pro 169 -_os_ 169 -_os 169 -das 167 -iv 166 -uma 165 -gr 165 -su 164 -fi 164 -um_ 162 -na_ 162 -ga 162 -ais_ 161 -_S 161 -lh 159 -ort 159 -cia 158 -.. 157 -_est 156 -cont 156 -ig 155 -_ 154 -ran 154 -a 154 -om_ 153 -_en 152 -dade 152 -_as 152 -ho 152 -ntr 151 -nto_ 151 -fe 150 -N 149 -das_ 149 -uma_ 149 -ess 149 -_ 148 -ndo_ 147 -ob 147 -_ 147 -ul 146 -ente_ 146 -go 146 -ento 144 -ver 144 -_des 144 -gi 144 -ha 142 -cu 142 -idad 142 -av 141 -es_ 141 -_pro 141 -ura 141 -ap 139 -_com_ 139 -_ca 139 -com_ 139 -ao 139 -ne 138 -od 138 -_" 137 -_M 137 -pre 137 -ras 136 -_me 136 -_ao 136 -_no_ 134 -oc 134 -str 133 -tes 133 -_b 133 -and 133 -_g 133 -ro_ 133 -omo 133 -_dos 132 -_fo 132 -_dos_ 132 -rn 132 -mento 131 -ito 131 -ev 131 -rio 130 -ass 130 -eu 130 -be 128 -os, 128 -os,_ 128 -sp 127 -_uma 127 -ep 126 -tad 125 -s. 125 -_uma_ 125 -_E 125 -idade 124 -_um_ 124 -n 124 -no 124 -ct 123 -ram 123 -ado_ 123 -ela 123 -omo_ 121 -iz 121 -_an 121 diff -Nru spamassassin-3.4.6/trunk-only/lm/qu.lm spamassassin-4.0.0~rc3/trunk-only/lm/qu.lm --- spamassassin-3.4.6/trunk-only/lm/qu.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/qu.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 5766 -a 4900 -n 1941 -i 1666 -u 1384 -s 1032 -t 995 -y 939 -h 929 -k 915 -q 909 -p 882 -a_ 847 -an 821 -r 783 -m 740 -c 705 -l 695 -ta 637 -ch 613 -ay 587 -qa 557 -pa 490 -ha 486 -e 474 -ma 457 -o 441 -na 434 -ku 411 -j 409 -un 367 -w 358 -in 353 -, 345 -,_ 344 -cha 318 -ar 317 -n_ 315 -as 291 -wa 289 -ta_ 269 -ll 259 -man 255 -_k 248 -._ 243 -. 243 -nt 227 -am 224 -pi 222 -la 222 -ka 217 -ac 214 -ni 214 -at 213 -aq 213 -i_ 208 -ri 207 -qa_ 204 -una 204 -y_ 192 -aj 192 -_p 192 -is 188 -_m 181 -lla 175 -ach 174 -rq 173 -us 172 -an_ 171 -_ka 171 -ata 169 -rqa 165 -sq 163 -hu 162 -sp 161 -_w 157 -nk 157 -hay 157 -_s 156 -sqa 155 -ki 153 -kun 152 -_c 152 -al 150 -nta 149 -ap 147 -ant 146 -yk 146 -ay_ 144 -spa 141 -hi 137 -_ch 136 -_n 136 -ya 135 -' 134 -j_ 133 -uy 132 -ra 132 -a,_ 132 -a, 132 -ti 130 -_a 125 -nc 125 -kuna 122 -s_ 121 -su 121 -ak 121 -_ma 118 -ana 118 -ari 115 -_t 114 -ama 114 -chi 114 - 113 -a._ 111 -a. 111 -nch 111 -iy 111 -all 110 -aw 110 -_r 110 -anta 109 -ayk 109 -na_ 109 -chay 108 -sa 104 -_wa 104 -si 103 -chu 102 -pa_ 101 -acha 101 -_cha 101 -pi_ 101 -qan 100 -_pa 99 -_q 97 -aj_ 97 -awa 97 -ank 95 -nku 95 -im 94 -q_ 92 -uk 92 -C 92 -mu 90 -tu 89 -J 89 -_ni 88 -taj 87 -_J 87 -nin 86 -_chay 86 -u_ 86 -_C 84 -wan 83 -nta_ 81 -_j 81 -mant 80 -ut 79 -in_ 79 -ik 79 -manta 79 -asq 79 -yt 78 -n, 78 -asqa 78 -n,_ 78 -pay 78 -li 77 -yn 77 -nq 76 -yta 76 -ic 76 -up 76 -_Ch 75 -yku 75 -Ch 75 -he 75 -hay_ 74 -nan 74 -ina 74 -ur 73 -er 72 -S 72 -arq 72 -or 72 -_l 71 -_u 71 -aq_ 70 -os 70 -yp 70 -anc 69 -man_ 69 -mi 69 -ich 68 -_i 68 -st 67 -_S 67 -arqa 66 -it 66 -anch 66 -ru 66 -aku 65 -pu 65 -a 65 -alla 64 -mp 64 -sqa_ 64 -'a 64 -ayku 63 -es 63 -A 63 -ia 63 -_man 63 -_Cha 61 -Cha 61 -taj_ 60 -api 60 -_ll 60 -wi 60 -ayp 60 -aman 59 -g 58 -anku 58 -yki 57 -ima 57 -yni 57 -oj 57 -mana 57 -anta_ 57 -_su 57 -uc 56 -isp 56 -ispa 56 -uch 56 -M 56 -ir 56 -_h 55 -nqa 55 -kuy 55 -ayt 54 -_M 54 -b 54 -_y 53 -_mana 53 -: 53 -uku 53 -:_ 53 -nm 53 -au 52 -ayta 52 -io 52 -qo 51 -an,_ 51 -apa 51 -spa_ 51 -erq 51 -_wi 51 -erqa 51 -_sa 51 -an, 51 -el 50 -um 50 -ana_ 50 -han 50 -il 50 -on 49 -chay_ 49 -sta 49 -_D 49 -D 49 -iku 49 -aqa 49 -che 48 -en 48 -yta_ 48 -Ma 47 -P 47 -_lla 47 -_Je 47 -yq 47 -Je 47 -ita 47 -rqan 47 -ypi 46 -har 46 -Jes 46 -_Jes 46 -ios 46 -ayq 46 -Dio 46 -un_ 46 -kus 46 -_Dio 46 -taq 46 -_Dios 46 -_Ma 46 -_Di 46 -Dios 46 -Di 46 -d 46 -kan 45 -Chay 45 -oq 45 -_Chay 45 -_pay 45 -upa 45 -mun 45 -ata_ 44 -_tu 44 -nis 44 -re 44 -paq 44 -yo 44 -ej 44 -qay 43 -ncha 43 -ha_ 43 -_A 43 -I 43 -_kan 43 -_nis 43 -_P 43 -nman 43 -nma 43 -ataj 42 -ara 42 -ku_ 42 -nata 42 -nat 42 -i, 41 -tin 41 -qh 41 -t' 41 -orq 41 -nki 41 -_ru 41 -_ku 41 -i,_ 41 -ip 40 -ham 40 -usq 40 -_ya 40 -qank 39 -orqa 39 -ayn 39 -mana_ 39 -ray 39 -ym 39 -uma 39 -_pu 39 -par 39 -kay 39 -n. 38 -qa,_ 38 -n._ 38 -sus 38 -aypi 38 -usqa 38 -qanku 38 -ill 38 -qa, 38 -was 38 -pa, 38 -pa,_ 38 -asp 38 -qa._ 37 -_mu 37 -paj 37 -amp 37 -hin 37 -uti 37 -rin 37 -_im 37 -_ima 37 -ja 37 -_ri 37 -rqa_ 37 -taq_ 37 -qa. 37 -sh 36 -spa,_ 36 -cha_ 36 -spa, 36 -achi 36 -una_ 36 -rqank 36 -jt 36 -K 36 -amu 36 -aspa 35 -_Jesu 35 -Jesus 35 -nispa 35 -ki_ 35 -waw 35 -ko 35 -ne 35 -esus 35 -int 35 diff -Nru spamassassin-3.4.6/trunk-only/lm/README spamassassin-4.0.0~rc3/trunk-only/lm/README --- spamassassin-3.4.6/trunk-only/lm/README 2005-02-25 14:28:10.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -The following guideline is used for specifying the language model -filename. - - [_][.]. - - is lowercase and taken from ISO 639-1. If ISO 639-1 does -not define a two-letter language code, a three-letter code defined by -ISO 639-2 is used. - -The field is optional, uppercase, and taken from ISO -3166-1. If ISO 3166-1 does not define a two-letter country code, use -two or three lowercase letters and if possible, use the top-level -domain for the country. - -The field is only optional if there is only one codeset -present for a language. It should be specified using a lowercase -representation of the preferred MIME name for that codeset. - -The is "lm" to specify the original language model format and -"ln" to specify the new language model format. - --- - -The original language models in "lm" format are part of the TextCat -program located at http://odur.let.rug.nl/~vannoord/TextCat/ and were -originally authored by Gertjan van Noord . - -tr.iso-8859-9.ln and ja.iso-2022-jp.ln were collated by Daniel Quinlan. diff -Nru spamassassin-3.4.6/trunk-only/lm/rm.lm spamassassin-4.0.0~rc3/trunk-only/lm/rm.lm --- spamassassin-3.4.6/trunk-only/lm/rm.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/rm.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 10888 -a 3490 -e 2268 -i 2196 -s 2169 -n 1961 -t 1555 -r 1510 -l 1281 -u 1249 -a_ 1155 -c 1060 -d 954 -o 815 -s_ 744 -g 726 -m 686 -h 620 -p 617 -n_ 559 -v 493 -_s 480 -er 476 -ch 469 -_d 457 -in 455 -da 418 -_c 404 -r_ 388 -_e 377 -. 358 -_p 340 -as 333 -l_ 328 -, 327 -._ 320 -_i 320 -,_ 315 -la 313 -en 312 -sc 310 -an 301 -ta 300 -_da 285 -f 282 -_t 268 -_a 262 -nt 259 -_m 252 -un 248 -ra 247 -i_ 247 -na 245 -ma 245 -ia 241 -ar 234 -sch 228 -b 228 -da_ 217 -es 214 -ai 213 -st 212 -' 209 -e_ 208 -as_ 208 -er_ 200 -t_ 199 -re 199 -_l 195 -al 193 -_n 193 -el 192 -tg 192 -te 188 -z 187 -ha 180 -_f 180 -sa 174 -_da_ 172 -ve 169 -ei 168 -_v 165 -at 165 -ss 161 -is 161 -_ch 161 -on 160 -la_ 158 -cu 158 -ad 158 -he 156 -in_ 147 -va 147 -_in 146 -gl 145 -ns 141 -ur 140 - 140 -u_ 138 -ts 138 -pe 136 -li 134 -gi 133 -et 133 -de 132 -ig 132 -or 130 -ti 129 -il 127 -d_ 126 -che 123 -ut 122 -us 122 -cha 121 -di 120 -ia_ 120 -_b 118 -_la 117 -na_ 116 -ain 115 -per 115 -to 115 -_cu 113 -_sc 112 -se 111 -ls 109 -- 108 -iu 108 -ca 107 -si 104 -ir 102 -rt 102 -ie 102 -_g 102 -un_ 102 -nd 101 -av 101 -ni 100 -q 99 -au 97 -ls_ 97 -ll 96 -qu 96 -_pe 96 -le 96 -rs 95 -pa 95 -ri 95 -_ma 94 -_per 93 -am 93 -eg 92 -_r 92 -gn 92 -me 92 -pi 91 -an_ 91 -en_ 91 -ga 91 -ent 90 -hi 90 -_e_ 90 -it 89 -ta_ 88 -ter 87 -ns_ 86 -iv 86 -igl 86 -a. 85 -em 85 -I 85 -chi 84 -_en 84 -int 84 -ue 83 -su 82 -tt 82 -a, 82 -a,_ 82 -o_ 82 -_ve 82 -a._ 82 -_q 81 -_qu 80 -ge 80 -" 80 -_la_ 80 -ar_ 80 -vi 79 -gl_ 79 -tu 78 -ng 78 -ro 76 -mi 76 -sta 75 -ed 75 -lla 74 -ei_ 73 -_o 73 -ic 73 -el_ 73 -_il 73 -_in_ 72 -g_ 72 -pr 71 -nu 70 -ina 70 -_h 69 -scha 68 -mai 68 -pl 68 -il_ 68 -os 68 -ha_ 68 -be 67 -uo 67 -cun 67 -ra_ 67 -_pa 65 -ts_ 64 -s. 64 -co 64 -_u 64 -fi 64 -_I 63 -sa_ 63 -s._ 63 -_re 62 -n 62 -_nu 62 -? 62 -S 62 -_se 61 -no 61 -nt_ 61 -E 61 -tr 61 -mp 60 -igl_ 60 -_su 60 -_st 60 -ess 60 -im 60 -zi 59 -?_ 59 -nc 59 -_E 58 -_- 58 -_cun 58 -_te 58 -_sa 58 -ant 58 -main 58 -eu 57 -ssa 57 --_ 57 -iun 57 -_-_ 57 -aint 56 -op 56 -al_ 56 -dal 56 -j 56 -ama 55 -_tg 55 -ua 55 -M 55 -per_ 55 -tsc 54 -nta 54 -tsch 54 -um 54 -fa 54 -za 54 -_di 54 -pia 54 -_per_ 54 -T 54 -_M 53 -ne 53 -era 53 -A 53 -que 53 -_dal 53 -cr 53 -_de 53 -lla_ 53 -_che 52 -h' 52 -_me 51 -ot 51 -_pr 51 -_pl 51 -_sch 51 -ch' 50 -_S 50 -opi 50 -ou 50 -tta 50 -mo 50 -ada 50 -ba 50 -_an 49 -top 49 -id 49 - 49 -he_ 49 -C 49 -va_ 49 -uto 49 -ins 48 -topi 48 -L 48 -ir_ 48 -ist 48 -c_ 48 -_il_ 48 -P 48 -ss_ 48 -ag 47 -_no 47 -res 47 -las 47 -_vi 46 -s, 46 -schi 46 -_en_ 46 -tg_ 46 -s,_ 46 -_si 46 -_que 45 -_T 45 -az 45 -'i 45 -cun_ 44 -_fa 44 -_mi 44 -utop 44 -utopi 44 -sche 44 -_C 44 -ur_ 44 -tge 44 -po 44 -es_ 44 -x 44 -nz 44 -_L 44 -_cun_ 44 -man 44 -_ch' 43 -_fi 43 -pu 43 -ell 43 -opia 43 -_igl 43 -_ig 43 -sp 43 -topia 43 -ava 42 -egn 42 -che_ 42 -on_ 42 -ci 42 -_P 42 -ev 42 -ond 41 -_" 41 - 41 -us_ 41 -_ha 41 -D 40 -_co 40 -etg 40 -'e 40 -las_ 40 -est 40 -ura 40 -uel 39 -ed_ 39 -vo 39 -gia 39 -bu 39 -mu 39 -nn 39 -gli 39 -_A 39 -lu 39 -cha_ 39 -ul 38 -mal 38 -_n 38 -ina_ 38 -_bu 38 -_ca 38 -_ 38 -uc 38 -nts 38 -tra 38 -_tu 37 diff -Nru spamassassin-3.4.6/trunk-only/lm/ro.lm spamassassin-4.0.0~rc3/trunk-only/lm/ro.lm --- spamassassin-3.4.6/trunk-only/lm/ro.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ro.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 20674 -a 6376 -e 5815 -i 5746 -t 3396 -r 3280 -n 3103 -u 2835 -s 2611 -c 2582 -e_ 2235 -l 2224 -o 2149 -a_ 1974 -d 1629 -m 1528 -p 1410 -i_ 1358 -in 1308 -_c 1167 -_s 1118 -_d 999 -re 905 -ar 898 -, 791 -,_ 786 -_p 785 -de 771 -_a 754 -te 687 -_i 667 -at 654 -ti 645 -ca 639 -n_ 630 -ta 617 -si 614 -_de 609 -f 606 -st 583 -ri 581 -u_ 567 -nt 553 -. 542 -ra 540 -_m 534 -g 528 -v 516 -ul 516 -de_ 513 -_in 503 -b 492 -_de_ 474 -._ 472 -le 459 -l_ 444 -un 443 -_si 440 -es 437 -tr 426 -ea 420 -t_ 412 -ce 412 -ma 407 -cu 402 -er 398 -_ca 397 -si_ 388 -_f 387 -_l 383 -z 382 -la 381 -ne 370 -sa 364 -as 360 -_e 357 -in_ 356 -an 352 -it 351 -te_ 346 -or 345 -el 345 -ci 339 -_si_ 333 -_n 330 -are 324 -pe 319 -re_ 317 -al 310 -_t 309 -se 304 -ic 295 -ie 290 -_u 290 -ul_ 290 -ni 289 -int 285 -_o 280 -en 279 -ta_ 279 -ur 261 -pa 256 -co 255 -_pe 254 -ia 252 -mi 251 -pr 249 -_ma 249 -oa 249 -me 246 -lu 246 -li 241 -im 238 -_in_ 237 -da 237 -na 237 -_sa 235 -ac 234 -- 234 -ii 232 -est 231 -r_ 231 -h 230 -_cu 230 -le_ 229 -ai 229 -ca_ 227 -il 226 -ru 223 -sc 223 -_v 221 -nu 220 -tu 220 -_un 220 -nd 220 -di 219 -are_ 216 -to 215 -am 214 -on 213 -o_ 208 -is 208 -sa_ 203 -la_ 200 -_b 200 -ste 195 -et 194 -ec 191 -_r 186 -car 185 -ui 180 -un_ 179 -lo 178 -cu_ 177 -ei 176 -e, 175 -e,_ 175 -pe_ 171 -m_ 167 -_la 166 -a, 165 -a,_ 164 -_ce 164 -rt 163 -_co 163 -ent 162 -ro 162 -ele 162 -_pe_ 160 -po 160 -ea_ 159 -" 158 -ntr 158 -_cu_ 158 -_pr 157 -ut 157 -nc 156 -ata 155 -care 154 -um 153 -au 151 -va 151 -_o_ 150 -_car 150 -ii_ 145 -ind 145 -_un_ 144 -os 144 -ad 141 -_la_ 140 -I 140 -este 138 -ste_ 138 -care_ 138 -ir 137 -ga 136 -ap 136 -ol 136 -ra_ 136 -_di 134 -D 134 -_care 133 -se_ 133 -om 133 -ara 133 -ati 133 -fi 133 -_sa_ 131 -zi 130 -vi 130 -_ca_ 129 -_se 128 -_nu 128 -ai_ 127 -ch 127 -pi 124 -ve 123 -fa 122 -ot 121 -_a_ 120 -este_ 120 -du 119 -ine 119 -s_ 118 -fo 118 -_ci 118 -ui_ 118 -ba 118 -i, 117 -i,_ 116 -ne_ 115 -us 115 -_g 115 -a. 115 -fe 114 -A 114 -pu 114 -ce_ 113 -ar_ 113 -_pa 113 -oc 112 -sta 112 -lui 112 -ns 112 -em 112 -' 112 -oar 112 -din 111 -iu 111 -_int 111 -ate 111 -mu 111 -hi 110 -ele_ 110 -mp 109 -_D 109 -S 109 -sti 108 -bi 108 -ata_ 107 -ti_ 107 -tra 107 -C 107 -c_ 106 -tre 106 -_al 105 -rea 105 -mai 105 -j 104 -a._ 104 -gi 104 -e. 103 -d_ 103 -_fa 103 -E 102 -mo 102 -at_ 101 -_e_ 101 -nte 101 -lt 101 -sp 101 -za 100 -mai_ 100 -su 99 -na_ 98 -tat 97 -sin 97 -ez 96 -tru 96 -e._ 96 -ie_ 96 -ia_ 96 -_re 96 -tul 96 -_fo 96 -ina 95 -art 95 -_C 95 -no 95 -nu_ 94 -_es 94 -_po 94 -cr 94 -inc 93 -_da 92 -_mai 92 -lui_ 92 -_din 92 -_est 92 -pre 91 -_mai_ 91 -io 91 -chi 91 -ge 90 -pri 90 -eu 90 -uri 90 -az 90 -_nu_ 89 -_me 89 -ct 89 -au_ 88 -esc 88 -ev 88 -ei_ 88 -min 87 -ace 87 -op 86 -ng 86 -ici 86 -_lu 85 -ari 85 -_mi 84 -ita 84 -_S 84 -_tr 84 -ere 83 -or_ 83 -ast 83 -ist 83 -nt_ 83 -_se_ 82 -ou 82 -tin 82 -intr 82 -con 82 -do 81 -_fi 81 -str 81 -am_ 80 -rat 80 -ru_ 80 -ri_ 80 -par 80 -oi 80 -uc 79 -ze 79 -pl 79 -res 78 -_ac 77 -ulu 77 -din_ 76 -va_ 76 -ada 76 -ului 75 -_con 75 -id 75 -inte 74 -ile 73 -cit 73 -_din_ 73 -lor 73 -_" 72 -ig 72 -rin 72 -da_ 72 -_st 72 --_ 71 -_- 71 -it_ 71 -ani 71 -nd_ 71 -ci_ 70 -ag 70 -eri 70 -i. 70 -tru_ 70 -_ne 70 -rm 70 -P 69 -_este 69 -nta 69 -bu 69 -une 69 -ma_ 69 -nti 69 -imp 68 -_-_ 68 -iv 68 -ind_ 68 diff -Nru spamassassin-3.4.6/trunk-only/lm/ru.iso-8859-5.lm spamassassin-4.0.0~rc3/trunk-only/lm/ru.iso-8859-5.lm --- spamassassin-3.4.6/trunk-only/lm/ru.iso-8859-5.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ru.iso-8859-5.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 76249 - 19732 - 16714 - 14389 - 13942 - 13160 - 12444 - 9867 - 8461 - 7895 - 7330 - 6498 - 5935 -. 5725 - 5287 - 5019 - 4877 - 4083 -, 3899 -,_ 3878 - 3656 - 3376 -_ 3167 -_ 3144 -_ 3135 -_ 3098 -- 3019 - 2983 -_ 2952 -._ 2930 -_ 2919 - 2887 - 2876 - 2797 - 2672 -_ 2631 - 2585 -.. 2407 -_ 2316 - 2300 --_ 2294 - 2281 -_ 2249 - 2057 -_ 2029 - 1981 - 1950 -_ 1944 - 1874 - 1856 -_ 1774 -... 1744 - 1709 - 1685 - 1636 -_- 1625 - 1616 - 1595 - 1584 -_ 1558 -_-_ 1531 -_ 1521 - 1518 - 1509 -__ 1454 - 1433 - 1419 - 1396 - 1389 -_ 1381 - 1375 - 1370 -_ 1364 - 1345 - 1338 - 1337 - 1329 - 1306 - 1300 -_ 1297 -_ 1290 - 1284 - 1271 - 1256 - 1245 -.... 1232 - 1219 - 1212 - 1192 - 1187 -_ 1168 -..... 1167 - 1147 - 1144 - 1109 - 1101 - 1099 -_ 1093 - 1076 -_ 1074 -_ 1063 - 1062 - 1045 -_ 1034 - 1029 -_ 1026 - 1000 - 998 - 996 - 993 -_ 975 - 968 - 968 -_ 966 - 946 - 943 -_ 931 -_ 923 - 913 - 910 -_ 907 - 898 -_ 898 - 889 -_ 881 - 878 - 875 - 862 -__ 833 -_ 816 - 816 - 807 -" 786 -_ 769 - 767 -_ 762 - 754 - 748 - 747 - 741 - 730 -_ 715 -_ 713 - 711 -_ 702 -_ 697 - 694 - 692 - 687 - 662 - 660 - 656 - 649 - 646 - 638 - 629 -_ 619 -_ 615 - 612 -_ 610 - 609 - 608 -.._ 605 - 604 - 604 - 604 -_ 600 - 597 - 594 - 593 -__ 589 -_ 587 -_ 583 - 583 - 583 - 575 - 571 - 571 -_ 570 -_ 569 -_ 559 - 556 - 544 - 540 - 536 - 533 - 525 -: 519 - 513 - 511 -_ 510 - 510 - 508 -_ 508 -! 503 -? 501 - 498 -_ 489 - 488 - 486 -_ 485 - 484 - 484 -_ 484 - 484 - 484 -:_ 484 -_ 480 -_ 477 - 470 -_ 469 -..._ 465 - 464 - 464 - 462 - 461 - 459 - 458 - 454 - 454 - 445 - 442 -_ 442 -_ 441 - 440 - 437 -_ 436 - 436 -_ 435 -_ 434 - 433 - 431 - 431 - 429 -_ 429 - 425 -_ 424 -_ 424 -_ 423 - 422 - 422 -_ 422 - 419 - 418 - 418 - 415 - 413 - 411 - 411 -_ 409 - 408 - 406 -_ 406 -_ 401 - 401 -_ 399 -_ 398 -_. 397 - 396 - 396 - 394 - 394 -_" 393 - 393 -_ 392 -_ 392 - 391 -__ 391 - 391 - 390 -- 390 - 388 -, 385 - 384 - 384 -__ 383 -,_ 383 - 383 -?_ 383 -_ 380 -_ 380 -_ 378 -_ 376 - 375 - 375 - 374 - 373 -_ 372 - 372 - 371 -_ 369 - 369 -_ 369 - 368 - 368 - 366 - 365 - 365 - 362 -_ 360 - 360 -!_ 360 - 360 - 358 -_ 358 - 358 - 358 - 356 -_ 356 - 354 - 352 -_ 352 - 349 - 349 -_ 348 -_ 348 - 346 -_ 344 - 344 - 343 - 342 - 341 -_ 339 - 338 - 337 - 334 - 334 - 328 -_ 328 - 328 - 327 -_ 324 -_ 323 - 323 - 322 -_ 322 -__ 322 - 322 - 321 -,_ 320 -, 320 - 319 - 319 - 318 - 318 - 317 -_ 316 - 315 - 314 -, 314 -_ 313 - 313 -,_ 313 - 312 - 312 - 311 - 311 - 311 -_ 310 - 309 - 309 - 309 - 309 -_ 308 - 308 - 308 - 307 - 307 -_ 305 - 305 - 303 - 302 - 300 - 300 - 300 -_ 298 - 297 -_ 297 -, 297 -,_ 297 -__ 296 -_ 296 -_._ 295 -_ 295 - 294 - 293 -, 292 -,_ 292 -_ 291 -_ 290 -_ 290 -_ 288 -_ 288 - 286 -_ 285 - 285 - 285 -_ 285 -_ 283 -_ 283 diff -Nru spamassassin-3.4.6/trunk-only/lm/ru.koi8-r.lm spamassassin-4.0.0~rc3/trunk-only/lm/ru.koi8-r.lm --- spamassassin-3.4.6/trunk-only/lm/ru.koi8-r.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ru.koi8-r.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 28256 - 8957 - 7206 - 6230 - 5966 - 5385 - 5338 - 4464 - 3984 - 3504 - 3335 - 2700 - 2441 - 2324 - 2230 - 1840 - 1562 - 1540 -_ 1505 -, 1492 -,_ 1492 - 1437 -_ 1423 -_ 1335 - 1286 - 1283 - 1233 - 1232 -_ 1193 - 1175 -_ 1146 - 1143 -_ 1118 -_ 1062 -_ 1032 -. 999 - 996 - 920 - 911 -._ 908 - 907 - 893 - 869 - 851 - 844 -_ 808 - 786 - 775 - 768 - 763 -_ 735 - 730 - 723 -_ 721 - 696 - 667 -_ 629 -_ 626 -_ 621 - 620 -_ 616 - 599 -_ 597 -_ 592 - 589 - 584 - 579 - 576 - 566 -_ 562 - 548 - 545 - 545 - 544 - 535 - 533 - 528 -_ 522 - 520 - 520 - 518 - 510 -_ 507 - 502 - 500 - 498 - 486 - 476 - 475 - 471 - 458 - 457 - 450 - 450 - 449 -_ 448 -_ 447 - 443 - 442 -_ 438 - 431 -__ 430 - 428 -_ 424 - 400 - 396 -_ 392 -_ 388 - 388 - 388 -__ 385 -_ 382 -_ 381 - 380 - 374 - 362 -_ 361 - 350 -_ 348 - 347 - 346 - 338 -_ 336 - 335 - 328 - 326 - 323 - 321 -_ 321 - 320 - 320 - 318 - 318 - 317 - 316 - 314 -- 314 - 309 - 308 -_ 307 - 306 -_ 305 -_ 302 -_ 300 - 295 -_ 291 - 289 - 288 - 285 -_ 275 -_ 274 - 274 - 273 -_ 272 - 271 -_ 271 - 267 - 266 - 265 -_ 264 - 263 - 260 - 258 - 255 - 254 - 254 - 247 - 246 - 246 - 244 - 240 -_ 239 -_ 239 -_ 238 - 237 - 237 -__ 236 - 234 - 234 - 229 - 228 - 226 - 224 - 224 -_ 222 - 222 -_ 222 - 220 - 218 - 216 - 216 - 214 - 213 -_ 211 - 211 - 210 -_ 210 - 209 -_ 208 - 205 - 204 -_ 204 -_ 203 -_ 203 - 202 -_ 202 - 201 - 199 - 199 - 199 -__ 199 - 198 - 198 -_ 197 -_ 197 -_ 195 - 194 - 193 -_ 193 - 191 -_ 190 -_ 187 -_ 187 - 186 -_ 186 - 186 -_ 185 -_ 184 -_ 184 - 183 -_ 182 - 182 - 181 -_ 180 - 180 - 180 - 173 - 172 - 172 -_ 172 - 172 - 172 - 171 - 171 - 170 - 169 - 169 - 168 - 167 - 166 - 166 - 165 -_ 164 -__ 163 - 163 -_ 163 - 162 -,_ 160 -, 160 - 160 - 159 - 158 - 157 - 157 - 156 - 156 - 155 -, 155 - 155 -_ 155 -,_ 155 -_ 154 - 154 - 154 -_ 154 -,_ 153 -, 153 - 152 -_ 151 - 150 - 150 -_ 150 - 150 - 150 -_- 149 - 148 - 147 -_ 146 - 146 - 146 -_ 145 - 145 - 145 - 145 -_ 144 -__ 144 - 144 -__ 144 -_ 144 -_ 144 - 143 - 143 - 142 - 142 - 142 - 142 - 141 - 140 --_ 140 - 139 - 139 - 138 -_ 138 - 137 - 137 -_ 137 -_ 136 -, 136 -,_ 136 - 136 -_ 135 -_ 135 - 134 -_ 134 - 134 - 133 -_ 133 - 133 - 133 - 133 - 132 -_-_ 131 - 131 - 131 -_ 129 - 129 - 129 - 129 - 129 -_ 127 - 127 -_ 127 - 127 - 126 - 126 -_ 126 - 126 - 125 - 125 -_ 124 - 123 - 123 -_ 123 -_ 123 - 123 -_ 122 - 122 - 122 - 121 - 121 -_ 121 -_ 121 - 121 - 121 - 120 -_ 120 -_ 119 - 119 -_ 118 - 118 -_ 117 -_ 117 - 117 - 116 -_ 116 - 116 - 115 - 115 - 115 - 114 - 114 - 113 -_ 113 - 113 - 113 - 113 - 112 -_ 112 -_ 112 - 111 - 111 -_ 111 - 111 -, 111 - 111 -,_ 111 - 110 - 110 - 109 - 109 diff -Nru spamassassin-3.4.6/trunk-only/lm/ru.windows-1251.lm spamassassin-4.0.0~rc3/trunk-only/lm/ru.windows-1251.lm --- spamassassin-3.4.6/trunk-only/lm/ru.windows-1251.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ru.windows-1251.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 21836 - 5818 - 4506 - 4258 - 3769 - 3394 - 3254 - 2594 - 2470 - 2346 - 2227 - 1798 - 1709 - 1673 - 1638 - 1377 -, 1187 -,_ 1172 -_ 1160 - 1059 - 1024 - 1006 -_ 966 - 945 -_ 937 - 910 -_ 907 -_ 896 - 878 - 856 -_ 828 -_ 818 -_ 801 - 795 -. 789 -._ 761 - 655 - 617 -_ 616 - 575 - 568 - 565 - 549 - 526 - 524 -_ 522 -_ 521 -_ 497 -_ 496 - 484 -_ 477 -_ 477 - 472 - 470 -_ 461 - 456 - 454 - 452 - 432 - 431 - 425 - 413 - 403 - 402 -_ 396 -_ 396 - 395 - 388 -_ 384 -_ 383 -_ 378 -__ 375 - 369 - 367 -_ 365 -_ 364 - 363 - 357 -_ 357 - 353 - 352 - 350 - 344 - 344 -_ 343 - 338 - 337 - 334 - 330 - 328 - 326 - 326 - 323 -- 322 - 320 - 317 - 312 - 308 - 308 -_ 302 -_ 299 -_ 296 - 292 -_ 292 - 291 - 291 -_ 291 - 286 - 283 - 283 -_ 274 - 264 - 263 -_ 260 - 253 -_- 245 -_ 245 -_ 244 - 240 -_ 238 - 235 -__ 235 - 233 - 229 --_ 225 - 219 -__ 217 - 217 - 215 - 215 - 211 - 211 - 211 - 209 -_ 209 - 208 -_ 206 - 206 - 205 - 205 - 203 - 203 - 202 -_-_ 202 -_ 199 -_ 199 - 197 - 197 -_ 197 -_ 195 - 192 -_ 191 - 190 - 190 - 188 - 188 - 185 -_ 184 -_ 183 - 182 -_ 181 - 175 - 174 -_ 172 - 170 -_ 169 -_ 168 -! 168 -_ 165 - 165 -_ 164 - 164 -_ 164 - 163 - 163 - 162 -__ 162 -_ 159 - 158 - 157 - 156 - 154 - 154 - 153 - 153 - 153 - 153 - 152 - 150 -__ 149 -_ 148 - 148 -_ 146 -_ 146 -_ 146 -_ 144 - 143 - 141 -_ 141 -_ 141 -!_ 139 - 139 - 139 - 137 - 136 - 136 -_ 135 -_ 134 -_ 131 - 131 - 130 -_ 129 -, 128 -_ 128 -,_ 127 - 127 - 126 - 126 -_ 126 - 125 - 125 - 124 - 123 - 122 -_ 122 -_ 121 -_ 120 - 120 - 120 - 120 -_ 119 - 119 - 119 - 118 - 117 -_ 117 -, 115 - 115 -_ 115 -_ 114 -_ 114 -,_ 114 -_ 113 -_ 113 - 112 - 112 - 110 - 110 -_ 110 - 109 - 109 - 109 -_ 109 -_ 108 - 108 - 107 - 107 - 107 - 106 -, 106 - 106 - 105 - 105 - 105 -_ 105 -_ 104 - 104 -_ 104 - 104 - 104 - 103 -,_ 103 - 103 - 102 - 102 -_ 102 -_ 101 - 101 - 101 - 101 -_ 101 - 100 -__ 100 -, 100 -_ 100 - 100 - 100 - 100 - 100 -_ 100 -_ 99 -, 99 - 99 - 99 -_ 99 -_ 99 - 98 - 98 -_ 98 -_ 98 - 97 - 97 - 97 -_ 97 -,_ 97 - 96 -_ 96 -,_ 96 - 96 - 96 -_ 95 - 95 - 94 -_ 94 -_ 94 - 94 - 93 - 93 -_ 92 -_ 91 - 91 - 90 - 90 -_ 90 -? 90 - 89 - 89 -__ 89 - 89 -, 89 - 88 - 88 -_ 88 - 88 - 88 -_ 87 - 87 -,_ 87 -_ 86 -, 86 -,_ 86 - 86 - 86 - 86 - 86 - 86 - 85 -_ 85 - 85 - 84 -__ 84 -_ 84 - 84 -_ 84 -_ 84 -_ 83 - 83 - 83 - 83 - 82 -_ 82 -" 82 - 82 -_ 81 - 81 - 81 - 81 - 81 - 81 - 81 - 80 -_ 79 - 79 - 79 - 79 - 79 - 79 - 79 -_ 78 - 78 -_ 78 -. 77 -_ 77 -._ 76 -. 76 -_ 76 - 76 - 76 - 76 - 76 -, 75 - 75 -_ 75 -,_ 75 -_ 75 - 74 -_ 74 - 74 - 74 - 74 diff -Nru spamassassin-3.4.6/trunk-only/lm/sa.lm spamassassin-4.0.0~rc3/trunk-only/lm/sa.lm --- spamassassin-3.4.6/trunk-only/lm/sa.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sa.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -a 15017 -_ 14975 -h 5028 -i 3820 -t 2976 -s 2788 -r 2599 -| 2437 -n 2432 -aa 2276 -ha 2007 -m 1982 -a_ 1802 -v 1799 -d 1768 -u 1629 -y 1599 -_| 1470 -|_ 1470 -e 1403 -k 1371 -sh 1330 -ra 1243 -p 1213 -va 1152 -A 1134 -ya 1120 -ma 1097 -na 1091 -ar 1080 -ta 1054 -M 1050 -. 1047 -am 1037 -an 1006 -|| 967 -||_ 965 -_|| 965 -_||_ 963 -at 962 -M_ 946 -as 910 -_s 882 -o 848 -b 844 -i_ 827 -aM 764 -aM_ 685 -c 630 -ch 629 -sa 623 -N 616 -ad 612 -H 601 -pa 595 -H_ 584 -g 580 -_n 579 -l 554 -bh 552 -hi 547 -ka 542 -it 536 -ii 535 -ama 519 -_|_ 505 -e_ 477 -_p 475 -dh 475 -av 469 -ak 445 -aH 444 -da 440 -aH_ 439 -ay 437 -j 437 -_na 432 -ana 430 -hh 428 -ti 426 -ara 425 -aa_ 410 -_k 394 -shh 389 -_v 388 -_sa 381 -.h 379 -ah 369 -_b 368 -h_ 363 -.h_ 363 -cha 362 -haa 361 -_t 358 -ri 352 -sha 345 -ap 333 -vi 330 -is 329 -^ 321 -o_ 321 -_m 320 -ai 311 -_d 311 -la 302 -na_ 301 -.n 298 -ava 295 -al 294 -_sh 291 -ja 288 -a. 280 -aan 277 -ish 274 -aN 273 -aya 273 -ash 266 -ha_ 265 -ga 264 -st 255 -ni 255 -ii_ 254 -hu 253 -Na 253 -R 248 -R^ 248 -^i 247 -R^i 247 -a.n 243 -th 241 -_c 240 -_ch 239 -maa 238 -bha 237 -vaa 233 -ab 228 -ir 226 -\ 226 -ita 223 -uu 222 -dha 220 -har 218 -_a 216 -_bh 216 -nam 212 -u_ 212 -he 212 -m.h_ 211 -m. 211 -m.h 211 -ur 210 -es 209 -ata 208 -te 206 -yaa 205 -_ma 204 -esh 202 -aka 200 -id 199 -pr 199 -aha 198 -hy 198 -T 197 -aat 197 -_OM_ 196 -OM 196 -_O 196 -_OM 196 -OM_ 196 -O 196 -ti_ 195 -ari 194 -raa 193 -ag 192 -_y 192 -aas 190 -_ta 190 -_j 189 -I 189 -_na_ 187 -am.h_ 185 -am.h 185 -am. 185 -_pa 183 -iv 182 -de 182 -ada 178 -nd 178 -_cha 177 -_h 176 -ati 175 -taa 173 -ev 172 -nt 171 -rii 171 -ishh 170 -ya_ 168 -_vi 166 -ast 165 -tr 164 -abh 164 -kh 162 -ala 160 -tha 160 -apa 160 -asa 158 -naa 158 -_nam 156 -ru 156 -A_ 155 -_ka 154 -aar 153 -_pr 152 -_g 151 -pra 150 -ham 150 -hha 149 -aana 149 -di 149 -ra_ 147 -ik 146 -.a 144 -yat 143 -ks 143 -hA 143 -hya 143 -ksh 143 -ut 142 -sy 141 -nama 140 -_va 140 -.\ 140 -paa 140 -han 139 -eva 138 -U 138 -mi 138 -_r 136 -_ja 136 -asy 135 -hr 135 -sya 134 -cha_ 132 -rv 132 -tv 130 -asya 130 -kar 130 -ho 129 -yo 129 -in 128 -adh 127 -yA 127 -va_ 126 -su 125 -_ya 125 -shha 124 -pu 124 -R^it 123 -sta 123 -mu 123 -^it 123 -ty 123 -_nama 121 -ac 120 -rii_ 120 -ach 120 -aNa 119 -tas 119 -shi 119 -iva 119 -hav 119 -tra 118 -var 118 -par 118 -haM 117 -aad 117 -kaa 117 -hch 117 -mas 117 -ai_ 117 -hc 117 -sar 116 -aam 116 -_bha 115 -_pra 114 -et 114 -haM_ 113 -aay 113 -aj 113 -ye 113 -o. 113 -An 111 -arii 111 -t.h 110 -t. 110 -ath 110 -t.h_ 109 -man 109 -te_ 108 -o.a 108 -hara 108 -rA 108 -rva 108 -tva 108 -asta 108 -up 108 -shr 107 -daa 104 -me 104 -dr 104 -ram 104 -arii_ 102 -_ni 102 -arv 102 -iH 102 -hit 101 -ras 101 -aga 101 -Am 101 -mA 101 -ba 101 -amas 100 -tu 100 -yaM 100 -ant 99 -ud 99 -uk 98 -iH_ 98 -yaM_ 98 -kha 98 -au 98 -ira 97 -shhT 97 -rah 97 -hT 97 -hhT 97 -D 96 -_sar 96 -re 96 -eshh 95 -sarv 94 -amaa 94 -and 94 -arva 94 -_ra 93 -_dh 93 -tt 92 -tad 92 -hm 92 -raM_ 91 -dev 91 -raM 91 -C 91 -ani 91 -_sarv 90 -atha 89 -Ad 89 -chi 89 -tA 88 -sarva 88 -avi 88 -taM 87 -hava 87 -anaa 86 -vA 86 -dd 86 -nA 85 -Ar 85 -hv 85 -taM_ 85 -dhi 84 -ksha 84 -ip 84 -ma_ 84 -_sha 84 -ati_ 83 -yai 83 -vat 83 -At 83 -kR 82 -kR^ 82 -bhi 82 -_shr 82 -to 82 -ta_ 82 -br 82 -ek 82 -kR^i 82 -tat 81 -nta 81 -hma 81 -aaya 80 -tam 80 -en 80 -us 79 -bra 79 -ke 79 -kt 79 -ddh 79 -mo 79 diff -Nru spamassassin-3.4.6/trunk-only/lm/sco.lm spamassassin-4.0.0~rc3/trunk-only/lm/sco.lm --- spamassassin-3.4.6/trunk-only/lm/sco.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sco.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 11688 -e 3223 -a 2469 -t 2269 -i 1928 -n 1903 -r 1414 -o 1406 -h 1369 -s 1249 -l 929 -n_ 890 -_t 862 -_a 843 -d 818 -e_ 798 -th 704 -w 661 -he 625 -an 612 -t_ 606 -u 592 -_th 575 -c 508 -s_ 471 -the 470 -, 469 -- 458 -in 455 -m 445 -,_ 440 -b 434 -g 429 -er 409 -ee 408 -_the 407 -k 402 -an_ 402 -f 385 -_w 378 -he_ 376 -the_ 364 -_an 362 -_o 360 -y 358 -_the_ 354 -_s 353 -_an_ 342 -a_ 335 -r_ 327 -_b 316 -d_ 303 -i_ 278 -en 277 -p 270 -ei 245 -A 236 -wa 232 -_A 231 -re 229 -in_ 229 -ui 218 -oo 217 -le 217 -ai 216 -et 212 -ti 209 -it 209 -_f 206 -te 204 -_a_ 203 -_m 202 -ha 200 -as 193 -on 188 -at 184 -_i 183 -_wa 183 -_c 182 -o_ 180 -or 178 -_h 176 -_g 169 -ch 165 -A_ 159 -_l 158 -_A_ 157 -st 156 -_d 155 -_ti 148 -. 148 -._ 146 -ke 144 -ti_ 143 --- 143 -_o_ 142 -ow 142 ---- 140 -ed 138 ----- 138 -_r 137 -as_ 137 -y_ 136 -er_ 136 ------ 136 -ir 135 -aa 135 -la 131 -een 130 -ae 129 -_ti_ 128 -ra 126 -es 125 -nd 124 -de 120 -h_ 120 -ie 120 -ar 119 -ll 119 -nt 118 -ot 118 -en_ 115 -ma 115 -eet 113 -her 112 -el 112 -is 112 -' 112 -at_ 111 -ic 109 -se 108 -or_ 106 -wu 104 -me 104 -ne 103 -fo 102 -on_ 101 -was 99 -_was 98 -et_ 98 -ri 98 -_e 97 -_ma 97 -v 97 -_n 97 -! 97 -li 97 -ht 93 -hi 92 -_wu 92 -ng 91 -ro 91 -it_ 90 -ck 90 -_fo 90 -tha 90 -k_ 89 -il 89 -cht 86 -eet_ 86 -_p 86 -we 86 -_was_ 85 -was_ 85 -rt 84 -ed_ 83 -ter 83 -id 83 -ga 82 -; 82 -;_ 81 -ther 79 -tt 76 -air 76 -e, 75 -un 75 -ho 75 -for 74 -ge 74 -_st 73 -_y 72 -_he 72 -wh 71 -_on 71 -sh 70 -z 70 -e,_ 69 -bi 68 -_tha 68 -wui 67 -!_ 67 -ad 67 -een_ 66 -l_ 66 -ts 66 -_for 66 -n, 66 -_wh 65 -re_ 65 -be 65 -eh 64 -hat 64 -ns 64 -br 64 -g_ 64 -ui_ 64 -rr 64 -wui_ 63 -ni 63 -_wui 62 -ay 62 -s, 62 -pe 61 -n,_ 61 -bo 61 -al 61 -ye 61 -_bi 60 -oot 60 -na 60 -ang 60 -s,_ 59 -es_ 59 -ill 58 -that 58 -_wui_ 58 -nn 58 -eh_ 58 -oa 57 -han 57 -_that 56 -_br 56 -ca 56 -_ga 56 -ng_ 56 -um 55 -hat_ 55 -oon 55 -od 55 -for_ 55 -no 55 -ree 55 -_for_ 54 -_le 54 -ht_ 54 -ot_ 54 -_k 53 -rd 53 -ki 53 -aw 53 -nd_ 53 -_on_ 53 -_it 53 -ik 53 -t, 53 -_be 52 -that_ 52 -ve 52 -rn 52 -'s 51 -au 51 -co 51 -ich 51 -to 51 -lo 51 -t,_ 51 -ea 51 -tee 51 -lan 50 -fi 50 -_at 50 -am 50 -_in 50 -ere 50 -ur 50 -le_ 50 -nt_ 49 -'s_ 49 -hin 49 -yi 49 -hr 49 -ts_ 49 -_ca 48 -" 48 -ta 48 -cht_ 48 --_ 48 -_as 47 -T 47 -ang_ 47 -lei 46 -_ma_ 46 -tr 46 -_ro 46 -fe 46 -ma_ 46 -icht 46 -_as_ 46 -der 46 -cl 46 -e- 45 -n- 45 -thr 45 -ba 45 -m_ 45 -st_ 45 -rt_ 45 -_u 45 -do 45 -_T 45 -im 44 -_se 44 -sk 44 -_la 44 -eik 44 -bit 43 -ike 43 -B 43 -kee 43 -tte 43 -di 43 -eed 43 -_B 42 -_aa 42 -her_ 42 -da 42 -ff 42 -tu 42 -ie_ 42 -_cl 42 -_ba 42 -oot_ 42 -bu 41 -eike 41 -oc 41 -hu 41 -_thr 41 -ther_ 41 -_co 41 -aa_ 41 -so 41 -_me 41 -H 41 -_H 40 -ke_ 40 -ert 40 -lu 40 -ist 40 -si 40 -iz 40 -ar_ 39 -uc 39 -thi 39 -ad_ 39 -ru 39 -owe 39 -gi 38 -_bit 38 -_do 38 -int 38 -bl 38 -ld 38 -_at_ 38 -lt 38 -ac 38 -_ha 38 -ae_ 38 -rs 37 -here 37 -ei_ 37 -han_ 37 -p_ 37 -is_ 37 -eth 37 -fa 37 -_sk 37 -ll_ 37 -ss 36 -bra 36 -wha 36 -gl 36 -ck_ 36 -pl 36 -lin 36 -ir_ 36 -ab 36 -_ther 36 -_da 35 -ce 35 -rin 35 -_oo 35 -rl 35 -wee 35 -and 35 -sa 35 -_yi 35 -_bra 35 -'d 35 -ds 35 -_bo 35 diff -Nru spamassassin-3.4.6/trunk-only/lm/sk.us-ascii.lm spamassassin-4.0.0~rc3/trunk-only/lm/sk.us-ascii.lm --- spamassassin-3.4.6/trunk-only/lm/sk.us-ascii.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sk.us-ascii.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 20064 -a 4991 -o 4983 -e 3838 -n 3342 -i 3317 -r 2583 -s 2501 -v 2383 -t 2325 -c 1918 -k 1912 -l 1888 -d 1736 -u 1725 -p 1543 -a_ 1527 -y 1371 -m 1339 -z 1227 -h 1194 -e_ 956 -_p 881 -_s 828 -o_ 814 -na 809 -b 808 -_v 798 -j 797 -. 796 -ov 795 -._ 785 -st 687 -i_ 665 -, 657 -,_ 657 -_n 625 -ch 623 -u_ 618 -ro 617 -po 598 -_o 546 -ne 529 -en 520 -v_ 519 -_a 516 -ra 506 -pr 488 -y_ 481 -od 476 -_z 467 -ie 462 -ni 448 -an 447 -vy 434 -to 433 -h_ 431 -_na 429 -re 416 -ch_ 404 -ho 401 -al 399 -ci 394 -va 387 -na_ 386 -_pr 385 -_d 384 -_k 378 -la 377 -ko 375 -do 374 -_po 373 -si 353 -_t 346 -_r 337 -os 336 -no 334 -in 328 -tr 324 -om 321 -_v_ 320 -ny 319 -m_ 319 -ri 317 -S 306 -ac 302 -sa 300 -ti 300 -_m 298 -za 298 -er 291 -ia 290 -ce 290 -li 289 -yc 286 -ych 285 -ed 284 -at 281 -ob 281 -ak 280 -_na_ 280 -il 279 -_, 279 -_,_ 279 -ok 277 -sk 268 -ych_ 265 -_c 262 -mi 261 -ol 260 -me 260 -l_ 259 -t_ 259 -ku 258 -ta 256 -le 256 -_b 254 -or 252 -_a_ 250 -lo 247 -oc 246 -vo 246 -es 244 -ve 242 -_vy 240 -on 238 -_sa 231 -as 231 -da 230 -aj 228 -av 218 -el 216 -ova 216 -ic 215 -ne_ 209 -_do 208 -sa_ 207 -ka 205 -_sa_ 204 -te 203 -j_ 201 -_ro 199 -P 198 -_za 196 -ky 196 -_S 195 -je 194 -ar 193 -_. 193 -it 192 -s_ 192 -em 191 -ej 191 -ur 190 -ad 189 -_o_ 187 -_._ 187 -ov_ 185 -de 180 -_% 179 -om_ 179 -% 179 -_u 174 -pre 173 -dn 173 -D 172 -rok 170 -ie_ 170 -sp 169 -pri 167 -_pre 167 -am 165 -- 164 -ke 164 -eh 162 -oz 161 -k_ 160 -ost 160 -_j 156 -f 155 -zn 153 -g 152 -kt 152 -ho_ 151 -eho 151 -hod 150 -ku_ 148 -is 148 -zi 147 -cn 147 -eho_ 146 -ej_ 145 -az 145 -tu 145 -_pri 144 -cen 144 -_st 143 -ma 142 -ast 141 -_ce 140 -rov 140 -la_ 138 -ot 138 -nych 135 -nyc 135 -_ob 133 -z_ 133 -nych_ 131 -N 130 -li_ 129 -ani 129 -co 128 -nt 128 -ny_ 127 -E 125 -_ne 124 -) 123 -_( 123 -sti 123 -A 123 -( 123 -cho 122 -vi 122 -_sp 122 -di 120 -pa 120 -n_ 119 -ju 118 -ys 117 -bo 117 -_P 116 -_tr 115 -V 114 -je_ 114 -ln 114 -_i 113 -ze 113 -spo 112 -_N 112 -nd 111 -nu 111 -so 111 -red 110 -vn 110 -kl 110 -kov 110 -_cen 110 -_rok 109 -tn 109 -du 109 -nc 109 -ap 109 -d_ 108 -van 108 -ca 108 -M 108 -chod 107 -ti_ 107 -U 106 -_ak 106 -ru 105 -sta 105 -ym 105 -_- 104 -et 103 -_h 102 -est 102 -_je 102 -nos 101 -aci 101 -us 100 -dov 100 -pod 100 -_to 100 -tor 99 -uc 99 -ras 98 -ky_ 98 -_s_ 98 -_mi 97 -* 97 -uj 97 -nost 97 -vys 97 -ovy 97 -ez 97 -oku 96 -_V 96 -op 96 -bc 96 -rast 96 -se 95 -B 95 -roku 95 -kto 94 -ove 94 -by 94 --_ 94 -_ko 93 -obc 92 -nie 91 -ia_ 91 -ka_ 91 -*_ 90 -ali 90 -lo_ 89 -ovan 89 -to_ 88 -iz 88 -_bo 88 -_l 88 -odo 87 -bch 87 -bchod 87 -bcho 87 -sl 86 -st_ 86 -pred 86 -C 86 -pol 85 -_pred 85 -R 85 -ik 84 -uro 84 -pi 84 -ek 84 -zo 83 -eni 83 -obch 83 -cie 83 -oku_ 83 -obcho 83 -ns 83 -roku_ 82 -ii 82 -tv 82 -ba 82 -ent 82 -_spo 81 -tov 81 -pe 81 -kon 80 -kc 80 -ec 80 -kci 80 -ck 80 -x 79 -osti 79 -_Sk 79 -mi_ 79 -_in 79 -Sk 79 -sia 79 -br 78 -rh 78 -val 78 -olo 77 -_pod 77 -%_ 77 -_%_ 77 -bu 77 -_f 77 -iv 77 -_obc 77 -_obch 77 -eb 76 -str 76 -nej 76 -_D 76 -ni_ 75 -ou 75 -im 75 -ena 74 -tre 74 -_A 74 -mo 74 -su 74 -rz 73 -_trh 73 -trh 73 -_U 73 -al_ 73 -_ra 73 -_e 72 -_C 72 -sti_ 72 -zv 72 -te_ 72 -cno 72 -oj 72 -ktor 71 -_roku 71 -ocn 71 -ina 71 -sil 71 -nov 71 -alo 71 -odn 70 -nan 70 -oh 70 diff -Nru spamassassin-3.4.6/trunk-only/lm/sk.windows-1250.lm spamassassin-4.0.0~rc3/trunk-only/lm/sk.windows-1250.lm --- spamassassin-3.4.6/trunk-only/lm/sk.windows-1250.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sk.windows-1250.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 8202 -o 2145 -a 1912 -e 1763 -i 1491 -n 1415 -r 1256 -t 1127 -v 1080 -s 1004 -k 824 -d 739 -p 739 -l 735 -m 685 -c 620 -u 597 -h 531 -a_ 467 -j 449 -_p 445 -z 439 -e_ 412 - 402 -_v 369 -. 361 -_s 359 -ov 330 -b 327 -st 312 -y 309 -pr 307 -._ 300 -o_ 297 - 278 -, 268 -,_ 260 -to 258 - 256 -_a 254 - 253 -i_ 252 -_pr 246 -ch 242 -re 233 -_z 223 -ra 220 -_n 217 -ne 214 -ie 214 -po 214 -en 208 -ro 205 -or 204 - 199 -u_ 197 -an 197 -ko 194 -na 189 -ni 187 -va 183 - 182 - 180 -os 179 -v_ 176 - 173 -_o 171 -ho 170 -ia 168 -no 166 -li 166 -h_ 166 -ed 164 -j_ 161 -om 160 -_k 160 - 158 -ch_ 158 -ti 155 -y_ 148 -m_ 147 -ej 147 -_po 145 -ci 145 -_d 140 -_ 139 -do 138 -_t 137 -_m 134 -ri 129 -mi 129 -od 128 -te 124 -_a_ 124 -la 122 -al 121 -aj 120 -ej_ 120 -vo 119 -ol 119 -in 118 -ve 117 -me 117 -tr 116 -sk 116 -ova 116 -S 111 -er 110 -ob 110 -_na 109 -ad 107 -je 106 -at 104 -_v_ 103 -_r 102 -ic 101 -ch 100 -pre 100 -c 100 -av 98 -es 96 -ta 95 -dn 94 -ho_ 94 -lo 94 -_ 93 -_pre 93 -it 93 -V 92 -de 92 -kt 89 -n 89 -za 88 -A 87 -le 86 -ch_ 86 -ok 86 -ost 85 -vi 84 -ie_ 83 -ak 82 -P 82 -n 81 -R 80 -sa 80 -as 79 -i 78 -na_ 77 -a 77 -_ 77 - 76 -ar 75 -di 75 -_S 74 -om_ 74 -_V 73 -_do 73 -_za 72 -- 72 -ck 71 -vy 71 -ka 71 -f 70 -tor 70 -am 70 -on 70 -_- 69 -_P 69 -M 68 -_i 68 -_sa 68 -nos 68 -n 68 -c 67 -a_ 67 -sl 66 -il 66 -r 66 -_c 66 -_b 66 -_-_ 64 -sa_ 64 --_ 64 -kto 64 -_j 64 -ani 64 -kr 64 -sti 63 -ou 63 -ot 63 -ne_ 63 -_sa_ 62 -v 62 -_na_ 62 -red 62 -ku 61 -is 61 -n 60 -_ 60 -so 60 -sp 60 -_st 59 -g 59 -tn 59 -str 58 -e 58 -nt 58 -et 57 -pra 57 -ke 57 -ov_ 57 -_vy 57 -_M 57 -nej 56 -tu 56 -l_ 56 -_je 56 -nie 56 -n 56 -k_ 56 -pe 56 -_h 55 -oz 55 -_ 55 -est 55 -_ 55 -va 55 -ma 54 -n_ 53 -t 53 -.. 53 -r 52 -ran 52 -bo 51 -nej_ 51 -ick 51 -ti_ 51 -ia_ 51 -ktor 51 -K 51 -O 51 -T 51 -_ne 51 -ou_ 50 -I 50 -oc 50 -to_ 50 -vn 50 -sta 50 -_. 50 -da 50 -h 49 -ho 49 -N 49 -_ro 49 -_ko 49 -ac 49 -ek 49 -li_ 49 -a 49 -rov 49 -oj 48 -s_ 48 -s 48 -ho_ 48 -va_ 48 -je_ 48 -z 47 -ik 47 -mo 47 -mi_ 47 -si 47 -_kto 46 -_sp 46 -_kt 46 -E 46 -_ktor 46 -eb 46 -nc 45 -_u 45 -el 45 -B 45 -nch 45 -pro 45 -eni 44 -_ 44 -em 44 -kon 44 -pa 44 -ky 44 -uj 44 -e_ 44 -ova 44 -cie 44 -hr 44 -k 44 -nch_ 43 -pred 43 -zo 43 -ln 43 -o 43 -tov 43 -nu 43 -e 43 -c 42 -l 42 -m 42 -pri 42 -_to 42 -l 41 -ce 41 -v 41 -eh 41 -_pro 41 -rav 41 -kej 41 -ns 41 -ali 41 -oli 40 -_ 40 -_pri 40 -oh 40 -ud 40 -_ak 40 -ent 40 -e 40 -prav 39 -_pred 39 -i 39 -zn 39 -ny 39 -ove 39 -pol 39 -ru 39 -a, 39 -ah 39 -kej_ 39 -a,_ 38 -z_ 38 -aj_ 38 -r_ 38 -i 38 -ova_ 38 -tre 38 -pod 37 -_z 37 -_ob 37 -nost 37 -sti_ 37 -van 37 -up 37 -osti 36 -ci 36 -_e 36 -j 36 -co 36 -_str 36 -i 36 -_ma 36 -ut 36 -nsk 36 -by 36 -_ve 35 -ko_ 35 -de_ 35 -ia 35 -_aj 35 -_aj_ 35 -op 35 -_pod 34 -pr 34 -_in 34 -ez 34 -odn 34 -dne 34 -Z 34 -tra 34 -bn 34 -d 34 -_e_ 34 -_vo 34 -as 34 -t 34 -d_ 34 - 34 -sto 34 -ky_ 34 -ir 33 -_z_ 33 -nie_ 33 -t 33 -ven 33 -i_ 33 -_s_ 33 -_B 33 -e 33 -ens 33 -spo 32 -eho 32 -lad 32 diff -Nru spamassassin-3.4.6/trunk-only/lm/sl.iso-8859-2.lm spamassassin-4.0.0~rc3/trunk-only/lm/sl.iso-8859-2.lm --- spamassassin-3.4.6/trunk-only/lm/sl.iso-8859-2.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sl.iso-8859-2.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 10406 -a 2828 -e 2676 -i 2458 -o 2418 -n 1814 -r 1484 -v 1253 -l 1248 -s 1228 -t 1172 -j 1107 -d 1085 -k 911 -p 880 -a_ 823 -m 763 -i_ 681 -e_ 678 -_p 603 -o_ 566 -u 521 -z 516 -b 456 -_s 435 -je 434 -, 416 -,_ 411 -ni 399 - 383 -_v 372 -_d 356 -pr 355 -g 345 -ra 336 -_n 332 -st 323 -an 313 -po 303 -re 301 -na 295 -h 287 -ov 276 -_pr 276 -li 275 -al 274 -_z 270 -je_ 259 -la 255 - 253 -ne 248 -en 246 -ko 244 -in 237 -c 234 -ti 234 -v_ 234 -_po 232 -no 230 -ve 230 -_k 227 -_i 224 -da 224 -. 221 -_j 221 -ri 220 -ja 216 -_t 214 -se 213 -ed 212 -._ 211 -em 206 -te 205 -za 201 -od 201 -av 200 -lo 196 -nj 194 -_o 194 -_je 193 -il 190 -or 183 -ka 181 -sk 179 -_b 178 -_je_ 178 -ih 178 -n_ 177 -_za 173 -h_ 171 -er 171 -os 171 -_na 168 -va 168 -ta 164 -le 163 -m_ 161 -ev 157 -ij 157 -ar 157 -do 155 -to 155 - 154 -A 153 -el 150 -_m 148 -ro 147 -ol 146 -_v_ 145 -aj 145 -di 143 -N 142 -S 142 -at 140 -ih_ 139 -ki 138 -de 137 -_in 135 -vo 135 -ga 134 -me 131 -in_ 129 -vi 129 -om 127 -_in_ 125 -et 124 -pre 124 -O 123 -bi 120 -I 119 -da_ 117 -ik 117 -ma 115 -E 114 -so 113 -bo 112 -it 112 -anj 112 -eg 110 -ni_ 109 -mi 108 -ke 108 -na_ 108 -u_ 108 -lj 106 -iz 105 -ob 105 -_da 103 -li_ 103 -is 103 -im 102 -red 102 -_pre 102 -dr 100 -mo 99 -P 99 -_se 99 -ji 98 -r_ 97 -ad 97 -pri 97 -K 97 -_l 97 -tr 95 -pa 94 -no_ 94 -j_ 92 -ki_ 91 -ti_ 91 -_pri 91 -dn 89 -_P 88 -ej 88 -_da_ 87 -ne_ 86 -ega 86 -_r 86 -_bi 86 -l_ 86 -em_ 86 -go 86 -" 85 -sl 85 -ek 84 -ali 84 -ove 84 -a 84 -ak 84 -ci 83 -ga_ 83 -ko_ 83 -se_ 82 -_S 82 -jo 81 -ot 81 -ja_ 81 -_so 80 -lov 80 -L 80 -D 79 -V 79 -as 78 -_do 78 -am 78 -nje 77 -es 77 -za_ 77 -_pa 76 -T 75 -tu 75 -_za_ 74 -sti 74 -_dr 74 -la_ 74 -_N 74 -_de 74 -ega_ 73 -_ko 73 -og 73 -ns 72 -e 72 -ds 72 -_bo 71 -ora 71 -vn 71 -ost 71 -_ne 71 -i 70 -ven 69 -z_ 69 -i 69 -_te 68 -ce 68 -_se_ 67 -a 67 -o 67 -M 66 -_u 66 -un 65 -ln 65 -pos 64 -ju 64 -sta 64 -op 64 -di_ 63 -ud 63 -vs 63 -t_ 62 -nsk 62 -tv 62 -on 62 -ski 62 -R 62 -pa_ 62 -_ka 62 -i, 61 -so_ 61 -_iz 60 -_pa_ 60 -s_ 60 -i,_ 60 -pro 59 -del 59 -rav 59 -eni 59 -oli 58 -rj 58 -e, 57 -e 57 -ili 57 -vr 57 -d_ 57 -_le 57 -pred 57 -jo_ 56 -e,_ 56 -nik 56 -love 56 -_pred 56 -ske 56 -er_ 55 -str 55 -n 54 -pra 54 -J 54 -_ 54 -oven 53 -_ra 53 -tn 53 -_na_ 53 -_so_ 53 -nih 53 -loven 53 -si 52 -ke_ 52 -_g 52 -ic 52 -udi 51 -bi_ 51 -eds 51 -oj 51 -ru 51 -a, 51 -_pro 50 -_pos 50 -nc 50 -nih_ 50 -u 50 -a,_ 50 -_a 50 -az 50 -ok 50 -B 50 -let 49 -udi_ 49 -_od 49 -_K 49 -aj_ 48 -_bi_ 48 -_ve 48 -ra 48 -o, 47 -_tu 47 -ija 47 -ter 47 -ist 47 -Z 47 -reds 46 -nd 46 -ali_ 46 -A_ 46 -iti 46 -bil 46 -_ob 46 -o,_ 46 -ati 46 -tud 45 -tudi 45 -_ki 45 -k_ 45 -be 45 -a 45 -ir 45 -a 45 -do_ 45 -sp 45 -_ki_ 45 -_st 45 -ep 44 -_del 44 -tudi_ 44 -r 44 -au 44 -_ni 44 -ah 43 -rau 43 -raun 43 -i 43 -_mo 43 -avn 43 -_tud 43 -un 43 -aun 43 -_tudi 43 -_to 42 -raz 42 -kr 42 -ova 42 -_e 42 -ogo 42 -ani 42 -_" 42 -ev_ 42 -br 42 -eb 42 -sa 42 -mi_ 42 -tem 42 -ta_ 41 -prav 41 -i. 41 -slov 41 -ens 41 -bo_ 41 -e 41 -_T 41 -_let 41 -odo 41 -slo 41 -ensk 40 -ka_ 40 -neg 40 -ez 40 -nos 40 -e 40 -_sl 40 -_V 40 -ra 40 -nega 40 -ili_ 39 diff -Nru spamassassin-3.4.6/trunk-only/lm/sl.us-ascii.lm spamassassin-4.0.0~rc3/trunk-only/lm/sl.us-ascii.lm --- spamassassin-3.4.6/trunk-only/lm/sl.us-ascii.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sl.us-ascii.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 25262 -e 6217 -a 5964 -i 5611 -o 5538 -n 4132 -s 3349 -l 3268 -r 2913 -t 2777 -j 2672 -v 2282 -k 2175 -e_ 1958 -d 1953 -p 1786 -a_ 1700 -y 1623 -m 1559 -o_ 1542 -z 1521 -i_ 1462 -_s 1433 -je 1383 -, 1278 -,_ 1278 -b 1230 -c 1137 -_p 1130 -_n 1032 -je_ 997 -u 986 -_j 972 -g 933 -_je 877 -cy 848 -_je_ 842 -_v 793 -il 786 -ni 782 -st 779 -na 743 -ra 726 -. 723 -._ 716 -_z 713 -in 691 -_k 685 -_b 667 -al 640 -h 627 -po 607 -ti 584 -pr 584 -ko 584 -_d 582 -el 579 -n_ 579 -la 577 -lo 573 -l_ 571 -_t 567 -se 567 -ne 562 -_i 556 -no 549 -en 546 -_o 534 -re 524 -bi 514 -li 512 -ov 496 -sy 458 -_na 457 -te 453 -da 451 -_po 440 -_bi 437 -ye 436 -to 424 -ri 420 -an 420 -_pr 417 -ve 410 -nj 404 -ka 403 -_m 394 -le 385 -ja 377 -va 374 -de 374 -is 371 -ed 364 -v_ 362 -za 361 -in_ 354 -bil 353 -_se 351 -aj 347 -ga 344 -ar 343 -od 339 -_in 338 -_in_ 333 -tr 332 -os 332 -_bil 332 -ta 328 -vo 327 -ki 324 -ro 324 -et 320 -so 315 -em 313 -lo_ 311 -na_ 306 -av 305 -ih 305 -yi 304 -h_ 295 -at 294 -m_ 293 -ek 292 -ol 289 -se_ 289 -as 284 -lj 281 -_za 277 -ob 275 -om 273 -me 273 -zy 272 -mi 268 -eg 265 -_v_ 263 -_g 260 -or 260 -es 259 -_se_ 258 -do 255 -ni_ 255 -ga_ 253 -oc 251 -il_ 250 -vi 249 -ak 248 -no_ 243 -da_ 241 -pa 240 -_ne 238 -ot 238 -_so 238 -ocy 237 -ya 237 -la_ 234 -li_ 234 -ih_ 231 -_c 229 -az 229 -ik 228 -on 225 -ki_ 224 -go 223 -im 223 -sk 223 -mo 221 -cye 219 -ti_ 217 -ji 216 -_da 216 -iz 215 -ko_ 214 -ic 213 -_l 209 -u_ 209 -pre 208 -_r 208 -_ko 208 -t_ 207 -z_ 206 -er 206 -so_ 206 -ilo 203 -r_ 201 -j_ 199 -ad 195 -cyi 193 -_na_ 193 -sa 191 -ev 191 -i, 188 -i,_ 188 -it 187 -sto 186 -_da_ 184 -_ni 183 -_so_ 182 -_ve 182 -nje 181 -a, 181 -kr 181 -a,_ 181 -dn 177 -_st 177 -di 176 -ega 176 -og 174 -o,_ 174 -o, 174 -ilo_ 172 -_ki 171 -ma 170 -- 170 -ij 169 -_cy 169 -ost 169 -e, 168 -e,_ 168 -ne_ 168 -ok 166 -ke 165 -_pre 165 -del 165 -yn 165 -al_ 165 -bo 164 -_pa 163 -_ki_ 163 -am 159 -ns 158 -ye_ 156 -sp 155 -em_ 154 -_ka 154 -_te 153 -_iz 152 -ega_ 151 -_ob 150 -br 149 -ec 149 -pri 148 -ap 147 -ez 147 -ali 147 -raz 144 -jo 142 -to_ 141 -d_ 138 -a._ 137 -a. 137 -cya 137 -ova 136 -anj 136 -el_ 135 -V 135 -si 134 -sta 134 -_pri 132 -_to 131 -_a 130 -_bilo 130 -bilo 130 -oj 129 -ecy 128 -_od 128 -gl 128 -op 127 -ju 127 -rav 126 -_u 125 -s_ 125 -_V 125 -ila 125 -ce 124 -_mo 124 -ali_ 124 -ah 122 -str 122 -_sp 121 -vr 121 -aj_ 121 -_do 121 -bilo_ 121 -N 119 -iv 117 -ru 116 -vs 116 -jal 116 -pi 115 -O 115 -_z_ 113 -icy 112 -k_ 112 -be 112 -elo 111 -dr 110 -pra 110 -sye 110 -ved 109 -rs 108 -_tr 108 -tv 108 -oz 108 -tn 107 -_nj 107 -le_ 107 -_N 107 -_ni_ 106 -pa_ 106 -l,_ 105 -l, 105 -ins 105 -ako 104 -ac 104 -ist 104 -ir 104 -sl 104 -ila_ 103 -nik 103 -bi_ 103 -i. 102 -i._ 102 -_vs 102 -iti 102 -_sy 101 -P 101 -val 100 -ku 100 -_P 99 -pe 99 -ala 99 -bil_ 98 -eli 98 -jen 98 -ede 98 -_zy 98 -T 96 -ja_ 96 -ran 95 -_bo 95 -S 95 -ln 95 -zn 94 -nst 93 -_pa_ 93 -_ra 93 -_bil_ 93 -nil 93 -ati 92 -ej 92 -ocyi 92 -e. 91 -_le 91 -ud 91 -nov 91 -nja 91 -sn 91 -ar_ 91 -e._ 91 -kl 91 -isy 90 -zye 90 -en_ 90 -sti 90 -_ga 90 -prav 90 -_bi_ 90 -za_ 89 -lik 89 -ton 89 -kra 88 -rt 88 -W 88 -_de 88 -_ga_ 88 -M 88 -ep 87 -cyn 87 -Wi 87 -_S 87 -ut 87 -_W 87 -inst 87 -insto 86 -ste 86 -Wins 86 -gov 86 -nu 86 -Win 86 -_Wi 86 -Winst 86 -nsto 86 -eti 86 -ston 86 -nston 86 -_Win 85 -_Wins 85 -ili 84 -bra 83 -rat 83 diff -Nru spamassassin-3.4.6/trunk-only/lm/sq.lm spamassassin-4.0.0~rc3/trunk-only/lm/sq.lm --- spamassassin-3.4.6/trunk-only/lm/sq.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sq.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 19480 - 4099 -e 4082 -t 3635 -i 3134 -a 2893 -r 2820 -n 2610 -s 2380 -h 2060 -_ 2055 -e_ 1825 -j 1677 -u 1489 -d 1381 -o 1370 -m 1318 -k 1264 -t 1091 -p 1072 -_t 1068 -sh 998 -l 936 -_n 876 -a_ 822 -, 816 -,_ 808 -t_ 795 -i_ 770 -_p 739 -_m 702 -_s 700 -te 653 -r 620 -_d 613 -_e 607 -g 602 -_k 601 -_t 593 -. 575 -_t_ 574 -v 567 -_e_ 554 -r_ 525 -._ 523 -ht 503 -n_ 480 -he 473 -n 462 -sht 461 -te_ 457 -q 454 -nd 436 -ri 432 -is 414 -et 403 -b 402 -je 401 -me 395 -in 391 -it 381 -r 374 -_a 374 -t_ 359 -ur 353 -_i 346 -ar 342 -s 339 -er 338 -n_ 338 -n 338 -dh 337 -en 336 -p 334 -f 328 -_v 323 -j 318 -nj 313 -ish 312 -pr 294 -y 285 -z 282 -es 281 -at 274 -_me 273 -_q 273 -gj 269 -ra 261 -as 258 -_n 256 -ku 256 -j_ 250 -ta 249 -re 246 -nj 245 -o_ 243 -ni 243 -_p 240 -hte 240 -_nj 239 -on 239 -isht 236 -pa 234 -th 233 -shte 233 -_pr 232 -se 228 -_g 223 -ve 221 -in_ 220 -s_ 219 -_n_ 219 -do 218 -hte_ 218 -m 216 -ti 215 -aj 212 -shte_ 212 -ej 212 -u_ 211 -q 211 -_sh 210 -nt 207 -j_ 206 -_b 205 -_nj 203 -di 202 -_pa 201 -_i_ 201 -ll 199 -_f 199 -k 198 -me_ 197 -dhe 195 -ishte 195 -si 194 -hi 191 -he_ 188 -- 187 -ja 187 -_q 187 -ua 186 -il 184 -_dh 184 -ur_ 183 -r_ 182 -or 180 -se_ 179 -q_ 178 -S 176 - 175 -_h 173 -an 172 -nj_ 172 -ng 170 -nte 170 -_q_ 169 -_S 169 -r_ 166 -dhe_ 165 -_me_ 164 -ka 162 -im 159 -h 158 -mi 157 -to 156 -tu 156 -n_ 155 -_nj_ 154 -ha 153 -nte_ 150 -tr 148 -sa 148 -t 148 -_gj 148 -un 147 -rr 147 -, 147 -_dhe 147 -ej_ 147 -ki 146 -,_ 146 -_ku 145 -_- 144 -_ng 142 -ik 141 -_nd 140 -end 138 -uk 137 -et 135 -ko 135 -_dhe_ 135 -_ve 132 -va 131 -_l 131 -pr_ 131 -shi 131 -er 129 -ke 127 -kis 127 -s 126 -jo 125 -li 124 -ga 124 -kish 123 -_ki 122 -po 122 -_se 122 -' 121 -du 120 -mb 120 -_m 119 -Si 115 -m_ 115 -esh 115 -_si 114 -qe 114 -l 114 -_kis 113 -oh 113 -_kish 113 -_Si 113 -pr 112 -_u 112 -uar 111 -de 111 -hu 111 -_th 111 -al 111 -ta_ 109 -ilv 108 -Sil 108 -Silv 108 -lv 108 -k_ 108 -e, 108 -ji 107 -e,_ 106 -_Sil 106 -_Silv 106 -_r 105 -os 104 -_se_ 104 -kisht 102 -_di 102 -st 101 -_pr_ 101 -b 101 -tj 100 -_nga 99 -nga 99 -_du 98 -ra_ 98 -v 98 -gji 98 -_ish 96 -rt 96 -_is 96 -ro 95 -ir 94 -ga_ 94 -sh 94 -ont 93 -c 93 -t, 93 -t,_ 93 -hin 92 -a, 92 -_at 92 -und 92 -jt 91 -_mb 91 -a,_ 91 -tje 90 -_nga_ 90 -_do 90 -_pr 90 -rit 90 -men 90 -nga_ 90 -ri_ 89 -N 89 -ma 89 -it_ 88 -_k 88 --_ 88 -m_ 87 -jo_ 87 -onte 87 -at 87 -la 87 -ri 87 -ilva 86 -shin 86 -. 86 -Silva 86 -lva 86 -s_ 85 -jer 85 -et_ 85 -_po 85 -s_ 84 -kur 84 -ru 84 -nin 83 -ot 83 -hin_ 83 -_N 83 -her 83 -ht 82 -ap 82 -shin_ 82 -mo 81 -ash 81 -tha 81 -_ 81 -._ 81 -m 81 -jit 80 -_ta 80 -ul 80 -le 80 -ho 80 -_z 79 -dr 78 -jet 78 -nin_ 78 -_m_ 78 -gjit 78 -A 78 -hk 78 -onte_ 78 -oni 77 -lo 77 -ba 77 -her 77 -ndo 76 -shk 76 -mend 75 -_v 75 -ha_ 75 -d 75 -tur 74 -_A 74 -el 74 -bi 74 -_ko 74 -uk_ 73 -er_ 73 -si_ 73 -_sa 73 -ar_ 72 -P 72 -rs 72 -pas 72 -ith 72 -uar_ 71 -_isht 71 -ai 70 -e. 70 -_vet 70 -vet 70 -_b 70 -zi 70 -d_ 70 -jith 70 -da 70 -gjith 69 -duk 69 -na 69 -hej 69 -tr 68 -_men 68 -_ka 68 -am 68 -nd_ 68 -_c 67 -_pas 67 -_duk 67 -jes 67 -ak 67 -s, 67 -e._ 67 -s,_ 67 -K 67 -sht 67 -mu 66 -kur_ 66 -yr 66 -em 65 -_s 65 -tha_ 65 -imi 65 -ie 65 -hej_ 64 -_s_ 64 -_u_ 64 -? 64 -fu 64 -_P 64 diff -Nru spamassassin-3.4.6/trunk-only/lm/sr.us-ascii.lm spamassassin-4.0.0~rc3/trunk-only/lm/sr.us-ascii.lm --- spamassassin-3.4.6/trunk-only/lm/sr.us-ascii.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sr.us-ascii.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 34122 -a 9113 -o 8135 -i 7736 -e 7535 -n 5207 -s 4860 -j 3995 -t 3797 -r 3660 -u 3224 -l 3065 -d 3061 -e_ 2941 -v 2786 -a_ 2746 -k 2701 -m 2492 -o_ 2328 -y 2238 -p 2151 -_s 2148 -i_ 2094 -je 1887 -c 1854 -z 1731 -_n 1437 -_p 1432 -g 1418 -b 1368 -u_ 1333 -je_ 1237 -, 1226 -,_ 1214 -_i 1130 -st 1105 -na 1076 -. 1056 -_d 1033 -._ 1030 -_j 967 -ra 934 -ko 908 -ni 900 -cy 893 -sy 875 -_je 871 -_o 824 -ta 799 -no 780 -_u 777 -re 766 -_b 764 -_k 763 -da 760 -ne 754 -li 750 -ti 745 -se 722 -po 713 -to 713 -_je_ 696 -an 688 -ja 683 -pr 665 -va 651 -lo 634 -_z 626 -m_ 625 -is 625 -il 622 -ov 621 -la 621 -_m 615 -bi 604 -_t 603 -_po 594 -en 586 -_se 578 -os 578 -in 576 -od 576 -ka 552 -ve 548 -ij 538 -_pr 536 -al 536 -vo 535 -om 530 -_i_ 525 -nj 515 -ed 509 -_na 507 -na_ 503 -og 499 -oj 498 -ma 493 -_bi 492 -on 489 -ak 482 -im 481 -ye 481 -ro 480 -vi 473 -sa 469 -ri 464 -da_ 451 -av 450 -at 449 -se_ 447 -es 446 -h 443 -ao 441 -ji 437 -yi 436 -_da 433 -ad 432 -_se_ 430 -lj 428 -zy 426 -za 426 -_ne 425 -de 422 -tr 417 -cj 415 -_u_ 414 -_c 412 -le 402 -_v 397 -ar 390 -_g 390 -ic 384 -n_ 382 -ju 379 -lo_ 377 -aj 376 -_ko 369 -ao_ 366 -ek 361 -_da_ 359 -et 356 -go 354 -iz 346 -_za 345 -_r 344 -or 342 -mo 341 -el 340 -as 339 -ik 336 -te 332 -_sa 329 -d_ 323 -am 320 -me 318 -sto 317 -di 315 -ec 311 -ol 310 -a,_ 307 -a, 307 -_ni 302 -ya 296 -do 295 -yt 294 -su 292 -syt 289 -li_ 288 -sta 286 -ije 284 -ko_ 277 -ti_ 277 -la_ 277 -ga 276 -bil 275 -no_ 274 -a. 273 -nu 272 -a._ 271 -ne_ 271 -om_ 268 -_cy 266 -_na_ 263 -_bil 263 -sv 263 -ru 259 -to_ 256 -_od 253 -cyi 253 -nje 251 -it 251 -pa 250 -az 248 -e,_ 245 -e, 245 -ob 244 -dn 243 -ac 242 -ost 242 -k_ 240 -iv 239 -io 238 -_su 238 -_iz 237 -ilo 235 -_sv 234 -_ka 233 -koj 231 -mi 229 -im_ 229 -ije_ 227 -g_ 226 -em 223 -su_ 223 -ih 223 -ji_ 221 -kr 220 -ut 220 -_koj 220 -V 218 -_st 218 -ye_ 217 -_l 214 -_V 213 -ovo 211 -j_ 210 -uc 208 -ja_ 208 -h_ 207 -nij 206 -sk 206 -ot 203 -io_ 203 -gl 203 -_do 201 -ok 200 -ns 199 -ilo_ 199 -er 197 -ih_ 195 -pre 193 -ci 193 -og_ 193 -ki 192 -sl 191 -t_ 189 -ni_ 189 -_a 189 -vr 188 -ati 187 -_su_ 186 -nije 181 -pro 181 -be 180 -yn 179 -cye 178 -ju_ 178 -ku 177 -isy 177 -ta_ 174 -sye 172 -_tr 172 -O 172 -jen 172 -_to 171 -pi 168 -_pre 168 -S 168 -ima 167 -nije_ 167 -_mo 166 -eg 166 -e._ 164 -za_ 164 -e. 164 -_pro 164 -gov 163 -N 162 -dr 162 -ako 162 -tv 162 -_S 160 -P 159 -ma_ 159 -_on 159 -sp 158 -nst 158 -anj 158 -dj 157 -oc 157 -_sy 156 -ev 155 -ce 155 -lik 154 -_nij 153 -_N 152 -ist 151 -_P 151 -_nije 151 -- 151 -ba 150 -jed 150 -sti 150 -ova 149 -_is 148 -id 148 -ton 148 -ke 147 -pos 147 -od_ 147 -osy 146 -Vi 146 -ila 145 -ins 145 -bo 145 -_Vi 145 -ir 144 -_za_ 144 -oz 144 -ecj 144 -cje 143 -on_ 143 -zn 142 -_O 141 -us 141 -i, 141 -i,_ 141 -mu 140 -inst 140 -cya 140 -oji 139 -esy 139 -icy 139 -lja 138 -_go 138 -i. 138 -_re 137 -_bilo 137 -edn 137 -acy 137 -rat 137 -bilo 137 -ali 136 -ecy 136 -ija 135 -pri 135 -ad_ 135 -lic 135 -i._ 135 -Vins 134 -Vin 134 -ston 134 -Vinst 134 -ga_ 134 -nston 134 -insto 134 -nsto 134 -_Vins 133 -_Vin 133 -zi 132 -ran 131 -le_ 130 -ili 130 -bilo_ 130 -_pos 129 -ila_ 129 -est 128 -_ve 128 -tre 128 -zye 127 -_nj 127 -si 126 -f 126 -alo 125 -ako_ 125 -tra 125 -sa_ 125 -pu 124 -ud 124 -z_ 124 -_ra 124 -iti 124 -_de 124 -odi 123 -T 123 --_ 122 -o,_ 121 -o, 121 -du 121 -rs 121 -B 120 -ka_ 119 -red 119 -_od_ 118 -an_ 118 -nu_ 118 -iko 117 -dno 117 -_pa 117 -s_ 116 diff -Nru spamassassin-3.4.6/trunk-only/lm/sv.lm spamassassin-4.0.0~rc3/trunk-only/lm/sv.lm --- spamassassin-3.4.6/trunk-only/lm/sv.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sv.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 33494 -e 8992 -n 7900 -t 7859 -a 7781 -r 7251 -s 6435 -i 5649 -l 4541 -d 4079 -o 3724 -m 3203 -k 3058 -g 2478 -en 2403 -n_ 2389 -t_ 2073 -de 1939 -r_ 1910 -v 1890 -h 1789 -u 1782 -_s 1768 - 1724 -er 1709 -f 1597 -en_ 1537 -a_ 1526 -an 1357 -p 1320 -et 1317 - 1278 - 1261 -st 1236 -ar 1226 -c 1191 -_d 1158 -e_ 1116 -in 1045 -_f 1027 -te 1000 -b 997 -_a 978 -s_ 974 -ra 958 -. 956 -tt 935 -_i 898 -_m 890 -._ 886 -ll 870 -ta 844 -_o 842 -_e 839 -nd 820 -ti 804 -sk 798 -re 779 -at 769 -_de 754 -om 743 -m_ 739 -r 720 -, 697 -,_ 695 -ng 686 -li 673 -ka 666 -oc 662 -_h 654 -on 652 -et_ 647 -ch 645 -ns 643 -is 642 -er_ 630 -r 625 -_v 614 -_t 614 -ni 611 -i_ 609 -_oc 592 -tt_ 587 -na 586 -y 586 -la 579 -_b 579 -h_ 577 -kt 575 -ch_ 568 -ig 564 -f 563 -och 555 -or 555 -_och 554 -och_ 554 -_och_ 553 -me 548 -den 548 -om_ 535 -_i_ 531 -d_ 530 -j 529 -ik 520 -de_ 520 -fr 518 -ge 498 -ad 497 -_k 491 -_f 487 -ri 484 -el 482 -il 481 -so 480 -al 474 -g_ 469 -le 464 -an_ 461 -_fr 447 -si 437 -ar_ 437 -att 435 -_p 434 -es 420 -ing 413 -se 407 -to 404 -_u 403 -_en 403 -and 398 -den_ 395 -nde 393 -nn 393 -_l 391 -_ 391 -D 385 -n 383 -nt 382 -l_ 381 -tr 378 -_D 372 -va 370 -am 369 -sa 367 -_so 365 -ga 364 -_en_ 361 -r_ 358 -ck 357 -av 354 -v_ 351 -ed 347 -ma 346 -da 346 -som 346 -rs 344 -som_ 344 -ve 342 -ter 341 -att_ 341 -ha 338 -ne 337 -ut 335 -as 332 -ska 329 -_at 327 -_att 326 -_som 324 -_att_ 324 -_som_ 323 -vi 322 -ikt 317 -_av 316 -det 316 -_den 315 -he 315 -ss 314 -un 307 -ke 304 -_g 303 -us 302 -di 302 -_st 300 -rn 297 -_me 296 -_ 295 -ade 294 -" 290 -_ha 290 -av_ 289 -ill 288 -_n 286 -_in 279 -io 275 -_r 275 -der 275 -it 274 -_av_ 274 -sta 274 -gen 272 -isk 270 -_ti 269 -id 265 -na_ 265 -ns_ 264 -ko 262 -_den_ 261 -ag 258 -det_ 257 -lig 257 -era 256 -ll_ 255 -_det 252 -_r 251 -be 249 -_r_ 248 -ra_ 247 -ion 244 -- 241 -pr 240 -oni 233 -til 231 -ten 228 -_si 225 -k_ 222 -p 222 -fr 221 -ro 219 -till 219 -iv 216 -ls 216 -ande 215 -r_ 214 -_det_ 213 -l 212 -_p 211 -ts 210 -ens 209 -med 209 -mm 208 -rt 208 -_till 208 -_til 208 -_va 207 -_fr 205 -_sk 205 -var 205 -nin 204 -ning 203 -ol 201 -ka_ 200 -lle 198 -ett 198 -rd 197 -em 196 -p_ 195 -x 195 -rk 194 -_ut 194 -ste 194 -ds 193 -_vi 192 -r 192 -S 192 -nde_ 191 -are 191 -ver 190 -_p_ 190 -nis 189 -kr 189 -_med 188 -all 188 -n 187 -nge 185 -mo 184 -os 183 -ld 182 -ade_ 181 -_S 181 -ed_ 180 -r 176 -De 175 -_- 175 -kan 174 -ta_ 173 -ng_ 172 -v 171 -fr_ 170 -ill_ 170 -han 170 -_De 170 -pp 169 -lt 169 -sam 168 -nte 167 -ans 167 -ton 166 -ur 165 -mi 165 -ess 165 -kl 164 -ig_ 164 -ks 164 -as_ 163 -und 163 -men 162 -med_ 161 -_med_ 161 -ak 161 -Di 160 -ot 159 -rna 159 -ul 159 -_var 159 -te_ 158 -gen_ 158 -het 157 -kto 157 -str 156 -_Di 155 -tad 155 -lan 154 -ga_ 154 -iska 154 -fa 154 -fi 154 -s 154 -Dikt 153 -Dik 153 -pe 153 -ska_ 152 -ja 152 -H 151 -res 151 -ku 151 -iu 150 -ande_ 150 -till_ 150 -t. 150 -ern 150 -rm 149 -_Dikt 149 -_Dik 149 -ie 149 -bl 148 --_ 147 -od 147 -_H 147 -n. 147 -ist 147 -_di 146 -ius 146 -_" 145 -la_ 145 -sl 145 -man 145 -ren 145 -_fr_ 145 -toni 144 -kton 144 -n._ 144 -ktoni 144 -ikton 144 -I 144 -ikto 144 -nius 143 -ten_ 143 -onius 143 -oniu 143 -toniu 143 -ing_ 143 -Dikto 143 -niu 143 -_ko 143 -ic 142 -_sa 142 -_han 142 -ett_ 142 -sm 141 -ba 141 -M 141 -gr 140 -l 140 -ex 138 -t._ 138 -sp 137 -lla 137 -_et 137 -_M 137 -dr 137 -r 136 -rad 136 -ek 136 -_be 135 -tar 135 -_-_ 135 -_om 134 -rl 134 -E 134 -m 133 diff -Nru spamassassin-3.4.6/trunk-only/lm/sw.lm spamassassin-4.0.0~rc3/trunk-only/lm/sw.lm --- spamassassin-3.4.6/trunk-only/lm/sw.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/sw.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 16483 -a 9342 -i 5293 -a_ 4071 -u 2730 -k 2609 -n 2351 -w 2076 -m 1928 -e 1866 -h 1800 -o 1775 -wa 1743 -l 1486 -s 1419 -i_ 1401 -t 1399 -_k 1306 -y 1100 -_w 969 -li 945 -wa_ 911 -z 891 -_wa 890 -ka 834 -ku 799 -r 770 -b 733 -an 727 -ma 723 -o_ 711 -_m 707 -na 698 -ya 675 -ha 672 -g 602 -al 580 -d 570 -at 560 -am 554 -_n 549 -_ku 549 -ik 543 -_h 515 -ya_ 514 -A 494 -is 487 -_y 485 -hi 474 -na_ 471 -_ya 471 -ta 468 -sh 456 -ali 449 -j 426 -u_ 423 -ki 418 -e_ 402 -p 401 -ti 401 -_wa_ 399 -f 392 -_ya_ 390 -ba 390 -ri 385 -ng 385 -il 380 -c 358 -hu 356 -_na 356 -ni 355 -za 354 -zi 351 -ia 344 -_na_ 343 -_a 336 -in 327 -_ma 326 -ch 322 -mb 317 -ika 314 -. 311 -._ 309 -_ka 307 -as 306 -ak 306 -ati 301 -, 300 -ka_ 296 -,_ 294 -_u 292 -kw 286 -ili 278 -K 274 -en 271 -si 266 -_kw 262 -la 261 -ni_ 261 -ma_ 261 -_s 258 -kwa 258 -ar 256 -ut 245 -za_ 245 -nd 242 -mba 241 -_kwa 239 -_z 234 -li_ 233 -un 233 -ny 230 -it 229 -se 229 -yo 227 -ia_ 222 -M 221 -sa 221 -kat 217 -_K 214 -_i 213 -ika_ 213 -ana 212 -ish 212 -kati 206 -_ha 204 -on 201 -ai 200 -I 198 -aa 196 -um 195 -im 190 -v 188 -mu 187 -amb 187 -sha 185 -em 183 -fa 181 -zi_ 180 -di 179 -mi 178 -_M 178 -us 176 -_ki 176 -ha_ 175 -iw 172 -ama 172 -_kat 168 -_kati 168 -_hi 166 -_l 166 -ra 166 -kwa_ 165 -la_ 164 -W 164 -ja 163 -U 163 -N 163 -amba 161 -ao 161 -_za 160 -ji 160 -B 157 -iwa 155 -tik 155 -wal 155 -le 155 -tika 154 -ge 153 -lis 153 -tu 152 -atika 152 -to 152 -atik 152 -uw 152 -_kwa_ 151 -A_ 151 -ke 150 -S 147 -tika_ 145 -aj 145 -we 144 -cha 144 -bi 141 -az 140 -er 139 -ek 138 -katik 138 -ez 138 -uwa 137 -kut 135 -_al 134 -_B 134 -ad 134 -mu_ 133 -_ali 133 -rik 132 -_W 131 -ba_ 131 -kuw 131 -me 130 -ali_ 128 -kuwa 128 -ema 127 -wan 127 -bu 126 -sem 126 -_A 125 -ir 125 -ata 125 -iz 124 -_hu 124 -ay 124 -ul 124 -af 123 -iki 122 -ema_ 121 -da 120 -ti_ 120 -sema 119 -aka 118 -sema_ 118 -te 118 -uz 117 -yo_ 117 -_v 117 -io 116 -iy 115 -uta 115 -ani 115 -_wal 115 -he 115 -if 114 -_la 114 -ab 114 -go 112 -_za_ 111 -ama_ 111 -sa_ 111 -pa 110 -_t 110 -zo 110 -nge 110 -wam 109 -wali 108 -ua 107 -ur 106 -_c 106 -ise 105 -_ch 105 -isem 105 -ho 105 -ye 104 -iyo 104 -E 104 -el 104 -mo 103 -ung 103 -eri 103 -_wali 103 -_b 102 -mba_ 102 -ari 101 -ita 101 -isema 100 -ot 99 -_la_ 99 -uk 99 -ao_ 99 -di_ 99 -sha_ 99 -ini 99 -kuwa_ 98 -uwa_ 98 -ana_ 98 -lise 98 -lisem 98 -uli 97 -shi 97 -ga 96 -iwa_ 96 -fu 96 -T 96 -R 95 -_il 95 -wak 94 -aw 94 -isha 94 -ri_ 93 -_am 93 -ara 92 -_cha 92 -aji 92 -_ili 91 -ifa 91 -O 90 -_p 90 -uh 90 -iri 90 -chi 90 -asi 89 -po 89 -a. 89 -ong 89 -azi 88 -_j 88 -_kut 88 -eny 88 -nc 88 -a._ 88 -ko 87 -uu 87 -id 87 -w_ 87 -no 87 -P 86 -ah 86 -ina 86 -rika 86 -_Bw 85 -H 85 -gu 85 -uo 85 -Bw_ 85 -_Bw_ 85 -_se 85 -Bw 85 -ib 84 -_S 84 -kam 84 -hi_ 84 -nya 84 -si_ 83 -a, 82 -no_ 81 -pi 81 -ok 81 -i. 81 -ip 81 -kwam 81 -i._ 81 -amba_ 80 -dh 80 -end 80 -ani_ 80 -a,_ 79 -wamb 79 -kwamb 79 -_sh 79 -eza 79 -nz 79 -wi 79 -_kwam 79 -wamba 79 -alis 78 -_kuw 78 -ngo 78 -ap 77 -_N 77 -any 77 -ili_ 77 -C 77 -WA 76 -vy 76 -wana 76 -_hiy 75 -Wa 75 -hiyo 75 -nch 75 -_hiyo 75 -de 75 -_kuwa 75 -ing 75 -hiy 75 -vi 75 -isha_ 74 -es 74 -atu 74 -_Wa 74 -nchi 74 -aki 74 -lim 73 -da_ 73 -ini_ 73 -ash 73 -ala 73 -i, 73 -ano 73 -i,_ 72 -_kam 71 -_wan 71 -ano_ 71 -mw 71 -nde 71 -ji_ 71 -ion 70 -_amb 70 -ndi 70 -_Ka 70 -eza_ 70 diff -Nru spamassassin-3.4.6/trunk-only/lm/ta.lm spamassassin-4.0.0~rc3/trunk-only/lm/ta.lm --- spamassassin-3.4.6/trunk-only/lm/ta.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/ta.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 11468 - 2697 - 2533 - 1960 - 1786 - 1249 - 1103 - 990 - 976 - 849 - 847 - 831 - 821 - 794 - 758 - 750 - 721 - 715 - 713 -. 702 -_ 671 - 655 - 648 - 625 -._ 611 - 601 - 571 - 557 - 556 - 524 -_ 520 - 518 -_ 492 - 489 -_ 488 - 484 -_ 482 - 461 - 442 - 418 - 416 - 403 -_ 398 - 373 -_ 368 - 360 - 359 -_ 349 - 348 - 342 - 337 -_ 331 - 331 -_ 323 -_ 321 - 320 -_ 310 -տ 308 - 299 - 294 - 292 - 292 - 290 -է 288 - 284 -_ 279 - 271 - 266 - 265 -_ 265 - 241 -_ 234 - 232 -= 231 - 229 - 227 -== 221 - 218 -_ 218 -է_ 213 -=== 211 -_ 210 -==== 201 -_ 199 -_ 198 - 197 -===== 191 -, 188 -ؽ 188 - 187 - 186 -_ 184 -,_ 184 - 183 -ԯ 181 -_ 179 -Ԩ 178 - 172 -_ 171 - 169 - 168 - 165 - 165 -_ 165 - 164 - 161 -_ 160 -ͨ 160 -_ͨ 157 - 156 -_ 156 - 152 -Դ 152 -ٻ 151 - 150 -_ 149 - 149 - 146 - 146 -ؽ 145 - 143 - 142 -׶ 142 - 142 - 140 -_ 139 -ԧ 138 -_ 138 - 138 - 137 -ը 137 -_ 136 - 133 -_׶ 132 - 128 - 128 - 127 - 127 -_ 127 - 127 -_ؽ 127 - 125 - 125 - 124 - 122 - 121 -ޣ 120 - 119 - 119 -׽ 119 - 119 -_ 118 -_ 118 -. 117 - 116 -տ 115 - 115 -_ 113 -. 113 -׻ 113 -._ 112 -_ 112 - 111 -ա 111 - 109 -״ 109 - 109 -._ 108 -_ 107 -մ 106 -_ 105 - 104 -' 104 - 103 -_ 102 - 102 -ش 101 - 100 - 100 -_ 99 -_׻ 99 - 98 - 98 - 98 -_׽ 97 -_ 97 -Ի 97 -_ 97 -Ԩ_ 97 -_ 97 - 96 - 96 -״ 96 -Ԩ 95 -ޣ 94 -տ_ 94 -ػ 94 - 94 - 93 - 93 -_ؽ 93 - 93 -ը_ 92 -_ 91 - 91 -_ 90 - 90 - 90 - 90 -_ 90 - 90 -ٹ 89 -_ 89 -__ 88 -_ 88 -_ 88 -_ 86 -硴 86 - 86 - 85 - 85 - 84 - 84 - 83 -ԥ 83 - 83 -_ 83 - 82 -_ 81 -Դ_ 81 -. 80 -_ 80 -է 80 - 80 - 80 -_ 79 - 79 -_ 79 - 79 -ԣ 79 - 78 -_ 78 -._ 77 -_ 77 - 77 -_ 77 - 77 - 76 -ޣ_ 75 -_ 75 -پ 75 -¯ 75 - 74 - 73 - 72 - 72 -_ 71 -ԧ_ 71 - 71 - 71 - 70 -է 70 - 70 - 69 -ٻ_ 69 - 69 - 69 -_ 68 - 68 -ؾ 67 -_ش 67 -բ 66 - 66 -Ԩ_ 66 - 66 -_ǻ 66 -ǻ 66 -Թ 66 - 66 -է_ 65 - 65 -_ 64 -. 64 - 63 -ե 63 -ԡ 63 -_״ 63 -_ 63 -ٴ 62 - 62 -տ 62 -._ 61 - 61 -_ 61 -_׻ 61 -׻ 61 - 61 - 60 -տ 60 -_ 60 -_ 60 -Ծ 60 - 59 -׶ 59 -ޣ_ 59 - 59 -_ 58 -_ 58 - 58 - 58 - 58 -տ 58 - 58 - 57 -ԯ 57 - 57 - 57 -_ 57 - 56 - 56 -_׶ 55 -? 55 - 54 - 54 - 54 - 54 -_״ 54 - 53 -տ_ 53 -_ 53 - 53 - 53 -硴 52 - 52 -_ 52 - 51 -_ 51 -'_ 51 -_ 51 - 51 -ͨ 51 - 51 - 51 - 51 -_ͨ 51 -_ 51 -տ 51 - 51 -_ɧ 50 -ɧ 50 - 50 -է_ 50 -׽ 50 - 50 - 49 -_ 49 - 49 - 49 - 49 -_ 49 - 48 -ԧ 48 - 48 -ա 48 -դ 48 - 48 - 48 -տ 48 -_硴 47 -_ 47 - 47 -ͨ_ 47 -׶ԧ 47 -硴 47 -_ 47 -_ͨ_ 47 -?_ 46 -ؿ 46 -Կ 46 -_ػ 46 - 46 -_ 46 -_ 46 - 45 -_ 45 -ٻ 45 - 45 - 45 -_׽ 44 - 44 -ԣ_ 44 - 44 - 44 - 44 - 44 - 44 -ԣ 44 -. 44 -_׶ԧ 43 - 43 diff -Nru spamassassin-3.4.6/trunk-only/lm/th.lm spamassassin-4.0.0~rc3/trunk-only/lm/th.lm --- spamassassin-3.4.6/trunk-only/lm/th.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/th.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 6290 - 5252 - 4377 - 3920 - 3050 - 2984 - 2657 - 2522 - 2454 - 2369 - 2304 - 2158 - 1981 - 1908 - 1693 - 1543 - 1443 - 1422 - 1398 - 1398 - 1301 - 1245 - 1239 - 1210 - 1181 - 1081 - 1045 - 978 - 951 - 907 - 892 - 829 - 795 - 735 - 722 - 710 - 691 - 688 - 668 -ͧ 595 -. 588 - 553 - 543 - 532 - 528 - 522 - 522 - 477 - 452 - 451 - 443 - 441 - 422 -ҧ 419 - 414 - 388 -_ 378 - 367 - 360 - 354 -Ѻ 349 -_ 347 - 345 - 340 - 337 - 337 - 336 - 336 - 334 -ҹ 333 - 332 - 328 - 325 - 322 -_ 320 - 314 - 313 - 299 -ѧ 297 -ҡ 297 - 296 - 295 -Ѱ 293 -Ѱ 293 - 290 - 289 - 288 - 285 - 280 - 273 - 268 - 268 - 266 - 263 -ѹ 263 - 263 - 256 - 254 - 253 - 252 - 251 - 251 - 248 - 248 - 248 - 248 - 247 - 247 - 247 - 247 -͡ 245 - 245 - 244 - 244 - 243 - 241 -_ 240 - 238 - 237 -_ 236 - 234 - 227 - 225 - 221 - 216 -¡ 214 -ä 213 - 211 - 211 - 211 - 210 -Թ 209 - 206 - 202 - 202 -˹ 201 - 201 -_ 200 - 197 - 196 -_ 193 - 191 - 191 - 188 - 188 - 186 -ͧ 184 - 184 - 183 - 183 - 181 - 180 - 179 - 178 -ҧ 177 -_ 176 -ä 176 -_ 176 - 174 - 174 - 174 - 174 -Ѵ 172 -Դ 172 -_ 171 - 167 - 167 -͹ 167 -ҵ 167 - 167 -ä 166 - 166 - 165 - 165 - 163 - 162 - 161 - 161 -_ 161 -_ 154 - 154 - 154 -ͧ 151 - 151 - 151 - 150 -ѡ 150 -_ 148 - 147 - 146 - 146 - 146 -_ 146 - 145 - 140 - 139 -ҡ 139 - 138 - 138 - 137 - 136 - 135 -Ѻ 134 -¡ 133 -_ 132 - 132 - 132 - 131 - 130 - 129 -ҵ 129 -_ 128 - 128 - 128 -Ѻ 128 -ա 128 - 127 - 127 - 126 -_ 126 -ҵ 126 - 126 -ҵ 126 - 126 - 126 -_ 125 - 124 - 124 - 124 - 124 - 123 -Ҥ 122 - 122 - 122 - 121 - 121 - 120 - 120 -ҷ 119 - 119 - 118 - 118 - 117 -ǹ 117 - 117 - 117 - 117 - 117 - 117 - 116 - 116 -_ 116 - 116 - 115 - 115 -Ѱ 115 - 115 - 115 -Ѱ 115 -. 115 -Ѱ 115 -Ѱ 115 - 115 -Ѱ 115 - 115 - 115 -_ 113 - 113 - 113 - 112 - 112 -_ 112 - 111 -Ի 111 - 111 - 111 - 110 -_ 110 - 110 -_ 110 -Ҩ 109 - 108 -¡ 108 -_ 107 -ѭ 107 -ҹ 107 - 106 - 106 -_ 106 - 105 - 105 -Ե 105 - 105 - 103 - 102 -_ 102 - 102 - 102 - 102 - 101 - 100 - 100 - 100 -_ 99 - 99 -ͧ 99 - 99 -_ 98 -Ъ 98 - 98 - 98 -¡ 97 - 97 -_ 97 - 97 -Ҫ 97 -_ 96 - 96 -Ѱ 94 -Ҿ 94 -Ѱ 94 - 94 - 94 - 93 - 93 - 93 - 92 - 92 -. 92 -Ѱ 92 -ѹ 92 -Ѱ 92 - 92 -Ѱ 92 - 92 - 92 -֧ 92 -. 91 - 91 -á 91 -_ 90 - 90 -. 90 - 90 - 90 - 90 - 89 -.. 89 -ҧ 89 -_ 89 -ҧ 89 -ѧ 89 - 89 - 88 -ͺ 88 -_ 88 -. 87 -ͧ 87 -Ъ 87 - 87 - 87 -ѧ 87 -.. 87 -.. 87 -_ 87 - 87 - 87 - 87 - 87 -. 87 -Ъ 87 - 87 -' 86 - 86 - 86 - 86 -_. 86 -ҧ 86 - 85 - 85 -§ 85 -._ 85 - 85 - 85 - 84 - 84 - 84 -Ѱ 84 - 84 - 84 - 84 -_. 84 - 83 - 83 - 83 - 83 -ѵ 82 - 82 - 82 -_ 82 diff -Nru spamassassin-3.4.6/trunk-only/lm/tl.lm spamassassin-4.0.0~rc3/trunk-only/lm/tl.lm --- spamassassin-3.4.6/trunk-only/lm/tl.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/tl.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 10664 -a 6092 -n 3421 -i 2332 -g 2149 -ng 1488 -an 1332 -g_ 1308 -ng_ 1243 -t 1155 -a_ 1138 -o 1137 -l 1105 -s 1067 -k 1035 -_n 957 -m 909 -y 801 -ang 787 -u 767 -ang_ 683 -p 682 -na 670 -_a 634 -la 596 -. 572 -in 561 -r 559 -sa 545 -_s 502 -._ 487 -ma 476 -ka 473 -_na 464 -b 462 -_m 458 -al 448 -d 445 -pa 414 -n_ 412 -at 394 -ak 393 -h 378 -ya 358 -_k 356 -ag 350 -ni 344 -_p 339 -_sa 335 -o_ 328 -ta 308 -_an 307 -iy 300 -sa_ 296 -_ang 294 -_ang_ 293 -t_ 290 -ay 286 -ga 283 -on 280 -it 275 -_sa_ 265 -ala 258 -_ng 256 -am 252 -_i 248 -_pa 248 -i_ 243 -na_ 243 -an_ 240 -e 239 -_ma 237 -_ka 235 -iya 231 -y_ 229 -il 228 -li 228 -w 226 -_ni 225 -_na_ 224 -_ng_ 220 -as 214 -ba 207 -si 206 -" 195 -ti 195 -ha 186 -, 179 -ar 178 -ing 173 -ra 173 -A 172 -ki 168 -ong 167 -_b 167 -ap 166 -,_ 162 -ong_ 161 -ko 159 -ay_ 159 -un 157 -ul 155 -yo 154 -to 152 -_l 150 -ah 148 -is 147 -hi 147 -_t 146 -lan 145 -ama 142 -niy 139 -at_ 138 -_niy 138 -aka 136 -wa 136 -niya 135 -_niya 135 -ab 134 -- 134 -di 133 -_si 132 -"_ 131 -aw 129 -_d 126 -_A 126 -yan 123 -ya_ 122 -ata 120 -a. 120 -gi 120 -P 120 -ing_ 118 -um 115 -o. 113 -aki 113 -ri 113 -ik 112 -nd 112 -ila 111 -mo 110 -da 110 -a._ 110 -in_ 109 -la_ 107 -ali 106 -S 106 -man 105 -ig 105 -iya_ 105 -s_ 104 -_ak 104 -_at 103 -_h 102 -yon 102 -asa 101 -ina 101 -_P 101 -n. 99 -N 98 -aa 98 -ga_ 97 -_mo 97 -_ba 97 -_" 95 -ito 94 -bi 94 -yang 94 -n._ 93 -pag 92 -lang 92 -yang_ 92 -_la 92 -o._ 90 -K 90 -_at_ 90 -tu 88 -_S 88 -ara 87 -nga 87 -ro 85 -apa 83 -rr 82 -lam 82 -lo 81 -nan 81 -_N 80 -aman 79 -aha 78 -mg 78 -mga 78 -mga_ 78 -_mga_ 78 -_mg 78 -_mga 78 -_K 78 -siy 77 -kan 76 -it_ 76 -san 76 -d_ 75 -ad 75 -di_ 74 -tin 74 -' 74 -ati 73 -siya 73 -kin 72 -M 72 -lang_ 71 -mo_ 70 -_mo_ 70 -ako 70 -uma 70 -_pag 69 -pi 69 -l_ 68 -_siy 68 -rrr 68 -_siya 67 -ula 67 -_M 66 -Pa 66 -iyo 66 -mi 66 -bu 66 -mu 65 -no 65 -pu 65 -nag 65 -ung 65 -Na 65 -ot 64 -_Na 64 -niya_ 64 -iyan 64 -ku 64 -k_ 63 -go 62 -awa 62 -ip 61 -_Pa 61 -lu 61 -_di 60 -pan 60 -_ta 60 -ini 60 -isa 60 -nt 60 -iyang 60 -_iyo 59 -_iy 59 -on_ 59 -tan 59 -mang 59 -aba 59 -gan 59 -ut 58 -I 58 -hin 58 -nak 58 -an. 57 -akin 57 -_r 57 -han 57 -Ka 57 -_ay 57 -_ako 56 -may 56 -iyon 56 -rrrr 55 -Sa 55 -aga 55 -to_ 55 -nit 55 -_ko 54 -er 54 -ib 54 -ari 54 -ana 54 -ili 54 -an._ 54 -ahi 54 -au 54 -ala_ 54 -gk 53 -pa_ 53 -_is 53 -rin 53 -ilan 52 -_kan 52 -_Ka 52 -_it 52 -_Sa 51 -king 51 -ko_ 51 -_nak 51 -gin 51 -_ay_ 50 -bo 50 -_iyon 50 -amang 50 -'y 49 -os 49 -mang_ 49 -_pa_ 49 -kat 49 -a, 49 -An 48 -Ma 48 -ny 48 -mag 48 -_ku 48 -_ito 48 -_ha 47 -yong 47 -? 47 -aking 47 -T 47 -ni_ 47 -yong_ 47 -_An 47 -king_ 47 -_akin 46 -sang 46 -_nag 46 -kas 46 -_aki 46 -_ni_ 46 -ayo 45 -kit 45 -'y_ 45 -mat 45 -_Ma 45 -lal 45 -ot_ 45 -nya 44 -ban 44 -ndi 44 -oo 44 -_u 44 -ngi 44 -_hi 44 -sang_ 44 -B 43 -su 43 -may_ 43 -rrrrr 43 -p_ 43 -ita 43 -wal 43 -ika 43 -abi 43 -aan 43 -_may 43 -lama 42 -naka 42 -mal 42 -_I 42 -_ri 42 -alan 42 -any 42 -im 42 -_pu 42 -ai 42 -wala 41 -anya 41 -a,_ 41 -_B 41 -ndi_ 41 -as_ 41 -pat 41 -po 41 -nang 41 -_mag 41 -laman 40 -lala 40 -kal 40 -g- 40 -.. 40 -ir 40 -! 40 -uk 40 -gu 39 -ito_ 39 -ro_ 39 -_g 39 -_da 39 -_isa 39 -_lam 39 -ilang 39 -kanya 39 -w_ 39 -kany 39 -agk 38 -pal 38 -ka_ 38 -_naka 38 -siya_ 38 -isan 38 Binary files /tmp/tmpa0777u8m/OJXhcDM2ms/spamassassin-3.4.6/trunk-only/lm/tr.iso-8859-9.ln and /tmp/tmpa0777u8m/kSmhBaMXyE/spamassassin-4.0.0~rc3/trunk-only/lm/tr.iso-8859-9.ln differ diff -Nru spamassassin-3.4.6/trunk-only/lm/tr.unknown.lm spamassassin-4.0.0~rc3/trunk-only/lm/tr.unknown.lm --- spamassassin-3.4.6/trunk-only/lm/tr.unknown.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/tr.unknown.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 23226 -i 8957 -a 7675 -e 6219 -n 5169 -& 4950 -; 4950 -l 4674 -r 4464 -&i 3206 -&i; 3206 -i; 3206 -s 3206 -k 3009 -d 2977 -t 2442 -m 2010 -y 2001 -u 1885 -n_ 1725 -g 1584 -o 1567 -b 1470 -e_ 1426 - 1353 -ar 1273 -la 1236 -a_ 1209 -i_ 1169 -in 1124 -_b 1101 -an 1097 -er 1073 -le 1058 -s; 1036 -&s; 1036 -&s 1036 -;_ 1018 -de 936 -;n 918 -&i;n 917 -i;n 917 -,_ 872 -_, 872 -_,_ 872 -, 872 -i;_ 863 -&i;_ 863 -_k 816 -en 769 -r_ 762 -_y 759 -da 759 -il 759 -k_ 750 -z 739 -nd 725 -&g; 708 -g; 708 -&g 708 -ra 697 -_a 692 -_d 692 -_s 676 -' 673 -_i 644 -._ 641 -. 641 -_. 637 -_._ 637 -c 637 -ka 635 -v 632 -;& 624 -h 615 -_g 597 -ri 596 - 596 -lar 583 -li 580 -ma 559 -ya 555 -ler 553 -p 547 -re 529 -al 529 - 527 -_t 520 -ir 508 -ak 502 -bi 500 -;l 480 -in_ 478 -di 477 -r& 468 -el 453 -et 449 -ek 445 -n& 439 -_o 439 -ol 437 -da_ 434 -n&i 433 -n&i; 433 -ni 429 -ti 428 -de_ 425 -an_ 422 -eri 421 -r&i 417 -r&i; 417 -s& 413 -s&i 413 -s&i; 413 -ar& 412 -me 407 -te 405 -a& 404 -i& 390 -ay 387 -ne 380 -_bi 373 -_ka 368 -ar&i; 367 -ar&i 367 -u_ 363 -as 363 -_e 362 -ta 359 -&i;l 352 -i;l 352 -nda 350 -ki 347 -na 346 -si 343 -_v 337 -;&i; 334 -;&i 334 -ve 334 -ara 333 -en_ 332 -;i 331 -on 328 -un 326 -l&i; 322 -l& 322 -l&i 322 -leri 322 -ba 318 -_m 318 -ik 315 -mi 315 -f 306 -lar& 302 -lar&i 302 -sa 298 -_h 297 -ld 296 -&i;& 290 -i;& 290 -_ve 288 -l_ 287 -ge 286 -is 285 -ed 285 -i&s; 284 -i&s 284 -;r 282 -_ya 279 -_ol 279 -d&i; 278 -d& 278 -d&i 278 -nl 277 -kl 275 -;k 274 -&i;n_ 271 -;n_ 271 -i;n_ 271 -ile 270 -or 269 -iy 267 -a&s 264 -a&s; 264 -y&i; 262 -ad 262 -y& 262 -y&i 262 -ye 259 -ha 258 -es 258 -t& 257 -t&i 257 -t&i; 257 -ini 253 -;nd 253 -i;nd 253 -r 253 -&i;nd 253 -se 248 -_ge 248 -i;nda 248 -;nda 248 -;n&i; 247 -i;n& 247 -;n& 247 -&i;n& 247 -i;n&i 247 -;n&i 247 -bu 245 -_' 245 -_ba 244 -as&i 242 -as&i; 242 -_de 242 -as& 242 -at 240 -am 240 -nda_ 239 -ar_ 231 -ve_ 230 -rin 230 -_ve_ 228 -_bu 227 -im 227 -&i;r 226 -i;r 226 -ur 221 -g;&i 220 -g;& 220 -&g;& 220 -yo 220 -&g;&i 220 -g;&i; 220 -ul 215 -ak_ 215 -ke 213 -nu 213 -erin 211 -g;i 208 -&g;i 208 -lan 207 -bir 205 -r&i;n 205 -nde 202 -rl 202 -n&i;_ 201 -ko 201 -ca 200 -m_ 197 -rd 196 -t_ 194 -er_ 194 -st 193 -em 193 -_sa 190 -lm 189 -rt 188 -_ 187 -i;k 187 -n 187 -ola 187 -&i;k 187 -lerin 185 -ce 185 -'_ 185 -;m 183 -az 183 -rk 182 -y 182 -;la 181 -_bir 181 -ir_ 180 -n&i;n 180 -ru 180 -lu 180 -;nda_ 178 -e& 177 -_ 176 -_ha 175 -_ko 173 -esi 171 -_ 170 -ap 170 -ni_ 168 -t 167 -den 164 -ind 161 -di_ 161 -be 161 -s&i;n 160 -nin 159 -z 158 -ri_ 155 -y&i;l 155 -_p 154 -nin_ 153 -&s;_ 152 -_y& 152 -edi 152 -s;_ 152 -_y&i; 152 -_y&i 152 -yl 151 -le_ 151 -inde 150 -eti 150 -ala 150 -&i;&s 149 -ele 149 -i;&s; 149 -;&s; 149 -;&s 149 -i;&s 149 -ek_ 148 -ere 148 -i 147 -du 145 -n 145 -z_ 144 -na_ 144 -eri_ 143 -ec 142 -g 142 -i;&g; 141 -s&i;_ 141 -bir_ 141 -&i;&g 141 -i;&g 141 -ah 141 -;&g; 141 -;&g 141 -_g 140 -lar_ 140 -eli 140 -a&g; 140 -a&g 140 -dan 140 -ac 140 -i 140 -an& 140 -u& 139 -;&g;& 138 -_y 138 -an&i 138 -an&i; 138 -pa 138 -it 137 -_ola 137 -_bir_ 136 -;t 135 -r 135 -ne_ 135 -ini_ 134 -lma 134 -kan 133 -ab 132 -to 131 -ba& 131 -kar 130 -r&i;_ 130 -_ar 129 -ili 129 -li_ 129 -ki_ 128 -bu_ 127 -anl 127 -d 127 -ler_ 126 -_ba& 126 -kon 126 -ll 125 -tl 125 -ine 125 -e&g; 124 -e&g 124 -_il 124 -_bu_ 124 -re_ 124 -bil 123 -&s;i 123 -;&i;n 123 -s;i 123 -ede 123 -zd 123 -'' 122 -_da 122 -_'' 122 -_t 122 -ret 122 -_-_ 121 -_''_ 121 -mas 121 -''_ 121 -- 121 -dan_ 121 -leri_ 121 -;u 121 -_- 121 -ev 121 diff -Nru spamassassin-3.4.6/trunk-only/lm/uk.koi8-r.lm spamassassin-4.0.0~rc3/trunk-only/lm/uk.koi8-r.lm --- spamassassin-3.4.6/trunk-only/lm/uk.koi8-r.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/uk.koi8-r.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 21726 - 4832 - 4080 - 3253 - 2775 - 2747 - 2642 - 2481 - 2373 - 2066 - 1929 - 1806 - 1797 - 1760 - 1605 - 1347 - 1345 - 1061 - 1060 -_ 971 -_ 965 -_ 916 -_ 902 - 881 -_ 869 -_ 847 - 843 -_ 810 - 760 -_ 696 -. 676 - 654 - 647 -_ 623 -" 621 -_ 606 - 582 -_ 565 - 543 -_ 514 - 480 -._ 476 - 464 - 459 -צ 457 -_ 457 -_ 451 - 450 -_ 449 -_ 443 - 438 - 431 - 428 -_ 419 - 418 - 414 - 413 - 410 - 400 - 396 -_ 394 - 377 - 375 - 373 - 358 - 356 -_ 354 - 354 -_ 350 - 346 -, 343 - 341 - 340 - 336 - 333 - 331 - 328 - 326 -,_ 323 - 322 - 321 - 319 - 318 - 317 - 314 -_ 314 - 312 - 310 - 310 - 305 - 295 - 295 -Φ 294 -_ 289 -_ 288 - 288 - 287 - 282 - 282 -_ 280 - 274 - 273 - 268 -_ 268 - 267 - 266 -"_ 264 - 254 - 252 - 252 -_" 251 -_ 251 -_ 249 -_ 248 - 246 -_ 245 -I 245 - 244 -_ 241 -_ 239 -_ 239 - 235 - 235 - 233 -_ 232 -__ 228 - 228 - 228 -_ 226 - 224 -_ 221 - 219 -_ 218 - 216 - 215 - 214 - 213 -_צ 210 - 209 -_ 207 -_ 206 - 206 -_ 204 - 203 -_ 203 -_ 202 - 201 -̦ 200 - 199 -_ 199 - 197 -_ 196 - 193 - 193 -__ 190 -_ 190 - 188 - 187 -_ 186 - 186 - 185 - 184 -_ 184 -_ 176 -__ 174 -_ 174 - 173 - 173 - 173 - 170 -_ 169 - 168 - 167 - 166 - 166 - 163 - 163 -Ҧ 163 - 163 - 162 -_ 161 - 160 -Φ_ 160 - 160 -_ 159 -צ 159 -_ 158 -Ԧ 155 -_ 155 -* 154 - 153 - 153 -_* 152 -_ 152 -_ 152 - 152 -_ 151 -_ 151 - 151 -*_ 151 - 151 -_*_ 150 - 149 -__ 149 -_ 148 -_ 147 -Ħ 147 - 146 - 145 -__ 144 - 144 -_ 143 - 142 -_ 141 - 141 - 140 -_ 139 - 138 -Ц 137 - 137 - 136 - 136 -__ 136 - 135 -æ 135 -_ 134 -_ 133 - 133 -_ 133 - 132 - 131 - 130 - 129 -_ 129 - 129 -_ 129 -_ 128 - 128 - 128 -ͦ 128 -_ 127 - 126 -_ 126 -צ 123 - 123 - 122 -˦ 121 -: 119 -_ 118 - 118 - 116 -Ӧ 116 - 115 -ϧ 115 - 115 -_ 115 - 114 -_ 113 -_ 113 - 113 - 113 - 112 - 112 -? 111 - 110 - 109 -_ 109 - 109 - 109 - 109 -_ 108 - 108 -_ 106 - 106 -_ 106 - 106 -_צ 106 - 106 - 105 -¦ 105 - 105 - 104 - 104 - 104 - 104 - 103 - 103 -_ 102 -_ 102 -_ 102 -_ 102 - 102 -_ 101 -_ 101 - 101 - 100 -_ 100 - 99 -_ 99 - 99 -__ 98 - 98 - 98 - 97 -_ 97 - 96 - 94 -_ 94 -_ 94 - 93 -! 93 -_ 93 -.. 93 - 92 - 92 - 92 - 92 -_ 91 - 91 - 91 -_ 91 - 91 - 89 - 89 -_ 88 -_ 88 - 88 - 86 - 86 - 86 - 86 - 85 -_ 85 - 84 - 84 - 84 -_ 83 -_Ц 83 -_ 82 - 82 - 82 - 81 - 81 -_ 81 -_ 81 - 81 - 81 - 81 -_ 80 -_ 79 -_ 79 - 78 - 78 - 78 - 78 - 78 -_ 77 -_ 77 -_ 77 - 77 - 77 -_ 77 -_ 77 -_ 76 -_ 76 -_ 76 - 76 - 75 - 75 - 75 - 74 - 74 - 74 - 74 -ϧ_ 73 -_ 73 - 72 -". 72 -." 72 - 72 - 72 - 71 -_ 71 - 71 - 71 -_ 71 - 71 - 71 -_ 70 -_ 70 - 70 -_ 69 -Φ 69 - 68 - 68 - 68 - 68 -_ 68 -_ 68 - 68 diff -Nru spamassassin-3.4.6/trunk-only/lm/vi.lm spamassassin-4.0.0~rc3/trunk-only/lm/vi.lm --- spamassassin-3.4.6/trunk-only/lm/vi.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/vi.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 88044 -n 17000 -h 12823 -t 9071 -i 8490 -c 8394 -g 8035 -ng 6718 -_t 6352 -_c 5234 -a 5083 -g_ 4883 -ng_ 4882 -_n 4379 -n_ 4365 -i_ 4365 -u 4149 -m 3648 - 3635 -nh 3480 -o 3451 - 3193 -_ 3168 -r 3011 -l 2692 - 2659 -, 2328 -,_ 2295 -c_ 2279 -_l 2263 -ch 2226 -v 2161 -th 2158 -a_ 2132 -_th 2113 -y 2111 -. 2107 -t_ 2106 -h_ 2074 -_v 2057 -_h 1888 -_m 1834 -_ch 1813 -s 1749 -nh_ 1715 -u_ 1679 - 1668 -_ 1649 -tr 1611 -b 1589 -_tr 1581 -_nh 1541 -_b 1530 -m_ 1505 -p 1483 -._ 1455 -k 1429 -_s 1415 -o_ 1380 -y_ 1371 -_k 1367 -_ng 1348 - 1343 -e 1296 - 1208 - 1199 - 1181 - 1139 - 1132 -T 1126 -hi 1121 - 1081 - 1058 - 1055 -d 1040 -_g 1039 -kh 1034 -_kh 1027 -_T 994 -i 967 -l 943 -_l 941 -" 926 - 916 -ܩ 901 -an 893 -_d 888 - 877 -i_ 859 -on 853 - 848 -N 846 - 820 -_ 813 - 801 -n 795 -ph 776 -_p 772 -_ph 752 - 752 - 734 -h 728 -ho 715 -v 709 -_v 703 -g 702 - 700 -_r 696 -H 693 -_l_ 691 -l_ 691 -ܩi 684 -n 679 -n 677 -ng 676 -ha 672 -gi 663 -C 656 -_gi 655 - 654 -gܩi 646 -gܩ 646 -ܩi_ 624 -ng_ 610 -ng 610 -_ng 608 -c 606 - 601 -ngܩ 600 -ngܩi 600 -_ngܩ 598 -gܩi_ 594 -a 587 -c 586 -_c 585 -t 585 -ca 585 -n_ 585 -_ca 584 -c 583 -a_ 582 -_c 581 -ca_ 581 - 581 -_ca_ 580 -t_ 578 -_N 574 -c_ 574 - 573 -_c_ 572 -i 568 - 562 - 562 -m 557 -_C 553 -_m 551 -p_ 540 - 540 -mt 538 -mt_ 534 -_mt 532 -n 528 -_mt_ 528 -ti 526 -i 525 - 517 - 512 -nh 500 -.. 500 - 497 -v_ 497 -_v_ 496 - 491 -q 490 -qu 490 -_H 487 -_q 484 -_qu 484 -ong 481 -ong_ 471 -h 471 -x 470 -h 468 - 466 -_" 460 -ܮ 456 -ro 453 -nh_ 445 -_ 434 -_x 434 -_ 427 - 423 -_ti 423 -in 422 -n 421 -"_ 418 -i 415 -n 413 -ron 412 -V 411 -rong 410 -i 410 -rong_ 409 -c_ 405 - 400 -n 399 -hn 398 -i 395 -ay 390 -_V 387 -h 382 -h 380 -y 377 -t 376 -uy 374 - 374 -_ 373 -i_ 372 -c 371 -_c 367 -n 366 -_ 366 -h 366 -_n 365 -ra 363 -hng 362 -ho_ 359 -n_ 356 -n 356 - 355 -i_ 354 -ai 352 -hu 352 -cho 352 -ܮc 351 -c 351 -n 351 -_cho 349 -tro 347 -t 347 -o 347 -_tro 346 -_tron 346 - 346 -tron 346 -trong 346 -M 345 -kh 340 -u 338 -_kh 338 -cho_ 337 -_cho_ 336 -hng_ 336 -ay_ 333 -ch_ 332 - 331 -t_ 331 -( 331 -_( 330 - 329 -_ 329 -ܮ 328 -_ܮc 328 -) 328 -ܮc 328 -_ܮ 328 -khn 324 -_ 324 -_khn 322 -_ 322 -__ 320 - 318 -n 318 -khng 316 -o_ 316 -ܮc_ 316 -c_ 316 -nh 315 -_ 315 -ng 313 -ng_ 313 -n 313 -_nh 313 -Th 312 -h 311 - 310 -hn 310 -hng_ 310 -hng 310 -i 309 -gh 309 -u 307 -ta 307 -anh 307 - 307 -ai_ 306 -ng 306 -y_ 304 -ܮc_ 298 - 295 -S 295 -: 294 -t_ 294 -e_ 294 -:_ 290 -_ 289 -ua 288 -n 288 -i 286 -u_ 285 -_nh 285 -nh 285 -nhng 285 -nhn 285 -_nhn 285 -_Th 285 -n_ 284 -n 283 - 281 -_M 281 -A 281 -c 278 -L 277 - 277 -n 276 -_ha 276 -n, 275 -ng 275 -ng 275 -an_ 272 -i_ 271 -iu 269 -s 269 -n,_ 268 -_ 268 -on_ 267 -_s 267 -cc 265 -ng_ 265 -_cc 264 -anh_ 264 -ngh 264 -_ta 263 -hi_ 262 -hn 261 -_ 261 -u_ 261 -n 260 - 260 -_ngh 257 -ia 255 - 252 -... 252 -u 251 -c 251 -i, 249 -iu_ 248 -nhi 247 -B 246 -i,_ 245 -ng 244 -_ 244 -co 244 -_nhi 244 - 244 -ܧ 244 -in 243 -D 243 -Tr 241 -_S 240 -h_ 239 -n 237 -h 236 -h 233 -K 233 -ng_ 232 -i 232 -ng_ 232 -n_ 231 -_co 231 -n_ 229 -h 229 -i 229 -y 229 -n 229 -n 228 -ng 228 -_L 227 -ng_ 226 -inh 226 -i 225 -m 225 -_i 225 -ng, 224 -ang 224 -P 224 -n 224 -g, 224 -g,_ 223 -_v 223 diff -Nru spamassassin-3.4.6/trunk-only/lm/yi.utf-8.lm spamassassin-4.0.0~rc3/trunk-only/lm/yi.utf-8.lm --- spamassassin-3.4.6/trunk-only/lm/yi.utf-8.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/yi.utf-8.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ - 29767 -_ 13552 -_ 6516 - 4273 - 3670 -א 3670 -ע 3261 - 3261 - 2826 -ע 2826 -א 2785 - 2785 -י 2565 - 2565 - 2082 -ר 2082 - 2062 -י 2062 - 1857 -ט 1857 - 1828 -ַ 1828 - 1793 -ן 1793 -_א 1537 -_ 1532 -ן_ 1532 - 1527 -ַ 1527 -אַ 1517 -ַ 1517 -ר 1355 - 1355 - 1270 -ל 1270 - 1268 -אָ 1268 -ָ 1268 -ָ 1268 -ַ 1240 -אַ 1240 -נ 1232 - 1232 -אָ 1229 -ָ 1229 - 1229 -ָ 1229 -נ 1181 - 1181 -ו 1116 - 1116 - 1031 -ד 1031 -ט 1012 - 1012 -ל 1007 - 1007 -ו 975 - 975 -ד 965 - 965 -פ 929 - 929 -פ 929 - 929 -ר 873 -ער 873 -א 870 - 870 -ז 868 - 868 - 832 -ס 832 - 797 -ק 797 -_א 784 -מ 766 - 766 -_א 752 - 747 -מ 747 - 742 -ג 742 - 725 -ש 725 -ט_ 699 -_ 699 -װ 691 - 691 -װ 674 - 674 - 667 -ײ 667 - 664 -ג 664 - 661 -ֿ 661 -ק 654 - 654 - 652 -ֿ 652 -ש 651 - 651 - 643 -ז 643 -פֿ 641 -ֿ 641 -פֿ 638 -ֿ 638 -_אַ 638 -ר_ 592 -_ 592 -_ד 560 -_ד 554 -, 551 -,_ 534 -ב 517 - 517 -_פ 502 -_פ 502 -ב 472 - 472 -ס 436 - 436 -צ 436 - 436 -צ 433 - 433 -_װ 430 -_װ 429 - 410 -ה 410 -ר_ 404 -_פֿ 404 -ער_ 404 -_מ 400 -_מ 396 -גע 390 -ע 390 -_ז 390 -_ז 386 -ע 384 -ען 384 -גע 384 -ן 384 -ער 382 -ר 382 -. 374 -אי 372 -י 372 -ּ 366 - 366 - 363 -ה 363 -י 362 -אי 362 -_ג 359 -ױ 357 - 357 -_ג 356 -ון 349 -ן 349 -י_ 346 -_ 346 -ע_ 343 -_ 343 -ן_ 337 -ון_ 337 -ע 334 -דע 334 -_אי 331 -ך 330 - 330 -ע 323 - 323 -דע 323 -ּ 323 - 322 -ײ 322 -ען_ 321 -ן_ 321 - 320 -ױ 320 -י 317 -די 317 -ַ 311 -ַר 311 -ײ 311 -ר 311 -ַר 311 -ײַ 311 - 311 -לע 310 -ע 310 -._ 307 -- 305 -_ 297 -ַ_ 297 - 294 -כ 294 -ע 290 -נע 290 -ס_ 289 -_ 289 -פּ 288 -ּ 288 -ײַ 287 -ַ 287 -ך_ 283 -_ 283 -ַ_ 274 -אַ_ 274 -ַר 272 -ר 272 -לע 261 -ע 261 -_ה 260 -_ה 260 -_צ 259 -ש 257 -יש 257 -_צ 256 -זי 254 -י 254 -פּ 252 -ּ 252 -מע 248 -ע 248 -_ק 247 -נע 247 -ע 247 -טע 245 -ע 245 -_ק 245 -או 244 -ו 244 -ו 244 -או 244 -ל 238 -על 238 -א 235 -הא 235 -הא 235 -שט 235 -ט 235 -א 235 -כ 234 - 234 -_ב 231 -ער 231 -_ב 231 -ַנ 229 -נ 229 -נ 228 -ַנ 228 -_או 227 -_גע 226 - 219 -ם 219 -" 218 -ע 217 -מע 217 -ע 217 -װע 217 -ל 216 -ַל 216 -_זי 215 -_נ 215 -על 212 -ל 212 -א 211 -רא 211 -_נ 211 -טע 211 -ע 211 -װא 210 -א 210 -_דע 210 -א 209 -װע 209 -װא 209 -ע 209 -ש 208 -יש 208 -ק 207 -יק 207 -רא 206 -א 206 -_ 205 -ז_ 205 -י 196 -מי 196 -_ש 195 -מי 195 -י 195 -ַל 193 -_ש 191 -ֿא 189 -א 189 -ֿא 189 -ֿא 188 -ו 188 -ֿו 188 -ֿו 188 -ו 188 -א 188 -ון 187 -אָ 186 -_הא 185 -ֿו 184 -_ע 179 -_די 178 -א 176 -טא 176 -טא 175 -א 175 -ָס 174 -ָס 174 -יט 174 -ט 174 -ס 174 -ל_ 173 -_ 173 -י_ 173 -די_ 173 -ם_ 171 -ל 171 -_ 171 -ַל 171 -_ע 171 -ָט 169 -ט 169 -ָט 169 -יך 168 -ך 168 -ָר 166 -י 166 -ָר 166 -ר 166 -זי 166 -ני 164 -ענ 164 -י 164 -נ 164 -י 163 -רי 163 -יך_ 163 -ך_ 163 -אָ 162 -ענ 162 -נ 162 -אַ 160 -ט 160 -עט 160 -_י 158 -י 157 -ר 157 -רי 157 -יר 157 -- 156 -ָס_ 155 -ס_ 155 -י 154 -_מי 154 -לי 154 -קע 153 -ונ 153 -ע 153 -נ 153 -_װא 152 -י 152 -ני 152 -ן 151 -ין 151 -אױ 151 -ױ 151 -י 150 -ט 150 - 150 - 150 -יִ 150 -ִ 150 -ִ 150 -ַט 150 -ִ 149 -ִ 149 - 149 -יִ 149 -י 148 -_י 148 -לי 148 -ױ 146 -אױ 146 -ַנ 146 -_אױ 145 -ון 145 -יז 143 -ז 143 -י 142 -די 142 diff -Nru spamassassin-3.4.6/trunk-only/lm/zh.big5.lm spamassassin-4.0.0~rc3/trunk-only/lm/zh.big5.lm --- spamassassin-3.4.6/trunk-only/lm/zh.big5.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/zh.big5.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 30653 - 2524 -_ 2123 - 1457 - 1406 -_ 1245 - 1244 -_ 1196 -_ 1100 - 833 -M 783 -M_ 764 -_ 727 -M_ 688 -M 688 -_M_ 684 -_M 684 - 680 - 675 - 659 - 629 - 593 - 566 -_ 560 - 533 -_ 516 - 497 -_ 495 -_ 485 - 483 - 473 - 459 - 458 - 448 -_ 442 - 436 -_ 425 - 422 -_ 422 -_ 404 - 401 - 393 -_ 385 -_ 382 -_ 374 -_ 373 - 350 -C 333 - 324 - 318 - 315 -_ 314 -_ 312 - 310 -_ 303 -C_ 303 -_ 303 -__ 302 -_ 302 -@ 288 -_ 279 -@_ 275 - 275 - 272 -_ 269 -_ 269 -| 268 -Q 265 -q 260 -~ 260 -|_ 255 -~_ 250 - 241 -A 235 - 234 -_ 233 - 233 -C_ 226 -C 226 -_ 225 - 224 -_C 224 -_C_ 224 -_ 222 -A_ 218 -Q_ 217 -O 210 -q_ 210 -D 209 -_ 206 - 202 -H 200 -@ 198 - 197 - 196 -O_ 196 -_ 195 -_ 192 -H_ 191 -@_ 190 -_@ 189 -_@_ 189 -_ 180 - 177 -P 176 -D_ 175 - 173 - 172 -_ 172 -_ 170 -_ 168 - 165 -u 164 -_ 162 -_ 162 -_| 161 -| 161 -_|_ 161 - 161 -L 161 -|_ 161 - 157 -p 156 -o 156 - 155 -_ 155 -_ 153 -_ 151 -A 151 -_ 151 -W 151 -Q 151 -L_ 150 -_ 150 - 149 -u_ 149 - 147 - 147 -A_ 146 -_ 145 -p_ 145 -_ 143 -_ 142 -_A_ 142 -_A 142 -{ 141 - 140 - 140 -_ 140 -P_ 139 -_ 137 -W_ 136 -{_ 136 -_ 135 -T 134 - 134 -j 134 - 132 -_ 131 -_ 131 -d 130 -G 130 -X 130 -o_ 129 -j_ 127 -F 126 -_ 126 -F_ 125 - 124 -b 123 -v 122 - 122 -_ 122 -_ 121 -_ 120 - 120 -d_ 120 -_ 119 -b_ 118 -T_ 118 - 117 -X_ 116 -n 116 -_ 116 -e 115 - 115 -_ 115 -v_ 114 -w 114 -a 114 -H 114 -_ 114 -i 114 -_ 113 -_ 113 - 112 - 111 -H_ 111 -_H_ 110 -_H 110 - 109 - 109 -_ 107 -w_ 107 -_ 107 -_ 106 -__ 106 -_ 106 - 105 -_ 105 - 105 -Q_ 105 -a_ 104 -] 104 -_b_ 103 -_b 103 -h 103 -_Q 103 -b 103 -b_ 103 -_Q_ 103 -_ 102 - 102 -_ 101 - 101 -k 100 -__ 100 -e_ 100 -_ 100 -k_ 100 -_ 100 -_ 100 -__ 100 -B 99 - 99 - 98 -_ 98 -s 98 -_ 98 -_ 98 -j 98 -i_ 97 -]_ 97 -n_ 96 - 95 -h_ 95 -_ 95 -U 95 -_ 94 - 94 -j_ 94 -_ 94 -_j 93 -_j_ 93 -q 92 - 92 - 92 -_ 92 -_ 92 -_ 91 -S 90 -__ 90 -_ 90 -_ 90 - 90 - 89 - 89 - 88 -B_ 88 - 88 -__ 87 -_ 87 -U_ 87 - 87 -_ 87 -N 87 -~ 86 -_~_ 86 -_ 86 -_ 86 - 86 -_~ 86 -~_ 86 - 85 -^ 85 - 84 -_ 84 - 84 -_ 84 -G_ 84 -N_ 83 -_ 83 -__ 83 -_ 83 -E 83 -_ 82 - 81 -_ 81 -_ 81 - 81 -__ 81 - 80 -_ 80 -_ 79 -_ 79 -_ 79 -__ 79 - 78 -_ 78 -__ 78 -_ 78 - 78 -_ 78 -_ 77 -S_ 77 -O_ 77 -_O_ 77 -_O 77 -__ 77 -_ 77 -_ 77 -_ 77 -O 77 -_ 77 -_ 76 -_ 76 -_ 76 -_ 75 - 74 - 72 -t 72 -_ 72 -_ 72 -__ 72 -s_ 71 -K 71 -T 71 -I 71 -_ 71 - 70 - 70 - 70 -_ 70 -_ 69 -W 69 -_ 69 -__ 68 -F_ 68 -_F 68 -__ 68 -_ 68 -_F_ 68 -_ 68 -_ 68 - 68 -F 68 -_ 68 -X 67 - 67 - 66 -_ 66 - 66 -J 66 -__ 66 -D 66 -_q 66 -_ 66 -_D 66 -l 65 - 65 -z 65 -_W 65 -D_ 65 -_D_ 65 - 65 - 65 -_W_ 64 -W_ 64 -q_ 64 -J_ 64 -_ 64 -_q_ 64 -_T 63 -_X_ 63 -X_ 63 -_ 63 -_X 63 -_ 63 - 63 -__ 63 - 62 -Y 62 -_ 61 -_ 61 -_ 61 -__ 61 -ĵ 61 -_ 61 -ĵ_ 60 -_T_ 60 diff -Nru spamassassin-3.4.6/trunk-only/lm/zh.gb2312.lm spamassassin-4.0.0~rc3/trunk-only/lm/zh.gb2312.lm --- spamassassin-3.4.6/trunk-only/lm/zh.gb2312.lm 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/lm/zh.gb2312.lm 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -_ 77350 - 7152 -_ 5428 - 3924 - 3063 - 3020 - 2565 - 2491 - 2490 -_ 2490 - 2438 - 2424 - 2394 -_ 2391 - 2384 - 2349 -_ 2233 -__ 2102 -_ 2102 - 2102 -_ 2102 - 2057 - 2043 - 2000 - 1999 - 1936 - 1856 - 1824 - 1824 - 1796 - 1780 - 1752 - 1728 - 1726 - 1696 -_ 1637 - 1631 - 1630 - 1630 - 1596 - 1571 -_ 1545 - 1535 - 1520 - 1505 -_ 1500 -_ 1470 -__ 1466 - 1450 - 1429 - 1425 - 1367 - 1364 - 1356 - 1335 - 1306 -_ 1286 - 1215 -_ 1173 -__ 1173 -_ 1173 - 1173 -_ 1141 - 1131 -_ 1124 -_ 1105 - 1083 -_ 1076 -_ 1048 -_ 1038 -_ 1026 - 1015 -_ 1008 - 973 - 952 -_ 947 -_ 946 -_ 932 -_ 908 -_ 904 - 876 -_ 831 -_ 823 -_ 817 -_ 808 -_ 805 -_ 803 -_ 790 -_ 785 -_ 783 -_ 768 -_ 766 - 759 -_ 759 -_ 751 -_ 749 - 744 -_ 740 -_ 740 -__ 740 - 740 -_ 738 - 733 -_ 720 - 708 - 694 -_ 690 - 688 -_ 686 -_ 685 -_ 674 - 674 -__ 674 -_ 674 -_ 663 -_ 656 -_ 651 - 643 -_ 643 -_ 632 -_ 628 - 626 - 605 -_ 593 - 586 -_ 585 - 584 - 578 -_ 574 - 563 - 562 -_ 549 -_ 534 -_ 521 - 515 - 510 -_ 507 -_ 503 -_ 493 -һ 493 -_ 482 -_ 481 - 476 - 474 -_ 470 - 468 -_ 465 -_ 465 -__ 465 -_ 464 - 455 -_ 450 - 449 -_ 449 - 448 -_ 448 - 445 - 445 - 441 -_ 434 -_ 432 -_ 430 - 428 -_ 427 -_ 426 -__ 426 -_ 426 - 426 - 425 -_ 424 -_ 423 -_һ 419 - 419 - 417 -_ 417 -__ 415 - 413 -_ 412 -_ 411 - 411 -_ 410 - 409 -_ 402 -_ 400 - 398 -_ 397 -_ 397 -_ 395 -_ 393 -_ 392 - 390 -_ 387 - 386 - 385 -_ 383 -__ 380 -_ 379 -_ 378 -_ 372 - 368 -__ 368 -_ 364 -_ 359 -_ 358 -_ 356 -_ 355 - 355 -_ 349 -_ 346 -_ 343 -_ 343 -_ 340 - 340 - 338 - 338 -_ 336 -_ 331 - 329 -_ 324 -һ_ 309 -_ 306 - 304 - 300 -_ 298 -_ 297 - 296 -_ 294 - 293 -_ 290 - 289 -_ 281 -_ 276 -_ 274 -ҵ 274 -_ 273 - 272 -_ 270 - 270 - 270 -_ 269 -_һ_ 269 -_ 268 - 268 -_ 267 - 267 - 266 -_ 265 -_ 264 -_ 264 -_ 262 - 258 -_ 257 -_ 256 -_ 248 -ҵ_ 246 - 242 -_ 242 - 242 -_ 237 - 233 - 230 - 229 - 228 -Ϊ 228 - 226 -_ 225 -_ 225 -_ 224 - 224 -_ 224 -_ 223 - 223 -_ 222 -_ 222 -_ 221 - 221 -_ 220 - 220 -_ 220 -_ 219 - 218 -_ 217 -__ 217 -_ 217 -_ 217 -_ 214 - 210 -_ 210 - 209 - 209 - 208 - 208 -_ 208 -_ 207 -_ 207 -_ 205 -_ 205 -_ 205 - 205 -__ 205 -__ 205 -_ 205 - 205 - 204 -_ 203 - 202 -_ 202 -__ 201 - 201 -__ 200 -_ 200 -_ 200 -_ 199 -_ 197 -_ 197 -_ 197 -__ 197 -_ 196 - 193 -_ 191 - 189 -_ 188 -_ 186 -__ 186 -_ 186 -_ 186 - 183 - 183 - 182 -Ϊ_ 182 -_ 180 - 179 - 179 - 178 -_ 178 -_ 177 -__ 177 -_ 177 -_ 176 - 175 - 174 -_Ϊ 173 -ȫ 171 -_ 171 - 171 - 171 - 169 -__ 169 -_ 169 -__ 169 -_ 169 -_ 169 -_ 169 -_ 168 -_ 168 -_ 168 -_ 167 -_ 166 -_ 166 -_ 166 -Ҫ 165 - 164 -ʱ 164 -_ 164 -_ 163 -_ 160 -_ 160 -_ 159 - 158 -__ 157 -_ 157 - 156 -__ 156 -__ 155 - 155 - 154 - 154 -_ 154 -_ 154 - 152 -_ 151 -_ 151 - 151 -ʡ 149 - 148 -_ 148 -_ʡ 148 - 147 -_ 146 -_ 145 -_ȫ 143 -ͬ 143 - 142 -_ 141 -_ 140 - 140 -ѧ 140 -ũ 139 -Ҫ_ 139 -_ 137 diff -Nru spamassassin-3.4.6/trunk-only/README spamassassin-4.0.0~rc3/trunk-only/README --- spamassassin-3.4.6/trunk-only/README 2018-02-05 16:13:03.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/README 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -These files are artifacts that are typically used directly from trunk. If you wish to use them, it is best to look there. diff -Nru spamassassin-3.4.6/trunk-only/rules/10_default_prefs.cf spamassassin-4.0.0~rc3/trunk-only/rules/10_default_prefs.cf --- spamassassin-3.4.6/trunk-only/rules/10_default_prefs.cf 2014-09-13 11:59:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/10_default_prefs.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,183 +0,0 @@ -# SpamAssassin basic config file -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -# Default template. Try to keep it under 78 columns (inside the the dots below). -# ........................................................................ -clear_report_template -if can(Mail::SpamAssassin::Conf::feature_yesno_takes_args) -report Spam detection software, running on the system "_HOSTNAME_", -report has_YESNO(, NOT)_ identified this incoming email as_YESNO( possible,)_ spam. The original -report message has been attached to this so you can view it or label -else -report Spam detection software, running on the system "_HOSTNAME_", has -report identified this incoming email as possible spam. The original message -report has been attached to this so you can view it (if it isn't spam) or label -endif -report similar future email. If you have any questions, see -report _CONTACTADDRESS_ for details. -report -report Content preview: _PREVIEW_ -report -report Content analysis details: (_SCORE_ points, _REQD_ required) -report -report " pts rule name description" -report ---- ---------------------- -------------------------------------------------- -report _SUMMARY_ - -# ........................................................................ - -# A 'contact address' users should contact for more info. (replaces -# _CONTACTADDRESS_ above if present) -report_contact @@CONTACT_ADDRESS@@ - -########################################################################### - -# Unsafe-for-viewing message report template. -# -# ...................................................................... -clear_unsafe_report_template -unsafe_report The original message was not completely plain text, and may be unsafe to -unsafe_report open with some email clients; in particular, it may contain a virus, -unsafe_report or confirm that your address can receive spam. If you wish to view -unsafe_report it, it may be safer to save it to a file and open it with an editor. -# ...................................................................... - -########################################################################### -# Database configuration options. -# -# user_scores_dsn MUST be in the form: -# DBI:databasetype:databasename:hostname:port -# ex. DBI:mysql:spamassassin:localhost -# -# user_scores_sql_username is the authorized username to connect to DSN -# user_scores_sql_password is the password for the database username - -#user_scores_dsn DBI:mysql:spamassassin:localhost -#user_scores_sql_username spam -#user_scores_sql_password spamfilter - -########################################################################## -# Headers to be added to mail (can be overriden by users in -# ~/.spamassassin/user_prefs) -# Make sure the header stays entirely on one line here - -clear_headers - -#X-Spam-Checker-Version: SpamAssassin 2.60-cvs (1.188-2003-05-24-exp) -add_header all Checker-Version SpamAssassin _VERSION_ (_SUBVERSION_) on _HOSTNAME_ - -#X-Spam-Flag: YES -add_header spam Flag _YESNOCAPS_ - -#X-Spam-Level: ************* -add_header all Level _STARS(*)_ - -#X-Spam-Status: Yes, score=14.0 required=5.0 tests=BAYES_99,CALL_FREE -# DATE_IN_PAST_12_24,DCC_CHECK,DRASTIC_REDUCED,FROM_HAS_MIXED_NUMS -# FROM_HAS_MIXED_NUMS3,HOME_EMPLOYMENT,INVALID_DATE,INVALID_MSGID -# LINES_OF_YELLING,MSGID_HAS_NO_AT,NO_REAL_NAME,ONCE_IN_LIFETIME -# UNDISC_RECIPS autolearn=spam version=2.60-cvs -add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_" - -########################################################################### -# Default prefs values: users can override these in their -# ~/.spamassassin/user_prefs files. - -# How many points before a mail is considered spam. -required_score 5 - -# Mail using locales used in these country codes will not be marked -# as being possibly spam in a foreign language. -ok_locales all - -# Mail using languages used in these country codes will not be marked -# as being possibly spam in a foreign language. This is an expensive -# classification, so it is is disabled in init.pre by default. -ifplugin Mail::SpamAssassin::Plugin::TextCat -ok_languages all -endif # Mail::SpamAssassin::Plugin::TextCat - -# Mail which scores outside this range will be fed back into SpamAssassin's -# learning system automatically, to train the Bayesian scanner. -ifplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold -bayes_auto_learn_threshold_nonspam 0.1 -bayes_auto_learn_threshold_spam 12.0 -endif # Mail::SpamAssassin::Plugin::AutoLearnThreshold - -# Set this to 0 to turn off auto-learning. -bayes_auto_learn 1 - -# report_safe controls the markup of spam. If you set it to 0, the message -# body of spam messages will not be modified -report_safe 1 - -# Headers to parse for originating IP address -if (can(Mail::SpamAssassin::Conf::feature_originating_ip_headers)) -clear_originating_ip_headers -originating_ip_headers X-Yahoo-Post-IP X-Originating-IP X-Apparently-From -originating_ip_headers X-SenderIP X-AOL-IP -endif - -if (can(Mail::SpamAssassin::Conf::feature_dns_local_ports_permit_avoid)) -# leave out the more densely populated port number ranges -dns_local_ports_avoid 0-11000 -# leave out some ephemeral ports, making them available to other programs -dns_local_ports_avoid 49152-49408 -# avoid IANA assigned high port numbers -dns_local_ports_avoid 11000-11001 11106 11111-11112 11161-11165 11201 11208 -dns_local_ports_avoid 11211 11319-11321 11367 11371 11600 11720 11751 11967 -dns_local_ports_avoid 12000-12008 12012-12013 12109 12121 12168 12172 12300 -dns_local_ports_avoid 12321-12322 12345 12753 13160 13216-13218 13223-13224 -dns_local_ports_avoid 13720-13722 13724 13782-13783 13785-13786 13818-13822 -dns_local_ports_avoid 13929 14000-14001 14033-14034 14141-14142 14145 14149 -dns_local_ports_avoid 14154 14250 14414 14936-14937 15000 15345 15363 15555 -dns_local_ports_avoid 15660 15740 16161 16309-16311 16360-16361 16367-16368 -dns_local_ports_avoid 16384 16900 16950 16991-16995 17007 17185 17219 17235 -dns_local_ports_avoid 17500 17729 17754-17756 18000 18181-18187 18241 18262 -dns_local_ports_avoid 18463 18634-18635 18769 18881 18888 19000 19191 19194 -dns_local_ports_avoid 19283 19315 19398 19410-19412 19539-19541 19999-20003 -dns_local_ports_avoid 20005 20014 20034 20046 20049 20167 20202 20222 20480 -dns_local_ports_avoid 20670 20999-21000 21554 21590 21800 21845-21849 -dns_local_ports_avoid 22000-22005 22273 22305 22343 22347 22350 22555 22763 -dns_local_ports_avoid 22800 22951 23000-23005 23272 23333 23400-23402 -dns_local_ports_avoid 24000-24006 24242 24249 24321 24386 24465 24554 -dns_local_ports_avoid 24676-24678 24680 24922 25000-25009 25793 25900-25903 -dns_local_ports_avoid 26000 26133 26208 26260-26263 26486-26487 26489 27345 -dns_local_ports_avoid 27442 27504 27782 27999-28000 28240 29167 30001-30002 -dns_local_ports_avoid 30260 30999 31416 31457 31620 31765 31948-31949 32034 -dns_local_ports_avoid 32249 32483 32635-32636 32767-32777 32801 32896 33123 -dns_local_ports_avoid 33331 33434 33656 34249 34378-34379 34962-34964 34980 -dns_local_ports_avoid 36001 36865 37475 37654 38201-38203 39681 40000 -dns_local_ports_avoid 40841-40843 41111 41794-41795 42508-42510 43188-43190 -dns_local_ports_avoid 43440-43441 44321-44322 44553 44818 45054 45678 45825 -dns_local_ports_avoid 45966 46999-47000 47557 47624 47806 47808 48000-48003 -dns_local_ports_avoid 48128-48129 48556 48619 -endif - -# Some common prefs settings can be set here, to take effect site-wide -# unless the user override them. See the user_prefs.template file for -# explanations. - - diff -Nru spamassassin-3.4.6/trunk-only/rules/10_hasbase.cf spamassassin-4.0.0~rc3/trunk-only/rules/10_hasbase.cf --- spamassassin-3.4.6/trunk-only/rules/10_hasbase.cf 2014-02-06 14:17:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/10_hasbase.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -# SpamAssassin rules file: Base __HAS_* rules for meta rules -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -# PLEASE KEEP THIS TIDY - -# According to Bug 6781 - -# Header rules - - -header __HAS_SENDER exists:Sender - -header __HAS_FROM exists:From - -header __HAS_TO exists:To - -header __HAS_CC exists:CC - -header __HAS_REPLY_TO exists:Reply-To - -header __HAS_ORGANIZATION exists:Organization - -# Webmail - -# MUA & User Agents -header __HAS_UA exists:User-Agent -header __HAS_XMAIL exists:X-Mailer - - -# Other -header __HAS_DKIM_SIGHD exists:DKIM-Signature - -header __HAS_TNEF exists:X-MS-TNEF-Correlator - -header __HAS_ERRORS_TO exists:Errors-To -header __HAS_ORIGINALLY exists:X-Originally-To -header __HAS_LIST_ID exists:List-Id -header __HAS_X_BEEN_THERE exists:X-BeenThere -header __HAS_X_REF exists:References -header __HAS_IN_REPLY_TO exists:In-Reply-To -header __XPRIO exists:X-Priority -header __DISPONOT exists:Disposition-Notification-To -header __RRCPTO exists:Return-Receipt-To -header __OLDPEG exists:X-Confirm-Reading-To -header __AOL_IP exists:X-AOL-IP - - -# Rawbody rules - - - -# Mimeheader rules -# should be encapsulated in if ... endif - -ifplugin Mail::SpamAssassin::Plugin::MIMEHeader -# Put rules below - - -# -endif - - - - -# URI rules - -uri __HAS_URI /./ diff -Nru spamassassin-3.4.6/trunk-only/rules/20_advance_fee.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_advance_fee.cf --- spamassassin-3.4.6/trunk-only/rules/20_advance_fee.cf 2010-05-22 03:57:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_advance_fee.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -# SpamAssassin rules file: advance fee fraud rules (Nigerian 419 scams) -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -require_version @@VERSION@@ - -# predicate naming used to avoid renumbering -# 1. assign new rules a random unique three letter sequence -# 2. sort on rule definition, not rule name - -header __FRAUD_VQE Subject =~ /^(?:Re:|\[.{1,10}\])?\s*(?:very )?urgent\s+(?:(?:and|&)\s+)?(?:confidential|assistance|business|attention|reply|response|help)\b/i - -body __FRAUD_DBI /(?:\bdollars?\b|\busd(?:ollars)?(?:[0-9]|\b)|\bus\$|\$[0-9,.]{6,}|\$[0-9].{0,8}[mb]illion|\$[0-9.,]{2,10} ?m|\beuros?\b|u[.]?s[.]? [0-9.]+ m)/i -body __FRAUD_KJV /(?:claim|concerning) (?:the|this) money/i -body __FRAUD_IRJ /(?:finance|holding|securit(?:ies|y)) (?:company|firm|storage house)/i -body __FRAUD_NEB /(?:government|bank) of nigeria/i -body __FRAUD_XJR /(?:who was a|as a|an? honest|you being a|to any) foreigner/i -body __FRAUD_DPR /\b(?:(?:respond|reply) (?:urgently|immediately)|(?:urgent|immediate|earliest) (?:reply|response))\b/i -body __FRAUD_PTS /\b(?:ass?ass?inat(?:ed|ion)|murder(?:e?d)?|kill(?:ed|ing)\b[^.]{0,99}\b(?:war veterans|rebels?))\b/i -body __FRAUD_BEP /\b(?:bank of nigeria|central bank of|trust bank|apex bank|amalgamated bank)\b/i -body __FRAUD_TDP /\b(?:business partner(?:s|ship)?|silent partner(?:s|ship)?)\b/i -body __FRAUD_GAN /\b(?:charles taylor|serena|abacha|gu[e]i|sese[- ]?seko|kabila)\b/i -body __FRAUD_IRT /\b(?:compliments? of the|dear friend|dear sir|yours faithfully|season'?s greetings)\b/i -body __FRAUD_AON /\b(?:confidential|private|alternate|alternative) (?:(?:e-? *)?mail)\b/i -body __FRAUD_WNY /\b(?:disburse?(?:ment)?|incurr?(?:ed)?|remunerr?at(?:ed?|ion)|remm?itt?(?:ed|ance|ing)?)\b/i -body __FRAUD_IPK /\b(?:in|to|visit) your country\b/i -body __FRAUD_QXX /\b(?:my name is|i am) (?:mrs?|engr|barrister|dr|prince(?:ss)?)[. ]/i -body __FRAUD_IOU /\b(?:no risks?|risk-? *free|free of risks?|100% safe)\b/i -body __FRAUD_EZY /\b(?:of|the) late president\b/i -body __FRAUD_MLY /\b(?:reply|respond)\b[^.]{0,50}\b(?:to|through)\b[^.]{0,50}\@\b/i -body __FRAUD_ZFJ /\b(?:wife|son|brother|daughter) of the late\b/i -body __FRAUD_KDT /\bU\.?S\.?(?:D\.?)?\s*(?:\$\s*)?(?:\d+,\d+,\d+|\d+\.\d+\.\d+|\d+(?:\.\d+)?\s*milli?on)/i -body __FRAUD_ULK /\baffidavits?\b/i -body __FRAUD_BGP /\battached to ticket number\b/i -body __FRAUD_FBI /\bdisburs/i -body __FRAUD_JBU /\bforeign account\b/i -body __FRAUD_YWW /\bfurnish you with\b/i -body __FRAUD_JYG /\bgive\s+you .{0,15}(?:fund|money|total|sum|contact|percent)\b/i -body __FRAUD_XVW /\bhonest cooperation\b/i -body __FRAUD_UUY /\blegitimate business(?:es)?\b/i -body __FRAUD_SNT /\blocate(?: .{1,20})? extended relative/i -body __FRAUD_LTX /\bmilli?on (?:.{1,25} thousand\s*)?(?:(?:united states|u\.?s\.?) dollars|(?i:U\.?S\.?D?))\b/i -body __FRAUD_JNB /\boperat(?:e|ing)\b[^.]{0,99}\b(?:for(?:ei|ie)gn|off-? ?shore|over-? ?seas?) (?:bank )?accounts?\b/i -body __FRAUD_QFY /\bover-? *(?:invoiced?|cost(?:s|ing)?)\b/i -body __FRAUD_WDR /\bprivate lawyer\b/i -body __FRAUD_WFC /\bsecur(?:e|ing) (?:the )?(?:funds?|monies)\b/i -body __FRAUD_AUM /\bthe desk of\b/i -body __FRAUD_MCQ /\btransaction\b.{1,30}\b(?:magnitude|diplomatic|strict|absolute|secret|confiden(?:tial|ce)|guarantee)/i -body __FRAUD_ETX /\byour\b[^.]{0,99}\b(?:contact (?:details|information)|private (?:e?[- ]?mail|telephone|tel|phone|fax))\b/i -body __FRAUD_PVN /as the beneficiary/i -body __FRAUD_FVU /award notification/i -body __FRAUD_CKF /computer ballot system/i -body __FRAUD_FCW /fiduciary agent/i -body __FRAUD_MQO /foreign (?:business partner|customer)/i -body __FRAUD_TCC /foreign (?:offshore )?(?:bank|account)/i -body __FRAUD_GBW /god gives .{1,10}second chance/i -body __FRAUD_NRG /i am contacting you/i -body __FRAUD_RLX /lott(?:o|ery) (?:co,?ordinator|international)/i -body __FRAUD_AXF /magnanimity/i -body __FRAUD_THJ /modalit(?:y|ies)/i -body __FRAUD_YQV /nigerian? (?:national|government)/i -body __FRAUD_YJA /over-invoice/i -body __FRAUD_YPO /the total sum/i -body __FRAUD_UOQ /vital documents/i - -# -# jhardin: temporarily disable to gauge and score ADVANCE_FEE_NEW rules in isolation -# -# meta ADVANCE_FEE_2 (__FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_EZY + __FRAUD_ZFJ + __FRAUD_KDT + __FRAUD_BGP + __FRAUD_FBI + __FRAUD_JBU + __FRAUD_JYG + __FRAUD_XVW + __FRAUD_SNT + __FRAUD_LTX + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_FCW + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_NRG + __FRAUD_RLX + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __FRAUD_DBI + __FRAUD_BEP + __FRAUD_DPR + __FRAUD_QXX + __FRAUD_QFY + __FRAUD_PTS + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IPK + __FRAUD_AON + __FRAUD_WNY + __FRAUD_AUM + __FRAUD_WFC + __FRAUD_YWW + __FRAUD_ULK + __FRAUD_IOU + __FRAUD_JNB + __FRAUD_IRT + __FRAUD_ETX + __FRAUD_WDR + __FRAUD_UUY + __FRAUD_MLY > 2) -# meta ADVANCE_FEE_3 (__FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_EZY + __FRAUD_ZFJ + __FRAUD_KDT + __FRAUD_BGP + __FRAUD_FBI + __FRAUD_JBU + __FRAUD_JYG + __FRAUD_XVW + __FRAUD_SNT + __FRAUD_LTX + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_FCW + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_NRG + __FRAUD_RLX + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __FRAUD_DBI + __FRAUD_BEP + __FRAUD_DPR + __FRAUD_QXX + __FRAUD_QFY + __FRAUD_PTS + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IPK + __FRAUD_AON + __FRAUD_WNY + __FRAUD_AUM + __FRAUD_WFC + __FRAUD_YWW + __FRAUD_ULK + __FRAUD_IOU + __FRAUD_JNB + __FRAUD_IRT + __FRAUD_ETX + __FRAUD_WDR + __FRAUD_UUY + __FRAUD_MLY > 3) -# meta ADVANCE_FEE_4 (__FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_EZY + __FRAUD_ZFJ + __FRAUD_KDT + __FRAUD_BGP + __FRAUD_FBI + __FRAUD_JBU + __FRAUD_JYG + __FRAUD_XVW + __FRAUD_SNT + __FRAUD_LTX + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_FCW + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_NRG + __FRAUD_RLX + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __FRAUD_DBI + __FRAUD_BEP + __FRAUD_DPR + __FRAUD_QXX + __FRAUD_QFY + __FRAUD_PTS + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IPK + __FRAUD_AON + __FRAUD_WNY + __FRAUD_AUM + __FRAUD_WFC + __FRAUD_YWW + __FRAUD_ULK + __FRAUD_IOU + __FRAUD_JNB + __FRAUD_IRT + __FRAUD_ETX + __FRAUD_WDR + __FRAUD_UUY + __FRAUD_MLY > 4) -# -# describe ADVANCE_FEE_2 Appears to be advance fee fraud (Nigerian 419) -# describe ADVANCE_FEE_3 Appears to be advance fee fraud (Nigerian 419) -# describe ADVANCE_FEE_4 Appears to be advance fee fraud (Nigerian 419) diff -Nru spamassassin-3.4.6/trunk-only/rules/20_aux_tlds.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_aux_tlds.cf --- spamassassin-3.4.6/trunk-only/rules/20_aux_tlds.cf 2017-04-15 07:01:26.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_aux_tlds.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,738 +0,0 @@ -# SpamAssassin - Auxiliary TLD Definitions -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -# This file replaces the SARE http://www.rulesemporium.com/rules/90_2tld.cf -# which will be deprecated as from 2010-05-01 - -# File updated 2014-09-17 to contain complete TLD lists, they are no longer -# hardcoded into SA codebase and Util/RegistrarBoundaries.pm is deprecated -# in favor of Mail::SpamAssassin::RegistryBoundaries. - - -# Let's clear the internal TLD list, we only want to read from this config -# file and ignore possible old hardcoded lists. -if (can(Mail::SpamAssassin::Conf::feature_registryboundaries)) -clear_util_rb -endif - - -# -# 1st level TLD list -# - -# Basic list can be obtained with the following command: -# wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | perl -ne 'print lc' -# Current list may include more or less.. TODO easier maintenance? - -# util_rb_tld only accepts alpha (a-z) input before RegistryBoundaries was -# implemented in 3.4.1(?), put IDN TLDs with numeric, hyphen (0-9-) etc in -# this block -# -# For an up to date list of IDN TLDs that can be pasted into this block, run this command: -# wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/' -# Since version 4.0 the util_rb_tld also accepts Unicode IDN labels (encoded as UTF-8), e.g.: -# wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | idn -u | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/' - -if (can(Mail::SpamAssassin::Conf::feature_registryboundaries)) -util_rb_tld xn--11b4c3d xn--1qqw23a xn--30rr7y xn--3bst00m xn--3ds443g xn--3e0b707e -util_rb_tld xn--3pxu8k xn--42c2d9a xn--45brj9c xn--45q11c xn--4gbrim xn--55qw42g xn--55qx5d -util_rb_tld xn--6frz82g xn--6qq986b3xl xn--80adxhks xn--80ao21a xn--80asehdb xn--80aswg -util_rb_tld xn--90a3ac xn--90ais xn--9dbq2a xn--9et52u xn--b4w605ferd xn--c1avg xn--c2br7g -util_rb_tld xn--cg4bki xn--clchc0ea0b2g2a9gcd xn--czr694b xn--czrs0t xn--czru2d xn--d1acj3b -util_rb_tld xn--d1alf xn--eckvdtc9d xn--efvy88h xn--estv75g xn--fhbei xn--fiq228c5hs -util_rb_tld xn--fiq64b xn--fiqs8s xn--fiqz9s xn--fjq720a xn--flw351e xn--fpcrj9c3d -util_rb_tld xn--fzc2c9e2c xn--gecrj9c xn--h2brj9c xn--hxt814e xn--i1b6b1a6a2e xn--imr513n -util_rb_tld xn--io0a7i xn--j1aef xn--j1amh xn--j6w193g xn--jlq61u9w7b xn--kcrx77d1x4a -util_rb_tld xn--kprw13d xn--kpry57d xn--kpu716f xn--kput3i xn--l1acc xn--lgbbat1ad8j -util_rb_tld xn--mgb9awbf xn--mgba3a3ejt xn--mgba3a4f16a xn--mgbaam7a8h xn--mgbab2bd -util_rb_tld xn--mgbayh7gpa xn--mgbb9fbpob xn--mgbbh1a71e xn--mgbc0a9azcg xn--mgberp4a5d4ar -util_rb_tld xn--mgbpl2fh xn--mgbt3dhd xn--mgbtx2b xn--mgbx4cd0ab xn--mk1bu44c xn--mxtq1m -util_rb_tld xn--ngbc5azd xn--ngbe9e0a xn--node xn--nqv7f xn--nqv7fs00ema xn--nyqy26a -util_rb_tld xn--o3cw4h xn--ogbpf8fl xn--p1acf xn--p1ai xn--pbt977c xn--pgbs0dh xn--pssy2u -util_rb_tld xn--q9jyb4c xn--qcka1pmc xn--qxam xn--rhqv96g xn--s9brj9c xn--ses554g -util_rb_tld xn--t60b56a xn--tckwe xn--unup4y xn--vermgensberater-ctb -util_rb_tld xn--vermgensberatung-pwb xn--vhquv xn--vuq861b xn--wgbh1c xn--wgbl6a -util_rb_tld xn--xhq521b xn--xkc2al3hye2a xn--xkc2dl3a5ee0h xn--y9a3aq xn--yfro4i67o -util_rb_tld xn--ygbi2ammx xn--zfr164b -endif - -# Standard List -# For an up to date list of TLDs that can be pasted into this block, run this command: -# wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | grep -vi '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/' - -util_rb_tld aaa aarp abarth abb abbott abbvie abc able abogado abudhabi ac academy -util_rb_tld accenture accountant accountants aco active actor ad adac ads adult ae aeg aero -util_rb_tld aetna af afamilycompany afl ag agakhan agency ai aig aigo airbus airforce -util_rb_tld airtel akdn al alfaromeo alibaba alipay allfinanz allstate ally alsace alstom -util_rb_tld am americanexpress americanfamily amex amfam amica amsterdam analytics android -util_rb_tld anquan anz ao aol apartments app apple aq aquarelle ar aramco archi army arpa -util_rb_tld art arte as asda asia associates at athleta attorney au auction audi audible -util_rb_tld audio auspost author auto autos avianca aw aws ax axa az azure ba baby baidu -util_rb_tld banamex bananarepublic band bank bar barcelona barclaycard barclays barefoot -util_rb_tld bargains baseball basketball bauhaus bayern bb bbc bbt bbva bcg bcn bd be beats -util_rb_tld beauty beer bentley berlin best bestbuy bet bf bg bh bharti bi bible bid bike -util_rb_tld bing bingo bio biz bj black blackfriday blanco blockbuster blog bloomberg blue -util_rb_tld bm bms bmw bn bnl bnpparibas bo boats boehringer bofa bom bond boo book booking -util_rb_tld boots bosch bostik bot boutique br bradesco bridgestone broadway broker brother -util_rb_tld brussels bs bt budapest bugatti build builders business buy buzz bv bw by bz -util_rb_tld bzh ca cab cafe cal call calvinklein cam camera camp cancerresearch canon -util_rb_tld capetown capital capitalone car caravan cards care career careers cars cartier -util_rb_tld casa case caseih cash casino cat catering cba cbn cbre cbs cc cd ceb center ceo -util_rb_tld cern cf cfa cfd cg ch chanel channel chase chat cheap chintai chloe christmas -util_rb_tld chrome chrysler church ci cipriani circle cisco citadel citi citic city -util_rb_tld cityeats ck cl claims cleaning click clinic clinique clothing cloud club -util_rb_tld clubmed cm cn co coach codes coffee college cologne com comcast commbank -util_rb_tld community company compare computer comsec condos construction consulting -util_rb_tld contact contractors cooking cookingchannel cool coop corsica country coupon -util_rb_tld coupons courses cr credit creditcard creditunion cricket crown crs cruises csc -util_rb_tld cu cuisinella cv cw cx cy cymru cyou cz dabur dad dance date dating datsun day -util_rb_tld dclk dds de deal dealer deals degree delivery dell deloitte delta democrat -util_rb_tld dental dentist desi design dev dhl diamonds diet digital direct directory -util_rb_tld discount discover dish diy dj dk dm dnp do docs doctor dodge dog doha domains -util_rb_tld dot download drive dtv dubai duck dunlop duns dupont durban dvag dvr dz earth -util_rb_tld eat ec eco edeka edu education ee eg email emerck energy engineer engineering -util_rb_tld enterprises epost epson equipment er ericsson erni es esq estate esurance et eu -util_rb_tld eurovision eus events everbank exchange expert exposed express extraspace fage -util_rb_tld fail fairwinds faith family fan fans farm farmers fashion fast fedex feedback -util_rb_tld ferrari ferrero fi fiat fidelity fido film final finance financial fire -util_rb_tld firestone firmdale fish fishing fit fitness fj fk flickr flights flir florist -util_rb_tld flowers fly fm fo foo foodnetwork football ford forex forsale forum foundation -util_rb_tld fox fr free fresenius frl frogans frontdoor frontier ftr fujitsu fujixerox fund -util_rb_tld furniture futbol fyi ga gal gallery gallo gallup game games gap garden gb gbiz -util_rb_tld gd gdn ge gea gent genting george gf gg ggee gh gi gift gifts gives giving gl -util_rb_tld glade glass gle global globo gm gmail gmbh gmo gmx gn godaddy gold goldpoint -util_rb_tld golf goo goodhands goodyear goog google gop got gov gp gq gr grainger graphics -util_rb_tld gratis green gripe group gs gt gu guardian gucci guge guide guitars guru gw gy -util_rb_tld hamburg hangout haus hbo hdfc hdfcbank health healthcare help helsinki here -util_rb_tld hermes hgtv hiphop hisamitsu hitachi hiv hk hkt hm hn hockey holdings holiday -util_rb_tld homedepot homegoods homes homesense honda honeywell horse host hosting hot -util_rb_tld hoteles hotmail house how hr hsbc ht htc hu hughes hyatt hyundai ibm icbc ice -util_rb_tld icu id ie ieee ifm iinet ikano il im imamat imdb immo immobilien in industries -util_rb_tld infiniti info ing ink institute insurance insure int intel international intuit -util_rb_tld investments io ipiranga iq ir irish is iselect ismaili ist istanbul it itau itv -util_rb_tld iveco iwc jaguar java jcb jcp je jeep jetzt jewelry jlc jll jm jmp jnj jo jobs -util_rb_tld joburg jot joy jp jpmorgan jprs juegos juniper kaufen kddi ke kerryhotels -util_rb_tld kerrylogistics kerryproperties kfh kg kh ki kia kim kinder kindle kitchen kiwi -util_rb_tld km kn koeln komatsu kosher kp kpmg kpn kr krd kred kuokgroup kw ky kyoto kz la -util_rb_tld lacaixa ladbrokes lamborghini lamer lancaster lancia lancome land landrover -util_rb_tld lanxess lasalle lat latino latrobe law lawyer lb lc lds lease leclerc lefrak -util_rb_tld legal lego lexus lgbt li liaison lidl life lifeinsurance lifestyle lighting -util_rb_tld like lilly limited limo lincoln linde link lipsy live living lixil lk loan -util_rb_tld loans locker locus loft lol london lotte lotto love lpl lplfinancial lr ls lt -util_rb_tld ltd ltda lu lundbeck lupin luxe luxury lv ly ma macys madrid maif maison makeup -util_rb_tld man management mango market marketing markets marriott marshalls maserati -util_rb_tld mattel mba mc mcd mcdonalds mckinsey md me med media meet melbourne meme -util_rb_tld memorial men menu meo metlife mg mh miami microsoft mil mini mint mit -util_rb_tld mitsubishi mk ml mlb mls mm mma mn mo mobi mobily moda moe moi mom monash money -util_rb_tld monster montblanc mopar mormon mortgage moscow motorcycles mov movie movistar -util_rb_tld mp mq mr ms msd mt mtn mtpc mtr mu museum mutual mutuelle mv mw mx my mz na nab -util_rb_tld nadex nagoya name nationwide natura navy nba nc ne nec net netbank netflix -util_rb_tld network neustar new newholland news next nextdirect nexus nf nfl ng ngo nhk ni -util_rb_tld nico nike nikon ninja nissan nissay nl no nokia northwesternmutual norton now -util_rb_tld nowruz nowtv np nr nra nrw ntt nu nyc nz obi observer off office okinawa olayan -util_rb_tld olayangroup oldnavy ollo om omega one ong onl online onyourside ooo open oracle -util_rb_tld orange org organic orientexpress origins osaka otsuka ott ovh pa page -util_rb_tld pamperedchef panasonic panerai paris pars partners parts party passagens pay -util_rb_tld pccw pe pet pf pfizer pg ph pharmacy philips photo photography photos physio -util_rb_tld piaget pics pictet pictures pid pin ping pink pioneer pizza pk pl place play -util_rb_tld playstation plumbing plus pm pn pnc pohl poker politie porn post pr pramerica -util_rb_tld praxi press prime pro prod productions prof progressive promo properties -util_rb_tld property protection pru prudential ps pt pub pw pwc py qa qpon quebec quest qvc -util_rb_tld racing radio raid re read realestate realtor realty recipes red redstone -util_rb_tld redumbrella rehab reise reisen reit ren rent rentals repair report republican -util_rb_tld rest restaurant review reviews rexroth rich richardli ricoh rightathome rio rip -util_rb_tld ro rocher rocks rodeo rogers room rs rsvp ru ruhr run rw rwe ryukyu sa saarland -util_rb_tld safe safety sakura sale salon samsclub samsung sandvik sandvikcoromant sanofi -util_rb_tld sap sapo sarl sas save saxo sb sbi sbs sc sca scb schaeffler schmidt -util_rb_tld scholarships school schule schwarz science scjohnson scor scot sd se seat -util_rb_tld secure security seek select sener services ses seven sew sex sexy sfr sg sh -util_rb_tld shangrila sharp shaw shell shia shiksha shoes shop shopping shouji show -util_rb_tld showtime shriram si silk sina singles site sj sk ski skin sky skype sl sling sm -util_rb_tld smart smile sn sncf so soccer social softbank software sohu solar solutions -util_rb_tld song sony soy space spiegel spot spreadbetting sr srl srt st stada staples star -util_rb_tld starhub statebank statefarm statoil stc stcgroup stockholm storage store stream -util_rb_tld studio study style su sucks supplies supply support surf surgery suzuki sv -util_rb_tld swatch swiftcover swiss sx sy sydney symantec systems sz tab taipei talk taobao -util_rb_tld target tatamotors tatar tattoo tax taxi tc tci td tdk team tech technology tel -util_rb_tld telecity telefonica temasek tennis teva tf tg th thd theater theatre tiaa -util_rb_tld tickets tienda tiffany tips tires tirol tj tjmaxx tjx tk tkmaxx tl tm tmall tn -util_rb_tld to today tokyo tools top toray toshiba total tours town toyota toys tr trade -util_rb_tld trading training travel travelchannel travelers travelersinsurance trust trv tt -util_rb_tld tube tui tunes tushu tv tvs tw tz ua ubank ubs uconnect ug uk unicom university -util_rb_tld uno uol ups us uy uz va vacations vana vanguard vc ve vegas ventures verisign -util_rb_tld versicherung vet vg vi viajes video vig viking villas vin vip virgin visa -util_rb_tld vision vista vistaprint viva vivo vlaanderen vn vodka volkswagen volvo vote -util_rb_tld voting voto voyage vu vuelos wales walmart walter wang wanggou warman watch -util_rb_tld watches weather weatherchannel webcam weber website wed wedding weibo weir wf -util_rb_tld whoswho wien wiki williamhill win windows wine winners wme wolterskluwer -util_rb_tld woodside work works world wow ws wtc wtf xbox xerox xfinity xihuan xin xperia -util_rb_tld xxx xyz yachts yahoo yamaxun yandex ye yodobashi yoga yokohama you youtube yt -util_rb_tld yun za zappos zara zero zip zippo zm zone zuerich zw - -# -# 2nd level TLD list -# - -# http://www.neustar.us/policies/docs/rfc_1480.txt -# data originally from http://spamcheck.freeapp.net/two-level-tlds -# The freeapp.net site now says that information on the site is obsolete -# See discussion and sources in comments of bug 5677 -# updated as per bug 5815 -# cleanup in progress per bug 6795 (axb) -# Unsorted sources: -# .ua : http://hostmaster.ua -# .hu : http://www.domain.hu/domain/English/szabalyzat/sld.html - -util_rb_2tld com.ac edu.ac gov.ac mil.ac net.ac org.ac -util_rb_2tld nom.ad -util_rb_2tld ac.ae co.ae com.ae gov.ae mil.ae name.ae net.ae org.ae pro.ae sch.ae -util_rb_2tld com.af edu.af gov.af net.af -util_rb_2tld co.ag com.ag net.ag nom.ag org.ag -util_rb_2tld com.ai edu.ai gov.ai net.ai off.ai org.ai -util_rb_2tld com.al edu.al gov.al net.al org.al -util_rb_2tld com.an edu.an net.an org.an -util_rb_2tld co.ao ed.ao gv.ao it.ao og.ao pb.ao -util_rb_2tld com.ar edu.ar gov.ar int.ar mil.ar net.ar org.ar -util_rb_2tld e164.arpa in-addr.arpa ip6.arpa iris.arpa uri.arpa urn.arpa -util_rb_2tld ac.at co.at gv.at or.at priv.at -util_rb_2tld act.au asn.au com.au conf.au csiro.au edu.au gov.au id.au info.au net.au nsw.au nt.au org.au otc.au oz.au qld.au sa.au tas.au telememo.au vic.au wa.au -util_rb_2tld com.aw -util_rb_2tld biz.az com.az edu.az gov.az info.az int.az mil.az name.az net.az org.az pp.az -util_rb_2tld co.ba com.ba edu.ba gov.ba mil.ba net.ba org.ba rs.ba unbi.ba unsa.ba -util_rb_2tld com.bb edu.bb gov.bb net.bb org.bb -util_rb_2tld ac.bd com.bd edu.bd gov.bd mil.bd net.bd org.bd -util_rb_2tld ac.be belgie.be dns.be fgov.be -util_rb_2tld gov.bf -util_rb_2tld biz.bh cc.bh com.bh edu.bh gov.bh info.bh net.bh org.bh -util_rb_2tld com.bm edu.bm gov.bm net.bm org.bm -util_rb_2tld com.bn edu.bn net.bn org.bn -util_rb_2tld com.bo edu.bo gob.bo gov.bo int.bo mil.bo net.bo org.bo tv.bo -util_rb_2tld adm.br adv.br agr.br am.br arq.br art.br ato.br bio.br bmd.br cim.br cng.br cnt.br com.br coop.br dpn.br eco.br ecn.br edu.br eng.br esp.br etc.br eti.br far.br fm.br fnd.br fot.br fst.br g12.br ggf.br gov.br imb.br ind.br inf.br jor.br lel.br mat.br med.br mil.br mus.br net.br nom.br not.br ntr.br odo.br org.br ppg.br pro.br psc.br psi.br qsl.br rec.br slg.br srv.br tmp.br trd.br tur.br tv.br vet.br zlg.br -util_rb_2tld com.bs net.bs org.bs -util_rb_2tld com.bt edu.bt gov.bt net.bt org.bt -util_rb_2tld co.bw org.bw -util_rb_2tld gov.by mil.by -util_rb_2tld com.bz net.bz org.bz -util_rb_2tld ab.ca bc.ca gc.ca mb.ca nb.ca nf.ca nl.ca ns.ca nt.ca nu.ca on.ca pe.ca qc.ca sk.ca yk.ca -util_rb_2tld co.ck edu.ck gov.ck net.ck org.ck -util_rb_2tld ac.cn ah.cn bj.cn com.cn cq.cn edu.cn fj.cn gd.cn gov.cn gs.cn gx.cn gz.cn ha.cn hb.cn he.cn hi.cn hk.cn hl.cn hn.cn jl.cn js.cn jx.cn ln.cn mo.cn net.cn nm.cn nx.cn org.cn qh.cn sc.cn sd.cn sh.cn sn.cn sx.cn tj.cn tw.cn xj.cn xz.cn yn.cn zj.cn -util_rb_2tld arts.co com.co edu.co firm.co gov.co info.co int.co mil.co net.co nom.co org.co rec.co web.co -util_rb_2tld co.cm com.cm net.cm -util_rb_2tld au.com br.com cn.com de.com eu.com gb.com hu.com no.com qc.com ru.com sa.com se.com uk.com us.com uy.com za.com -util_rb_2tld ac.cr co.cr ed.cr fi.cr go.cr or.cr sa.cr -util_rb_2tld com.cu edu.cu gov.cu inf.cu net.cu org.cu -util_rb_2tld gov.cx -util_rb_2tld ac.cy biz.cy com.cy ekloges.cy gov.cy ltd.cy name.cy net.cy org.cy parliament.cy press.cy pro.cy tm.cy -util_rb_2tld co.dk -util_rb_2tld com.dm edu.dm gov.dm net.dm org.dm -util_rb_2tld art.do com.do edu.do gob.do gov.do mil.do net.do org.do sld.do web.do -util_rb_2tld art.dz asso.dz com.dz edu.dz gov.dz net.dz org.dz pol.dz -util_rb_2tld com.ec edu.ec fin.ec gov.ec info.ec k12.ec med.ec mil.ec net.ec org.ec pro.ec gob.ec -util_rb_2tld co.ee com.ee edu.ee fie.ee med.ee org.ee pri.ee -util_rb_2tld com.eg edu.eg eun.eg gov.eg mil.eg net.eg org.eg sci.eg -util_rb_2tld com.er edu.er gov.er ind.er mil.er net.er org.er -util_rb_2tld com.es edu.es gob.es nom.es org.es -util_rb_2tld biz.et com.et edu.et gov.et info.et name.et net.et org.et -util_rb_2tld aland.fi -util_rb_2tld ac.fj biz.fj com.fj gov.fj id.fj info.fj mil.fj name.fj net.fj org.fj pro.fj school.fj -util_rb_2tld ac.fk co.fk com.fk gov.fk net.fk nom.fk org.fk -util_rb_2tld tm.fr asso.fr nom.fr prd.fr presse.fr com.fr gouv.fr -util_rb_2tld com.ge edu.ge gov.ge mil.ge net.ge org.ge pvt.ge -util_rb_2tld ac.gg alderney.gg co.gg gov.gg guernsey.gg ind.gg ltd.gg net.gg org.gg sark.gg sch.gg -util_rb_2tld com.gh edu.gh gov.gh mil.gh org.gh -util_rb_2tld com.gi edu.gi gov.gi ltd.gi mod.gi org.gi -util_rb_2tld ac.gn com.gn gov.gn net.gn org.gn -util_rb_2tld asso.gp com.gp edu.gp net.gp org.gp -util_rb_2tld com.gr edu.gr gov.gr net.gr org.gr -util_rb_2tld com.gt edu.gt gob.gt ind.gt mil.gt net.gt org.gt -util_rb_2tld com.gu edu.gu gov.gu mil.gu net.gu org.gu -util_rb_2tld com.hk edu.hk gov.hk idv.hk net.hk org.hk -util_rb_2tld com.hn edu.hn gob.hn mil.hn net.hn org.hn -util_rb_2tld com.hr from.hr iz.hr name.hr -util_rb_2tld adult.ht art.ht asso.ht com.ht coop.ht edu.ht firm.ht gouv.ht info.ht med.ht net.ht org.ht perso.ht pol.ht pro.ht rel.ht shop.ht -util_rb_2tld 2000.hu agrar.hu bolt.hu casino.hu city.hu co.hu erotica.hu erotika.hu film.hu forum.hu games.hu hotel.hu info.hu ingatlan.hu jogasz.hu konyvelo.hu lakas.hu media.hu news.hu org.hu priv.hu reklam.hu sex.hu shop.hu sport.hu suli.hu szex.hu tm.hu tozsde.hu utazas.hu video.hu -util_rb_2tld ac.id co.id go.id mil.id net.id or.id sch.id web.id -util_rb_2tld gov.ie -util_rb_2tld ac.il co.il gov.il idf.il k12.il muni.il net.il org.il -util_rb_2tld ac.im co.im com.im gov.im net.im nic.im org.im -util_rb_2tld ac.in co.in edu.in ernet.in firm.in gen.in gov.in ind.in mil.in net.in nic.in org.in res.in -util_rb_2tld com.io gov.io mil.io net.io org.io -util_rb_2tld gov.iq -util_rb_2tld ac.ir co.ir gov.ir id.ir net.ir org.ir sch.ir -util_rb_2tld edu.it gov.it -util_rb_2tld ac.je co.je gov.je ind.je jersey.je ltd.je net.je org.je sch.je -util_rb_2tld com.jm edu.jm gov.jm net.jm org.jm -util_rb_2tld com.jo edu.jo gov.jo mil.jo net.jo org.jo -util_rb_2tld ac.jp ad.jp aichi.jp akita.jp aomori.jp chiba.jp co.jp ed.jp ehime.jp fukui.jp fukuoka.jp fukushima.jp gifu.jp go.jp gov.jp gr.jp gunma.jp hiroshima.jp hokkaido.jp hyogo.jp ibaraki.jp ishikawa.jp iwate.jp kagawa.jp kagoshima.jp kanagawa.jp kanazawa.jp kawasaki.jp kitakyushu.jp kobe.jp kochi.jp kumamoto.jp kyoto.jp lg.jp matsuyama.jp mie.jp miyagi.jp miyazaki.jp nagano.jp nagasaki.jp nagoya.jp nara.jp ne.jp net.jp niigata.jp oita.jp okayama.jp okinawa.jp or.jp org.jp osaka.jp saga.jp saitama.jp sapporo.jp sendai.jp shiga.jp shimane.jp shizuoka.jp takamatsu.jp tochigi.jp tokushima.jp tokyo.jp tottori.jp toyama.jp utsunomiya.jp wakayama.jp yamagata.jp yamaguchi.jp yamanashi.jp yokohama.jp -util_rb_2tld ac.ke co.ke go.ke ne.ke new.ke or.ke sc.ke -util_rb_2tld com.kg edu.kg gov.kg mil.kg net.kg org.kg -util_rb_2tld com.kh edu.kh gov.kh mil.kh net.kh org.kh per.kh -util_rb_2tld ac.kr busan.kr chungbuk.kr chungnam.kr co.kr daegu.kr daejeon.kr es.kr gangwon.kr go.kr gwangju.kr gyeongbuk.kr gyeonggi.kr gyeongnam.kr hs.kr incheon.kr jeju.kr jeonbuk.kr jeonnam.kr kg.kr kyonggi.kr mil.kr ms.kr ne.kr or.kr pe.kr re.kr sc.kr seoul.kr ulsan.kr -util_rb_2tld com.kw edu.kw gov.kw mil.kw net.kw org.kw -util_rb_2tld com.ky edu.ky gov.ky net.ky org.ky -util_rb_2tld com.kz edu.kz gov.kz mil.kz net.kz org.kz -util_rb_2tld com.la net.la org.la -util_rb_2tld com.lb edu.lb gov.lb mil.lb net.lb org.lb -util_rb_2tld com.lc edu.lc gov.lc net.lc org.lc -util_rb_2tld assn.lk com.lk edu.lk gov.lk grp.lk hotel.lk int.lk ltd.lk net.lk ngo.lk org.lk sch.lk soc.lk web.lk -util_rb_2tld com.lr edu.lr gov.lr net.lr org.lr -util_rb_2tld co.ls org.ls -util_rb_2tld gov.lt mil.lt -util_rb_2tld asn.lv com.lv conf.lv edu.lv gov.lv id.lv mil.lv net.lv org.lv -util_rb_2tld biz.ly com.ly edu.ly gov.ly id.ly med.ly net.ly org.ly plc.ly sch.ly -util_rb_2tld ac.ma co.ma gov.ma net.ma org.ma press.ma -util_rb_2tld asso.mc tm.mc -util_rb_2tld ac.me co.me edu.me gov.me its.me net.me org.me priv.me -util_rb_2tld com.mg edu.mg gov.mg mil.mg nom.mg org.mg prd.mg tm.mg -util_rb_2tld army.mil navy.mil -util_rb_2tld com.mk org.mk -util_rb_2tld com.mm edu.mm gov.mm net.mm org.mm -util_rb_2tld edu.mn gov.mn org.mn -util_rb_2tld com.mo edu.mo gov.mo net.mo org.mo -util_rb_2tld music.mobi weather.mobi -util_rb_2tld co.mp edu.mp gov.mp net.mp org.mp -util_rb_2tld com.mt edu.mt gov.mt net.mt org.mt tm.mt uu.mt -util_rb_2tld co.mu com.mu -util_rb_2tld aero.mv biz.mv com.mv coop.mv edu.mv gov.mv info.mv int.mv mil.mv museum.mv name.mv net.mv org.mv pro.mv -util_rb_2tld ac.mw co.mw com.mw coop.mw edu.mw gov.mw int.mw museum.mw net.mw org.mw -util_rb_2tld com.mx edu.mx gob.mx net.mx org.mx -util_rb_2tld com.my edu.my gov.my mil.my name.my net.my org.my -util_rb_2tld alt.na com.na cul.na edu.na net.na org.na telecom.na unam.na -util_rb_2tld com.nc net.nc org.nc -util_rb_2tld de.net gb.net uk.net -util_rb_2tld ac.ng com.ng edu.ng gov.ng net.ng org.ng sch.ng -util_rb_2tld ac.ni biz.ni com.ni edu.ni gob.ni in.ni info.ni int.ni mil.ni net.ni nom.ni org.ni web.ni -util_rb_2tld fhs.no folkebibl.no fylkesbibl.no herad.no idrett.no kommune.no mil.no museum.no priv.no stat.no tel.no vgs.no -util_rb_2tld com.np edu.np gov.np mil.np net.np org.np -util_rb_2tld biz.nr co.nr com.nr edu.nr fax.nr gov.nr info.nr mob.nr mobil.nr mobile.nr net.nr org.nr tel.nr tlf.nr -util_rb_2tld ac.nz co.nz cri.nz geek.nz gen.nz govt.nz iwi.nz kiwi.nz maori.nz mil.nz net.nz org.nz parliament.nz school.nz -util_rb_2tld ac.om biz.om co.om com.om edu.om gov.om med.om mil.om mod.om museum.om net.om org.om pro.om sch.om -util_rb_2tld dk.org eu.org -util_rb_2tld abo.pa ac.pa com.pa edu.pa gob.pa ing.pa med.pa net.pa nom.pa org.pa sld.pa -util_rb_2tld com.pe edu.pe gob.pe mil.pe net.pe nom.pe org.pe -util_rb_2tld com.pf edu.pf org.pf -util_rb_2tld ac.pg com.pg net.pg -util_rb_2tld com.ph edu.ph gov.ph mil.ph net.ph ngo.ph org.ph -util_rb_2tld biz.pk com.pk edu.pk fam.pk gob.pk gok.pk gon.pk gop.pk gos.pk gov.pk net.pk org.pk web.pk -util_rb_2tld art.pl biz.pl com.pl edu.pl gov.pl info.pl mil.pl net.pl ngo.pl org.pl -util_rb_2tld biz.pr com.pr edu.pr gov.pr info.pr isla.pr name.pr net.pr org.pr pro.pr -util_rb_2tld cpa.pro law.pro med.pro -util_rb_2tld com.ps edu.ps gov.ps net.ps org.ps plo.ps sec.ps -util_rb_2tld com.pt edu.pt gov.pt int.pt net.pt nome.pt org.pt publ.pt -util_rb_2tld com.py edu.py gov.py net.py org.py -util_rb_2tld com.qa edu.qa gov.qa net.qa org.qa -util_rb_2tld asso.re com.re nom.re -util_rb_2tld arts.ro com.ro firm.ro info.ro nom.ro nt.ro org.ro rec.ro store.ro tm.ro www.ro -util_rb_2tld ac.rs co.rs edu.rs gov.rs in.rs org.rs -util_rb_2tld ac.ru com.ru edu.ru gov.ru int.ru mil.ru net.ru org.ru pp.ru -util_rb_2tld ac.rw co.rw com.rw edu.rw gouv.rw gov.rw int.rw mil.rw net.rw -util_rb_2tld com.sa edu.sa gov.sa med.sa net.sa org.sa pub.sa sch.sa -util_rb_2tld com.sb edu.sb gov.sb net.sb org.sb -util_rb_2tld com.sc edu.sc gov.sc net.sc org.sc -util_rb_2tld com.sd edu.sd gov.sd info.sd med.sd net.sd org.sd sch.sd tv.sd -util_rb_2tld ab.se ac.se bd.se brand.se c.se d.se e.se f.se fh.se fhsk.se fhv.se g.se h.se i.se k.se komforb.se kommunalforbund.se komvux.se lanarb.se lanbib.se m.se mil.se n.se naturbruksgymn.se o.se org.se parti.se pp.se press.se s.se sshn.se t.se tm.se u.se w.se x.se y.se z.se -util_rb_2tld com.sg edu.sg gov.sg idn.sg net.sg org.sg per.sg -util_rb_2tld com.sh edu.sh gov.sh mil.sh net.sh org.sh -util_rb_2tld edu.sk gov.sk mil.sk -util_rb_2tld co.st com.st consulado.st edu.st embaixada.st gov.st mil.st net.st org.st principe.st saotome.st store.st -util_rb_2tld com.sv edu.sv gob.sv org.sv red.sv -util_rb_2tld com.sy gov.sy net.sy org.sy -util_rb_2tld at.tf bg.tf ca.tf ch.tf cz.tf de.tf edu.tf eu.tf int.tf net.tf pl.tf ru.tf sg.tf us.tf -util_rb_2tld ac.th co.th go.th in.th mi.th net.th or.th -util_rb_2tld ac.tj biz.tj co.tj com.tj edu.tj go.tj gov.tj int.tj mil.tj name.tj net.tj org.tj web.tj -util_rb_2tld com.tn edunet.tn ens.tn fin.tn gov.tn ind.tn info.tn intl.tn nat.tn net.tn org.tn rnrt.tn rns.tn rnu.tn tourism.tn -util_rb_2tld gov.to -util_rb_2tld gov.tp -util_rb_2tld av.tr bbs.tr bel.tr biz.tr com.tr dr.tr edu.tr gen.tr gov.tr info.tr k12.tr mil.tr name.tr net.tr org.tr pol.tr tel.tr web.tr -util_rb_2tld aero.tt at.tt au.tt be.tt biz.tt ca.tt co.tt com.tt coop.tt de.tt dk.tt edu.tt es.tt eu.tt fr.tt gov.tt info.tt int.tt it.tt jobs.tt mobi.tt museum.tt name.tt net.tt nic.tt org.tt pro.tt se.tt travel.tt uk.tt us.tt -util_rb_2tld co.tv gov.tv -util_rb_2tld club.tw com.tw ebiz.tw edu.tw game.tw gov.tw idv.tw mil.tw net.tw org.tw -util_rb_2tld ac.tz co.tz go.tz ne.tz or.tz -util_rb_2tld cherkassy.ua chernigov.ua chernovtsy.ua ck.ua cn.ua co.ua com.ua crimea.ua cv.ua dn.ua dnepropetrovsk.ua donetsk.ua dp.ua edu.ua gov.ua if.ua in.ua ivano-frankivsk.ua kh.ua kharkov.ua kherson.ua khmelnitskiy.ua kiev.ua kirovograd.ua km.ua kr.ua ks.ua kv.ua lg.ua lugansk.ua lutsk.ua lviv.ua mk.ua net.ua nikolaev.ua od.ua odessa.ua org.ua pl.ua poltava.ua rovno.ua rv.ua sebastopol.ua sumy.ua te.ua ternopil.ua uzhgorod.ua vinnica.ua vn.ua zaporizhzhe.ua zhitomir.ua zp.ua zt.ua -util_rb_2tld ac.ug co.ug go.ug ne.ug or.ug sc.ug -util_rb_2tld ac.uk bl.uk british-library.uk co.uk edu.uk gov.uk icnet.uk jet.uk ltd.uk me.uk mod.uk national-library-scotland.uk net.uk nhs.uk nic.uk nls.uk org.uk parliament.uk plc.uk police.uk sch.uk -util_rb_2tld ak.us al.us ar.us az.us ca.us co.us ct.us dc.us de.us dni.us fed.us fl.us ga.us hi.us ia.us id.us il.us in.us isa.us kids.us ks.us ky.us la.us ma.us md.us me.us mi.us mn.us mo.us ms.us mt.us nc.us nd.us ne.us nh.us nj.us nm.us nsn.us nv.us ny.us oh.us ok.us or.us pa.us ri.us sc.us sd.us tn.us tx.us ut.us va.us vt.us wa.us wi.us wv.us wy.us -util_rb_2tld com.uy edu.uy gub.uy mil.uy net.uy org.uy -util_rb_2tld vatican.va -util_rb_2tld arts.ve bib.ve co.ve com.ve edu.ve firm.ve gov.ve info.ve int.ve mil.ve net.ve nom.ve org.ve rec.ve store.ve tec.ve web.ve -util_rb_2tld co.vi com.vi edu.vi gov.vi net.vi org.vi -util_rb_2tld ac.vn biz.vn com.vn edu.vn gov.vn health.vn info.vn int.vn name.vn net.vn org.vn pro.vn -util_rb_2tld ch.vu com.vu de.vu edu.vu fr.vu net.vu org.vu -util_rb_2tld com.ws edu.ws gov.ws net.ws org.ws -util_rb_2tld com.ye edu.ye gov.ye mil.ye net.ye org.ye -util_rb_2tld ac.za alt.za bourse.za city.za co.za edu.za gov.za law.za mil.za net.za ngo.za nom.za org.za school.za tm.za web.za -util_rb_2tld ac.zm co.zm com.zm edu.zm gov.zm org.zm sch.zm -util_rb_2tld ac.zw co.zw gov.zw org.zw -# -util_rb_2tld 110mb.com -util_rb_2tld 9k.com -util_rb_2tld addr.com -util_rb_2tld altervista.org -util_rb_2tld biz.tm -util_rb_2tld blogger.ca -util_rb_2tld blogger.cf -util_rb_2tld blogger.ch -util_rb_2tld blogspot.com -util_rb_2tld blogger.cv -util_rb_2tld blogger.jp -util_rb_2tld blogger.pl -util_rb_2tld blogger.re -util_rb_2tld blogger.se -util_rb_2tld blogspot.ca -util_rb_2tld blogspot.cv -util_rb_2tld blogspot.de -util_rb_2tld blogspot.fr -util_rb_2tld blogspot.in -util_rb_2tld blogspot.it -util_rb_2tld blogspot.jp -util_rb_2tld blogspot.mx -util_rb_2tld blogspot.pt -util_rb_2tld blogspot.re -util_rb_2tld blogspot.se -util_rb_2tld bravehost.com -util_rb_2tld bravejournal.com -util_rb_2tld by.ru -util_rb_2tld chat.ru -util_rb_2tld cjb.net -util_rb_2tld es.tl -util_rb_2tld extra.hu -util_rb_2tld freehostia.com -util_rb_2tld front.ru -util_rb_2tld geocities.com -util_rb_2tld getmyip.com -util_rb_2tld googlepages.com -util_rb_2tld helloweb.eu -util_rb_2tld host.sk -util_rb_2tld hotbox.ru -util_rb_2tld hotmail.ru -util_rb_2tld hu2.ru -util_rb_2tld hut2.ru -util_rb_2tld iblogger.org -util_rb_2tld ic.cz -util_rb_2tld id.ru -util_rb_2tld kwik.to -util_rb_2tld land.ru -util_rb_2tld mine.nu -util_rb_2tld mooo.com -util_rb_2tld narod.ru -util_rb_2tld netsolhost.com -util_rb_2tld na.by -util_rb_2tld newmail.ru -util_rb_2tld nextmail.ru -util_rb_2tld nightmail.ru -util_rb_2tld nm.ru -util_rb_2tld notlong.com -util_rb_2tld page.tl -util_rb_2tld pochta.ru -util_rb_2tld pochtamt.ru -util_rb_2tld pop3.ru -util_rb_2tld proboards.com -util_rb_2tld rbcmail.ru -util_rb_2tld rm.ru -util_rb_2tld smtp.ru -util_rb_2tld sol.ru -util_rb_2tld t35.com -util_rb_2tld tripod.com -util_rb_2tld uk.to -util_rb_2tld unblog.fr -util_rb_2tld us.to -util_rb_2tld web-soft.ru -util_rb_2tld wz.cz -util_rb_2tld zmail.ru -util_rb_2tld t35.net -util_rb_2tld t35.com -util_rb_2tld wordpress.com -util_rb_2tld jino-net.ru -util_rb_2tld 6a.org -util_rb_2tld xf.cz -util_rb_2tld fr.tc -util_rb_2tld googlegroups.com -util_rb_2tld 150m.com -util_rb_2tld bravepages.com -util_rb_2tld ucoz.ru -util_rb_2tld ucoz.com -util_rb_2tld ucoz.net -util_rb_2tld szm.com -util_rb_2tld geocities.jp -util_rb_2tld gmxhome.de -util_rb_2tld freeservercity.com -util_rb_2tld iquebec.com -util_rb_2tld mail2k.ru -util_rb_2tld mail.ru -util_rb_2tld ath.cx -util_rb_2tld go.ro -util_rb_2tld z8.ru -util_rb_2tld appspot.com -util_rb_2tld gigazu.net -util_rb_2tld weebly.com -util_rb_2tld ifrance.com -util_rb_2tld jimdo.com -util_rb_2tld kimsufi.com -util_rb_2tld mail333.su -util_rb_2tld pisem.su -util_rb_2tld mail15.su -util_rb_2tld prserv.net -util_rb_2tld angelfire.com -util_rb_2tld 163.to -util_rb_2tld home.pl -util_rb_2tld redirectme.net -util_rb_2tld interia.pl -util_rb_2tld co.kg -util_rb_2tld ning.com -util_rb_2tld xorg.pl -util_rb_2tld free.fr -util_rb_2tld we.bs -util_rb_2tld net.tc -util_rb_2tld isuisse.com -util_rb_2tld de.ki -util_rb_2tld funpic.de -util_rb_2tld interii.pl -util_rb_2tld selfip.com -#util_rb_2tld livejournal.com - Removed per bug 6662 4/7/15 - KAM -util_rb_2tld t3.to -util_rb_2tld fx.to -util_rb_2tld iespana.es -util_rb_2tld go.com -util_rb_2tld hostevo.com -util_rb_2tld iwebsource.com -util_rb_2tld one.pl -util_rb_2tld gratishost.com -util_rb_2tld netfirms.com -util_rb_2tld ibelgique.com -util_rb_2tld to.it -util_rb_2tld whsites.net -util_rb_2tld home.ro -util_rb_2tld 1blu.de -util_rb_2tld co.cc -util_rb_2tld cc.cc -util_rb_2tld webs.com -util_rb_2tld webcindario.com -util_rb_2tld idoo.com -util_rb_2tld selfip.net -util_rb_2tld ovh.net -util_rb_2tld sapo.pt -util_rb_2tld homeip.net -util_rb_2tld unlugar.com -util_rb_2tld nov.ru -util_rb_2tld republika.pl -util_rb_2tld blog.com -util_rb_2tld sosblog.com -util_rb_2tld servebbs.com -util_rb_2tld serveftp.com -util_rb_2tld gob.ve -util_rb_2tld xanga.com -util_rb_2tld com.vc -util_rb_2tld net.vc -util_rb_2tld org.vc -util_rb_2tld kickme.to -util_rb_2tld asso.ws -util_rb_2tld url.st -util_rb_2tld at.pn -util_rb_2tld au.pn -util_rb_2tld ca.pn -util_rb_2tld ch.pn -util_rb_2tld cn.pn -util_rb_2tld co.pn -util_rb_2tld corp.st -util_rb_2tld societe.st -util_rb_2tld de.pn -util_rb_2tld es.pn -util_rb_2tld eu.pn -util_rb_2tld euro.tm -util_rb_2tld fr.pn -util_rb_2tld gov.pn -util_rb_2tld government.pn -util_rb_2tld it.pn -util_rb_2tld jp.pn -util_rb_2tld perso.tc -util_rb_2tld site.tc -util_rb_2tld societe.st -util_rb_2tld url.st -util_rb_2tld blog.ru -util_rb_2tld eu.tc -util_rb_2tld us.tc -util_rb_2tld pro.tc -util_rb_2tld de.tc -util_rb_2tld at.tc -util_rb_2tld it.tc -util_rb_2tld es.tc -util_rb_2tld ru.tc -util_rb_2tld se.tc -util_rb_2tld dk.tc -util_rb_2tld be.tc -util_rb_2tld no.tc -util_rb_2tld int.tc -util_rb_2tld pl.tc -util_rb_2tld bg.tc -util_rb_2tld cz.tc -util_rb_2tld mx.tc -util_rb_2tld br.tc -util_rb_2tld hk.tc -util_rb_2tld kr.tc -util_rb_2tld th.tc -util_rb_2tld ph.tc -util_rb_2tld at.lv -util_rb_2tld de.lv -util_rb_2tld ch.lv -util_rb_2tld org.rw -util_rb_2tld myvnc.com -util_rb_2tld blog4ever.com -util_rb_2tld sytes.net -util_rb_2tld multiply.com -util_rb_2tld 80.hk -util_rb_2tld shutterfly.com -util_rb_2tld chez.com -util_rb_2tld ce.ms -util_rb_2tld zapto.org -util_rb_2tld cz.cc -util_rb_2tld fromru.su -util_rb_2tld krovatka.su -util_rb_2tld pochta.com -util_rb_2tld 5ballov.ru -util_rb_2tld usa.cc -util_rb_2tld jpn.com -util_rb_2tld yolasite.com -util_rb_2tld in.net -util_rb_2tld com.de -util_rb_2tld biz.ua -util_rb_2tld azurewebsites.net -util_rb_2tld azureedge.net -util_rb_2tld zohosites.com -util_rb_2tld wixsite.com -# -util_rb_2tld neostrada.pl -util_rb_2tld vv.cc -util_rb_2tld co.be -util_rb_2tld uni.cc -util_rb_2tld shop.co -util_rb_2tld tumblr.com -util_rb_2tld fileave.com -util_rb_2tld de.tl -util_rb_2tld co.com -# Dyndns.com -util_rb_2tld dyndns-at-home.com -util_rb_2tld dyndns-at-work.com -util_rb_2tld dyndns-blog.com -util_rb_2tld dyndns-free.com -util_rb_2tld dyndns-home.com -util_rb_2tld dyndns-ip.com -util_rb_2tld dyndns-mail.com -util_rb_2tld dyndns-office.com -util_rb_2tld dyndns-pics.com -util_rb_2tld dyndns-remote.com -util_rb_2tld dyndns-server.com -util_rb_2tld dyndns-web.com -util_rb_2tld dyndns-wiki.com -util_rb_2tld dyndns-work.com -util_rb_2tld dyndns.biz -util_rb_2tld dyndns.info -util_rb_2tld dyndns.org -util_rb_2tld dyndns.tv -util_rb_2tld dyndns.dk -util_rb_2tld dyndns.ws -util_rb_2tld mydyndns.org -util_rb_2tld qip.ru -# -util_rb_2tld no-ip.biz -util_rb_2tld no-ip.ca -util_rb_2tld no-ip.com -util_rb_2tld no-ip.info -util_rb_2tld no-ip.net -util_rb_2tld no-ip.org -# -util_rb_2tld gotdns.ch -util_rb_2tld ddnsking.com -util_rb_2tld ddns.net -util_rb_2tld bounceme.net -util_rb_2tld hopto.org -util_rb_2tld serveblog.net -util_rb_2tld myftp.org -util_rb_2tld myftp.biz - - -# -# 3rd level TLD list (SA 3.3+) -# -# There was a bug before 3.4.1(?), only one 3TLD per line works! -# - -if (version >= 3.003000) - -util_rb_3tld demon.co.uk -util_rb_3tld esc.edu.ar -util_rb_3tld lkd.co.im -util_rb_3tld plc.co.im -util_rb_3tld ltd.co.im -# -util_rb_3tld bay.livefilestore.com -util_rb_3tld blu.livefilestore.com -util_rb_3tld groups.live.com -util_rb_3tld spaces.live.com -util_rb_3tld profile.live.com -util_rb_3tld web.aplus.net -util_rb_3tld cloud.prohosting.com -util_rb_3tld skydrive.live.com -util_rb_3tld docs.google.com -util_rb_3tld spaces.msn.com -util_rb_3tld blog.friendster.com -util_rb_3tld plc.co.im -util_rb_3tld ltd.co.im -util_rb_3tld sakura.ne.jp -util_rb_3tld web.officelive.com -util_rb_3tld com.sapo.pt -util_rb_3tld paginas.sapo.pt -util_rb_3tld no.sapo.pt -util_rb_3tld home.sapo.pt -util_rb_3tld do.sapo.pt -util_rb_3tld homepage.t-online.de -util_rb_3tld privat.t-online.de -util_rb_3tld web.fc2.com -util_rb_3tld co.uk.pn -util_rb_3tld com.au.pn -util_rb_3tld co.at.pn -util_rb_3tld co.at.lv -util_rb_3tld or.at.lv -util_rb_3tld co.at.tc -util_rb_3tld qld.edu.au -util_rb_3tld perso.neuf.fr -util_rb_3tld perso.sfr.fr -util_rb_3tld hop.clickbank.net -util_rb_3tld user.icpnet.pl -util_rb_3tld en.alibaba.com -# -util_rb_3tld blogspot.co.nz -util_rb_3tld blogspot.co.uk -util_rb_3tld blogspot.com.ar -util_rb_3tld blogspot.com.au -util_rb_3tld blogspot.com.br -util_rb_3tld blogspot.com.es -# -util_rb_3tld no-ip.co.uk -# -util_rb_3tld mobile.web.tr - -endif - - diff -Nru spamassassin-3.4.6/trunk-only/rules/20_body_tests.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_body_tests.cf --- spamassassin-3.4.6/trunk-only/rules/20_body_tests.cf 2014-09-18 01:52:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_body_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,165 +0,0 @@ -# SpamAssassin rules file: body tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# Note: body tests are run with long lines, so be sure to limit the -# size of searches; use /.{0,30}/ instead of /.*/ to avoid huge -# search times. -# -# Note: If you are adding a rule which looks for a phrase in the body -# (as most of them do), please add it to rules/20_phrases.cf instead. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -require_version @@VERSION@@ - -########################################################################### -# GTUBE test - the generic test for UBE. -body GTUBE /XJS\*C4JDBQADN1\.NSBN3\*2IDNEN\*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL\*C\.34X/ -describe GTUBE Generic Test for Unsolicited Bulk Email -tflags GTUBE userconf noautolearn - -########################################################################### - -# this seems to be the new fashion (as of Jul 5 2002). base64-encoded -# parts need to be stripped before this match -body TRACKER_ID /^[a-z0-9]{6,24}[-_a-z0-9]{12,36}[a-z0-9]{6,24}\s*\z/is -describe TRACKER_ID Incorporates a tracking ID number - -body WEIRD_QUOTING /[\042\223\224\262\263\271]{2}\S{0,16}[\042\223\224\262\263\271]{2}/ -describe WEIRD_QUOTING Weird repeated double-quotation marks - -########################################################################### -# multipart/alternative has very good accuracy, other multipart types are -# similar to MIME_HTML_ONLY so they don't need a separate rule -header __CTYPE_MULTIPART_ALT Content-Type =~ /multipart\/alternative/i -meta MIME_HTML_ONLY_MULTI (__CTYPE_MULTIPART_ALT && MIME_HTML_ONLY) -describe MIME_HTML_ONLY_MULTI Multipart message only has text/html MIME parts - -# note: __HIGHBITS is used in rules/20_html_tests.cf, HTML_CHARSET_FARAWAY -meta MIME_CHARSET_FARAWAY (__MIME_CHARSET_FARAWAY && __HIGHBITS) -describe MIME_CHARSET_FARAWAY MIME character set indicates foreign language -tflags MIME_CHARSET_FARAWAY userconf - -########################################################################### - -# duncf -body EMAIL_ROT13 /\b[a-z(\]-]+\^[a-z-]+\([a-z]{2,3}\b/ -describe EMAIL_ROT13 Body contains a ROT13-encoded email address -test EMAIL_ROT13 ok qhabs^ebtref(pbz -test EMAIL_ROT13 ok zxrggyre^riv-vap(pbz -test EMAIL_ROT13 fail duncf-nospam@rogers.com - -# this could use more work -body __LONGWORDS_A /\b(?:[a-z]{8,}[\s\.]+){6}/ -body __LONGWORDS_B /\b(?:[a-z]{6,}[\s\.]+){9}/ -body __LONGWORDS_C /\b(?:[a-z]{5,}[\s\.]+){10}/ -meta LONGWORDS (__LONGWORDS_A + __LONGWORDS_B + __LONGWORDS_C > 1) -describe LONGWORDS Long string of long words - - -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::BodyEval - - -# This rule uses a simple algorithm to determine if the text and html -# parts of an multipart/alternative message are different. -body MPART_ALT_DIFF eval:multipart_alternative_difference('99', '100') -describe MPART_ALT_DIFF HTML and text parts are different - -body MPART_ALT_DIFF_COUNT eval:multipart_alternative_difference_count('3', '1') -describe MPART_ALT_DIFF_COUNT HTML and text parts are different - -body BLANK_LINES_80_90 eval:check_blank_line_ratio('80','90','4') -describe BLANK_LINES_80_90 Message body has 80-90% blank lines - -# it's the ratio of spaces to non-spaces in each paragraph. apparently -# messages where generally there are lots of spaces mean the message is spam. -# 8.532 10.6051 0.1897 0.982 0.75 0.01 T_VERTICAL_WORDS_TVD_1 -# bug 6149: avoid common .jp false positives -header __SUBJECT_UTF8_B_ENCODED Subject:raw =~ /=\?UTF-?8\?B\?/i -body __TVD_SPACE_RATIO eval:tvd_vertical_words('0','10') -meta TVD_SPACE_RATIO (__TVD_SPACE_RATIO && !__ISO_2022_JP_DELIM && !__SUBJECT_UTF8_B_ENCODED && !__HIGHBITS) - -endif - -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::MIMEEval - -# 0.767 0.9097 0.0000 1.000 0.84 1.00 MULTIPART_ALT_NON_TEXT -body MULTIPART_ALT_NON_TEXT eval:check_ma_non_text() - -body CHARSET_FARAWAY eval:check_for_faraway_charset() -describe CHARSET_FARAWAY Character set indicates a foreign language -tflags CHARSET_FARAWAY userconf - -# these tests doesn't actually use rawbody since rawbody isn't raw enough; -# they must be written very carefully to avoid modifying the original content - -# MIME Content-Transfer-Encoding control rules -rawbody __MIME_BASE64 eval:check_for_mime('mime_base64_count') -describe __MIME_BASE64 Includes a base64 attachment - -rawbody __MIME_QP eval:check_for_mime('mime_qp_count') -describe __MIME_QP Includes a quoted-printable attachment - -rawbody MIME_BASE64_BLANKS eval:check_for_mime('mime_base64_blanks') -describe MIME_BASE64_BLANKS Extra blank lines in base64 encoding - - -rawbody MIME_BASE64_TEXT eval:check_for_mime('mime_base64_encoded_text') -describe MIME_BASE64_TEXT Message text disguised using base64 encoding - - -body MISSING_MIME_HB_SEP eval:check_msg_parse_flags('missing_mime_head_body_separator') -describe MISSING_MIME_HB_SEP Missing blank line between MIME header and body - -body MIME_HTML_MOSTLY eval:check_mime_multipart_ratio('0.00','0.01') -describe MIME_HTML_MOSTLY Multipart message mostly text/html MIME - -# Steve Linford via Charlie Watts: good test! -body MIME_HTML_ONLY eval:check_for_mime_html_only() -describe MIME_HTML_ONLY Message only has text/html MIME parts - -rawbody MIME_QP_LONG_LINE eval:check_for_mime('mime_qp_long_line') -describe MIME_QP_LONG_LINE Quoted-printable line longer than 76 chars - -rawbody __MIME_CHARSET_FARAWAY eval:check_for_mime('mime_faraway_charset') - -body MIME_BAD_ISO_CHARSET eval:check_for_mime('mime_bad_iso_charset') -describe MIME_BAD_ISO_CHARSET MIME character set is an unknown ISO charset - -endif - -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::URIEval - -body HTTPS_IP_MISMATCH eval:check_https_ip_mismatch() -describe HTTPS_IP_MISMATCH IP to HTTPS link found in HTML - -body URI_TRUNCATED eval:check_uri_truncated() -describe URI_TRUNCATED Message contained a URI which was truncated - -endif diff -Nru spamassassin-3.4.6/trunk-only/rules/20_compensate.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_compensate.cf --- spamassassin-3.4.6/trunk-only/rules/20_compensate.cf 2006-10-20 15:07:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_compensate.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -# SpamAssassin rules file: compensation for common false positives -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### -# Header compensation tests - -require_version @@VERSION@@ - -header __HAS_RCVD exists:Received -meta NO_RECEIVED (!__HAS_RCVD) -tflags NO_RECEIVED nice userconf -describe NO_RECEIVED Informational: message has no Received headers - -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::RelayEval - -# The message was never sent via an untrustworthy host. -header ALL_TRUSTED eval:check_all_trusted() -describe ALL_TRUSTED Passed through trusted hosts only via SMTP -tflags ALL_TRUSTED nice userconf - -header NO_RELAYS eval:check_no_relays() -tflags NO_RELAYS nice userconf -describe NO_RELAYS Informational: message was not relayed via SMTP - -endif diff -Nru spamassassin-3.4.6/trunk-only/rules/20_dnsbl_tests.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_dnsbl_tests.cf --- spamassassin-3.4.6/trunk-only/rules/20_dnsbl_tests.cf 2015-01-08 11:49:29.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_dnsbl_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,219 +0,0 @@ -# SpamAssassin rules file: DNS blacklist and whitelist tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -require_version @@VERSION@@ - -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::DNSEval - -# See the Mail::SpamAssassin::Conf manual page for details of how to use -# check_rbl(). - -# --------------------------------------------------------------------------- -# Multizone / Multi meaning BLs first. -# -# Note that currently TXT queries cannot be used for these, since the -# DNSBLs do not return the A type (127.0.0.x) as part of the TXT reply. - - -# --------------------------------------------------------------------------- -# SORBS -# transfers: both axfr and ixfr available -# URL: http://www.dnsbl.sorbs.net/ -# pay-to-use: no -# delist: $50 fee for RCVD_IN_SORBS_SPAM, others have free retest on request - -header __RCVD_IN_SORBS eval:check_rbl('sorbs', 'dnsbl.sorbs.net.') -describe __RCVD_IN_SORBS SORBS: sender is listed in SORBS -tflags __RCVD_IN_SORBS net -reuse __RCVD_IN_SORBS - -header RCVD_IN_SORBS_HTTP eval:check_rbl_sub('sorbs', '127.0.0.2') -describe RCVD_IN_SORBS_HTTP SORBS: sender is open HTTP proxy server -tflags RCVD_IN_SORBS_HTTP net -reuse RCVD_IN_SORBS_HTTP - -header RCVD_IN_SORBS_SOCKS eval:check_rbl_sub('sorbs', '127.0.0.3') -describe RCVD_IN_SORBS_SOCKS SORBS: sender is open SOCKS proxy server -tflags RCVD_IN_SORBS_SOCKS net -reuse RCVD_IN_SORBS_SOCKS - -header RCVD_IN_SORBS_MISC eval:check_rbl_sub('sorbs', '127.0.0.4') -describe RCVD_IN_SORBS_MISC SORBS: sender is open proxy server -tflags RCVD_IN_SORBS_MISC net -reuse RCVD_IN_SORBS_MISC - -header RCVD_IN_SORBS_SMTP eval:check_rbl_sub('sorbs', '127.0.0.5') -describe RCVD_IN_SORBS_SMTP SORBS: sender is open SMTP relay -tflags RCVD_IN_SORBS_SMTP net -reuse RCVD_IN_SORBS_SMTP - -# delist: $50 fee -#header RCVD_IN_SORBS_SPAM eval:check_rbl_sub('sorbs', '127.0.0.6') -#describe RCVD_IN_SORBS_SPAM SORBS: sender is a spam source -#tflags RCVD_IN_SORBS_SPAM net -#reuse RCVD_IN_SORBS_SPAM RCVD_IN_SORBS_SPAM - -header RCVD_IN_SORBS_WEB eval:check_rbl_sub('sorbs', '127.0.0.7') -describe RCVD_IN_SORBS_WEB SORBS: sender is an abusable web server -tflags RCVD_IN_SORBS_WEB net -reuse RCVD_IN_SORBS_WEB - -header RCVD_IN_SORBS_BLOCK eval:check_rbl_sub('sorbs', '127.0.0.8') -describe RCVD_IN_SORBS_BLOCK SORBS: sender demands to never be tested -tflags RCVD_IN_SORBS_BLOCK net -reuse RCVD_IN_SORBS_BLOCK - -header RCVD_IN_SORBS_ZOMBIE eval:check_rbl_sub('sorbs', '127.0.0.9') -describe RCVD_IN_SORBS_ZOMBIE SORBS: sender is on a hijacked network -tflags RCVD_IN_SORBS_ZOMBIE net -reuse RCVD_IN_SORBS_ZOMBIE - -header RCVD_IN_SORBS_DUL eval:check_rbl('sorbs-lastexternal', 'dnsbl.sorbs.net.', '127.0.0.10') -describe RCVD_IN_SORBS_DUL SORBS: sent directly from dynamic IP address -tflags RCVD_IN_SORBS_DUL net -reuse RCVD_IN_SORBS_DUL - -# --------------------------------------------------------------------------- -# Spamhaus ZEN includes SBL+CSS+XBL+PBL -# http://www.spamhaus.org/faq/section/DNSBL%20Usage#200 -# -# Spamhaus XBL contains the Abuseat CBL data (cbl.abuseat.org) - -header __RCVD_IN_ZEN eval:check_rbl('zen', 'zen.spamhaus.org.') -describe __RCVD_IN_ZEN Received via a relay in Spamhaus Zen -tflags __RCVD_IN_ZEN net -reuse __RCVD_IN_ZEN - -# SBL is the Spamhaus Block List: http://www.spamhaus.org/sbl/ -header RCVD_IN_SBL eval:check_rbl_sub('zen', '127.0.0.2') -describe RCVD_IN_SBL Received via a relay in Spamhaus SBL -tflags RCVD_IN_SBL net -reuse RCVD_IN_SBL - -# XBL is the Exploits Block List: http://www.spamhaus.org/xbl/ -header RCVD_IN_XBL eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '^127\.0\.0\.[45678]$') -describe RCVD_IN_XBL Received via a relay in Spamhaus XBL -tflags RCVD_IN_XBL net -reuse RCVD_IN_XBL - -# PBL is the Policy Block List: http://www.spamhaus.org/pbl/ -header RCVD_IN_PBL eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '^127\.0\.0\.1[01]$') -describe RCVD_IN_PBL Received via a relay in Spamhaus PBL -tflags RCVD_IN_PBL net -reuse RCVD_IN_PBL - -# CSS is the Spamhaus CSS Component of the SBL List: http://www.spamhaus.org/css/ -header RCVD_IN_SBL_CSS eval:check_rbl_sub('zen', '127.0.0.3') -describe RCVD_IN_SBL_CSS Received via a relay in Spamhaus SBL-CSS -tflags RCVD_IN_SBL_CSS net -reuse RCVD_IN_SBL_CSS - -# Now, single zone BLs follow: - -# --------------------------------------------------------------------------- -# NOTE: donation tests, see README file for details - -header RCVD_IN_BL_SPAMCOP_NET eval:check_rbl_txt('spamcop', 'bl.spamcop.net.', '(?i:spamcop)') -describe RCVD_IN_BL_SPAMCOP_NET Received via a relay in bl.spamcop.net -tflags RCVD_IN_BL_SPAMCOP_NET net -reuse RCVD_IN_BL_SPAMCOP_NET - -# --------------------------------------------------------------------------- -# NOTE: commercial tests, see README file for details - -header RCVD_IN_MAPS_RBL eval:check_rbl('rblplus', 'activationcode.r.mail-abuse.com.', '1') -describe RCVD_IN_MAPS_RBL Relay in RBL, http://www.mail-abuse.com/enduserinfo_rbl.html -tflags RCVD_IN_MAPS_RBL net - -header RCVD_IN_MAPS_DUL eval:check_rbl('rblplus-lastexternal', 'activationcode.r.mail-abuse.com.', '2') -describe RCVD_IN_MAPS_DUL Relay in DUL, http://www.mail-abuse.com/enduserinfo_dul.html -tflags RCVD_IN_MAPS_DUL net - -header RCVD_IN_MAPS_RSS eval:check_rbl_sub('rblplus', '4') -describe RCVD_IN_MAPS_RSS Relay in RSS, http://www.mail-abuse.com/enduserinfo_rss.html -tflags RCVD_IN_MAPS_RSS net - -header RCVD_IN_MAPS_OPS eval:check_rbl_sub('rblplus', '8') -describe RCVD_IN_MAPS_OPS Relay in OPS, http://www.mail-abuse.com/enduserinfo_ops.html -tflags RCVD_IN_MAPS_OPS net - -# The NML isn't part of the RBL+ and I find any documentation for it - is it dead? -header RCVD_IN_MAPS_NML eval:check_rbl('nml', 'nonconfirm.mail-abuse.com.') -describe RCVD_IN_MAPS_NML Relay in NML, http://www.mail-abuse.com/enduserinfo_nml.html -tflags RCVD_IN_MAPS_NML net - -# --------------------------------------------------------------------------- -# Section for DNS WL related lookups below. - -# IADB support ... -header __RCVD_IN_IADB eval:check_rbl('iadb-firsttrusted', 'iadb.isipp.com.') -tflags __RCVD_IN_IADB net nice - -header RCVD_IN_IADB_VOUCHED eval:check_rbl_sub('iadb-firsttrusted', '127.0.1.255') -describe RCVD_IN_IADB_VOUCHED ISIPP IADB lists as vouched-for sender -tflags RCVD_IN_IADB_VOUCHED net nice - -# --------------------------------------------------------------------------- -# Return Path Certified: -# http://www.returnpath.net/internetserviceprovider/certification/ -# (replaces RCVD_IN_BSP_TRUSTED, RCVD_IN_BSP_OTHER, RCVD_IN_SSC_TRUSTED_COI) -header RCVD_IN_RP_CERTIFIED eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.') -describe RCVD_IN_RP_CERTIFIED Sender in ReturnPath Certified - Contact cert-sa@returnpath.net -tflags RCVD_IN_RP_CERTIFIED net nice - -# Return Path Safe: -# http://www.returnpath.net/internetserviceprovider/certification/ -# (replaces HABEAS_ACCREDITED_COI, HABEAS_ACCREDITED_SOI, HABEAS_CHECKED) -header RCVD_IN_RP_SAFE eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.') -describe RCVD_IN_RP_SAFE Sender in ReturnPath Safe - Contact safe-sa@returnpath.net -tflags RCVD_IN_RP_SAFE net nice - -# Return Path Reputation Network Blacklist (RNBL): -# https://senderscore.org/blacklistlookup/ -header RCVD_IN_RP_RNBL eval:check_rbl('rnbl-lastexternal','bl.score.senderscore.com.') -describe RCVD_IN_RP_RNBL Relay in RNBL, https://senderscore.org/blacklistlookup/ -tflags RCVD_IN_RP_RNBL net - - -endif - - -ifplugin Mail::SpamAssassin::Plugin::AskDNS - -askdns DKIMDOMAIN_IN_DWL _DKIMDOMAIN_._vouch.dwl.spamhaus.org TXT /^([a-z]+ )*(transaction|list|all)( [a-z]+)*$/ -tflags DKIMDOMAIN_IN_DWL net nice -describe DKIMDOMAIN_IN_DWL Signing domain listed in Spamhaus DWL - -askdns __DKIMDOMAIN_IN_DWL_ANY _DKIMDOMAIN_._vouch.dwl.spamhaus.org TXT -tflags __DKIMDOMAIN_IN_DWL_ANY net nice -describe __DKIMDOMAIN_IN_DWL_ANY Any TXT response received from a Spamhaus DWL - -meta DKIMDOMAIN_IN_DWL_UNKNOWN __DKIMDOMAIN_IN_DWL_ANY && !DKIMDOMAIN_IN_DWL -tflags DKIMDOMAIN_IN_DWL_UNKNOWN net nice -describe DKIMDOMAIN_IN_DWL_UNKNOWN Unrecognized response from Spamhaus DWL - -endif diff -Nru spamassassin-3.4.6/trunk-only/rules/20_drugs.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_drugs.cf --- spamassassin-3.4.6/trunk-only/rules/20_drugs.cf 2011-07-25 22:29:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_drugs.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,269 +0,0 @@ -# SpamAssassin rules file: drug tests -# -# This ruleset is intended to detect common "pill spam" however, it is not -# appropriate for all environments. It may not be appropriate for a medical or -# pharmaceutical environment. If in doubt, adjust the scores of all the rules -# to 0.01 and see if they fire off on your daily nonspam. -# -# Please don't modify this file as your changes will be overwritten with the -# next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. See 'perldoc -# Mail::SpamAssassin::Conf' for details. -# -# Note: body tests are run with long lines, so be sure to limit the size of -# searches; use /.{0,30}/ instead of /.*/ to avoid huge search times. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -require_version @@VERSION@@ - -########################################################################### -# header rules -# (only use sufficiently long drug name to make name unique) - -header SUBJECT_DRUG_GAP_C Subject =~ /\bc.{0,2}i.{0,2}a.{0,2}l.{0,2}i.{0,2}s\b/i -describe SUBJECT_DRUG_GAP_C Subject contains a gappy version of 'cialis' - -header SUBJECT_DRUG_GAP_L Subject =~ /l.{0,2}e.{0,2}v.{0,2}i.{0,2}t.{0,2}r.{0,2}a/i -describe SUBJECT_DRUG_GAP_L Subject contains a gappy version of 'levitra' - - -header SUBJECT_DRUG_GAP_S Subject =~ /\bs.{0,1}o.{0,1}m.{0,1}a\b/i -describe SUBJECT_DRUG_GAP_S Subject contains a gappy version of 'soma' - -header SUBJECT_DRUG_GAP_VA Subject =~ /v.{0,2}a.{0,2}l.{0,2}i.{0,2}u.{0,2}m/i -describe SUBJECT_DRUG_GAP_VA Subject contains a gappy version of 'valium' - - -header SUBJECT_DRUG_GAP_X Subject =~ /x.{0,2}a.{0,2}n.{0,2}a.{0,2}x/i -describe SUBJECT_DRUG_GAP_X Subject contains a gappy version of 'xanax' - -########################################################################### -# body rules - -body DRUG_DOSAGE m{[\d\.]+ *\$? *(?:[\\/]|per) *d.?o.?s.?e}i -describe DRUG_DOSAGE Talks about price per dose - -# jm: keep this case-sensitive, otherwise it FP's -body DRUG_ED_CAPS /\b(?:CIALIS|LEVITRA|VIAGRA)/ -describe DRUG_ED_CAPS Mentions an E.D. drug - - -body DRUG_ED_SILD /\bsildenafil\b/i -describe DRUG_ED_SILD Talks about an E.D. drug using its chemical name - -body DRUG_ED_GENERIC /\bGeneric Viagra\b/ -describe DRUG_ED_GENERIC Mentions Generic Viagra - -body DRUG_ED_ONLINE /\bviagra .{0,25}(?:express|online|overnight)/i -describe DRUG_ED_ONLINE Fast Viagra Delivery - -body ONLINE_PHARMACY /\bonline pharmacy|\b(?:drugs|medications) online/i -describe ONLINE_PHARMACY Online Pharmacy - -# Updated bug 6448 -body NO_PRESCRIPTION /N[o0].{1,10}P(?:er|re)scr[i1]pt[i1][o0]n.{1,10}(?:n[e3][e3]d[e3]d|requ[1i]re|n[e3]c[e3]ssary)/i -describe NO_PRESCRIPTION No prescription needed - -# too easy -body VIA_GAP_GRA /\bvia.gra\b/i -describe VIA_GAP_GRA Attempts to disguise the word 'viagra' - -######################################################################## -# male sexual dysfunction drugs -# -# This section is undergoing improvements and I'm trying to track down a -# FP case that seems to mostly affect technical emails. -# However, all of the test cases so far fail to match when retested. -# note: The regex /v.i.a.g.r.a/ was intentionally not used -# due to potential false positive cases with PGP signatures -# and other base-64ish stuff. -# instead other patterns are used catch non alphanumeric gapping patterns -# note: \W = "non word character" - -# Note: many of the drugs named in here are brand-names and are trademarked. -# All trademarks are property of the respective owners. -#current best char substitutions -# i - [i1!|l\xEC-\xEF] -# a - [a4\xE0-\xE6@] -# e - [e3\xE8-\xEB] -# o - [o0\xF2-\xF6] -# u - [u\xB5\xF9-\xFC] - -# v - (?:\\\/|V) -# l - [l!|1] -#plain Viagra and Cialis (used in obfu detection) -body __DRUGS_ERECTILE_V /\bViagra\b/i -body __DRUGS_ERECTILE_C /\bCialis\b/i -body __DRUGS_ERECTILE_L /\bLevitra\b/i -# obfu/plain and mis-spelled Viagra variants -body __DRUGS_ERECTILE1 /(?:\b|\s)[_\W]{0,3}(?:\\\/|V)[_\W]{0,3}[ij1!|l\xEC\xED\xEE\xEF][_\W]{0,3}[a40\xE0-\xE6@][_\W]{0,3}[xyz]?[gj][_\W]{0,3}r[_\W]{0,3}[a40\xE0-\xE6@][_\W]{0,3}x?[_\W]{0,3}(?:\b|\s)/i -body __DRUGS_ERECTILE2 /\bV(?:agira|igara|iaggra|iaegra)\b/i -# cialis variants (spelling correct now) -# note: the rather strange pre-amble is to avoid FPs on french words containing high-ascii chars surrounding -# "cialis". -body __DRUGS_ERECTILE3 /(?:\A|[\s\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])[_\W]{0,3}C[_\W]{0,3}[ij1!|l\xEC\xED\xEE\xEF][_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}l?[l!|1][_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}s[_\W]{0,3}(?:\b|\s)/i -body __DRUGS_ERECTILE4 /\bC(?:alis|ilias|ilais)\b/i -# generic names -#sildenafil citrate -body __DRUGS_ERECTILE5 /\b_{0,3}s[_\W]?[i1!|l\xEC-\xEF][_\W]?l[_\W]?d[_\W]?[e3\xE8-\xEB][_\W]?n[_\W]?[a4\xE0-\xE6@][_\W]?f[_\W]?[i1!|l\xEC-\xEF][_\W]?l c[_\W]?[i1!|l\xEC-\xEF][_\W]?t[_\W]?r[_\W]?[a4\xE0-\xE6@][_\W]?t[_\W]?[e3\xE8-\xEB]_{0,3}(?:\b|\s)/i -#Levitra -body __DRUGS_ERECTILE6 /\b_{0,3}L[_\W]?[e3\xE8-\xEB][_\W]?(?:\\\/|V)[_\W]?[i1!|l\xEC-\xEF][_\W]?t[_\W]?r[_\W]?[a4\xE0-\xE6@][_\W]?(?:\b|\s)/i -#tadalafil -body __DRUGS_ERECTILE8 /\b_{0,3}T[_\W]?[a4\xE0-\xE6@][_\W]?d[_\W]?[a4\xE0-\xE6@][_\W]?l[_\W]?[a4\xE0-\xE6@][_\W]?f[_\W]?[i1!|l\xEC-\xEF][_\W]?l_{0,3}\b/i -# gapped/obfu viagra variants using funky html-style character codes -rawbody __DRUGS_ERECTILE10 /\b_{0,3}V[_\W]?(?:i|\ï\;)[_\W]?(?:a|\à|\å)\;?[_\W]?g[_\W]?r[_\W]?(?:a|\à|\å)\b/i -#apcalis - a generic of cialis -body __DRUGS_ERECTILE11 /(?:\b|\s)_{0,3}[a4\xE0-\xE6@][_\W]{0,3}p[_\W]{0,3}c[_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}[l!|1][_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}s_{0,3}\b/i -meta DRUGS_ERECTILE (__DRUGS_ERECTILE1 || __DRUGS_ERECTILE2 || __DRUGS_ERECTILE3 || __DRUGS_ERECTILE4 || __DRUGS_ERECTILE5 || __DRUGS_ERECTILE6 || __DRUGS_ERECTILE8 || __DRUGS_ERECTILE10 || __DRUGS_ERECTILE11 ) -describe DRUGS_ERECTILE Refers to an erectile drug -meta DRUGS_ERECTILE_OBFU ( (__DRUGS_ERECTILE1 &&!__DRUGS_ERECTILE_V) || (__DRUGS_ERECTILE3 && !__DRUGS_ERECTILE_C) ||__DRUGS_ERECTILE2 || (__DRUGS_ERECTILE10 &&!__DRUGS_ERECTILE_V) || (__DRUGS_ERECTILE6 &&!__DRUGS_ERECTILE_L)) -describe DRUGS_ERECTILE_OBFU Obfuscated reference to an erectile drug - - - -#diet -body __DRUGS_DIET_PHEN /\bphentermine\b/i -#phentermine -body __DRUGS_DIET1 /(?:\b|\s)[_\W]{0,3}p[_\W]{0,3}h[_\W]{0,3}[e3\xE8-\xEB][_\W]{0,3}n[_\W]{0,3}t[_\W]{0,3}[e3\xE8-\xEB][_\W]{0,3}r[_\W]{0,3}m[_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}n[_\W]{0,3}[e3\xE8-\xEB][_\W]{0,3}(?:\b|\s)/i -#ionamin -body __DRUGS_DIET2 /(?:\b|\s)_{0,3}[i1!|l\xEC-\xEF][_\W]?o[_\W]?n[_\W]?[a4\xE0-\xE6@][_\W]?m[_\W]?[i1!|l\xEC-\xEF][_\W]?n_{0,3}\b/i -#bontril -body __DRUGS_DIET3 /\bbontril\b/i -#phendimetrazine -body __DRUGS_DIET4 /\bphendimetrazine\b/i -#diethylpropion, generic of Tenuate, uncommon in spam -body __DRUGS_DIET5 /\bdiethylpropion\b/i -#Meridia -body __DRUGS_DIET6 /(?:\b|\s)[_\W]{0,3}M[_\W]{0,3}[e3\xE8-\xEB][_\W]{0,3}r[_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}d[_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}(?:\b|\s)/i -#tenuate -body __DRUGS_DIET7 /\b_{0,3}t[_\W]?[e3\xE8-\xEB][_\W]?n[_\W]?u[_\W]?a[_\W]?t[_\W]?[e3\xE8-\xEB]_{0,3}(?:\b|\s)/i -#didrex -body __DRUGS_DIET8 /\b_{0,3}d[_\W]?[i1!|l\xEC-\xEF][_\W]?d[_\W]?r[_\W][e3\xE8-\xEB[_\W]?xx?_{0,3}\b/i -#adipex -body __DRUGS_DIET9 /\b_{0,3}a[_\W]?d[_\W]?[i1!|l\xEC-\xEF][_\W]?p[_\W]?[e3\xE8-\xEB][_\W]?x_{0,3}\b/i -#xenical -body __DRUGS_DIET10 /\b_{0,3}x?x[_\W]?[e3\xE8-\xEB][_\W]?n[_\W]?[i1!|l\xEC-\xEF][_\W]?c[_\W]?[a4\xE0-\xE6@][_\W]?l_{0,3}\b/i -meta DRUGS_DIET (__DRUGS_DIET1 || __DRUGS_DIET2 || __DRUGS_DIET3 || __DRUGS_DIET4 ||__DRUGS_DIET5 ||__DRUGS_DIET6 ||__DRUGS_DIET7 ||__DRUGS_DIET8 || __DRUGS_DIET9 || __DRUGS_DIET10 ) -describe DRUGS_DIET Refers to a diet drug -meta DRUGS_DIET_OBFU (__DRUGS_DIET1 && !__DRUGS_DIET_PHEN) -describe DRUGS_DIET_OBFU Obfuscated reference to a diet drug - -# pain relief drugs -body __DRUGS_PAIN_VICO /vicodin/i -body __DRUGS_PAIN_VIOXX /vioxx/i -body __DRUGS_PAIN_FIO /fioricet/i -body __DRUGS_PAIN1 /\b_{0,3}h[_\W]?y[_\W]?d[_\W]?r[_\W]?[o0\xF2-\xF6][_\W]?c[_\W]?[o0\xF2-\xF6][_\W]?d[_\W]?[o0\xF2-\xF6][_\W]?n[_\W]?e_{0,3}\b/i -body __DRUGS_PAIN2 /\b_{0,3}c[o0\xF2-\xF6]deine_{0,3}\b/i -#ultram -body __DRUGS_PAIN3 /(?:\b|\s)[_\W]{0,3}[u\xB5\xF9-\xFC][_\W]{0,3}l[_\W]{0,3}t[_\W]{0,3}r[_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}m_{0,3}\b/i -#vicodin -body __DRUGS_PAIN4 /(?:\b|\s)[_\W]{0,3}(?:\\\/|V)[_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}c[_\W]{0,3}[o0\xF2-\xF6][_\W]{0,3}d[_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}ns?[_\W]{0,3}(?:\b|\s)/i -#tramadol -body __DRUGS_PAIN5 /\b_{0,3}t[_\W]?r[_\W]?[a4\xE0-\xE6@][_\W]?m[_\W]?[a4\xE0-\xE6@][_\W]?d[_\W]?[o0\xF2-\xF6][_\W]?[l!|1]_{0,3}\b/i -# ultracet, uncommon in spam. -body __DRUGS_PAIN6 /\b_{0,3}u[_\W]?l[_\W]?t[_\W]?r[_\W]?a[_\W]?c[_\W]?e[_\W]?t_{0,3}\b/i -#fioricet -body __DRUGS_PAIN7 /\b_{0,3}f[_\W]?[i1!|l\xEC-\xEF][_\W]?[o0\xF2-\xF6][_\W]?r[_\W]?[i1!|l\xEC-\xEF][_\W]?c[_\W]?[e3\xE8-\xEB][_\W]?[t7]_{0,3}\b/i -#celebrex -body __DRUGS_PAIN8 /\b_{0,3}c[_\W]?[e3\xE8-\xEB][_\W]?l[_\W]?[e3\xE8-\xEB][_\W]?b[_\W]?r[_\W]?[e3\xE8-\xEB][_\W]?x_{0,3}\b/i -#imitrex -body __DRUGS_PAIN9 /(?:\b|\s)_{0,3}[i1!|l\xEC-\xEF]m[i1!|l\xEC-\xEF]tr[e3\xE8-\xEB]x_{0,3}\b/i -#vioxx -body __DRUGS_PAIN10 /(?:\b|\s)[_\W]{0,3}(?:\\\/|V)[_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}[o0\xF2-\xF6][_\W]{0,3}x[_\W]{0,3}xx?_{0,3}\b/i -#zebutal, uncommon in spam. -body __DRUGS_PAIN11 /\bzebutal\b/i -#esgic plus, uncommon in spam. -body __DRUGS_PAIN12 /\besgic plus\b/i -#Darvon - a prescription narcotic -body __DRUGS_PAIN13 /\bD[_\W]?[a4\xE0-\xE6@][_\W]?r[_\W]?v[_\W]?[o0\xF2-\xF6][_\W]?n\b/i -body __DRUGS_PAIN14 /N[o0\xF2-\xF6]rc[o0\xF2-\xF6]/i -meta __DRUGS_PAIN (__DRUGS_PAIN1 || __DRUGS_PAIN2 || __DRUGS_PAIN3 || __DRUGS_PAIN4 ||__DRUGS_PAIN5 ||__DRUGS_PAIN6 ||__DRUGS_PAIN7 ||__DRUGS_PAIN8 || __DRUGS_PAIN9 || __DRUGS_PAIN10|| __DRUGS_PAIN11 || __DRUGS_PAIN12 || __DRUGS_PAIN13 ||__DRUGS_PAIN14) -#sleep aids -#ativan and lorazepam already under anxiety -#Ambien, brand of zolpidem tartrate -body __DRUGS_SLEEP1 /(?:\b|\s)[_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}m[_\W]{0,3}b[_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}[e3\xE8-\xEB][_\W]{0,3}n[_\W]{0,3}(?:\b|\s)/i -#sonata, brand of zaleplon -body __DRUGS_SLEEP2 /(?:\b|\s)[_\W]{0,3}S[_\W]{0,3}[o0\xF2-\xF6][_\W]{0,3}n[_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}t[_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}(?:\b|\s)/i -#Restoril, brand of temazepam, uncommon in spam -body __DRUGS_SLEEP3 /\b_{0,3}R[_\W]?[e3\xE8-\xEB][_\W]?s[_\W]?t[_\W]?[o0\xF2-\xF6][_\W]?r[_\W]?i[_\W]?l_{0,3}\b/i -#Halcion, brand of triazolam -body __DRUGS_SLEEP4 /\b_{0,3}H[_\W]?[a4\xE0-\xE6@][_\W]?l[_\W]?c[_\W]?i[_\W]?[o0\xF2-\xF6][_\W]?n_{0,3}\b/i - -meta __DRUGS_SLEEP (__DRUGS_SLEEP1 || __DRUGS_SLEEP2 || __DRUGS_SLEEP3 ||__DRUGS_SLEEP4) - -#muscle relaxants -#soma -body __DRUGS_MUSCLE1 /(?:\b|\s)[_\W]{0,3}s[_\W]{0,3}[o0\xF2-\xF6][_\W]{0,3}m[_\W]{0,3}[a4\xE0-\xE3\xE5\xE6@][_\W]{0,3}(?:\b|\s)/i -#cyclobenzaprine -body __DRUGS_MUSCLE2 /\b_{0,3}cycl[o0\xF2-\xF6]b[e3\xE8-\xEB]nz[a4\xE0-\xE6@]pr[i1!|l\xEC-\xEF]n[e3\xE8-\xEB]_{0,3}(?:\b|\s)/i -#flexeril -body __DRUGS_MUSCLE3 /\b_{0,3}f[_\W]?l[_\W]?[e3\xE8-\xEB][_\W]?x[_\W]?[e3\xE8-\xEB][_\W]?r[_\W]?[i1!|l\xEC-\xEF]_{0,3}[_\W]?l_{0,3}\b/i -#zanaflex -body __DRUGS_MUSCLE4 /\b_{0,3}z[_\W]?a[_\W]?n[_\W]?a[_\W]?f[_\W]?l[_\W]?e[_\W]?x_{0,3}\b/i -#skelaxin -body __DRUGS_MUSCLE5 /\bskelaxin\b/i -meta DRUGS_MUSCLE (__DRUGS_MUSCLE1 || __DRUGS_MUSCLE2 || __DRUGS_MUSCLE3 || __DRUGS_MUSCLE4 ||__DRUGS_MUSCLE5 ) -describe DRUGS_MUSCLE Refers to a muscle relaxant -#anti-anxiety -#these two rules are used to differentiate between obfu and non-obfu spellings -body __DRUGS_ANXIETY_XAN /xan[ae]x/i -body __DRUGS_ANXIETY_VAL /valium/i -#xanax - note: second a sometimes done as e. -body __DRUGS_ANXIETY1 /(?:\b|\s)[_\W]{0,3}x?x[_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}n[_\W]{0,3}[ea4\xE1\xE2\xE3@][_\W]{0,3}xx?_{0,3}\b/i -#alprazolam -body __DRUGS_ANXIETY2 /\bAlprazolam\b/i -#valium -body __DRUGS_ANXIETY3 /(?:\b|\s)[_\W]{0,3}(?:\\\/|V)[_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}[l|][_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}[u\xB5\xF9-\xFC][_\W]{0,3}m\b/i -#diazepam, generic of valium -body __DRUGS_ANXIETY4 /\b_{0,3}D[_\W]?[i1!|l\xEC-\xEF][_\W]?[a4\xE0-\xE6@][_\W]?z[_\W]?[ea3\xE9\xEA\xEB][_\W]?p[_\W]?[a4\xE0-\xE6@][_\W]?m_{0,3}\b/i -#ativan -body __DRUGS_ANXIETY5 /(?:\b|\s)[a4\xE0-\xE6@][_\W]?t[_\W]?[i1!|l\xEC-\xEF][_\W]?v[_\W]?[a4\xE0-\xE6@][_\W]?n_{0,3}\b/i -#lorazepam - generic of ativan, uncommon in spam -body __DRUGS_ANXIETY6 /\b_{0,3}l[_\W]?[o0\xF2-\xF6][_\W]?r[_\W]?[a4\xE0-\xE6@][_\W]?z[_\W]?[e3\xE8-\xEB][_\W]?p[_\W]?[a4\xE0-\xE6@][_\W]?m_{0,3}\b/i -#clonazepam, generic. -body __DRUGS_ANXIETY7 /\b_{0,3}c[_\W]?l[_\W]?[o0\xF2-\xF6][_\W]?n[_\W]?[a4\xE0-\xE6@][_\W]?z[_\W]?e[_\W]?p[_\W]?[a4\xE0-\xE6@][_\W]?m\b/i -#klonopin, brand of clonazepam, uncommon in spam -body __DRUGS_ANXIETY8 /\bklonopin\b/i -#rivotril, brand of clonazepam, uncommon in spam -body __DRUGS_ANXIETY9 /\brivotril\b/i -meta DRUGS_ANXIETY (__DRUGS_ANXIETY1 || __DRUGS_ANXIETY2 || __DRUGS_ANXIETY3 || __DRUGS_ANXIETY4 ||__DRUGS_ANXIETY5 ||__DRUGS_ANXIETY6 ||__DRUGS_ANXIETY7 ||__DRUGS_ANXIETY8 || __DRUGS_ANXIETY9 ) -describe DRUGS_ANXIETY Refers to an anxiety control drug -meta DRUGS_ANXIETY_OBFU ( (__DRUGS_ANXIETY1 &&! __DRUGS_ANXIETY_XAN) || (__DRUGS_ANXIETY3 && !__DRUGS_ANXIETY_VAL)) -describe DRUGS_ANXIETY_OBFU Obfuscated reference to an anxiety control drug - -body DRUGS_SMEAR1 /(?:Viagra|Valium|Xanax|Soma|Cialis){2}/i -describe DRUGS_SMEAR1 Two or more drugs crammed together into one word - -#search for "weird" combinations that are unlikely to -#be prescribed together for a single event, thus unlikely to be -#mentioned in the same email, except an online pharmacy ad. -meta DRUGS_ANXIETY_EREC (DRUGS_ERECTILE && DRUGS_ANXIETY) -describe DRUGS_ANXIETY_EREC Refers to both an erectile and an anxiety drug -meta DRUGS_SLEEP_EREC (DRUGS_ERECTILE && __DRUGS_SLEEP) -describe DRUGS_SLEEP_EREC Refers to both an erectile and a sleep aid drug - -# note: some 3 item combos are "normal" ie: a patient might legitimately -# be prescribed depression, anxiety and sleep aid drugs all at once. -# however, I know of no "normal" 4-item combinations. -meta DRUGS_MANYKINDS (DRUGS_ERECTILE + DRUGS_DIET + __DRUGS_PAIN + __DRUGS_SLEEP + DRUGS_MUSCLE + DRUGS_ANXIETY > 3) -describe DRUGS_MANYKINDS Refers to at least four kinds of drugs - -######################################################################## - diff -Nru spamassassin-3.4.6/trunk-only/rules/20_dynrdns.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_dynrdns.cf --- spamassassin-3.4.6/trunk-only/rules/20_dynrdns.cf 2014-11-12 21:24:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_dynrdns.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,216 +0,0 @@ -# SpamAssassin rules file: dynamic-ish rDNS tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# We should write a new ruletype for these, to save typing. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -require_version @@VERSION@@ - -# --------------------------------------------------------------------------- - -# Note the '^[^\]]+ ' stanza: this ensures that we only match spamware -# connecting to a internal relay; if a mail came from a dynamic addr but -# was relayed through their smarthost, that's fine. - -# See bug #5856, all references of "trusted" were changed to "external" - -# All of the RDNS_DYNAMIC rules require that the last external relay -# did not use SMTP authentication. These rules should not be firing on -# friendlies! -header __LAST_UNTRUSTED_RELAY_NO_AUTH X-Spam-Relays-Untrusted =~ /^[^\]]+ auth= / -header __LAST_EXTERNAL_RELAY_NO_AUTH X-Spam-Relays-External =~ /^[^\]]+ auth= / - -# dhcp024-210-034-053.columbus.rr.com [24.210.34.53] -# c-66-176-16-108.se.client2.attbi.com [66.176.16.108] -# c-67-168-174-61.client.comcast.net [67.168.174.61] -# NNN-NNN-NNN-NNN.fibertel.com.ar -# NN.NN.NNN.NNN.ap.yournet.ne.jp -# NN.NNN.NN-NN.rev.gaoland.net -# vaise-1-82-67-44-166.fbx.proxad.net [82.67.44.166] -# lns-vlq-11-62-147-186-141.adsl.proxad.net [62.147.186.141] -# dsl-200-95-109-107.prod-infinitum.com.mx [200.95.109.107] -# port-212-202-77-203.reverse.qsc.de [212.202.77.203] -# pool-151-203-32-68.bos.east.verizon.net [151.203.32.68] -# c-67-164-133-216.client.comcast.net [67.164.133.216] -# 200-171-228-6.customer.telesp.net.br [200.171.228.6] -# modemcable090.28-201-24.mc.videotron.ca [24.201.28.90] -# 80-218-47-160.dclient.hispeed.ch [80.218.47.160] -# cdm-68-226-239-16.laft.cox-internet.com [68.226.239.16] -# d53-64-35-171.nap.wideopenwest.com [64.53.171.35] -# 74.67-201-80.adsl.skynet.be [80.201.67.74] -# 12-218-225-223.client.mchsi.com [12.218.225.223] -# pptp-81-30-186-139.ufanet.ru [81.30.186.139] -# (require an alpha first, as legit HELO'ing-as-IP-address is hit otherwise) -header __RDNS_DYNAMIC_IPADDR X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*\d+[^\d\s]\d+[^\d\s]\d+[^\d\s]\d+\S*\.\S+\.\S/i -describe __RDNS_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr 1) - -# dhcp024-210-034-053.columbus.rr.com [24.210.34.53] -# catv-506237d8.miskcatv.broadband.hu [80.98.55.216] -# node-c-8b22.a2000.nl -# cm89.omega139.maxonline.com.sg -# cm114.gamma208.maxonline.com.sg -header __RDNS_DYNAMIC_DHCP X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:cm|catv|docsis|cable|dsl|dhcp|cpe|node)\S*\d+[^\d\s]+\d/i -describe __RDNS_DYNAMIC_DHCP Relay HELO'd using suspicious hostname (DHCP) - -# fia83-8.dsl.hccnet.nl [62.251.8.83] -# fia160-115-100.dsl.hccnet.nl [80.100.115.160] -header __RDNS_DYNAMIC_HCC X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*\d+[^\d\s]+\d+\S*\.(?:docsis|cable|dsl|adsl|dhcp|cpe)\./i -describe __RDNS_DYNAMIC_HCC Relay HELO'd using suspicious hostname (HCC) - -# h0002a5d76857.ne.client2.attbi.com [65.96.12.59] -header __RDNS_DYNAMIC_ATTBI X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+\d+\S+\.client2\.attbi\.com/i -describe __RDNS_DYNAMIC_ATTBI Relay HELO'd using suspicious hostname (ATTBI.com) - -# CPE0004e2372711-CM000a73666706.cpe.net.cable.rogers.com -# CPE00e0184f0eba-CM014490118324.cpe.net.cable.rogers.com [24.43.109.140] -header __RDNS_DYNAMIC_ROGERS X-Spam-Relays-External =~ /^[^\]]+ rdns=CPE\d+\S+\.rogers\.com/i -describe __RDNS_DYNAMIC_ROGERS Relay HELO'd using suspicious hostname (Rogers) - -# ca-morpark-cuda1-zone7-b-159.vnnyca.adelphia.net[67.23.129.159] -# tn-greenvillecuda1cable7a-36.atlaga.adelphia.net [68.171.113.36] -# ky-richmond2a-123.rhmdky.adelphia.net [68.71.36.123] -# ny-lackawannacadent4-chtwga3a-b-117.buf.adelphia.net [68.71.205.117] -# fl-edel-u2-c3c-233.pbc.adelphia.net [68.64.89.233] -header __RDNS_DYNAMIC_ADELPHIA X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z]{2}-\S+-\d{1,3}\.[a-z]{3,8}\.adelphia\.net/i -describe __RDNS_DYNAMIC_ADELPHIA Relay HELO'd using suspicious hostname (Adelphia) - -# pD9E4F89F.dip.t-dialin.net [217.228.248.159] -header __RDNS_DYNAMIC_DIALIN X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z][A-F0-9]+\.dip\./ -describe __RDNS_DYNAMIC_DIALIN Relay HELO'd using suspicious hostname (T-Dialin) - -# 0xd5aaf40b.dhcp.kabelnettet.dk -# 0x50a46949.virnxx11.adsl-dhcp.tele.dk -header __RDNS_DYNAMIC_HEXIP X-Spam-Relays-External =~ /^[^\]]+ rdns=0x[a-f0-9]{8}\./ -describe __RDNS_DYNAMIC_HEXIP Relay HELO'd using suspicious hostname (Hex IP) - -# 118.Red-80-35-201.pooles.rima-tde.net -header __RDNS_DYNAMIC_SPLIT_IP X-Spam-Relays-External =~ /^[^\]]+ rdns=\d+\.\S+\d+[^\d\s]\d+[^\d\s]\d+[^\d\s]/ -describe __RDNS_DYNAMIC_SPLIT_IP Relay HELO'd using suspicious hostname (Split IP) - -# YahooBB219173000034.bbtec.net [219.173.0.34] -header __RDNS_DYNAMIC_YAHOOBB X-Spam-Relays-External =~ /^[^\]]+ rdns=YahooBB/i -describe __RDNS_DYNAMIC_YAHOOBB Relay HELO'd using suspicious hostname (YahooBB) - -# ool-18be1aaf.dyn.optonline.net [24.190.26.175] -header __RDNS_DYNAMIC_OOL X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+\.dyn\.optonline\.net/ -describe __RDNS_DYNAMIC_OOL Relay HELO'd using suspicious hostname (OptOnline) - -# wiley-170-10231.roadrunner.nf.net [205.251.210.249] -header __RDNS_DYNAMIC_RR2 X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z]+-\d{1,3}-\d{1,5}\.roadrunner/i -describe __RDNS_DYNAMIC_RR2 Relay HELO'd using suspicious hostname (RR 2) - -# pcp04024417pcs.toresd01.pa.comcast.net [68.86.206.126] -# bgp542174bgs.ewndsr01.nj.comcast.net[68.38.144.91] -# Computer-udp135632uds.union01.nj.comcast.net [68.39.99.32] -header __RDNS_DYNAMIC_COMCAST X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z-]+\d+[a-z]{3}\.[a-z0-9]+\...\.comcast/i -describe __RDNS_DYNAMIC_COMCAST Relay HELO'd using suspicious hostname (Comcast) - -# h234n2fls32o895.telia.com [217.208.73.234] -# h53n2fls32o828.telia.com -# h116n2fls32o1111.telia.com -# h29n1fls306o1003.telia.com -header __RDNS_DYNAMIC_TELIA X-Spam-Relays-External =~ /^[^\]]+ rdns=h\d+n\d+fls\S+\.telia\.com/i -describe __RDNS_DYNAMIC_TELIA Relay HELO'd using suspicious hostname (Telia) - -# CM-vina5-168-207.cm.vtr.net [200.104.168.207] -# CM-anto1-98-153.cm.vtr.net [200.104.98.153] -header __RDNS_DYNAMIC_VTR X-Spam-Relays-External =~ /^[^\]]+ rdns=cm-[a-z]+\d+-\d+-\d+\.cm\.vtr/i -describe __RDNS_DYNAMIC_VTR Relay HELO'd using suspicious hostname (VTR) - -# ec9z5l.cm.chello.no -header __RDNS_DYNAMIC_CHELLO_NO X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+\.cm\.chello\.no/i -describe __RDNS_DYNAMIC_CHELLO_NO Relay HELO'd using suspicious hostname (Chello.no) - -# g225174.upc-g.chello.nl -# a151145.upc-a.chello.nl -# a96134.upc-a.chello.nl -header __RDNS_DYNAMIC_CHELLO_NL X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z]\d+\.upc-[a-z]\.chello\.nl/i -describe __RDNS_DYNAMIC_CHELLO_NL Relay HELO'd using suspicious hostname (Chello.nl) - -# MG001182.user.veloxzone.com.br -# ba199058073.user.veloxzone.com.br -header __RDNS_DYNAMIC_VELOX X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z]{2}\d+\.user\.veloxzone\./i -describe __RDNS_DYNAMIC_VELOX Relay HELO'd using suspicious hostname (Veloxzone) - -# public4-seve6-5-cust173.lond.broadband.ntl.com -# spr1-bolt5-5-0-cust9.manc.broadband.ntl.com -# spc1-lewi4-6-0-cust190.lond.broadband.ntl.com -header __RDNS_DYNAMIC_NTL X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+\d+-\d+-cust\d+\.[a-z]{4,6}\.broadband\.ntl\.com/i -describe __RDNS_DYNAMIC_NTL Relay HELO'd using suspicious hostname (NTL) - -# cp160000-a.mill1.nb.home.nl -# cp341468-b.venra1.lb.home.nl -header __RDNS_DYNAMIC_HOME_NL X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z]{2}\d+-\S\.\S+\d\.[a-z]{2}\.home\.nl/i -describe __RDNS_DYNAMIC_HOME_NL Relay HELO'd using suspicious hostname (Home.nl) - -# (I'm quite sure these may be a good spamsign in future) -# nwblwi-nrp3-l10-a671.nwblwi.tds.net -header __RDNS_DYNAMIC_TDS X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+-[a-z]\d+\.[a-z]{6}\.tds\.net/i -header __RDNS_DYNAMIC_VIRTUA X-Spam-Relays-External =~ /^[^\]]+ rdns=\d+\.cps\./i - -# sp1-c700-131.spacelan.ne.jp -header __RDNS_DYNAMIC_SPACELAN X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+-[a-z]\d+-\d+\./i - -# rDNS host-type indicators, as per -# http://tools.ietf.org/wg/dnsop/draft-msullivan-dnsop-generic-naming-schemes-00.txt -header __RDNS_INDICATOR_DYN X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+[\-\.]dyn(?:amic)?[\-\.]/i - -# surprisingly large ham hitrate -header __RDNS_INDICATOR_TYPE X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+[\-\.](?:dial|modem|isdn|dov|\S?dsl|cable|wireless)[\-\.]/i - -# this hits a little ham, not too much though -header __RDNS_INDICATOR_RES X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+[\-\.](?:res|resnet|client)[\-\.]/i - -# these are non-standard, but common in the field; 100% spam correlation! -# (I think that's a fluke) -header __RDNS_INDICATOR_TYPE2 X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+[\-\.](?:docsis|dhcp|cpe|catv)[\-\.]/i - -# dsl.dynamic8510023760.ttnet.net.tr -header __RDNS_DYNAMIC_TTNET X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+[\-\.]dyn(?:amic)?\d/i - -# c221106.ppp.asahi-net.or.jp -# i253064.ppp.asahi-net.or.jp -# u035201.ppp.asahi-net.or.jp -# w158034.ppp.asahi-net.or.jp -header __RDNS_DYNAMIC_ASAHI X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z][0-9]+\.ppp\.asahi-net\.or\.jp/i - -# exceptions (bug 5397): -header __RDNS_STATIC X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:fix|static|fixip|dedicated)/i - -# bug 5586: -header __CGATE_RCVD Received =~ /by \S+ \(CommuniGate Pro/ -# bug 5926: -header __DOMINO_RCVD Received =~ /by \S+ \(Lotus Domino / - -header __RDNS_NONE X-Spam-Relays-External =~ /^[^\]]+ rdns= / - -########################################################################### - -meta RDNS_DYNAMIC (__LAST_EXTERNAL_RELAY_NO_AUTH && !__RDNS_STATIC && (__RDNS_DYNAMIC_IPADDR || __RDNS_DYNAMIC_DHCP || __RDNS_DYNAMIC_HCC || __RDNS_DYNAMIC_ATTBI || __RDNS_DYNAMIC_ROGERS || __RDNS_DYNAMIC_ADELPHIA || __RDNS_DYNAMIC_DIALIN || __RDNS_DYNAMIC_HEXIP || __RDNS_DYNAMIC_SPLIT_IP || __RDNS_DYNAMIC_YAHOOBB || __RDNS_DYNAMIC_OOL || __RDNS_DYNAMIC_RR2 || __RDNS_DYNAMIC_COMCAST || __RDNS_DYNAMIC_TELIA || __RDNS_DYNAMIC_VTR || __RDNS_DYNAMIC_CHELLO_NO || __RDNS_DYNAMIC_CHELLO_NL || __RDNS_DYNAMIC_VELOX || __RDNS_DYNAMIC_NTL || __RDNS_DYNAMIC_HOME_NL || __RDNS_DYNAMIC_TDS || __RDNS_DYNAMIC_VIRTUA || __RDNS_DYNAMIC_SPACELAN || __RDNS_INDICATOR_DYN || __RDNS_INDICATOR_RES || __RDNS_INDICATOR_TYPE2 || __RDNS_DYNAMIC_TTNET || __RDNS_DYNAMIC_ASAHI)) -describe RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS - -meta RDNS_NONE (__RDNS_NONE && !__CGATE_RCVD && !__DOMINO_RCVD) -describe RDNS_NONE Delivered to internal network by a host with no rDNS - - diff -Nru spamassassin-3.4.6/trunk-only/rules/20_fake_helo_tests.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_fake_helo_tests.cf --- spamassassin-3.4.6/trunk-only/rules/20_fake_helo_tests.cf 2012-12-10 19:26:34.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_fake_helo_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ -# SpamAssassin rules file: fake-HELO tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# We should write a new ruletype for these, to save typing. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -require_version @@VERSION@@ - -#--------------------------------------------------------------------------- -# Handle hosts that look like HELO_DYNAMIC hosts - -# cmr-208-124-139-194.cr.net.cable.rogers.com) [208.124.139.194] -# cmr-208-97-119-114.cr.net.cable.rogers.com) [208.97.119.114] -header __HELO_STATIC_ROGERS X-Spam-Relays-External =~ /^[^\]]+ helo=cmr-\d{1,3}-\d{1,3}-\d{1,3}-\d{1,3}\S+\.rogers\.com[^\]]+ auth= /i -describe HELO_STATIC_HOST Relay HELO'd using static hostname -meta HELO_STATIC_HOST (__HELO_STATIC_ROGERS) - - -# --------------------------------------------------------------------------- - -# Suresh says: these will never be used as HELOs from real mail.com relays. -# Just check the most recent handover; the connection to a internal host. -# This way a legit sender can send to their MSA using that HELO (quite a few -# MUAs will do that), but a spammer gets caught. (List of domains comes from -# the drop-down list on the Mail.com signup page.) -#header FAKE_HELO_MAIL_COM_DOM X-Spam-Relays-External =~ /^[^\]]+ helo=(?:\S+\.|)(?:(?:mail|email|iname|cheerful|consultant|europe|mindless|myself|post|techie|usa|writeme|2die4|artlover|bikerider|catlover|cliffhanger|cutey|doglover|gardener|hot-shot|inorbit|loveable|mad\.scientist|playful|poetic|popstar|saintly|seductive|soon|whoever|winning|witty|yours|africamail|arcticmail|asia|australiamail|europe|japan|samerica|usa|berlin|dublin|london|madrid|moscowmail|munich|nycmail|paris|rome|sanfranmail|singapore|tokyo|accountant|adexec|allergist|alumnidirector|archaeologist|chemist|clerk|columnist|comic|consultant|counsellor|deliveryman|diplomats|doctor|dr|engineer|execs|financier|geologist|graphic-designer|insurer|journalist|lawyer|legislator|lobbyist|minister|optician|pediatrician|presidency|priest|publicist|realtyagent|registerednurses|repairman|representative|rescueteam|scientist|sociologist|teacher|techietechnologist|umpire)\.com|(?:programmer|earthling|hairdresser)\.net|musician\.org) /i -#describe FAKE_HELO_MAIL_COM_DOM Relay HELO'd with suspicious hostname (mail.com) - - -# --------------------------------------------------------------------------- -# Interesting new feature; spamware HELO'ing, from a dialup IP addr, -# using that IP's rDNS entry. We can catch this easily. There aren't -# many legit mailservers calling themselves -# 'dhcp024-210-034-053.columbus.rr.com'. ;) -# -# Note the '^[^\]]+ ' stanza: this ensures that we only match spamware -# connecting to a internal relay; if a mail came from a dynamic addr but -# was relayed through their smarthost, that's fine. - -# See bug #5856, all references of trusted were changed to internal - -# dhcp024-210-034-053.columbus.rr.com [24.210.34.53] -# c-66-176-16-108.se.client2.attbi.com [66.176.16.108] -# c-67-168-174-61.client.comcast.net [67.168.174.61] -# NNN-NNN-NNN-NNN.fibertel.com.ar -# NN.NN.NNN.NNN.ap.yournet.ne.jp -# NN.NNN.NN-NN.rev.gaoland.net -# vaise-1-82-67-44-166.fbx.proxad.net [82.67.44.166] -# lns-vlq-11-62-147-186-141.adsl.proxad.net [62.147.186.141] -# dsl-200-95-109-107.prod-infinitum.com.mx [200.95.109.107] -# port-212-202-77-203.reverse.qsc.de [212.202.77.203] -# pool-151-203-32-68.bos.east.verizon.net [151.203.32.68] -# c-67-164-133-216.client.comcast.net [67.164.133.216] -# 200-171-228-6.customer.telesp.net.br [200.171.228.6] -# modemcable090.28-201-24.mc.videotron.ca [24.201.28.90] -# 80-218-47-160.dclient.hispeed.ch [80.218.47.160] -# cdm-68-226-239-16.laft.cox-internet.com [68.226.239.16] -# d53-64-35-171.nap.wideopenwest.com [64.53.171.35] -# 74.67-201-80.adsl.skynet.be [80.201.67.74] -# 12-218-225-223.client.mchsi.com [12.218.225.223] -# (require an alpha first, as legit HELO'ing-as-IP-address is hit otherwise) -header __HELO_DYNAMIC_IPADDR X-Spam-Relays-External =~ /^[^\]]+ helo=[a-z]\S*\d+[^\d\s]\d+[^\d\s]\d+[^\d\s]\d+[^\d\s][^\.]*\.\S+\.\S+[^\]]+ auth= /i -meta HELO_DYNAMIC_IPADDR (__HELO_DYNAMIC_IPADDR && !HELO_STATIC_HOST) -describe HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr 1) - -# dhcp024-210-034-053.columbus.rr.com [24.210.34.53] -# catv-506237d8.miskcatv.broadband.hu [80.98.55.216] -# node-c-8b22.a2000.nl -# cm89.omega139.maxonline.com.sg -# cm114.gamma208.maxonline.com.sg -header __HELO_DYNAMIC_DHCP X-Spam-Relays-External =~ /^[^\]]+ helo=\S*(?:(? -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::FreeMail - -body __freemail_safe_fwd /---\s?(?:(?:Forwarded|Original) message|Alkuper.inen viesti)/i -header __freemail_safe_rls X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+\.(?:tfbnw\.net|ebay\.com|tieto\.com) / -meta __freemail_safe __freemail_safe_fwd || __ML2 || __ML4 || __HAS_X_MAILING_LIST || __HAS_X_MAILMAN_VERSION || __freemail_safe_rls - -header __freemail_replyto eval:check_freemail_replyto('replyto') -meta FREEMAIL_REPLYTO __freemail_replyto && !__freemail_safe -describe FREEMAIL_REPLYTO Reply-To/From or Reply-To/body contain different freemails -score FREEMAIL_REPLYTO 2 - -header __freemail_reply eval:check_freemail_replyto('reply') -meta FREEMAIL_REPLY __freemail_reply && !__freemail_replyto && !__freemail_safe -describe FREEMAIL_REPLY From and body contain different freemails -score FREEMAIL_REPLY 0.5 - -header FREEMAIL_FROM eval:check_freemail_from() -describe FREEMAIL_FROM Sender email is commonly abused enduser mail provider -score FREEMAIL_FROM 0.001 - -header FREEMAIL_ENVFROM_END_DIGIT eval:check_freemail_header('EnvelopeFrom', '\d@') -describe FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit -score FREEMAIL_ENVFROM_END_DIGIT 0.1 - -header FREEMAIL_REPLYTO_END_DIGIT eval:check_freemail_header('Reply-To', '\d@') -describe FREEMAIL_REPLYTO_END_DIGIT Reply-To freemail username ends in digit -score FREEMAIL_REPLYTO_END_DIGIT 0.1 - -#header FREEMAIL_SUBJECT eval:check_freemail_header('Subject') -#describe FREEMAIL_SUBJECT Subject contains freemail -#score FREEMAIL_SUBJECT 0.001 - -# Idea from John Hardin -header __freemail_hdr_replyto eval:check_freemail_header('Reply-To') -meta FREEMAIL_FORGED_REPLYTO __freemail_hdr_replyto && !FREEMAIL_FROM && !__freemail_safe -describe FREEMAIL_FORGED_REPLYTO Freemail in Reply-To, but not From -score FREEMAIL_FORGED_REPLYTO 0.1 - -endif - diff -Nru spamassassin-3.4.6/trunk-only/rules/20_freemail_domains.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_freemail_domains.cf --- spamassassin-3.4.6/trunk-only/rules/20_freemail_domains.cf 2017-04-22 05:20:27.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_freemail_domains.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,545 +0,0 @@ -# SpamAssassin - FreeMail domains file -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -# List contains commonly abused end user mail providers -# "freemail" is solely used for label purposes. - -# weed out domains that already exist given a FILE of one domain per line: -# perl -lane 'if (@F and shift(@F) eq "freemail_domains") { -# for (@F) { s/\./\\./g; s/\?/./g; s/\*/[^.]*/g; print } -# }' rules/*.cf |grep -wvf- FILE - -# Updated 2016-08-18-axb - -ifplugin Mail::SpamAssassin::Plugin::FreeMail - -# Initial import from old FreeMail.pm / 090428 -freemail_domains 020.co.uk 123.com 123box.net 123india.com 123mail.cl -freemail_domains 123mail.org 123qwe.co.uk 138mail.com 141.ro 150mail.com 150ml.com 16mail.com -freemail_domains 1963chevrolet.com 1963pontiac.com 1netdrive.com 1st-website.com 1stpd.net -freemail_domains 2-mail.com 20after4.com 21cn.com 24h.co.jp 24horas.com 271soundview.com -freemail_domains 2die4.com 2mydns.com 2net.us 3000.it 3ammagazine.com 3email.com 3xl.net -freemail_domains 444.net 4email.com 4email.net 4newyork.com 50mail.com 55mail.cc 5fm.za.com -freemail_domains 6210.hu 6sens.com 702mail.co.za 7110.hu 8848.net 8m.com 8m.net 8x.com.br 8u8.com 8u8.hk 8u8.tw 9.cn -freemail_domains a-topmail.at about.com abv.bg acceso.or.cr access4less.net accessgcc.com -freemail_domains acmemail.net adiga.com adinet.com.uy -freemail_domains adres.nl advalvas.be aeiou.pt aeneasmail.com afrik.com -freemail_domains afropoets.com aggies.com ahaa.dk aichi.com aim.com airpost.net aiutamici.com -freemail_domains aklan.com aknet.kg alabama.usa.com alaska.usa.com alavatotal.com -freemail_domains albafind.com albawaba.com alburaq.net aldeax.com aldeax.com.ar alex4all.com aliyun.com -freemail_domains alexandria.cc algeria.com alice.it alinto.com allmail.net -freemail_domains alskens.dk altavista.se altbox.org alternativagratis.com alum.com -freemail_domains alunos.unipar.br alvilag.hu amenworld.com america.hm -freemail_domains americamail.com amnetsal.com amorous.com ananzi.co.za anet.ne.jp anfmail.com -freemail_domains angelfire.com animail.net aniverse.com anjungcafe.com -freemail_domains another.com antedoonsub.com antwerpen.com anunciador.net anytimenow.com -freemail_domains aol.* aol.co*.* aon.at apexmail.com apollo.lv approvers.net aprava.com -freemail_domains apropo.ro arcor.de argentina.com -freemail_domains arizona.usa.com arkansas.usa.com armmail.com army.com arnet.com.ar aroma.com -freemail_domains arrl.net aruba.it asheville.com asia-links.com -freemail_domains asiamail.com assala.com assamesemail.com asurfer.com -freemail_domains atl.lv atlas.cz atlas.sk atozasia.com atreillou.com att.net *.att.ne.jp au.ru aubenin.com -freemail_domains aus-city.com aussiemail.com.au avasmail.com.mv axarnet.com -freemail_domains ayna.com azet.sk babbalu.com badgers.com bakpaka.com bakpaka.net -freemail_domains balochistan.org baluch.com bama-fan.com bancora.net bankersmail.com -freemail_domains barlick.net beeebank.com beehive.org -freemail_domains been-there.com beirut.com belizehome.com belizemail.net -freemail_domains belizeweb.com bellsouth.net berlin.de bestmail.us bflomail.com -freemail_domains bgnmail.com bharatmail.com big-orange.com bigboss.cz bigfoot.com bigger.com -freemail_domains bigmailbox.com bigmir.net bigstring.com bip.net bigpond.com -freemail_domains bitwiser.com biz.by bizhosting.com black-sea.ro blackburnmail.com -freemail_domains blackglobalnetwork.net blink182.net blue.devils.com bluebottle.com -freemail_domains bluemail.ch blumail.org blvds.com bol.com.br bolando.com -freemail_domains bollywood2000.com bollywoodz.com bolt.com bombka.dyn.pl bonbon.net boom.com -freemail_domains bootmail.com bostonoffice.com box.az boxbg.com boxemail.com brain.com.pk -freemail_domains brasilia.net bravanese.com brazilmail.com.br breathe.com -freemail_domains brestonline.com brfree.com.br brujula.net btcc.org -freemail_domains buffaloes.com bulgaria.com bulldogs.com bumerang.ro burntmail.com -freemail_domains butch-femme.net buzy.com buzzjakkerz.com c-box.cz c3.hu c4.com cadinfo.net -freemail_domains calcfacil.com.br calcware.org california.usa.com -freemail_domains callnetuk.com camaroclubsweden.com canada-11.com canada.com canal21.com -freemail_domains canoemail.com caramail.com cardblvd.com care-mail.com care2.com caress.com -freemail_domains carioca.net cashette.com casino.com casinomail.com cataloniamail.com -freemail_domains catalunyamail.com cataz.com catcha.com catholic.org caths.co.uk -freemail_domains caxess.net cbrmail.com cc.lv cemelli.com centoper.it centralpets.com -freemail_domains centrum.cz centrum.sk cercaziende.it cgac.es chaiyo.com chaiyomail.com -freemail_domains chance2mail.com channelonetv.com chattown.com checkitmail.at -freemail_domains chelny.com cheshiremail.com chil-e.com chillimail.com -freemail_domains china.com christianmail.org ciaoweb.it cine.com ciphercom.net -freemail_domains circlemail.com cititrustbank1.cjb.net citromail.hu citynetusa.com ciudad.com.ar -freemail_domains claramail.com classicmail.co.za cliffhanger.com clix.pt -freemail_domains close2you.net cluemail.com clujnapoca.ro collegeclub.com -freemail_domains colombia.com colorado.usa.com comcast.net comfortable.com -freemail_domains compaqnet.fr compuserve.com computer.net computermail.net -freemail_domains computhouse.com conevyt.org.mx connect4free.net connecticut.usa.com -freemail_domains coolgoose.com coolkiwi.com coollist.com -freemail_domains coolmail.com coolmail.net coolsend.com cooltoad.com cooperation.net -freemail_domains copacabana.com copticmail.com corporateattorneys.com corporation.net -freemail_domains correios.net.br correomagico.com cosmo.com cosmosurf.net cougars.com -freemail_domains count.com countrybass.com couple.com criticalpath.net -freemail_domains critterpost.com crosspaths.net crosswinds.net cryingmail.com cs.com -freemail_domains csucsposta.hu cumbriamail.com curio-city.com custmail.com -freemail_domains cwazy.co.uk cwazy.net cww.de cyberaccess.com.pk -freemail_domains cybergirls.dk cyberguys.dk cybernet.it cymail.net -freemail_domains dabsol.net dada.net dadanet.it dailypioneer.com damuc.org.br -freemail_domains dansegulvet.com darkhorsefan.net data54.com davegracey.com dayzers.com -freemail_domains dbmail.com dcemail.com dcsi.net deacons.com deadlymob.org deal-maker.com -freemail_domains dearriba.com degoo.com delajaonline.org delaware.usa.com delfi.lv -freemail_domains delhimail.com demon.deacons.com desertonline.com -freemail_domains desidrivers.com deskpilot.com despammed.com detik.com devils.com dexara.net -freemail_domains dhmail.net di-ve.com didamail.com digitaltrue.com -freemail_domains direccion.com director-general.com diri.com discardmail.com -freemail_domains discoverymail.net disinfo.net djmillenium.com dmailman.com -freemail_domains dnsmadeeasy.com do.net.ar dodgeit.com dogmail.co.uk -freemail_domains doityourself.com domaindiscover.com domainmanager.com doneasy.com -freemail_domains dontexist.org dores.com dostmail.com dot5hosting.com dotcom.fr -freemail_domains dotnow.com dott.it doubt.com dplanet.ch dragoncon.net dragonfans.com -freemail_domains dropzone.com dserver.org dubaiwebcity.com dublin.ie dustdevil.com -freemail_domains dynamitemail.com dyndns.org e-apollo.lv e-hkma.com -freemail_domains e-mail.cz e-mail.ph e-mailanywhere.com e-milio.com e-tapaal.com e-webtec.com earthalliance.com -freemail_domains earthling.net eastmail.com eastrolog.com easy-pages.com easy.com -freemail_domains easyinfomail.co.za easypeasy.com echina.com ecn.org ecplaza.net eircom.net -freemail_domains edsamail.com.ph educacao.te.pt edumail.co.za eeism.com ego.co.th ekolay.net -freemail_domains elforotv.com.ar elitemail.org elsitio.com eltimon.com elvis.com -freemail_domains email.com.br email.cz email.bg email.it email.lu email.lviv.ua email.nu -freemail_domains email.ro email.si email2me.com emailacc.com emailaccount.com -freemail_domains emailaddresses.com emailchoice.com emailcorner.net emailn.de emailengine.net -freemail_domains emailengine.org emailgaul.com emailgroups.net emailhut.net emailpinoy.com -freemail_domains emailplanet.com emailplus.org emailuser.net ematic.com embroideryforums.com -freemail_domains eml.cc emoka.ro emptymail.com enel.net enelpunto.net -freemail_domains england.com enterate.com.ar entryweb.it entusiastisk.com -freemail_domains enusmail.com epatra.com epix.net epomail.com epost.de eprompter.com eqqu.com -freemail_domains eramail.co.za eresmas.com eriga.lv ertelecom.ru esde-s.org esfera.cl estadao.com.br -freemail_domains etllao.com euromail.net euroseek.com -freemail_domains euskalmail.com evafan.com everyday.com.kh everymail.net everyone.net -freemail_domains excite.* excite.co*.* execs2k.com executivemail.co.za -freemail_domains expn.com ezilon.com ezrs.com f-m.fm facilmail.com fadrasha.net fadrasha.org -freemail_domains faithhighway.com faithmail.com familymailbox.com familyroll.com -freemail_domains familysafeweb.net fan.com fan.net faroweb.com fast-email.com fast-mail.org -freemail_domains fastem.com fastemail.us fastemailer.com fastermail.com fastest.cc -freemail_domains fastimap.com fastmail.* fastmail.co*.* fastmailbox.net -freemail_domains fastmessaging.com fastwebmail.it fawz.net fea.st federalcontractors.com -freemail_domains fedxmail.com feelings.com female.ru fepg.net ffanet.com fiberia.com -freemail_domains filipinolinks.com financesource.com findmail.com -freemail_domains fiscal.net flashmail.com flipcode.com florida.usa.com floridagators.com -freemail_domains fmail.co.uk fmailbox.com fmgirl.com fmguy.com fnmail.com footballer.com foxmail.com -freemail_domains forfree.at forsythmissouri.org fortuncity.com forum.dk free.com.pe free.fr -freemail_domains free.net.nz freeaccess.nl freegates.be freeghana.com freehosting.nl -freemail_domains freei.co.th freeler.nl freemail.* freemail.*.* freemail.globalsite.com.br -freemail_domains freemuslim.net freenet.de freenet.kg freeola.net freepgs.com freesbee.fr -freemail_domains freeserve.co.uk freeservers.com freestart.hu freesurf.ch freesurf.fr -freemail_domains freesurf.nl freeuk.com freeuk.net freeweb.it freewebemail.com freeyellow.com -freemail_domains frisurf.no fsmail.net fsnet.co.uk ftml.net fuelie.org -freemail_domains fun-greetings-jokes.com fun.21cn.com fusemail.com fut.es gala.net -freemail_domains galmail.co.za gamebox.net gamecocks.com gawab.com gay.com -freemail_domains gaymailbox.com gaza.net gazeta.pl gci.net gdi.net geeklife.com gemari.or.id -freemail_domains genxemail.com geopia.com georgia.usa.com getmail.no -freemail_domains ggaweb.ch giga4u.de gjk.dk glay.org glendale.net globalfree.it globomail.com -freemail_domains globalpinoy.com globalsite.com.br globalum.com globetrotter.net gmail.com -freemail_domains gmx.* go-bama.com go-cavs.com go-chargers.com go-dawgs.com go-gators.com -freemail_domains go-hogs.com go-irish.com go-spartans.com go-tigers.com go.aggies.com -freemail_domains go.air-force.com go.badgers.com go.big-orange.com go.blue.devils.com -freemail_domains go.buffaloes.com go.bulldogs.com go.com go.cougars.com go.dores.com -freemail_domains go.gamecocks.com go.huskies.com go.longhorns.com go.mustangs.com -freemail_domains go.rebels.com go.ro go.ru go.terrapins.com go.wildcats.com go.wolverines.com -freemail_domains go.yellow-jackets.com go2net.com go4.it gofree.co.uk golfemail.com -freemail_domains goliadtexas.com gomail.com.ua gonowmail.com gonuts4free.com googlemail.com -freemail_domains goplay.com gorontalo.net gotmail.com gotomy.com govzone.com grad.com -freemail_domains graffiti.net gratisweb.com gtechnics.com -freemail_domains guate.net guessmail.com gwalla.com h-mail.us haberx.com hailmail.net -freemail_domains halejob.com hamptonroads.com handbag.com happemail.com -freemail_domains happycounsel.com hawaii.com hawaii.usa.com hayahaya.tg hedgeai.com -freemail_domains heesun.net heremail.com hetnet.nl highveldmail.co.za hildebrands.de -freemail_domains hingis.org hispavista.com hitmanrecords.com hockeyghiaccio.com -freemail_domains hockeymail.com holapuravida.com home.no.net home.ro home.se homelocator.com -freemail_domains homemail.co.za homenetmail.com homestead.com homosexual.net hongkong.com hong-kong-1.com -freemail_domains hopthu.com hosanna.net hot.ee hotbot.com hotbox.ru hotcoolmail.com hotdak.com -freemail_domains hotfire.net hotinbox.com hotmail.* hotmail.co*.* -freemail_domains hotpop.com hotvoice.com hour.com howling.com huhmail.com -freemail_domains humour.com hurra.de hush.ai hush.com hushmail.com huskies.com -freemail_domains hutchcity.com i-france.com i-p.com i12.com i2828.com ibatam.com ibest.com.br -freemail_domains ibizdns.com icafe.com ice.is icestorm.com icq.com icqmail.com icrazy.com -freemail_domains id.ru idaho.usa.com idirect.com idncafe.com ieg.com.br iespalomeras.net -freemail_domains iespana.es ifrance.com ig.com.br ignazio.it illinois.usa.com ilse.net -freemail_domains ilse.nl imail.ru imailbox.com imap-mail.com imap.cc imapmail.org imel.org -freemail_domains in-box.net inbox.com inbox.ge inbox.lv inbox.net inbox.ru in.com -freemail_domains incamail.com indexa.fr india.com indiamail.com indiana.usa.com -freemail_domains indiatimes.com induquimica.org inet.com.ua infinito.it infoapex.com -freemail_domains infohq.com infomail.es infomart.or.jp infosat.net infovia.com.ar inicia.es -freemail_domains inmail.sk inmail24.com inoutbox.com -freemail_domains intelnet.net.gt intelnett.com interblod.com -freemail_domains interfree.it interia.pl interlap.com.ar intermail.hu internet-e-mail.com -freemail_domains internet-mail.org internet.lu internetegypt.com internetemails.net -freemail_domains internetmailing.net inwind.it iobox.com iobox.fi iol.it iol.pt iowa.usa.com -freemail_domains ip3.com ipermitmail.com iqemail.com iquebec.com iran.com irangate.net -freemail_domains iscool.net islandmama.com ismart.net isonews2.com isonfire.com isp9.net -freemail_domains ispey.com itelgua.com itloox.com itmom.com -freemail_domains ivenus.com iwan-fals.com iwon.com ixp.net japan.com jaydemail.com -freemail_domains jedrzejow.pl jetemail.net jingjo.net jippii.fi jmail.co.za jojomail.com -freemail_domains jovem.te.pt joymail.com jubii.dk jubiipost.dk jumpy.it -freemail_domains juno.com justemail.net justmailz.com k.ro kaazoo.com kabissa.org kaixo.com -freemail_domains kalluritimes.com kalpoint.com kansas.usa.com katamail.com kataweb.it -freemail_domains kayafmmail.co.za keko.com.ar kentucky.usa.com keptprivate.com -freemail_domains kimo.com kiwitown.com klik.it klikni.cz kmtn.ru koko.com kolozsvar.ro kombud.com -freemail_domains koreanmail.com kotaksuratku.info krunis.com kukamail.com -freemail_domains kuronowish.com kyokodate.com kyokofukada.net ladymail.cz lagoon.nc -freemail_domains lahaonline.com lamalla.net lancsmail.com land.ru laposte.net latinmail.com -freemail_domains lawyer.com lawyersmail.com lawyerzone.com lebanonatlas.com leehom.net -freemail_domains leonardo.it leonlai.net letsjam.com letterbox.org -freemail_domains letterboxes.org levele.com lexpress.net libero.it liberomail.com -freemail_domains libertysurf.net libre.net lightwines.org linkmaster.com linuxfreemail.com -freemail_domains lionsfan.com.au live.* livedoor.com llandudno.com -freemail_domains llangollen.com lmxmail.sk loggain.net loggain.nu lolnetwork.net -freemail_domains london.com longhorns.com look.com looksmart.co.uk looksmart.com -freemail_domains looksmart.com.au loteria.net lotonazo.com louisiana.usa.com louiskoo.com -freemail_domains loveable.com lovemail.com lovingjesus.com lpemail.com luckymail.com luso.pt -freemail_domains lusoweb.pt luukku.com lycos.* lycos.co*.* lycosmail.com mac.com -freemail_domains machinecandy.com macmail.com mad.scientist.com madcrazy.com -freemail_domains madonno.com madrid.com magicmail.co.za magik-net.com mail-atlas.net -freemail_domains mail-awu.de mail-box.cz mail.by mail-center.com mail-central.com mail-jp.org -freemail_domains mail-online.dk mail-page.com mail-x-change.com mail.austria.com mail.az -freemail_domains mail.de mail.be mail.bg mail.bulgaria.com mail.co.za mail.dk mail.ee -freemail_domains mail.goo.ne.jp mail.gr mail.lawguru.com mail.md mail.mn mail.org mail.pf -freemail_domains mail.pt mail.ru mail.yahoo.co.jp mail15.com mail2*.com mail3000.com mail333.com -freemail_domains mail8.com mailandftp.com mailandnews.com mailas.com mailasia.com mailbg.com -freemail_domains mailblocks.com mailbolt.com mailbox.as mailbox.co.za mailbox.gr mailbox.hu -freemail_domains mailbox.sk mailc.net mailcan.com mailcircuit.com mailclub.fr mailclub.net -freemail_domains maildozy.com mailfly.com mailforce.net mailftp.com mailglobal.net -freemail_domains mailhaven.com mailinator.com mailingaddress.org mailingweb.com mailisent.com -freemail_domains mailite.com mailme.dk mailmight.com mailmij.nl mailnew.com mailops.com -freemail_domains mailpanda.com mailpersonal.com mailroom.com mailru.com mails.de mailsent.net -freemail_domains mailserver.dk mailservice.ms mailsnare.net mailsurf.com mailup.net -freemail_domains mailvault.com mailworks.org maine.usa.com majorana.martina-franca.ta.it -freemail_domains maktoob.com malayalamtelevision.net malayalapathram.com male.ru manager.de -freemail_domains manlymail.net mantrafreenet.com mantramail.com mantraonline.com -freemail_domains marihuana.ro marijuana.nl marketweighton.com maryland.usa.com -freemail_domains masrawy.com massachusetts.usa.com mauimail.com mbox.com.au mcrmail.com me.by -freemail_domains medicinatv.com meetingmall.com megamail.pt menara.ma merseymail.com mesra.net -freemail_domains messagez.com metacrawler.com mexico.com miaoweb.net -freemail_domains michigan.usa.com micro2media.com miesto.sk mighty.co.za milacamn.net -freemail_domains milmail.com mindless.com mindviz.com minnesota.usa.com -freemail_domains mississippi.usa.com missouri.usa.com mixmail.com ml1.net ml2clan.com -freemail_domains mlanime.com mm.st mmail.com mobimail.mn mobsters.com mobstop.com -freemail_domains modemnet.net modomail.com moldova.com moldovacc.com monarchy.com -freemail_domains montana.usa.com montevideo.com.uy moomia.com moose-mail.com mosaicfx.com -freemail_domains motormania.com movemail.com mr.outblaze.com mrspender.com -freemail_domains ms*.hinet.net mscold.com msn.com msn.co.uk msnzone.cn mundo-r.com -freemail_domains muslimsonline.com mustangs.com mxs.de myblue.cc mycabin.com mycity.com mycommail.com -freemail_domains mycool.com mydomain.com myeweb.com myfastmail.com myfunnymail.com mykolab.com -freemail_domains mygamingconsoles.com myiris.com myjazzmail.com mymacmail.com mymail.dk -freemail_domains mymail.ph.inter.net mymail.ro mynet.com mynet.com.tr myotw.net myopera.com -freemail_domains myownemail.com mypersonalemail.com myplace.com myrealbox.com -freemail_domains myspace.com myt.mu myway.com mzgchaos.de n2.com n2business.com n2mail.com -freemail_domains n2software.com nabble.com name.com nameplanet.com nanamail.co.il -freemail_domains nanaseaikawa.com nandomail.com naseej.com nastything.com national-champs.com -freemail_domains nativeweb.net narod.ru naveganas.com nebraska.usa.com nemra1.com nenter.com -freemail_domains nerdshack.com nervhq.org net.hr net4b.pt net4jesus.com net4you.at -freemail_domains netbounce.com netcabo.pt netcape.net netcourrier.com netexecutive.com -freemail_domains netfirms.com netkushi.com netmongol.com netpiper.com netposta.net -freemail_domains netscape.com netscape.net netscapeonline.co.uk netsquare.com nettaxi.com -freemail_domains netti.fi networld.com netzero.com netzero.net neustreet.com nevada.usa.com -freemail_domains newhampshire.usa.com newjersey.usa.com newmail.com newmail.net -freemail_domains newmail.ok.com newmail.ru newmexico.usa.com newspaperemail.com newyork.com -freemail_domains newyork.usa.com newyorkcity.com nfmail.com nicegal.com nightimeuk.com -freemail_domains nightly.com nightmail.com nightmail.ru noavar.com noemail.com nonomail.com nokiamail.com -freemail_domains noolhar.com northcarolina.usa.com northdakota.usa.com -freemail_domains nospammail.net nowzer.com ny.com nyc.com nz11.com -freemail_domains nzoomail.com o2.pl oceanfree.net ocsnet.net oddpost.com odeon.pl -freemail_domains odmail.com offshorewebmail.com ofir.dk ohio.usa.com oicexchange.com ok.ru -freemail_domains oklahoma.usa.com ole.com oleco.net olympist.net omaninfo.com onatoo.com -freemail_domains ondikoi.com onebox.com onenet.com.ar onet.pl ongc.net oninet.pt online.ie -freemail_domains online.ru onlinewiz.com onobox.com open.by openbg.com openforyou.com -freemail_domains opentransfer.com operamail.com oplusnet.com orange.* orangehome.co.uk -freemail_domains orbitel.bg orcon.net.nz oregon.usa.com oreka.com organizer.net orgio.net -freemail_domains orthodox.com osite.com.br oso.com ourbrisbane.com ournet.md -freemail_domains ourprofile.net ourwest.com outgun.com outlook.* ownmail.net oxfoot.com ozu.es -freemail_domains pacer.com paginasamarillas.com -freemail_domains pakistanmail.com pandawa.com pando.com pandora.be paris.com parsimail.com -freemail_domains parspage.com patmail.com pattayacitythailand.com pc4me.us pcpostal.com -freemail_domains penguinmaster.com pennsylvania.usa.com peopleweb.com -freemail_domains personal.ro personales.com peru.com petml.com -freemail_domains phreaker.net pigeonportal.com pilu.com pimagop.com -freemail_domains pinoymail.com pipni.cz pisem.net planet-school.de planetaccess.com -freemail_domains planetout.com plasa.com playersodds.com playful.com pluno.com -freemail_domains plusmail.com.br pmail.net pnetmail.co.za pobox.ru pobox.sk pochtamt.ru pochta.ru -freemail_domains poczta.fm poetic.com pogowave.com polbox.com -freemail_domains pop3.ru pop.co.th popmail.com poppymail.com popsmail.com popstar.com portafree.com -freemail_domains portaldosalunos.com portugalmail.com portugalmail.pt post.cz -freemail_domains post.expart.ne.jp post.pl post.sk posta.ge postaccesslite.com postiloota.net -freemail_domains postinbox.com postino.ch postino.it postmaster.co.uk postpro.net praize.com -freemail_domains press.co.jp primposta.com printesamargareta.ro -freemail_domains private.21cn.com probemail.com profesional.com profession.freemail.com.br -freemail_domains proinbox.com promessage.com prontomail.com protonmail.com protonmail.ch -freemail_domains provincial.net publicaccounting.com punkass.com puppy.com.my -freemail_domains qatar.io qlmail.com qq.com qrio.com qsl.net qudsmail.com queerplaces.com quepasa.com -freemail_domains quick.cz quickwebmail.com r-o-o-t.com r320.hu raakim.com rbcmail.ru racingseat.com -freemail_domains radicalz.com radiojobbank.com ragingbull.com -freemail_domains raisingadaughter.com rallye-webmail.com ranmamail.com ravearena.com -freemail_domains ravemail.co.za razormail.com real.ro realemail.net reallyfast.biz -freemail_domains reallyfast.info rebels.com recife.net recme.net -freemail_domains rediffmail.com rediffmailpro.com redseven.de redwhitearmy.com -freemail_domains relia.com -freemail_domains revenue.com rexian.com rhodeisland.usa.com -freemail_domains ritmes.net rn.com roanokemail.com rochester-mail.com rock.com rocketmail.com -freemail_domains rockfan.com rockinghamgateway.com rojname.com rol.ro -freemail_domains rollin.com rome.com romymichele.com royal.net rpharmacist.com rt.nl ru.ru -freemail_domains rushpost.com russiamail.com rxpost.net s-mail.com saabnet.com -freemail_domains sacbeemail.com sacmail.com safe-mail.net safe-mailbox.com -freemail_domains saigonnet.vn saint-mike.org -freemail_domains samilan.net sandiego.com sanook.com sanriotown.com -freemail_domains sapibon.com sapo.pt saturnfans.com sayhi.net sbcglobal.com scfn.net -freemail_domains schweiz.org sci.fi sciaga.pl -freemail_domains scrapbookscrapbook.com seapole.com search417.com seark.com sebil.com -freemail_domains secretservices.net secure-jlnet.com seductive.com sendmail.ru -freemail_domains sendme.cz sent.as sent.at sent.com serga.com.ar sermix.com server4free.de -freemail_domains serverwench.com sesmail.com sexmagnet.com seznam.cz shadango.com she.com -freemail_domains shuf.com siamlocalhost.com siamnow.net sify.com sinamail.com singapore.com -freemail_domains singmail.com singnet.com.sg siraj.org sirindia.com sirunet.com sister.com sina.com sina.cn sinanail.com -freemail_domains sistersbrothers.com sizzling.com slamdunkfan.com slickriffs.co.uk -freemail_domains slingshot.com slo.net slomusic.net smartemail.co.uk smtp.ru snail-mail.net -freemail_domains sndt.net sneakemail.com snoopymail.com snowboarding.com -freemail_domains so-simple.org socamail.com softhome.net sohu.com -freemail_domains sol.dk solidmail.com soon.com sos.lv soundvillage.org -freemail_domains southcarolina.usa.com southdakota.usa.com sp.nl space.com spacetowns.com -freemail_domains spamex.com spartapiet.com speed-racer.com speedpost.net -freemail_domains speedymail.org spils.com spinfinder.com sportemail.com spray.net spray.no -freemail_domains spray.se spymac.com srbbs.com srilankan.net ssan.com ssl-mail.com stade.fr -freemail_domains stalag13.com stampmail.com starbuzz.com starline.ee starmail.com -freemail_domains starmail.org starmedia.com starspath.com start.com.au start.no stribmail.com -freemail_domains strompost.* student.com student.ednet.ns.ca studmail.com sudanmail.net -freemail_domains suisse.org sunbella.net sunmail1.com sunpoint.net sunrise.ch -freemail_domains sunumail.sn sunuweb.net suomi24.fi superdada.it supereva.com supereva.it -freemail_domains supermailbox.com superposta.com surf3.net surfassistant.com surfsupnet.net -freemail_domains surfy.net surimail.com surnet.cl sverige.nu svizzera.org -freemail_domains sweb.cz swift-mail.com swissinfo.org -freemail_domains swissmail.net switzerland.org syom.com syriamail.com t-mail.com t-net.net.ve -freemail_domains t2mail.com tabasheer.com talk21.com talkcity.com tangmonkey.com tatanova.com -freemail_domains taxcutadvice.com techemail.com technisamail.co.za -freemail_domains teenmail.co.uk teenmail.co.za tejary.com telebot.com telefonica.net -freemail_domains telegraf.by teleline.es telinco.net telkom.net telpage.net telstra.com telenet.be -freemail_domains telusplanet.net tempting.com tenchiclub.com tennessee.usa.com terra.* -freemail_domains terra.co*.* terrapins.com texas.usa.com texascrossroads.com tfz.net thai.com -freemail_domains thaimail.com thaimail.net the-fastest.net the-quickest.com thegame.com -freemail_domains theinternetemail.com theoffice.net thepostmaster.net -freemail_domains theracetrack.com theserverbiz.com thewatercooler.com -freemail_domains thewebpros.co.uk thinkpost.net thirdage.com thundermail.com tim.it -freemail_domains timemail.com tin.it tinati.net tiscali.* tiscali.co*.* tiscalinet.it -freemail_domains tjohoo.se tkcity.com tlcfan.com tlen.pl tmicha.net todito.com todoperros.com -freemail_domains tokyo.com topchat.com topmail.com.ar topmail.dk topmail.co.ie topmail.co.in topmail.co.nz topmail.co.uk topmail.co.za -freemail_domains topsurf.com toquedequeda.com torba.com torchmail.com -freemail_domains totalmail.com totalsurf.com totonline.net tough.com toughguy.net trav.se -freemail_domains trevas.net tripod-mail.com triton.net trmailbox.com tsamail.co.za -freemail_domains turbonett.com turkey.com tvnet.lv typemail.com u2club.com uae.ac -freemail_domains ubbi.com ubbi.com.br uboot.com ugeek.com uk2.net uk2net.com ukr.net -freemail_domains ukrpost.net ukrpost.ua uku.co.uk ulimit.com ummah.org unbounded.com -freemail_domains unican.es unicum.de unimail.mn unitedemailsystems.com universal.pt -freemail_domains universia.cl universia.edu.ve universia.es universia.net.co universia.net.mx -freemail_domains universia.pr universia.pt universiabrasil.net unofree.it uol.com.ar -freemail_domains uol.com.br uole.com uolmail.com uomail.com uraniomail.com urbi.com.br -freemail_domains ureach.com usanetmail.com userbeam.com utah.usa.com -freemail_domains uyuyuy.com v-sexi.com v3mail.com vegetarisme.be velnet.com velocall.com -freemail_domains vercorreo.com verizonmail.com vermont.usa.com verticalheaven.com -freemail_domains veryfast.biz veryspeedy.net vfemail.net vietmedia.com vip.gr virgilio.it -freemail_domains virgin.net virginia.usa.com virtual-mail.com visitmail.com visto.com -freemail_domains vivelared.com vjtimail.com vnn.vn vsnl.com vsnl.net vodamail.co.za voila.fr volkermord.com vosforums.com vodafone.* -freemail_domains w.cn walla.com walla.co.il wallet.com wam.co.za wanadoo.co.uk wanadoo.es wanadoo.fr wanex.ge wap.hu -freemail_domains wapda.com wapicode.com wappi.com warpmail.net washington.usa.com wassup.com -freemail_domains waterloo.com waumail.com wazmail.com wearab.net web-mail.com.ar web.de -freemail_domains web.nl web2mail.com webaddressbook.com webbworks.com webcity.ca webdream.com -freemail_domains webemaillist.com webindia123.com webinfo.fi webjump.com webl-3.br.inter.net -freemail_domains webmail.co.yu webmail.co.za webmails.com webmailv.com webpim.cc -freemail_domains webspawner.com webstation.com websurfer.co.za webtopmail.com webtribe.net -freemail_domains webtv.net weedmail.com weekonline.com weirdness.com westvirginia.usa.com -freemail_domains whale-mail.com whipmail.com who.net whoever.com wildcats.com wildmail.com -freemail_domains williams.net.ar winning.com winningteam.com winwinhosting.com -freemail_domains wisconsin.usa.com witelcom.com witty.com wolverines.com wooow.it -freemail_domains workmail.co.za worldcrossing.com worldemail.com worldmedic.com -freemail_domains worldonline.de wowmail.com wp.pl wprost.pl wrongmail.com -freemail_domains wtonetwork.com wurtele.net www.com www.consulcredit.it wyoming.usa.com -freemail_domains x-mail.net xasa.com xemail.* xfreehosting.com xmail.net xmsg.com xnmsn.cn xoom.com xtra.co.nz xuite.net -freemail_domains xpectmore.com xrea.com xsmail.com xzapmail.com y7mail.com yahala.co.il -freemail_domains yaho.com yahoo.* yahoo.co*.* yalla.com.lb -freemail_domains ya.com yeah.net ya.ru yahoomail.com -freemail_domains yam.com yamal.info yandex.* yapost.com yawmail.com yebox.com yehey.com -freemail_domains yellow-jackets.com yellowstone.net yenimail.com yepmail.net yifan.net -freemail_domains ymail.com your-mail.com yours.com yourwap.com yyhmail.com z11.com z6.com -freemail_domains zednet.co.uk zeeman.nl ziplip.com zipmail.com.br zipmax.com -freemail_domains zmail.pt zmail.ru zona-andina.net zonai.com zoneview.net zonnet.nl -freemail_domains zoho.com zoomshare.com zoznam.sk zubee.com zuvio.com zwallet.com zworg.com -freemail_domains zybermail.com zzn.com - -# chinese numbers -freemail_domains 126.com 139.com 163.com 188.com 189.cn 263.net 9.cn - -# Vips -freemail_domains vip.126.com vip.163.com vip.188.com -freemail_domains vip.sina.com vip.sohu.com vip.sohu.net vip.tom.com vip.qq.com vipsohu.net - -# Bug 6903 - powered by VFEmail - 2013-02-19-AXB -freemail_domains clovermail.net mail-on.us chewiemail.com offcolormail.com powdermail.com tightmail.com toothandmail.com tushmail.com -freemail_domains openmail.cc expressmail.dk - -# Bug 6903 - powered by 5x2 Online 2013-02-19-AXB -freemail_domains 4xn.de 5x2.de 5x2.me aufdrogen.de auf-steroide.de -freemail_domains besser-als-du.de brainsurfer.de chillaxer.de cyberkriminell.de -freemail_domains danneben.so freemailen.de freemailn.de ist-der-mann.de -freemail_domains ist-der-wahnsinn.de ist-echt.so istecht.so ist-genialer.de -freemail_domains ist-schlauer.de ist-supersexy.de kann.so mag-spam.net -freemail_domains mega-schlau.de muss.so nerd4life.de ohne-drogen-gehts.net -freemail_domains on-steroids.de scheint.so staatsterrorist.de super-gerissen.de -freemail_domains unendlich-schlau.de vip-client.de will-keinen-spam.de -freemail_domains zu-geil.de - -# Bug 6903 - powered by Runbox - paid service, but offers 30 day free trial - 2013-02-19-AXB -freemail_domains runbox.* -freemail_domains rbox.me rbox.co - -freemail_domains tunome.com - -freemail_domains acatperson.com adogperson.com all4theskins.com -freemail_domains allsportsrock.com alwaysgrilling.com alwaysinthekitchen.com -freemail_domains alwayswatchingmovies.com alwayswatchingtv.com asylum.com -freemail_domains basketball-email.com beabookworm.com beagolfer.com beahealthnut.com -freemail_domains believeinliberty.com bestcoolcars.com bestjobcandidate.com besure2vote.com -freemail_domains bigtimecatperson.com bigtimedogperson.com bigtimereader.com -freemail_domains bigtimesportsfan.com blackvoices.com capsfanatic.com capshockeyfan.com -freemail_domains capsred.com car-nut.net cat-person.com catpeoplerule.com chat-with-me.com -freemail_domains cheatasrule.com crazy4baseball.com crazy4homeimprovement.com crazy4mail.com -freemail_domains crazyaboutfilms.net crazycarfan.com crazyforemail.com crazymoviefan.com -freemail_domains descriptivemail.com differentmail.com dog-person.com dogpeoplerule.com -freemail_domains easydoesit.com expertrenovator.com expressivemail.com fanaticos.com -freemail_domains fanofbooks.com fanofcomputers.com fanofcooking.com fanoftheweb.com -freemail_domains fieldmail.com fleetmail.com focusedonprofits.com focusedonreturns.com -freemail_domains futboladdict.com games.com getintobooks.com hail2theskins.com hitthepuck.com -freemail_domains i-dig-movies.com i-love-restaurants.com idigcomputers.com -freemail_domains idigelectronics.com idigvideos.com ilike2helpothers.com ilike2invest.com -freemail_domains ilike2workout.com ilikeelectronics.com ilikeworkingout.com -freemail_domains ilovehomeprojects.com iloveourteam.com iloveworkingout.com in2autos.net -freemail_domains interestedinthejob.com intomotors.com iwatchrealitytv.com lemondrop.com -freemail_domains love2exercise.com love2workout.com lovefantasysports.com lovetoexercise.com -freemail_domains luvfishing.com luvgolfing.com luvsoccer.com -freemail_domains mail4me.com majorgolfer.com majorshopaholic.com majortechie.com mcom.com -freemail_domains motor-nut.com moviefan.com mycapitalsmail.com mycatiscool.com -freemail_domains myfantasyteamrules.com myteamisbest.com netbusiness.com news-fanatic.com -freemail_domains newspaperfan.com onlinevideosrock.com realbookfan.com realhealthnut.com -freemail_domains realitytvaddict.net realitytvnut.com reallyintomusic.com realtravelfan.com -freemail_domains redskinscheer.com redskinsfamily.com redskinsfancentral.com redskinshog.com -freemail_domains redskinsrule.com redskinsspecialteams.com redskinsultimatefan.com -freemail_domains scoutmail.com skins4life.com stargate2.com stargateatlantis.com -freemail_domains stargatefanclub.com stargatesg1.com stargateu.com switched.com -freemail_domains thegamefanatic.com total-techie.com totalfoodnut.com -freemail_domains totally-into-cooking.com totallyintobaseball.com totallyintobasketball.com -freemail_domains totallyintocooking.com totallyintofootball.com totallyintogolf.com -freemail_domains totallyintohockey.com totallyintomusic.com totallyintoreading.com -freemail_domains totallyintosports.com totallyintotravel.com totalmoviefan.com -freemail_domains travel2newplaces.com tvchannelsurfer.com ultimateredskinsfan.com -freemail_domains videogamesrock.com volunteeringisawesome.com wayintocomputers.com -freemail_domains whatmail.com when.com wild4music.com wildaboutelectronics.com -freemail_domains workingaroundthehouse.com workingonthehouse.com writesoon.com xmasmail.com - -# irq.ir / 091030 - -freemail_domains arab.ir denmark.ir egypt.ir icq.ir ir.ae iraq.ir ire.ir ireland.ir irr.ir -freemail_domains jpg.ir ksa.ir kuwait.ir london.ir paltalk.ir spain.ir sweden.ir tokyo.ir - - -# scraped http://www.zemskov.net/free-email-domains.html 2013-10-18-khopesh - -# bigmailbox.com -freemail_domains 111mail.com 123iran.com 37.com 420email.com 4degreez.com -freemail_domains 4-music-today.com actingbiz.com allhiphop.com anatomicrock.com -freemail_domains animeone.com asiancutes.com a-teens.net ausi.com autoindia.com -freemail_domains autopm.com barriolife.com b-boy.com beautifulboy.com bgay.com -freemail_domains bicycledata.com bicycling.com bigheavyworld.com bigmailbox.net -freemail_domains bikerheaven.net bikermail.com billssite.com -freemail_domains blackandchristian.com blackcity.net blackvault.com bmxtrix.com -freemail_domains boarderzone.com boatnerd.com bolbox.com bongmail.com bowl.com -freemail_domains butch-femme.org byke.com calle22.com cannabismail.com -freemail_domains catlovers.com certifiedbitches.com championboxing.com -freemail_domains chatway.com chillymail.com classprod.com classycouples.com -freemail_domains congiu.net coolshit.com corpusmail.com cyberunlimited.org -freemail_domains cycledata.com darkfear.com darkforces.com dirtythird.com -freemail_domains dopefiends.com draac.com drakmail.net dr-dre.com dreamstop.com -freemail_domains egypt.net emailfast.com envirocitizen.com escapeartist.com -freemail_domains ezsweeps.com famous.as farts.com feelingnaughty.com -freemail_domains firemyst.com freeonline.com fudge.com funkytimes.com -freemail_domains gamerssolution.com gazabo.net glittergrrrls.com goatrance.com -freemail_domains goddess.com gohip.com gospelcity.com gothicgirl.com -freemail_domains grapemail.net greatautos.org guy.com haitisurf.com -freemail_domains happyhippo.com hateinthebox.com houseofhorrors.com hugkiss.com -freemail_domains hullnumber.com idunno4recipes.com ihatenetscape.com -freemail_domains intimatefire.com irow.com jazzemail.com juanitabynum.com -freemail_domains kanoodle.com kickboxing.com kidrock.com kinkyemail.com -freemail_domains kool-things.com latinabarbie.com latinogreeks.com leesville.com -freemail_domains loveemail.com lowrider.com lucky7lotto.net madeniggaz.net -freemail_domains mailbomb.com marillion.net megarave.com mofa.com motley.com -freemail_domains music.com musician.net musicsites.com netbroadcaster.com -freemail_domains netfingers.com net-surf.com nocharge.com operationivy.com -freemail_domains paidoffers.net pcbee.com persian.com petrofind.com -freemail_domains phunkybitches.com pikaguam.com pinkcity.net pitbullmail.com -freemail_domains planetsmeg.com poop.com poormail.com potsmokersnet.com -freemail_domains primetap.com project420.com prolife.net puertoricowow.com -freemail_domains puppetweb.com rapstar.com rapworld.com rastamall.com ratedx.net -freemail_domains ravermail.com relapsecult.com remixer.com rockeros.com -freemail_domains romance106fm.com singalongcenter.com sketchyfriends.com -freemail_domains slayerized.com smartstocks.com soulja-beatz.org -freemail_domains specialoperations.com speedymail.net spells.com -freemail_domains streetracing.com subspacemail.com sugarray.com -freemail_domains superbikeclub.com superintendents.net surfguiden.com -freemail_domains sweetwishes.com tattoodesign.com teamster.net teenchatnow.com -freemail_domains the5thquarter.com theblackmarket.com tombstone.ws troamail.org -freemail_domains u2tours.com vitalogy.org whatisthis.com wrestlezone.com -# gawab.com -freemail_domains abha.cc agadir.cc ahsa.ws ajman.cc ajman.us ajman.ws albaha.cc -freemail_domains algerie.cc alriyadh.cc amman.cc aqaba.cc arar.ws aswan.cc -freemail_domains baalbeck.cc bahraini.cc banha.cc bizerte.cc blida.info -freemail_domains buraydah.cc cameroon.cc dhahran.cc dhofar.cc djibouti.cc -freemail_domains dominican.cc eritrea.cc falasteen.cc fujairah.cc fujairah.us -freemail_domains fujairah.ws gabes.cc gafsa.cc giza.cc guinea.cc hamra.cc -freemail_domains hasakah.com hebron.tv homs.cc ibra.cc irbid.ws ismailia.cc -freemail_domains jadida.cc jadida.org jerash.cc jizan.cc jouf.cc kairouan.cc -freemail_domains karak.cc khaimah.cc khartoum.cc khobar.cc kuwaiti.tv -freemail_domains kyrgyzstan.cc latakia.cc lebanese.cc lubnan.cc lubnan.ws -freemail_domains madinah.cc maghreb.cc manama.cc mansoura.tv marrakesh.cc -freemail_domains mascara.ws meknes.cc muscat.tv muscat.ws nabeul.cc nabeul.info -freemail_domains nablus.cc nador.cc najaf.cc omani.ws omdurman.cc oran.cc -freemail_domains oued.info oued.org oujda.biz oujda.cc pakistani.ws palmyra.cc -freemail_domains palmyra.ws portsaid.cc qassem.cc quds.cc rabat.cc rafah.cc -freemail_domains ramallah.cc safat.biz safat.info safat.us safat.ws salalah.cc -freemail_domains salmiya.biz sanaa.cc seeb.cc sfax.ws sharm.cc sinai.cc siria.cc -freemail_domains sousse.cc sudanese.cc suez.cc tabouk.cc tajikistan.cc -freemail_domains tangiers.cc tanta.cc tayef.cc tetouan.cc timor.cc tunisian.cc -freemail_domains urdun.cc yanbo.cc yemeni.cc yunus.cc zagazig.cc zambia.cc -# other -freemail_domains 5005.lv a.org.ua bmx.lv company.org.ua coolmail.ru dino.lv -freemail_domains eclub.lv e-mail.am fit.lv hacker.am human.lv iphon.biz -freemail_domains latchess.com loveis.lv lv-inter.net pookmail.com sexriga.lv - -# Microsoft's new service 2013-10-18-khopesh -freemail_domains *.onmicrosoft.com - - -endif - diff -Nru spamassassin-3.4.6/trunk-only/rules/20_freemail_mailcom_domains.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_freemail_mailcom_domains.cf --- spamassassin-3.4.6/trunk-only/rules/20_freemail_mailcom_domains.cf 2014-09-17 14:15:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_freemail_mailcom_domains.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -# SpamAssassin - Mail.com Freemail domains file -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -# List contains commonly abused end user mail providers -# "freemail" is solely used for label purposes. - -# This dedicated list contains domains provided by mail.com - -# Updated 2014-09-17-axb - -ifplugin Mail::SpamAssassin::Plugin::FreeMail - -freemail_domains accountant.com acdcfan.com activist.com adexec.com africamail.com aircraftmail.com allergist.com alumni.com alumnidirector.com angelic.com appraiser.net archaeologist.com arcticmail.com artlover.com asia-mail.com asia.com atheist.com auctioneer.net australiamail.com -freemail_domains bartender.net bellair.net berlin.com bikerider.com birdlover.com blader.com boardermail.com brazilmail.com brew-master.com brew-meister.com bsdmail.com -freemail_domains californiamail.com cash4u.com catlover.com cheerful.com chef.net chemist.com chinamail.com clerk.com clubmember.org collector.org columnist.com comic.com computer4u.com consultant.com contractor.net coolsite.net counsellor.com cutey.com cyber-wizard.com cyberdude.com cybergal.com cyberservices.com -freemail_domains dallasmail.com dbzmail.com deliveryman.com diplomats.com disciples.com discofan.com disposable.com doctor.com doglover.com doramail.com dr.com dublin.com dutchmail.com -freemail_domains elvisfan.com email.com engineer.com englandmail.com europe.com europemail.com execs.com -freemail_domains fastservice.com financier.com fireman.net -freemail_domains galaxyhit.com gardener.com geologist.com germanymail.com graduate.org graphic-designer.com greenmail.net groupmail.com -freemail_domains hackermail.com hairdresser.net hilarious.com hiphopfan.com homemail.com hot-shot.com housemail.com humanoid.net -freemail_domains iname.acom iname.com innocent.com inorbit.com instruction.com instructor.net insurer.com irelandmail.com israelmail.com italymail.com -freemail_domains job4u.com journalist.com -freemail_domains keromail.com kissfans.com kittymail.com koreamail.com -freemail_domains legislator.com linuxmail.org lobbyist.com lovecat.com -freemail_domains madonnafan.com mail-me.com mail.com marchmail.com metalfan.com mexicomail.com minister.com moscowmail.com munich.com musician.org muslim.com myself.com -freemail_domains net-shopping.com ninfan.com nonpartisan.com null.net nycmail.com -freemail_domains oath.com optician.com orthodontist.net -freemail_domains pacific-ocean.com pacificwest.com pediatrician.com petlover.com photographer.net physicist.net planetmail.com planetmail.net polandmail.com politician.com post.com presidency.com priest.com programmer.net protestant.com publicist.com -freemail_domains qualityservice.com -freemail_domains radiologist.net ravemail.com realtyagent.com reborn.com reggaefan.com registerednurses.com reincarnate.com religious.com repairman.com representative.com rescueteam.com rocketship.com -freemail_domains safrica.com saintly.com salesperson.net samerica.com sanfranmail.com scientist.com scotlandmail.com secretary.net snakebite.com socialworker.net sociologist.com solution4u.com songwriter.net spainmail.com surgical.net swedenmail.com swissmail.com -freemail_domains teachers.org tech-center.com techie.com technologist.com theplate.com therapist.net toke.com toothfairy.com torontomail.com tvstar.com -freemail_domains umpire.com usa.com uymail.com -freemail_domains webname.com worker.com workmail.com writeme.com - -endif - - diff -Nru spamassassin-3.4.6/trunk-only/rules/20_head_tests.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_head_tests.cf --- spamassassin-3.4.6/trunk-only/rules/20_head_tests.cf 2018-02-24 00:37:46.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_head_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,601 +0,0 @@ -# SpamAssassin rules file: header tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -require_version @@VERSION@@ - -########################################################################### - -# partial messages; currently-theoretical attack -# unsurprisingly this hits 0/0 right now. -header FRAGMENTED_MESSAGE Content-Type =~ /\bmessage\/partial/i -describe FRAGMENTED_MESSAGE Partial message -tflags FRAGMENTED_MESSAGE userconf - -########################################################################### - -header FROM_BLANK_NAME From =~ /(?:\s|^)"" <\S+>/i -describe FROM_BLANK_NAME From: contains empty name - -########################################################################### -# numeric address rules, these are written to avoid overlap with each other - -header __FROM_ENDS_IN_NUMS From:addr =~ /\D\d{8,}\@/i - -header FROM_STARTS_WITH_NUMS From:addr =~ /^\d{3,50}[^0-9\@]/ -describe FROM_STARTS_WITH_NUMS From: starts with several numbers - -# don't match US/Canada phone numbers: 10 digits optionally preceded by a "1" -header __FROM_ALL_NUMS From:addr =~ /^(?:\d{1,9}|[02-9]\d{10}|\d{12,})@/ - -########################################################################### - -header FROM_OFFERS From:addr =~ /\@\S*offers(?![eo]n\b)/i -describe FROM_OFFERS From address is "at something-offers" - -header FROM_NO_USER From =~ /(?:^\@|<\@| \@[^\)<]*$|<>)/ [if-unset: unset@unset.unset] -describe FROM_NO_USER From: has no local-part before @ sign - -# also 100% valid -# bug 6149: avoid common .jp false positives -header __PLING_QUERY Subject =~ /\?.*!|!.*\?/ -meta PLING_QUERY (__PLING_QUERY && !__ISO_2022_JP_DELIM) -describe PLING_QUERY Subject has exclamation mark and question mark - - - - -header MSGID_SPAM_CAPS Message-ID =~ /^\s*/ -describe MSGID_SPAM_LETTERS Spam tool Message-Id: (letters variant) - - - -# negative lookahead exempts this MUA from circa 1997-2000 -# X-Mailer: Microsoft Outlook Express 4.71.1712.3 -# Message-ID: <01bd45da$2649cdc0$LocalHost@andrew> -header __MSGID_DOLLARS_OK MESSAGEID =~ /<[0-9a-f]{4,}\$[0-9a-f]{4,}\$[0-9a-f]{4,}\@\S+>/ -header __MSGID_DOLLARS_MAYBE MESSAGEID =~ /<\w{4,}\$\w{4,}\$(?!localhost)\w{4,}\@\S+>/i -meta MSGID_DOLLARS_RANDOM __MSGID_DOLLARS_MAYBE && !__MSGID_DOLLARS_OK - -# bit of a ratware rule, but catches a bit more than just the one ratware -header __MSGID_RANDY Message-ID =~ /<[a-z\d][a-z\d\$-]{10,29}[a-z\d]\@[a-z\d][a-z\d.]{3,12}[a-z\d]>/ -# heuristic to eliminate most good Message-ID formats -header __MSGID_OK_HEX Message-ID =~ /\b[a-f\d]{8}\b/ -header __MSGID_OK_DIGITS Message-ID =~ /\d{10}/ -header __MSGID_OK_HOST Message-ID =~ /\@(?:\D{2,}|(?:\d{1,3}\.){3}\d{1,3})>/ -meta MSGID_RANDY (__MSGID_RANDY && !(__MSGID_OK_HEX || __MSGID_OK_DIGITS || __MSGID_OK_HOST)) -describe MSGID_RANDY Message-Id has pattern used in spam - -# bug 3395 -header MSGID_YAHOO_CAPS Message-ID =~ /<[A-Z]+\@yahoo.com>/ -describe MSGID_YAHOO_CAPS Message-ID has ALLCAPS@yahoo.com - -########################################################################### - -header __AT_AOL_MSGID MESSAGEID =~ /\@aol\.com\b/i -header __FROM_AOL_COM From =~ /\@aol\.com\b/i -meta FORGED_MSGID_AOL (__AT_AOL_MSGID && !__FROM_AOL_COM) -describe FORGED_MSGID_AOL Message-ID is forged, (aol.com) - -header __AT_EXCITE_MSGID MESSAGEID =~ /\@excite\.com\b/i -header __MY_RCVD_EXCITE Received =~ /\.excite\.com\b/i -meta FORGED_MSGID_EXCITE (__AT_EXCITE_MSGID && !__MY_RCVD_EXCITE) -describe FORGED_MSGID_EXCITE Message-ID is forged, (excite.com) - -header __AT_HOTMAIL_MSGID MESSAGEID =~ /\@hotmail\.com\b/i -header __FROM_HOTMAIL_COM From =~ /\@hotmail\.com\b/i -meta FORGED_MSGID_HOTMAIL (__AT_HOTMAIL_MSGID && (!__FROM_HOTMAIL_COM && !__FROM_MSN_COM && !__FROM_YAHOO_COM)) -describe FORGED_MSGID_HOTMAIL Message-ID is forged, (hotmail.com) - -header __AT_MSN_MSGID MESSAGEID =~ /\@msn\.com\b/i -header __FROM_MSN_COM From =~ /\@msn\.com\b/i -meta FORGED_MSGID_MSN (__AT_MSN_MSGID && (!__FROM_MSN_COM && !__FROM_HOTMAIL_COM && !__FROM_YAHOO_COM)) -describe FORGED_MSGID_MSN Message-ID is forged, (msn.com) - -header __AT_YAHOO_MSGID MESSAGEID =~ /\@yahoo\.com\b/i -header __FROM_YAHOO_COM From =~ /\@yahoo\.com\b/i -meta FORGED_MSGID_YAHOO (__AT_YAHOO_MSGID && !__FROM_YAHOO_COM) -describe FORGED_MSGID_YAHOO Message-ID is forged, (yahoo.com) - -########################################################################### - -header __MSGID_BEFORE_RECEIVED ALL:raw =~ /^Message-Id:.*^Received:/msi -header __MSGID_BEFORE_OKAY Message-Id =~ /\@[a-z0-9.-]+\.(?:yahoo|wanadoo)(?:\.[a-z]{2,3}){1,2}>/ - -meta MSGID_FROM_MTA_HEADER (__MSGID_BEFORE_RECEIVED && !__MSGID_BEFORE_OKAY && !__FROM_HOTMAIL_COM) -describe MSGID_FROM_MTA_HEADER Message-Id was added by a relay - - - -header MSGID_SHORT MESSAGEID =~ /^.{1,15}$|<.{0,4}\@/ -describe MSGID_SHORT Message-ID is unusually short - -#DEMOTED TO SANDBOX - 2012-03-21 -#header MSGID_MULTIPLE_AT MESSAGEID =~ /<[^>]*\@[^>]*\@/ -#describe MSGID_MULTIPLE_AT Message-ID contains multiple '@' characters - -########################################################################### - -header DATE_SPAMWARE_Y2K Date =~ /^[A-Z][a-z]{2}, \d\d [A-Z][a-z]{2} [0-6]\d \d\d:\d\d:\d\d [A-Z]{3}$/ -describe DATE_SPAMWARE_Y2K Date header uses unusual Y2K formatting - -# as noted on the dev@ list, ":60" is valid for seconds when there's a leap -# second (12/31/2005 for instance), so let's accept that as valid. ISO 8601 -# apparently allows for it. -# there were a few whitespace issues in the original RE, and I wanted to avoid my -# two common, but yes invalid, date headers. specifically / \(GMT\)$/ and -# / 0000 GMT$/. dos has / "GMT"$/ - tvd -# 2.229 2.7267 0.0517 0.981 0.86 0.00 INVALID_DATE -# 2.263 2.7486 0.1368 0.953 0.78 0.00 INVALID_DATE_OLD -# -# WRT the tests, remember that ok and fail are reversed -- so valid dates -# should be "fail" and invalid dates should be "ok". -header INVALID_DATE Date !~ /^\s*(?:(?i:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s)?\s*(?:[12]\d|3[01]|0?[1-9])\s+(?i:Jan|Feb|Ma[ry]|Apr|Ju[nl]|Aug|Sep|Oct|Nov|Dec)\s+(?:19[7-9]\d|2\d{3})\s+(?:[01]?\d|2[0-3])\:[0-5]\d(?::(?:[0-5]\d|60))?(?:\s+[AP]M)?(?:\s+(?:[+-][0-9]{4}|UT|[A-Z]{2,3}T|0000 GMT|"GMT"))?(?:\s*\(.*\))?\s*$/ [if-unset: Wed, 31 Jul 2002 16:41:57 +0200] -describe INVALID_DATE Invalid Date: header (not RFC 2822) -test INVALID_DATE fail Sat, 31 Dec 2005 23:59:60 -0500 -test INVALID_DATE fail Wed, 31 Jul 2002 16:41:57 +0200 -test INVALID_DATE fail Sat, 31 Dec 2005 23:00:00 -test INVALID_DATE ok Sat, 31 Dec 2005 24:00:00 -0500 -test INVALID_DATE ok Thurs, 31 Jul 2002 16:41:57 +0200 - -# allow +1300, NZ timezone -header INVALID_DATE_TZ_ABSURD Date =~ /[-+](?!(?:0\d|1[0-4])(?:[03]0|[14]5))\d{4}$/ -describe INVALID_DATE_TZ_ABSURD Invalid Date: header (timezone does not exist) - -header INVALID_TZ_CST ALL:raw =~ /[+-]\d\d[30]0(?, see SpamAssassin-talk list 2003-03 -# quinlan: 2003-03-23 here are more generic Japanese iso-2022-jp codes -# ("not yet acceptance" or "email") + "announcement" -# FWIW, according to Peter Evans, this should be sufficient to catch the -# UCE tag and a common attempt at evasion (using the "sue" instead of -# "mi" Chinese character). 2006-10-12: updated by bug 4021. -header JAPANESE_UCE_SUBJECT Subject =~ /\e\$B.*(?:L\$>5Bz|EE;R%a!<%k)(?:8x|9-)9p/ -describe JAPANESE_UCE_SUBJECT Subject contains a Japanese UCE tag - -# check body for "shou nin daku kou koku" UCE tag (bug 4021) -body __JAPANESE_UCE_BODY /(?:L\$>5Bz|EE;R%a!<%k)(?:8x|9-)9p/ - -meta JAPANESE_UCE_BODY (__ISO_2022_JP_DELIM && __JAPANESE_UCE_BODY) -describe JAPANESE_UCE_BODY Body contains Japanese UCE tag - -# quinlan: "advertisement" in Russian KOI8-R -# (no longer common, but worth noting in future) -#header RUSSIAN_UCE_SUBJECT Subject =~ /\xf0\xe5\xea\xeb\xe0\xec\xf3/ -#describe RUSSIAN_UCE_SUBJECT Subject contains a Russian UCE tag - -# Korean UCE Subject: lines are usually 8-bit, but are occasionally encoded -# with quoted-printable or base64. -# -# \xbc\xba\xc0\xce means "adult" -# \xb1\xa4\xb0\xed means "advertisement" -# \xc1\xa4\xba\xb8 means "information" -# \xc8\xab\xba\xb8 means "publicity" -# -# Each two byte sequence is one Korean letter; the spaces and periods are -# sometimes used to obscure the words. \xb1\xa4\xb0\xed is the most common -# tag and is sometimes very obscured so we look harder. -# -header KOREAN_UCE_SUBJECT Subject =~ /[({[<][. ]*(?-i:\xbc\xba[. ]*\xc0\xce[. ]*)?(?-i:\xb1\xa4(?:[. ]*|[\x00-\x7f]{0,3})\xb0\xed|\xc1\xa4[. ]*\xba\xb8|\xc8\xab[. ]*\xba\xb8)[. ]*[)}\]>]/ -describe KOREAN_UCE_SUBJECT Subject: contains Korean unsolicited email tag - -########################################################################### - -# two reliable signatures -header __DOUBLE_IP_SPAM_1 Received =~ /from \[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\] by \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} with/ -header __DOUBLE_IP_SPAM_2 Received =~ /from\s+\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s+by\s+\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3};/ -# loose match -header __DOUBLE_IP_LOOSE Received =~ /(?:\b(?:from|by)\b.{1,4}\b\d{1,3}[._-]\d{1,3}[._-]\d{1,3}[._-]\d{1,3}(? 1) -describe MULTI_FORGED Received headers indicate multiple forgeries - -header NONEXISTENT_CHARSET Content-Type =~ /charset=.?DEFAULT/ -describe NONEXISTENT_CHARSET Character set doesn't exist - -header __HAS_MESSAGE_ID exists:Message-Id -meta MISSING_MID !__HAS_MESSAGE_ID -describe MISSING_MID Missing Message-Id: header - -header __HAS_DATE exists:Date -meta MISSING_DATE !__HAS_DATE -describe MISSING_DATE Missing Date: header - -header __HAS_SUBJECT exists:Subject -meta MISSING_SUBJECT !__HAS_SUBJECT -describe MISSING_SUBJECT Missing Subject: header - -# bug 6353 -header __HAS_FROM exists:From -meta MISSING_FROM !__HAS_FROM -describe MISSING_FROM Missing From: header - -# bug 6149: avoid common .jp false positives -header __GAPPY_SUBJECT Subject =~ /\b(?:[a-z]([-_. =~\/:,*!\@\#\$\%\^&+;\"\'<>\\])\1{0,2}){4}/i -meta GAPPY_SUBJECT (__GAPPY_SUBJECT && !__ISO_2022_JP_DELIM) -describe GAPPY_SUBJECT Subject: contains G.a.p.p.y-T.e.x.t - -### header existence tests (description is added automatically) - -# X-Fix example: NTMail fixed non RFC822 compliant EMail message -# -# X-PMFLAGS is all caps -# -# Headers that seem to only be used by a single spamming software and -# are found together in the same message: -# 1. X-MailingID and X-ServerHost -# 2. X-Stormpost-To and X-List-Unsubscribe -# -# not spammish: X-EM-Registration, X-EM-Version, X-Antiabuse, X-List-Host, -# X-Message-Id -# bad FP rate: Comment, Date-warning - -header PREVENT_NONDELIVERY exists:Prevent-NonDelivery-Report -describe PREVENT_NONDELIVERY Message has Prevent-NonDelivery-Report header - -header X_IP exists:X-IP -describe X_IP Message has X-IP header - -header __HAS_MIMEOLE exists:X-MimeOLE -header __HAS_MSMAIL_PRI exists:X-MSMail-Priority -header __HAS_SQUIRRELMAIL_IN_MAILER X-Mailer =~ /SquirrelMail\b/ -# Bug 6346 -# 2015-01-22 expanded to Office 15 as well per bug 7122 -header __HAS_OFFICE1214_IN_MAILER X-Mailer =~ /^Microsoft (?:Office )?Outlook 1[245]\.0/ -meta MISSING_MIMEOLE (__HAS_MSMAIL_PRI && !__HAS_MIMEOLE && !__HAS_SQUIRRELMAIL_IN_MAILER && !__HAS_OFFICE1214_IN_MAILER) -describe MISSING_MIMEOLE Message has X-MSMail-Priority, but no X-MimeOLE - -header __HAS_X_MAILER exists:X-Mailer - -header __IS_EXCH X-MimeOLE =~ /Produced By Microsoft Exchange V/ - -header SUBJ_AS_SEEN Subject =~ /\bAs Seen/i -describe SUBJ_AS_SEEN Subject contains "As Seen" - -header SUBJ_DOLLARS Subject =~ /^\$[0-9.,]+\b/ -describe SUBJ_DOLLARS Subject starts with dollar amount - - - - - - -#DISABLING DUE TO POOR S/O 2012-09-27 -#header SUBJ_YOUR_DEBT Subject =~ /Your (?:Bills|Debt|Credit)/i -#describe SUBJ_YOUR_DEBT Subject contains "Your Bills" or similar - -header SUBJ_YOUR_FAMILY Subject =~ /Your Family/i -describe SUBJ_YOUR_FAMILY Subject contains "Your Family" - - -# the real services never HELO as 'foo.com', instead 'mail.foo.com' or -# something like that. Note: be careful when expanding this... legit dotcom -# HELOers include: hotmail.com, drizzle.com, lockergnome.com. -header RCVD_FAKE_HELO_DOTCOM Received =~ /^from (?:msn|yahoo|yourwebsite|lycos|excite|cs|aol|localhost|koreanmail|allexecs|mydomain|juno|eudoramail|compuserve|desertmail|excite|caramail)\.com \(/m -describe RCVD_FAKE_HELO_DOTCOM Received contains a faked HELO hostname - -header SUBJECT_DIET Subject =~ /\bLose .*(?:pounds|lbs|weight)/i -describe SUBJECT_DIET Subject talks about losing pounds - - -# MIME boundary tests; spam tools use distinctive patterns. -header MIME_BOUND_DD_DIGITS Content-Type =~ /boundary=\"--\d+\"/ -describe MIME_BOUND_DD_DIGITS Spam tool pattern in MIME boundary -header MIME_BOUND_DIGITS_15 Content-Type =~ /boundary=\"\d{15,}\"/ -describe MIME_BOUND_DIGITS_15 Spam tool pattern in MIME boundary -header MIME_BOUND_MANY_HEX Content-Type =~ /boundary="[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}"/ -describe MIME_BOUND_MANY_HEX Spam tool pattern in MIME boundary - -# note: the first alternation is anchored for speed -header TO_MALFORMED To !~ /(?:^|[^\S"])(?:(?:\"[^\"]+\"|\S+)\@\S+\.\S+|^\s*.+:\s*;|^\s*\"[^\"]+\":\s*;|^\s*\([^\)]*\)\s*$|<\S+(?:\!\S+){1,}>|^\s*$)/ [if-unset: unset@unset.unset] -describe TO_MALFORMED To: has a malformed address - -header __CD exists:Content-Disposition -header __CT exists:Content-Type -header __CTE exists:Content-Transfer-Encoding -header __MIME_VERSION exists:MIME-Version -header __CT_TEXT_PLAIN Content-Type =~ /^text\/plain\b/i -meta MIME_HEADER_CTYPE_ONLY (!__CD && !__CTE && __CT && !__MIME_VERSION && !__CT_TEXT_PLAIN) -describe MIME_HEADER_CTYPE_ONLY 'Content-Type' found without required MIME headers - -header WITH_LC_SMTP Received =~ /\swith\ssmtp;\s/ -describe WITH_LC_SMTP Received line contains spam-sign (lowercase smtp) - - -header SUBJ_BUY Subject =~ /^buy/i -describe SUBJ_BUY Subject line starts with Buy or Buying - -# seems to be ratware -header RCVD_AM_PM Received =~ /; [A-Z][a-z][a-z], \d{1,2} \d{4} \d{1,2}:\d\d:\d\d [AP]M [+-]\d{4}/ -describe RCVD_AM_PM Received headers forged (AM/PM) - -header __USER_AGENT_MSN X-Mailer =~ /^MSN Explorer / - -# host no longer exists according to administrator -header FAKE_OUTBLAZE_RCVD Received =~ /\.mr\.outblaze\.com/ -describe FAKE_OUTBLAZE_RCVD Received header contains faked 'mr.outblaze.com' - - -# thanks to David Ritz for passing this on -header UNCLOSED_BRACKET ALL =~ /\[\d+\r?\n/s -describe UNCLOSED_BRACKET Headers contain an unclosed bracket - -header FROM_DOMAIN_NOVOWEL From =~ /\@\S*[bcdfgjklmnpqrstvwxz]{7}/i -describe FROM_DOMAIN_NOVOWEL From: domain has series of non-vowel letters -tflags FROM_DOMAIN_NOVOWEL userconf # lock scores low - -header FROM_LOCAL_NOVOWEL From =~ /[bcdfgjklmnpqrstvwxz]{7}\S*\@/i -describe FROM_LOCAL_NOVOWEL From: localpart has series of non-vowel letters -tflags FROM_LOCAL_NOVOWEL userconf # lock scores low - -header FROM_LOCAL_HEX From =~ /[0-9a-f]{11}\S*\@/i -describe FROM_LOCAL_HEX From: localpart has long hexadecimal sequence - -header FROM_LOCAL_DIGITS From =~ /\d{11}\S*\@/i -describe FROM_LOCAL_DIGITS From: localpart has long digit sequence - -header __TOCC_EXISTS exists:ToCc - -header X_PRIORITY_CC ALL:raw =~ /^X-Priority:[^\n]{0,80}^Cc:/msi -describe X_PRIORITY_CC Cc: after X-Priority: (bulk email fingerprint) - -# catch non-RFC2047 compliant messages -# Apple Mail has a bug where headers will have whitespace around the encoded -# text, so try to ignore that -header BAD_ENC_HEADER ALL:raw =~ /=\?[^?\s]+\?[^?\s]\?\s*[^?]+\s(?!\?=)/ -describe BAD_ENC_HEADER Message has bad MIME encoding in the header - - -header __ML1 Precedence =~ m{\b(list|bulk)\b}i -header __ML2 exists:List-Id -header __ML3 exists:List-Post -header __ML4 exists:Mailing-List -header __ML5 Return-Path:addr =~ m{^([^\@]+-(request|bounces|admin|owner)|owner-[^\@]+)(\@|\z)}i -meta __VIA_ML __ML1 || __ML2 || __ML3 || __ML4 || __ML5 -describe __VIA_ML Mail from a mailing list - - -# some clueless mailing lists (like zmailer with an RFC822TABS option on) -# are replacing a leading space by a TAB in header fields From, To, -# Cc, Date (Bug 6429) -header __ML_TURNS_SP_TO_TAB Received =~ /\(ORCPT = 3.004002) -header FORGED_GMAIL_RCVD eval:check_for_forged_gmail_received_headers() -describe FORGED_GMAIL_RCVD 'From' gmail.com does not match 'Received' headers -endif - -header __FORGED_JUNO_RCVD eval:check_for_forged_juno_received_headers() - - - -header SORTED_RECIPS eval:sorted_recipients() -describe SORTED_RECIPS Recipient list is sorted by address - -header SUSPICIOUS_RECIPS eval:similar_recipients('0.65','undef') -describe SUSPICIOUS_RECIPS Similar addresses in recipient list - -# this is a quite common false positive, as it's legal to remove a To but leave -# a CC. so don't score it high. -header MISSING_HEADERS eval:check_for_missing_to_header() -describe MISSING_HEADERS Missing To: header - -header DATE_IN_PAST_03_06 eval:check_for_shifted_date('-6', '-3') -describe DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date - -header DATE_IN_PAST_06_12 eval:check_for_shifted_date('-12', '-6') -describe DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date - -header DATE_IN_PAST_12_24 eval:check_for_shifted_date('-24', '-12') -describe DATE_IN_PAST_12_24 Date: is 12 to 24 hours before Received: date - -header DATE_IN_PAST_24_48 eval:check_for_shifted_date('-48', '-24') -describe DATE_IN_PAST_24_48 Date: is 24 to 48 hours before Received: date - - -header DATE_IN_PAST_96_XX eval:check_for_shifted_date('undef', '-96') -describe DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date - -header DATE_IN_FUTURE_03_06 eval:check_for_shifted_date('3', '6') -describe DATE_IN_FUTURE_03_06 Date: is 3 to 6 hours after Received: date - -header DATE_IN_FUTURE_06_12 eval:check_for_shifted_date('6', '12') -describe DATE_IN_FUTURE_06_12 Date: is 6 to 12 hours after Received: date - -header DATE_IN_FUTURE_12_24 eval:check_for_shifted_date('12', '24') -describe DATE_IN_FUTURE_12_24 Date: is 12 to 24 hours after Received: date - -header DATE_IN_FUTURE_24_48 eval:check_for_shifted_date('24', '48') -describe DATE_IN_FUTURE_24_48 Date: is 24 to 48 hours after Received: date - -header DATE_IN_FUTURE_48_96 eval:check_for_shifted_date('48', '96') -describe DATE_IN_FUTURE_48_96 Date: is 48 to 96 hours after Received: date - -#header DATE_IN_FUTURE_96_XX eval:check_for_shifted_date('96', 'undef') -meta DATE_IN_FUTURE_96_XX (0) -describe DATE_IN_FUTURE_96_XX Date: is 96 hours or more after Received: date - -header UNRESOLVED_TEMPLATE eval:check_unresolved_template() -describe UNRESOLVED_TEMPLATE Headers contain an unresolved template - -header SUBJ_ALL_CAPS eval:subject_is_all_caps() -describe SUBJ_ALL_CAPS Subject is all capitals - - -header LOCALPART_IN_SUBJECT eval:check_for_to_in_subject('user') -describe LOCALPART_IN_SUBJECT Local part of To: address appears in Subject - -header MSGID_OUTLOOK_INVALID eval:check_outlook_message_id() -describe MSGID_OUTLOOK_INVALID Message-Id is fake (in Outlook Express format) - -header HEADER_COUNT_CTYPE eval:check_header_count_range('Content-Type','2','999') -describe HEADER_COUNT_CTYPE Multiple Content-Type headers found - -endif - -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::MIMEEval - -# this is also mostly-theoretical, so allow 0 hits -header HEAD_LONG eval:check_msg_parse_flags('truncated_header') -describe HEAD_LONG Message headers are very long -tflags HEAD_LONG userconf - -header MISSING_HB_SEP eval:check_msg_parse_flags('missing_head_body_separator') -describe MISSING_HB_SEP Missing blank line between message header and body -tflags MISSING_HB_SEP userconf - -endif - -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::RelayEval - -header __UNPARSEABLE_RELAY_COUNT eval:check_relays_unparseable() -tflags __UNPARSEABLE_RELAY_COUNT userconf - -meta UNPARSEABLE_RELAY (__UNPARSEABLE_RELAY_COUNT >= 1) -tflags UNPARSEABLE_RELAY userconf -describe UNPARSEABLE_RELAY Informational: message has unparseable relay lines - - -header RCVD_HELO_IP_MISMATCH eval:helo_ip_mismatch() -describe RCVD_HELO_IP_MISMATCH Received: HELO and IP do not match, but should - -header RCVD_NUMERIC_HELO eval:check_for_numeric_helo() -describe RCVD_NUMERIC_HELO Received: contains an IP address used for HELO - -# not used directly right now due to FPs; but CONFIRMED_FORGED turns it -# into a 1.0 S/O rule anyway, so that's not a problem ;) -# 2.626 3.6340 1.5251 0.704 0.34 1.44 FORGED_RCVD_TRAIL -# 0.956 3.3890 0.0000 1.000 0.98 4.30 CONFIRMED_FORGED -header __FORGED_RCVD_TRAIL eval:check_for_forged_received_trail() - -header NO_RDNS_DOTCOM_HELO eval:check_for_no_rdns_dotcom_helo() -describe NO_RDNS_DOTCOM_HELO Host HELO'd as a big ISP, but had no rDNS - -endif - -ifplugin Mail::SpamAssassin::Plugin::HeaderEval - -header __ENV_AND_HDR_FROM_MATCH eval:check_for_matching_env_and_hdr_from() - -endif - diff -Nru spamassassin-3.4.6/trunk-only/rules/20_html_tests.cf spamassassin-4.0.0~rc3/trunk-only/rules/20_html_tests.cf --- spamassassin-3.4.6/trunk-only/rules/20_html_tests.cf 2014-04-11 06:16:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/20_html_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -# SpamAssassin rules file: HTML tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -require_version @@VERSION@@ - -# HTML parser tests -# -# please sort these by eval type then name - -meta HTML_SHORT_LINK_IMG_1 __HTML_LENGTH_0000_1024 && __HTML_LINK_IMAGE -meta HTML_SHORT_LINK_IMG_2 __HTML_LENGTH_1024_1536 && __HTML_LINK_IMAGE -meta HTML_SHORT_LINK_IMG_3 __HTML_LENGTH_1536_2048 && __HTML_LINK_IMAGE -describe HTML_SHORT_LINK_IMG_1 HTML is very short with a linked image -describe HTML_SHORT_LINK_IMG_2 HTML is very short with a linked image -describe HTML_SHORT_LINK_IMG_3 HTML is very short with a linked image - - -meta HTML_SHORT_CENTER (__HTML_LENGTH_384 && __TAG_EXISTS_CENTER) -describe HTML_SHORT_CENTER HTML is very short with CENTER tag - - -meta HTML_TITLE_SUBJ_DIFF __HTML_TITLE_SUBJ_DIFF && !__MIME_ATTACHMENT - -meta HTML_CHARSET_FARAWAY (__HTML_CHARSET_FARAWAY && __HIGHBITS) -describe HTML_CHARSET_FARAWAY A foreign language charset used in HTML markup -tflags HTML_CHARSET_FARAWAY userconf - -meta HTML_MIME_NO_HTML_TAG MIME_HTML_ONLY && !__TAG_EXISTS_HTML -describe HTML_MIME_NO_HTML_TAG HTML-only message, but there is no HTML tag - -meta HTML_MISSING_CTYPE (!__MIME_HTML && HTML_MESSAGE) -describe HTML_MISSING_CTYPE Message is HTML without HTML Content-Type - -########################################################################### -# rawbody HTML tests - -rawbody HIDE_WIN_STATUS /<[^>]+onMouseOver=[^>]+window\.status=/i -describe HIDE_WIN_STATUS Javascript to hide URLs in browser - -rawbody __OBFUSCATING_COMMENT_A /\w(?:]*>)+\w/ -rawbody __OBFUSCATING_COMMENT_B /[^\s>](?:]*>)+[^\s<]/ -ifplugin Mail::SpamAssassin::Plugin::HTMLEval -ifplugin Mail::SpamAssassin::Plugin::MIMEEval -meta OBFUSCATING_COMMENT ((__OBFUSCATING_COMMENT_A && HTML_MESSAGE) || (__OBFUSCATING_COMMENT_B && MIME_HTML_ONLY)) && !__ISO_2022_JP_DELIM -describe OBFUSCATING_COMMENT HTML comments which obfuscate text -endif -endif - -# spams that are assembled from a Javascript array -# look for the XOR op -rawbody __JS_FROMCHARCODE /String\.fromCharCode\s*\(\s*\S+\s*\[\s*\S+\s*\]\s*\^/ -rawbody __JS_DOCWRITE /document\.write/ -meta JS_FROMCHARCODE (__JS_FROMCHARCODE && __JS_DOCWRITE) -describe JS_FROMCHARCODE Document is built from a Javascript charcode array - -# a good possible rule that may resurface -# ! $ % ' ( ) , - . / : ; = ? @ _ -#rawbody ENTITY_DEC_OTHER /\&\#0*(?:3[3679]|4[014567]|5[89]|6[134]|95)\;/ -#describe ENTITY_DEC_OTHER HTML contains needlessly encoded punctuation - -body __HIGHBITS /(?:[\x80-\xff].?){4}/ -# note: __HIGHBITS is used by HTML_CHARSET_FARAWAY - -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::HTMLEval - -# HTML control test, HTML spam rules should all have better S/O than this -body HTML_MESSAGE eval:html_test('html') -describe HTML_MESSAGE HTML included in message - -# HTML comment tests -body HTML_COMMENT_SHORT eval:html_text_match('comment', '') -describe HTML_COMMENT_SHORT HTML comment is very short - -body HTML_COMMENT_SAVED_URL eval:html_text_match('comment', ' -test TRACKER_ID fail Donau-Dampfschifffahrts-Kapitaen - -test __OBFUSCATING_COMMENT_A ok This is a test -test __OBFUSCATING_COMMENT_A fail Not a here -test __OBFUSCATING_COMMENT_A fail or here -test __OBFUSCATING_COMMENT_A fail This I hope - -test HIDE_WIN_STATUS ok with any questions. - - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.2 (SunOS) - -mQILBEOnbDQBEADBfda+hU8cGXD/2WYrIHsZ5CmvC2eCYKgQ87W706tzwmxoZWQS -JfnRpkZnBqS5WDhXhNBOhk9CgF5/e9yHnDQCusNYfRstKd+t0XTFvq30/tacrJNe -67zgq+DtWqIK9C7akfElc+2M5NkX6mF4cjaMXZoW17ltPy0XSSeirf584nvK3pXf -oEFLYQ/0AUV9EBpo9+i2DkMUd8d5tz7A6O5foB3ijYPzIcVtVJ1eyCg6gO1I4cIA -YbIZCH0WIVx5MQjydfKyCR4D7VFPpZgwcZ1PmyZSsy3lrigGVvYEoUS2fWTt2jUO -pB3wg5pgzuu9hN5CpChZGvq65t4PGtAeShnBkddIH4l+iDC6sAc6W06KidSaUCW1 -BKvNMa39lyEkO4bfLblZRjoZbj7Tjq3wQV/PLpPyKDa8ZZ88GfWaeRDUNRgZG6Qq -e6UKlFGfrw2RXOImUje7Sjy/eG4Ud/BOeGkV913yWBm9CHsPNtaVDK+iQI6vkAWS -3QkiPjBkXGTZFHsUx9/i3k5Iga6d4Gq2cBIVBur3sDxjKuuSazLwA9OAybpzQe2s -PvTzbGc/f1P7plT++HBFlBHwFtl/v68Q8pkbMWlEc5M9nYJ6yXHATHZzFfThxBwt -OYfF25XGaclUMkOMX++RiRkmjaEaT7Whv5aPbeb3+H3v6Omjvnebge24lQAGKbQ/ -dXBkYXRlcy5zcGFtYXNzYXNzaW4ub3JnIFNpZ25pbmcgS2V5IDxyZWxlYXNlQHNw -YW1hc3Nhc3Npbi5vcmc+iQI2BBMBAgAgBQJDp2w0AhsDBgsJCAcDAgQVAggDBBYC -AwECHgECF4AACgkQQFamGlJE7EVkfg//ZjBQ6UXDizX9UPsEmogWXIqbBsyP5DJH -uToaFa6OzCbOJqcYnXNfOjovYdDOTje+x3ZEkwbx+y6MSfhmDuHPDPqBU7hXenxx -oRktC68mJasKo0wXym2YfyWFnhSZMlXXFQ9We48zNGcVRckzaxLzM67BFJuRUfOM -EV6Lf3HxMvoUK3/Xzq9YPEq2sqFO1Eu+qPC3nq726Tj/aYBBFHgHmbjDrZTaQNyV -fHvEjDzPcDRjlJI+vZw1UEuXG+BKATPpiT7U7I1OGLDa2ExDIxh0+eJnsmA3YyHG -VweE7nDN2GmkXMVfa5vXHH49Ae9Ee8jIIRipfgMgZWnkZ0XYDvLj2ueH0Ixu4o9R -D2zJIwqzRh1sytG+1YOfHrOMUCplImJaY/ARgOM324ZdBvhkgIi1XvT7Sy/ZmGWd -DKFo+GjX0r2cujR8Pd4i7VlKsF9wRypk+n/aupXiaz5GY44EIVbnweyS5IlCNrwn -4UtqcB9/9uk1tmUNIcC5xjbq5ud/Y+iMIqCKCH0C9WUwSNSdsg+K+9xoZuvlaXY0 -JeXWNcDdq+tMir+x+/o0U4ENVYBkSFesnotmHwN6jZj4lSMRmvcFHPBljXqLqzM+ -y5wZxnCo1N7T+erZaI7BUrpJYm8JxcJ2VCWV0JFoO1Ec//B6XYB0pckbRuSTX/Zw -pKEkNqOdmjm5AgsEQ6dsigEQAKvdggbwqJgfDbRE2Lcy2gsn4j7haqu3IVBbyUDn -kGuuDuEtSeoRjCZXEb5DaKibIpEy5vzvRGvCFFkrBs4KXk/uamkgCpGnQZFnoz/S -rNZ8U7+e1pecEePpIkhQyafUKox9+p43UVoq4UybdPRDvE9SmQ1qaNUhyQY2FP9S -WT1a63u5GA73aH4puGO0BuZ9R3MNaDYZe/MOlRRjmlAsbY4oqWOudlNVaZ71EV3O -FFmOH4pnpxdO0X0l6sF6nvqvO5/gdZ3dI5iqrJjUneVgVOmPkREq7tQ5qHS/2pny -rDrH8NZCDNT5TXciBxBrt53bxxL/V/HWaolmtJi8gK82uXt8YlmT6zuEsofufDmu -P/HMDZ+BhGI+ggNzY2AVwERTRD6ecHDOI3iIuCP4Ck26YNHRCLyocL3CSlIpjQPu -tb3qfdAcqKLJ/fVyLtGkXr24crel6IeJY7/AGjYBrfh47DWnK7Xds8bAqJ8VCjOc -/q1usFTHgGkYocvtv0gmcjbu8YypzuG8HxOg9Yk9qRLQgg1fNhzXE2lqEPyMlBfj -eLmMNRvKP70fH8CK8adinPIegaRrS6gZ/iIdv8+YV+1rlEt28qzzGJxnmzUEmW6X -Xj44u91umg9WOsLxTOCQWdjGHonytHqj/xIsf45N2JIGLhU0lF04hYfEo5p65AyM -PpYhAAYpiQIfBBgBAgAJBQJDp2yKAhsCAAoJEEBWphpSROxFungP/iWKe7o8szOz -VmXkj89xDVFZ69nthVKkbgSYIZYQC+QLF8P1MWRnNWO/8TY+XsaCT3SrqxDFQ/R/ -9mlAPGUM1ySVihOPmP/DPiOlWLCsc0mb6OzYF2olcOR33s05MqvJlqXSmIrdB+hI -KkC7G5byZ+XZwPXVj4XlxIEOzs18+0YJqy0IPZPXTiMet4k2KyWyWkJpJYUCb19G -R6QC8hZQD97EYTbkbr5Ss26jjY/9AqLofW5F1/98pLDo+ron7pI2k8Ymn5DngEsa -XoGsQuyvPfTAjS4p9q/XwExJcX3gvQesdw18mpoSaGAOgDISolBPRqpHpy7v7vuw -3UMnsefKOX3F0Rossevw+c2/JCulnGmJDlgz6nHSR6FhHsbrDKF8oBeYPfGW/Kjw -NvzB1i9yubAMrsTQVu1Q8e5LsnL/MNYKb6oEJbBywdeHxBkehGWFXVdSoFvVSih/ -VNqX9f7jlybpLZW/n8cQ2r1ax19v7FleO/xSGvkYm7B1+4BW0mjy6A5dta5+e5WG -D5R06Uya3/xRAPGdmV6t4Mw8fFsuyCvs+vC73PR3+eS1UvCYsDpcQD8KpVBnsHaA -duWRKKhjuFL0vdOWAr25tFOTKAj5Ywas47PBukO0isov2WBCA1rVqOr6FUvdP76y -mqHv/0E6/vnTLxFoNsu4Ce42nAQ/A/jRiQQ+BBgBAgAJAhsCBQJHhbheAinBXSAE -GQECAAYFAkOnbIoACgkQbFU5eCT0NM68MQ/8DvYqxRm3vP0Gwnr+63kzET8S+6vf -gxOghnU+eMlqUeUu/ajqnVDMzoAIRDw9QgQc9ZZoklOSJQwOuloAbdpL4TwQ2XfJ -MLU60JkZWnEOXJwClb0qG1GqtcBPbMEUPfZcQfphdRL3jpWZlaexFiJRSD+A0riw -7q3NZKPDt4FrF7F3GY9krFy+P0nRt5f462DeDhCYZgguBQH+oGtjc5Hx+kOVWDsS -txo5xkt4/0DG50ZklPkTlCohmJwRLACy+NswdQ9q83eWAhzKOPgkal7xF6a+LyE+ -ytVYy2EgEU74r2gVw5iizy92FDj//Z2QAUyf/c4BMuAhvfwVIHd8n2DPHvpMP15L -6fwoymh0OjzmhwK94Z2u1YqNC1CK27/hfB6okQ/Tct7/Ik61dBjtiYdUC9tTA5Ze -W8X5ouSmttS1QFixx+Z4hiXV7Qj12lgVKuJohjrVshfcbVzTHljjAo3YkOZIHIoA -IJTUMRNzTIx9k4hrPVbxbVQhKjKTwFNtBuxvmptGTcLEIv9THpqlq8jkcStJ2Zrd -hhofPCWRT/Kzo+WE+Kgefv88T5Li7Ku12U/UpiK85+6nRspXj3rnkfDOUbLZjGM+ -1NET0xQTPuyxN6CXF7MMxfGCpszCudYxMANDQqNXu9brcPN/+EIxGRjqin4E7q+h -kYUaY7Ki8mXtJ8cJEEBWphpSROxFktcQALWQv996bFq1iFcGuQ0ITxNDlOWCsses -bgEM5zR10DH+6s2bXEO8xyDHQJtrvdCPetRDosnuOToBMnGMXTYVytnWzwwAzwq1 -YM+bGAeTHaIX+2UmxwFyX4GMOdqsNB+xDZ8pmRKjamJSgUQt6e18YpZlg1Y4QkxS -Vptq7OZBjiKeLUhLhGJ6GWgEIedLcoCtFzKCfz3zwn0Oxl+1EnVu8yqN+quWTf8P -7EZn+0ztqZY059BrcK2jmOyXvtOZBcAHXCUknh/uPHwAJV2WFWSNid2kNiLOrV+J -3eLTs5sF9wNhxWRhl6/10cwTzjy0Onv5cJh2tjdwksigMRMwz4c839zXORni/tnY -+IY22kNTKu84gB8rBuqUq8MQXNdS3bbROwwNUzpC0D1C1z1fBvyXDL1EwJdz70Wc -2m/Sw6tIid5g98+XMW+Ibt43Jk2XbK71JLhbVbePbAcHVh/UXEtnjhRfX7oyWlwS -a+lkKMiJd/6CQ6bvYsgklE7uEzTpRskpkkOcCk1O+8jfl+DsDwKrvVaNu8tpx45k -TtV4JDA6iEHKakD/zZdVTR79W2CFqBvRfRikc5INOl1OfMQ4ODmjkMl3yI9wrHwS -SQQxdq2XsS7xbU9HDFBEguQDu0rfzILZ9DuKIVHyr/CsRoJ5joj+JvKaUQC81ywQ -aB8EKy5bg4U6 -=IbYW ------END PGP PUBLIC KEY BLOCK----- diff -Nru spamassassin-3.4.6/trunk-only/rules/STATISTICS-set0.txt spamassassin-4.0.0~rc3/trunk-only/rules/STATISTICS-set0.txt --- spamassassin-3.4.6/trunk-only/rules/STATISTICS-set0.txt 2009-12-02 18:11:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/STATISTICS-set0.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,998 +0,0 @@ -STATISTICS REPORT FOR SPAMASSASSIN RULESET - -Classification success on test corpora, at default threshold: - -# SUMMARY for threshold 5.0: -# Correctly non-spam: 20948 98.88% -# Correctly spam: 34456 78.07% -# False positives: 238 1.12% -# False negatives: 9678 21.93% -# TCR(l=50): 2.045324 SpamRecall: 78.071% SpamPrec: 99.314% - -Results on test corpora at various alternative thresholds: - -# SUMMARY for threshold -4.0: -# Correctly non-spam: 37 0.17% -# Correctly spam: 44134 100.00% -# False positives: 21149 99.83% -# False negatives: 0 0.00% -# TCR(l=50): 0.041736 SpamRecall: 100.000% SpamPrec: 67.604% - -# SUMMARY for threshold -3.0: -# Correctly non-spam: 37 0.17% -# Correctly spam: 44134 100.00% -# False positives: 21149 99.83% -# False negatives: 0 0.00% -# TCR(l=50): 0.041736 SpamRecall: 100.000% SpamPrec: 67.604% - -# SUMMARY for threshold -2.0: -# Correctly non-spam: 37 0.17% -# Correctly spam: 44134 100.00% -# False positives: 21149 99.83% -# False negatives: 0 0.00% -# TCR(l=50): 0.041736 SpamRecall: 100.000% SpamPrec: 67.604% - -# SUMMARY for threshold -1.0: -# Correctly non-spam: 37 0.17% -# Correctly spam: 44134 100.00% -# False positives: 21149 99.83% -# False negatives: 0 0.00% -# TCR(l=50): 0.041736 SpamRecall: 100.000% SpamPrec: 67.604% - -# SUMMARY for threshold 0.0: -# Correctly non-spam: 1465 6.91% -# Correctly spam: 44134 100.00% -# False positives: 19721 93.09% -# False negatives: 0 0.00% -# TCR(l=50): 0.044758 SpamRecall: 100.000% SpamPrec: 69.116% - -# SUMMARY for threshold 1.0: -# Correctly non-spam: 16961 80.06% -# Correctly spam: 42325 95.90% -# False positives: 4225 19.94% -# False negatives: 1809 4.10% -# TCR(l=50): 0.207144 SpamRecall: 95.901% SpamPrec: 90.924% - -# SUMMARY for threshold 2.0: -# Correctly non-spam: 17710 83.59% -# Correctly spam: 42194 95.60% -# False positives: 3476 16.41% -# False negatives: 1940 4.40% -# TCR(l=50): 0.251132 SpamRecall: 95.604% SpamPrec: 92.389% - -# SUMMARY for threshold 3.0: -# Correctly non-spam: 20077 94.77% -# Correctly spam: 38630 87.53% -# False positives: 1109 5.23% -# False negatives: 5504 12.47% -# TCR(l=50): 0.724054 SpamRecall: 87.529% SpamPrec: 97.209% - -# SUMMARY for threshold 4.0: -# Correctly non-spam: 20419 96.38% -# Correctly spam: 37792 85.63% -# False positives: 767 3.62% -# False negatives: 6342 14.37% -# TCR(l=50): 0.987515 SpamRecall: 85.630% SpamPrec: 98.011% - -# SUMMARY for threshold 4.5: -# Correctly non-spam: 20747 97.93% -# Correctly spam: 36967 83.76% -# False positives: 439 2.07% -# False negatives: 7167 16.24% -# TCR(l=50): 1.515747 SpamRecall: 83.761% SpamPrec: 98.826% - -# SUMMARY for threshold 5.5: -# Correctly non-spam: 21067 99.44% -# Correctly spam: 31869 72.21% -# False positives: 119 0.56% -# False negatives: 12265 27.79% -# TCR(l=50): 2.422948 SpamRecall: 72.210% SpamPrec: 99.628% - -# SUMMARY for threshold 6.0: -# Correctly non-spam: 21097 99.58% -# Correctly spam: 30898 70.01% -# False positives: 89 0.42% -# False negatives: 13236 29.99% -# TCR(l=50): 2.495420 SpamRecall: 70.010% SpamPrec: 99.713% - -# SUMMARY for threshold 6.5: -# Correctly non-spam: 21112 99.65% -# Correctly spam: 30048 68.08% -# False positives: 74 0.35% -# False negatives: 14086 31.92% -# TCR(l=50): 2.481390 SpamRecall: 68.084% SpamPrec: 99.754% - -# SUMMARY for threshold 7.0: -# Correctly non-spam: 21143 99.80% -# Correctly spam: 28781 65.21% -# False positives: 43 0.20% -# False negatives: 15353 34.79% -# TCR(l=50): 2.521511 SpamRecall: 65.213% SpamPrec: 99.851% - -# SUMMARY for threshold 8.0: -# Correctly non-spam: 21176 99.95% -# Correctly spam: 24135 54.69% -# False positives: 10 0.05% -# False negatives: 19999 45.31% -# TCR(l=50): 2.152983 SpamRecall: 54.686% SpamPrec: 99.959% - -# SUMMARY for threshold 9.0: -# Correctly non-spam: 21183 99.99% -# Correctly spam: 22017 49.89% -# False positives: 3 0.01% -# False negatives: 22117 50.11% -# TCR(l=50): 1.982036 SpamRecall: 49.887% SpamPrec: 99.986% - -# SUMMARY for threshold 10.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 19092 43.26% -# False positives: 0 0.00% -# False negatives: 25042 56.74% -# TCR(l=50): 1.762399 SpamRecall: 43.259% SpamPrec: 100.000% - -# SUMMARY for threshold 12.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 13604 30.82% -# False positives: 0 0.00% -# False negatives: 30530 69.18% -# TCR(l=50): 1.445594 SpamRecall: 30.824% SpamPrec: 100.000% - -# SUMMARY for threshold 15.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 7675 17.39% -# False positives: 0 0.00% -# False negatives: 36459 82.61% -# TCR(l=50): 1.210510 SpamRecall: 17.390% SpamPrec: 100.000% - -# SUMMARY for threshold 17.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 5176 11.73% -# False positives: 0 0.00% -# False negatives: 38958 88.27% -# TCR(l=50): 1.132861 SpamRecall: 11.728% SpamPrec: 100.000% - -# SUMMARY for threshold 20.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 1822 4.13% -# False positives: 0 0.00% -# False negatives: 42312 95.87% -# TCR(l=50): 1.043061 SpamRecall: 4.128% SpamPrec: 100.000% - - -Test hit frequencies, for spam and ham corpora: -(note: S/O indicates ratio of spam hits to overall hits for -each test, where 0.0 = hits only non-spam and 1.0 = hits only spam, -and the 'score' field should be ignored.) - -OVERALL SPAM% HAM% S/O RANK SCORE NAME - 0 354116 168179 0.678 0.00 0.00 (all messages) -0.00000 67.8000 32.2000 0.678 0.00 0.00 (all messages as %) - 58.306 85.9927 0.0077 1.000 1.00 0.00 BAYES_99 - 9.134 13.4719 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_08 - 9.132 13.4688 0.0006 1.000 0.98 4.40 KB_RATWARE_OUTLOOK_MID - 9.131 13.4673 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_16 - 9.131 13.4673 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_12 - 7.889 11.6355 0.0000 1.000 0.98 2.81 HELO_DYNAMIC_IPADDR2 - 10.781 15.8976 0.0077 1.000 0.97 2.36 FH_HELO_EQ_D_D_D_D - 4.050 5.9735 0.0000 1.000 0.96 4.30 HELO_DYNAMIC_HCC - 4.988 7.3544 0.0042 0.999 0.96 2.63 HELO_DYNAMIC_IPADDR - 3.597 5.3048 0.0018 1.000 0.96 4.30 HK_NAME_DRUGS - 2.380 3.5104 0.0000 1.000 0.95 3.03 HELO_DYNAMIC_SPLIT_IP - 2.281 3.3650 0.0000 1.000 0.94 4.20 FSL_YG_ABUSE - 1.957 2.8861 0.0000 1.000 0.94 3.49 REPLICA_WATCH - 1.957 2.8858 0.0000 1.000 0.94 1.67 FB_REPLICA_ROLEX - 8.791 12.9579 0.0172 0.999 0.93 2.60 DOS_OE_TO_MX - 2.305 3.3975 0.0042 0.999 0.93 0.24 TVD_RCVD_SINGLE - 2.317 0.0028 7.1882 0.000 0.93 -1.00 ALL_TRUSTED - 2.720 4.0074 0.0089 0.998 0.93 2.60 HELO_DYNAMIC_DHCP - 1.773 2.6121 0.0054 0.998 0.91 2.04 RATWARE_MS_HASH - 1.448 2.1357 0.0006 1.000 0.91 0.00 HELO_LOCALHOST - 1.573 2.3184 0.0036 0.998 0.91 2.96 RATWARE_OUTLOOK_NONAME - 1.379 2.0338 0.0006 1.000 0.91 4.10 KB_RATWARE_MSGID - 1.331 1.9632 0.0012 0.999 0.90 0.00 JM_SOUGHT_FRAUD_3 - 2.324 3.4212 0.0149 0.996 0.90 4.00 FH_FAKE_RCVD_LINE_B - 1.630 2.4001 0.0095 0.996 0.89 4.00 FORGED_MUA_OUTLOOK - 1.157 1.7051 0.0018 0.999 0.89 2.69 ADVANCE_FEE_3 - 1.075 1.5859 0.0000 1.000 0.89 0.00 JM_SOUGHT_FRAUD_1 - 0.910 1.3422 0.0000 1.000 0.88 4.00 SANE_7429530a7398f43f1f1b795f9420714e - 1.094 1.6111 0.0054 0.997 0.88 0.00 BAYES_95 - 0.766 1.1301 0.0006 0.999 0.87 0.00 ADVANCE_FEE_4 - 0.743 1.0960 0.0006 0.999 0.87 3.90 MSGID_OUTLOOK_INVALID - 3.794 5.5792 0.0339 0.994 0.87 2.21 HTML_SHORT_LINK_IMG_1 - 0.852 1.2544 0.0059 0.995 0.86 2.61 DATE_IN_FUTURE_96_XX - 1.326 1.9479 0.0155 0.992 0.86 2.40 REPLYTO_WITHOUT_TO_CC - 0.607 0.8943 0.0006 0.999 0.86 3.41 AXB_HELO_LH_HOME - 0.562 0.8291 0.0000 1.000 0.86 0.00 FSL_INTERIA_ABUSE - 0.558 0.8237 0.0000 1.000 0.85 2.68 FH_HOST_EQ_VERIZON_P - 0.561 0.8268 0.0006 0.999 0.85 1.68 FSL_HELO_DEVICE - 1.313 1.9279 0.0184 0.991 0.85 1.78 DRUGS_ERECTILE - 0.630 0.9274 0.0042 0.996 0.85 3.80 MILLION_USD - 1.163 1.7076 0.0166 0.990 0.85 0.00 BAYES_80 - 2.234 3.2797 0.0321 0.990 0.85 2.74 MISSING_DATE - 0.568 0.8356 0.0036 0.996 0.85 0.00 KB_DATE_CONTAINS_TAB - 3.057 4.4884 0.0440 0.990 0.84 1.68 HTML_IMAGE_ONLY_04 - 1.245 1.8265 0.0208 0.989 0.84 0.00 DYN_RDNS_SHORT_HELO_HTML - 0.491 0.7238 0.0000 1.000 0.84 3.80 HTML_SHORT_CENTER - 0.622 0.9135 0.0077 0.992 0.84 0.00 HELO_LH_HOME - 0.489 0.7212 0.0006 0.999 0.84 3.80 SANE_d0d2b0f6373bf91253d66dd74c594b87 - 0.544 0.7995 0.0048 0.994 0.84 0.99 MSOE_MID_WRONG_CASE - 0.719 1.0547 0.0119 0.989 0.84 3.80 FILL_THIS_FORM_LONG - 0.555 0.8153 0.0059 0.993 0.84 1.69 FB_CIALIS_LEO3 - 0.463 0.6831 0.0000 1.000 0.84 2.43 KB_FAKED_THE_BAT - 0.440 0.6489 0.0006 0.999 0.83 0.16 TVD_RCVD_IP4 - 0.406 0.5987 0.0000 1.000 0.83 2.89 FB_SOFTTABS - 0.484 0.7122 0.0042 0.994 0.83 1.93 SUBJECT_DIET - 1.535 2.2481 0.0327 0.986 0.83 1.42 HTML_SHORT_LINK_IMG_2 - 0.406 0.5981 0.0006 0.999 0.83 2.89 DOS_OE_TO_MX_IMAGE - 0.476 0.7003 0.0048 0.993 0.82 2.09 FILL_THIS_FORM_LOAN - 1.801 2.6364 0.0410 0.985 0.82 3.26 FREEMAIL_REPLYTO - 0.367 0.5416 0.0000 1.000 0.82 3.70 FH_HELO_ALMOST_IP - 0.366 0.5394 0.0000 1.000 0.82 0.00 RDNS_LOCALHOST - 0.354 0.5216 0.0000 1.000 0.81 2.23 SANE_4ef8302546bf270a19baf98508afacc4 - 0.351 0.5173 0.0006 0.999 0.81 0.00 FB_THIS_ADVERT - 1.627 2.3783 0.0440 0.982 0.81 0.00 HK_RANDOM_ENVFROM - 0.369 0.5422 0.0042 0.992 0.81 0.24 SHORT_HELO_AND_INLINE_IMAGE - 0.303 0.4456 0.0012 0.997 0.80 0.00 X_MAILER_CME_6543_MSN - 0.282 0.4160 0.0000 1.000 0.80 1.71 SANE_04e8bf28eb445199a7f11b943c44d209 - 1.686 2.4628 0.0499 0.980 0.80 2.31 ADVANCE_FEE_2 - 0.295 0.4346 0.0018 0.996 0.80 3.24 FS_REPLICAWATCH - 0.967 1.4108 0.0321 0.978 0.80 0.00 BAYES_60 - 0.625 0.9110 0.0232 0.975 0.79 1.63 FS_REPLICA - 0.291 0.4281 0.0036 0.992 0.79 1.89 FS_WEIGHT_LOSS - 0.264 0.3894 0.0012 0.997 0.79 3.60 HK_LOTTO - 0.304 0.4448 0.0065 0.986 0.79 0.00 STOCK_IMG_HTML - 0.285 0.4188 0.0048 0.989 0.79 3.60 NA_DOLLARS - 0.305 0.4459 0.0077 0.983 0.78 0.00 STOCK_IMG_HDR_FROM - 5.178 7.5958 0.0874 0.989 0.78 0.69 HTML_SHORT_LINK_IMG_3 - 0.410 0.5973 0.0155 0.975 0.78 0.00 FORGED_OUTLOOK_HTML - 1.167 1.6980 0.0482 0.972 0.78 2.64 DOS_OUTLOOK_TO_MX - 0.226 0.3324 0.0006 0.998 0.77 3.01 KAM_LOTTO1 - 0.475 0.6899 0.0220 0.969 0.77 0.50 FROM_LOCAL_NOVOWEL - 0.221 0.3259 0.0000 1.000 0.77 0.00 JM_SOUGHT_FRAUD_2 - 0.239 0.3502 0.0036 0.990 0.77 1.54 IMPOTENCE - 0.462 0.6712 0.0226 0.967 0.77 2.60 DATE_IN_PAST_96_XX - 0.216 0.3191 0.0000 1.000 0.77 2.63 HELO_DYNAMIC_DIALIN - 0.212 0.3126 0.0000 1.000 0.77 2.98 SANE_2b173a7fb7518c75ac8a2d294d773fd8 - 0.206 0.3041 0.0000 1.000 0.76 3.40 FM_VEGAS_CASINO - 0.208 0.3067 0.0006 0.998 0.76 0.00 APOSTROPHE_FROM - 0.189 0.2790 0.0000 1.000 0.76 0.00 FB_TO_STOP_DISTRO - 0.206 0.3036 0.0012 0.996 0.76 0.84 ONLINE_PHARMACY - 0.218 0.3197 0.0030 0.991 0.76 3.40 RCVD_ILLEGAL_IP - 0.187 0.2762 0.0000 1.000 0.76 3.31 FB_QUALITY_REPLICA - 0.689 0.9960 0.0428 0.959 0.76 3.40 DATE_IN_FUTURE_03_06 - 0.245 0.3569 0.0089 0.976 0.76 1.69 BODY_ENHANCEMENT2 - 0.184 0.2711 0.0000 1.000 0.76 0.00 XMAILER_MIMEOLE_OL_3AC1D - 0.186 0.2736 0.0012 0.996 0.75 3.40 FUZZY_ROLEX - 0.179 0.2635 0.0000 1.000 0.75 3.05 FORGED_MUA_THEBAT_BOUN - 0.184 0.2705 0.0012 0.996 0.75 1.96 TVD_VISIT_PHARMA - 0.221 0.3231 0.0065 0.980 0.75 0.93 BODY_ENHANCEMENT - 0.310 0.4479 0.0202 0.957 0.75 0.00 FRT_SOMA - 0.175 0.2578 0.0006 0.998 0.75 0.00 DRUG_ED_SILD - 6.821 9.9964 0.1356 0.987 0.75 2.80 FROM_STARTS_WITH_NUMS - 0.168 0.2477 0.0000 1.000 0.74 3.30 LOTTERY_PH_004470 - 0.165 0.2437 0.0000 1.000 0.74 2.63 FH_HOST_EQ_DYNAMICIP - 0.164 0.2426 0.0000 1.000 0.74 2.96 FUZZY_PHARMACY - 0.175 0.2567 0.0030 0.989 0.74 0.25 FS_START_LOSE - 0.158 0.2330 0.0000 1.000 0.74 3.30 DRUGS_SMEAR1 - 0.168 0.2468 0.0012 0.995 0.74 3.30 FM_LOTTO_YOU_WON - 0.297 0.4273 0.0226 0.950 0.73 0.00 FH_HAS_XID - 0.154 0.2265 0.0006 0.997 0.73 3.30 LIVEFILESTORE - 0.173 0.2530 0.0036 0.986 0.73 2.91 EXCUSE_REMOVE - 0.149 0.2189 0.0006 0.997 0.73 3.21 HS_VPXL - 0.140 0.2064 0.0000 1.000 0.73 1.32 DRUGS_ERECTILE_OBFU - 1.141 1.6492 0.0708 0.959 0.73 3.30 MIME_HEADER_CTYPE_ONLY - 0.205 0.2979 0.0107 0.965 0.73 2.36 FM_SCHOOLING - 0.144 0.2115 0.0012 0.994 0.73 2.60 DOS_RCVD_IP_TWICE_C - 0.128 0.1892 0.0000 1.000 0.73 3.13 TVD_PH_REC - 0.193 0.2790 0.0113 0.961 0.73 3.30 SUBJ_YOUR_DEBT - 0.135 0.1988 0.0018 0.991 0.72 0.00 SANE_3b92eda751c992f230f215fb7eb36844 - 0.150 0.2189 0.0042 0.981 0.72 1.68 RCVD_HELO_IP_MISMATCH - 0.122 0.1804 0.0000 1.000 0.72 3.20 XMAILER_MIMEOLE_OL_22B61 - 0.127 0.1858 0.0024 0.987 0.72 2.60 DATE_IN_FUTURE_24_48 - 0.120 0.1771 0.0000 1.000 0.72 0.00 SANE_1c4f3286fa4aed6424ced88bfaf8b09c - 0.119 0.1748 0.0000 1.000 0.72 2.55 XMAILER_MIMEOLE_OL_8627E - 0.122 0.1790 0.0024 0.987 0.71 0.00 FU_COMMON_SUBS2 - 0.267 0.3804 0.0268 0.934 0.71 2.60 DATE_IN_FUTURE_12_24 - 0.137 0.1985 0.0059 0.971 0.71 0.00 FILL_THIS_FORM_FRAUD_PHISH - 0.110 0.1618 0.0000 1.000 0.71 0.61 FH_HELO_EQ_CHARTER - 0.108 0.1596 0.0000 1.000 0.71 0.00 FH_HOST_IN_ADDRARPA - 1.243 1.7904 0.0916 0.951 0.71 2.60 INVALID_MSGID - 0.119 0.1742 0.0030 0.983 0.71 2.50 SUSPICIOUS_RECIPS - 0.106 0.1556 0.0006 0.996 0.70 3.10 DEAR_WINNER - 0.104 0.1536 0.0000 1.000 0.70 0.23 FM_SEX_HELODDDD - 0.425 0.6035 0.0499 0.924 0.70 0.50 URI_NOVOWEL - 1.823 2.6282 0.1290 0.953 0.70 1.97 HTML_IMAGE_ONLY_16 - 0.126 0.1827 0.0071 0.962 0.70 3.10 NO_RDNS_DOTCOM_HELO - 0.098 0.1449 0.0000 1.000 0.70 3.02 MIME_BOUND_DD_DIGITS - 0.093 0.1372 0.0000 1.000 0.70 0.00 BASE64_LENGTH_78_79 - 1.197 1.7178 0.0993 0.945 0.70 2.80 MPART_ALT_DIFF_COUNT - 0.090 0.1327 0.0000 1.000 0.69 2.65 SPAMMY_XMAILER - 0.159 0.2279 0.0149 0.939 0.69 2.91 MONEY_BACK - 0.088 0.1293 0.0000 1.000 0.69 3.10 RATWARE_NAME_ID - 0.084 0.1243 0.0000 1.000 0.69 3.04 UNRESOLVED_TEMPLATE - 0.094 0.1367 0.0030 0.979 0.69 2.71 SUBJ_AS_SEEN - 1.055 1.5083 0.0993 0.938 0.69 2.60 FSL_HELO_BARE_IP_1 - 0.082 0.1209 0.0000 1.000 0.69 1.62 KAM_LOTTO2 - 1.732 2.4876 0.1415 0.946 0.68 1.70 INVALID_DATE - 0.083 0.1211 0.0012 0.990 0.68 0.00 FS_PHARMASUB2 - 0.092 0.1344 0.0042 0.970 0.68 0.00 TVD_FINGER_02 - 0.153 0.2169 0.0172 0.926 0.68 0.00 URI_OBFU_WWW - 0.080 0.1175 0.0006 0.995 0.68 2.37 MSGID_SPAM_CAPS - 0.565 0.7975 0.0755 0.913 0.68 3.10 BAD_ENC_HEADER - 0.079 0.1163 0.0006 0.995 0.68 3.10 MALE_ENHANCE - 0.193 0.2722 0.0262 0.912 0.68 2.31 FB_GET_MEDS - 0.076 0.1127 0.0000 1.000 0.68 0.00 FSL_FAKE_GMAIL_RCVD - 0.074 0.1099 0.0000 1.000 0.68 2.11 SUBJECT_DRUG_GAP_C - 1.518 2.1719 0.1409 0.939 0.68 0.00 STOX_REPLY_TYPE_WITHOUT_QUOTES - 0.099 0.1420 0.0083 0.945 0.68 0.00 TVD_PH_SUBJ_ACCOUNTS_POST - 0.074 0.1096 0.0000 1.000 0.68 3.10 SANE_91eb43f705d25c804374a746d7519660 - 0.074 0.1084 0.0000 1.000 0.68 2.63 FSL_FAKE_HOTMAIL_RVCD - 0.790 1.1174 0.0999 0.918 0.67 0.00 FORGED_OUTLOOK_TAGS - 0.075 0.1096 0.0024 0.979 0.67 0.00 FB_SAVE_PERSC - 0.069 0.1014 0.0000 1.000 0.67 2.30 XMAILER_MIMEOLE_OL_1ECD5 - 0.072 0.1059 0.0012 0.989 0.67 3.00 SPOOF_COM2OTH - 0.069 0.1011 0.0000 1.000 0.67 3.00 PERCENT_RANDOM - 0.068 0.1008 0.0000 1.000 0.67 1.82 DYN_RDNS_SHORT_HELO_IMAGE - 0.068 0.1000 0.0000 1.000 0.67 3.00 RATWARE_EFROM - 0.071 0.1045 0.0018 0.983 0.67 2.91 SUBJ_YOUR_FAMILY - 10.028 14.6542 0.2884 0.981 0.67 0.00 FSL_HELO_NON_FQDN_1 - 4.413 6.3990 0.2325 0.965 0.67 2.80 URI_HEX - 0.322 0.4482 0.0577 0.886 0.66 0.62 SUBJ_ILLEGAL_CHARS - 0.066 0.0980 0.0000 1.000 0.66 2.41 RCVD_DOUBLE_IP_SPAM - 0.183 0.2558 0.0285 0.900 0.66 2.20 BANG_GUAR - 4.831 7.0104 0.2420 0.967 0.66 2.11 HTML_IMAGE_ONLY_20 - 0.062 0.0918 0.0000 1.000 0.66 2.39 RATWARE_ZERO_TZ - 0.427 0.5947 0.0749 0.888 0.66 0.00 PART_CID_STOCK - 0.062 0.0912 0.0012 0.987 0.65 2.90 HK_FAKENAME_EBAY - 0.263 0.3637 0.0523 0.874 0.65 2.90 DATE_IN_FUTURE_06_12 - 1.053 1.4879 0.1362 0.916 0.65 1.38 HTML_IMAGE_ONLY_12 - 0.058 0.0858 0.0000 1.000 0.65 2.17 FH_FAKE_RCVD_LINE - 0.060 0.0884 0.0006 0.993 0.65 2.90 FR_TITLE_NUMS - 53.063 78.0569 0.4370 0.994 0.65 0.00 RCVD_IN_BRBL_LASTEXT - 0.063 0.0921 0.0030 0.969 0.65 0.95 ENGLISH_UCE_SUBJECT - 0.727 1.0163 0.1189 0.895 0.65 2.60 US_DOLLARS_3 - 0.055 0.0813 0.0000 1.000 0.65 2.90 HELO_OEM - 0.054 0.0802 0.0000 1.000 0.65 2.19 FROM_ILLEGAL_CHARS - 0.408 0.5634 0.0803 0.875 0.64 2.68 DEAR_FRIEND - 0.052 0.0771 0.0006 0.992 0.64 1.69 FS_ABIGGER - 0.051 0.0751 0.0000 1.000 0.64 0.00 HS_FORGED_OE_FW - 0.121 0.1663 0.0250 0.869 0.64 0.00 FH_FROMEML_NOTLD - 0.051 0.0746 0.0006 0.992 0.64 2.83 FORGED_MUA_EUDORA - 0.226 0.3087 0.0511 0.858 0.64 0.00 TVD_PH_BODY_ACCOUNTS_PRE - 1.090 1.5300 0.1623 0.904 0.63 1.34 DYN_RDNS_AND_INLINE_IMAGE - 0.273 0.3716 0.0648 0.851 0.63 2.80 BAD_CREDIT - 30.313 0.2364 93.6413 0.003 0.63 0.00 BAYES_00 - 0.052 0.0754 0.0042 0.948 0.63 0.00 TVD_PH_SUBJ_URGENT - 0.043 0.0627 0.0006 0.991 0.63 0.00 FB_GVR - 0.043 0.0627 0.0006 0.991 0.63 2.80 DRUG_ED_CAPS - 0.064 0.0901 0.0095 0.904 0.63 2.80 EXCUSE_24 - 0.362 0.4945 0.0838 0.855 0.63 0.58 HTML_IMAGE_ONLY_08 - 0.388 0.5301 0.0880 0.858 0.63 1.75 URG_BIZ - 0.135 0.1830 0.0345 0.841 0.63 0.59 SUBJ_BUY - 0.047 0.0683 0.0024 0.966 0.63 2.66 DRUGS_DIET - 0.051 0.0737 0.0042 0.947 0.63 0.00 REPTO_QUOTE_YAHOO - 0.040 0.0596 0.0000 1.000 0.63 0.00 HS_BOBAX_MID_2 - 2.657 3.7773 0.2985 0.927 0.63 2.80 HTML_IMAGE_ONLY_24 - 0.040 0.0590 0.0000 1.000 0.63 2.80 RCVD_FAKE_HELO_DOTCOM - 0.296 0.4002 0.0755 0.841 0.62 1.20 FREEMAIL_FORGED_REPLYTO - 0.039 0.0000 0.1225 0.000 0.62 -7.50 USER_IN_DEF_SPF_WL - 0.039 0.0576 0.0000 1.000 0.62 2.80 FUZZY_PHENT - 0.040 0.0585 0.0006 0.990 0.62 2.80 MORE_SEX - 2.140 3.0273 0.2717 0.918 0.62 2.80 HTML_IMAGE_ONLY_28 - 0.048 0.0692 0.0042 0.943 0.62 0.00 FS_START_DOYOU2 - 0.039 0.0570 0.0000 1.000 0.62 0.00 FB_INDEPEND_RWD - 0.059 0.0819 0.0101 0.890 0.62 0.79 PRICES_ARE_AFFORDABLE - 0.051 0.0726 0.0065 0.917 0.62 2.20 FUZZY_XPILL - 0.260 0.3505 0.0684 0.837 0.62 0.00 FAKE_REPLY_C - 0.038 0.0553 0.0000 1.000 0.62 0.00 MIME_PHP_NO_TEXT - 0.039 0.0568 0.0012 0.979 0.62 0.54 L_SPAM_TOOL_13 - 0.120 0.1618 0.0333 0.829 0.62 1.15 HTML_TITLE_SUBJ_DIFF - 0.036 0.0534 0.0000 1.000 0.62 2.70 TVD_QUAL_MEDS - 0.036 0.0525 0.0000 1.000 0.62 2.80 SUBJECT_DRUG_GAP_L - 0.037 0.0539 0.0012 0.978 0.61 2.70 GUARANTEED_100_PERCENT - 0.034 0.0508 0.0000 1.000 0.61 2.70 UNCLOSED_BRACKET - 0.038 0.0553 0.0018 0.969 0.61 0.00 FH_FROM_GET_NAME - 0.052 0.0726 0.0089 0.891 0.61 2.70 FREE_QUOTE_INSTANT - 0.034 0.0505 0.0000 1.000 0.61 0.00 FH_DATE_PAST_20XX - 0.049 0.0683 0.0077 0.898 0.61 0.00 BASE64_LENGTH_79_INF - 2.332 3.2907 0.3122 0.913 0.61 2.20 HTML_IMAGE_ONLY_32 - 0.035 0.0508 0.0012 0.977 0.61 0.00 FRT_BIGGERMEM1 - 0.064 0.0873 0.0155 0.849 0.61 0.00 STOCK_IMG_CTYPE - 0.040 0.0568 0.0048 0.923 0.61 2.70 UNCLAIMED_MONEY - 0.033 0.0486 0.0000 1.000 0.61 0.00 FB_INCREASE_YOUR - 0.032 0.0474 0.0000 1.000 0.60 2.52 XMAILER_MIMEOLE_OL_91287 - 0.117 0.1548 0.0381 0.803 0.60 0.00 HTTPS_HTTP_MISMATCH - 0.049 0.0666 0.0113 0.855 0.60 0.00 MSGID_SHORT - 0.041 0.0570 0.0077 0.881 0.60 0.26 INVALID_DATE_TZ_ABSURD - 0.029 0.0426 0.0000 1.000 0.60 2.70 XMAILER_MIMEOLE_OL_7533E - 0.033 0.0472 0.0018 0.964 0.60 0.00 FS_LARGE_PERCENT2 - 0.435 0.5800 0.1284 0.819 0.60 0.00 FROM_LOCAL_DIGITS - 0.033 0.0480 0.0024 0.953 0.60 2.70 FRT_ROLEX - 2.409 3.3842 0.3544 0.905 0.60 2.60 FREEMAIL_ENVFROM_END_DIGIT - 0.042 0.0570 0.0089 0.865 0.60 0.00 BUG6152_INVALID_DATE_TZ_ABSURD - 0.029 0.0421 0.0006 0.986 0.59 0.29 FB_EXTRA_INCHES - 0.445 0.5925 0.1332 0.816 0.59 0.00 FROM_LOCAL_HEX - 0.027 0.0398 0.0000 1.000 0.59 2.70 DRUGS_STOCK_MIMEOLE - 0.030 0.0435 0.0024 0.948 0.59 0.00 FUZZY_VPILL - 0.027 0.0395 0.0000 1.000 0.59 2.70 FROM_OFFERS - 1.161 1.6026 0.2307 0.874 0.59 0.00 RCVD_NUMERIC_HELO - 0.026 0.0387 0.0000 1.000 0.59 0.00 FSL_GEO_ABUSE - 0.100 0.1302 0.0375 0.777 0.59 0.55 MARKETING_PARTNERS - 0.045 0.0607 0.0131 0.823 0.59 2.70 FIN_FREE - 0.025 0.0376 0.0000 1.000 0.59 0.80 MSGID_YAHOO_CAPS - 0.038 0.0522 0.0089 0.854 0.59 2.70 DRUGS_ANXIETY - 0.025 0.0367 0.0000 1.000 0.59 1.43 XMAILER_MIMEOLE_OL_CAC8F - 0.024 0.0350 0.0000 1.000 0.59 2.70 FORGED_MSGID_YAHOO - 18.052 26.2708 0.7474 0.972 0.59 2.64 RDNS_DYNAMIC - 0.023 0.0339 0.0000 1.000 0.58 1.30 XMAILER_MIMEOLE_OL_09BB4 - 0.023 0.0336 0.0000 1.000 0.58 2.60 XMAILER_MIMEOLE_OL_20C99 - 0.057 0.0748 0.0196 0.792 0.58 0.00 FH_FROM_CASH - 0.022 0.0330 0.0000 1.000 0.58 2.00 DRUGS_MANYKINDS - 0.025 0.0356 0.0018 0.952 0.58 2.20 MSGID_RANDY - 0.047 0.0610 0.0161 0.792 0.58 0.00 TVD_APPROVED - 0.547 0.7258 0.1707 0.810 0.58 2.40 FORGED_YAHOO_RCVD - 0.037 0.0500 0.0107 0.824 0.58 0.00 FRT_OFFER2 - 0.021 0.0311 0.0000 1.000 0.58 0.64 SUBJECT_FUZZY_CHEAP - 0.022 0.0316 0.0006 0.982 0.58 2.60 FS_WILL_HELP - 0.021 0.0308 0.0000 1.000 0.58 2.60 XMAILER_MIMEOLE_OL_83BF7 - 0.022 0.0319 0.0012 0.964 0.58 0.00 FB_LOSE_WEIGHT_CAP - 0.028 0.0384 0.0048 0.890 0.58 0.00 NULL_IN_BODY - 0.552 0.7308 0.1754 0.806 0.58 0.71 HTML_FONT_LOW_CONTRAST - 0.020 0.0302 0.0000 1.000 0.58 2.60 XMAILER_MIMEOLE_OL_3D61D - 0.142 0.1821 0.0583 0.758 0.58 0.00 FRT_SOMA2 - 0.020 0.0299 0.0000 1.000 0.58 2.50 XMAILER_MIMEOLE_OL_4B815 - 0.020 0.0297 0.0000 1.000 0.57 2.38 HELO_DYNAMIC_HOME_NL - 0.020 0.0297 0.0000 1.000 0.57 0.00 TVD_SUBJ_WIPE_DEBT - 0.020 0.0294 0.0000 1.000 0.57 0.00 FH_FROM_GIVEAWAY - 0.020 0.0291 0.0000 1.000 0.57 2.41 HELO_DYNAMIC_CHELLO_NL - 0.572 0.7560 0.1849 0.803 0.57 0.00 SUBJECT_NEEDS_ENCODING - 0.022 0.0308 0.0024 0.928 0.57 0.00 FROM_NO_USER - 0.023 0.0322 0.0048 0.871 0.57 1.66 FM_SUBJ_APPROVE - 0.029 0.0384 0.0077 0.832 0.57 0.00 BILLION_DOLLARS - 0.018 0.0271 0.0000 1.000 0.57 0.00 THEBAT_UNREG - 0.018 0.0271 0.0000 1.000 0.57 2.32 HELO_DYNAMIC_HEXIP - 0.020 0.0285 0.0012 0.960 0.57 2.60 FORGED_MUA_OIMO - 0.018 0.0265 0.0000 1.000 0.57 2.60 FUZZY_MILLION - 0.021 0.0014 0.0630 0.022 0.57 -0.00 NO_RELAYS - 0.018 0.0263 0.0000 1.000 0.57 0.00 XMAILER_MIMEOLE_OL_B30D1 - 0.017 0.0000 0.0541 0.000 0.57 -0.50 ENV_AND_HDR_SPF_MATCH - 0.018 0.0263 0.0006 0.978 0.56 1.53 TVD_INCREASE_SIZE - 0.137 0.1740 0.0606 0.741 0.56 2.50 FRT_APPROV - 0.017 0.0251 0.0000 1.000 0.56 2.50 FS_APPROVE_YOU - 0.017 0.0246 0.0000 1.000 0.56 0.00 FS_AT_NO_COST - 0.016 0.0243 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_812FF - 0.016 0.0243 0.0000 1.000 0.56 0.00 FB_ULTRA_ALLURE - 0.016 0.0243 0.0000 1.000 0.56 0.00 LOTTERY_1 - 0.031 0.0404 0.0119 0.773 0.56 0.00 DRUGS_MUSCLE - 0.016 0.0240 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_F6D01 - 0.407 0.5247 0.1605 0.766 0.56 2.50 FREEMAIL_REPLY - 0.016 0.0234 0.0000 1.000 0.56 1.89 FAKE_HELO_MAIL_COM_DOM - 0.016 0.0234 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_C65FA - 0.026 0.0342 0.0095 0.782 0.56 0.00 HTTP_EXCESSIVE_ESCAPES - 0.016 0.0232 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_9B90B - 0.016 0.0229 0.0000 1.000 0.56 0.70 DRUG_ED_ONLINE - 0.016 0.0234 0.0006 0.975 0.56 0.00 FB_SPACED_FREE - 0.060 0.0751 0.0291 0.721 0.56 0.50 DC_IMAGE_SPAM_HTML - 0.015 0.0226 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_CF0C0 - 5.465 7.6712 0.8194 0.903 0.56 0.00 TVD_RCVD_IP - 0.426 0.0830 1.1470 0.067 0.56 0.00 BAYES_05 - 0.015 0.0220 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_F3B05 - 0.015 0.0217 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_B4B40 - 0.015 0.0217 0.0000 1.000 0.55 0.00 TT_MSGID_TRUNC - 0.088 0.1076 0.0476 0.693 0.55 0.10 DC_IMAGE_SPAM_TEXT - 0.015 0.0215 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_015D5 - 0.739 0.9686 0.2551 0.792 0.55 1.70 DATE_IN_PAST_06_12 - 0.014 0.0212 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_ADFF7 - 0.014 0.0212 0.0000 1.000 0.55 2.50 FORGED_TELESP_RCVD - 0.014 0.0212 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_5B79A - 0.100 0.1223 0.0541 0.693 0.55 1.80 SORTED_RECIPS - 0.014 0.0209 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_4BF4C - 0.014 0.0209 0.0000 1.000 0.55 2.50 HEADER_SPAM - 0.014 0.0206 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_4EEDB - 0.014 0.0203 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_BC7E6 - 0.014 0.0200 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_6554A - 0.014 0.0200 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_58CB5 - 0.018 0.0243 0.0042 0.854 0.55 0.50 FROM_DOMAIN_NOVOWEL - 2.057 2.7635 0.5690 0.829 0.55 0.71 DIET_1 - 0.013 0.0195 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_3857F - 0.013 0.0192 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_FF5C8 - 0.013 0.0192 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_25340 - 1.715 2.3026 0.4763 0.829 0.55 0.00 NML_ADSP_CUSTOM_MED - 0.013 0.0195 0.0006 0.970 0.55 2.50 HTML_OBFUSCATE_20_30 - 0.013 0.0186 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_F475E - 0.012 0.0184 0.0000 1.000 0.54 1.90 RATWARE_EGROUPS - 0.012 0.0184 0.0000 1.000 0.54 2.40 FORGED_MUA_MOZILLA - 0.012 0.0184 0.0000 1.000 0.54 0.00 XMAILER_MIMEOLE_OL_07794 - 0.013 0.0189 0.0006 0.970 0.54 2.40 FH_MSGID_XXX - 0.233 0.2892 0.1136 0.718 0.54 0.00 FORGED_HOTMAIL_RCVD2 - 0.012 0.0181 0.0000 1.000 0.54 0.00 FM_SCHOOL_DIPLOMA - 0.012 0.0181 0.0000 1.000 0.54 1.92 NO_PRESCRIPTION - 26.975 39.1471 1.3462 0.967 0.54 2.40 RDNS_NONE - 0.012 0.0178 0.0000 1.000 0.54 2.40 FORGED_MUA_IMS - 0.271 0.3352 0.1362 0.711 0.54 0.00 DATE_IN_PAST_12_24 - 0.019 0.0249 0.0071 0.777 0.54 0.00 TVD_PH_SEC - 0.012 0.0175 0.0000 1.000 0.54 0.00 TVD_PH_SUBJ_SEC_MEASURES - 0.012 0.0172 0.0000 1.000 0.54 0.00 XMAILER_MIMEOLE_OL_4F240 - 0.013 0.0189 0.0018 0.914 0.54 0.00 FH_DATE_IS_19XX - 0.011 0.0169 0.0000 1.000 0.54 0.00 TBIRD_SUSP_MIME_BDRY - 0.031 0.0378 0.0172 0.687 0.54 0.00 FUZZY_CPILL - 0.011 0.0167 0.0000 1.000 0.54 2.40 FS_NUDE - 0.011 0.0167 0.0000 1.000 0.54 0.00 FB_NO_SCRIP_NEEDED - 0.015 0.0206 0.0042 0.832 0.54 2.40 EXCUSE_4 - 0.017 0.0226 0.0059 0.792 0.54 2.38 DATE_IN_FUTURE_48_96 - 0.084 0.0997 0.0499 0.666 0.54 1.40 ACT_NOW_CAPS - 0.011 0.0158 0.0000 1.000 0.54 2.40 FORGED_MSGID_EXCITE - 1.648 2.1758 0.5363 0.802 0.54 0.00 STOX_REPLY_TYPE - 0.015 0.0198 0.0042 0.826 0.54 2.19 EMPTY_MESSAGE - 0.882 1.1400 0.3401 0.770 0.54 1.22 FREEMAIL_REPLYTO_END_DIGIT - 0.010 0.0150 0.0000 1.000 0.53 0.00 BANKING_LAWS - 0.010 0.0150 0.0000 1.000 0.53 0.59 EM_ROLEX - 0.027 0.0319 0.0161 0.665 0.53 1.84 ONE_TIME - 0.010 0.0144 0.0000 1.000 0.53 0.00 FS_OBFU_PRMCY - 0.009 0.0138 0.0000 1.000 0.53 0.00 FS_EJACULA - 0.011 0.0155 0.0018 0.897 0.53 1.82 FUZZY_PRICES - 0.025 0.0291 0.0149 0.662 0.53 1.15 RCVD_DOUBLE_IP_LOOSE - 0.010 0.0141 0.0012 0.922 0.53 2.40 URI_NO_WWW_BIZ_CGI - 0.010 0.0144 0.0018 0.890 0.53 2.36 FUZZY_ERECT - 0.709 0.8960 0.3145 0.740 0.53 2.40 DATE_IN_PAST_03_06 - 0.008 0.0119 0.0000 1.000 0.53 0.00 BANG_OPRAH - 0.008 0.0119 0.0000 1.000 0.53 0.00 FB_PENIS_GROWTH - 0.008 0.0119 0.0000 1.000 0.53 0.00 FM_FAKE_HELO_VERIZON - 0.008 0.0119 0.0000 1.000 0.53 0.00 XMAILER_MIMEOLE_OL_465CD - 0.008 0.0116 0.0000 1.000 0.52 0.00 DOS_HIGH_BAT_TO_MX - 0.008 0.0116 0.0000 1.000 0.52 0.00 HEAD_ILLEGAL_CHARS - 0.280 0.3383 0.1582 0.681 0.52 0.77 PLING_QUERY - 0.025 0.0291 0.0166 0.636 0.52 0.00 FH_HOST_EQ_PACBELL_D - 0.008 0.0113 0.0000 1.000 0.52 0.00 TVD_ENVFROM_APOST - 0.011 0.0141 0.0030 0.826 0.52 0.00 FRT_PENIS1 - 0.007 0.0110 0.0000 1.000 0.52 0.00 FS_ERECTION - 0.009 0.0121 0.0012 0.911 0.52 0.00 HEADER_COUNT_SUBJECT - 0.011 0.0144 0.0042 0.776 0.52 0.00 FR_ALMOST_VIAG2 - 0.007 0.0102 0.0000 1.000 0.52 0.00 TVD_RATWARE_MSGID_02 - 0.007 0.0104 0.0006 0.946 0.52 0.00 FSL_HELO_SETUP - 0.045 0.0503 0.0327 0.606 0.52 0.00 DC_GIF_UNO_LARGO - 0.007 0.0096 0.0000 1.000 0.52 0.00 FU_UKGEOCITIES - 0.006 0.0093 0.0000 1.000 0.52 0.00 FORGED_IMS_TAGS - 0.007 0.0099 0.0006 0.943 0.52 0.00 FB_LOWER_PAYM - 0.007 0.0102 0.0012 0.895 0.52 0.00 RATWARE_HASH_DASH - 0.006 0.0085 0.0000 1.000 0.52 0.00 FS_NO_SCRIP - 0.006 0.0082 0.0000 1.000 0.51 0.00 FB_ADD_INCHES - 0.006 0.0082 0.0000 1.000 0.51 0.00 FS_LOW_RATES - 0.006 0.0082 0.0000 1.000 0.51 0.00 FAKE_OUTBLAZE_RCVD - 0.006 0.0088 0.0006 0.936 0.51 0.00 HTTPS_IP_MISMATCH - 0.012 0.0144 0.0065 0.688 0.51 0.00 FRT_TODAY2 - 0.005 0.0079 0.0000 1.000 0.51 0.00 MSGID_DOLLARS_RANDOM - 0.006 0.0085 0.0006 0.934 0.51 0.00 FB_NUMYO2 - 0.005 0.0076 0.0000 1.000 0.51 0.00 DOS_ANAL_SPAM_MAILER - 0.005 0.0076 0.0000 1.000 0.51 0.00 FH_HELO_ENDS_DOT - 0.005 0.0076 0.0000 1.000 0.51 0.00 X_MESSAGE_INFO - 0.005 0.0076 0.0000 1.000 0.51 0.00 REPTO_QUOTE_AOL - 0.005 0.0076 0.0000 1.000 0.51 0.00 FORGED_MSGID_HOTMAIL - 0.005 0.0073 0.0000 1.000 0.51 0.00 SUBJECT_SEXUAL - 0.008 0.0107 0.0036 0.750 0.51 0.00 RATWARE_RCVD_PF - 0.005 0.0071 0.0000 1.000 0.51 0.00 REPTO_QUOTE_QUALCOMM - 2.786 3.6155 1.0388 0.777 0.51 2.25 MPART_ALT_DIFF - 0.005 0.0076 0.0006 0.928 0.51 0.00 FB_ALMOST_SEX - 0.004 0.0065 0.0000 1.000 0.51 0.00 FORGED_QUALCOMM_TAGS - 0.007 0.0093 0.0030 0.758 0.51 0.00 FS_WITH_SMALL - 0.004 0.0062 0.0000 1.000 0.51 0.00 SUBJECT_DRUG_GAP_VA - 0.004 0.0062 0.0000 1.000 0.51 0.00 SUBJECT_DRUG_GAP_X - 0.005 0.0068 0.0006 0.919 0.51 0.00 FB_YOUR_REFI - 0.004 0.0059 0.0000 1.000 0.51 0.00 FB_FAKE_NUMS4 - 0.004 0.0059 0.0000 1.000 0.51 0.00 FORGED_IMS_HTML - 0.010 0.0116 0.0059 0.661 0.51 2.30 URI_NO_WWW_INFO_CGI - 1.408 1.7912 0.6011 0.749 0.51 0.00 HS_INDEX_PARAM - 0.004 0.0000 0.0119 0.000 0.51 -15.00 USER_IN_DEF_WHITELIST - 0.006 0.0073 0.0018 0.805 0.51 0.00 FB_HEY_BRO_COMMA - 0.004 0.0054 0.0000 1.000 0.51 0.00 TVD_SECTION - 0.004 0.0054 0.0000 1.000 0.51 0.00 RCVD_MAIL_COM - 0.012 0.0138 0.0089 0.608 0.51 0.70 JOIN_MILLIONS - 0.003 0.0051 0.0000 1.000 0.51 0.00 TVD_PP_PHISH - 0.003 0.0051 0.0000 1.000 0.51 0.00 REPTO_QUOTE_IMS - 0.015 0.0169 0.0119 0.588 0.51 0.00 FM_IS_IT_OUR_ACCOUNT - 0.013 0.0147 0.0101 0.592 0.50 2.20 LONGWORDS - 0.003 0.0048 0.0000 1.000 0.50 0.00 FB_GAPPY_ADDRESS - 0.003 0.0045 0.0000 1.000 0.50 0.00 DRUGS_HDIA - 0.003 0.0045 0.0000 1.000 0.50 0.00 TVD_FUZZY_PHARMACEUTICAL - 0.004 0.0056 0.0012 0.826 0.50 0.00 HTML_MISSING_CTYPE - 0.003 0.0042 0.0000 1.000 0.50 0.00 DRUGS_DIET_OBFU - 0.003 0.0042 0.0000 1.000 0.50 0.00 SUBJECT_FUZZY_PENIS - 0.003 0.0042 0.0000 1.000 0.50 0.00 REFINANCE_NOW - 0.024 0.0257 0.0214 0.546 0.50 0.59 GAPPY_SUBJECT - 0.003 0.0042 0.0000 1.000 0.50 0.00 HELO_DYNAMIC_ROGERS - 0.003 0.0042 0.0000 1.000 0.50 0.00 FM_FRM_RN_L_BRACK - 0.003 0.0048 0.0006 0.890 0.50 0.00 TVD_SUBJ_FINGER_03 - 0.512 0.1432 1.2873 0.100 0.50 0.00 BAYES_20 - 0.006 0.0073 0.0036 0.673 0.50 0.00 DATE_SPAMWARE_Y2K - 0.002 0.0037 0.0000 1.000 0.50 0.00 DRUGS_SLEEP_EREC - 0.002 0.0037 0.0000 1.000 0.50 0.00 REPTO_QUOTE_MSN - 0.002 0.0037 0.0000 1.000 0.50 0.00 FRT_SEXUAL - 0.002 0.0037 0.0000 1.000 0.50 0.00 FH_HELO_EQ_610HEX - 0.002 0.0037 0.0000 1.000 0.50 0.00 VIA_GAP_GRA - 0.004 0.0048 0.0012 0.801 0.50 0.00 HELO_LH_LD - 0.002 0.0034 0.0000 1.000 0.50 0.00 FH_FROM_HOODIA - 0.002 0.0034 0.0000 1.000 0.50 0.00 FS_HUGECOCK - 0.002 0.0034 0.0000 1.000 0.50 0.00 TVD_FUZZY_DEGREE - 0.002 0.0034 0.0000 1.000 0.50 0.00 FB_PIPE_ILLION - 0.003 0.0040 0.0006 0.869 0.50 0.00 FB_HG_H_CAP - 32.586 44.5642 7.3654 0.858 0.50 2.20 MIME_HTML_ONLY - 0.002 0.0031 0.0000 1.000 0.50 0.00 FUZZY_AFFORDABLE - 0.002 0.0031 0.0000 1.000 0.50 0.00 NOT_ADVISOR - 0.002 0.0031 0.0000 1.000 0.50 0.00 FS_RE_APPROV - 0.003 0.0042 0.0012 0.781 0.50 0.00 FRT_REFINANCE1 - 0.002 0.0028 0.0000 1.000 0.50 0.00 FORGED_MSGID_AOL - 0.002 0.0028 0.0000 1.000 0.50 0.00 FM_FAKE_HELO_HOTMAIL - 0.002 0.0028 0.0000 1.000 0.50 0.00 XMAILER_MIMEOLE_OL_B9B11 - 0.065 0.0698 0.0553 0.558 0.50 2.20 FUZZY_AMBIEN - 0.017 0.0181 0.0155 0.539 0.50 0.00 SB_GIF_AND_NO_URIS - 0.007 0.0073 0.0048 0.607 0.50 0.00 URI_UNSUBSCRIBE - 0.002 0.0025 0.0000 1.000 0.50 0.00 FUZZY_GUARANTEE - 0.002 0.0025 0.0000 1.000 0.50 0.00 FORGED_THEBAT_HTML - 0.002 0.0025 0.0000 1.000 0.50 0.00 FRT_GUARANTEE1 - 0.002 0.0025 0.0000 1.000 0.50 0.00 DRUGS_ANXIETY_OBFU - 0.002 0.0025 0.0000 1.000 0.50 0.00 MSGID_SPAM_LETTERS - 0.002 0.0031 0.0006 0.839 0.50 0.00 FS_PERSCRIPTION - 0.002 0.0031 0.0006 0.839 0.50 0.00 FB_LETTERS_21B - 0.003 0.0042 0.0018 0.704 0.50 0.00 SUBJECT_DRUG_GAP_S - 0.002 0.0023 0.0000 1.000 0.50 0.00 MULTIPART_ALT_NON_TEXT - 0.002 0.0023 0.0000 1.000 0.50 0.00 FRT_DISCOUNT - 0.002 0.0023 0.0000 1.000 0.50 0.00 STRONG_BUY - 0.002 0.0023 0.0000 1.000 0.50 0.00 FB_NOT_PHONE_NUM1 - 0.002 0.0023 0.0000 1.000 0.50 0.00 FORGED_MSGID_MSN - 0.002 0.0023 0.0000 1.000 0.50 0.00 NONEXISTENT_CHARSET - 0.002 0.0023 0.0000 1.000 0.50 0.00 FUZZY_MEDICATION - 0.002 0.0028 0.0006 0.826 0.50 0.00 HS_DRUG_DOLLAR_1 - 9.175 12.3846 2.4183 0.837 0.50 2.20 HTML_IMAGE_RATIO_02 - 0.001 0.0020 0.0000 1.000 0.50 0.00 FUZZY_THOUSANDS - 0.001 0.0020 0.0000 1.000 0.50 0.00 DRUG_ED_GENERIC - 0.001 0.0020 0.0000 1.000 0.50 0.00 TT_OBSCURED_VIAGRA - 0.001 0.0017 0.0000 1.000 0.50 0.00 LONG_TERM_PRICE - 0.019 0.0192 0.0178 0.518 0.49 0.00 WEIRD_QUOTING - 0.001 0.0014 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_8E893 - 0.001 0.0014 0.0000 1.000 0.49 0.00 DRUGS_ANXIETY_EREC - 0.001 0.0014 0.0000 1.000 0.49 0.00 FUZZY_MERIDIA - 0.001 0.0014 0.0000 1.000 0.49 0.00 FB_P1LL - 0.002 0.0025 0.0012 0.681 0.49 0.00 FRT_OPPORTUN2 - 0.013 0.0136 0.0125 0.521 0.49 0.00 TVD_SUBJ_ACC_NUM - 0.003 0.0037 0.0024 0.607 0.49 0.00 FRT_WEIGHT2 - 0.001 0.0011 0.0000 1.000 0.49 0.00 TVD_RATWARE_CB - 0.001 0.0011 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_A842E - 0.001 0.0011 0.0000 1.000 0.49 0.00 RATWARE_OE_MALFORMED - 0.001 0.0011 0.0000 1.000 0.49 0.00 FH_MSGID_000000 - 0.001 0.0011 0.0000 1.000 0.49 0.00 AXB_XMID_OEGOESNULL - 0.001 0.0011 0.0000 1.000 0.49 0.00 FUZZY_PRESCRIPT - 0.001 0.0011 0.0000 1.000 0.49 0.00 FB_HOMELOAN - 0.001 0.0011 0.0000 1.000 0.49 0.00 SUBJECT_FUZZY_MEDS - 0.001 0.0011 0.0000 1.000 0.49 0.00 FS_CHEAP_CAP - 0.002 0.0023 0.0012 0.655 0.49 0.00 FREE_PORN - 0.058 0.0599 0.0535 0.528 0.49 2.03 TRACKER_ID - 0.004 0.0014 0.0083 0.145 0.49 -0.00 NO_RECEIVED - 0.005 0.0056 0.0048 0.543 0.49 0.00 TVD_ACT_193 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_ESTABLISH2 - 0.001 0.0008 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_A50F8 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FB_IMPRESS_GIRL - 0.001 0.0008 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_32D97 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_VALIUM1 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_VALIUM2 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FB_SPACEY_ZIP - 0.001 0.0008 0.0000 1.000 0.49 0.00 FM_PHN_NODNS - 0.001 0.0014 0.0006 0.704 0.49 0.00 FUZZY_MORTGAGE - 0.614 0.7266 0.3764 0.659 0.49 0.00 HTML_FONT_SIZE_HUGE - 3.233 4.1328 1.3385 0.755 0.49 0.55 MISSING_MID - 0.000 0.0006 0.0000 1.000 0.49 0.00 FM_LIKE_STOCKS - 0.000 0.0006 0.0000 1.000 0.49 0.00 HTTP_77 - 0.000 0.0006 0.0000 1.000 0.49 0.00 FB_DOUBLE_0WORDS - 0.000 0.0006 0.0000 1.000 0.49 0.00 FM_DOESNT_SAY_STOCK - 0.000 0.0006 0.0000 1.000 0.49 0.00 INVALID_TZ_CST - 0.000 0.0006 0.0000 1.000 0.49 0.00 FU_HOODIA - 0.000 0.0006 0.0000 1.000 0.49 0.00 FUZZY_MONEY - 0.000 0.0006 0.0000 1.000 0.49 0.00 FR_MIDER - 0.000 0.0006 0.0000 1.000 0.49 0.00 FU_MIDER - 0.000 0.0003 0.0000 1.000 0.49 0.00 JAPANESE_UCE_BODY - 0.000 0.0003 0.0000 1.000 0.49 0.00 FUZZY_BILLION - 0.000 0.0003 0.0000 1.000 0.49 0.00 HS_DRUG_DOLLAR_MANY - 0.000 0.0003 0.0000 1.000 0.49 0.00 JAPANESE_UCE_SUBJECT - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_ROLX - 0.000 0.0003 0.0000 1.000 0.49 0.00 MID_DEGREES - 0.000 0.0003 0.0000 1.000 0.49 0.00 CONFIRMED_FORGED - 0.000 0.0003 0.0000 1.000 0.49 0.00 TVD_DEAR_HOMEOWNER - 0.000 0.0003 0.0000 1.000 0.49 0.00 SHORT_TERM_PRICE - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_FHARMACY - 0.000 0.0000 0.0006 0.000 0.49 -2.00 HASHCASH_23 - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_C0MPANY - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_ONIINE - 0.000 0.0003 0.0000 1.000 0.49 0.00 HS_DRUG_DOLLAR_2 - 0.000 0.0003 0.0000 1.000 0.49 0.00 FUZZY_REMOVE - 0.000 0.0003 0.0000 1.000 0.49 0.00 PREST_NON_ACCREDITED - 0.000 0.0003 0.0000 1.000 0.49 0.00 TVD_FLOAT_GENERAL - 0.000 0.0003 0.0000 1.000 0.49 -0.00 HELO_STATIC_HOST - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_BILLI0N - 0.001 0.0008 0.0006 0.588 0.49 0.00 FORWARD_LOOKING - 0.001 0.0008 0.0006 0.588 0.49 0.00 TVD_EB_PHISH - 0.001 0.0008 0.0006 0.588 0.49 0.00 HEADER_COUNT_CTYPE - 0.001 0.0014 0.0012 0.543 0.49 0.00 HTML_TAG_EXIST_BGSOUND - 74.699 84.0309 55.0509 0.604 0.49 0.00 HTML_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 100.00 SUBJECT_IN_BLACKLIST - 0.000 0.0000 0.0000 0.500 0.49 0.00 CORRUPT_FROM_LINE_IN_HDRS - 0.000 0.0000 0.0000 0.500 0.49 -5.00 HASHCASH_HIGH - 0.000 0.0000 0.0000 0.500 0.49 2.45 MIME_CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FRT_ERECTION - 0.000 0.0000 0.0000 0.500 0.49 0.00 FUZZY_OBLIGATION - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_50_60 - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_70_80 - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 1.00 S25R_4 - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_BADTAG_40_50 - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_DEPT - 0.000 0.0000 0.0000 0.500 0.49 0.00 PREVENT_NONDELIVERY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FSL_UA - 0.000 0.0000 0.0000 0.500 0.49 -3.00 HASHCASH_24 - 0.000 0.0000 0.0000 0.500 0.49 100.00 USER_IN_BLACKLIST - 0.000 0.0000 0.0000 0.500 0.49 0.50 HTML_CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 0.00 HIGH_CODEPAGE_URI - 0.000 0.0000 0.0000 0.500 0.49 1.00 FRT_PHARMAC - 0.000 0.0000 0.0000 0.500 0.49 -20.00 USER_IN_MORE_SPAM_TO - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_URI - 0.000 0.0000 0.0000 0.500 0.49 0.10 MIME_SUSPECT_NAME - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_NAME_FREE - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_PERCENT - 0.000 0.0000 0.0000 0.500 0.49 0.00 SHORTCIRCUIT - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_90_100 - 0.000 0.0000 0.0000 0.500 0.49 0.00 FUZZY_OFFERS - 0.000 0.0000 0.0000 0.500 0.49 1.00 SPAMMY_MIME_BDRY_01 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_GECKO_BUILD - 0.000 0.0000 0.0000 0.500 0.49 0.10 VBOUNCE_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N8 - 0.000 0.0000 0.0000 0.500 0.49 0.00 EMAIL_ROT13 - 0.000 0.0000 0.0000 0.500 0.49 1.00 SANE_b58d7945d89b7afc9e2753c83b00ab44 - 0.000 0.0000 0.0000 0.500 0.49 -1.00 HASHCASH_22 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_AM_PM - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N3 - 0.000 0.0000 0.0000 0.500 0.49 3.20 CHARSET_FARAWAY_HEADER - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_SPF_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 1.00 TO_NO_BRKTS_DYNIP - 0.000 0.0000 0.0000 0.500 0.49 1.00 DEAR_BENEFICIARY - 0.000 0.0000 0.0000 0.500 0.49 0.00 FORGED_MUA_THEBAT_CS - 0.000 0.0000 0.0000 0.500 0.49 0.00 ACCESSDB - 0.000 0.0000 0.0000 0.500 0.49 1.00 KHOP_NO_FQDN - 0.000 0.0000 0.0000 0.500 0.49 1.00 FSL_LSPACES_ABUSE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_S25 - 0.000 0.0000 0.0000 0.500 0.49 0.00 YAHOO_RD_REDIR - 0.000 0.0000 0.0000 0.500 0.49 0.00 MULTI_FORGED - 0.000 0.0000 0.0000 0.500 0.49 1.00 DEAR_EMAIL - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_MSFT - 0.000 0.0000 0.0000 0.500 0.49 10.00 USER_IN_BLACKLIST_TO - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_RCVD_AT - 0.000 0.0000 0.0000 0.500 0.49 1.00 MANY_SPAN_IN_TEXT - 0.000 0.0000 0.0000 0.500 0.49 -6.00 USER_IN_WHITELIST_TO - 0.000 0.0000 0.0000 0.500 0.49 0.00 NO_HEADERS_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_AGENT - 0.000 0.0000 0.0000 0.500 0.49 0.00 NML_ADSP_CUSTOM_LOW - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_MOZ_MALFORMED - 0.000 0.0000 0.0000 0.500 0.49 0.10 MICROSOFT_EXECUTABLE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N2 - 0.000 0.0000 0.0000 0.500 0.49 0.00 WITH_LC_SMTP - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_DYNIP - 0.000 0.0000 0.0000 0.500 0.49 3.20 CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FB_TIRED_OF_YOUR - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N15 - 0.000 0.0000 0.0000 0.500 0.49 0.00 BLANK_LINES_80_90 - 0.000 0.0000 0.0000 0.500 0.49 0.00 FRAGMENTED_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_PNIS - 0.000 0.0000 0.0000 0.500 0.49 1.00 FB_WITHOUT_PRESC - 0.000 0.0000 0.0000 0.500 0.49 -4.00 HASHCASH_25 - 0.000 0.0000 0.0000 0.500 0.49 0.00 JS_FROMCHARCODE - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_FORM - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_FROM_MISSP - 0.000 0.0000 0.0000 0.500 0.49 0.00 YAHOO_DRS_REDIR - 0.000 0.0000 0.0000 0.500 0.49 -0.50 HASHCASH_20 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RUDE_HTML - 0.000 0.0000 0.0000 0.500 0.49 1.00 HELO_NO_DOMAIN - 0.000 0.0000 0.0000 0.500 0.49 0.00 AWL - 0.000 0.0000 0.0000 0.500 0.49 0.00 X_PRIORITY_CC - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N1 - 0.000 0.0000 0.0000 0.500 0.49 1000.00 GTUBE - 0.000 0.0000 0.0000 0.500 0.49 1.00 FS_MORE_CONFIDENT - 0.000 0.0000 0.0000 0.500 0.49 2.80 UNWANTED_LANGUAGE_BODY - 0.000 0.0000 0.0000 0.500 0.49 -0.70 HASHCASH_21 - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_FREEMAIL - 0.000 0.0000 0.0000 0.500 0.49 1.50 BODY_8BITS - 0.000 0.0000 0.0000 0.500 0.49 0.00 URI_TRUNCATED - 0.000 0.0000 0.0000 0.500 0.49 0.10 HASHCASH_2SPEND - 0.000 0.0000 0.0000 0.500 0.49 1.00 FORGED_RELAY_MUA_TO_MX - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_ALL_SPAM_TO - 0.000 0.0000 0.0000 0.500 0.49 1.00 MANY_TINY_FLOAT - 0.000 0.0000 0.0000 0.500 0.49 1.00 S25R_6 - 0.000 0.0000 0.0000 0.500 0.49 0.00 KOREAN_UCE_SUBJECT - 0.000 0.0000 0.0000 0.500 0.49 0.00 MISSING_HB_SEP - 0.000 0.0000 0.0000 0.500 0.49 -100.00 SUBJECT_IN_WHITELIST - 0.001 0.0006 0.0006 0.487 0.49 0.00 FB_ANA_TRIM - 0.001 0.0011 0.0012 0.487 0.49 0.00 FRT_XANAX2 - 0.001 0.0011 0.0012 0.487 0.49 0.00 FS_TEEN_BAD - 0.000 0.0003 0.0006 0.322 0.49 0.00 FB_FAKE_NUMBERS - 0.000 0.0003 0.0006 0.322 0.49 0.00 HTML_OBFUSCATE_30_40 - 0.000 0.0003 0.0006 0.322 0.49 0.00 NML_ADSP_CUSTOM_HIGH - 0.000 0.0003 0.0006 0.322 0.49 0.00 TVD_FUZZY_FINANCE - 0.001 0.0008 0.0012 0.416 0.49 0.00 FB_SPACED_PHN_3B - 0.001 0.0008 0.0012 0.416 0.49 0.00 CTYPE_8SPACE_GIF - 0.000 0.0000 0.0006 0.000 0.49 0.00 FB_ROLLER_IS_T - 0.000 0.0000 0.0006 0.000 0.49 0.00 FB_SSEX - 0.000 0.0000 0.0006 0.000 0.49 0.00 FUZZY_SOFTWARE - 0.000 0.0000 0.0006 0.000 0.49 0.00 HTML_BADTAG_90_100 - 0.000 0.0000 0.0006 0.000 0.49 0.00 STOCK_ALERT - 0.001 0.0006 0.0012 0.322 0.49 0.00 CURR_PRICE - 0.001 0.0006 0.0012 0.322 0.49 0.00 DRUG_DOSAGE - 0.001 0.0006 0.0012 0.322 0.49 0.00 REFINANCE_YOUR_HOME - 0.001 0.0006 0.0012 0.322 0.49 0.00 FUZZY_VIOXX - 0.003 0.0028 0.0036 0.442 0.49 0.00 INVALID_TZ_EST - 0.011 0.0107 0.0119 0.474 0.49 0.17 HTML_OBFUSCATE_10_20 - 0.001 0.0003 0.0012 0.192 0.49 0.00 CUM_SHOT - 0.001 0.0003 0.0012 0.192 0.49 0.00 SUBJECT_FUZZY_VPILL - 0.001 0.0008 0.0018 0.322 0.49 0.00 FRT_PRICE - 0.001 0.0008 0.0018 0.322 0.49 0.00 SPOOF_NET2COM - 0.001 0.0008 0.0018 0.322 0.49 0.00 HTML_NONELEMENT_60_70 - 0.000 0.0000 0.0012 0.000 0.49 0.10 CHALLENGE_RESPONSE - 0.001 0.0003 0.0018 0.137 0.49 0.00 HTML_NONELEMENT_80_90 - 0.001 0.0003 0.0018 0.137 0.49 0.00 FS_DOLLAR_BONUS - 6.742 8.5946 2.8422 0.751 0.49 0.00 BAYES_50 - 0.011 0.0104 0.0125 0.456 0.49 2.20 NO_MEDICAL - 0.001 0.0000 0.0018 0.000 0.49 0.00 FS_NEW_XXX - 0.002 0.0011 0.0030 0.275 0.48 0.00 TVD_STOCK1 - 0.001 0.0003 0.0024 0.106 0.48 0.00 HDR_ORDER_FTSDMCXX_001C - 0.002 0.0008 0.0030 0.222 0.48 0.00 FB_MORE_SIZE - 0.002 0.0014 0.0036 0.284 0.48 0.00 TVD_FUZZY_MICROCAP - 0.010 0.0093 0.0119 0.439 0.48 0.20 INVESTMENT_ADVICE - 0.001 0.0000 0.0024 0.000 0.48 0.00 HTML_BADTAG_50_60 - 0.001 0.0000 0.0024 0.000 0.48 0.00 FM_LUX_GIFTS_REDUCED - 0.001 0.0006 0.0030 0.160 0.48 0.00 LIVE_PORN - 0.002 0.0011 0.0036 0.240 0.48 0.00 MIME_BAD_ISO_CHARSET - 0.002 0.0008 0.0036 0.192 0.48 0.00 FRT_XANAX1 - 0.005 0.0037 0.0065 0.359 0.48 0.00 FRT_LEVITRA - 0.002 0.0011 0.0042 0.213 0.48 0.00 FUZZY_VLIUM - 0.093 0.0974 0.0827 0.541 0.48 0.00 SPOOF_COM2COM - 0.001 0.0003 0.0036 0.073 0.48 0.00 HTML_COMMENT_SHORT - 0.001 0.0003 0.0036 0.073 0.48 0.00 FR_3TAG_3TAG - 0.002 0.0008 0.0042 0.169 0.48 0.00 FRT_DOLLAR - 0.002 0.0014 0.0048 0.229 0.48 0.00 FB_REPLIC_CAP - 0.086 0.0901 0.0785 0.534 0.48 0.10 BOUNCE_MESSAGE - 0.001 0.0000 0.0036 0.000 0.48 0.00 DOS_URI_ASTERISK - 0.001 0.0000 0.0036 0.000 0.48 0.00 HTML_BADTAG_60_70 - 0.002 0.0006 0.0042 0.119 0.48 0.00 FU_LONG_QUERY3 - 0.002 0.0003 0.0042 0.064 0.48 0.00 HTML_FORMACTION_MAILTO - 3.762 4.6313 1.9331 0.706 0.48 2.09 HTML_IMAGE_RATIO_04 - 0.008 0.0062 0.0113 0.355 0.48 0.00 FRT_FUCK2 - 0.004 0.0025 0.0077 0.247 0.48 0.00 FM_MULTI_LUX_GIFTS - 0.004 0.0025 0.0077 0.247 0.48 0.00 FRT_INVESTOR - 0.045 0.0432 0.0494 0.467 0.48 0.00 PART_CID_STOCK_LESS - 0.002 0.0000 0.0054 0.000 0.47 0.00 MIME_BOUND_EQ_REL - 1.051 1.2250 0.6856 0.641 0.47 0.00 HTML_MIME_NO_HTML_TAG - 0.002 0.0003 0.0065 0.041 0.47 0.00 FB_NUMYO - 0.002 0.0003 0.0065 0.041 0.47 0.00 FRT_MEETING - 0.032 0.0291 0.0375 0.437 0.47 2.10 FROM_BLANK_NAME - 0.002 0.0000 0.0071 0.000 0.47 0.00 TVD_SILLY_URI_OBFU - 0.011 0.0090 0.0166 0.352 0.47 0.00 STOCK_IMG_OUTLOOK - 0.009 0.0059 0.0143 0.294 0.47 0.00 RCVD_BAD_ID - 0.047 0.0443 0.0541 0.450 0.47 0.00 MISSING_MIME_HB_SEP - 0.011 0.0076 0.0166 0.314 0.46 0.00 NUMERIC_HTTP_ADDR - 0.388 0.4202 0.3205 0.567 0.46 0.52 HTML_TAG_BALANCE_HEAD - 0.094 0.0929 0.0963 0.491 0.46 0.20 HTML_COMMENT_SAVED_URL - 0.003 0.0000 0.0095 0.000 0.46 0.00 TVD_FUZZY_SYMBOL - 0.005 0.0023 0.0119 0.160 0.46 0.00 OBSCURED_EMAIL - 0.027 0.0237 0.0351 0.403 0.46 0.89 TO_MALFORMED - 0.006 0.0028 0.0131 0.178 0.46 0.00 MIME_BOUND_MANY_HEX - 0.166 0.1694 0.1594 0.515 0.46 0.16 LOW_PRICE - 0.093 0.0904 0.0975 0.481 0.46 0.10 ANY_BOUNCE_MESSAGE - 5.014 4.9472 5.1552 0.490 0.46 0.00 MIME_QP_LONG_LINE - 8.846 7.5936 11.4842 0.398 0.46 0.00 FREEMAIL_FROM - 0.006 0.0020 0.0143 0.122 0.45 0.00 HTML_NONELEMENT_40_50 - 0.007 0.0028 0.0155 0.154 0.45 0.00 FUZZY_REFINANCE - 0.480 0.5137 0.4097 0.556 0.45 2.00 DEAR_SOMETHING - 0.080 0.0757 0.0880 0.462 0.45 0.00 LOCALPART_IN_SUBJECT - 0.118 0.1121 0.1308 0.462 0.45 0.00 HTML_EXTRA_CLOSE - 2.224 2.4337 1.7814 0.577 0.45 0.92 MISSING_HEADERS - 1.332 1.4498 1.0828 0.572 0.44 1.25 HTML_TAG_BALANCE_BODY - 0.008 0.0031 0.0190 0.140 0.44 0.00 HTML_IFRAME_SRC - 0.006 0.0003 0.0166 0.017 0.44 0.00 TVD_SPACED_SUBJECT_WORD3 - 0.022 0.0167 0.0345 0.326 0.44 1.15 RATWARE_MPOP_WEBMAIL - 0.005 0.0000 0.0166 0.000 0.44 0.00 FRT_STRONG2 - 0.478 0.2205 1.0203 0.178 0.44 0.00 BAYES_40 - 0.006 0.0003 0.0190 0.015 0.44 0.10 CRBOUNCE_MESSAGE - 0.007 0.0008 0.0196 0.041 0.44 0.00 DC_PNG_UNO_LARGO - 0.009 0.0025 0.0232 0.099 0.43 0.00 SUBJECT_FUZZY_TION - 0.014 0.0068 0.0279 0.195 0.43 0.00 FH_HAS_XAIMC - 2.009 1.9991 2.0294 0.496 0.43 0.52 SUBJ_ALL_CAPS - 0.120 0.1082 0.1463 0.425 0.43 1.11 DATE_IN_PAST_24_48 - 1.630 1.6777 1.5299 0.523 0.43 0.00 TVD_SPACE_RATIO - 0.341 0.3267 0.3722 0.467 0.42 0.00 FROM_EXCESS_BASE64 - 0.009 0.0014 0.0244 0.055 0.42 0.00 HEAD_LONG - 1.264 1.2377 1.3182 0.484 0.42 0.00 HTML_IMAGE_RATIO_08 - 0.241 0.2253 0.2729 0.452 0.42 0.39 MISSING_MIMEOLE - 0.073 0.0576 0.1064 0.351 0.41 0.00 MIME_BASE64_TEXT - 0.062 0.0483 0.0922 0.344 0.41 0.81 HTTP_ESCAPED_HOST - 0.009 0.0003 0.0274 0.010 0.41 0.00 FU_END_ET - 0.011 0.0017 0.0315 0.051 0.41 0.00 HTML_EMBEDS - 1.159 1.0262 1.4395 0.416 0.41 0.00 HTML_IMAGE_RATIO_06 - 0.722 0.6119 0.9537 0.391 0.40 0.00 UNPARSEABLE_RELAY - 0.159 0.1336 0.2117 0.387 0.40 0.60 SUBJ_DOLLARS - 0.021 0.0096 0.0458 0.173 0.40 0.00 HTML_NONELEMENT_30_40 - 1.048 0.9110 1.3379 0.405 0.40 0.35 MIME_HTML_MOSTLY - 0.093 0.0692 0.1421 0.327 0.39 0.00 MISSING_SUBJECT - 0.191 0.1539 0.2705 0.363 0.39 0.41 REMOVE_BEFORE_LINK - 0.025 0.0113 0.0535 0.174 0.39 0.00 OBFUSCATING_COMMENT - 0.028 0.0141 0.0571 0.198 0.39 0.00 TVD_FW_GRAPHIC_NAME_LONG - 1.483 0.9920 2.5158 0.283 0.38 1.00 EXTRA_MPART_TYPE - 0.022 0.0073 0.0541 0.119 0.38 0.00 X_IP - 0.291 0.2279 0.4251 0.349 0.37 0.16 NORMAL_HTTP_TO_IP - 0.088 0.0565 0.1546 0.268 0.37 1.70 FUZZY_CREDIT - 0.556 0.3795 0.9270 0.290 0.37 0.00 HTML_FONT_FACE_BAD - 0.029 0.0102 0.0672 0.131 0.36 0.00 FRT_DIPLOMA - 0.055 0.0285 0.1118 0.203 0.36 0.00 TVD_FW_GRAPHIC_NAME_MID - 0.127 0.0796 0.2259 0.261 0.35 0.00 CTYPE_001C_B - 0.823 0.5058 1.4913 0.253 0.34 0.00 MIME_BASE64_BLANKS - 0.020 0.0000 0.0636 0.000 0.34 0.43 MIME_BOUND_DIGITS_15 - 0.334 0.2047 0.6059 0.253 0.33 1.48 UPPERCASE_75_100 - 0.244 0.1387 0.4668 0.229 0.33 0.60 HTML_OBFUSCATE_05_10 - 0.273 0.1519 0.5292 0.223 0.32 0.00 MIME_HTML_ONLY_MULTI - 0.122 0.0641 0.2438 0.208 0.32 0.00 UPPERCASE_50_75 - 0.027 0.0017 0.0797 0.021 0.32 0.00 HIDE_WIN_STATUS - 0.710 0.3629 1.4407 0.201 0.32 0.00 HTML_FONT_SIZE_LARGE - 0.592 0.2604 1.2915 0.168 0.29 0.40 MSGID_FROM_MTA_HEADER - 0.052 0.0045 0.1528 0.029 0.26 0.00 IP_LINK_PLUS - 0.047 0.0023 0.1427 0.016 0.25 0.00 FRT_ADOBE2 - 0.093 0.0195 0.2480 0.073 0.24 0.00 WEIRD_PORT - 0.394 0.0494 1.1208 0.042 0.16 0.00 MSGID_MULTIPLE_AT - 0.216 0.0246 0.6178 0.038 0.16 0.00 TVD_RCVD_SPACE_BRACKET - -Rule file versions for which these results apply: -(SpamAssassin Version string: 3.003000-beta1-svn) - --rw-r--r-- 1 mark nsc 5671 Sep 30 16:45 10_default_prefs.cf --rw-r--r-- 1 mark nsc 7509 Sep 30 16:45 20_advance_fee.cf --rw-r--r-- 1 mark nsc 7005 Sep 30 16:45 20_body_tests.cf --rw-r--r-- 1 mark nsc 1894 Sep 30 16:45 20_compensate.cf --rw-r--r-- 1 mark nsc 13540 Oct 6 12:30 20_dnsbl_tests.cf --rw-r--r-- 1 mark nsc 14998 Sep 30 16:45 20_drugs.cf --rw-r--r-- 1 mark nsc 11492 Sep 30 16:45 20_dynrdns.cf --rw-r--r-- 1 mark nsc 8118 Sep 30 16:45 20_fake_helo_tests.cf --rw-r--r-- 1 mark nsc 3159 Oct 30 15:58 20_freemail.cf --rw-r--r-- 1 mark nsc 35574 Oct 30 15:58 20_freemail_domains.cf --rw-r--r-- 1 mark nsc 25516 Sep 30 16:45 20_head_tests.cf --rw-r--r-- 1 mark nsc 10504 Sep 30 16:45 20_html_tests.cf --rw-r--r-- 1 mark nsc 5287 Sep 30 16:45 20_imageinfo.cf --rw-r--r-- 1 mark nsc 3330 Sep 30 16:45 20_meta_tests.cf --rw-r--r-- 1 mark nsc 1880 Sep 30 16:45 20_net_tests.cf --rw-r--r-- 1 mark nsc 8013 Sep 30 16:45 20_phrases.cf --rw-r--r-- 1 mark nsc 2062 Sep 30 16:45 20_porn.cf --rw-r--r-- 1 mark nsc 16172 Sep 30 16:45 20_ratware.cf --rw-r--r-- 1 mark nsc 5534 Sep 30 16:45 20_uri_tests.cf --rw-r--r-- 1 mark nsc 19305 Sep 30 16:45 20_vbounce.cf --rw-r--r-- 1 mark nsc 2549 Sep 30 16:45 23_bayes.cf --rw-r--r-- 1 mark nsc 1544 Sep 30 16:45 25_accessdb.cf --rw-r--r-- 1 mark nsc 1536 Sep 30 16:45 25_antivirus.cf --rw-r--r-- 1 mark nsc 1544 Sep 30 16:45 25_asn.cf --rw-r--r-- 1 mark nsc 2331 Sep 30 16:45 25_dcc.cf --rw-r--r-- 1 mark nsc 4407 Nov 2 17:07 25_dkim.cf --rw-r--r-- 1 mark nsc 2929 Sep 30 16:45 25_hashcash.cf --rw-r--r-- 1 mark nsc 1310 Sep 30 16:45 25_pyzor.cf --rw-r--r-- 1 mark nsc 3389 Sep 30 16:45 25_razor2.cf --rw-r--r-- 1 mark nsc 7672 Sep 30 16:45 25_replace.cf --rw-r--r-- 1 mark nsc 3100 Sep 30 16:45 25_spf.cf --rw-r--r-- 1 mark nsc 1768 Sep 30 16:45 25_textcat.cf --rw-r--r-- 1 mark nsc 7819 Nov 9 18:31 25_uribl.cf --rw-r--r-- 1 mark nsc 28682 Sep 30 16:45 30_text_de.cf --rw-r--r-- 1 mark nsc 20901 Sep 30 16:45 30_text_fr.cf --rw-r--r-- 1 mark nsc 1858 Sep 30 16:45 30_text_it.cf --rw-r--r-- 1 mark nsc 22257 Sep 30 16:45 30_text_nl.cf --rw-r--r-- 1 mark nsc 18290 Sep 30 16:45 30_text_pl.cf --rw-r--r-- 1 mark nsc 3331 Sep 30 16:45 30_text_pt_br.cf --rw-r--r-- 1 mark nsc 49537 Nov 27 18:58 50_scores.cf --rw-r--r-- 1 mark nsc 9288 Sep 30 16:45 60_adsp_override_dkim.cf --rw-r--r-- 1 mark nsc 1304 Sep 30 16:45 60_awl.cf --rw-r--r-- 1 mark nsc 2178 Sep 30 16:45 60_shortcircuit.cf --rw-r--r-- 1 mark nsc 4984 Sep 30 16:45 60_whitelist.cf --rw-r--r-- 1 mark nsc 6434 Nov 2 17:10 60_whitelist_dkim.cf --rw-r--r-- 1 mark nsc 3584 Sep 30 16:45 60_whitelist_spf.cf --rw-r--r-- 1 mark nsc 1914 Sep 30 16:45 60_whitelist_subject.cf --rw-r--r-- 1 mark nsc 54456 Dec 2 18:28 72_active.cf --rw-r--r-- 1 mark nsc 2214 Sep 30 16:45 local.cf --rw-r--r-- 1 mark nsc 2762 Sep 30 16:45 regression_tests.cf diff -Nru spamassassin-3.4.6/trunk-only/rules/STATISTICS-set1.txt spamassassin-4.0.0~rc3/trunk-only/rules/STATISTICS-set1.txt --- spamassassin-3.4.6/trunk-only/rules/STATISTICS-set1.txt 2009-12-02 18:11:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/STATISTICS-set1.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,1109 +0,0 @@ -STATISTICS REPORT FOR SPAMASSASSIN RULESET - -Classification success on test corpora, at default threshold: - -# SUMMARY for threshold 5.0: -# Correctly non-spam: 21156 99.86% -# Correctly spam: 42753 96.87% -# False positives: 30 0.14% -# False negatives: 1381 3.13% -# TCR(l=50): 15.318986 SpamRecall: 96.871% SpamPrec: 99.930% - -Results on test corpora at various alternative thresholds: - -# SUMMARY for threshold -4.0: -# Correctly non-spam: 3310 15.62% -# Correctly spam: 44134 100.00% -# False positives: 17876 84.38% -# False negatives: 0 0.00% -# TCR(l=50): 0.049378 SpamRecall: 100.000% SpamPrec: 71.172% - -# SUMMARY for threshold -3.0: -# Correctly non-spam: 4960 23.41% -# Correctly spam: 44132 100.00% -# False positives: 16226 76.59% -# False negatives: 2 0.00% -# TCR(l=50): 0.054399 SpamRecall: 99.995% SpamPrec: 73.117% - -# SUMMARY for threshold -2.0: -# Correctly non-spam: 5476 25.85% -# Correctly spam: 44130 99.99% -# False positives: 15710 74.15% -# False negatives: 4 0.01% -# TCR(l=50): 0.056186 SpamRecall: 99.991% SpamPrec: 73.747% - -# SUMMARY for threshold -1.0: -# Correctly non-spam: 5866 27.69% -# Correctly spam: 44126 99.98% -# False positives: 15320 72.31% -# False negatives: 8 0.02% -# TCR(l=50): 0.057616 SpamRecall: 99.982% SpamPrec: 74.229% - -# SUMMARY for threshold 0.0: -# Correctly non-spam: 10087 47.61% -# Correctly spam: 44104 99.93% -# False positives: 11099 52.39% -# False negatives: 30 0.07% -# TCR(l=50): 0.079524 SpamRecall: 99.932% SpamPrec: 79.894% - -# SUMMARY for threshold 1.0: -# Correctly non-spam: 17276 81.54% -# Correctly spam: 43965 99.62% -# False positives: 3910 18.46% -# False negatives: 169 0.38% -# TCR(l=50): 0.225554 SpamRecall: 99.617% SpamPrec: 91.833% - -# SUMMARY for threshold 2.0: -# Correctly non-spam: 20060 94.69% -# Correctly spam: 43770 99.18% -# False positives: 1126 5.31% -# False negatives: 364 0.82% -# TCR(l=50): 0.778872 SpamRecall: 99.175% SpamPrec: 97.492% - -# SUMMARY for threshold 3.0: -# Correctly non-spam: 20753 97.96% -# Correctly spam: 43558 98.69% -# False positives: 433 2.04% -# False negatives: 576 1.31% -# TCR(l=50): 1.985692 SpamRecall: 98.695% SpamPrec: 99.016% - -# SUMMARY for threshold 4.0: -# Correctly non-spam: 21021 99.22% -# Correctly spam: 43216 97.92% -# False positives: 165 0.78% -# False negatives: 918 2.08% -# TCR(l=50): 4.813918 SpamRecall: 97.920% SpamPrec: 99.620% - -# SUMMARY for threshold 4.5: -# Correctly non-spam: 21107 99.63% -# Correctly spam: 43055 97.56% -# False positives: 79 0.37% -# False negatives: 1079 2.44% -# TCR(l=50): 8.775900 SpamRecall: 97.555% SpamPrec: 99.817% - -# SUMMARY for threshold 5.5: -# Correctly non-spam: 21170 99.92% -# Correctly spam: 42479 96.25% -# False positives: 16 0.08% -# False negatives: 1655 3.75% -# TCR(l=50): 17.977189 SpamRecall: 96.250% SpamPrec: 99.962% - -# SUMMARY for threshold 6.0: -# Correctly non-spam: 21180 99.97% -# Correctly spam: 42149 95.50% -# False positives: 6 0.03% -# False negatives: 1985 4.50% -# TCR(l=50): 19.314661 SpamRecall: 95.502% SpamPrec: 99.986% - -# SUMMARY for threshold 6.5: -# Correctly non-spam: 21183 99.99% -# Correctly spam: 41753 94.61% -# False positives: 3 0.01% -# False negatives: 2381 5.39% -# TCR(l=50): 17.437377 SpamRecall: 94.605% SpamPrec: 99.993% - -# SUMMARY for threshold 7.0: -# Correctly non-spam: 21184 99.99% -# Correctly spam: 41281 93.54% -# False positives: 2 0.01% -# False negatives: 2853 6.46% -# TCR(l=50): 14.945479 SpamRecall: 93.536% SpamPrec: 99.995% - -# SUMMARY for threshold 8.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 40138 90.95% -# False positives: 0 0.00% -# False negatives: 3996 9.05% -# TCR(l=50): 11.044545 SpamRecall: 90.946% SpamPrec: 100.000% - -# SUMMARY for threshold 9.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 38678 87.64% -# False positives: 0 0.00% -# False negatives: 5456 12.36% -# TCR(l=50): 8.089076 SpamRecall: 87.638% SpamPrec: 100.000% - -# SUMMARY for threshold 10.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 37009 83.86% -# False positives: 0 0.00% -# False negatives: 7125 16.14% -# TCR(l=50): 6.194246 SpamRecall: 83.856% SpamPrec: 100.000% - -# SUMMARY for threshold 12.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 32985 74.74% -# False positives: 0 0.00% -# False negatives: 11149 25.26% -# TCR(l=50): 3.958561 SpamRecall: 74.738% SpamPrec: 100.000% - -# SUMMARY for threshold 15.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 27098 61.40% -# False positives: 0 0.00% -# False negatives: 17036 38.60% -# TCR(l=50): 2.590632 SpamRecall: 61.399% SpamPrec: 100.000% - -# SUMMARY for threshold 17.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 23812 53.95% -# False positives: 0 0.00% -# False negatives: 20322 46.05% -# TCR(l=50): 2.171735 SpamRecall: 53.954% SpamPrec: 100.000% - -# SUMMARY for threshold 20.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 19126 43.34% -# False positives: 0 0.00% -# False negatives: 25008 56.66% -# TCR(l=50): 1.764795 SpamRecall: 43.336% SpamPrec: 100.000% - - -Test hit frequencies, for spam and ham corpora: -(note: S/O indicates ratio of spam hits to overall hits for -each test, where 0.0 = hits only non-spam and 1.0 = hits only spam, -and the 'score' field should be ignored.) - -OVERALL SPAM% HAM% S/O RANK SCORE NAME - 0 354116 168179 0.678 0.00 0.00 (all messages) -0.00000 67.8000 32.2000 0.678 0.00 0.00 (all messages as %) - 21.490 31.6961 0.0012 1.000 1.00 4.50 URIBL_AB_SURBL - 58.306 85.9927 0.0077 1.000 1.00 0.00 BAYES_99 - 28.417 41.9097 0.0054 1.000 0.99 1.66 URIBL_WS_SURBL - 10.321 15.2230 0.0006 1.000 0.99 0.00 URIBL_SC_SURBL - 9.134 13.4719 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_08 - 9.132 13.4688 0.0006 1.000 0.98 4.40 KB_RATWARE_OUTLOOK_MID - 9.131 13.4673 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_16 - 9.131 13.4673 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_12 - 7.889 11.6355 0.0000 1.000 0.98 3.89 HELO_DYNAMIC_IPADDR2 - 48.786 71.9487 0.0137 1.000 0.98 2.43 RAZOR2_CF_RANGE_E8_51_100 - 10.781 15.8976 0.0077 1.000 0.97 1.12 FH_HELO_EQ_D_D_D_D - 36.655 54.0555 0.0155 1.000 0.97 1.95 URIBL_JP_SURBL - 4.050 5.9735 0.0000 1.000 0.96 2.51 HELO_DYNAMIC_HCC - 4.988 7.3544 0.0042 0.999 0.96 3.24 HELO_DYNAMIC_IPADDR - 3.597 5.3048 0.0018 1.000 0.96 0.00 HK_NAME_DRUGS - 2.380 3.5104 0.0000 1.000 0.95 2.89 HELO_DYNAMIC_SPLIT_IP - 2.281 3.3650 0.0000 1.000 0.94 4.20 FSL_YG_ABUSE - 1.957 2.8861 0.0000 1.000 0.94 3.16 REPLICA_WATCH - 39.995 58.9770 0.0262 1.000 0.94 3.56 RCVD_IN_PBL - 1.957 2.8858 0.0000 1.000 0.94 0.71 FB_REPLICA_ROLEX - 1.901 0.0000 5.9050 0.000 0.93 -7.50 USER_IN_DEF_DKIM_WL - 8.791 12.9579 0.0172 0.999 0.93 3.09 DOS_OE_TO_MX - 2.305 3.3975 0.0042 0.999 0.93 1.21 TVD_RCVD_SINGLE - 2.317 0.0028 7.1882 0.000 0.93 -1.00 ALL_TRUSTED - 2.720 4.0074 0.0089 0.998 0.93 0.84 HELO_DYNAMIC_DHCP - 14.258 21.0180 0.0238 0.999 0.93 0.00 RCVD_IN_SORBS_DUL - 1.773 2.6121 0.0054 0.998 0.91 3.69 RATWARE_MS_HASH - 1.448 2.1357 0.0006 1.000 0.91 0.00 HELO_LOCALHOST - 1.573 2.3184 0.0036 0.998 0.91 0.03 RATWARE_OUTLOOK_NONAME - 1.379 2.0338 0.0006 1.000 0.91 2.99 KB_RATWARE_MSGID - 1.331 1.9632 0.0012 0.999 0.90 0.00 JM_SOUGHT_FRAUD_3 - 2.324 3.4212 0.0149 0.996 0.90 3.37 FH_FAKE_RCVD_LINE_B - 1.630 2.4001 0.0095 0.996 0.89 2.79 FORGED_MUA_OUTLOOK - 1.157 1.7051 0.0018 0.999 0.89 1.90 ADVANCE_FEE_3 - 1.402 2.0649 0.0071 0.997 0.89 2.60 RCVD_IN_SBL - 1.075 1.5859 0.0000 1.000 0.89 0.00 JM_SOUGHT_FRAUD_1 - 6.608 9.7318 0.0297 0.997 0.89 1.28 RCVD_IN_SSBL - 20.886 30.7854 0.0428 0.999 0.89 0.79 URIBL_OB_SURBL - 2.494 0.0102 7.7227 0.001 0.89 -4.30 HABEAS_ACCREDITED_SOI - 0.910 1.3422 0.0000 1.000 0.88 1.66 SANE_7429530a7398f43f1f1b795f9420714e - 1.094 1.6111 0.0054 0.997 0.88 0.00 BAYES_95 - 0.766 1.1301 0.0006 0.999 0.87 0.00 ADVANCE_FEE_4 - 6.882 10.1317 0.0398 0.996 0.87 0.64 URIBL_SBL - 0.743 1.0960 0.0006 0.999 0.87 3.90 MSGID_OUTLOOK_INVALID - 3.794 5.5792 0.0339 0.994 0.87 0.14 HTML_SHORT_LINK_IMG_1 - 0.852 1.2544 0.0059 0.995 0.86 3.03 DATE_IN_FUTURE_96_XX - 1.326 1.9479 0.0155 0.992 0.86 1.95 REPLYTO_WITHOUT_TO_CC - 0.607 0.8943 0.0006 0.999 0.86 2.06 AXB_HELO_LH_HOME - 0.562 0.8291 0.0000 1.000 0.86 0.00 FSL_INTERIA_ABUSE - 0.558 0.8237 0.0000 1.000 0.85 1.24 FH_HOST_EQ_VERIZON_P - 0.561 0.8268 0.0006 0.999 0.85 0.00 FSL_HELO_DEVICE - 1.313 1.9279 0.0184 0.991 0.85 2.22 DRUGS_ERECTILE - 0.630 0.9274 0.0042 0.996 0.85 2.48 MILLION_USD - 1.163 1.7076 0.0166 0.990 0.85 0.00 BAYES_80 - 2.234 3.2797 0.0321 0.990 0.85 1.40 MISSING_DATE - 0.568 0.8356 0.0036 0.996 0.85 0.00 KB_DATE_CONTAINS_TAB - 0.744 0.0042 2.3011 0.002 0.85 -4.30 RCVD_IN_BSP_TRUSTED - 3.057 4.4884 0.0440 0.990 0.84 0.34 HTML_IMAGE_ONLY_04 - 1.245 1.8265 0.0208 0.989 0.84 0.00 DYN_RDNS_SHORT_HELO_HTML - 0.491 0.7238 0.0000 1.000 0.84 3.42 HTML_SHORT_CENTER - 0.622 0.9135 0.0077 0.992 0.84 2.02 HELO_LH_HOME - 0.489 0.7212 0.0006 0.999 0.84 2.04 SANE_d0d2b0f6373bf91253d66dd74c594b87 - 0.544 0.7995 0.0048 0.994 0.84 3.37 MSOE_MID_WRONG_CASE - 0.719 1.0547 0.0119 0.989 0.84 3.48 FILL_THIS_FORM_LONG - 0.555 0.8153 0.0059 0.993 0.84 3.06 FB_CIALIS_LEO3 - 0.463 0.6831 0.0000 1.000 0.84 3.44 KB_FAKED_THE_BAT - 0.907 0.0076 2.8012 0.003 0.84 -0.80 DCC_REPUT_00_12 - 0.440 0.6489 0.0006 0.999 0.83 1.50 TVD_RCVD_IP4 - 0.406 0.5987 0.0000 1.000 0.83 3.17 FB_SOFTTABS - 0.484 0.7122 0.0042 0.994 0.83 1.56 SUBJECT_DIET - 1.535 2.2481 0.0327 0.986 0.83 0.26 HTML_SHORT_LINK_IMG_2 - 0.406 0.5981 0.0006 0.999 0.83 1.89 DOS_OE_TO_MX_IMAGE - 0.476 0.7003 0.0048 0.993 0.82 2.24 FILL_THIS_FORM_LOAN - 1.801 2.6364 0.0410 0.985 0.82 2.77 FREEMAIL_REPLYTO - 0.367 0.5416 0.0000 1.000 0.82 3.27 FH_HELO_ALMOST_IP - 0.366 0.5394 0.0000 1.000 0.82 0.00 RDNS_LOCALHOST - 0.354 0.5216 0.0000 1.000 0.81 3.46 SANE_4ef8302546bf270a19baf98508afacc4 - 0.351 0.5173 0.0006 0.999 0.81 0.00 FB_THIS_ADVERT - 1.627 2.3783 0.0440 0.982 0.81 0.00 HK_RANDOM_ENVFROM - 0.369 0.5422 0.0042 0.992 0.81 0.16 SHORT_HELO_AND_INLINE_IMAGE - 0.303 0.4456 0.0012 0.997 0.80 0.00 X_MAILER_CME_6543_MSN - 0.282 0.4160 0.0000 1.000 0.80 3.19 SANE_04e8bf28eb445199a7f11b943c44d209 - 1.686 2.4628 0.0499 0.980 0.80 2.29 ADVANCE_FEE_2 - 0.295 0.4346 0.0018 0.996 0.80 1.71 FS_REPLICAWATCH - 0.967 1.4108 0.0321 0.978 0.80 0.00 BAYES_60 - 0.625 0.9110 0.0232 0.975 0.79 3.60 FS_REPLICA - 0.783 1.1406 0.0291 0.975 0.79 0.21 RCVD_IN_NJABL_PROXY - 0.291 0.4281 0.0036 0.992 0.79 1.54 FS_WEIGHT_LOSS - 0.264 0.3894 0.0012 0.997 0.79 2.75 HK_LOTTO - 0.304 0.4448 0.0065 0.986 0.79 0.00 STOCK_IMG_HTML - 0.285 0.4188 0.0048 0.989 0.79 3.60 NA_DOLLARS - 0.305 0.4459 0.0077 0.983 0.78 0.00 STOCK_IMG_HDR_FROM - 10.447 15.3597 0.1035 0.993 0.78 2.70 RCVD_IN_PSBL - 5.178 7.5958 0.0874 0.989 0.78 0.33 HTML_SHORT_LINK_IMG_3 - 0.410 0.5973 0.0155 0.975 0.78 0.00 FORGED_OUTLOOK_HTML - 1.167 1.6980 0.0482 0.972 0.78 1.45 DOS_OUTLOOK_TO_MX - 0.543 0.7893 0.0256 0.969 0.78 0.00 DNS_FROM_RFC_DSN - 0.226 0.3324 0.0006 0.998 0.77 3.50 KAM_LOTTO1 - 0.469 0.0102 1.4348 0.007 0.77 -0.10 DCC_REPUT_13_19 - 0.475 0.6899 0.0220 0.969 0.77 0.50 FROM_LOCAL_NOVOWEL - 0.221 0.3259 0.0000 1.000 0.77 0.00 JM_SOUGHT_FRAUD_2 - 0.239 0.3502 0.0036 0.990 0.77 2.14 IMPOTENCE - 0.462 0.6712 0.0226 0.967 0.77 2.07 DATE_IN_PAST_96_XX - 0.216 0.3191 0.0000 1.000 0.77 3.23 HELO_DYNAMIC_DIALIN - 0.212 0.3126 0.0000 1.000 0.77 1.12 SANE_2b173a7fb7518c75ac8a2d294d773fd8 - 0.206 0.3041 0.0000 1.000 0.76 0.75 FM_VEGAS_CASINO - 0.208 0.3067 0.0006 0.998 0.76 0.00 APOSTROPHE_FROM - 0.189 0.2790 0.0000 1.000 0.76 0.00 FB_TO_STOP_DISTRO - 0.206 0.3036 0.0012 0.996 0.76 2.37 ONLINE_PHARMACY - 0.218 0.3197 0.0030 0.991 0.76 3.40 RCVD_ILLEGAL_IP - 0.187 0.2762 0.0000 1.000 0.76 3.15 FB_QUALITY_REPLICA - 0.689 0.9960 0.0428 0.959 0.76 2.43 DATE_IN_FUTURE_03_06 - 0.186 0.0003 0.5786 0.000 0.76 -8.00 RCVD_IN_DNSWL_HI - 0.245 0.3569 0.0089 0.976 0.76 1.51 BODY_ENHANCEMENT2 - 0.184 0.2711 0.0000 1.000 0.76 0.00 XMAILER_MIMEOLE_OL_3AC1D - 0.186 0.2736 0.0012 0.996 0.75 1.04 FUZZY_ROLEX - 0.179 0.2635 0.0000 1.000 0.75 3.22 FORGED_MUA_THEBAT_BOUN - 0.184 0.2705 0.0012 0.996 0.75 1.20 TVD_VISIT_PHARMA - 0.221 0.3231 0.0065 0.980 0.75 1.61 BODY_ENHANCEMENT - 0.310 0.4479 0.0202 0.957 0.75 0.00 FRT_SOMA - 0.175 0.2578 0.0006 0.998 0.75 0.17 DRUG_ED_SILD - 0.254 0.0065 0.7760 0.008 0.75 -0.38 RCVD_IN_IADB_LISTED - 6.821 9.9964 0.1356 0.987 0.75 0.55 FROM_STARTS_WITH_NUMS - 0.172 0.0000 0.5334 0.000 0.75 -2.06 RCVD_IN_IADB_OPTIN - 0.247 0.0062 0.7540 0.008 0.74 -0.00 RCVD_IN_IADB_SPF - 0.168 0.2477 0.0000 1.000 0.74 3.30 LOTTERY_PH_004470 - 0.245 0.0062 0.7474 0.008 0.74 -0.17 RCVD_IN_IADB_RDNS - 0.165 0.2437 0.0000 1.000 0.74 2.45 FH_HOST_EQ_DYNAMICIP - 0.164 0.2426 0.0000 1.000 0.74 3.30 FUZZY_PHARMACY - 0.175 0.2567 0.0030 0.989 0.74 0.18 FS_START_LOSE - 0.158 0.2330 0.0000 1.000 0.74 2.05 DRUGS_SMEAR1 - 0.168 0.2468 0.0012 0.995 0.74 3.30 FM_LOTTO_YOU_WON - 56.573 83.3459 0.2004 0.998 0.74 0.36 RAZOR2_CF_RANGE_51_100 - 0.297 0.4273 0.0226 0.950 0.73 0.00 FH_HAS_XID - 0.154 0.2265 0.0006 0.997 0.73 2.57 LIVEFILESTORE - 0.173 0.2530 0.0036 0.986 0.73 2.99 EXCUSE_REMOVE - 0.149 0.2189 0.0006 0.997 0.73 1.40 HS_VPXL - 0.140 0.2064 0.0000 1.000 0.73 1.31 DRUGS_ERECTILE_OBFU - 1.141 1.6492 0.0708 0.959 0.73 2.00 MIME_HEADER_CTYPE_ONLY - 0.177 0.2581 0.0065 0.975 0.73 0.00 SPF_HELO_NEUTRAL - 17.958 26.4018 0.1778 0.993 0.73 1.25 RCVD_IN_BL_SPAMCOP_NET - 0.205 0.2979 0.0107 0.965 0.73 1.65 FM_SCHOOLING - 0.144 0.2115 0.0012 0.994 0.73 2.06 DOS_RCVD_IP_TWICE_C - 24.225 35.6409 0.1879 0.995 0.73 0.47 RAZOR2_CF_RANGE_E4_51_100 - 0.128 0.1892 0.0000 1.000 0.73 2.03 TVD_PH_REC - 0.193 0.2790 0.0113 0.961 0.73 3.04 SUBJ_YOUR_DEBT - 0.135 0.1988 0.0018 0.991 0.72 0.00 SANE_3b92eda751c992f230f215fb7eb36844 - 0.150 0.2189 0.0042 0.981 0.72 1.19 RCVD_HELO_IP_MISMATCH - 0.122 0.1804 0.0000 1.000 0.72 3.20 XMAILER_MIMEOLE_OL_22B61 - 0.127 0.1858 0.0024 0.987 0.72 1.25 DATE_IN_FUTURE_24_48 - 0.120 0.1771 0.0000 1.000 0.72 0.00 SANE_1c4f3286fa4aed6424ced88bfaf8b09c - 0.119 0.1748 0.0000 1.000 0.72 2.55 XMAILER_MIMEOLE_OL_8627E - 0.122 0.1790 0.0024 0.987 0.71 0.00 FU_COMMON_SUBS2 - 0.267 0.3804 0.0268 0.934 0.71 2.49 DATE_IN_FUTURE_12_24 - 0.137 0.1985 0.0059 0.971 0.71 0.00 FILL_THIS_FORM_FRAUD_PHISH - 0.110 0.1618 0.0000 1.000 0.71 0.29 FH_HELO_EQ_CHARTER - 0.165 0.2383 0.0101 0.959 0.71 0.28 URIBL_RHS_DOB - 0.108 0.1596 0.0000 1.000 0.71 0.00 FH_HOST_IN_ADDRARPA - 1.243 1.7904 0.0916 0.951 0.71 1.17 INVALID_MSGID - 0.119 0.1742 0.0030 0.983 0.71 2.50 SUSPICIOUS_RECIPS - 0.106 0.1556 0.0006 0.996 0.70 3.10 DEAR_WINNER - 0.104 0.1536 0.0000 1.000 0.70 1.08 FM_SEX_HELODDDD - 0.425 0.6035 0.0499 0.924 0.70 0.50 URI_NOVOWEL - 11.477 16.8278 0.2105 0.988 0.70 0.00 DIGEST_MULTIPLE - 1.823 2.6282 0.1290 0.953 0.70 1.05 HTML_IMAGE_ONLY_16 - 0.126 0.1827 0.0071 0.962 0.70 0.43 NO_RDNS_DOTCOM_HELO - 0.098 0.1449 0.0000 1.000 0.70 0.35 MIME_BOUND_DD_DIGITS - 0.093 0.1372 0.0000 1.000 0.70 0.00 BASE64_LENGTH_78_79 - 1.197 1.7178 0.0993 0.945 0.70 1.48 MPART_ALT_DIFF_COUNT - 0.090 0.1327 0.0000 1.000 0.69 0.86 SPAMMY_XMAILER - 0.159 0.2279 0.0149 0.939 0.69 2.49 MONEY_BACK - 0.088 0.1293 0.0000 1.000 0.69 0.31 RATWARE_NAME_ID - 1.438 2.0620 0.1231 0.944 0.69 1.20 DCC_REPUT_99_100 - 0.084 0.1243 0.0000 1.000 0.69 0.72 UNRESOLVED_TEMPLATE - 0.094 0.1367 0.0030 0.979 0.69 3.10 SUBJ_AS_SEEN - 1.055 1.5083 0.0993 0.938 0.69 1.43 FSL_HELO_BARE_IP_1 - 0.082 0.1209 0.0000 1.000 0.69 1.03 KAM_LOTTO2 - 1.732 2.4876 0.1415 0.946 0.68 0.43 INVALID_DATE - 0.083 0.1211 0.0012 0.990 0.68 0.00 FS_PHARMASUB2 - 0.092 0.1344 0.0042 0.970 0.68 1.54 TVD_FINGER_02 - 0.153 0.2169 0.0172 0.926 0.68 0.00 URI_OBFU_WWW - 7.388 0.1093 22.7145 0.005 0.68 -4.00 RCVD_IN_DNSWL_MED - 0.080 0.1175 0.0006 0.995 0.68 2.00 MSGID_SPAM_CAPS - 0.565 0.7975 0.0755 0.913 0.68 1.72 BAD_ENC_HEADER - 0.079 0.1163 0.0006 0.995 0.68 3.10 MALE_ENHANCE - 0.193 0.2722 0.0262 0.912 0.68 2.03 FB_GET_MEDS - 20.622 30.2805 0.2848 0.991 0.68 0.72 RCVD_IN_XBL - 0.076 0.1127 0.0000 1.000 0.68 0.00 FSL_FAKE_GMAIL_RCVD - 1.055 1.5032 0.1106 0.931 0.68 0.38 NO_DNS_FOR_FROM - 0.074 0.1099 0.0000 1.000 0.68 0.99 SUBJECT_DRUG_GAP_C - 1.518 2.1719 0.1409 0.939 0.68 0.00 STOX_REPLY_TYPE_WITHOUT_QUOTES - 0.099 0.1420 0.0083 0.945 0.68 0.00 TVD_PH_SUBJ_ACCOUNTS_POST - 0.074 0.1096 0.0000 1.000 0.68 2.80 SANE_91eb43f705d25c804374a746d7519660 - 0.074 0.1084 0.0000 1.000 0.68 1.82 FSL_FAKE_HOTMAIL_RVCD - 0.111 0.0059 0.3336 0.017 0.67 -0.00 RCVD_IN_IADB_SENDERID - 0.790 1.1174 0.0999 0.918 0.67 0.56 FORGED_OUTLOOK_TAGS - 0.075 0.1096 0.0024 0.979 0.67 0.00 FB_SAVE_PERSC - 0.069 0.1014 0.0000 1.000 0.67 2.45 XMAILER_MIMEOLE_OL_1ECD5 - 0.072 0.1059 0.0012 0.989 0.67 3.00 SPOOF_COM2OTH - 0.069 0.1011 0.0000 1.000 0.67 2.84 PERCENT_RANDOM - 0.068 0.1008 0.0000 1.000 0.67 2.52 DYN_RDNS_SHORT_HELO_IMAGE - 0.068 0.1000 0.0000 1.000 0.67 3.00 RATWARE_EFROM - 0.071 0.1045 0.0018 0.983 0.67 3.00 SUBJ_YOUR_FAMILY - 10.028 14.6542 0.2884 0.981 0.67 0.00 FSL_HELO_NON_FQDN_1 - 4.413 6.3990 0.2325 0.965 0.67 1.31 URI_HEX - 0.322 0.4482 0.0577 0.886 0.66 1.10 SUBJ_ILLEGAL_CHARS - 0.066 0.0980 0.0000 1.000 0.66 2.78 RCVD_DOUBLE_IP_SPAM - 0.183 0.2558 0.0285 0.900 0.66 2.38 BANG_GUAR - 4.831 7.0104 0.2420 0.967 0.66 0.70 HTML_IMAGE_ONLY_20 - 41.685 61.3005 0.3841 0.994 0.66 1.77 URIBL_BLACK - 0.062 0.0918 0.0000 1.000 0.66 2.54 RATWARE_ZERO_TZ - 0.427 0.5947 0.0749 0.888 0.66 0.00 PART_CID_STOCK - 0.062 0.0912 0.0012 0.987 0.65 2.90 HK_FAKENAME_EBAY - 0.263 0.3637 0.0523 0.874 0.65 0.00 DATE_IN_FUTURE_06_12 - 1.053 1.4879 0.1362 0.916 0.65 1.63 HTML_IMAGE_ONLY_12 - 0.058 0.0858 0.0000 1.000 0.65 1.43 FH_FAKE_RCVD_LINE - 0.060 0.0884 0.0006 0.993 0.65 2.69 FR_TITLE_NUMS - 53.063 78.0569 0.4370 0.994 0.65 0.00 RCVD_IN_BRBL_LASTEXT - 0.063 0.0921 0.0030 0.969 0.65 1.54 ENGLISH_UCE_SUBJECT - 57.316 84.3246 0.4477 0.995 0.65 1.73 RAZOR2_CHECK - 0.727 1.0163 0.1189 0.895 0.65 2.52 US_DOLLARS_3 - 0.090 0.1265 0.0143 0.899 0.65 1.80 DKIM_ADSP_DISCARD - 0.055 0.0813 0.0000 1.000 0.65 2.90 HELO_OEM - 10.241 14.9395 0.3490 0.977 0.65 0.97 SPF_SOFTFAIL - 0.054 0.0802 0.0000 1.000 0.65 2.06 FROM_ILLEGAL_CHARS - 0.408 0.5634 0.0803 0.875 0.64 2.60 DEAR_FRIEND - 0.052 0.0771 0.0006 0.992 0.64 1.35 FS_ABIGGER - 0.051 0.0751 0.0000 1.000 0.64 0.00 HS_FORGED_OE_FW - 0.121 0.1663 0.0250 0.869 0.64 0.00 FH_FROMEML_NOTLD - 0.051 0.0746 0.0006 0.992 0.64 2.51 FORGED_MUA_EUDORA - 0.226 0.3087 0.0511 0.858 0.64 0.00 TVD_PH_BODY_ACCOUNTS_PRE - 0.046 0.0000 0.1439 0.000 0.63 -1.21 RCVD_IN_IADB_OPTIN_GT50 - 0.070 0.0051 0.2063 0.024 0.63 -0.10 RCVD_IN_IADB_UT_CPR_MAT - 0.070 0.0051 0.2063 0.024 0.63 -0.33 RCVD_IN_IADB_MI_CPR_MAT - 1.090 1.5300 0.1623 0.904 0.63 1.34 DYN_RDNS_AND_INLINE_IMAGE - 3.882 5.5759 0.3140 0.947 0.63 0.65 SPF_NEUTRAL - 0.273 0.3716 0.0648 0.851 0.63 1.66 BAD_CREDIT - 30.313 0.2364 93.6413 0.003 0.63 0.00 BAYES_00 - 0.052 0.0754 0.0042 0.948 0.63 0.00 TVD_PH_SUBJ_URGENT - 0.043 0.0627 0.0006 0.991 0.63 0.00 FB_GVR - 0.043 0.0627 0.0006 0.991 0.63 1.02 DRUG_ED_CAPS - 0.064 0.0901 0.0095 0.904 0.63 2.80 EXCUSE_24 - 0.362 0.4945 0.0838 0.855 0.63 1.78 HTML_IMAGE_ONLY_08 - 0.388 0.5301 0.0880 0.858 0.63 0.94 URG_BIZ - 0.135 0.1830 0.0345 0.841 0.63 1.50 SUBJ_BUY - 0.047 0.0683 0.0024 0.966 0.63 0.76 DRUGS_DIET - 0.051 0.0737 0.0042 0.947 0.63 0.49 REPTO_QUOTE_YAHOO - 0.040 0.0596 0.0000 1.000 0.63 0.00 HS_BOBAX_MID_2 - 2.657 3.7773 0.2985 0.927 0.63 1.28 HTML_IMAGE_ONLY_24 - 0.040 0.0590 0.0000 1.000 0.63 2.39 RCVD_FAKE_HELO_DOTCOM - 0.296 0.4002 0.0755 0.841 0.62 2.50 FREEMAIL_FORGED_REPLYTO - 10.555 15.3597 0.4376 0.972 0.62 0.92 SPF_FAIL - 0.039 0.0000 0.1225 0.000 0.62 -7.50 USER_IN_DEF_SPF_WL - 0.039 0.0576 0.0000 1.000 0.62 1.65 FUZZY_PHENT - 0.040 0.0585 0.0006 0.990 0.62 2.77 MORE_SEX - 2.140 3.0273 0.2717 0.918 0.62 0.73 HTML_IMAGE_ONLY_28 - 0.048 0.0692 0.0042 0.943 0.62 0.00 FS_START_DOYOU2 - 0.039 0.0570 0.0000 1.000 0.62 0.00 FB_INDEPEND_RWD - 0.059 0.0819 0.0101 0.890 0.62 0.85 PRICES_ARE_AFFORDABLE - 1.325 1.8565 0.2069 0.900 0.62 1.47 RCVD_IN_NJABL_SPAM - 0.051 0.0726 0.0065 0.917 0.62 1.75 FUZZY_XPILL - 0.260 0.3505 0.0684 0.837 0.62 0.00 FAKE_REPLY_C - 0.038 0.0553 0.0000 1.000 0.62 0.00 MIME_PHP_NO_TEXT - 0.039 0.0568 0.0012 0.979 0.62 0.48 L_SPAM_TOOL_13 - 0.120 0.1618 0.0333 0.829 0.62 2.17 HTML_TITLE_SUBJ_DIFF - 0.036 0.0534 0.0000 1.000 0.62 2.40 TVD_QUAL_MEDS - 0.036 0.0525 0.0000 1.000 0.62 2.30 SUBJECT_DRUG_GAP_L - 0.037 0.0539 0.0012 0.978 0.61 2.70 GUARANTEED_100_PERCENT - 0.034 0.0508 0.0000 1.000 0.61 1.33 UNCLOSED_BRACKET - 0.038 0.0553 0.0018 0.969 0.61 0.00 FH_FROM_GET_NAME - 0.052 0.0726 0.0089 0.891 0.61 2.70 FREE_QUOTE_INSTANT - 0.034 0.0505 0.0000 1.000 0.61 0.00 FH_DATE_PAST_20XX - 0.049 0.0683 0.0077 0.898 0.61 0.00 BASE64_LENGTH_79_INF - 2.332 3.2907 0.3122 0.913 0.61 0.00 HTML_IMAGE_ONLY_32 - 0.035 0.0508 0.0012 0.977 0.61 0.00 FRT_BIGGERMEM1 - 0.064 0.0873 0.0155 0.849 0.61 0.00 STOCK_IMG_CTYPE - 0.040 0.0568 0.0048 0.923 0.61 2.70 UNCLAIMED_MONEY - 0.033 0.0486 0.0000 1.000 0.61 0.00 FB_INCREASE_YOUR - 0.032 0.0474 0.0000 1.000 0.60 2.42 XMAILER_MIMEOLE_OL_91287 - 0.117 0.1548 0.0381 0.803 0.60 0.00 HTTPS_HTTP_MISMATCH - 0.049 0.0666 0.0113 0.855 0.60 0.34 MSGID_SHORT - 0.041 0.0570 0.0077 0.881 0.60 0.63 INVALID_DATE_TZ_ABSURD - 0.040 0.0559 0.0071 0.887 0.60 2.44 DNS_FROM_AHBL_RHSBL - 0.029 0.0426 0.0000 1.000 0.60 2.02 XMAILER_MIMEOLE_OL_7533E - 0.033 0.0472 0.0018 0.964 0.60 0.00 FS_LARGE_PERCENT2 - 0.435 0.5800 0.1284 0.819 0.60 0.00 FROM_LOCAL_DIGITS - 0.033 0.0480 0.0024 0.953 0.60 2.18 FRT_ROLEX - 2.554 0.1799 7.5545 0.023 0.60 -1.00 RCVD_IN_DNSWL_LOW - 2.409 3.3842 0.3544 0.905 0.60 2.22 FREEMAIL_ENVFROM_END_DIGIT - 0.042 0.0570 0.0089 0.865 0.60 0.00 BUG6152_INVALID_DATE_TZ_ABSURD - 0.866 1.1801 0.2051 0.852 0.59 0.80 DKIM_ADSP_NXDOMAIN - 0.029 0.0421 0.0006 0.986 0.59 0.00 FB_EXTRA_INCHES - 0.445 0.5925 0.1332 0.816 0.59 0.33 FROM_LOCAL_HEX - 0.027 0.0398 0.0000 1.000 0.59 1.68 DRUGS_STOCK_MIMEOLE - 0.030 0.0435 0.0024 0.948 0.59 0.49 FUZZY_VPILL - 0.027 0.0395 0.0000 1.000 0.59 2.70 FROM_OFFERS - 1.161 1.6026 0.2307 0.874 0.59 0.86 RCVD_NUMERIC_HELO - 0.026 0.0387 0.0000 1.000 0.59 0.00 FSL_GEO_ABUSE - 0.100 0.1302 0.0375 0.777 0.59 0.23 MARKETING_PARTNERS - 0.045 0.0607 0.0131 0.823 0.59 2.29 FIN_FREE - 0.025 0.0376 0.0000 1.000 0.59 1.41 MSGID_YAHOO_CAPS - 0.038 0.0522 0.0089 0.854 0.59 0.69 DRUGS_ANXIETY - 0.025 0.0367 0.0000 1.000 0.59 1.73 XMAILER_MIMEOLE_OL_CAC8F - 16.561 24.0963 0.6939 0.972 0.59 0.61 RCVD_IN_SORBS_WEB - 0.024 0.0350 0.0000 1.000 0.59 2.24 FORGED_MSGID_YAHOO - 18.052 26.2708 0.7474 0.972 0.59 0.36 RDNS_DYNAMIC - 0.023 0.0339 0.0000 1.000 0.58 0.38 XMAILER_MIMEOLE_OL_09BB4 - 0.023 0.0336 0.0000 1.000 0.58 0.00 XMAILER_MIMEOLE_OL_20C99 - 0.057 0.0748 0.0196 0.792 0.58 0.00 FH_FROM_CASH - 0.022 0.0330 0.0000 1.000 0.58 1.47 DRUGS_MANYKINDS - 0.025 0.0356 0.0018 0.952 0.58 2.60 MSGID_RANDY - 0.047 0.0610 0.0161 0.792 0.58 0.00 TVD_APPROVED - 0.547 0.7258 0.1707 0.810 0.58 1.02 FORGED_YAHOO_RCVD - 0.037 0.0500 0.0107 0.824 0.58 0.00 FRT_OFFER2 - 0.021 0.0311 0.0000 1.000 0.58 1.83 SUBJECT_FUZZY_CHEAP - 0.022 0.0316 0.0006 0.982 0.58 0.89 FS_WILL_HELP - 0.021 0.0308 0.0000 1.000 0.58 1.24 XMAILER_MIMEOLE_OL_83BF7 - 0.022 0.0319 0.0012 0.964 0.58 0.00 FB_LOSE_WEIGHT_CAP - 0.028 0.0384 0.0048 0.890 0.58 0.00 NULL_IN_BODY - 0.552 0.7308 0.1754 0.806 0.58 0.00 HTML_FONT_LOW_CONTRAST - 0.020 0.0302 0.0000 1.000 0.58 0.84 XMAILER_MIMEOLE_OL_3D61D - 0.578 0.7656 0.1843 0.806 0.58 0.90 SPF_HELO_SOFTFAIL - 0.142 0.1821 0.0583 0.758 0.58 0.00 FRT_SOMA2 - 0.020 0.0299 0.0000 1.000 0.58 1.91 XMAILER_MIMEOLE_OL_4B815 - 0.483 0.6368 0.1605 0.799 0.58 0.00 SPF_HELO_FAIL - 0.020 0.0297 0.0000 1.000 0.57 1.53 HELO_DYNAMIC_HOME_NL - 0.020 0.0297 0.0000 1.000 0.57 0.00 TVD_SUBJ_WIPE_DEBT - 1.590 2.1784 0.3502 0.861 0.57 1.46 DNS_FROM_RFC_BOGUSMX - 0.020 0.0294 0.0000 1.000 0.57 0.00 FH_FROM_GIVEAWAY - 0.020 0.0291 0.0000 1.000 0.57 1.92 HELO_DYNAMIC_CHELLO_NL - 0.572 0.7560 0.1849 0.803 0.57 0.00 SUBJECT_NEEDS_ENCODING - 0.022 0.0308 0.0024 0.928 0.57 2.60 FROM_NO_USER - 0.023 0.0322 0.0048 0.871 0.57 1.46 FM_SUBJ_APPROVE - 0.029 0.0384 0.0077 0.832 0.57 1.45 BILLION_DOLLARS - 0.018 0.0271 0.0000 1.000 0.57 0.00 THEBAT_UNREG - 0.018 0.0271 0.0000 1.000 0.57 0.51 HELO_DYNAMIC_HEXIP - 0.020 0.0285 0.0012 0.960 0.57 2.60 FORGED_MUA_OIMO - 0.018 0.0265 0.0000 1.000 0.57 2.60 FUZZY_MILLION - 0.021 0.0014 0.0630 0.022 0.57 -0.00 NO_RELAYS - 0.018 0.0263 0.0000 1.000 0.57 0.00 XMAILER_MIMEOLE_OL_B30D1 - 0.017 0.0000 0.0541 0.000 0.57 -0.50 ENV_AND_HDR_SPF_MATCH - 0.024 0.0322 0.0059 0.844 0.56 1.88 RCVD_IN_NJABL_RELAY - 0.018 0.0263 0.0006 0.978 0.56 0.60 TVD_INCREASE_SIZE - 0.137 0.1740 0.0606 0.741 0.56 2.50 FRT_APPROV - 0.017 0.0251 0.0000 1.000 0.56 1.27 FS_APPROVE_YOU - 0.017 0.0246 0.0000 1.000 0.56 0.00 FS_AT_NO_COST - 0.016 0.0243 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_812FF - 0.016 0.0243 0.0000 1.000 0.56 0.00 FB_ULTRA_ALLURE - 0.016 0.0243 0.0000 1.000 0.56 0.00 LOTTERY_1 - 0.031 0.0404 0.0119 0.773 0.56 2.50 DRUGS_MUSCLE - 0.016 0.0240 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_F6D01 - 0.407 0.5247 0.1605 0.766 0.56 2.50 FREEMAIL_REPLY - 0.016 0.0234 0.0000 1.000 0.56 0.15 FAKE_HELO_MAIL_COM_DOM - 0.016 0.0234 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_C65FA - 0.026 0.0342 0.0095 0.782 0.56 1.52 HTTP_EXCESSIVE_ESCAPES - 0.016 0.0232 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_9B90B - 0.016 0.0229 0.0000 1.000 0.56 1.15 DRUG_ED_ONLINE - 0.016 0.0234 0.0006 0.975 0.56 0.00 FB_SPACED_FREE - 0.060 0.0751 0.0291 0.721 0.56 0.14 DC_IMAGE_SPAM_HTML - 0.015 0.0226 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_CF0C0 - 5.465 7.6712 0.8194 0.903 0.56 0.05 TVD_RCVD_IP - 0.426 0.0830 1.1470 0.067 0.56 0.00 BAYES_05 - 0.015 0.0220 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_F3B05 - 0.015 0.0217 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_B4B40 - 0.015 0.0217 0.0000 1.000 0.55 0.00 TT_MSGID_TRUNC - 0.088 0.1076 0.0476 0.693 0.55 0.12 DC_IMAGE_SPAM_TEXT - 0.015 0.0215 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_015D5 - 0.739 0.9686 0.2551 0.792 0.55 1.10 DATE_IN_PAST_06_12 - 0.014 0.0212 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_ADFF7 - 0.014 0.0212 0.0000 1.000 0.55 2.50 FORGED_TELESP_RCVD - 0.014 0.0212 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_5B79A - 0.100 0.1223 0.0541 0.693 0.55 2.47 SORTED_RECIPS - 0.014 0.0209 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_4BF4C - 0.014 0.0209 0.0000 1.000 0.55 2.50 HEADER_SPAM - 0.014 0.0206 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_4EEDB - 0.014 0.0203 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_BC7E6 - 0.014 0.0200 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_6554A - 0.014 0.0200 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_58CB5 - 0.018 0.0243 0.0042 0.854 0.55 0.50 FROM_DOMAIN_NOVOWEL - 2.057 2.7635 0.5690 0.829 0.55 0.00 DIET_1 - 0.013 0.0195 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_3857F - 0.013 0.0192 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_FF5C8 - 0.013 0.0192 0.0000 1.000 0.55 2.50 RCVD_IN_SORBS_HTTP - 0.013 0.0192 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_25340 - 1.715 2.3026 0.4763 0.829 0.55 1.20 NML_ADSP_CUSTOM_MED - 0.013 0.0195 0.0006 0.970 0.55 2.44 HTML_OBFUSCATE_20_30 - 0.013 0.0186 0.0000 1.000 0.55 2.44 RCVD_IN_SORBS_SOCKS - 0.013 0.0186 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_F475E - 0.012 0.0184 0.0000 1.000 0.54 1.26 RATWARE_EGROUPS - 0.012 0.0184 0.0000 1.000 0.54 1.60 FORGED_MUA_MOZILLA - 0.012 0.0184 0.0000 1.000 0.54 0.00 XMAILER_MIMEOLE_OL_07794 - 0.013 0.0189 0.0006 0.970 0.54 1.63 FH_MSGID_XXX - 0.026 0.0062 0.0678 0.084 0.54 -0.22 RCVD_IN_IADB_DK - 0.233 0.2892 0.1136 0.718 0.54 1.19 FORGED_HOTMAIL_RCVD2 - 0.012 0.0181 0.0000 1.000 0.54 0.00 FM_SCHOOL_DIPLOMA - 0.012 0.0181 0.0000 1.000 0.54 1.10 NO_PRESCRIPTION - 0.024 0.0051 0.0624 0.075 0.54 -0.00 RCVD_IN_IADB_DOPTIN_LT50 - 26.975 39.1471 1.3462 0.967 0.54 1.27 RDNS_NONE - 0.012 0.0178 0.0000 1.000 0.54 2.40 FORGED_MUA_IMS - 12.000 17.1249 1.2094 0.934 0.54 1.98 PYZOR_CHECK - 0.271 0.3352 0.1362 0.711 0.54 0.80 DATE_IN_PAST_12_24 - 0.019 0.0249 0.0071 0.777 0.54 0.00 TVD_PH_SEC - 0.012 0.0175 0.0000 1.000 0.54 0.00 TVD_PH_SUBJ_SEC_MEASURES - 0.012 0.0172 0.0000 1.000 0.54 0.00 XMAILER_MIMEOLE_OL_4F240 - 0.013 0.0189 0.0018 0.914 0.54 0.00 FH_DATE_IS_19XX - 0.011 0.0169 0.0000 1.000 0.54 0.00 TBIRD_SUSP_MIME_BDRY - 0.031 0.0378 0.0172 0.687 0.54 0.00 FUZZY_CPILL - 0.011 0.0167 0.0000 1.000 0.54 1.65 FS_NUDE - 0.011 0.0167 0.0000 1.000 0.54 0.00 FB_NO_SCRIP_NEEDED - 0.011 0.0000 0.0351 0.000 0.54 -2.20 RCVD_IN_IADB_VOUCHED - 0.015 0.0206 0.0042 0.832 0.54 1.69 EXCUSE_4 - 0.017 0.0226 0.0059 0.792 0.54 0.81 DATE_IN_FUTURE_48_96 - 0.084 0.0997 0.0499 0.666 0.54 2.40 ACT_NOW_CAPS - 0.011 0.0158 0.0000 1.000 0.54 1.90 FORGED_MSGID_EXCITE - 1.648 2.1758 0.5363 0.802 0.54 0.00 STOX_REPLY_TYPE - 0.015 0.0198 0.0042 0.826 0.54 2.34 EMPTY_MESSAGE - 0.882 1.1400 0.3401 0.770 0.54 0.98 FREEMAIL_REPLYTO_END_DIGIT - 0.010 0.0150 0.0000 1.000 0.53 0.00 BANKING_LAWS - 0.010 0.0150 0.0000 1.000 0.53 1.31 EM_ROLEX - 0.027 0.0319 0.0161 0.665 0.53 1.18 ONE_TIME - 0.010 0.0144 0.0000 1.000 0.53 0.00 FS_OBFU_PRMCY - 0.009 0.0138 0.0000 1.000 0.53 0.00 FS_EJACULA - 0.011 0.0155 0.0018 0.897 0.53 0.72 FUZZY_PRICES - 0.009 0.0000 0.0279 0.000 0.53 -6.00 RCVD_IN_IADB_ML_DOPTIN - 0.025 0.0291 0.0149 0.662 0.53 0.96 RCVD_DOUBLE_IP_LOOSE - 0.010 0.0141 0.0012 0.922 0.53 2.40 URI_NO_WWW_BIZ_CGI - 0.010 0.0144 0.0018 0.890 0.53 1.31 FUZZY_ERECT - 0.709 0.8960 0.3145 0.740 0.53 1.08 DATE_IN_PAST_03_06 - 0.008 0.0119 0.0000 1.000 0.53 0.00 BANG_OPRAH - 0.008 0.0119 0.0000 1.000 0.53 0.00 FB_PENIS_GROWTH - 0.008 0.0119 0.0000 1.000 0.53 0.00 FM_FAKE_HELO_VERIZON - 0.008 0.0119 0.0000 1.000 0.53 0.00 XMAILER_MIMEOLE_OL_465CD - 0.008 0.0000 0.0244 0.000 0.52 0.00 RCVD_IN_IADB_EDDB - 0.008 0.0116 0.0000 1.000 0.52 0.00 DOS_HIGH_BAT_TO_MX - 0.008 0.0116 0.0000 1.000 0.52 0.00 HEAD_ILLEGAL_CHARS - 0.280 0.3383 0.1582 0.681 0.52 0.28 PLING_QUERY - 0.025 0.0291 0.0166 0.636 0.52 0.00 FH_HOST_EQ_PACBELL_D - 0.008 0.0113 0.0000 1.000 0.52 0.00 TVD_ENVFROM_APOST - 0.011 0.0141 0.0030 0.826 0.52 0.00 FRT_PENIS1 - 0.007 0.0110 0.0000 1.000 0.52 0.00 FS_ERECTION - 0.009 0.0121 0.0012 0.911 0.52 0.00 HEADER_COUNT_SUBJECT - 0.011 0.0144 0.0042 0.776 0.52 0.00 FR_ALMOST_VIAG2 - 0.007 0.0102 0.0000 1.000 0.52 0.00 TVD_RATWARE_MSGID_02 - 0.007 0.0104 0.0006 0.946 0.52 0.00 FSL_HELO_SETUP - 0.045 0.0503 0.0327 0.606 0.52 1.32 DC_GIF_UNO_LARGO - 0.007 0.0096 0.0000 1.000 0.52 0.00 FU_UKGEOCITIES - 0.006 0.0093 0.0000 1.000 0.52 0.00 FORGED_IMS_TAGS - 0.007 0.0099 0.0006 0.943 0.52 0.00 FB_LOWER_PAYM - 0.006 0.0000 0.0190 0.000 0.52 -3.70 RCVD_IN_SSC_TRUSTED_COI - 0.006 0.0000 0.0190 0.000 0.52 -8.00 HABEAS_ACCREDITED_COI - 0.007 0.0102 0.0012 0.895 0.52 0.00 RATWARE_HASH_DASH - 0.006 0.0085 0.0000 1.000 0.52 0.00 FS_NO_SCRIP - 0.006 0.0082 0.0000 1.000 0.51 0.00 FB_ADD_INCHES - 0.006 0.0082 0.0000 1.000 0.51 0.00 FS_LOW_RATES - 0.006 0.0082 0.0000 1.000 0.51 0.00 FAKE_OUTBLAZE_RCVD - 0.006 0.0088 0.0006 0.936 0.51 0.00 HTTPS_IP_MISMATCH - 0.012 0.0144 0.0065 0.688 0.51 0.00 FRT_TODAY2 - 0.005 0.0079 0.0000 1.000 0.51 0.00 MSGID_DOLLARS_RANDOM - 0.006 0.0085 0.0006 0.934 0.51 0.00 FB_NUMYO2 - 0.005 0.0076 0.0000 1.000 0.51 0.00 DOS_ANAL_SPAM_MAILER - 0.005 0.0076 0.0000 1.000 0.51 0.00 FH_HELO_ENDS_DOT - 0.005 0.0076 0.0000 1.000 0.51 0.00 X_MESSAGE_INFO - 0.005 0.0076 0.0000 1.000 0.51 0.00 REPTO_QUOTE_AOL - 0.005 0.0076 0.0000 1.000 0.51 0.00 FORGED_MSGID_HOTMAIL - 0.005 0.0073 0.0000 1.000 0.51 0.00 SUBJECT_SEXUAL - 0.008 0.0107 0.0036 0.750 0.51 0.00 RATWARE_RCVD_PF - 0.005 0.0071 0.0000 1.000 0.51 0.00 REPTO_QUOTE_QUALCOMM - 2.786 3.6155 1.0388 0.777 0.51 0.72 MPART_ALT_DIFF - 0.005 0.0076 0.0006 0.928 0.51 0.00 FB_ALMOST_SEX - 0.004 0.0065 0.0000 1.000 0.51 0.00 FORGED_QUALCOMM_TAGS - 0.007 0.0093 0.0030 0.758 0.51 0.00 FS_WITH_SMALL - 0.004 0.0062 0.0000 1.000 0.51 0.00 SUBJECT_DRUG_GAP_VA - 0.004 0.0062 0.0000 1.000 0.51 0.00 SUBJECT_DRUG_GAP_X - 0.005 0.0068 0.0006 0.919 0.51 0.00 FB_YOUR_REFI - 0.004 0.0059 0.0000 1.000 0.51 0.00 FB_FAKE_NUMS4 - 0.004 0.0059 0.0000 1.000 0.51 0.00 FORGED_IMS_HTML - 0.010 0.0116 0.0059 0.661 0.51 2.30 URI_NO_WWW_INFO_CGI - 1.408 1.7912 0.6011 0.749 0.51 0.00 HS_INDEX_PARAM - 0.004 0.0000 0.0119 0.000 0.51 -15.00 USER_IN_DEF_WHITELIST - 0.006 0.0073 0.0018 0.805 0.51 0.00 FB_HEY_BRO_COMMA - 0.004 0.0054 0.0000 1.000 0.51 0.00 TVD_SECTION - 0.004 0.0054 0.0000 1.000 0.51 0.00 RCVD_MAIL_COM - 0.012 0.0138 0.0089 0.608 0.51 0.13 JOIN_MILLIONS - 0.003 0.0051 0.0000 1.000 0.51 0.00 TVD_PP_PHISH - 0.003 0.0000 0.0107 0.000 0.51 0.00 RCVD_IN_IADB_EPIA - 0.003 0.0051 0.0000 1.000 0.51 0.00 REPTO_QUOTE_IMS - 0.015 0.0169 0.0119 0.588 0.51 0.00 FM_IS_IT_OUR_ACCOUNT - 0.013 0.0147 0.0101 0.592 0.50 1.84 LONGWORDS - 0.003 0.0048 0.0000 1.000 0.50 0.00 FB_GAPPY_ADDRESS - 0.003 0.0045 0.0000 1.000 0.50 0.00 DRUGS_HDIA - 0.003 0.0045 0.0000 1.000 0.50 0.00 TVD_FUZZY_PHARMACEUTICAL - 0.004 0.0056 0.0012 0.826 0.50 0.00 HTML_MISSING_CTYPE - 0.003 0.0042 0.0000 1.000 0.50 0.00 DRUGS_DIET_OBFU - 0.003 0.0042 0.0000 1.000 0.50 0.00 SUBJECT_FUZZY_PENIS - 0.003 0.0042 0.0000 1.000 0.50 0.00 REFINANCE_NOW - 0.024 0.0257 0.0214 0.546 0.50 1.31 GAPPY_SUBJECT - 0.003 0.0042 0.0000 1.000 0.50 0.00 HELO_DYNAMIC_ROGERS - 0.003 0.0042 0.0000 1.000 0.50 0.00 FM_FRM_RN_L_BRACK - 0.003 0.0048 0.0006 0.890 0.50 0.00 TVD_SUBJ_FINGER_03 - 0.512 0.1432 1.2873 0.100 0.50 0.00 BAYES_20 - 0.006 0.0073 0.0036 0.673 0.50 0.00 DATE_SPAMWARE_Y2K - 0.002 0.0037 0.0000 1.000 0.50 0.00 DRUGS_SLEEP_EREC - 0.002 0.0037 0.0000 1.000 0.50 0.00 REPTO_QUOTE_MSN - 0.002 0.0037 0.0000 1.000 0.50 0.00 FRT_SEXUAL - 0.002 0.0000 0.0077 0.000 0.50 -4.00 RCVD_IN_IADB_DOPTIN - 0.002 0.0037 0.0000 1.000 0.50 0.00 FH_HELO_EQ_610HEX - 0.002 0.0037 0.0000 1.000 0.50 0.00 VIA_GAP_GRA - 0.004 0.0048 0.0012 0.801 0.50 0.00 HELO_LH_LD - 0.002 0.0034 0.0000 1.000 0.50 0.00 FH_FROM_HOODIA - 0.002 0.0034 0.0000 1.000 0.50 0.00 FS_HUGECOCK - 0.002 0.0034 0.0000 1.000 0.50 0.00 TVD_FUZZY_DEGREE - 0.002 0.0034 0.0000 1.000 0.50 0.00 FB_PIPE_ILLION - 0.003 0.0040 0.0006 0.869 0.50 0.00 FB_HG_H_CAP - 32.586 44.5642 7.3654 0.858 0.50 1.10 MIME_HTML_ONLY - 0.002 0.0031 0.0000 1.000 0.50 0.00 FUZZY_AFFORDABLE - 0.002 0.0031 0.0000 1.000 0.50 0.00 NOT_ADVISOR - 0.002 0.0031 0.0000 1.000 0.50 0.00 FS_RE_APPROV - 0.003 0.0042 0.0012 0.781 0.50 0.00 FRT_REFINANCE1 - 0.002 0.0028 0.0000 1.000 0.50 0.00 RCVD_IN_SORBS_ZOMBIE - 0.002 0.0028 0.0000 1.000 0.50 0.00 FORGED_MSGID_AOL - 0.002 0.0028 0.0000 1.000 0.50 0.00 FM_FAKE_HELO_HOTMAIL - 0.002 0.0028 0.0000 1.000 0.50 0.00 XMAILER_MIMEOLE_OL_B9B11 - 0.065 0.0698 0.0553 0.558 0.50 1.85 FUZZY_AMBIEN - 0.017 0.0181 0.0155 0.539 0.50 0.00 SB_GIF_AND_NO_URIS - 0.007 0.0073 0.0048 0.607 0.50 0.00 URI_UNSUBSCRIBE - 0.002 0.0025 0.0000 1.000 0.50 0.00 FUZZY_GUARANTEE - 0.002 0.0025 0.0000 1.000 0.50 0.00 FORGED_THEBAT_HTML - 0.002 0.0025 0.0000 1.000 0.50 0.00 FRT_GUARANTEE1 - 0.002 0.0025 0.0000 1.000 0.50 0.00 DRUGS_ANXIETY_OBFU - 0.002 0.0025 0.0000 1.000 0.50 0.00 MSGID_SPAM_LETTERS - 0.002 0.0031 0.0006 0.839 0.50 0.00 FS_PERSCRIPTION - 0.002 0.0031 0.0006 0.839 0.50 0.00 FB_LETTERS_21B - 0.003 0.0042 0.0018 0.704 0.50 0.00 SUBJECT_DRUG_GAP_S - 0.002 0.0023 0.0000 1.000 0.50 0.00 MULTIPART_ALT_NON_TEXT - 0.002 0.0023 0.0000 1.000 0.50 0.00 FRT_DISCOUNT - 0.002 0.0023 0.0000 1.000 0.50 0.00 STRONG_BUY - 0.002 0.0023 0.0000 1.000 0.50 0.00 FB_NOT_PHONE_NUM1 - 0.002 0.0023 0.0000 1.000 0.50 0.00 FORGED_MSGID_MSN - 0.002 0.0023 0.0000 1.000 0.50 0.00 NONEXISTENT_CHARSET - 0.002 0.0023 0.0000 1.000 0.50 0.00 FUZZY_MEDICATION - 0.002 0.0028 0.0006 0.826 0.50 0.00 HS_DRUG_DOLLAR_1 - 9.175 12.3846 2.4183 0.837 0.50 0.81 HTML_IMAGE_RATIO_02 - 0.001 0.0020 0.0000 1.000 0.50 0.00 FUZZY_THOUSANDS - 0.001 0.0020 0.0000 1.000 0.50 0.00 DRUG_ED_GENERIC - 0.001 0.0020 0.0000 1.000 0.50 0.00 TT_OBSCURED_VIAGRA - 0.001 0.0017 0.0000 1.000 0.50 0.00 LONG_TERM_PRICE - 0.001 0.0017 0.0000 1.000 0.50 0.00 RCVD_IN_SORBS_MISC - 0.019 0.0192 0.0178 0.518 0.49 0.00 WEIRD_QUOTING - 0.001 0.0014 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_8E893 - 0.001 0.0014 0.0000 1.000 0.49 0.00 DRUGS_ANXIETY_EREC - 0.001 0.0014 0.0000 1.000 0.49 0.00 FUZZY_MERIDIA - 0.001 0.0014 0.0000 1.000 0.49 0.00 FB_P1LL - 0.002 0.0025 0.0012 0.681 0.49 0.00 FRT_OPPORTUN2 - 0.013 0.0136 0.0125 0.521 0.49 0.00 TVD_SUBJ_ACC_NUM - 0.003 0.0037 0.0024 0.607 0.49 0.00 FRT_WEIGHT2 - 0.001 0.0011 0.0000 1.000 0.49 0.00 TVD_RATWARE_CB - 0.001 0.0011 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_A842E - 0.001 0.0011 0.0000 1.000 0.49 0.00 RATWARE_OE_MALFORMED - 0.001 0.0011 0.0000 1.000 0.49 0.00 FH_MSGID_000000 - 0.001 0.0011 0.0000 1.000 0.49 0.00 AXB_XMID_OEGOESNULL - 0.001 0.0011 0.0000 1.000 0.49 0.00 FUZZY_PRESCRIPT - 0.001 0.0011 0.0000 1.000 0.49 0.00 FB_HOMELOAN - 0.001 0.0011 0.0000 1.000 0.49 0.00 SUBJECT_FUZZY_MEDS - 0.001 0.0011 0.0000 1.000 0.49 0.00 RCVD_IN_SORBS_SMTP - 0.001 0.0011 0.0000 1.000 0.49 0.00 FS_CHEAP_CAP - 0.002 0.0023 0.0012 0.655 0.49 0.00 FREE_PORN - 0.058 0.0599 0.0535 0.528 0.49 1.10 TRACKER_ID - 0.004 0.0014 0.0083 0.145 0.49 -0.00 NO_RECEIVED - 0.005 0.0056 0.0048 0.543 0.49 0.00 TVD_ACT_193 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_ESTABLISH2 - 0.001 0.0008 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_A50F8 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FB_IMPRESS_GIRL - 0.001 0.0008 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_32D97 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_VALIUM1 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_VALIUM2 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FB_SPACEY_ZIP - 0.001 0.0008 0.0000 1.000 0.49 0.00 FM_PHN_NODNS - 0.001 0.0014 0.0006 0.704 0.49 0.00 FUZZY_MORTGAGE - 0.614 0.7266 0.3764 0.659 0.49 0.00 HTML_FONT_SIZE_HUGE - 3.233 4.1328 1.3385 0.755 0.49 0.14 MISSING_MID - 0.000 0.0000 0.0012 0.000 0.49 0.00 RCVD_IN_IADB_UT_CPEAR - 0.000 0.0006 0.0000 1.000 0.49 0.00 FM_LIKE_STOCKS - 0.000 0.0006 0.0000 1.000 0.49 0.00 HTTP_77 - 0.000 0.0006 0.0000 1.000 0.49 0.00 FB_DOUBLE_0WORDS - 0.000 0.0006 0.0000 1.000 0.49 0.00 FM_DOESNT_SAY_STOCK - 0.000 0.0000 0.0012 0.000 0.49 0.00 RCVD_IN_IADB_MI_CPEAR - 0.000 0.0006 0.0000 1.000 0.49 0.00 INVALID_TZ_CST - 0.000 0.0006 0.0000 1.000 0.49 0.00 FU_HOODIA - 0.000 0.0006 0.0000 1.000 0.49 0.00 FUZZY_MONEY - 0.000 0.0006 0.0000 1.000 0.49 0.00 FR_MIDER - 0.000 0.0006 0.0000 1.000 0.49 0.00 FU_MIDER - 0.000 0.0003 0.0000 1.000 0.49 0.00 JAPANESE_UCE_BODY - 0.000 0.0003 0.0000 1.000 0.49 0.00 FUZZY_BILLION - 0.000 0.0003 0.0000 1.000 0.49 0.00 HS_DRUG_DOLLAR_MANY - 0.000 0.0003 0.0000 1.000 0.49 0.00 JAPANESE_UCE_SUBJECT - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_ROLX - 0.000 0.0003 0.0000 1.000 0.49 0.00 MID_DEGREES - 0.000 0.0003 0.0000 1.000 0.49 0.00 CONFIRMED_FORGED - 0.000 0.0003 0.0000 1.000 0.49 0.00 TVD_DEAR_HOMEOWNER - 0.000 0.0003 0.0000 1.000 0.49 0.00 SHORT_TERM_PRICE - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_FHARMACY - 0.000 0.0000 0.0006 0.000 0.49 0.00 RCVD_IN_IADB_LOOSE - 0.000 0.0000 0.0006 0.000 0.49 -2.00 HASHCASH_23 - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_C0MPANY - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_ONIINE - 0.000 0.0003 0.0000 1.000 0.49 0.00 HS_DRUG_DOLLAR_2 - 0.000 0.0003 0.0000 1.000 0.49 0.00 FUZZY_REMOVE - 0.000 0.0003 0.0000 1.000 0.49 0.00 PREST_NON_ACCREDITED - 0.000 0.0003 0.0000 1.000 0.49 0.00 TVD_FLOAT_GENERAL - 0.000 0.0003 0.0000 1.000 0.49 -0.00 HELO_STATIC_HOST - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_BILLI0N - 0.001 0.0008 0.0006 0.588 0.49 0.00 FORWARD_LOOKING - 0.001 0.0008 0.0006 0.588 0.49 0.00 TVD_EB_PHISH - 0.001 0.0008 0.0006 0.588 0.49 0.00 HEADER_COUNT_CTYPE - 0.001 0.0014 0.0012 0.543 0.49 0.00 HTML_TAG_EXIST_BGSOUND - 0.002 0.0011 0.0054 0.174 0.49 0.00 RCVD_IN_IADB_DOPTIN_GT50 - 74.699 84.0309 55.0509 0.604 0.49 0.00 HTML_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 100.00 SUBJECT_IN_BLACKLIST - 0.000 0.0000 0.0000 0.500 0.49 0.00 CORRUPT_FROM_LINE_IN_HDRS - 0.000 0.0000 0.0000 0.500 0.49 -5.00 HASHCASH_HIGH - 0.000 0.0000 0.0000 0.500 0.49 2.45 MIME_CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FRT_ERECTION - 0.000 0.0000 0.0000 0.500 0.49 0.00 FUZZY_OBLIGATION - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_50_60 - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_70_80 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_OPTIN_LT50 - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 1.00 S25R_4 - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_BADTAG_40_50 - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_DEPT - 0.000 0.0000 0.0000 0.500 0.49 0.00 PREVENT_NONDELIVERY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FSL_UA - 0.000 0.0000 0.0000 0.500 0.49 -3.00 HASHCASH_24 - 0.000 0.0000 0.0000 0.500 0.49 100.00 USER_IN_BLACKLIST - 0.000 0.0000 0.0000 0.500 0.49 0.50 HTML_CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 0.00 HIGH_CODEPAGE_URI - 0.000 0.0000 0.0000 0.500 0.49 1.00 FRT_PHARMAC - 0.000 0.0000 0.0000 0.500 0.49 -20.00 USER_IN_MORE_SPAM_TO - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_URI - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_RSS - 0.000 0.0000 0.0000 0.500 0.49 0.10 MIME_SUSPECT_NAME - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_NAME_FREE - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_SORBS_BLOCK - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_PERCENT - 0.000 0.0000 0.0000 0.500 0.49 0.00 SHORTCIRCUIT - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_90_100 - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_POLICY_SIGNSOME - 0.000 0.0000 0.0000 0.500 0.49 0.00 FUZZY_OFFERS - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_RBL - 0.000 0.0000 0.0000 0.500 0.49 1.00 SPAMMY_MIME_BDRY_01 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_GECKO_BUILD - 0.000 0.0000 0.0000 0.500 0.49 0.10 VBOUNCE_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N8 - 0.000 0.0000 0.0000 0.500 0.49 0.00 EMAIL_ROT13 - 0.000 0.0000 0.0000 0.500 0.49 1.00 SANE_b58d7945d89b7afc9e2753c83b00ab44 - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_POLICY_SIGNALL - 0.000 0.0000 0.0000 0.500 0.49 -1.00 HASHCASH_22 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_AM_PM - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N3 - 0.000 0.0000 0.0000 0.500 0.49 3.20 CHARSET_FARAWAY_HEADER - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_UT_CPR_30 - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_SPF_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_POLICY_TESTING - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_NJABL_CGI - 0.000 0.0000 0.0000 0.500 0.49 1.00 TO_NO_BRKTS_DYNIP - 0.000 0.0000 0.0000 0.500 0.49 1.00 DEAR_BENEFICIARY - 0.000 0.0000 0.0000 0.500 0.49 0.00 FORGED_MUA_THEBAT_CS - 0.000 0.0000 0.0000 0.500 0.49 0.00 ACCESSDB - 0.000 0.0000 0.0000 0.500 0.49 1.00 KHOP_NO_FQDN - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_NML - 0.000 0.0000 0.0000 0.500 0.49 1.00 FSL_LSPACES_ABUSE - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_NOCONTROL - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_UNVERIFIED_1 - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_S25 - 0.000 0.0000 0.0000 0.500 0.49 0.00 YAHOO_RD_REDIR - 0.000 0.0000 0.0000 0.500 0.49 0.00 MULTI_FORGED - 0.000 0.0000 0.0000 0.500 0.49 1.00 DEAR_EMAIL - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_MSFT - 0.000 0.0000 0.0000 0.500 0.49 10.00 USER_IN_BLACKLIST_TO - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_RCVD_AT - 0.000 0.0000 0.0000 0.500 0.49 1.00 MANY_SPAN_IN_TEXT - 0.000 0.0000 0.0000 0.500 0.49 -6.00 USER_IN_WHITELIST_TO - 0.000 0.0000 0.0000 0.500 0.49 0.00 NO_HEADERS_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_AGENT - 0.000 0.0000 0.0000 0.500 0.49 0.70 NML_ADSP_CUSTOM_LOW - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_MOZ_MALFORMED - 0.000 0.0000 0.0000 0.500 0.49 0.10 MICROSOFT_EXECUTABLE - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_VERIFIED - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N2 - 0.000 0.0000 0.0000 0.500 0.49 0.00 WITH_LC_SMTP - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_DYNIP - 0.000 0.0000 0.0000 0.500 0.49 3.20 CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FB_TIRED_OF_YOUR - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N15 - 0.000 0.0000 0.0000 0.500 0.49 0.00 BLANK_LINES_80_90 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_MI_CPR_30 - 0.000 0.0000 0.0000 0.500 0.49 0.00 FRAGMENTED_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_ADSP_CUSTOM_LOW - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_PNIS - 0.000 0.0000 0.0000 0.500 0.49 1.00 FB_WITHOUT_PRESC - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_DUL - 0.000 0.0000 0.0000 0.500 0.49 -4.00 HASHCASH_25 - 0.000 0.0000 0.0000 0.500 0.49 0.00 JS_FROMCHARCODE - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_FORM - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_FROM_MISSP - 0.000 0.0000 0.0000 0.500 0.49 0.00 YAHOO_DRS_REDIR - 0.000 0.0000 0.0000 0.500 0.49 1.00 RCVD_IN_CSS - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_OPTOUTONLY - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_NJABL_MULTI - 0.000 0.0000 0.0000 0.500 0.49 -0.50 HASHCASH_20 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RUDE_HTML - 0.000 0.0000 0.0000 0.500 0.49 1.00 HELO_NO_DOMAIN - 0.000 0.0000 0.0000 0.500 0.49 0.00 AWL - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_UNVERIFIED_2 - 0.000 0.0000 0.0000 0.500 0.49 0.00 X_PRIORITY_CC - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N1 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_OPS - 0.000 0.0000 0.0000 0.500 0.49 1000.00 GTUBE - 0.000 0.0000 0.0000 0.500 0.49 1.00 FS_MORE_CONFIDENT - 0.000 0.0000 0.0000 0.500 0.49 2.80 UNWANTED_LANGUAGE_BODY - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_OOO - 0.000 0.0000 0.0000 0.500 0.49 -0.70 HASHCASH_21 - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_FREEMAIL - 0.000 0.0000 0.0000 0.500 0.49 1.50 BODY_8BITS - 0.000 0.0000 0.0000 0.500 0.49 0.00 URI_TRUNCATED - 0.000 0.0000 0.0000 0.500 0.49 0.10 HASHCASH_2SPEND - 0.000 0.0000 0.0000 0.500 0.49 1.00 FORGED_RELAY_MUA_TO_MX - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_ALL_SPAM_TO - 0.000 0.0000 0.0000 0.500 0.49 1.00 MANY_TINY_FLOAT - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_DKIM_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 1.00 S25R_6 - 0.000 0.0000 0.0000 0.500 0.49 0.00 KOREAN_UCE_SUBJECT - 0.000 0.0000 0.0000 0.500 0.49 0.00 MISSING_HB_SEP - 0.000 0.0000 0.0000 0.500 0.49 -100.00 SUBJECT_IN_WHITELIST - 0.001 0.0006 0.0006 0.487 0.49 0.00 FB_ANA_TRIM - 0.001 0.0011 0.0012 0.487 0.49 0.00 FRT_XANAX2 - 0.001 0.0011 0.0012 0.487 0.49 0.00 FS_TEEN_BAD - 0.000 0.0003 0.0006 0.322 0.49 0.00 FB_FAKE_NUMBERS - 0.000 0.0003 0.0006 0.322 0.49 0.00 HTML_OBFUSCATE_30_40 - 0.000 0.0003 0.0006 0.322 0.49 2.60 NML_ADSP_CUSTOM_HIGH - 0.000 0.0003 0.0006 0.322 0.49 0.00 TVD_FUZZY_FINANCE - 0.000 0.0003 0.0006 0.322 0.49 0.00 DKIM_ADSP_CUSTOM_HIGH - 0.001 0.0008 0.0012 0.416 0.49 0.00 FB_SPACED_PHN_3B - 0.001 0.0008 0.0012 0.416 0.49 0.00 CTYPE_8SPACE_GIF - 0.000 0.0000 0.0006 0.000 0.49 0.00 FB_ROLLER_IS_T - 0.000 0.0000 0.0006 0.000 0.49 0.00 FB_SSEX - 0.000 0.0000 0.0006 0.000 0.49 0.00 FUZZY_SOFTWARE - 0.000 0.0000 0.0006 0.000 0.49 0.00 HTML_BADTAG_90_100 - 0.000 0.0000 0.0006 0.000 0.49 0.00 STOCK_ALERT - 0.001 0.0006 0.0012 0.322 0.49 0.00 CURR_PRICE - 0.001 0.0006 0.0012 0.322 0.49 0.00 DRUG_DOSAGE - 0.001 0.0006 0.0012 0.322 0.49 0.00 REFINANCE_YOUR_HOME - 0.001 0.0006 0.0012 0.322 0.49 0.00 FUZZY_VIOXX - 0.003 0.0028 0.0036 0.442 0.49 0.00 INVALID_TZ_EST - 0.011 0.0107 0.0119 0.474 0.49 1.16 HTML_OBFUSCATE_10_20 - 0.001 0.0003 0.0012 0.192 0.49 0.00 CUM_SHOT - 0.001 0.0003 0.0012 0.192 0.49 0.00 SUBJECT_FUZZY_VPILL - 0.001 0.0008 0.0018 0.322 0.49 0.00 FRT_PRICE - 0.001 0.0008 0.0018 0.322 0.49 0.00 SPOOF_NET2COM - 0.001 0.0008 0.0018 0.322 0.49 0.00 HTML_NONELEMENT_60_70 - 0.000 0.0000 0.0012 0.000 0.49 0.10 CHALLENGE_RESPONSE - 0.001 0.0003 0.0018 0.137 0.49 0.00 HTML_NONELEMENT_80_90 - 0.001 0.0003 0.0018 0.137 0.49 0.00 FS_DOLLAR_BONUS - 6.742 8.5946 2.8422 0.751 0.49 0.00 BAYES_50 - 0.011 0.0104 0.0125 0.456 0.49 1.25 NO_MEDICAL - 0.001 0.0000 0.0018 0.000 0.49 0.00 FS_NEW_XXX - 0.002 0.0011 0.0030 0.275 0.48 0.00 TVD_STOCK1 - 0.001 0.0003 0.0024 0.106 0.48 0.00 HDR_ORDER_FTSDMCXX_001C - 0.002 0.0008 0.0030 0.222 0.48 0.00 FB_MORE_SIZE - 0.002 0.0014 0.0036 0.284 0.48 0.00 TVD_FUZZY_MICROCAP - 0.010 0.0093 0.0119 0.439 0.48 2.16 INVESTMENT_ADVICE - 0.001 0.0000 0.0024 0.000 0.48 0.00 HTML_BADTAG_50_60 - 0.001 0.0011 0.0000 1.000 0.48 0.00 RCVD_IN_IADB_GOODMAIL - 0.001 0.0000 0.0024 0.000 0.48 0.00 FM_LUX_GIFTS_REDUCED - 0.001 0.0006 0.0030 0.160 0.48 0.00 LIVE_PORN - 0.002 0.0011 0.0036 0.240 0.48 0.00 MIME_BAD_ISO_CHARSET - 0.002 0.0008 0.0036 0.192 0.48 0.00 FRT_XANAX1 - 0.005 0.0037 0.0065 0.359 0.48 0.00 FRT_LEVITRA - 0.002 0.0011 0.0042 0.213 0.48 0.00 FUZZY_VLIUM - 0.093 0.0974 0.0827 0.541 0.48 1.63 SPOOF_COM2COM - 0.001 0.0003 0.0036 0.073 0.48 0.00 HTML_COMMENT_SHORT - 0.001 0.0003 0.0036 0.073 0.48 0.00 FR_3TAG_3TAG - 0.002 0.0008 0.0042 0.169 0.48 0.00 FRT_DOLLAR - 0.002 0.0014 0.0048 0.229 0.48 0.00 FB_REPLIC_CAP - 0.086 0.0901 0.0785 0.534 0.48 0.10 BOUNCE_MESSAGE - 0.001 0.0000 0.0036 0.000 0.48 0.00 DOS_URI_ASTERISK - 0.001 0.0000 0.0036 0.000 0.48 0.00 HTML_BADTAG_60_70 - 0.002 0.0006 0.0042 0.119 0.48 0.00 FU_LONG_QUERY3 - 0.002 0.0003 0.0042 0.064 0.48 0.00 HTML_FORMACTION_MAILTO - 3.762 4.6313 1.9331 0.706 0.48 0.61 HTML_IMAGE_RATIO_04 - 0.008 0.0062 0.0113 0.355 0.48 0.00 FRT_FUCK2 - 0.004 0.0025 0.0077 0.247 0.48 0.00 FM_MULTI_LUX_GIFTS - 0.004 0.0025 0.0077 0.247 0.48 0.00 FRT_INVESTOR - 0.045 0.0432 0.0494 0.467 0.48 0.00 PART_CID_STOCK_LESS - 0.002 0.0000 0.0054 0.000 0.47 0.00 MIME_BOUND_EQ_REL - 1.051 1.2250 0.6856 0.641 0.47 0.64 HTML_MIME_NO_HTML_TAG - 0.002 0.0003 0.0065 0.041 0.47 0.00 FB_NUMYO - 0.002 0.0003 0.0065 0.041 0.47 0.00 FRT_MEETING - 0.032 0.0291 0.0375 0.437 0.47 2.10 FROM_BLANK_NAME - 0.002 0.0000 0.0071 0.000 0.47 0.00 TVD_SILLY_URI_OBFU - 0.011 0.0090 0.0166 0.352 0.47 0.00 STOCK_IMG_OUTLOOK - 10.372 4.3102 23.1367 0.157 0.47 -0.10 DKIM_VALID - 0.009 0.0059 0.0143 0.294 0.47 0.00 RCVD_BAD_ID - 0.047 0.0443 0.0541 0.450 0.47 0.00 MISSING_MIME_HB_SEP - 0.011 0.0076 0.0166 0.314 0.46 0.00 NUMERIC_HTTP_ADDR - 8.755 4.2797 18.1771 0.191 0.46 -0.10 DKIM_VALID_AU - 0.388 0.4202 0.3205 0.567 0.46 0.00 HTML_TAG_BALANCE_HEAD - 0.094 0.0929 0.0963 0.491 0.46 0.36 HTML_COMMENT_SAVED_URL - 8.113 3.6183 17.5765 0.171 0.46 -0.00 SPF_PASS - 0.003 0.0000 0.0095 0.000 0.46 0.00 TVD_FUZZY_SYMBOL - 0.005 0.0023 0.0119 0.160 0.46 0.00 OBSCURED_EMAIL - 4.761 4.9153 4.4358 0.526 0.46 1.10 DCC_CHECK - 0.027 0.0237 0.0351 0.403 0.46 1.25 TO_MALFORMED - 0.006 0.0028 0.0131 0.178 0.46 0.00 MIME_BOUND_MANY_HEX - 0.166 0.1694 0.1594 0.515 0.46 0.60 LOW_PRICE - 0.093 0.0904 0.0975 0.481 0.46 0.10 ANY_BOUNCE_MESSAGE - 5.014 4.9472 5.1552 0.490 0.46 0.00 MIME_QP_LONG_LINE - 8.846 7.5936 11.4842 0.398 0.46 0.00 FREEMAIL_FROM - 4.389 2.3283 8.7282 0.211 0.45 -0.00 SPF_HELO_PASS - 0.006 0.0020 0.0143 0.122 0.45 0.00 HTML_NONELEMENT_40_50 - 0.007 0.0028 0.0155 0.154 0.45 0.00 FUZZY_REFINANCE - 0.480 0.5137 0.4097 0.556 0.45 1.73 DEAR_SOMETHING - 0.080 0.0757 0.0880 0.462 0.45 0.73 LOCALPART_IN_SUBJECT - 0.660 0.7003 0.5738 0.550 0.45 0.00 URIBL_PH_SURBL - 0.118 0.1121 0.1308 0.462 0.45 0.00 HTML_EXTRA_CLOSE - 2.224 2.4337 1.7814 0.577 0.45 1.21 MISSING_HEADERS - 1.332 1.4498 1.0828 0.572 0.44 0.71 HTML_TAG_BALANCE_BODY - 0.008 0.0031 0.0190 0.140 0.44 0.00 HTML_IFRAME_SRC - 0.006 0.0003 0.0166 0.017 0.44 0.00 TVD_SPACED_SUBJECT_WORD3 - 0.022 0.0167 0.0345 0.326 0.44 1.34 RATWARE_MPOP_WEBMAIL - 0.005 0.0000 0.0166 0.000 0.44 0.00 FRT_STRONG2 - 0.478 0.2205 1.0203 0.178 0.44 0.00 BAYES_40 - 12.651 5.4338 27.8483 0.163 0.44 0.10 DKIM_SIGNED - 0.412 0.4092 0.4186 0.494 0.44 0.70 DCC_REPUT_95_98 - 0.006 0.0003 0.0190 0.015 0.44 0.10 CRBOUNCE_MESSAGE - 0.007 0.0008 0.0196 0.041 0.44 0.00 DC_PNG_UNO_LARGO - 0.009 0.0025 0.0232 0.099 0.43 0.00 SUBJECT_FUZZY_TION - 0.014 0.0068 0.0279 0.195 0.43 0.00 FH_HAS_XAIMC - 2.009 1.9991 2.0294 0.496 0.43 1.62 SUBJ_ALL_CAPS - 0.120 0.1082 0.1463 0.425 0.43 0.48 DATE_IN_PAST_24_48 - 2.715 2.3153 3.5569 0.394 0.43 0.00 DKIM_ADSP_CUSTOM_MED - 1.630 1.6777 1.5299 0.523 0.43 0.00 TVD_SPACE_RATIO - 0.341 0.3267 0.3722 0.467 0.42 0.10 FROM_EXCESS_BASE64 - 0.009 0.0014 0.0244 0.055 0.42 0.00 HEAD_LONG - 1.264 1.2377 1.3182 0.484 0.42 0.00 HTML_IMAGE_RATIO_08 - 0.992 0.9474 1.0863 0.466 0.42 1.08 URIBL_GREY - 0.241 0.2253 0.2729 0.452 0.42 1.84 MISSING_MIMEOLE - 0.073 0.0576 0.1064 0.351 0.41 0.00 MIME_BASE64_TEXT - 0.062 0.0483 0.0922 0.344 0.41 1.62 HTTP_ESCAPED_HOST - 0.009 0.0003 0.0274 0.010 0.41 0.00 FU_END_ET - 0.011 0.0017 0.0315 0.051 0.41 0.00 HTML_EMBEDS - 1.159 1.0262 1.4395 0.416 0.41 0.00 HTML_IMAGE_RATIO_06 - 0.722 0.6119 0.9537 0.391 0.40 0.00 UNPARSEABLE_RELAY - 0.159 0.1336 0.2117 0.387 0.40 0.00 SUBJ_DOLLARS - 0.021 0.0096 0.0458 0.173 0.40 0.00 HTML_NONELEMENT_30_40 - 1.048 0.9110 1.3379 0.405 0.40 0.00 MIME_HTML_MOSTLY - 0.093 0.0692 0.1421 0.327 0.39 1.77 MISSING_SUBJECT - 0.191 0.1539 0.2705 0.363 0.39 1.59 REMOVE_BEFORE_LINK - 0.025 0.0113 0.0535 0.174 0.39 0.00 OBFUSCATING_COMMENT - 0.028 0.0141 0.0571 0.198 0.39 0.00 TVD_FW_GRAPHIC_NAME_LONG - 1.483 0.9920 2.5158 0.283 0.38 1.00 EXTRA_MPART_TYPE - 0.184 0.1401 0.2753 0.337 0.38 0.40 DCC_REPUT_90_94 - 0.022 0.0073 0.0541 0.119 0.38 0.00 X_IP - 0.291 0.2279 0.4251 0.349 0.37 0.00 NORMAL_HTTP_TO_IP - 0.088 0.0565 0.1546 0.268 0.37 1.41 FUZZY_CREDIT - 0.556 0.3795 0.9270 0.290 0.37 0.29 HTML_FONT_FACE_BAD - 0.029 0.0102 0.0672 0.131 0.36 0.00 FRT_DIPLOMA - 0.055 0.0285 0.1118 0.203 0.36 0.00 TVD_FW_GRAPHIC_NAME_MID - 0.332 0.2285 0.5494 0.294 0.35 0.00 URIBL_RED - 0.127 0.0796 0.2259 0.261 0.35 0.00 CTYPE_001C_B - 0.823 0.5058 1.4913 0.253 0.34 0.00 MIME_BASE64_BLANKS - 0.020 0.0000 0.0636 0.000 0.34 1.23 MIME_BOUND_DIGITS_15 - 0.334 0.2047 0.6059 0.253 0.33 1.19 UPPERCASE_75_100 - 0.244 0.1387 0.4668 0.229 0.33 0.00 HTML_OBFUSCATE_05_10 - 0.273 0.1519 0.5292 0.223 0.32 0.00 MIME_HTML_ONLY_MULTI - 0.122 0.0641 0.2438 0.208 0.32 0.79 UPPERCASE_50_75 - 0.027 0.0017 0.0797 0.021 0.32 1.35 HIDE_WIN_STATUS - 0.710 0.3629 1.4407 0.201 0.32 0.00 HTML_FONT_SIZE_LARGE - 0.592 0.2604 1.2915 0.168 0.29 0.00 MSGID_FROM_MTA_HEADER - 0.424 0.1454 1.0090 0.126 0.27 0.10 DCC_REPUT_70_89 - 0.052 0.0045 0.1528 0.029 0.26 0.00 IP_LINK_PLUS - 0.047 0.0023 0.1427 0.016 0.25 0.00 FRT_ADOBE2 - 0.093 0.0195 0.2480 0.073 0.24 0.00 WEIRD_PORT - 0.394 0.0494 1.1208 0.042 0.16 0.00 MSGID_MULTIPLE_AT - 0.216 0.0246 0.6178 0.038 0.16 0.00 TVD_RCVD_SPACE_BRACKET - 0.373 0.0071 1.1440 0.006 0.06 1.10 DKIM_ADSP_ALL - -Rule file versions for which these results apply: -(SpamAssassin Version string: 3.003000-beta1-svn) - --rw-r--r-- 1 mark nsc 5671 Sep 30 16:45 10_default_prefs.cf --rw-r--r-- 1 mark nsc 7509 Sep 30 16:45 20_advance_fee.cf --rw-r--r-- 1 mark nsc 7005 Sep 30 16:45 20_body_tests.cf --rw-r--r-- 1 mark nsc 1894 Sep 30 16:45 20_compensate.cf --rw-r--r-- 1 mark nsc 13540 Oct 6 12:30 20_dnsbl_tests.cf --rw-r--r-- 1 mark nsc 14998 Sep 30 16:45 20_drugs.cf --rw-r--r-- 1 mark nsc 11492 Sep 30 16:45 20_dynrdns.cf --rw-r--r-- 1 mark nsc 8118 Sep 30 16:45 20_fake_helo_tests.cf --rw-r--r-- 1 mark nsc 3159 Oct 30 15:58 20_freemail.cf --rw-r--r-- 1 mark nsc 35574 Oct 30 15:58 20_freemail_domains.cf --rw-r--r-- 1 mark nsc 25516 Sep 30 16:45 20_head_tests.cf --rw-r--r-- 1 mark nsc 10504 Sep 30 16:45 20_html_tests.cf --rw-r--r-- 1 mark nsc 5287 Sep 30 16:45 20_imageinfo.cf --rw-r--r-- 1 mark nsc 3330 Sep 30 16:45 20_meta_tests.cf --rw-r--r-- 1 mark nsc 1880 Sep 30 16:45 20_net_tests.cf --rw-r--r-- 1 mark nsc 8013 Sep 30 16:45 20_phrases.cf --rw-r--r-- 1 mark nsc 2062 Sep 30 16:45 20_porn.cf --rw-r--r-- 1 mark nsc 16172 Sep 30 16:45 20_ratware.cf --rw-r--r-- 1 mark nsc 5534 Sep 30 16:45 20_uri_tests.cf --rw-r--r-- 1 mark nsc 19305 Sep 30 16:45 20_vbounce.cf --rw-r--r-- 1 mark nsc 2549 Sep 30 16:45 23_bayes.cf --rw-r--r-- 1 mark nsc 1544 Sep 30 16:45 25_accessdb.cf --rw-r--r-- 1 mark nsc 1536 Sep 30 16:45 25_antivirus.cf --rw-r--r-- 1 mark nsc 1544 Sep 30 16:45 25_asn.cf --rw-r--r-- 1 mark nsc 2331 Sep 30 16:45 25_dcc.cf --rw-r--r-- 1 mark nsc 4407 Nov 2 17:07 25_dkim.cf --rw-r--r-- 1 mark nsc 2929 Sep 30 16:45 25_hashcash.cf --rw-r--r-- 1 mark nsc 1310 Sep 30 16:45 25_pyzor.cf --rw-r--r-- 1 mark nsc 3389 Sep 30 16:45 25_razor2.cf --rw-r--r-- 1 mark nsc 7672 Sep 30 16:45 25_replace.cf --rw-r--r-- 1 mark nsc 3100 Sep 30 16:45 25_spf.cf --rw-r--r-- 1 mark nsc 1768 Sep 30 16:45 25_textcat.cf --rw-r--r-- 1 mark nsc 7819 Nov 9 18:31 25_uribl.cf --rw-r--r-- 1 mark nsc 28682 Sep 30 16:45 30_text_de.cf --rw-r--r-- 1 mark nsc 20901 Sep 30 16:45 30_text_fr.cf --rw-r--r-- 1 mark nsc 1858 Sep 30 16:45 30_text_it.cf --rw-r--r-- 1 mark nsc 22257 Sep 30 16:45 30_text_nl.cf --rw-r--r-- 1 mark nsc 18290 Sep 30 16:45 30_text_pl.cf --rw-r--r-- 1 mark nsc 3331 Sep 30 16:45 30_text_pt_br.cf --rw-r--r-- 1 mark nsc 49537 Nov 27 18:58 50_scores.cf --rw-r--r-- 1 mark nsc 9288 Sep 30 16:45 60_adsp_override_dkim.cf --rw-r--r-- 1 mark nsc 1304 Sep 30 16:45 60_awl.cf --rw-r--r-- 1 mark nsc 2178 Sep 30 16:45 60_shortcircuit.cf --rw-r--r-- 1 mark nsc 4984 Sep 30 16:45 60_whitelist.cf --rw-r--r-- 1 mark nsc 6434 Nov 2 17:10 60_whitelist_dkim.cf --rw-r--r-- 1 mark nsc 3584 Sep 30 16:45 60_whitelist_spf.cf --rw-r--r-- 1 mark nsc 1914 Sep 30 16:45 60_whitelist_subject.cf --rw-r--r-- 1 mark nsc 54456 Dec 2 18:28 72_active.cf --rw-r--r-- 1 mark nsc 2214 Sep 30 16:45 local.cf --rw-r--r-- 1 mark nsc 2762 Sep 30 16:45 regression_tests.cf diff -Nru spamassassin-3.4.6/trunk-only/rules/STATISTICS-set2.txt spamassassin-4.0.0~rc3/trunk-only/rules/STATISTICS-set2.txt --- spamassassin-3.4.6/trunk-only/rules/STATISTICS-set2.txt 2009-12-02 18:11:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/STATISTICS-set2.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,998 +0,0 @@ -STATISTICS REPORT FOR SPAMASSASSIN RULESET - -Classification success on test corpora, at default threshold: - -# SUMMARY for threshold 5.0: -# Correctly non-spam: 21162 99.89% -# Correctly spam: 40958 92.80% -# False positives: 24 0.11% -# False negatives: 3176 7.20% -# TCR(l=50): 10.085466 SpamRecall: 92.804% SpamPrec: 99.941% - -Results on test corpora at various alternative thresholds: - -# SUMMARY for threshold -4.0: -# Correctly non-spam: 37 0.17% -# Correctly spam: 44134 100.00% -# False positives: 21149 99.83% -# False negatives: 0 0.00% -# TCR(l=50): 0.041736 SpamRecall: 100.000% SpamPrec: 67.604% - -# SUMMARY for threshold -3.0: -# Correctly non-spam: 37 0.17% -# Correctly spam: 44134 100.00% -# False positives: 21149 99.83% -# False negatives: 0 0.00% -# TCR(l=50): 0.041736 SpamRecall: 100.000% SpamPrec: 67.604% - -# SUMMARY for threshold -2.0: -# Correctly non-spam: 1379 6.51% -# Correctly spam: 44134 100.00% -# False positives: 19807 93.49% -# False negatives: 0 0.00% -# TCR(l=50): 0.044564 SpamRecall: 100.000% SpamPrec: 69.023% - -# SUMMARY for threshold -1.0: -# Correctly non-spam: 15102 71.28% -# Correctly spam: 44116 99.96% -# False positives: 6084 28.72% -# False negatives: 18 0.04% -# TCR(l=50): 0.145074 SpamRecall: 99.959% SpamPrec: 87.880% - -# SUMMARY for threshold 0.0: -# Correctly non-spam: 18404 86.87% -# Correctly spam: 44079 99.88% -# False positives: 2782 13.13% -# False negatives: 55 0.12% -# TCR(l=50): 0.317157 SpamRecall: 99.875% SpamPrec: 94.063% - -# SUMMARY for threshold 1.0: -# Correctly non-spam: 19844 93.67% -# Correctly spam: 44039 99.78% -# False positives: 1342 6.33% -# False negatives: 95 0.22% -# TCR(l=50): 0.656805 SpamRecall: 99.785% SpamPrec: 97.043% - -# SUMMARY for threshold 2.0: -# Correctly non-spam: 20278 95.71% -# Correctly spam: 43992 99.68% -# False positives: 908 4.29% -# False negatives: 142 0.32% -# TCR(l=50): 0.969083 SpamRecall: 99.678% SpamPrec: 97.978% - -# SUMMARY for threshold 3.0: -# Correctly non-spam: 20793 98.15% -# Correctly spam: 43622 98.84% -# False positives: 393 1.85% -# False negatives: 512 1.16% -# TCR(l=50): 2.188969 SpamRecall: 98.840% SpamPrec: 99.107% - -# SUMMARY for threshold 4.0: -# Correctly non-spam: 21069 99.45% -# Correctly spam: 41877 94.89% -# False positives: 117 0.55% -# False negatives: 2257 5.11% -# TCR(l=50): 5.443937 SpamRecall: 94.886% SpamPrec: 99.721% - -# SUMMARY for threshold 4.5: -# Correctly non-spam: 21142 99.79% -# Correctly spam: 41343 93.68% -# False positives: 44 0.21% -# False negatives: 2791 6.32% -# TCR(l=50): 8.842717 SpamRecall: 93.676% SpamPrec: 99.894% - -# SUMMARY for threshold 5.5: -# Correctly non-spam: 21175 99.95% -# Correctly spam: 38245 86.66% -# False positives: 11 0.05% -# False negatives: 5889 13.34% -# TCR(l=50): 6.854170 SpamRecall: 86.657% SpamPrec: 99.971% - -# SUMMARY for threshold 6.0: -# Correctly non-spam: 21179 99.97% -# Correctly spam: 36879 83.56% -# False positives: 7 0.03% -# False negatives: 7255 16.44% -# TCR(l=50): 5.803287 SpamRecall: 83.561% SpamPrec: 99.981% - -# SUMMARY for threshold 6.5: -# Correctly non-spam: 21185 100.00% -# Correctly spam: 33533 75.98% -# False positives: 1 0.00% -# False negatives: 10601 24.02% -# TCR(l=50): 4.143648 SpamRecall: 75.980% SpamPrec: 99.997% - -# SUMMARY for threshold 7.0: -# Correctly non-spam: 21185 100.00% -# Correctly spam: 31227 70.75% -# False positives: 1 0.00% -# False negatives: 12907 29.25% -# TCR(l=50): 3.406190 SpamRecall: 70.755% SpamPrec: 99.997% - -# SUMMARY for threshold 8.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 26471 59.98% -# False positives: 0 0.00% -# False negatives: 17663 40.02% -# TCR(l=50): 2.498670 SpamRecall: 59.979% SpamPrec: 100.000% - -# SUMMARY for threshold 9.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 22785 51.63% -# False positives: 0 0.00% -# False negatives: 21349 48.37% -# TCR(l=50): 2.067263 SpamRecall: 51.627% SpamPrec: 100.000% - -# SUMMARY for threshold 10.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 19171 43.44% -# False positives: 0 0.00% -# False negatives: 24963 56.56% -# TCR(l=50): 1.767977 SpamRecall: 43.438% SpamPrec: 100.000% - -# SUMMARY for threshold 12.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 14879 33.71% -# False positives: 0 0.00% -# False negatives: 29255 66.29% -# TCR(l=50): 1.508597 SpamRecall: 33.713% SpamPrec: 100.000% - -# SUMMARY for threshold 15.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 8525 19.32% -# False positives: 0 0.00% -# False negatives: 35609 80.68% -# TCR(l=50): 1.239406 SpamRecall: 19.316% SpamPrec: 100.000% - -# SUMMARY for threshold 17.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 5220 11.83% -# False positives: 0 0.00% -# False negatives: 38914 88.17% -# TCR(l=50): 1.134142 SpamRecall: 11.828% SpamPrec: 100.000% - -# SUMMARY for threshold 20.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 1864 4.22% -# False positives: 0 0.00% -# False negatives: 42270 95.78% -# TCR(l=50): 1.044097 SpamRecall: 4.224% SpamPrec: 100.000% - - -Test hit frequencies, for spam and ham corpora: -(note: S/O indicates ratio of spam hits to overall hits for -each test, where 0.0 = hits only non-spam and 1.0 = hits only spam, -and the 'score' field should be ignored.) - -OVERALL SPAM% HAM% S/O RANK SCORE NAME - 0 354116 168179 0.678 0.00 0.00 (all messages) -0.00000 67.8000 32.2000 0.678 0.00 0.00 (all messages as %) - 58.306 85.9927 0.0077 1.000 1.00 3.80 BAYES_99 - 9.134 13.4719 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_08 - 9.132 13.4688 0.0006 1.000 0.98 2.50 KB_RATWARE_OUTLOOK_MID - 9.131 13.4673 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_16 - 9.131 13.4673 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_12 - 7.889 11.6355 0.0000 1.000 0.98 3.73 HELO_DYNAMIC_IPADDR2 - 10.781 15.8976 0.0077 1.000 0.97 2.81 FH_HELO_EQ_D_D_D_D - 4.050 5.9735 0.0000 1.000 0.96 2.93 HELO_DYNAMIC_HCC - 4.988 7.3544 0.0042 0.999 0.96 3.68 HELO_DYNAMIC_IPADDR - 3.597 5.3048 0.0018 1.000 0.96 3.08 HK_NAME_DRUGS - 2.380 3.5104 0.0000 1.000 0.95 4.22 HELO_DYNAMIC_SPLIT_IP - 2.281 3.3650 0.0000 1.000 0.94 4.20 FSL_YG_ABUSE - 1.957 2.8861 0.0000 1.000 0.94 4.07 REPLICA_WATCH - 1.957 2.8858 0.0000 1.000 0.94 1.11 FB_REPLICA_ROLEX - 8.791 12.9579 0.0172 0.999 0.93 2.27 DOS_OE_TO_MX - 2.305 3.3975 0.0042 0.999 0.93 0.00 TVD_RCVD_SINGLE - 2.317 0.0028 7.1882 0.000 0.93 -1.00 ALL_TRUSTED - 2.720 4.0074 0.0089 0.998 0.93 1.54 HELO_DYNAMIC_DHCP - 1.773 2.6121 0.0054 0.998 0.91 0.45 RATWARE_MS_HASH - 1.448 2.1357 0.0006 1.000 0.91 0.00 HELO_LOCALHOST - 1.573 2.3184 0.0036 0.998 0.91 2.69 RATWARE_OUTLOOK_NONAME - 1.379 2.0338 0.0006 1.000 0.91 2.11 KB_RATWARE_MSGID - 1.331 1.9632 0.0012 0.999 0.90 0.00 JM_SOUGHT_FRAUD_3 - 2.324 3.4212 0.0149 0.996 0.90 4.00 FH_FAKE_RCVD_LINE_B - 1.630 2.4001 0.0095 0.996 0.89 2.50 FORGED_MUA_OUTLOOK - 1.157 1.7051 0.0018 0.999 0.89 3.50 ADVANCE_FEE_3 - 1.075 1.5859 0.0000 1.000 0.89 0.00 JM_SOUGHT_FRAUD_1 - 0.910 1.3422 0.0000 1.000 0.88 2.78 SANE_7429530a7398f43f1f1b795f9420714e - 1.094 1.6111 0.0054 0.997 0.88 3.20 BAYES_95 - 0.766 1.1301 0.0006 0.999 0.87 0.00 ADVANCE_FEE_4 - 0.743 1.0960 0.0006 0.999 0.87 3.90 MSGID_OUTLOOK_INVALID - 3.794 5.5792 0.0339 0.994 0.87 0.48 HTML_SHORT_LINK_IMG_1 - 0.852 1.2544 0.0059 0.995 0.86 2.85 DATE_IN_FUTURE_96_XX - 1.326 1.9479 0.0155 0.992 0.86 0.61 REPLYTO_WITHOUT_TO_CC - 0.607 0.8943 0.0006 0.999 0.86 3.46 AXB_HELO_LH_HOME - 0.562 0.8291 0.0000 1.000 0.86 0.00 FSL_INTERIA_ABUSE - 0.558 0.8237 0.0000 1.000 0.85 3.67 FH_HOST_EQ_VERIZON_P - 0.561 0.8268 0.0006 0.999 0.85 0.88 FSL_HELO_DEVICE - 1.313 1.9279 0.0184 0.991 0.85 1.30 DRUGS_ERECTILE - 0.630 0.9274 0.0042 0.996 0.85 3.22 MILLION_USD - 1.163 1.7076 0.0166 0.990 0.85 2.70 BAYES_80 - 2.234 3.2797 0.0321 0.990 0.85 1.80 MISSING_DATE - 0.568 0.8356 0.0036 0.996 0.85 0.00 KB_DATE_CONTAINS_TAB - 3.057 4.4884 0.0440 0.990 0.84 1.80 HTML_IMAGE_ONLY_04 - 1.245 1.8265 0.0208 0.989 0.84 0.00 DYN_RDNS_SHORT_HELO_HTML - 0.491 0.7238 0.0000 1.000 0.84 2.61 HTML_SHORT_CENTER - 0.622 0.9135 0.0077 0.992 0.84 0.54 HELO_LH_HOME - 0.489 0.7212 0.0006 0.999 0.84 2.71 SANE_d0d2b0f6373bf91253d66dd74c594b87 - 0.544 0.7995 0.0048 0.994 0.84 0.96 MSOE_MID_WRONG_CASE - 0.719 1.0547 0.0119 0.989 0.84 2.30 FILL_THIS_FORM_LONG - 0.555 0.8153 0.0059 0.993 0.84 2.46 FB_CIALIS_LEO3 - 0.463 0.6831 0.0000 1.000 0.84 2.01 KB_FAKED_THE_BAT - 0.440 0.6489 0.0006 0.999 0.83 0.67 TVD_RCVD_IP4 - 0.406 0.5987 0.0000 1.000 0.83 3.38 FB_SOFTTABS - 0.484 0.7122 0.0042 0.994 0.83 0.82 SUBJECT_DIET - 1.535 2.2481 0.0327 0.986 0.83 0.60 HTML_SHORT_LINK_IMG_2 - 0.406 0.5981 0.0006 0.999 0.83 2.42 DOS_OE_TO_MX_IMAGE - 0.476 0.7003 0.0048 0.993 0.82 1.84 FILL_THIS_FORM_LOAN - 1.801 2.6364 0.0410 0.985 0.82 1.81 FREEMAIL_REPLYTO - 0.367 0.5416 0.0000 1.000 0.82 3.46 FH_HELO_ALMOST_IP - 0.366 0.5394 0.0000 1.000 0.82 0.00 RDNS_LOCALHOST - 0.354 0.5216 0.0000 1.000 0.81 2.27 SANE_4ef8302546bf270a19baf98508afacc4 - 0.351 0.5173 0.0006 0.999 0.81 0.00 FB_THIS_ADVERT - 1.627 2.3783 0.0440 0.982 0.81 0.00 HK_RANDOM_ENVFROM - 0.369 0.5422 0.0042 0.992 0.81 0.01 SHORT_HELO_AND_INLINE_IMAGE - 0.303 0.4456 0.0012 0.997 0.80 0.00 X_MAILER_CME_6543_MSN - 0.282 0.4160 0.0000 1.000 0.80 2.65 SANE_04e8bf28eb445199a7f11b943c44d209 - 1.686 2.4628 0.0499 0.980 0.80 1.20 ADVANCE_FEE_2 - 0.295 0.4346 0.0018 0.996 0.80 1.73 FS_REPLICAWATCH - 0.967 1.4108 0.0321 0.978 0.80 2.50 BAYES_60 - 0.625 0.9110 0.0232 0.975 0.79 2.03 FS_REPLICA - 0.291 0.4281 0.0036 0.992 0.79 2.50 FS_WEIGHT_LOSS - 0.264 0.3894 0.0012 0.997 0.79 2.99 HK_LOTTO - 0.304 0.4448 0.0065 0.986 0.79 0.00 STOCK_IMG_HTML - 0.285 0.4188 0.0048 0.989 0.79 3.60 NA_DOLLARS - 0.305 0.4459 0.0077 0.983 0.78 0.00 STOCK_IMG_HDR_FROM - 5.178 7.5958 0.0874 0.989 0.78 0.00 HTML_SHORT_LINK_IMG_3 - 0.410 0.5973 0.0155 0.975 0.78 0.00 FORGED_OUTLOOK_HTML - 1.167 1.6980 0.0482 0.972 0.78 1.74 DOS_OUTLOOK_TO_MX - 0.226 0.3324 0.0006 0.998 0.77 1.78 KAM_LOTTO1 - 0.475 0.6899 0.0220 0.969 0.77 0.50 FROM_LOCAL_NOVOWEL - 0.221 0.3259 0.0000 1.000 0.77 0.00 JM_SOUGHT_FRAUD_2 - 0.239 0.3502 0.0036 0.990 0.77 3.03 IMPOTENCE - 0.462 0.6712 0.0226 0.967 0.77 1.23 DATE_IN_PAST_96_XX - 0.216 0.3191 0.0000 1.000 0.77 2.19 HELO_DYNAMIC_DIALIN - 0.212 0.3126 0.0000 1.000 0.77 1.95 SANE_2b173a7fb7518c75ac8a2d294d773fd8 - 0.206 0.3041 0.0000 1.000 0.76 3.19 FM_VEGAS_CASINO - 0.208 0.3067 0.0006 0.998 0.76 0.00 APOSTROPHE_FROM - 0.189 0.2790 0.0000 1.000 0.76 0.00 FB_TO_STOP_DISTRO - 0.206 0.3036 0.0012 0.996 0.76 0.01 ONLINE_PHARMACY - 0.218 0.3197 0.0030 0.991 0.76 3.40 RCVD_ILLEGAL_IP - 0.187 0.2762 0.0000 1.000 0.76 2.00 FB_QUALITY_REPLICA - 0.689 0.9960 0.0428 0.959 0.76 3.00 DATE_IN_FUTURE_03_06 - 0.245 0.3569 0.0089 0.976 0.76 1.86 BODY_ENHANCEMENT2 - 0.184 0.2711 0.0000 1.000 0.76 0.00 XMAILER_MIMEOLE_OL_3AC1D - 0.186 0.2736 0.0012 0.996 0.75 3.40 FUZZY_ROLEX - 0.179 0.2635 0.0000 1.000 0.75 3.21 FORGED_MUA_THEBAT_BOUN - 0.184 0.2705 0.0012 0.996 0.75 0.42 TVD_VISIT_PHARMA - 0.221 0.3231 0.0065 0.980 0.75 0.97 BODY_ENHANCEMENT - 0.310 0.4479 0.0202 0.957 0.75 0.00 FRT_SOMA - 0.175 0.2578 0.0006 0.998 0.75 0.11 DRUG_ED_SILD - 6.821 9.9964 0.1356 0.987 0.75 1.20 FROM_STARTS_WITH_NUMS - 0.168 0.2477 0.0000 1.000 0.74 3.30 LOTTERY_PH_004470 - 0.165 0.2437 0.0000 1.000 0.74 3.30 FH_HOST_EQ_DYNAMICIP - 0.164 0.2426 0.0000 1.000 0.74 1.97 FUZZY_PHARMACY - 0.175 0.2567 0.0030 0.989 0.74 1.42 FS_START_LOSE - 0.158 0.2330 0.0000 1.000 0.74 3.15 DRUGS_SMEAR1 - 0.168 0.2468 0.0012 0.995 0.74 3.00 FM_LOTTO_YOU_WON - 0.297 0.4273 0.0226 0.950 0.73 0.00 FH_HAS_XID - 0.154 0.2265 0.0006 0.997 0.73 3.18 LIVEFILESTORE - 0.173 0.2530 0.0036 0.986 0.73 3.30 EXCUSE_REMOVE - 0.149 0.2189 0.0006 0.997 0.73 2.70 HS_VPXL - 0.140 0.2064 0.0000 1.000 0.73 2.94 DRUGS_ERECTILE_OBFU - 1.141 1.6492 0.0708 0.959 0.73 1.80 MIME_HEADER_CTYPE_ONLY - 0.205 0.2979 0.0107 0.965 0.73 3.28 FM_SCHOOLING - 0.144 0.2115 0.0012 0.994 0.73 3.29 DOS_RCVD_IP_TWICE_C - 0.128 0.1892 0.0000 1.000 0.73 3.27 TVD_PH_REC - 0.193 0.2790 0.0113 0.961 0.73 1.20 SUBJ_YOUR_DEBT - 0.135 0.1988 0.0018 0.991 0.72 0.00 SANE_3b92eda751c992f230f215fb7eb36844 - 0.150 0.2189 0.0042 0.981 0.72 2.36 RCVD_HELO_IP_MISMATCH - 0.122 0.1804 0.0000 1.000 0.72 3.20 XMAILER_MIMEOLE_OL_22B61 - 0.127 0.1858 0.0024 0.987 0.72 0.00 DATE_IN_FUTURE_24_48 - 0.120 0.1771 0.0000 1.000 0.72 0.00 SANE_1c4f3286fa4aed6424ced88bfaf8b09c - 0.119 0.1748 0.0000 1.000 0.72 2.53 XMAILER_MIMEOLE_OL_8627E - 0.122 0.1790 0.0024 0.987 0.71 0.00 FU_COMMON_SUBS2 - 0.267 0.3804 0.0268 0.934 0.71 3.20 DATE_IN_FUTURE_12_24 - 0.137 0.1985 0.0059 0.971 0.71 0.00 FILL_THIS_FORM_FRAUD_PHISH - 0.110 0.1618 0.0000 1.000 0.71 0.09 FH_HELO_EQ_CHARTER - 0.108 0.1596 0.0000 1.000 0.71 0.00 FH_HOST_IN_ADDRARPA - 1.243 1.7904 0.0916 0.951 0.71 1.33 INVALID_MSGID - 0.119 0.1742 0.0030 0.983 0.71 2.14 SUSPICIOUS_RECIPS - 0.106 0.1556 0.0006 0.996 0.70 2.31 DEAR_WINNER - 0.104 0.1536 0.0000 1.000 0.70 1.92 FM_SEX_HELODDDD - 0.425 0.6035 0.0499 0.924 0.70 0.50 URI_NOVOWEL - 1.823 2.6282 0.1290 0.953 0.70 1.20 HTML_IMAGE_ONLY_16 - 0.126 0.1827 0.0071 0.962 0.70 3.10 NO_RDNS_DOTCOM_HELO - 0.098 0.1449 0.0000 1.000 0.70 2.42 MIME_BOUND_DD_DIGITS - 0.093 0.1372 0.0000 1.000 0.70 0.00 BASE64_LENGTH_78_79 - 1.197 1.7178 0.0993 0.945 0.70 1.20 MPART_ALT_DIFF_COUNT - 0.090 0.1327 0.0000 1.000 0.69 1.99 SPAMMY_XMAILER - 0.159 0.2279 0.0149 0.939 0.69 0.60 MONEY_BACK - 0.088 0.1293 0.0000 1.000 0.69 3.10 RATWARE_NAME_ID - 0.084 0.1243 0.0000 1.000 0.69 2.42 UNRESOLVED_TEMPLATE - 0.094 0.1367 0.0030 0.979 0.69 3.10 SUBJ_AS_SEEN - 1.055 1.5083 0.0993 0.938 0.69 3.10 FSL_HELO_BARE_IP_1 - 0.082 0.1209 0.0000 1.000 0.69 0.54 KAM_LOTTO2 - 1.732 2.4876 0.1415 0.946 0.68 1.20 INVALID_DATE - 0.083 0.1211 0.0012 0.990 0.68 0.00 FS_PHARMASUB2 - 0.092 0.1344 0.0042 0.970 0.68 1.39 TVD_FINGER_02 - 0.153 0.2169 0.0172 0.926 0.68 0.00 URI_OBFU_WWW - 0.080 0.1175 0.0006 0.995 0.68 3.10 MSGID_SPAM_CAPS - 0.565 0.7975 0.0755 0.913 0.68 1.81 BAD_ENC_HEADER - 0.079 0.1163 0.0006 0.995 0.68 3.10 MALE_ENHANCE - 0.193 0.2722 0.0262 0.912 0.68 1.20 FB_GET_MEDS - 0.076 0.1127 0.0000 1.000 0.68 0.00 FSL_FAKE_GMAIL_RCVD - 0.074 0.1099 0.0000 1.000 0.68 1.35 SUBJECT_DRUG_GAP_C - 1.518 2.1719 0.1409 0.939 0.68 0.00 STOX_REPLY_TYPE_WITHOUT_QUOTES - 0.099 0.1420 0.0083 0.945 0.68 0.00 TVD_PH_SUBJ_ACCOUNTS_POST - 0.074 0.1096 0.0000 1.000 0.68 2.75 SANE_91eb43f705d25c804374a746d7519660 - 0.074 0.1084 0.0000 1.000 0.68 2.01 FSL_FAKE_HOTMAIL_RVCD - 0.790 1.1174 0.0999 0.918 0.67 0.00 FORGED_OUTLOOK_TAGS - 0.075 0.1096 0.0024 0.979 0.67 0.00 FB_SAVE_PERSC - 0.069 0.1014 0.0000 1.000 0.67 2.20 XMAILER_MIMEOLE_OL_1ECD5 - 0.072 0.1059 0.0012 0.989 0.67 2.88 SPOOF_COM2OTH - 0.069 0.1011 0.0000 1.000 0.67 2.98 PERCENT_RANDOM - 0.068 0.1008 0.0000 1.000 0.67 2.29 DYN_RDNS_SHORT_HELO_IMAGE - 0.068 0.1000 0.0000 1.000 0.67 3.00 RATWARE_EFROM - 0.071 0.1045 0.0018 0.983 0.67 3.00 SUBJ_YOUR_FAMILY - 10.028 14.6542 0.2884 0.981 0.67 0.00 FSL_HELO_NON_FQDN_1 - 4.413 6.3990 0.2325 0.965 0.67 1.21 URI_HEX - 0.322 0.4482 0.0577 0.886 0.66 0.45 SUBJ_ILLEGAL_CHARS - 0.066 0.0980 0.0000 1.000 0.66 1.91 RCVD_DOUBLE_IP_SPAM - 0.183 0.2558 0.0285 0.900 0.66 1.69 BANG_GUAR - 4.831 7.0104 0.2420 0.967 0.66 1.30 HTML_IMAGE_ONLY_20 - 0.062 0.0918 0.0000 1.000 0.66 0.27 RATWARE_ZERO_TZ - 0.427 0.5947 0.0749 0.888 0.66 0.00 PART_CID_STOCK - 0.062 0.0912 0.0012 0.987 0.65 2.90 HK_FAKENAME_EBAY - 0.263 0.3637 0.0523 0.874 0.65 2.22 DATE_IN_FUTURE_06_12 - 1.053 1.4879 0.1362 0.916 0.65 1.40 HTML_IMAGE_ONLY_12 - 0.058 0.0858 0.0000 1.000 0.65 2.52 FH_FAKE_RCVD_LINE - 0.060 0.0884 0.0006 0.993 0.65 2.90 FR_TITLE_NUMS - 53.063 78.0569 0.4370 0.994 0.65 0.00 RCVD_IN_BRBL_LASTEXT - 0.063 0.0921 0.0030 0.969 0.65 2.57 ENGLISH_UCE_SUBJECT - 0.727 1.0163 0.1189 0.895 0.65 1.78 US_DOLLARS_3 - 0.055 0.0813 0.0000 1.000 0.65 1.23 HELO_OEM - 0.054 0.0802 0.0000 1.000 0.65 0.24 FROM_ILLEGAL_CHARS - 0.408 0.5634 0.0803 0.875 0.64 1.80 DEAR_FRIEND - 0.052 0.0771 0.0006 0.992 0.64 2.48 FS_ABIGGER - 0.051 0.0751 0.0000 1.000 0.64 0.00 HS_FORGED_OE_FW - 0.121 0.1663 0.0250 0.869 0.64 0.00 FH_FROMEML_NOTLD - 0.051 0.0746 0.0006 0.992 0.64 1.96 FORGED_MUA_EUDORA - 0.226 0.3087 0.0511 0.858 0.64 0.00 TVD_PH_BODY_ACCOUNTS_PRE - 1.090 1.5300 0.1623 0.904 0.63 1.43 DYN_RDNS_AND_INLINE_IMAGE - 0.273 0.3716 0.0648 0.851 0.63 1.28 BAD_CREDIT - 30.313 0.2364 93.6413 0.003 0.63 -1.50 BAYES_00 - 0.052 0.0754 0.0042 0.948 0.63 0.00 TVD_PH_SUBJ_URGENT - 0.043 0.0627 0.0006 0.991 0.63 0.00 FB_GVR - 0.043 0.0627 0.0006 0.991 0.63 2.52 DRUG_ED_CAPS - 0.064 0.0901 0.0095 0.904 0.63 2.80 EXCUSE_24 - 0.362 0.4945 0.0838 0.855 0.63 1.84 HTML_IMAGE_ONLY_08 - 0.388 0.5301 0.0880 0.858 0.63 0.57 URG_BIZ - 0.135 0.1830 0.0345 0.841 0.63 0.00 SUBJ_BUY - 0.047 0.0683 0.0024 0.966 0.63 1.83 DRUGS_DIET - 0.051 0.0737 0.0042 0.947 0.63 0.00 REPTO_QUOTE_YAHOO - 0.040 0.0596 0.0000 1.000 0.63 0.00 HS_BOBAX_MID_2 - 2.657 3.7773 0.2985 0.927 0.63 1.33 HTML_IMAGE_ONLY_24 - 0.040 0.0590 0.0000 1.000 0.63 2.60 RCVD_FAKE_HELO_DOTCOM - 0.296 0.4002 0.0755 0.841 0.62 1.20 FREEMAIL_FORGED_REPLYTO - 0.039 0.0000 0.1225 0.000 0.62 -7.50 USER_IN_DEF_SPF_WL - 0.039 0.0576 0.0000 1.000 0.62 1.54 FUZZY_PHENT - 0.040 0.0585 0.0006 0.990 0.62 2.57 MORE_SEX - 2.140 3.0273 0.2717 0.918 0.62 1.51 HTML_IMAGE_ONLY_28 - 0.048 0.0692 0.0042 0.943 0.62 0.00 FS_START_DOYOU2 - 0.039 0.0570 0.0000 1.000 0.62 0.00 FB_INDEPEND_RWD - 0.059 0.0819 0.0101 0.890 0.62 1.11 PRICES_ARE_AFFORDABLE - 0.051 0.0726 0.0065 0.917 0.62 2.80 FUZZY_XPILL - 0.260 0.3505 0.0684 0.837 0.62 0.00 FAKE_REPLY_C - 0.038 0.0553 0.0000 1.000 0.62 0.00 MIME_PHP_NO_TEXT - 0.039 0.0568 0.0012 0.979 0.62 0.49 L_SPAM_TOOL_13 - 0.120 0.1618 0.0333 0.829 0.62 1.80 HTML_TITLE_SUBJ_DIFF - 0.036 0.0534 0.0000 1.000 0.62 2.80 TVD_QUAL_MEDS - 0.036 0.0525 0.0000 1.000 0.62 1.40 SUBJECT_DRUG_GAP_L - 0.037 0.0539 0.0012 0.978 0.61 2.48 GUARANTEED_100_PERCENT - 0.034 0.0508 0.0000 1.000 0.61 1.43 UNCLOSED_BRACKET - 0.038 0.0553 0.0018 0.969 0.61 0.00 FH_FROM_GET_NAME - 0.052 0.0726 0.0089 0.891 0.61 2.70 FREE_QUOTE_INSTANT - 0.034 0.0505 0.0000 1.000 0.61 0.00 FH_DATE_PAST_20XX - 0.049 0.0683 0.0077 0.898 0.61 0.00 BASE64_LENGTH_79_INF - 2.332 3.2907 0.3122 0.913 0.61 1.17 HTML_IMAGE_ONLY_32 - 0.035 0.0508 0.0012 0.977 0.61 0.00 FRT_BIGGERMEM1 - 0.064 0.0873 0.0155 0.849 0.61 0.00 STOCK_IMG_CTYPE - 0.040 0.0568 0.0048 0.923 0.61 2.70 UNCLAIMED_MONEY - 0.033 0.0486 0.0000 1.000 0.61 0.00 FB_INCREASE_YOUR - 0.032 0.0474 0.0000 1.000 0.60 1.54 XMAILER_MIMEOLE_OL_91287 - 0.117 0.1548 0.0381 0.803 0.60 0.00 HTTPS_HTTP_MISMATCH - 0.049 0.0666 0.0113 0.855 0.60 0.00 MSGID_SHORT - 0.041 0.0570 0.0077 0.881 0.60 0.71 INVALID_DATE_TZ_ABSURD - 0.029 0.0426 0.0000 1.000 0.60 1.89 XMAILER_MIMEOLE_OL_7533E - 0.033 0.0472 0.0018 0.964 0.60 0.00 FS_LARGE_PERCENT2 - 0.435 0.5800 0.1284 0.819 0.60 0.00 FROM_LOCAL_DIGITS - 0.033 0.0480 0.0024 0.953 0.60 1.44 FRT_ROLEX - 2.409 3.3842 0.3544 0.905 0.60 1.77 FREEMAIL_ENVFROM_END_DIGIT - 0.042 0.0570 0.0089 0.865 0.60 0.00 BUG6152_INVALID_DATE_TZ_ABSURD - 0.029 0.0421 0.0006 0.986 0.59 2.60 FB_EXTRA_INCHES - 0.445 0.5925 0.1332 0.816 0.59 0.00 FROM_LOCAL_HEX - 0.027 0.0398 0.0000 1.000 0.59 2.48 DRUGS_STOCK_MIMEOLE - 0.030 0.0435 0.0024 0.948 0.59 0.80 FUZZY_VPILL - 0.027 0.0395 0.0000 1.000 0.59 2.51 FROM_OFFERS - 1.161 1.6026 0.2307 0.874 0.59 0.00 RCVD_NUMERIC_HELO - 0.026 0.0387 0.0000 1.000 0.59 0.00 FSL_GEO_ABUSE - 0.100 0.1302 0.0375 0.777 0.59 0.69 MARKETING_PARTNERS - 0.045 0.0607 0.0131 0.823 0.59 2.70 FIN_FREE - 0.025 0.0376 0.0000 1.000 0.59 2.28 MSGID_YAHOO_CAPS - 0.038 0.0522 0.0089 0.854 0.59 2.21 DRUGS_ANXIETY - 0.025 0.0367 0.0000 1.000 0.59 0.71 XMAILER_MIMEOLE_OL_CAC8F - 0.024 0.0350 0.0000 1.000 0.59 2.09 FORGED_MSGID_YAHOO - 18.052 26.2708 0.7474 0.972 0.59 1.66 RDNS_DYNAMIC - 0.023 0.0339 0.0000 1.000 0.58 1.53 XMAILER_MIMEOLE_OL_09BB4 - 0.023 0.0336 0.0000 1.000 0.58 2.02 XMAILER_MIMEOLE_OL_20C99 - 0.057 0.0748 0.0196 0.792 0.58 0.00 FH_FROM_CASH - 0.022 0.0330 0.0000 1.000 0.58 0.84 DRUGS_MANYKINDS - 0.025 0.0356 0.0018 0.952 0.58 2.60 MSGID_RANDY - 0.047 0.0610 0.0161 0.792 0.58 0.00 TVD_APPROVED - 0.547 0.7258 0.1707 0.810 0.58 2.60 FORGED_YAHOO_RCVD - 0.037 0.0500 0.0107 0.824 0.58 0.00 FRT_OFFER2 - 0.021 0.0311 0.0000 1.000 0.58 0.83 SUBJECT_FUZZY_CHEAP - 0.022 0.0316 0.0006 0.982 0.58 2.48 FS_WILL_HELP - 0.021 0.0308 0.0000 1.000 0.58 2.60 XMAILER_MIMEOLE_OL_83BF7 - 0.022 0.0319 0.0012 0.964 0.58 0.00 FB_LOSE_WEIGHT_CAP - 0.028 0.0384 0.0048 0.890 0.58 0.00 NULL_IN_BODY - 0.552 0.7308 0.1754 0.806 0.58 0.79 HTML_FONT_LOW_CONTRAST - 0.020 0.0302 0.0000 1.000 0.58 1.61 XMAILER_MIMEOLE_OL_3D61D - 0.142 0.1821 0.0583 0.758 0.58 0.00 FRT_SOMA2 - 0.020 0.0299 0.0000 1.000 0.58 2.08 XMAILER_MIMEOLE_OL_4B815 - 0.020 0.0297 0.0000 1.000 0.57 1.02 HELO_DYNAMIC_HOME_NL - 0.020 0.0297 0.0000 1.000 0.57 0.00 TVD_SUBJ_WIPE_DEBT - 0.020 0.0294 0.0000 1.000 0.57 0.00 FH_FROM_GIVEAWAY - 0.020 0.0291 0.0000 1.000 0.57 2.02 HELO_DYNAMIC_CHELLO_NL - 0.572 0.7560 0.1849 0.803 0.57 0.00 SUBJECT_NEEDS_ENCODING - 0.022 0.0308 0.0024 0.928 0.57 0.02 FROM_NO_USER - 0.023 0.0322 0.0048 0.871 0.57 1.32 FM_SUBJ_APPROVE - 0.029 0.0384 0.0077 0.832 0.57 1.23 BILLION_DOLLARS - 0.018 0.0271 0.0000 1.000 0.57 0.00 THEBAT_UNREG - 0.018 0.0271 0.0000 1.000 0.57 1.77 HELO_DYNAMIC_HEXIP - 0.020 0.0285 0.0012 0.960 0.57 2.60 FORGED_MUA_OIMO - 0.018 0.0265 0.0000 1.000 0.57 1.66 FUZZY_MILLION - 0.021 0.0014 0.0630 0.022 0.57 -0.00 NO_RELAYS - 0.018 0.0263 0.0000 1.000 0.57 0.00 XMAILER_MIMEOLE_OL_B30D1 - 0.017 0.0000 0.0541 0.000 0.57 -0.50 ENV_AND_HDR_SPF_MATCH - 0.018 0.0263 0.0006 0.978 0.56 1.05 TVD_INCREASE_SIZE - 0.137 0.1740 0.0606 0.741 0.56 2.50 FRT_APPROV - 0.017 0.0251 0.0000 1.000 0.56 1.94 FS_APPROVE_YOU - 0.017 0.0246 0.0000 1.000 0.56 0.00 FS_AT_NO_COST - 0.016 0.0243 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_812FF - 0.016 0.0243 0.0000 1.000 0.56 0.00 FB_ULTRA_ALLURE - 0.016 0.0243 0.0000 1.000 0.56 0.00 LOTTERY_1 - 0.031 0.0404 0.0119 0.773 0.56 0.39 DRUGS_MUSCLE - 0.016 0.0240 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_F6D01 - 0.407 0.5247 0.1605 0.766 0.56 1.79 FREEMAIL_REPLY - 0.016 0.0234 0.0000 1.000 0.56 1.37 FAKE_HELO_MAIL_COM_DOM - 0.016 0.0234 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_C65FA - 0.026 0.0342 0.0095 0.782 0.56 0.00 HTTP_EXCESSIVE_ESCAPES - 0.016 0.0232 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_9B90B - 0.016 0.0229 0.0000 1.000 0.56 1.22 DRUG_ED_ONLINE - 0.016 0.0234 0.0006 0.975 0.56 0.00 FB_SPACED_FREE - 0.060 0.0751 0.0291 0.721 0.56 1.81 DC_IMAGE_SPAM_HTML - 0.015 0.0226 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_CF0C0 - 5.465 7.6712 0.8194 0.903 0.56 0.00 TVD_RCVD_IP - 0.426 0.0830 1.1470 0.067 0.56 -0.30 BAYES_05 - 0.015 0.0220 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_F3B05 - 0.015 0.0217 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_B4B40 - 0.015 0.0217 0.0000 1.000 0.55 0.00 TT_MSGID_TRUNC - 0.088 0.1076 0.0476 0.693 0.55 0.32 DC_IMAGE_SPAM_TEXT - 0.015 0.0215 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_015D5 - 0.739 0.9686 0.2551 0.792 0.55 1.27 DATE_IN_PAST_06_12 - 0.014 0.0212 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_ADFF7 - 0.014 0.0212 0.0000 1.000 0.55 2.50 FORGED_TELESP_RCVD - 0.014 0.0212 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_5B79A - 0.100 0.1223 0.0541 0.693 0.55 1.79 SORTED_RECIPS - 0.014 0.0209 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_4BF4C - 0.014 0.0209 0.0000 1.000 0.55 1.99 HEADER_SPAM - 0.014 0.0206 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_4EEDB - 0.014 0.0203 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_BC7E6 - 0.014 0.0200 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_6554A - 0.014 0.0200 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_58CB5 - 0.018 0.0243 0.0042 0.854 0.55 0.50 FROM_DOMAIN_NOVOWEL - 2.057 2.7635 0.5690 0.829 0.55 0.40 DIET_1 - 0.013 0.0195 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_3857F - 0.013 0.0192 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_FF5C8 - 0.013 0.0192 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_25340 - 1.715 2.3026 0.4763 0.829 0.55 0.00 NML_ADSP_CUSTOM_MED - 0.013 0.0195 0.0006 0.970 0.55 1.45 HTML_OBFUSCATE_20_30 - 0.013 0.0186 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_F475E - 0.012 0.0184 0.0000 1.000 0.54 1.41 RATWARE_EGROUPS - 0.012 0.0184 0.0000 1.000 0.54 2.40 FORGED_MUA_MOZILLA - 0.012 0.0184 0.0000 1.000 0.54 0.00 XMAILER_MIMEOLE_OL_07794 - 0.013 0.0189 0.0006 0.970 0.54 2.38 FH_MSGID_XXX - 0.233 0.2892 0.1136 0.718 0.54 0.70 FORGED_HOTMAIL_RCVD2 - 0.012 0.0181 0.0000 1.000 0.54 0.00 FM_SCHOOL_DIPLOMA - 0.012 0.0181 0.0000 1.000 0.54 2.28 NO_PRESCRIPTION - 26.975 39.1471 1.3462 0.967 0.54 1.23 RDNS_NONE - 0.012 0.0178 0.0000 1.000 0.54 2.40 FORGED_MUA_IMS - 0.271 0.3352 0.1362 0.711 0.54 1.19 DATE_IN_PAST_12_24 - 0.019 0.0249 0.0071 0.777 0.54 0.00 TVD_PH_SEC - 0.012 0.0175 0.0000 1.000 0.54 0.00 TVD_PH_SUBJ_SEC_MEASURES - 0.012 0.0172 0.0000 1.000 0.54 0.00 XMAILER_MIMEOLE_OL_4F240 - 0.013 0.0189 0.0018 0.914 0.54 0.00 FH_DATE_IS_19XX - 0.011 0.0169 0.0000 1.000 0.54 0.00 TBIRD_SUSP_MIME_BDRY - 0.031 0.0378 0.0172 0.687 0.54 0.00 FUZZY_CPILL - 0.011 0.0167 0.0000 1.000 0.54 1.29 FS_NUDE - 0.011 0.0167 0.0000 1.000 0.54 0.00 FB_NO_SCRIP_NEEDED - 0.015 0.0206 0.0042 0.832 0.54 2.40 EXCUSE_4 - 0.017 0.0226 0.0059 0.792 0.54 1.08 DATE_IN_FUTURE_48_96 - 0.084 0.0997 0.0499 0.666 0.54 0.93 ACT_NOW_CAPS - 0.011 0.0158 0.0000 1.000 0.54 1.65 FORGED_MSGID_EXCITE - 1.648 2.1758 0.5363 0.802 0.54 0.00 STOX_REPLY_TYPE - 0.015 0.0198 0.0042 0.826 0.54 1.55 EMPTY_MESSAGE - 0.882 1.1400 0.3401 0.770 0.54 1.18 FREEMAIL_REPLYTO_END_DIGIT - 0.010 0.0150 0.0000 1.000 0.53 0.00 BANKING_LAWS - 0.010 0.0150 0.0000 1.000 0.53 2.07 EM_ROLEX - 0.027 0.0319 0.0161 0.665 0.53 1.83 ONE_TIME - 0.010 0.0144 0.0000 1.000 0.53 0.00 FS_OBFU_PRMCY - 0.009 0.0138 0.0000 1.000 0.53 0.00 FS_EJACULA - 0.011 0.0155 0.0018 0.897 0.53 2.21 FUZZY_PRICES - 0.025 0.0291 0.0149 0.662 0.53 1.04 RCVD_DOUBLE_IP_LOOSE - 0.010 0.0141 0.0012 0.922 0.53 2.40 URI_NO_WWW_BIZ_CGI - 0.010 0.0144 0.0018 0.890 0.53 2.36 FUZZY_ERECT - 0.709 0.8960 0.3145 0.740 0.53 1.20 DATE_IN_PAST_03_06 - 0.008 0.0119 0.0000 1.000 0.53 0.00 BANG_OPRAH - 0.008 0.0119 0.0000 1.000 0.53 0.00 FB_PENIS_GROWTH - 0.008 0.0119 0.0000 1.000 0.53 0.00 FM_FAKE_HELO_VERIZON - 0.008 0.0119 0.0000 1.000 0.53 0.00 XMAILER_MIMEOLE_OL_465CD - 0.008 0.0116 0.0000 1.000 0.52 0.00 DOS_HIGH_BAT_TO_MX - 0.008 0.0116 0.0000 1.000 0.52 0.00 HEAD_ILLEGAL_CHARS - 0.280 0.3383 0.1582 0.681 0.52 0.69 PLING_QUERY - 0.025 0.0291 0.0166 0.636 0.52 0.00 FH_HOST_EQ_PACBELL_D - 0.008 0.0113 0.0000 1.000 0.52 0.00 TVD_ENVFROM_APOST - 0.011 0.0141 0.0030 0.826 0.52 0.00 FRT_PENIS1 - 0.007 0.0110 0.0000 1.000 0.52 0.00 FS_ERECTION - 0.009 0.0121 0.0012 0.911 0.52 0.00 HEADER_COUNT_SUBJECT - 0.011 0.0144 0.0042 0.776 0.52 0.00 FR_ALMOST_VIAG2 - 0.007 0.0102 0.0000 1.000 0.52 0.00 TVD_RATWARE_MSGID_02 - 0.007 0.0104 0.0006 0.946 0.52 0.00 FSL_HELO_SETUP - 0.045 0.0503 0.0327 0.606 0.52 0.05 DC_GIF_UNO_LARGO - 0.007 0.0096 0.0000 1.000 0.52 0.00 FU_UKGEOCITIES - 0.006 0.0093 0.0000 1.000 0.52 0.00 FORGED_IMS_TAGS - 0.007 0.0099 0.0006 0.943 0.52 0.00 FB_LOWER_PAYM - 0.007 0.0102 0.0012 0.895 0.52 0.00 RATWARE_HASH_DASH - 0.006 0.0085 0.0000 1.000 0.52 0.00 FS_NO_SCRIP - 0.006 0.0082 0.0000 1.000 0.51 0.00 FB_ADD_INCHES - 0.006 0.0082 0.0000 1.000 0.51 0.00 FS_LOW_RATES - 0.006 0.0082 0.0000 1.000 0.51 0.00 FAKE_OUTBLAZE_RCVD - 0.006 0.0088 0.0006 0.936 0.51 0.00 HTTPS_IP_MISMATCH - 0.012 0.0144 0.0065 0.688 0.51 0.00 FRT_TODAY2 - 0.005 0.0079 0.0000 1.000 0.51 0.00 MSGID_DOLLARS_RANDOM - 0.006 0.0085 0.0006 0.934 0.51 0.00 FB_NUMYO2 - 0.005 0.0076 0.0000 1.000 0.51 0.00 DOS_ANAL_SPAM_MAILER - 0.005 0.0076 0.0000 1.000 0.51 0.00 FH_HELO_ENDS_DOT - 0.005 0.0076 0.0000 1.000 0.51 0.00 X_MESSAGE_INFO - 0.005 0.0076 0.0000 1.000 0.51 0.00 REPTO_QUOTE_AOL - 0.005 0.0076 0.0000 1.000 0.51 0.00 FORGED_MSGID_HOTMAIL - 0.005 0.0073 0.0000 1.000 0.51 0.00 SUBJECT_SEXUAL - 0.008 0.0107 0.0036 0.750 0.51 0.00 RATWARE_RCVD_PF - 0.005 0.0071 0.0000 1.000 0.51 0.00 REPTO_QUOTE_QUALCOMM - 2.786 3.6155 1.0388 0.777 0.51 0.59 MPART_ALT_DIFF - 0.005 0.0076 0.0006 0.928 0.51 0.00 FB_ALMOST_SEX - 0.004 0.0065 0.0000 1.000 0.51 0.00 FORGED_QUALCOMM_TAGS - 0.007 0.0093 0.0030 0.758 0.51 0.00 FS_WITH_SMALL - 0.004 0.0062 0.0000 1.000 0.51 0.00 SUBJECT_DRUG_GAP_VA - 0.004 0.0062 0.0000 1.000 0.51 0.00 SUBJECT_DRUG_GAP_X - 0.005 0.0068 0.0006 0.919 0.51 0.00 FB_YOUR_REFI - 0.004 0.0059 0.0000 1.000 0.51 0.00 FB_FAKE_NUMS4 - 0.004 0.0059 0.0000 1.000 0.51 0.00 FORGED_IMS_HTML - 0.010 0.0116 0.0059 0.661 0.51 0.29 URI_NO_WWW_INFO_CGI - 1.408 1.7912 0.6011 0.749 0.51 0.00 HS_INDEX_PARAM - 0.004 0.0000 0.0119 0.000 0.51 -15.00 USER_IN_DEF_WHITELIST - 0.006 0.0073 0.0018 0.805 0.51 0.00 FB_HEY_BRO_COMMA - 0.004 0.0054 0.0000 1.000 0.51 0.00 TVD_SECTION - 0.004 0.0054 0.0000 1.000 0.51 0.00 RCVD_MAIL_COM - 0.012 0.0138 0.0089 0.608 0.51 1.55 JOIN_MILLIONS - 0.003 0.0051 0.0000 1.000 0.51 0.00 TVD_PP_PHISH - 0.003 0.0051 0.0000 1.000 0.51 0.00 REPTO_QUOTE_IMS - 0.015 0.0169 0.0119 0.588 0.51 0.00 FM_IS_IT_OUR_ACCOUNT - 0.013 0.0147 0.0101 0.592 0.50 1.82 LONGWORDS - 0.003 0.0048 0.0000 1.000 0.50 0.00 FB_GAPPY_ADDRESS - 0.003 0.0045 0.0000 1.000 0.50 0.00 DRUGS_HDIA - 0.003 0.0045 0.0000 1.000 0.50 0.00 TVD_FUZZY_PHARMACEUTICAL - 0.004 0.0056 0.0012 0.826 0.50 0.00 HTML_MISSING_CTYPE - 0.003 0.0042 0.0000 1.000 0.50 0.00 DRUGS_DIET_OBFU - 0.003 0.0042 0.0000 1.000 0.50 0.00 SUBJECT_FUZZY_PENIS - 0.003 0.0042 0.0000 1.000 0.50 0.00 REFINANCE_NOW - 0.024 0.0257 0.0214 0.546 0.50 1.21 GAPPY_SUBJECT - 0.003 0.0042 0.0000 1.000 0.50 0.00 HELO_DYNAMIC_ROGERS - 0.003 0.0042 0.0000 1.000 0.50 0.00 FM_FRM_RN_L_BRACK - 0.003 0.0048 0.0006 0.890 0.50 0.00 TVD_SUBJ_FINGER_03 - 0.512 0.1432 1.2873 0.100 0.50 -0.00 BAYES_20 - 0.006 0.0073 0.0036 0.673 0.50 0.00 DATE_SPAMWARE_Y2K - 0.002 0.0037 0.0000 1.000 0.50 0.00 DRUGS_SLEEP_EREC - 0.002 0.0037 0.0000 1.000 0.50 0.00 REPTO_QUOTE_MSN - 0.002 0.0037 0.0000 1.000 0.50 0.00 FRT_SEXUAL - 0.002 0.0037 0.0000 1.000 0.50 0.00 FH_HELO_EQ_610HEX - 0.002 0.0037 0.0000 1.000 0.50 0.00 VIA_GAP_GRA - 0.004 0.0048 0.0012 0.801 0.50 0.00 HELO_LH_LD - 0.002 0.0034 0.0000 1.000 0.50 0.00 FH_FROM_HOODIA - 0.002 0.0034 0.0000 1.000 0.50 0.00 FS_HUGECOCK - 0.002 0.0034 0.0000 1.000 0.50 0.00 TVD_FUZZY_DEGREE - 0.002 0.0034 0.0000 1.000 0.50 0.00 FB_PIPE_ILLION - 0.003 0.0040 0.0006 0.869 0.50 0.00 FB_HG_H_CAP - 32.586 44.5642 7.3654 0.858 0.50 1.20 MIME_HTML_ONLY - 0.002 0.0031 0.0000 1.000 0.50 0.00 FUZZY_AFFORDABLE - 0.002 0.0031 0.0000 1.000 0.50 0.00 NOT_ADVISOR - 0.002 0.0031 0.0000 1.000 0.50 0.00 FS_RE_APPROV - 0.003 0.0042 0.0012 0.781 0.50 0.00 FRT_REFINANCE1 - 0.002 0.0028 0.0000 1.000 0.50 0.00 FORGED_MSGID_AOL - 0.002 0.0028 0.0000 1.000 0.50 0.00 FM_FAKE_HELO_HOTMAIL - 0.002 0.0028 0.0000 1.000 0.50 0.00 XMAILER_MIMEOLE_OL_B9B11 - 0.065 0.0698 0.0553 0.558 0.50 0.93 FUZZY_AMBIEN - 0.017 0.0181 0.0155 0.539 0.50 0.00 SB_GIF_AND_NO_URIS - 0.007 0.0073 0.0048 0.607 0.50 0.00 URI_UNSUBSCRIBE - 0.002 0.0025 0.0000 1.000 0.50 0.00 FUZZY_GUARANTEE - 0.002 0.0025 0.0000 1.000 0.50 0.00 FORGED_THEBAT_HTML - 0.002 0.0025 0.0000 1.000 0.50 0.00 FRT_GUARANTEE1 - 0.002 0.0025 0.0000 1.000 0.50 0.00 DRUGS_ANXIETY_OBFU - 0.002 0.0025 0.0000 1.000 0.50 0.00 MSGID_SPAM_LETTERS - 0.002 0.0031 0.0006 0.839 0.50 0.00 FS_PERSCRIPTION - 0.002 0.0031 0.0006 0.839 0.50 0.00 FB_LETTERS_21B - 0.003 0.0042 0.0018 0.704 0.50 0.00 SUBJECT_DRUG_GAP_S - 0.002 0.0023 0.0000 1.000 0.50 0.00 MULTIPART_ALT_NON_TEXT - 0.002 0.0023 0.0000 1.000 0.50 0.00 FRT_DISCOUNT - 0.002 0.0023 0.0000 1.000 0.50 0.00 STRONG_BUY - 0.002 0.0023 0.0000 1.000 0.50 0.00 FB_NOT_PHONE_NUM1 - 0.002 0.0023 0.0000 1.000 0.50 0.00 FORGED_MSGID_MSN - 0.002 0.0023 0.0000 1.000 0.50 0.00 NONEXISTENT_CHARSET - 0.002 0.0023 0.0000 1.000 0.50 0.00 FUZZY_MEDICATION - 0.002 0.0028 0.0006 0.826 0.50 0.00 HS_DRUG_DOLLAR_1 - 9.175 12.3846 2.4183 0.837 0.50 1.20 HTML_IMAGE_RATIO_02 - 0.001 0.0020 0.0000 1.000 0.50 0.00 FUZZY_THOUSANDS - 0.001 0.0020 0.0000 1.000 0.50 0.00 DRUG_ED_GENERIC - 0.001 0.0020 0.0000 1.000 0.50 0.00 TT_OBSCURED_VIAGRA - 0.001 0.0017 0.0000 1.000 0.50 0.00 LONG_TERM_PRICE - 0.019 0.0192 0.0178 0.518 0.49 0.00 WEIRD_QUOTING - 0.001 0.0014 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_8E893 - 0.001 0.0014 0.0000 1.000 0.49 0.00 DRUGS_ANXIETY_EREC - 0.001 0.0014 0.0000 1.000 0.49 0.00 FUZZY_MERIDIA - 0.001 0.0014 0.0000 1.000 0.49 0.00 FB_P1LL - 0.002 0.0025 0.0012 0.681 0.49 0.00 FRT_OPPORTUN2 - 0.013 0.0136 0.0125 0.521 0.49 0.00 TVD_SUBJ_ACC_NUM - 0.003 0.0037 0.0024 0.607 0.49 0.00 FRT_WEIGHT2 - 0.001 0.0011 0.0000 1.000 0.49 0.00 TVD_RATWARE_CB - 0.001 0.0011 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_A842E - 0.001 0.0011 0.0000 1.000 0.49 0.00 RATWARE_OE_MALFORMED - 0.001 0.0011 0.0000 1.000 0.49 0.00 FH_MSGID_000000 - 0.001 0.0011 0.0000 1.000 0.49 0.00 AXB_XMID_OEGOESNULL - 0.001 0.0011 0.0000 1.000 0.49 0.00 FUZZY_PRESCRIPT - 0.001 0.0011 0.0000 1.000 0.49 0.00 FB_HOMELOAN - 0.001 0.0011 0.0000 1.000 0.49 0.00 SUBJECT_FUZZY_MEDS - 0.001 0.0011 0.0000 1.000 0.49 0.00 FS_CHEAP_CAP - 0.002 0.0023 0.0012 0.655 0.49 0.00 FREE_PORN - 0.058 0.0599 0.0535 0.528 0.49 1.75 TRACKER_ID - 0.004 0.0014 0.0083 0.145 0.49 -0.00 NO_RECEIVED - 0.005 0.0056 0.0048 0.543 0.49 0.00 TVD_ACT_193 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_ESTABLISH2 - 0.001 0.0008 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_A50F8 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FB_IMPRESS_GIRL - 0.001 0.0008 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_32D97 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_VALIUM1 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_VALIUM2 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FB_SPACEY_ZIP - 0.001 0.0008 0.0000 1.000 0.49 0.00 FM_PHN_NODNS - 0.001 0.0014 0.0006 0.704 0.49 0.00 FUZZY_MORTGAGE - 0.614 0.7266 0.3764 0.659 0.49 0.00 HTML_FONT_SIZE_HUGE - 3.233 4.1328 1.3385 0.755 0.49 1.20 MISSING_MID - 0.000 0.0006 0.0000 1.000 0.49 0.00 FM_LIKE_STOCKS - 0.000 0.0006 0.0000 1.000 0.49 0.00 HTTP_77 - 0.000 0.0006 0.0000 1.000 0.49 0.00 FB_DOUBLE_0WORDS - 0.000 0.0006 0.0000 1.000 0.49 0.00 FM_DOESNT_SAY_STOCK - 0.000 0.0006 0.0000 1.000 0.49 0.00 INVALID_TZ_CST - 0.000 0.0006 0.0000 1.000 0.49 0.00 FU_HOODIA - 0.000 0.0006 0.0000 1.000 0.49 0.00 FUZZY_MONEY - 0.000 0.0006 0.0000 1.000 0.49 0.00 FR_MIDER - 0.000 0.0006 0.0000 1.000 0.49 0.00 FU_MIDER - 0.000 0.0003 0.0000 1.000 0.49 0.00 JAPANESE_UCE_BODY - 0.000 0.0003 0.0000 1.000 0.49 0.00 FUZZY_BILLION - 0.000 0.0003 0.0000 1.000 0.49 0.00 HS_DRUG_DOLLAR_MANY - 0.000 0.0003 0.0000 1.000 0.49 0.00 JAPANESE_UCE_SUBJECT - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_ROLX - 0.000 0.0003 0.0000 1.000 0.49 0.00 MID_DEGREES - 0.000 0.0003 0.0000 1.000 0.49 0.00 CONFIRMED_FORGED - 0.000 0.0003 0.0000 1.000 0.49 0.00 TVD_DEAR_HOMEOWNER - 0.000 0.0003 0.0000 1.000 0.49 0.00 SHORT_TERM_PRICE - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_FHARMACY - 0.000 0.0000 0.0006 0.000 0.49 -2.00 HASHCASH_23 - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_C0MPANY - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_ONIINE - 0.000 0.0003 0.0000 1.000 0.49 0.00 HS_DRUG_DOLLAR_2 - 0.000 0.0003 0.0000 1.000 0.49 0.00 FUZZY_REMOVE - 0.000 0.0003 0.0000 1.000 0.49 0.00 PREST_NON_ACCREDITED - 0.000 0.0003 0.0000 1.000 0.49 0.00 TVD_FLOAT_GENERAL - 0.000 0.0003 0.0000 1.000 0.49 -0.00 HELO_STATIC_HOST - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_BILLI0N - 0.001 0.0008 0.0006 0.588 0.49 0.00 FORWARD_LOOKING - 0.001 0.0008 0.0006 0.588 0.49 0.00 TVD_EB_PHISH - 0.001 0.0008 0.0006 0.588 0.49 0.00 HEADER_COUNT_CTYPE - 0.001 0.0014 0.0012 0.543 0.49 0.00 HTML_TAG_EXIST_BGSOUND - 74.699 84.0309 55.0509 0.604 0.49 0.00 HTML_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 100.00 SUBJECT_IN_BLACKLIST - 0.000 0.0000 0.0000 0.500 0.49 0.00 CORRUPT_FROM_LINE_IN_HDRS - 0.000 0.0000 0.0000 0.500 0.49 -5.00 HASHCASH_HIGH - 0.000 0.0000 0.0000 0.500 0.49 2.45 MIME_CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FRT_ERECTION - 0.000 0.0000 0.0000 0.500 0.49 0.00 FUZZY_OBLIGATION - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_50_60 - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_70_80 - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 1.00 S25R_4 - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_BADTAG_40_50 - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_DEPT - 0.000 0.0000 0.0000 0.500 0.49 0.00 PREVENT_NONDELIVERY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FSL_UA - 0.000 0.0000 0.0000 0.500 0.49 -3.00 HASHCASH_24 - 0.000 0.0000 0.0000 0.500 0.49 100.00 USER_IN_BLACKLIST - 0.000 0.0000 0.0000 0.500 0.49 0.50 HTML_CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 0.00 HIGH_CODEPAGE_URI - 0.000 0.0000 0.0000 0.500 0.49 1.00 FRT_PHARMAC - 0.000 0.0000 0.0000 0.500 0.49 -20.00 USER_IN_MORE_SPAM_TO - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_URI - 0.000 0.0000 0.0000 0.500 0.49 0.10 MIME_SUSPECT_NAME - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_NAME_FREE - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_PERCENT - 0.000 0.0000 0.0000 0.500 0.49 0.00 SHORTCIRCUIT - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_90_100 - 0.000 0.0000 0.0000 0.500 0.49 0.00 FUZZY_OFFERS - 0.000 0.0000 0.0000 0.500 0.49 1.00 SPAMMY_MIME_BDRY_01 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_GECKO_BUILD - 0.000 0.0000 0.0000 0.500 0.49 0.10 VBOUNCE_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N8 - 0.000 0.0000 0.0000 0.500 0.49 0.00 EMAIL_ROT13 - 0.000 0.0000 0.0000 0.500 0.49 1.00 SANE_b58d7945d89b7afc9e2753c83b00ab44 - 0.000 0.0000 0.0000 0.500 0.49 -1.00 HASHCASH_22 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_AM_PM - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N3 - 0.000 0.0000 0.0000 0.500 0.49 3.20 CHARSET_FARAWAY_HEADER - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_SPF_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 1.00 TO_NO_BRKTS_DYNIP - 0.000 0.0000 0.0000 0.500 0.49 1.00 DEAR_BENEFICIARY - 0.000 0.0000 0.0000 0.500 0.49 0.00 FORGED_MUA_THEBAT_CS - 0.000 0.0000 0.0000 0.500 0.49 0.00 ACCESSDB - 0.000 0.0000 0.0000 0.500 0.49 1.00 KHOP_NO_FQDN - 0.000 0.0000 0.0000 0.500 0.49 1.00 FSL_LSPACES_ABUSE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_S25 - 0.000 0.0000 0.0000 0.500 0.49 0.00 YAHOO_RD_REDIR - 0.000 0.0000 0.0000 0.500 0.49 0.00 MULTI_FORGED - 0.000 0.0000 0.0000 0.500 0.49 1.00 DEAR_EMAIL - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_MSFT - 0.000 0.0000 0.0000 0.500 0.49 10.00 USER_IN_BLACKLIST_TO - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_RCVD_AT - 0.000 0.0000 0.0000 0.500 0.49 1.00 MANY_SPAN_IN_TEXT - 0.000 0.0000 0.0000 0.500 0.49 -6.00 USER_IN_WHITELIST_TO - 0.000 0.0000 0.0000 0.500 0.49 0.00 NO_HEADERS_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_AGENT - 0.000 0.0000 0.0000 0.500 0.49 0.00 NML_ADSP_CUSTOM_LOW - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_MOZ_MALFORMED - 0.000 0.0000 0.0000 0.500 0.49 0.10 MICROSOFT_EXECUTABLE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N2 - 0.000 0.0000 0.0000 0.500 0.49 0.00 WITH_LC_SMTP - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_DYNIP - 0.000 0.0000 0.0000 0.500 0.49 3.20 CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FB_TIRED_OF_YOUR - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N15 - 0.000 0.0000 0.0000 0.500 0.49 0.00 BLANK_LINES_80_90 - 0.000 0.0000 0.0000 0.500 0.49 0.00 FRAGMENTED_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_PNIS - 0.000 0.0000 0.0000 0.500 0.49 1.00 FB_WITHOUT_PRESC - 0.000 0.0000 0.0000 0.500 0.49 -4.00 HASHCASH_25 - 0.000 0.0000 0.0000 0.500 0.49 0.00 JS_FROMCHARCODE - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_FORM - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_FROM_MISSP - 0.000 0.0000 0.0000 0.500 0.49 0.00 YAHOO_DRS_REDIR - 0.000 0.0000 0.0000 0.500 0.49 -0.50 HASHCASH_20 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RUDE_HTML - 0.000 0.0000 0.0000 0.500 0.49 1.00 HELO_NO_DOMAIN - 0.000 0.0000 0.0000 0.500 0.49 0.00 AWL - 0.000 0.0000 0.0000 0.500 0.49 0.00 X_PRIORITY_CC - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N1 - 0.000 0.0000 0.0000 0.500 0.49 1000.00 GTUBE - 0.000 0.0000 0.0000 0.500 0.49 1.00 FS_MORE_CONFIDENT - 0.000 0.0000 0.0000 0.500 0.49 2.80 UNWANTED_LANGUAGE_BODY - 0.000 0.0000 0.0000 0.500 0.49 -0.70 HASHCASH_21 - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_FREEMAIL - 0.000 0.0000 0.0000 0.500 0.49 1.50 BODY_8BITS - 0.000 0.0000 0.0000 0.500 0.49 0.00 URI_TRUNCATED - 0.000 0.0000 0.0000 0.500 0.49 0.10 HASHCASH_2SPEND - 0.000 0.0000 0.0000 0.500 0.49 1.00 FORGED_RELAY_MUA_TO_MX - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_ALL_SPAM_TO - 0.000 0.0000 0.0000 0.500 0.49 1.00 MANY_TINY_FLOAT - 0.000 0.0000 0.0000 0.500 0.49 1.00 S25R_6 - 0.000 0.0000 0.0000 0.500 0.49 0.00 KOREAN_UCE_SUBJECT - 0.000 0.0000 0.0000 0.500 0.49 0.00 MISSING_HB_SEP - 0.000 0.0000 0.0000 0.500 0.49 -100.00 SUBJECT_IN_WHITELIST - 0.001 0.0006 0.0006 0.487 0.49 0.00 FB_ANA_TRIM - 0.001 0.0011 0.0012 0.487 0.49 0.00 FRT_XANAX2 - 0.001 0.0011 0.0012 0.487 0.49 0.00 FS_TEEN_BAD - 0.000 0.0003 0.0006 0.322 0.49 0.00 FB_FAKE_NUMBERS - 0.000 0.0003 0.0006 0.322 0.49 0.00 HTML_OBFUSCATE_30_40 - 0.000 0.0003 0.0006 0.322 0.49 0.00 NML_ADSP_CUSTOM_HIGH - 0.000 0.0003 0.0006 0.322 0.49 0.00 TVD_FUZZY_FINANCE - 0.001 0.0008 0.0012 0.416 0.49 0.00 FB_SPACED_PHN_3B - 0.001 0.0008 0.0012 0.416 0.49 0.00 CTYPE_8SPACE_GIF - 0.000 0.0000 0.0006 0.000 0.49 0.00 FB_ROLLER_IS_T - 0.000 0.0000 0.0006 0.000 0.49 0.00 FB_SSEX - 0.000 0.0000 0.0006 0.000 0.49 0.00 FUZZY_SOFTWARE - 0.000 0.0000 0.0006 0.000 0.49 0.00 HTML_BADTAG_90_100 - 0.000 0.0000 0.0006 0.000 0.49 0.00 STOCK_ALERT - 0.001 0.0006 0.0012 0.322 0.49 0.00 CURR_PRICE - 0.001 0.0006 0.0012 0.322 0.49 0.00 DRUG_DOSAGE - 0.001 0.0006 0.0012 0.322 0.49 0.00 REFINANCE_YOUR_HOME - 0.001 0.0006 0.0012 0.322 0.49 0.00 FUZZY_VIOXX - 0.003 0.0028 0.0036 0.442 0.49 0.00 INVALID_TZ_EST - 0.011 0.0107 0.0119 0.474 0.49 0.59 HTML_OBFUSCATE_10_20 - 0.001 0.0003 0.0012 0.192 0.49 0.00 CUM_SHOT - 0.001 0.0003 0.0012 0.192 0.49 0.00 SUBJECT_FUZZY_VPILL - 0.001 0.0008 0.0018 0.322 0.49 0.00 FRT_PRICE - 0.001 0.0008 0.0018 0.322 0.49 0.00 SPOOF_NET2COM - 0.001 0.0008 0.0018 0.322 0.49 0.00 HTML_NONELEMENT_60_70 - 0.000 0.0000 0.0012 0.000 0.49 0.10 CHALLENGE_RESPONSE - 0.001 0.0003 0.0018 0.137 0.49 0.00 HTML_NONELEMENT_80_90 - 0.001 0.0003 0.0018 0.137 0.49 0.00 FS_DOLLAR_BONUS - 6.742 8.5946 2.8422 0.751 0.49 2.00 BAYES_50 - 0.011 0.0104 0.0125 0.456 0.49 2.20 NO_MEDICAL - 0.001 0.0000 0.0018 0.000 0.49 0.00 FS_NEW_XXX - 0.002 0.0011 0.0030 0.275 0.48 0.00 TVD_STOCK1 - 0.001 0.0003 0.0024 0.106 0.48 0.00 HDR_ORDER_FTSDMCXX_001C - 0.002 0.0008 0.0030 0.222 0.48 0.00 FB_MORE_SIZE - 0.002 0.0014 0.0036 0.284 0.48 0.00 TVD_FUZZY_MICROCAP - 0.010 0.0093 0.0119 0.439 0.48 2.20 INVESTMENT_ADVICE - 0.001 0.0000 0.0024 0.000 0.48 0.00 HTML_BADTAG_50_60 - 0.001 0.0000 0.0024 0.000 0.48 0.00 FM_LUX_GIFTS_REDUCED - 0.001 0.0006 0.0030 0.160 0.48 0.00 LIVE_PORN - 0.002 0.0011 0.0036 0.240 0.48 0.00 MIME_BAD_ISO_CHARSET - 0.002 0.0008 0.0036 0.192 0.48 0.00 FRT_XANAX1 - 0.005 0.0037 0.0065 0.359 0.48 0.00 FRT_LEVITRA - 0.002 0.0011 0.0042 0.213 0.48 0.00 FUZZY_VLIUM - 0.093 0.0974 0.0827 0.541 0.48 1.95 SPOOF_COM2COM - 0.001 0.0003 0.0036 0.073 0.48 0.00 HTML_COMMENT_SHORT - 0.001 0.0003 0.0036 0.073 0.48 0.00 FR_3TAG_3TAG - 0.002 0.0008 0.0042 0.169 0.48 0.00 FRT_DOLLAR - 0.002 0.0014 0.0048 0.229 0.48 0.00 FB_REPLIC_CAP - 0.086 0.0901 0.0785 0.534 0.48 0.10 BOUNCE_MESSAGE - 0.001 0.0000 0.0036 0.000 0.48 0.00 DOS_URI_ASTERISK - 0.001 0.0000 0.0036 0.000 0.48 0.00 HTML_BADTAG_60_70 - 0.002 0.0006 0.0042 0.119 0.48 0.00 FU_LONG_QUERY3 - 0.002 0.0003 0.0042 0.064 0.48 0.00 HTML_FORMACTION_MAILTO - 3.762 4.6313 1.9331 0.706 0.48 0.61 HTML_IMAGE_RATIO_04 - 0.008 0.0062 0.0113 0.355 0.48 0.00 FRT_FUCK2 - 0.004 0.0025 0.0077 0.247 0.48 0.00 FM_MULTI_LUX_GIFTS - 0.004 0.0025 0.0077 0.247 0.48 0.00 FRT_INVESTOR - 0.045 0.0432 0.0494 0.467 0.48 0.00 PART_CID_STOCK_LESS - 0.002 0.0000 0.0054 0.000 0.47 0.00 MIME_BOUND_EQ_REL - 1.051 1.2250 0.6856 0.641 0.47 0.00 HTML_MIME_NO_HTML_TAG - 0.002 0.0003 0.0065 0.041 0.47 0.00 FB_NUMYO - 0.002 0.0003 0.0065 0.041 0.47 0.00 FRT_MEETING - 0.032 0.0291 0.0375 0.437 0.47 2.10 FROM_BLANK_NAME - 0.002 0.0000 0.0071 0.000 0.47 0.00 TVD_SILLY_URI_OBFU - 0.011 0.0090 0.0166 0.352 0.47 0.00 STOCK_IMG_OUTLOOK - 0.009 0.0059 0.0143 0.294 0.47 0.00 RCVD_BAD_ID - 0.047 0.0443 0.0541 0.450 0.47 0.00 MISSING_MIME_HB_SEP - 0.011 0.0076 0.0166 0.314 0.46 0.00 NUMERIC_HTTP_ADDR - 0.388 0.4202 0.3205 0.567 0.46 0.60 HTML_TAG_BALANCE_HEAD - 0.094 0.0929 0.0963 0.491 0.46 0.90 HTML_COMMENT_SAVED_URL - 0.003 0.0000 0.0095 0.000 0.46 0.00 TVD_FUZZY_SYMBOL - 0.005 0.0023 0.0119 0.160 0.46 0.00 OBSCURED_EMAIL - 0.027 0.0237 0.0351 0.403 0.46 2.10 TO_MALFORMED - 0.006 0.0028 0.0131 0.178 0.46 0.00 MIME_BOUND_MANY_HEX - 0.166 0.1694 0.1594 0.515 0.46 0.00 LOW_PRICE - 0.093 0.0904 0.0975 0.481 0.46 0.10 ANY_BOUNCE_MESSAGE - 5.014 4.9472 5.1552 0.490 0.46 0.00 MIME_QP_LONG_LINE - 8.846 7.5936 11.4842 0.398 0.46 0.00 FREEMAIL_FROM - 0.006 0.0020 0.0143 0.122 0.45 0.00 HTML_NONELEMENT_40_50 - 0.007 0.0028 0.0155 0.154 0.45 0.00 FUZZY_REFINANCE - 0.480 0.5137 0.4097 0.556 0.45 1.79 DEAR_SOMETHING - 0.080 0.0757 0.0880 0.462 0.45 1.20 LOCALPART_IN_SUBJECT - 0.118 0.1121 0.1308 0.462 0.45 0.00 HTML_EXTRA_CLOSE - 2.224 2.4337 1.7814 0.577 0.45 1.20 MISSING_HEADERS - 1.332 1.4498 1.0828 0.572 0.44 0.63 HTML_TAG_BALANCE_BODY - 0.008 0.0031 0.0190 0.140 0.44 0.00 HTML_IFRAME_SRC - 0.006 0.0003 0.0166 0.017 0.44 0.00 TVD_SPACED_SUBJECT_WORD3 - 0.022 0.0167 0.0345 0.326 0.44 1.23 RATWARE_MPOP_WEBMAIL - 0.005 0.0000 0.0166 0.000 0.44 0.00 FRT_STRONG2 - 0.478 0.2205 1.0203 0.178 0.44 -0.00 BAYES_40 - 0.006 0.0003 0.0190 0.015 0.44 0.10 CRBOUNCE_MESSAGE - 0.007 0.0008 0.0196 0.041 0.44 0.00 DC_PNG_UNO_LARGO - 0.009 0.0025 0.0232 0.099 0.43 0.00 SUBJECT_FUZZY_TION - 0.014 0.0068 0.0279 0.195 0.43 0.00 FH_HAS_XAIMC - 2.009 1.9991 2.0294 0.496 0.43 1.20 SUBJ_ALL_CAPS - 0.120 0.1082 0.1463 0.425 0.43 0.62 DATE_IN_PAST_24_48 - 1.630 1.6777 1.5299 0.523 0.43 0.00 TVD_SPACE_RATIO - 0.341 0.3267 0.3722 0.467 0.42 0.00 FROM_EXCESS_BASE64 - 0.009 0.0014 0.0244 0.055 0.42 0.00 HEAD_LONG - 1.264 1.2377 1.3182 0.484 0.42 0.00 HTML_IMAGE_RATIO_08 - 0.241 0.2253 0.2729 0.452 0.42 0.57 MISSING_MIMEOLE - 0.073 0.0576 0.1064 0.351 0.41 0.00 MIME_BASE64_TEXT - 0.062 0.0483 0.0922 0.344 0.41 0.48 HTTP_ESCAPED_HOST - 0.009 0.0003 0.0274 0.010 0.41 0.00 FU_END_ET - 0.011 0.0017 0.0315 0.051 0.41 1.17 HTML_EMBEDS - 1.159 1.0262 1.4395 0.416 0.41 0.00 HTML_IMAGE_RATIO_06 - 0.722 0.6119 0.9537 0.391 0.40 0.00 UNPARSEABLE_RELAY - 0.159 0.1336 0.2117 0.387 0.40 0.60 SUBJ_DOLLARS - 0.021 0.0096 0.0458 0.173 0.40 0.31 HTML_NONELEMENT_30_40 - 1.048 0.9110 1.3379 0.405 0.40 0.72 MIME_HTML_MOSTLY - 0.093 0.0692 0.1421 0.327 0.39 1.30 MISSING_SUBJECT - 0.191 0.1539 0.2705 0.363 0.39 1.80 REMOVE_BEFORE_LINK - 0.025 0.0113 0.0535 0.174 0.39 0.00 OBFUSCATING_COMMENT - 0.028 0.0141 0.0571 0.198 0.39 0.00 TVD_FW_GRAPHIC_NAME_LONG - 1.483 0.9920 2.5158 0.283 0.38 1.00 EXTRA_MPART_TYPE - 0.022 0.0073 0.0541 0.119 0.38 0.00 X_IP - 0.291 0.2279 0.4251 0.349 0.37 0.80 NORMAL_HTTP_TO_IP - 0.088 0.0565 0.1546 0.268 0.37 0.60 FUZZY_CREDIT - 0.556 0.3795 0.9270 0.290 0.37 0.29 HTML_FONT_FACE_BAD - 0.029 0.0102 0.0672 0.131 0.36 0.00 FRT_DIPLOMA - 0.055 0.0285 0.1118 0.203 0.36 0.00 TVD_FW_GRAPHIC_NAME_MID - 0.127 0.0796 0.2259 0.261 0.35 0.00 CTYPE_001C_B - 0.823 0.5058 1.4913 0.253 0.34 0.00 MIME_BASE64_BLANKS - 0.020 0.0000 0.0636 0.000 0.34 1.24 MIME_BOUND_DIGITS_15 - 0.334 0.2047 0.6059 0.253 0.33 0.00 UPPERCASE_75_100 - 0.244 0.1387 0.4668 0.229 0.33 0.72 HTML_OBFUSCATE_05_10 - 0.273 0.1519 0.5292 0.223 0.32 0.00 MIME_HTML_ONLY_MULTI - 0.122 0.0641 0.2438 0.208 0.32 0.00 UPPERCASE_50_75 - 0.027 0.0017 0.0797 0.021 0.32 0.75 HIDE_WIN_STATUS - 0.710 0.3629 1.4407 0.201 0.32 0.00 HTML_FONT_SIZE_LARGE - 0.592 0.2604 1.2915 0.168 0.29 0.47 MSGID_FROM_MTA_HEADER - 0.052 0.0045 0.1528 0.029 0.26 0.25 IP_LINK_PLUS - 0.047 0.0023 0.1427 0.016 0.25 0.00 FRT_ADOBE2 - 0.093 0.0195 0.2480 0.073 0.24 0.10 WEIRD_PORT - 0.394 0.0494 1.1208 0.042 0.16 0.00 MSGID_MULTIPLE_AT - 0.216 0.0246 0.6178 0.038 0.16 0.00 TVD_RCVD_SPACE_BRACKET - -Rule file versions for which these results apply: -(SpamAssassin Version string: 3.003000-beta1-svn) - --rw-r--r-- 1 mark nsc 5671 Sep 30 16:45 10_default_prefs.cf --rw-r--r-- 1 mark nsc 7509 Sep 30 16:45 20_advance_fee.cf --rw-r--r-- 1 mark nsc 7005 Sep 30 16:45 20_body_tests.cf --rw-r--r-- 1 mark nsc 1894 Sep 30 16:45 20_compensate.cf --rw-r--r-- 1 mark nsc 13540 Oct 6 12:30 20_dnsbl_tests.cf --rw-r--r-- 1 mark nsc 14998 Sep 30 16:45 20_drugs.cf --rw-r--r-- 1 mark nsc 11492 Sep 30 16:45 20_dynrdns.cf --rw-r--r-- 1 mark nsc 8118 Sep 30 16:45 20_fake_helo_tests.cf --rw-r--r-- 1 mark nsc 3159 Oct 30 15:58 20_freemail.cf --rw-r--r-- 1 mark nsc 35574 Oct 30 15:58 20_freemail_domains.cf --rw-r--r-- 1 mark nsc 25516 Sep 30 16:45 20_head_tests.cf --rw-r--r-- 1 mark nsc 10504 Sep 30 16:45 20_html_tests.cf --rw-r--r-- 1 mark nsc 5287 Sep 30 16:45 20_imageinfo.cf --rw-r--r-- 1 mark nsc 3330 Sep 30 16:45 20_meta_tests.cf --rw-r--r-- 1 mark nsc 1880 Sep 30 16:45 20_net_tests.cf --rw-r--r-- 1 mark nsc 8013 Sep 30 16:45 20_phrases.cf --rw-r--r-- 1 mark nsc 2062 Sep 30 16:45 20_porn.cf --rw-r--r-- 1 mark nsc 16172 Sep 30 16:45 20_ratware.cf --rw-r--r-- 1 mark nsc 5534 Sep 30 16:45 20_uri_tests.cf --rw-r--r-- 1 mark nsc 19305 Sep 30 16:45 20_vbounce.cf --rw-r--r-- 1 mark nsc 2549 Sep 30 16:45 23_bayes.cf --rw-r--r-- 1 mark nsc 1544 Sep 30 16:45 25_accessdb.cf --rw-r--r-- 1 mark nsc 1536 Sep 30 16:45 25_antivirus.cf --rw-r--r-- 1 mark nsc 1544 Sep 30 16:45 25_asn.cf --rw-r--r-- 1 mark nsc 2331 Sep 30 16:45 25_dcc.cf --rw-r--r-- 1 mark nsc 4407 Nov 2 17:07 25_dkim.cf --rw-r--r-- 1 mark nsc 2929 Sep 30 16:45 25_hashcash.cf --rw-r--r-- 1 mark nsc 1310 Sep 30 16:45 25_pyzor.cf --rw-r--r-- 1 mark nsc 3389 Sep 30 16:45 25_razor2.cf --rw-r--r-- 1 mark nsc 7672 Sep 30 16:45 25_replace.cf --rw-r--r-- 1 mark nsc 3100 Sep 30 16:45 25_spf.cf --rw-r--r-- 1 mark nsc 1768 Sep 30 16:45 25_textcat.cf --rw-r--r-- 1 mark nsc 7819 Nov 9 18:31 25_uribl.cf --rw-r--r-- 1 mark nsc 28682 Sep 30 16:45 30_text_de.cf --rw-r--r-- 1 mark nsc 20901 Sep 30 16:45 30_text_fr.cf --rw-r--r-- 1 mark nsc 1858 Sep 30 16:45 30_text_it.cf --rw-r--r-- 1 mark nsc 22257 Sep 30 16:45 30_text_nl.cf --rw-r--r-- 1 mark nsc 18290 Sep 30 16:45 30_text_pl.cf --rw-r--r-- 1 mark nsc 3331 Sep 30 16:45 30_text_pt_br.cf --rw-r--r-- 1 mark nsc 49537 Nov 27 18:58 50_scores.cf --rw-r--r-- 1 mark nsc 9288 Sep 30 16:45 60_adsp_override_dkim.cf --rw-r--r-- 1 mark nsc 1304 Sep 30 16:45 60_awl.cf --rw-r--r-- 1 mark nsc 2178 Sep 30 16:45 60_shortcircuit.cf --rw-r--r-- 1 mark nsc 4984 Sep 30 16:45 60_whitelist.cf --rw-r--r-- 1 mark nsc 6434 Nov 2 17:10 60_whitelist_dkim.cf --rw-r--r-- 1 mark nsc 3584 Sep 30 16:45 60_whitelist_spf.cf --rw-r--r-- 1 mark nsc 1914 Sep 30 16:45 60_whitelist_subject.cf --rw-r--r-- 1 mark nsc 54456 Dec 2 18:28 72_active.cf --rw-r--r-- 1 mark nsc 2214 Sep 30 16:45 local.cf --rw-r--r-- 1 mark nsc 2762 Sep 30 16:45 regression_tests.cf diff -Nru spamassassin-3.4.6/trunk-only/rules/STATISTICS-set3.txt spamassassin-4.0.0~rc3/trunk-only/rules/STATISTICS-set3.txt --- spamassassin-3.4.6/trunk-only/rules/STATISTICS-set3.txt 2009-12-02 18:11:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/STATISTICS-set3.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,1109 +0,0 @@ -STATISTICS REPORT FOR SPAMASSASSIN RULESET - -Classification success on test corpora, at default threshold: - -# SUMMARY for threshold 5.0: -# Correctly non-spam: 21178 99.96% -# Correctly spam: 43443 98.43% -# False positives: 8 0.04% -# False negatives: 691 1.57% -# TCR(l=50): 40.452796 SpamRecall: 98.434% SpamPrec: 99.982% - -Results on test corpora at various alternative thresholds: - -# SUMMARY for threshold -4.0: -# Correctly non-spam: 5362 25.31% -# Correctly spam: 44134 100.00% -# False positives: 15824 74.69% -# False negatives: 0 0.00% -# TCR(l=50): 0.055781 SpamRecall: 100.000% SpamPrec: 73.608% - -# SUMMARY for threshold -3.0: -# Correctly non-spam: 5713 26.97% -# Correctly spam: 44134 100.00% -# False positives: 15473 73.03% -# False negatives: 0 0.00% -# TCR(l=50): 0.057046 SpamRecall: 100.000% SpamPrec: 74.042% - -# SUMMARY for threshold -2.0: -# Correctly non-spam: 8477 40.01% -# Correctly spam: 44134 100.00% -# False positives: 12709 59.99% -# False negatives: 0 0.00% -# TCR(l=50): 0.069453 SpamRecall: 100.000% SpamPrec: 77.642% - -# SUMMARY for threshold -1.0: -# Correctly non-spam: 16598 78.34% -# Correctly spam: 44123 99.98% -# False positives: 4588 21.66% -# False negatives: 11 0.02% -# TCR(l=50): 0.192380 SpamRecall: 99.975% SpamPrec: 90.581% - -# SUMMARY for threshold 0.0: -# Correctly non-spam: 19191 90.58% -# Correctly spam: 44100 99.92% -# False positives: 1995 9.42% -# False negatives: 34 0.08% -# TCR(l=50): 0.442295 SpamRecall: 99.923% SpamPrec: 95.672% - -# SUMMARY for threshold 1.0: -# Correctly non-spam: 20307 95.85% -# Correctly spam: 44068 99.85% -# False positives: 879 4.15% -# False negatives: 66 0.15% -# TCR(l=50): 1.002681 SpamRecall: 99.850% SpamPrec: 98.044% - -# SUMMARY for threshold 2.0: -# Correctly non-spam: 20842 98.38% -# Correctly spam: 43995 99.69% -# False positives: 344 1.62% -# False negatives: 139 0.31% -# TCR(l=50): 2.545360 SpamRecall: 99.685% SpamPrec: 99.224% - -# SUMMARY for threshold 3.0: -# Correctly non-spam: 21057 99.39% -# Correctly spam: 43905 99.48% -# False positives: 129 0.61% -# False negatives: 229 0.52% -# TCR(l=50): 6.607875 SpamRecall: 99.481% SpamPrec: 99.707% - -# SUMMARY for threshold 4.0: -# Correctly non-spam: 21139 99.78% -# Correctly spam: 43721 99.06% -# False positives: 47 0.22% -# False negatives: 413 0.94% -# TCR(l=50): 15.973218 SpamRecall: 99.064% SpamPrec: 99.893% - -# SUMMARY for threshold 4.5: -# Correctly non-spam: 21167 99.91% -# Correctly spam: 43574 98.73% -# False positives: 19 0.09% -# False negatives: 560 1.27% -# TCR(l=50): 29.227815 SpamRecall: 98.731% SpamPrec: 99.956% - -# SUMMARY for threshold 5.5: -# Correctly non-spam: 21182 99.98% -# Correctly spam: 43265 98.03% -# False positives: 4 0.02% -# False negatives: 869 1.97% -# TCR(l=50): 41.285313 SpamRecall: 98.031% SpamPrec: 99.991% - -# SUMMARY for threshold 6.0: -# Correctly non-spam: 21184 99.99% -# Correctly spam: 43070 97.59% -# False positives: 2 0.01% -# False negatives: 1064 2.41% -# TCR(l=50): 37.915808 SpamRecall: 97.589% SpamPrec: 99.995% - -# SUMMARY for threshold 6.5: -# Correctly non-spam: 21185 100.00% -# Correctly spam: 42842 97.07% -# False positives: 1 0.00% -# False negatives: 1292 2.93% -# TCR(l=50): 32.886736 SpamRecall: 97.073% SpamPrec: 99.998% - -# SUMMARY for threshold 7.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 42544 96.40% -# False positives: 0 0.00% -# False negatives: 1590 3.60% -# TCR(l=50): 27.757233 SpamRecall: 96.397% SpamPrec: 100.000% - -# SUMMARY for threshold 8.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 41896 94.93% -# False positives: 0 0.00% -# False negatives: 2238 5.07% -# TCR(l=50): 19.720286 SpamRecall: 94.929% SpamPrec: 100.000% - -# SUMMARY for threshold 9.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 40823 92.50% -# False positives: 0 0.00% -# False negatives: 3311 7.50% -# TCR(l=50): 13.329508 SpamRecall: 92.498% SpamPrec: 100.000% - -# SUMMARY for threshold 10.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 39492 89.48% -# False positives: 0 0.00% -# False negatives: 4642 10.52% -# TCR(l=50): 9.507540 SpamRecall: 89.482% SpamPrec: 100.000% - -# SUMMARY for threshold 12.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 35598 80.66% -# False positives: 0 0.00% -# False negatives: 8536 19.34% -# TCR(l=50): 5.170337 SpamRecall: 80.659% SpamPrec: 100.000% - -# SUMMARY for threshold 15.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 29093 65.92% -# False positives: 0 0.00% -# False negatives: 15041 34.08% -# TCR(l=50): 2.934246 SpamRecall: 65.920% SpamPrec: 100.000% - -# SUMMARY for threshold 17.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 25415 57.59% -# False positives: 0 0.00% -# False negatives: 18719 42.41% -# TCR(l=50): 2.357711 SpamRecall: 57.586% SpamPrec: 100.000% - -# SUMMARY for threshold 20.0: -# Correctly non-spam: 21186 100.00% -# Correctly spam: 20835 47.21% -# False positives: 0 0.00% -# False negatives: 23299 52.79% -# TCR(l=50): 1.894244 SpamRecall: 47.209% SpamPrec: 100.000% - - -Test hit frequencies, for spam and ham corpora: -(note: S/O indicates ratio of spam hits to overall hits for -each test, where 0.0 = hits only non-spam and 1.0 = hits only spam, -and the 'score' field should be ignored.) - -OVERALL SPAM% HAM% S/O RANK SCORE NAME - 0 354116 168179 0.678 0.00 0.00 (all messages) -0.00000 67.8000 32.2000 0.678 0.00 0.00 (all messages as %) - 21.490 31.6961 0.0012 1.000 1.00 4.50 URIBL_AB_SURBL - 58.306 85.9927 0.0077 1.000 1.00 3.50 BAYES_99 - 28.417 41.9097 0.0054 1.000 0.99 1.61 URIBL_WS_SURBL - 10.321 15.2230 0.0006 1.000 0.99 0.57 URIBL_SC_SURBL - 9.134 13.4719 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_08 - 9.132 13.4688 0.0006 1.000 0.98 1.50 KB_RATWARE_OUTLOOK_MID - 9.131 13.4673 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_16 - 9.131 13.4673 0.0006 1.000 0.98 0.00 KB_RATWARE_OUTLOOK_12 - 7.889 11.6355 0.0000 1.000 0.98 3.61 HELO_DYNAMIC_IPADDR2 - 48.786 71.9487 0.0137 1.000 0.98 1.89 RAZOR2_CF_RANGE_E8_51_100 - 10.781 15.8976 0.0077 1.000 0.97 3.18 FH_HELO_EQ_D_D_D_D - 36.655 54.0555 0.0155 1.000 0.97 1.25 URIBL_JP_SURBL - 4.050 5.9735 0.0000 1.000 0.96 2.76 HELO_DYNAMIC_HCC - 4.988 7.3544 0.0042 0.999 0.96 1.95 HELO_DYNAMIC_IPADDR - 3.597 5.3048 0.0018 1.000 0.96 0.55 HK_NAME_DRUGS - 2.380 3.5104 0.0000 1.000 0.95 3.48 HELO_DYNAMIC_SPLIT_IP - 2.281 3.3650 0.0000 1.000 0.94 4.20 FSL_YG_ABUSE - 1.957 2.8861 0.0000 1.000 0.94 3.77 REPLICA_WATCH - 39.995 58.9770 0.0262 1.000 0.94 3.33 RCVD_IN_PBL - 1.957 2.8858 0.0000 1.000 0.94 3.17 FB_REPLICA_ROLEX - 1.901 0.0000 5.9050 0.000 0.93 -7.50 USER_IN_DEF_DKIM_WL - 8.791 12.9579 0.0172 0.999 0.93 2.52 DOS_OE_TO_MX - 2.305 3.3975 0.0042 0.999 0.93 2.17 TVD_RCVD_SINGLE - 2.317 0.0028 7.1882 0.000 0.93 -1.00 ALL_TRUSTED - 2.720 4.0074 0.0089 0.998 0.93 0.21 HELO_DYNAMIC_DHCP - 14.258 21.0180 0.0238 0.999 0.93 0.00 RCVD_IN_SORBS_DUL - 1.773 2.6121 0.0054 0.998 0.91 2.15 RATWARE_MS_HASH - 1.448 2.1357 0.0006 1.000 0.91 0.00 HELO_LOCALHOST - 1.573 2.3184 0.0036 0.998 0.91 2.95 RATWARE_OUTLOOK_NONAME - 1.379 2.0338 0.0006 1.000 0.91 1.70 KB_RATWARE_MSGID - 1.331 1.9632 0.0012 0.999 0.90 0.00 JM_SOUGHT_FRAUD_3 - 2.324 3.4212 0.0149 0.996 0.90 4.00 FH_FAKE_RCVD_LINE_B - 1.630 2.4001 0.0095 0.996 0.89 1.93 FORGED_MUA_OUTLOOK - 1.157 1.7051 0.0018 0.999 0.89 3.82 ADVANCE_FEE_3 - 1.402 2.0649 0.0071 0.997 0.89 0.14 RCVD_IN_SBL - 1.075 1.5859 0.0000 1.000 0.89 0.00 JM_SOUGHT_FRAUD_1 - 6.608 9.7318 0.0297 0.997 0.89 1.31 RCVD_IN_SSBL - 20.886 30.7854 0.0428 0.999 0.89 0.12 URIBL_OB_SURBL - 2.494 0.0102 7.7227 0.001 0.89 -4.30 HABEAS_ACCREDITED_SOI - 0.910 1.3422 0.0000 1.000 0.88 1.48 SANE_7429530a7398f43f1f1b795f9420714e - 1.094 1.6111 0.0054 0.997 0.88 3.00 BAYES_95 - 0.766 1.1301 0.0006 0.999 0.87 0.27 ADVANCE_FEE_4 - 6.882 10.1317 0.0398 0.996 0.87 1.62 URIBL_SBL - 0.743 1.0960 0.0006 0.999 0.87 3.90 MSGID_OUTLOOK_INVALID - 3.794 5.5792 0.0339 0.994 0.87 0.00 HTML_SHORT_LINK_IMG_1 - 0.852 1.2544 0.0059 0.995 0.86 3.09 DATE_IN_FUTURE_96_XX - 1.326 1.9479 0.0155 0.992 0.86 1.55 REPLYTO_WITHOUT_TO_CC - 0.607 0.8943 0.0006 0.999 0.86 3.62 AXB_HELO_LH_HOME - 0.562 0.8291 0.0000 1.000 0.86 0.00 FSL_INTERIA_ABUSE - 0.558 0.8237 0.0000 1.000 0.85 1.32 FH_HOST_EQ_VERIZON_P - 0.561 0.8268 0.0006 0.999 0.85 0.81 FSL_HELO_DEVICE - 1.313 1.9279 0.0184 0.991 0.85 1.99 DRUGS_ERECTILE - 0.630 0.9274 0.0042 0.996 0.85 3.25 MILLION_USD - 1.163 1.7076 0.0166 0.990 0.85 2.00 BAYES_80 - 2.234 3.2797 0.0321 0.990 0.85 1.36 MISSING_DATE - 0.568 0.8356 0.0036 0.996 0.85 0.00 KB_DATE_CONTAINS_TAB - 0.744 0.0042 2.3011 0.002 0.85 -4.30 RCVD_IN_BSP_TRUSTED - 3.057 4.4884 0.0440 0.990 0.84 1.17 HTML_IMAGE_ONLY_04 - 1.245 1.8265 0.0208 0.989 0.84 0.00 DYN_RDNS_SHORT_HELO_HTML - 0.491 0.7238 0.0000 1.000 0.84 0.74 HTML_SHORT_CENTER - 0.622 0.9135 0.0077 0.992 0.84 1.74 HELO_LH_HOME - 0.489 0.7212 0.0006 0.999 0.84 1.49 SANE_d0d2b0f6373bf91253d66dd74c594b87 - 0.544 0.7995 0.0048 0.994 0.84 2.58 MSOE_MID_WRONG_CASE - 0.719 1.0547 0.0119 0.989 0.84 3.40 FILL_THIS_FORM_LONG - 0.555 0.8153 0.0059 0.993 0.84 3.25 FB_CIALIS_LEO3 - 0.463 0.6831 0.0000 1.000 0.84 2.69 KB_FAKED_THE_BAT - 0.907 0.0076 2.8012 0.003 0.84 -0.40 DCC_REPUT_00_12 - 0.440 0.6489 0.0006 0.999 0.83 1.60 TVD_RCVD_IP4 - 0.406 0.5987 0.0000 1.000 0.83 1.58 FB_SOFTTABS - 0.484 0.7122 0.0042 0.994 0.83 1.47 SUBJECT_DIET - 1.535 2.2481 0.0327 0.986 0.83 0.00 HTML_SHORT_LINK_IMG_2 - 0.406 0.5981 0.0006 0.999 0.83 3.70 DOS_OE_TO_MX_IMAGE - 0.476 0.7003 0.0048 0.993 0.82 2.88 FILL_THIS_FORM_LOAN - 1.801 2.6364 0.0410 0.985 0.82 2.40 FREEMAIL_REPLYTO - 0.367 0.5416 0.0000 1.000 0.82 0.69 FH_HELO_ALMOST_IP - 0.366 0.5394 0.0000 1.000 0.82 0.00 RDNS_LOCALHOST - 0.354 0.5216 0.0000 1.000 0.81 3.54 SANE_4ef8302546bf270a19baf98508afacc4 - 0.351 0.5173 0.0006 0.999 0.81 0.00 FB_THIS_ADVERT - 1.627 2.3783 0.0440 0.982 0.81 0.00 HK_RANDOM_ENVFROM - 0.369 0.5422 0.0042 0.992 0.81 1.39 SHORT_HELO_AND_INLINE_IMAGE - 0.303 0.4456 0.0012 0.997 0.80 0.00 X_MAILER_CME_6543_MSN - 0.282 0.4160 0.0000 1.000 0.80 1.34 SANE_04e8bf28eb445199a7f11b943c44d209 - 1.686 2.4628 0.0499 0.980 0.80 1.05 ADVANCE_FEE_2 - 0.295 0.4346 0.0018 0.996 0.80 3.02 FS_REPLICAWATCH - 0.967 1.4108 0.0321 0.978 0.80 1.50 BAYES_60 - 0.625 0.9110 0.0232 0.975 0.79 3.60 FS_REPLICA - 0.783 1.1406 0.0291 0.975 0.79 2.22 RCVD_IN_NJABL_PROXY - 0.291 0.4281 0.0036 0.992 0.79 2.04 FS_WEIGHT_LOSS - 0.264 0.3894 0.0012 0.997 0.79 3.60 HK_LOTTO - 0.304 0.4448 0.0065 0.986 0.79 0.00 STOCK_IMG_HTML - 0.285 0.4188 0.0048 0.989 0.79 3.60 NA_DOLLARS - 0.305 0.4459 0.0077 0.983 0.78 0.02 STOCK_IMG_HDR_FROM - 10.447 15.3597 0.1035 0.993 0.78 2.70 RCVD_IN_PSBL - 5.178 7.5958 0.0874 0.989 0.78 0.15 HTML_SHORT_LINK_IMG_3 - 0.410 0.5973 0.0155 0.975 0.78 0.02 FORGED_OUTLOOK_HTML - 1.167 1.6980 0.0482 0.972 0.78 2.84 DOS_OUTLOOK_TO_MX - 0.543 0.7893 0.0256 0.969 0.78 0.00 DNS_FROM_RFC_DSN - 0.226 0.3324 0.0006 0.998 0.77 3.16 KAM_LOTTO1 - 0.469 0.0102 1.4348 0.007 0.77 -0.10 DCC_REPUT_13_19 - 0.475 0.6899 0.0220 0.969 0.77 0.50 FROM_LOCAL_NOVOWEL - 0.221 0.3259 0.0000 1.000 0.77 0.00 JM_SOUGHT_FRAUD_2 - 0.239 0.3502 0.0036 0.990 0.77 1.37 IMPOTENCE - 0.462 0.6712 0.0226 0.967 0.77 3.41 DATE_IN_PAST_96_XX - 0.216 0.3191 0.0000 1.000 0.77 1.37 HELO_DYNAMIC_DIALIN - 0.212 0.3126 0.0000 1.000 0.77 0.94 SANE_2b173a7fb7518c75ac8a2d294d773fd8 - 0.206 0.3041 0.0000 1.000 0.76 0.85 FM_VEGAS_CASINO - 0.208 0.3067 0.0006 0.998 0.76 0.00 APOSTROPHE_FROM - 0.189 0.2790 0.0000 1.000 0.76 0.00 FB_TO_STOP_DISTRO - 0.206 0.3036 0.0012 0.996 0.76 0.65 ONLINE_PHARMACY - 0.218 0.3197 0.0030 0.991 0.76 3.40 RCVD_ILLEGAL_IP - 0.187 0.2762 0.0000 1.000 0.76 2.31 FB_QUALITY_REPLICA - 0.689 0.9960 0.0428 0.959 0.76 3.03 DATE_IN_FUTURE_03_06 - 0.186 0.0003 0.5786 0.000 0.76 -8.00 RCVD_IN_DNSWL_HI - 0.245 0.3569 0.0089 0.976 0.76 1.54 BODY_ENHANCEMENT2 - 0.184 0.2711 0.0000 1.000 0.76 0.00 XMAILER_MIMEOLE_OL_3AC1D - 0.186 0.2736 0.0012 0.996 0.75 1.96 FUZZY_ROLEX - 0.179 0.2635 0.0000 1.000 0.75 3.40 FORGED_MUA_THEBAT_BOUN - 0.184 0.2705 0.0012 0.996 0.75 1.41 TVD_VISIT_PHARMA - 0.221 0.3231 0.0065 0.980 0.75 0.00 BODY_ENHANCEMENT - 0.310 0.4479 0.0202 0.957 0.75 0.00 FRT_SOMA - 0.175 0.2578 0.0006 0.998 0.75 1.79 DRUG_ED_SILD - 0.254 0.0065 0.7760 0.008 0.75 -0.00 RCVD_IN_IADB_LISTED - 6.821 9.9964 0.1356 0.987 0.75 0.74 FROM_STARTS_WITH_NUMS - 0.172 0.0000 0.5334 0.000 0.75 -1.47 RCVD_IN_IADB_OPTIN - 0.247 0.0062 0.7540 0.008 0.74 -0.06 RCVD_IN_IADB_SPF - 0.168 0.2477 0.0000 1.000 0.74 3.30 LOTTERY_PH_004470 - 0.245 0.0062 0.7474 0.008 0.74 -0.23 RCVD_IN_IADB_RDNS - 0.165 0.2437 0.0000 1.000 0.74 3.30 FH_HOST_EQ_DYNAMICIP - 0.164 0.2426 0.0000 1.000 0.74 1.35 FUZZY_PHARMACY - 0.175 0.2567 0.0030 0.989 0.74 1.81 FS_START_LOSE - 0.158 0.2330 0.0000 1.000 0.74 0.23 DRUGS_SMEAR1 - 0.168 0.2468 0.0012 0.995 0.74 3.30 FM_LOTTO_YOU_WON - 56.573 83.3459 0.2004 0.998 0.74 0.50 RAZOR2_CF_RANGE_51_100 - 0.297 0.4273 0.0226 0.950 0.73 0.00 FH_HAS_XID - 0.154 0.2265 0.0006 0.997 0.73 0.77 LIVEFILESTORE - 0.173 0.2530 0.0036 0.986 0.73 3.30 EXCUSE_REMOVE - 0.149 0.2189 0.0006 0.997 0.73 1.95 HS_VPXL - 0.140 0.2064 0.0000 1.000 0.73 1.11 DRUGS_ERECTILE_OBFU - 1.141 1.6492 0.0708 0.959 0.73 0.72 MIME_HEADER_CTYPE_ONLY - 0.177 0.2581 0.0065 0.975 0.73 0.11 SPF_HELO_NEUTRAL - 17.958 26.4018 0.1778 0.993 0.73 1.35 RCVD_IN_BL_SPAMCOP_NET - 0.205 0.2979 0.0107 0.965 0.73 2.13 FM_SCHOOLING - 0.144 0.2115 0.0012 0.994 0.73 0.10 DOS_RCVD_IP_TWICE_C - 24.225 35.6409 0.1879 0.995 0.73 0.64 RAZOR2_CF_RANGE_E4_51_100 - 0.128 0.1892 0.0000 1.000 0.73 1.78 TVD_PH_REC - 0.193 0.2790 0.0113 0.961 0.73 0.99 SUBJ_YOUR_DEBT - 0.135 0.1988 0.0018 0.991 0.72 0.00 SANE_3b92eda751c992f230f215fb7eb36844 - 0.150 0.2189 0.0042 0.981 0.72 2.37 RCVD_HELO_IP_MISMATCH - 0.122 0.1804 0.0000 1.000 0.72 3.16 XMAILER_MIMEOLE_OL_22B61 - 0.127 0.1858 0.0024 0.987 0.72 2.05 DATE_IN_FUTURE_24_48 - 0.120 0.1771 0.0000 1.000 0.72 0.00 SANE_1c4f3286fa4aed6424ced88bfaf8b09c - 0.119 0.1748 0.0000 1.000 0.72 2.42 XMAILER_MIMEOLE_OL_8627E - 0.122 0.1790 0.0024 0.987 0.71 0.00 FU_COMMON_SUBS2 - 0.267 0.3804 0.0268 0.934 0.71 3.20 DATE_IN_FUTURE_12_24 - 0.137 0.1985 0.0059 0.971 0.71 0.00 FILL_THIS_FORM_FRAUD_PHISH - 0.110 0.1618 0.0000 1.000 0.71 2.68 FH_HELO_EQ_CHARTER - 0.165 0.2383 0.0101 0.959 0.71 1.51 URIBL_RHS_DOB - 0.108 0.1596 0.0000 1.000 0.71 0.00 FH_HOST_IN_ADDRARPA - 1.243 1.7904 0.0916 0.951 0.71 0.57 INVALID_MSGID - 0.119 0.1742 0.0030 0.983 0.71 2.51 SUSPICIOUS_RECIPS - 0.106 0.1556 0.0006 0.996 0.70 3.10 DEAR_WINNER - 0.104 0.1536 0.0000 1.000 0.70 0.05 FM_SEX_HELODDDD - 0.425 0.6035 0.0499 0.924 0.70 0.50 URI_NOVOWEL - 11.477 16.8278 0.2105 0.988 0.70 0.29 DIGEST_MULTIPLE - 1.823 2.6282 0.1290 0.953 0.70 1.09 HTML_IMAGE_ONLY_16 - 0.126 0.1827 0.0071 0.962 0.70 0.82 NO_RDNS_DOTCOM_HELO - 0.098 0.1449 0.0000 1.000 0.70 1.37 MIME_BOUND_DD_DIGITS - 0.093 0.1372 0.0000 1.000 0.70 0.00 BASE64_LENGTH_78_79 - 1.197 1.7178 0.0993 0.945 0.70 1.11 MPART_ALT_DIFF_COUNT - 0.090 0.1327 0.0000 1.000 0.69 2.49 SPAMMY_XMAILER - 0.159 0.2279 0.0149 0.939 0.69 1.23 MONEY_BACK - 0.088 0.1293 0.0000 1.000 0.69 0.25 RATWARE_NAME_ID - 1.438 2.0620 0.1231 0.944 0.69 1.40 DCC_REPUT_99_100 - 0.084 0.1243 0.0000 1.000 0.69 1.25 UNRESOLVED_TEMPLATE - 0.094 0.1367 0.0030 0.979 0.69 1.46 SUBJ_AS_SEEN - 1.055 1.5083 0.0993 0.938 0.69 2.35 FSL_HELO_BARE_IP_1 - 0.082 0.1209 0.0000 1.000 0.69 3.01 KAM_LOTTO2 - 1.732 2.4876 0.1415 0.946 0.68 1.10 INVALID_DATE - 0.083 0.1211 0.0012 0.990 0.68 0.00 FS_PHARMASUB2 - 0.092 0.1344 0.0042 0.970 0.68 1.22 TVD_FINGER_02 - 0.153 0.2169 0.0172 0.926 0.68 0.00 URI_OBFU_WWW - 7.388 0.1093 22.7145 0.005 0.68 -4.00 RCVD_IN_DNSWL_MED - 0.080 0.1175 0.0006 0.995 0.68 3.10 MSGID_SPAM_CAPS - 0.565 0.7975 0.0755 0.913 0.68 1.99 BAD_ENC_HEADER - 0.079 0.1163 0.0006 0.995 0.68 0.85 MALE_ENHANCE - 0.193 0.2722 0.0262 0.912 0.68 0.94 FB_GET_MEDS - 20.622 30.2805 0.2848 0.991 0.68 0.38 RCVD_IN_XBL - 0.076 0.1127 0.0000 1.000 0.68 0.00 FSL_FAKE_GMAIL_RCVD - 1.055 1.5032 0.1106 0.931 0.68 0.00 NO_DNS_FOR_FROM - 0.074 0.1099 0.0000 1.000 0.68 2.14 SUBJECT_DRUG_GAP_C - 1.518 2.1719 0.1409 0.939 0.68 0.00 STOX_REPLY_TYPE_WITHOUT_QUOTES - 0.099 0.1420 0.0083 0.945 0.68 0.00 TVD_PH_SUBJ_ACCOUNTS_POST - 0.074 0.1096 0.0000 1.000 0.68 1.57 SANE_91eb43f705d25c804374a746d7519660 - 0.074 0.1084 0.0000 1.000 0.68 2.37 FSL_FAKE_HOTMAIL_RVCD - 0.111 0.0059 0.3336 0.017 0.67 -0.00 RCVD_IN_IADB_SENDERID - 0.790 1.1174 0.0999 0.918 0.67 0.05 FORGED_OUTLOOK_TAGS - 0.075 0.1096 0.0024 0.979 0.67 0.00 FB_SAVE_PERSC - 0.069 0.1014 0.0000 1.000 0.67 2.77 XMAILER_MIMEOLE_OL_1ECD5 - 0.072 0.1059 0.0012 0.989 0.67 2.72 SPOOF_COM2OTH - 0.069 0.1011 0.0000 1.000 0.67 1.84 PERCENT_RANDOM - 0.068 0.1008 0.0000 1.000 0.67 1.01 DYN_RDNS_SHORT_HELO_IMAGE - 0.068 0.1000 0.0000 1.000 0.67 3.00 RATWARE_EFROM - 0.071 0.1045 0.0018 0.983 0.67 3.00 SUBJ_YOUR_FAMILY - 10.028 14.6542 0.2884 0.981 0.67 0.00 FSL_HELO_NON_FQDN_1 - 4.413 6.3990 0.2325 0.965 0.67 1.12 URI_HEX - 0.322 0.4482 0.0577 0.886 0.66 1.52 SUBJ_ILLEGAL_CHARS - 0.066 0.0980 0.0000 1.000 0.66 1.81 RCVD_DOUBLE_IP_SPAM - 0.183 0.2558 0.0285 0.900 0.66 2.70 BANG_GUAR - 4.831 7.0104 0.2420 0.967 0.66 1.55 HTML_IMAGE_ONLY_20 - 41.685 61.3005 0.3841 0.994 0.66 1.73 URIBL_BLACK - 0.062 0.0918 0.0000 1.000 0.66 1.78 RATWARE_ZERO_TZ - 0.427 0.5947 0.0749 0.888 0.66 0.00 PART_CID_STOCK - 0.062 0.0912 0.0012 0.987 0.65 2.90 HK_FAKENAME_EBAY - 0.263 0.3637 0.0523 0.874 0.65 1.95 DATE_IN_FUTURE_06_12 - 1.053 1.4879 0.1362 0.916 0.65 2.06 HTML_IMAGE_ONLY_12 - 0.058 0.0858 0.0000 1.000 0.65 1.78 FH_FAKE_RCVD_LINE - 0.060 0.0884 0.0006 0.993 0.65 2.90 FR_TITLE_NUMS - 53.063 78.0569 0.4370 0.994 0.65 0.00 RCVD_IN_BRBL_LASTEXT - 0.063 0.0921 0.0030 0.969 0.65 2.90 ENGLISH_UCE_SUBJECT - 57.316 84.3246 0.4477 0.995 0.65 0.92 RAZOR2_CHECK - 0.727 1.0163 0.1189 0.895 0.65 1.75 US_DOLLARS_3 - 0.090 0.1265 0.0143 0.899 0.65 1.80 DKIM_ADSP_DISCARD - 0.055 0.0813 0.0000 1.000 0.65 0.27 HELO_OEM - 10.241 14.9395 0.3490 0.977 0.65 0.67 SPF_SOFTFAIL - 0.054 0.0802 0.0000 1.000 0.65 0.04 FROM_ILLEGAL_CHARS - 0.408 0.5634 0.0803 0.875 0.64 2.58 DEAR_FRIEND - 0.052 0.0771 0.0006 0.992 0.64 1.11 FS_ABIGGER - 0.051 0.0751 0.0000 1.000 0.64 0.00 HS_FORGED_OE_FW - 0.121 0.1663 0.0250 0.869 0.64 0.00 FH_FROMEML_NOTLD - 0.051 0.0746 0.0006 0.992 0.64 0.00 FORGED_MUA_EUDORA - 0.226 0.3087 0.0511 0.858 0.64 0.00 TVD_PH_BODY_ACCOUNTS_PRE - 0.046 0.0000 0.1439 0.000 0.63 -0.01 RCVD_IN_IADB_OPTIN_GT50 - 0.070 0.0051 0.2063 0.024 0.63 -0.00 RCVD_IN_IADB_UT_CPR_MAT - 0.070 0.0051 0.2063 0.024 0.63 -0.00 RCVD_IN_IADB_MI_CPR_MAT - 1.090 1.5300 0.1623 0.904 0.63 1.17 DYN_RDNS_AND_INLINE_IMAGE - 3.882 5.5759 0.3140 0.947 0.63 0.78 SPF_NEUTRAL - 0.273 0.3716 0.0648 0.851 0.63 2.42 BAD_CREDIT - 30.313 0.2364 93.6413 0.003 0.63 -1.90 BAYES_00 - 0.052 0.0754 0.0042 0.948 0.63 0.00 TVD_PH_SUBJ_URGENT - 0.043 0.0627 0.0006 0.991 0.63 0.00 FB_GVR - 0.043 0.0627 0.0006 0.991 0.63 0.94 DRUG_ED_CAPS - 0.064 0.0901 0.0095 0.904 0.63 2.80 EXCUSE_24 - 0.362 0.4945 0.0838 0.855 0.63 1.65 HTML_IMAGE_ONLY_08 - 0.388 0.5301 0.0880 0.858 0.63 0.57 URG_BIZ - 0.135 0.1830 0.0345 0.841 0.63 0.64 SUBJ_BUY - 0.047 0.0683 0.0024 0.966 0.63 0.34 DRUGS_DIET - 0.051 0.0737 0.0042 0.947 0.63 0.65 REPTO_QUOTE_YAHOO - 0.040 0.0596 0.0000 1.000 0.63 0.00 HS_BOBAX_MID_2 - 2.657 3.7773 0.2985 0.927 0.63 1.62 HTML_IMAGE_ONLY_24 - 0.040 0.0590 0.0000 1.000 0.63 1.19 RCVD_FAKE_HELO_DOTCOM - 0.296 0.4002 0.0755 0.841 0.62 2.10 FREEMAIL_FORGED_REPLYTO - 10.555 15.3597 0.4376 0.972 0.62 0.00 SPF_FAIL - 0.039 0.0000 0.1225 0.000 0.62 -7.50 USER_IN_DEF_SPF_WL - 0.039 0.0576 0.0000 1.000 0.62 2.66 FUZZY_PHENT - 0.040 0.0585 0.0006 0.990 0.62 1.41 MORE_SEX - 2.140 3.0273 0.2717 0.918 0.62 1.40 HTML_IMAGE_ONLY_28 - 0.048 0.0692 0.0042 0.943 0.62 0.00 FS_START_DOYOU2 - 0.039 0.0570 0.0000 1.000 0.62 0.00 FB_INDEPEND_RWD - 0.059 0.0819 0.0101 0.890 0.62 0.55 PRICES_ARE_AFFORDABLE - 1.325 1.8565 0.2069 0.900 0.62 1.25 RCVD_IN_NJABL_SPAM - 0.051 0.0726 0.0065 0.917 0.62 2.80 FUZZY_XPILL - 0.260 0.3505 0.0684 0.837 0.62 0.00 FAKE_REPLY_C - 0.038 0.0553 0.0000 1.000 0.62 0.00 MIME_PHP_NO_TEXT - 0.039 0.0568 0.0012 0.979 0.62 1.33 L_SPAM_TOOL_13 - 0.120 0.1618 0.0333 0.829 0.62 2.04 HTML_TITLE_SUBJ_DIFF - 0.036 0.0534 0.0000 1.000 0.62 2.48 TVD_QUAL_MEDS - 0.036 0.0525 0.0000 1.000 0.62 1.56 SUBJECT_DRUG_GAP_L - 0.037 0.0539 0.0012 0.978 0.61 2.70 GUARANTEED_100_PERCENT - 0.034 0.0508 0.0000 1.000 0.61 1.50 UNCLOSED_BRACKET - 0.038 0.0553 0.0018 0.969 0.61 0.00 FH_FROM_GET_NAME - 0.052 0.0726 0.0089 0.891 0.61 1.30 FREE_QUOTE_INSTANT - 0.034 0.0505 0.0000 1.000 0.61 0.00 FH_DATE_PAST_20XX - 0.049 0.0683 0.0077 0.898 0.61 0.00 BASE64_LENGTH_79_INF - 2.332 3.2907 0.3122 0.913 0.61 0.00 HTML_IMAGE_ONLY_32 - 0.035 0.0508 0.0012 0.977 0.61 0.00 FRT_BIGGERMEM1 - 0.064 0.0873 0.0155 0.849 0.61 0.00 STOCK_IMG_CTYPE - 0.040 0.0568 0.0048 0.923 0.61 2.43 UNCLAIMED_MONEY - 0.033 0.0486 0.0000 1.000 0.61 0.00 FB_INCREASE_YOUR - 0.032 0.0474 0.0000 1.000 0.60 1.87 XMAILER_MIMEOLE_OL_91287 - 0.117 0.1548 0.0381 0.803 0.60 0.00 HTTPS_HTTP_MISMATCH - 0.049 0.0666 0.0113 0.855 0.60 0.00 MSGID_SHORT - 0.041 0.0570 0.0077 0.881 0.60 0.49 INVALID_DATE_TZ_ABSURD - 0.040 0.0559 0.0071 0.887 0.60 2.70 DNS_FROM_AHBL_RHSBL - 0.029 0.0426 0.0000 1.000 0.60 2.28 XMAILER_MIMEOLE_OL_7533E - 0.033 0.0472 0.0018 0.964 0.60 0.00 FS_LARGE_PERCENT2 - 0.435 0.5800 0.1284 0.819 0.60 0.00 FROM_LOCAL_DIGITS - 0.033 0.0480 0.0024 0.953 0.60 2.70 FRT_ROLEX - 2.554 0.1799 7.5545 0.023 0.60 -1.00 RCVD_IN_DNSWL_LOW - 2.409 3.3842 0.3544 0.905 0.60 1.55 FREEMAIL_ENVFROM_END_DIGIT - 0.042 0.0570 0.0089 0.865 0.60 0.00 BUG6152_INVALID_DATE_TZ_ABSURD - 0.866 1.1801 0.2051 0.852 0.59 0.90 DKIM_ADSP_NXDOMAIN - 0.029 0.0421 0.0006 0.986 0.59 0.00 FB_EXTRA_INCHES - 0.445 0.5925 0.1332 0.816 0.59 0.01 FROM_LOCAL_HEX - 0.027 0.0398 0.0000 1.000 0.59 1.32 DRUGS_STOCK_MIMEOLE - 0.030 0.0435 0.0024 0.948 0.59 1.01 FUZZY_VPILL - 0.027 0.0395 0.0000 1.000 0.59 2.70 FROM_OFFERS - 1.161 1.6026 0.2307 0.874 0.59 1.16 RCVD_NUMERIC_HELO - 0.026 0.0387 0.0000 1.000 0.59 0.00 FSL_GEO_ABUSE - 0.100 0.1302 0.0375 0.777 0.59 0.00 MARKETING_PARTNERS - 0.045 0.0607 0.0131 0.823 0.59 2.70 FIN_FREE - 0.025 0.0376 0.0000 1.000 0.59 1.41 MSGID_YAHOO_CAPS - 0.038 0.0522 0.0089 0.854 0.59 1.48 DRUGS_ANXIETY - 0.025 0.0367 0.0000 1.000 0.59 1.58 XMAILER_MIMEOLE_OL_CAC8F - 16.561 24.0963 0.6939 0.972 0.59 0.77 RCVD_IN_SORBS_WEB - 0.024 0.0350 0.0000 1.000 0.59 1.55 FORGED_MSGID_YAHOO - 18.052 26.2708 0.7474 0.972 0.59 0.98 RDNS_DYNAMIC - 0.023 0.0339 0.0000 1.000 0.58 0.00 XMAILER_MIMEOLE_OL_09BB4 - 0.023 0.0336 0.0000 1.000 0.58 0.67 XMAILER_MIMEOLE_OL_20C99 - 0.057 0.0748 0.0196 0.792 0.58 0.00 FH_FROM_CASH - 0.022 0.0330 0.0000 1.000 0.58 0.34 DRUGS_MANYKINDS - 0.025 0.0356 0.0018 0.952 0.58 2.60 MSGID_RANDY - 0.047 0.0610 0.0161 0.792 0.58 0.00 TVD_APPROVED - 0.547 0.7258 0.1707 0.810 0.58 1.63 FORGED_YAHOO_RCVD - 0.037 0.0500 0.0107 0.824 0.58 0.00 FRT_OFFER2 - 0.021 0.0311 0.0000 1.000 0.58 0.00 SUBJECT_FUZZY_CHEAP - 0.022 0.0316 0.0006 0.982 0.58 0.73 FS_WILL_HELP - 0.021 0.0308 0.0000 1.000 0.58 1.21 XMAILER_MIMEOLE_OL_83BF7 - 0.022 0.0319 0.0012 0.964 0.58 0.00 FB_LOSE_WEIGHT_CAP - 0.028 0.0384 0.0048 0.890 0.58 0.00 NULL_IN_BODY - 0.552 0.7308 0.1754 0.806 0.58 0.00 HTML_FONT_LOW_CONTRAST - 0.020 0.0302 0.0000 1.000 0.58 2.31 XMAILER_MIMEOLE_OL_3D61D - 0.578 0.7656 0.1843 0.806 0.58 0.73 SPF_HELO_SOFTFAIL - 0.142 0.1821 0.0583 0.758 0.58 0.00 FRT_SOMA2 - 0.020 0.0299 0.0000 1.000 0.58 1.59 XMAILER_MIMEOLE_OL_4B815 - 0.483 0.6368 0.1605 0.799 0.58 0.00 SPF_HELO_FAIL - 0.020 0.0297 0.0000 1.000 0.57 1.46 HELO_DYNAMIC_HOME_NL - 0.020 0.0297 0.0000 1.000 0.57 0.00 TVD_SUBJ_WIPE_DEBT - 1.590 2.1784 0.3502 0.861 0.57 1.67 DNS_FROM_RFC_BOGUSMX - 0.020 0.0294 0.0000 1.000 0.57 0.00 FH_FROM_GIVEAWAY - 0.020 0.0291 0.0000 1.000 0.57 2.43 HELO_DYNAMIC_CHELLO_NL - 0.572 0.7560 0.1849 0.803 0.57 0.00 SUBJECT_NEEDS_ENCODING - 0.022 0.0308 0.0024 0.928 0.57 0.80 FROM_NO_USER - 0.023 0.0322 0.0048 0.871 0.57 0.27 FM_SUBJ_APPROVE - 0.029 0.0384 0.0077 0.832 0.57 1.64 BILLION_DOLLARS - 0.018 0.0271 0.0000 1.000 0.57 0.00 THEBAT_UNREG - 0.018 0.0271 0.0000 1.000 0.57 1.79 HELO_DYNAMIC_HEXIP - 0.020 0.0285 0.0012 0.960 0.57 2.60 FORGED_MUA_OIMO - 0.018 0.0265 0.0000 1.000 0.57 2.50 FUZZY_MILLION - 0.021 0.0014 0.0630 0.022 0.57 -0.00 NO_RELAYS - 0.018 0.0263 0.0000 1.000 0.57 0.00 XMAILER_MIMEOLE_OL_B30D1 - 0.017 0.0000 0.0541 0.000 0.57 -0.50 ENV_AND_HDR_SPF_MATCH - 0.024 0.0322 0.0059 0.844 0.56 2.50 RCVD_IN_NJABL_RELAY - 0.018 0.0263 0.0006 0.978 0.56 0.00 TVD_INCREASE_SIZE - 0.137 0.1740 0.0606 0.741 0.56 2.50 FRT_APPROV - 0.017 0.0251 0.0000 1.000 0.56 1.87 FS_APPROVE_YOU - 0.017 0.0246 0.0000 1.000 0.56 0.00 FS_AT_NO_COST - 0.016 0.0243 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_812FF - 0.016 0.0243 0.0000 1.000 0.56 0.00 FB_ULTRA_ALLURE - 0.016 0.0243 0.0000 1.000 0.56 0.00 LOTTERY_1 - 0.031 0.0404 0.0119 0.773 0.56 0.16 DRUGS_MUSCLE - 0.016 0.0240 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_F6D01 - 0.407 0.5247 0.1605 0.766 0.56 1.93 FREEMAIL_REPLY - 0.016 0.0234 0.0000 1.000 0.56 2.14 FAKE_HELO_MAIL_COM_DOM - 0.016 0.0234 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_C65FA - 0.026 0.0342 0.0095 0.782 0.56 1.57 HTTP_EXCESSIVE_ESCAPES - 0.016 0.0232 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_9B90B - 0.016 0.0229 0.0000 1.000 0.56 0.61 DRUG_ED_ONLINE - 0.016 0.0234 0.0006 0.975 0.56 0.00 FB_SPACED_FREE - 0.060 0.0751 0.0291 0.721 0.56 0.81 DC_IMAGE_SPAM_HTML - 0.015 0.0226 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_CF0C0 - 5.465 7.6712 0.8194 0.903 0.56 0.69 TVD_RCVD_IP - 0.426 0.0830 1.1470 0.067 0.56 -0.50 BAYES_05 - 0.015 0.0220 0.0000 1.000 0.56 0.00 XMAILER_MIMEOLE_OL_F3B05 - 0.015 0.0217 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_B4B40 - 0.015 0.0217 0.0000 1.000 0.55 0.00 TT_MSGID_TRUNC - 0.088 0.1076 0.0476 0.693 0.55 0.24 DC_IMAGE_SPAM_TEXT - 0.015 0.0215 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_015D5 - 0.739 0.9686 0.2551 0.792 0.55 1.54 DATE_IN_PAST_06_12 - 0.014 0.0212 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_ADFF7 - 0.014 0.0212 0.0000 1.000 0.55 1.84 FORGED_TELESP_RCVD - 0.014 0.0212 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_5B79A - 0.100 0.1223 0.0541 0.693 0.55 2.50 SORTED_RECIPS - 0.014 0.0209 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_4BF4C - 0.014 0.0209 0.0000 1.000 0.55 0.58 HEADER_SPAM - 0.014 0.0206 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_4EEDB - 0.014 0.0203 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_BC7E6 - 0.014 0.0200 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_6554A - 0.014 0.0200 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_58CB5 - 0.018 0.0243 0.0042 0.854 0.55 0.50 FROM_DOMAIN_NOVOWEL - 2.057 2.7635 0.5690 0.829 0.55 0.00 DIET_1 - 0.013 0.0195 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_3857F - 0.013 0.0192 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_FF5C8 - 0.013 0.0192 0.0000 1.000 0.55 0.00 RCVD_IN_SORBS_HTTP - 0.013 0.0192 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_25340 - 1.715 2.3026 0.4763 0.829 0.55 0.90 NML_ADSP_CUSTOM_MED - 0.013 0.0195 0.0006 0.970 0.55 2.00 HTML_OBFUSCATE_20_30 - 0.013 0.0186 0.0000 1.000 0.55 1.93 RCVD_IN_SORBS_SOCKS - 0.013 0.0186 0.0000 1.000 0.55 0.00 XMAILER_MIMEOLE_OL_F475E - 0.012 0.0184 0.0000 1.000 0.54 1.62 RATWARE_EGROUPS - 0.012 0.0184 0.0000 1.000 0.54 2.31 FORGED_MUA_MOZILLA - 0.012 0.0184 0.0000 1.000 0.54 0.00 XMAILER_MIMEOLE_OL_07794 - 0.013 0.0189 0.0006 0.970 0.54 1.48 FH_MSGID_XXX - 0.026 0.0062 0.0678 0.084 0.54 -0.10 RCVD_IN_IADB_DK - 0.233 0.2892 0.1136 0.718 0.54 0.87 FORGED_HOTMAIL_RCVD2 - 0.012 0.0181 0.0000 1.000 0.54 0.00 FM_SCHOOL_DIPLOMA - 0.012 0.0181 0.0000 1.000 0.54 2.40 NO_PRESCRIPTION - 0.024 0.0051 0.0624 0.075 0.54 -0.00 RCVD_IN_IADB_DOPTIN_LT50 - 26.975 39.1471 1.3462 0.967 0.54 0.79 RDNS_NONE - 0.012 0.0178 0.0000 1.000 0.54 1.94 FORGED_MUA_IMS - 12.000 17.1249 1.2094 0.934 0.54 1.39 PYZOR_CHECK - 0.271 0.3352 0.1362 0.711 0.54 1.05 DATE_IN_PAST_12_24 - 0.019 0.0249 0.0071 0.777 0.54 0.00 TVD_PH_SEC - 0.012 0.0175 0.0000 1.000 0.54 0.00 TVD_PH_SUBJ_SEC_MEASURES - 0.012 0.0172 0.0000 1.000 0.54 0.00 XMAILER_MIMEOLE_OL_4F240 - 0.013 0.0189 0.0018 0.914 0.54 0.00 FH_DATE_IS_19XX - 0.011 0.0169 0.0000 1.000 0.54 0.00 TBIRD_SUSP_MIME_BDRY - 0.031 0.0378 0.0172 0.687 0.54 0.00 FUZZY_CPILL - 0.011 0.0167 0.0000 1.000 0.54 1.10 FS_NUDE - 0.011 0.0167 0.0000 1.000 0.54 0.00 FB_NO_SCRIP_NEEDED - 0.011 0.0000 0.0351 0.000 0.54 -2.20 RCVD_IN_IADB_VOUCHED - 0.015 0.0206 0.0042 0.832 0.54 1.32 EXCUSE_4 - 0.017 0.0226 0.0059 0.792 0.54 2.18 DATE_IN_FUTURE_48_96 - 0.084 0.0997 0.0499 0.666 0.54 2.21 ACT_NOW_CAPS - 0.011 0.0158 0.0000 1.000 0.54 0.53 FORGED_MSGID_EXCITE - 1.648 2.1758 0.5363 0.802 0.54 0.00 STOX_REPLY_TYPE - 0.015 0.0198 0.0042 0.826 0.54 2.32 EMPTY_MESSAGE - 0.882 1.1400 0.3401 0.770 0.54 1.15 FREEMAIL_REPLYTO_END_DIGIT - 0.010 0.0150 0.0000 1.000 0.53 0.00 BANKING_LAWS - 0.010 0.0150 0.0000 1.000 0.53 0.62 EM_ROLEX - 0.027 0.0319 0.0161 0.665 0.53 0.71 ONE_TIME - 0.010 0.0144 0.0000 1.000 0.53 0.00 FS_OBFU_PRMCY - 0.009 0.0138 0.0000 1.000 0.53 0.00 FS_EJACULA - 0.011 0.0155 0.0018 0.897 0.53 2.31 FUZZY_PRICES - 0.009 0.0000 0.0279 0.000 0.53 -6.00 RCVD_IN_IADB_ML_DOPTIN - 0.025 0.0291 0.0149 0.662 0.53 1.01 RCVD_DOUBLE_IP_LOOSE - 0.010 0.0141 0.0012 0.922 0.53 2.40 URI_NO_WWW_BIZ_CGI - 0.010 0.0144 0.0018 0.890 0.53 1.86 FUZZY_ERECT - 0.709 0.8960 0.3145 0.740 0.53 1.59 DATE_IN_PAST_03_06 - 0.008 0.0119 0.0000 1.000 0.53 0.00 BANG_OPRAH - 0.008 0.0119 0.0000 1.000 0.53 0.00 FB_PENIS_GROWTH - 0.008 0.0119 0.0000 1.000 0.53 0.00 FM_FAKE_HELO_VERIZON - 0.008 0.0119 0.0000 1.000 0.53 0.00 XMAILER_MIMEOLE_OL_465CD - 0.008 0.0000 0.0244 0.000 0.52 0.00 RCVD_IN_IADB_EDDB - 0.008 0.0116 0.0000 1.000 0.52 0.00 DOS_HIGH_BAT_TO_MX - 0.008 0.0116 0.0000 1.000 0.52 0.00 HEAD_ILLEGAL_CHARS - 0.280 0.3383 0.1582 0.681 0.52 0.99 PLING_QUERY - 0.025 0.0291 0.0166 0.636 0.52 0.00 FH_HOST_EQ_PACBELL_D - 0.008 0.0113 0.0000 1.000 0.52 0.00 TVD_ENVFROM_APOST - 0.011 0.0141 0.0030 0.826 0.52 0.00 FRT_PENIS1 - 0.007 0.0110 0.0000 1.000 0.52 0.00 FS_ERECTION - 0.009 0.0121 0.0012 0.911 0.52 0.00 HEADER_COUNT_SUBJECT - 0.011 0.0144 0.0042 0.776 0.52 0.00 FR_ALMOST_VIAG2 - 0.007 0.0102 0.0000 1.000 0.52 0.00 TVD_RATWARE_MSGID_02 - 0.007 0.0104 0.0006 0.946 0.52 0.00 FSL_HELO_SETUP - 0.045 0.0503 0.0327 0.606 0.52 2.18 DC_GIF_UNO_LARGO - 0.007 0.0096 0.0000 1.000 0.52 0.00 FU_UKGEOCITIES - 0.006 0.0093 0.0000 1.000 0.52 0.00 FORGED_IMS_TAGS - 0.007 0.0099 0.0006 0.943 0.52 0.00 FB_LOWER_PAYM - 0.006 0.0000 0.0190 0.000 0.52 -3.70 RCVD_IN_SSC_TRUSTED_COI - 0.006 0.0000 0.0190 0.000 0.52 -8.00 HABEAS_ACCREDITED_COI - 0.007 0.0102 0.0012 0.895 0.52 0.00 RATWARE_HASH_DASH - 0.006 0.0085 0.0000 1.000 0.52 0.00 FS_NO_SCRIP - 0.006 0.0082 0.0000 1.000 0.51 0.00 FB_ADD_INCHES - 0.006 0.0082 0.0000 1.000 0.51 0.00 FS_LOW_RATES - 0.006 0.0082 0.0000 1.000 0.51 0.00 FAKE_OUTBLAZE_RCVD - 0.006 0.0088 0.0006 0.936 0.51 0.00 HTTPS_IP_MISMATCH - 0.012 0.0144 0.0065 0.688 0.51 0.00 FRT_TODAY2 - 0.005 0.0079 0.0000 1.000 0.51 0.00 MSGID_DOLLARS_RANDOM - 0.006 0.0085 0.0006 0.934 0.51 0.00 FB_NUMYO2 - 0.005 0.0076 0.0000 1.000 0.51 0.00 DOS_ANAL_SPAM_MAILER - 0.005 0.0076 0.0000 1.000 0.51 0.00 FH_HELO_ENDS_DOT - 0.005 0.0076 0.0000 1.000 0.51 0.00 X_MESSAGE_INFO - 0.005 0.0076 0.0000 1.000 0.51 0.00 REPTO_QUOTE_AOL - 0.005 0.0076 0.0000 1.000 0.51 0.00 FORGED_MSGID_HOTMAIL - 0.005 0.0073 0.0000 1.000 0.51 0.00 SUBJECT_SEXUAL - 0.008 0.0107 0.0036 0.750 0.51 0.00 RATWARE_RCVD_PF - 0.005 0.0071 0.0000 1.000 0.51 0.00 REPTO_QUOTE_QUALCOMM - 2.786 3.6155 1.0388 0.777 0.51 0.79 MPART_ALT_DIFF - 0.005 0.0076 0.0006 0.928 0.51 0.00 FB_ALMOST_SEX - 0.004 0.0065 0.0000 1.000 0.51 0.00 FORGED_QUALCOMM_TAGS - 0.007 0.0093 0.0030 0.758 0.51 0.00 FS_WITH_SMALL - 0.004 0.0062 0.0000 1.000 0.51 0.00 SUBJECT_DRUG_GAP_VA - 0.004 0.0062 0.0000 1.000 0.51 0.00 SUBJECT_DRUG_GAP_X - 0.005 0.0068 0.0006 0.919 0.51 0.00 FB_YOUR_REFI - 0.004 0.0059 0.0000 1.000 0.51 0.00 FB_FAKE_NUMS4 - 0.004 0.0059 0.0000 1.000 0.51 0.00 FORGED_IMS_HTML - 0.010 0.0116 0.0059 0.661 0.51 2.07 URI_NO_WWW_INFO_CGI - 1.408 1.7912 0.6011 0.749 0.51 0.00 HS_INDEX_PARAM - 0.004 0.0000 0.0119 0.000 0.51 -15.00 USER_IN_DEF_WHITELIST - 0.006 0.0073 0.0018 0.805 0.51 0.00 FB_HEY_BRO_COMMA - 0.004 0.0054 0.0000 1.000 0.51 0.00 TVD_SECTION - 0.004 0.0054 0.0000 1.000 0.51 0.00 RCVD_MAIL_COM - 0.012 0.0138 0.0089 0.608 0.51 1.03 JOIN_MILLIONS - 0.003 0.0051 0.0000 1.000 0.51 0.00 TVD_PP_PHISH - 0.003 0.0000 0.0107 0.000 0.51 0.00 RCVD_IN_IADB_EPIA - 0.003 0.0051 0.0000 1.000 0.51 0.00 REPTO_QUOTE_IMS - 0.015 0.0169 0.0119 0.588 0.51 0.00 FM_IS_IT_OUR_ACCOUNT - 0.013 0.0147 0.0101 0.592 0.50 2.04 LONGWORDS - 0.003 0.0048 0.0000 1.000 0.50 0.00 FB_GAPPY_ADDRESS - 0.003 0.0045 0.0000 1.000 0.50 0.00 DRUGS_HDIA - 0.003 0.0045 0.0000 1.000 0.50 0.00 TVD_FUZZY_PHARMACEUTICAL - 0.004 0.0056 0.0012 0.826 0.50 0.00 HTML_MISSING_CTYPE - 0.003 0.0042 0.0000 1.000 0.50 0.00 DRUGS_DIET_OBFU - 0.003 0.0042 0.0000 1.000 0.50 0.00 SUBJECT_FUZZY_PENIS - 0.003 0.0042 0.0000 1.000 0.50 0.00 REFINANCE_NOW - 0.024 0.0257 0.0214 0.546 0.50 1.95 GAPPY_SUBJECT - 0.003 0.0042 0.0000 1.000 0.50 0.00 HELO_DYNAMIC_ROGERS - 0.003 0.0042 0.0000 1.000 0.50 0.00 FM_FRM_RN_L_BRACK - 0.003 0.0048 0.0006 0.890 0.50 0.00 TVD_SUBJ_FINGER_03 - 0.512 0.1432 1.2873 0.100 0.50 -0.00 BAYES_20 - 0.006 0.0073 0.0036 0.673 0.50 0.00 DATE_SPAMWARE_Y2K - 0.002 0.0037 0.0000 1.000 0.50 0.00 DRUGS_SLEEP_EREC - 0.002 0.0037 0.0000 1.000 0.50 0.00 REPTO_QUOTE_MSN - 0.002 0.0037 0.0000 1.000 0.50 0.00 FRT_SEXUAL - 0.002 0.0000 0.0077 0.000 0.50 -4.00 RCVD_IN_IADB_DOPTIN - 0.002 0.0037 0.0000 1.000 0.50 0.00 FH_HELO_EQ_610HEX - 0.002 0.0037 0.0000 1.000 0.50 0.00 VIA_GAP_GRA - 0.004 0.0048 0.0012 0.801 0.50 0.00 HELO_LH_LD - 0.002 0.0034 0.0000 1.000 0.50 0.00 FH_FROM_HOODIA - 0.002 0.0034 0.0000 1.000 0.50 0.00 FS_HUGECOCK - 0.002 0.0034 0.0000 1.000 0.50 0.00 TVD_FUZZY_DEGREE - 0.002 0.0034 0.0000 1.000 0.50 0.00 FB_PIPE_ILLION - 0.003 0.0040 0.0006 0.869 0.50 0.00 FB_HG_H_CAP - 32.586 44.5642 7.3654 0.858 0.50 0.72 MIME_HTML_ONLY - 0.002 0.0031 0.0000 1.000 0.50 0.00 FUZZY_AFFORDABLE - 0.002 0.0031 0.0000 1.000 0.50 0.00 NOT_ADVISOR - 0.002 0.0031 0.0000 1.000 0.50 0.00 FS_RE_APPROV - 0.003 0.0042 0.0012 0.781 0.50 0.00 FRT_REFINANCE1 - 0.002 0.0028 0.0000 1.000 0.50 0.00 RCVD_IN_SORBS_ZOMBIE - 0.002 0.0028 0.0000 1.000 0.50 0.00 FORGED_MSGID_AOL - 0.002 0.0028 0.0000 1.000 0.50 0.00 FM_FAKE_HELO_HOTMAIL - 0.002 0.0028 0.0000 1.000 0.50 0.00 XMAILER_MIMEOLE_OL_B9B11 - 0.065 0.0698 0.0553 0.558 0.50 0.55 FUZZY_AMBIEN - 0.017 0.0181 0.0155 0.539 0.50 0.00 SB_GIF_AND_NO_URIS - 0.007 0.0073 0.0048 0.607 0.50 0.00 URI_UNSUBSCRIBE - 0.002 0.0025 0.0000 1.000 0.50 0.00 FUZZY_GUARANTEE - 0.002 0.0025 0.0000 1.000 0.50 0.00 FORGED_THEBAT_HTML - 0.002 0.0025 0.0000 1.000 0.50 0.00 FRT_GUARANTEE1 - 0.002 0.0025 0.0000 1.000 0.50 0.00 DRUGS_ANXIETY_OBFU - 0.002 0.0025 0.0000 1.000 0.50 0.00 MSGID_SPAM_LETTERS - 0.002 0.0031 0.0006 0.839 0.50 0.00 FS_PERSCRIPTION - 0.002 0.0031 0.0006 0.839 0.50 0.00 FB_LETTERS_21B - 0.003 0.0042 0.0018 0.704 0.50 0.00 SUBJECT_DRUG_GAP_S - 0.002 0.0023 0.0000 1.000 0.50 0.00 MULTIPART_ALT_NON_TEXT - 0.002 0.0023 0.0000 1.000 0.50 0.00 FRT_DISCOUNT - 0.002 0.0023 0.0000 1.000 0.50 0.00 STRONG_BUY - 0.002 0.0023 0.0000 1.000 0.50 0.00 FB_NOT_PHONE_NUM1 - 0.002 0.0023 0.0000 1.000 0.50 0.00 FORGED_MSGID_MSN - 0.002 0.0023 0.0000 1.000 0.50 0.00 NONEXISTENT_CHARSET - 0.002 0.0023 0.0000 1.000 0.50 0.00 FUZZY_MEDICATION - 0.002 0.0028 0.0006 0.826 0.50 0.00 HS_DRUG_DOLLAR_1 - 9.175 12.3846 2.4183 0.837 0.50 0.44 HTML_IMAGE_RATIO_02 - 0.001 0.0020 0.0000 1.000 0.50 0.00 FUZZY_THOUSANDS - 0.001 0.0020 0.0000 1.000 0.50 0.00 DRUG_ED_GENERIC - 0.001 0.0020 0.0000 1.000 0.50 0.00 TT_OBSCURED_VIAGRA - 0.001 0.0017 0.0000 1.000 0.50 0.00 LONG_TERM_PRICE - 0.001 0.0017 0.0000 1.000 0.50 0.00 RCVD_IN_SORBS_MISC - 0.019 0.0192 0.0178 0.518 0.49 0.00 WEIRD_QUOTING - 0.001 0.0014 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_8E893 - 0.001 0.0014 0.0000 1.000 0.49 0.00 DRUGS_ANXIETY_EREC - 0.001 0.0014 0.0000 1.000 0.49 0.00 FUZZY_MERIDIA - 0.001 0.0014 0.0000 1.000 0.49 0.00 FB_P1LL - 0.002 0.0025 0.0012 0.681 0.49 0.00 FRT_OPPORTUN2 - 0.013 0.0136 0.0125 0.521 0.49 0.00 TVD_SUBJ_ACC_NUM - 0.003 0.0037 0.0024 0.607 0.49 0.00 FRT_WEIGHT2 - 0.001 0.0011 0.0000 1.000 0.49 0.00 TVD_RATWARE_CB - 0.001 0.0011 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_A842E - 0.001 0.0011 0.0000 1.000 0.49 0.00 RATWARE_OE_MALFORMED - 0.001 0.0011 0.0000 1.000 0.49 0.00 FH_MSGID_000000 - 0.001 0.0011 0.0000 1.000 0.49 0.00 AXB_XMID_OEGOESNULL - 0.001 0.0011 0.0000 1.000 0.49 0.00 FUZZY_PRESCRIPT - 0.001 0.0011 0.0000 1.000 0.49 0.00 FB_HOMELOAN - 0.001 0.0011 0.0000 1.000 0.49 0.00 SUBJECT_FUZZY_MEDS - 0.001 0.0011 0.0000 1.000 0.49 0.00 RCVD_IN_SORBS_SMTP - 0.001 0.0011 0.0000 1.000 0.49 0.00 FS_CHEAP_CAP - 0.002 0.0023 0.0012 0.655 0.49 0.00 FREE_PORN - 0.058 0.0599 0.0535 0.528 0.49 1.31 TRACKER_ID - 0.004 0.0014 0.0083 0.145 0.49 -0.00 NO_RECEIVED - 0.005 0.0056 0.0048 0.543 0.49 0.00 TVD_ACT_193 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_ESTABLISH2 - 0.001 0.0008 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_A50F8 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FB_IMPRESS_GIRL - 0.001 0.0008 0.0000 1.000 0.49 0.00 XMAILER_MIMEOLE_OL_32D97 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_VALIUM1 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FRT_VALIUM2 - 0.001 0.0008 0.0000 1.000 0.49 0.00 FB_SPACEY_ZIP - 0.001 0.0008 0.0000 1.000 0.49 0.00 FM_PHN_NODNS - 0.001 0.0014 0.0006 0.704 0.49 0.00 FUZZY_MORTGAGE - 0.614 0.7266 0.3764 0.659 0.49 0.00 HTML_FONT_SIZE_HUGE - 3.233 4.1328 1.3385 0.755 0.49 0.50 MISSING_MID - 0.000 0.0000 0.0012 0.000 0.49 0.00 RCVD_IN_IADB_UT_CPEAR - 0.000 0.0006 0.0000 1.000 0.49 0.00 FM_LIKE_STOCKS - 0.000 0.0006 0.0000 1.000 0.49 0.00 HTTP_77 - 0.000 0.0006 0.0000 1.000 0.49 0.00 FB_DOUBLE_0WORDS - 0.000 0.0006 0.0000 1.000 0.49 0.00 FM_DOESNT_SAY_STOCK - 0.000 0.0000 0.0012 0.000 0.49 0.00 RCVD_IN_IADB_MI_CPEAR - 0.000 0.0006 0.0000 1.000 0.49 0.00 INVALID_TZ_CST - 0.000 0.0006 0.0000 1.000 0.49 0.00 FU_HOODIA - 0.000 0.0006 0.0000 1.000 0.49 0.00 FUZZY_MONEY - 0.000 0.0006 0.0000 1.000 0.49 0.00 FR_MIDER - 0.000 0.0006 0.0000 1.000 0.49 0.00 FU_MIDER - 0.000 0.0003 0.0000 1.000 0.49 0.00 JAPANESE_UCE_BODY - 0.000 0.0003 0.0000 1.000 0.49 0.00 FUZZY_BILLION - 0.000 0.0003 0.0000 1.000 0.49 0.00 HS_DRUG_DOLLAR_MANY - 0.000 0.0003 0.0000 1.000 0.49 0.00 JAPANESE_UCE_SUBJECT - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_ROLX - 0.000 0.0003 0.0000 1.000 0.49 0.00 MID_DEGREES - 0.000 0.0003 0.0000 1.000 0.49 0.00 CONFIRMED_FORGED - 0.000 0.0003 0.0000 1.000 0.49 0.00 TVD_DEAR_HOMEOWNER - 0.000 0.0003 0.0000 1.000 0.49 0.00 SHORT_TERM_PRICE - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_FHARMACY - 0.000 0.0000 0.0006 0.000 0.49 0.00 RCVD_IN_IADB_LOOSE - 0.000 0.0000 0.0006 0.000 0.49 -2.00 HASHCASH_23 - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_C0MPANY - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_ONIINE - 0.000 0.0003 0.0000 1.000 0.49 0.00 HS_DRUG_DOLLAR_2 - 0.000 0.0003 0.0000 1.000 0.49 0.00 FUZZY_REMOVE - 0.000 0.0003 0.0000 1.000 0.49 0.00 PREST_NON_ACCREDITED - 0.000 0.0003 0.0000 1.000 0.49 0.00 TVD_FLOAT_GENERAL - 0.000 0.0003 0.0000 1.000 0.49 -0.00 HELO_STATIC_HOST - 0.000 0.0003 0.0000 1.000 0.49 0.00 FB_BILLI0N - 0.001 0.0008 0.0006 0.588 0.49 0.00 FORWARD_LOOKING - 0.001 0.0008 0.0006 0.588 0.49 0.00 TVD_EB_PHISH - 0.001 0.0008 0.0006 0.588 0.49 0.00 HEADER_COUNT_CTYPE - 0.001 0.0014 0.0012 0.543 0.49 0.00 HTML_TAG_EXIST_BGSOUND - 0.002 0.0011 0.0054 0.174 0.49 0.00 RCVD_IN_IADB_DOPTIN_GT50 - 74.699 84.0309 55.0509 0.604 0.49 0.00 HTML_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 100.00 SUBJECT_IN_BLACKLIST - 0.000 0.0000 0.0000 0.500 0.49 0.00 CORRUPT_FROM_LINE_IN_HDRS - 0.000 0.0000 0.0000 0.500 0.49 -5.00 HASHCASH_HIGH - 0.000 0.0000 0.0000 0.500 0.49 2.45 MIME_CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FRT_ERECTION - 0.000 0.0000 0.0000 0.500 0.49 0.00 FUZZY_OBLIGATION - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_50_60 - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_70_80 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_OPTIN_LT50 - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 1.00 S25R_4 - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_BADTAG_40_50 - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_DEPT - 0.000 0.0000 0.0000 0.500 0.49 0.00 PREVENT_NONDELIVERY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FSL_UA - 0.000 0.0000 0.0000 0.500 0.49 -3.00 HASHCASH_24 - 0.000 0.0000 0.0000 0.500 0.49 100.00 USER_IN_BLACKLIST - 0.000 0.0000 0.0000 0.500 0.49 0.50 HTML_CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 0.00 HIGH_CODEPAGE_URI - 0.000 0.0000 0.0000 0.500 0.49 1.00 FRT_PHARMAC - 0.000 0.0000 0.0000 0.500 0.49 -20.00 USER_IN_MORE_SPAM_TO - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_URI - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_RSS - 0.000 0.0000 0.0000 0.500 0.49 0.10 MIME_SUSPECT_NAME - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_NAME_FREE - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_SORBS_BLOCK - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_PERCENT - 0.000 0.0000 0.0000 0.500 0.49 0.00 SHORTCIRCUIT - 0.000 0.0000 0.0000 0.500 0.49 0.00 HTML_OBFUSCATE_90_100 - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_POLICY_SIGNSOME - 0.000 0.0000 0.0000 0.500 0.49 0.00 FUZZY_OFFERS - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_RBL - 0.000 0.0000 0.0000 0.500 0.49 1.00 SPAMMY_MIME_BDRY_01 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_GECKO_BUILD - 0.000 0.0000 0.0000 0.500 0.49 0.10 VBOUNCE_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N8 - 0.000 0.0000 0.0000 0.500 0.49 0.00 EMAIL_ROT13 - 0.000 0.0000 0.0000 0.500 0.49 1.00 SANE_b58d7945d89b7afc9e2753c83b00ab44 - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_POLICY_SIGNALL - 0.000 0.0000 0.0000 0.500 0.49 -1.00 HASHCASH_22 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_AM_PM - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N3 - 0.000 0.0000 0.0000 0.500 0.49 3.20 CHARSET_FARAWAY_HEADER - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_UT_CPR_30 - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_SPF_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_POLICY_TESTING - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_NJABL_CGI - 0.000 0.0000 0.0000 0.500 0.49 1.00 TO_NO_BRKTS_DYNIP - 0.000 0.0000 0.0000 0.500 0.49 1.00 DEAR_BENEFICIARY - 0.000 0.0000 0.0000 0.500 0.49 0.00 FORGED_MUA_THEBAT_CS - 0.000 0.0000 0.0000 0.500 0.49 0.00 ACCESSDB - 0.000 0.0000 0.0000 0.500 0.49 1.00 KHOP_NO_FQDN - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_NML - 0.000 0.0000 0.0000 0.500 0.49 1.00 FSL_LSPACES_ABUSE - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_NOCONTROL - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_UNVERIFIED_1 - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_S25 - 0.000 0.0000 0.0000 0.500 0.49 0.00 YAHOO_RD_REDIR - 0.000 0.0000 0.0000 0.500 0.49 0.00 MULTI_FORGED - 0.000 0.0000 0.0000 0.500 0.49 1.00 DEAR_EMAIL - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_MSFT - 0.000 0.0000 0.0000 0.500 0.49 10.00 USER_IN_BLACKLIST_TO - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_RCVD_AT - 0.000 0.0000 0.0000 0.500 0.49 1.00 MANY_SPAN_IN_TEXT - 0.000 0.0000 0.0000 0.500 0.49 -6.00 USER_IN_WHITELIST_TO - 0.000 0.0000 0.0000 0.500 0.49 0.00 NO_HEADERS_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 1.00 LOTTO_AGENT - 0.000 0.0000 0.0000 0.500 0.49 0.70 NML_ADSP_CUSTOM_LOW - 0.000 0.0000 0.0000 0.500 0.49 0.00 RATWARE_MOZ_MALFORMED - 0.000 0.0000 0.0000 0.500 0.49 0.10 MICROSOFT_EXECUTABLE - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_VERIFIED - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N2 - 0.000 0.0000 0.0000 0.500 0.49 0.00 WITH_LC_SMTP - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_DYNIP - 0.000 0.0000 0.0000 0.500 0.49 3.20 CHARSET_FARAWAY - 0.000 0.0000 0.0000 0.500 0.49 1.00 FB_TIRED_OF_YOUR - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N15 - 0.000 0.0000 0.0000 0.500 0.49 0.00 BLANK_LINES_80_90 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_MI_CPR_30 - 0.000 0.0000 0.0000 0.500 0.49 0.00 FRAGMENTED_MESSAGE - 0.000 0.0000 0.0000 0.500 0.49 0.00 DKIM_ADSP_CUSTOM_LOW - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_PNIS - 0.000 0.0000 0.0000 0.500 0.49 1.00 FB_WITHOUT_PRESC - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_DUL - 0.000 0.0000 0.0000 0.500 0.49 -4.00 HASHCASH_25 - 0.000 0.0000 0.0000 0.500 0.49 0.00 JS_FROMCHARCODE - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_FORM - 0.000 0.0000 0.0000 0.500 0.49 1.00 MONEY_FROM_MISSP - 0.000 0.0000 0.0000 0.500 0.49 0.00 YAHOO_DRS_REDIR - 0.000 0.0000 0.0000 0.500 0.49 1.00 RCVD_IN_CSS - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_OPTOUTONLY - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_NJABL_MULTI - 0.000 0.0000 0.0000 0.500 0.49 -0.50 HASHCASH_20 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RUDE_HTML - 0.000 0.0000 0.0000 0.500 0.49 1.00 HELO_NO_DOMAIN - 0.000 0.0000 0.0000 0.500 0.49 0.00 AWL - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_UNVERIFIED_2 - 0.000 0.0000 0.0000 0.500 0.49 0.00 X_PRIORITY_CC - 0.000 0.0000 0.0000 0.500 0.49 1.00 HK_SCAM_N1 - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_MAPS_OPS - 0.000 0.0000 0.0000 0.500 0.49 1000.00 GTUBE - 0.000 0.0000 0.0000 0.500 0.49 1.00 FS_MORE_CONFIDENT - 0.000 0.0000 0.0000 0.500 0.49 2.80 UNWANTED_LANGUAGE_BODY - 0.000 0.0000 0.0000 0.500 0.49 0.00 RCVD_IN_IADB_OOO - 0.000 0.0000 0.0000 0.500 0.49 -0.70 HASHCASH_21 - 0.000 0.0000 0.0000 0.500 0.49 1.00 FROM_MISSP_FREEMAIL - 0.000 0.0000 0.0000 0.500 0.49 1.50 BODY_8BITS - 0.000 0.0000 0.0000 0.500 0.49 0.00 URI_TRUNCATED - 0.000 0.0000 0.0000 0.500 0.49 0.10 HASHCASH_2SPEND - 0.000 0.0000 0.0000 0.500 0.49 1.00 FORGED_RELAY_MUA_TO_MX - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_ALL_SPAM_TO - 0.000 0.0000 0.0000 0.500 0.49 1.00 MANY_TINY_FLOAT - 0.000 0.0000 0.0000 0.500 0.49 -100.00 USER_IN_DKIM_WHITELIST - 0.000 0.0000 0.0000 0.500 0.49 1.00 S25R_6 - 0.000 0.0000 0.0000 0.500 0.49 0.00 KOREAN_UCE_SUBJECT - 0.000 0.0000 0.0000 0.500 0.49 0.00 MISSING_HB_SEP - 0.000 0.0000 0.0000 0.500 0.49 -100.00 SUBJECT_IN_WHITELIST - 0.001 0.0006 0.0006 0.487 0.49 0.00 FB_ANA_TRIM - 0.001 0.0011 0.0012 0.487 0.49 0.00 FRT_XANAX2 - 0.001 0.0011 0.0012 0.487 0.49 0.00 FS_TEEN_BAD - 0.000 0.0003 0.0006 0.322 0.49 0.00 FB_FAKE_NUMBERS - 0.000 0.0003 0.0006 0.322 0.49 0.00 HTML_OBFUSCATE_30_40 - 0.000 0.0003 0.0006 0.322 0.49 2.50 NML_ADSP_CUSTOM_HIGH - 0.000 0.0003 0.0006 0.322 0.49 0.00 TVD_FUZZY_FINANCE - 0.000 0.0003 0.0006 0.322 0.49 0.00 DKIM_ADSP_CUSTOM_HIGH - 0.001 0.0008 0.0012 0.416 0.49 0.00 FB_SPACED_PHN_3B - 0.001 0.0008 0.0012 0.416 0.49 0.00 CTYPE_8SPACE_GIF - 0.000 0.0000 0.0006 0.000 0.49 0.00 FB_ROLLER_IS_T - 0.000 0.0000 0.0006 0.000 0.49 0.00 FB_SSEX - 0.000 0.0000 0.0006 0.000 0.49 0.00 FUZZY_SOFTWARE - 0.000 0.0000 0.0006 0.000 0.49 0.00 HTML_BADTAG_90_100 - 0.000 0.0000 0.0006 0.000 0.49 0.00 STOCK_ALERT - 0.001 0.0006 0.0012 0.322 0.49 0.00 CURR_PRICE - 0.001 0.0006 0.0012 0.322 0.49 0.00 DRUG_DOSAGE - 0.001 0.0006 0.0012 0.322 0.49 0.00 REFINANCE_YOUR_HOME - 0.001 0.0006 0.0012 0.322 0.49 0.00 FUZZY_VIOXX - 0.003 0.0028 0.0036 0.442 0.49 0.00 INVALID_TZ_EST - 0.011 0.0107 0.0119 0.474 0.49 0.09 HTML_OBFUSCATE_10_20 - 0.001 0.0003 0.0012 0.192 0.49 0.00 CUM_SHOT - 0.001 0.0003 0.0012 0.192 0.49 0.00 SUBJECT_FUZZY_VPILL - 0.001 0.0008 0.0018 0.322 0.49 0.00 FRT_PRICE - 0.001 0.0008 0.0018 0.322 0.49 0.00 SPOOF_NET2COM - 0.001 0.0008 0.0018 0.322 0.49 0.00 HTML_NONELEMENT_60_70 - 0.000 0.0000 0.0012 0.000 0.49 0.10 CHALLENGE_RESPONSE - 0.001 0.0003 0.0018 0.137 0.49 0.00 HTML_NONELEMENT_80_90 - 0.001 0.0003 0.0018 0.137 0.49 0.00 FS_DOLLAR_BONUS - 6.742 8.5946 2.8422 0.751 0.49 0.80 BAYES_50 - 0.011 0.0104 0.0125 0.456 0.49 1.77 NO_MEDICAL - 0.001 0.0000 0.0018 0.000 0.49 0.00 FS_NEW_XXX - 0.002 0.0011 0.0030 0.275 0.48 0.00 TVD_STOCK1 - 0.001 0.0003 0.0024 0.106 0.48 0.00 HDR_ORDER_FTSDMCXX_001C - 0.002 0.0008 0.0030 0.222 0.48 0.00 FB_MORE_SIZE - 0.002 0.0014 0.0036 0.284 0.48 0.00 TVD_FUZZY_MICROCAP - 0.010 0.0093 0.0119 0.439 0.48 2.20 INVESTMENT_ADVICE - 0.001 0.0000 0.0024 0.000 0.48 0.00 HTML_BADTAG_50_60 - 0.001 0.0011 0.0000 1.000 0.48 0.00 RCVD_IN_IADB_GOODMAIL - 0.001 0.0000 0.0024 0.000 0.48 0.00 FM_LUX_GIFTS_REDUCED - 0.001 0.0006 0.0030 0.160 0.48 0.00 LIVE_PORN - 0.002 0.0011 0.0036 0.240 0.48 0.00 MIME_BAD_ISO_CHARSET - 0.002 0.0008 0.0036 0.192 0.48 0.00 FRT_XANAX1 - 0.005 0.0037 0.0065 0.359 0.48 0.00 FRT_LEVITRA - 0.002 0.0011 0.0042 0.213 0.48 0.00 FUZZY_VLIUM - 0.093 0.0974 0.0827 0.541 0.48 2.05 SPOOF_COM2COM - 0.001 0.0003 0.0036 0.073 0.48 0.00 HTML_COMMENT_SHORT - 0.001 0.0003 0.0036 0.073 0.48 0.00 FR_3TAG_3TAG - 0.002 0.0008 0.0042 0.169 0.48 0.00 FRT_DOLLAR - 0.002 0.0014 0.0048 0.229 0.48 0.00 FB_REPLIC_CAP - 0.086 0.0901 0.0785 0.534 0.48 0.10 BOUNCE_MESSAGE - 0.001 0.0000 0.0036 0.000 0.48 0.00 DOS_URI_ASTERISK - 0.001 0.0000 0.0036 0.000 0.48 0.00 HTML_BADTAG_60_70 - 0.002 0.0006 0.0042 0.119 0.48 0.00 FU_LONG_QUERY3 - 0.002 0.0003 0.0042 0.064 0.48 0.00 HTML_FORMACTION_MAILTO - 3.762 4.6313 1.9331 0.706 0.48 0.56 HTML_IMAGE_RATIO_04 - 0.008 0.0062 0.0113 0.355 0.48 0.00 FRT_FUCK2 - 0.004 0.0025 0.0077 0.247 0.48 0.00 FM_MULTI_LUX_GIFTS - 0.004 0.0025 0.0077 0.247 0.48 0.00 FRT_INVESTOR - 0.045 0.0432 0.0494 0.467 0.48 0.00 PART_CID_STOCK_LESS - 0.002 0.0000 0.0054 0.000 0.47 0.00 MIME_BOUND_EQ_REL - 1.051 1.2250 0.6856 0.641 0.47 0.38 HTML_MIME_NO_HTML_TAG - 0.002 0.0003 0.0065 0.041 0.47 0.00 FB_NUMYO - 0.002 0.0003 0.0065 0.041 0.47 0.00 FRT_MEETING - 0.032 0.0291 0.0375 0.437 0.47 0.72 FROM_BLANK_NAME - 0.002 0.0000 0.0071 0.000 0.47 0.00 TVD_SILLY_URI_OBFU - 0.011 0.0090 0.0166 0.352 0.47 0.00 STOCK_IMG_OUTLOOK - 10.372 4.3102 23.1367 0.157 0.47 -0.10 DKIM_VALID - 0.009 0.0059 0.0143 0.294 0.47 0.00 RCVD_BAD_ID - 0.047 0.0443 0.0541 0.450 0.47 0.00 MISSING_MIME_HB_SEP - 0.011 0.0076 0.0166 0.314 0.46 1.24 NUMERIC_HTTP_ADDR - 8.755 4.2797 18.1771 0.191 0.46 -0.10 DKIM_VALID_AU - 0.388 0.4202 0.3205 0.567 0.46 0.82 HTML_TAG_BALANCE_HEAD - 0.094 0.0929 0.0963 0.491 0.46 1.39 HTML_COMMENT_SAVED_URL - 8.113 3.6183 17.5765 0.171 0.46 -0.00 SPF_PASS - 0.003 0.0000 0.0095 0.000 0.46 0.00 TVD_FUZZY_SYMBOL - 0.005 0.0023 0.0119 0.160 0.46 0.00 OBSCURED_EMAIL - 4.761 4.9153 4.4358 0.526 0.46 1.10 DCC_CHECK - 0.027 0.0237 0.0351 0.403 0.46 2.10 TO_MALFORMED - 0.006 0.0028 0.0131 0.178 0.46 0.00 MIME_BOUND_MANY_HEX - 0.166 0.1694 0.1594 0.515 0.46 1.46 LOW_PRICE - 0.093 0.0904 0.0975 0.481 0.46 0.10 ANY_BOUNCE_MESSAGE - 5.014 4.9472 5.1552 0.490 0.46 0.00 MIME_QP_LONG_LINE - 8.846 7.5936 11.4842 0.398 0.46 0.00 FREEMAIL_FROM - 4.389 2.3283 8.7282 0.211 0.45 -0.00 SPF_HELO_PASS - 0.006 0.0020 0.0143 0.122 0.45 0.00 HTML_NONELEMENT_40_50 - 0.007 0.0028 0.0155 0.154 0.45 0.00 FUZZY_REFINANCE - 0.480 0.5137 0.4097 0.556 0.45 1.97 DEAR_SOMETHING - 0.080 0.0757 0.0880 0.462 0.45 1.11 LOCALPART_IN_SUBJECT - 0.660 0.7003 0.5738 0.550 0.45 0.61 URIBL_PH_SURBL - 0.118 0.1121 0.1308 0.462 0.45 0.00 HTML_EXTRA_CLOSE - 2.224 2.4337 1.7814 0.577 0.45 1.02 MISSING_HEADERS - 1.332 1.4498 1.0828 0.572 0.44 1.16 HTML_TAG_BALANCE_BODY - 0.008 0.0031 0.0190 0.140 0.44 0.00 HTML_IFRAME_SRC - 0.006 0.0003 0.0166 0.017 0.44 0.00 TVD_SPACED_SUBJECT_WORD3 - 0.022 0.0167 0.0345 0.326 0.44 2.00 RATWARE_MPOP_WEBMAIL - 0.005 0.0000 0.0166 0.000 0.44 0.00 FRT_STRONG2 - 0.478 0.2205 1.0203 0.178 0.44 -0.00 BAYES_40 - 12.651 5.4338 27.8483 0.163 0.44 0.10 DKIM_SIGNED - 0.412 0.4092 0.4186 0.494 0.44 1.00 DCC_REPUT_95_98 - 0.006 0.0003 0.0190 0.015 0.44 0.10 CRBOUNCE_MESSAGE - 0.007 0.0008 0.0196 0.041 0.44 0.00 DC_PNG_UNO_LARGO - 0.009 0.0025 0.0232 0.099 0.43 0.00 SUBJECT_FUZZY_TION - 0.014 0.0068 0.0279 0.195 0.43 0.00 FH_HAS_XAIMC - 2.009 1.9991 2.0294 0.496 0.43 1.51 SUBJ_ALL_CAPS - 0.120 0.1082 0.1463 0.425 0.43 1.34 DATE_IN_PAST_24_48 - 2.715 2.3153 3.5569 0.394 0.43 0.00 DKIM_ADSP_CUSTOM_MED - 1.630 1.6777 1.5299 0.523 0.43 0.00 TVD_SPACE_RATIO - 0.341 0.3267 0.3722 0.467 0.42 0.98 FROM_EXCESS_BASE64 - 0.009 0.0014 0.0244 0.055 0.42 0.00 HEAD_LONG - 1.264 1.2377 1.3182 0.484 0.42 0.00 HTML_IMAGE_RATIO_08 - 0.992 0.9474 1.0863 0.466 0.42 0.42 URIBL_GREY - 0.241 0.2253 0.2729 0.452 0.42 1.90 MISSING_MIMEOLE - 0.073 0.0576 0.1064 0.351 0.41 1.74 MIME_BASE64_TEXT - 0.062 0.0483 0.0922 0.344 0.41 1.12 HTTP_ESCAPED_HOST - 0.009 0.0003 0.0274 0.010 0.41 0.00 FU_END_ET - 0.011 0.0017 0.0315 0.051 0.41 1.80 HTML_EMBEDS - 1.159 1.0262 1.4395 0.416 0.41 0.00 HTML_IMAGE_RATIO_06 - 0.722 0.6119 0.9537 0.391 0.40 0.00 UNPARSEABLE_RELAY - 0.159 0.1336 0.2117 0.387 0.40 1.80 SUBJ_DOLLARS - 0.021 0.0096 0.0458 0.173 0.40 0.00 HTML_NONELEMENT_30_40 - 1.048 0.9110 1.3379 0.405 0.40 0.43 MIME_HTML_MOSTLY - 0.093 0.0692 0.1421 0.327 0.39 1.80 MISSING_SUBJECT - 0.191 0.1539 0.2705 0.363 0.39 1.80 REMOVE_BEFORE_LINK - 0.025 0.0113 0.0535 0.174 0.39 0.72 OBFUSCATING_COMMENT - 0.028 0.0141 0.0571 0.198 0.39 0.00 TVD_FW_GRAPHIC_NAME_LONG - 1.483 0.9920 2.5158 0.283 0.38 1.00 EXTRA_MPART_TYPE - 0.184 0.1401 0.2753 0.337 0.38 0.60 DCC_REPUT_90_94 - 0.022 0.0073 0.0541 0.119 0.38 0.00 X_IP - 0.291 0.2279 0.4251 0.349 0.37 0.00 NORMAL_HTTP_TO_IP - 0.088 0.0565 0.1546 0.268 0.37 1.68 FUZZY_CREDIT - 0.556 0.3795 0.9270 0.290 0.37 0.98 HTML_FONT_FACE_BAD - 0.029 0.0102 0.0672 0.131 0.36 0.00 FRT_DIPLOMA - 0.055 0.0285 0.1118 0.203 0.36 0.00 TVD_FW_GRAPHIC_NAME_MID - 0.332 0.2285 0.5494 0.294 0.35 0.00 URIBL_RED - 0.127 0.0796 0.2259 0.261 0.35 0.00 CTYPE_001C_B - 0.823 0.5058 1.4913 0.253 0.34 0.00 MIME_BASE64_BLANKS - 0.020 0.0000 0.0636 0.000 0.34 0.80 MIME_BOUND_DIGITS_15 - 0.334 0.2047 0.6059 0.253 0.33 0.00 UPPERCASE_75_100 - 0.244 0.1387 0.4668 0.229 0.33 0.26 HTML_OBFUSCATE_05_10 - 0.273 0.1519 0.5292 0.223 0.32 0.00 MIME_HTML_ONLY_MULTI - 0.122 0.0641 0.2438 0.208 0.32 0.01 UPPERCASE_50_75 - 0.027 0.0017 0.0797 0.021 0.32 1.38 HIDE_WIN_STATUS - 0.710 0.3629 1.4407 0.201 0.32 0.00 HTML_FONT_SIZE_LARGE - 0.592 0.2604 1.2915 0.168 0.29 0.00 MSGID_FROM_MTA_HEADER - 0.424 0.1454 1.0090 0.126 0.27 0.10 DCC_REPUT_70_89 - 0.052 0.0045 0.1528 0.029 0.26 0.01 IP_LINK_PLUS - 0.047 0.0023 0.1427 0.016 0.25 0.00 FRT_ADOBE2 - 0.093 0.0195 0.2480 0.073 0.24 0.00 WEIRD_PORT - 0.394 0.0494 1.1208 0.042 0.16 0.00 MSGID_MULTIPLE_AT - 0.216 0.0246 0.6178 0.038 0.16 0.00 TVD_RCVD_SPACE_BRACKET - 0.373 0.0071 1.1440 0.006 0.06 0.80 DKIM_ADSP_ALL - -Rule file versions for which these results apply: -(SpamAssassin Version string: 3.003000-beta1-svn) - --rw-r--r-- 1 mark nsc 5671 Sep 30 16:45 10_default_prefs.cf --rw-r--r-- 1 mark nsc 7509 Sep 30 16:45 20_advance_fee.cf --rw-r--r-- 1 mark nsc 7005 Sep 30 16:45 20_body_tests.cf --rw-r--r-- 1 mark nsc 1894 Sep 30 16:45 20_compensate.cf --rw-r--r-- 1 mark nsc 13540 Oct 6 12:30 20_dnsbl_tests.cf --rw-r--r-- 1 mark nsc 14998 Sep 30 16:45 20_drugs.cf --rw-r--r-- 1 mark nsc 11492 Sep 30 16:45 20_dynrdns.cf --rw-r--r-- 1 mark nsc 8118 Sep 30 16:45 20_fake_helo_tests.cf --rw-r--r-- 1 mark nsc 3159 Oct 30 15:58 20_freemail.cf --rw-r--r-- 1 mark nsc 35574 Oct 30 15:58 20_freemail_domains.cf --rw-r--r-- 1 mark nsc 25516 Sep 30 16:45 20_head_tests.cf --rw-r--r-- 1 mark nsc 10504 Sep 30 16:45 20_html_tests.cf --rw-r--r-- 1 mark nsc 5287 Sep 30 16:45 20_imageinfo.cf --rw-r--r-- 1 mark nsc 3330 Sep 30 16:45 20_meta_tests.cf --rw-r--r-- 1 mark nsc 1880 Sep 30 16:45 20_net_tests.cf --rw-r--r-- 1 mark nsc 8013 Sep 30 16:45 20_phrases.cf --rw-r--r-- 1 mark nsc 2062 Sep 30 16:45 20_porn.cf --rw-r--r-- 1 mark nsc 16172 Sep 30 16:45 20_ratware.cf --rw-r--r-- 1 mark nsc 5534 Sep 30 16:45 20_uri_tests.cf --rw-r--r-- 1 mark nsc 19305 Sep 30 16:45 20_vbounce.cf --rw-r--r-- 1 mark nsc 2549 Sep 30 16:45 23_bayes.cf --rw-r--r-- 1 mark nsc 1544 Sep 30 16:45 25_accessdb.cf --rw-r--r-- 1 mark nsc 1536 Sep 30 16:45 25_antivirus.cf --rw-r--r-- 1 mark nsc 1544 Sep 30 16:45 25_asn.cf --rw-r--r-- 1 mark nsc 2331 Sep 30 16:45 25_dcc.cf --rw-r--r-- 1 mark nsc 4407 Nov 2 17:07 25_dkim.cf --rw-r--r-- 1 mark nsc 2929 Sep 30 16:45 25_hashcash.cf --rw-r--r-- 1 mark nsc 1310 Sep 30 16:45 25_pyzor.cf --rw-r--r-- 1 mark nsc 3389 Sep 30 16:45 25_razor2.cf --rw-r--r-- 1 mark nsc 7672 Sep 30 16:45 25_replace.cf --rw-r--r-- 1 mark nsc 3100 Sep 30 16:45 25_spf.cf --rw-r--r-- 1 mark nsc 1768 Sep 30 16:45 25_textcat.cf --rw-r--r-- 1 mark nsc 7819 Nov 9 18:31 25_uribl.cf --rw-r--r-- 1 mark nsc 28682 Sep 30 16:45 30_text_de.cf --rw-r--r-- 1 mark nsc 20901 Sep 30 16:45 30_text_fr.cf --rw-r--r-- 1 mark nsc 1858 Sep 30 16:45 30_text_it.cf --rw-r--r-- 1 mark nsc 22257 Sep 30 16:45 30_text_nl.cf --rw-r--r-- 1 mark nsc 18290 Sep 30 16:45 30_text_pl.cf --rw-r--r-- 1 mark nsc 3331 Sep 30 16:45 30_text_pt_br.cf --rw-r--r-- 1 mark nsc 49537 Nov 27 18:58 50_scores.cf --rw-r--r-- 1 mark nsc 9288 Sep 30 16:45 60_adsp_override_dkim.cf --rw-r--r-- 1 mark nsc 1304 Sep 30 16:45 60_awl.cf --rw-r--r-- 1 mark nsc 2178 Sep 30 16:45 60_shortcircuit.cf --rw-r--r-- 1 mark nsc 4984 Sep 30 16:45 60_whitelist.cf --rw-r--r-- 1 mark nsc 6434 Nov 2 17:10 60_whitelist_dkim.cf --rw-r--r-- 1 mark nsc 3584 Sep 30 16:45 60_whitelist_spf.cf --rw-r--r-- 1 mark nsc 1914 Sep 30 16:45 60_whitelist_subject.cf --rw-r--r-- 1 mark nsc 54456 Dec 2 18:28 72_active.cf --rw-r--r-- 1 mark nsc 2214 Sep 30 16:45 local.cf --rw-r--r-- 1 mark nsc 2762 Sep 30 16:45 regression_tests.cf diff -Nru spamassassin-3.4.6/trunk-only/rules/svn_only.pre spamassassin-4.0.0~rc3/trunk-only/rules/svn_only.pre --- spamassassin-3.4.6/trunk-only/rules/svn_only.pre 2006-12-06 17:41:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/svn_only.pre 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -# 'loadplugin' lines for experimental, non-distributed plugins. -# -########################################################################### - -# RabinKarpBody - EXPERIMENTAL speedup plugin, requires RabinKarpAccel module -# loadplugin Mail::SpamAssassin::Plugin::RabinKarpBody - -# P595Body - EXPERIMENTAL speedup plugin, using bleadperl RE optimizations -# loadplugin Mail::SpamAssassin::Plugin::P595Body - diff -Nru spamassassin-3.4.6/trunk-only/rules/user_prefs.template spamassassin-4.0.0~rc3/trunk-only/rules/user_prefs.template --- spamassassin-3.4.6/trunk-only/rules/user_prefs.template 2005-10-18 22:15:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/user_prefs.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -# SpamAssassin user preferences file. See 'perldoc Mail::SpamAssassin::Conf' -# for details of what can be tweaked. -#* -#* Note: this file is not read by SpamAssassin until copied into the user -#* directory. At runtime, if a user has no preferences in their home directory -#* already, it will be copied for them, allowing them to perform personalised -#* customisation. If you want to make changes to the site-wide defaults, -#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead. -########################################################################### - -# How many points before a mail is considered spam. -# required_score 5 - -# Whitelist and blacklist addresses are now file-glob-style patterns, so -# "friend@somewhere.com", "*@isp.com", or "*.domain.net" will all work. -# whitelist_from someone@somewhere.com - -# Add your own customised scores for some tests below. The default scores are -# read from the installed spamassassin rules files, but you can override them -# here. To see the list of tests and their default scores, go to -# http://spamassassin.apache.org/tests.html . -# -# score SYMBOLIC_TEST_NAME n.nn - -# Speakers of Asian languages, like Chinese, Japanese and Korean, will almost -# definitely want to uncomment the following lines. They will switch off some -# rules that detect 8-bit characters, which commonly trigger on mails using CJK -# character sets, or that assume a western-style charset is in use. -# -# score HTML_COMMENT_8BITS 0 -# score UPPERCASE_25_50 0 -# score UPPERCASE_50_75 0 -# score UPPERCASE_75_100 0 -# score OBSCURED_EMAIL 0 - -# Speakers of any language that uses non-English, accented characters may wish -# to uncomment the following lines. They turn off rules that fire on -# misformatted messages generated by common mail apps in contravention of the -# email RFCs. - -# score SUBJ_ILLEGAL_CHARS 0 - diff -Nru spamassassin-3.4.6/trunk-only/rules/v310.pre spamassassin-4.0.0~rc3/trunk-only/rules/v310.pre --- spamassassin-3.4.6/trunk-only/rules/v310.pre 2009-06-29 15:18:46.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/v310.pre 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -# This is the right place to customize your installation of SpamAssassin. -# -# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be -# tweaked. -# -# This file was installed during the installation of SpamAssassin 3.1.0, -# and contains plugin loading commands for the new plugins added in that -# release. It will not be overwritten during future SpamAssassin installs, -# so you can modify it to enable some disabled-by-default plugins below, -# if you so wish. -# -# There are now multiple files read to enable plugins in the -# /etc/mail/spamassassin directory; previously only one, "init.pre" was -# read. Now both "init.pre", "v310.pre", and any other files ending in -# ".pre" will be read. As future releases are made, new plugins will be -# added to new files, named according to the release they're added in. -########################################################################### - -# DCC - perform DCC message checks. -# -# DCC is disabled here because it is not open source. See the DCC -# license for more details. -# -#loadplugin Mail::SpamAssassin::Plugin::DCC - -# Pyzor - perform Pyzor message checks. -# -loadplugin Mail::SpamAssassin::Plugin::Pyzor - -# Razor2 - perform Razor2 message checks. -# -loadplugin Mail::SpamAssassin::Plugin::Razor2 - -# SpamCop - perform SpamCop message reporting -# -loadplugin Mail::SpamAssassin::Plugin::SpamCop - -# AntiVirus - some simple anti-virus checks, this is not a replacement -# for an anti-virus filter like Clam AntiVirus -# -#loadplugin Mail::SpamAssassin::Plugin::AntiVirus - -# AWL - do auto-whitelist checks -# -#loadplugin Mail::SpamAssassin::Plugin::AWL - -# AutoLearnThreshold - threshold-based discriminator for Bayes auto-learning -# -loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold - -# TextCat - language guesser -# -#loadplugin Mail::SpamAssassin::Plugin::TextCat - -# AccessDB - lookup from-addresses in access database -# -#loadplugin Mail::SpamAssassin::Plugin::AccessDB - -# WhitelistSubject - Whitelist/Blacklist certain subject regular expressions -# -loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject - -########################################################################### -# experimental plugins - -# DomainKeys - perform DomainKeys verification -# -# This plugin has been removed as of v3.3.0. Use the DKIM plugin instead, -# which supports both Domain Keys and DKIM. - -# MIMEHeader - apply regexp rules against MIME headers in the message -# -loadplugin Mail::SpamAssassin::Plugin::MIMEHeader - -# ReplaceTags -# -loadplugin Mail::SpamAssassin::Plugin::ReplaceTags - diff -Nru spamassassin-3.4.6/trunk-only/rules/v312.pre spamassassin-4.0.0~rc3/trunk-only/rules/v312.pre --- spamassassin-3.4.6/trunk-only/rules/v312.pre 2008-08-14 16:31:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/v312.pre 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# This is the right place to customize your installation of SpamAssassin. -# -# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be -# tweaked. -# -# This file was installed during the installation of SpamAssassin 3.1.2, -# and contains plugin loading commands for the new plugins added in that -# release. It will not be overwritten during future SpamAssassin installs, -# so you can modify it to enable some disabled-by-default plugins below, -# if you so wish. -# -# There are now multiple files read to enable plugins in the -# /etc/mail/spamassassin directory; previously only one, "init.pre" was -# read. Now both "init.pre", "v310.pre", and any other files ending in -# ".pre" will be read. As future releases are made, new plugins will be -# added to new files, named according to the release they're added in. - -########################################################################### -# experimental plugins - -# DKIM - perform DKIM verification -# -# Mail::DKIM module required for use, see INSTALL for more information. -# -# Note that if C version 0.20 or later is installed, this -# renders the DomainKeys plugin redundant. -# -loadplugin Mail::SpamAssassin::Plugin::DKIM - diff -Nru spamassassin-3.4.6/trunk-only/rules/v320.pre spamassassin-4.0.0~rc3/trunk-only/rules/v320.pre --- spamassassin-3.4.6/trunk-only/rules/v320.pre 2007-08-07 15:36:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/v320.pre 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -# This is the right place to customize your installation of SpamAssassin. -# -# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be -# tweaked. -# -# This file was installed during the installation of SpamAssassin 3.2.0, -# and contains plugin loading commands for the new plugins added in that -# release. It will not be overwritten during future SpamAssassin installs, -# so you can modify it to enable some disabled-by-default plugins below, -# if you so wish. -# -# There are now multiple files read to enable plugins in the -# /etc/mail/spamassassin directory; previously only one, "init.pre" was -# read. Now both "init.pre", "v310.pre", and any other files ending in -# ".pre" will be read. As future releases are made, new plugins will be -# added to new files, named according to the release they're added in. -########################################################################### - -# Check - Provides main check functionality -# -loadplugin Mail::SpamAssassin::Plugin::Check - -# HTTPSMismatch - find URI mismatches between href and anchor text -# -loadplugin Mail::SpamAssassin::Plugin::HTTPSMismatch - -# URIDetail - test URIs using detailed URI information -# -loadplugin Mail::SpamAssassin::Plugin::URIDetail - -# Shortcircuit - stop evaluation early if high-accuracy rules fire -# -# loadplugin Mail::SpamAssassin::Plugin::Shortcircuit - -# Plugins which used to be EvalTests.pm -# broken out into separate plugins -loadplugin Mail::SpamAssassin::Plugin::Bayes -loadplugin Mail::SpamAssassin::Plugin::BodyEval -loadplugin Mail::SpamAssassin::Plugin::DNSEval -loadplugin Mail::SpamAssassin::Plugin::HTMLEval -loadplugin Mail::SpamAssassin::Plugin::HeaderEval -loadplugin Mail::SpamAssassin::Plugin::MIMEEval -loadplugin Mail::SpamAssassin::Plugin::RelayEval -loadplugin Mail::SpamAssassin::Plugin::URIEval -loadplugin Mail::SpamAssassin::Plugin::WLBLEval - -# VBounce - anti-bounce-message rules, see rules/20_vbounce.cf -# -loadplugin Mail::SpamAssassin::Plugin::VBounce - -# Rule2XSBody - speedup by compilation of ruleset to native code -# -# loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody - -# ASN - Look up the Autonomous System Number of the connecting IP -# and create a header containing ASN data for bayes tokenization. -# See plugin's POD docs for usage info. -# -# loadplugin Mail::SpamAssassin::Plugin::ASN - -# ImageInfo - rules to match metadata of image attachments -# -loadplugin Mail::SpamAssassin::Plugin::ImageInfo - diff -Nru spamassassin-3.4.6/trunk-only/rules/v330.pre spamassassin-4.0.0~rc3/trunk-only/rules/v330.pre --- spamassassin-3.4.6/trunk-only/rules/v330.pre 2009-07-23 11:51:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/v330.pre 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -# This is the right place to customize your installation of SpamAssassin. -# -# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be -# tweaked. -# -# This file was installed during the installation of SpamAssassin 3.3.0, -# and contains plugin loading commands for the new plugins added in that -# release. It will not be overwritten during future SpamAssassin installs, -# so you can modify it to enable some disabled-by-default plugins below, -# if you so wish. -# -# There are now multiple files read to enable plugins in the -# /etc/mail/spamassassin directory; previously only one, "init.pre" was -# read. Now both "init.pre", "v310.pre", and any other files ending in -# ".pre" will be read. As future releases are made, new plugins will be -# added to new files, named according to the release they're added in. -########################################################################### - -# PhishTag - allows sites to rewrite suspect phish-mail URLs -# (Note: this requires configuration, see http://umut.topkara.org/PhishTag) -# -#loadplugin Mail::SpamAssassin::Plugin::PhishTag - -# FreeMail - detect email addresses using free webmail services, -# usable as input for other rules -# -loadplugin Mail::SpamAssassin::Plugin::FreeMail - diff -Nru spamassassin-3.4.6/trunk-only/rules/v340.pre spamassassin-4.0.0~rc3/trunk-only/rules/v340.pre --- spamassassin-3.4.6/trunk-only/rules/v340.pre 2011-05-12 13:56:04.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/v340.pre 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -# This is the right place to customize your installation of SpamAssassin. -# -# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be -# tweaked. -# -# This file was installed during the installation of SpamAssassin 3.4.0, -# and contains plugin loading commands for the new plugins added in that -# release. It will not be overwritten during future SpamAssassin installs, -# so you can modify it to enable some disabled-by-default plugins below, -# if you so wish. -# -# There are now multiple files read to enable plugins in the -# /etc/mail/spamassassin directory; previously only one, "init.pre" was -# read. Now both "init.pre", "v310.pre", and any other files ending in -# ".pre" will be read. As future releases are made, new plugins will be -# added to new files, named according to the release they're added in. -########################################################################### - -# AskDNS - forms a DNS query based on 'tags' as supplied by other plugins -# -loadplugin Mail::SpamAssassin::Plugin::AskDNS diff -Nru spamassassin-3.4.6/trunk-only/rules/v341.pre spamassassin-4.0.0~rc3/trunk-only/rules/v341.pre --- spamassassin-3.4.6/trunk-only/rules/v341.pre 2015-01-12 21:35:44.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/v341.pre 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -# This is the right place to customize your installation of SpamAssassin. -# -# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be -# tweaked. -# -# This file was installed during the installation of SpamAssassin 3.4.1, -# and contains plugin loading commands for the new plugins added in that -# release. It will not be overwritten during future SpamAssassin installs, -# so you can modify it to enable some disabled-by-default plugins below, -# if you so wish. -# -# There are now multiple files read to enable plugins in the -# /etc/mail/spamassassin directory; previously only one, "init.pre" was -# read. Now both "init.pre", "v310.pre", and any other files ending in -# ".pre" will be read. As future releases are made, new plugins will be -# added to new files, named according to the release they're added in. -########################################################################### - -# TxRep - Reputation database that replaces AWL -# loadplugin Mail::SpamAssassin::Plugin::TxRep - -# URILocalBL - Provides ISP and Country code based filtering as well as -# quick IP based blocks without a full RBL implementation - Bug 7060 - -# loadplugin Mail::SpamAssassin::Plugin::URILocalBL - -# PDFInfo - Use several methods to detect a PDF file's ham/spam traits -# loadplugin Mail::SpamAssassin::Plugin::PDFInfo diff -Nru spamassassin-3.4.6/trunk-only/rules/v342.pre spamassassin-4.0.0~rc3/trunk-only/rules/v342.pre --- spamassassin-3.4.6/trunk-only/rules/v342.pre 2018-03-02 13:57:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules/v342.pre 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -# This is the right place to customize your installation of SpamAssassin. -# -# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be -# tweaked. -# -# This file was installed during the installation of SpamAssassin 3.4.1, -# and contains plugin loading commands for the new plugins added in that -# release. It will not be overwritten during future SpamAssassin installs, -# so you can modify it to enable some disabled-by-default plugins below, -# if you so wish. -# -# There are now multiple files read to enable plugins in the -# /etc/mail/spamassassin directory; previously only one, "init.pre" was -# read. Now both "init.pre", "v310.pre", and any other files ending in -# ".pre" will be read. As future releases are made, new plugins will be -# added to new files, named according to the release they're added in. -########################################################################### - -# HashBL - Use EBL email blocklist -# loadplugin Mail::SpamAssassin::Plugin::HashBL diff -Nru spamassassin-3.4.6/trunk-only/rules-extras/10_uridnsbl_skip_financial.cf spamassassin-4.0.0~rc3/trunk-only/rules-extras/10_uridnsbl_skip_financial.cf --- spamassassin-3.4.6/trunk-only/rules-extras/10_uridnsbl_skip_financial.cf 2017-04-11 04:56:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules-extras/10_uridnsbl_skip_financial.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,625 +0,0 @@ - -# -# Last update: 2016-08-29-axb -# Phished financial domains -ifplugin Mail::SpamAssassin::Plugin::URIDNSBL - -uridnsbl_skip_domain 1stnationalbank.com -uridnsbl_skip_domain 365online.com -uridnsbl_skip_domain 53.com -uridnsbl_skip_domain abl.com.pk -uridnsbl_skip_domain abnamro.nl -uridnsbl_skip_domain accessbankplc.com -uridnsbl_skip_domain adib.ae -uridnsbl_skip_domain aib.ie -uridnsbl_skip_domain aibgb.co.uk -uridnsbl_skip_domain airdriesavingsbank.com -uridnsbl_skip_domain aldermore.co.uk -uridnsbl_skip_domain alliancebank.com.my -uridnsbl_skip_domain alliancefg.com -uridnsbl_skip_domain alliantcreditunion.com -uridnsbl_skip_domain alliantcreditunion.org -uridnsbl_skip_domain allianz.de -uridnsbl_skip_domain allybank.com -uridnsbl_skip_domain alterna.ca -uridnsbl_skip_domain americanexpress.ch -uridnsbl_skip_domain americanexpress.com -uridnsbl_skip_domain anadolubank.nl -uridnsbl_skip_domain anz.co.nz -uridnsbl_skip_domain anz.com -uridnsbl_skip_domain anz.com.au -uridnsbl_skip_domain arbuthnotlatham.co.uk -uridnsbl_skip_domain asb.co.nz -uridnsbl_skip_domain authorize.net -uridnsbl_skip_domain axisbank.co.in -uridnsbl_skip_domain axisbank.com -uridnsbl_skip_domain b2bbank.com -uridnsbl_skip_domain baaderbank.de -uridnsbl_skip_domain baloise.ch -uridnsbl_skip_domain baml.com -uridnsbl_skip_domain banamex.com -uridnsbl_skip_domain bancanetbsc.do -uridnsbl_skip_domain bancanetsantacruz.com.do -uridnsbl_skip_domain bancapulia.it -uridnsbl_skip_domain bancarios.com -uridnsbl_skip_domain bancastato.ch -uridnsbl_skip_domain bancatransilvania.ro -uridnsbl_skip_domain banco.bradesco -uridnsbl_skip_domain bancobase.com -uridnsbl_skip_domain bancobic.ao -uridnsbl_skip_domain bancobic.pt -uridnsbl_skip_domain bancobpi.pt -uridnsbl_skip_domain bancobrasil.com.br -uridnsbl_skip_domain bancochile.cl -uridnsbl_skip_domain bancochile.com -uridnsbl_skip_domain bancoestado.cl -uridnsbl_skip_domain bancofalabella.cl -uridnsbl_skip_domain bancofalabella.com.co -uridnsbl_skip_domain bancofalabella.pe -uridnsbl_skip_domain bancomer.com -uridnsbl_skip_domain bancopopolare.it -uridnsbl_skip_domain bancoposta.it -uridnsbl_skip_domain bancopostaclick.it -uridnsbl_skip_domain bancosantander.es -uridnsbl_skip_domain bancovotorantimcartoes.com.br -uridnsbl_skip_domain bank-of-ireland.co.uk -uridnsbl_skip_domain bank.barclays.co.uk -uridnsbl_skip_domain bank24.ru -uridnsbl_skip_domain bankalhabib.com -uridnsbl_skip_domain bankaustria.at -uridnsbl_skip_domain bankbgzbnpparibas.pl -uridnsbl_skip_domain bankcardservices.co.uk -uridnsbl_skip_domain bankcomm.com -uridnsbl_skip_domain bankcoop.ch -uridnsbl_skip_domain bankia.com -uridnsbl_skip_domain bankia.es -uridnsbl_skip_domain bankiabancapersonal.es -uridnsbl_skip_domain bankinter.com -uridnsbl_skip_domain bankinter.es -uridnsbl_skip_domain bankmutual.com -uridnsbl_skip_domain bankofamerica.com -uridnsbl_skip_domain bankofcanada.ca -uridnsbl_skip_domain bankofchina.com -uridnsbl_skip_domain bankofcyprus.com -uridnsbl_skip_domain bankofindia.co.nz -uridnsbl_skip_domain bankofireland.com -uridnsbl_skip_domain bankofirelanduk.com -uridnsbl_skip_domain bankofoklahoma.com -uridnsbl_skip_domain bankofscotland.co.uk -uridnsbl_skip_domain bankofsingapore.com -uridnsbl_skip_domain banksinarmas.com -uridnsbl_skip_domain bankvonroll.ch -uridnsbl_skip_domain bankwest.com.au -uridnsbl_skip_domain banque-casino.fr -uridnsbl_skip_domain banquepopulaire.fr -uridnsbl_skip_domain banquescotia.com -uridnsbl_skip_domain barclaycard.co.uk -uridnsbl_skip_domain barclaycard.de -uridnsbl_skip_domain barclaycard.es -uridnsbl_skip_domain barclays.co.uk -uridnsbl_skip_domain barclays.com -uridnsbl_skip_domain barclays.sc -uridnsbl_skip_domain barclayspartnerfinance.com -uridnsbl_skip_domain barodanzltd.co.nz -uridnsbl_skip_domain basler.ch -uridnsbl_skip_domain bba.org.uk -uridnsbl_skip_domain bbandt.com -uridnsbl_skip_domain bci.cl -uridnsbl_skip_domain bcp.com.pe -uridnsbl_skip_domain bcv.ch -uridnsbl_skip_domain bcvs.ch -uridnsbl_skip_domain bekb.ch -uridnsbl_skip_domain bellevue.ch -uridnsbl_skip_domain bendigobank.com.au -uridnsbl_skip_domain berliner-bank.de -uridnsbl_skip_domain berliner-sparkasse.de -uridnsbl_skip_domain bfanet.ao -uridnsbl_skip_domain bgfi.com -uridnsbl_skip_domain bgfionline.com -uridnsbl_skip_domain bgzbnpparibas.pl -uridnsbl_skip_domain billmelater.com -uridnsbl_skip_domain bk.rw -uridnsbl_skip_domain bkb.ch -uridnsbl_skip_domain bks.at -uridnsbl_skip_domain blkb.ch -uridnsbl_skip_domain bmo.com -uridnsbl_skip_domain bmocm.com -uridnsbl_skip_domain bmogam.com -uridnsbl_skip_domain bmoharris.com -uridnsbl_skip_domain bmoharrisprivatebankingonline.com -uridnsbl_skip_domain bmoinvestorline.com -uridnsbl_skip_domain bmonesbittburns.com -uridnsbl_skip_domain bnl.it -uridnsbl_skip_domain bnpparibas.com -uridnsbl_skip_domain bnpparibas.fr -uridnsbl_skip_domain bnpparibasfortis.be -uridnsbl_skip_domain boc.cnnz -uridnsbl_skip_domain bonuscard.ch -uridnsbl_skip_domain bpe-gruposantander.com -uridnsbl_skip_domain bpi.pt -uridnsbl_skip_domain bpostbank.be -uridnsbl_skip_domain bradescardonline.com.br -uridnsbl_skip_domain bradesco.com.br -uridnsbl_skip_domain bradescoseguranca.com.br -uridnsbl_skip_domain bridgewaterbank.ca -uridnsbl_skip_domain bsibank.com -uridnsbl_skip_domain bt-trade.ro -uridnsbl_skip_domain btrl.ro -uridnsbl_skip_domain businessonline-boi.com -uridnsbl_skip_domain bzbank.ch -uridnsbl_skip_domain ca-cib.com -uridnsbl_skip_domain ca-egypt.com -uridnsbl_skip_domain ca-suisse.com -uridnsbl_skip_domain cafbank.org -uridnsbl_skip_domain cafonline.org -uridnsbl_skip_domain caisse-epargne.com -uridnsbl_skip_domain caisse-epargne.fr -uridnsbl_skip_domain caixa.gov.br -uridnsbl_skip_domain caixabank.com -uridnsbl_skip_domain cajasur.es -uridnsbl_skip_domain camsonline.com -uridnsbl_skip_domain canadiandirect.com -uridnsbl_skip_domain capitalone.com -uridnsbl_skip_domain capitalone360.com -uridnsbl_skip_domain capitaloneonline.co.uk -uridnsbl_skip_domain capitecbank.co.za -uridnsbl_skip_domain cariparma.it -uridnsbl_skip_domain carrefour-banque.fr -uridnsbl_skip_domain cartabcc.it -uridnsbl_skip_domain cartabccpos.it -uridnsbl_skip_domain cartasi.it -uridnsbl_skip_domain catalunyacaixa.com -uridnsbl_skip_domain cbg.gm -uridnsbl_skip_domain cbonline.co.uk -uridnsbl_skip_domain cembra.ch -uridnsbl_skip_domain cenbank.org -uridnsbl_skip_domain centralbank.ae -uridnsbl_skip_domain charitybank.org -uridnsbl_skip_domain chase.com -uridnsbl_skip_domain chebanca.it -uridnsbl_skip_domain chinatrust.com.tw -uridnsbl_skip_domain cial.ch -uridnsbl_skip_domain cibc.com -uridnsbl_skip_domain cic.ch -uridnsbl_skip_domain cimbclicks.com.my -uridnsbl_skip_domain citi.co.nz -uridnsbl_skip_domain citi.com -uridnsbl_skip_domain citi.eu -uridnsbl_skip_domain citibank.ae -uridnsbl_skip_domain citibank.co.in -uridnsbl_skip_domain citibank.co.uk -uridnsbl_skip_domain citibank.com -uridnsbl_skip_domain citibankonline.com -uridnsbl_skip_domain citibusiness.com -uridnsbl_skip_domain citicards.com -uridnsbl_skip_domain citigroup.com -uridnsbl_skip_domain citizensbank.ca -uridnsbl_skip_domain citizensbank.com -uridnsbl_skip_domain citizensbankonline.com -uridnsbl_skip_domain civibank.com -uridnsbl_skip_domain civibank.it -uridnsbl_skip_domain closebrothers.co.uk -uridnsbl_skip_domain closebrothers.com -uridnsbl_skip_domain clubsc.ch -uridnsbl_skip_domain co-operativebank.co.uk -uridnsbl_skip_domain colpatria.com -uridnsbl_skip_domain colpatria.com.co -uridnsbl_skip_domain commbank.com -uridnsbl_skip_domain commbank.com.au -uridnsbl_skip_domain commerzbank.com -uridnsbl_skip_domain commerzbank.de -uridnsbl_skip_domain coopbank.dk -uridnsbl_skip_domain corner.ch -uridnsbl_skip_domain cornerbanca.ch -uridnsbl_skip_domain cornercard.ch -uridnsbl_skip_domain cornercard.com -uridnsbl_skip_domain cosycard.ch -uridnsbl_skip_domain coutts.com -uridnsbl_skip_domain credit-agricole.com -uridnsbl_skip_domain credit-agricole.fr -uridnsbl_skip_domain credit-suisse.com -uridnsbl_skip_domain creditagricole.rs -uridnsbl_skip_domain cs.com -uridnsbl_skip_domain css.ch -uridnsbl_skip_domain ctbcbank.com -uridnsbl_skip_domain ctfs.com -uridnsbl_skip_domain cwbank.com -uridnsbl_skip_domain cwbankgroup.com -uridnsbl_skip_domain cwt.ca -uridnsbl_skip_domain cybg.com -uridnsbl_skip_domain danskebank.co.uk -uridnsbl_skip_domain danskebank.com -uridnsbl_skip_domain danskebank.de -uridnsbl_skip_domain danskebank.dk -uridnsbl_skip_domain danskebank.ee -uridnsbl_skip_domain danskebank.fi -uridnsbl_skip_domain danskebank.ie -uridnsbl_skip_domain danskebank.no -uridnsbl_skip_domain danskebankas.lt -uridnsbl_skip_domain datatrans.biz -uridnsbl_skip_domain datatrans.ch -uridnsbl_skip_domain db.com -uridnsbl_skip_domain dbs.com -uridnsbl_skip_domain demirbank.kg -uridnsbl_skip_domain denizbank.com -uridnsbl_skip_domain desjardins.ca -uridnsbl_skip_domain desjardins.com -uridnsbl_skip_domain deutsche-bank.de -uridnsbl_skip_domain deutschebank.be -uridnsbl_skip_domain deutschebank.co.nz -uridnsbl_skip_domain deutschebank.de -uridnsbl_skip_domain diamondbank.com -uridnsbl_skip_domain dibpak.com -uridnsbl_skip_domain discover.com -uridnsbl_skip_domain discovercard.com -uridnsbl_skip_domain discovery.co.za -uridnsbl_skip_domain dnbnord.lt -uridnsbl_skip_domain dresdner-bank.de -uridnsbl_skip_domain dsbbank.sr -uridnsbl_skip_domain duncanlawrie.com -uridnsbl_skip_domain e-gulfbank.com -uridnsbl_skip_domain easybank.at -uridnsbl_skip_domain ecobank.com -uridnsbl_skip_domain edwardjones.com -uridnsbl_skip_domain esunbank.com.tw -uridnsbl_skip_domain fednetbank.com -uridnsbl_skip_domain fidelity.com -uridnsbl_skip_domain fidor.de -uridnsbl_skip_domain finance.com -uridnsbl_skip_domain finansbank.com.tr -uridnsbl_skip_domain finasta.lt -uridnsbl_skip_domain fineco.it -uridnsbl_skip_domain firstbankcard.com -uridnsbl_skip_domain firstmerit.com -uridnsbl_skip_domain firstnational.com -uridnsbl_skip_domain firstnationalmerchantsolutions.com -uridnsbl_skip_domain firsttrustbank.co.uk -uridnsbl_skip_domain fnb-online.com -uridnsbl_skip_domain fnb.co.za -uridnsbl_skip_domain fnbc.ca -uridnsbl_skip_domain friuladria.it -uridnsbl_skip_domain garanti.com.tr -uridnsbl_skip_domain garantibank.eu -uridnsbl_skip_domain garantibank.nl -uridnsbl_skip_domain gazprombank.ch -uridnsbl_skip_domain gazprombank.ru -uridnsbl_skip_domain generali.es -uridnsbl_skip_domain genevoise.ch -uridnsbl_skip_domain gkb.ch -uridnsbl_skip_domain granitbank.hu -uridnsbl_skip_domain gtbank.com -uridnsbl_skip_domain halifax.co.uk -uridnsbl_skip_domain handelsbanken.se -uridnsbl_skip_domain harrodsbank.co.uk -uridnsbl_skip_domain hbl.com -uridnsbl_skip_domain hblibank.com -uridnsbl_skip_domain hblibank.com.pk -uridnsbl_skip_domain hdfcbank.com -uridnsbl_skip_domain heartland.co.nz -uridnsbl_skip_domain hellenicbank.com -uridnsbl_skip_domain hkbea.com -uridnsbl_skip_domain hlb.com.kh -uridnsbl_skip_domain hlb.com.my -uridnsbl_skip_domain hoaresbank.co.uk -uridnsbl_skip_domain home.barclays -uridnsbl_skip_domain hongleongconnect.com.kh -uridnsbl_skip_domain hongleongconnect.com.vn -uridnsbl_skip_domain hongleongconnect.my -uridnsbl_skip_domain hsbc.co.nz -uridnsbl_skip_domain hsbc.co.uk -uridnsbl_skip_domain hsbc.com -uridnsbl_skip_domain hsbc.com.ar -uridnsbl_skip_domain hsbc.com.hk -uridnsbl_skip_domain hypovereinsbank.co.uk -uridnsbl_skip_domain hypovereinsbank.de -uridnsbl_skip_domain icbcnz.com -uridnsbl_skip_domain icicibank.co.in -uridnsbl_skip_domain icicibank.com -uridnsbl_skip_domain icicibankprivatebanking.com -uridnsbl_skip_domain icorner.ch -uridnsbl_skip_domain icscards.de -uridnsbl_skip_domain icscards.nl -uridnsbl_skip_domain ing-diba.de -uridnsbl_skip_domain ing.be -uridnsbl_skip_domain ing.com -uridnsbl_skip_domain ing.lu -uridnsbl_skip_domain ing.nl -uridnsbl_skip_domain ingdirect.ca -uridnsbl_skip_domain ingdirect.fr -uridnsbl_skip_domain ingvysyabank.com -uridnsbl_skip_domain interac.ca -uridnsbl_skip_domain iobnet.co.in -uridnsbl_skip_domain isbank.com.tr -uridnsbl_skip_domain isbank.de -uridnsbl_skip_domain isbank.ge -uridnsbl_skip_domain isbank.iq -uridnsbl_skip_domain isbankkosova.com -uridnsbl_skip_domain itau.com.br -uridnsbl_skip_domain jpmchase.com -uridnsbl_skip_domain jpmorgan.com -uridnsbl_skip_domain jsafrasarasin.com -uridnsbl_skip_domain julianhodgebank.com -uridnsbl_skip_domain juliusbaer.com -uridnsbl_skip_domain jyskebank.dk -uridnsbl_skip_domain kantonalbank.ch -uridnsbl_skip_domain key.com -uridnsbl_skip_domain kiwibank.co.nz -uridnsbl_skip_domain kotak.com -uridnsbl_skip_domain kredytbank.pl -uridnsbl_skip_domain kreissparkasse-schwalm-eder.de -uridnsbl_skip_domain ksklb.de -uridnsbl_skip_domain kutxabank.es -uridnsbl_skip_domain laboralkutxa.com -uridnsbl_skip_domain lacaixa.cat -uridnsbl_skip_domain lacaixa.es -uridnsbl_skip_domain laurentianbank.ca -uridnsbl_skip_domain lbb.de -uridnsbl_skip_domain lcl.com -uridnsbl_skip_domain lcl.fr -uridnsbl_skip_domain lloydsbank.com -uridnsbl_skip_domain lloydsbankcommercial.com -uridnsbl_skip_domain lloydsbankinggroup.com -uridnsbl_skip_domain lloydstsb.ch -uridnsbl_skip_domain lloydstsb.co.uk -uridnsbl_skip_domain lombardodier.com -uridnsbl_skip_domain loydsbank.com -uridnsbl_skip_domain maerki-baumann.ch -uridnsbl_skip_domain mandtbank.com -uridnsbl_skip_domain manulife.com -uridnsbl_skip_domain manulifebank.ca -uridnsbl_skip_domain manulifebankselect.ca -uridnsbl_skip_domain manulifeone.ca -uridnsbl_skip_domain mashreqbank.com -uridnsbl_skip_domain mastercard.com -uridnsbl_skip_domain maybank2u.com -uridnsbl_skip_domain maybank2u.com.my -uridnsbl_skip_domain mdmbank.com -uridnsbl_skip_domain mechanicsbank.com -uridnsbl_skip_domain medbank.lt -uridnsbl_skip_domain metrobankdirect.com -uridnsbl_skip_domain metrobankonline.co.uk -uridnsbl_skip_domain migbank.com -uridnsbl_skip_domain migrosbank.ch -uridnsbl_skip_domain mizuhobank.co.jp -uridnsbl_skip_domain mmwarburg.lu -uridnsbl_skip_domain montepio.pt -uridnsbl_skip_domain morganstanley.com -uridnsbl_skip_domain mps.it -uridnsbl_skip_domain ms.com -uridnsbl_skip_domain mufg.jp -uridnsbl_skip_domain myonlineresourcecenter.com -uridnsbl_skip_domain myonlineservices.ch -uridnsbl_skip_domain nab.com.au -uridnsbl_skip_domain nationalesuisse.ch -uridnsbl_skip_domain nationwide-communications.co.uk -uridnsbl_skip_domain nationwide-service.co.uk -uridnsbl_skip_domain nationwide.co.uk -uridnsbl_skip_domain natwest.com -uridnsbl_skip_domain navyfederal.org -uridnsbl_skip_domain nbc.ca -uridnsbl_skip_domain newyorkfed.org -uridnsbl_skip_domain nibl.com.np -uridnsbl_skip_domain nordea.fi -uridnsbl_skip_domain nordea.lt -uridnsbl_skip_domain nordfynsbank.dk -uridnsbl_skip_domain norisbank.de -uridnsbl_skip_domain notenstein.ch -uridnsbl_skip_domain nuvisionfederal.com -uridnsbl_skip_domain oceanbank.com -uridnsbl_skip_domain onlinesbi.com -uridnsbl_skip_domain orchardbank.com -uridnsbl_skip_domain ostsaechsische-sparkasse-dresden.de -uridnsbl_skip_domain paylife.at -uridnsbl_skip_domain paypal-brasil.com.br -uridnsbl_skip_domain paypal-communication.com -uridnsbl_skip_domain paypal-community.com -uridnsbl_skip_domain paypal-customerfeedback.com -uridnsbl_skip_domain paypal-deutschland.de -uridnsbl_skip_domain paypal-exchanges.com -uridnsbl_skip_domain paypal-marketing.co.uk -uridnsbl_skip_domain paypal-marketing.pl -uridnsbl_skip_domain paypal-notify.com -uridnsbl_skip_domain paypal-now.com -uridnsbl_skip_domain paypal-opwaarderen.nl -uridnsbl_skip_domain paypal-pages.com -uridnsbl_skip_domain paypal-search.com -uridnsbl_skip_domain paypal-shopping.co.uk -uridnsbl_skip_domain paypal-techsupport.com -uridnsbl_skip_domain paypal.be -uridnsbl_skip_domain paypal.ca -uridnsbl_skip_domain paypal.ch -uridnsbl_skip_domain paypal.co.il -uridnsbl_skip_domain paypal.co.uk -uridnsbl_skip_domain paypal.com -uridnsbl_skip_domain paypal.com.au -uridnsbl_skip_domain paypal.com.br -uridnsbl_skip_domain paypal.com.mx -uridnsbl_skip_domain paypal.com.pt -uridnsbl_skip_domain paypal.de -uridnsbl_skip_domain paypal.dk -uridnsbl_skip_domain paypal.es -uridnsbl_skip_domain paypal.fr -uridnsbl_skip_domain paypal.it -uridnsbl_skip_domain paypal.net -uridnsbl_skip_domain paypal.nl -uridnsbl_skip_domain paypal.no -uridnsbl_skip_domain paypal.pt -uridnsbl_skip_domain paypal.ru -uridnsbl_skip_domain paypal.se -uridnsbl_skip_domain paypalobjects.com -uridnsbl_skip_domain pbebank.com -uridnsbl_skip_domain pcfinancial.ca -uridnsbl_skip_domain permanenttsb.ie -uridnsbl_skip_domain pnc.com -uridnsbl_skip_domain popolarevicenza.it -uridnsbl_skip_domain postbank.de -uridnsbl_skip_domain postepay.it -uridnsbl_skip_domain postfinance.ch -uridnsbl_skip_domain postfinance.info -uridnsbl_skip_domain postfinancearena.ch -uridnsbl_skip_domain publicislamicbank.com.my -uridnsbl_skip_domain rabobank.co.nz -uridnsbl_skip_domain rabobank.com -uridnsbl_skip_domain rabobank.nl -uridnsbl_skip_domain rahnbodmer.ch -uridnsbl_skip_domain raiffeisen.ch -uridnsbl_skip_domain raiffeisen.hu -uridnsbl_skip_domain raiffeisen.li -uridnsbl_skip_domain raiffeisen.ru -uridnsbl_skip_domain raiffeisenbank.rs -uridnsbl_skip_domain raphaelsbank.com -uridnsbl_skip_domain rbc.com -uridnsbl_skip_domain rbcroyalbank.com -uridnsbl_skip_domain rbs.co.uk -uridnsbl_skip_domain rbssecure.co.uk -uridnsbl_skip_domain rbsworldpay.com -uridnsbl_skip_domain rcb.at rcb.at -uridnsbl_skip_domain recordbank.be -uridnsbl_skip_domain regiobank.nl -uridnsbl_skip_domain regions.com -uridnsbl_skip_domain regionsnet.com -uridnsbl_skip_domain renasantbank.com -uridnsbl_skip_domain rhbgroup.com -uridnsbl_skip_domain rogersbank.com -uridnsbl_skip_domain rothschild.com -uridnsbl_skip_domain rothschildbank.com -uridnsbl_skip_domain royalbank.com -uridnsbl_skip_domain s.de -uridnsbl_skip_domain sagepay.co.uk -uridnsbl_skip_domain sagepay.com -uridnsbl_skip_domain sainsburysbank.co.uk -uridnsbl_skip_domain samba.com -uridnsbl_skip_domain santander.cl -uridnsbl_skip_domain santander.co.uk -uridnsbl_skip_domain santander.com -uridnsbl_skip_domain santander.com.br -uridnsbl_skip_domain santander.com.mx -uridnsbl_skip_domain santandercorretora.com.br -uridnsbl_skip_domain santanderesfera.com.br -uridnsbl_skip_domain santandersantiago.cl -uridnsbl_skip_domain sarasin.ch -uridnsbl_skip_domain sberbank.ch -uridnsbl_skip_domain sbs.net.nz -uridnsbl_skip_domain sc.com -uridnsbl_skip_domain schoellerbank.at -uridnsbl_skip_domain scotiabank.ca -uridnsbl_skip_domain scotiabank.com -uridnsbl_skip_domain scotiamocatta.com -uridnsbl_skip_domain scotiaonline.com -uridnsbl_skip_domain securetrustbank.com -uridnsbl_skip_domain service-sparkasse.de -uridnsbl_skip_domain serviciobancomer.com -uridnsbl_skip_domain shawbrook.co.uk -uridnsbl_skip_domain shkb.ch -uridnsbl_skip_domain six-group.com -uridnsbl_skip_domain six-payment-services.com -uridnsbl_skip_domain skrill.com -uridnsbl_skip_domain sls-direkt.de -uridnsbl_skip_domain snb.ch snb.ch -uridnsbl_skip_domain snsbank.nl -uridnsbl_skip_domain societegenerale.fr -uridnsbl_skip_domain sparda-a.de -uridnsbl_skip_domain sparda-b.de -uridnsbl_skip_domain sparda-bank-hamburg.de -uridnsbl_skip_domain sparda-bw.de -uridnsbl_skip_domain sparda-h.de -uridnsbl_skip_domain sparda-hessen.de -uridnsbl_skip_domain sparda-m.de -uridnsbl_skip_domain sparda-ms.de -uridnsbl_skip_domain sparda-n.de -uridnsbl_skip_domain sparda-ostbayern.de -uridnsbl_skip_domain sparda-sw.de -uridnsbl_skip_domain sparda-verband.de -uridnsbl_skip_domain sparda-west.de -uridnsbl_skip_domain sparkasse-bank-malta.com -uridnsbl_skip_domain sparkasse-bielefeld.de -uridnsbl_skip_domain sparkasse-bochum.de -uridnsbl_skip_domain sparkasse-gera-greiz.de -uridnsbl_skip_domain sparkasse-hamm.de -uridnsbl_skip_domain sparkasse-heidelberg.de -uridnsbl_skip_domain sparkasse-ingolstadt.de -uridnsbl_skip_domain sparkasse-mittelthueringen.de -uridnsbl_skip_domain sparkasse.at -uridnsbl_skip_domain sparkasse.ch -uridnsbl_skip_domain sparkasse.de -uridnsbl_skip_domain sparkasseblog.de -uridnsbl_skip_domain standardbank.co.za -uridnsbl_skip_domain standardbank.com -uridnsbl_skip_domain standardchartered.com.gh -uridnsbl_skip_domain standardchartered.com.my -uridnsbl_skip_domain suncorpbank.com.au -uridnsbl_skip_domain suntrust.com -uridnsbl_skip_domain swedbank.com -uridnsbl_skip_domain swedbank.ee -uridnsbl_skip_domain swedbank.lt -uridnsbl_skip_domain swedbank.lu -uridnsbl_skip_domain swedbank.se -uridnsbl_skip_domain swisscanto.ch -uridnsbl_skip_domain swisscaution.ch -uridnsbl_skip_domain swissquote.ch -uridnsbl_skip_domain sydbank.dk -uridnsbl_skip_domain tangerine.ca -uridnsbl_skip_domain tcb-bank.com.tw -uridnsbl_skip_domain tdbank.com -uridnsbl_skip_domain tdcommercialbanking.com -uridnsbl_skip_domain tescobank.com -uridnsbl_skip_domain tsb.co.nz -uridnsbl_skip_domain tsb.co.uk -uridnsbl_skip_domain tsbbank.co.nz -uridnsbl_skip_domain ubibanca.com -uridnsbl_skip_domain ubs.com -uridnsbl_skip_domain ulsterbank.co.uk -uridnsbl_skip_domain ulsterbankanytimebanking.co.uk -uridnsbl_skip_domain unibanco.pt -uridnsbl_skip_domain unibancoconnect.pt -uridnsbl_skip_domain unicredit.eu -uridnsbl_skip_domain unicredit.it -uridnsbl_skip_domain unicreditbank.lt -uridnsbl_skip_domain unicreditgroup.eu -uridnsbl_skip_domain unionbank.com -uridnsbl_skip_domain unionbankcameroon.com -uridnsbl_skip_domain unity.co.uk -uridnsbl_skip_domain uob.com.sg -uridnsbl_skip_domain uobgroup.com -uridnsbl_skip_domain usbank.com -uridnsbl_skip_domain valianttrust.com -uridnsbl_skip_domain vaudoise.ch -uridnsbl_skip_domain venetobanca.it -uridnsbl_skip_domain venetobanka.al -uridnsbl_skip_domain versabank.com -uridnsbl_skip_domain virginmoney.com -uridnsbl_skip_domain visa.com.ar -uridnsbl_skip_domain visa.com.br -uridnsbl_skip_domain visaeurope.ch -uridnsbl_skip_domain visaeurope.com -uridnsbl_skip_domain viseca.ch -uridnsbl_skip_domain volksbank.de -uridnsbl_skip_domain volkswagenbank.de -uridnsbl_skip_domain vpbank.com -uridnsbl_skip_domain vr.de -uridnsbl_skip_domain vwbank.de -uridnsbl_skip_domain wachovia.com -uridnsbl_skip_domain weatherbys.co.uk -uridnsbl_skip_domain wegelin.ch -uridnsbl_skip_domain wellsfargo.com -uridnsbl_skip_domain wellsfargoemail.com -uridnsbl_skip_domain westernunion.ca -uridnsbl_skip_domain westernunion.com -uridnsbl_skip_domain westernunion.fr -uridnsbl_skip_domain westernunion.se -uridnsbl_skip_domain westpac.co.nz -uridnsbl_skip_domain westpac.com.au -uridnsbl_skip_domain westpac.com.nz -uridnsbl_skip_domain wir.ch -uridnsbl_skip_domain worldbank.org -uridnsbl_skip_domain worldpay.com -uridnsbl_skip_domain wvb.de -uridnsbl_skip_domain yacht.nl -uridnsbl_skip_domain ybonline.co.uk -uridnsbl_skip_domain yorkshirebank.co.uk -uridnsbl_skip_domain yourbankcard.com -uridnsbl_skip_domain zagbank.ca -uridnsbl_skip_domain zenithbank.com -uridnsbl_skip_domain zkb.ch -uridnsbl_skip_domain zugerkb.ch -endif # Mail::SpamAssassin::Plugin::URIDNSBL diff -Nru spamassassin-3.4.6/trunk-only/rules-extras/README.txt spamassassin-4.0.0~rc3/trunk-only/rules-extras/README.txt --- spamassassin-3.4.6/trunk-only/rules-extras/README.txt 2017-04-11 04:56:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rules-extras/README.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Rules in this directory are NOT processed by masschecks or sa-update -Use at your own risk. - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/10_force_active.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/10_force_active.cf --- spamassassin-3.4.6/trunk-only/rulesrc/10_force_active.cf 2018-02-05 13:34:29.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/10_force_active.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,667 +0,0 @@ -# -# Force some sandbox rules to be active, since they have scores assigned -# by the GA/Perceptron evolver. If you want to remove a rule from -# this list, be sure to remove it's 'score' line in rules/50_scores.cf -# too. -# - -publish ACCESSDB -publish ACT_NOW_CAPS -publish ALL_TRUSTED -publish ANY_BOUNCE_MESSAGE -publish APOSTROPHE_FROM -publish BAD_CREDIT -publish BAD_ENC_HEADER -publish BANG_GUAR -publish BANG_OPRAH -publish BANKING_LAWS -publish BASE64_LENGTH_78_79 -publish BASE64_LENGTH_79_INF -publish BAYES_00 -publish BAYES_05 -publish BAYES_20 -publish BAYES_40 -publish BAYES_50 -publish BAYES_60 -publish BAYES_80 -publish BAYES_95 -publish BAYES_99 -publish BILLION_DOLLARS -publish BLANK_LINES_80_90 -publish BODY_8BITS -publish BODY_ENHANCEMENT -publish BODY_ENHANCEMENT2 -publish BOUNCE_MESSAGE -publish BUG6152_INVALID_DATE_TZ_ABSURD -publish CHALLENGE_RESPONSE -publish CHARSET_FARAWAY -publish CHARSET_FARAWAY_HEADER -publish CONFIRMED_FORGED -publish CORRUPT_FROM_LINE_IN_HDRS -publish CRBOUNCE_MESSAGE -publish CTYPE_001C_A -publish CTYPE_001C_B -publish CTYPE_8SPACE_GIF -publish CUM_SHOT -publish CURR_PRICE -publish DATE_IN_FUTURE_03_06 -publish DATE_IN_FUTURE_06_12 -publish DATE_IN_FUTURE_12_24 -publish DATE_IN_FUTURE_24_48 -publish DATE_IN_FUTURE_48_96 -publish DATE_IN_FUTURE_96_XX -publish DATE_IN_PAST_03_06 -publish DATE_IN_PAST_06_12 -publish DATE_IN_PAST_12_24 -publish DATE_IN_PAST_24_48 -publish DATE_IN_PAST_96_XX -publish DATE_SPAMWARE_Y2K -publish DCC_CHECK -publish DCC_REPUT_00_12 -publish DCC_REPUT_13_19 -publish DCC_REPUT_70_89 -publish DCC_REPUT_90_94 -publish DCC_REPUT_95_98 -publish DCC_REPUT_99_100 -publish DC_GIF_UNO_LARGO -publish DC_IMAGE_SPAM_HTML -publish DC_IMAGE_SPAM_TEXT -publish DC_PNG_UNO_LARGO -publish DEAR_FRIEND -publish DEAR_SOMETHING -publish DEAR_WINNER -publish DIET_1 -publish DIGEST_MULTIPLE -publish DKIM_ADSP_ALL -publish DKIM_ADSP_CUSTOM_HIGH -publish DKIM_ADSP_CUSTOM_LOW -publish DKIM_ADSP_CUSTOM_MED -publish DKIM_ADSP_DISCARD -publish DKIM_ADSP_NXDOMAIN -publish DKIM_POLICY_SIGNALL -publish DKIM_POLICY_SIGNSOME -publish DKIM_POLICY_TESTING -publish DKIM_SIGNED -publish DKIM_VALID -publish DKIM_VALID_AU -publish DKIM_VERIFIED -publish DOS_ANAL_SPAM_MAILER -publish DOS_FIX_MY_URI -publish DOS_HIGH_BAT_TO_MX -publish DOS_LET_GO_JOB -publish DOS_OE_TO_MX -publish DOS_OE_TO_MX_IMAGE -publish DOS_OUTLOOK_TO_MX -publish DOS_RCVD_IP_TWICE_C -publish DOS_STOCK_BAT -publish DOS_STOCK_BAT2 -publish DOS_URI_ASTERISK -publish DOS_YOUR_PLACE -publish DRUG_DOSAGE -publish DRUG_ED_CAPS -publish DRUG_ED_GENERIC -publish DRUG_ED_ONLINE -publish DRUG_ED_SILD -publish DRUGS_ANXIETY -publish DRUGS_ANXIETY_EREC -publish DRUGS_ANXIETY_OBFU -publish DRUGS_DIET -publish DRUGS_DIET_OBFU -publish DRUGS_ERECTILE -publish DRUGS_ERECTILE_OBFU -publish DRUGS_HDIA -publish DRUGS_MANYKINDS -publish DRUGS_MUSCLE -publish DRUGS_SLEEP_EREC -publish DRUGS_SMEAR1 -publish DRUGS_STOCK_MIMEOLE -publish DYN_RDNS_AND_INLINE_IMAGE -publish DYN_RDNS_SHORT_HELO_HTML -publish DYN_RDNS_SHORT_HELO_IMAGE -publish EMAIL_ROT13 -publish EMPTY_MESSAGE -publish EM_ROLEX -publish ENGLISH_UCE_SUBJECT -publish ENV_AND_HDR_SPF_MATCH -publish EXCUSE_24 -publish EXCUSE_4 -publish EXCUSE_REMOVE -publish EXTRA_MPART_TYPE -publish FAKE_OUTBLAZE_RCVD -publish FAKE_REPLY_C -publish FORGED_HOTMAIL_RCVD2 -publish FORGED_IMS_HTML -publish FORGED_IMS_TAGS -publish FORGED_MSGID_AOL -publish FORGED_MSGID_EXCITE -publish FORGED_MSGID_HOTMAIL -publish FORGED_MSGID_MSN -publish FORGED_MSGID_YAHOO -publish FORGED_MUA_EUDORA -publish FORGED_MUA_IMS -publish FORGED_MUA_MOZILLA -publish FORGED_MUA_OIMO -publish FORGED_MUA_OUTLOOK -publish FORGED_MUA_THEBAT_BOUN -publish FORGED_MUA_THEBAT_CS -publish FORGED_OUTLOOK_HTML -publish FORGED_OUTLOOK_TAGS -publish FORGED_QUALCOMM_TAGS -publish FORGED_TELESP_RCVD -publish FORGED_THEBAT_HTML -publish FORGED_YAHOO_RCVD -publish FORWARD_LOOKING -publish FR_3TAG_3TAG -publish FRAGMENTED_MESSAGE -publish FREEMAIL_ENVFROM_END_DIGIT -publish FREEMAIL_FORGED_REPLYTO -publish FREEMAIL_FROM -publish FREEMAIL_REPLY -publish FREEMAIL_REPLYTO -publish FREEMAIL_REPLYTO_END_DIGIT -publish FREE_PORN -publish FREE_QUOTE_INSTANT -publish FR_MIDER -publish FROM_BLANK_NAME -publish FROM_DOMAIN_NOVOWEL -publish FROM_EXCESS_BASE64 -publish FROM_ILLEGAL_CHARS -publish FROM_LOCAL_DIGITS -publish FROM_LOCAL_HEX -publish FROM_LOCAL_NOVOWEL -publish FROM_NO_USER -publish FROM_OFFERS -publish FROM_STARTS_WITH_NUMS -publish FS_LARGE_PERCENT2 -publish FSL_FAKE_HOTMAIL_RVCD -publish FSL_HELO_BARE_IP_1 -publish FSL_HELO_DEVICE -publish FSL_HELO_NON_FQDN_1 -publish FSL_HELO_SETUP -publish FSL_INTERIA_ABUSE -publish FUZZY_AFFORDABLE -publish FUZZY_AMBIEN -publish FUZZY_BILLION -publish FUZZY_CPILL -publish FUZZY_CREDIT -publish FUZZY_ERECT -publish FUZZY_GUARANTEE -publish FUZZY_MEDICATION -publish FUZZY_MERIDIA -publish FUZZY_MILLION -publish FUZZY_MONEY -publish FUZZY_MORTGAGE -publish FUZZY_OBLIGATION -publish FUZZY_OFFERS -publish FUZZY_PHARMACY -publish FUZZY_PHENT -publish FUZZY_PRESCRIPT -publish FUZZY_PRICES -publish FUZZY_REFINANCE -publish FUZZY_REMOVE -publish FUZZY_ROLEX -publish FUZZY_SOFTWARE -publish FUZZY_THOUSANDS -publish FUZZY_VIOXX -publish FUZZY_VLIUM -publish FUZZY_VPILL -publish FUZZY_XPILL -publish GAPPY_SUBJECT -publish GEO_QUERY_STRING -publish GTUBE -publish GUARANTEED_100_PERCENT -publish HASHCASH_20 -publish HASHCASH_21 -publish HASHCASH_22 -publish HASHCASH_23 -publish HASHCASH_24 -publish HASHCASH_25 -publish HASHCASH_2SPEND -publish HASHCASH_HIGH -publish HDR_ORDER_FTSDMCXX_001C -publish HDR_ORDER_FTSDMCXX_BAT -publish HEADER_COUNT_CTYPE -publish HEADER_COUNT_SUBJECT -publish HEADER_SPAM -publish HEAD_ILLEGAL_CHARS -publish HEAD_LONG -publish HELO_DYNAMIC_CHELLO_NL -publish HELO_DYNAMIC_DHCP -publish HELO_DYNAMIC_DIALIN -publish HELO_DYNAMIC_HCC -publish HELO_DYNAMIC_HEXIP -publish HELO_DYNAMIC_HOME_NL -publish HELO_DYNAMIC_IPADDR -publish HELO_DYNAMIC_IPADDR2 -publish HELO_DYNAMIC_ROGERS -publish HELO_DYNAMIC_SPLIT_IP -publish HELO_FRIEND -publish HELO_LH_LD -publish HELO_LOCALHOST -publish HELO_OEM -publish HELO_STATIC_HOST -publish HIDE_WIN_STATUS -publish HIGH_CODEPAGE_URI -publish HK_FAKENAME_EBAY -publish HK_LOTTO -publish HK_NAME_DRUGS -publish HK_RANDOM_ENVFROM -publish HS_BOBAX_MID_2 -publish HS_BODY_UPLOADED_SOFTWARE -publish HTML_BADTAG_40_50 -publish HTML_BADTAG_50_60 -publish HTML_BADTAG_60_70 -publish HTML_BADTAG_90_100 -publish HTML_CHARSET_FARAWAY -publish HTML_COMMENT_SAVED_URL -publish HTML_COMMENT_SHORT -publish HTML_EMBEDS -publish HTML_EXTRA_CLOSE -publish HTML_FONT_FACE_BAD -publish HTML_FONT_LOW_CONTRAST -publish HTML_FONT_SIZE_HUGE -publish HTML_FONT_SIZE_LARGE -publish HTML_FORMACTION_MAILTO -publish HTML_IFRAME_SRC -publish HTML_IMAGE_ONLY_04 -publish HTML_IMAGE_ONLY_08 -publish HTML_IMAGE_ONLY_12 -publish HTML_IMAGE_ONLY_16 -publish HTML_IMAGE_ONLY_20 -publish HTML_IMAGE_ONLY_24 -publish HTML_IMAGE_ONLY_28 -publish HTML_IMAGE_ONLY_32 -publish HTML_IMAGE_RATIO_02 -publish HTML_IMAGE_RATIO_04 -publish HTML_IMAGE_RATIO_06 -publish HTML_IMAGE_RATIO_08 -publish HTML_MESSAGE -publish HTML_MIME_NO_HTML_TAG -publish HTML_MISSING_CTYPE -publish HTML_NONELEMENT_30_40 -publish HTML_NONELEMENT_40_50 -publish HTML_NONELEMENT_60_70 -publish HTML_NONELEMENT_80_90 -publish HTML_OBFUSCATE_05_10 -publish HTML_OBFUSCATE_10_20 -publish HTML_OBFUSCATE_20_30 -publish HTML_OBFUSCATE_30_40 -publish HTML_OBFUSCATE_50_60 -publish HTML_OBFUSCATE_70_80 -publish HTML_OBFUSCATE_90_100 -publish HTML_SHORT_CENTER -publish HTML_SHORT_LINK_IMG_1 -publish HTML_SHORT_LINK_IMG_2 -publish HTML_SHORT_LINK_IMG_3 -publish HTML_TAG_BALANCE_BODY -publish HTML_TAG_BALANCE_HEAD -publish HTML_TAG_EXIST_BGSOUND -publish HTML_TITLE_SUBJ_DIFF -publish HTTP_77 -publish HTTP_ESCAPED_HOST -publish HTTP_EXCESSIVE_ESCAPES -publish HTTPS_HTTP_MISMATCH -publish HTTPS_IP_MISMATCH -publish IMPOTENCE -publish INVALID_DATE -publish INVALID_DATE_TZ_ABSURD -publish INVALID_MSGID -publish INVALID_TZ_CST -publish INVALID_TZ_EST -publish INVESTMENT_ADVICE -publish IP_LINK_PLUS -publish JAPANESE_UCE_BODY -publish JAPANESE_UCE_SUBJECT -publish JM_I_FEEL_LUCKY -publish JM_RCVD_QMAILV1 -publish JM_TORA_XM -publish JOIN_MILLIONS -publish JS_FROMCHARCODE -publish KAM_LOTTO1 -publish KAM_LOTTO2 -publish KAM_STOCKOTC -publish KAM_STOCKTIP15 -publish KAM_STOCKTIP20 -publish KAM_STOCKTIP21 -publish KAM_STOCKTIP4 -publish KAM_STOCKTIP6 -publish KB_DATE_CONTAINS_TAB -publish KB_FAKED_THE_BAT -publish KB_RATWARE_BOUNDARY -publish KB_RATWARE_MSGID -publish KB_RATWARE_OUTLOOK_08 -publish KB_RATWARE_OUTLOOK_12 -publish KB_RATWARE_OUTLOOK_16 -publish KB_RATWARE_OUTLOOK_MID -publish KOREAN_UCE_SUBJECT -publish LIVEFILESTORE -publish LIVE_PORN -publish LOCALPART_IN_SUBJECT -publish LONG_TERM_PRICE -publish LONGWORDS -publish LOOPHOLE_1 -publish LOTTERY_1 -publish LOTTERY_PH_004470 -publish LOW_PRICE -publish L_SPAM_TOOL_13 -publish MALE_ENHANCE -publish MARKETING_PARTNERS -publish MICROSOFT_EXECUTABLE -publish MID_DEGREES -#publish MILLION_USD -publish MIME_BAD_ISO_CHARSET -publish MIME_BASE64_BLANKS -publish MIME_BASE64_TEXT -publish MIME_BOUND_DD_DIGITS -publish MIME_BOUND_DIGITS_15 -publish MIME_BOUND_EQ_REL -publish MIME_BOUND_MANY_HEX -publish MIME_CHARSET_FARAWAY -publish MIME_HEADER_CTYPE_ONLY -publish MIME_HTML_MOSTLY -publish MIME_HTML_ONLY -publish MIME_HTML_ONLY_MULTI -publish MIME_PHP_NO_TEXT -publish MIME_QP_LONG_LINE -publish MIME_SUSPECT_NAME -publish MISSING_DATE -publish MISSING_HB_SEP -publish MISSING_HEADERS -publish MISSING_MID -publish MISSING_MIME_HB_SEP -publish MISSING_MIMEOLE -publish MISSING_SUBJECT -publish MONEY_BACK -publish MORE_SEX -publish MPART_ALT_DIFF -publish MPART_ALT_DIFF_COUNT -publish MSGID_DOLLARS_RANDOM -publish MSGID_FROM_MTA_HEADER -publish MSGID_MULTIPLE_AT -publish MSGID_OUTLOOK_INVALID -publish MSGID_RANDY -publish MSGID_SHORT -publish MSGID_SPAM_CAPS -publish MSGID_SPAM_LETTERS -publish MSGID_YAHOO_CAPS -publish MSOE_MID_WRONG_CASE -publish MULTI_FORGED -publish MULTIPART_ALT_NON_TEXT -#publish NA_DOLLARS -publish NML_ADSP_CUSTOM_HIGH -publish NML_ADSP_CUSTOM_LOW -publish NML_ADSP_CUSTOM_MED -publish NO_DNS_FOR_FROM -publish NO_HEADERS_MESSAGE -publish NO_MEDICAL -publish NONEXISTENT_CHARSET -publish NO_PRESCRIPTION -publish NO_RDNS_DOTCOM_HELO -publish NO_RECEIVED -publish NO_RELAYS -publish NORMAL_HTTP_TO_IP -publish NOT_ADVISOR -publish NULL_IN_BODY -publish NUMERIC_HTTP_ADDR -publish OBFUSCATING_COMMENT -publish OBSCURED_EMAIL -publish ONE_TIME -publish ONLINE_PHARMACY -publish PART_CID_STOCK -publish PART_CID_STOCK_LESS -publish PERCENT_RANDOM -publish PLING_QUERY -publish PREST_NON_ACCREDITED -publish PREVENT_NONDELIVERY -publish PRICES_ARE_AFFORDABLE -publish PYZOR_CHECK -publish RATWARE_EFROM -publish RATWARE_EGROUPS -publish RATWARE_HASH_DASH -publish RATWARE_MOZ_MALFORMED -publish RATWARE_MPOP_WEBMAIL -publish RATWARE_MS_HASH -publish RATWARE_NAME_ID -publish RATWARE_OE_MALFORMED -publish RATWARE_OUTLOOK_NONAME -publish RATWARE_RCVD_AT -publish RATWARE_RCVD_PF -publish RATWARE_ZERO_TZ -publish RAZOR2_CF_RANGE_51_100 -publish RAZOR2_CF_RANGE_E4_51_100 -publish RAZOR2_CF_RANGE_E8_51_100 -publish RAZOR2_CHECK -publish RCVD_AM_PM -publish RCVD_BAD_ID -publish RCVD_DOUBLE_IP_LOOSE -publish RCVD_DOUBLE_IP_SPAM -publish RCVD_FAKE_HELO_DOTCOM -publish RCVD_FORGED_WROTE -publish RCVD_FORGED_WROTE2 -publish RCVD_HELO_IP_MISMATCH -publish RCVD_ILLEGAL_IP -publish RCVD_IN_BL_SPAMCOP_NET -#publish RCVD_IN_BRBL_LASTEXT -publish RCVD_IN_CSS -publish RCVD_IN_DNSWL_HI -publish RCVD_IN_DNSWL_LOW -publish RCVD_IN_DNSWL_MED -publish RCVD_IN_DNSWL_NONE -publish RCVD_IN_DNSWL_BLOCKED -publish RCVD_IN_IADB_DK -publish RCVD_IN_IADB_DOPTIN -publish RCVD_IN_IADB_DOPTIN_GT50 -publish RCVD_IN_IADB_DOPTIN_LT50 -publish RCVD_IN_IADB_EDDB -publish RCVD_IN_IADB_EPIA -publish RCVD_IN_IADB_GOODMAIL -publish RCVD_IN_IADB_LISTED -publish RCVD_IN_IADB_LOOSE -publish RCVD_IN_IADB_MI_CPEAR -publish RCVD_IN_IADB_MI_CPR_30 -publish RCVD_IN_IADB_MI_CPR_MAT -publish RCVD_IN_IADB_ML_DOPTIN -publish RCVD_IN_IADB_NOCONTROL -publish RCVD_IN_IADB_OOO -publish RCVD_IN_IADB_OPTIN -publish RCVD_IN_IADB_OPTIN_GT50 -publish RCVD_IN_IADB_OPTIN_LT50 -publish RCVD_IN_IADB_OPTOUTONLY -publish RCVD_IN_IADB_RDNS -publish RCVD_IN_IADB_SENDERID -publish RCVD_IN_IADB_SPF -publish RCVD_IN_IADB_UNVERIFIED_1 -publish RCVD_IN_IADB_UNVERIFIED_2 -publish RCVD_IN_IADB_UT_CPEAR -publish RCVD_IN_IADB_UT_CPR_30 -publish RCVD_IN_IADB_UT_CPR_MAT -publish RCVD_IN_IADB_VOUCHED -publish RCVD_IN_MAPS_DUL -publish RCVD_IN_MAPS_NML -publish RCVD_IN_MAPS_OPS -publish RCVD_IN_MAPS_RBL -publish RCVD_IN_MAPS_RSS -publish RCVD_IN_PBL -publish RCVD_IN_PSBL -publish RCVD_IN_RP_CERTIFIED -publish RCVD_IN_RP_RNBL -publish RCVD_IN_RP_SAFE -publish RCVD_IN_SBL -publish RCVD_IN_SORBS_BLOCK -publish RCVD_IN_SORBS_DUL -publish RCVD_IN_SORBS_HTTP -publish RCVD_IN_SORBS_MISC -publish RCVD_IN_SORBS_SMTP -publish RCVD_IN_SORBS_SOCKS -publish RCVD_IN_SORBS_WEB -publish RCVD_IN_SORBS_ZOMBIE -publish RCVD_IN_XBL -publish RCVD_MAIL_COM -publish RCVD_NUMERIC_HELO -publish RDNS_DYNAMIC -publish RDNS_LOCALHOST -publish RDNS_NONE -publish REFINANCE_NOW -publish REFINANCE_YOUR_HOME -publish REMOVE_BEFORE_LINK -publish REPLICA_WATCH -publish REPLYTO_WITHOUT_TO_CC -publish REPTO_QUOTE_AOL -publish REPTO_QUOTE_IMS -publish REPTO_QUOTE_MSN -publish REPTO_QUOTE_QUALCOMM -publish REPTO_QUOTE_YAHOO -publish RUDE_HTML -publish SB_GIF_AND_NO_URIS -publish SHORTCIRCUIT -publish SHORT_HELO_AND_INLINE_IMAGE -publish SHORT_TERM_PRICE -publish SORTED_RECIPS -publish SPAMMY_XMAILER -publish SPF_FAIL -publish SPF_HELO_FAIL -publish SPF_HELO_NEUTRAL -publish SPF_HELO_PASS -publish SPF_HELO_SOFTFAIL -publish SPF_NEUTRAL -publish SPF_PASS -publish SPF_SOFTFAIL -publish SPOOF_COM2COM -publish SPOOF_COM2OTH -publish SPOOF_NET2COM -publish STOCK_ALERT -publish STOCK_IMG_CTYPE -publish STOCK_IMG_HDR_FROM -publish STOCK_IMG_HTML -publish STOCK_IMG_OUTLOOK -publish STOCK_PRICES -publish STOX_AND_PRICE -publish STOX_REPLY_TYPE -publish STOX_REPLY_TYPE_WITHOUT_QUOTES -publish STRONG_BUY -publish SUBJ_ALL_CAPS -publish SUBJ_AS_SEEN -publish SUBJ_BUY -publish SUBJ_DOLLARS -publish SUBJECT_DIET -publish SUBJECT_DRUG_GAP_C -publish SUBJECT_DRUG_GAP_L -publish SUBJECT_DRUG_GAP_S -publish SUBJECT_DRUG_GAP_VA -publish SUBJECT_DRUG_GAP_X -publish SUBJECT_FUZZY_CHEAP -publish SUBJECT_FUZZY_MEDS -publish SUBJECT_FUZZY_PENIS -publish SUBJECT_FUZZY_TION -publish SUBJECT_FUZZY_VPILL -publish SUBJECT_IN_BLACKLIST -publish SUBJECT_IN_WHITELIST -publish SUBJECT_NEEDS_ENCODING -publish SUBJECT_SEXUAL -publish SUBJ_ILLEGAL_CHARS -publish SUBJ_RE_NUM -#publish SUBJ_YOUR_DEBT -publish SUBJ_YOUR_FAMILY -publish SUSPICIOUS_RECIPS -publish TBIRD_SUSP_MIME_BDRY -publish THEBAT_UNREG -publish TO_MALFORMED -publish TRACKER_ID -publish TT_MSGID_TRUNC -publish TT_OBSCURED_VALIUM -publish TT_OBSCURED_VIAGRA -publish TVD_ACT_193 -publish TVD_APPROVED -publish TVD_DEAR_HOMEOWNER -publish TVD_EB_PHISH -publish TVD_ENVFROM_APOST -publish TVD_FINGER_02 -publish TVD_FLOAT_GENERAL -publish TVD_FUZZY_DEGREE -publish TVD_FUZZY_FINANCE -publish TVD_FUZZY_FIXED_RATE -publish TVD_FUZZY_MICROCAP -publish TVD_FUZZY_PHARMACEUTICAL -publish TVD_FUZZY_SYMBOL -publish TVD_FW_GRAPHIC_NAME_LONG -publish TVD_FW_GRAPHIC_NAME_MID -publish TVD_INCREASE_SIZE -publish TVD_LINK_SAVE -publish TVD_PH_BODY_ACCOUNTS_PRE -publish TVD_PH_REC -publish TVD_PH_SEC -publish TVD_PH_SUBJ_ACCOUNTS_POST -publish TVD_PH_SUBJ_SEC_MEASURES -publish TVD_PH_SUBJ_URGENT -publish TVD_PP_PHISH -publish TVD_QUAL_MEDS -publish TVD_RATWARE_CB -publish TVD_RATWARE_CB_2 -publish TVD_RATWARE_MSGID_02 -publish TVD_RCVD_IP -publish TVD_RCVD_IP4 -publish TVD_RCVD_SINGLE -publish TVD_RCVD_SPACE_BRACKET -publish TVD_SECTION -publish TVD_SILLY_URI_OBFU -publish TVD_SPACED_SUBJECT_WORD3 -publish TVD_SPACE_RATIO -publish TVD_STOCK1 -publish TVD_SUBJ_ACC_NUM -publish TVD_SUBJ_FINGER_03 -publish TVD_SUBJ_OWE -publish TVD_SUBJ_WIPE_DEBT -publish TVD_VIS_HIDDEN -publish TVD_VISIT_PHARMA -publish UNCLAIMED_MONEY -publish UNCLOSED_BRACKET -publish UNPARSEABLE_RELAY -publish UNRESOLVED_TEMPLATE -publish UNWANTED_LANGUAGE_BODY -publish UPPERCASE_50_75 -publish UPPERCASE_75_100 -publish URG_BIZ -publish URIBL_AB_SURBL -publish URIBL_BLACK -publish URIBL_BLOCKED -publish URIBL_GREY -publish URIBL_JP_SURBL -publish URIBL_PH_SURBL -publish URIBL_MW_SURBL -publish URIBL_RED -publish URIBL_RHS_DOB -publish URIBL_SBL -publish URIBL_SBL_A -publish URIBL_SC_SURBL -publish URIBL_WS_SURBL -publish URI_HEX -publish URI_NOVOWEL -publish URI_NO_WWW_BIZ_CGI -publish URI_NO_WWW_INFO_CGI -publish URI_OBFU_WWW -publish URI_TRUNCATED -publish URI_UNSUBSCRIBE -#publish US_DOLLARS_3 -publish USER_IN_ALL_SPAM_TO -publish USER_IN_BLACKLIST -publish USER_IN_BLACKLIST_TO -publish USER_IN_DEF_DKIM_WL -publish USER_IN_DEF_SPF_WL -publish USER_IN_DEF_WHITELIST -publish USER_IN_DKIM_WHITELIST -publish USER_IN_MORE_SPAM_TO -publish USER_IN_SPF_WHITELIST -publish USER_IN_WHITELIST -publish USER_IN_WHITELIST_TO -publish VANITY -publish VBOUNCE_MESSAGE -publish VIA_GAP_GRA -publish WEIRD_PORT -publish WEIRD_QUOTING -publish WITH_LC_SMTP -publish X_IP -publish X_MAILER_CME_6543_MSN -publish X_MESSAGE_INFO -publish X_PRIORITY_CC -publish YAHOO_DRS_REDIR -publish YAHOO_RD_REDIR diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/20_axb_misc.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/20_axb_misc.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/20_axb_misc.cf 2015-04-16 10:26:10.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/20_axb_misc.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -ifplugin Mail::SpamAssassin::Plugin::URIDetail - uri_detail AXB_URIDETAIL_BROWSETHIS text =~ /You may browse this\./ - describe AXB_URIDETAIL_BROWSETHIS LLT fingerprint - tflags AXB_URIDETAIL_BROWSETHIS nopublish -endif - - -uri AXB_URI_CDGB /\/\?cid\=gib/ -describe AXB_URI_CDGB Do not mistake with CBGB - - -header AXB_X_FF_SEZ_S X-Forefront-Antispam-Report =~ /\bSFV\:SPM\b/ -describe AXB_X_FF_SEZ_S Forefront sez this is spam - -rawbody AXB_RBDY_TENANDTEN /\&\#1088\;\&\#1092\;/ -describe AXB_RBDY_TENANDTEN Ten & Ten - -# 2012-09-27 -header __AXB_XM_OL_2600 X-Mailer =~ /Microsoft\ Outlook\ Express\ 6\.00\.2600\.0000/ -header __AXB_MO_OL_2600 X-MimeOLE =~ /Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2600\.0000/ -meta AXB_XM_FORGED_OL2600 (__AXB_XM_OL_2600 && !__AXB_MO_OL_2600 ) -describe AXB_XM_FORGED_OL2600 Forged OE v. 6.2600 - - -# 2012-01-04 -header AXB_X_AOL_SEZ_S x-aol-global-disposition =~ /^S$/ -describe AXB_X_AOL_SEZ_S AOL said this is S* - - - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/20_axb_pdf.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/20_axb_pdf.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/20_axb_pdf.cf 2015-02-21 16:57:02.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/20_axb_pdf.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -ifplugin Mail::SpamAssassin::Plugin::PDFInfo - -# Hint -## cat spam.eml | spamassassin --debug pdfinfo - -#2014-12-2 -#body AXB_PDFINFO_AUTH_TEST eval:pdf_match_details('author','/^Test$/') -#describe AXB_PDFINFO_AUTH_TEST PDF trait seen in spam - -#2014-12-2 -#body AXB_PDF_FUZZY_LOTTOUK eval:pdf_match_fuzzy_md5('A2E91B898193A34CA233632210FA87C9') -#describe AXB_PDF_FUZZY_LOTTOUK Fuzzy tags Match - -#2014-12-2 -#body AXB_PDF_FUZZY2_WINNING eval:pdf_match_fuzzy_md5('4440EC39D1441386FF8AE1E9A12F9F4B') -#describe AXB_PDF_FUZZY2_WINNING Fuzzy tags match - -#2014-12-2 -#body AXB_PDF_FUZZY1_EBR eval:pdf_match_fuzzy_md5('68E3B831CD249E5E0E1F48F2346CB1A9') -#describe AXB_PDF_FUZZY1_EBR Fuzzy tags match - - - -endif diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/20_xmailer.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/20_xmailer.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/20_xmailer.cf 2014-03-21 09:39:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/20_xmailer.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# Auto generated: Tue, 05 Mar 2013 13:33:02 +0100 -header __AXB_XM_OL_024C2 X-Mailer =~ /Microsoft\ Outlook\ Express\ 6\.00\.2600\.0000/ -header __AXB_MO_OL_024C2 X-MimeOLE =~ /Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2600\.0000/ -meta AXB_XMAILER_MIMEOLE_OL_024C2 (__AXB_XM_OL_024C2 && __AXB_MO_OL_024C2) -describe AXB_XMAILER_MIMEOLE_OL_024C2 Yet another X header trait - - -# Auto generated: Tue, 05 Mar 2013 13:33:02 +0100 -header __AXB_XM_OL_1ECD5 X-Mailer =~ /Microsoft\ Outlook\ Express\ 6\.00\.2800\.1081/ -header __AXB_MO_OL_1ECD5 X-MimeOLE =~ /Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2800\.1081/ -meta AXB_XMAILER_MIMEOLE_OL_1ECD5 (__AXB_XM_OL_1ECD5 && __AXB_MO_OL_1ECD5) -describe AXB_XMAILER_MIMEOLE_OL_1ECD5 Yet another X header trait \ No newline at end of file diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/23_bayes_ignore_header.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/23_bayes_ignore_header.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/23_bayes_ignore_header.cf 2015-02-18 08:48:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/23_bayes_ignore_header.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,257 +0,0 @@ -# Last update: 2015-02-18-axb -# Set headers which may provide inappropriate AV/filter cues to the Bayesian classifier -bayes_ignore_header X_CMAE_Category -bayes_ignore_header X-ACL-Warn -bayes_ignore_header X-Alimail-AntiSpam -bayes_ignore_header X-Amavis-Modified -bayes_ignore_header X-AntiAbuse -bayes_ignore_header X-Antispam -bayes_ignore_header X-Anti-Spam -bayes_ignore_header X-Antivirus -bayes_ignore_header X-Anti-Virus -bayes_ignore_header X-Antivirus-Code -bayes_ignore_header X-Antivirus-Status -bayes_ignore_header X-Antivirus-Version -bayes_ignore_header X-Anti-Virus-Version -bayes_ignore_header x-aol-global-disposition -bayes_ignore_header X-ASF-Spam-Status -bayes_ignore_header X-ASG-Debug-ID -bayes_ignore_header X-ASG-Orig-Subj -bayes_ignore_header X-ASG-Recipient-Whitelist -bayes_ignore_header X-ASG-Tag -bayes_ignore_header X-Assp-Version -bayes_ignore_header X-Authority-Analysis -bayes_ignore_header X-Authvirus -bayes_ignore_header X-Auto-Response-Suppress -bayes_ignore_header x-avast-antispam -bayes_ignore_header X-AV-Do-Run -bayes_ignore_header X-AV-Status -bayes_ignore_header X-Backend -bayes_ignore_header X-Barracuda-Apparent-Source-IP -bayes_ignore_header X-Barracuda-Bayes -bayes_ignore_header X-Barracuda-BBL-IP -bayes_ignore_header X-Barracuda-BRTS-Status -bayes_ignore_header X-Barracuda-BRTS-URL-Found -bayes_ignore_header X-Barracuda-Connect -bayes_ignore_header X-Barracuda-Encrypted -bayes_ignore_header X-Barracuda-Envelope-From -bayes_ignore_header X-Barracuda-Fingerprint-Found -bayes_ignore_header X-Barracuda-Orig-Rcpt -bayes_ignore_header X-Barracuda-RBL-IP -bayes_ignore_header X-Barracuda-RBL-Trusted-Forwarder -bayes_ignore_header X-Barracuda-Spam-Report -bayes_ignore_header X-Barracuda-Spam-Score -bayes_ignore_header X-Barracuda-Spam-Status -bayes_ignore_header X-Barracuda-Start-Time -bayes_ignore_header X-Barracuda-UID -bayes_ignore_header X-Barracuda-URL -bayes_ignore_header X-Barracuda-Virus-Alert -bayes_ignore_header X-Bayesian-Result -bayes_ignore_header X-Bayes-Prob -bayes_ignore_header X-BitDefender-Spam -bayes_ignore_header X-BitDefender-SpamStamp -bayes_ignore_header X-BL -bayes_ignore_header X-Bogosity -bayes_ignore_header X-Boxtrapper -bayes_ignore_header X-Brightmail-Tracker -bayes_ignore_header X-BTI-AntiSpam -bayes_ignore_header X-Bugzilla-Version -bayes_ignore_header X-CanIt-Geo -bayes_ignore_header X-CanItPRO-Stream -bayes_ignore_header X-Canit-Stats-ID -bayes_ignore_header X-Clapf-spamicity -bayes_ignore_header X-Cloud-Security -bayes_ignore_header X-CMAE-Analysis -bayes_ignore_header X-CMAE-Match -bayes_ignore_header X-CMAE-Score -bayes_ignore_header X-CMAE-Verdict -bayes_ignore_header X-CM-Score -bayes_ignore_header X-CNFS-Analysis -bayes_ignore_header X-Coremail-Antispam -bayes_ignore_header X-CRM114-CacheID -bayes_ignore_header X-CRM114-Status -bayes_ignore_header X-CRM114-Version -bayes_ignore_header X-CTCH-SenderID -bayes_ignore_header X-CTCH-SenderID-TotalBulk -bayes_ignore_header X-CTCH-SenderID-TotalConfirmed -bayes_ignore_header X-CTCH-SenderID-TotalMessages -bayes_ignore_header X-CTCH-SenderID-TotalRecipients -bayes_ignore_header X-CTCH-SenderID-TotalSpam -bayes_ignore_header X-CTCH-SenderID-TotalSuspected -bayes_ignore_header X-CTCH-SenderID-TotalVirus -bayes_ignore_header X-CTCH-Spam -bayes_ignore_header X-CTCH-VOD -bayes_ignore_header X-CT-Spam -bayes_ignore_header X-Drweb-SpamState -bayes_ignore_header X-DSPAM-Confidence -bayes_ignore_header X-DSPAM-Factors -bayes_ignore_header X-DSPAM-Improbability -bayes_ignore_header X-DSPAM-Probability -bayes_ignore_header X-DSPAM-Processed -bayes_ignore_header X-DSPAM-Result -bayes_ignore_header X-DSPAM-Signature -bayes_ignore_header x-eavas -bayes_ignore_header x-eavas-action -bayes_ignore_header x-eavas-eavasid -bayes_ignore_header X-Enigmail-Version -bayes_ignore_header X-EsetId -bayes_ignore_header X-EsetResult -bayes_ignore_header X-Exchange-Antispam-Report -bayes_ignore_header X-EYOU-SPAMVALUE -bayes_ignore_header X-FB-OUTBOUND-SPAM -bayes_ignore_header X-FEAS-SBL -bayes_ignore_header X-FILTER-SCORE -bayes_ignore_header X-Forefront-Antispam-Report -bayes_ignore_header X-Forefront-PRVS -bayes_ignore_header X-Fuglu-Spamstatus -bayes_ignore_header X-Fuglu-Suspect -bayes_ignore_header X-getmail-filter-classifier -bayes_ignore_header X-GFIME-MASPAM -bayes_ignore_header X-Gmane-NNTP-Posting-Host -bayes_ignore_header X-GMX-Antispam -bayes_ignore_header X-GMX-Antivirus -bayes_ignore_header X-He-Spam -bayes_ignore_header X-hMailServer-Spam -bayes_ignore_header X-IAS -bayes_ignore_header X-iGspam-global -bayes_ignore_header X-Injected-Via-Gmane -bayes_ignore_header X-Interia-Antivirus -bayes_ignore_header X-IP-Spam-Verdict -bayes_ignore_header X-Ironport -bayes_ignore_header X-IronPort-Anti-Spam-Filtered -bayes_ignore_header X-IronPort-Anti-Spam-Result -bayes_ignore_header X-IronPort-AV -bayes_ignore_header X-IronPort-Outgoing-Antispam -bayes_ignore_header X-Junkmail -bayes_ignore_header X-Junk-Score -bayes_ignore_header X-KLMS-AntiPhishing -bayes_ignore_header X-Klms-Antispam -bayes_ignore_header X-KLMS-AntiSpam-Info -bayes_ignore_header X-KLMS-AntiSpam-Interceptor-Info -bayes_ignore_header X-KLMS-AntiSpam-Lua-Profiles -bayes_ignore_header X-KLMS-AntiSpam-Method -bayes_ignore_header X-KLMS-AntiSpam-Moebius-Timestamps -bayes_ignore_header X-KLMS-AntiSpam-Rate -bayes_ignore_header X-KLMS-AntiSpam-Status -bayes_ignore_header X-KLMS-AntiSpam-Version -bayes_ignore_header X-KLMS-AntiVirus -bayes_ignore_header X-KLMS-AntiVirus-Status -bayes_ignore_header X-KLMS-Message-Action -bayes_ignore_header X-KLMS-Rule-ID -bayes_ignore_header X-KMail-EncryptionState -bayes_ignore_header X-KMail-MDN-Sent -bayes_ignore_header X-KMail-SignatureState -bayes_ignore_header X-MailCleaner-SpamChec -bayes_ignore_header X-MailCleaner-SpamCheck -bayes_ignore_header X-MailFoundry -bayes_ignore_header X-MDMailLookup-Result -bayes_ignore_header X-ME-Bayesian -bayes_ignore_header X-ME-Content -bayes_ignore_header X-Microsoft-Antispam -bayes_ignore_header X-Mlf-Version -bayes_ignore_header X-MXScan-AntiSpam -bayes_ignore_header X-MXScan-AntiVirus -bayes_ignore_header X-MXScan-Country-Sequence -bayes_ignore_header X-MXScan-License -bayes_ignore_header X-MXScan-Msgid -bayes_ignore_header X-MXScan-ProcessingTime -bayes_ignore_header X-MXScan-Scan -bayes_ignore_header X-NAI-Spam-Flag -bayes_ignore_header X-NAI-Spam-Rules -bayes_ignore_header X-NAI-Spam-Score -bayes_ignore_header X-NAI-Spam-Threshold -bayes_ignore_header X-NetStation-Status -bayes_ignore_header X-OVH-SPAMCAUSE -bayes_ignore_header X-OVH-SPAMCAUSE: -bayes_ignore_header X-OVH-SPAMSCORE -bayes_ignore_header X-OVH-SPAMSTATE -bayes_ignore_header X-PerlMx-Spam -bayes_ignore_header X-PerlMx-Virus-Scanned -bayes_ignore_header X-PFSI-Info -bayes_ignore_header X-PMX-Spam -bayes_ignore_header X-PMX-Version -bayes_ignore_header X-policyd-weight -bayes_ignore_header X-Policy-Service -bayes_ignore_header X-PreRBLs -bayes_ignore_header X-Probable-Spam -bayes_ignore_header X-PROLinux-SpamCheck -bayes_ignore_header X-Proofpoint-Spam-Reason -bayes_ignore_header X-Proofpoint-Virus-Version -bayes_ignore_header x-purgate-eavas: clean -bayes_ignore_header x-purgate-id -bayes_ignore_header x-purgate-size -bayes_ignore_header x-purgate-type -bayes_ignore_header X-Qmail-Scanner-Diagnostics -bayes_ignore_header X-Qmail-Scanner-MOVED-X-Spam-Status -bayes_ignore_header X-Quarantine-ID -bayes_ignore_header X-RSpam-Report -bayes_ignore_header X-SA-Do-Not-Run -bayes_ignore_header X-SA-Exim-Version -bayes_ignore_header X-Scanned-by -bayes_ignore_header X-SmarterMail-CustomSpamHeader -bayes_ignore_header X-Spam -bayes_ignore_header X-Spam_bar -bayes_ignore_header X-Spam-Action -bayes_ignore_header X-SPAM-AISP -bayes_ignore_header X-Spambayes-Classification -bayes_ignore_header X-Spam-Check-By -bayes_ignore_header X-Spam-Checker-Version -bayes_ignore_header X-Spam-CMAE-Analysis -bayes_ignore_header X-Spam-CMAESCORE -bayes_ignore_header X-Spam-CTCH-RefID -bayes_ignore_header X-SpamExperts-Domain -bayes_ignore_header X-SpamExperts-Outgoing-Class -bayes_ignore_header X-SpamExperts-Outgoing-Evidence -bayes_ignore_header X-SpamExperts-Username -bayes_ignore_header X-Spamfilter-host -bayes_ignore_header X-Spam-Flag -bayes_ignore_header X-Spamina-Bogosity -bayes_ignore_header X-Spamina-Spam-Report -bayes_ignore_header X-Spamina-Spam-Score -bayes_ignore_header X-SpamInfo -bayes_ignore_header X-Spam-Level -bayes_ignore_header X-Spam-Processed -bayes_ignore_header X-Spam-Report -bayes_ignore_header X-Spamsave -bayes_ignore_header X-Spam-Scanned -bayes_ignore_header X-Spam-Score -bayes_ignore_header X-Spam-Score-Int -bayes_ignore_header X-Spam-SmartLearn -bayes_ignore_header X-Spam-Status -bayes_ignore_header X-SpamTest-Group-ID -bayes_ignore_header X-SpamTest-Info -bayes_ignore_header X-SpamTest-Method -bayes_ignore_header X-SpamTest-Rate -bayes_ignore_header X-SpamTest-SPF -bayes_ignore_header X-SpamTest-Status -bayes_ignore_header X-SpamTest-Status-Extended -bayes_ignore_header X-Spam-Threshold -bayes_ignore_header X-SPF-Scan-By -bayes_ignore_header X-STA-Metric -bayes_ignore_header X-STA-NotSpam -bayes_ignore_header X-StarScan-Version -bayes_ignore_header X-STA-Spam -bayes_ignore_header X-SurGATE-Result -bayes_ignore_header X-SWITCHham-Score -bayes_ignore_header X-UI-Filterresults -bayes_ignore_header X-UI-Loop -bayes_ignore_header X-UI-Out-Filterresults -bayes_ignore_header X-Univie-Spam-Checker-Version -bayes_ignore_header X-Univie-Virus-Scan -bayes_ignore_header X-Virus -bayes_ignore_header X-VirusChecked -bayes_ignore_header X-Virus-Checker-Version -bayes_ignore_header X-Virus-Scanned -bayes_ignore_header X-Virus-Scanner-Result -bayes_ignore_header X-Virus-Scanner-Version -bayes_ignore_header X-Virus-Status -bayes_ignore_header X-VR-SCORE -bayes_ignore_header X-VR-SPAMCAUSE -bayes_ignore_header X-VR-STATUS -bayes_ignore_header X-WatchGuard-Mail-Client-IP -bayes_ignore_header X-WatchGuard-Mail-From -bayes_ignore_header X-WatchGuard-Mail-Recipients -bayes_ignore_header X-WatchGuard-Spam-ID -bayes_ignore_header X-WatchGuard-Spam-Score -bayes_ignore_header X-Whitelist-Domain -bayes_ignore_header X-WUM-CCI diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/README spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/README --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/axb/README 2014-04-25 13:39:29.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/axb/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -# Open Cooperative Sandbox Policy -# I hereby give permission for any other committer to change anything in my -# sandbox if their personal judgment deems it is safe and not counter to the -# intent of my rules. I trust you not to introduce breakage in my sandbox. I -# don't expect for this to ever be a problem, but if I disagree with your change -# then we can talk about it. -# -# Feel free to contact me at axb@apache.org with questions or comments -# regarding this sandbox. diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/20_uri.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/20_uri.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/20_uri.cf 2008-12-19 10:19:47.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/20_uri.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -uri GEO_QUERY_STRING /^http:\/\/(?:\w{2,4}\.)?geocities\.com(?::\d*)?\/.+?\/\?/i - -# 20080928 - One line followed by a live spaces URI, may need more to avoid FPs -uri DOS_LIVE_SPACES_CID /^http:\/\/cid-.{10,20}\.spaces\.live\.com\/$/ - -# 20081218 - google docs... sort of like geocities -uri DOS_GOOGLE_DOCS /^http:\/\/docs\.google\.com\/View\?id=/ diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/70_bugs.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/70_bugs.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/70_bugs.cf 2008-07-04 22:32:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/70_bugs.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ - -#ifplugin Mail::SpamAssassin::Plugin::DNSEval -#endif - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/70_other.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/70_other.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/70_other.cf 2014-07-03 14:07:32.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/70_other.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,314 +0,0 @@ -######################################################################## -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -######################################################################## - - -# Russian dating spams that usually have email addresses at domains listed -# by URIBL and sometimes SURBL -- that we won't check -body __DOS_COMING_TO_YOUR_PLACE /I (?:am|might(?: be)?) c[a-z]?o[a-z]?m[a-z]?(?:i[a-z]?n[a-z]?g[a-z]{0,2}|e down) to y[!a-z]{2,4}r (?:city|place[a-z]{0,2}|co[a-z]?u[a-z]?n[a-z]?t[a-z]?ry) in (?:f[a-z]?e[a-z]?w|\d{1,2}) (?:day|week)s/ -body __DOS_MEET_EACH_OTHER /(?:meet each other|[Mm]ay ?be we can meet)/ -body __DOS_DROP_ME_A_LINE /Drop me a line at/ -body __DOS_CORRESPOND_EMAIL /correspond with me using my email/ -body __DOS_EMAIL_DIRECTLY /(?:Email m[a-z]?e|address) direc(?:tl|lt)y at/ -body __DOS_WRITE_ME_AT /[Ww].?r.?i.?t.?e me at/ -body __DOS_PERSONAL_EMAIL /personal email at/ -body __DOS_I_AM_25 /I a.?m 25/ -meta DOS_YOUR_PLACE (__DOS_COMING_TO_YOUR_PLACE && __DOS_MEET_EACH_OTHER && (__DOS_DROP_ME_A_LINE || __DOS_CORRESPOND_EMAIL || __DOS_EMAIL_DIRECTLY || __DOS_I_AM_25 || __DOS_WRITE_ME_AT || __DOS_PERSONAL_EMAIL)) -describe DOS_YOUR_PLACE Russian dating spam - - -# Domain Listing Center -body __DOS_DOM_LIST_CENTER /Domain Listing Center/ -body __DOS_NOT_A_BILL /THIS IS NOT A BILL/ -body __DOS_SUB_SEARCH_ENGINE /Submission to \d{2,4} search engines/ -header __DOS_FINAL_NOTICE_DL Subject =~ /Final Notice of Domain Listing/ -meta DOS_DOM_LIST_CENTER (__DOS_DOM_LIST_CENTER && __DOS_NOT_A_BILL && __DOS_SUB_SEARCH_ENGINE && __DOS_FINAL_NOTICE_DL) -describe DOS_DOM_LIST_CENTER Final notice for search engine submission - - -# Stock's with prices containing 'O' -body __DOS_STOCK_COMPANY /Company: / -body __DOS_STOCK_TICKER /Ticker: / -body __DOS_STOCK_O_PRICE /(?:Current|Target)(?: Price)?:\s+\$(?:O\.|\d\.O)/ -meta DOS_STOCK_O_PRICE (__DOS_STOCK_COMPANY && __DOS_STOCK_TICKER && __DOS_STOCK_O_PRICE) -describe DOS_STOCK_O_PRICE Stocks with 'oh', rather than 'zero' values - - -# http://www.squirrelmail.org/docs/user/user-3.html#ss3.1 -# mids: 1123.145.23.250.17.squirrel@webserveraddress -# Message-ID: <1252.10.145.1.219.1157357908.squirrel@cyan.dostech.net> -# X-Mailer: SquirrelMail (version 1.2.11) -# User-Agent: SquirrelMail/1.4.4 -# -# Disabled 2014-07-03 - Bug 7061 -#header __DOS_UA_SM User-Agent =~ /SquirrelMail/ -#header __DOS_MAILER_SM X-Mailer =~ /SquirrelMail/ -#header __DOS_RELAY_SM Received =~ /SquirrelMail authenticated/ -#header __DOS_SM_MID Message-ID =~ /^<\d{4,8}(?:\.\d{1,3}){4}(?:\.\d{10})?\.squirrel\@[A-Za-z0-9._-]+>$/ -# -#meta DOS_FAKE_SQUIRREL (__DOS_MAILER_SM || __DOS_UA_SM) && (!__DOS_RELAY_SM || !__DOS_SM_MID) -#describe DOS_FAKE_SQUIRREL Message contains faked SquirrelMail headers - - -# your job must suck if you count how long you've had it by months after 10 or 20+ years -body __DOS_LET_GO_JOB /I was (?:let go|fired|layed off|dismissed) from a job I h(?:el|a)d for (?:2\d years|\d{3} months)/ -body __DOS_MY_OLD_JOB /my old job/ -body __DOS_I_DRIVE_A /I drive a/ -body __DOS_TAKING_HOME /Taking home \d (?:digit level|figures) in \d{1,2} months/ - -meta DOS_LET_GO_JOB __DOS_LET_GO_JOB && __DOS_MY_OLD_JOB && __DOS_I_DRIVE_A && __DOS_TAKING_HOME -describe DOS_LET_GO_JOB Let go from their job and now makes lots of dough! - - -# these shouldn't last long, but I'm curious... and need a mortgage -body __DOS_488K_FIXED /\$488,?\d{3}(?:\.00)? at a [0-3]\.\d{2}% fixed/ -body __DOS_372K_VARI /\$372,?\d{3}(?:\.00)? at a [0-3]\.\d{2}% variable/ -body __DOS_492K_INT /\$492,?\d{3}(?:\.00)? at a [0-3]\.\d{2}% interest/ -body __DOS_248K_FIXED /\$248,?\d{3}(?:\.00)? at a [0-3]\.\d{2}% fixed/ -body __DOS_198K_VARI /\$198,?\d{3}(?:\.00)? at a [0-3]\.\d{2}% variable/ - -meta DOS_MORTGAGE __DOS_488K_FIXED + __DOS_372K_VARI + __DOS_492K_INT + __DOS_248K_FIXED + __DOS_198K_VARI > 1 - - -# I won't be buying stocks from a stock broker who manages to spell stock wrong twice in a row -body DOS_DOUBLE_SOTCK /\b(s(?:otc|tco)k)\b.{15,50}\b\1\b/ -describe DOS_DOUBLE_SOTCK Stock spelt wrong the same way twice in a row - -body DOS_TWO_MIS_STOCK /\bs(?:otc|tco)k\b.{15,50}\bs(?:otc|tco)k\b/ -describe DOS_TWO_MIS_STOCK Stock spelt wrong twice in a row - - -# small bodied stock spams - Oct 19, 2006 -header __DOS_HAVE_TO_READ Subject =~ /have to read/ -header __DOS_REQ_TO_READ Subject =~ /require to read/ - -body __DOS_TOLD_DAY /have been told that (?:Mon|Tues|Wednes|Thurs|Fri)day is the day/ -body __DOS_OIL_EXCEED /oil \w{2,20} exceeded all its expectations/ -body __DOS_DEAL_MAKE_MONEY /is the \w{2,20} deal and those who knows it is making money/ -body __DOS_GREAT_DRAWN_UP /great \w{2,20} are drawn up/ -body __DOS_KEY_GET_IN_EARLY /key is getting in early/ -body __DOS_INCREASE_UP /increase is up/ -body __DOS_WASTE_TIME_MISS /(?:waste time|loss moment) and miss out/ -body __DOS_NO_STOPPING /no stopping this one/ - -meta DOS_TO_READ_STOCK (__DOS_HAVE_TO_READ || __DOS_REQ_TO_READ) + __DOS_TOLD_DAY + __DOS_OIL_EXCEED + __DOS_DEAL_MAKE_MONEY + __DOS_GREAT_DRAWN_UP + __DOS_KEY_GET_IN_EARLY + __DOS_INCREASE_UP + __DOS_WASTE_TIME_MISS + __DOS_NO_STOPPING > 4 - -describe DOS_TO_READ_STOCK Stock pumping you just have to read -## score DOS_TO_READ_STOCK 2.0 - - -# text messages from my phone to email addresses often end up with a score of 4.9+ -header __BELL_MOBILITY_RELAY X-Spam-Relays-External =~ /^[^\]]+ rdns=mail\.txt\.bellmobilite\.ca helo=erwdbmgweb02\.bellmobilite\.ca / -meta BELL_MOBILITY_TXT_MSG INVALID_DATE && MISSING_SUBJECT && FROM_STARTS_WITH_NUMS && __BELL_MOBILITY_RELAY -describe BELL_MOBILITY_TXT_MSG Adjustment for poorly formatted text->email messages -tflags BELL_MOBILITY_TXT_MSG nice -## score BELL_MOBILITY_TXT_MSG -4.0 - - -# -header DOS_DOT_COM_AT Envelope-From:addr =~ /^[^=]+\.com\@[^\@]+$/ -describe DOS_DOT_COM_AT Envelope-From has a domain.com@anotherdomain.com - - -# pump and dump stock spam claiming to be sent by The Bat! -header __DOS_RCVD_MON Received =~ / Mon, / -header __DOS_RCVD_TUE Received =~ / Tue, / -header __DOS_RCVD_WED Received =~ / Wed, / -header __DOS_RCVD_THU Received =~ / Thu, / -header __DOS_RCVD_FRI Received =~ / Fri, / -header __DOS_RCVD_SAT Received =~ / Sat, / -header __DOS_RCVD_SUN Received =~ / Sun, / - -body __DOS_BODY_MON /\bmon(?:day)?\b/i -body __DOS_BODY_TUE /\btue(?:s(?:day)?)?\b/i -body __DOS_BODY_WED /\bwed(?:nesday)?\b/i -body __DOS_BODY_THU /\bthu(?:r(?:s(?:day)?)?)?\b/i -body __DOS_BODY_FRI /\bfri(?:day)?\b/i -body __DOS_BODY_SAT /\bsat(?:day)?\b/i -body __DOS_BODY_SUN /\bsun(?:day)?\b/i - -meta __DOS_REF_TODAY (__DOS_RCVD_MON && __DOS_BODY_MON) || (__DOS_RCVD_TUE && __DOS_BODY_TUE) || (__DOS_RCVD_WED && __DOS_BODY_WED) || (__DOS_RCVD_THU && __DOS_BODY_THU) || (__DOS_RCVD_FRI && __DOS_BODY_FRI) || (__DOS_RCVD_SAT && __DOS_BODY_SAT) || (__DOS_RCVD_SUN && __DOS_BODY_SUN) - -meta __DOS_REF_NEXT_WK_DAY (__DOS_RCVD_MON && __DOS_BODY_TUE) || (__DOS_RCVD_TUE && __DOS_BODY_WED) || (__DOS_RCVD_WED && __DOS_BODY_THU) || (__DOS_RCVD_THU && __DOS_BODY_FRI) || (__DOS_RCVD_FRI && __DOS_BODY_MON) || (__DOS_RCVD_SAT && __DOS_BODY_MON) || (__DOS_RCVD_SUN && __DOS_BODY_MON) - -meta __DOS_REF_2_WK_DAYS (__DOS_RCVD_MON && __DOS_BODY_WED) || (__DOS_RCVD_TUE && __DOS_BODY_THU) || (__DOS_RCVD_WED && __DOS_BODY_FRI) || (__DOS_RCVD_THU && __DOS_BODY_MON) || (__DOS_RCVD_FRI && __DOS_BODY_TUE) || (__DOS_RCVD_SAT && __DOS_BODY_TUE) || (__DOS_RCVD_SUN && __DOS_BODY_TUE) - -body __DOS_BODY_STOCK /\bstock\b/i -body __DOS_BODY_TICKER /\b[A-Z]{4}\.(?:OB|PK)\b/ - -meta DOS_STOCK_BAT __THEBAT_MUA && (__DOS_BODY_STOCK || __DOS_BODY_TICKER) && (__DOS_REF_TODAY || __DOS_REF_NEXT_WK_DAY || __DOS_REF_2_WK_DAYS) -describe DOS_STOCK_BAT Probable pump and dump stock spam - -body __DOS_FIN_ADVANTAGE /\bfinancial advantage/i -body __DOS_STRONG_CF /\bstrong cash flow/i -body __DOS_STEADY_COURSE /\bsteady (?:and increasing )?course\b/i - -meta DOS_STOCK_BAT2 DOS_STOCK_BAT && (__DOS_FIN_ADVANTAGE + __DOS_STRONG_CF + __DOS_STEADY_COURSE > 2) - - -# http://www.fod*rx.com -# http://www.rx555*com -uri DOS_URI_ASTERISK m{^[Hh][Tt]{2}[Pp][Ss]?://[^/:]+(?:\*[A-Za-z0-9-]*\.|\*)[A-Za-z]{2,3}(?:\.[A-Za-z]{2})?(?:$|:|/)} -describe DOS_URI_ASTERISK Found an asterisk in a URI -## score DOS_URI_ASTERISK 1.5 - - -header __DOS_SINGLE_EXT_RELAY X-Spam-Relays-External =~ /^\[ [^\]]+ \]$/ -body __DOS_HI /^Hi,$/ -body __DOS_LINK /\blink\b/ -uri __DOS_HAS_ANY_URI /./ - -meta DOS_FIX_MY_URI __MIMEOLE_1106 && __DOS_HAS_ANY_URI && __DOS_SINGLE_EXT_RELAY && __DOS_HI && __DOS_LINK -describe DOS_FIX_MY_URI Looks like a "fix my obfu'd URI please" spam -#score DOS_FIX_MY_URI 1.2 - - -# 20070405 - pump and dump income statement spam -body __DOS_SYMBOL_4 /\bSymbol [A-Z]{4}\b/ -body __DOS_HEADLINES /\bHeadlines\b/ - -body DOS_PROVISION4 /\bProvisionfor income taxes\b/ -describe DOS_PROVISION4 Provision for income taxes -score DOS_PROVISION4 1.5 - -body DOS_REPORT_FIN_INC /\bReport of financial income\b/ -describe DOS_REPORT_FIN_INC Report of financial income -score DOS_REPORT_FIN_INC 0.5 - -meta DOS_STOCK_INCOME_STATEMENT DOS_REPORT_FIN_INC && DOS_PROVISION4 && __DOS_SYMBOL_4 && __DOS_HEADLINES -describe DOS_STOCK_INCOME_STATEMENT Pump and dump stock income statement spam -score DOS_STOCK_INCOME_STATEMENT 1.5 - -# 20070405 - pump and dump spam CDYV, generic version ([A-Z]{4} for CDYV) -body DOS_STOCK_CDYV_GENERIC /(?:Lookup|Sym8oL|Search for|Promoting sym|S\.umbol|Target sym|Campaign for): [A-Z]{4},?.{1,50}\b[Pp]rice/ -describe DOS_STOCK_CDYV_GENERIC Pump and dump stock spam -score DOS_STOCK_CDYV_GENERIC 2.5 - -# 20070905 - GIF spam -header __DOS_HAS_LIST_ID exists:List-ID -header __DOS_HAS_LIST_UNSUB exists:List-Unsubscribe -header __DOS_HAS_MAILING_LIST exists:Mailing-List -# we complete ignore(!) received headers we can't get "useful" info from, which screws up detecting direct-to-mx -header __DOS_RELAYED_EXT ALL-EXTERNAL =~ /(?:^|\n)[Rr][eE][cC][eE][iI][vV][eE][dD]:\s.+\n[Rr][eE][cC][eE][iI][vV][eE][dD]:\s/s -meta __DOS_DIRECT_TO_MX __DOS_SINGLE_EXT_RELAY && !__DOS_HAS_LIST_ID && !__DOS_HAS_LIST_UNSUB && !__DOS_HAS_MAILING_LIST && !__DOS_RELAYED_EXT - -meta DOS_OUTLOOK_TO_MX __ANY_OUTLOOK_MUA && !__OE_MUA && __DOS_DIRECT_TO_MX && !DOS_OUTLOOK_TO_MX_IMAGE -describe DOS_OUTLOOK_TO_MX Delivered direct to MX with Outlook headers - -meta DOS_OUTLOOK_TO_MX_IMAGE __ANY_OUTLOOK_MUA && !__OE_MUA && __DOS_DIRECT_TO_MX && __ANY_IMAGE_ATTACH -describe DOS_OUTLOOK_TO_MX_IMAGE Direct to MX with Outlook headers and an image - -meta DOS_OE_TO_MX __OE_MUA && __DOS_DIRECT_TO_MX && !DOS_OE_TO_MX_IMAGE -describe DOS_OE_TO_MX Delivered direct to MX with OE headers - -meta DOS_OE_TO_MX_IMAGE __OE_MUA && __DOS_DIRECT_TO_MX && __ANY_IMAGE_ATTACH -describe DOS_OE_TO_MX_IMAGE Direct to MX with OE headers and an image - -# 20070907 - Google "I'm feeling lucky" redirect -uri DOS_GOOGLE_LUCKY_REDIRECT m{^http://[^/]\.google\.[^/]/search?(?:.*&|&?)btnI=?} -describe DOS_GOOGLE_LUCKY_REDIRECT Invisible Google redirect using the "lucky button" - -# 20070911 - new-ish anal porn site spam -# force publish it for scoring, it's the only spam I get that isn't caught -header DOS_ANAL_SPAM_MAILER X-mailer =~ /^[A-Z][a-z]{6}e \d\.\d{2}$/ -describe DOS_ANAL_SPAM_MAILER X-mailer pattern common to anal porn site spam -tflags DOS_ANAL_SPAM_MAILER publish - -# 20071004 - new variant in the last few days -header DOS_ANAL_SPAM_MAILER2 X-mailer =~ /^[A-Z][a-z]{6}e .* \d\.\d{2}$/ -describe DOS_ANAL_SPAM_MAILER2 X-mailer pattern common to porn site spam -#tflags DOS_ANAL_SPAM_MAILER2 publish - -# 20070927 - sendmail specific check to detect forged received headers -header DOS_FORGED_RCVD_QUADS ALL-EXTERNAL =~ /(?:^|\n)Received:\s+from \[(\d{2,3}\.\d{1,3}.\d{1,3}\.\d{1,3})\] .+\nReceived:\s+from \[\1\] by \S+; / -describe DOS_FORGED_RCVD_QUADS Probable forged received header - -# 20080213 - generic DOS_FORGED_RCVD_QUADS_x -header DOS_RCVD_IP_TWICE_A X-Spam-Relays-External =~ /\[ ip=(?!127)([\d.]+) [^\[]*\bhelo=\S+ [^\[]*\[ ip=\1 / -describe DOS_RCVD_IP_TWICE_A Received from the same IP twice in a row - -header DOS_RCVD_IP_TWICE_B X-Spam-Relays-External =~ /^\s*\[ ip=(?!127)([\d.]+) [^\[]*\[ ip=\1 [^\]]*\]\s*$/ -describe DOS_RCVD_IP_TWICE_B Received from the same IP twice in a row (only one external relay) - -header DOS_RCVD_IP_TWICE_C X-Spam-Relays-External =~ /^\s*\[ ip=(?!127)([\d.]+) [^\[]*\bhelo=(?:![\d.]{7,15}!)? [^\[]*\[ ip=\1 [^\]]*\]\s*$/ -describe DOS_RCVD_IP_TWICE_C Received from the same IP twice in a row (only one external relay; empty or IP helo) - -# 20071108 - asks you to remove the dot from the end of the domain name -body DOS_REMOVE_DOMAIN_DOT /e(?:mov|let)e the (?:dot|period|point) from the end/ -meta DOS_REMOVE_DOMAIN_DOT_YAHOO DOS_REMOVE_DOMAIN_DOT && FORGED_YAHOO_RCVD - -# 20071118 - web pharmacy spam -body __DOS_MED_WHAT_COULD /\bwhat (?:more|else) could you /i -body __DOS_MED_NO_DIRECTION /\bN0 (?:(?:medicinal|doctor) (?:directions|instructions|recommendations)|prescriptions needed)\b/ -body __DOS_MED_CAN_WEB_PHARM /\b(?:Web-Based Canadian|Canadian On-Line) Pharmacy\b/i -body __DOS_MED_MARK_DOWN /\d{2}% (?:mark down|reduction)/i -meta DOS_MED_CAN_PHARM_NOV07 __OE_MSGID_2 && __DOS_HAS_ANY_URI && ((__DOS_MED_WHAT_COULD && __DOS_MED_NO_DIRECTION) || ( __DOS_MED_CAN_WEB_PHARM && __DOS_MED_MARK_DOWN)) - -# 20071220 -ifplugin Mail::SpamAssassin::Plugin::MIMEHeader - mimeheader DOS_ZIP_HARDCORE Content-Type =~ /^application\/zip;\sname="hardcore\.zip"$/ - describe DOS_ZIP_HARDCORE hardcore.zip file attached; quite certainly a virus - score DOS_ZIP_HARDCORE 2.5 -endif - -body DOS_PLAYED_IN_HARDCORE /played in hardcore porn/ -describe DOS_PLAYED_IN_HARDCORE Claims someone played in hardcore porn -score DOS_PLAYED_IN_HARDCORE 1.5 - -meta DOS_HC_ZIP_VIRUS DOS_ZIP_HARDCORE && DOS_PLAYED_IN_HARDCORE -describe DOS_HC_ZIP_VIRUS Hardcore porn virus spam -score DOS_HC_ZIP_VIRUS 3.5 - -# 20071227 -header DOS_PORN_BOUNDARY Content-Type =~ /\bboundary="----\#(?:SUBSTANCE|CONTENT)_BOUNDARY"$/ -describe DOS_PORN_BOUNDARY Content boundary common to porn spam -score DOS_PORN_BOUNDARY 1.0 - -# 20070225 -header X_MAILER_CME_6543_MSN X-Mailer =~ /^CME-V6\.5\.4\.3; MSN\s*$/ - - -# 20070723 -header DOS_FAKE_UPS_TRACK_NUM Subject =~ /UPS Tracking Number \d{10}/ -describe DOS_FAKE_UPS_TRACK_NUM Invalid UPS Tracking Number in Subject - -# 2000818 -header __DOS_MSGID_DIGITS9 Message-ID =~ /<\d{9}\@.*>/ -header __DOS_MSGID_DIGITS10 Message-ID =~ /<1[013-9]\d{8}\@.*>/ - -meta DOS_DEREK_AUG08 __DOS_SINGLE_EXT_RELAY && __DOS_HAS_ANY_URI && __NAKED_TO && __LAST_UNTRUSTED_RELAY_NO_AUTH && SPF_PASS && __TVD_MIME_ATT_TP && __CT_TEXT_PLAIN && (__DOS_MSGID_DIGITS9 || __DOS_MSGID_DIGITS10) - -# 20081030 - high bit mail sent direct to MX claiming to be The Bat! -meta DOS_HIGH_BAT_TO_MX __DOS_DIRECT_TO_MX && __HIGHBITS && __LAST_UNTRUSTED_RELAY_NO_AUTH && __THEBAT_MUA -describe DOS_HIGH_BAT_TO_MX The Bat! Direct to MX with High Bits - -# 20081101 - domain expiration/maintenance phishes -uri DOS_PHISH_WWW_COM_BIZ /^http:\/\/www\.[^.]+\.com\.[^.]+\.biz$/ -uri DOS_PHISH_WWW_COM_RU /^http:\/\/www\.[^.]+\.com\.[^.]+\.ru$/ - -# 20081105 - high bit body with no message id header -meta DOS_BODY_HIGH_NO_MID __HIGHBITS && MISSING_MID -describe DOS_BODY_HIGH_NO_MID High bit body and no message ID header - -# 20081111 - less conservative shot at highbit spam -# 20100408 - disabled -- this rule appears to be bad... complaints in bug 6389 -#meta DOS_HIGHBIT_HDRS_BODY __FROM_NEEDS_MIME && __SUBJECT_ENCODED_B64 && __FROM_ENCODED_B64 && __SUBJECT_NEEDS_MIME && __HIGHBITS -#describe DOS_HIGHBIT_HDRS_BODY Headers need encoding and body is highbit - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/add-hitless-active-to-freqs spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/add-hitless-active-to-freqs --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/add-hitless-active-to-freqs 2007-09-24 21:04:07.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/add-hitless-active-to-freqs 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -#!/usr/bin/perl - -# NOTE: this script is used by generate-new-scores; it is meant to be copied -# to and called from the masses/ directory of the checkout being used -# for the score generation run for the particular scoreset; you -# shouldn't need to call this script manually -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -use strict; -use warnings; - -my %active_rules; -my %original_rules; - -open(ACTIVE, "../rules/active.list") or die "Cannot open active.list: $!"; -while() { - $active_rules{$1} = undef if (/^(?!__)(\S+)$/); -} -close ACTIVE; - -open(ORIG, "../rules/50_scores.cf") or die "Cannot open original score file: $!"; -while() { - if (/^score\s+(\S+)/) { - $original_rules{$1} = undef; - } -} -close ORIG; - -open(FREQS, "freqs") or die "Cannot open freqs: $!"; -readline(FREQS); -readline(FREQS); -readline(FREQS); -while () { - if (/(\S+)$/) { - delete $active_rules{$1}; - } -} -close FREQS; - -open(SCORES, ">scores-active-zeroed") or die "Cannot open scores-active-zeroed: $!"; -if (scalar keys %active_rules) { - open(FREQS, ">>freqs") or die "Cannot open freqs: $!"; - foreach my $rule (sort(keys %active_rules)) { - # no need to get the real scores for the base rules since there's no hits - # on them their score doesn't matter - print FREQS " 0.000 0.0000 0.0000 0.500 0.00 0.00 $rule\n"; - - # generate zero score lines for active.list non-base ruleset rules that are hitless - # skip the AWL rule, it doesn't have a static score TODO: detect this automatically?! - unless (exists $original_rules{$rule} || $rule =~ /^AWL$/) { - my $line = "score $rule "; - for (my $i = 0; $i < 30 - length $rule; $i++) { - $line .= ' '; - } - $line .= "0.000\n"; - print SCORES $line; - } - } - close FREQS; -} -close SCORES; diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/do-nightly-rescore-example spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/do-nightly-rescore-example --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/do-nightly-rescore-example 2012-08-08 22:24:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/do-nightly-rescore-example 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -#!/bin/bash - -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -set -e - -rm -rf scores scores-set0 scores-set1 scores-set2 scores-set3 stats-set0 stats-set1 stats-set2 stats-set3 trunk-rulesrc-scores -svn up - -#ON 1st day of the week, THIS RUNS 0 first and then 1. 1 would be the net tests. -if [ `date +%w` -eq 0 ]; then - echo 'Beginning of Week. Running with 0 first.' - ./generate-new-scores 0 - ./generate-new-scores 1 - REVISION=`grep "revision .*" scores-set1 | cut -d" " -f9` -else - echo 'Not Beginning of Week. Running with 1 first.' - ./generate-new-scores 1 - ./generate-new-scores 0 - REVISION=`grep "revision .*" scores-set0 | cut -d" " -f9` -fi - -# 20101106 - temporarily s/0.000/0.001/g scores - bug 6510 -sed -e 's/0.000/0.001 # force non-zero/g' < scores-set0 > scores-set0-non-zero; mv -f scores-set0-non-zero scores-set0 -sed -e 's/0.000/0.001 # force non-zero/g' < scores-set1 > scores-set1-non-zero; mv -f scores-set1-non-zero scores-set1 - -cp scores-set0 scores-set2 -cp scores-set1 scores-set3 -./merge-scoresets $SCORESET -cat scores - -svn co https://svn.apache.org/repos/asf/spamassassin/trunk/rulesrc/scores trunk-rulesrc-scores - -cp scores trunk-rulesrc-scores/72_scores.cf -cp scores-set* stats-set* trunk-rulesrc-scores/. - -svn ci trunk-rulesrc-scores/ -m "updated scores for revision $REVISION active rules added since last mass-check" diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/extract-new-scores spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/extract-new-scores --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/extract-new-scores 2010-01-31 02:15:26.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/extract-new-scores 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -#!/usr/bin/perl - -# NOTE: this script is used by generate-new-scores; it is meant to be copied -# to and called from the masses/ directory of the checkout being used -# for the score generation run for the particular scoreset; you -# shouldn't need to call this script manually -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -use strict; -use warnings; - -my $scoreset = 0; # default -my $ham_pref = 5.0; -my $threshold = 5.0; -my $epochs = 100; -my $note = ''; - -my %original_rules; - -open(CONFIG, "config") or die "Cannot open config file: $!"; -while () { - $scoreset = $1 if /^\s*SCORESET=(\d)\s*$/; - $ham_pref = $1 if /^\s*HAM_PREFERENCE=([\d.-]+)/; - $threshold = $1 if /^\s*THRESHOLD=([\d.-]+)/; - $epochs = $1 if /^\s*EPOCHS=(\d+)\s*$/; - $note = "-$1" if /^\s*NOTE=(.+)$/; -} -close CONFIG; - -print "Removing scores for base release rules from newly generated scores\n"; - -open(ORIG, "../rules/50_scores.cf") or - die "Cannot open original score file (../rules/50_scores.cf): $!"; -while() { - if (/^score\s+(\S+)/) { - $original_rules{$1} = undef; - } -} -close ORIG; - -print "extract-new-scores using gen-set$scoreset-$ham_pref-$threshold-$epochs-ga$note/scores\n"; - -open(ORIG, "gen-set$scoreset-$ham_pref-$threshold-$epochs-ga$note/scores") or - die "Cannot open gen-set$scoreset-$ham_pref-$threshold-$epochs-ga$note/scores: $!"; -open(NEW, ">gen-set$scoreset-$ham_pref-$threshold-$epochs-ga$note/scores-new") or - die "Cannot open gen-set$scoreset-$ham_pref-$threshold-$epochs-ga$note/scores-new: $!"; -while () { - if (/^score\s+(\S+)/) { - next if exists $original_rules{$1}; - print NEW $_; - } -} -close ORIG; -close NEW; diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/generate-new-scores spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/generate-new-scores --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/generate-new-scores 2012-08-08 22:24:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/generate-new-scores 1970-01-01 00:00:00.000000000 +0000 @@ -1,278 +0,0 @@ -#!/bin/bash - -# generate-new-scores - generate scores for rules promoted after initial -# release mass-check scoring run -# -# usage: generate-new-scores (0|1|2|3) -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -SCORESET=$1 -CORPUS_SRC_DIR="/export/home/corpus-rsync/corpus" - -if [ ! $SCORESET ]; then - echo "Missing scoreset number parameter" - exit -fi - -# prep current nightly mass-check logs -if [ ! -e corpus ]; then - echo "[ creating corpus directory ]" - mkdir corpus || exit $? -fi - -date -# if running on spamassassin.zones.apache.org rsync locally, otherwise rsync remotely -if [ -e $CORPUS_SRC_DIR ]; then - echo "[ rsyncing logs locally ]" - rsync -artv --delete --exclude="*am-rescore-*" $CORPUS_SRC_DIR/*.log corpus/. || exit $? -else - echo "[ rsyncing logs remotely ]" - # load rsync credentials from RSYNC-CREDS file - # RSYNC_USERNAME="username" - # RSYNC_PASSWORD="password" - . RSYNC-CREDS - export RSYNC_PASSWORD - rsync -artvz --delete --exclude="*am-rescore-*" $RSYNC_USERNAME@rsync.spamassassin.org::corpus/*.log corpus/. || exit $? -fi - -date -echo "[ selecting log files to use for scoreset $SCORESET ]" - -# select a usable corpus (it'll use all available logs for the wanted score set -# with the most recent revision found among logs for that score set) -rm -rf corpus/usable-corpus-set$SCORESET -mkdir corpus/usable-corpus-set$SCORESET || exit $? - -if [ $SCORESET -eq 3 ]; then - for FILE in `find corpus -type f -name "*am-bayes-net-*"`; - do - FILE=`echo $FILE | cut -d"/" -f2-` - ln corpus/$FILE corpus/usable-corpus-set${SCORESET}/$FILE || exit $? - echo "Linked $FILE to corpus/usable-corpus-set${SCORESET}/$FILE" - done -elif [ $SCORESET -eq 2 ]; then - for FILE in `find corpus -type f -name "*am-bayes-*" | grep -v net-`; - do - FILE=`echo $FILE | cut -d"/" -f2-` - ln corpus/$FILE corpus/usable-corpus-set${SCORESET}/$FILE || exit $? - echo "Linked $FILE to corpus/usable-corpus-set${SCORESET}/$FILE" - done -elif [ $SCORESET -eq 1 ]; then - for FILE in `find corpus -type f -name "*am-net-*"`; - do - FILE=`echo $FILE | cut -d"/" -f2-` - ln corpus/$FILE corpus/usable-corpus-set${SCORESET}/$FILE || exit $? - echo "Linked $FILE to corpus/usable-corpus-set${SCORESET}/$FILE" - done -elif [ $SCORESET -eq 0 ]; then - for FILE in `find corpus -type f -name "*am-*" | grep -v net- | grep -v bayes-`; - do - FILE=`echo $FILE | cut -d"/" -f2-` - ln corpus/$FILE corpus/usable-corpus-set${SCORESET}/$FILE || exit $? - echo "Linked $FILE to corpus/usable-corpus-set${SCORESET}/$FILE" - done -else - echo "Unknown score set: $SCORESET" - exit -fi - -# cthielen's ham logs seem to have a shitload of spam in them -rm -f corpus/usable-corpus-set${SCORESET}/*cthielen.log - -REVISION=`head corpus/usable-corpus-set${SCORESET}/* | grep "SVN revision" | cut -d" " -f4 | sort -rn | head -1` -if [ "$REVISION" == "" ]; then - echo "No logs for scoreset" - exit 1 -fi - -# DEBUG -#echo "test" -#exit 1 - -for FILE in `find corpus/usable-corpus-set$SCORESET -type f`; -do - echo "Checking $FILE for SVN $REVISION..." - head $FILE | grep "SVN revision: $REVISION" || (rm $FILE; echo "$FILE does not meet the requirements") -done - -# check to make sure that we have enough corpus submitters -HAMCONTRIBS=`ls -l corpus/usable-corpus-set$SCORESET/ham-*.log | wc -l | sed -e 's/^[ \t]*//' | cut -d" " -f1` -SPAMCONTRIBS=`ls -l corpus/usable-corpus-set$SCORESET/spam-*.log | wc -l | sed -e 's/^[ \t]*//' | cut -d" " -f1` - -echo " HAM CONTRIBUTORS FOUND: $HAMCONTRIBS (required 10)" -echo "SPAM CONTRIBUTORS FOUND: $SPAMCONTRIBS (required 10)" - -if [ $HAMCONTRIBS -lt 10 ]; then - echo "Insufficient ham corpus contributors; aborting." - exit 6 -fi - -if [ $SPAMCONTRIBS -lt 10 ]; then - echo "Insufficient spam corpus contributors; aborting." - exit 7 -fi - -date -echo "[ checking out code from svn repository ]" - -# make note of what logs we are going to use -echo "# Using score set $SCORESET logs for revision $REVISION from:" > scores-set$SCORESET -echo "#" `ls corpus/usable-corpus-set$SCORESET` >> scores-set$SCORESET -echo >> scores-set$SCORESET - -# prep the ruleset checkout -rm -rf trunk-new-rules-set$SCORESET - -svn co -r $REVISION http://svn.apache.org/repos/asf/spamassassin/trunk trunk-new-rules-set$SCORESET || exit $? -svn co http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_3_0/rules trunk-new-rules-set$SCORESET/rules-base || exit $? -svn co http://svn.apache.org/repos/asf/spamassassin/trunk/rules trunk-new-rules-set$SCORESET/rules-current || exit $? - -svn up -r $REVISION trunk-new-rules-set${SCORESET}/rulesrc/ || exit $? - -# use the newest masses/ directory so that we can fix bugs in the masses/ stuff -# and not have the net-enabled scores broken all week -svn up trunk-new-rules-set$SCORESET/masses/ - -# we need to patch the Makefile to get it to mangle some data for us -cd trunk-new-rules-set${SCORESET}/masses -patch < ../../masses-Makefile.patch || exit $? -cd ../.. - -# copy the support scripts to masses/ of the scoreset's checkout; this lets us -# contain all the new score generation scripts in their own directory and keeps -# us from having to pass the checkout path as an argument to each of the scripts -# NOTE: lock-scores now uses existing scores (even commented out) in 72_active.cf -# as absolute maximum values to be inserted in tmp/ranges.data -cp lock-scores trunk-new-rules-set$SCORESET/masses/lock-scores -cp extract-new-scores trunk-new-rules-set$SCORESET/masses/extract-new-scores -cp add-hitless-active-to-freqs trunk-new-rules-set$SCORESET/masses/add-hitless-active-to-freqs - -date -echo "[ generating active ruleset via make ]" - -cd trunk-new-rules-set$SCORESET -perl Makefile.PL < /dev/null || exit $? -make || exit $? - -# strip scores from new rules so that the garescorer can set them -grep -v ^score rules/72_active.cf > rules/72_active.cf-scoreless -mv -f rules/72_active.cf-scoreless rules/72_active.cf - -date -echo "[ running log-grep-recent ]" - -# only use recent spam to generate scores; use a lot of ham history to avoid FPs - Increases Ham to 84 months on 8/8/2012 to try and get a masscheck out the door. -masses/log-grep-recent -m 84 ../corpus/usable-corpus-set$SCORESET/ham-*.log > masses/ham-full.log -masses/log-grep-recent -m 2 ../corpus/usable-corpus-set$SCORESET/spam-*.log > masses/spam-full.log - -# make sure that we have enough mass-check results to actually generate reasonable scores -# NOTE: currently we only check for a minimum number of messages -HAMCOUNT=`wc -l masses/ham-full.log | sed -e 's/^[ \t]*//' | cut -d" " -f1` -SPAMCOUNT=`wc -l masses/spam-full.log | sed -e 's/^[ \t]*//' | cut -d" " -f1` - -echo " HAM: $HAMCOUNT (150000 required)" -echo "SPAM: $SPAMCOUNT (150000 required)" - -if [ $HAMCOUNT -lt 150000 ]; then - echo "Insufficient ham corpus to generate scores; aborting." - exit 8 -fi - -if [ $SPAMCOUNT -lt 150000 ]; then - echo "Insufficient spam corpus to generate scores; aborting." - exit 9 -fi - -# set config to chosen scoreset -cp masses/config.set$SCORESET masses/config -. masses/config -NAME="set$SCORESET" -LOGDIR="gen-$NAME-$HAM_PREFERENCE-$THRESHOLD-$EPOCHS-ga" - -date -echo "[ running make freqs ]" - -# generate new ruleset -cd masses - -make clean || exit $? -rm -rf ORIG NSBASE SPBASE ham-validate.log spam-validate.log ham.log spam.log -ln -s ham-full.log ham.log -ln -s spam-full.log spam.log -make freqs SCORESET=$SCORESET || exit $? - -cp freqs freqs.full # probably not needed for anything - someday I'll look to see -make > make.out 2>&1 || exit $? - -rm -rf ORIG NSBASE SPBASE ham-validate.log spam-validate.log ham.log spam.log -mkdir ORIG -for CLASS in ham spam ; do - ln $CLASS-full.log ORIG/$CLASS.log - for I in 0 1 2 3 ; do - ln -s $CLASS.log ORIG/$CLASS-set$I.log - done -done - -date -echo "[ starting runGA ]" - -# generate the new scores -./runGA || exit $? - -date -echo "[ generating fp-fn-statistics ]" - -# generate stats on the old rules to compare against the new rules and their scores -./fp-fn-statistics --ham ham-test.log --spam spam-test.log --scoreset $SCORESET \ - --cffile=../rules-base --fnlog $LOGDIR/false_negatives_original \ - --fplog $LOGDIR/false_positives_original > $LOGDIR/stats-set$SCORESET-original-test - -./fp-fn-statistics --ham ham.log --spam spam.log --scoreset $SCORESET \ - --cffile=../rules-base --fnlog $LOGDIR/false_negatives_original \ - --fplog $LOGDIR/false_positives_original > $LOGDIR/stats-set$SCORESET-original-full - -date -echo "[ extracting new scores ]" - -# extract the new scores -./extract-new-scores -cat $LOGDIR/scores-new >> ../../scores-set$SCORESET - -# new active.list rules that didn't hit enough get zeroed... add the zero scores -# for them, otherwise SA will assign 1.0 defaults (or use whatever was in the sandbox) -if [ -s scores-active-zeroed ]; then - echo "# in active.list but have no hits in recent corpus" >> ../../scores-set$SCORESET - cat scores-active-zeroed >> ../../scores-set$SCORESET -fi - -cd ../.. -cat scores-set$SCORESET - -# collect some stats -echo "##### WITH NEW RULES AND SCORES #####" > stats-set$SCORESET -head -10 trunk-new-rules-set$SCORESET/masses/$LOGDIR/scores >> stats-set$SCORESET -cat trunk-new-rules-set$SCORESET/masses/$LOGDIR/test >> stats-set$SCORESET -echo >> stats-set$SCORESET -echo "##### WITHOUT NEW RULES AND SCORES #####" >> stats-set$SCORESET -cat trunk-new-rules-set$SCORESET/masses/$LOGDIR/stats-set$SCORESET-original-full >> stats-set$SCORESET -cat trunk-new-rules-set$SCORESET/masses/$LOGDIR/stats-set$SCORESET-original-test >> stats-set$SCORESET - -date -echo "[ completed ]" - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/ifpluginize-scores spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/ifpluginize-scores --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/ifpluginize-scores 2007-05-11 06:40:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/ifpluginize-scores 1970-01-01 00:00:00.000000000 +0000 @@ -1,257 +0,0 @@ -#!/usr/bin/perl - -# ifpluginize-scores -# -# determine each rule's required ifplugin line (if any) and insert the ifplugin -# line (or move the score line inside an existing ifplugin line) into the score -# file, dumping the altered score file on STDOUT -# -# usage: ifpluginize-scores rules/ rules/50_scores.cf > rules/50_scores.cf.new -# ifpluginize-scores rules/ rules/72_scores.cf > rules/72_scores.cf.new -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -# note: this only supports one ifplugin line per rule (no nested ifplugins) -# and it might not work on Windows due to line ending differences -# -# TODO: this is a quick hack to fix the currently broken 3.2.0 updates that -# currently have 102 scores missing ifplugin lines in the base release -# 50_scores.cf and 2 scores missing ifplugin lines in 72_scores.cf -# -# ideally this should be done way before now, like in whatever that -# combine-scores script is called -# -# also, after using and inserting any ifplugin lines that we are aware -# of in the actual rule cf files, we should probably brute force the -# detection of missing ifplugin lines by disabling one plugin at a time -# to see if anything breaks... fixing this case in the update -# automatically would be do-able, but it's probably better fixed in the -# sandbox/wherever (and just aborting the update) - -use strict; -use warnings; - -# parameters: /path/to/rules/dir /path/to/scores.cf -my $rulesDir = shift @ARGV; -my $scoreFile = shift @ARGV; - -# find out what plugins we need for each rule based on the rule files -my %ruleIfPlugins = (); -opendir(RULESDIR, $rulesDir) or die "Cannot open rules directory: $!\n"; -while (my $file = readdir(RULESDIR)) { - next unless $file =~ /\.cf$/; - open(RULEFILE, "$rulesDir/$file") or die "Cannot open rule file: $!\n"; - - my $currentPlugin; - while() { - $_ =~ s/\015\012//; - chomp $_; - - $_ =~ s/^lang\s+\S+\s+//; # strip lang whatever describe to just describe - - next if ($_ =~ /^\s*(?:#.*)?$/); # comments - next if ($_ =~ /^shortcircuit\b/); # not handled, easiest to catch this sort of stuff by brute force (unload plugins and lint) - - if ($_ =~ /^(ifplugin\s+\S+)$/) { - $currentPlugin = $1; - } elsif ($_ =~ /^endif(?:$|\b)/) { - $currentPlugin = undef; - } elsif (defined $currentPlugin && $_ =~ /^\S+\s+(\S+)\s+/) { - if (exists $ruleIfPlugins{$1}) { - next if $ruleIfPlugins{$1} eq $currentPlugin; - warn "more than one ifplugin per rule not supported by this script!\n". - "rule: $1 requires $ruleIfPlugins{$1} and\n". - "$_\n"; - } else { - $ruleIfPlugins{$1} = $currentPlugin; - } - } - } - close RULEFILE; -} -close RULESDIR; - -# load the score file into memory -open(SCOREFILE, $scoreFile) or die "Cannot open score file: $scoreFile: $!\n"; -my @sf; -while () { - $_ =~ s/\015\012//; - chomp $_; - push (@sf, $_); -} -close SCOREFILE; - -# find any rules needing ifplugin lines and move them inside existing ifplugin -# lines for the required plugin, pay attention to mutable flags for fun -my %rulesNeedingNewIfplugins = (); -my %rulesNeedingNewIfpluginsIsMutable = (); -RULE: foreach my $rule (sort keys %ruleIfPlugins) { - # some vars to track where a score line appears - # note that we assume that when there are both ifplugin and gen:mutable lines - # around a rule that the ifplugin lines will enclose the gen:mutable lines - my $insideIfplugin = 0; - my $ifpluginStartLine = 0; - my $ifpluginEndLine = 0; - my $insideGenMutable = 0; - my $genMutableStartLine = 0; - my $genMutableEndLine = 0; - my $ruleIsMutable = 0; - my $ruleAtLine = 0; - my $line = 0; - foreach my $cfLine (@sf) { - $line++; # line is at array index + 1 so that we can be lazy and use 0 in the above vars - - # handle rules that fall in existing ifplugin lines, we'll handle new ifplugin lines later - if ($ruleAtLine && $ifpluginStartLine && $ifpluginEndLine) { - if ($ruleIsMutable) { - if ($genMutableStartLine && $genMutableEndLine) { - # existing ifplugin + mutable flags, just move the rule - moveRule(\@sf, $rule, $ruleAtLine-1, $genMutableStartLine, $genMutableEndLine-2); - } else { - # mutable rule, but no existing mutable flags, we'll add them - moveRule(\@sf, $rule, $ruleAtLine-1, $ifpluginStartLine-1, $ifpluginStartLine-1, 1); - } - } else { - if ($genMutableStartLine && $genMutableEndLine) { - # existing ifplugin + mutable flags, but the rule isn't mutable so we'll move the - # rule to just after the closing mutable flag but still inside the ifplugin - moveRule(\@sf, $rule, $ruleAtLine-1, $genMutableEndLine, $ifpluginEndLine-2); - } else { - # existing ifplugin and no mutable flags, just move the rule - moveRule(\@sf, $rule, $ruleAtLine-1, $ifpluginStartLine, $ifpluginEndLine-2); - } - } - # once we move the rule we move to the next one, reseting the tracking vars (above) - next RULE; - } - - # determine where we are (inside ifplugin, gen:mutable) - # again, we assume that if there's ifplugin lines any gen:mutable lines will be inside the ifplugin - if ($cfLine =~ /^$ruleIfPlugins{$rule}\b/) { # only looks for the ifplugin line we need - $insideIfplugin = 1; - $ifpluginStartLine = $line; - } elsif ($cfLine =~ /^endif/) { - $ifpluginEndLine = $line if $insideIfplugin; - $insideIfplugin = 0; - } elsif ($cfLine =~ //) { - $insideGenMutable = 1; - $genMutableStartLine = $line if $insideIfplugin; - } elsif ($cfLine =~ /<\/gen:mutable>/) { - $insideGenMutable = 0; - $genMutableEndLine = $line if $insideIfplugin; - } elsif ($cfLine =~ /^score $rule\b/) { - $ruleAtLine = $line; - $ruleIsMutable = $insideGenMutable; - if ($insideIfplugin) { - # great, the rule is inside the ifplugin line it needs, check the next rule - #delete $ruleIfPlugins{$rule}; # careful, we're looping! just for debug anyway - next RULE; - } - } - } - # if we couldn't find somewhere to move the rule we'll add it to the end of the file later - $rulesNeedingNewIfplugins{$rule} = $ruleAtLine-1 if $ruleAtLine; - $rulesNeedingNewIfpluginsIsMutable{$rule} = $ruleIsMutable; - - #print "$rule : $ruleAtLine : $ifpluginStartLine : $ifpluginEndLine : $ruleIsMutable : $genMutableStartLine : $genMutableEndLine\n"; # if $ruleAtLine; -} - -# move any rules that require ifplugin lines that weren't already in the score -# file to the end of the score file and wrap them in their own ifplugin lines -my $i = 0; -foreach my $rule (sort { $rulesNeedingNewIfplugins{$a} <=> $rulesNeedingNewIfplugins{$b} } keys %rulesNeedingNewIfplugins) { - #print "rule: $rule at line: $rulesNeedingNewIfplugins{$rule} needs '$ruleIfPlugins{$rule}'\n"; - - my $line = $sf[$rulesNeedingNewIfplugins{$rule}-$i]; - splice(@sf, $rulesNeedingNewIfplugins{$rule}-$i, 1); - - if ($rulesNeedingNewIfpluginsIsMutable{$rule}) { - push (@sf, ("", "$ruleIfPlugins{$rule}", "# ", $line, "# ", "endif")); - } else { - push (@sf, ("", "$ruleIfPlugins{$rule}", $line, "endif")); - } - $i++; -} - -# output the result -foreach (@sf) { - print $_, "\n"; -} - - - -# move rules around in the array reference passed -# add mutable flags where appropriate -sub moveRule { - my ($aref, $rule, $current, $toStart, $toEnd, $addGenMutable) = @_; - $addGenMutable ||= 0; - -# warn "debug moveRule: $rule : $current : $toStart : $toEnd\n"; - - if ($current < $toStart) { - # add first, then delete - my $added = 0; - for (my $i = $toStart; $i <= $toEnd; $i++) { - next if $sf[$i] !~ /^score (\S+)\b/; - - if (($1 cmp $rule) == 1) { - splice(@{$aref}, $i, 0, @{$aref}[$current]); - if ($addGenMutable) { - splice(@{$aref}, $i, 0, "# "); - splice(@{$aref}, $i+2, 0, "# "); - } - $added = 1; - last; - } - } - unless ($added) { - splice(@{$aref}, $toEnd+1, 0, @{$aref}[$current]); - if ($addGenMutable) { - splice(@{$aref}, $toEnd+1, 0, "# "); - splice(@{$aref}, $toEnd+3, 0, "# "); - } - } - splice(@{$aref}, $current, 1); - - } else { - # delete first, then add - my $line = splice(@{$aref}, $current, 1); - - my $added = 0; - for (my $i = $toStart; $i <= $toEnd; $i++) { - next if $sf[$i] !~ /^score (\S+)\b/; - - if (($1 cmp $rule) == 1) { - splice(@{$aref}, $i, 0, @{$aref}[$current]); - if ($addGenMutable) { - splice(@{$aref}, $i, 0, "# "); - splice(@{$aref}, $i+2, 0, "# "); - } - $added = 1; - last; - } - } - unless ($added) { - splice(@{$aref}, $toEnd+1, 0, $line); - if ($addGenMutable) { - splice(@{$aref}, $toEnd+1, 0, "# "); - splice(@{$aref}, $toEnd+3, 0, "# "); - } - } - } -} diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/lock-scores spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/lock-scores --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/lock-scores 2011-05-16 00:14:06.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/lock-scores 1970-01-01 00:00:00.000000000 +0000 @@ -1,127 +0,0 @@ -#!/usr/bin/perl - -# NOTE: this script is used by generate-new-scores; it is meant to be copied -# to and called from the masses/ directory of the checkout being used -# for the score generation run for the particular scoreset; you -# shouldn't need to call this script manually -# -# locks the score ranges for the base release rules to their original scores -# from 50_scores.cf -# -# the script also uses existing scores in 72_active.cf (even commented ones) -# to set the absolute min or max score in the ranges.data file -# -# if called with a 1 parameter new rules that aren't in the most current copy -# of the active.list file will be locked to zero so that the GA can ignore -# rules that aren't in the most current update (this is used for zeroing rules -# found in the weekly net checks that are no longer in the nightly non-net -# checks which 6 of 7 updates a week are based on) -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -use strict; -use warnings; - -my $scoreset = 0; # default - -my %rulescores; -my %newrulescores; -my %currently_active; - -my $only_currently_active_rules = (defined $ARGV[0] && $ARGV[0] == 1 ? 1 : 0); - -open(CONFIG, "config") or die "Cannot open config file: $!"; -while () { - /^\s*SCORESET=(\d)\s*$/; - $scoreset = $1; - # don't exit loop in case scoreset appears in config again -} -close CONFIG; - -print "Fixing score range for existing rules to current scoreset $scoreset score\n"; - -open(ORIG, "../rules/50_scores.cf") or die "Cannot open original score file: $!"; -while() { - if (/^score/) { - /^score\s+(\S+)\s+(-?[\d.]+)(?:\s+(-?[\d.]+)\s+(-?[\d.]+)\s+(-?[\d.]+))?/; - my @scores; - if (defined $3) { - push @scores, ($2, $3, $4, $5); - } else { - push @scores, ($2, $2, $2, $2); - } - $rulescores{$1} = $scores[$scoreset]; - } -} -close ORIG; - -open(ORIG, "../rules/72_active.cf") or die "Cannot open original score file: $!"; -while() { - if (/^(?:\#\s*)?score/) { - /^(?:\#\s*)?score\s+(\S+)\s+(-?[\d.]+)(?:\s+(-?[\d.]+)\s+(-?[\d.]+)\s+(-?[\d.]+))?/; - my @scores; - if (defined $3) { - push @scores, ($2, $3, $4, $5); - } else { - push @scores, ($2, $2, $2, $2); - } - $newrulescores{$1} = $scores[$scoreset]; - } -} -close ORIG; - -if ($only_currently_active_rules) { - open(ACTIVE, "../rules-current/active.list") or die "Cannot open rules-current/active.list: $!"; - while() { - $currently_active{$1} = undef if (/^(?!#)(\S+)$/); - } - close ACTIVE; -} - -open(ORIG, "tmp/ranges.data") or die "Cannot open original range.data file: $!"; -open(NEW, ">tmp/ranges.data-new") or die "Cannot open range.data-new file: $!"; -while () { -# if (/^(?:(?:-?[\d.]+) ){3}(\S+)$/) { - if (/^(-?[\d.]+) (-?[\d.]+) (-?[\d.]+) (\S+)$/) { - if (defined $rulescores{$4}) { - print NEW "$rulescores{$4} $rulescores{$4} 0 $4\n"; - } else { - if ($only_currently_active_rules) { - if (exists $currently_active{$4}) { - if (defined $newrulescores{$4}) { - if ($newrulescores{$4} > 0) { - print NEW "0 $newrulescores{$4} $3 $4\n" - } else { - print NEW "$newrulescores{$4} 0 $3 $4\n" - } - } else { - print NEW $_; - } - } else { - print NEW "0 0 0 $4\n"; - } - } else { - print NEW $_; - } - } - } else { - print NEW $_; - } -} -close ORIG; -close NEW; diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/masses-Makefile.patch spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/masses-Makefile.patch --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/masses-Makefile.patch 2014-06-15 08:34:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/masses-Makefile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -Index: Makefile -=================================================================== ---- Makefile (revision 1602672) -+++ Makefile (working copy) -@@ -2,9 +2,10 @@ - CFLAGS= -g -O2 -Wall - LDFLAGS= -lm - --PGAPACK= /local/pgapack-1.0.0.1 --#PGAPACKLIBDIR= $(PGAPACK)/lib/linux # linux --PGAPACKLIBDIR= $(PGAPACK)/lib/sun4 # solaris -+#Changed to the location recommended by pgapack's readme and linux libdir for new spamassassin-vm box on 6/15/2014 -+PGAPACK= /usr/local/pga -+PGAPACKLIBDIR= $(PGAPACK)/lib/linux # linux -+#PGAPACKLIBDIR= $(PGAPACK)/lib/sun4 # solaris - - # What rule scoreset are we using? - include config -@@ -36,7 +37,10 @@ - tmp/scores.h: tmp/tests.h - - tmp/ranges.data: tmp/.created freqs score-ranges-from-freqs -+ perl add-hitless-active-to-freqs - perl score-ranges-from-freqs $(RULES) $(SCORESET) < freqs -+ perl lock-scores 1 -+ mv tmp/ranges.data-new tmp/ranges.data - - freqs: spam.log ham.log - perl hit-frequencies -c $(RULES) -x -p -s $(SCORESET) > freqs diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets 2010-11-07 00:50:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/merge-scoresets 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -#!/usr/bin/perl - -# merges the scores found in score-setN into a single scores file -# -# if called with a score set parameter N, only rules that appear in -# that score-setN file will be used (score lines for rules only found -# in other score-set files will be ignored) -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -use strict; -use warnings; - -my %rules; - -my $active_rule_set; -$active_rule_set = $ARGV[0] if (defined $ARGV[0] && $ARGV[0] =~ /^[0-3]$/); - -if (defined $active_rule_set) { - open (SCORES, "scores-set$active_rule_set") or die "Cannot open scores-set$active_rule_set: $!"; - while() { - next unless /^score (\S+)\s+(-?[\d.]+)\b/; - @{$rules{$1}} = ('0.001', '0.001' ,'0.001', '0.001'); - $rules{$1}[$active_rule_set] = $2; - } - close SCORES; -} - -for (my $i = 0; $i < 4; $i++) { - next if (defined $active_rule_set && $i == $active_rule_set); - open (SCORES, "scores-set$i") or die "Cannot open scores-set$i: $!"; - while() { - next unless /^score (\S+)\s+(-?[\d.]+)\b/; - next if (defined $active_rule_set && !exists $rules{$1}); - @{$rules{$1}} = ('0.001', '0.001' ,'0.001', '0.001') unless exists $rules{$1}; - $rules{$1}[$i] = $2; - } - close SCORES; -} - -open (SCORES, ">scores") or die "Cannot open scores: $!"; - foreach my $rule (sort(keys %rules)) { - my $line = "score $rule "; - for (my $i = 0; $i < 37 - length $rule; $i++) { - $line .= ' '; - } - $line .= join(' ', @{$rules{$rule}})."\n"; - print SCORES $line; - } -close SCORES; diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/README spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/README --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/README 2007-05-02 19:30:26.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/new-rule-score-gen/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Steps for generating scores for rules promoted post 3.2.0 release -(you only need to do the first three steps once): - - - checkout the directory this README file is in - - - create an RSYNC-CREDS file containing your nightly mass-check rsync creds - (don't do something silly like 'svn add' this file): - - RSYNC_USERNAME="username" - RSYNC_PASSWORD="passowrd" - - - protect those creds from others - - chmod 600 RSYNC-CREDS - - - if the newest mass-check logs are set0 logs run this: - - ./generate-new-scores 1 - ./generate-new-scores 0 - - - if the newest mass-check logs are set1 logs run this: - - ./generate-new-scores 0 - ./generate-new-scores 1 - - - -Steps for using set0 scores for set2 and set1 scores for set3 -(until we start enabling bayes on nightly mass-checks): - - - generate the set0 and set1 scores as above - - - run this: - - cp scores-set0 scores-set2 - cp scores-set1 scores-set3 - ./merge-scoresets - - - -The "do-nightly-rescore-example" script is what I currently use to generate -and commit updates each day. - - (less sparse documentation goes here) - -EOF diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/SIQ.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/SIQ.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/SIQ.cf 2006-03-10 03:28:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/SIQ.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,818 +0,0 @@ -# Copyright (c) 2006 Daryl C. W. O'Shea, DOS Technologies. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#loadplugin Mail::SpamAssassin::Plugin::SIQ /etc/mail/spamassassin/SIQ.pm - - -ifplugin Mail::SpamAssassin::Plugin::SIQ - - -siq_server db.outboundindex.net:6264 - -# Outbound Index doesn't yet provide a TTL -siq_server_ttl db.outboundindex.net:6264 300 - -# Outbound Index hasn't implemented the current draft yet -siq_oi_workaround 1 - -# db.outboundindex.net:6264 often takes a while to respond -siq_query_timeout 11 - -#siq_skip_domain example.com - -#siq_skip_ip 1.2.3.4 - - -# queries are sent out as soon as possible; try to harvest them as late as -# possible, by setting a high priority, so that the responses have more time - -header SIQ_OI_ERROR eval:siq_score('db.outboundindex.net:6264','-999','-2') -score SIQ_OI_ERROR 0.001 -describe SIQ_OI_ERROR Query returned an error value -tflags SIQ_OI_ERROR net -priority SIQ_OI_ERROR 900 - -header SIQ_OI_UNKNOWN eval:siq_score('db.outboundindex.net:6264','-1','-1') -score SIQ_OI_UNKNOWN 0.01 -describe SIQ_OI_UNKNOWN Query returned reputation unknown -tflags SIQ_OI_UNKNOWN net -priority SIQ_OI_UNKNOWN 900 - -header SIQ_OI_00 eval:siq_score('db.outboundindex.net:6264',0,0) -score SIQ_OI_00 1.5 -describe SIQ_OI_00 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_00 net -priority SIQ_OI_00 900 - -header SIQ_OI_01 eval:siq_score('db.outboundindex.net:6264',1,1) -score SIQ_OI_01 1.0 -describe SIQ_OI_01 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_01 net -priority SIQ_OI_01 900 - -header SIQ_OI_05 eval:siq_score('db.outboundindex.net:6264',2,5) -score SIQ_OI_05 0.8 -describe SIQ_OI_05 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_05 net -priority SIQ_OI_05 900 - -header SIQ_OI_10 eval:siq_score('db.outboundindex.net:6264',6,10) -score SIQ_OI_10 0.75 -describe SIQ_OI_10 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_10 net -priority SIQ_OI_10 900 - -header SIQ_OI_15 eval:siq_score('db.outboundindex.net:6264',11,15) -score SIQ_OI_15 0.7 -describe SIQ_OI_15 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_15 net -priority SIQ_OI_15 900 - -header SIQ_OI_20 eval:siq_score('db.outboundindex.net:6264',16,20) -score SIQ_OI_20 0.65 -describe SIQ_OI_20 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_20 net -priority SIQ_OI_20 900 - -header SIQ_OI_25 eval:siq_score('db.outboundindex.net:6264',21,25) -score SIQ_OI_25 0.6 -describe SIQ_OI_25 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_25 net -priority SIQ_OI_25 900 - -header SIQ_OI_30 eval:siq_score('db.outboundindex.net:6264',26,30) -score SIQ_OI_30 0.55 -describe SIQ_OI_30 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_30 net -priority SIQ_OI_30 900 - -header SIQ_OI_35 eval:siq_score('db.outboundindex.net:6264',31,35) -score SIQ_OI_35 0.5 -describe SIQ_OI_35 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_35 net -priority SIQ_OI_35 900 - -header SIQ_OI_40 eval:siq_score('db.outboundindex.net:6264',36,40) -score SIQ_OI_40 0.45 -describe SIQ_OI_40 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_40 net -priority SIQ_OI_40 900 - -header SIQ_OI_45 eval:siq_score('db.outboundindex.net:6264',41,45) -score SIQ_OI_45 0.4 -describe SIQ_OI_45 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_45 net -priority SIQ_OI_45 900 - -header SIQ_OI_50 eval:siq_score('db.outboundindex.net:6264',46,50) -score SIQ_OI_50 0.35 -describe SIQ_OI_50 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_50 net -priority SIQ_OI_50 900 - -header SIQ_OI_55 eval:siq_score('db.outboundindex.net:6264',51,55) -score SIQ_OI_55 0.3 -describe SIQ_OI_55 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_55 net -priority SIQ_OI_55 900 - -header SIQ_OI_60 eval:siq_score('db.outboundindex.net:6264',56,60) -score SIQ_OI_60 0.25 -describe SIQ_OI_60 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_60 net -priority SIQ_OI_60 900 - -header SIQ_OI_65 eval:siq_score('db.outboundindex.net:6264',61,65) -score SIQ_OI_65 0.20 -describe SIQ_OI_65 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_65 net -priority SIQ_OI_65 900 - -header SIQ_OI_70 eval:siq_score('db.outboundindex.net:6264',66,70) -score SIQ_OI_70 0.15 -describe SIQ_OI_70 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_70 net -priority SIQ_OI_70 900 - -header SIQ_OI_75 eval:siq_score('db.outboundindex.net:6264',71,75) -score SIQ_OI_75 0.10 -describe SIQ_OI_75 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_75 net -priority SIQ_OI_75 900 - -header SIQ_OI_80 eval:siq_score('db.outboundindex.net:6264',76,80) -score SIQ_OI_80 0.05 -describe SIQ_OI_80 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_80 net -priority SIQ_OI_80 900 - -header SIQ_OI_85 eval:siq_score('db.outboundindex.net:6264',81,85) -score SIQ_OI_85 -0.001 -describe SIQ_OI_85 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_85 net -priority SIQ_OI_85 900 - -header SIQ_OI_90 eval:siq_score('db.outboundindex.net:6264',86,90) -score SIQ_OI_90 -0.005 -describe SIQ_OI_90 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_90 net -priority SIQ_OI_90 900 - -header SIQ_OI_95 eval:siq_score('db.outboundindex.net:6264',91,95) -score SIQ_OI_95 -0.010 -describe SIQ_OI_95 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_95 net -priority SIQ_OI_95 900 - -header SIQ_OI_99 eval:siq_score('db.outboundindex.net:6264',96,99) -score SIQ_OI_99 -0.015 -describe SIQ_OI_99 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_99 net -priority SIQ_OI_99 900 - -header SIQ_OI_100 eval:siq_score('db.outboundindex.net:6264',100,100) -score SIQ_OI_100 -0.02 -describe SIQ_OI_100 Outbound Index Reputation: http://outboundindex.org/ -tflags SIQ_OI_100 net -priority SIQ_OI_100 900 - - -header SIQ_OI_IP_ERROR eval:siq_ip_score('db.outboundindex.net:6264','-999','-2') -score SIQ_OI_IP_ERROR 0.001 -describe SIQ_OI_IP_ERROR Query returned an error value -tflags SIQ_OI_IP_ERROR net -priority SIQ_OI_IP_ERROR 900 - -header SIQ_OI_IP_UNKNOWN eval:siq_ip_score('db.outboundindex.net:6264','-1','-1') -score SIQ_OI_IP_UNKNOWN 0.01 -describe SIQ_OI_IP_UNKNOWN Query returned IP reputation unknown -tflags SIQ_OI_IP_UNKNOWN net -priority SIQ_OI_IP_UNKNOWN 900 - -header SIQ_OI_IP_00 eval:siq_ip_score('db.outboundindex.net:6264',0,0) -score SIQ_OI_IP_00 0.01 -describe SIQ_OI_IP_00 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_00 net -priority SIQ_OI_IP_00 900 - -header SIQ_OI_IP_01 eval:siq_ip_score('db.outboundindex.net:6264',1,1) -score SIQ_OI_IP_01 0.01 -describe SIQ_OI_IP_01 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_01 net -priority SIQ_OI_IP_01 900 - -header SIQ_OI_IP_05 eval:siq_ip_score('db.outboundindex.net:6264',2,5) -score SIQ_OI_IP_05 0.01 -describe SIQ_OI_IP_05 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_05 net -priority SIQ_OI_IP_05 900 - -header SIQ_OI_IP_10 eval:siq_ip_score('db.outboundindex.net:6264',6,10) -score SIQ_OI_IP_10 0.01 -describe SIQ_OI_IP_10 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_10 net -priority SIQ_OI_IP_10 900 - -header SIQ_OI_IP_15 eval:siq_ip_score('db.outboundindex.net:6264',11,15) -score SIQ_OI_IP_15 0.01 -describe SIQ_OI_IP_15 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_15 net -priority SIQ_OI_IP_15 900 - -header SIQ_OI_IP_20 eval:siq_ip_score('db.outboundindex.net:6264',16,20) -score SIQ_OI_IP_20 0.01 -describe SIQ_OI_IP_20 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_20 net -priority SIQ_OI_IP_20 900 - -header SIQ_OI_IP_25 eval:siq_ip_score('db.outboundindex.net:6264',21,25) -score SIQ_OI_IP_25 0.01 -describe SIQ_OI_IP_25 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_25 net -priority SIQ_OI_IP_25 900 - -header SIQ_OI_IP_30 eval:siq_ip_score('db.outboundindex.net:6264',26,30) -score SIQ_OI_IP_30 0.01 -describe SIQ_OI_IP_30 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_30 net -priority SIQ_OI_IP_30 900 - -header SIQ_OI_IP_35 eval:siq_ip_score('db.outboundindex.net:6264',31,35) -score SIQ_OI_IP_35 0.01 -describe SIQ_OI_IP_35 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_35 net -priority SIQ_OI_IP_35 900 - -header SIQ_OI_IP_40 eval:siq_ip_score('db.outboundindex.net:6264',36,40) -score SIQ_OI_IP_40 0.01 -describe SIQ_OI_IP_40 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_40 net -priority SIQ_OI_IP_40 900 - -header SIQ_OI_IP_45 eval:siq_ip_score('db.outboundindex.net:6264',41,45) -score SIQ_OI_IP_45 0.01 -describe SIQ_OI_IP_45 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_45 net -priority SIQ_OI_IP_45 900 - -header SIQ_OI_IP_50 eval:siq_ip_score('db.outboundindex.net:6264',46,50) -score SIQ_OI_IP_50 0.01 -describe SIQ_OI_IP_50 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_50 net -priority SIQ_OI_IP_50 900 - -header SIQ_OI_IP_55 eval:siq_ip_score('db.outboundindex.net:6264',51,55) -score SIQ_OI_IP_55 -0.01 -describe SIQ_OI_IP_55 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_55 net -priority SIQ_OI_IP_55 900 - -header SIQ_OI_IP_60 eval:siq_ip_score('db.outboundindex.net:6264',56,60) -score SIQ_OI_IP_60 -0.01 -describe SIQ_OI_IP_60 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_60 net -priority SIQ_OI_IP_60 900 - -header SIQ_OI_IP_65 eval:siq_ip_score('db.outboundindex.net:6264',61,65) -score SIQ_OI_IP_65 -0.01 -describe SIQ_OI_IP_65 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_65 net -priority SIQ_OI_IP_65 900 - -header SIQ_OI_IP_70 eval:siq_ip_score('db.outboundindex.net:6264',66,70) -score SIQ_OI_IP_70 -0.01 -describe SIQ_OI_IP_70 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_70 net -priority SIQ_OI_IP_70 900 - -header SIQ_OI_IP_75 eval:siq_ip_score('db.outboundindex.net:6264',71,75) -score SIQ_OI_IP_75 -0.01 -describe SIQ_OI_IP_75 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_75 net -priority SIQ_OI_IP_75 900 - -header SIQ_OI_IP_80 eval:siq_ip_score('db.outboundindex.net:6264',76,80) -score SIQ_OI_IP_80 -0.01 -describe SIQ_OI_IP_80 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_80 net -priority SIQ_OI_IP_80 900 - -header SIQ_OI_IP_85 eval:siq_ip_score('db.outboundindex.net:6264',81,85) -score SIQ_OI_IP_85 -0.01 -describe SIQ_OI_IP_85 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_85 net -priority SIQ_OI_IP_85 900 - -header SIQ_OI_IP_90 eval:siq_ip_score('db.outboundindex.net:6264',86,90) -score SIQ_OI_IP_90 -0.01 -describe SIQ_OI_IP_90 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_90 net -priority SIQ_OI_IP_90 900 - -header SIQ_OI_IP_95 eval:siq_ip_score('db.outboundindex.net:6264',91,95) -score SIQ_OI_IP_95 -0.01 -describe SIQ_OI_IP_95 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_95 net -priority SIQ_OI_IP_95 900 - -header SIQ_OI_IP_99 eval:siq_ip_score('db.outboundindex.net:6264',96,99) -score SIQ_OI_IP_99 -0.01 -describe SIQ_OI_IP_99 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_99 net -priority SIQ_OI_IP_99 900 - -header SIQ_OI_IP_100 eval:siq_ip_score('db.outboundindex.net:6264',100,100) -score SIQ_OI_IP_100 -0.01 -describe SIQ_OI_IP_100 Outbound Index IP Reputation: http://outboundindex.org/ -tflags SIQ_OI_IP_100 net -priority SIQ_OI_IP_100 900 - - - -header SIQ_OI_DOM_ERROR eval:siq_domain_score('db.outboundindex.net:6264','-999','-2') -score SIQ_OI_DOM_ERROR 0.001 -describe SIQ_OI_DOM_ERROR Query returned an error value -tflags SIQ_OI_DOM_ERROR net -priority SIQ_OI_DOM_ERROR 900 - -header SIQ_OI_DOM_UNKNOWN eval:siq_domain_score('db.outboundindex.net:6264','-1','-1') -score SIQ_OI_DOM_UNKNOWN 0.01 -describe SIQ_OI_DOM_UNKNOWN Query returned domain reputation unknown -tflags SIQ_OI_DOM_UNKNOWN net -priority SIQ_OI_DOM_UNKNOWN 900 - -header SIQ_OI_DOM_00 eval:siq_domain_score('db.outboundindex.net:6264',0,0) -score SIQ_OI_DOM_00 1.5 -describe SIQ_OI_DOM_00 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_00 net -priority SIQ_OI_DOM_00 900 - -header SIQ_OI_DOM_01 eval:siq_domain_score('db.outboundindex.net:6264',1,1) -score SIQ_OI_DOM_01 1.0 -describe SIQ_OI_DOM_01 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_01 net -priority SIQ_OI_DOM_01 900 - -header SIQ_OI_DOM_05 eval:siq_domain_score('db.outboundindex.net:6264',2,5) -score SIQ_OI_DOM_05 0.8 -describe SIQ_OI_DOM_05 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_05 net -priority SIQ_OI_DOM_05 900 - -header SIQ_OI_DOM_10 eval:siq_domain_score('db.outboundindex.net:6264',6,10) -score SIQ_OI_DOM_10 0.75 -describe SIQ_OI_DOM_10 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_10 net -priority SIQ_OI_DOM_10 900 - -header SIQ_OI_DOM_15 eval:siq_domain_score('db.outboundindex.net:6264',11,15) -score SIQ_OI_DOM_15 0.7 -describe SIQ_OI_DOM_15 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_15 net -priority SIQ_OI_DOM_15 900 - -header SIQ_OI_DOM_20 eval:siq_domain_score('db.outboundindex.net:6264',16,20) -score SIQ_OI_DOM_20 0.65 -describe SIQ_OI_DOM_20 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_20 net -priority SIQ_OI_DOM_20 900 - -header SIQ_OI_DOM_25 eval:siq_domain_score('db.outboundindex.net:6264',21,25) -score SIQ_OI_DOM_25 0.6 -describe SIQ_OI_DOM_25 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_25 net -priority SIQ_OI_DOM_25 900 - -header SIQ_OI_DOM_30 eval:siq_domain_score('db.outboundindex.net:6264',26,30) -score SIQ_OI_DOM_30 0.55 -describe SIQ_OI_DOM_30 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_30 net -priority SIQ_OI_DOM_30 900 - -header SIQ_OI_DOM_35 eval:siq_domain_score('db.outboundindex.net:6264',31,35) -score SIQ_OI_DOM_35 0.5 -describe SIQ_OI_DOM_35 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_35 net -priority SIQ_OI_DOM_35 900 - -header SIQ_OI_DOM_40 eval:siq_domain_score('db.outboundindex.net:6264',36,40) -score SIQ_OI_DOM_40 0.45 -describe SIQ_OI_DOM_40 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_40 net -priority SIQ_OI_DOM_40 900 - -header SIQ_OI_DOM_45 eval:siq_domain_score('db.outboundindex.net:6264',41,45) -score SIQ_OI_DOM_45 0.4 -describe SIQ_OI_DOM_45 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_45 net -priority SIQ_OI_DOM_45 900 - -header SIQ_OI_DOM_50 eval:siq_domain_score('db.outboundindex.net:6264',46,50) -score SIQ_OI_DOM_50 0.35 -describe SIQ_OI_DOM_50 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_50 net -priority SIQ_OI_DOM_50 900 - -header SIQ_OI_DOM_55 eval:siq_domain_score('db.outboundindex.net:6264',51,55) -score SIQ_OI_DOM_55 0.3 -describe SIQ_OI_DOM_55 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_55 net -priority SIQ_OI_DOM_55 900 - -header SIQ_OI_DOM_60 eval:siq_domain_score('db.outboundindex.net:6264',56,60) -score SIQ_OI_DOM_60 0.25 -describe SIQ_OI_DOM_60 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_60 net -priority SIQ_OI_DOM_60 900 - -header SIQ_OI_DOM_65 eval:siq_domain_score('db.outboundindex.net:6264',61,65) -score SIQ_OI_DOM_65 0.20 -describe SIQ_OI_DOM_65 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_65 net -priority SIQ_OI_DOM_65 900 - -header SIQ_OI_DOM_70 eval:siq_domain_score('db.outboundindex.net:6264',66,70) -score SIQ_OI_DOM_70 0.15 -describe SIQ_OI_DOM_70 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_70 net -priority SIQ_OI_DOM_70 900 - -header SIQ_OI_DOM_75 eval:siq_domain_score('db.outboundindex.net:6264',71,75) -score SIQ_OI_DOM_75 0.10 -describe SIQ_OI_DOM_75 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_75 net -priority SIQ_OI_DOM_75 900 - -header SIQ_OI_DOM_80 eval:siq_domain_score('db.outboundindex.net:6264',76,80) -score SIQ_OI_DOM_80 0.05 -describe SIQ_OI_DOM_80 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_80 net -priority SIQ_OI_DOM_80 900 - -header SIQ_OI_DOM_85 eval:siq_domain_score('db.outboundindex.net:6264',81,85) -score SIQ_OI_DOM_85 -0.01 -describe SIQ_OI_DOM_85 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_85 net -priority SIQ_OI_DOM_85 900 - -header SIQ_OI_DOM_90 eval:siq_domain_score('db.outboundindex.net:6264',86,90) -score SIQ_OI_DOM_90 -0.5 -describe SIQ_OI_DOM_90 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_90 net -priority SIQ_OI_DOM_90 900 - -header SIQ_OI_DOM_95 eval:siq_domain_score('db.outboundindex.net:6264',91,95) -score SIQ_OI_DOM_95 -0.10 -describe SIQ_OI_DOM_95 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_95 net -priority SIQ_OI_DOM_95 900 - -header SIQ_OI_DOM_99 eval:siq_domain_score('db.outboundindex.net:6264',96,99) -score SIQ_OI_DOM_99 -0.15 -describe SIQ_OI_DOM_99 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_99 net -priority SIQ_OI_DOM_99 900 - -header SIQ_OI_DOM_100 eval:siq_domain_score('db.outboundindex.net:6264',100,100) -score SIQ_OI_DOM_100 -0.2 -describe SIQ_OI_DOM_100 Outbound Index Domain Reputation: http://outboundindex.org/ -tflags SIQ_OI_DOM_100 net -priority SIQ_OI_DOM_100 900 - - - -header SIQ_OI_REL_ERROR eval:siq_relative_score('db.outboundindex.net:6264','-999','-2') -score SIQ_OI_REL_ERROR 0.001 -describe SIQ_OI_REL_ERROR Query returned an error value -tflags SIQ_OI_REL_ERROR net -priority SIQ_OI_REL_ERROR 900 - -header SIQ_OI_REL_UNKNOWN eval:siq_relative_score('db.outboundindex.net:6264','-1','-1') -score SIQ_OI_REL_UNKNOWN 0.01 -describe SIQ_OI_REL_UNKNOWN Query returned relative reputation unknown -tflags SIQ_OI_REL_UNKNOWN net -priority SIQ_OI_REL_UNKNOWN 900 - -header SIQ_OI_REL_00 eval:siq_relative_score('db.outboundindex.net:6264',0,0) -score SIQ_OI_REL_00 1.5 -describe SIQ_OI_REL_00 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_00 net -priority SIQ_OI_REL_00 900 - -header SIQ_OI_REL_01 eval:siq_relative_score('db.outboundindex.net:6264',1,1) -score SIQ_OI_REL_01 1.0 -describe SIQ_OI_REL_01 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_01 net -priority SIQ_OI_REL_01 900 - -header SIQ_OI_REL_05 eval:siq_relative_score('db.outboundindex.net:6264',2,5) -score SIQ_OI_REL_05 0.8 -describe SIQ_OI_REL_05 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_05 net -priority SIQ_OI_REL_05 900 - -header SIQ_OI_REL_10 eval:siq_relative_score('db.outboundindex.net:6264',6,10) -score SIQ_OI_REL_10 0.75 -describe SIQ_OI_REL_10 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_10 net -priority SIQ_OI_REL_10 900 - -header SIQ_OI_REL_15 eval:siq_relative_score('db.outboundindex.net:6264',11,15) -score SIQ_OI_REL_15 0.7 -describe SIQ_OI_REL_15 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_15 net -priority SIQ_OI_REL_15 900 - -header SIQ_OI_REL_20 eval:siq_relative_score('db.outboundindex.net:6264',16,20) -score SIQ_OI_REL_20 0.65 -describe SIQ_OI_REL_20 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_20 net -priority SIQ_OI_REL_20 900 - -header SIQ_OI_REL_25 eval:siq_relative_score('db.outboundindex.net:6264',21,25) -score SIQ_OI_REL_25 0.6 -describe SIQ_OI_REL_25 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_25 net -priority SIQ_OI_REL_25 900 - -header SIQ_OI_REL_30 eval:siq_relative_score('db.outboundindex.net:6264',26,30) -score SIQ_OI_REL_30 0.55 -describe SIQ_OI_REL_30 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_30 net -priority SIQ_OI_REL_30 900 - -header SIQ_OI_REL_35 eval:siq_relative_score('db.outboundindex.net:6264',31,35) -score SIQ_OI_REL_35 0.5 -describe SIQ_OI_REL_35 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_35 net -priority SIQ_OI_REL_35 900 - -header SIQ_OI_REL_40 eval:siq_relative_score('db.outboundindex.net:6264',36,40) -score SIQ_OI_REL_40 0.45 -describe SIQ_OI_REL_40 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_40 net -priority SIQ_OI_REL_40 900 - -header SIQ_OI_REL_45 eval:siq_relative_score('db.outboundindex.net:6264',41,45) -score SIQ_OI_REL_45 0.4 -describe SIQ_OI_REL_45 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_45 net -priority SIQ_OI_REL_45 900 - -header SIQ_OI_REL_50 eval:siq_relative_score('db.outboundindex.net:6264',46,50) -score SIQ_OI_REL_50 0.35 -describe SIQ_OI_REL_50 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_50 net -priority SIQ_OI_REL_50 900 - -header SIQ_OI_REL_55 eval:siq_relative_score('db.outboundindex.net:6264',51,55) -score SIQ_OI_REL_55 0.3 -describe SIQ_OI_REL_55 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_55 net -priority SIQ_OI_REL_55 900 - -header SIQ_OI_REL_60 eval:siq_relative_score('db.outboundindex.net:6264',56,60) -score SIQ_OI_REL_60 0.25 -describe SIQ_OI_REL_60 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_60 net -priority SIQ_OI_REL_60 900 - -header SIQ_OI_REL_65 eval:siq_relative_score('db.outboundindex.net:6264',61,65) -score SIQ_OI_REL_65 0.20 -describe SIQ_OI_REL_65 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_65 net -priority SIQ_OI_REL_65 900 - -header SIQ_OI_REL_70 eval:siq_relative_score('db.outboundindex.net:6264',66,70) -score SIQ_OI_REL_70 0.15 -describe SIQ_OI_REL_70 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_70 net -priority SIQ_OI_REL_70 900 - -header SIQ_OI_REL_75 eval:siq_relative_score('db.outboundindex.net:6264',71,75) -score SIQ_OI_REL_75 0.10 -describe SIQ_OI_REL_75 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_75 net -priority SIQ_OI_REL_75 900 - -header SIQ_OI_REL_80 eval:siq_relative_score('db.outboundindex.net:6264',76,80) -score SIQ_OI_REL_80 0.05 -describe SIQ_OI_REL_80 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_80 net -priority SIQ_OI_REL_80 900 - -header SIQ_OI_REL_85 eval:siq_relative_score('db.outboundindex.net:6264',81,85) -score SIQ_OI_REL_85 -0.01 -describe SIQ_OI_REL_85 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_85 net -priority SIQ_OI_REL_85 900 - -header SIQ_OI_REL_90 eval:siq_relative_score('db.outboundindex.net:6264',86,90) -score SIQ_OI_REL_90 -0.5 -describe SIQ_OI_REL_90 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_90 net -priority SIQ_OI_REL_90 900 - -header SIQ_OI_REL_95 eval:siq_relative_score('db.outboundindex.net:6264',91,95) -score SIQ_OI_REL_95 -0.10 -describe SIQ_OI_REL_95 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_95 net -priority SIQ_OI_REL_95 900 - -header SIQ_OI_REL_99 eval:siq_relative_score('db.outboundindex.net:6264',96,99) -score SIQ_OI_REL_99 -0.15 -describe SIQ_OI_REL_99 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_99 net -priority SIQ_OI_REL_99 900 - -header SIQ_OI_REL_100 eval:siq_relative_score('db.outboundindex.net:6264',100,100) -score SIQ_OI_REL_100 -0.2 -describe SIQ_OI_REL_100 Outbound Index Relative Reputation: http://outboundindex.org/ -tflags SIQ_OI_REL_100 net -priority SIQ_OI_REL_100 900 - - -# confidence values have no scoring value on their own, but are useful in meta -# tests when combined with the above rules - -header SIQ_OI_CONF eval:siq_confidence('db.outboundindex.net','-1','100') -score SIQ_OI_CONF 0.0001 -describe SIQ_OI_CONF Outbound Index Confidence: http://outboundindex.org/ -tflags SIQ_OI_CONF net -priority SIQ_OI_CONF 900 - - -# tests on the text section must occur after the evals are done -# so the priority must be higher than the eval priorities - -header SIQ_OI_STAB_1_9 db.outboundindex.net:6264 =~ /stability=[1-9]\./ -score SIQ_OI_STAB_1_9 0.001 -describe SIQ_OI_STAB_1_9 Outbound Index Stability from 1 to 9 -tflags SIQ_OI_STAB_1_9 net -priority SIQ_OI_STAB_1_9 901 - -header SIQ_OI_STAB_10 db.outboundindex.net:6264 =~ /stability=1[0-9]\./ -score SIQ_OI_STAB_10 0.001 -describe SIQ_OI_STAB_10 Outbound Index Stability from 10 to 19 -tflags SIQ_OI_STAB_10 net -priority SIQ_OI_STAB_10 901 - -header SIQ_OI_STAB_20 db.outboundindex.net:6264 =~ /stability=2[0-9]\./ -score SIQ_OI_STAB_20 0.001 -describe SIQ_OI_STAB_20 Outbound Index Stability from 20 to 29 -tflags SIQ_OI_STAB_20 net -priority SIQ_OI_STAB_20 901 - -header SIQ_OI_STAB_30 db.outboundindex.net:6264 =~ /stability=3[0-9]\./ -score SIQ_OI_STAB_30 0.001 -describe SIQ_OI_STAB_30 Outbound Index Stability from 30 to 39 -tflags SIQ_OI_STAB_30 net -priority SIQ_OI_STAB_30 901 - -header SIQ_OI_STAB_40 db.outboundindex.net:6264 =~ /stability=4[0-9]\./ -score SIQ_OI_STAB_40 0.001 -describe SIQ_OI_STAB_40 Outbound Index Stability from 40 to 49 -tflags SIQ_OI_STAB_40 net -priority SIQ_OI_STAB_40 901 - -header SIQ_OI_STAB_50 db.outboundindex.net:6264 =~ /stability=5[0-9]\./ -score SIQ_OI_STAB_50 0.001 -describe SIQ_OI_STAB_50 Outbound Index Stability from 50 to 59 -tflags SIQ_OI_STAB_50 net -priority SIQ_OI_STAB_50 901 - -header SIQ_OI_STAB_60 db.outboundindex.net:6264 =~ /stability=6[0-9]\./ -score SIQ_OI_STAB_60 0.001 -describe SIQ_OI_STAB_60 Outbound Index Stability from 60 to 69 -tflags SIQ_OI_STAB_60 net -priority SIQ_OI_STAB_60 901 - -header SIQ_OI_STAB_70 db.outboundindex.net:6264 =~ /stability=7[0-9]\./ -score SIQ_OI_STAB_70 0.001 -describe SIQ_OI_STAB_70 Outbound Index Stability from 70 to 79 -tflags SIQ_OI_STAB_70 net -priority SIQ_OI_STAB_70 901 - -header SIQ_OI_STAB_80 db.outboundindex.net:6264 =~ /stability=8[0-9]\./ -score SIQ_OI_STAB_80 0.001 -describe SIQ_OI_STAB_80 Outbound Index Stability from 80 to 89 -tflags SIQ_OI_STAB_80 net -priority SIQ_OI_STAB_80 901 - -header SIQ_OI_STAB_90 db.outboundindex.net:6264 =~ /stability=9[0-9]\./ -score SIQ_OI_STAB_90 0.001 -describe SIQ_OI_STAB_90 Outbound Index Stability from 90 to 99 -tflags SIQ_OI_STAB_90 net -priority SIQ_OI_STAB_90 901 - -header SIQ_OI_STAB_100S db.outboundindex.net:6264 =~ /stability=[1-9][0-9]{2}\./ -score SIQ_OI_STAB_100S 0.001 -describe SIQ_OI_STAB_100S Outbound Index Stability from 100 to 999 -tflags SIQ_OI_STAB_100S net -priority SIQ_OI_STAB_100S 901 - -header SIQ_OI_STAB_1000 db.outboundindex.net:6264 =~ /stability=1[0-9]{3}\./ -score SIQ_OI_STAB_1000 0.001 -describe SIQ_OI_STAB_1000 Outbound Index Stability from 1000 to 1999 -tflags SIQ_OI_STAB_1000 net -priority SIQ_OI_STAB_1000 901 - -header SIQ_OI_STAB_2000 db.outboundindex.net:6264 =~ /stability=2[0-9]{3}\./ -score SIQ_OI_STAB_2000 0.001 -describe SIQ_OI_STAB_2000 Outbound Index Stability from 2000 to 2999 -tflags SIQ_OI_STAB_2000 net -priority SIQ_OI_STAB_2000 901 - -header SIQ_OI_STAB_3000 db.outboundindex.net:6264 =~ /stability=3[0-9]{3}\./ -score SIQ_OI_STAB_3000 0.001 -describe SIQ_OI_STAB_3000 Outbound Index Stability from 3000 to 3999 -tflags SIQ_OI_STAB_3000 net -priority SIQ_OI_STAB_3000 901 - -header SIQ_OI_STAB_4000 db.outboundindex.net:6264 =~ /stability=4[0-9]{3}\./ -score SIQ_OI_STAB_4000 0.001 -describe SIQ_OI_STAB_4000 Outbound Index Stability from 4000 to 4999 -tflags SIQ_OI_STAB_4000 net -priority SIQ_OI_STAB_4000 901 - -header SIQ_OI_STAB_5000 db.outboundindex.net:6264 =~ /stability=\d*([5-9][0-9]{3}|[0-9]{5})\./ -score SIQ_OI_STAB_5000 0.001 -describe SIQ_OI_STAB_5000 Outbound Index Stability of 5000 or more -tflags SIQ_OI_STAB_5000 net -priority SIQ_OI_STAB_5000 901 - - - -# meta rules -- high stability, weight the siq_score heavier -# priority value must be higher than dependency priorities - -meta SIQ_OI_00_100S (SIQ_OI_00 && SIQ_OI_STAB_100S) -score SIQ_OI_00_100S 0.5 -describe SIQ_OI_00_100S OI Rep Score=0 Stability=100-999 -tflags SIQ_OI_00_100S net -priority SIQ_OI_00_100S 902 - -meta SIQ_OI_00_1000 (SIQ_OI_00 && SIQ_OI_STAB_1000) -score SIQ_OI_00_1000 1.0 -describe SIQ_OI_00_1000 OI Rep Score=0 Stability=1000-1999 -tflags SIQ_OI_00_1000 net -priority SIQ_OI_00_1000 902 - -meta SIQ_OI_00_2000 (SIQ_OI_00 && (SIQ_OI_STAB_2000 || SIQ_OI_STAB_3000 || SIQ_OI_STAB_4000 || SIQ_OI_STAB_5000)) -score SIQ_OI_00_2000 1.5 -describe SIQ_OI_00_2000 OI Rep Score=0 Stability=2000+ -tflags SIQ_OI_00_2000 net -priority SIQ_OI_00_2000 902 - - -meta SIQ_OI_01_100S (SIQ_OI_01 && SIQ_OI_STAB_100S) -score SIQ_OI_01_100S 0.25 -describe SIQ_OI_01_100S OI Rep Score=1 Stability=100-999 -tflags SIQ_OI_01_100S net -priority SIQ_OI_01_100S 902 - -meta SIQ_OI_01_1000 (SIQ_OI_01 && SIQ_OI_STAB_1000) -score SIQ_OI_01_1000 0.5 -describe SIQ_OI_01_1000 OI Rep Score=1 Stability=1000-1999 -tflags SIQ_OI_01_1000 net -priority SIQ_OI_01_1000 902 - -meta SIQ_OI_01_2000 (SIQ_OI_01 && (SIQ_OI_STAB_2000 || SIQ_OI_STAB_3000 || SIQ_OI_STAB_4000 || SIQ_OI_STAB_5000)) -score SIQ_OI_01_2000 1.0 -describe SIQ_OI_01_2000 OI Rep Score=1 Stability=2000+ -tflags SIQ_OI_01_2000 net -priority SIQ_OI_01_2000 902 - - -meta SIQ_OI_05_100S (SIQ_OI_05 && SIQ_OI_STAB_100S) -score SIQ_OI_05_100S 0.15 -describe SIQ_OI_05_100S OI Rep Score=2-5 Stability=100-999 -tflags SIQ_OI_05_100S net -priority SIQ_OI_05_100S 902 - -meta SIQ_OI_05_1000 (SIQ_OI_05 && SIQ_OI_STAB_1000) -score SIQ_OI_05_1000 0.25 -describe SIQ_OI_05_1000 OI Rep Score=2-5 Stability=1000-1999 -tflags SIQ_OI_05_1000 net -priority SIQ_OI_05_1000 902 - -meta SIQ_OI_05_2000 (SIQ_OI_05 && (SIQ_OI_STAB_2000 || SIQ_OI_STAB_3000 || SIQ_OI_STAB_4000 || SIQ_OI_STAB_5000)) -score SIQ_OI_05_2000 0.75 -describe SIQ_OI_05_2000 OI Rep Score=2-5 Stability=2000+ -tflags SIQ_OI_05_2000 net -priority SIQ_OI_05_2000 902 - - -endif # Mail::SpamAssassin::Plugin::SIQ - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/SIQ.pm spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/SIQ.pm --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/dos/SIQ.pm 2018-02-05 14:10:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/dos/SIQ.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,1161 +0,0 @@ -=head1 NAME - -Mail::SpamAssassin::Plugin::SIQ version: 20060305 - -=head1 SYNOPSIS - - loadplugin Mail::SpamAssassin::Plugin::SIQ [/path/to/SIQ.pm] - - siq_server db.outboundindex.net:6264 - - siq_server_ttl db.outboundindex.net:6264 300 - - siq_oi_workaround 0 - - siq_query_timeout 5 - - siq_skip_domain example.com - - siq_skip_ip 1.2.3.4 - - header SIQ_OI_00 eval:siq_score('db.outboundindex.net',0,0) - score SIQ_OI_00 1.5 - describe SIQ_OI_00 Outbound Index Reputation: http://outboundindex.org/ - tflags SIQ_OI_00 net - priority SIQ_OI_00 900 - - header SIQ_OI_IP_01 eval:siq_ip_score('db.outboundindex.net',1,1) - score SIQ_OI_IP_01 1.0 - describe SIQ_OI_IP_01 Outbound Index IP Reputation: http://outboundindex.org/ - tflags SIQ_OI_IP_01 net - priority SIQ_OI_IP_01 900 - - header SIQ_OI_DOM_50 eval:siq_domain_score('db.outboundindex.net',50,59) - score SIQ_OI_DOM_50 0.1 - describe SIQ_OI_DOM_50 Outbound Index Domain Reputation: http://outboundindex.org/ - tflags SIQ_OI_DOM_50 net - priority SIQ_OI_DOM_50 900 - - header SIQ_OI_REL_01 eval:siq_relative_score('db.outboundindex.net',1,1) - score SIQ_OI_REL_01 1.0 - describe SIQ_OI_REL_01 Outbound Index Relative Reputation: http://outboundindex.org/ - tflags SIQ_OI_REL_01 net - priority SIQ_OI_REL_01 900 - - header SIQ_OI_CONF_01 eval:siq_confidence('db.outboundindex.net',1,1) - score SIQ_OI_CONF_01 1.0 - describe SIQ_OI_CONF_01 Outbound Index Confidence: http://outboundindex.org/ - tflags SIQ_OI_CONF_01 net - priority SIQ_OI_CONF_01 900 - - header SIQ_OI_STAB_1 db.outboundindex.net:6264 =~ /stability=1\./ - score SIQ_OI_STAB_1 0.5 - describe SIQ_OI_STAB_1 Outbound Index stability value of 1 - tflags SIQ_OI_STAB_1 net - priority SIQ_OI_STAB_1 901 - -=head1 DESCRIPTION - -This plugin queries for reputation data, based on domain & IP pairs, from a -reputation service provider using the IETF ASRG draft SIQ protocol: - -http://www.ietf.org/internet-drafts/draft-irtf-asrg-iar-howe-siq-02.txt - -A number of eval functions are provided for writing eval-type rules against -the reputation data returned by the reputation service queried. - -A pseudo-header is also provided for testing of the optional text area in an -SIQ response. - -=head1 AUTHOR - -Daryl C. W. O'Shea, DOS Technologies - -=head1 COPYRIGHT - -Copyright (c) 2006 Daryl C. W. O'Shea, DOS Technologies. All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -=head1 NOTICE - -Built-in caching is used, so queries against the same domain and IP pair will -not incur the expense (both time and reputation service provider charges) of -an additional query. Note that each SpamAssassin child process maintains its -own idependent cache which is not shared with other children and lasts only -for the lifetime of the current child. The cache life time is configurable. - -=head1 PRIVACY CONCERNS - -As with any third-party data service used to classify email, use of services -utilizing the SIQ protocol has inherent privacy implications. Many/most -reputation services use aggregated data from their query logs as a part of -their reputation calculations. With the data provided (domain and IP pairs) -by a query client, such as this plugin, a reputation service provider could -estimate your email volume, a breakdown of email domains sending mail to your -systems, and etc. - -Depending on your DNS setup, use of services using the SIQ protocol might not -impose privacy concerns greater than those already imposed by the use of DNS -based IP and/or URI blacklists (or whitelists). - -=cut - -package Mail::SpamAssassin::Plugin::SIQ; - -use Mail::SpamAssassin::Plugin; -use Mail::SpamAssassin::Logger; -use strict; -use warnings; -use bytes; - -use Socket; -use IO::Socket; -use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK); - -our @ISA = qw(Mail::SpamAssassin::Plugin); - - -sub new { - my $class = shift; - my $mailsaobject = shift; - - $class = ref($class) || $class; - my $self = $class->SUPER::new($mailsaobject); - bless ($self, $class); - - if ($mailsaobject->{local_tests_only}) { - $self->{disabled} = 1; - } else { - $self->{disabled} = 0; - } - - $self->register_eval_rule("siq_score"); - $self->register_eval_rule("siq_ip_score"); - $self->register_eval_rule("siq_domain_score"); - $self->register_eval_rule("siq_relative_score"); - $self->register_eval_rule("siq_confidence"); - - $self->set_config($mailsaobject->{conf}); - - return $self; -} - - -sub set_config { - my($self, $conf) = @_; - my @cmds = (); - -=head1 USER PREFERENCES - -=over 4 - -=item siq_skip_domain example.com (default: none) - -A list of domain name patterns to exclude from SIQ queries. Normal shell -wild cards may be used, similar to those used in whilelist_from entries. - -Multiple domain name patterns per line are permitted, as are multiple lines. - - Example: - siq_skip_domain example.com *.example.com - siq_skip_domain *.apache.org - -=cut - - push (@cmds, { - setting => 'siq_skip_domain', - default => {}, - code => sub { - my ($self, $key, $value, $line) = @_; - if ($value =~ /^$/) { - return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE; - } - if ($value !~ /^[-.*?\w\s]+$/) { - return $Mail::SpamAssassin::Conf::INVALID_VALUE; - } - foreach my $domain (split(/\s+/, $value)) { - my $pattern = $domain; - $domain =~ s/\./\\\./g; - $domain =~ s/\?/\./g; - $domain =~ s/\*/\.\*/g; - $self->{siq_skip_domain}->{lc $domain} = $pattern; - } - } - }); - -=item siq_skip_ip 192.168.123.* (default: none) - -A list of ip patterns to exclude from SIQ queries. Normal shell wild cards -may be used, similar to those used in whilelist_from entries. - -Multiple ip patterns per line are permitted, as are multiple lines. - - Example: - siq_skip_ip 192.168.123.* 127.* - siq_skip_ip 10.1.* - -Note: Currently only file-glob style wildcards are supported. CIDR -notation, nor any other format, is NOT supported. - -=cut - - push (@cmds, { - setting => 'siq_skip_ip', - default => {}, - code => sub { - my ($self, $key, $value, $line) = @_; - if ($value =~ /^$/) { - return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE; - } - if ($value !~ /^[\.\*\?0-9\s]+$/) { - return $Mail::SpamAssassin::Conf::INVALID_VALUE; - } - foreach my $ip (split(/\s+/, $value)) { - my $pattern = $ip; - $ip =~ s/\./\\\./g; - $ip =~ s/\?/\./g; - $ip =~ s/\*/\.\*/g; - $self->{siq_skip_ip}->{$ip} = $pattern; - } - } - }); - -=back - -=head1 RULE DEFINITIONS AND PRIVILEGED SETTINGS - -There are no privileged settings provided. - -=head1 ADMINISTRATOR SETTINGS - -These settings differ from the ones above, in that they are considered 'more -privileged' -- even more than the ones in the B section. -No matter what C is set to, these can never be set from a -user's C file when spamc/spamd is being used. However, all -settings can be used by local programs run directly by the user. - -=over 4 - -=item siq_server db.example.net:6264 - -An SIQ server hostname to query. An optional :port number may be included. If -no port is specified, port 6264 will be used by default. Multiple servers per -line are permitted, as are multiple lines. - -Examples: - - siq_server db.example.net:6264 - siq_server db.example.org - siq_server db.example.com db.example.org:1234 - siq_server db.example.net:6264 db.example.org:1234 - -=cut - - push (@cmds, { - setting => 'siq_server', - default => {}, - is_admin => 1, - code => sub { - my ($self, $key, $value, $line) = @_; - if ($value =~ /^$/) { - return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE; - } - if ($value !~ /^[-.\w\d]+(?::\d{1,5})?(?:\s+[-.\w\d]+(?::\d{1,5})?)*$/) { - return $Mail::SpamAssassin::Conf::INVALID_VALUE; - } - foreach my $server (split(/\s+/, $value)) { - $server =~ /^(.*?)(?::(.*))?$/; - my $host = lc $1; - my $port = (defined $2 ? $2 : "6264"); - $self->{siq_servers}->{lc $1}->{$port} = 1; - dbg("config: added SIQ server host: $1 port: $port"); - } - } - }); - -=item siq_server_ttl db.example.net:6264 300 - -The amount of time in seconds to keep cached SIQ query responses from a -particular server. Note that domain and IP pairs may be cached more often -than this value as caches are not shared between children and expire when a -child expires (after 200 messages by default). - -This option overrides the TTL returned in an SIQ response by the specified SIQ -server hostname. An optional :port number may be included. If no port is -specified, port 6264 will be used by default. Only one server, with optional -port, and TTL value per line is permitted. Multiple lines are permitted. - -Examples: - - siq_server_ttl db.example.net:6264 300 - siq_server_ttl db.example.org 500 - -Note: To prevent abuse of services, the longer of the TTL provided with this -option and the TTL provided in the SIQ response will be used. - -=cut - - push (@cmds, { - setting => 'siq_server_ttl', - default => {}, - is_admin => 1, - code => sub { - my ($self, $key, $value, $line) = @_; - if ($value =~ /^$/) { - return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE; - } - if ($value !~ /^([-.\w\d]+)(?::(\d{1,5}))?\s+(\d+)$/) { - return $Mail::SpamAssassin::Conf::INVALID_VALUE; - } - my $host = lc $1; - my $port = (defined $2 ? $2 : "6264"); - my $ttl = $3; - $self->{siq_server_ttls}->{lc $1}->{$port} = $3; - dbg("config: added SIQ response TTL: $3 for server host: $1 port: $port"); - } - }); - -=item siq_oi_workaround (0|1) (default: 0) - -As of March 5, 2006, Oubtbound Index does not yet include octets 8-11 (TTL, -Confidence and Extra-Length values) as specified by the draft in their -responses. - -Outbound Index plans on updating their software to include these octets in the -near future. Set this option to 1 to enable correct parsing of Outbound Index -responses in the interim. - -Note: Enabling this option will affect parsing of ALL SIQ servers' -responses. Therefore you cannot use Outbound Index and another service -together until Outbound Index updates their service so that this option -is not required. This shouldn't be a problem since there aren't any other -public services using SIQ yet. - -=cut - - push(@cmds, { - setting => 'siq_oi_workaround', - default => 0, - is_admin => 1, - type => $Mail::SpamAssassin::Conf::CONF_TYPE_BOOL - }); - -=item siq_query_timeout n (default: 5) - -The amount of time in seconds to wait for an SIQ query to complete. - -=cut - - push(@cmds, { - setting => 'siq_query_timeout', - default => 5, - is_admin => 1, - type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC - }); - - $conf->{parser}->register_commands(\@cmds); -} - - -=item eval:siq_score('host:port',min,max) - -This eval function is provided for writing eval-type rules against the -reputation score returned by the reputation service queried. - -min and max define a range of scores to match against. - -Example: - - header SIQ_OI_00 eval:siq_score('db.outboundindex.net',0,0) - score SIQ_OI_00 1.5 - describe SIQ_OI_00 Outbound Index Reputation: http://outboundindex.org/ - tflags SIQ_OI_00 net - priority SIQ_OI_00 900 - -Note: The priority value gives SIQ responses more time to arrive before -SpamAssassin pauses to wait for responses for the amount of time specified by -siq_query_timeout. Changing the priority value is not recommended. Adjust -the siq_query_timeout value to shorten or lengthen the time SpamAssassin -will wait for SIQ responses. Set siq_query_timeout to 0 if you do not -want SpamAssassin to wait at all for SIQ responses. - -=cut - -sub siq_score { - my ($self, $pms, $server, $min, $max) = @_; - return 0 if $self->{disabled}; - return 0 unless $pms->{siq_checking}; - - my $rule_name = $pms->get_current_eval_rule_name(); - - my ($config_ok, $host, $port) - = $self->_parse_eval_call($pms, "siq_score", $rule_name, $server, $min, $max); - - return 0 if (!$config_ok); - - # this comes after $self->_parse_eval_call to avoid being called earlier - # than necessary by an incorrect eval call - $self->_get_results($pms) unless $pms->{siq_got_results}; - - # log the hit (if any) and return 0, otherwise hits will appear twice - my @results = $self->_get_results_from_cache($pms->{siq_time}, $host, - $port, $pms->{siq_domain}, $pms->{siq_ip}); - - if (defined $results[1] && - $min <= $results[1] && $results[1] <= $max) { - $self->_log_hit($pms, $rule_name, "SIQ: score: $results[1] queried: ". - "$pms->{siq_domain}/$pms->{siq_ip}"); - } - return 0; -} - - -=item eval:siq_ip_score('host:port',min,max) - -This eval function is provided for writing eval-type rules against the -IP reputation score returned by the reputation service queried. - -min and max define a range of scores to match against. - -Example: - - header SIQ_OI_IP_01 eval:siq_ip_score('db.outboundindex.net',1,1) - score SIQ_OI_IP_01 1.0 - describe SIQ_OI_IP_01 Outbound Index IP Reputation: http://outboundindex.org/ - tflags SIQ_OI_IP_01 net - priority SIQ_OI_IP_01 900 - -Note: See the note above for eval:siq_score regarding the priority value. - -=cut - -sub siq_ip_score { - my ($self, $pms, $server, $min, $max) = @_; - return 0 if $self->{disabled}; - return 0 unless $pms->{siq_checking}; - - my $rule_name = $pms->get_current_eval_rule_name(); - - my ($config_ok, $host, $port) - = $self->_parse_eval_call($pms, "siq_ip_score", $rule_name, $server, $min, $max); - - return 0 if (!$config_ok); - - # this comes after $self->_parse_eval_call to avoid being called earlier - # than necessary by an incorrect eval call - $self->_get_results($pms) unless $pms->{siq_got_results}; - - # log the hit (if any) and return 0, otherwise hits will appear twice - my @results = $self->_get_results_from_cache($pms->{siq_time}, $host, - $port, $pms->{siq_domain}, $pms->{siq_ip}); - - if (defined $results[3] && - $min <= $results[3] && $results[3] <= $max) { - $self->_log_hit($pms, $rule_name, "SIQ: score: $results[3] queried: ". - "$pms->{siq_domain}/$pms->{siq_ip}"); - } - return 0; -} - - -=item eval:siq_domain_score('host:port',min,max) - -This eval function is provided for writing eval-type rules against the -domain reputation score returned by the reputation service queried. - -min and max define a range of scores to match against. - -Example: - - header SIQ_OI_DOM_50 eval:siq_domain_score('db.outboundindex.net',50,59) - score SIQ_OI_DOM_50 0.1 - describe SIQ_OI_DOM_50 Outbound Index Domain Reputation: http://outboundindex.org/ - tflags SIQ_OI_DOM_50 net - priority SIQ_OI_DOM_50 900 - -Note: See the note above for eval:siq_score regarding the priority value. - -=cut - -sub siq_domain_score { - my ($self, $pms, $server, $min, $max) = @_; - return 0 if $self->{disabled}; - return 0 unless $pms->{siq_checking}; - - my $rule_name = $pms->get_current_eval_rule_name(); - - my ($config_ok, $host, $port) - = $self->_parse_eval_call($pms, "siq_domain_score", $rule_name, $server, $min, $max); - - return 0 if (!$config_ok); - - # this comes after $self->_parse_eval_call to avoid being called earlier - # than necessary by an incorrect eval call - $self->_get_results($pms) unless $pms->{siq_got_results}; - - # log the hit (if any) and return 0, otherwise hits will appear twice - my @results = $self->_get_results_from_cache($pms->{siq_time}, $host, - $port, $pms->{siq_domain}, $pms->{siq_ip}); - - if (defined $results[4] && - $min <= $results[4] && $results[4] <= $max) { - $self->_log_hit($pms, $rule_name, "SIQ: score: $results[4] queried: ". - "$pms->{siq_domain}/$pms->{siq_ip}"); - } - return 0; -} - - -=item eval:siq_relative_score('host:port',min,max) - -This eval function is provided for writing eval-type rules against the -relative reputation score returned by the reputation service queried. - -min and max define a range of scores to match against. - -Example: - - header SIQ_OI_REL_01 eval:siq_relative_score('db.outboundindex.net',1,1) - score SIQ_OI_REL_01 1.0 - describe SIQ_OI_REL_01 Outbound Index Relative Reputation: http://outboundindex.org/ - tflags SIQ_OI_REL_01 net - priority SIQ_OI_REL_01 900 - -Note: See the note above for eval:siq_score regarding the priority value. - -=cut - -sub siq_relative_score { - my ($self, $pms, $server, $min, $max) = @_; - return 0 if $self->{disabled}; - return 0 unless $pms->{siq_checking}; - - my $rule_name = $pms->get_current_eval_rule_name(); - - my ($config_ok, $host, $port) - = $self->_parse_eval_call($pms, "siq_relative_score", $rule_name, $server, $min, $max); - - return 0 if (!$config_ok); - - # this comes after $self->_parse_eval_call to avoid being called earlier - # than necessary by an incorrect eval call - $self->_get_results($pms) unless $pms->{siq_got_results}; - - # log the hit (if any) and return 0, otherwise hits will appear twice - my @results = $self->_get_results_from_cache($pms->{siq_time}, $host, - $port, $pms->{siq_domain}, $pms->{siq_ip}); - - if (defined $results[5] && - $min <= $results[5] && $results[5] <= $max) { - $self->_log_hit($pms, $rule_name, "SIQ: score: $results[5] queried: ". - "$pms->{siq_domain}/$pms->{siq_ip}"); - } - return 0; -} - - -=item eval:siq_confidence('host:port',min,max) - -This eval function is provided for writing eval-type rules against the -confidence value returned by the reputation service queried. - -min and max define a range of values to match against. - -Example: - - header SIQ_OI_CONF_01 eval:siq_confidence('db.outboundindex.net',1,1) - score SIQ_OI_CONF_01 1.0 - describe SIQ_OI_CONF_01 Outbound Index Confidence: http://outboundindex.org/ - tflags SIQ_OI_CONF_01 net - priority SIQ_OI_CONF_01 900 - -Note: See the note above for eval:siq_score regarding the priority value. - -=cut - -sub siq_confidence { - my ($self, $pms, $server, $min, $max) = @_; - return 0 if $self->{disabled}; - return 0 unless $pms->{siq_checking}; - - my $rule_name = $pms->get_current_eval_rule_name(); - - my ($config_ok, $host, $port) - = $self->_parse_eval_call($pms, "siq_confidence", $rule_name, $server, $min, $max); - - return 0 if (!$config_ok); - - # this comes after $self->_parse_eval_call to avoid being called earlier - # than necessary by an incorrect eval call - $self->_get_results($pms) unless $pms->{siq_got_results}; - - # log the hit (if any) and return 0, otherwise hits will appear twice - my @results = $self->_get_results_from_cache($pms->{siq_time}, $host, - $port, $pms->{siq_domain}, $pms->{siq_ip}); - - if (defined $results[8] && - $min <= $results[8] && $results[8] <= $max) { - $self->_log_hit($pms, $rule_name, "SIQ: value: $results[8] queried: ". - "$pms->{siq_domain}/$pms->{siq_ip}"); - } - return 0; -} - - -=item header siqhost[:port] =~ /pattern/modifiers - -A pseudo-header containing the text portion of the SIQ result is -provided for each SIQ server that you have called at least one of -the above eval tests on one of more times. - -Example: - - header SIQ_OI_STAB_1 db.outboundindex.net =~ /stability=1\./ - score SIQ_OI_STAB_1 0.5 - describe SIQ_OI_STAB_1 Outbound Index stability value of 1 - tflags SIQ_OI_STAB_1 net - priority SIQ_OI_STAB_1 901 - - header SIQ_EX_STAB_20 db.example.org:1234 =~ /stability=2[0-9]\./ - score SIQ_EX_STAB_20 0.1 - describe SIQ_EX_STAB_20 Example Service stability value of 20 to 29 - tflags SIQ_EX_STAB_20 net - priority SIQ_EX_STAB_20 9 - -Notes: - -You MUST call at least one of the above eval tests on each of the servers -that you want to test the text portion of the response, otherwise the -pseudo-header will not be present. - -You MUST include the port number in the psuedo-header if the default port -6264 is not used, otherwise it is optional. - -You MUST include a priority for the rule that is greater in value than the -priority of the required pre-requisite eval test. The pseudo-header will not -yet be present if this rule's priority is less than (higher) than the above -eval tests. - -=back - -=cut - -sub _parse_eval_call { - my ($self, $pms, $eval_name, $rule_name, $server, $min, $max) = @_; - - my ($host, $port); - - # validate the eval call and complain if it was done wrong - unless (defined $server && $server =~ /^([-.\w\d]+)(?::(\d{1,5}))?$/) { - warn("siq: eval rule: $rule_name ". - "requires an SIQ server parameter (host with optional :port) ". - "as the first parameter"); - - dbg("config: eval rule: $rule_name ". - "requires an SIQ server parameter such as: header $rule_name ". - "eval:$eval_name\('db.example.com:6264',20,30\)"); - - $pms->{rule_errors}++; # flag to --lint that there was an error ... - return 0; - } else { - $host = $1; - $port = (defined $2 ? $2 : "6264"); - } - - unless (exists $pms->{conf}->{siq_servers}->{$host}->{$port}) { - warn("siq: the SIQ server specified in eval rule: $rule_name ". - "has not been added to the list of SIQ servers to query"); - - dbg("config: you must add \'siq_server $host:$port\' to your configuration ". - "if you want to be able to test SIQ results from this server"); - - $pms->{rule_errors}++; # flag to --lint that there was an error ... - return 0; - } - - unless (defined $min && $min =~ /^-?\d+(?:\.\d+)?$/ && - defined $max && $max =~ /^-?\d+(?:\.\d+)?$/) { - warn("siq: eval rule: $rule_name requires a minimum and maximum value"); - - dbg("config: eval rule: $rule_name ". - "requires minimum and maximum parameters such as: header ". - "$rule_name eval:$eval_name\('db.example.com',20,30\)"); - - $pms->{rule_errors}++; # flag to --lint that there was an error ... - return 0; - } - - return (1, $host, $port); -} - - -sub _log_hit { - my ($self, $pms, $rulename, $text) = @_; - - $pms->test_log ($text); - $pms->got_hit ($rulename, ""); -} - - -sub parsed_metadata { - my ($self, $opts) = @_; - my $pms = $opts->{permsgstatus}; - - return if $self->{disabled}; - - $pms->{siq_queries_remaining} = 0; - $pms->{siq_queries_sent} = 0; - $pms->{siq_time} = time; - $pms->{siq_got_results} = 0; - $pms->{siq_checking} = 0; - - # get an appropriate relay to test against - my $lasthop = $self->_get_relay($pms); - if (!defined $lasthop) { - dbg("siq: no suitable relay for siq use found, skipping SIQ query"); - return; - } - - $pms->{siq_ip} = $lasthop->{ip}; - $pms->{siq_domain} = $self->_get_sender($pms); - - # we already dbg'd if we couldn't get a sender, just return - return unless (defined $pms->{siq_domain}); - $pms->{siq_domain} =~ s/^.*\@//; - - # check to see if the domain is in the list of domains to skip - my $skip_it = 0; - while (my ($regexp, $simple) = each (%{$pms->{conf}->{siq_skip_domain}})) { - if ($pms->{siq_domain} =~ /^$regexp$/) { # both already lc - dbg("siq: domain: $pms->{siq_domain} matches skip pattern: $simple"); - $skip_it = 1; - } - } - return if $skip_it; - - # check to see if the domain is in the list of domains to skip - while (my ($regexp, $simple) = each (%{$pms->{conf}->{siq_skip_ip}})) { - if ($pms->{siq_ip} =~ /^$regexp$/) { # both already lc - dbg("siq: ip: $pms->{siq_ip} matches skip pattern: $simple"); - $skip_it = 1; - } - } - return if $skip_it; - - # signal to the evals that we're doing checks this time around - $pms->{siq_checking} = 1; - - # do queries - foreach my $host (keys %{$pms->{conf}->{siq_servers}}) { - foreach my $port (keys %{$pms->{conf}->{siq_servers}->{$host}}) { - next if $self->_check_for_cached_results($pms, $pms->{siq_time}, $host, - $port, $pms->{siq_domain}, $pms->{siq_ip}); - dbg("siq: querying $host:$port"); - $self->_send_siq_query($pms, $pms->{siq_domain}, $pms->{siq_ip}, - $host, $port); - } - } - - return; -} - - -sub _cache_results { - my ($self, $time, $host, $port, $domain, $ip, @results) = @_; - - # set cache item expiry time - # don't allow TTLs shorter than the TTL specified in the response - if (exists $self->{main}->{conf}->{siq_server_ttls}->{$host}->{$port} && - $self->{main}->{conf}->{siq_server_ttls}->{$host}->{$port} > $results[7]) { - $time += $self->{main}->{conf}->{siq_server_ttls}->{$host}->{$port}; - } else { - $time += $results[7] if ($results[7] > 0); # unknown OI TTL is set to -999 - } - - $self->{siq_cache} = {} unless (exists $self->{siq_cache}); - - $self->{siq_cache}->{$host} = {} - unless (exists $self->{siq_cache}->{$host}); - - $self->{siq_cache}->{$host}->{$port} = {} - unless (exists $self->{siq_cache}->{$host}->{$port}); - - $self->{siq_cache}->{$host}->{$port}->{$domain} = {} - unless (exists $self->{siq_cache}->{$host}->{$port}->{$domain}); - - $self->{siq_cache}->{$host}->{$port}->{$domain}->{$ip} = [$time, @results]; - - dbg("siq: saved results to cache: $host:$port/$domain/$ip"); - - return; -} - - -sub _check_for_cached_results { - my ($self, $pms, $time, $host, $port, $domain, $ip) = @_; - - if (exists $self->{siq_cache}->{$host}->{$port}->{$domain}->{$ip}) { - if ($self->{siq_cache}->{$host}->{$port}->{$domain}->{$ip}->[0] > $time) { - dbg("siq: found results in cache: $host:$port/$domain/$ip"); - - # make the cached text portion available for testing - # the port number is optional if the default 6264 is used - $pms->{msg}->put_metadata("$host:$port", - $self->{siq_cache}->{$host}->{$port}->{$domain}->{$ip}->[10]); - if ($port == 6264) { - $pms->{msg}->put_metadata($host, - $self->{siq_cache}->{$host}->{$port}->{$domain}->{$ip}->[10]); - } - return 1; - } else { - dbg("siq: found expired result in cache, doing new query"); - } - } else { - dbg("siq: no results found in cache for $host:$port"); - } - return 0; -} - - -sub _get_results_from_cache { - my ($self, $time, $host, $port, $domain, $ip) = @_; - - if (exists $self->{siq_cache}->{$host}->{$port}->{$domain}->{$ip}) { - if ($self->{siq_cache}->{$host}->{$port}->{$domain}->{$ip}->[0] > $time) { - my @results = @{$self->{siq_cache}->{$host}->{$port}->{$domain}->{$ip}}; - shift @results; - return @results; - } - } - return undef; -} - - -sub _generate_query_id { - return int(rand(65535)); -} - - -sub _send_siq_query { - my ($self, $pms, $domain, $ip, $host, $port) = @_; - - unless (defined $ip && - $ip =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/) { - warn("siq: invalid (non-IPv4) IP passed to _send_siq_query\n"); - return 0; - } - - unless (defined $domain) { - warn("siq: missing domain in call to _send_siq_query\n"); - return 0; - } - - # the query ID identifies the query and is used in the response packet - # since we send multiple queries out on the same socket, we have to - # create a new packet with a random query ID for each query - my $query_id = $self->_generate_query_id(); - $pms->{siq_query_ids}->{$host}->{$port} = $query_id; - - # build request packet - my $payload = pack("B8", "00000001"); # version - $payload .= pack("B8"); # QT - $payload .= substr(pack("N", $query_id), 2); # ID - $payload .= pack("B96"); # IPv6 zero-padding - $payload .= inet_aton($ip); # IPv4 in IPv6 - $payload .= substr(pack("N", length($domain)), 3); # QD-length in octets - $payload .= pack("B8"); # extra length (octets) - $payload .= $domain; # domain - - # save socket handle on $pms, we'll check for a response later - unless (exists $pms->{siq_handle} && $pms->{siq_handle}) { - dbg("siq: opening socket for SIQ queries"); - unless ($pms->{siq_handle} = IO::Socket::INET->new(Proto => 'udp')) { - dbg("siq: socket creation failed: $@"); - return 0; - } else { - # try to prevent unwanted blocking - my $flags = fcntl($pms->{siq_handle}, F_GETFL, 0) - or warn "siq: Can't get flags for the socket: $!\n"; - if ($flags) { - fcntl($pms->{siq_handle}, F_SETFL, $flags | O_NONBLOCK) - or warn "siq: Can't set flags for the socket: $!\n"; - } - } - } else { - dbg("siq: using existing socket for SIQ queries"); - } - - my $ipaddr = inet_aton($host); - my $portaddr = sockaddr_in($port, $ipaddr); - - unless (send($pms->{siq_handle}, $payload, 0, $portaddr) - == length($payload)) { - dbg("siq: cannot send query: $!"); - return 0; - } else { - dbg("siq: sent query ID $query_id to $host:$port"); - $pms->{siq_queries_remaining}++; - $pms->{siq_queries_sent}++; - } - return 1; -} - - -sub _get_results { - my ($self, $pms) = @_; - - $pms->{siq_got_results} = 1; - $self->_harvest_siq_responses($pms); - - dbg("siq: sent ". $pms->{siq_queries_sent} ." queries, received ". - ($pms->{siq_queries_sent} - $pms->{siq_queries_remaining}) - ." responses"); - return; -} - - -sub _harvest_siq_responses { - my ($self, $pms) = @_; - - return unless $pms->{siq_queries_sent}; - - my $rout; - my $rin = ''; - - vec($rin,fileno($pms->{siq_handle}),1) = 1; - - my $timeout = $pms->{conf}->{siq_query_timeout}; - - my $nfound = 0; - my $wait_time = 0.05; - - while ($timeout > 0) { - $nfound = select($rout=$rin, undef, undef, $wait_time); - - if (!defined $nfound || $nfound < 1) { - $timeout -= $wait_time; - } else { - # read results - READRESULT: for (my $i = 0; $i < $nfound; $i++) { - my ($response, $portaddr); - unless ($portaddr = recv($pms->{siq_handle}, $response, 512, 0)) { - dbg ("siq: recv failed: $!"); - return 0; - } - - # parse response - # returns: ($version, $score, $id, $ipscore, $dscore, $rscore, $textlen, $ttl, - # $confidence, $text) - my (@results) = $self->_parse_response($response, $pms->{conf}->{siq_oi_workaround}); - next READRESULT unless @results; - - foreach my $host (keys %{$pms->{siq_query_ids}}) { - foreach my $port (keys %{$pms->{siq_query_ids}->{$host}}) { - my $query_id = $pms->{siq_query_ids}->{$host}->{$port}; - - if ($results[2] == $query_id) { - dbg("siq: response ID $query_id matches query to $host:$port"); - $pms->{siq_queries_remaining}--; - - dbg("siq: response: ". join("/", @results)); - - $self->_cache_results($pms->{siq_time}, $host, $port, - $pms->{siq_domain}, $pms->{siq_ip}, @results); - - # we store the text section as metadata so people can write - # rules against it - # the port number is optional if the default 6264 is used - $pms->{msg}->put_metadata("$host:$port", $results[9]); - if ($port == 6264) { - $pms->{msg}->put_metadata($host, $results[9]); - } - - unless ($pms->{siq_queries_remaining}) { - dbg("siq: received responses to all queries after waiting ". - (sprintf "%.2f", ($pms->{conf}->{siq_query_timeout} - $timeout)) - ." seconds, closing socket"); - close $pms->{siq_handle}; - return 1; - } - next READRESULT; - } - } - } - dbg("siq: response ID $results[2] does not match any queries sent ". - "for this message, discarding"); - } - dbg("siq: waiting up to $timeout seconds for more responses"); - } - } - - dbg("siq: query response timeout, closing socket"); - close $pms->{siq_handle}; - return 0; -} - - -sub _parse_response { - my ($self, $response, $enable_oi_workaround) = @_; - - my $min_response_length = 12; - if ($enable_oi_workaround) { - dbg("siq: using Outbound Index response missing octets workaround"); - $min_response_length = 8; - } - - if (length($response) < $min_response_length) { - dbg("siq: packet shorter than minimum response length, ignoring packet"); - return; - } - - my $version = unpack("c8", substr($response, 0, 1)); - my $score = unpack("c8", substr($response, 1, 1)); - my $id = unpack("N", pack("x2B16", unpack("B16", substr($response, 2, 2)))); - my $ipscore = unpack("c8", substr($response, 4, 1)); - my $dscore = unpack("c8", substr($response, 5, 1)); - my $rscore = unpack("c8", substr($response, 6, 1)); - my $textlen = unpack("c8", substr($response, 7, 1)); - - # ensure we've got the entire packet - if (length($response) < ($min_response_length + $textlen)) { - dbg("siq: packet length shorter than minimum length plus reported TEXT ". - "section length, ignoring packet"); - return; - } - - # workaround Outbound Index not using the current draft yet - # (they don't include draft response octets 8-11) - my ($ttl, $confidence, $text); - if ($enable_oi_workaround) { - $ttl = -999; - $confidence = -999; - $text = unpack("A*", substr($response, 8, $textlen)); - } else { - $ttl = unpack("N", pack("x2B16", unpack("B16", substr($response, 8, 2)))); - $confidence = unpack("c8", substr($response, 10, 1)); - my $xtralen = unpack("c8", substr($response, 11, 1)); - $text = unpack("A*", substr($response, 12, $textlen)); - - # the 'EXTRA' data is server/client dependent, we can't reasonably parse - # ever implementations EXTRA section, so don't parse any -- they can - # always use the TEXT section which we do support - dbg("siq: plugin does not support parsing of the $xtralen octets of ". - "'EXTRA' data provided in the SIQ response, not using 'EXTRA' data") - if $xtralen; - } - - return ($version, $score, $id, $ipscore, $dscore, $rscore, $textlen, $ttl, - $confidence, $text); -} - - -# dos: copied (with s/SPF/SIQ/) from my patch for SA bug 4661 -- the current -# SPF code does it wrong for non-trivial cases -# http://issues.apache.org/SpamAssassin/attachment.cgi?id=3241&action=view -# this really needs to get into Received.pm itself -sub _get_relay { - my ($self, $scanner) = @_; - - # return relay if already determined - return $scanner->{siq_relay} if exists $scanner->{siq_relay}; - - # DOS: For SIQ checks we want to use the relay that passed the message to - # the internal network. This relay can be any of the trusted relays or the - # first untrusted relay. No matter which it is, the next (newer) relay has - # to be an internal relay. If there are no trusted relays, the first - # untrusted relay is the one we want. If internal_networks aren't set we - # have to assume all trusted relays are internal. - - my $relay = undef; - my $relays_trusted = $scanner->{relays_trusted}; - - # no trusted relays, use first untrusted - if (scalar @{$relays_trusted} == 0) { - $relay = $scanner->{relays_untrusted}->[0]; - dbg("siq: no trusted relays found, using first (untrusted) relay (if present) for SIQ checks"); - } - - # last trusted relay is internal (or internal_networks not set), use first untrusted - elsif ($relays_trusted->[-1]->{internal} || !($scanner->{conf}->{internal_networks}->get_num_nets() > 0)) { - $relay = $scanner->{relays_untrusted}->[0]; - dbg("siq: last trusted relay is internal, using first untrusted relay (parsed relay #". (scalar @{$relays_trusted}+1) ." if present) for SIQ checks"); - } - - # find external relay that passed the message to the last internal relay - else { - - # found an internal relay? - my $found = 0; - - # start at the end; don't check for an internal relay before the first one - for (my $i = scalar @{$relays_trusted} - 1; $i > 0 && !$found; $i--) { - # if the next relay is internal, we can use the current external one - if ($relays_trusted->[$i-1]->{internal}) { - $relay = $relays_trusted->[$i]; - $found = 1; - dbg("siq: using first external trusted relay (parsed relay #". ($i+1) .") for SIQ checks"); - } - } - - # if none of the trusted relays were internal, internal_networks isn't set - # correctly -- dbg about it - if (!$found) { - dbg("siq: none of the trusted relays are internal, please check your internal_networks configuration"); - } - } - - $scanner->{siq_relay} = $relay; - return $relay; -} - - -# copied with modifications from patched (bug 4661) SPF.pm -# this also needs to get into Received.pm or elsewhere -sub _get_sender { - my ($self, $scanner) = @_; - my $sender; - - my $relay = $self->_get_relay($scanner); - if (defined $relay) { - $sender = $relay->{envfrom}; - } - - if ($sender) { - dbg("siq: found Envelope-From in first external Received header"); - } - else { - # We cannot use the env-from data, since it went through 1 or more relays - # since the untrusted sender and they may have rewritten it. - if ($scanner->{num_relays_trusted} > 0 && !$scanner->{conf}->{always_trust_envelope_sender}) { - dbg("siq: relayed through one or more trusted relays, cannot use header-based Envelope-From, skipping"); - return; - } - - # we can (apparently) use whatever the current Envelope-From was, - # from the Return-Path, X-Envelope-From, or whatever header. - # it's better to get it from Received though, as that is updated - # hop-by-hop. - $sender = $scanner->get ("EnvelopeFrom"); - } - - if (!$sender) { - dbg("siq: cannot get Envelope-From, cannot use SIQ"); - return; # avoid setting $scanner->{sender} to undef - } - - return lc $sender; -} - - -1; diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/duncf/20_debt.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/duncf/20_debt.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/duncf/20_debt.cf 2006-12-02 20:31:44.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/duncf/20_debt.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ - -body LOOPHOLE_1 /loop-?hole in the banking/i -describe LOOPHOLE_1 A loop hole in the banking laws? - -body BANKING_LAWS /banking laws/i -describe BANKING_LAWS Talks about banking laws diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/duncf/20_header.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/duncf/20_header.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/duncf/20_header.cf 2006-12-02 20:31:44.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/duncf/20_header.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -header APOSTROPHE_FROM From:addr =~ /'/ -describe APOSTROPHE_FROM From address contains an apostrophe - -header APOSTROPHE_TOCC ToCc:addr =~ /'/ -describe APOSTROPHE_TOCC To or CC address contains an apostrophe - -header STUDDLYCAPS Subject =~ /(?:[A-Z][a-z]+){3}/ -describe STUDDLYCAPS ContainsThreeWordsLikeThis diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/00_FVGT_File001.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/00_FVGT_File001.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/00_FVGT_File001.cf 2014-03-31 20:42:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/00_FVGT_File001.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,4032 +0,0 @@ -######################################################################\ -## Fred's Collection of Rules File 001 #\ -## Version: 0.00.17 #\ -## Created: 10/30/2006 # -## Modified: 12/23/2006 # -## Current Maintainer: Frederic Tarasevicius - tech2@i-is.com # -## Current Home: http://www.rulesemporium.com/rules/00_FVGT_File001.cf # -## 01/2014: Some rules migrated to JHardin sandbox prior to file retirement # -## License: http://www.apache.org/licenses/LICENSE-2.0 # -######################################################################### -## *** PLEASE READ ** PLEASE READ ** PLEASE READ ** PLEASE READ ******* # -## *** Most of these are rules are scored very high, use caution! ***** # -######################################################################### -## # -## -> SOME RULES REQUIRE THAT YOU HAVE TRUSTED_NETWORKS SET PROPERLY <- # -## # -######################################################################### -## v0.00.13 = 11/24/2006 - Spam identified as spam by these rules: 23276 of 33482 69.5% -## v0.00.14 = 11/30/2006 - Spam identified as spam by these rules: 24241 of 34698 69.8% -## v0.00.15 = 12/04/2006 - Spam identified as spam by these rules: 24830 of 34870 71.2% -## v0.00.16 = Minor tweaks to scores for FP reports. -## v0.00.17 = Changed License to Apache v2 -## v0.00.17 = 12/23/2006 - Spam identified as spam by these rules: 27051 of 37183 72.7% -## -## 442 Rules included -## -############################################# -######## START NEWEST RULES / 0 Day ######### -## These rules are the freshest to this set # -## I keep them near the top for observation # -############################################# -# -# -#header FH_MSGID_XXBLAH MESSAGEID =~ /6c822ecf/ -#describe FH_MSGID_XXBLAH Common sign in msg-id's 12/21/2006 -###score FH_MSGID_XXBLAH 10.357 -##counts FH_MSGID_XXBLAH 254s/0h of 44365 corpus (34562s/9803h FVGT) 12/21/06 -##counts FH_MSGID_XXBLAH 255s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_LETTERS_21B /-- [a-z]{21}/ -#describe FB_LETTERS_21B Special people leave special signs! -###score FB_LETTERS_21B 10.357 -##counts FB_LETTERS_28B 105s/0h of 44365 corpus (34562s/9803h FVGT) 12/21/06 -##counts FB_LETTERS_21B 225s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -# -#body __F_LARGE_MONEY /\d\d\d,\d\d\d/ -#body __F_LARGE_MONEY_2 /\d\d?\s?(?:thousand|(?:m|b|tr)illion)/i -#meta __FM_LARGE_MONEY (__F_LARGE_MONEY || __F_LARGE_MONEY_2) -#body __YOU_HAVE_WON /you(?: \w+)? won/i -#body __FB_CONGRADS /Congratulations/i -#meta __YOU_WON_SOMTIN (__YOU_HAVE_WON || __FB_CONGRADS) -##body __FB_NATIONAL /national/i -#body __FB_LOTTERY /lottery/i -#meta __FM_NAT_LOTTERY (__FB_NATIONAL && __FB_LOTTERY) -# -#meta FM_LOTTO_MONEY (__FM_LARGE_MONEY && __FM_NAT_LOTTERY) -#describe FM_LOTTO_MONEY Talks about lotto and large money! -###score FM_LOTTO_MONEY 2.011 -##counts FM_LOTTO_MONEY 48s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#meta FM_LOTTO_YOU_WON (__FM_LARGE_MONEY && __FM_NAT_LOTTERY && __YOU_WON_SOMTIN) -#describe FM_LOTTO_YOU_WON Talks about lotto and you won! -###score FM_LOTTO_YOU_WON 3.741 -##counts FM_LOTTO_YOU_WON 45s/0h of 46631 corpus (36802s/9829h FVGT) 12/23/06 -# -# -# -#body FB_EXP_POWER_OF /Experience the power of/i -#describe FB_EXP_POWER_OF Phrase: Experience the power of -###score FB_EXP_POWER_OF 0.991 -##counts FB_EXP_POWER_OF 2s/0h of 46631 corpus (36802s/9829h FVGT) 12/23/06 -# -# -# -#body __FB_PPLE_ARE_SEARCH /(?:People|they) are searching/i -#body __FB_COULD_NOT_F /could not find you/i -#meta FM_PEOPLE_LOOK_4ME (__FB_PPLE_ARE_SEARCH && __FB_COULD_NOT_F) -#describe FM_PEOPLE_LOOK_4ME People are looking for me? -###score FM_PEOPLE_LOOK_4ME 2.922 -##counts FM_PEOPLE_LOOK_4ME 1s/0h of 46631 corpus (36802s/9829h FVGT) 12/23/06 -# -# -#header FH_BAD_OEV1441 X-Mailer =~ /^Microsoft Outlook Express 6\.00\.2800\.1441$/ -#describe FH_BAD_OEV1441 Bad X-Mailer version -###score FH_BAD_OEV1441 4.555 -##counts FH_BAD_OEV1441 66s/0h of 46631 corpus (36802s/9829h FVGT) 12/23/06 -# -# -# -##Combine SARE RANDOM Active Rules into single rule. -#header __ALL_RANDOM ALL =~ /(?:[%\#\[\$]R?A?NDO?M?|\%(?:CUSTOM|FROM|PROXY|X?MESSA|MAKE_TXT|FROM_USER))/i -#rawbody __RAW_RANDOM /(?:[%\#\[\$]RA?NDO?M?|\%(?:CUSTOM|FROM|PROXY|X?MESSA|MAKE_TXT))/i -#meta FH_RANDOM_SURE (__ALL_RANDOM || __RAW_RANDOM) -#describe FH_RANDOM_SURE SARE Random in one rule. -##Setting 0.50 score ceiling on 1/16/2014 due to FPs -#score FH_RANDOM_SURE 0.50 -##counts FH_RANDOM_SURE 221s/0h of 46241 corpus (36438s/9803h FVGT) 12/14/06 -##counts FH_RANDOM_SURE 225s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_MSGID_01C67 Message-ID =~ /^<000001c[67]/ -#describe FH_MSGID_01C67 Special MSGID -###score FH_MSGID_01C67 1.968 -##counts FH_MSGID_01C67 9212s/3h of 45714 corpus (35935s/9779h FVGT) 12/08/06 -##counts FH_MSGID_01C67 9200s/3h of 46241 corpus (36438s/9803h FVGT) 12/14/06 -##counts FH_MSGID_01C67 9480s/3h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HAS_X exists:X -#describe FH_HAS_X Has X: header -###score FH_HAS_X 10.357 -##counts FH_HAS_X 32s/0h of 46241 corpus (36438s/9803h FVGT) 12/14/06 -##counts FH_HAS_X 32s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HAS_XAIMC exists:X-AIMC-AUTH -#describe FH_HAS_XAIMC Has X-AIMC-AUTH header -###score FH_HAS_XAIMC 10.357 -##counts FH_HAS_XAIMC 3s/0h of 46241 corpus (36438s/9803h FVGT) 12/14/06 -##counts FH_HAS_XAIMC 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HAS_XCVBN exists:X-CVBN -#describe FH_HAS_XCVBN Has X-CVBN header -###score FH_HAS_XCVBN 10.357 -##counts FH_HAS_XCVBN 3s/0h of 46241 corpus (36438s/9803h FVGT) 12/14/06 -##counts FH_HAS_XCVBN 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_BAD_MSOE14 X-Mailer =~ /^Microsoft Outlook Express 6\.00\.1400\.14$/ -#describe FH_BAD_MSOE14 Bad OE version -###score FH_BAD_MSOE14 10.357 -##counts FH_BAD_MSOE14 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##X-WBC -#header FH_HAS_X_WBC exists:X-WBC -#describe FH_HAS_X_WBC Has X-WBC header -###score FH_HAS_X_WBC 2.439 -##counts FH_HAS_X_WBC 4s/0h of 46241 corpus (36438s/9803h FVGT) 12/14/06 -##counts FH_HAS_X_WBC 4s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_MSGID_000000 MESSAGEID =~ /\$00000000\@/ -#describe FH_MSGID_000000 Special MSGID -###score FH_MSGID_000000 10 10 10 10 -##counts FH_MSGID_000000 51s/0h of 45714 corpus (35935s/9779h FVGT) 12/08/06 -##counts FH_MSGID_000000 91s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##X-FGHJ: znsvtbnaabivfviwftfwfbsm vbaipfnfmspiafmwt vawsapvwvm -#header FH_HAS_XFGHJ exists:X-FGHJ -#describe FH_HAS_XFGHJ Has X-FGHJ -###score FH_HAS_XFGHJ 10 5 5 3 -##counts FH_HAS_XFGHJ 12s/0h of 44357 corpus (34582s/9775h FVGT) 12/04/06 -##counts FH_HAS_XFGHJ 19s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_XMAIL_HEX20 X-Mailer =~ /^[A-F0-9]{6,10}\.[A-F0-9]{6,10}\.[a-f0-9]{6,10}/ -#describe FH_XMAIL_HEX20 Special HEX X-Mailer -###score FH_XMAIL_HEX20 10 4 4 3 -##counts FH_XMAIL_HEX20 1s/0h of 44357 corpus (34582s/9775h FVGT) 12/04/06 -##counts FH_XMAIL_HEX20 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HAS_XBBO exists:X-BBounce -#describe FH_HAS_XBBO Has X-BBounce -###score FH_HAS_XBBO 10 4 4 3 -##counts FH_HAS_XBBO 61s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FH_HAS_XBBO 80s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_REPL_TOKEN Subject =~ /\{Token1\}/i -#describe FS_REPL_TOKEN Subject has Replacement Token -###score FS_REPL_TOKEN 10 10 10 10 -##counts FS_REPL_TOKEN 0s/0h of 44357 corpus (34582s/9775h FVGT) 12/04/06 -##counts FS_REPL_TOKEN 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FM_XMAIL_F_OUT X-Mailer =~ /Microsoft Outlook Express V6.00.2900.2180/ -#describe FM_XMAIL_F_OUT Looks like Fake Outlook? -###score FM_XMAIL_F_OUT 10 -##counts FM_XMAIL_F_OUT 514s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FM_XMAIL_F_OUT 917s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_XCON_HAS_EQ X-Contact =~ /=/ -#describe FH_XCON_HAS_EQ X-Contact has = -###score FH_XCON_HAS_EQ 2 1 1 0.5 -##counts FH_XCON_HAS_EQ 10s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FH_XCON_HAS_EQ 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HAS_XOVE exists:X-OVE -#describe FH_HAS_XOVE Has X-OVE -###score FH_HAS_XOVE 10 10 10 5 -##counts FH_HAS_XOVE 434s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FH_HAS_XOVE 442s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##X-ID: "1167502916049" -#header FH_HAS_XID exists:X-ID -#describe FH_HAS_XID Has X-ID -###score FH_HAS_XID 10 3.1 3.1 2.5 -##counts FH_HAS_XID 1224s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FH_HAS_XID 1232s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##X-UIOP: alovoltujjmvyvmluerjojeo ryjlkrumvuvjylmytrj vrjvytetjy -#header FH_HAS_XUIOP exists:X-UIOP -#describe FH_HAS_XUIOP Has X-UIOP -###score FH_HAS_XUIOP 10 5 5 3 -##counts FH_HAS_XUIOP 20s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FH_HAS_XUIOP 21s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_XMAIL_RND_833 X-Mailer =~ /^[a-z]{3}\sv8\.3\.3\./ -#describe FH_XMAIL_RND_833 Special X-Mailer Version -###score FH_XMAIL_RND_833 17 10 10 10 -##counts FH_XMAIL_RND_833 53s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FH_XMAIL_RND_833 198s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_RAMROD Subject =~ /ramrod/i -#describe FS_RAMROD Subject says Ramrod -###score FS_RAMROD 10 5 5 3 -##counts FS_RAMROD 0s/0h of 44060 corpus (34282s/9778h FVGT) 12/01/06 -##counts FS_RAMROD 3s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FS_RAMROD 7s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_WITH_SMALL Subject =~ /with (?:\w+\s)?(?:small|short)/i -#describe FS_WITH_SMALL Subject says With ... small -###score FS_WITH_SMALL 3 -##counts FS_WITH_SMALL 6s/0h of 44060 corpus (34282s/9778h FVGT) 12/01/06 -##counts FS_WITH_SMALL 9s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FS_WITH_SMALL 12s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_MSGID_REPLACE MESSAGEID =~ /^<%MSGID/ -#describe FH_MSGID_REPLACE Broken Replace Template -###score FH_MSGID_REPLACE 10 10 10 10 -##counts FH_MSGID_REPLACE 2s/0h of 44060 corpus (34282s/9778h FVGT) 12/01/06 -##counts FH_MSGID_REPLACE 23s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FH_MSGID_REPLACE 23s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_XMAIL_REPLACE X-Mailer =~ /%XMAILER/ -#describe FH_XMAIL_REPLACE Broken Replace Template -###score FH_XMAIL_REPLACE 10 10 10 10 -##counts FH_XMAIL_REPLACE 2s/0h of 44060 corpus (34282s/9778h FVGT) 12/01/06 -##counts FH_XMAIL_REPLACE 23s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FH_XMAIL_REPLACE 23s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_ADD_INCHES /(?:add|gain) inches/i -#describe FB_ADD_INCHES Add / Gain inches -###score FB_ADD_INCHES 4 2.2 2.2 1.8 -##counts FB_ADD_INCHES 22s/0h of 44060 corpus (34282s/9778h FVGT) 12/01/06 -##counts FB_ADD_INCHES 25s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FB_ADD_INCHES 27s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -# -##Message-ID: <01c70f9e$adc3acc0$987ba8c0@dabushb> -##Message-ID: <01c70e80$416884c0$6501a8c0@CLIENT3> -##Message-ID: <01c70fc7$5bf945c0$aef1b250@URINAYAD> -##Message-ID: <01c70fc9$e55514f0$9500a8c0@plwn3pt0ufq4raf> -##Message-ID: <01c70f73$c056fb10$de49f952@nomanvmb2qxoqa> -##Message-ID: <01c70f9b$e98036f0$7ac1e455@anderssoe10f8c> -#header __FH_MSGID_01C7 MESSAGEID =~ /^<0{1,5}1c7/ -##header __FH_HAS_XMSMAIL exists:X-MSMail-Priority -##header __FH_HAS_XPRIORITY exists:X-Priority -##header __FS_SUBJ_RE Subject =~ /^Re: / -#meta FM_RE_HELLO_SPAM (__FH_MSGID_01C7 && __FH_HAS_XMSMAIL && __FH_HAS_XPRIORITY && __FS_SUBJ_RE) -#describe FM_RE_HELLO_SPAM Re: Hello / hi -###score FM_RE_HELLO_SPAM 10 10 10 10 -##counts FM_RE_HELLO_SPAM 2s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FM_RE_HELLO_SPAM 3181s/0h of 43779 corpus (34015s/9764h FVGT) 11/28/06 -##counts FM_RE_HELLO_SPAM 3456s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FM_RE_HELLO_SPAM 4162s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_DDDD_BUCKS /\d{4} bucks/ -#describe FB_DDDD_BUCKS We use comma's and it's dollars not bucks! -###score FB_DDDD_BUCKS 4 -##counts FB_DDDD_BUCKS 16s/0h of 43891 corpus (34132s/9759h FVGT) 11/30/06 -##counts FB_DDDD_BUCKS 19s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FB_DDDD_BUCKS 34s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HOST_IN_ADDRARPA X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]{0,25}\.in-addr\.arpa / -#describe FH_HOST_IN_ADDRARPA HOST dns says "in-addr.arpa" -###score FH_HOST_IN_ADDRARPA 3.9 2 2 1 -##counts FH_HOST_IN_ADDRARPA 20s/0h of 43891 corpus (34132s/9759h FVGT) 11/30/06 -##counts FH_HOST_IN_ADDRARPA 22s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FH_HOST_IN_ADDRARPA 27s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_IMAGIRL /i am a girl/i -#describe FB_IMAGIRL Phrae: I am a girl -###score FB_IMAGIRL 10 4 4 2 -##counts FB_IMAGIRL 9s/0h of 42912 corpus (33149s/9763h FVGT) 11/27/06 -##counts FB_IMAGIRL 10s/0h of 43779 corpus (34015s/9764h FVGT) 11/28/06 -##counts FB_IMAGIRL 11s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FB_IMAGIRL 11s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##header __SUBJ_LOWER ALL =~ /subject:\s\S{5}/ -##header __FROM_LOWER ALL =~ /from:\s\S{5}/ -##header __TO___LOWER ALL =~ /to:\s\S{5}/ -##header __DATE_LOWER ALL =~ /date:\s\S{5}/ -#meta FM_LOWER_CASE_HEAD (__SUBJ_LOWER && __FROM_LOWER && __TO___LOWER && __DATE_LOWER) -#describe FM_LOWER_CASE_HEAD Lots of headers with lower case. -###score FM_LOWER_CASE_HEAD 10 5 5 4 -##counts LOWER_CASE_HEAD 3s/0h of 43763 corpus (34000s/9763h FVGT) 11/28/06 -##counts LOWER_CASE_HEAD 3s/0h of 43891 corpus (34132s/9759h FVGT) 11/30/06 -##counts FM_LOWER_CASE_HEAD 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_REPLIC_CAP /REPLICAS?\b/ -#describe FB_REPLIC_CAP Phrase: REPLICA -###score FB_REPLIC_CAP 2.5 2 2 1 -##counts FB_REPLIC_CAP 26s/0h of 211884 corpus (204373s/7511h FT) 12/08/05 -##counts FB_REPLIC_CAP 13s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_REPLIC_CAP 16s/0h of 42912 corpus (33149s/9763h FVGT) 11/27/06 -##counts FB_REPLIC_CAP 16s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FB_REPLIC_CAP 16s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __F_FUCK /\bfuck\b/i -#body __F_ASS /\bass\b/i -#body __F_TEEN /teens?\b/i -#meta FM_FUCK_ASS_TEEN (__F_FUCK && __F_ASS && __F_TEEN) -###score FM_FUCK_ASS_TEEN 10.357 -##counts FM_FUCK_ASS_TEEN 1s/0h of 42912 corpus (33149s/9763h FVGT) 11/27/06 -##counts FM_FUCK_ASS_TEEN 2s/0h of 43779 corpus (34015s/9764h FVGT) 11/28/06 -##counts FM_FUCK_ASS_TEEN 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_P_TRUELOVE /true love/i -#body __FB_P_ALLNIGHT /all night!/i -#meta FM_TRUE_LOV_ALL_N (__FB_P_TRUELOVE && __FB_P_ALLNIGHT) -#describe FM_TRUE_LOV_ALL_N True Love all Night! -###score FM_TRUE_LOV_ALL_N 10.357 -##counts FM_TRUE_LOV_ALL_N 0s/0h of 42054 corpus (32293s/9761h FVGT) 11/24/06 -##counts FM_TRUE_LOV_ALL_N 41s/0h of 42912 corpus (33149s/9763h FVGT) 11/27/06 -##counts FM_TRUE_LOV_ALL_N 48s/0h of 43779 corpus (34015s/9764h FVGT) 11/28/06 -##counts FM_TRUE_LOV_ALL_N 57s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_ENDS_SG m'/sg$'i -#describe FU_ENDS_SG URL ends with /sg -###score FU_ENDS_SG 10.357 -##counts FU_ENDS_SG 4s/0h of 42912 corpus (33149s/9763h FVGT) 11/27/06 -##counts FU_ENDS_SG 5s/0h of 43779 corpus (34015s/9764h FVGT) 11/28/06 -##counts FU_ENDS_SG 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_ENDS_RT m'/rt$'i -#describe FU_ENDS_RT URL ends with /rt -###score FU_ENDS_RT 10.357 -##counts FU_ENDS_RT 7s/0h of 42912 corpus (33149s/9763h FVGT) 11/27/06 -##counts FU_ENDS_RT 8s/0h of 43779 corpus (34015s/9764h FVGT) 11/28/06 -##counts FU_ENDS_RT 9s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#meta FM_PHN_NODNS (FB_SPACED_PHN_3B && RDNS_NONE) -#describe FM_PHN_NODNS Phone spacing + no dns -###score FM_PHN_NODNS 3.755 -##counts FM_PHN_NODNS 31s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FM_PHN_NODNS 40s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##watches http://www.freshbeach.com -#rawbody FR_WATCHES_HTTP m'watches\s(?:\w+)?\s?http://'i -#describe FR_WATCHES_HTTP Watches http:// -###score FR_WATCHES_HTTP 4.415 -##counts FR_WATCHES_HTTP 1s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FR_WATCHES_HTTP 39s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FR_WATCHES_HTTP 56s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_END_ET m'/et/$'i -#describe FU_END_ET ET Phone Home? -###score FU_END_ET 10.357 -##counts FU_END_ET 304s/0h of 42054 corpus (32293s/9761h FVGT) 11/24/06 -##counts FU_END_ET 342s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FU_END_ET 373s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FU_END_ET 399s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_MSGID_01C70XXX MESSAGEID =~ /^<01c70[a-f][a-f0-9]{2}\$[a-f0-9]{8}\$[a-f0-9]{8}\@[a-zA-Z0-9-]+>$/ -#describe FH_MSGID_01C70XXX MESSAGE ID seen often!!! -###score FH_MSGID_01C70XXX 10.357 -##counts FH_MSGID_01C70XXX 13s/0h of 42054 corpus (32293s/9761h FVGT) 11/24/06 -##counts FH_MSGID_01C70XXX 15s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FH_MSGID_01C70XXX 54s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FH_MSGID_01C70XXX 159s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_CLICK_PHP_DDD /click\.php\?\d+\.\d+\.\d+\.\d+\.\d+/i -#describe FU_CLICK_PHP_DDD Click.php?ddd.ddd.ddd.ddd.ddd -###score FU_CLICK_PHP_DDD 10 8 8 6 -##counts FU_CLICK_PHP_DDD 41s/0h of 40756 corpus (31065s/9691h FVGT) 11/20/06 -##counts FU_CLICK_PHP_DDD 51s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FU_CLICK_PHP_DDD 55s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FU_CLICK_PHP_DDD 68s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_X_REFS_DDD X-References =~ /^\d{1,5}$/ -#describe FH_X_REFS_DDD X-Refs with digits. -###score FH_X_REFS_DDD 10.222 -##counts FH_X_REFS_DDD 41s/0h of 40756 corpus (31065s/9691h FVGT) 11/20/06 -##counts FH_X_REFS_DDD 51s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FH_X_REFS_DDD 55s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FH_X_REFS_DDD 68s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#meta FM_XREF_CLICKPHP (FU_CLICK_PHP_DDD && FH_X_REFS_DDD) -#describe FM_XREF_CLICKPHP Whatever it takes! -###score FM_XREF_CLICKPHP 4.54 -##counts FM_XREF_CLICKPHP 41s/0h of 40756 corpus (31065s/9691h FVGT) 11/20/06 -##counts FM_XREF_CLICKPHP 51s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FM_XREF_CLICKPHP 55s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FM_XREF_CLICKPHP 68s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -# -#body FB_SPACED_PHN_3B /\d\d\d--\d\d\d--?\d\d\d\d/ -#describe FB_SPACED_PHN_3B Phone number with -- spacing. (B) -###score FB_SPACED_PHN_3B 5 2 2 1.563 -##counts FB_SPACED_PHN_3B 2s/0h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -##counts FB_SPACED_PHN_3B 2s/0h of 34882 corpus (25258s/9624h FVGT) 11/16/06 -##counts FB_SPACED_PHN_3B 9s/0h of 40756 corpus (31065s/9691h FVGT) 11/20/06 -##counts FB_SPACED_PHN_3B 27s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FB_SPACED_PHN_3B 35s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FB_SPACED_PHN_3B 44s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FH_FRM_53 From =~ /\@53\.com/i -#header __FH_MSG_53 MESSAGEID =~ /\@53\.com/i -#header __FH_RCV_53 Received =~ /\.53\.com/i -#meta FM_FAKE_53COM_SPOOF (__FH_FRM_53 && !__FH_MSG_53 && !__FH_RCV_53) -#describe FM_FAKE_53COM_SPOOF Spoof mail from 53.com? -###score FM_FAKE_53COM_SPOOF 10.357 -##counts FM_FAKE_53COM_SPOOF 488s/0h of 40784 corpus (31086s/9698h FVGT) 11/20/06 -##counts FM_FAKE_53COM_SPOOF 489s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FM_FAKE_53COM_SPOOF 491s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FM_FAKE_53COM_SPOOF 491s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_HOWMUCH /How Much/i -##body __FB_COST /cost/i -#meta __FM_HOW_COST (__FB_HOWMUCH && __FB_COST) -#body __FB_IDENTITY /identity/i -#meta __FM_HOW_COST_ID (__FM_HOW_COST || __FB_IDENTITY) -#body __FB_YOUR_IMAGE /your(?: compan(?:y(?:'s)?|ies)) image/i -#body __FB_IMAGE_OF /image of your company/i -#meta __FM_YOUR_IMAGE (__FB_YOUR_IMAGE || __FB_IMAGE_OF) -#meta FM_HOW_IMG_COST2 (__FM_HOW_COST_ID && __FM_YOUR_IMAGE) -#describe FM_HOW_IMG_COST2 How much does your image cost? (2) -###score FM_HOW_IMG_COST2 3.99 2.2 2.2 1.777 -##counts FM_HOW_IMG_COST2 9s/0h of 40784 corpus (31086s/9698h FVGT) 11/20/06 -##counts FM_HOW_IMG_COST2 15s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FM_HOW_IMG_COST2 15s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FM_HOW_IMG_COST2 16s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_COMMON_SUBS m'/(?:h(?:5r|x1)|1q0|bgh|csy|j6x|n1b|y6g|zox)/?[,.]?$'i -#describe FU_COMMON_SUBS Sub-dir seen often in spam. -###score FU_COMMON_SUBS 7 5 5 4 -##counts FU_COMMON_SUBS 2s/0h of 42141 corpus (34216s/7925h FVGT) 04/25/06 -##counts FU_COMMON_SUBS 43s/0h of 144700 corpus (93150s/51550h DOC) 04/25/06 -##counts FU_COMMON_SUBS 5s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_COMMON_SUBS 23s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FU_COMMON_SUBS 24s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#ifplugin Mail::SpamAssassin::Plugin::ReplaceTags -#body __FRT_GOLD /\b(?!gold)\b/i -#replace_rules __FRT_GOLD -#body __FRT_SILVER /\b(?!s[il][li]ver)\b/i -#replace_rules __FRT_SILVER -#meta FRM_SILVER_GOLD (__FRT_SILVER && __FRT_GOLD) -#describe FRM_SILVER_GOLD ReplaceTags: Silver & Gold -###score FRM_SILVER_GOLD 1.955 -##counts FRM_SILVER_GOLD 6s/0h of 40784 corpus (31086s/9698h FVGT) 11/20/06 -##counts FRM_SILVER_GOLD 8s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FRM_SILVER_GOLD 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -#endif # Mail::SpamAssassin::Plugin::ReplaceTags -# -# -#body __FB_LUX_GIFTS /Luxury (?:\w+\s)?Gifts/i -##body __FB_NUM_PERCNT /\d\s?\%/ -#meta FM_LUX_GIFTS_REDUCED (__FB_LUX_GIFTS && __FB_NUM_PERCNT) -#describe FM_LUX_GIFTS_REDUCED Luxury Gifts with dd% -###score FM_LUX_GIFTS_REDUCED 10 5 5 2.2 -##counts FM_LUX_GIFTS_REDUCED 19s/0h of 32090 corpus (22848s/9242h FVGT) 11/13/06 -##counts FM_LUX_GIFTS_REDUCED 96s/0h of 41138 corpus (31436s/9702h FVGT) 11/20/06 -##counts FM_LUX_GIFTS_REDUCED 139s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FM_LUX_GIFTS_REDUCED 142s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_MSGID_DIGIT MESSAGEID =~ /\{DIGIT\}/ -#describe FH_MSGID_DIGIT Forgot Pattern Replacement? -###score FH_MSGID_DIGIT 10 10 10 10 -##counts FH_MSGID_DIGIT 21s/0h of 41138 corpus (31436s/9702h FVGT) 11/20/06 -##counts FH_MSGID_DIGIT 23s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FH_MSGID_DIGIT 23s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FS_HOWMUCH Subject =~ /how much/i -#header __FS_IMAGE Subject =~ /your(?: compan(?:y(?:'s)?|ies))? image/i -#header __FS_COST Subject =~ /cost/i -#meta FM_HOW_IMG_COST (__FS_HOWMUCH && __FS_IMAGE && __FS_COST) -#describe FM_HOW_IMG_COST How much does your image cost? -###score FM_HOW_IMG_COST 10 5 5 5 -##counts FM_HOW_IMG_COST 17s/0h of 24480 corpus (15455s/9025h FVGT) 10/30/06 -##counts FM_HOW_IMG_COST 21s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FM_HOW_IMG_COST 24s/0h of 40802 corpus (31109s/9693h FVGT) 11/20/06 -##counts FM_HOW_IMG_COST 25s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##rawbody __FR_SPACING_8 /[a-z0-9]{6}\s{8}[a-z0-9]{5}/i -##rawbody __FR_SPACING_9 /[a-z0-9]{6}\s{9}[a-z0-9]{5}/i -##rawbody __FR_SPACING_15 /[a-z0-9]{6}\s{15}[a-z0-9]{5}/i -##rawbody __FR_SPACING_17 /[a-z0-9]{6}\s{17}[a-z0-9]{5}/i -##rawbody __FR_SPACING_22 /[a-z0-9]{6}\s{22}[a-z0-9]{5}/i -#meta FM_ASCII_ART_SPACINGc ((__FR_SPACING_8 + __FR_SPACING_9 + __FR_SPACING_15 + __FR_SPACING_17 + __FR_SPACING_22) > 3) -#describe FM_ASCII_ART_SPACINGc Looks like might be ASCII -###score FM_ASCII_ART_SPACINGc 0.833 -##counts FM_ASCII_ART_SPACINGc 23s/0h of 35751 corpus (26053s/9698h FVGT) 11/18/06 -##counts FM_ASCII_ART_SPACINGc 23s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FS_S_TRADE Subject =~ /\btrade\b/i -#body __FB_S_SYMBOL /Symb?o?l?:\s?[A-Z_,\.-]{4,8}/i -##body __FB_S_PRICE /Pri{1,2}c[a-z]?e/i -##meta __FM_MY_PRICE (__FB_S_PRICE || FRT_PRICE) -##body __FB_S_STOCK /Stock/i -#meta FM_DOESNT_SAY_STOCK (__FB_S_SYMBOL && __FM_MY_PRICE && !__FB_S_STOCK && !__FS_S_TRADE) -#describe FM_DOESNT_SAY_STOCK It's a stock spam but doesn't say stock -###score FM_DOESNT_SAY_STOCK 10.357 -##counts FM_DOESNT_SAY_STOCK 30s/0h of 35726 corpus (26027s/9699h FVGT) 11/17/06 -##counts FM_DOESNT_SAY_STOCK 30s/0h of 35751 corpus (26053s/9698h FVGT) 11/18/06 -##counts FM_DOESNT_SAY_STOCK 96s/0h of 40802 corpus (31109s/9693h FVGT) 11/20/06 -##counts FM_DOESNT_SAY_STOCK 114s/0h of 41138 corpus (31436s/9702h FVGT) 11/20/06 -##counts FM_DOESNT_SAY_STOCK 142s/0h of 42986 corpus (33212s/9774h FVGT) 11/24/06 -##counts FM_DOESNT_SAY_STOCK 150s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FM_DOESNT_SAY_STOCK 156s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_HOTTEST /hottest/i -#body __FB_PICK /\bpick\b/i -#body __FB_PROJECTED /projected/i -#meta __FM_STOCK_WORDS (__FB_HOTTEST || __FB_PICK || __FB_PROJECTED) -#meta FM_LIKE_STOCKS (__FM_STOCK_WORDS && !__FB_S_STOCK && __FB_S_SYMBOL) -#describe FM_LIKE_STOCKS It looks like a duck, it's a duck! -###score FM_LIKE_STOCKS 5.888 -##counts FM_LIKE_STOCKS 6s/0h of 35751 corpus (26053s/9698h FVGT) 11/18/06 -##counts FM_LIKE_STOCKS 41s/0h of 41138 corpus (31436s/9702h FVGT) 11/20/06 -##counts FM_LIKE_STOCKS 56s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_FROM_HOODIA From =~ /Hoodia/i -#describe FH_FROM_HOODIA From has Hoodia!!? -###score FH_FROM_HOODIA 6.222 -##counts FH_FROM_HOODIA 7s/0h of 12277 corpus (6604s/5673h CT) 03/21/06 -##counts FH_FROM_HOODIA 1s/0h of 9125 corpus (6891s/2234h AxB) 03/21/06 -##counts FH_FROM_HOODIA 29s/0h of 22944 corpus (17229s/5715h MY) 03/21/06 -##counts FH_FROM_HOODIA 161s/0h of 111414 corpus (73794s/37620h DOC) 03/21/06 -##counts FH_FROM_HOODIA 1094s/0h of 103219 corpus (95719s/7500h FVGT) 03/21/06 -##counts FH_FROM_HOODIA 32s/0h of 41138 corpus (31436s/9702h FVGT) 11/20/06 -##counts FH_FROM_HOODIA 33s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##### START FULL RULES #### -##### THESE WILL RETIRE AFTER 3.2 IS RELEASE #### -# -# -#full FF_COMMENT_ODD /<-\*->/ -#describe FF_COMMENT_ODD FULL RULE: Special Comment -###score FF_COMMENT_ODD 10.357 -##counts FF_COMMENT_ODD 2996s/0h of 222798 corpus (214870s/7928h FVGT) 04/25/06 -##counts FF_COMMENT_ODD 486s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FF_COMMENT_ODD 524s/0h of 41138 corpus (31436s/9702h FVGT) 11/20/06 -##counts FF_COMMENT_ODD 539s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#full FF_LEO_FLOAT_RIGHT /FLOAT[\r\n]{1,2}:[\r\n]{1,2}RIGHT/i -#describe FF_LEO_FLOAT_RIGHT FULL RULE: Float, Right, Special signs! -###score FF_LEO_FLOAT_RIGHT 10.357 -##counts FF_LEO_FLOAT_RIGHT 26s/0h of 27310 corpus (19422s/7888h FT) 02/28/06 -##counts FF_LEO_FLOAT_RIGHT 1931s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FF_LEO_FLOAT_RIGHT 1932s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#full FF_IHOPE_YOU_SINK /(?:FLOAT.{10,300}){3}/is -#describe FF_IHOPE_YOU_SINK Triple Floats, common viagra signs. -###score FF_IHOPE_YOU_SINK 1.699 -##counts IHOPE_YOU_SINK 295s/1h of 41941 corpus (34079s/7862h FVGT) 04/14/06 -##counts IHOPE_YOU_SINK 5224s/1h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FF_IHOPE_YOU_SINK 3338s/1h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FF_IHOPE_YOU_SINK 3361s/3h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FF_IHOPE_YOU_SINK 3364s/3h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##====== BODY RULES BELOW ============= -# -# -#body FB_ACHIEVE_BACH /Achieve your Bachelor/i -#describe FB_ACHIEVE_BACH Phrase: Achieve your bachelor -###score FB_ACHIEVE_BACH 3.253 -##counts FB_ACHIEVE_BACH 2s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_ACHIEVE_BACH 2s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_ACHIEVE_BACH 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_ALMOST_SEX /\b[b-z]sex+\b/i -#describe FB_ALMOST_SEX It's almost sex, but not! -###score FB_ALMOST_SEX 4.114 -##counts FB_ALMOST_SEX 12s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_ALMOST_SEX 33s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_ALMOST_SEX 34s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_AN_ERROR_4U /An error has been made in your favor/ -#describe FB_AN_ERROR_4U Phrase: an error has been made in your favor -###score FB_AN_ERROR_4U 5.717 -##counts FB_AN_ERROR_4U 2s/0h of 42564 corpus (34322s/8242h FVGT) 05/26/06 -##counts FB_AN_ERROR_4U 2s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_AN_ERROR_4U 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_ANA_TRIM /Ana[^a-z]trim/i -#describe FB_ANA_TRIM Broken AnaTrim phrase. -###score FB_ANA_TRIM 10.357 -##counts FB_ANA_TRIM 2s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FB_ANA_TRIM 4s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_ANA_TRIM 1383s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_ANA_TRIM 5s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_ANA_TRIM 69s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_ANUI /A[-_\.]U[-_\.]N[-_\.]I/i -#describe FB_ANUI Phrase: A_U_N_I -###score FB_ANUI 7.166 -##counts FB_ANUI 14s/0h of 25009 corpus (15987s/9022h FVGT) 11/03/06 -##counts FB_ANUI 21s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FB_ANUI 42s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_B0NUS /B0nus/i -#describe FB_B0NUS Phrase: B0nus -###score FB_B0NUS 10.357 -##counts FB_B0NUS 6s/0h of 42564 corpus (34322s/8242h FVGT) 05/26/06 -##counts FB_B0NUS 36s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_B0NUS 5s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_B0NUS 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_BAD_ERECT /bad erection/i -#describe FB_BAD_ERECT Phrase: Bad Erection -###score FB_BAD_ERECT 10.822 -##counts FB_BAD_ERECT 2s/0h of 25348 corpus (16329s/9019h FVGT) 11/04/06 -##counts FB_BAD_ERECT 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_BE_MILLION /be.{1,5}millionaire/i -#describe FB_BE_MILLION Phrase: be millionaire -###score FB_BE_MILLION 1.837 -##counts FB_BE_MILLION 184s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_BE_MILLION 48s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_BE_MILLION 5s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_BE_MILLION 9s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_BEDISCARDED /discarded [a-z\s]{1,14} future deployments/i -#describe FB_BEDISCARDED Phrase: discarded ... future deployments -###score FB_BEDISCARDED 2.973 -##counts FB_BEDISCARDED 969s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_BEDISCARDED 0s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_BEDISCARDED 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_BILLI0N /[BM][I1]LL[I1]0N/i -###score FB_BILLI0N 10.357 -#describe FB_BILLI0N Phrase: [BM]Illi0n -##counts FB_BILLI0N 669s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_BILLI0N 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_BILLI0N 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_BOOST_CONFIDEN /Boost your confidence/i -#describe FB_BOOST_CONFIDEN Phrase: boost your confidence. -###score FB_BOOST_CONFIDEN 2.395 -##counts FB_BOOST_CONFIDEN 31s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_BOOST_CONFIDEN 1s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_BOOST_CONFIDEN 19s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_BOOST_CONFIDEN 21s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##80O.538.6704 -#body FB_BROKEN_PHNUM /(?!800)8[0o][0o][-.\s\)]{1,3}\d\d\d[-\.\s]{0,3}\d\d\d\d/i -#describe FB_BROKEN_PHNUM weird phone number, with letters! -###score FB_BROKEN_PHNUM 3.84 -##counts FB_BROKEN_PHNUM 10s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FB_BROKEN_PHNUM 42s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_BROWSER_ERR /Browser Error: [a-z0-9_]+,/i -#describe FB_BROWSER_ERR Phrase: Browser Error: random -###score FB_BROWSER_ERR 10 -##counts FB_BROWSER_ERR 11s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FB_BROWSER_ERR 139s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_BROWSER_ERR 413s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_C0MPANY /c0mpany/i -#describe FB_C0MPANY Phrase: C0mpany -###score FB_C0MPANY 10 -##counts FB_C0MPANY 21s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FB_C0MPANY 9s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_C0MPANY 12s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_CAN_LONGER /can last longer/i -#describe FB_CAN_LONGER Phrase: can last longer -###score FB_CAN_LONGER 4.854 -##counts FB_CAN_LONGER 8s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FB_CAN_LONGER 26s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_CAN_LONGER 41s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_CASINO /(?!casino)Ca[\$s5][i1\|]n[o0]/i -#describe FB_CASINO Phrase: ca$ino -###score FB_CASINO 10 -##counts FB_CASINO 46s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_CASINO 50s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_CASINO 56s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_CASINO_SPELLER /(?:Onliine Casino|Online CCasino)/i -#describe FB_CASINO_SPELLER Phrase: Online Casino, spelling mistake. -###score FB_CASINO_SPELLER 10.357 -##counts FB_CASINO_SPELLER 4s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_CASINO_SPELLER 4s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_CASINO_SPELLER 4s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_CHOLESTERBLCK /Cholesterblock/i -#describe FB_CHOLESTERBLCK Phrase: Cholesterblock -###score FB_CHOLESTERBLCK 10.357 -##counts FB_CHOLESTERBLCK 10s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_CHOLESTERBLCK 29s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_CHOLESTERBLCK 50s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_CIALIS_LEO3 /\bC(?!IALIS|eibal|laim|laritas)\s?[a-z]?\s?[Iitl1\\\/]\s?[a-z]?\s?[Aa]\s?[a-z]?\s?[LIl1\\\/]\s?[a-z]?\s?[ilIt1\\\/]\s?[a-z]?\s?[Ss]\b/ -#describe FB_CIALIS_LEO3 Uses a mis-spelled version of cialis. -###score FB_CIALIS_LEO3 4.599 -##counts FB_CIALIS_LEO3 2604s/0h of 41968 corpus (34130s/7838h FVGT) 04/11/06 -##counts FB_CIALIS_LEO3 17145s/12h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_CIALIS_LEO3 674s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_CIALIS_LEO3 686s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_CIALIS_LEO3 826s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_COM_ADR_SIGN /\:\:\s.{0,5}\d{3}\s\w{3,9}\s\w{2,9}\s.{1,20}\d{2}/i -#describe FB_COM_ADR_SIGN Common sign used in Addresses -###score FB_COM_ADR_SIGN 10.357 -##counts FB_COM_ADR_SIGN 11s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FB_COM_ADR_SIGN 63s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_COM_ADR_SIGN 160s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_COM_ADR_SIGN 351s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_CONSOL_YOUR /consolidate your/i -#describe FB_CONSOL_YOUR Phrase: Consolidate your -###score FB_CONSOL_YOUR 1.998 -##counts FB_CONSOL_YOUR 204s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_CONSOL_YOUR 4s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_CONSOL_YOUR 6s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_CONSOL_YOUR 12s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_DOUBLE_0WORDS /\b[a-z]{1,5}0[a-z]{3,9}\s[a-z]{1,5}0[a-z]{3,9}\b/i -#describe FB_DOUBLE_0WORDS Looks like double 0 words -###score FB_DOUBLE_0WORDS 2.999 -##counts FB_DOUBLE_0WORDS 689s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_DOUBLE_0WORDS 263s/0h of 107818 corpus (99658s/8160h FVGT) 03/11/06 -##counts FB_DOUBLE_0WORDS 11s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_DOUBLE_0WORDS 12s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_DROWNING_DEBT /drowning in debt/i -#describe FB_DROWNING_DEBT Phrase: drowning in debt -###score FB_DROWNING_DEBT 2.375 -##counts FB_DROWNING_DEBT 72s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_DROWNING_DEBT 1s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_DROWNING_DEBT 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_EARN_UP_TO /earn up to \$?\d?,?\d\d\d.{1,7}(?:day|week|month|year)/i -#describe FB_EARN_UP_TO Phrase: Earn up to .... -###score FB_EARN_UP_TO 3.828 -##counts FB_EARN_UP_TO 1s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_EARN_UP_TO 7s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_EMAIL_HIER /email hier/i -#describe FB_EMAIL_HIER Phrase: email hier -###score FB_EMAIL_HIER 10.357 -##counts FB_EMAIL_HIER 1583s/0h of 107818 corpus (99658s/8160h FVGT) 03/11/06 -##counts FB_EMAIL_HIER 165s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_EMAIL_HIER 169s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FB_ENHANCED_MALE /Enhanced male power/i -#body FB_ENHANCED_MALE /Enhanced male/i -#describe FB_ENHANCED_MALE Phrase: Enhanced male -###score FB_ENHANCED_MALE 10.357 -##counts FB_ENHANCED_MALE 17s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_ENHANCED_MALE 19s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_EPHEDRA_IS /Ephedra is back/i -#describe FB_EPHEDRA_IS Phrase: Ephedra is back -###score FB_EPHEDRA_IS 10.357 -##counts FB_EPHEDRA_IS 31s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FB_EPHEDRA_IS 37s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_EPHEDRA_IS 51s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_EXPLOSIVE /EXPLOSIVE\b/ -#describe FB_EXPLOSIVE Phrase: EXPLOSIVE -###score FB_EXPLOSIVE 7.148 -##counts FB_EXPLOSIVE 718s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_EXPLOSIVE 1s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_EXPLOSIVE 1s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_EXPLOSIVE 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_EXTRA_INCHES /extra inches/ -#describe FB_EXTRA_INCHES Phrase: extra inches -###score FB_EXTRA_INCHES 3.352 -##counts FB_EXTRA_INCHES 16s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FB_EXTRA_INCHES 17s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_EXTRA_INCHES 21s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_FAKE_NUMBERS /\$\d\d?O\s*[MBT]/i -#describe FB_FAKE_NUMBERS Looks like numbers with O's insted of 0's -###score FB_FAKE_NUMBERS 3.494 -##counts FB_FAKE_NUMBERS 948s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_FAKE_NUMBERS 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_FAKE_NUMBERS 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_FAKE_NUMS2 /\d,0OO/i -#describe FB_FAKE_NUMS2 Looks like fake numbers -###score FB_FAKE_NUMS2 3.834 -##counts FB_FAKE_NUMS2 11s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_FAKE_NUMS2 0s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_FAKE_NUMS2 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_FAKE_NUMS4 /(?:\b|\b\d)\d,?\d,?OO(?:\b|\d\b)/ -#describe FB_FAKE_NUMS4 Looks like fake numbers (4) -###score FB_FAKE_NUMS4 3.992 -##counts FB_FAKE_NUMS4 68s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_FAKE_NUMS4 49s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_FAKE_NUMS4 49s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_FEDERALLY_COMPL /We are federally compliant/i -#describe FB_FEDERALLY_COMPL Phrase: we are federally compliant -###score FB_FEDERALLY_COMPL 10.357 -##counts FB_FEDERALLY_COMPL 19s/0h of 104500 corpus (96503s/7997h FVGT) 03/09/06 -##counts FB_FEDERALLY_COMPL 21s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_FEDERALLY_COMPL 594s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_FEDERALLY_COMPL 742s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_FHARMACY /Fharmacy/i -#describe FB_FHARMACY Phrase: Farmacy -###score FB_FHARMACY 10.357 -##counts FB_FHARMACY 12s/0h of 33043 corpus (23599s/9444h FVGT) 11/15/06 -##counts FB_FHARMACY 65s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_FHARMACY 204s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_FORWARD_LOOK /(?!forward look)f[o0]rward l[0o][0o]k/i -#describe FB_FORWARD_LOOK Phrase: forward look with 0's -###score FB_FORWARD_LOOK 10.357 -##counts FB_FORWARD_LOOK 588s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_FORWARD_LOOK 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_FORWARD_LOOK 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_FREE888 /Free \$888/i -#describe FB_FREE888 Claims we can get $888 Free. -###score FB_FREE888 10.357 -##counts FB_FREE888 10s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_FREE888 17s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_FREE888 21s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_FUNNY_WEIGHT /(?!weight)we ?i?ght/i -#describe FB_FUNNY_WEIGHT Looks like weight but it's not! -###score FB_FUNNY_WEIGHT 5.993 -##counts FB_FUNNY_WEIGHT 10s/0h of 34977 corpus (27086s/7891h FT) 03/01/06 -##counts FB_FUNNY_WEIGHT 13s/0h of 107818 corpus (99658s/8160h FVGT) 03/11/06 -##counts FB_FUNNY_WEIGHT 2s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_FUNNY_WEIGHT 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_GAPPY_ADDRESS /(?:[a-z] ){8}, (?:[a-z0-9] ){4}/i -#describe FB_GAPPY_ADDRESS Too much spacing in Address -###score FB_GAPPY_ADDRESS 5.655 -##counts FB_GAPPY_ADDRESS 21s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FB_GAPPY_ADDRESS 139s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_GAPPY_ADDRESS 425s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_GAPPY_ADDRESS 616s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_GAPPY_SOMETHING /(?:[A-Z,-]\s){8}.{0,5}(?:[0-9]\s){3}/ -#describe FB_GAPPY_SOMETHING Looks like something thats g a p p y -###score FB_GAPPY_SOMETHING 0.444 -##counts FB_GAPPY_SOMETHING 1s/0h of 42071 corpus (34145s/7926h FVGT) 04/20/06 -##counts FB_GAPPY_SOMETHING 3s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_GAPPY_SOMETHING 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_GET_LAID /GET LAID/ -#describe FB_GET_LAID Phrase: GET LAID -###score FB_GET_LAID 10.357 -##counts FB_GET_LAID 5s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FB_GET_LAID 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_GET_MEDS /(?:place f[o0]r|[0o]rder|get\s?(?:y[o0]ur)?|online|quality).{1,7}med[isz][^a]/i -#describe FB_GET_MEDS Looks like trying to sell meds -###score FB_GET_MEDS 3.875 -##counts FB_GET_MEDS 30s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_GET_MEDS 38s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_GET_XXX_CASH /get \d+(?:,?\d+)? (?:[a-z]+ ?)?cash/i -#describe FB_GET_XXX_CASH Phrase: Get Cash -###score FB_GET_XXX_CASH 10.357 -##counts FB_GET_XXX_CASH 17s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_GET_XXX_CASH 55s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_GET_XXX_CASH 107s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_GREAT_BEST_SEX /(?:greater|best|Improved) sex/i -#describe FB_GREAT_BEST_SEX Phrase: greater, best, improved sex -###score FB_GREAT_BEST_SEX 5.157 -##counts FB_GREAT_BEST_SEX 51s/0h of 25733 corpus (16658s/9075h FVGT) 11/08/06 -##counts FB_GREAT_BEST_SEX 79s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_GREAT_BEST_SEX 109s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_GVR /(?:pef-rx|vigrex-ds|gsc-100|vp-rx|gv-promax|phentermine|adipex|xenical)/i -#describe FB_GVR Looks like generic viagra -###score FB_GVR 4.999 -##counts FB_GVR 79s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_GVR 55s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_GVR 55s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_HA1R /\bha1r\b/i -#describe FB_HA1R Phrase: ha1r -###score FB_HA1R 5.644 -##counts FB_HA1R 128s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_HA1R 0s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_HA1R 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_HEY_BRO_COMMA /Hey bro, / -#describe FB_HEY_BRO_COMMA Phrase hey bro, -###score FB_HEY_BRO_COMMA 7.357 -##counts FB_HEY_BRO_COMMA 40s/0h of 103587 corpus (96208s/7379h FVGT) 03/15/06 -##counts FB_HEY_BRO_COMMA 392s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_HEY_BRO_COMMA 10s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_HEY_BRO_COMMA 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_HG_H_CAP /\bHGH\b/ -#describe FB_HG_H_CAP Phrase: HGH -###score FB_HG_H_CAP 4.775 -##counts FB_HG_H_CAP 75s/0h of 25733 corpus (16658s/9075h FVGT) 11/08/06 -##counts FB_HG_H_CAP 88s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_HG_H_CAP 131s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_HOMELOAN /\$\d{3},\d{3} home loan/i -#describe FB_HOMELOAN Phrase $x home loan -###score FB_HOMELOAN 10.357 -##counts FB_HOMELOAN 333s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_HOMELOAN 4s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_HOMELOAN 1165s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_HOMELOAN 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_IMPRESS_GIRL /\bimpress .{0,5}girl\b/ -#describe FB_IMPRESS_GIRL Phrase: impress ... girl -###score FB_IMPRESS_GIRL 4.284 -##counts FB_IMPRESS_GIRL 122s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FB_IMPRESS_GIRL 128s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_IMPRESS_GIRL 131s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_IMPROVEJA /Improved Ejaculation/i -#describe FB_IMPROVEJA Phrase: Improved Ejaculation -###score FB_IMPROVEJA 10.357 -##counts FB_IMPROVEJA 0s/0h of 25733 corpus (16658s/9075h FVGT) 11/08/06 -##counts FB_IMPROVEJA 1s/0h of 26801 corpus (17723s/9078h FVGT) 11/09/06 -##counts FB_IMPROVEJA 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_INCREASE_VOL /\bincrease.{0,8}volume/ -#describe FB_INCREASE_VOL Phrase: increase volume -###score FB_INCREASE_VOL 3.629 -##counts FB_INCREASE_VOL 83s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FB_INCREASE_VOL 87s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_INCREASE_VOL 95s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_INCREASE_YOUR /Increase your energy/i -#describe FB_INCREASE_YOUR Phrase: Increase your energy -###score FB_INCREASE_YOUR 10.357 -##counts FB_INCREASE_YOUR 58s/0h of 25733 corpus (16658s/9075h FVGT) 11/08/06 -##counts FB_INCREASE_YOUR 83s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_INCREASE_YOUR 142s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_INDEPEND_RWD /independent reward/i -#describe FB_INDEPEND_RWD Phrase: independent reward -###score FB_INDEPEND_RWD 10.357 -##counts FB_INDEPEND_RWD 164s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_INDEPEND_RWD 620s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_INDEPEND_RWD 1386s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_IOW /\bIow\b/ -#describe FB_IOW Phrase: mis-spelled low, iow? -###score FB_IOW 10.357 -##counts FB_IOW 3s/0h of 25718 corpus (16644s/9074h FVGT) 11/08/06 -##counts FB_IOW 6s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_IOW 7s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_L0AN /\bl0ans?\b/i -#describe FB_L0AN Phrase: L0an -###score FB_L0AN 10.357 -##counts FB_L0AN 34s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FB_L0AN 7s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_L0AN 18s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_LAON /\blaon\b/i -#describe FB_LAON Phrase: laon -###score FB_LAON 2.382 -##counts FB_LAON 30s/0h of 104500 corpus (96503s/7997h FVGT) 03/09/06 -##counts FB_LAON 0s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_LAON 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_LATEST_OEM /latest oem/i -#describe FB_LATEST_OEM Phrase: latest oem. -###score FB_LATEST_OEM 10.357 -##counts FB_LATEST_OEM 12s/0h of 17430 corpus (9737s/7693h FT) 01/11/06 -##counts FB_LATEST_OEM 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_LATEST_OEM 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_LIMITED_TIME /limited time promotion/i -#describe FB_LIMITED_TIME Phrase: limited time promotion -###score FB_LIMITED_TIME 3.193 -##counts FB_LIMITED_TIME 73s/0h of 9788 corpus (4882s/4906h FT) 12/26/05 -##counts FB_LIMITED_TIME 16s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_LIMITED_TIME 21s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_LOSE_WEIGHT_CAP /LOSE WEIGHT/ -#describe FB_LOSE_WEIGHT_CAP Phrase: LOSE WEIGHT -###score FB_LOSE_WEIGHT_CAP 2.522 -##counts FB_LOSE_WEIGHT_CAP 115s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_LOSE_WEIGHT_CAP 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_LOSE_WEIGHT_CAP 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_LOWER_PAYM /lower your monthly payments/i -#describe FB_LOWER_PAYM Phrase: lower your monthly payments -###score FB_LOWER_PAYM 3.542 -##counts FB_LOWER_PAYM 187s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_LOWER_PAYM 37s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_LOWER_PAYM 38s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MAGIC_TAB /\b(?:magic|this) tab\b/ -#describe FB_MAGIC_TAB Phrase: this / magic tab. -###score FB_MAGIC_TAB 10.357 -##counts FB_MAGIC_TAB 115s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FB_MAGIC_TAB 116s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_MAGIC_TAB 118s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MAKE_MONEY /generate \$/i -#describe FB_MAKE_MONEY Phrase: generate $ -###score FB_MAKE_MONEY 1.755 -##counts FB_MAKE_MONEY 11s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_MAKE_MONEY 0s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_MAKE_MONEY 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MASCULINE_PERF /Masculine performance/i -#describe FB_MASCULINE_PERF Phrase: Masculine performance -###score FB_MASCULINE_PERF 10.357 -##counts FB_MASCULINE_PERF 15s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_MASCULINE_PERF 18s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_MASCULINE_PERF 18s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MED1CAT /\bmed1cat/i -#describe FB_MED1CAT Phrase: Med1cat -###score FB_MED1CAT 10.357 -##counts FB_MED1CAT 7s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_MED1CAT 6s/0h of 35267 corpus (25646s/9621h FVGT) 11/17/06 -##counts FB_MED1CAT 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MEDS_PERCENT /meds .{3,10}\d\s?%/i -#describe FB_MEDS_PERCENT Talks about meds and % -###score FB_MEDS_PERCENT 10.357 -##counts FB_MEDS_PERCENT 13s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_MEDS_PERCENT 6s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_MEDS_PERCENT 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MEEDS /\bmeed[zs]\b/i -#describe FB_MEEDS Phrase: meed[zs] -###score FB_MEEDS 10.357 -##counts FB_MEEDS 615s/0h of 81916 corpus (65011s/16905h ML) 02/27/06 -##counts FB_MEEDS 0s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_MEEDS 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MORE_SEMEN /more semen/i -#describe FB_MORE_SEMEN Phrase: more semen -###score FB_MORE_SEMEN 10.357 -##counts FB_MORE_SEMEN 4s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_MORE_SEMEN 95s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_MORE_SEMEN 5s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_MORE_SEMEN 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MORE_SIZE /\bmore size\b/ -#describe FB_MORE_SIZE Phrase: more size -###score FB_MORE_SIZE 10.357 -##counts FB_MORE_SIZE 11s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_MORE_SIZE 29s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_MORE_SIZE 48s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MOST_RECOG /most recognized brands/i -#describe FB_MOST_RECOG Phrase: most recognized brands. -###score FB_MOST_RECOG 2.772 -##counts FB_MOST_RECOG 12s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_MOST_RECOG 12s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_MOST_RECOG 13s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_MOST_QUALITY /Most quality products/i -#describe FB_MOST_QUALITY Phrase: Most quality products -###score FB_MOST_QUALITY 10.357 -##counts FB_MOST_QUALITY 16s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_MOST_QUALITY 90s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_MOST_QUALITY 26s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_N3W / n3w /i -#describe FB_N3W Phrase: n3w -###score FB_N3W 3.362 -##counts FB_N3W 11s/0h of 34977 corpus (27086s/7891h FT) 03/01/06 -##counts FB_N3W 523s/0h of 84470 corpus (67306s/17164h ML) 03/01/06 -##counts FB_N3W 19s/0h of 107818 corpus (99658s/8160h FVGT) 03/11/06 -##counts FB_N3W 0s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_N3W 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NATIONALSURV /NationalSurveyPanel/i -#describe FB_NATIONALSURV Phrase: NationalSurveyPanel -###score FB_NATIONALSURV 3.259 -##counts FB_NATIONALSURV 75s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_NATIONALSURV 2s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_NATIONALSURV 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NEW_LOW_RATE /new low rate/i -#describe FB_NEW_LOW_RATE Phrase: new low rate -###score FB_NEW_LOW_RATE 1.853 -##counts FB_NEW_LOW_RATE 1s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_NEW_LOW_RATE 1s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_NEW_LOW_RATE 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NO_MORE_ADS /no more ad/i -#describe FB_NO_MORE_ADS Phrase: no more ad -###score FB_NO_MORE_ADS 1.174 -##counts FB_NO_MORE_ADS 6s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_NO_MORE_ADS 13s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_NO_MORE_ADS 13s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NO_MORE_HTTP /no\s?more.{0,5} http/i -#describe FB_NO_MORE_HTTP No more, the http -###score FB_NO_MORE_HTTP 10.357 -##counts FB_NO_MORE_HTTP 1s/0h of 42050 corpus (34123s/7927h FVGT) 04/25/06 -##counts FB_NO_MORE_HTTP 109s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_NO_MORE_HTTP 174s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##No More Mail Please: -##No More Mail: -##No more distribution -#body FB_NO_MORE_MAIL /No More (?:Mail|distribution)/i -#describe FB_NO_MORE_MAIL Phrase: no more mail, distribution -###score FB_NO_MORE_MAIL 10.529 -##counts FB_NO_MORE_MAIL 25s/0h of 25733 corpus (16658s/9075h FVGT) 11/08/06 -##counts FB_NO_MORE_MAIL 52s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_NO_MORE_MAIL 68s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NO_MORE_OFFER /No more offer/i -#describe FB_NO_MORE_OFFER Phrase: no more offer -###score FB_NO_MORE_OFFER 3.189 -##counts FB_NO_MORE_OFFER 2s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FB_NO_MORE_OFFER 1s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_NO_MORE_OFFER 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## Bug 6448: replaced with NO_PRESCRIPTION -##body FB_NO_SCRIP_NEEDED /No.{1,10}P(?:er|re)scr[i1]pt[i1][o0]n (?:needed|requ[1i]re)/i -##describe FB_NO_SCRIP_NEEDED Phrase: no prescription needed. -###score FB_NO_SCRIP_NEEDED 10.357 -##counts FB_NO_SCRIP_NEEDED 722s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_NO_SCRIP_NEEDED 1042s/0h of 107818 corpus (99658s/8160h FVGT) 03/13/06 -##counts FB_NO_SCRIP_NEEDED 84s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_NO_SCRIP_NEEDED 133s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NOT_CREDIT /\b(?!credit)cred[^i\s]{1,3}t\b/i -#describe FB_NOT_CREDIT Looks like credit but ain't. -###score FB_NOT_CREDIT 3.857 -##counts FB_NOT_CREDIT 40s/0h of 42007 corpus (34077s/7930h FVGT) 04/19/06 -##counts FB_NOT_CREDIT 9s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_NOT_CREDIT 9s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##8oo-xxx-xxxx -#body FB_NOT_PHONE_NUM1 /(?!\d{3})8(?:66|77|88|[0o][0o])[-\.\s\)]{1,3}[OIL0-9]{3}[-\.\s]/i -#describe FB_NOT_PHONE_NUM1 Looks like a fake phone number (1) -###score FB_NOT_PHONE_NUM1 10.357 -##counts FB_NOT_PHONE_NUM1 3s/0h of 25718 corpus (16644s/9074h FVGT) 11/08/06 -##counts FB_NOT_PHONE_NUM1 24s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_NOT_PHONE_NUM1 109s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##888-xox-xxxx -#body FB_NOT_PHONE_NUM2 /8(?:66|77|88|[0o][0o])[-\.\s\)]{1,3}(?!\d{3})[OIL0-9]{3}[-\.\s]/i -#describe FB_NOT_PHONE_NUM2 Looks like a fake phone number (2) -###score FB_NOT_PHONE_NUM2 10.357 -##counts FB_NOT_PHONE_NUM2 5s/0h of 25718 corpus (16644s/9074h FVGT) 11/08/06 -##counts FB_NOT_PHONE_NUM2 16s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_NOT_PHONE_NUM2 69s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##888-xxx-xiox -#body FB_NOT_PHONE_NUM3 /8(?:66|77|88|[0o][0o])[-\.\s\)]{1,3}[OIL0-9]{3}[-\.\s]{1,3}(?!\d{4})[OIL0-9]{4}/i -#describe FB_NOT_PHONE_NUM3 Looks like a fake phone number (3) -###score FB_NOT_PHONE_NUM3 10.357 -##counts FB_NOT_PHONE_NUM3 7s/0h of 25718 corpus (16644s/9074h FVGT) 11/08/06 -##counts FB_NOT_PHONE_NUM3 25s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_NOT_PHONE_NUM3 120s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## $choolgirl -#body FB_NOT_SCHOOL /(?!school)[\$s5]ch[o0][o0][il1\|]/i -#describe FB_NOT_SCHOOL Looks like school but it's not! -###score FB_NOT_SCHOOL 10.357 -##counts FB_NOT_SCHOOL 2s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_NOT_SCHOOL 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NOT_SEXUAL /[^Ss]exual/ -#describe FB_NOT_SEXUAL Almost Sexual but not. -###score FB_NOT_SEXUAL 10.357 -##counts FB_NOT_SEXUAL 23s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FB_NOT_SEXUAL 27s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NOW_NOW_NOW /NOW NOW NOW/ -#describe FB_NOW_NOW_NOW Phrase: NOW NOW NOW -###score FB_NOW_NOW_NOW 10.357 -##counts FB_NOW_NOW_NOW 23s/0h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -##counts FB_NOW_NOW_NOW 42s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_NOW_NOW_NOW 96s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NUMYO /1[0-9][\s\.]?y[\s\.]?o[\s\.]?\b/i -#describe FB_NUMYO Speaks of teenager. -###score FB_NUMYO 10.357 -##counts FB_NUMYO 160s/0h of 24696 corpus (15673s/9023h FVGT) 11/01/06 -##counts FB_NUMYO 287s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_NUMYO 166s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_NUMYO 181s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_NUMYO2 /2[0-9][\s\.]?y[\s\.]?o[\s\.]?\b/i -#describe FB_NUMYO2 Speaks of 20+ year old. -###score FB_NUMYO2 10.357 -##counts FB_NUMYO2 7s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_NUMYO2 100s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_NUMYO2 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_ODD_SPACED_MONEY /\$\d\s,\s\d\d/ -#describe FB_ODD_SPACED_MONEY Looks like money but has odd spacing. -###score FB_ODD_SPACED_MONEY 10.357 -##counts FB_ODD_SPACED_MONEY 1075s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_ODD_SPACED_MONEY 1078s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_ODD_SPACED_MONEY 1076s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_ONIINE /oniine/i -#describe FB_ONIINE Mis-spelled online -###score FB_ONIINE 10.357 -##counts FB_ONIINE 2s/0h of 24645 corpus (15618s/9027h FVGT) 10/31/06 -##counts FB_ONIINE 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_P1LL /\bp1ll/i -#describe FB_P1LL Phrase: p1ll -###score FB_P1LL 10.357 -##counts FB_P1LL 61s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_P1LL 3s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_P1LL 7s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_P1LL 24s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_PA1N /\bpa1n/i -#describe FB_PA1N Phrase: pa1n -###score FB_PA1N 10.658 -##counts FB_PA1N 10s/0h of 40695 corpus (35393s/5302h MY) 12/13/05 -##counts FB_PA1N 12s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_PA1N 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_PA1N 1s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_PA1N 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##paste link in browser -#body FB_PASTE_LINK /paste link .{1,8}browser/i -#describe FB_PASTE_LINK Phrase: past link into browser -###score FB_PASTE_LINK 10.357 -##counts FB_PASTE_LINK 9s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_PASTE_LINK 94s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_PASTE_LINK 49s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_PC_DOCTOR /PC Doctor/i -#describe FB_PC_DOCTOR Phrase: PC Doctor -###score FB_PC_DOCTOR 10.357 -##counts FB_PC_DOCTOR 2s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FB_PC_DOCTOR 25s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_PC_DOCTOR 90s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_PC_DOCTOR 166s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_PENIS_GROWTH /pen[i1]s grow(?:th)?/i -#describe FB_PENIS_GROWTH Phrase: penis growth -###score FB_PENIS_GROWTH 6.999 -##counts FB_PENIS_GROWTH 21s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_PENIS_GROWTH 4s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_PENIS_GROWTH 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_PIPE_ILLION /(?!illion)i[l|][l|][i|][o0]n/i -#describe FB_PIPE_ILLION Looks like illion, but it's not -###score FB_PIPE_ILLION 10.357 -##counts FB_PIPE_ILLION 1560s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_PIPE_ILLION 3s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_PIPE_ILLION 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_PIPEDOLLAR /(?!dollar)d[o0][1|li][1|li]ar/i -#describe FB_PIPEDOLLAR Phrase: Dollar, with pipes or 0's. -###score FB_PIPEDOLLAR 10.357 -##counts FB_PIPEDOLLAR 40s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_PIPEDOLLAR 2s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_PIPEDOLLAR 331s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_PIPEDOLLAR 262s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FB_PIPEDOLLAR 4s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_PIPENEWSLETTER /news\|etter/i -#describe FB_PIPENEWSLETTER Phrase news|etter -###score FB_PIPENEWSLETTER 10.357 -##counts FB_PIPENEWSLETTER 1s/0h of 40695 corpus (35393s/5302h MY) 12/13/05 -##counts FB_PIPENEWSLETTER 890s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_PIPENEWSLETTER 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_PIPENEWSLETTER 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_PROLONGED_HARD /(?:prolonged|increased) hardness/i -#describe FB_PROLONGED_HARD Talks about prolonged hardness -###score FB_PROLONGED_HARD 10.357 -##counts FB_PROLONGED_HARD 15s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_PROLONGED_HARD 22s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_PROLONGED_HARD 175s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_PROLONGED_HARD 21s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -# -#body FB_QUALITY_REPLICA /quality replica/i -#describe FB_QUALITY_REPLICA Phrase: quality replica -###score FB_QUALITY_REPLICA 10.357 -##counts FB_QUALITY_REPLICA 222s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_QUALITY_REPLICA 1s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_QUALITY_REPLICA 503s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_QUALITY_REPLICA 35s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_RANDOM_SPUR /\{SPUR_\d{1,2}\}/i -#describe FB_RANDOM_SPUR Pattern Replacement Failure -###score FB_RANDOM_SPUR 10.357 -##counts FB_RANDOM_SPUR 38s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_RANDOM_SPUR 105s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_RANDOM_SPUR 206s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_RE_FI /\bre[^a-z]fi\b/ -#describe FB_RE_FI Looks like refi. -###score FB_RE_FI 10.357 -##counts FB_RE_FI 1s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_RE_FI 2s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_RE_FI 68s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_RE_FI 16s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_REF_CODE_SPACE /r e f c o d e/i -#describe FB_REF_CODE_SPACE Refcode with spacing -###score FB_REF_CODE_SPACE 10.357 -##counts FB_REF_CODE_SPACE 74s/0h of 23261 corpus (14238s/9023h FVGT) 10/30/06 -##counts FB_REF_CODE_SPACE 711s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_REF_CODE_SPACE 1009s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_REFI / Refi /i -#describe FB_REFI Phrase: Refi -###score FB_REFI 3.534 -##counts FB_REFI 1088s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_REFI 14s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_REFI 16s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_REM_PART /remov\W/i -#describe FB_REM_PART Looks like remove w/o e. -###score FB_REM_PART 10.357 -##counts FB_REM_PART 48s/0h of 40695 corpus (35393s/5302h MY) 12/13/05 -##counts FB_REM_PART 856s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_REM_PART 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_REPLICA_ROLEX /replica rolex/i -#describe FB_REPLICA_ROLEX Phrase: Replica Rolex -###score FB_REPLICA_ROLEX 3.957 -##counts FB_REPLICA_ROLEX 7s/0h of 40695 corpus (35393s/5302h MY) 12/13/05 -##counts FB_REPLICA_ROLEX 16s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_REPLICA_ROLEX 5s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_REPLICA_ROLEX 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_REWARDS_GATE /Rewards Gateway/i -#describe FB_REWARDS_GATE Phrase: Rewards Gateway -###score FB_REWARDS_GATE 10.357 -##counts FB_REWARDS_GATE 30s/0h of 27348 corpus (19456s/7892h FT) 02/27/06 -##counts FB_REWARDS_GATE 148s/0h of 101278 corpus (61900s/39378h DOC) 02/27/06 -##counts FB_REWARDS_GATE 11s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_REWARDS_GATE 24s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_ROLLER_IS_T /Roller is th/i -#describe FB_ROLLER_IS_T Phrase: Roller is th -###score FB_ROLLER_IS_T 1.357 -##counts FB_ROLLER_IS_T 20s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FB_ROLLER_IS_T 22s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_ROLLER_IS_T 1s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FB_ROLLER_IS_T 28s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_ROLLER_IS_T 28s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_ROLX /\brolx\b/i -#describe FB_ROLX Phrase: rolx -###score FB_ROLX 10.357 -##counts FB_ROLX 0s/0h of 40695 corpus (35393s/5302h MY) 12/13/05 -##counts FB_ROLX 163s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_ROLX 0s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_ROLX 1s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_ROLX 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SAVE_PERSC /sav(?:e|ing).{1,45}p[re][re]scr[i1]pt[i1][o0]n/i -#describe FB_SAVE_PERSC Phrase: save ... prescription. -###score FB_SAVE_PERSC 3.199 -##counts FB_SAVE_PERSC 7s/0h of 40695 corpus (35393s/5302h MY) 12/13/05 -##counts FB_SAVE_PERSC 30s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_SAVE_PERSC 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_SAVE_PERSC 19s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_SAVE_PERSC 2s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FB_SAVE_PERSC 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SSEX /\bssex\b/ -#describe FB_SSEX Phrase: ssex -###score FB_SSEX 10.357 -##counts FB_SSEX 0s/0h of 5479 corpus (1297s/4182h AxB) 09/25/06 -##counts FB_SSEX 19s/0h of 21635 corpus (15142s/6493h CT) 09/25/06 -##counts FB_SSEX 33s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FB_SSEX 34s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SMALL_PEN /small p+e+n(?!sion)/i -#describe FB_SMALL_PEN Phrase: small pen -###score FB_SMALL_PEN 10.357 -##counts FB_SMALL_PEN 105s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_SMALL_PEN 24s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_SMALL_PEN 26s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SOFTTABS /\bsoft\s?t?abs\b/i -#describe FB_SOFTTABS Phrase: Softabs -###score FB_SOFTTABS 10.357 -##counts FB_SOFTTABS 31s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_SOFTTABS 0s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_SOFTTABS 95s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_SOFTTABS 97s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SPACED_CASH /c a s h/i -#describe FB_SPACED_CASH Phrase: c a s h -###score FB_SPACED_CASH 4.555 -##counts FB_SPACED_CASH 4s/0h of 42007 corpus (34077s/7930h FVGT) 04/19/06 -##counts FB_SPACED_CASH 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SPACED_FREE /F R E E/i -#describe FB_SPACED_FREE Phrase: F R E E -###score FB_SPACED_FREE 2.157 -##counts FB_SPACED_FREE 68s/0h of 40695 corpus (35393s/5302h MY) 12/13/05 -##counts FB_SPACED_FREE 141s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_SPACED_FREE 60s/0h of 25362 corpus (16336s/9026h FVGT) 11/04/06 -##counts FB_SPACED_FREE 66s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SPACED_LOWER /L O W E R/i -#describe FB_SPACED_LOWER Phrase: l o w e r -###score FB_SPACED_LOWER 10.357 -##counts FB_SPACED_LOWER 4s/0h of 42007 corpus (34077s/7930h FVGT) 04/19/06 -##counts FB_SPACED_LOWER 5s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_SPACED_LOWER 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SPACEY_ZIP /\s\d\s\d\s\d\s\d\s\d\s-\s\d\s\d\s\d\s\d/ -#describe FB_SPACEY_ZIP Looks like a s p a c e d zipcode. -###score FB_SPACEY_ZIP 10.357 -##counts FB_SPACEY_ZIP 121s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_SPACEY_ZIP 104s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_SPACEY_ZIP 186s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_SPACEY_ZIP 206s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SPUR_M /\bSPUR-M\b/i -#describe FB_SPUR_M Phrase: SPUR-M -###score FB_SPUR_M 10.357 -##counts FB_SPUR_M 2175s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_SPUR_M 23s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_SPUR_M 23s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_STAMINA_IN_BED /stamina in bed/i -#describe FB_STAMINA_IN_BED Phrase: stamina in bed. -###score FB_STAMINA_IN_BED 10.357 -##counts FB_STAMINA_IN_BED 7s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_STAMINA_IN_BED 10s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_STAMINA_IN_BED 92s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_STAMINA_IN_BED 11s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_STOCK_EXPLODE /st[0o]ck\b.{4,10}expl[o0]de/i -#describe FB_STOCK_EXPLODE Looks like stocks exploding. -###score FB_STOCK_EXPLODE 10.357 -##counts FB_STOCK_EXPLODE 36s/0h of 40695 corpus (35393s/5302h MY) 12/13/05 -##counts FB_STOCK_EXPLODE 105s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_STOCK_EXPLODE 87s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_STOCK_EXPLODE 407s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_STOCK_EXPLODE 87s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_STOP_EMAILING /Stop e-?mailing me/i -#describe FB_STOP_EMAILING Phrase stop e-mailing me -###score FB_STOP_EMAILING 4.133 -##counts FB_STOP_EMAILING 15s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_STOP_EMAILING 28s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FB_STOP_EMAILING 202s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_STOP_EMAILING 305s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_STREAM_OF /Watch the stream of (?:potential\s?)? customers/i -#describe FB_STREAM_OF Phrase: Watch the stream of customers -###score FB_STREAM_OF 10.357 -##counts FB_STREAM_OF 32s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FB_STREAM_OF 36s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_STREAM_OF 43s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_STRONGER_EJ /stronger ejaculation/ -#describe FB_STRONGER_EJ Phrase: stronger ejaculation -###score FB_STRONGER_EJ 10.357 -##counts FB_STRONGER_EJ 4s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_STRONGER_EJ 185s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_STRONGER_EJ 280s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_STRONGER_EJ 187s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SUPERBREWARD /\bSuperb\s?Rewards\b/i -#describe FB_SUPERBREWARD Phrase: Superb Rewards -###score FB_SUPERBREWARD 10.357 -##counts FB_SUPERBREWARD 216s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_SUPERBREWARD 4s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_SUPERBREWARD 4s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_SYMBLO /\bSymblo\b/i -#describe FB_SYMBLO Mis-spelled symbol. -###score FB_SYMBLO 10.357 -##counts FB_SYMBLO 1s/0h of 24696 corpus (15673s/9023h FVGT) 11/01/06 -##counts FB_SYMBLO 1s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_SYMBLO 3s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FB_SYMBLO 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_THIS_ADVERT /this advertiser/i -#describe FB_THIS_ADVERT Phrase: this advertiser -###score FB_THIS_ADVERT 5.172 -##counts FB_THIS_ADVERT 138s/1h of 27454 corpus (21820s/5634h MY) 02/28/06 -##counts FB_THIS_ADVERT 204s/0h of 27348 corpus (19451s/7897h FT) 02/28/06 -##counts FB_THIS_ADVERT 477s/0h of 101690 corpus (62275s/39415h DOC) 02/28/06 -##counts FB_THIS_ADVERT 532s/0h of 107818 corpus (99658s/8160h FVGT) 03/11/06 -##counts FB_THIS_ADVERT 84s/0h of 25362 corpus (16336s/9026h FVGT) 11/04/06 -##counts FB_THIS_ADVERT 301s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_THIS_ADVERT 656s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_THOUS_PERSONAL /thousand personal/i -#describe FB_THOUS_PERSONAL Phrase: thousand personal -###score FB_THOUS_PERSONAL 10.357 -##counts FB_THOUS_PERSONAL 954s/0h of 34977 corpus (27086s/7891h FT) 03/01/06 -##counts FB_THOUS_PERSONAL 604s/0h of 103116 corpus (63731s/39385h DOC) 03/01/06 -##counts FB_THOUS_PERSONAL 76s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_THOUS_PERSONAL 76s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_TIRED_OF_YOUR /Tired of your/i -#describe FB_TIRED_OF_YOUR Phrase: Tired of your -###score FB_TIRED_OF_YOUR 10.357 -##counts FB_TIRED_OF_YOUR 55s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_TIRED_OF_YOUR 227s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_TIRED_OF_YOUR 188s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FB_TIRED_OF_YOUR 71s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_TIRED_OF_YOUR 90s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##To stop further distribution -##To longer get distribution -##To stop receiving announcements -##To stop announcements -#body FB_TO_STOP_DISTRO /To (?:(?:stop further|longer get) distribution|stop (?:receiving )?announcements)/i -#describe FB_TO_STOP_DISTRO Phrase: to stop further distribution -###score FB_TO_STOP_DISTRO 10.222 -##counts FB_TO_STOP_DISTRO 19s/0h of 25733 corpus (16658s/9075h FVGT) 11/08/06 -##counts FB_TO_STOP_DISTRO 25s/0h of 26801 corpus (17723s/9078h FVGT) 11/09/06 -##counts FB_TO_STOP_DISTRO 75s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_TO_STOP_DISTRO 100s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_UGGS_NOW /Uggs Now/i -#describe FB_UGGS_NOW Phrase: uggs now -###score FB_UGGS_NOW 10.357 -##counts FB_UGGS_NOW 2s/0h of 24567 corpus (15543s/9024h FVGT) 10/31/06 -##counts FB_UGGS_NOW 10s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FB_UGGS_NOW 28s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_UGGS_NOW 62s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_ULTRA_ALLURE /Ultra Allure/i -#describe FB_ULTRA_ALLURE Phrase: Ultra Allure -###score FB_ULTRA_ALLURE 10.357 -##counts FB_ULTRA_ALLURE 39s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FB_ULTRA_ALLURE 6s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_ULTRA_ALLURE 33s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_ULTRA_ALLURE 12s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_UNLOCK_YOUR_G /lock ?(?:to ?)? your girlfriend/i -#describe FB_UNLOCK_YOUR_G Phrase: lock to your girlfriend -###score FB_UNLOCK_YOUR_G 10.357 -##counts FB_UNLOCK_YOUR_G 9s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FB_UNLOCK_YOUR_G 23s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_UNLOCK_YOUR_G 225s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_UNLOCK_YOUR_G 54s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_UNLOCK_YOUR_G 100s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_UNRESOLV_PROV /\{PROV_\d_\d\}/ -#describe FB_UNRESOLV_PROV Pattern Replacement PROV_D -###score FB_UNRESOLV_PROV 10.357 -##counts FB_UNRESOLV_PROV 3s/0h of 25733 corpus (16658s/9075h FVGT) 11/08/06 -##counts FB_UNRESOLV_PROV 3s/0h of 26801 corpus (17723s/9078h FVGT) 11/09/06 -##counts FB_UNRESOLV_PROV 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_V_SPACE_GRA m'(?:V|\\/).{2,5} G R A [a-z]' -#describe FB_V_SPACE_GRA Looks like Viagra? -###score FB_V_SPACE_GRA 10.357 -##counts FB_V_SPACE_GRA 31s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_V_SPACE_GRA 31s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_V_SPACE_GRA 31s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_VERIFY_ZIP /verify your zipcode/i -#describe FB_VERIFY_ZIP Phrase: verify your zipcode -###score FB_VERIFY_ZIP 4.897 -##counts FB_VERIFY_ZIP 94s/0h of 22976 corpus (17263s/5713h MY) 03/17/06 -##counts FB_VERIFY_ZIP 65s/0h of 103688 corpus (96287s/7401h FVGT) 03/17/06 -##counts FB_VERIFY_ZIP 18s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_VERIFY_ZIP 35s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_VERIFY_ZIP 58s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_WHILECONNECTED /while connected to the internet/i -#describe FB_WHILECONNECTED Phrase: white connected to the internet -###score FB_WHILECONNECTED 10.357 -##counts FB_WHILECONNECTED 1s/0h of 34935 corpus (26998s/7937h FT) 03/02/06 -##counts FB_WHILECONNECTED 6s/0h of 107818 corpus (99658s/8160h FVGT) 03/11/06 -##counts FB_WHILECONNECTED 151s/0h of 102872 corpus (63496s/39376h DOC) 03/02/06 -##counts FB_WHILECONNECTED 1s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_WHILECONNECTED 156s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_WHITEGOLD /white gold sound good/ -#describe FB_WHITEGOLD Phrase: white gold sound good -###score FB_WHITEGOLD 10.357 -##counts FB_WHITEGOLD 7s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_WHITEGOLD 8s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_WHITEGOLD 344s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_WHITEGOLD 8s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_WITHOUT_INCRE /without increasing your/i -#describe FB_WITHOUT_INCRE Phrase: without increasing your -###score FB_WITHOUT_INCRE 1.193 -##counts FB_WITHOUT_INCRE 1s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_WITHOUT_INCRE 1s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_WITHOUT_INCRE 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_WITHOUT_PRESC /without a prescript/i -#describe FB_WITHOUT_PRESC Phrase: without a prescription. -###score FB_WITHOUT_PRESC 3.498 -##counts FB_WITHOUT_PRESC 2s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_WITHOUT_PRESC 43s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_WITHOUT_PRESC 8s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_WITHOUT_PRESC 19s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_WORD1_END_DOLLAR / [a-z013]{3,6}\$ /i -#describe FB_WORD1_END_DOLLAR Looks like a word ending with a $ -###score FB_WORD1_END_DOLLAR 1.294 #FP Reports -##counts FB_WORD1_END_DOLLAR 1569s/0h of 345244 corpus (337372s/7872h FT) 02/07/06 -##counts FB_WORD1_END_DOLLAR 2820s/0h of 107818 corpus (99658s/8160h FVGT) 03/11/06 -##counts FB_WORD1_END_DOLLAR 16s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FB_WORD1_END_DOLLAR 18s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_WORD2_END_DOLLAR /\b[a-z013]{3,6}\$ /i -#describe FB_WORD2_END_DOLLAR Looks like a word ending with a $ (2) -###score FB_WORD2_END_DOLLAR 1.294 #FP Reports -##counts FB_WORD2_END_DOLLAR 1796s/0h of 345244 corpus (337372s/7872h FT) 02/07/06 -##counts FB_WORD2_END_DOLLAR 3082s/0h of 107818 corpus (99658s/8160h FVGT) 03/11/06 -##counts FB_WORD2_END_DOLLAR 21s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_WORD2_END_DOLLAR 24s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOU_CAN_BECOME /you can become/i -#describe FB_YOU_CAN_BECOME Phrase: you can become -###score FB_YOU_CAN_BECOME 1.258 -##counts FB_YOU_CAN_BECOME 84s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_YOU_CAN_BECOME 14s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_YOU_CAN_BECOME 15s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOU_LOVE /You love can/i -#describe FB_YOU_LOVE Phrase: you love can -###score FB_YOU_LOVE 4.292 -##counts FB_YOU_LOVE 8s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FB_YOU_LOVE 14s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_YOU_LOVE 250s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_YOU_LOVE 26s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_YOU_LOVE 29s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_YOU_LOVE 41s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOUR_MED /your med\b/ -#describe FB_YOUR_MED Phrase: your med -###score FB_YOUR_MED 10.357 -##counts FB_YOUR_MED 13s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_YOUR_MED 1s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_YOUR_MED 10s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FB_YOUR_MED 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOUR_REFI /Your refi/i -#describe FB_YOUR_REFI Phrase: Your refi -###score FB_YOUR_REFI 0.333 -##counts FB_YOUR_REFI 44s/0h of 35751 corpus (26053s/9698h FVGT) 11/18/06 -##counts FB_YOUR_REFI 51s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOUR_MORTGAGE /your mortgage/i -#describe FB_YOUR_MORTGAGE Phrase: Your Mortgage -###score FB_YOUR_MORTGAGE 2.128 -##counts FB_YOUR_MORTGAGE 1589s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FB_YOUR_MORTGAGE 67s/0h of 33815 corpus (24249s/9566h FVGT) 11/16/06 -##counts FB_YOUR_MORTGAGE 104s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOUR_PC_ERROR /your PC has error/i -#describe FB_YOUR_PC_ERROR Phrase: your pc has error -###score FB_YOUR_PC_ERROR 10.357 -##counts FB_YOUR_PC_ERROR 2s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FB_YOUR_PC_ERROR 25s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_YOUR_PC_ERROR 58s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FB_YOUR_PC_ERROR 166s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOUR_REFILL /your refill/i -#describe FB_YOUR_REFILL Phrase: your refill -###score FB_YOUR_REFILL 3.157 -##counts FB_YOUR_REFILL 58s/0h of 345244 corpus (337372s/7872h FT) 02/07/06 -##counts FB_YOUR_REFILL 40s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_YOUR_REFILL 139s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_YOUR_REFILL 40s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOUR_WEIGHT /about your weight/i -#describe FB_YOUR_WEIGHT Phrase: about your weight -###score FB_YOUR_WEIGHT 3.531 -##counts FB_YOUR_WEIGHT 1s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FB_YOUR_WEIGHT 15s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FB_YOUR_WEIGHT 29s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_YOUR_WEIGHT 48s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOUR_WOMAN /your woman will be/ -#describe FB_YOUR_WOMAN Phrase: Your woman will be -###score FB_YOUR_WOMAN 10.357 -##counts FB_YOUR_WOMAN 2s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FB_YOUR_WOMAN 36s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FB_YOUR_WOMAN 193s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FB_YOUR_WOMAN 296s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FB_YOUR_WOMAN 42s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOURSELF_MASTER /yourself master/i -#describe FB_YOURSELF_MASTER Phrase: yourself master -###score FB_YOURSELF_MASTER 10.357 -##counts FB_YOURSELF_MASTER 954s/0h of 34977 corpus (27086s/7891h FT) 03/01/06 -##counts FB_YOURSELF_MASTER 3420s/0h of 107818 corpus (99658s/8160h FVGT) 03/11/06 -##counts FB_YOURSELF_MASTER 76s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FB_YOURSELF_MASTER 76s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FB_YOUTH_THIS /YOUTH is BACK!/ -#describe FB_YOUTH_THIS Phrase: Youth is Back! -###score FB_YOUTH_THIS 10.357 -##counts FB_YOUTH_THIS 155s/0h of 35267 corpus (25646s/9621h FVGT) 11/17/06 -##counts FB_YOUTH_THIS 157s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##========= Header Rules ============== -# -# -## Seen 1980 used in current spam. -#header FH_DATE_IS_19XX Date =~ /19[789][0-9]/ [if-unset: 2006] -#describe FH_DATE_IS_19XX The date is not 19xx. -###score FH_DATE_IS_19XX 10.357 -##counts FH_DATE_IS_19XX 36s/0h of 103219 corpus (95719s/7500h FVGT) 03/21/06 -##counts FH_DATE_IS_19XX 12s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FH_DATE_IS_19XX 172s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FH_DATE_IS_19XX 12s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## Date: Tue, 19 Jan 2038 11:14:07 +0800 -## This exact date is VERY COMMON! -##header FH_DATE_PAST_20XX Date =~ /20[2-9][0-9]/ [if-unset: 2006] -##describe FH_DATE_PAST_20XX The date is grossly in the future. -###score FH_DATE_PAST_20XX 10.357 -##counts FH_DATE_PAST_20XX 207s/0h of 103219 corpus (95719s/7500h FVGT) 03/21/06 -##counts FH_DATE_PAST_20XX 290s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FH_DATE_PAST_20XX 393s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FH_DATE_PAST_20XX 298s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_FAKE_RCVD_LINE Received =~ /from\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s*by\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3};\s*[SMTWF].{2},\s*\d{1,2}\s*[JFMASOND].{2,5}\s*\d{4}\s*\d{2}:\d{2}:\d{2}\s*[-+]\d{4}/ -#describe FH_FAKE_RCVD_LINE RCVD line looks faked (A) -###score FH_FAKE_RCVD_LINE 10.357 -##counts FH_FAKE_RCVD_LINE 428s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FH_FAKE_RCVD_LINE 437s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_FAKE_RCVD_LINE 437s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_FAKE_RCVD_LINE_B Received =~ /from\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s*by\s*[a-z0-9.]{4,24}\.[a-z0-9.]{4,36}\.(?:com|net|org|biz);\s*[SMTWF].{2},\s*\d{1,2}\s*[JFMASOND].{2,5}\s*\d{4}\s*\d{2}:\d{2}:\d{2}\s*[-+]\d{4}/i -#describe FH_FAKE_RCVD_LINE_B RCVD line looks faked (B) -###score FH_FAKE_RCVD_LINE_B 5.777 -##counts FH_FAKE_RCVD_LINE_B 7s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FH_FAKE_RCVD_LINE_B 28s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FH_FAKE_RCVD_LINE_B 1s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FH_FAKE_RCVD_LINE_B 7s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_FROM_CASH From:name =~ /\bcash\b/i -#describe FH_FROM_CASH From name has "cash" -###score FH_FROM_CASH 1.882 -##counts FH_FROM_CASH 54s/0h of 27454 corpus (21820s/5634h MY) 02/28/06 -##counts FH_FROM_CASH 4s/0h of 12254 corpus (6582s/5672h CT) 02/28/06 -##counts FH_FROM_CASH 91s/0h of 27348 corpus (19451s/7897h FT) 02/28/06 -##counts FH_FROM_CASH 88s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FH_FROM_CASH 113s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## Bug 6353 -#header FH_FROMEML_NOTLD From:addr !~ /\@[^@]+\.(?:[a-z]{2,}|xn--[a-z0-9]+(?:-[a-z0-9]*)?)$/i [if-unset: foo@bar.com] -#describe FH_FROMEML_NOTLD E-mail address doesn't have TLD (.com, etc.) -###score FH_FROMEML_NOTLD 2.268 -##counts FH_FROMEML_NOTLD 104s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FH_FROMEML_NOTLD 106s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_FROMEML_NOTLD 107s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_FROM_RND_1 From =~ /%(?:from|RND_)/ -#describe FH_FROM_RND_1 From has pattern replacement broken. -###score FH_FROM_RND_1 10.357 -##counts FH_FROM_RND_1 255s/0h of 103059 corpus (95661s/7398h FVGT) 03/20/06 -##counts FH_FROM_RND_1 76s/0h of 25009 corpus (15987s/9022h FVGT) 11/03/06 -##counts FH_FROM_RND_1 76s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_FROM_GET_NAME From:name =~ /\bGet\b/i -#describe FH_FROM_GET_NAME From name says Get -###score FH_FROM_GET_NAME 2.598 -##counts FH_FROM_GET_NAME 56s/0h of 25009 corpus (15987s/9022h FVGT) 11/03/06 -##counts FH_FROM_GET_NAME 3s/0h of 9077 corpus (4464s/4613h AxB) 11/03/06 -##counts FH_FROM_GET_NAME 110s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FH_FROM_GET_NAME 54s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FH_FROM_GET_NAME 93s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_FROM_GIVEAWAY From =~ /Giveaway/i -#describe FH_FROM_GIVEAWAY From name is giveaway. -###score FH_FROM_GIVEAWAY 2.269 -##counts FH_FROM_GIVEAWAY 35s/0h of 27348 corpus (19451s/7897h FT) 02/28/06 -##counts FH_FROM_GIVEAWAY 416s/0h of 101690 corpus (62275s/39415h DOC) 02/28/06 -##counts FH_FROM_GIVEAWAY 2s/0h of 25009 corpus (15987s/9022h FVGT) 11/03/06 -##counts FH_FROM_GIVEAWAY 26s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FH_FROM_GIVEAWAY 54s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_FROM_START_YOU From =~ /^You\b/i -#describe FH_FROM_START_YOU From starts with you. -###score FH_FROM_START_YOU 0.799 -##counts FH_FROM_START_YOU 19s/0h of 70283 corpus (50296s/19987h ML) 03/20/06 -##counts FH_FROM_START_YOU 1s/0h of 103059 corpus (95661s/7398h FVGT) 03/20/06 -##counts FH_FROM_START_YOU 1s/0h of 25009 corpus (15987s/9022h FVGT) 11/03/06 -##counts FH_FROM_START_YOU 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HAS_UID exists:UID -#describe FH_HAS_UID Header UID found. -###score FH_HAS_UID 0.877 -##counts FH_HAS_UID 31s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FH_HAS_UID 129s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HELO_ALMOST_IP X-Spam-Relays-External =~ /^[^\]]+ helo=[^ ]+[a-z][-.]\d{1,3}[-.]\d{1,3}[-.]\d{1,3}[-.][a-z][^ ]+ /i -#describe FH_HELO_ALMOST_IP Helo is almost an IP addr. -###score FH_HELO_ALMOST_IP 5.417 -##counts FH_HELO_ALMOST_IP 82s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FH_HELO_ALMOST_IP 109s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HELO_GMAILSMTP Received =~ /HELO gmail-smtp-in/ -#describe FH_HELO_GMAILSMTP Faked helo of gmail-smtp-in -###score FH_HELO_GMAILSMTP 10.357 -##counts FH_HELO_GMAILSMTP 294s/0h of 34977 corpus (27086s/7891h FT) 03/01/06 -##counts FH_HELO_GMAILSMTP 159s/0h of 103116 corpus (63731s/39385h DOC) 03/01/06 -##counts FH_HELO_GMAILSMTP 1s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FH_HELO_GMAILSMTP 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HELO_ENDS_DOT X-Spam-Relays-External =~ /^[^\]]+ helo=[^ ]+\. by=/ -#describe FH_HELO_ENDS_DOT Helo ends with a dot. -###score FH_HELO_ENDS_DOT 10.993 -##counts FH_HELO_ENDS_DOT 211s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FH_HELO_ENDS_DOT 28s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FH_HELO_ENDS_DOT 34s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FH_HELO_ENDS_DOT 57s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HELO_EQ_610HEX X-Spam-Relays-External =~ /^[^\]]+ helo=-?[A-F0-9]{6,10} / -#describe FH_HELO_EQ_610HEX Helo is 6-10 hex chr's. -###score FH_HELO_EQ_610HEX 10.599 -##counts FH_HELO_EQ_610HEX 9235s/0h of 222450 corpus (214521s/7929h FVGT) 04/24/06 -##counts FH_HELO_EQ_610HEX 459s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FH_HELO_EQ_610HEX 473s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FH_HELO_EQ_610HEX 520s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HELO_EQ_CHARTER X-Spam-Relays-External =~ /^[^\]]+ helo=\d{2,3}-\d{1,3}-\d{1,3}-\d{1,3}.{5,20}\.charter\.com /i -#describe FH_HELO_EQ_CHARTER Helo is d-d-d-d charter.com -###score FH_HELO_EQ_CHARTER 2.175 -##counts FH_HELO_EQ_CHARTER 280s/0h of 41722 corpus (34113s/7609h FVGT) 03/27/06 -##counts FH_HELO_EQ_CHARTER 130s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_HELO_EQ_CHARTER 174s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## OBSOLETE / Misfires on too many ham cases -## https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6778 -## -## header FH_HELO_EQ_D_D_D_D X-Spam-Relays-External =~ /^[^\]]+ helo=[^ ]{0,15}\d{1,3}-\d{1,3}-\d{1,3}-\d{1,3}/ -## describe FH_HELO_EQ_D_D_D_D Helo is d-d-d-d -###score FH_HELO_EQ_D_D_D_D 1.397 -##counts FH_HELO_EQ_D_D_D_D 2911s/1h of 41684 corpus (34086s/7598h FVGT) 03/27/06 -##counts FH_HELO_EQ_D_D_D_D 1306s/1h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -##counts FH_HELO_EQ_D_D_D_D 1323s/1h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_HELO_EQ_D_D_D_D 1338s/1h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FH_HELO_EQ_D_D_D_D 1834s/1h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## redundant with RDNS_DYNAMIC, causing FPs: bug 5682 -# -### header FH_HOST_ALMOST_IP X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]+[a-z][-.]\d{1,3}[-.]\d{1,3}[-.]\d{1,3}[-.][a-z][^ ]+ /i -### describe FH_HOST_ALMOST_IP The host almost looks like an IP addr. -### ##score FH_HOST_ALMOST_IP 1.889 -### #counts HOST_ALMOST_IP 117s/2h of 15656 corpus (7711s/7945h FT) 04/20/06 -### #counts HOST_ALMOST_IP 501s/2h of 42071 corpus (34145s/7926h FVGT) 04/20/06 -### #counts FH_HOST_ALMOST_IP 917s/2h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -### #counts FH_HOST_ALMOST_IP 952s/2h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -### #counts FH_HOST_ALMOST_IP 1283s/4h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## redundant with RDNS_DYNAMIC, causing FPs: bug 5682 -## overlap spam: 90% of RDNS_DYNAMIC hits also hit FH_HOST_EQ_D_D_D_D; 84% of FH_HOST_EQ_D_D_D_D hits also hit RDNS_DYNAMIC -# -# -### header FH_HOST_EQ_D_D_D_D X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]+\d{1,3}[^0-9]\d{1,3}[^0-9]\d{1,3}[^0-9]\d{1,3}[^ ]+ / -### describe FH_HOST_EQ_D_D_D_D Host starts with d-d-d-d -### ##score FH_HOST_EQ_D_D_D_D 0.665 -### #counts HOST_EQ_D_D_D_D 10886s/231h of 41745 corpus (34134s/7611h FVGT) 03/29/06 -### #counts FH_HOST_EQ_D_D_D_D 8057s/308h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -### #counts FH_HOST_EQ_D_D_D_D 8340s/308h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -### #counts FH_HOST_EQ_D_D_D_D 11366s/308h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## now hits nothing in http://ruleqa.spamassassin.org/20071029-r589545-n -### header FH_HOST_EQ_D_D_D_DB X-Spam-Relays-External =~ /^[^\]]+ rdns=\d{1,3}[^0-9]\d{1,3}[^0-9]\d{1,3}[^0-9]\d{1,3}[^ ]+ / -### describe FH_HOST_EQ_D_D_D_DB Host is d-d-d-d -### ##score FH_HOST_EQ_D_D_D_DB 0.688 -### #counts HOST_EQ_D_D_D_DB 4324s/71h of 42070 corpus (34144s/7926h FVGT) 04/19/06 -### #counts FH_HOST_EQ_D_D_D_DB 2893s/107h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -### #counts FH_HOST_EQ_D_D_D_DB 2989s/107h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -### #counts FH_HOST_EQ_D_D_D_DB 3087s/107h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -### #counts FH_HOST_EQ_D_D_D_DB 4217s/107h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HOST_EQ_DYNAMICIP X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]{0,25}[dD][yY][nN][aA][mM][iI][cC][iI][pP][^ ]{5,25} helo=/ -#describe FH_HOST_EQ_DYNAMICIP Host is dynamicip -###score FH_HOST_EQ_DYNAMICIP 2.177 -##counts FH_HOST_EQ_DYNAMICIP 211s/0h of 41665 corpus (34068s/7597h FVGT) 03/25/06 -##counts FH_HOST_EQ_DYNAMICIP 613s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_HOST_EQ_DYNAMICIP 639s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FH_HOST_EQ_DYNAMICIP 832s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HOST_EQ_PACBELL_D X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]+\.dsl\.\w{2,10}\.pacbell\.net / -#describe FH_HOST_EQ_PACBELL_D Host is pacbell.net dsl -###score FH_HOST_EQ_PACBELL_D 3.944 -##counts FH_HOST_EQ_PACBELL_D 232s/0h of 41722 corpus (34113s/7609h FVGT) 03/27/06 -##counts FH_HOST_EQ_PACBELL_D 49s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_HOST_EQ_PACBELL_D 53s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HOST_EQ_SPRINT_H X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]+\.dhcp\.sprint-hsd\.net / -#describe FH_HOST_EQ_SPRINT_H Host is dhcp sprint-hsd.net -###score FH_HOST_EQ_SPRINT_H 2.293 -##counts FH_HOST_EQ_SPRINT_H 44s/0h of 41789 corpus (34114s/7675h FVGT) 04/06/06 -##counts FH_HOST_EQ_SPRINT_H 1s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_HOST_EQ_SPRINT_H 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_HOST_EQ_VERIZON_P X-Spam-Relays-External =~ /^[^\]]+ rdns=pool-\d.{5,30}\.verizon\.net/ -#describe FH_HOST_EQ_VERIZON_P Host is pool-.+verizon.net -###score FH_HOST_EQ_VERIZON_P 2.144 -##counts FH_HOST_EQ_VERIZON_P 1393s/0h of 41686 corpus (34078s/7608h FVGT) 03/27/06 -##counts FH_HOST_EQ_VERIZON_P 436s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FH_HOST_EQ_VERIZON_P 441s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_HOST_EQ_VERIZON_P 518s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_MSGID_XXX MESSAGEID =~ /\@xxx/i -#describe FH_MSGID_XXX Message-Id = @xxx -###score FH_MSGID_XXX 10.357 -##counts FH_MSGID_XXX 10s/0h of 50422 corpus (42421s/8001h FVGT) 03/07/06 -##counts FH_MSGID_XXX 6s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FH_MSGID_XXX 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##from barometer baptistery by -#header FH_RCVD_FROM_2_WDS Received =~ /from \w+ \w+ by/i -#describe FH_RCVD_FROM_2_WDS RCVD line has 2 words after from. -###score FH_RCVD_FROM_2_WDS 10.357 -##counts FH_RCVD_FROM_2_WDS 9s/0h of 24696 corpus (15673s/9023h FVGT) 11/01/06 -##counts FH_RCVD_FROM_2_WDS 141s/0h of 25311 corpus (18683s/6628h CT) 11/03/06 -##counts FH_RCVD_FROM_2_WDS 727s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FH_RCVD_FROM_2_WDS 94s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FH_RCVD_FROM_2_WDS 124s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_RCVD_FROM_2_WDS 256s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_RCVD_HELODATE Received =~ /from \[(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)/ -#describe FH_RCVD_HELODATE The HELO Looks like a date? -###score FH_RCVD_HELODATE 10.357 -##counts FH_RCVD_HELODATE 10s/0h of 42141 corpus (34216s/7925h FVGT) 04/25/06 -##counts FH_RCVD_HELODATE 1s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FH_RCVD_HELODATE 172s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FH_RCVD_HELODATE 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_RE_NEW_DDD Subject =~ /^Re: new\s?\d{0,3}$/i -#describe FH_RE_NEW_DDD Subject is Re: new \d\d\d -###score FH_RE_NEW_DDD 10.357 -##counts FH_RE_NEW_DDD 266s/0h of 26801 corpus (17723s/9078h FVGT) 11/09/06 -##counts FH_RE_NEW_DDD 792s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FH_RE_NEW_DDD 1317s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## Feb 7 2007 jm: replaced with RDNS_NONE! -## header FH_RELAY_NODNS X-Spam-Relays-External =~ /^[^\]]+rdns= helo=/ -## describe FH_RELAY_NODNS We could not determine your Reverse DNS -###score FH_RELAY_NODNS 1.451 #Prone to FPs. -##counts FH_RELAY_NODNS 12654s/99h of 41713 corpus (34082s/7631h FVGT) 04/03/06 -##counts FH_RELAY_NODNS 85775s/103h of 222960 corpus (215032s/7928h FVGT) 04/22/06 -##counts FH_RELAY_NODNS 6020s/115h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FH_RELAY_NODNS 6293s/116h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_RELAY_NODNS 6424s/116h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FH_RELAY_NODNS 8455s/120h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_SPOOF_NAMES ALL =~ /\$names\@/i -#describe FH_SPOOF_NAMES Pattern Replacement Failure -###score FH_SPOOF_NAMES 10.357 -##counts FH_SPOOF_NAMES 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FH_SPOOF_NAMES 0s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FH_SPOOF_NAMES 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_USER_MOZILLA_SMAL user-agent =~ /mozilla/ -#describe FH_USER_MOZILLA_SMAL Specific signs of ratware -###score FH_USER_MOZILLA_SMAL 10.357 -##counts FH_USER_MOZILLA_SMAL 11s/0h of 26801 corpus (17723s/9078h FVGT) 11/09/06 -##counts FH_USER_MOZILLA_SMAL 90s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_USER_MOZILLA_SMAL 221s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_VIRUS_NORTON X-Virus-Status =~ /Scanned by norton/ -#describe FH_VIRUS_NORTON Does Norton really not have caps? -###score FH_VIRUS_NORTON 10.357 -##counts FH_VIRUS_NORTON 10s/0h of 50422 corpus (42421s/8001h FVGT) 03/07/06 -##counts FH_VIRUS_NORTON 130s/0h of 89519 corpus (71646s/17873h ML) 03/07/06 -##counts FH_VIRUS_NORTON 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FH_VIRUS_NORTON 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FH_XCOMMENT_GIBBER X-Comment =~ /[a-z]{15}/i -#describe FH_XCOMMENT_GIBBER X-Comment is gibberish -###score FH_XCOMMENT_GIBBER 5.382 -##counts FH_XCOMMENT_GIBBER 6s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FH_XCOMMENT_GIBBER 8s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FH_XCOMMENT_GIBBER 10s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FH_XCOMMENT_GIBBER 17s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##========= Rawbody Rules ============== -# -# -#rawbody FR_3TAG_3TAG m'<[abcefghijklmnoqstuvwxz]{3}>'i -#describe FR_3TAG_3TAG Looks like 3 small tags. -###score FR_3TAG_3TAG 1.758 -##counts FR_3TAG_3TAG 927s/0h of 40929 corpus (31147s/9782h ML) 12/26/05 -##counts FR_3TAG_3TAG 333s/0h of 17415 corpus (9736s/7679h FT) 01/03/06 -##counts FR_3TAG_3TAG 808s/0h of 77837 corpus (38456s/39381h DOC) 01/03/06 -##counts FR_3TAG_3TAG 46s/0h of 25358 corpus (16335s/9023h FVGT) 11/04/06 -##counts FR_3TAG_3TAG 47s/1h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FR_3TAG_3TAG 48s/1h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_ALMOST_VIAG2 /[^a-z](?!viagra)v?ia.?g.?ra/i -#describe FR_ALMOST_VIAG2 Almost looks like viagra. -###score FR_ALMOST_VIAG2 10.357 -##counts FR_ALMOST_VIAG2 23s/0h of 17368 corpus (9729s/7639h FT) 01/02/06 -##counts FR_ALMOST_VIAG2 132s/0h of 77273 corpus (37963s/39310h DOC) 01/02/06 -##counts FR_ALMOST_VIAG2 65s/0h of 25358 corpus (16335s/9023h FVGT) 11/04/06 -##counts FR_ALMOST_VIAG2 96s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FR_ALMOST_VIAG2 151s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_CANTSEETEXT /class="?cantseetext/i -#describe FR_CANTSEETEXT Phrase class=cantseetext -###score FR_CANTSEETEXT 10.357 -##counts FR_CANTSEETEXT 29s/0h of 17368 corpus (9729s/7639h FT) 01/02/06 -##counts FR_CANTSEETEXT 289s/0h of 77837 corpus (38456s/39381h DOC) 01/03/06 -##counts FR_CANTSEETEXT 2s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FR_CANTSEETEXT 86s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FR_CANTSEETEXT 4s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FR_CANTSEETEXT 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_COMMENT_ODD /<-\*->/ -#describe FR_COMMENT_ODD Strange HTML comment. -###score FR_COMMENT_ODD 10.357 -##counts FR_COMMENT_ODD 130s/0h of 22940 corpus (17232s/5708h MY) 04/25/06 -##counts FR_COMMENT_ODD 397s/0h of 42141 corpus (34216s/7925h FVGT) 04/25/06 -##counts FR_COMMENT_ODD 468s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FR_COMMENT_ODD 511s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_DIV_DRUGS_3 m'(?:]{0,20}> (?: )?[a-z0-9$] (?: )? ){3}'i -#describe FR_DIV_DRUGS_3 Looks like many div's in drug spam. -###score FR_DIV_DRUGS_3 3.799 -##counts FR_DIV_DRUGS_3 15s/0h of 34977 corpus (27086s/7891h FT) 03/01/06 -##counts FR_DIV_DRUGS_3 366s/0h of 84470 corpus (67306s/17164h ML) 03/01/06 -##counts FR_DIV_DRUGS_3 5s/0h of 25358 corpus (16335s/9023h FVGT) 11/04/06 -##counts FR_DIV_DRUGS_3 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_DOT_FEVER_5 /(?:[a-z ']{2,35}\s[.,]\s){5}/ -#describe FR_DOT_FEVER_5 Lots of dots inbetween letters. -###score FR_DOT_FEVER_5 3.9 -##counts FR_DOT_FEVER_5 0s/0h of 17415 corpus (9736s/7679h FT) 01/03/06 -##counts FR_DOT_FEVER_5 1s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FR_DOT_FEVER_5 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_IMPORT_CSS /\@import url\(/i -#describe FR_IMPORT_CSS Special @import url css -###score FR_IMPORT_CSS 1.889 -##counts FR_IMPORT_CSS 1s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FR_IMPORT_CSS 9s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FR_IMPORT_CSS 25s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_M_E_D_S /M E D S/i -#describe FR_M_E_D_S Spaced out M E D S -###score FR_M_E_D_S 10.357 -##counts FR_M_E_D_S 182s/0h of 82118 corpus (57948s/24170h ML) 04/03/06 -##counts FR_M_E_D_S 24s/0h of 41810 corpus (34135s/7675h FVGT) 04/03/06 -##counts FR_M_E_D_S 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FR_M_E_D_S 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_MIDER m'http[^ ]{5,30}/gall?/' -#describe FR_MIDER Sign often seen in spams -###score FR_MIDER 10.357 -##counts FR_MIDER 3s/0h of 5479 corpus (1297s/4182h AxB) 09/25/06 -##counts FR_MIDER 366s/0h of 21635 corpus (15142s/6493h CT) 09/25/06 -##counts FR_MIDER 730s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FR_MIDER 761s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FR_MIDER 788s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_P_END_P_MANY10 m'(?:

    ){10}'i -#describe FR_P_END_P_MANY10 Many

    (10) -###score FR_P_END_P_MANY10 10.539 -##counts FR_P_END_P_MANY10 3s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FR_P_END_P_MANY10 10s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FR_P_END_P_MANY10 66s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FR_P_END_P_MANY10 21s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_PORN_NOT_URL /\b,(?:hVX|WeQ|VSd|WeQ)\b/ -#describe FR_PORN_NOT_URL Looks like a porn url seen before. -###score FR_PORN_NOT_URL 10.357 -##counts FR_PORN_NOT_URL 155s/0h of 34977 corpus (27086s/7891h FT) 03/01/06 -##counts FR_PORN_NOT_URL 174s/0h of 84470 corpus (67306s/17164h ML) 03/01/06 -##counts FR_PORN_NOT_URL 9s/0h of 25358 corpus (16335s/9023h FVGT) 11/04/06 -##counts FR_PORN_NOT_URL 15s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_TEST_BASE64_BAD /[a-z0-9]{70}
    /i -#describe FR_TEST_BASE64_BAD Looks like bad BASE64 with
    at end. -###score FR_TEST_BASE64_BAD 3.189 -##counts FR_TEST_BASE64_BAD 150s/0h of 27452 corpus (21819s/5633h MY) 03/03/06 -##counts FR_TEST_BASE64_BAD 6s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FR_TEST_BASE64_BAD 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_TITLE_CONS_6 m'.{0,4}[bcdfgjklmnpqrstvwxyz]{6}.{0,25}'i -#describe FR_TITLE_CONS_6 Title Attribute has 6 non-vowels. -###score FR_TITLE_CONS_6 0.865 -##counts FR_TITLE_CONS_6 3s/0h of 103688 corpus (96287s/7401h FVGT) 03/17/06 -##counts FR_TITLE_CONS_6 33s/0h of 108996 corpus (71372s/37624h DOC) 03/17/06 -##counts FR_TITLE_CONS_6 1s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FR_TITLE_CONS_6 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#rawbody FR_TITLE_NUMS m'\d+'i -#describe FR_TITLE_NUMS HTML Title is only numbers -###score FR_TITLE_NUMS 10.357 -##counts FR_TITLE_NUMS 23s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FR_TITLE_NUMS 19s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FR_TITLE_NUMS 228s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FR_TITLE_NUMS 200s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FR_TITLE_NUMS 263s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##========== Subject Rules ================= -# -# -#header FS_ABIGGER Subject =~ /a bigger/i -#describe FS_ABIGGER Subject has "a bigger" -###score FS_ABIGGER 2.399 -##counts FS_ABIGGER 8s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FS_ABIGGER 10s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FS_ABIGGER 12s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_APPROVE_YOU Subject =~ /approve you/i -#describe FS_APPROVE_YOU Subject says approve you -###score FS_APPROVE_YOU 2.973 -##counts FS_APPROVE_YOU 7s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FS_APPROVE_YOU 1s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_APPROVE_YOU 66s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_APPROVE_YOU 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_AT_NO_COST Subject =~ /\bat no cost/i -#describe FS_AT_NO_COST Subject says "At No Cost" -###score FS_AT_NO_COST 2.489 -##counts FS_AT_NO_COST 47s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FS_AT_NO_COST 60s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_AT_NO_COST 24s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_AT_NO_COST 57s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##attract more customers -#header FS_ATTRACT_CUST Subject =~ /Attract (?:\w{2,8}\s)?customer/i -#describe FS_ATTRACT_CUST Subject says Attract something customer -###score FS_ATTRACT_CUST 0.889 -##counts FS_ATTRACT_CUST 1s/0h of 50733 corpus (42740s/7993h FVGT) 03/06/06 -##counts FS_ATTRACT_CUST 3s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_ATTRACT_CUST 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_BROKEN_MEETING Subject =~ /(?!meeting)m.{0,1}e.{0,1}e.{0,1}t.{0,1}i.{0,1}n.{0,1}g/i -#describe FS_BROKEN_MEETING Subject looks like meeting but broken. -###score FS_BROKEN_MEETING 10.357 -##counts FS_BROKEN_MEETING 3s/0h of 24999 corpus (15974s/9025h FVGT) 11/02/06 -##counts FS_BROKEN_MEETING 31s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_BROKEN_MEETING 6s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_BROKEN_MEETING 8s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_CHEAP_CAP Subject =~ /CHEAP/ -#describe FS_CHEAP_CAP Phrase: Cheap in Caps in Subject. -###score FS_CHEAP_CAP 2.522 -##counts FS_CHEAP_CAP 6s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FS_CHEAP_CAP 7s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_CHEAP_CAP 8s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_CAILIS Subject =~ /\bcailis\b/i -#describe FS_CAILIS Subject says cailis -###score FS_CAILIS 10.357 -##counts FS_CAILIS 13s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_CAILIS 0s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_CAILIS 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_CLAIM_NOW Subject =~ /Claim Now/i -#describe FS_CLAIM_NOW Subject says "Claim now" -###score FS_CLAIM_NOW 1.975 -##counts FS_CLAIM_NOW 11s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FS_CLAIM_NOW 1s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_CLAIM_NOW 12s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FS_CLAIM_NOW 21s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_COSTARICA Subject =~ /costa rica/i -#describe FS_COSTARICA Subject says Costa Rica -###score FS_COSTARICA 2.899 -##counts FS_COSTARICA 11s/0h of 27348 corpus (19456s/7892h FT) 02/27/06 -##counts FS_COSTARICA 64s/0h of 101278 corpus (61900s/39378h DOC) 02/27/06 -##counts FS_COSTARICA 1s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_COSTARICA 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_CUTE_TEEN Subject =~ /cute teen/i -#describe FS_CUTE_TEEN Subject says cute teen -###score FS_CUTE_TEEN 2.964 -##counts FS_CUTE_TEEN 211s/0h of 103219 corpus (95719s/7500h FVGT) 03/21/06 -##counts FS_CUTE_TEEN 1s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_CUTE_TEEN 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_DOLLAR_BONUS Subject =~ /\$\d\d\d?\.?\d?\d? bonus/i -#describe FS_DOLLAR_BONUS Subject talks about money bonus! -###score FS_DOLLAR_BONUS 10.357 -##counts FS_DOLLAR_BONUS 27s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_DOLLAR_BONUS 1s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_DOLLAR_BONUS 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_EJACULA Subject =~ /ejaculat(?:[io01][o0i1]n|e)/i -#describe FS_EJACULA Phrase: ejaculation in subject. -###score FS_EJACULA 10.357 -##counts FS_EJACULA 328s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_EJACULA 166s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_EJACULA 168s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FS_EJACULA 190s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_END_BILLS Subject =~ /bills\s?$/i -#describe FS_END_BILLS Subject ends with bills. -###score FS_END_BILLS 1.555 -##counts FS_END_BILLS 1s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FS_END_BILLS 16s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_END_BILLS 2s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_END_BILLS 4s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_ERECTION Subject =~ / erection /i -#describe FS_ERECTION Phrase: erection in subject. -###score FS_ERECTION 10.579 -##counts FS_ERECTION 90s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_ERECTION 3s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_ERECTION 81s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_ERECTION 4s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_GANGBANG Subject =~ /gangbang/i -#describe FS_GANGBANG Phrase: subject says gangbang -###score FS_GANGBANG 10.357 -##counts FS_GANGBANG 15s/0h of 17373 corpus (9742s/7631h FT) 12/28/05 -##counts FS_GANGBANG 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_GANGBANG 25s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_GANGBANG 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_GET_LAID Subject =~ /get la[i1]d/i -#describe FS_GET_LAID Phrase: get laid in subj. -###score FS_GET_LAID 10.357 -##counts FS_GET_LAID 5s/0h of 9789 corpus (4888s/4901h FT) 12/26/05 -##counts FS_GET_LAID 3s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FS_GET_LAID 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_GIFT_CARD_OFF Subject =~ /Gift\s?Card\s?Offer/i -#describe FS_GIFT_CARD_OFF Subject says Gift card offer -###score FS_GIFT_CARD_OFF 3.374 -##counts FS_GIFT_CARD_OFF 5s/0h of 15656 corpus (7711s/7945h FT) 04/20/06 -##counts FS_GIFT_CARD_OFF 43s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_GIFT_CARD_OFF 102s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_HOT_TEEN Subject =~ /hot teen/i -#describe FS_HOT_TEEN Phrase: subject says "hot teen" -###score FS_HOT_TEEN 10.357 -##counts FS_HOT_TEEN 138s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_HOT_TEEN 2s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_HOT_TEEN 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_HUGECOCK Subject =~ /(?:huge|tiny|small) (?:c[o0]ck|d[i1]ck|p[e3]n[1i]s)/i -#describe FS_HUGECOCK Phrase: Huge Cock -###score FS_HUGECOCK 10.357 -##counts FS_HUGECOCK 36s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_HUGECOCK 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_HUGECOCK 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_LARGE_PERCENT2 Subject =~ /(?!100%)\d[0-9oi][0-9oi]%/i -#describe FS_LARGE_PERCENT2 Larger than 100% in subj. -###score FS_LARGE_PERCENT2 3.357 -##counts FS_LARGE_PERCENT2 52s/0h of 33776 corpus (24217s/9559h FVGT) 11/15/06 -##counts FS_LARGE_PERCENT2 52s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_LARGE_PERCENT2 64s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_LITTLE_PILL Subject =~ /little \w+ pill/i -#describe FS_LITTLE_PILL Phrase: little somthing pill. -###score FS_LITTLE_PILL 10.357 -##counts FS_LITTLE_PILL 21s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_LITTLE_PILL 0s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FS_LITTLE_PILL 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_LOW_INTMOR Subject =~ /low.{1,6}(?:interest|mortgage)/i -#describe FS_LOW_INTMOR Subject says low interest or mortgage -###score FS_LOW_INTMOR 10.357 -##counts FS_LOW_INTMOR 43s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_LOW_INTMOR 2s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_LOW_INTMOR 17s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_LOW_INTMOR 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_LOW_RATES Subject =~ / low rates/i -#describe FS_LOW_RATES Subject says low rates -###score FS_LOW_RATES 1.556 -##counts FS_LOW_RATES 42s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_LOW_RATES 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_LOW_RATES 39s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_LOW_RATES 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_LOWER_YOUR Subject =~ /lower your/i -#describe FS_LOWER_YOUR Phrase: lower your -###score FS_LOWER_YOUR 1.366 -##counts FS_LOWER_YOUR 74s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_LOWER_YOUR 1s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FS_LOWER_YOUR 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_MAKE_MONEY Subject =~ /make money/i -#describe FS_MAKE_MONEY Subject says "make money" -###score FS_MAKE_MONEY 1.771 -##counts FS_MAKE_MONEY 178s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_MAKE_MONEY 35s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_MAKE_MONEY 38s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FS_MAKE_MONEY 57s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_MORE_CONFIDENT Subject =~ /more confident/i -#describe FS_MORE_CONFIDENT Subject says More Confident -###score FS_MORE_CONFIDENT 2.594 -##counts FS_MORE_CONFIDENT 9s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FS_MORE_CONFIDENT 160s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_MORE_CONFIDENT 569s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FS_MORE_CONFIDENT 25s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_NEED_MONEY Subject =~ /Need (?:\$|Cash)/i -#describe FS_NEED_MONEY Subject talks about needing cash. -###score FS_NEED_MONEY 3.887 -##counts FS_NEED_MONEY 138s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_NEED_MONEY 1s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_NEED_MONEY 3s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FS_NEED_MONEY 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_NEW_SOFT_UPLOAD Subject =~ /^New software uploaded by/ -#describe FS_NEW_SOFT_UPLOAD Subj starts with New software uploaded -###score FS_NEW_SOFT_UPLOAD 10.357 -##counts FS_NEW_SOFT_UPLOAD 14s/0h of 33043 corpus (23599s/9444h FVGT) 11/15/06 -##counts FS_NEW_SOFT_UPLOAD 19s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_NEW_SOFT_UPLOAD 22s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FS_NEW_SOFT_UPLOAD 26s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_NEW_XXX Subject =~ /^Re: news? [a-z]{1,5}$/ -#describe FS_NEW_XXX Subject looks like Fharmacy spams. -###score FS_NEW_XXX 10.357 -##counts FS_NEW_XXX 16s/0h of 33043 corpus (23599s/9444h FVGT) 11/15/06 -##counts FS_NEW_XXX 69s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_NEW_XXX 208s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_NO_SCRIP Subject =~ /n[o0O] p[reRE][erER]scr[i1I]pt[i1I][o0O]n/i -#describe FS_NO_SCRIP Subject almost says No prescription -###score FS_NO_SCRIP 10.357 -##counts FS_NO_SCRIP 107s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_NO_SCRIP 19s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_NO_SCRIP 19s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_NUDE Subject =~ /\bnude\b/i -#describe FS_NUDE Subject says Nude -###score FS_NUDE 1.869 -##counts FS_NUDE 296s/0h of 345244 corpus (337372s/7872h FT) 02/07/06 -##counts FS_NUDE 1s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_NUDE 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_NUMYO Subject =~ /1[0-9][\s\.]?y[\s\.]?o[\s\.]?\b/i -#describe FS_NUMYO Speaks of teenager in subject. -###score FS_NUMYO 3.999 -##counts FS_NUMYO 1s/0h of 24567 corpus (15543s/9024h FVGT) 10/31/06 -##counts FS_NUMYO 44s/0h of 9077 corpus (4464s/4613h AxB) 11/03/06 -##counts FS_NUMYO 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_OBFU_PRMCY Subject =~ /\b(?!(?:pharmacy|primacy))p[ph]{0,4}\S{1,3}r\S{0,2}m\S{0,3}c\S{0,2}y\b/i -#describe FS_OBFU_PRMCY what could this word be? -###score FS_OBFU_PRMCY 10.357 -##counts FS_OBFU_PRMCY 1057s/0h of 35267 corpus (25646s/9621h FVGT) 11/17/06 -##counts FS_OBFU_PRMCY 1101s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_PAYINGTOOM Subject =~ /paying too much for/i -#describe FS_PAYINGTOOM Subject says Paying too much for -###score FS_PAYINGTOOM 3.993 -##counts FS_PAYINGTOOM 87s/0h of 115331 corpus (75904s/39427h DOC) 03/24/06 -##counts FS_PAYINGTOOM 84s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_PAYINGTOOM 1s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_PAYINGTOOM 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_PERSCRIPTION Subject =~ /perscr[i1]pt[i1][o0]n/i -#describe FS_PERSCRIPTION Subject mis-spelled prescription -###score FS_PERSCRIPTION 10.357 -##counts FS_PERSCRIPTION 26s/0h of 32949 corpus (24998s/7951h ML) 12/13/05 -##counts FS_PERSCRIPTION 22s/0h of 70341 corpus (31030s/39311h DOC) 12/13/05 -##counts FS_PERSCRIPTION 4s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_PERSCRIPTION 0s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FS_PERSCRIPTION 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_PHARMASUB2 Subject =~ /PH[A-Za-z]{2,7}MA/ -#describe FS_PHARMASUB2 Looks like Phramacy subject. -###score FS_PHARMASUB2 10.357 -##counts FS_PHARMASUB2 2771s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FS_PHARMASUB2 585s/0h of 25311 corpus (18683s/6628h CT) 11/03/06 -##counts FS_PHARMASUB2 8163s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_PHARMASUB2 2823s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_PHARMASUB2 2819s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_PORN_STAR Subject =~ /Porn Star/i -#describe FS_PORN_STAR Subject says Porn Star -###score FS_PORN_STAR 10.357 -##counts FS_PORN_STAR 1s/0h of 70341 corpus (31030s/39311h DOC) 12/13/05 -##counts FS_PORN_STAR 2s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_PORN_STAR 13s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_PORN_STAR 16s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_PRE_SUBJ Subject =~ /\{PRE_SUBJ\}/ -#describe FS_PRE_SUBJ Subject says PRE_SUBJ -###score FS_PRE_SUBJ 10.357 -##counts FS_PRE_SUBJ 1s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FS_PRE_SUBJ 276s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_PRE_SUBJ 169s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FS_PRE_SUBJ 276s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_PRE_SUBJ 276s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_RE_APPROV Subject =~ /re approved/i -#describe FS_RE_APPROV Phrase: re approved -###score FS_RE_APPROV 10.357 -##counts FS_RE_APPROV 51s/0h of 115331 corpus (75904s/39427h DOC) 03/24/06 -##counts FS_RE_APPROV 45s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_RE_APPROV 1s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_RE_APPROV 37s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_RE_APPROV 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_REFI Subject =~ /\brefi\b/i -#describe FS_REFI Subject says "refi" -###score FS_REFI 7.388 -##counts FS_REFI 21s/0h of 9808 corpus (4903s/4905h FT) 12/14/05 -##counts FS_REFI 53s/0h of 40636 corpus (35345s/5291h MY) 12/14/05 -##counts FS_REFI 8s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_REFI 8s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##header __FS_REPLICA Subject =~ /\breplica\b/i -##meta FS_REPLICA __FS_REPLICA && !FS_REPLICAWATCH -##describe FS_REPLICA Subject says "replica" -###score FS_REPLICA 0.994 -##counts FS_REPLICA 335s/0h of 70341 corpus (31030s/39311h DOC) 12/13/05 -##counts FS_REPLICA 716s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_REPLICA 34s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_REPLICA 39s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_REPLICA 92s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## header FS_REPLICAWATCH Subject =~ /replica watch\b/i -## describe FS_REPLICAWATCH Subject says Replica watch -###score FS_REPLICAWATCH 10.357 -##counts FS_REPLICAWATCH 110s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_REPLICAWATCH 19s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_REPLICAWATCH 1429s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_REPLICAWATCH 54s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_RESULTS_BED Subject =~ /results in bed/i -#describe FS_RESULTS_BED Subject says results in bed -###score FS_RESULTS_BED 10.357 -##counts FS_RESULTS_BED 3s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FS_RESULTS_BED 6s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FS_RESULTS_BED 33s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_RESULTS_BED 7s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_SILDENAFIL Subject =~ /Sildenafil Citrate/i -#describe FS_SILDENAFIL Subject says "Sildenafil Citrate" -###score FS_SILDENAFIL 10.357 -##counts FS_SILDENAFIL 11s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_SILDENAFIL 1s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_SILDENAFIL 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_SINGLE_LETTER_H Subject =~ /\sh\s/i -#describe FS_SINGLE_LETTER_H Subject has a bare H -###score FS_SINGLE_LETTER_H 0.672 -##counts FS_SINGLE_LETTER_H 8s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FS_SINGLE_LETTER_H 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_SINGLE_LETTER_J Subject =~ /\sj\s/i -#describe FS_SINGLE_LETTER_J Subject has a bare J -###score FS_SINGLE_LETTER_J 0.672 -##counts FS_SINGLE_LETTER_J 10s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FS_SINGLE_LETTER_J 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_SPERMAX Subject =~ /Spermamax/i -#describe FS_SPERMAX Subject contains Spermamax -###score FS_SPERMAX 10.357 -##counts FS_SPERMAX 30s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FS_SPERMAX 13s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FS_SPERMAX 20s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_SPLASH Subject =~ / splash(?:ed|ing)? /i -#describe FS_SPLASH Subject says splash or splashed -###score FS_SPLASH 0.868 -##counts FS_SPLASH 1s/0h of 6866 corpus (4638s/2228h AxB) 02/07/06 -##counts FS_SPLASH 10s/0h of 345244 corpus (337372s/7872h FT) 02/07/06 -##counts FS_SPLASH 0s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FS_SPLASH 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_START_DOYOU2 Subject =~ /^Do you (?:dream|have|want|love|like|wanna)/i -#describe FS_START_DOYOU2 Subject starts with Do you dream,have,want,love, etc. -###score FS_START_DOYOU2 1.633 -##counts FS_START_DOYOU2 957s/0h of 103219 corpus (95719s/7500h FVGT) 03/21/06 -##counts FS_START_DOYOU2 124s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FS_START_DOYOU2 10s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_START_DOYOU2 22s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_START_LOSE Subject =~ /^Lose /i -#describe FS_START_LOSE Subject starts with Lose -###score FS_START_LOSE 1.493 -##counts FS_START_LOSE 466s/0h of 103219 corpus (95719s/7500h FVGT) 03/21/06 -##counts FS_START_LOSE 4s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_START_LOSE 10s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_START_LOSE 13s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_START_TEEN Subject =~ /^Teen /i -#describe FS_START_TEEN Subject starts with Teen -###score FS_START_TEEN 1.399 -##counts FS_START_TEEN 816s/0h of 103219 corpus (95719s/7500h FVGT) 03/21/06 -##counts FS_START_TEEN 5s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FS_START_TEEN 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_TEEN_BAD Subject =~ /teen.{1,15}(?:pussy|sex|slut|ass|fuck|rape)/i -#describe FS_TEEN_BAD Subject says something bad about teens -###score FS_TEEN_BAD 10.357 -##counts FS_TEEN_BAD 675s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_TEEN_BAD 15s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_TEEN_BAD 15s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_TIGHT_TEEN Subject =~ /tight (?:teen|pussy|ass)/i -#describe FS_TIGHT_TEEN Phrase: tight teen, etc. -###score FS_TIGHT_TEEN 10.357 -##counts FS_TIGHT_TEEN 80s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_TIGHT_TEEN 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_TIP_DDD Subject =~ /(?:tip|good) \d\d\d?\d?/i -#describe FS_TIP_DDD Phrase: subject = tip ddd -###score FS_TIP_DDD 10.357 -##counts FS_TIP_DDD 53s/0h of 25733 corpus (16658s/9075h FVGT) 11/08/06 -##counts FS_TIP_DDD 741s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_TIP_DDD 854s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FS_TIP_DDD 1664s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_VIEWPHOTOS Subject =~ /view photos of singles in your area/i -#describe FS_VIEWPHOTOS Phrase: View photos of singles... -###score FS_VIEWPHOTOS 10.357 -##counts FS_VIEWPHOTOS 115s/0h of 55252 corpus (47682s/7570h FVGT) 03/24/06 -##counts FS_VIEWPHOTOS 5s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_VIEWPHOTOS 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_WE_WANT Subject =~ /^We want/i -#describe FS_WE_WANT Subject starts with We Want. -###score FS_WE_WANT 1.629 -##counts FS_WE_WANT 20s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FS_WE_WANT 51s/0h of 257465 corpus (187155s/70310h DOC) 10/26/06 -##counts FS_WE_WANT 1s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_WE_WANT 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_WEIGHT_LOSS Subject =~ /weight loss/i -#describe FS_WEIGHT_LOSS Subject says Weight Loss -###score FS_WEIGHT_LOSS 2.134 -##counts FS_WEIGHT_LOSS 149s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_WEIGHT_LOSS 42s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FS_WEIGHT_LOSS 44s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_WEIGHT_LOSS 44s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_WILL_HELP Subject =~ /will help/ -#describe FS_WILL_HELP Subject says will help -###score FS_WILL_HELP 2.749 -##counts FS_WILL_HELP 35s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FS_WILL_HELP 19s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FS_WILL_HELP 692s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_WILL_HELP 357s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FS_WILL_HELP 29s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_YOUR_COMPUTER Subject =~ /^Your computer/i -#describe FS_YOUR_COMPUTER Phrase: Your Computer in Subject. -###score FS_YOUR_COMPUTER 3.645 -##counts FS_YOUR_COMPUTER 2s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FS_YOUR_COMPUTER 34s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_YOUR_COMPUTER 90s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_YOUR_PRESCRIP Subject =~ /Your(?: rx)? Prescription/i -#describe FS_YOUR_PRESCRIP Subject talks about your prescription -###score FS_YOUR_PRESCRIP 2.575 -##counts FS_YOUR_PRESCRIP 27s/0h of 206859 corpus (199363s/7496h FT) 12/13/05 -##counts FS_YOUR_PRESCRIP 0s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FS_YOUR_PRESCRIP 11s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FS_YOUR_PRESCRIP 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header FS_YOUR_REFILL Subject =~ /your refill/i -#describe FS_YOUR_REFILL Subject Phrase: your refill -###score FS_YOUR_REFILL 1.952 -##counts FS_YOUR_REFILL 2s/0h of 9808 corpus (4903s/4905h FT) 12/14/05 -##counts FS_YOUR_REFILL 40s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FS_YOUR_REFILL 40s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##====== URI RULES BELOW ============= -# -# -#uri FU_16R m'/16r'i -#describe FU_16R Often seen in spam /16r -###score FU_16R 10.357 -##counts FU_16R 68s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FU_16R 74s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FU_16R 166s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_16R 490s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_COMMON_SUBS2 m'/(?:[2w]m|7d|b|ee|lj|j|o|u)/[,.]?$' -#describe FU_COMMON_SUBS2 Sub-dir seen often in spam (2). -###score FU_COMMON_SUBS2 4.999 -##counts FU_COMMON_SUBS2 26s/0h of 42141 corpus (34216s/7925h FVGT) 04/25/06 -##counts FU_COMMON_SUBS2 137s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FU_COMMON_SUBS2 24s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_COMMON_SUBS2 22s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_ENDS_NUMS_DOTS_CLK m'(?:clk|uns)/\d+\.\d+\.\d+'i -#describe FU_ENDS_NUMS_DOTS_CLK Ends with clk/d+.d+.d+ -###score FU_ENDS_NUMS_DOTS_CLK 10.357 -##counts FU_ENDS_NUMS_DOTS_CLK 15s/0h of 15656 corpus (7711s/7945h FT) 04/20/06 -##counts FU_ENDS_NUMS_DOTS_CLK 19s/0h of 42071 corpus (34145s/7926h FVGT) 04/20/06 -##counts FU_ENDS_NUMS_DOTS_CLK 455s/0h of 93047 corpus (65257s/27790h ML) 04/20/06 -##counts FU_ENDS_NUMS_DOTS_CLK 8s/0h of 21937 corpus (16638s/5299h FVGT) 11/08/06 -##counts FU_ENDS_NUMS_DOTS_CLK 13s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_ENDS_NUMS_DOTS_CLK 19s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_HG_PATH m'/hgh/'i -#describe FU_HG_PATH URL has /hgh/ in path. -###score FU_HG_PATH 10.357 -##counts FU_HG_PATH 13s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FU_HG_PATH 391s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FU_HG_PATH 14s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_HOODIA /hoodia/i -#describe FU_HOODIA URL has hoodia in it. -###score FU_HOODIA 10.357 -##counts FU_HOODIA 601s/0h of 103688 corpus (96287s/7401h FVGT) 03/17/06 -##counts FU_HOODIA 10s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FU_HOODIA 17s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_LONG_HTML /[a-z]{50}\.html/i -#describe FU_LONG_HTML URL has long file name with .html extension. -###score FU_LONG_HTML 10.357 -##counts FU_LONG_HTML 27s/0h of 42564 corpus (34322s/8242h FVGT) 05/26/06 -##counts FU_LONG_HTML 28s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_LONG_HTML 28s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_LOTSOFCOLONS m'/\w{5,25}:\w{5,25}:\w{5,25}\b'i -#describe FU_LOTSOFCOLONS word:word:word in URL. -###score FU_LOTSOFCOLONS 4.999 -##counts FU_LOTSOFCOLONS 1s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FU_LOTSOFCOLONS 95s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FU_LOTSOFCOLONS 123s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FU_LOTSOFCOLONS 175s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_LONG_QUERY3 m'[A-F0-9]{30}\.aspx' -#describe FU_LONG_QUERY3 URL has a long file name with .aspx extension. -###score FU_LONG_QUERY3 4.799 -##counts FU_LONG_QUERY3 274s/0h of 82118 corpus (57948s/24170h ML) 04/03/06 -##counts FU_LONG_QUERY3 36s/0h of 41810 corpus (34135s/7675h FVGT) 04/03/06 -##counts FU_LONG_QUERY3 21s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_LONG_QUERY3 27s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_MIDER m'/gall?/' -#describe FU_MIDER URL has /gal/ -###score FU_MIDER 10.357 -##counts FU_MIDER 730s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FU_MIDER 5954s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FU_MIDER 759s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_MIDER 760s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FU_MIDER 787s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_RX_DIR m'/rx/'i -#describe FU_RX_DIR /rx/ -###score FU_RX_DIR 1.999 -##counts FU_RX_DIR 1s/0h of 41941 corpus (34079s/7862h FVGT) 04/14/06 -##counts FU_RX_DIR 1s/0h of 21937 corpus (16638s/5299h FVGT) 11/08/06 -##counts FU_RX_DIR 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_SUB_D_WEIRD /3a2kf\./ -#describe FU_SUB_D_WEIRD Sub-domain seen often in spam. -###score FU_SUB_D_WEIRD 10.357 -##counts FU_SUB_D_WEIRD 31s/0h of 24480 corpus (15455s/9025h FVGT) 10/30/06 -##counts FU_SUB_D_WEIRD 45s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FU_SUB_D_WEIRD 45s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_SUB_D_WEIRD 45s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -# -#uri FU_UKGEOCITIES /\b[a-z]{2}\.geocities\.com/i -#describe FU_UKGEOCITIES URL with [a-z]{2}.geocities.com -###score FU_UKGEOCITIES 5.697 -##counts FU_UKGEOCITIES 121s/0h of 21937 corpus (16638s/5299h FVGT) 11/08/06 -##counts FU_UKGEOCITIES 121s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_UKGEOCITIES 124s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#uri FU_URI_TRACKER_T m'/[yi]/(?:sp|et|vm|xl2)/'i -#describe FU_URI_TRACKER_T URI style tracker (T) -###score FU_URI_TRACKER_T 10.357 -##counts FU_URI_TRACKER_T 9s/0h of 25009 corpus (15987s/9022h FVGT) 11/03/06 -##counts FU_URI_TRACKER_T 203s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FU_URI_TRACKER_T 221s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FU_URI_TRACKER_T 487s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##====== META RULES BELOW ============= -# -# -##msg A -#body __BEEN_APPROVED /been approved/ -##body __CAN_HELP /can help/ -#body __COMPLETE_REVIEW /complete review/ -#meta FM_APPROVE_COMPLETE (__BEEN_APPROVED && __CAN_HELP && __COMPLETE_REVIEW) -#describe FM_APPROVE_COMPLETE Meta approved complete review -###score FM_APPROVE_COMPLETE 4.885 -##counts FM_APPROVE_COMPLETE 1s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FM_APPROVE_COMPLETE 1s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FM_APPROVE_COMPLETE 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_BIG /BIG/ -#body __FB_REASON /REASON/ -#body __FB_BEST /BEST/ -#meta FM_BIG_REASON ((__FB_BIG + __FB_REASON + __FB_BEST) > 1) -#describe FM_BIG_REASON Lot's of CAP words, BIG, REASON, BEST -###score FM_BIG_REASON 10.357 -##counts FM_BIG_REASON 20s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FM_BIG_REASON 22s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FM_BIG_REASON 203s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FM_BIG_REASON 29s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_BIG_REASON 56s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FS_CLAIM_YOUR Subject =~ /claim your/i -#header __FS_FREE Subject =~ /\bfree\b/i -#header __FS_IPODXBOX Subject =~ /(?:ipod|xbox)/i -#header __FS_MP3PLAY Subject =~ /mp3 player/i -#meta FM_CLAIM_IPOD ((__FS_CLAIM_YOUR || __FS_FREE) && (__FS_IPODXBOX || __FS_MP3PLAY)) -#describe FM_CLAIM_IPOD Looks like u should claim your ipod. -###score FM_CLAIM_IPOD 1.771 -##counts FM_CLAIM_IPOD 18s/0h of 27495 corpus (21848s/5647h MY) 03/01/06 -##counts FM_CLAIM_IPOD 2s/0h of 34977 corpus (27086s/7891h FT) 03/01/06 -##counts FM_CLAIM_IPOD 8s/0h of 84470 corpus (67306s/17164h ML) 03/01/06 -##counts FM_CLAIM_IPOD 75s/0h of 103116 corpus (63731s/39385h DOC) 03/01/06 -##counts FM_CLAIM_IPOD 7s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FM_CLAIM_IPOD 8s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FS_COKE Subject =~ /\bcoke\b/i -#header __FS_PEPSI Subject =~ /\bpepsi\b/i -#meta FM_COKE_PEPSI (__FS_COKE && __FS_PEPSI) -#describe FM_COKE_PEPSI Subject has both Coke and Pepsi -###score FM_COKE_PEPSI 10.357 -##counts FM_COKE_PEPSI 94s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FM_COKE_PEPSI 110s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FM_COKE_PEPSI 134s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __GETYOUR subject =~ /get your/i -#header __CONGRADULAT Subject =~ /congra[dt]ulation/i -#header __GIFTCERT Subject =~ /(?:gift|gas) (?:cert|card)/i -#meta FM_CONG_GIFTCARD ((__CONGRADULAT || __GETYOUR) && __GIFTCERT) -#describe FM_CONG_GIFTCARD Talks about gift cards and congrads. -###score FM_CONG_GIFTCARD 3.321 -##counts FM_CONG_GIFTCARD 19s/0h of 34977 corpus (27086s/7891h FT) 03/01/06 -##counts FM_CONG_GIFTCARD 22s/0h of 103116 corpus (63731s/39385h DOC) 03/01/06 -##counts FM_CONG_GIFTCARD 4s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FM_CONG_GIFTCARD 27s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __OWN_LAND /\bland\b/i -#body __OWN_PROP /propert/i -#body __COSTA_RI /Costa Rica/i -##body __FB_TOUR /\btour/i -#meta FM_COSTA_RICA ((__OWN_LAND || __OWN_PROP) && __COSTA_RI && __FB_TOUR) -#describe FM_COSTA_RICA Looks like Costa Rica spams. -###score FM_COSTA_RICA 10.357 -##counts FM_COSTA_RICA 96s/0h of 40658 corpus (35364s/5294h MY) 12/12/05 -##counts FM_COSTA_RICA 9s/0h of 9809 corpus (4905s/4904h FT) 12/12/05 -##counts FM_COSTA_RICA 27s/0h of 207630 corpus (200121s/7509h FT) 12/13/05 -##counts FM_COSTA_RICA 0s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FM_COSTA_RICA 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_CUSTOM_LOGO /(?:custom|unique) logo/i -#body __FB_LOGO_DESIGN /Logo Design/i -#body __FB_CUSTOM_RECOG /customer recognition/i -#body __FB_TARGET_AUDIEN /target audience/i -#meta FM_CUSTOMLOGODSGNc (__FB_CUSTOM_LOGO && (__FB_LOGO_DESIGN || __FB_CUSTOM_RECOG || __FB_TARGET_AUDIEN)) -#describe FM_CUSTOMLOGODSGNc Custom Designed Logos -###score FM_CUSTOMLOGODSGNc 10.357 -##counts FM_CUSTOMLOGODSGNc 22s/0h of 104500 corpus (96503s/7997h FVGT) 03/09/06 -##counts FM_CUSTOMLOGODSGNc 195s/0h of 90227 corpus (72176s/18051h ML) 03/08/06 -##counts FM_CUSTOMLOGODSGNc 18s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FM_CUSTOMLOGODSGNc 24s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -### meta FM_DDDD_TIMES_2 (FH_HELO_EQ_D_D_D_D && FH_HOST_EQ_D_D_D_D) -### describe FM_DDDD_TIMES_2 Dual helo + host eq d_d_d_d -###score FM_DDDD_TIMES_2 1.999 -##counts FM_DDDD_TIMES_2 2923s/1h of 41800 corpus (34198s/7602h FVGT) 03/25/06 -##counts FM_DDDD_TIMES_2 3486s/1h of 41949 corpus (34112s/7837h FVGT) 04/11/06 -##counts FM_DDDD_TIMES_2 1304s/1h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_DDDD_TIMES_2 1776s/1h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FS_DEBT Subject =~ /debt/i -#header __FS_HELP Subject =~ /help/i -#meta FM_DEBT_HELP (__FS_DEBT && __FS_HELP) -#describe FM_DEBT_HELP Subject says debt and help. -###score FM_DEBT_HELP 3.222 -##counts FM_DEBT_HELP 1s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FM_DEBT_HELP 53s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FM_DEBT_HELP 4s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FM_DEBT_HELP 7s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __HOTMAILCOM X-Spam-Relays-External =~ /^[^\]]+ helo=hotmail\.com /i -#header __HOST_HOTMAIL X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]+\.hotmail\.com / -#meta FM_FAKE_HELO_HOTMAIL (__HOTMAILCOM && !__HOST_HOTMAIL) -#describe FM_FAKE_HELO_HOTMAIL Looks like a fake hotmail.com helo. -###score FM_FAKE_HELO_HOTMAIL 2.353 -##counts FM_FAKE_HELO_HOTMAIL 0s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_FAKE_HELO_HOTMAIL 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FHELO_VERIZON X-Spam-Relays-External =~ /^[^\]]+ helo=[^ ]+verizon\.net /i -#header __FHOST_VERIZON X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]+verizon\.net /i -#meta FM_FAKE_HELO_VERIZON (__FHELO_VERIZON && !__FHOST_VERIZON) -#describe FM_FAKE_HELO_VERIZON Looks like a fake verizon.net helo. -###score FM_FAKE_HELO_VERIZON 1.229 -##counts FM_FAKE_HELO_VERIZON 26s/0h of 42070 corpus (34144s/7926h FVGT) 04/19/06 -##counts FM_FAKE_HELO_VERIZON 71s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_FAKE_HELO_VERIZON 90s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __MSGID_GMAIL MESSAGEID =~ /gmail\.com/i -#header __FROM_GMAIL From =~ /gmail\.com/ -#meta FM_FORGED_GMAIL (__MSGID_GMAIL && !__FROM_GMAIL) -#describe FM_FORGED_GMAIL Looks like a forged gmail msg? -###score FM_FORGED_GMAIL 0.622 -##counts FORGED_GMAIL 10s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FM_FORGED_GMAIL 10s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_FORGED_GMAIL 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FROM_LEFT_BRACK From:name =~ // -#header __FROM_ISO_2022_JP From:raw =~ /=\?ISO-2022-JP\?/ -#meta FM_FRM_RN_L_BRACK (__FROM_RIGH_BRACK && !__FROM_LEFT_BRACK && !__FROM_ISO_2022_JP) -#describe FM_FRM_RN_L_BRACK From name has > but not < -###score FM_FRM_RN_L_BRACK 0.545 -##counts FRM_RN_L_BRACK 7s/0h of 103219 corpus (95719s/7500h FVGT) 03/21/06 -##counts FRM_RN_L_BRACK 9s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FM_FRM_RN_L_BRACK 11s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body __SURVEY /\bsurvey\b/i -#meta FM_GET_CASH_SURVEY (FB_GET_XXX_CASH && __SURVEY) -#describe FM_GET_CASH_SURVEY Meta Get Cash + Survey -###score FM_GET_CASH_SURVEY 10.357 -##counts FM_GET_CASH_SURVEY 17s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FM_GET_CASH_SURVEY 55s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_GET_CASH_SURVEY 107s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __YOUR_CREDIT /your credit/ -#body __GOOD_ENOUGH /good enough/ -#meta FM_GOOD_ENF_CREDIT (__YOUR_CREDIT && __GOOD_ENOUGH) -#describe FM_GOOD_ENF_CREDIT Meta Good enough credit -###score FM_GOOD_ENF_CREDIT 10.357 -##counts FM_GOOD_ENF_CREDIT 12s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FM_GOOD_ENF_CREDIT 40s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_GOOD_ENF_CREDIT 98s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __YOUR_ACCOUNT /your account/i -#header __MANY_RECIPS ToCc =~ /(?:\@[^@]{5,100}){3}/ -#meta FM_IS_IT_OUR_ACCOUNT (__YOUR_ACCOUNT && __MANY_RECIPS) -#describe FM_IS_IT_OUR_ACCOUNT Is it our account? -###score FM_IS_IT_OUR_ACCOUNT 4.20 -##counts FM_IS_IT_OUR_ACCOUNT 2s/0h of 9808 corpus (4903s/4905h FT) 12/14/05 -##counts FM_IS_IT_OUR_ACCOUNT 7s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FM_IS_IT_OUR_ACCOUNT 11s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##header __NUMBERS_IN_SUBJ Subject =~ /\d{3}/ -#header __FS_LEND Subject =~ /\blend\b/i -#meta FM_LEND_MONEY (__NUMBERS_IN_SUBJ && __FS_LEND) -#describe FM_LEND_MONEY Subject has ddd + lend! -###score FM_LEND_MONEY 2.668 -##counts FS_LEND_MONEY 2s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FS_LEND_MONEY 7s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FM_LEND_MONEY 13s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##http://www18.homeloanstore456.com -#uri __FU_LOAN /[a-pr-z0-9]+loan[a-z0-9]+\.com/i -#uri __DOMAIN_WITH_NUMS /www[^.]+\.[^.]+\d[^.]+\./i -#meta FM_LOAN_NUM_DOMAIN (__FU_LOAN && __DOMAIN_WITH_NUMS) -#describe FM_LOAN_NUM_DOMAIN Loan and numbers in .com -###score FM_LOAN_NUM_DOMAIN 3.524 -##counts FM_LOAN_NUM_DOMAIN 2s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FM_LOAN_NUM_DOMAIN 13s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FM_LOAN_NUM_DOMAIN 19s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_GENERATE /generate/i -#body __FB_FIND_OUT /find out how/i -#body __FB_FROM_YOUR /from your/i -#body __FB_HOME_HOUSE /ho(?:use|me)/i -#meta FM_MAKE_MONEY_HOME (__FB_GENERATE && __FB_FIND_OUT && __FB_FROM_YOUR && __FB_HOME_HOUSE) -#describe FM_MAKE_MONEY_HOME Making money from home. -###score FM_MAKE_MONEY_HOME 10.357 -##counts FM_MAKE_MONEY_HOME 1s/0h of 25733 corpus (16658s/9075h FVGT) 11/08/06 -##counts FM_MAKE_MONEY_HOME 77s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __VA_WORD /\bV[A-Za-z]{2,4}RA\b/ -#body __CS_WORD /\bC[A-Za-z]{2,4}IS\b/ -#body __VM_WORD /\bV[A-Za-z]{2,5}UM\b/ -#meta FM_MANY_DRUG_WORDS (__VA_WORD && __CS_WORD && __VM_WORD) -#describe FM_MANY_DRUG_WORDS Lot's of almost drug words -###score FM_MANY_DRUG_WORDS 10.357 -##counts MANY_DRUG_WORDS 228s/0h of 21635 corpus (15142s/6493h CT) 09/25/06 -##counts FM_MANY_DRUG_WORDS 1169s/0h of 25499 corpus (16409s/9090h FVGT) 11/04/06 -##counts FM_MANY_DRUG_WORDS 1199s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_YOUR_MEDS /your meds/i -#header __FS_RE_TWO_WORDS Subject =~ /^Re: (?:[a-z']{2,5}\s+){2}$/ -#meta FM_MEDS_SUBJ_2WDS ((__FB_YOUR_MEDS || FB_MEDS_PERCENT) && __FS_RE_TWO_WORDS) -#describe FM_MEDS_SUBJ_2WDS Talks about Meds, Re: two words. -###score FM_MEDS_SUBJ_2WDS 10.357 -##counts __FB_YOUR_MEDS 10s/1h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts __FS_RE_TWO_WORDS 271s/9h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FM_MEDS_SUBJ_2WDS 6s/0h of 42742 corpus (34169s/8573h FVGT) 07/06/06 -##counts FM_MEDS_SUBJ_2WDS 6s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FM_MEDS_SUBJ_2WDS 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __PREAPPROVEDFVGT /pre-approved/i -#body __FIXED_RATEFVGT /fixed rate/i -#body __YOUR_CREDITFVGT /your credit/i -#body __HOMELOANFVGT /home loan/i -#body __APPROVALFVGT /approval/i -#body __BIGDOLLARSFVGT /\$\d{2,3},\d{3}/ -#uri __LOANURIFVGT /\bloa.?ns?\b/i -#uri __MORTURIFVGT /\bmor.?t\b/i -#meta __FM_MORTGAGE3PLUS ((__PREAPPROVEDFVGT + __FIXED_RATEFVGT + __YOUR_CREDITFVGT + __HOMELOANFVGT + __APPROVALFVGT + __BIGDOLLARSFVGT + __LOANURIFVGT + __MORTURIFVGT) > 2) -#meta __FM_MORTGAGE4PLUS ((__PREAPPROVEDFVGT + __FIXED_RATEFVGT + __YOUR_CREDITFVGT + __HOMELOANFVGT + __APPROVALFVGT + __BIGDOLLARSFVGT + __LOANURIFVGT + __MORTURIFVGT) > 3) -#meta __FM_MORTGAGE5PLUS ((__PREAPPROVEDFVGT + __FIXED_RATEFVGT + __YOUR_CREDITFVGT + __HOMELOANFVGT + __APPROVALFVGT + __BIGDOLLARSFVGT + __LOANURIFVGT + __MORTURIFVGT) > 4) -#meta __FM_MORTGAGE6PLUS ((__PREAPPROVEDFVGT + __FIXED_RATEFVGT + __YOUR_CREDITFVGT + __HOMELOANFVGT + __APPROVALFVGT + __BIGDOLLARSFVGT + __LOANURIFVGT + __MORTURIFVGT) > 5) -# -#meta FM_MORTGAGE3PLUS (__FM_MORTGAGE3PLUS && !__FM_MORTGAGE4PLUS && !__FM_MORTGAGE5PLUS && !__FM_MORTGAGE6PLUS) -#describe FM_MORTGAGE3PLUS Looks like a mortgage spam (3+) -###score FM_MORTGAGE3PLUS 0.602 -##counts FM_MORTGAGE3PLUS 46s/1h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FM_MORTGAGE3PLUS 46s/1h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FM_MORTGAGE3PLUS 49s/1h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_MORTGAGE3PLUS 57s/1h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -#meta FM_MORTGAGE4PLUS (__FM_MORTGAGE4PLUS && !__FM_MORTGAGE5PLUS && !__FM_MORTGAGE6PLUS) -#describe FM_MORTGAGE4PLUS Looks like a mortgage spam (4+) -###score FM_MORTGAGE4PLUS 0.166 -##counts FM_MORTGAGE4PLUS 1s/1h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FM_MORTGAGE4PLUS 1s/1h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FM_MORTGAGE4PLUS 1s/1h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_MORTGAGE4PLUS 3s/1h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -#meta FM_MORTGAGE5PLUS (__FM_MORTGAGE5PLUS && !__FM_MORTGAGE6PLUS) -#describe FM_MORTGAGE5PLUS Looks like a mortgage spam (5+) -###score FM_MORTGAGE5PLUS 3.222 -##counts FM_MORTGAGE5PLUS 39s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FM_MORTGAGE5PLUS 46s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -#meta FM_MORTGAGE6PLUS (__FM_MORTGAGE6PLUS) -#describe FM_MORTGAGE6PLUS Looks like a mortgage spam (6+) -###score FM_MORTGAGE6PLUS 2.500 -##counts FM_MORTGAGE6PLUS 3s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06 -##counts FM_MORTGAGE6PLUS 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_BRAND_NAME /brand name/i -#body __FB_TIMEPIECE /timepiece/i -#body __FB_WALLETS /wallets/i -#body __FB_HANDBAGS /handbags/i -#body __FB_DESIGNER /designer/i -#body __FB_INK_PEN /ink pen/i -#meta FM_MULTI_LUX_GIFTS ((__FB_BRAND_NAME + __FB_TIMEPIECE + __FB_WALLETS + __FB_HANDBAGS + __FB_DESIGNER + __FB_LUX_GIFTS + __FB_NUM_PERCNT + __FB_INK_PEN) > 3) -#describe FM_MULTI_LUX_GIFTS Talks about variety of luxury gifts -###score FM_MULTI_LUX_GIFTS 10.357 -##counts FM_MULTI_LUX_GIFTS 35s/0h of 32090 corpus (22848s/9242h FVGT) 11/13/06 -##counts FM_MULTI_LUX_GIFTS 42s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_MULTI_LUX_GIFTS 156s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## Brand comparisons as of late... -#header __FS_ADIDAS Subject =~ /\badidas\b/i -#header __FS_NIKE Subject =~ /\bnike\b/i -#meta FM_NIKE_ADIDAS (__FS_ADIDAS && __FS_NIKE) -#describe FM_NIKE_ADIDAS Meta Nike & Adidas -###score FM_NIKE_ADIDAS 4.555 -##counts FM_NIKE_ADIDAS 1s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FM_NIKE_ADIDAS 3s/0h of 257465 corpus (187155s/70310h DOC) 10/26/06 -##counts FM_NIKE_ADIDAS 1s/0h of 25019 corpus (15994s/9025h FVGT) 11/01/06 -##counts FM_NIKE_ADIDAS 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_YOU_ARE_PAYING /you are paying/i -##counts FB_YOU_ARE_PAYING 155s/26h of 207630 corpus (200121s/7509h FT) 12/13/05 -#meta FM_PAYING_LOWER (FB_LOWER_PAYM && __FB_YOU_ARE_PAYING) -#describe FM_PAYING_LOWER Meta You are paying too much... -###score FM_PAYING_LOWER 1.35 -##counts FM_PAYING_LOWER 0s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_PAYING_LOWER 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#meta FM_PC_ERROR_DBL (FB_YOUR_PC_ERROR && (FS_YOUR_COMPUTER || FB_PC_DOCTOR)) -#describe FM_PC_ERROR_DBL Combo Meta of multiple rules. -###score FM_PC_ERROR_DBL 10.357 -##counts FM_PC_ERROR_DBL 2s/0h of 43642 corpus (34621s/9021h FVGT) 10/26/06 -##counts FM_PC_ERROR_DBL 25s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FM_PC_ERROR_DBL 58s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_PC_ERROR_DBL 166s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __MSGID_VGA Message-ID =~ /^<000001c[67]/ -#header __DATE_700 Date =~ /-0700/ -#meta FM_RATSIGN_1106 (__MSGID_VGA && __DATE_700) -#describe FM_RATSIGN_1106 Fingerprint seen in lots of spam. 11/2006 -###score FM_RATSIGN_1106 17.422 -##counts GOODBYE_VJJAGGRRAA 3781s/0h of 43750 corpus (34719s/9031h FVGT) 10/27/06 -##counts FM_RATSIGN_1106 3862s/0h of 32547 corpus (23290s/9257h FVGT) 11/14/06 -##counts FM_RATSIGN_1106 3895s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_RATSIGN_1106 3937s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_DO_NOT_REPLY /Do not reply to this address/i -#body __FB_EMAIL_ME_BAC /Email me baca?k at/i -#meta FM_REPLY_OR_NOT (__FB_DO_NOT_REPLY && __FB_EMAIL_ME_BAC) -#describe FM_REPLY_OR_NOT Meta do they want a reply or not? -###score FM_REPLY_OR_NOT 10.357 -##counts FM_REPLY_OR_NOT 2s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FM_REPLY_OR_NOT 14s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FM_REPLY_OR_NOT 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_ROLEX_MEN /Rolex Men/i -#body __FB_ROLEX_WMEN /Rolex Lady/i -#body __FB_OMEGA /Omega/i -#body __FB_GLASHUTE /Glashute/ -#meta FM_ROLEX_ADS (__FB_ROLEX_MEN && __FB_ROLEX_WMEN && __FB_OMEGA && __FB_GLASHUTE) -#describe FM_ROLEX_ADS Looks like Rolex spams. -###score FM_ROLEX_ADS 6.999 -##counts FM_ROLEX_ADS 0s/0h of 5479 corpus (1297s/4182h AxB) 09/25/06 -##counts FM_ROLEX_ADS 0s/0h of 21635 corpus (15142s/6493h CT) 09/25/06 -##counts FM_ROLEX_ADS 60s/0h of 25381 corpus (16358s/9023h FVGT) 11/04/06 -##counts FM_ROLEX_ADS 85s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __FB_BA /\bBA\b/ -#body __FB_BCs /\bBSc\b/ -#body __FB_MA /\bMA\b/ -#body __FB_MBA /\bMBA\b/ -#meta FM_SCHOOL_TYPES (__FB_BA && __FB_BCs && __FB_MA && __FB_MBA) -#describe FM_SCHOOL_TYPES Meta Combo Phrase for Schooling -###score FM_SCHOOL_TYPES 5.599 -##counts FM_SCHOOL_TYPES 4s/0h of 24480 corpus (15455s/9025h FVGT) 10/30/06 -##counts FM_SCHOOL_TYPES 4s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FM_SCHOOL_TYPES 4s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FM_SCHOOL_TYPES 6s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FM_SCHOOL_TYPES 28s/0h of 125199 corpus (120083s/5116h AxB2) 11/03/06 -##counts FM_SCHOOL_TYPES 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -## We don't need no schooling ;) -#body __BACHELORS /Bachelor/i -#body __MASTERS /Masters/i -#body __MBA /MBA/i -#body __PHD /PhD/i -#body __DIPLOMA /diploma/i -#meta FM_SCHOOLING ((__BACHELORS + __MASTERS + __MBA + __PHD) > 2) -#describe FM_SCHOOLING Meta Combo Phrase for Schooling (2) -###score FM_SCHOOLING 5.657 -##counts FM_SCHOOLING 15s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FM_SCHOOLING 88s/0h of 25311 corpus (18683s/6628h CT) 11/03/06 -##counts FM_SCHOOLING 20s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#meta FM_SCHOOL_DIPLOMA (FM_SCHOOLING && __DIPLOMA) -#describe FM_SCHOOL_DIPLOMA Meta for Schooling + Diploma. -###score FM_SCHOOL_DIPLOMA 10.357 -##counts FM_SCHOOL_DIPLOMA 10s/0h of 25369 corpus (16344s/9025h FVGT) 11/03/06 -##counts FM_SCHOOL_DIPLOMA 61s/0h of 25311 corpus (18683s/6628h CT) 11/03/06 -##counts FM_SCHOOL_DIPLOMA 477s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FM_SCHOOL_DIPLOMA 15s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body __WORD_SEX /\bsex(?:iest|y)?\b/i -##body __WORD_CUM /\bcum\b/i -##body __WORD_SPERM /\bsperm\b/i -##body __WORD_SLUTS /\bsluts?\b/i -##body __WORD_RAPED /\braped?\b/i -##meta __SEX_WRDS (__WORD_SEX || __WORD_CUM || __WORD_SPERM || __WORD_SLUTS || __WORD_RAPED) -##meta FM_SEX_HELODDDD (__SEX_WRDS && FH_HELO_EQ_D_D_D_D) -##describe FM_SEX_HELODDDD Sex words + helo = dddd -###score FM_SEX_HELODDDD 10.357 -##counts FM_SEX_HELODDDD 105s/0h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -##counts FM_SEX_HELODDDD 108s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_SEX_HELODDDD 258s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -###meta FM_SEX_HOSTDDDD (__SEX_WRDS && FH_HOST_EQ_D_D_D_D) -###describe FM_SEX_HOSTDDDD Sex words + host = dddd -###score FM_SEX_HOSTDDDD 10.357 -##counts FM_SEX_HOSTDDDD 289s/0h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -##counts FM_SEX_HOSTDDDD 303s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_SEX_HOSTDDDD 529s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FS_TEEN Subject =~ /\bteen\b/i -#meta FM_SUB_TEEN_NUDE (FS_NUDE && __FS_TEEN) -#describe FM_SUB_TEEN_NUDE Subject says teen and nude -###score FM_SUB_TEEN_NUDE 5.981 -##counts FM_SUB_TEEN_NUDE 48s/0h of 345244 corpus (337372s/7872h FT) 02/07/06 -##counts FM_SUB_TEEN_NUDE 0s/0h of 32300 corpus (23045s/9255h FVGT) 11/14/06 -##counts FM_SUB_TEEN_NUDE 0s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __EXCLAIM_SUBJ Subject =~ /\!/ -#header __SUBJ_APPROVE Subject =~ /Approve/i -#meta FM_SUBJ_APPROVE (__EXCLAIM_SUBJ && __SUBJ_APPROVE) -#describe FM_SUBJ_APPROVE Subject has Approve and ! -###score FM_SUBJ_APPROVE 3.877 -##counts FM_SUBJ_APPROVE 9s/0h of 24573 corpus (15551s/9022h FVGT) 10/31/06 -##counts FM_SUBJ_APPROVE 13s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FM_SUBJ_APPROVE 20s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FS_PROFIT Subject =~ /profit/i -#header __FS_YOU Subject =~ /you\b/i -#meta FM_SUBJ_YOU_PROFIT (__FS_PROFIT && __FS_YOU) -#describe FM_SUBJ_YOU_PROFIT Subject says you profit -###score FM_SUBJ_YOU_PROFIT 3.788 -##counts FM_SUBJ_YOU_PROFIT 26s/0h of 103688 corpus (96287s/7401h FVGT) 03/17/06 -##counts FM_SUBJ_YOU_PROFIT 3s/0h of 25005 corpus (15981s/9024h FVGT) 11/03/06 -##counts FM_SUBJ_YOU_PROFIT 26s/0h of 293382 corpus (226480s/66902h ML) 11/03/06 -##counts FM_SUBJ_YOU_PROFIT 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#header __FROM_VEGAS From =~ /Vegas/i -#header __SUBJ_3DIGIT Subject =~ /\b\d{3}[^0-9]/ -#header __SUBJ_VEGAS Subject =~ /(?:Vegas|Casino)/i -#body __FB_GAME /game/i -#meta FM_VEGAS_CASINO ((__FROM_VEGAS + __SUBJ_3DIGIT + __SUBJ_VEGAS + __FB_GAME) > 2) -#describe FM_VEGAS_CASINO Looks like vega casino spam -###score FM_VEGAS_CASINO 10.357 -##counts FM_VEGAS_CASINO 119s/0h of 132996 corpus (95808s/37188h ML) 06/12/06 -##counts FM_VEGAS_CASINO 110s/0h of 168016 corpus (116196s/51820h DOC) 06/12/06 -##counts FM_VEGAS_CASINO 22s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FM_VEGAS_CASINO 22s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body __SEEN_ON_ABC /\bA[^a-z]{0,1}B[^a-z]{0,1}C\b/i -#body __SEEN_ON_CNN /\bC[^a-z]{0,1}N[^a-z]{0,1}N\b/i -#body __SEEN_ON_NBC /\bN[^a-z]{0,1}B[^a-z]{0,1}C\b/i -#body __SEEN_ON_CBS /\bC[^a-z]{0,1}B[^a-z]{0,1}S\b/i -#body __SEEN_ON_OPRAH /\boprah\b/i -#body __LOSE_WEIGHT /l.{0,1}o.{0,1}s.{0,1}e.{0,4}w.{0,1}e.{0,1}[i1].{0,1}g.{0,1}h.{0,1}t/i -#meta FM_WEIGHT_LOSS ((__SEEN_ON_ABC + __SEEN_ON_CNN + __SEEN_ON_NBC + __SEEN_ON_CBS + __LOSE_WEIGHT + __SEEN_ON_OPRAH) > 3) -#describe FM_WEIGHT_LOSS Looks like oprah weight loss spam. -###score FM_WEIGHT_LOSS 10.357 -##counts FM_WEIGHT_LOSS 18s/0h of 32090 corpus (22848s/9242h FVGT) 11/13/06 -##counts FM_WEIGHT_LOSS 18s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##====== REPLACE TAG RULES BELOW ============= -# -#ifplugin Mail::SpamAssassin::Plugin::ReplaceTags -#replace_inter W0 \w? -#replace_inter SP2 [\s\d_*\$\%(),.:;?!}{\[\]|\/?^\#~\xa1`'+-]? -#replace_tag GX [gk6] -#replace_tag IX [ilt|!1y?\xcc\xcd\xce\xcf\xec\xed\xee\xef] -#replace_tag SX [sz5\xa6\xa7] -#replace_tag TX [t|] -#replace_tag UX [u\xb5\xd9\xda\xdb\xdc\xfc\xfb\xfa\xf9\xfd] -#replace_tag WX (?:[wv]|vv) -# -# -#body FRT_ABSOLUT /\b(?!absolutely)    /i -#describe FRT_ABSOLUT ReplaceTags: Absolutely -###score FRT_ABSOLUT 0.285 -#replace_rules FRT_ABSOLUT -##counts FRT_ABSOLUT 4s/0h of 46241 corpus (36438s/9803h FVGT) 12/14/06 -##counts FRT_ABSOLUT 4s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_ADOBE2 /\b(?!adobe)\b/i -#describe FRT_ADOBE2 ReplaceTags: Adobe -###score FRT_ADOBE2 2.455 -#replace_rules FRT_ADOBE2 -##counts FRT_ADOBE2 2s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_ADOBE2 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_ADULT2 /\b(?!adult)/i -#describe FRT_ADULT2 ReplaceTags: Adult -###score FRT_ADULT2 1.479 -#replace_rules FRT_ADULT2 -##counts FRT_ADULT2 12s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_ADULT2 16s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_APPROV /\b(?!approu?v)

    /i -#describe FRT_APPROV ReplaceTags: Approve -###score FRT_APPROV 1.645 -#replace_rules FRT_APPROV -##counts FRT_APPROV 2s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_APPROV 3s/0h of 32386 corpus (23130s/9256h FVGT) 11/14/06 -##counts FRT_APPROV 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_BEFORE /\b(?!before)\b/i -#describe FRT_BEFORE ReplaceTags: Before -###score FRT_BEFORE 1.279 -#replace_rules FRT_BEFORE -##counts FRT_BEFORE 3s/0h of 32386 corpus (23130s/9256h FVGT) 11/14/06 -##counts FRT_BEFORE 6s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_BELOW2 /\b(?!below)\b/i -#describe FRT_BELOW2 ReplaceTags: Below (2) -###score FRT_BELOW2 2.154 -#replace_rules FRT_BELOW2 -##counts FRT_BELOW2 26s/0h of 32300 corpus (23052s/9248h FVGT) 11/14/06 -##counts FRT_BELOW2 28s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_BIGGERMEM1 /(?:|).{1,8}(?:

    ||)/i -#describe FRT_BIGGERMEM1 ReplaceTags: Bigger / Larger, Penis / Member -###score FRT_BIGGERMEM1 2.555 -#replace_rules FRT_BIGGERMEM1 -##counts FRT_BIGGERMEM1 17s/0h of 32300 corpus (23052s/9248h FVGT) 11/14/06 -##counts FRT_BIGGERMEM1 52s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_CANSPAM /\b(?!CANSPAM)

    /i -#describe FRT_CANSPAM ReplaceTags: Can Spam -###score FRT_CANSPAM 2.232 -#replace_rules FRT_CANSPAM -##counts FRT_CANSPAM 7s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_CANSPAM 26s/0h of 32386 corpus (23130s/9256h FVGT) 11/14/06 -##counts FRT_CANSPAM 51s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_CLICK /\b(?!click)\b/i -#describe FRT_CLICK ReplaceTags: Click -###score FRT_CLICK 1.993 -#replace_rules FRT_CLICK -##counts FRT_CLICK 67s/0h of 32300 corpus (23052s/9248h FVGT) 11/14/06 -##counts FRT_CLICK 116s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_COCK /\b(?![cs]ock)/i -#describe FRT_COCK ReplaceTags: Cock -###score FRT_COCK 1.594 -#replace_rules FRT_COCK -##counts FRT_COCK 18s/0h of 32300 corpus (23052s/9248h FVGT) 11/14/06 -##counts FRT_COCK 55s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_CONTACT /\b(?!contr?act)/i -#describe FRT_CONTACT ReplaceTags: Contact -###score FRT_CONTACT 1.594 -#replace_rules FRT_CONTACT -##counts FRT_CONTACT 10s/0h of 46631 corpus (36802s/9829h FVGT) 12/23/06 -##counts FRT_CONTACT 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_DIPLOMA /\b(?!d[iy]pl[o\xe2\xc2]m)

    /i -##describe FRT_DIPLOMA ReplaceTags: Diploma -###score FRT_DIPLOMA 1.499 -##replace_rules FRT_DIPLOMA -##counts FRT_DIPLOMA 2s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_DIPLOMA 2s/0h of 32386 corpus (23130s/9256h FVGT) 11/14/06 -##counts FRT_DIPLOMA 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_DISCOUNT /\b(?!discount)/i -##describe FRT_DISCOUNT ReplaceTags: Discount -###score FRT_DISCOUNT 4.495 -#replace_rules FRT_DISCOUNT -##counts FRT_DISCOUNT 24s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_DISCOUNT 32s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_DOLLAR /\b(?!dollar)/i -##describe FRT_DOLLAR ReplaceTags: Dollar -###score FRT_DOLLAR 2.410 -##replace_rules FRT_DOLLAR -##counts FRT_DOLLAR 8s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_DOLLAR 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_ERECTION /(?!erection)/i -#describe FRT_ERECTION ReplaceTags: Erection -###score FRT_ERECTION 3.649 -#replace_rules FRT_ERECTION -##counts FRT_ERECTION 25s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_ERECTION 28s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_ESTABLISH /\b(?!estabi?lish)/i -#describe FRT_ESTABLISH ReplaceTags: Establish -###score FRT_ESTABLISH 2.492 -#replace_rules FRT_ESTABLISH -##counts FRT_ESTABLISH 2s/0h of 40802 corpus (31109s/9693h FVGT) 11/20/06 -##counts FRT_ESTABLISH 7s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_ESTABLISH2 /\b(?!estabi?lish)/i -##describe FRT_ESTABLISH2 ReplaceTags: Establish (2) -###score FRT_ESTABLISH2 2.492 -##replace_rules FRT_ESTABLISH2 -##counts FRT_ESTABLISH2 2s/0h of 40802 corpus (31109s/9693h FVGT) 11/20/06 -##counts FRT_ESTABLISH2 7s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_EXPERIENCE /\b(?!exp[e\xe9\xc9]rience)

    \b/i -#describe FRT_EXPERIENCE ReplaceTags: Experience -###score FRT_EXPERIENCE 2.333 -#replace_rules FRT_EXPERIENCE -##counts FRT_EXPERIENCE 3s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_EXPERIENCE 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_FOLLOW1 /\b(?!follow)/i -#describe FRT_FOLLOW1 ReplaceTags: Follow -###score FRT_FOLLOW1 1.432 -#replace_rules FRT_FOLLOW1 -##counts FRT_FOLLOW1 16s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_FOLLOW1 17s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_FOLLOW2 /\b(?!follow)/i -#describe FRT_FOLLOW2 ReplaceTags: Follow (2) -###score FRT_FOLLOW2 0.422 -#replace_rules FRT_FOLLOW2 -##counts FRT_FOLLOW2 14s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_FOLLOW2 14s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_FREE /\b(?!free)\b/i -#describe FRT_FREE ReplaceTags: Free -###score FRT_FREE 3.433 -#replace_rules FRT_FREE -##counts FRT_FREE 72s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_FREE 99s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_FRIEND /\b(?!friend)/i -#describe FRT_FRIEND ReplaceTags: Friend -###score FRT_FRIEND 2.522 -#replace_rules FRT_FRIEND -##counts FRT_FRIEND 6s/0h of 34882 corpus (25258s/9624h FVGT) 11/16/06 -##counts FRT_FRIEND 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_FUCK1 /\b(?!fuck)/i -#describe FRT_FUCK1 ReplaceTags: Fuck (1) -###score FRT_FUCK1 2.534 -#replace_rules FRT_FUCK1 -##counts FRT_FUCK1 3s/0h of 32300 corpus (23052s/9248h FVGT) 11/14/06 -##counts FRT_FUCK1 14s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_FUCK2 /\b(?!fuck)/i -##describe FRT_FUCK2 ReplaceTags: Fuck (2) -###score FRT_FUCK2 3.434 -##replace_rules FRT_FUCK2 -##counts FRT_FUCK2 6s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_FUCK2 15s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_GUARANTEE1 /(?!guarantee)/i -##describe FRT_GUARANTEE1 ReplaceTags: Guarantee (1) -###score FRT_GUARANTEE1 4.599 -##replace_rules FRT_GUARANTEE1 -##counts FRT_GUARANTEE1 80s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_GUARANTEE1 89s/0h of 35048 corpus (25413s/9635h FVGT) 11/16/06 -##counts FRT_GUARANTEE1 126s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_HEALTH /\b(?!health)\b/i -#describe FRT_HEALTH ReplaceTags: Health -###score FRT_HEALTH 2.655 -#replace_rules FRT_HEALTH -##counts FRT_HEALTH 1s/0h of 44060 corpus (34282s/9778h FVGT) 12/01/06 -##counts FRT_HEALTH 5s/0h of 44368 corpus (34592s/9776h FVGT) 12/02/06 -##counts FRT_HEALTH 11s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_HOUR /\b(?!hour)\b/i -#describe FRT_HOUR ReplaceTags: Hour -###score FRT_HOUR 1.655 -#replace_rules FRT_HOUR -##counts FRT_HOUR 41s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_HOUR 62s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_INCOME /\b(?!income)\b/i -#describe FRT_INCOME ReplaceTags: Income -###score FRT_INCOME 3.579 -#replace_rules FRT_INCOME -##counts FRT_INCOME 6s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_INCOME 17s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_INTEREST /\b(?!interest)\b/i -#describe FRT_INTEREST ReplaceTags: Interest -###score FRT_INTEREST 3.579 -#replace_rules FRT_INTEREST -##counts FRT_INTEREST 8s/0h of 35267 corpus (25646s/9621h FVGT) 11/17/06 -##counts FRT_INTEREST 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_INVESTOR /\b(?!investor)/i -##describe FRT_INVESTOR ReplaceTags: Investor -###score FRT_INVESTOR 1.832 -##replace_rules FRT_INVESTOR -##counts FRT_INVESTOR 13s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_INVESTOR 32s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_LEVITRA /(?!levitra)/i -##describe FRT_LEVITRA ReplaceTags: Levitra -###score FRT_LEVITRA 1.812 -##replace_rules FRT_LEVITRA -##counts FRT_LEVITRA 2s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_LEVITRA 3s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_LITTLE /\b(?!little)/i -#describe FRT_LITTLE ReplaceTags: Little -###score FRT_LITTLE 1.555 -#replace_rules FRT_LITTLE -##counts FRT_LITTLE 1s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_LITTLE 5s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_LOLITA1 /\b(?!lolita)/i -#describe FRT_LOLITA1 ReplaceTags: Lolita (1) -###score FRT_LOLITA1 1.865 -#replace_rules FRT_LOLITA1 -##counts FRT_LOLITA1 11s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_LOLITA1 11s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_MEETING /\b(?!meeting)\b/i -##describe FRT_MEETING ReplaceTags: Meeting -###score FRT_MEETING 2.697 -##replace_rules FRT_MEETING -##counts FRT_MEETING 5s/0h of 34882 corpus (25258s/9624h FVGT) 11/16/06 -##counts FRT_MEETING 8s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_OFFER2 /\b(?!offer)/i -#describe FRT_OFFER2 ReplaceTags: Offer (2) -###score FRT_OFFER2 2.545 -#replace_rules FRT_OFFER2 -##counts FRT_OFFER2 35s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_OFFER2 42s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_OPPORTUN1 /(?!opportun)

    /i -#describe FRT_OPPORTUN1 ReplaceTags: Oppertun (1) -###score FRT_OPPORTUN1 1.893 -#replace_rules FRT_OPPORTUN1 -##counts FRT_OPPORTUN1 12s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_OPPORTUN1 18s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_OPPORTUN2 /(?!opportun)

    /i -##describe FRT_OPPORTUN2 ReplaceTags: Oppertun (2) -###score FRT_OPPORTUN2 1.397 -##replace_rules FRT_OPPORTUN2 -##counts FRT_OPPORTUN2 12s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_OPPORTUN2 15s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PACKAGE /\b(?!package)

    /i -#describe FRT_PACKAGE ReplaceTags: Package -###score FRT_PACKAGE 1.967 -#replace_rules FRT_PACKAGE -##counts FRT_PACKAGE 6s/0h of 40802 corpus (31109s/9693h FVGT) 11/20/06 -##counts FRT_PACKAGE 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PAYMENT /\b(?!payment)

    /i -#describe FRT_PAYMENT ReplaceTags: Payment -###score FRT_PAYMENT 2.292 -#replace_rules FRT_PAYMENT -##counts FRT_PAYMENT 3s/0h of 32300 corpus (23052s/9248h FVGT) 11/14/06 -##counts FRT_PAYMENT 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PENIS1 /\b(?!pen\s?(?:ie?s|ny[ ']?s))

    \b/i -#describe FRT_PENIS1 ReplaceTags: Penis -###score FRT_PENIS1 3.592 -#replace_rules FRT_PENIS1 -##counts FRT_PENIS1 86s/0h of 32300 corpus (23052s/9248h FVGT) 11/14/06 -##counts FRT_PENIS1 147s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PHARMAC /(?!pharma[c\@])

    /i -#describe FRT_PHARMAC ReplaceTags: Pharmac -###score FRT_PHARMAC 3.193 -#replace_rules FRT_PHARMAC -##counts FRT_PHARMAC 324s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_PHARMAC 619s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_POSSIBLE /\b(?!possible)

    \b/i -#describe FRT_POSSIBLE ReplaceTags: Possible -###score FRT_POSSIBLE 5.697 -#replace_rules FRT_POSSIBLE -##counts FRT_POSSIBLE 6s/0h of 34882 corpus (25258s/9624h FVGT) 11/16/06 -##counts FRT_POSSIBLE 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PRICE /\b(?!price)

    \b/i -#describe FRT_PRICE ReplaceTags: Price -###score FRT_PRICE 3.897 -#replace_rules FRT_PRICE -##counts FRT_PRICE 71s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_PRICE 86s/0h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -##counts FRT_PRICE 128s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PROFILE1 /\b(?!profile)

    /i -#describe FRT_PROFILE1 ReplaceTags: Profile (1) -###score FRT_PROFILE1 2.555 -#replace_rules FRT_PROFILE1 -##counts FRT_PROFILE1 9s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_PROFILE1 9s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PROFILE2 /\b(?!profile)

    /i -#describe FRT_PROFILE2 ReplaceTags: Profile (2) -###score FRT_PROFILE2 2.111 -#replace_rules FRT_PROFILE2 -##counts FRT_PROFILE2 8s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_PROFILE2 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PROFIT1 /\b(?!profit)

    /i -#describe FRT_PROFIT1 ReplaceTags: Profit (1) -###score FRT_PROFIT1 3.858 -#replace_rules FRT_PROFIT1 -##counts FRT_PROFIT1 37s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_PROFIT1 41s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PROFIT2 /\b(?!profit)

    /i -#describe FRT_PROFIT2 ReplaceTags: Profit (2) -###score FRT_PROFIT2 10.357 -#replace_rules FRT_PROFIT2 -##counts FRT_PROFIT2 3s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_PROFIT2 56s/0h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -##counts FRT_PROFIT2 57s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_PUSSY /\b(?!pussy)

    /i -#describe FRT_PUSSY ReplaceTags: Pussy -###score FRT_PUSSY 0.285 -#replace_rules FRT_PUSSY -##counts FRT_PUSSY 2s/0h of 46241 corpus (36438s/9803h FVGT) 12/14/06 -##counts FRT_PUSSY 2s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_REFINANCE1 /\b(?!refinanc)/i -##describe FRT_REFINANCE1 ReplaceTags: Refinance (1) -###score FRT_REFINANCE1 2.934 -##replace_rules FRT_REFINANCE1 -##counts FRT_REFINANCE1 18s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_REFINANCE1 24s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_ROLEX /\b(?!rolex)/i -#describe FRT_ROLEX ReplaceTags: Rolex -###score FRT_ROLEX 3.878 -#replace_rules FRT_ROLEX -##counts FRT_ROLEX 5s/0h of 32300 corpus (23052s/9248h FVGT) 11/14/06 -##counts FRT_ROLEX 15s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_SEXUAL /\b(?!sexual)/i -##describe FRT_SEXUAL ReplaceTags: Sexual -###score FRT_SEXUAL 3.777 -##replace_rules FRT_SEXUAL -##counts FRT_SEXUAL 93s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_SEXUAL 95s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FRT_SEXUAL 102s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_SLUT /\b(?!slut)/ -#describe FRT_SLUT ReplaceTags: Slut -###score FRT_SLUT 2.522 -#replace_rules FRT_SLUT -##counts FRT_SLUT 1s/0h of 34882 corpus (25258s/9624h FVGT) 11/16/06 -##counts FRT_SLUT 11s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FRT_SLUT 11s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_SOMA /\b(?!soma|sommar|500mg)\b/i -##describe FRT_SOMA ReplaceTags: Soma -###score FRT_SOMA 2.264 -##replace_rules FRT_SOMA -##counts FRT_SOMA 54s/0h of 32386 corpus (23130s/9256h FVGT) 11/14/06 -##counts FRT_SOMA 141s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FRT_SOMA 234s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_SOMA2 /\b(?!soma|som[m\s]\xE4|sommar|500? ?mg)\b/i -##describe FRT_SOMA2 ReplaceTags: Soma (2) -###score FRT_SOMA2 2.199 -##replace_rules FRT_SOMA2 -##counts FRT_SOMA2 96s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FRT_SOMA2 107s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_STOCK1 /\b(?!stock)/i -#describe FRT_STOCK1 ReplaceTags: Stock (1) -###score FRT_STOCK1 2.988 -#replace_rules FRT_STOCK1 -##counts FRT_STOCK1 156s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_STOCK1 161s/0h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -##counts FRT_STOCK1 167s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_STOCK2 /\b(?!stor?ck)/i -#describe FRT_STOCK2 ReplaceTags: Stock (2) -###score FRT_STOCK2 2.988 -#replace_rules FRT_STOCK2 -##counts FRT_STOCK2 135s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_STOCK2 136s/0h of 33966 corpus (24401s/9565h FVGT) 11/16/06 -##counts FRT_STOCK2 141s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_STRONG1 /\b(?!stro\s?ng)\b/i -##describe FRT_STRONG1 ReplaceTags: Strong (1) -###score FRT_STRONG1 2.352 -##replace_rules FRT_STRONG1 -##counts FRT_STRONG1 96s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_STRONG1 98s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_STRONG2 /\b(?!strong)\b/i -##describe FRT_STRONG2 ReplaceTags: Strong (2) -###score FRT_STRONG2 1.535 -##replace_rules FRT_STRONG2 -##counts FRT_STRONG2 3s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_STRONG2 9s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_SYMBOL /\b(?!symbol)/i -##describe FRT_SYMBOL ReplaceTags: Symbol -###score FRT_SYMBOL 2.932 -##replace_rules FRT_SYMBOL -##counts FRT_SYMBOL 15s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_SYMBOL 21s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_TODAY2 /\b(?!today)/i -##describe FRT_TODAY2 ReplaceTags: Today (2) -###score FRT_TODAY2 2.648 -##replace_rules FRT_TODAY2 -##counts FRT_TODAY2 16s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_TODAY2 16s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -# -##body FRT_VALIUM1 /\b(?!valium|verifiquem|volturno|vollum)\b/i -##describe FRT_VALIUM1 ReplaceTags: Valium -###score FRT_VALIUM1 10.357 -##replace_rules FRT_VALIUM1 -##counts FRT_VALIUM1 159s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_VALIUM1 183s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FRT_VALIUM1 183s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_VALIUM2 /\b(?!valium|verifiquem|volturno|vollum)\b/i -##describe FRT_VALIUM2 ReplaceTags: Valium (2) -###score FRT_VALIUM2 2.843 -##replace_rules FRT_VALIUM2 -##counts FRT_VALIUM2 112s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_VALIUM2 112s/0h of 36007 corpus (26307s/9700h FVGT) 11/17/06 -##counts FRT_VALIUM2 108s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#body FRT_VIRGIN1 /(?!virgin)?\b/i -#describe FRT_VIRGIN1 ReplaceTags: Virgin (1) -###score FRT_VIRGIN1 2.887 -#replace_rules FRT_VIRGIN1 -##counts FRT_VIRGIN1 10s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_VIRGIN1 10s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_WEIGHT2 /\b(?!weight)/i -##describe FRT_WEIGHT2 ReplaceTags: Weight (2) -###score FRT_WEIGHT2 2.442 -##replace_rules FRT_WEIGHT2 -##counts FRT_WEIGHT2 6s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_WEIGHT2 13s/0h of 44480 corpus (34698s/9782h FVGT) 11/30/06 -##counts FRT_WEIGHT2 12s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_XANAX1 /\b(?!xanax)\b/i -##describe FRT_XANAX1 ReplaceTags: Xanax (1) -###score FRT_XANAX1 2.775 -##replace_rules FRT_XANAX1 -##counts FRT_XANAX1 24s/0h of 32300 corpus (23052s/9248h FVGT) 11/14/06 -##counts FRT_XANAX1 29s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -##body FRT_XANAX2 /\b(?!xanax)\b/i -##describe FRT_XANAX2 ReplaceTags: Xanax (2) -###score FRT_XANAX2 2.892 -##replace_rules FRT_XANAX2 -##counts FRT_XANAX2 69s/0h of 27206 corpus (18125s/9081h FVGT) 11/10/06 -##counts FRT_XANAX2 72s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06 -# -# -#endif # Mail::SpamAssassin::Plugin::ReplaceTags -# -## EOF -# \ No newline at end of file diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/00_FVGT_File001.readme.txt spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/00_FVGT_File001.readme.txt --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/00_FVGT_File001.readme.txt 2014-03-31 20:40:55.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/00_FVGT_File001.readme.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -# DISABLED ALL RULES 2014-03-31 - AXB - -# 2014-01-20 - AXB - -removed fixed scores in 50_scores.cf for rules in 00_FVGT_File001.cf -seems these were assigned before ruleqa autopromoted rules. - -Testing what gets autopromoted and what should be deprecated. - - -# 2011-11-07 - AXB - -Disabled / Commented out rules which had a hardcoded score of 0 in 50_scores.cf -Also removed those scores from 50_scores.cf - -WARNING: Disabled rules would cause FPs due to replacetags incompatibility with newer SA versions. - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/20_bug_6848_ajb.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/20_bug_6848_ajb.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/20_bug_6848_ajb.cf 2014-01-21 09:36:26.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/20_bug_6848_ajb.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# DISABLED 2014-01-21-Axb - -## samples rules submitted by Alex Boyer (NO CLA) -## 2012-09-03 -# -#ifplugin Mail::SpamAssassin::Plugin::URIDetail -# -### Canada Post -#uri_detail AJB_CANPOST_BADLINK raw !~ /canadapost\./ text =~ /(?:https?:\/\/|www\.)canadapost\./ type =~ /^a$/ -#describe AJB_CANPOST_BADLINK Found a mismatch between href and anchored text pretending to link to www.canadapost.ca -## score AJB_UTUBE_BADLINK 1.0 -##tflags AJB_UTUBE_BADLINK nopublish -# -### youtube -#uri_detail AJB_UTUBE_BADLINK raw !~ /youtube\./ text =~ /(?:https?:\/\/|www\.)youtube\./ type =~ /^a$/ -#describe AJB_UTUBE_BADLINK Found a mismatch between href and anchored text pretending to link to www.youtube.com -##score AJB_UTUBE_BADLINK 0.5 -##tflags AJB_UTUBE_BADLINK nopublish -# -# -# -## because of link trackers (from massmailer for example), we must meta this with other rulz to be sure we face our fake yutube botnet -#header __AJB_EMPTY_SUBJ Subject =~ /^$/ -#tflags __AJB_EMPTY_SUBJ nopublish -# -#meta AJB_FK_UTUBE_BOTNET AJB_UTUBE_BADLINK && MIME_HTML_ONLY && __AJB_EMPTY_SUBJ -#describe AJB_FK_UTUBE_BOTNET mismatch between href and anchored + empty subject = botnet -##score AJB_FK_UTUBE_BOTNET 5.5 -#tflags AJB_FK_UTUBE_BOTNET nopublish -# -#endif -# \ No newline at end of file diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/sa-list-template.txt spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/sa-list-template.txt --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/sa-list-template.txt 2014-10-08 15:53:13.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/sa-list-template.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Could you please tell us more about your setup so we get a better picture... - -- Please post missed spam samples in pastebin.com - do not post samples to mailing lists - -- What SA version are you using? and on what operating system? - -- How are you using SA? -(pls specify: amavis, MIMEDefang, a milter, Mailscanner, procmail, Fuglu, etc, etc) - -- Are you using SA in a PC/notebook? or on a server? - -- What plugins are you using? -(pls specify: Razor, Pyzor, DCC, etc) - -- Are you using RBLs? -(specify: at SMTP level, only SA's lookups, etc) - -- Are you using any additional rulesets? - -- Are you using a local, non forwarding, DNS resolver/caching server ? - -- Are you using per/user or site wide Bayes? - -- What Bayes backend are you using? -(specify: default, SDBM, SQL, Redis, other) - -- Are you handling mail for a company, personal email, ISP, one domain, many - domains, etc? diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/sa_users_contrib.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/sa_users_contrib.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/emailed/sa_users_contrib.cf 2014-12-09 08:25:20.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/emailed/sa_users_contrib.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ - -# rule is not getting picked up by masscheck -# Suggested by Rich Wales (NO CLA) 2014-11-10 -#header RW_BOGUS_RCVD_AMAVIS Received =~ /\(amavisd-new,\s+port\s+\d+\).+;\s*for\b/ -#describe RW_BOGUS_RCVD_AMAVIS Contains bogus amavisd-new rcvd header diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/fanf/10_headers.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/fanf/10_headers.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/fanf/10_headers.cf 2010-02-09 12:35:40.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/fanf/10_headers.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# more Received: forgery variants - -# same as RCVD_FORGED_WROTE but allowing capitalized host names -# -header RCVD_FORGED_WROTE2 Received =~ /from [0-9.]+ \(HELO \S+[A-Za-z]+\) by (\S+) with esmtp \(\S+\s\S+\) id \S{6}-\S{6}-\S\S for \S+@\1;/s - -header RCVD_FORGED_WROTE3 Received =~ /from \[[0-9.]+\] \(port=\d+ helo=\S+[A-Za-z]+\) by (\S+) with asmtp id \S{6}-\S{6}-\S\S for \S+@\1;/s - -# Another variant a bit like Sendmail instead of Exim... -# -header RCVD_FORGED_WROTE4 Received =~ /from [0-9.]+ \(HELO \S+[A-Za-z]+\) by (\S+) with \(8[0-9.]+\/8[0-9.]+\) ESMTP [0-9a-z]{14} for \S+@\1;/s - -# Following samples spotted by an eagle-eyed user... -# -# From: TravelDeals -# From: FreeCellPhone -# From: PhotographySchool -# From: AirlineTickets7 -# From: HealthHappy -# From: KitchenCabinets -# -header FROM_SPACE_COMMA From =~ /\w+ <\w+ \w+\.\d+[^,@]+,@[a-z0-9.-]+>/i -describe FROM_SPACE_COMMA Distinctive syntax error in from address diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/fanf/20_uri_tests.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/fanf/20_uri_tests.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/fanf/20_uri_tests.cf 2006-12-21 15:33:25.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/fanf/20_uri_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# another evil redirector - -uri YAHOO_RDS_REDIR m{^https?://rds\.yahoo\.com/_ylt=}i diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/fanf/30_text.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/fanf/30_text.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/fanf/30_text.cf 2007-05-23 14:18:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/fanf/30_text.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -# bits of text from spam - -body SHORT_TERM_PRICE /short\W+term\W+(target|projected)(\W+price)?/i -body LONG_TERM_PRICE /long\W+term\W+(target|projected)(\W+price)?/i -meta STOCK_PRICES (SHORT_TERM_PRICE && LONG_TERM_PRICE) - -rawbody IMG_ALT_BRACKETS /^[[][]]/ diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/70_dnswl.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/70_dnswl.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/70_dnswl.cf 2011-12-14 19:23:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/70_dnswl.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -# SpamAssassin rules file: DNSWL tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::DNSEval - -# 0.000 0.0000 0.0000 0.500 1.00 -8.00 T_RCVD_IN_DNSWL_HI -# 0.817 0.2509 3.5683 0.066 0.50 1.00 __RCVD_IN_DNSWL -# 0.059 0.0000 0.3481 0.000 0.50 -1.00 T_RCVD_IN_DNSWL_LOW -# 0.163 0.0000 0.9574 0.000 0.00 -4.00 T_RCVD_IN_DNSWL_MED - -header __RCVD_IN_DNSWL eval:check_rbl('dnswl-firsttrusted', 'list.dnswl.org.') -tflags __RCVD_IN_DNSWL nice net -reuse __RCVD_IN_DNSWL - -header RCVD_IN_DNSWL_NONE eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.0$') -describe RCVD_IN_DNSWL_NONE Sender listed at http://www.dnswl.org/, no trust -tflags RCVD_IN_DNSWL_NONE nice net -reuse RCVD_IN_DNSWL_NONE - -header RCVD_IN_DNSWL_LOW eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.1$') -describe RCVD_IN_DNSWL_LOW Sender listed at http://www.dnswl.org/, low trust -tflags RCVD_IN_DNSWL_LOW nice net -reuse RCVD_IN_DNSWL_LOW - -header RCVD_IN_DNSWL_MED eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.2$') -describe RCVD_IN_DNSWL_MED Sender listed at http://www.dnswl.org/, medium trust -tflags RCVD_IN_DNSWL_MED nice net -reuse RCVD_IN_DNSWL_MED - -header RCVD_IN_DNSWL_HI eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.3$') -describe RCVD_IN_DNSWL_HI Sender listed at http://www.dnswl.org/, high trust -tflags RCVD_IN_DNSWL_HI nice net -reuse RCVD_IN_DNSWL_HI - -## score RCVD_IN_DNSWL_LOW -1 -## score RCVD_IN_DNSWL_MED -4 -## score RCVD_IN_DNSWL_HI -8 - -header RCVD_IN_DNSWL_BLOCKED eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.255$') -describe RCVD_IN_DNSWL_BLOCKED ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists\#dnsbl-block for more information. -tflags RCVD_IN_DNSWL_BLOCKED net noautolearn -reuse RCVD_IN_DNSWL_BLOCKED - -endif diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/70_iadb.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/70_iadb.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/70_iadb.cf 2011-05-04 20:31:04.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/70_iadb.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,225 +0,0 @@ -# SpamAssassin rules file: IADB tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -# via: http://isipp.com/iadbcodes.php - -# 127.0.0.1 Listed in IADB -# 127.0.0.2 Listed in IADB (Alternate to 127.0.0.1) -# 127.0.1.255 Vouched listing* -# 127.0.2.1 Participates in Email Deliverability Database (EDDB) -# 127.0.2.2 Is a member of the Email Processing Industry Alliance (EPIA) -# 127.2.255.1 Publishes SPF record -# 127.2.255.2 Publishes Microsoft "Sender I.D." record -# 127.2.255.3 Publishes Domain Keys record -# 127.2.255.4 Publishes rDNS -# 127.2.255.101 Participates in Habeas program -# 127.2.255.102 Participates in Ironport's Bonded Sender program -# 127.2.255.103 Is a GoodMail certified sender -# 127.3.100.0 Has absolutely no mailing controls in place -# 127.3.100.1 Scrapes addresses, pure opt-out only -# 127.3.100.2 Accepts unverified sign-ups such as through web page -# 127.3.100.3 Accepts unverified sign-ups, gives chance to opt out -# 127.3.100.4 Adds only customer and inquirer email addresses to mailing list without opt-in, gives chance to opt out -# 127.3.100.5 Has opt-in mechanism available, used less than 50% of the time -# 127.3.100.6 Has opt-in mechanism available, used more than 50% of the time -# 127.3.100.7 All mailing list mail is opt-in -# 127.3.100.8 All mailing list mail is at least opt-in, and has confirmed (double) opt-in mechanism available, used less than 50% of the time -# 127.3.100.9 All mailing list mail is at least opt-in, and has confirmed (double) opt-in mechanism available, used more than 50% of the time -# 127.3.100.10 All mailing list mail is confirmed (double) opt-in -# 127.3.100.100 The only email which comes from this IP address is mailing list email, and that mailing list email is entirely confirmed (double) opt-in -# 127.3.100.200 The only email which comes from this IP address is one-to-one or transactional email. No bulk email is sent from this IP address -# 127.101.001.10 Complies with Michigan's Child Protection Email Address Registry law -# 127.101.002.10 Complies with Utah's Child Protection Email Address Registry law -# 127.101.101.10 Has checked mailing lists against the Michigan Child Protective Registry within last 30 days -# 127.101.102.10 Has checked mailing lists against the Utah Child Protective Registry within last 30 days -# 127.101.201.10 This IP address sends no material which falls under the Michigan Child Protective Registry law -# 127.101.202.10 This IP address sends no material which falls under the Utah Child Protective Registry law - -########################################################################### - -ifplugin Mail::SpamAssassin::Plugin::DNSEval - -## IADB support ... -## these commented sections are already included in 20_dnsbl_tests.cf -# -#header __RCVD_IN_IADB eval:check_rbl('iadb-firsttrusted', 'iadb.isipp.com.') -#tflags __RCVD_IN_IADB net nice -# -#header RCVD_IN_IADB_VOUCHED eval:check_rbl_sub('iadb-firsttrusted', '127.0.1.255') -#describe RCVD_IN_IADB_VOUCHED ISIPP IADB lists as vouched-for sender -#tflags RCVD_IN_IADB_VOUCHED net nice - -header RCVD_IN_IADB_LISTED eval:check_rbl_sub('iadb-firsttrusted', '^127\.0\.0\.[12]$') -describe RCVD_IN_IADB_LISTED Participates in the IADB system -tflags RCVD_IN_IADB_LISTED net nice -reuse RCVD_IN_IADB_LISTED - -########################################################################### - -header RCVD_IN_IADB_EDDB eval:check_rbl_sub('iadb-firsttrusted', '127.0.2.1') -describe RCVD_IN_IADB_EDDB IADB: Participates in Email Deliverability Database -tflags RCVD_IN_IADB_EDDB net nice -reuse RCVD_IN_IADB_EDDB - -header RCVD_IN_IADB_EPIA eval:check_rbl_sub('iadb-firsttrusted', '127.0.2.2') -describe RCVD_IN_IADB_EPIA IADB: Member of Email Processing Industry Alliance -tflags RCVD_IN_IADB_EPIA net nice -reuse RCVD_IN_IADB_EPIA - -header RCVD_IN_IADB_SPF eval:check_rbl_sub('iadb-firsttrusted', '127.2.255.1') -describe RCVD_IN_IADB_SPF IADB: Sender publishes SPF record -tflags RCVD_IN_IADB_SPF net nice -reuse RCVD_IN_IADB_SPF - -header RCVD_IN_IADB_SENDERID eval:check_rbl_sub('iadb-firsttrusted', '127.2.255.2') -describe RCVD_IN_IADB_SENDERID IADB: Sender publishes Sender ID record -tflags RCVD_IN_IADB_SENDERID net nice -reuse RCVD_IN_IADB_SENDERID - -header RCVD_IN_IADB_DK eval:check_rbl_sub('iadb-firsttrusted', '127.2.255.3') -describe RCVD_IN_IADB_DK IADB: Sender publishes Domain Keys record -tflags RCVD_IN_IADB_DK net nice -reuse RCVD_IN_IADB_DK - -header RCVD_IN_IADB_RDNS eval:check_rbl_sub('iadb-firsttrusted', '127.2.255.4') -describe RCVD_IN_IADB_RDNS IADB: Sender has reverse DNS record -tflags RCVD_IN_IADB_RDNS net nice -reuse RCVD_IN_IADB_RDNS - -# we already check for this -#header RCVD_IN_IADB_HABEAS eval:check_rbl_sub('iadb-firsttrusted', '127.2.255.101') -#describe RCVD_IN_IADB_HABEAS IADB: Sender participates in Habeas program -#tflags RCVD_IN_IADB_HABEAS net nice - -# we already check for this -#header RCVD_IN_IADB_BONDEDSENDER eval:check_rbl_sub('iadb-firsttrusted', '127.2.255.102') -#describe RCVD_IN_AIDB_BONDEDSENDER IADB: Sender participates in Bonded Sender program -#tflags RCVD_IN_IADB_BONDEDSENDER net nice - -header RCVD_IN_IADB_GOODMAIL eval:check_rbl_sub('iadb-firsttrusted', '127.2.255.103') -describe RCVD_IN_IADB_GOODMAIL IADB: Sender has been certified by GoodMail -tflags RCVD_IN_IADB_GOODMAIL net nice -reuse RCVD_IN_IADB_GOODMAIL - -########################################################################### - -header RCVD_IN_IADB_NOCONTROL eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.0') -describe RCVD_IN_IADB_NOCONTROL IADB: Has absolutely no mailing controls in place -tflags RCVD_IN_IADB_NOCONTROL net nice -reuse RCVD_IN_IADB_NOCONTROL - -header RCVD_IN_IADB_OPTOUTONLY eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.1') -describe RCVD_IN_IADB_OPTOUTONLY IADB: Scrapes addresses, pure opt-out only -tflags RCVD_IN_IADB_OPTOUTONLY net nice -reuse RCVD_IN_IADB_OPTOUTONLY - -header RCVD_IN_IADB_UNVERIFIED_1 eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.2') -describe RCVD_IN_IADB_UNVERIFIED_1 IADB: Accepts unverified sign-ups -tflags RCVD_IN_IADB_UNVERIFIED_1 net nice -reuse RCVD_IN_IADB_UNVERIFIED_1 - -header RCVD_IN_IADB_UNVERIFIED_2 eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.3') -describe RCVD_IN_IADB_UNVERIFIED_2 IADB: Accepts unverified sign-ups, gives chance to opt out -tflags RCVD_IN_IADB_UNVERIFIED_2 net nice -reuse RCVD_IN_IADB_UNVERIFIED_2 - -header RCVD_IN_IADB_LOOSE eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.4') -describe RCVD_IN_IADB_LOOSE IADB: Adds relationship addrs w/out opt-in -tflags RCVD_IN_IADB_LOOSE net nice -reuse RCVD_IN_IADB_LOOSE - -header RCVD_IN_IADB_OPTIN_LT50 eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.5') -describe RCVD_IN_IADB_OPTIN_LT50 IADB: Opt-in used less than 50% of the time -tflags RCVD_IN_IADB_OPTIN_LT50 net nice -reuse RCVD_IN_IADB_OPTIN_LT50 - -header RCVD_IN_IADB_OPTIN_GT50 eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.6') -describe RCVD_IN_IADB_OPTIN_GT50 IADB: Opt-in used more than 50% of the time -tflags RCVD_IN_IADB_OPTIN_GT50 net nice -reuse RCVD_IN_IADB_OPTIN_GT50 - -header RCVD_IN_IADB_OPTIN eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.7') -describe RCVD_IN_IADB_OPTIN IADB: All mailing list mail is opt-in -tflags RCVD_IN_IADB_OPTIN net nice -reuse RCVD_IN_IADB_OPTIN - -header RCVD_IN_IADB_DOPTIN_LT50 eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.8') -describe RCVD_IN_IADB_DOPTIN_LT50 IADB: Confirmed opt-in used less than 50% of the time -tflags RCVD_IN_IADB_DOPTIN_LT50 net nice -reuse RCVD_IN_IADB_DOPTIN_LT50 - -header RCVD_IN_IADB_DOPTIN_GT50 eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.9') -describe RCVD_IN_IADB_DOPTIN_GT50 IADB: Confirmed opt-in used more than 50% of the time -tflags RCVD_IN_IADB_DOPTIN_GT50 net nice -reuse RCVD_IN_IADB_DOPTIN_GT50 - -header RCVD_IN_IADB_DOPTIN eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.10') -describe RCVD_IN_IADB_DOPTIN IADB: All mailing list mail is confirmed opt-in -tflags RCVD_IN_IADB_DOPTIN net nice -reuse RCVD_IN_IADB_DOPTIN - -header RCVD_IN_IADB_ML_DOPTIN eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.100') -describe RCVD_IN_IADB_ML_DOPTIN IADB: Mailing list email only, confirmed opt-in -tflags RCVD_IN_IADB_ML_DOPTIN net nice -reuse RCVD_IN_IADB_ML_DOPTIN - -header RCVD_IN_IADB_OOO eval:check_rbl_sub('iadb-firsttrusted', '127.3.100.200') -describe RCVD_IN_IADB_OOO IADB: One-to-one/transactional email only -tflags RCVD_IN_IADB_OOO net nice -reuse RCVD_IN_IADB_OOO - -########################################################################### - -header RCVD_IN_IADB_MI_CPEAR eval:check_rbl_sub('iadb-firsttrusted', '127.101.1.10') -describe RCVD_IN_IADB_MI_CPEAR IADB: Complies with Michigan's CPEAR law -tflags RCVD_IN_IADB_MI_CPEAR net nice -reuse RCVD_IN_IADB_MI_CPEAR - -header RCVD_IN_IADB_UT_CPEAR eval:check_rbl_sub('iadb-firsttrusted', '127.101.2.10') -describe RCVD_IN_IADB_UT_CPEAR IADB: Complies with Utah's CPEAR law -tflags RCVD_IN_IADB_UT_CPEAR net nice -reuse RCVD_IN_IADB_UT_CPEAR - -header RCVD_IN_IADB_MI_CPR_30 eval:check_rbl_sub('iadb-firsttrusted', '127.101.101.10') -describe RCVD_IN_IADB_MI_CPR_30 IADB: Checked lists against Michigan's CPR within 30 days -tflags RCVD_IN_IADB_MI_CPR_30 net nice -reuse RCVD_IN_IADB_MI_CPR_30 - -header RCVD_IN_IADB_UT_CPR_30 eval:check_rbl_sub('iadb-firsttrusted', '127.101.102.10') -describe RCVD_IN_IADB_UT_CPR_30 IADB: Checked lists against Utah's CPR within 30 days -tflags RCVD_IN_IADB_UT_CPR_30 net nice -reuse RCVD_IN_IADB_UT_CPR_30 - -header RCVD_IN_IADB_MI_CPR_MAT eval:check_rbl_sub('iadb-firsttrusted', '127.101.201.10') -describe RCVD_IN_IADB_MI_CPR_MAT IADB: Sends no material under Michigan's CPR -tflags RCVD_IN_IADB_MI_CPR_MAT net nice -reuse RCVD_IN_IADB_MI_CPR_MAT - -header RCVD_IN_IADB_UT_CPR_MAT eval:check_rbl_sub('iadb-firsttrusted', '127.101.202.10') -describe RCVD_IN_IADB_UT_CPR_MAT IADB: Sends no material under Utah's CPR -tflags RCVD_IN_IADB_UT_CPR_MAT net nice -reuse RCVD_IN_IADB_UT_CPR_MAT - -endif diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/70_other.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/70_other.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/70_other.cf 2014-09-10 05:27:12.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/70_other.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,424 +0,0 @@ -# Rules from what was "rules/70_testing.cf", a temporary new home -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -######################################################################## - -# 5.180 6.1536 0.0221 0.996 0.00 0.00 T_INVALID_DATE -# 5.261 6.1703 0.4419 0.933 0.00 0.00 INVALID_DATE -# I found a few whitespace issues in the original RE, and I wanted to avoid my -# two common, but yes invalid, date headers. specifically / \(GMT\)$/ and -# / 0000 GMT$/. dos has / "GMT"$/ -#header INVALID_DATE Date !~ /^\s*(?:(?i:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s)?\s*(?:[12]\d|3[01]|0?[1-9])\s+(?i:Jan|Feb|Ma[ry]|Apr|Ju[nl]|Aug|Sep|Oct|Nov|Dec)\s+(?:19[7-9]\d|2\d{3})\s+(?:[01]?\d|2[0-3])\:[0-5]\d(?::(?:[0-5]\d|60))?\s+(?:[AP]M\s+)?(?:[+-][0-9]{4}|UT|[A-Z]{2,3}T)(?:\s+\(.*\))?\s*$/ [if-unset: Wed, 31 Jul 2002 16:41:57 +0200] -#header T_INVALID_DATE Date !~ /^\s*(?:(?i:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s)?\s*(?:[12]\d|3[01]|0?[1-9])\s+(?i:Jan|Feb|Ma[ry]|Apr|Ju[nl]|Aug|Sep|Oct|Nov|Dec)\s+(?:19[7-9]\d|2\d{3})\s+(?:[01]?\d|2[0-3])\:[0-5]\d(?::(?:[0-5]\d|60))?(?:\s+[AP]M)?(?:\s+(?:[+-][0-9]{4}|UT|[A-Z]{2,3}T|0000 GMT))?(?:\s*\(.*\))?\s*$/ [if-unset: Wed, 31 Jul 2002 16:41:57 +0200] -#header T_INVALID_DATE2 Date !~ /^\s*(?:(?i:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s)?\s*(?:[12]\d|3[01]|0?[1-9])\s+(?i:Jan|Feb|Ma[ry]|Apr|Ju[nl]|Aug|Sep|Oct|Nov|Dec)\s+(?:19[7-9]\d|2\d{3})\s+(?:[01]?\d|2[0-3])\:[0-5]\d(?::(?:[0-5]\d|60))?(?:\s+[AP]M)?(?:\s+(?:[+-][0-9]{4}|UT|[A-Z]{2,3}T|0000 GMT|"GMT"))?(?:\s*\(.*\))?\s*$/ [if-unset: Wed, 31 Jul 2002 16:41:57 +0200] - -# 4.470 5.2627 0.0000 1.000 1.00 0.00 T_TVD_SILLY_URI_OBFU -# allow the obfuscation around the tld as well -body TVD_SILLY_URI_OBFU m!https?://[a-z0-9-]+\.[a-z0-9-]*\.?[^a-z0-9.:/\s"'\@?\)>-]+[a-z0-9.-]*[a-z]{3}(?:\s|$)!i -describe TVD_SILLY_URI_OBFU URI obfuscation that can fool a URIBL or a uri rule - -# much more generic -- since the current spammer(s) are using com domains, -# let's specifically just look for when they do something like "example*com" -# or "example-com", etc. -#body T_TVD_SILLY_URI_OBFU_COM m!https?://[^/]+[^.]com(?:[/\s]|$)!i - -ifplugin Mail::SpamAssassin::Plugin::ReplaceTags - -# 0.446 0.5767 0.0009 0.998 0.78 0.01 T_FUZZY_SPRM -body FUZZY_SPRM /

    /i -replace_rules FUZZY_SPRM - -# 0.115 0.1326 0.0000 1.000 0.80 0.01 T_FUZZY_MERIDIA -body FUZZY_MERIDIA /\b(?!meridia)\b/i -replace_rules FUZZY_MERIDIA -describe FUZZY_MERIDIA Obfuscation of the word "meridia" - -# bug 4773 -body TVD_FUZZY_PHARMACEUTICAL /(?!pharmaceutical)

    /i -replace_rules TVD_FUZZY_PHARMACEUTICAL -describe TVD_FUZZY_PHARMACEUTICAL Obfuscation of the word "pharmaceutical" - -body TVD_FUZZY_SYMBOL /(?!symbol)/i -replace_rules TVD_FUZZY_SYMBOL -describe TVD_FUZZY_SYMBOL Obfuscation of the word "symbol" - -# I think the FPs are small enough to accept the extra spam hit rate, but the -# other one is still here if we want to get S/O of 1.0. -# 1.740 2.1249 0.0000 1.000 0.89 1.00 TVD_FUZZY_SECURITIES2 -# 1.912 2.3312 0.0135 0.994 0.88 1.00 TVD_FUZZY_SECURITIES -body TVD_FUZZY_SECURITIES /(?!securities)(?!security es)/i -replace_rules TVD_FUZZY_SECURITIES -#body TVD_FUZZY_SECURITIES2 /(?!securities)/i -#replace_rules TVD_FUZZY_SECURITIES2 - -body TVD_FUZZY_FINANCE /(?!finance)/i -replace_rules TVD_FUZZY_FINANCE -describe TVD_FUZZY_FINANCE Obfuscation of the word "finance" - -body TVD_FUZZY_FIXED_RATE /(?!fixed rate)\s+/i -replace_rules TVD_FUZZY_FIXED_RATE -describe TVD_FUZZY_FIXED_RATE Obfuscation of the phrase "fixed rate" - -body TVD_FUZZY_MICROCAP /(?!microcap)(?!micro-cap)-?

    /i -replace_rules TVD_FUZZY_MICROCAP -describe TVD_FUZZY_MICROCAP Obfuscation of the word "micro-cap" - -body TVD_FUZZY_SECTOR /(?!sector)/i -replace_rules TVD_FUZZY_SECTOR - -# 0.318 0.3838 0.0000 1.000 1.00 0.01 TVD_FUZZY_DEGREE -body TVD_FUZZY_DEGREE /\b(?!degree)\b/i -describe TVD_FUZZY_DEGREE Obfuscation of the word "degree" -replace_rules TVD_FUZZY_DEGREE - -endif - -######################################################################## - -# 0.181 0.2347 0.0000 1.000 0.68 0.01 T_DEAR_WINNER -body DEAR_WINNER /\bdear.{1,20}winner/i -describe DEAR_WINNER Spam with generic salutation of "dear winner" - -# 18.685 24.1565 0.0671 0.997 0.87 0.01 T_SUBJECT_NEEDS_ENCODING -meta SUBJECT_NEEDS_ENCODING (!__SUBJECT_ENCODED_B64 && !__SUBJECT_ENCODED_QP) && __SUBJECT_NEEDS_MIME -describe SUBJECT_NEEDS_ENCODING Subject is encoded but does not specify the encoding - -# 0.310 0.4008 0.0000 1.000 0.74 0.01 T_DRUGS_HDIA -header DRUGS_HDIA Subject =~ /\bhoodia\b/i -describe DRUGS_HDIA Subject mentions "hoodia" - -# 0.197 0.2525 0.0066 0.974 0.67 0.01 T_TVD_FROM_1 -header TVD_FROM_1 From:addr =~ /[^\@0-9]{2}\d{3}\.(?:com|net|org|info|biz)$/i -#KAM: 2013-05-17 added 1.0 to put a ceiling on this score because it's currently hitting 3.5 which is far too high -score TVD_FROM_1 1.0 -describe TVD_FROM_1 From address appears to be a throwaway domain - -# doesn't hit a lot, but seems to hit mostly on phishing mails -# 0.062 0.0800 0.0000 1.000 0.58 0.01 T_TVD_RATWARE_CB -header TVD_RATWARE_CB Content-Type =~ /\bboundary\b.{1,40}qzsoft_directmail_seperator/i -describe TVD_RATWARE_CB Content-Type header that is commonly indicative of ratware - -header TVD_SUBJ_WIPE_DEBT Subject =~ /(?:wipe out|remove|get (?:rid|out) of|eradicate) .{0,20}(?:owe|debt|obligation)/i -describe TVD_SUBJ_WIPE_DEBT Spam advertising a way to eliminate debt - -header TVD_SUBJ_APPR_LOAN Subject =~ /approved? .{0,20}loan/i - -header __HEAD_X_KERNEL exists:X-Kernel -header __USER_AGENT_MUTT User-Agent =~ /^Mutt / -meta TVD_HEAD_KERNEL __HEAD_X_KERNEL && !__USER_AGENT_MUTT - -header TVD_HEAD_EDITION exists:X-Edition -header TVD_HEAD_USR exists:X-Usr - -body TVD_ACT_193 /\bact of (?:193|nineteen thirty)/i -describe TVD_ACT_193 Message refers to an act passed in the 1930s - -body TVD_APPROVED /you.{1,2}re .{0,20}approved/i -describe TVD_APPROVED Body states that the recipient has been approved - -body TVD_APP_LOAN /approved .{0,20}loan/i -body TVD_COMPANY_PICK /company .{2,20}hot pick/i - -body TVD_DEAR_HOMEOWNER /^dear homeowner/i -describe TVD_DEAR_HOMEOWNER Spam with generic salutation of "dear homeowner" - -body TVD_ENHANCE /(?:enhanc(?:e(?:ment)?|ing)|improv(?:e|ing)) .{0,20}sexual (?:stamina|performance)/i -body __TVD_GET_STOCK /(?i:OTC)[^-\/\\'.]{2,8}(?:[A-Z]\s*){3,5}\b/ -meta TVD_GET_STOCK __TVD_GET_STOCK && !__VIA_ML && !__DKIM_EXISTS && !__LCL__ENV_AND_HDR_FROM_MATCH && !__RP_MATCHES_RCVD && !__BUGGED_IMG && !__MSOE_MID_WRONG_CASE - -body TVD_INCREASE_SIZE /\bsize of .{1,20}(?:penis|dick|manhood)/i -describe TVD_INCREASE_SIZE Advertising for penis enlargement - -body TVD_LONG_WORD5 /^(?:(?:\w+,?\s+)\.)+\s*$/ -body TVD_NOT_SATISFIED /not satisfied .{1,32}(?:lover|size)/i - -body TVD_SECTION /\bSection (?:27A|21B)/i -describe TVD_SECTION References to specific legal codes - -body TVD_UNDER_VALUED /(?:company|stock) .{1,20}under-?valued/i -body TVD_VISIT_PHARMA /Online Ph.rmacy/i -describe TVD_VISIT_PHARMA Body mentions online pharmacy - -header TVD_SUBJ_OWE Subject =~ /^\s*(?:\w+\s+)+you\s+(?:\w+\s+)*(?:owe|indebted)\s+(?:\w+\s+)+an\s*other/i -describe TVD_SUBJ_OWE Subject line states that the recipieint is in debt - -# 0.153 0.1870 0.0000 1.000 0.64 0.01 TVD_DOLLARS_US -body TVD_DOLLARS_US /\s\d[\d.,]+US/ - -# Ok, I've said in the past that full rules are evil and that we should never -# use them. While I do think that they're nasty and are almost always not the -# most efficient way to go about things, in this case, unfortunately, -# I think it actually is the most efficient way to do this search. :( -# BTW: a raw (non-encoded) NUL char (ASCII 0) is forbidden by RFC2822, though -# it seems to show up in spams a lot these days. MTAs -- deny these mails! -# -# 2.548 3.0152 0.0000 1.000 1.00 1.00 NULL_IN_BODY -full NULL_IN_BODY /\x00/ -describe NULL_IN_BODY Message has NUL (ASCII 0) byte in message - -######################################################################## - -ifplugin Mail::SpamAssassin::Plugin::MIMEHeader - -mimeheader __GIF_ATTACH Content-Type =~ /^image\/gif\b/i - -# 5.679 6.6610 0.0203 0.997 0.92 1.00 TVD_FW_GRAPHIC_ID1 -# 0.339 0.3980 0.0000 1.000 0.50 1.00 TVD_FW_GRAPHIC_ID2 -mimeheader __TVD_FW_GRAPHIC_ID1 Content-Id =~ /<[0-9a-f]{12}(?:\$[0-9a-f]{8}){2}\@/ -mimeheader TVD_FW_GRAPHIC_ID2 Content-Id =~ /<(?:[0-9A-F]{8}\.){3}[0-9A-F]{8}/ - -# 0.908 1.0658 0.0000 1.000 1.00 0.01 TVD_FW_GRAPHIC_ID3 -# this appears to be a standard CID for Outlook so it FPs -# the spams appear to let the MTA create the Message-ID, so I think that's -# what we need to key off for this... -mimeheader __TVD_OUTLOOK_IMG Content-Id =~ /\s*[a-zA-Z]\s*\s*[a-zA-Z]+\s*<(?:div|span)\b/i -rawbody TVD_SINGLE_SPAN_DIV />\s+[a-zA-Z]\s+<\/(?:span|div)\b/i - -# 1.150 1.3983 0.0000 1.000 0.87 0.01 T_TVD_FLOAT_GENERAL4 -# 1.140 1.3860 0.0000 1.000 0.87 0.01 T_TVD_FLOAT_GENERAL6 -# 1.100 1.3379 0.0000 1.000 0.87 0.01 T_TVD_FLOAT_GENERAL5 -# was TVD_FLOAT_GENERAL4 ... -rawbody TVD_FLOAT_GENERAL /\bstyle\s*=\s*"[^"]*\bfloat\s*:\s*[a-z]+\s*">\s*[a-zA-Z]+\s*\s*[a-zA-Z]\s*\s*(?-i:[a-z])+\s*]+style\s*=\s*"visibility:\s*hidden\b/i -describe TVD_VIS_HIDDEN Invisible textarea HTML tags - -# 0.255 0.3074 0.0000 1.000 1.00 0.01 TVD_RATWARE_MSGID_01 -header TVD_RATWARE_MSGID_01 Message-ID =~ /<[a-z0-9]{2}-/ - -# 0.776 0.9389 0.0000 1.000 1.00 0.01 T_TVD_SUBJ_FINGER_04 -header TVD_SUBJ_FINGER_04 Subject =~ /^(?:(?:Re|Fw)[^:]{0,5}: )?[A-Z]+[\/a-zA-Z]+[A-Z]+\s+(?i:news)?\s*$/ - -# 0.091 0.1095 0.0000 1.000 1.00 0.01 T_TVD_RATWARE_CB_2 -# 0.074 0.0892 0.0000 1.000 0.67 0.01 T_TVD_QUAL_MEDS -# 0.044 0.0527 0.0000 1.000 0.33 0.01 T_TVD_LINK_SAVE -# 0.044 0.0527 0.0000 1.000 0.33 0.01 T_TVD_SUBJ_END_STAR -# 0.044 0.0527 0.0000 1.000 0.33 0.01 T_TVD_BODY_END_STAR -header TVD_SUBJ_END_STAR Subject =~ /(?:[A-Z0-9]+\*[,\s]+){2}/ -body TVD_BODY_END_STAR /(?:[A-Z0-9]+\*[,\s]+){2}/ - -body TVD_QUAL_MEDS /\bquality med(?:ication)?s\b/i -describe TVD_QUAL_MEDS The body matches phrases such as "quality meds" or "quality medication" - -body TVD_LINK_SAVE /\blink to save\b/i -describe TVD_LINK_SAVE Spam with the text "link to save" - -header TVD_RATWARE_CB_2 Content-Type =~ /\bboundary\s*=\s*"?-+\d+=+\.MRA/ -describe TVD_RATWARE_CB_2 Content-Type header that is commonly indicative of ratware - -# 0.650 0.7944 0.0000 1.000 1.00 0.01 TVD_MSGID_LOWERCASE -# this came up on the irc channel -header TVD_RATWARE_MSGID_02 Message-ID =~ /^[^<]*<[a-z]+\@/ -describe TVD_RATWARE_MSGID_02 Ratware with a Message-ID header that is entirely lower-case - -######################################################################## -#loadplugin Mail::SpamAssassin::Plugin::Sandbox::felicity sandbox-felicity.pm -#ifplugin Mail::SpamAssassin::Plugin::Sandbox::felicity -#endif -######################################################################## - -ifplugin Mail::SpamAssassin::Plugin::MIMEEval - -# It came up on the users@ list that some spammers generate base64 encoded -# parts with a single or a handful of long lines over the standard length, -# which hovers around 77 chars on average. -# 0.798 0.9651 0.0000 1.000 0.86 0.00 BASE64_LENGTH_79_INF -# 0.170 0.2047 0.0020 0.990 0.69 0.00 BASE64_LENGTH_78_79 -body BASE64_LENGTH_78_79 eval:check_base64_length('78','79') -describe BASE64_LENGTH_79_INF base64 encoded email part uses line length of 78 or 79 characters - -body BASE64_LENGTH_79_INF eval:check_base64_length('79') -describe BASE64_LENGTH_79_INF base64 encoded email part uses line length greater than 79 characters - -# 0.177 0.2037 0.0000 1.000 0.00 0.00 TVD_MIME_EPI -# with one exception, my FPs are all mails through mailing lists that tack on -# a footer to all mails, outside the MIME boundary. -# the one exception is a malformed mail which repeated the text/html -# part content after the closing boundary. -# -body T_TVD_MIME_EPI eval:check_msg_parse_flags('mime_epilogue_exists') -body T_TVD_MIME_NO_HEADERS eval:check_msg_parse_flags('missing_mime_headers') - -endif - -# these don't have a large enough hitrate to be real rules, but it may be -# useful to track over time since they are 100% definite obfuscation -# techniques -- and both HEX and OCT may be used at the same time... -# -# 0.029 0.0344 0.0025 0.933 0.50 0.01 T_TVD_IP_HEX -# 0.014 0.0168 0.0000 1.000 0.48 0.01 T_TVD_IP_SING_HEX -# 0.007 0.0079 0.0012 0.864 0.46 0.01 T_TVD_IP_OCT -# -# http://0x7f000001/ -uri TVD_IP_SING_HEX m@^https?://0x[0-9a-f]+(?:[:/]|$)@i -# http://0x7f.0.0.1/ -uri TVD_IP_HEX m@^https?://(?:\d+\.){0,3}0x[0-9a-f]{2}@i -# http://0177.0.0.1/ -uri TVD_IP_OCT m@^https?://(?:(?:0x[0-9a-f]+|\d+)\.){0,3}0+(?:[1-3][0-7]{0,2}|[4-7][0-7]?)(?:\.(?:0x[0-9a-f]+|\d+)){0,3}(?:[:/]|$)@i - -# 0.274 0.3212 0.0000 1.000 1.00 1.00 TVD_RCVD_10 -# lots of Received headers seem to have dates in brackets, so just look for a space: -# Received: from qrx.quickslick.com ([Thu, 28 Dec 2006 11:38:21 +1200]) -# Received: from noetherian.dielectric.pochta.ru ([unix socket]) -# -# FPs have included: -# Received: from localhost (localhost [[UNIX: localhost]]) -# Received: .* [ConcentricHost ... ] -# Received: .* [XMail ... ] -header TVD_RCVD_SPACE_BRACKET Received =~ /\(\[(?!UNIX:)[^\[\]]*\s/ - -# 12.405 14.5584 0.0000 1.000 1.00 1.00 TVD_RCVD_IP -# 6.088 7.1444 0.0000 1.000 0.50 1.00 TVD_RCVD_IP4 -header TVD_RCVD_IP4 Received =~ /^from\s+(?:\d+\.){3}\d+\s/ -describe TVD_RCVD_IP4 Message was received from an IPv4 address - -header TVD_RCVD_IP Received =~ /^from\s+(?:\d+[^0-9a-zA-Z\s]){3}\d+[.\s]/ -describe TVD_RCVD_IP Message was received from an IP address - -# 1.265 1.4843 0.0000 1.000 1.00 1.00 TVD_RCVD_046 -header TVD_RCVD_SINGLE Received =~ /^from\s+(?!localhost)[^\s.a-z0-9-]+\s/ -describe TVD_RCVD_SINGLE Message was received from localhost - - -ifplugin Mail::SpamAssassin::Plugin::HeaderEval - -# 0.115 0.1333 0.0000 1.000 1.00 1.00 HEADER_COUNT_SUBJECT -header HEADER_COUNT_SUBJECT eval:check_header_count_range('Subject','2','999') -describe HEADER_COUNT_SUBJECT Multiple Subject headers found - -endif - -# 13.245 14.9333 0.0000 1.000 1.00 1.00 RCVD_BAD_ID -# bug 6073, removed colon -header RCVD_BAD_ID Received =~ /\bid\s+[a-zA-Z0-9_+\/\\,-]+(?:[!"\#\$\%&'()*<=>?\@\[\]^\`{|}~]|;\S)/ -describe RCVD_BAD_ID Received header contains id field with bad characters - -# 8.791 10.1359 0.0000 1.000 1.00 1.00 TVD_ENVFROM_APOST -header TVD_ENVFROM_APOST EnvelopeFrom =~ /\'/ -describe TVD_ENVFROM_APOST Envelope From contains single-quote - -ifplugin Mail::SpamAssassin::Plugin::BodyEval -body TVD_STOCK1 eval:check_stock_info('2') -describe TVD_STOCK1 Spam related to stock trading -endif - -# don't use body -rawbody __TVD_BODY /\S{4}/ - -## look for specific content-types -header __TVD_MIME_CT_MM Content-Type =~ /^multipart\/mixed/i -ifplugin Mail::SpamAssassin::Plugin::MIMEHeader -mimeheader __TVD_MIME_ATT_TP Content-Type =~ /^text\/plain/i -mimeheader __TVD_MIME_ATT_AP Content-Type =~ /^application\/pdf/i -mimeheader __TVD_MIME_ATT_AOPDF Content-Type =~ /^application\/octet-stream.*\.pdf/i -endif -meta __TVD_MIME_ATT __TVD_MIME_ATT_AP || __TVD_MIME_ATT_AOPDF - -meta TVD_PDF_FINGER01 __TVD_MIME_CT_MM && __TVD_MIME_ATT_TP && __TVD_MIME_ATT && !__TVD_BODY -describe TVD_PDF_FINGER01 Mail matches standard pdf spam fingerprint - -# I saw someone mention this on the users@ list, does well for my corpus: -# 2.138 2.3093 0.0000 1.000 0.91 TVD_GOOG_LUCKY -uri TVD_GOOG_LUCKY /\bgooo?gle\..*&btnI=/i - -# 1.598 1.6953 0.0000 1.000 1.00 1.00 TVD_SUBJ_NUM_OBFU2 -# 1.598 1.6953 0.0000 1.000 1.00 1.00 TVD_SUBJ_NUM_OBFU3 -# 1.052 1.1163 0.0000 1.000 0.50 1.00 TVD_SUBJ_NUM_OBFU -header T_TVD_SUBJ_NUM_OBFU Subject =~ /[a-z]{3,}\d+[a-z]{2,}/i -header T_TVD_SUBJ_NUM_OBFU2 Subject =~ /[a-z0-9]{2,}[a-z]\d+[a-z][a-z0-9]/i -header T_TVD_SUBJ_NUM_OBFU3 Subject =~ /[a-z0-9]{2,}[a-z]\d+[a-z0-9]*[a-z][a-z0-9]/i - -# 5.550 5.9506 0.0000 1.000 1.00 1.00 TVD_SUBJ_FINGER_07 -# 5.017 5.3791 0.0000 1.000 0.67 1.00 TVD_SUBJ_FINGER_06 -# 0.103 0.1108 0.0000 1.000 0.33 1.00 TVD_SUBJ_FINGER_05 -header T_TVD_SUBJ_FINGER_05 Subject =~ /^(?:[A-Z][a-z]+){2}$/ -header T_TVD_SUBJ_FINGER_06 Subject =~ /^(?:[A-Z][a-z]{3,}){3,}$/ -header TVD_SUBJ_FINGER_07 Subject =~ /^(?:[A-Z][a-z]{2,}){3,}$/ - -# came up on the users@ list, seems to work pretty well for me... -# 0.796 0.8523 0.0000 1.000 1.00 1.00 TVD_PCT_OFF -# 1.225 1.2956 0.2355 0.846 0.50 1.00 TVD_PCT_OFF2 -# 0.787 0.8435 0.0000 1.000 0.50 1.00 TVD_PCT_OFF3 -header TVD_PCT_OFF Subject =~ /(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\S* \d+% OFF/ -header T_TVD_PCT_OFF2 Subject =~ /% OFF/ -header T_TVD_PCT_OFF3 Subject =~ /^(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\S* \d+% OFF/ - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/70_phishing.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/70_phishing.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/70_phishing.cf 2013-10-26 13:33:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/70_phishing.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,175 +0,0 @@ -# Rules from what was "rules/70_testing.cf", a temporary new home -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -######################################################################## - -# 0.142 0.1814 0.0085 0.955 0.63 0.01 T_PH_SEC -# 0.159 0.2061 0.0000 1.000 0.66 0.01 T_PH_REC -body TVD_PH_SEC /\byour .{0,40}account .{0,40}security/i -body TVD_PH_REC /\byour .{0,40}account .{0,40}record/i -describe TVD_PH_SEC Message includes a phrase commonly used in phishing mails -describe TVD_PH_REC Message includes a phrase commonly used in phishing mails - -# 0.234 0.2997 0.0123 0.961 0.68 0.01 T_PH_TVD_7 -# 0.112 0.1390 0.0012 0.992 0.61 0.01 T_PH_TVD_1 -body TVD_PH_7 /\baccount .{0,20}suspen/i -body TVD_PH_1 /Dear valued .{1,40}(?:member|customer)/i - -# 0.153 0.1964 0.0057 0.972 0.64 0.01 T_PH_TVD_FR5 -header __PH_TVD_FROM2 From:addr =~ /\@.*ebay/i -meta TVD_PH_FR5 !__ENV_AND_HDR_FROM_MATCH && __PH_TVD_FROM2 - -# 0.134 0.1736 0.0000 1.000 0.64 0.01 T_PP_PHISH -# 0.124 0.1608 0.0000 1.000 0.64 0.01 T_EB_PHISH -header __FROM_PAYPAL From:addr =~ /\@paypal\.com$/i -header __FROM_EBAY From:addr =~ /\@ebay\.com$/i -meta TVD_PP_PHISH __FROM_PAYPAL && NORMAL_HTTP_TO_IP -meta TVD_EB_PHISH __FROM_EBAY && NORMAL_HTTP_TO_IP - -# 0.209 0.2612 0.0033 0.987 0.69 1.00 TVD_SUBJ_ACC_NUM -header TVD_SUBJ_ACC_NUM Subject =~ /\b[a-zA-Z]+ [\#\s]{1,4}\d+[A-Z]+/ -describe TVD_SUBJ_ACC_NUM Subject has spammy looking monetary reference - -# bug 4457 -# this may be dealt with by other/less complex rules -header __LOCAL_PP_S_UPD Subject: =~ m'(?:confirm|update) (?:your|the) (?:billing )?(?:records?|information|account)'i -body __LOCAL_PP_B_UPD m'(?:confirm|update|verify) (?:your|the) (?:(?:current|billing) )?(?:records?|information|account|identity)'i -body __LOCAL_PP_PPCGIURL m'https?://www.paypal.com/cgi-bin/webscr\?'i -uri __LOCAL_PP_NONPPURL m'https?://(?:[A-Za-z0-9-_]+)\.(?!paypal\.com)(?:[A-Za-z0-9-_\.]+)'i -meta T_LOCAL_PP_UPD_BADURL (__FROM_PAYPAL && ((__LOCAL_PP_B_UPD || __LOCAL_PP_S_UPD) || __LOCAL_PP_PPCGIURL) && __LOCAL_PP_NONPPURL) -describe T_LOCAL_PP_UPD_BADURL paypal account update, but has bad URL - - -ifplugin Mail::SpamAssassin::Plugin::HTTPSMismatch - -# bug 4255: with some ideas from Fred Tarasevicius I came up with a rule that -# performs pretty decently, worthy of a general mass-check: -# 0.186 0.2273 0.0030 0.987 0.66 0.01 T_HTTPS_HTTP_MISMATCH_1_12 -# 0.186 0.2273 0.0030 0.987 0.66 0.01 T_HTTPS_HTTP_MISMATCH_1_13 -# 0.185 0.2253 0.0015 0.993 0.66 0.01 T_HTTPS_HTTP_MISMATCH_1_10 -# 0.187 0.2280 0.0045 0.981 0.66 0.01 T_HTTPS_HTTP_MISMATCH_1_14 -# 0.186 0.2266 0.0030 0.987 0.66 0.01 T_HTTPS_HTTP_MISMATCH_1_11 -# 0.189 0.2280 0.0119 0.951 0.65 0.01 T_HTTPS_HTTP_MISMATCH_1_15 -# 0.003 0.0013 0.0089 0.129 0.43 0.01 T_HTTPS_HTTP_MISMATCH_11_15 -# 0.019 0.0013 0.0965 0.014 0.33 0.01 T_HTTPS_HTTP_MISMATCH_11_20 -# generally, hams seem to have a lot of links, whereas phishing mails don't. -# so compare the domains between https? href and https anchor text, and flag -# if the number of anchors is inside the given range and the domains don't -# match. -# FYI: these rules don't overlap HTTPS_IP_MISMATCH as IPs are ignored in the -# href -- IPs tend not to be used in ham, so don't bother with the overhead of -# this rule. though the two rules are very similar and could definitely share -# code. if promoted, the two should get merged together to backup both rules. - -# used to be T_HTTPS_HTTP_MISMATCH_1_10, has the best results -body HTTPS_HTTP_MISMATCH eval:check_https_http_mismatch('1','10') - -endif - -######################################################################## - -# Phishing usually comes from official sounding email addresses. Could -# potentially be used to lower FPs if necessary. - -#header __TVD_PH_FROM_ACCO From:addr =~ /accounts?\@/i -#header __TVD_PH_FROM_CUST From:addr =~ /customer[^@]*\@/i -#header __TVD_PH_FROM_SUPP From:addr =~ /support\@/i -#header __TVD_PH_FROM_SERV From:addr =~ /service\@/i -#header __TVD_PH_FROM_BILL From:addr =~ /billing\@/i -#header __TVD_PH_FROM_NOTI From:addr =~ /notice\@/i -#header __TVD_PH_FROM_ADMI From:addr =~ /admin\@/i -#header __TVD_PH_FROM_SECU From:addr =~ /secure\@/i -# -#meta __TVD_PH_FROM_ANY __TVD_PH_FROM_ACCO || __TVD_PH_FROM_CUST || __TVD_PH_FROM_SUPP || __TVD_PH_FROM_SERV || __TVD_PH_FROM_BILL || __TVD_PH_FROM_NOTI || __TVD_PH_FROM_ADMI || __TVD_PH_FROM_SECU -#meta T_TVD_PH_FROM_SUBJ_GOOD __TVD_PH_FROM_ANY && T_TVD_PH_SUBJ_GOOD -#meta T_TVD_PH_FROM_SUBJ_GOOD2 __TVD_PH_FROM_ANY && T_TVD_PH_SUBJ_GOOD2 - -######################################################################## - -# Look at subjects for phishing - -# 2011-07-01 Changed by KAM - https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6579 - -#Changed to Sub Rules -header __TVD_PH_SUBJ_ACCOUNTS_PRE Subject =~ /\baccounts? (?:[a-z_,-]+ )*?(?:record[a-z]*|suspen[a-z]+|notif(?:y|ication)|security|updated?|verifications?|confirm[a-z]+)\b/i -header __TVD_PH_SUBJ_SEC_MEASURES Subject =~ /\bsecurity (?:[a-z_,-]+ )*?measures?\b/i -header __TVD_PH_SUBJ_UPDATE Subject =~ /\bupdate (?:[a-z_,-]+ )*?(?:access|credit|records?|info(?:rmation)?)\b/i -header __TVD_PH_SUBJ_URGENT Subject =~ /^urgent(?:[\s\W]*$|.{1,40}(?:alert|response|assistance|proposal|reply|warning|noti(?:ce|fication)|greeting|matter))/i -header __TVD_PH_SUBJ_ACCOUNTS_POST Subject =~ /\b(?:(?:re-?)?(?:activat[a-z]*|verify|validate)|secure|restore|flagged|limited|unusual|update|report|notif(?:y|ication)|suspen(?:d|ded|sion)|co(?:n|m)firm[a-z]*) (?:[-a-z_,]+ )*?accounts?\b/i - -#REMOVED TVD_PH_SUBJ_META_ALL - -#ADDED A META TAG FOR SCORING THE ABOVE RULES SO WE CAN HAVE A SCORE SET. -meta TVD_PH_SUBJ_META1 (__TVD_PH_SUBJ_ACCOUNTS_PRE + __TVD_PH_SUBJ_SEC_MEASURES + __TVD_PH_SUBJ_UPDATE + __TVD_PH_SUBJ_URGENT + __TVD_PH_SUBJ_ACCOUNTS_POST > 0) -score TVD_PH_SUBJ_META1 1.25 -describe TVD_PH_SUBJ_META1 Email has a Phishy looking subject line - -######################################################################## - -# Look for lesser matched REs and meta them together - -# 0.251 0.3023 0.0000 1.000 1.00 0.01 T_TVD_PH_SUBJ_META -meta __TVD_PH_SUBJ_META __TVD_PH_SUBJ_00 || __TVD_PH_SUBJ_02 || __TVD_PH_SUBJ_04 || __TVD_PH_SUBJ_15 || __TVD_PH_SUBJ_17 || __TVD_PH_SUBJ_18 || __TVD_PH_SUBJ_19 || __TVD_PH_SUBJ_29 || __TVD_PH_SUBJ_31 || __TVD_PH_SUBJ_36 || __TVD_PH_SUBJ_37 || __TVD_PH_SUBJ_38 || __TVD_PH_SUBJ_39 || __TVD_PH_SUBJ_41 || __TVD_PH_SUBJ_52 || __TVD_PH_SUBJ_54 || __TVD_PH_SUBJ_56 || __TVD_PH_SUBJ_58 || __TVD_PH_SUBJ_59 || __TVD_PH_SUBJ_ACCESS_POST -meta TVD_PH_SUBJ_META __TVD_PH_SUBJ_META - -header __TVD_PH_SUBJ_00 Subject =~ /\brewards? survey\b/i - -header __TVD_PH_SUBJ_02 Subject =~ /\byour payment has been sent\b/i -header __TVD_PH_SUBJ_04 Subject =~ /\baccounts? profile\b/i -header __TVD_PH_SUBJ_15 Subject =~ /\binvestment for (?:[a-z_,-]+ )*?to(?:morrow|day)\b/i -header __TVD_PH_SUBJ_17 Subject =~ /\bremove limitations?\b/i -header __TVD_PH_SUBJ_18 Subject =~ /\bsecurity (?:[a-z_,-]+ )*?changes\b/i -header __TVD_PH_SUBJ_19 Subject =~ /\bmessage (?:[a-z_,-]+ )*?bank\b/i -header __TVD_PH_SUBJ_29 Subject =~ /^notice(?::|[\s\W]*$)/i -header __TVD_PH_SUBJ_31 Subject =~ /\bsecurity (?:[a-z_,-]+ )*?verification\b/i -header __TVD_PH_SUBJ_36 Subject =~ /\bconsumer notice\b/i -header __TVD_PH_SUBJ_37 Subject =~ /\bvalued member[a-z]*\b/i -header __TVD_PH_SUBJ_38 Subject =~ /\bonline bank[a-z]*\b/i -header __TVD_PH_SUBJ_39 Subject =~ /\bonline department\b/i -header __TVD_PH_SUBJ_41 Subject =~ /\bunusual activity\b/i -header __TVD_PH_SUBJ_52 Subject =~ /\b(?:account|online) profile\b/i -header __TVD_PH_SUBJ_54 Subject =~ /\bun-?authorized access(?:es)?\b/i -header __TVD_PH_SUBJ_56 Subject =~ /\brespond now\b/i -header __TVD_PH_SUBJ_58 Subject =~ /\bbilling service\b/i -header __TVD_PH_SUBJ_59 Subject =~ /\bquestion from (?:[a-z_,-]+ )*?member\b/i -header __TVD_PH_SUBJ_ACCESS_POST Subject =~ /\b(?:(?:re-?)?activat[a-z]*|secure|verify|restore|flagged|limited|unusual|report|notif(?:y|ication)|suspen(?:d|ded|sion)) (?:[a-z_,-]+ )*?access\b/i - -######################################################################## - -meta __TVD_PH_BODY_META __TVD_PH_BODY_01 || __TVD_PH_BODY_02 || __TVD_PH_BODY_03 || __TVD_PH_BODY_04 || __TVD_PH_BODY_05 || __TVD_PH_BODY_06 || __TVD_PH_BODY_07 || __TVD_PH_BODY_08 -meta TVD_PH_BODY_META __TVD_PH_BODY_META -meta TVD_PH_BODY_META_ALL __TVD_PH_BODY_META || __TVD_PH_BODY_ACCOUNTS_PRE || __TVD_PH_BODY_ACCOUNTS_POST -body __TVD_PH_BODY_01 /\baccount .{0,20}placed? [io]n restricted status/i -body __TVD_PH_BODY_02 /\brecords (?:[a-z_,-]+ )+?(?:feature|(?:a|re)ward)/i -body __TVD_PH_BODY_03 /\byou(?:'ve| have) been (?:[a-z_,-]+ )+?payment/i -body __TVD_PH_BODY_04 /\bfunds? (?!transfer from)(?!from)(?!in)(?!via)(?:[a-z_,-]+ )+?to your (?:[a-z_,-]+ )*?account/i -body __TVD_PH_BODY_05 /\bthis is (?:[a-z_,-]+ )+?protect (?:[a-z_,-]+ )+?your/i -body __TVD_PH_BODY_06 /Dear [a-z]+ bank (?:member|customer)/i -body __TVD_PH_BODY_07 /\bguarantee the safety of your (?:[a-z_,-]+ )*?account/i -body __TVD_PH_BODY_08 /\bmultiple password failures/i - -body __TVD_PH_BODY_ACCOUNTS_PRE /\baccounts? (?:[a-z_,-]+ )+?(?:record[a-z]*|suspen[a-z]+|notif(?:y|ication)|updated|verifications?|credited)\b/i -meta TVD_PH_BODY_ACCOUNTS_PRE __TVD_PH_BODY_ACCOUNTS_PRE -describe TVD_PH_BODY_ACCOUNTS_PRE The body matches phrases such as "accounts suspended", "account credited", "account verification" - -body __TVD_PH_BODY_ACCOUNTS_POST /\b(?:(?:[dr]e-?)?activat[a-z]*|(?:re-?)?validate|secure|restore|confirm|update|suspend) (?!your)(?:[a-z_,-]+ )+?accounts?\b/i -meta TVD_PH_BODY_ACCOUNTS_POST __TVD_PH_BODY_ACCOUNTS_POST - - - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/sandbox-felicity.pm spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/sandbox-felicity.pm --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/felicity/sandbox-felicity.pm 2018-02-05 14:10:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/felicity/sandbox-felicity.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -package Mail::SpamAssassin::Plugin::Sandbox::felicity; - -use Mail::SpamAssassin::Plugin; -use Mail::SpamAssassin::Logger; -use strict; -use warnings; -use bytes; - -our @ISA = qw(Mail::SpamAssassin::Plugin); - -# constructor: register the eval rule -sub new { - my $class = shift; - my $mailsaobject = shift; - - # some boilerplate... - $class = ref($class) || $class; - my $self = $class->SUPER::new($mailsaobject); - bless ($self, $class); - - # the important bit! - $self->register_eval_rule ("check_quotedprintable_length"); - - return $self; -} - -sub check_quotedprintable_length { - my $self = shift; - my $pms = shift; - shift; # body array, unnecessary - my $min = shift; - my $max = shift; - - if (!defined $pms->{quotedprintable_length}) { - $pms->{quotedprintable_length} = $self->_check_quotedprintable_length($pms->{msg}); - } - - return 0 if (defined $max && $pms->{quotedprintable_length} > $max); - return $pms->{quotedprintable_length} >= $min; -} - -sub _check_quotedprintable_length { - my $self = shift; - my $msg = shift; - - my $result = 0; - - foreach my $p ($msg->find_parts(qr@.@, 1)) { - my $ctype= - Mail::SpamAssassin::Util::parse_content_type($p->get_header('content-type')); - - my $cte = lc $p->get_header('content-transfer-encoding') || ''; - next if ($cte !~ /^quoted-printable$/); - foreach my $l ( @{$p->raw()} ) { - my $len = length $l; - $result = $len if ($len > $result); - } - } - - return $result; -} - - -1; diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf 2007-02-08 14:35:08.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,190 +0,0 @@ -#From Michel Arboi -header __MISSING_REPLY In-Reply-To =~ /^UNSET$/ [if-unset: UNSET] -header __MISSING_REF References =~ /^UNSET$/ [if-unset: UNSET] -header __MISSING_THREAD Thread-Index =~ /^UNSET$/ [if-unset: UNSET] - -#From FreddyT -header __SUBJ_RE Subject =~ /^R[eE]:/ -#header __SUBJ_FW Subject =~ /^F[wW][dD]?:/ - -#From http://marc2.theaimsgroup.com/?l=fop-dev&m=104335769809427&w=2 -#Both In-Reply-To and References: -header __XM_BALSA X-Mailer =~ /^Balsa \d/ -header __XM_CALYPSO X-Mailer =~ /^Calypso/ -header __XM_FORTE X-Mailer =~ /^Forte Agent \d/ -header __XM_MHE X-Mailer =~ /^mh-e \d/ -header __XM_SQRLMAIL X-Mailer =~ /^SquirrelMail/ -header __XM_SYLPHEED X-Mailer =~ /^Sylpheed/ -header __XM_THEBAT X-Mailer =~ /^The Bat!/ -header __XM_VM X-Mailer =~ /^VM \d/ -header __XM_XIMEVOL X-Mailer =~ /^Ximian Evolution/ -header __UA_KMAIL User-Agent =~ /^KMail/ -header __UA_MOZ5 User-Agent =~ /^Mozilla\/5/ -header __UA_OPERA7 User-Agent =~ /^Opera7/ -meta __BOTH_INR_AND_REF (__XM_BALSA || __XM_CALYPSO || __XM_FORTE || __XM_MHE || __XM_SQRLMAIL || __XM_SYLPHEED || __XM_THEBAT || __XM_VM || __XM_XIMEVOL || __UA_KMAIL || __UA_MOZ5 || __UA_OPERA7) - -meta NICE_REPLY_A (__SUBJ_RE && !__MISSING_REPLY && !__MISSING_REF && __BOTH_INR_AND_REF) -describe NICE_REPLY_A Looks like a legit relpy (A) -## score NICE_REPLY_A -0.444 -tflags NICE_REPLY_A nopublish -#counts NICE_REPLY_A 0s/45h of 43776 corpus (34010s/9766h FVGT) 11/29/06 - - -meta FAKE_REPLY_A1 (__SUBJ_RE && __MISSING_REPLY && __MISSING_REF && __BOTH_INR_AND_REF) -## score FAKE_REPLY_A1 0.972 -#counts FAKE_REPLY_A1 75s/0h of 43776 corpus (34010s/9766h FVGT) 11/29/06 - - - - -#In-Reply-To but but no References -header __XM_IMAIL X-Mailer =~ /^ 2) -score HK_WIN 1 - -body __HK_LOTTO_1 /\b(?:(?:inter)?national|foundation|mercato|univers|euro ?million|e-?mail|euro-pw|bill ?gates|swiss|prestige|cristal|am.ricaine|coca.?cola|fiduciary|department) ?lot(?:eri[ej]|t(?:ery|o))/i -body __HK_LOTTO_2 /\blot(?:eri[ej]|t(?:ery|o)) ?(?:(?:inter)?national|foundation|mercato|univers|euro ?million|e-?mail|euro-pw|bill ?gates|swiss|prestige|cristal|am.ricaine|coca.?cola|fiduciary|department)/i -body __HK_LOTTO_JACKPOT /\bmega jackpot\b/i -body __HK_LOTTO_STAATS /\bstaatsloteri/i -body __HK_LOTTO_BALLOT /\b(?:promotional|on.?line|computer|internet|e-?mail|fran.aise) (?:ballot|draw|sweepstake)/i -body __HK_LOTTO_AWARD /(?:cash prize|prize awards?|you have been awarded|award (?:notification|notice))/i -meta HK_LOTTO __HK_LOTTO_1 || __HK_LOTTO_2 || __HK_LOTTO_JACKPOT || __HK_LOTTO_STAATS || __HK_LOTTO_BALLOT -score HK_LOTTO 1 - -header HK_LOTTO_SUBJECT Subject =~ /\blot(?:eri[ej]|t(?:ery|o))\b/mi -score HK_LOTTO_SUBJECT 1 -header HK_LOTTO_NAME From =~ /^[^@]*(?:lot(?:eri[ej]|t(?:ery|o))|award|winner)/mi -score HK_LOTTO_NAME 1 - -body HK_SCAM_N1 /\b(?:widow|son|daughter|husband|wife|brother|sister) of (?:the )?(?:late|sacked|dead|passed)\b/i -body HK_SCAM_N2 /\bnext of kin\b/i -body HK_SCAM_N3 /\bdirect telephone numbers?\b/i -body HK_SCAM_N4 /\b(?:e?mail me below|reply (?:me to )?this e?mail (?:at|to)?|send your reply (?:to|at))\b/i -body HK_SCAM_N8 /\byour compensation\b/i -body HK_SCAM_N9 /\bseek for your indulgence\b/i -body HK_SCAM_N12 /\binsured with your email\b/i -body HK_SCAM_N13 /\b(?:business|important|discreet) transaction\b/i -body HK_SCAM_N14 /\bsum of amount\b/i -body HK_SCAM_N15 /\b(?:account (?:overseas?|offshore)|(?:overseas?|offshore) account)\b/i -body HK_SCAM_N16 /\b(?:arrangement secret|secret arrangement)\b/i - -body HK_SCAM_S15 /(?:discovered a dormant account|can you be my partner)/i -body HK_SCAM_S7 /(?:(?:investment|proposed|lucrative) (?:business|venture)|(?:business|venture) (?:enterprise|propos(?:al|ition)))/i -body HK_SCAM_S12 /fidelity investments international/i -body HK_SCAM_S25 /\bbank (?:in|of) ghana/i - -body HK_SCAM_S1 /pay you the sum of/i -body HK_SCAM_S3 /invest(?:ment (?:in your area|partner)|in your country|assist me in an investment)/i -body HK_SCAM_S4 /transfer (?:this|my|of )?funds?/i -body HK_SCAM_S22 /\bmining companies/i -body HK_SCAM_S23 /(?:\b(?:urgent alert|start trade|get it at monday)\b|\b(?:5-|five )day price:)/i - -body HK_GOLDDUST /\bgold ?dust\b/i - -body HK_PNIS /\bpenis\b/i -score HK_PNIS 1 -body HK_PNISES /\bpenises\b/i -score HK_PNISES 1 - -# From Mike Cappella -header __TAB_IN_FROM From:raw =~ /^\t/s -describe __TAB_IN_FROM From starts with a tab -meta TAB_IN_FROM __TAB_IN_FROM && !__ML_TURNS_SP_TO_TAB -describe TAB_IN_FROM From starts with a tab -score TAB_IN_FROM 0.5 - - -#### -#### FreeMail related -#### - -ifplugin Mail::SpamAssassin::Plugin::FreeMail - -#REQUIRING VERSION 3.4 BECAUSE From:name works improperly prior to that version. -if (version >= 3.004000) - header __HK_NAME_MR_MRS From:name =~ /^M(?:RS?|ISS)\b/mi - meta HK_NAME_MR_MRS __HK_NAME_MR_MRS && !FREEMAIL_FROM - score HK_NAME_MR_MRS 1.0 - meta HK_NAME_FM_MR_MRS __HK_NAME_MR_MRS && FREEMAIL_FROM - score HK_NAME_FM_MR_MRS 1.5 -endif - -header __HK_NAME_DR From:name =~ /^DR\b/mi -header __HK_NAME_FROM From:name =~ /^FROM\b/mi -meta HK_NAME_DR __HK_NAME_DR && !FREEMAIL_FROM -score HK_NAME_DR 1.0 -meta HK_NAME_FM_DR __HK_NAME_DR && FREEMAIL_FROM -score HK_NAME_FM_DR 1.5 -meta HK_NAME_FROM __HK_NAME_FROM && !FREEMAIL_FROM -score HK_NAME_FROM 1.0 -meta HK_NAME_FM_FROM __HK_NAME_FROM && FREEMAIL_FROM -score HK_NAME_FM_FROM 1.5 - -endif - - -#### -#### MIMEHeader -#### - -ifplugin Mail::SpamAssassin::Plugin::MIMEHeader - -mimeheader __HK_SPAMMY_CTFN Content-Type =~ /name=.*?(?:lot(?:eri[ej]|t(?:ery|o))|award|prize|winn(?:er|ing)|microsoft|congrat|urgent)/mi -mimeheader __HK_SPAMMY_CDFN Content-Disposition =~ /name=.*?(?:lot(?:eri[ej]|t(?:ery|o))|award|prize|winn(?:er|ing)|microsoft|congrat|urgent)/mi -meta HK_SPAMMY_FILENAME __HK_SPAMMY_CTFN || __HK_SPAMMY_CDFN - -endif - -#### -#### Some fakename tests which rely in SPF & DKIM -#### - -#ifplugin Mail::SpamAssassin::Plugin::SPF -#ifplugin Mail::SpamAssassin::Plugin::DKIM - -# check spf and dkim for all, false hits per bug 6417 - -#header __HK_NAME_MICROSOFT From:name =~ /(microsoft|\bmsn\b)/i -#header __HK_HELO_MICROSOFT X-Spam-Relays-External =~ / helo=\S+\.(?:microsoft(?:email)?|msn)\.com / -#meta HK_FAKENAME_MICROSOFT __HK_NAME_MICROSOFT && !__HK_HELO_MICROSOFT && !SPF_PASS && !DKIM_VALID_AU -#describe HK_FAKENAME_MICROSOFT From name mentions Microsoft, but not relayed from there - -#header __HK_NAME_YAHOO From:name =~ /\byahoo\b/i -#header __HK_HELO_YAHOO X-Spam-Relays-External =~ / helo=[^ ]+\.yahoo\.com / -#meta HK_FAKENAME_YAHOO __HK_NAME_YAHOO && !__HK_HELO_YAHOO && !SPF_PASS && !DKIM_VALID_AU -#describe HK_FAKENAME_YAHOO From name mentions Yahoo, but not relayed from there - -#header __HK_NAME_PAYPAL From:name =~ /\bpaypal\b/i -#header __HK_HELO_PAYPAL X-Spam-Relays-External =~ / helo=[^ ]+\.paypal\b/ -#meta HK_FAKENAME_PAYPAL __HK_NAME_PAYPAL && !__HK_HELO_PAYPAL && !SPF_PASS && !DKIM_VALID_AU -#describe HK_FAKENAME_PAYPAL From name mentions PayPal, but not relayed from there - -#header __HK_NAME_EBAY From:name =~ /\bebay\b/i -#header __HK_HELO_EBAY X-Spam-Relays-External =~ / helo=[^ ]+\.(?:ebay|emarsys)\b/ -#meta HK_FAKENAME_EBAY __HK_NAME_EBAY && !__HK_HELO_EBAY && !SPF_PASS && !DKIM_VALID_AU -#describe HK_FAKENAME_EBAY From name mentions eBay, but not relayed from there - -#endif -#endif - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hege/20_html.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hege/20_html.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hege/20_html.cf 2012-04-03 20:21:13.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hege/20_html.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -ifplugin Mail::SpamAssassin::Plugin::HTMLEval -# Check comment lengths -body __HTML_COMMENT_10000 eval:html_text_match('comment', '(?s)^(?=.{10000})') -body __HTML_COMMENT_20000 eval:html_text_match('comment', '(?s)^(?=.{20000})') -body __HTML_COMMENT_30000 eval:html_text_match('comment', '(?s)^(?=.{30000})') -body __HTML_COMMENT_50000 eval:html_text_match('comment', '(?s)^(?=(?:.{25000}){2})') -endif diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/20_body_tests.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/20_body_tests.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/20_body_tests.cf 2014-01-15 16:43:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/20_body_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# SpamAssassin rules file: body tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# Note: body tests are run with long lines, so be sure to limit the -# size of searches; use /.{0,30}/ instead of /.*/ to avoid huge -# search times. -# -# Note: If you are adding a rule which looks for a phrase in the body -# (as most of them do), please add it to rules/20_phrases.cf instead. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/20_head_tests.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/20_head_tests.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/20_head_tests.cf 2014-01-15 16:43:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/20_head_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -########################################################################### -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/20_meta_tests.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/20_meta_tests.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/20_meta_tests.cf 2014-01-15 16:43:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/20_meta_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -# SpamAssassin rules file: meta tests -# -# Please don't modify this file as your changes will be overwritten with -# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead. -# See 'perldoc Mail::SpamAssassin::Conf' for details. -# -# Add meta tests which cover *both* headers and body here. -# -# Note: body tests are run with long lines, so be sure to limit the -# size of searches; use /.{0,30}/ instead of /.*/ to avoid huge -# search times. -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/20_uri_tests.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/20_uri_tests.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/20_uri_tests.cf 2014-01-15 16:43:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/20_uri_tests.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -########################################################################### -# -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -########################################################################### - -# Redirector URI patterns - -# ExpressionEngine redirector -# see http://www.pmachine.com/forums/viewthread/29561/ -# e.g. http://www.someEEBasedSite.com/index.php?URL=http://www.NastyPR0nSite.com -# e.g. http://www.pmachine.com/ee/knowledgeblog/?URL=http://www.google.com -redirector_pattern m'/(?:index.php)?\?.*(?<=[?&])URL=(.*?)(?:$|[&\#])'i - -# Google redirector. -# Common form: -# http://www.google.com/url?sa=U&start=4&q=http://urlofspammer -# -> http://urlofspammer -# Unhandled form: -# http://www.google.com/url?q=http://urlofspammer/space&q=here -# -> http://urlofspammer/space%20here -# Redirector gets http://urlofspammer/space -# http://www.google.com/url?q=http://urlof&q=spammer does not work -redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/url\?.*?(?<=[?&])q=(.*?)(?:$|[&\#])'i - -# Google site search -# http://www.google.com/search?q=site:bluevallet.com -# -> links to http://www.bluevallet.com/ -# Google inurl search -# http://google.com//search?hl=en&q=inurl:rnyself.com%2Bvpxl%2Bmade%2Beasy&btnI=RC27 -# -> searches for 'VXPL made easy' on rnyself.com -redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/search\?.*?(?<=[?&])q=[^&]*?(?<=%20|..[=+\s])(?:site|inurl):(.*?)(?:$|%20|[\s+&\#])'i - -# Google search for pages that contain the site name -# http://www.google.com/search?q="bluevallet.com" -# http://www.google.com/search?q=%22bluevallet.com%22 -# -> links to search page that probably has http://bluevallet.com -# at the top -redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/search\?.*?(?<=[?&])q=[^&]*?(?<=%20|..[=+\s])(?:"|%22)(.*?)(?:$|%22|["\s+&\#])'i - -# Google translate -# http://translate.google.com/translate?u=www.domain.tld&langpair=en%7Cen&hl=en -# -> http://www.domain.tld inside a frame -redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/translate\?.*?(?<=[?&])u=(.*?)(?:$|[&\#])'i - -# Google Ads -# http://google.com/pagead/iclk?sa=l&ai=nightmare&num=399412020&adurl=http://quilarpe.com?375 -# -> http://quilarpe.com?375 -redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/pagead/iclk\?.*?(?<=[?&])adurl=(.*?)(?:$|[&\#])'i - -# AOL redirector -# http://aol.com/redir.adp?_url=http://www.ixp.jp/univac/ -# -> http://www.ixp.jp/univac/ -redirector_pattern m'^http:/*(?:\w+\.)?aol\.com/redir\.adp\?.*(?<=[?&])_url=(.*?)(?:$|[&\#])'i - -# Facebook redirector -# http://www.facebook.com/l/;www.example.com -# -> http://www.example.com/ -redirector_pattern m'^https?/*(?:\w+\.)?facebook\.com/l/;(.*)'i diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/sandbox-hstern.pm spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/sandbox-hstern.pm --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/hstern/sandbox-hstern.pm 2018-02-05 14:10:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/hstern/sandbox-hstern.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -package Mail::SpamAssassin::Plugin::Sandbox::hstern; - -use strict; -use warnings; -use Mail::SpamAssassin::Plugin; -use Mail::SpamAssassin::Logger; -use Mail::SpamAssassin::Util; - -our @ISA = qw(Mail::SpamAssassin::Plugin); - -sub new { - my $class = shift; - my $mailsa = shift; - - $class = ref($class) || $class; - my $self = $class->SUPER::new($mailsa); - bless ($self, $class); - - $self->register_eval_rule("check_fast_forward"); - - return $self; -} - -sub check_fast_forward { - my $self = shift; - my $status = shift; - my $body = $status->get_decoded_body_text_array(); - my $date = $status->get("Date"); - - return undef unless $date; - my $cdate = Mail::SpamAssassin::Util::parse_rfc822_date ($date, "+0000"); - return undef unless $cdate; # cannot parse date - my (undef, $cdmin) = gmtime($cdate); - - foreach (@$body) { - if ( /^Sent: (.*)/ ) { - my $csent = Mail::SpamAssassin::Util::parse_rfc822_date ($1, "+0000"); - next unless $csent; # cannot parse date - my (undef, $csmin) = gmtime($csent); - return $cdmin == $csmin; - } - } - - return undef; -} - -1; diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_advance_fee_reevolved.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_advance_fee_reevolved.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_advance_fee_reevolved.cf 2014-10-19 18:38:04.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_advance_fee_reevolved.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -# -# Advance Fee scam rules for evaluation. -# Evaluate via masscheck and keep the top -# performers for publication. -# -# Evolved on: Sun Oct 11 16:54:21 PDT 2009 -# Evolve parameters: -m5 -t75 -e3 -p9 -# -# Performance: -# fitness: 119568.000000 -# rule count: 75 -# HAM HAM% SPAM SPAM% S/O -# >=0 hits: 188 100.0000 5860 100.0000 0.5000 -# >=1 hits: 44 23.4043 2081 35.5119 0.6028 -# >=2 hits: 1 0.5319 1529 26.0922 0.9800 -# >=3 hits: 0 0.0000 1311 22.3720 1.0000 -# >=4 hits: 0 0.0000 1047 17.8669 1.0000 -# >=5 hits: 0 0.0000 775 13.2253 1.0000 -# -# $Id$ -# -# __DEAL manually added -# Other FP avoidance rules manually added to evolved rules -# - -meta __ADVANCE_FEE_2_NEW (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 1) && !__THREAD_INDEX_GOOD -meta T_ADVANCE_FEE_2_NEW (__ADVANCE_FEE_2_NEW && !__FILL_THIS_FORM && !LOTS_OF_MONEY && !__ADVANCE_FEE_3_NEW && !__ADVANCE_FEE_4_NEW && !__ADVANCE_FEE_5_NEW) && !__SUBSCRIPTION_INFO && !__DKIM_EXISTS && !__HAS_SENDER && !__DOS_HAS_LIST_UNSUB && !__TAG_EXISTS_STYLE && !__HTML_LINK_IMAGE && !__COMMENT_EXISTS && !__HAS_X_LOOP && !__TO_YOUR_ORG -describe T_ADVANCE_FEE_2_NEW Appears to be advance fee fraud (Nigerian 419) -score T_ADVANCE_FEE_2_NEW 2.50 # limit - -meta __ADVANCE_FEE_3_NEW (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 2) && !__THREAD_INDEX_GOOD -meta ADVANCE_FEE_3_NEW (__ADVANCE_FEE_3_NEW && !__FILL_THIS_FORM && !LOTS_OF_MONEY && !__ADVANCE_FEE_4_NEW && !__ADVANCE_FEE_5_NEW) && !__HTML_LINK_IMAGE && !__TAG_EXISTS_CENTER && !__COMMENT_EXISTS && !__VIA_ML && !__THREADED && !__UNSUB_LINK && !__UPPERCASE_URI && !__SURVEY && !__HAS_SENDER && !__HAS_X_LOOP && !__TO_YOUR_ORG -describe ADVANCE_FEE_3_NEW Appears to be advance fee fraud (Nigerian 419) -score ADVANCE_FEE_3_NEW 3.5 # limit - -meta __ADVANCE_FEE_4_NEW (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 3) && !__THREAD_INDEX_GOOD -meta ADVANCE_FEE_4_NEW (__ADVANCE_FEE_4_NEW && !__FILL_THIS_FORM && !LOTS_OF_MONEY && !__ADVANCE_FEE_5_NEW) && !__COMMENT_EXISTS && !__TAG_EXISTS_CENTER && !__HAS_ERRORS_TO && !__DOS_HAS_LIST_UNSUB -describe ADVANCE_FEE_4_NEW Appears to be advance fee fraud (Nigerian 419) - -meta __ADVANCE_FEE_5_NEW (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 4) && !__THREAD_INDEX_GOOD -meta ADVANCE_FEE_5_NEW (__ADVANCE_FEE_5_NEW && !__FILL_THIS_FORM && !LOTS_OF_MONEY) -describe ADVANCE_FEE_5_NEW Appears to be advance fee fraud (Nigerian 419) - -# if large sums of money are involved... - -meta __ADVANCE_FEE_2_NEW_MONEY !__FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_2_NEW -meta ADVANCE_FEE_2_NEW_MONEY (__ADVANCE_FEE_2_NEW_MONEY && !__ADVANCE_FEE_3_NEW_MONEY && !__ADVANCE_FEE_4_NEW_MONEY && !__ADVANCE_FEE_5_NEW_MONEY) && !__DOS_HAS_LIST_UNSUB && !__TAG_EXISTS_CENTER && !__LYRIS_EZLM_REMAILER && !__COMMENT_EXISTS && !__UNSUB_LINK && !__VIA_ML && !__HTML_LINK_IMAGE && !__HDRS_LCASE && !__NAME_EQ_EMAIL && !__URI_MAILTO_MANY && !__RP_MATCHES_RCVD && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP -describe ADVANCE_FEE_2_NEW_MONEY Advance Fee fraud and lots of money -score ADVANCE_FEE_2_NEW_MONEY 2.000 # limit - -meta __ADVANCE_FEE_3_NEW_MONEY !__FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_3_NEW -meta ADVANCE_FEE_3_NEW_MONEY (__ADVANCE_FEE_3_NEW_MONEY && !__ADVANCE_FEE_4_NEW_MONEY && !__ADVANCE_FEE_5_NEW_MONEY) && !__HTML_LINK_IMAGE && !__UPPERCASE_URI && !__UNSUB_LINK && !__VIA_ML && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP -describe ADVANCE_FEE_3_NEW_MONEY Advance Fee fraud and lots of money - -meta __ADVANCE_FEE_4_NEW_MONEY !__FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_4_NEW -meta ADVANCE_FEE_4_NEW_MONEY (__ADVANCE_FEE_4_NEW_MONEY && !__ADVANCE_FEE_5_NEW_MONEY) && !__HTML_LINK_IMAGE && !__TAG_EXISTS_CENTER && !__HAS_SENDER && !__HAS_X_LOOP -describe ADVANCE_FEE_4_NEW_MONEY Advance Fee fraud and lots of money - -meta __ADVANCE_FEE_5_NEW_MONEY !__FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_5_NEW -meta ADVANCE_FEE_5_NEW_MONEY __ADVANCE_FEE_5_NEW_MONEY && !__BOUNCE_CTYPE -describe ADVANCE_FEE_5_NEW_MONEY Advance Fee fraud and lots of money - -# if you fill in a form... - -meta __ADVANCE_FEE_2_NEW_FORM __FILL_THIS_FORM && !LOTS_OF_MONEY && __ADVANCE_FEE_2_NEW -meta ADVANCE_FEE_2_NEW_FORM (__ADVANCE_FEE_2_NEW_FORM && !__ADVANCE_FEE_3_NEW_FORM && !__ADVANCE_FEE_4_NEW_FORM && !__ADVANCE_FEE_5_NEW_FORM) && !__COMMENT_EXISTS && !__THREADED && !__HTML_LINK_IMAGE && !__HDRS_LCASE && !__DOS_HAS_LIST_UNSUB && !__HAS_SENDER && !__HAS_X_LOOP -describe ADVANCE_FEE_2_NEW_FORM Advance Fee fraud and a form -score ADVANCE_FEE_2_NEW_FORM 2.000 # limit - -meta __ADVANCE_FEE_3_NEW_FORM __FILL_THIS_FORM && !LOTS_OF_MONEY && __ADVANCE_FEE_3_NEW -meta ADVANCE_FEE_3_NEW_FORM (__ADVANCE_FEE_3_NEW_FORM && !__ADVANCE_FEE_4_NEW_FORM && !__ADVANCE_FEE_5_NEW_FORM) && !__HTML_LINK_IMAGE && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP -describe ADVANCE_FEE_3_NEW_FORM Advance Fee fraud and a form - -meta __ADVANCE_FEE_4_NEW_FORM __FILL_THIS_FORM && !LOTS_OF_MONEY && __ADVANCE_FEE_4_NEW -meta ADVANCE_FEE_4_NEW_FORM (__ADVANCE_FEE_4_NEW_FORM && !__ADVANCE_FEE_5_NEW_FORM) -describe ADVANCE_FEE_4_NEW_FORM Advance Fee fraud and a form - -meta __ADVANCE_FEE_5_NEW_FORM __FILL_THIS_FORM && !LOTS_OF_MONEY && __ADVANCE_FEE_5_NEW -meta ADVANCE_FEE_5_NEW_FORM __ADVANCE_FEE_5_NEW_FORM -describe ADVANCE_FEE_5_NEW_FORM Advance Fee fraud and a form - -# if large sums of money and a form are involved... - -meta __ADVANCE_FEE_2_NEW_FRM_MNY __FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_2_NEW -meta ADVANCE_FEE_2_NEW_FRM_MNY (__ADVANCE_FEE_2_NEW_FRM_MNY && !__ADVANCE_FEE_3_NEW_FRM_MNY && !__ADVANCE_FEE_4_NEW_FRM_MNY && !__ADVANCE_FEE_5_NEW_FRM_MNY) && !__HTML_LINK_IMAGE && !__HDRS_LCASE && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP -describe ADVANCE_FEE_2_NEW_FRM_MNY Advance Fee fraud form and lots of money -score ADVANCE_FEE_2_NEW_FRM_MNY 2.500 - -meta __ADVANCE_FEE_3_NEW_FRM_MNY __FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_3_NEW -meta ADVANCE_FEE_3_NEW_FRM_MNY (__ADVANCE_FEE_3_NEW_FRM_MNY && !__ADVANCE_FEE_4_NEW_FRM_MNY && !__ADVANCE_FEE_5_NEW_FRM_MNY) && !__HTML_LINK_IMAGE && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP -describe ADVANCE_FEE_3_NEW_FRM_MNY Advance Fee fraud form and lots of money - -meta __ADVANCE_FEE_4_NEW_FRM_MNY __FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_4_NEW -meta ADVANCE_FEE_4_NEW_FRM_MNY (__ADVANCE_FEE_4_NEW_FRM_MNY && !__ADVANCE_FEE_5_NEW_FRM_MNY) -describe ADVANCE_FEE_4_NEW_FRM_MNY Advance Fee fraud form and lots of money - -meta __ADVANCE_FEE_5_NEW_FRM_MNY __FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_5_NEW -meta ADVANCE_FEE_5_NEW_FRM_MNY __ADVANCE_FEE_5_NEW_FRM_MNY -describe ADVANCE_FEE_5_NEW_FRM_MNY Advance Fee fraud form and lots of money - -# Let the ones that perform well enough be published -#tflags ADVANCE_FEE_2_NEW nopublish -tflags ADVANCE_FEE_3_NEW publish -tflags ADVANCE_FEE_4_NEW publish -#tflags ADVANCE_FEE_5_NEW publish -tflags ADVANCE_FEE_2_NEW_MONEY publish -tflags ADVANCE_FEE_3_NEW_MONEY publish -#tflags ADVANCE_FEE_4_NEW_MONEY nopublish -#tflags ADVANCE_FEE_5_NEW_MONEY nopublish -tflags ADVANCE_FEE_2_NEW_FORM publish -tflags ADVANCE_FEE_3_NEW_FORM publish -#tflags ADVANCE_FEE_4_NEW_FORM nopublish -#tflags ADVANCE_FEE_5_NEW_FORM nopublish -#tflags ADVANCE_FEE_2_NEW_FRM_MNY nopublish -#tflags ADVANCE_FEE_3_NEW_FRM_MNY nopublish -#tflags ADVANCE_FEE_4_NEW_FRM_MNY nopublish -#tflags ADVANCE_FEE_5_NEW_FRM_MNY nopublish - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_fillform.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_fillform.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_fillform.cf 2015-04-08 07:53:34.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_fillform.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ - -# -# Ruleset to match fill-in-this-form body text -# common in scams and loan spams -# occasional in phishing -# -# Requires multipass ReplaceTags plugin -# -# If you are using this with 3.2.5, make sure you get this as well: -# http://svn.apache.org/viewvc/spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm -# -# -# $Id$ -# - -ifplugin Mail::SpamAssassin::Plugin::ReplaceTags - - # Repetitive syntactic bits - replace_tag FF_LNNO (?:(?:\d{1,3}(?:[)}\]:.,]{1,80}|(?:st|nd|rd|th)[)}\]:.,]{0,3})|\W?\([\div]{1,5}\)|\W?\{\d{1,3}\}|\[\d{1,3}\]|\*{1,5}|\#{1,5}|\(?[A-K][)}\]:.,]{1,3})\s?) - replace_tag FF_YOUR (?:a?\s?copy\sof\s)?(?:(?:your|din|seu|twoje)[\s,:]{1,5})?(?:present\s|c[uo]rrent\s|full(?:st[\xe4]ndigt)?\s?|complete\s|direct\s|private?\s|valid\s|personal\s|nuvarande\s|vollst[\xe4]ndige\s|aktuelle\s|pe\s(?:ne\s)?){0,3} - replace_tag ANDOR (?:\s?[\/&+,]\s?|\sor\s|\sand?\s) - replace_tag NUMBER (?:(?:ruf)?num(?:[bm]er)?\(?s?\)?|nos?\.|no\b|n[\xb0]|\#s?|nbrs?\.?) - replace_tag FF_SUFFIX (?:\sin\s(?:full|words)|\scompleto)?:?(?:\s?[({][^)}]{1,30}[)}])? - replace_tag FF_BLANK1 (?:[\s:;]{0,4}(?:(?:[-=_.,:;*\s\x85]|&\#\d{1,3};|[\xe2][\x80][\xa6]){3,100})) - replace_tag FF_BLANK2 (?:[^-=_.,:;*\w]{0,3}(?:[-=_.,:;*\s\x85]|&\#\d{1,3};|[\xe2][\x80][\xa6]){1,100}) - - # Address variations - replace_tag FF_A1 (?:(?:countr?y|city|province|ter+itory|(?:zip|post(?:al)?)(?:\s?code)?|st?ates?|ad+res+e?)?){1,3}(?:\sof\s(?:residence|birth|employment|citizenship|origin))? - replace_tag FF_A2 (?:(?:contact|full|house|home|resident[ia]+l|busines+|mailing|work|delivery|ship+ing|post(?:al)?|of+ice|e-?mail|bostads|wohn)?){0,3}\s?(?:ad+res+[es]{0,2}|location|endere[\xe7]o)(?:\sline)?(?:\s[0-9])? - - # Name variations - replace_tag FF_N1 (?:company|first|last|all|busines+|legal|ben[ei]ficiary|user|vollstaendigen)?\s?(?:name?[sn]?|navne|nome|nazwy)(?:ad+res+)? - - # Telephone variations - replace_tag FF_P1 (?:(?:(?:busines+|contact|fax|voice|house|home|mobile?|cel+(?:ular)?|of+ice|tel+e?(?:\s?(?:ph|f)one?)?|(?:ph|f)one|private)(?:\s(?:ph|f)one)??){1,3}(?:\s?)??){1,3} - - # Misc personal data - replace_tag FF_M1 (?:(?:ages?|marital\s?statu[se]|sex|gender|male\sor\sfemale|(?:date\s(?:of\s)?)?birth|religion|nationality|(?:user )?email|next\sof\skin|alter|staatsangehoerigkeit|nationalitet|idade|weik)?){1,3} - - # Loan application details - replace_tag FF_L1 (?:(?:previous\s)?work(?:ing)\s?experience|employment|position|profes+ion|(?:monthly|an+ual)?\s?income|purpose\sof\sl(?:oa|ao)n|an+ual\sturn\s?over|l(?:oa|ao)n\sduration|oc+up[ae]tion(?:\/position)?s?|(?:l(?:oa|ao)n\s|the\s)?amount(?:\sneed(ed)?|\sdesired)?(?:\s(?:as|of)\sloan)?|beruf|zaw(?:=F3|[\xf3])d) - - # Financial/ID details (scams and phishing) - replace_tag FF_F1 (?:(?:bank(?:ing)?|beneficiary|billing|acc(?:oun)?t|rout(?:ing)?|swift|receiver|user)?){1,3}\s(?:(?:name|ad+res+(?:es)?|location|code|details|institution|a\/c|)?){1,3} - replace_tag FF_F2 (?:(?:(?:international\s)?driver'?s?\sli[sc]+(?:en[sc]e)?|pas+\s?port|id\scard|[ia]d(?:entification|entity)(?:\s(?:card||papers?))?)?){1,3}(?:\s)? - replace_tag FF_F3 (?:picture|zdj\scie|test\squestion|answer|amount\swon|(?:inheritance\s)?funds?\svalue|(?:e-?mail\s)?pas+word|e-?mai?l\sid|amount\s[\w\s]{0,30}lost[\w\s]{0,15}) - replace_tag FF_F4 (?:log[-\s]?in|(?:e-?mail\s)?user)\s?names? - replace_tag FF_F5 (?:ref(?:erence)?|batch|win+ing|award|billet)[-\s]? - - # All variations together - replace_tag FF_ALL (?:||||||||||) - - # 5+ fields (high reliability) - # Leave this exposed, it's a fairly good spam sign by itself - body __FILL_THIS_FORM_LONG1 /(?:(?:(?:P[a-z\.\s]{10,30})?|)){5}/i - body __FILL_THIS_FORM_LONG2 /(?:(?:(?:P[a-z\.\s]{10,30})?|)){5}/i - replace_rules __FILL_THIS_FORM_LONG1 - replace_rules __FILL_THIS_FORM_LONG2 - meta __FILL_THIS_FORM_LONG __FILL_THIS_FORM_LONG1 || __FILL_THIS_FORM_LONG2 - meta FILL_THIS_FORM_LONG __FILL_THIS_FORM_LONG && !__VIA_ML && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__TRAVEL_MANY - describe FILL_THIS_FORM_LONG Fill in a form with personal information - score FILL_THIS_FORM_LONG 2.00 # limit - - # 5+ fields that body paragraph processing didn't paste together - body __FILL_THIS_FORM_PARTIAL /^\s??(?:?){1,3}(?:|(?:[-=_.,:;*\s]|=20){1,4}$)/im - replace_rules __FILL_THIS_FORM_PARTIAL - tflags __FILL_THIS_FORM_PARTIAL multiple maxhits=5 - rawbody __FILL_THIS_FORM_PARTIAL_RAW /^(?>\s{0,50})?(?:?){1,3}(?:|(?:[-=_.,:;*\s]|=20| |<\/\w+>){0,4}$)/im - replace_rules __FILL_THIS_FORM_PARTIAL_RAW - tflags __FILL_THIS_FORM_PARTIAL_RAW multiple maxhits=5 - - # 5+ fields in either format - # For easy use in metas - meta __FILL_THIS_FORM (__FILL_THIS_FORM_LONG || __FILL_THIS_FORM_PARTIAL > 4 || __FILL_THIS_FORM_PARTIAL_RAW > 4) - meta FILL_THIS_FORM __FILL_THIS_FORM && !__THREADED && !__FB_TOUR && !__VIA_ML - describe FILL_THIS_FORM Fill in a form with personal information - #score FILL_THIS_FORM 1.00 - tflags FILL_THIS_FORM publish - - # 3 or 4 fields (low reliability, but still useful in metas - body __FILL_THIS_FORM_SHORT1 /(?:(?:|)){3}/i - body __FILL_THIS_FORM_SHORT2 /(?:(?:|)){3}/i - replace_rules __FILL_THIS_FORM_SHORT1 - replace_rules __FILL_THIS_FORM_SHORT2 - meta __FILL_THIS_FORM_SHORT !__FILL_THIS_FORM && (__FILL_THIS_FORM_SHORT1 || __FILL_THIS_FORM_SHORT2 || __FILL_THIS_FORM_PARTIAL > 2 || __FILL_THIS_FORM_PARTIAL_RAW > 2) - meta FILL_THIS_FORM_SHORT __FILL_THIS_FORM_SHORT && !__VIA_ML && !__MSGID_JAVAMAIL - describe FILL_THIS_FORM_SHORT Fill in a short form with personal information - score FILL_THIS_FORM_SHORT 1.00 # limit - - # Add to score if loan question is present - body __FILL_THIS_FORM_LOAN1 /(?:|$)/i - replace_rules __FILL_THIS_FORM_LOAN1 - meta __FILL_THIS_FORM_LOAN __FILL_THIS_FORM && __FILL_THIS_FORM_LOAN1 - meta FILL_THIS_FORM_LOAN __FILL_THIS_FORM_LOAN && !__COMMENT_EXISTS && !__HTML_LINK_IMAGE - describe FILL_THIS_FORM_LOAN Answer loan question(s) - score FILL_THIS_FORM_LOAN 2.0 - - # Add to score if fraud/phishing question is present - body __FILL_THIS_FORM_FRAUD_PHISH1 /(?:||||)(?:|$)/i - replace_rules __FILL_THIS_FORM_FRAUD_PHISH1 - meta __FILL_THIS_FORM_FRAUD_PHISH (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FILL_THIS_FORM_FRAUD_PHISH1 || __EMAIL_PHISH) - meta FILL_THIS_FORM_FRAUD_PHISH __FILL_THIS_FORM_FRAUD_PHISH && !__UNSUB_LINK && !__SPOOFED_URL && !__DOS_LINK && !__CAN_HELP && !__VIA_ML && !__COMMENT_EXISTS && !__HAS_IN_REPLY_TO && !__THREADED - describe FILL_THIS_FORM_FRAUD_PHISH Answer suspicious question(s) - #score FILL_THIS_FORM_FRAUD_PHISH 1.50 - -else - meta __FILL_THIS_FORM_LONG1 0 - meta __FILL_THIS_FORM_LONG2 0 - meta __FILL_THIS_FORM_LONG 0 - meta __FILL_THIS_FORM_PARTIAL 0 - meta __FILL_THIS_FORM_PARTIAL_RAW 0 - meta __FILL_THIS_FORM 0 - meta __FILL_THIS_FORM_SHORT1 0 - meta __FILL_THIS_FORM_SHORT2 0 - meta __FILL_THIS_FORM_SHORT 0 - meta __FILL_THIS_FORM_LOAN1 0 - meta __FILL_THIS_FORM_LOAN 0 - meta __FILL_THIS_FORM_FRAUD_PHISH1 0 - meta __FILL_THIS_FORM_FRAUD_PHISH 0 -endif # Mail::SpamAssassin::Plugin::ReplaceTags diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_lotsa_money.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_lotsa_money.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_lotsa_money.cf 2015-03-21 21:14:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_lotsa_money.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,361 +0,0 @@ - -# added meta dependencies from hstern's sandbox -#rawbody __HS_QUOTE /^> / # now in jm sandbox -#header __HS_SUBJ_RE_FW Subject =~ /^(?i:re|fw):/ # now in jm sandbox -# - -ifplugin Mail::SpamAssassin::Plugin::ReplaceTags - replace_tag CURRENCY [\(\[]?(?:\bU[Ss][D\$]{0,2}|\$(?:US)?|usd|CAD|GBP|=[Aa][34]|\xa3|&\#16[34];|(?i:pounds\ssterling)|\xa4|EUR(?:OS)?|(?:d')?[Ee]uro?s?|(?i:eur)\sde|CHF|FCFA|d[\xf3]lares\sde\slos\sE+\.\s?U+\.)[\]\)]? - replace_tag GB_UK \b(?:U\.?K\.?|(?:Great\s)?Brit(?:ain|ish)|G\.?B\.?)\b - - body __LOTSA_MONEY_00 /[\s\.]?[1-9][\dOo][,\.][\dOo]{3}(?:(?!\d)|\b)/ - body __LOTSA_MONEY_01 /(?:(?i:sum\sof\s)[\(\[]?|\s?)[\s\.]?[1-9][\d.,\sOo]{5,20}[\dOo](?|Pounds|(?i:dollars?|bucks))\b/ - body __LOTSA_MONEY_03 /(?:(?i:sum\sof\s)[\(\[]?|\s?)[1-9][\d.,\sOo]{0,5}[\)\]]?\s?(?i:M(?i:il)?\b|mil+(?i:io|)n|hund?[re]+a?[dt]|thousand|tausend|milh[\xf5]es)/ - body __LOTSA_MONEY_04 /(?:(?n|hund?rea?d(?!s)[^\.]{1,25}thousand(?!s)|cents?[^\.]{1,25}mille|hundert[^\.]{1,30}tausend|ientos?[^\.]{1,20}mil|cent[a-z\s]{1,20}mil\s[a-z]{1,20}centos)[^\.\$]{0,50}?(?:(?:U\.?\s?S\.?\s?(?:A\.?\s?)?|united\s?states\s|E\.\s?U\.\s|canad(?:ian|a)\s|(?:ia\s)?de\s)?d(?:[o\xf3]|[\xc3][\xb3])l+are?s?|bucks|USD|GBP|\spounds?|(?:\s)?pounds?\ssterling|pounds(?!\sof)|(?:d'\s?)?euros?|francs?)\b/i - body __LOTSA_MONEY_05 /(?:(?:sum|value|amount)\sof\s)[1-9][\d.,\sO]{7,20}[\dO\.][\)\]\(\s]{0,3}(?:pounds?|dollars?|euros?|bucks)\b/i - replace_rules __LOTSA_MONEY_00 __LOTSA_MONEY_01 __LOTSA_MONEY_02 __LOTSA_MONEY_03 __LOTSA_MONEY_04 - - # not a meta so it will show up in the report - meta LOTS_OF_MONEY (__LOTSA_MONEY_00 || __LOTSA_MONEY_01 || __LOTSA_MONEY_02 || __LOTSA_MONEY_03 || __LOTSA_MONEY_04 || __LOTSA_MONEY_05) && !__TRAVEL_ITINERARY - describe LOTS_OF_MONEY Huge... sums of money - score LOTS_OF_MONEY 0.01 - tflags LOTS_OF_MONEY publish -else - meta __LOTSA_MONEY_00 0 - meta __LOTSA_MONEY_01 0 - meta __LOTSA_MONEY_02 0 - meta __LOTSA_MONEY_03 0 - meta __LOTSA_MONEY_04 0 - meta __LOTSA_MONEY_05 0 -endif - -# now combine with other stuff in metas to weed out FPs -# A lot of this is research intended to feed a re-evolve of the ADVANCE_FEE ruleset. -# Some of these are pulled from other sandbox rules in preparation for this. - -ifplugin Mail::SpamAssassin::Plugin::FreeMail - meta MONEY_FREEMAIL LOTS_OF_MONEY && (FREEMAIL_FROM || FREEMAIL_REPLYTO) - describe MONEY_FREEMAIL Lots of money from someone using free email? - #score MONEY_FREEMAIL 0.5 - tflags MONEY_FREEMAIL nopublish -endif - -#meta MONEY_FROM_RUNON LOTS_OF_MONEY && __FROM_RUNON # almost same spam hit rate, poorer S/O -meta MONEY_FROM_MISSP LOTS_OF_MONEY && __FROM_MISSPACED && !__MIME_QP -describe MONEY_FROM_MISSP Lots of money and misspaced From -score MONEY_FROM_MISSP 2.000 # limit - -#meta MONEY_TO_NO_R LOTS_OF_MONEY && __TO_NO_ARROWS_R -#describe MONEY_TO_NO_R Lots of money and bare, missing or undisclosed To - -meta __MONEY_FORM LOTS_OF_MONEY && __FILL_THIS_FORM -meta MONEY_FORM __MONEY_FORM && !__FB_TOUR && !__FM_MY_PRICE && !__FR_SPACING_8 && !__COMMENT_EXISTS && !__CAN_HELP -describe MONEY_FORM Lots of money if you fill out a form -#score MONEY_FORM 3.0 - -meta __MONEY_FORM_SHORT LOTS_OF_MONEY && __FILL_THIS_FORM_SHORT -meta MONEY_FORM_SHORT __MONEY_FORM_SHORT && !__DOS_HAS_LIST_UNSUB && !__VIA_ML && !__HTML_LINK_IMAGE && !__UPPERCASE_URI && !__THREADED && !__COMMENT_EXISTS && !__TAG_EXISTS_CENTER && !__THREAD_INDEX_GOOD -describe MONEY_FORM_SHORT Lots of money if you fill out a short form -score MONEY_FORM_SHORT 2.500 # limit - -#meta MONEY_ACCOUNT LOTS_OF_MONEY && __YOUR_ACCOUNT -#describe MONEY_ACCOUNT Lots of money to your account - - -body __LOTTO_WINNINGS /\b(?:claim|process(?:ing)?|transfert?(?:\s\w+)?|redeem|payment|virement|zahlung|reivindicar|demandar|remise)\s(?:(?:[a-z]{1,5}\s)?(?:your|of|the|this|de|ihrer|seu|tu)\s)+(?:win+ings?|money|(?:cash\s)?prize|award|f[ou]nds?|grant|gewinne|premio|gain)\b/i - -body __LOTTO_WIN_01 /\bwin+ing\s(?:prize|number|notification|draw|check|cheque|details|information|payment)/i - -body __YOU_WON_01 /\byou(?:r|'re|'ve|'ll|\shave|\sdid)?\s(?:e-?mail\s)?(?:\w+\s){0,2}(?:a\s)?w[io]n+(?:er|ing)?(?!'t)\b/i -body __YOU_WON_02 /\bw[io]n\s(?:(?:for|by)\s)?your?\b/i -body __YOU_WON_03 /\b(?:your?|win+ing|win+ers?|beneficiaries|participants?|individuals?|address(?:es)?|accounts?|emails?)(?:\s[-a-z\s]{4,40})?\s(?:w(?:ere|as)|ha(?:ve|s) be(?:en)?)\s(?:automatically\s)?(?:(?:randomly|raffly)\s(?:selected|cho+sen|cho+sing|picked)|(?:selected|cho+sen|cho+sing|picked)\s(?:[a-z\s]{2,40}?\srandom(?:ly)?|online|lottery|computer\s(?:ballot|wahlgang))|(?:selected|cho+sen|cho+sing|picked)(?:\sas?|\sthe){0,3}\swin+er)/i -body __YOU_WON_04 /\bqu[ei]\s?(?:vous (?:[\xc3][\xaa]|=C3=AA|[\xea]|e)tes\s?gagnant|en\scons(?:e|=E9|[\xe9]|[\xc3][\xa9])quence\sgagne)\b/i -body __YOU_WON_05 /\bI won\b/i -body __HAS_WON_01 /\bque ha ganado\b/i -meta __YOU_WON __YOU_WON_01 || __YOU_WON_02 || __YOU_WON_03 || __YOU_WON_04 || __HAS_WON_01 || (__YOU_WON_05 && (__MOVE_MONEY || __GIVE_MONEY)) - -ifplugin Mail::SpamAssassin::Plugin::MIMEHeader - meta WON_MONEY_ATTACH __YOU_WON && LOTS_OF_MONEY && (__PDF_ATTACH || __DOC_ATTACH) - describe WON_MONEY_ATTACH You won lots of money! See attachment. - - meta WON_NBDY_ATTACH __YOU_WON && __EMPTY_BODY && (__PDF_ATTACH || __DOC_ATTACH || __GIF_ATTACH || __JPEG_ATTACH) - describe WON_NBDY_ATTACH You won lots of money! See attachment. -endif - -body __TO_YOUR_ORG /\b(?:to|for) your organi[sz]ation\b/i -body __TRAVEL_ITINERARY /(?:travel|ticketed|your|current) itinerary/i -body __AUTO_ACCIDENT /auto(?:mobile)? accident/i - -body __LOTTO_AGENT_01 /\b(?:(?:(?:the|y?our)(?:\s\w{1,20})?|contact|accredited|listed)\sclaim(?:s|ing)?(?:\sprocessing)?|fiducia\w+|reimbursement|(?:prize|international|intl|foreign|win+ing)(?:[\s,.]+(?:rem+it+ance|settlement|payment|payout|award|transfer))+|payment|payout|immunity|(? 1 - -meta __MONEY_LOTTERY LOTS_OF_MONEY && (__LOTTO_WINNINGS + __LOTTO_WIN_01 + __YOU_WON + __LOTTO_AGENT_01 + __LOTTO_AGENT_02 + __LOTTO_DEPT + LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __LOTTO_ADMITS + __LOTTO_RELATED + DEAR_WINNER + __LOTTO_VERIFY + __GET_TICKET > 1) -meta MONEY_LOTTERY __MONEY_LOTTERY && !__CAN_HELP && !__HTML_LINK_IMAGE && !__DOS_HAS_LIST_UNSUB && !__MSGID_APPLEMAIL && __THREADED -describe MONEY_LOTTERY Lots of money from a lottery -#score MONEY_LOTTERY 1.5 - -body __DEAL /\b(?:(?:business|financial|this|the|mutual|die(?:se)?r?|cette|profitable)\s(?:deal|transa[ck]tion|proposal|off[er]{2}|venture|suggestion|partnership)|your\spartnership)/i -body __HUSH_HUSH /\b(?:confiden[tc]i[ae]l(?:\b|ity\b|it(?:=E9|[\xe9]|[\xc3][\xa9]))|private\b|secr[e\xe8](?:te?|cy)\b|sensitive\b|concealed\b|obscured?\b|discre(?:et|tion)\b|very\sdiscrete|top\ssecret|vertraulich(?:en)?\b|geheim\b|priv(?:e|=E9|[\xe9]|[\xc3][\xa9]))/i -body __IS_LEGAL /\b(?:(?:(this|esta)\s(?:deal|offer|transac[tc]i(?:o|[\xc3][\xb3])n|proposal|exchange|arrangement|work)|it)?\s[ie]s\s(?:(?:guaranteed|completely|absolutely|perfectly|100%|very|fully)\s)?(?:legal|hitch-free|seguro|legitimate)|legitimate\sarrangement|toute?\sl(?:e|=E9|[\xe9]|[\xc3][\xa9])gale)\b/i -body __NOT_SCAM /\b(?:not\sa\sscam|(?:not|never)\sscam\syou)\b/i -body __BACK_SCRATCH /\bmutual+y?\s(?:benefi(?:t|cial)|interest)\b/i -body __LUCRATIVE /\b(?:lucrative|profitable|tr[\xe8]s\ssalutaire)\b/i -body __YOU_ASSIST /\b(?:your\sas+istan(?:ce|t)|votre\s(?:as+istance|aide))\b/i -body __OUR_BEHALF /\b(?:on\s(?:my|our)\sbehalf|of\sbehalf\sof)\b/i -body __AGREED_RATIO /\b(?:agreed|sharing)\s(?:ratios?|percent\w+)\b/i -body __SHARE_IT /\b(?:(?:share|allocate|teilen|parteger(?:ez|ons)?|partage)\s(?:th(?:e|is)|das|les?|des)\s(?:proceeds|funds?|money|balance|account|geld|compte|fonds)|partager(?:ez|ons)? (?:avec (?:vous|moi)|ratio|suivant un pourcentage))\b/i -body __DESTROY_ME /\b(?:destroy|hunt|quemar)\sm[eyi]\b/i -body __YOUR_PROFIT /\byour?\sprofit/i -body __FIFTY_FIFTY /\b(?:50|fifty)(?:%?[\/:]50%?|%|\spercent)/i -meta SHARE_50_50 (__SHARE_IT || __AGREED_RATIO) && __FIFTY_FIFTY -describe SHARE_50_50 Share the money 50/50 - -body EMRCP /\bExcess Maximum Return Capital Profit\b/i -describe EMRCP "Excess Maximum Return Capital Profit" Fidelity scam - -meta LUCRATIVE __LUCRATIVE && !ALL_TRUSTED && !__ANY_TEXT_ATTACH && !__REPLYTO_EXISTS && !__LCL__ENV_AND_HDR_FROM_MATCH -describe LUCRATIVE Make lots of money! -score LUCRATIVE 2.00 # limit -tflags LUCRATIVE publish - -ifplugin Mail::SpamAssassin::Plugin::ReplaceTags - replace_tag PERCENT \b(?:\d\d|ten|[a-z]+teen|(?:twen|thir|fou?r|fif)ty(?:-?[a-z]+)?)\s?(?:%|percent) - - body __PCT_FOR_YOU_1 /[\s)]{0,3}(?:(?:of\s[\w\s]{0,35}?)?(?:for|to|as)\syour?|(?:[^\s.]{1,15}\s)?an uns beide)/i - body __PCT_FOR_YOU_2 /\b(?:(?:give|offer)\syou|vous\s(?:aurez\sdroit\s(?:=E0|[\xe0])|donnerai|all(?:e|=E9|[\xe9]|[\xc3][\xa9])\srecevoir\sautour\sde)|ihnen)\s/i - body __PCT_FOR_YOU_3 /\byour?\s(?!can)(?:(?!you)\w{1,15}\s){0,10}(?:(?:share|entiti?le(?:d|ment)?|percentage|fee|assist(?:ance)?|comp[ea]nsat(?:ed?|tion)|reward(?:ed)?|renumerat(?:e|tion)|com+is+ion|paid|deduct|account|tage|(?:will|shall|would|(?:are|stand|going)\sto)\s(?:be\s)?(?:tak(?:e|ing)|earn|get(?:ting)?|remit|subtract|with+old)|(?:deduct|taken?|subtract(?:ed)?)\syour|keep(?:ing)?|receiv(?:e|ing)|retain(?:ing)?|have|half|giv(?:en|ing)|paid|(?:give|pay|offer)\s(?:me|you|him)|bank\saccount|to\s(?:take|use)|(?:time|country)\sand|ratio\sof)(?:\s(?!you)\w{1,15}){0,10})\s(?/i - body __PCT_OF_PMTS /[\s)]+(?:of\s[\w\s]{0,35}?)?(?:of|du|de)\s(?:(?:the|la)\s)?(?:total\s)?(?:payments?|rem+it+ances?|capital|chec(?:k|que)s?|mon(?:ey|ies)|suma?)/i - - replace_rules __PCT_FOR_YOU_1 __PCT_FOR_YOU_2 __PCT_FOR_YOU_3 __PCT_OF_PMTS - - meta __PCT_FOR_YOU __PCT_FOR_YOU_1 || __PCT_FOR_YOU_2 || __PCT_FOR_YOU_3 || SHARE_50_50 - - meta MONEY_PERCENT LOTS_OF_MONEY && (__PCT_FOR_YOU || __PCT_OF_PMTS || __FIFTY_FIFTY) - describe MONEY_PERCENT X% of a lot of money for you -else - meta __PCT_FOR_YOU_1 0 - meta __PCT_FOR_YOU_2 0 - meta __PCT_FOR_YOU_3 0 - meta __PCT_OF_PMTS 0 - meta __PCT_FOR_YOU 0 -endif - -#meta MONEY_DEAL LOTS_OF_MONEY && (__DEAL + __HUSH_HUSH + __PCT_FOR_YOU + __FRAUD_IOV + __FRAUD_JYG + __IS_LEGAL + __NOT_SCAM + __BACK_SCRATCH + __LUCRATIVE + __YOU_ASSIST + __OUR_BEHALF + __AGREED_RATIO + __SHARE_IT + __DESTROY_ME > 2) -#describe MONEY_DEAL Lots of money in a suspicious deal -#score MONEY_DEAL 1.5 - -body __ATM_CARD /\b(?:your|the|this|through|via|by\smeans\sof\|that\sa)[\s\(](?:\w{1,20}\s)?(?:atm|debit|(?:money[\s-]?gram\s)?fast\scash)(?:\smaster|swift|value?|cash)?[\s\)]card/i -meta __MONEY_ATM_CARD LOTS_OF_MONEY && __ATM_CARD -meta MONEY_ATM_CARD __MONEY_ATM_CARD && !__COMMENT_EXISTS && !__TAG_EXISTS_STYLE -describe MONEY_ATM_CARD Lots of money on an ATM card - -body __YOU_INHERIT /\byour\s[a-z\s]{0,30}inherit+ance\b/i -meta YOU_INHERIT __YOU_INHERIT -describe YOU_INHERIT Discussing your inheritance -body __I_INHERIT /\b(?:I|eu)\s[a-z\s]{0,30}(?:inherited|herdei)\b/i -body __THEY_INHERIT /\b(?:inherit\sth(?:e|is)\smoney|herede\sest[ea]\sdinero)\b/i -body __NOT_DEAD_YET /\b(?:will\sinherit|que\sherede)\b/i -body __AM_DYING /\b(?:am\s(?:\S+\s)?dying|terminally\sill|cancer|en\sphase\sterminale|(?:become|is|devenu|maladie)\sincurable|que\sje\smeurs)\b/i -body __I_WILL_YOU /\bwill(?:ed)?\s(?:[a-z\s]{0,20}(?:fortune|money|\$[\d,]+[a-z]{0,9})\s)?to\syou\b/i -body __NEXT_OF_KIN /\bnext[-\s]of[-\s]kin\b/i -body __EX_CUSTOMER /\b(?:(?:dead|deceased|late|verstorbenen|death\sof\sthe)\s(?:[ck]lient|customer|ac+ount|invest[eo]r|beneficiary|depositor|mr\.|kunde|engr?\.?)|titulaire\sdu\scompte\sest\sd(?:e|=E9|[\xe9]|[\xc3][\xa9])c(?:e|=E9|[\xe9]|[\xc3][\xa9])d(?:e|=E9|[\xe9]|[\xc3][\xa9])|invest[eo]r\sdied|(?:e|=E9|[\xe9]|[\xc3][\xa9])tranger\sd(?:e|=E9|[\xe9]|[\xc3][\xa9])c(?:e|=E9|[\xe9]|[\xc3][\xa9])d(?:e|=E9|[\xe9]|[\xc3][\xa9])|(?:[ck]lient|customer|ac+ount|invest[eo]r|beneficiary|mr\.|kunde|engr?\.?)\s(?:[a-z]{1,10}\s)?(?:dead|deceased|verstorbenen))/i -body __DECEASED /\b(?:the|my|your|der|du|le|meu?)\s(?:deceased|late|verstorbenen|d(?:i|e|=E9|[\xe9]|[\xc3][\xa9])funto?|d(?:e|=E9|[\xe9]|[\xc3][\xa9])nt|falecido)\b/i -body __SURVIVORS /\b(?:widow|son|daughter|husband|wife|brother|sister|attorney|vi(?:=FA|[\xfa]|[\xc3][\xba])va|esposa|veuve)\s(?:of|to|do|de)\s(?:the\s)?(?:late|falecido|finales|feu|d(?:e|=E9|[\xe9]|[\xc3][\xa9])funt|mr\.?)\s\w+\b/i -body __DEAD_PARENT /\b(?:my|meu)\s(?:(?:deceased|dead)\s(?:father|mother|husband)|(?:father|dad|mother|mom|husband|marido)(?:'?s)?\s(?:death|died|passed\saway|murder|was\s(?:killed|murdered|poisoned)|faleceu))/i -body __DORMANT_ACCT /\b(?:(?:dormant|abandoned|left\s?over)\s(?:account|fund|transaction|sum|deposit)|fonds\sdorment)/i -body __WILL_LEGAL /\b(?:codicil|last\stestament|probate|executor|intestate|bequest|mandamus)\b/i -body __EARLY_DEMISE /\buntimely\sdeath\b/i -body __WIDOW /\b(?:widow(?:e[rd])'?s?|veuve)\b/i -body __MY_FORTUNE /\b(?:my|his|her)\s(?:fortune|heritage)\b/i -body __DIED_IN /\bdied\sin\b/i -body __INHERIT_PMT /\binheritance\spayment\s/i -body __CONTACT_ATTY /\bcontact(?:er)?\s(?:my|(?:de\s)?mon)\s(?:barrister|attou?rney|lawyer|avocat|gestionnaire)\b/i -body __TRTMT_DEFILED /\bdefiled\sall\s(?:forms\sof\s)?(?:medical\s)?treatments?\b/i - -# most hits at > 10 points, not useful -#meta DECEASED_NO_ML __DECEASED && !__VIA_ML && !__UNSUB_LINK && !__DOS_HAS_LIST_UNSUB && !__HAS_THREAD_INDEX && !__THREAD_INDEX_GOOD && !__HS_SUBJ_RE_FW && !__IMS_MSGID && !__IS_EXCH && !__COMMENT_EXISTS && !__DOS_SINGLE_EXT_RELAY -#describe DECEASED_NO_ML Dead not via mailing list -##tflags DECEASED_NO_ML nopublish - -body __WIRE_XFR /\b(?:wire|telegraph(?:ic)?|bank)\s?transfer/i -body __TRUSTED_CHECK /\b(?:cashier'?s?|certified)\sche(?:ck|que)/i -body __BANK_DRAFT /\bbank\sdraft/i -body __MOVE_MONEY /\b(?:(?:receive|re-?profile|transfer(?:ring|ir|t)?|release|repatriat(?:e|ion)|rapatrier|secure|r(?:e|=E9|[\xe9]|[\xc3][\xa9])clamation|possession|virer|dona(?:te|r)|depositante|dep[\xc3][\xb3]sito)\s(?:th(?:e(?:se)?|is)|d[ae]s|sur ce|de ce[st]|cet|est[eao]s?|del?)|re-?profiling|receive|re-?locat(?:e|ing)(?:\s\w{1,15})?)\s(?:of\s|your\s|the\s){0,2}(?:sums?\sof\s|inheritance\s)?(?:proceeds|funds?|money|balance|account|g[eo]ld|compte|fond[so]{1,2}|dinero|argent)\b/i -body __TO_YOUR_ACCT /\b(?:(?:f[uo]nds|money|f[uo]ndo|dinheiro|bank)\s(?:\w{1,10}\s){0,4}(?:transfer(?:red)?|transferido|sont)|\d+)\s(?:to|para|en)\s(?:your?|sua|votre)\s(?:account|conta|pos+es+ion)/i -body __PAY_YOU /\bpay\syou\b/ -body __GIVE_MONEY /\b(?:(?:give\syou\s(?:this\s)?(?:money|fund|inheritance))|(?:donated?\s(?:\w\+\s){0,3}(?:the\ssum\sof|(?:(?:the|this|some)\s(?:money|funds?|inheritance)|to\s)(?:you|(?:(?:the|a)\s)?church|charit(?:y|ies)|humanit\w+|needy|poor|orphan(?:age)?s?|philanthropists\?)))|de vous donner cet argent|faire don de la somme|voudrais en faire don|tego funduszu do dom(?:=F3|[\xf3])w (?:dziecka|wdowy))\b/i -meta __XFER_MONEY (__WIRE_XFR || __TRUSTED_CHECK || __BANK_DRAFT || __MOVE_MONEY || __TO_YOUR_ACCT || __PAY_YOU || __GIVE_MONEY) - -meta XFER_LOTSA_MONEY __XFER_MONEY && LOTS_OF_MONEY -describe XFER_LOTSA_MONEY Transfer a lot of money -score XFER_LOTSA_MONEY 1.000 # limit - -body __INTL_BANK /\b(?:international\s(?:\w+\s)?bank|banque\sinternationale)\b/i -body __YOUR_BANK /\byour?\s(?:full\s)?bank(?:ing)?\sinformations?\b/i - -body __BARRISTER /\b(?:barrister|solicitor at law|barr\.)/i -meta MONEY_BARRISTER __BARRISTER && LOTS_OF_MONEY -describe MONEY_BARRISTER Lots of money from a UK lawyer -score MONEY_BARRISTER 1.000 # limit - -body __SCAM /\bscam(?:m?e[dr])?s?\b/i -body __UN /\bunited\snations?\b/i -body __AFR_UNION /\bafrican\sunion\b/i -body __COMPENSATION /\b(?:compensat(?:e|ion)|recompensed?|ausgleich)\b/i -body __FRAUD /\b(?:de)?fraud/i - -meta UN_NO_ML __UN && !__VIA_ML && !__UNSUB_LINK && !__COMMENT_EXISTS -describe UN_NO_ML United Nations not via mailing list -tflags UN_NO_ML nopublish - -ifplugin Mail::SpamAssassin::Plugin::DKIM - meta COMPENSATION __COMPENSATION && !__DOS_HAS_LIST_UNSUB && !__HAS_X_LOOP && !__HAS_ERRORS_TO && !__UNSUB_LINK && !__OPERA_MID_NON_OP && !__FB_S_STOCK && !__COMMENT_EXISTS && !__NOT_SPOOFED && !__LOCAL_PP_NONPPURL && !__NOT_A_PERSON && !__SUBSCRIPTION_INFO && !__DKIM_EXISTS && !__HAS_SENDER && !__RP_MATCHES_RCVD && !__DKIM_DEPENDABLE -else - meta COMPENSATION __COMPENSATION && !__DOS_HAS_LIST_UNSUB && !__HAS_X_LOOP && !__HAS_ERRORS_TO && !__UNSUB_LINK && !__OPERA_MID_NON_OP && !__FB_S_STOCK && !__COMMENT_EXISTS && !__NOT_SPOOFED && !__LOCAL_PP_NONPPURL && !__NOT_A_PERSON && !__SUBSCRIPTION_INFO && !__DKIM_EXISTS && !__HAS_SENDER && !__RP_MATCHES_RCVD -endif -describe COMPENSATION "Compensation" -score COMPENSATION 1.50 # limit - -body __TRUNK_BOX /\b(?:(?:trunk|metallic|proof|security|consignment)\sbox(?:es)?|sealed\ssafe|une mallette m(?:e|=E9|[\xe9]|[\xc3][\xa9])tallique)\b/i -body __COURIER /\bcourier\s(?:company|service)\b/i -#meta MONEY_FRAUD_BOX LOTS_OF_MONEY && __TRUNK_BOX && __COURIER -#describe MONEY_FRAUD_BOX Lots of money in a box, lots of money from a fox -#score MONEY_FRAUD_BOX 1.0 - -body __SUM_OF_FUND /\b(?:sum|release|freigabe)\s(?:of|der)\s(?:amount|fund|investment|mittel)\b/i - -# [\xc3][\xa9] avoids "malformed UTF8" errors that plain \xc3\xa9 can experience. -body __BENEFICIARY /\bb(?:e|=E9|[\xe9]|[\xc3][\xa9])n(?:e|=E9|[\xe9]|[\xc3][\xa9])fi(?:c|sh)i?ai?r(?:y|ies|es?)/i -body __DIPLOMATIC /\bdiplomatic\b/i -body __FEES /\b(?:security|safe\w*|courier|registration|pay|paid|up-?front|processing|delivery|transfer|keeping)[\s\w]{0,15}\s(?:fee|charge)s?\b/i -body __LUCKY_WINNER /\b(?:lucky|gl.cklich(?:en)?|afortunados)\s(?:(?:ge)?win+ers?|ganador(?:es)?|individuals?)\b/i -body __YOUR_FUND /\b(?:your|ihr)\s(?:unpaid\s|win+ing\s|ap+roved\s|foreign\s|overdue\s|outstanding\s|contract\s|inheritance\s|nicht\sausbezahlten\s){0,3}(?:fund|payment|geld)\b/i -body __NIGERIA /\bnigeria\b/i -body __IVORY_COAST /\b(?:Cote\s?D.Ivoire|Ivory\s?Coast|Costa\sde\sMarfil)\b/i -body __BURKINA_FASO /\bburkina\s?faso\b/i -body __GHANA /\bghana\b/i -body __BENIN /\bb(?:e|=E9|[\xe9]|[\xc3][\xa9])nin\b/i -meta __AFRICAN_STATE (__NIGERIA || __IVORY_COAST || __BURKINA_FASO || __GHANA || __BENIN || __AFR_UNION) -body __YOUR_PERM /\byour\spermission\b/i -body __CONTACT_YOU /\b(?:contact(?:ing)\syou|vous\scontacter?)\b/i -body __FOUND_YOU /\b(?:I|we)\sfound\syour?\b/i -body __INVEST_MONEY /\binvest(?:ir)?\s(?:this|ces|d[ae]s|sur ce|de ces)\s(?:money|f[ou]nds?)\b/i -body __INVEST_COUNTRY /\binvest\sin\syour?\scountry\b/i -body __RANDOM_PICK /\b(?:random(?:ly)?\s(?:\w+\s)?(?:select(?:ion|ed)|pick(?:ed)?|computer)|(?:select|pick)ed\s(?:at\s)?random(?:ly)?|(?:esco(?:g|lh)idos|seleccion) (?:aleatoria(?:mente)?|al azar))\b/i -body __CHARITY /\b(?:charit(?:y|[ai]ble)|orphans?|homeless|orphelins|sans\sabri)\b/i - -body __UC_MONEY /\bMONEY\b/ - -body DEAR_BENEFICIARY /\b(?:De[ae]r\s|At+(?:ention|n):?\s?)(?:\S+\s)?Ben[ei]ficiary\b/i -describe DEAR_BENEFICIARY Dear Beneficiary: -#score DEAR_BENEFICIARY 2.0 - -meta YOUR_PERMISSION __YOUR_PERM && !__CTYPE_HAS_BOUNDARY && !__DKIM_EXISTS && !__DOS_HAS_LIST_UNSUB && !__CT_TEXT_PLAIN && !__BUGGED_IMG && !__COMMENT_EXISTS -describe YOUR_PERMISSION With your permission... - -# DEAR_WINNER from felicity/70_other.cf - -# simplification, talking about unspecified lots of money -body __MILLIONS /\bmillions\sof\s(?:dollar|euro|pound)/i - -# Adjust __FRAUD_PTS __FRAUD_XVW __FRAUD_IOU -body __FRAUD_PTX /\b(?:ass?ass?inat(?:ed|ion)|murder(?:e?d)?|poison(?:e?d)?|kill(?:ed|ing|ers)\b[^.]{0,99}\b(?:war veterans|rebels?)|les tueurs)\b/i -body __FRAUD_XWW /\b(?:honest(?:ly)?\sco(?:-?operat(?:e|ion)|llaborat(?:e|ion))|ehrliche\szusammenarbeit|sichere [kc]o+p[eo]ration|col+aboration\swith\sme)\b/i -body __FRAUD_IOV /\b(?:no risks?|risky?[- ]{0,3}free|free of risks?|100% safe|v\S{1,3}llig Risikofrei ist)\b/i - -meta RISK_FREE __FRAUD_IOV && !__UNSUB_LINK && !__VIA_ML && !__HTML_LINK_IMAGE && !__SUBSCRIPTION_INFO && !__HS_SUBJ_RE_FW && !__LCL__ENV_AND_HDR_FROM_MATCH -describe RISK_FREE No risk! - -meta __MONEY_FRAUD LOTS_OF_MONEY && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH + __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX + __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 1) -#meta MONEY_FRAUD __MONEY_FRAUD && !__VIA_ML && !__HAS_THREAD_INDEX -#describe MONEY_FRAUD Lots of money and a fraud phrase -#score MONEY_FRAUD 0.25 -#tflags MONEY_FRAUD nopublish - -meta __MONEY_FRAUD_3 LOTS_OF_MONEY && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH + __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX + __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 3) -meta MONEY_FRAUD_3 (__MONEY_FRAUD_3 && !__MONEY_FRAUD_5 && !__MONEY_FRAUD_8 && !__ADVANCE_FEE_3_NEW_MONEY) && !__COMMENT_EXISTS && !__TAG_EXISTS_CENTER && !__IS_EXCH && !__VIA_ML && !__HAS_THREAD_INDEX && !__UNSUB_LINK && !__DOS_HAS_LIST_UNSUB && !__HTML_LINK_IMAGE && !__THREADED && !__DOS_BODY_THU && !__URL_SHORTENER && !__TAG_EXISTS_STYLE -describe MONEY_FRAUD_3 Lots of money and several fraud phrases -#score MONEY_FRAUD_3 1.00 -tflags MONEY_FRAUD_3 publish - -meta __MONEY_FRAUD_5 LOTS_OF_MONEY && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH + __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX + __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 5) -meta MONEY_FRAUD_5 (__MONEY_FRAUD_5 && !__MONEY_FRAUD_8 && !__ADVANCE_FEE_5_NEW_MONEY) && !__VIA_ML && !__HAS_THREAD_INDEX && !__COMMENT_EXISTS && !__UNSUB_LINK && !__TAG_EXISTS_CENTER && !__URL_SHORTENER && !__TAG_EXISTS_STYLE -describe MONEY_FRAUD_5 Lots of money and many fraud phrases -#score MONEY_FRAUD_5 1.50 -tflags MONEY_FRAUD_5 publish - -meta __MONEY_FRAUD_8 LOTS_OF_MONEY && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH + __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX + __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 8) -#score MONEY_FRAUD_8 1.50 -meta MONEY_FRAUD_8 __MONEY_FRAUD_8 && !__VIA_ML && !__HAS_THREAD_INDEX && !__BUGGED_IMG -describe MONEY_FRAUD_8 Lots of money and very many fraud phrases -tflags MONEY_FRAUD_8 publish - -meta __FORM_FRAUD (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH + __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX + __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 1) -meta FORM_FRAUD (__FORM_FRAUD && !__FORM_FRAUD_3 && !__FORM_FRAUD_5) && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_THREAD_INDEX && !__VIA_ML && !__HTML_LINK_IMAGE && !__COMMENT_EXISTS && !__NOT_SPOOFED && !__UPPERCASE_URI && !__UNSUB_LINK -describe FORM_FRAUD Fill a form and a fraud phrase -score FORM_FRAUD 1.000 # limit -tflags FORM_FRAUD publish - -meta __FORM_FRAUD_3 (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH + __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX + __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 3) -meta FORM_FRAUD_3 (__FORM_FRAUD_3 && !__FORM_FRAUD_5 && !__ADVANCE_FEE_3_NEW_FORM && !__ADVANCE_FEE_3_NEW_FRM_MNY) && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_THREAD_INDEX && !__VIA_ML && !__HTML_LINK_IMAGE && !__MIME_QP && !__DOS_BODY_FRI && !__UNSUB_LINK && !__BUGGED_IMG && !__NOT_SPOOFED -describe FORM_FRAUD_3 Fill a form and several fraud phrases -#score FORM_FRAUD_3 1.00 -tflags FORM_FRAUD_3 publish - -meta __FORM_FRAUD_5 (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH + __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX + __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 5) -meta FORM_FRAUD_5 (__FORM_FRAUD_5 && !__ADVANCE_FEE_5_NEW_FORM && !__ADVANCE_FEE_5_NEW_FRM_MNY) && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_THREAD_INDEX && !__VIA_ML && !__BOUNCE_CTYPE -describe FORM_FRAUD_5 Fill a form and many fraud phrases -#score FORM_FRAUD_5 1.00 -tflags FORM_FRAUD_5 publish - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_MIME_in_body.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_MIME_in_body.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_MIME_in_body.cf 2014-04-06 17:50:36.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_MIME_in_body.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ - -# John Hardin -# Spams without a text body part first started appearing in 5/2009 - -# Requires fix for bug#6845 to work properly -if (version >= 3.004000) - body __MIME_CTYPE_IN_BODY /^Content-Type:\s/ - meta __MIME_MALF __CTYPE_MULTIPART_ANY && __MIME_CTYPE_IN_BODY - meta MIME_MALF __MIME_MALF && !ALL_TRUSTED - describe MIME_MALF Malformed MIME: headers in body - score MIME_MALF 2.00 # limit -else - meta __MIME_CTYPE_IN_BODY 0 - meta __MIME_MALF 0 -endif - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_MIME_no_text.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_MIME_no_text.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_MIME_no_text.cf 2014-07-04 17:01:34.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_MIME_no_text.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ - -# John Hardin -# Spams without a text body part first started appearing in 5/2009 - -# These should be generally useful to other rules as well - -header __CTYPE_MULTIPART_ANY Content-Type =~ /multipart\/\w+/i -header __PHP_MUA_1 X-Mailer =~ /^PHP\s?v?\/?\d\./ -header __PHP_MUA_2 X-Mailer =~ /^PHP\d$/ -meta __PHP_MUA __PHP_MUA_1 || __PHP_MUA_2 - -ifplugin Mail::SpamAssassin::Plugin::MIMEHeader - mimeheader __ANY_TEXT_ATTACH Content-Type =~ /text\/\w+/i - - meta __MIME_NO_TEXT (__CTYPE_MULTIPART_ANY && !__ANY_TEXT_ATTACH) - meta MIME_NO_TEXT __MIME_NO_TEXT && !ALL_TRUSTED && !__MSGID_APPLEMAIL && !__USER_AGENT_APPLEMAIL && !__HAS_IN_REPLY_TO && !__HAS_X_REF && !__HS_SUBJ_RE_FW && !__LCL__ENV_AND_HDR_FROM_MATCH - score MIME_NO_TEXT 2.00 # limit - describe MIME_NO_TEXT No (properly identified) text body parts - tflags MIME_NO_TEXT publish - - meta MIME_PHP_NO_TEXT (MIME_NO_TEXT && __PHP_MUA) - #score MIME_PHP_NO_TEXT 2.00 - describe MIME_PHP_NO_TEXT No text body parts, X-Mailer: PHP -else - meta __ANY_TEXT_ATTACH 0 - meta __MIME_NO_TEXT 0 -endif - diff -Nru spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_misc_testing.cf spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_misc_testing.cf --- spamassassin-3.4.6/trunk-only/rulesrc/sandbox/jhardin/20_misc_testing.cf 2015-04-04 17:42:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/rulesrc/sandbox/jhardin/20_misc_testing.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,1960 +0,0 @@ - -# Ensure plugin-based rules used for FP avoidance exist -# even if the plugin is not loaded, or an older version is loaded -# __KAM_BODY_LENGTH_LT_512 -ifplugin Mail::SpamAssassin::Plugin::BodyEval - if can(Mail::SpamAssassin::Plugin::BodyEval::has_check_body_length) - meta __LCL__KAM_BODY_LENGTH_LT_512 __KAM_BODY_LENGTH_LT_512 - else - meta __LCL__KAM_BODY_LENGTH_LT_512 0 - endif -else - meta __LCL__KAM_BODY_LENGTH_LT_512 0 -endif - -# __KAM_BODY_LENGTH_LT_1024 -ifplugin Mail::SpamAssassin::Plugin::BodyEval - if can(Mail::SpamAssassin::Plugin::BodyEval::has_check_body_length) - meta __LCL__KAM_BODY_LENGTH_LT_1024 __KAM_BODY_LENGTH_LT_1024 - else - meta __LCL__KAM_BODY_LENGTH_LT_1024 0 - endif -else - meta __LCL__KAM_BODY_LENGTH_LT_1024 0 -endif - -# __ENV_AND_HDR_FROM_MATCH -ifplugin Mail::SpamAssassin::Plugin::HeaderEval - meta __LCL__ENV_AND_HDR_FROM_MATCH __ENV_AND_HDR_FROM_MATCH -else - meta __LCL__ENV_AND_HDR_FROM_MATCH 0 -endif - -# __TVD_SPACE_RATIO -ifplugin Mail::SpamAssassin::Plugin::BodyEval - # -else - meta __TVD_SPACE_RATIO 0 -endif - - - -# -#header REPLYTO_MANY_AT Reply-To =~ /\@.+\@/ -#describe REPLYTO_MANY_AT More than one @ in Reply-To: -# -#header SENDER_MANY_AT Sender =~ /\@.+\@/ -#describe SENDER_MANY_AT More than one @ in Sender: -# -#header FROM_MANY_AT From =~ /\@.+\@/ -#describe FROM_MANY_AT More than one @ in From: -# - -header RDNS_LOCALHOST X-Spam-Relays-External =~ /^\[ ip=(?!127)\d+\.\d+\.\d+\.\d+ rdns=localhost(?:\.localdomain)? /i -describe RDNS_LOCALHOST Sender's public rDNS is "localhost" - -#body EU_SPAM_LAW m,Directive 2000/31/EC of the European Parliament,i -#describe EU_SPAM_LAW Quoting "European Parliament" spam law - -ifplugin Mail::SpamAssassin::Plugin::MIMEHeader - mimeheader __HTML_ATTACH_01 Content-Type =~ m,\btext/html\b.+\.html?\b,i - mimeheader __HTML_ATTACH_02 Content-Disposition =~ m,\bfilename="?[^"]+\.html?\b,i - meta HTML_ATTACH __HTML_ATTACH_01 || __HTML_ATTACH_02 - describe HTML_ATTACH HTML attachment to bypass scanning? - - mimeheader OBFU_HTML_ATTACH Content-Type =~ m,\bapplication/octet-stream\b.+\.html?\b,i - describe OBFU_HTML_ATTACH HTML attachment with non-text MIME type - - mimeheader OBFU_TEXT_ATTACH Content-Type =~ m,\bapplication/octet-stream\b.+\.txt\b,i - describe OBFU_TEXT_ATTACH Text attachment with non-text MIME type - #score OBFU_TEXT_ATTACH 2.5 - tflags OBFU_TEXT_ATTACH publish - - mimeheader OBFU_DOC_ATTACH Content-Type =~ m,\bapplication/octet-stream\b.+\.(?:doc|rtf)\b,i - describe OBFU_DOC_ATTACH MS Document attachment with generic MIME type - #score OBFU_DOC_ATTACH 0.25 - - mimeheader OBFU_PDF_ATTACH Content-Type =~ m,\bapplication/octet-stream\b.+\.pdf\b,i - describe OBFU_PDF_ATTACH PDF attachment with generic MIME type - #score OBFU_PDF_ATTACH 0.25 - - mimeheader OBFU_JPG_ATTACH Content-Type =~ m,\bapplication/octet-stream\b.+\.jpe?g\b,i - describe OBFU_JPG_ATTACH JPG attachment with generic MIME type - #score OBFU_JPG_ATTACH 1.50 - - mimeheader OBFU_GIF_ATTACH Content-Type =~ m,\bapplication/octet-stream\b.+\.gif\b,i - describe OBFU_GIF_ATTACH GIF attachment with generic MIME type - #score OBFU_GIF_ATTACH 1.50 - - meta OBFU_ATTACH_MISSP __FROM_RUNON && (OBFU_HTML_ATTACH || OBFU_TEXT_ATTACH || OBFU_DOC_ATTACH || OBFU_PDF_ATTACH || OBFU_JPG_ATTACH || OBFU_GIF_ATTACH) - describe OBFU_ATTACH_MISSP Obfuscated attachment type and misspaced From - -# mimeheader ECMSNGR_MH X-ecm-part-format =~ /./ -# describe ECMSNGR_MH eC-Messenger header - - mimeheader __CTYPE_NULL Content-Type =~ /^\s*;/ - meta CTYPE_NULL __CTYPE_NULL - describe CTYPE_NULL Malformed Content-Type header - - mimeheader __ZIP_ATTACH_NOFN Content-Type =~ m,\bapplication/zip[;\s]*$,i - meta OBFU_HTML_ATT_MALW __ZIP_ATTACH_NOFN && __HTML_ATTACH_02 - describe OBFU_HTML_ATT_MALW HTML attachment with incorrect MIME type - possible malware - - mimeheader __PDF_ATTACH Content-Type =~ m,\bapplication/pdf\b,i - - mimeheader __ATTACH_NAME_NO_EXT Content-Type =~ m,\bname\s?=\s?"(?!=\?)[^."]+",i - meta DOC_ATTACH_NO_EXT __ATTACH_NAME_NO_EXT && (__PDF_ATTACH || __DOC_ATTACH_MT) - describe DOC_ATTACH_NO_EXT Document attachment with suspicious name - -else - meta __HTML_ATTACH_01 0 - meta __HTML_ATTACH_02 0 - meta __CTYPE_NULL 0 - meta __ZIP_ATTACH_NOFN 0 - meta __PDF_ATTACH 0 - meta __ATTACH_NAME_NO_EXT 0 -endif - -# general case of spample observation -#header MUA_ONE_WORD X-Mailer =~ /^[A-Za-z][a-z]*$/ -#describe MUA_ONE_WORD Single word X-Mailer: not CamelCase - -body DEAR_EMAIL_USER /^\s?(?:Dear\s|Attention:?\s?)(?:E|Web)-?mail\s(?:account\s)?User\b/i -describe DEAR_EMAIL_USER Dear Email User: -#score DEAR_EMAIL_USER 3.0 - - -# from users list spamples 8/2009 -uri URI_NUMERIC_CCTLD m;^[a-z]+://(?:\d+\.){2,}[a-z][a-z]/;i -describe URI_NUMERIC_CCTLD CCTLD URI with multiple numeric subdomains - -# various MUAs -header __PHP_NOVER_MUA X-Mailer =~ /^PHP$/ -header __PHPMAILER_MUA X-Mailer =~ /^PHPMailer\b/ - -# __PHP_NOVER_MUA most spam hits are on messages scoring < 5 points -ifplugin Mail::SpamAssassin::Plugin::DKIM - meta PHP_NOVER_MUA __PHP_NOVER_MUA && !__DKIM_DEPENDABLE && !__TO_NO_BRKTS_HTML_ONLY && !__MSGID_OK_DIGITS && !__UPPERCASE_25_50 && !__RP_MATCHES_RCVD && !__GIF_ATTACH -else - meta PHP_NOVER_MUA __PHP_NOVER_MUA && !__TO_NO_BRKTS_HTML_ONLY && !__MSGID_OK_DIGITS && !__UPPERCASE_25_50 && !__RP_MATCHES_RCVD && !__GIF_ATTACH -endif -score PHP_NOVER_MUA 3.50 # limit -describe PHP_NOVER_MUA Mail from PHP with no version number - - -# From should have whitespace between the comment and the address -# Better S/O, good enough for standalone rule -header __FROM_MISSPACED From =~ /^\s*"[^"]*" 10 points already -#meta __FROM_MISSP_URI __FROM_RUNON_UNCODED && __HAS_ANY_URI -#meta FROM_MISSP_URI __FROM_MISSP_URI && !__NOT_SPOOFED && !__RCD_RDNS_MTA_MESSY && !MISSING_MIMEOLE && !__REPTO_QUOTE && !__UNSUB_LINK && !__MSGID_OK_HEX && !__MAIL_LINK && !__MIME_QP && !__BUGGED_IMG && !MIME_BASE64_TEXT && !__CTYPE_MULTIPART_ALT && !__MTLANDROID_MUA && !__XEROXWORKCTR_MUA && !__PHP_MUA && !__AMADEUSMS_MUA && !__FLASHMAIL_MUA && !__DKIM_EXISTS && !__HAS_SENDER && !__RP_MATCHES_RCVD && !__THREADED && !__TAG_EXISTS_META -#describe FROM_MISSP_URI From misspaced, has URI -#score FROM_MISSP_URI 2.00 # max - -meta FROM_MISSP_USER (__FROM_RUNON && NSL_RCVD_FROM_USER) -describe FROM_MISSP_USER From misspaced, from "User" - -# all hits > 10 points already -#meta FROM_MISSP_NO_TO (__FROM_RUNON && MISSING_HEADERS) -#describe FROM_MISSP_NO_TO From misspaced, To missing - -meta FROM_MISSP_TO_UNDISC (__FROM_RUNON && __TO_UNDISCLOSED) -describe FROM_MISSP_TO_UNDISC From misspaced, To undisclosed - -ifplugin Mail::SpamAssassin::Plugin::DKIM - meta __FROM_MISSP_DKIM (__FROM_RUNON_UNCODED && __DKIM_DEPENDABLE) - tflags __FROM_MISSP_DKIM net - meta FROM_MISSP_DKIM __FROM_MISSP_DKIM && !__CTYPE_MULTIPART_ALT && !__MIME_QP && !__BUGGED_IMG && !__DOS_HAS_LIST_UNSUB && !__MIME_BASE64 && !__MTLANDROID_MUA && !__XEROXWORKCTR_MUA && !__PHP_MUA && !__AMADEUSMS_MUA && !__FLASHMAIL_MUA - describe FROM_MISSP_DKIM From misspaced, DKIM dependable -else - meta __FROM_MISSP_DKIM 0 -endif - -meta __FROM_MISSP_REPLYTO __FROM_RUNON && __REPLYTO_EXISTS -meta FROM_MISSP_REPLYTO __FROM_MISSP_REPLYTO && !__NOT_SPOOFED && !__RCD_RDNS_MTA_MESSY && !__TO___LOWER && !__COMMENT_EXISTS && !__UNSUB_LINK && !__MIME_QP && !__CTYPE_MULTIPART_ALT && !__JM_REACTOR_DATE && !__PLING_QUERY -describe FROM_MISSP_REPLYTO From misspaced, has Reply-To - -## To the same -#header TO_MISSPACED To =~ /^\s*"[^"]*"]+>\n.*Organization: \1\n/ism -header __FROM_EQ_ORG_2 ALL =~ /\nOrganization: ([^\n]+)\n.*From: "?\1"?/ism -#meta FROM_EQ_ORG __FROM_EQ_ORG_1 || __FROM_EQ_ORG_2 -#describe FROM_EQ_ORG From: same as Organization: -#tflags FROM_EQ_ORG publish - - -# observed in UCE 9/2009 -#header __HDRS_LCASE ALL =~ /\n(?:Reply-to|Message-id|Content-type|X-MSMail-priority|from|subject|to|Disposition-notification-to):/sm -header __HDRS_LCASE ALL =~ /\n(?:Message-id|Content-type|X-MSMail-priority|from|subject|to|cc|Disposition-notification-to):/sm -tflags __HDRS_LCASE multiple maxhits=3 - -# __MSGID_APPLEMAIL is uppercase-only GUID message_id. This may be redundant. -header __MSGID_GUID Message-ID =~ /^ 1 -meta __TOOMANY_HDRS_LCASE __HDRS_LCASE > 2 -ifplugin Mail::SpamAssassin::Plugin::FreeMail - meta MANY_HDRS_LCASE __MANY_HDRS_LCASE && !__HDRS_LCASE_KNOWN && !__VIA_ML && !__freemail_safe && !__THREADED && !__UNUSABLE_MSGID && !__DOS_SINGLE_EXT_RELAY && !__DKIM_EXISTS && !__NOT_SPOOFED && !__BUGGED_IMG && !__MIME_QP && !__RDNS_NONE -else - meta MANY_HDRS_LCASE __MANY_HDRS_LCASE && !__HDRS_LCASE_KNOWN && !__VIA_ML && !__THREADED && !__UNUSABLE_MSGID && !__DOS_SINGLE_EXT_RELAY && !__DKIM_EXISTS && !__NOT_SPOOFED && !__BUGGED_IMG && !__MIME_QP && !__RDNS_NONE -endif -describe MANY_HDRS_LCASE Odd capitalization of multiple message headers -score MANY_HDRS_LCASE 0.10 # limit - -# Some metas that appear to perform well in masscheck -#meta __HDRS_LCASE_1K __HDRS_LCASE && __SINGLE_HEADER_1K -#meta HDRS_LCASE_1K __HDRS_LCASE_1K && !__HDRS_LCASE_KNOWN && !__VIA_ML && !__MIME_QP && !__BUGGED_IMG && !__BOUNCE_RPATH_NULL && !__NOT_SPOOFED && !__DKIM_EXISTS && !__RDNS_NONE -#describe HDRS_LCASE_1K Odd capitalization of message headers + long header -#score HDRS_LCASE_1K 0.50 # limit -meta HDRS_LCASE_IMGONLY __HDRS_LCASE && __HTML_IMG_ONLY && !__HDRS_LCASE_KNOWN -describe HDRS_LCASE_IMGONLY Odd capitalization of message headers + image-only HTML -score HDRS_LCASE_IMGONLY 0.10 # limit - - - - -# observed in UCE from India, 9/2009 -header MDN_BOTCHED Disposition-notification-to =~ /<>/ -describe MDN_BOTCHED Malformed return receipt header - -# observed in spam 9/2009 -header __HDRS_MISSP ALL =~ /\n(?:Subject|From|To):\S/ism -meta HDRS_MISSP __HDRS_MISSP && !__TAG_EXISTS_HEAD && !__DKIM_EXISTS && !__RP_MATCHES_RCVD && !__NOT_SPOOFED && !__LCL__ENV_AND_HDR_FROM_MATCH -describe HDRS_MISSP Misspaced headers -score HDRS_MISSP 2.000 # limit - -header SPAMMY_MIME_BDRY_01 Content-Type =~ /boundary="\@\@BOUNDARY"/ -describe SPAMMY_MIME_BDRY_01 Spammy MIME boundary string -#score SPAMMY_MIME_BDRY_01 0.10 - -# testing -header __TB_MIME_BDRY_NO_Z Content-Type =~ /boundary="-{8,}(?:[1-9]){16}/ -meta TBIRD_SUSP_MIME_BDRY __MUA_TBIRD && __TB_MIME_BDRY_NO_Z -describe TBIRD_SUSP_MIME_BDRY Unlikely Thunderbird MIME boundary - -# too dangerous even if it has a good S/O and hits >20% of spam in masschecks -#meta TBIRD_SPOOF __MUA_TBIRD && !__HAS_IN_REPLY_TO && !__HAS_X_REF && !__THREADED && !__VIA_ML && !__NOT_SPOOFED && !__HAS_SENDER && !__HAS_ERRORS_TO && !__HAS_X_BEEN_THERE && !__RP_MATCHES_RCVD && !ALL_TRUSTED && !__TO_EQ_FROM_DOM && !__RCD_RDNS_MAIL_MESSY && !__MIME_BASE64 && !__S25R_1 -#describe TBIRD_SPOOF Claims Thunderbird mail client but looks suspicious -#score TBIRD_SPOOF 2.00 # limit - -# seen in a few HTML fraud spams -rawbody RUNON_SHY /(?:\­){3}/i -describe RUNON_SHY Repeating soft hyphens -#score RUNON_SHY 0.1 -tflags RUNON_SHY nopublish - -# Seen all too often -header LAZY_LISTWASHING To =~ /\@(?:example\.com|example\.domain|your\.domain|some\.domain|domain\.dom|somewhere\.tld|somewhere\.com|your\.?domain\.com|your\.favorite\.machine)\b/i -describe LAZY_LISTWASHING Lazy spammer, painfully obvious bogus addresses -#score LAZY_LISTWASHING 0.25 - -# Little to work with -body __PLS_REVIEW /\b(?:please|kindly)\s(?:(?:re)?view|see)(?:\s\w+)?\sattach(?:ed|ment)\b/i -body __DLND_ATTACH /\bdownload\sthe\sattach(?:ed|ment)\b/i - -ifplugin Mail::SpamAssassin::Plugin::MIMEHeader - mimeheader __DOC_ATTACH_MT Content-Type =~ m,\bapplication/(?:msword|rtf|vnd\.ms-word|vnd\.openxmlformats-officedocument\.wordprocessingml\.document)\b,i - mimeheader __DOC_ATTACH_FN1 Content-Type =~ /="[^"]+\.(?:docx?|rtf)"/i - mimeheader __DOC_ATTACH_FN2 Content-Disposition =~ /="[^"]+\.(?:docx?|rtf)"/i - meta __DOC_ATTACH (__DOC_ATTACH_MT || __DOC_ATTACH_FN1 || __DOC_ATTACH_FN2) - mimeheader __PDF_ATTACH_MT Content-Type =~ m,\bapplication/pdf\b,i - mimeheader __PDF_ATTACH_FN1 Content-Type =~ /="[^"]+\.pdf"/i - mimeheader __PDF_ATTACH_FN2 Content-Disposition =~ /="[^"]+\.pdf"/i - meta __PDF_ATTACH (__PDF_ATTACH_MT || __PDF_ATTACH_FN1 || __PDF_ATTACH_FN2) - - # observed in 419 spam - mimeheader CDISP_SZ_MANY Content-Disposition =~ /\bsize\s?=\s?\d.*\bsize\s?=\s?\d/ - describe CDISP_SZ_MANY Suspicious MIME header - score CDISP_SZ_MANY 2.0 # limit -else - meta __DOC_ATTACH_MT 0 - meta __DOC_ATTACH_FN1 0 - meta __DOC_ATTACH_FN2 0 - meta __DOC_ATTACH 0 - meta __PDF_ATTACH_MT 0 - meta __PDF_ATTACH_FN1 0 - meta __PDF_ATTACH_FN2 0 - meta __PDF_ATTACH 0 -endif - -ifplugin Mail::SpamAssassin::Plugin::FreeMail - meta __FREEMAIL_DOC_PDF (__DOC_ATTACH || __PDF_ATTACH) && (FREEMAIL_FROM || FREEMAIL_REPLYTO) - meta FREEMAIL_DOC_PDF __FREEMAIL_DOC_PDF - describe FREEMAIL_DOC_PDF MS document or PDF attachment, from freemail - - meta FREEMAIL_DOC_PDF_BCC __FREEMAIL_DOC_PDF && __TO_UNDISCLOSED - describe FREEMAIL_DOC_PDF_BCC MS document or PDF attachment, from freemail, all recipients hidden - - meta FREEMAIL_RVW_ATTCH (__PLS_REVIEW || __DLND_ATTACH) && __FREEMAIL_DOC_PDF - describe FREEMAIL_RVW_ATTCH Please review attached document, from freemail -endif - -meta EMPTY_RVW_ATTCH (__PLS_REVIEW || __DLND_ATTACH) && __EMPTY_BODY -describe EMPTY_RVW_ATTCH Please review attached document, empty message - -body __END_FUTURE_EMAILS /\b(?:end|stop(?! receiving these (?:alerts|emails))|cease|discontinue|removed?|(?:do(?! not wish to receive [\w\s]{0,20}emails)|would|you(?:'d)?) (?:not (?:wish|want|like|desire)|(?:prefer|wish|want|like|desire) not) to|exclude yourself|fore?go)[- ](?:get |receiv(?:ing|e) |or |(?:a-z{1,30} ){0,4}from )?(?:these|our|(?:any )?(?:future|further)) (?:(?:e|ad)?-?m(?:ail(?:ing)?|es+[age]{3})|alert|PSA|marketing|notice)[- ]?(?:ad|update)?s?\b/i -ifplugin Mail::SpamAssassin::Plugin::DKIM - meta END_FUTURE_EMAILS __END_FUTURE_EMAILS && !__SUBJECT_ENCODED_B64 && !__HDRS_LCASE && !__HDRS_LCASE_KNOWN && !__TO___LOWER && !__DKIM_DEPENDABLE && !DKIM_SIGNED -else - meta END_FUTURE_EMAILS __END_FUTURE_EMAILS && !__SUBJECT_ENCODED_B64 && !__HDRS_LCASE && !__HDRS_LCASE_KNOWN && !__TO___LOWER -endif -describe END_FUTURE_EMAILS Spammy unsubscribe -score END_FUTURE_EMAILS 2.500 # limit - - -body AD_COMPLAINTS /\bcomplaints about this ad+\b/i -describe AD_COMPLAINTS Complain about this spam - -# observed in bank phishing 09/2009 -rawbody MISQ_HTML /<\w{2,20}[^>=]{1,30}=[^"][^">]{1,30}[^=]"[\s>]/ -describe MISQ_HTML Unbalanced quotes in HTML tag -tflags MISQ_HTML nopublish - -# observed in bank phishing 09/2009 -uri WIKI_IMG m,^https?://[^/]+wiki[mp]edia\.org/.+\.(?:png|gif|jpe?g),i -describe WIKI_IMG Image from wikipedia - -# observed in spam 09/2009 -header SUBJ_RE_CLNCLN Subject =~ /^\s*RE::/ -describe SUBJ_RE_CLNCLN Subject RE:: - -# observed in spam 02/2011 -header TO_SEM_SEM To =~ /;;/ -describe TO_SEM_SEM To has ";;" -tflags TO_SEM_SEM nopublish - -uri __MANY_SUBDOM m;^https?://(?:[^\./]{1,30}\.){6};i -meta MANY_SUBDOM __MANY_SUBDOM && !__JM_REACTOR_DATE && !__UNSUB_LINK && !__VIA_ML && !NO_RELAYS && !__UPPERCASE_URI && !__MIME_QP -describe MANY_SUBDOM Lots and lots of subdomain parts in a URI - -# by request of Benny Pedersen on the users list 10/9/2009 -#meta RFC_ABUSE_POST (__DNS_FROM_RFC_ABUSE && __DNS_FROM_RFC_POST) -#describe RFC_ABUSE_POST Both abuse and postmaster missing on sender domain -#score RFC_ABUSE_POST 0.01 -#tflags RFC_ABUSE_POST net - -body CALL_SKYPE /\bCall this phone number [\w\s]{0,30}with Skype\b/ - -# tags shouldn't appear in the midst of text -rawbody __SPAN_BEG_TEXT /[a-z]{2}<(?i:span)\s/ -tflags __SPAN_BEG_TEXT multiple maxhits=5 -rawbody __SPAN_END_TEXT /[^;>]<\/(?i:span)>[a-z]{3}/ -tflags __SPAN_END_TEXT multiple maxhits=5 -meta __MANY_SPAN_IN_TEXT (__SPAN_BEG_TEXT > 4) && (__SPAN_END_TEXT > 4) -meta MANY_SPAN_IN_TEXT __MANY_SPAN_IN_TEXT && !__VIA_ML -describe MANY_SPAN_IN_TEXT Many tags embedded within text -tflags MANY_SPAN_IN_TEXT publish -#score MANY_SPAN_IN_TEXT 2.50 - -#uri __FEEDPROXY_URI m;http://feedproxy\.google\.com/;i -#rawbody __FEEDPROXY m;http://feedproxy\.google\.com/;i -#tflags __FEEDPROXY multiple maxhits=5 -#meta MANY_GOOG_PROXY __FEEDPROXY > 4 -#describe MANY_GOOG_PROXY Many Google feedproxy URIs - -rawbody TINY_FLOAT /\bstyle\s*=\s*"[^"]{0,40}?(?:(?:FONT-SIZE\s*:\s+\dpx|FLOAT\s*:\s+(?:right|left))(?:;\s+)?(?:(?!(?:FONT-SIZE|FLOAT))\w+:\s+\w+;?\s*)*){2}/i -describe TINY_FLOAT Has small-font floating HTML - text obfuscation? -#score TINY_FLOAT 2.00 - - -# endless requests on the users list... -header __TO_EQ_FROM_1 ALL =~ /\nFrom:\s+(?:[^\n<]{0,80}<)?([^\n\s>]+)>?\n(?:[^\n]{1,100}\n)*To:\s+(?:[^\n]{0,80}<)?\1[>,\s\n]/ism -header __TO_EQ_FROM_2 ALL =~ /\nTo:\s+(?:[^\n<]{0,80}<)?([^\n\s>]+)>?\n(?:[^\n]{1,100}\n)*From:\s+(?:[^\n]{0,80}<)?\1[>,\s\n]/ism -meta __TO_EQ_FROM (__TO_EQ_FROM_1 || __TO_EQ_FROM_2) -describe __TO_EQ_FROM To: same as From: -#tflags __TO_EQ_FROM publish - -# Suggested by Hans-Werner Friedemann on users list 09/30/2010 -header __SUBJ_HAS_FROM_1 ALL =~ /\nFrom:\s+(?:[^\n<]{0,80}<)?([^\n\s>]+)>?\n(?:[^\n]{1,100}\n)*Subject:\s+[^\n]{0,100}\1[>,\s\n]/ism -meta FROM_IN_TO_AND_SUBJ (__TO_EQ_FROM && __SUBJ_HAS_FROM_1) -describe FROM_IN_TO_AND_SUBJ From address is in To and Subject -tflags FROM_IN_TO_AND_SUBJ publish - -header __SUBJ_HAS_TO_1 ALL =~ /\nTo:\s+(?:[^\n<]{0,80}<)?([^\n\s>,]+)>?\n(?:[^\n]{1,200}\n)*Subject:\s+[^\n]{0,100}\1[^a-z0-9]/ism -header __SUBJ_HAS_TO_2 ALL =~ /\nReceived:[^\n]{0,200} for ;]+)>?;(?:[^\n]+\n)*Subject:\s+[^\n]{0,100}\1[^a-z0-9]/ism -header __SUBJ_HAS_TO_3 ALL =~ /\nSubject:(?=[^\n]{0,200}@)[^\n]{0,200}([a-z][a-z0-9_.]{3,80}@(?:[a-z0-9_]{1,80}\.){1,4}[a-z]{2,30})(?:[^\n]+\n)*To:\s+[^\n]{0,100}\1[^a-z0-9.]/ism -meta __TO_IN_SUBJ (__SUBJ_HAS_TO_1 || __SUBJ_HAS_TO_2 || __SUBJ_HAS_TO_3) -meta TO_IN_SUBJ __TO_IN_SUBJ && !__VIA_ML && !MISSING_MIMEOLE && !__THREAD_INDEX_GOOD && !__FSL_RELAY_GOOGLE && !__LCL__ENV_AND_HDR_FROM_MATCH && !__HS_SUBJ_RE_FW -describe TO_IN_SUBJ To address is in Subject -tflags TO_IN_SUBJ publish -score TO_IN_SUBJ 0.1 - -meta __TO_EQ_FM_HTML_ONLY __TO_EQ_FROM && MIME_HTML_ONLY -meta TO_EQ_FM_HTML_ONLY __TO_EQ_FM_HTML_ONLY && !ALL_TRUSTED && !__RCD_RDNS_MAIL_MESSY && !__RCD_RDNS_SMTP_MESSY && !__NOT_SPOOFED && !__DKIM_EXISTS && !__ANY_IMAGE_ATTACH && !__FROM_LOWER && !__TAG_EXISTS_CENTER -describe TO_EQ_FM_HTML_ONLY To == From and HTML only -#tflags TO_EQ_FM_HTML_ONLY publish - -meta __TO_EQ_FM_DIRECT_MX __TO_EQ_FROM && __DOS_DIRECT_TO_MX -meta TO_EQ_FM_DIRECT_MX __TO_EQ_FM_DIRECT_MX && !__THREAD_INDEX_GOOD && !__IS_EXCH -describe TO_EQ_FM_DIRECT_MX To == From and direct-to-MX -#tflags TO_EQ_FM_DIRECT_MX publish - -# Why __HUSH_HUSH hits ham on this in masscheck I don't know. Legit bank emails maybe? -meta __TO_EQ_FM_HTML_DIRECT __TO_EQ_FM_DIRECT_MX && MIME_HTML_ONLY -meta TO_EQ_FM_HTML_DIRECT __TO_EQ_FM_HTML_DIRECT && !__HUSH_HUSH -describe TO_EQ_FM_HTML_DIRECT To == From and HTML only, direct-to-MX -#tflags TO_EQ_FM_HTML_DIRECT publish - -ifplugin Mail::SpamAssassin::Plugin::SPF - meta __TO_EQ_FM_SPF_FAIL __TO_EQ_FROM && SPF_FAIL - tflags __TO_EQ_FM_SPF_FAIL net - meta TO_EQ_FM_SPF_FAIL __TO_EQ_FM_SPF_FAIL && !__THREADED && !ALL_TRUSTED - describe TO_EQ_FM_SPF_FAIL To == From and external SPF failed - tflags TO_EQ_FM_SPF_FAIL net -else - meta __TO_EQ_FM_SPF_FAIL 0 -endif - -# Paul Stead on SA list 11/2014 -# ++ not liked by perl 5.8.x -if can(Mail::SpamAssassin::Conf::perl_min_version_5010000) - header __PDS_TO_EQ_FROM_NAME_1 ALL =~ /\nTo:\s+(?:[^\n<]{0,80}<)?([^\n\s>]+)>?\n(?:[^\n]{1,100}\n)*From:\W+(\1)([^\n\w<]++<)?((?!\1)[^\n">]++)>?\n/ism - header __PDS_TO_EQ_FROM_NAME_2 ALL =~ /\nFrom:\W+"([\w+.-]+\@[\w.-]+\.\w\w+)(?:[^\n\w<]{0,80}<)?((?!\1)[^\n">]++)>?\n(?:[^\n]{1,100}\n)*To:\s+(?:[^\n<]{0,80}<)?(\1)>?/ism - - meta PDS_TO_EQ_FROM_NAME (__PDS_TO_EQ_FROM_NAME_1 || __PDS_TO_EQ_FROM_NAME_2) - describe PDS_TO_EQ_FROM_NAME From: name same as To: address - - header __PDS_FROM_2_EMAILS From =~ /^\W+([\w+.-]+\@[\w.-]+\.\w\w++)(?:[^\n\w<]{0,80})?<(?!\1)[^\n\s]*\@/i - meta PDS_FROM_2_EMAILS __PDS_FROM_2_EMAILS && !__VIA_ML && !__VIA_RESIGNER && !__CLICK_HERE && !__BUGGED_IMG && !__RP_MATCHES_RCVD -endif - -uri __PDS_LOC_WP_POMO m;/wp-includes/pomo/(?!(?:entry|po|mo|streams|translations)\.php).*;i - - -header __FROM_ALL_NUMS From:addr =~ /^\d+@/ -header __TO_ALL_NUMS To:addr =~ /^\d+@/ -meta __FM_TO_ALL_NUMS __FROM_ALL_NUMS && __TO_ALL_NUMS - -header __TO_EQ_FROM_DOM_1 ALL =~ /\nFrom:\s+[^\n@]{0,80}@([^\n\s>]+)>?\n(?:[^\n]{1,100}\n)*To:\s+[^\n]+@\1[>,\s\n]/ism -header __TO_EQ_FROM_DOM_2 ALL =~ /\nTo:\s+[^\n@]{0,80}@([^\n\s>]+)>?\n(?:[^\n]{1,100}\n)*From:\s+[^\n]+@\1[>,\s\n]/ism -meta __TO_EQ_FROM_DOM (__TO_EQ_FROM_DOM_1 || __TO_EQ_FROM_DOM_2) -describe __TO_EQ_FROM_DOM To: domain same as From: domain - -meta __TO_EQ_FM_DOM_HTML_ONLY __TO_EQ_FROM_DOM && MIME_HTML_ONLY -meta TO_EQ_FM_DOM_HTML_ONLY __TO_EQ_FM_DOM_HTML_ONLY && !__NOT_SPOOFED && !__CTYPE_MULTIPART_ALT && !HTML_MIME_NO_HTML_TAG && !__IS_EXCH && !__MSGID_BEFORE_RECEIVED && !__FM_TO_ALL_NUMS && !__FROM_LOWER && !__HAS_IN_REPLY_TO && !__BUGGED_IMG && !__FROM_ENCODED_QP && !__MSGID_OK_HEX -describe TO_EQ_FM_DOM_HTML_ONLY To domain == From domain and HTML only - -meta __TO_EQ_FM_DOM_HTML_IMG __TO_EQ_FROM_DOM && __HTML_LINK_IMAGE -meta TO_EQ_FM_DOM_HTML_IMG __TO_EQ_FM_DOM_HTML_IMG && !__NOT_SPOOFED && !__CTYPE_MULTIPART_ALT && !__IS_EXCH && !__UNSUB_LINK && !__COMMENT_EXISTS && !__FM_TO_ALL_NUMS && !__DKIM_EXISTS && !__HAS_THREAD_INDEX && !__MSGID_JAVAMAIL && !__RP_MATCHES_RCVD -describe TO_EQ_FM_DOM_HTML_IMG To domain == From domain and HTML image link - -ifplugin Mail::SpamAssassin::Plugin::SPF - meta __TO_EQ_FM_DOM_SPF_FAIL __TO_EQ_FROM_DOM && SPF_FAIL - tflags __TO_EQ_FM_DOM_SPF_FAIL net - meta TO_EQ_FM_DOM_SPF_FAIL __TO_EQ_FM_DOM_SPF_FAIL && !__THREADED && !ALL_TRUSTED - describe TO_EQ_FM_DOM_SPF_FAIL To domain == From domain and external SPF failed - tflags TO_EQ_FM_DOM_SPF_FAIL net -else - meta __TO_EQ_FM_DOM_SPF_FAIL 0 -endif - - -# Evaluate ReturnPath and blacklist collisions -meta __RP_SAFE_BRBL RCVD_IN_RP_SAFE && RCVD_IN_BRBL_LASTEXT -meta __RP_CERTIFIED_BRBL RCVD_IN_RP_CERTIFIED && RCVD_IN_BRBL_LASTEXT -tflags __RP_SAFE_BRBL net nopublish -tflags __RP_CERTIFIED_BRBL net nopublish -meta __RP_SAFE_ZEN RCVD_IN_RP_SAFE && __RCVD_IN_ZEN -meta __RP_CERTIFIED_ZEN RCVD_IN_RP_CERTIFIED && __RCVD_IN_ZEN -tflags __RP_SAFE_ZEN net nopublish -tflags __RP_CERTIFIED_ZEN net nopublish -meta __RP_SAFE_SORBS RCVD_IN_RP_SAFE && __RCVD_IN_SORBS -meta __RP_CERTIFIED_SORBS RCVD_IN_RP_CERTIFIED && __RCVD_IN_SORBS -tflags __RP_SAFE_SORBS net nopublish -tflags __RP_CERTIFIED_SORBS net nopublish -meta __RP_SAFE_XBL RCVD_IN_RP_SAFE && RCVD_IN_XBL -meta __RP_CERTIFIED_XBL RCVD_IN_RP_CERTIFIED && RCVD_IN_XBL -tflags __RP_SAFE_XBL net nopublish -tflags __RP_CERTIFIED_XBL net nopublish -meta __RP_SAFE_PSBL RCVD_IN_RP_SAFE && RCVD_IN_PSBL -meta __RP_CERTIFIED_PSBL RCVD_IN_RP_CERTIFIED && RCVD_IN_PSBL -tflags __RP_SAFE_PSBL net nopublish -tflags __RP_CERTIFIED_PSBL net nopublish -#meta __RP_SAFE_ANBREP_L3 RCVD_IN_RP_SAFE && RCVD_IN_ANBREP_L3 -#meta __RP_CERTIFIED_ANBREP_L3 RCVD_IN_RP_CERTIFIED && RCVD_IN_ANBREP_L3 -#tflags __RP_SAFE_ANBREP_L3 net nopublish -#tflags __RP_CERTIFIED_ANBREP_L3 net nopublish - -# a URI in the From comment text, to bypass URIBL checks -# simplistic URI format for now -header __FROM_URI_1 From =~ /[^\@]www[.\s][^\s"<\@]+[.\s](?:com|net|info|biz|org|\w\w)\b.*["<]/i -header __FROM_URI_2 From =~ m;http://(?:[^.\s]+\.){1,3}(?:com|net|info|biz|org|\w\w)\b;i -meta FROM_URI __FROM_URI_1 || __FROM_URI_2 -describe FROM_URI URI or www. in From - -# observed in spam feb 2010 -# Apparently-To per RFC2821 SHOULD NOT be used -header __APPARENTLY_TO Apparently-To =~ /<.*>/ -tflags __APPARENTLY_TO multiple maxhits=21 nopublish -meta HAS_APPARENTLY_TO __APPARENTLY_TO > 0 -describe HAS_APPARENTLY_TO Has deprecated Apparently-To header -#score HAS_APPARENTLY_TO 0.50 -tflags HAS_APPARENTLY_TO nopublish -meta MANY_APPARENTLY_TO __APPARENTLY_TO > 20 -describe MANY_APPARENTLY_TO Has many Apparently-To headers -#score MANY_APPARENTLY_TO 2.00 -tflags MANY_APPARENTLY_TO nopublish - -# obfuscation of "opt out" -ifplugin Mail::SpamAssassin::Plugin::ReplaceTags - body FUZZY_OPTOUT /\b(?!opt.?out)

    .?\b/i - replace_rules FUZZY_OPTOUT - describe FUZZY_OPTOUT Obfuscated opt-out text -endif - -# stock spam disclaimer obfuscation -# body GAPPY_TRADING /\b(?!trading)t[^a-z\s]?r[^a-z\s]?a[^a-z\s]?d[^a-z\s]?i[^a-z\s]?n[^a-z\s]?g/i -# body GAPPY_SECURITIES /\b(?!securities)s[^a-z\s]?e[^a-z\s]?c[^a-z\s]?u[^a-z\s]?r[^a-z\s]?i[^a-z\s]?t[^a-z\s]?i[^a-z\s]?e[^a-z\s]?s/i -# body GAPPY_RISK /\b(?!risky?)r[^a-z\s]?i[^a-z\s]?s[^a-z\s]?k(?:[^a-z\s]?y)?/i -# body GAPPY_SELLING /\b(?!selling)s[^a-z\s]?e[^a-z\s]?l[^a-z\s]?l[^a-z\s]?i[^a-z\s]?n[^a-z\s]?g/i -# body GAPPY_HUNDRED /\b(?!hundred)h[^a-z\s]?u[^a-z\s]?n[^a-z\s]?d[^a-z\s]?r[^a-z\s]?e[^a-z\s]?d/i -# body GAPPY_THOUSAND /\b(?!thousand)t[^a-z\s]?h[^a-z\s]?o[^a-z\s]?u[^a-z\s]?s[^a-z\s]?a[^a-z\s]?n[^a-z\s]?d/i -# body GAPPY_EXPENSES /\b(?!expenses)e[^a-z\s]?x[^a-z\s]?p[^a-z\s]?e[^a-z\s]?n[^a-z\s]?s[^a-z\s]?e[^a-z\s]?s/i -# body GAPPY_DOLLARS /\b(?!dollars)d[^a-z\s]?o[^a-z\s]?l[^a-z\s]?l[^a-z\s]?a[^a-z\s]?r[^a-z\s]?s/i -# -# describe GAPPY_TRADING Possible obfuscated stock disclaimer -# describe GAPPY_SECURITIES Possible obfuscated stock disclaimer -# describe GAPPY_RISK Possible obfuscated stock disclaimer -# describe GAPPY_SELLING Possible obfuscated stock disclaimer -# describe GAPPY_HUNDRED Possible obfuscated stock disclaimer -# describe GAPPY_THOUSAND Possible obfuscated stock disclaimer -# describe GAPPY_EXPENSES Possible obfuscated stock disclaimer -# describe GAPPY_DOLLARS Possible obfuscated stock disclaimer - -body GAPPY_GENITALIA /\bp(?!enis)(?!en is)[^a-z]?e[^a-z]?n[^a-z]?i[^a-z]?s(?:\b|_)/i -describe GAPPY_GENITALIA G.a.p.p.y male body parts - -body GAPPY_PILLS /\bp(?!ills)[^a-z]?i[^a-z]?l[^a-z]?l[^a-z]?s(?:\b|_)/i -describe GAPPY_PILLS G.a.p.p.y pills - -body __STYLE_TAG_IN_BODY /]{0,30})?>/i -body __BODY_XHTML //i -if can(Mail::SpamAssassin::Conf::perl_min_version_5010000) - # possessive {0,4}+ requires perl 5.10 or better - rawbody __STYLE_GIBBERISH_1 /]{0,40})?>(?:\s{0,100}(?!<\/style>)(?:(?:\/\*(?:\s|[^*<]|\*(?!\/)|<(?!\/style>)){0,200}\*\/)|\#[^{<]{1,50}\{[^}<]{4,100}\})){0,4}+(?:\s{0,100}(?!<\/style>|\/\*)[^\s:;,]){150}/im -else - # older perl, can't deal with style comments properly - rawbody __STYLE_GIBBERISH_1 /]{0,40})?>(?:\s{0,100}(?!<\/style>|\/\*)[^\s:;,]){150}/im -endif -rawbody __STYLE_GIBBERISH_2 /\.style\w{0,20}\s{1,10}\{[^:;]{200}/im -rawbody __STYLE_GIBBERISH_3 /]{0,40})?>\s{0,80}(?:[\w:]{1,30}\s{0,10}\{[^}]{1,50}\}\s{0,80}){1,5}(?:[\w,.']{1,30}\s{1,10}){40}/im -meta __STYLE_GIBBERISH (__STYLE_GIBBERISH_1 || __STYLE_GIBBERISH_2 || __STYLE_GIBBERISH_3) -meta STYLE_GIBBERISH __STYLE_GIBBERISH && (__BODY_XHTML || !__STYLE_TAG_IN_BODY) && !__RCD_RDNS_MX_MESSY && !__HAS_THREAD_INDEX && !__ANY_OUTLOOK_MUA && !__MIME_QP && !ALL_TRUSTED -describe STYLE_GIBBERISH Nonsense in HTML - - -blah ---" -------=_NextPart_000_0005_01C8DEEE.041E4FC5-- - - ---9B095B5ADSN=_01C88289643A9370001069E5mailhost.cris.un-- - - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/14.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/14.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/14.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/14.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/1.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/1.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/1.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/1.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/2 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/2 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/2 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/2 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -From MAILER-DAEMON Sun Jun 8 20:49:03 2008 -Return-Path: <> -X-Original-To: jm-eire-spamtrap@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from dogma.boxhost.net (dogma.boxhost.net [80.169.141.78]) - by soman.fdntech.com (Postfix) with ESMTP id 8B71ABA5207 - for ; Sun, 8 Jun 2008 20:34:14 -0500 (CDT) -Received: from syndix.net (unknown [63.111.67.240]) - by dogma.boxhost.net (Postfix) with ESMTP id 1ABF931003A - for ; Mon, 9 Jun 2008 02:34:03 +0100 (IST) -Received: (qmail 9357 invoked for bounce); 8 Jun 2008 21:26:36 -0400 -Date: 8 Jun 2008 21:26:36 -0400 -From: MAILER-DAEMON@syndix.net -To: ggggg@eire.com -Subject: failure notice -Message-Id: <20080609013403.1ABF931003A@dogma.boxhost.net> - -Hi. This is the qmail-send program at syndix.net. -I'm afraid I wasn't able to deliver your message to the following addresses. -This is a permanent error; I've given up. Sorry it didn't work out. - -: -This address no longer accepts mail. - ---- Below this line is a copy of the message. - -Return-Path: -Received: (qmail 9354 invoked from network); 8 Jun 2008 21:26:35 -0400 -Received: from adsl-dynamic-pool-xxx.hcm.fpt.vn (HELO 118.68.165.20) (118.68.165.20) - by 63.111.67.240 with SMTP; 8 Jun 2008 21:26:35 -0400 -Message-ID: <000701c8c9d0$06ab480f$70279d90@vdeqlki> -From: "jodi buck" -To: -Subject: Your video file es -Date: Sun, 08 Jun 2008 23:46:07 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: 7bit -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2900.3138 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 - -http://impresalavoro.it/ex.html - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/2.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/2.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/2.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/2.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/3 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/3 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/3 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/3 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -From MAILER-DAEMON Sun Jun 8 20:49:04 2008 -Return-Path: <> -X-Original-To: jm-eire-spamtrap@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from dogma.boxhost.net (dogma.boxhost.net [80.169.141.78]) - by soman.fdntech.com (Postfix) with ESMTP id B4209BA51A1 - for ; Sun, 8 Jun 2008 20:34:18 -0500 (CDT) -Received: from mail17m.wh.ocn.ne.jp (unknown [122.1.231.78]) - by dogma.boxhost.net (Postfix) with SMTP id F113A31001A - for ; Mon, 9 Jun 2008 02:34:05 +0100 (IST) -Received: (qmail 10097 invoked for bounce); 9 Jun 2008 01:33:43 -0000 -Date: 9 Jun 2008 01:33:43 -0000 -From: MAILER-DAEMON@mail17m.wh.ocn.ne.jp -To: ggggg@eire.com -Subject: failure notice -Message-Id: <20080609013405.F113A31001A@dogma.boxhost.net> - -Hi. This is the qmail-send program at mail17m.wh.ocn.ne.jp. -I'm afraid I wasn't able to deliver your message to the following addresses. -This is a permanent error; I've given up. Sorry it didn't work out. - -: -Sorry, I couldn't find any host named takacho.com. (#5.1.2) - ---- Below this line is a copy of the message. - -Return-Path: -Received: from 155-134-42-72.gci.net (72.42.134.155) - by mail17m.wh.ocn.ne.jp (RS ver 1.0.95vs) with SMTP id 6-0100855222 - for ; Mon, 9 Jun 2008 10:33:43 +0900 (JST) -Message-ID: <000601c8c9d0$068c616f$4b5944ac@tyoiafel> -From: "kliment rhona" -To: -Subject: Your video file erulefoxvw -Date: Sun, 08 Jun 2008 23:46:18 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: 7bit -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2900.3138 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 -X-SF-Loop: 1 - -http://impresalavoro.it/ex.html - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/3.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/3.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/3.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/3.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/4 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/4 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/4 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/4 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -From MAILER-DAEMON Sun Jun 8 20:49:05 2008 -Return-Path: <> -X-Original-To: jm-eire-spamtrap@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from dogma.boxhost.net (dogma.boxhost.net [80.169.141.78]) - by soman.fdntech.com (Postfix) with ESMTP id B5012BA5208 - for ; Sun, 8 Jun 2008 20:34:18 -0500 (CDT) -Received: from plesk-6.2020media.com (plesk-6.2020media.com [212.124.194.150]) - by dogma.boxhost.net (Postfix) with ESMTP id D083231003A - for ; Mon, 9 Jun 2008 02:34:06 +0100 (IST) -Received: (qmail 5089 invoked for bounce); 9 Jun 2008 01:34:06 -0000 -Date: 9 Jun 2008 01:34:06 -0000 -From: MAILER-DAEMON@plesk-6.2020media.com -To: ggggg@eire.com -Subject: failure notice -Message-Id: <20080609013406.D083231003A@dogma.boxhost.net> - -Hi. This is the qmail-send program at plesk-6.2020media.com. -I'm afraid I wasn't able to deliver your message to the following addresses. -This is a permanent error; I've given up. Sorry it didn't work out. - -: -This message is looping: it already has my Delivered-To line. (#5.4.6) - ---- Below this line is a copy of the message. - -Return-Path: -Received: (qmail 5087 invoked by uid 110); 9 Jun 2008 01:34:06 -0000 -Delivered-To: 491-sian.clifford@mandmproperties.co.uk -Received: (qmail 5085 invoked by uid 110); 9 Jun 2008 01:34:06 -0000 -Delivered-To: 491-leightonbuzzardq@mandmproperties.co.uk -Received: (qmail 5063 invoked from network); 9 Jun 2008 01:34:05 -0000 -Received: from softdnserror (HELO 218.68.78.141) (218.68.78.141) - by plesk-6.2020media.com with SMTP; 9 Jun 2008 01:34:05 -0000 -Message-ID: <000701c8c9d0$01f8f38b$acddbea5@srqvp> -From: "Watches" -To: "Replica Watches" -Subject: Tag Heuer Carrera Watches -Date: Sun, 08 Jun 2008 23:46:08 +0000 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0004_01C8C9D0.01F5A86A" -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2900.3138 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 - -This is a multi-part message in MIME format. - -------=_NextPart_000_0004_01C8C9D0.01F5A86A -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: quoted-printable - -King Replica - Best Replica watches, jewellery an accessories! - -We specialize in the sales of brand name quality replica timepieces,=20 -at some of the lowest prices possible. With our large selection of = -watches=20 -you can be sure to find that perfect timepiece that will suit you best.=20 -Visit King-replica! -------=_NextPart_000_0004_01C8C9D0.01F5A86A -Content-Type: text/html; - charset="iso-8859-1" -Content-Transfer-Encoding: quoted-printable - - - - - - - - -

    King Replica - = -Best Replica watches, jewellery an accessories!

    We specialize in the sales of brand name quality replica timepieces, = -
    at some of the lowest prices possible. With our large selection of = -watches
    you can be sure to find that perfect timepiece that will = -suit you best.

    -

    Visit King-replica!

     -------=_NextPart_000_0004_01C8C9D0.01F5A86A-- - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/4.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/4.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/4.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/4.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/6 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/6 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/6 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/6 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -From MAILER-DAEMON Sun Jun 8 20:49:08 2008 -Return-Path: <> -X-Original-To: jm-eire-spamtrap@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from dogma.boxhost.net (dogma.boxhost.net [80.169.141.78]) - by soman.fdntech.com (Postfix) with ESMTP id 06DB5BA520A - for ; Sun, 8 Jun 2008 20:34:21 -0500 (CDT) -Received: from neptun.bn.com.pl (unknown [80.51.2.194]) - by dogma.boxhost.net (Postfix) with ESMTP id AA1EE31003A - for ; Mon, 9 Jun 2008 02:34:09 +0100 (IST) -Received: (qmail 25291 invoked for bounce); 9 Jun 2008 03:39:09 -0000 -Date: 9 Jun 2008 03:39:09 -0000 -From: bn.com.pl@neptun.bn.com.pl -To: ggggg@eire.com -Subject: failure notice -Message-Id: <20080609013409.AA1EE31003A@dogma.boxhost.net> - -Hi. This is the qmail-send program at neptun.bn.com.pl. -I'm afraid I wasn't able to deliver your message to the following addresses. -This is a permanent error; I've given up. Sorry it didn't work out. - -: -user does not exist, but will deliver to /home/vpopmail/domains/player.pl/daniel/ -can not open new email file errno=2 file=/home/vpopmail/domains/player.pl/daniel/Maildir/tmp/1212982749.25263.neptun.bn.com.pl,S=3155 -system error - ---- Below this line is a copy of the message. - -Return-Path: -Received: (qmail 25258 invoked by uid 710); 9 Jun 2008 03:39:06 -0000 -Received: from ggggg@eire.com by neptun.bn.com.pl by uid 706 with qmail-scanner-1.22-st-qms - (clamdscan: 0.70. spamassassin: 2.63. Clear:RC:0(190.164.9.95):SA:0(0.0/4.0):. - Processed in 0.614149 secs); 09 Jun 2008 03:39:06 -0000 -X-Spam-Status: No, hits=0.0 required=4.0 -X-Qmail-Scanner-Mail-From: ggggg@eire.com via neptun.bn.com.pl -X-Qmail-Scanner: 1.22-st-qms (Clear:RC:0(190.164.9.95):SA:0(0.0/4.0):. Processed in 0.614149 secs Process 25233) -Received: from unknown (HELO 190.164.9.95) (190.164.9.95) - by 0 with SMTP; 9 Jun 2008 03:39:05 -0000 -Message-ID: <000801c8c9d0$04602924$1cd9be87@skhbqmdo> -From: "Totally Satisfied" -To: "Replica Watches" -Subject: Bvlgari Watches -Date: Sun, 08 Jun 2008 23:45:34 +0000 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0005_01C8C9D0.045B2FA9" -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2900.3138 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 - -This is a multi-part message in MIME format. - -------=_NextPart_000_0005_01C8C9D0.045B2FA9 -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: quoted-printable - -Replica Watches - cheap and really good solution! -What is a replica watch and how is it different from the real watches?=20 - -A replica watch is a watch made similar to that of the real brand ones, = -except, at a much lower cost.=20 -A real Rolex can go up to hundreds of thousands of dollars, but you can = -get a replica similar to that one,=20 -for only a few hundred dollars. This allows the normal everyday person = -to be able to look and feel classy,=20 -without having to actually spend such ridiculous amounts of money on it. = - -Visit our replica watches shop! -------=_NextPart_000_0005_01C8C9D0.045B2FA9 -Content-Type: text/html; - charset="iso-8859-1" -Content-Transfer-Encoding: quoted-printable - - - - - - - - -

    Replica Watches - cheap and really = -good solution!

    -

    What is a replica watch and how is it = -different from the real watches?

    A replica watch is = -a watch made similar to that of the real brand ones, except, at a much = -lower cost.
    A real Rolex can go up to hundreds of thousands of = -dollars, but you can get a replica similar to that one,
    for only a = -few hundred dollars. This allows the normal everyday person to be able = -to look and feel classy,
    without having to actually spend such = -ridiculous amounts of money on it.

    -

    Visit our replica watches = -shop!

     -------=_NextPart_000_0005_01C8C9D0.045B2FA9-- - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/6.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/6.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/6.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/6.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/7 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/7 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/7 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/7 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -From MAILER-DAEMON Sun Jun 8 20:48:58 2008 -Return-Path: <> -X-Original-To: jm-eire-spamtrap@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from dogma.boxhost.net (dogma.boxhost.net [80.169.141.78]) - by soman.fdntech.com (Postfix) with ESMTP id DE052BA519B - for ; Sun, 8 Jun 2008 20:34:07 -0500 (CDT) -Received: from mail.interbgc.com (unknown [217.9.224.228]) - by dogma.boxhost.net (Postfix) with SMTP id 9289331001A - for ; Mon, 9 Jun 2008 02:33:56 +0100 (IST) -Received: (qmail 99954 invoked for bounce); 9 Jun 2008 01:33:42 -0000 -Date: 9 Jun 2008 01:33:42 -0000 -From: MAILER-DAEMON@mail.interbgc.com -To: ggggg@eire.com -Subject: failure notice -Message-Id: <20080609013356.9289331001A@dogma.boxhost.net> - -Hi. This is the qmail-send program at mail.interbgc.com. -I'm afraid I wasn't able to deliver your message to the following addresses. -This is a permanent error; I've given up. Sorry it didn't work out. - -: -212.21.129.181 does not like recipient. -Remote host said: 550 5.1.1 : Recipient address rejected: User unknown in virtual mailbox table -Giving up on 212.21.129.181. - ---- Below this line is a copy of the message. - -Return-Path: -Received: (qmail 99772 invoked by uid 1008); 9 Jun 2008 01:33:22 -0000 -X-Spam-Flag: YES -X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on s02.interbgc.com -X-Spam-Level: *********************** -X-Spam-Status: Yes, score=23.1 required=8.5 tests=FH_HELO_EQ_D_D_D_D, - HELO_DYNAMIC_DHCP,HELO_DYNAMIC_IPADDR,RAZOR2_CF_RANGE_51_100, - RAZOR2_CF_RANGE_E4_51_100,RAZOR2_CF_RANGE_E8_51_100,RAZOR2_CHECK, - RCVD_IN_BL_SPAMCOP_NET,RCVD_IN_XBL,RDNS_NONE,URIBL_AB_SURBL,URIBL_BLACK, - URIBL_JP_SURBL,URIBL_SC_SURBL autolearn=disabled version=3.2.3 -X-Spam-Report: - * 0.1 RDNS_NONE Delivered to trusted network by a host with no rDNS - * 1.5 HELO_DYNAMIC_DHCP Relay HELO'd using suspicious hostname (DHCP) - * 0.5 FH_HELO_EQ_D_D_D_D Helo is d-d-d-d - * 2.9 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr - * 1) - * 1.5 RAZOR2_CF_RANGE_E8_51_100 Razor2 gives engine 8 confidence level - * above 50% - * [cf: 100] - * 1.5 RAZOR2_CF_RANGE_E4_51_100 Razor2 gives engine 4 confidence level - * above 50% - * [cf: 100] - * 0.5 RAZOR2_CHECK Listed in Razor2 (http://razor.sf.net/) - * 0.5 RAZOR2_CF_RANGE_51_100 Razor2 gives confidence level above 50% - * [cf: 100] - * 2.0 URIBL_BLACK Contains an URL listed in the URIBL blacklist - * [URIs: impresalavoro.it] - * 1.6 URIBL_AB_SURBL Contains an URL listed in the AB SURBL blocklist - * [URIs: impresalavoro.it] - * 2.9 URIBL_JP_SURBL Contains an URL listed in the JP SURBL blocklist - * [URIs: impresalavoro.it] - * 2.5 URIBL_SC_SURBL Contains an URL listed in the SC SURBL blocklist - * [URIs: impresalavoro.it] - * 2.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net - * [Blocked - see ] - * 2.9 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL - * [74.251.177.227 listed in zen.spamhaus.org] -Received: from unknown (HELO adsl-074-251-142-092.sip.asm.bellsouth.net) (74.251.177.227) - by mx02.interbgc.com with SMTP; 9 Jun 2008 01:33:22 -0000 -Message-ID: <000901c8c9d0$04908db0$1ab8c18e@lbyvul> -From: "avraham asher" -To: -Subject: *****SPAM***** Your video file e00bc3e7 -Date: Sun, 08 Jun 2008 23:45:59 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: 7bit -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2900.3138 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 -X-Spam-Prev-Subject: Your video file e00bc3e7 - -http://impresalavoro.it/ex.html - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/7.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/7.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/7.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/7.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_2 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_2 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_2 2008-07-10 14:07:10.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_2 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -From mailman-bounces@fdntech.com Fri Jun 20 12:02:43 2008 -Return-Path: -X-Spam-Virus: No -X-Spam-Checker-Version: SpamAssassin 3.3.0-r650054 (2008-04-21) on - soman.fdntech.com -X-Spam-Relays-External: [ ip=213.75.38.117 rdns=hpsmtp-eml17.kpnxchange.com - helo=hpsmtp-eml17.kpnxchange.com by=soman.fdntech.com ident= envfrom= intl=0 - id=30773BA5165 auth= msa=0 ] [ ip=213.75.38.122 rdns= - helo=hpsmtp-eml22.kpnxchange.com by=hpsmtp-eml17.kpnxchange.com ident= - envfrom= intl=0 id= auth= msa=0 ] [ ip=195.121.247.250 rdns= - helo=cpbrm-eml10.kpnxchange.com by=hpsmtp-eml22.kpnxchange.com ident= - envfrom= intl=0 id= auth= msa=0 ] [ ip=10.94.53.250 rdns= - helo=hpsmtp-eml26.kpnxchange.com by=cpbrm-eml10.kpnxchange.com ident= - envfrom= intl=0 id= auth= msa=0 ] [ ip=10.94.53.250 rdns= helo=localhost - by=hpsmtp-eml26.kpnxchange.com ident= envfrom= intl=0 id= auth= msa=0 ] -X-Spam-Status: No, score=-0.2 required=5.0 tests=AWL,BAYES_00,DRUGS_ERECTILE, - DRUG_ED_CAPS shortcircuit=no autolearn=no version=3.3.0-r650054 -X-Spam-Relays-Internal: [ ip=127.0.0.1 rdns=localhost.localdomain - helo=soman.fdntech.com by=soman.fdntech.com ident= envfrom= intl=1 - id=9F102BA5165 auth= msa=0 ] -X-Spam-Relays-Untrusted: [ ip=213.75.38.117 rdns=hpsmtp-eml17.kpnxchange.com - helo=hpsmtp-eml17.kpnxchange.com by=soman.fdntech.com ident= envfrom= intl=0 - id=30773BA5165 auth= msa=0 ] [ ip=213.75.38.122 rdns= - helo=hpsmtp-eml22.kpnxchange.com by=hpsmtp-eml17.kpnxchange.com ident= - envfrom= intl=0 id= auth= msa=0 ] [ ip=195.121.247.250 rdns= - helo=cpbrm-eml10.kpnxchange.com by=hpsmtp-eml22.kpnxchange.com ident= - envfrom= intl=0 id= auth= msa=0 ] [ ip=10.94.53.250 rdns= - helo=hpsmtp-eml26.kpnxchange.com by=cpbrm-eml10.kpnxchange.com ident= - envfrom= intl=0 id= auth= msa=0 ] [ ip=10.94.53.250 rdns= helo=localhost - by=hpsmtp-eml26.kpnxchange.com ident= envfrom= intl=0 id= auth= msa=0 ] -X-Spam-Relays-Trusted: [ ip=127.0.0.1 rdns=localhost.localdomain - helo=soman.fdntech.com by=soman.fdntech.com ident= envfrom= intl=1 - id=9F102BA5165 auth= msa=0 ] -X-Spam-Level: -X-Spam-RBL: [127.0.5.0] - [72.232.31.42] - [100 brisby.nimh.net., 0 mail.fdntech.com.] -X-Original-To: jm-wm-ladmin@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from soman.fdntech.com (localhost.localdomain [127.0.0.1]) - by soman.fdntech.com (Postfix) with ESMTP id 9F102BA5165 - for ; Fri, 20 Jun 2008 12:02:43 -0500 (CDT) -X-Original-To: webmake-talk-owner@fdntech.com -Delivered-To: webmake-talk-owner@fdntech.com -Received: from hpsmtp-eml17.kpnxchange.com (hpsmtp-eml17.kpnxchange.com - [213.75.38.117]) - by soman.fdntech.com (Postfix) with ESMTP id 30773BA5165 - for ; - Fri, 20 Jun 2008 12:02:42 -0500 (CDT) -Received: from hpsmtp-eml22.kpnxchange.com ([213.75.38.122]) by - hpsmtp-eml17.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.1830); - Fri, 20 Jun 2008 19:02:38 +0200 -Received: from cpbrm-eml10.kpnxchange.com ([195.121.247.250]) by - hpsmtp-eml22.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.1830); - Fri, 20 Jun 2008 19:02:37 +0200 -Received: from hpsmtp-eml26.kpnxchange.com ([10.94.53.250]) by - cpbrm-eml10.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.1830); - Fri, 20 Jun 2008 19:02:37 +0200 -Received: from localhost ([10.94.53.250]) by hpsmtp-eml26.kpnxchange.com with - Microsoft SMTPSVC(6.0.3790.1830); Fri, 20 Jun 2008 19:02:37 +0200 -From: postmaster@kpnxchange.com -To: webmake-talk-owner@fdntech.com -Date: Fri, 20 Jun 2008 19:02:37 +0200 -MIME-Version: 1.0 -Content-Type: multipart/report; report-type=delivery-status; - boundary="9B095B5ADSN=_01C8D19BFE9608DD003374E9CPEXBE?EML15.kpn" -X-DSNContext: 7ce717b1 - 1158 - 00000002 - 00000000 -Message-ID: -Subject: Delivery Status Notification (Failure) -X-OriginalArrivalTime: 20 Jun 2008 17:02:37.0758 (UTC) - FILETIME=[712CDDE0:01C8D2F7] -Sender: mailman-bounces@fdntech.com -Errors-To: mailman-bounces@fdntech.com - -This is a MIME-formatted message. -Portions of this message may be unreadable without a MIME-capable mail program. - ---9B095B5ADSN=_01C8D19BFE9608DD003374E9CPEXBE?EML15.kpn -Content-Type: text/plain; charset=unicode-1-1-utf-7 - -This is an automatically generated Delivery Status Notification. - -Delivery to the following recipients failed. - - vos01589@planet.nl - - - - ---9B095B5ADSN=_01C8D19BFE9608DD003374E9CPEXBE?EML15.kpn -Content-Type: message/delivery-status - -Reporting-MTA: dns;CPEXBE-EML15.kpnsp.local -Received-From-MTA: dns;hpsmtp-eml21.kpnxchange.com -Arrival-Date: Fri, 20 Jun 2008 19:02:37 +0200 - -Final-Recipient: rfc822;vos01589@planet.nl -Action: failed -Status: 5.2.2 -X-Display-Name: vos01589@planet.nl - ---9B095B5ADSN=_01C8D19BFE9608DD003374E9CPEXBE?EML15.kpn -Content-Type: text/rfc822-headers - -From: VIAGRA ? Official Site -To: -Message-ID: <20080620080238.2855.qmail@eka74.internetdsl.tpnet.pl> -Subject: Dear vos.c@planet.nl June 88% 0FF - - ---9B095B5ADSN=_01C8D19BFE9608DD003374E9CPEXBE?EML15.kpn-- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_2.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_2.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_2.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_2.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_centroshop spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_centroshop --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_centroshop 2008-07-10 14:07:10.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_centroshop 1970-01-01 00:00:00.000000000 +0000 @@ -1,137 +0,0 @@ -From MAILER-DAEMON Wed Jun 25 03:11:49 2008 -Return-Path: <> -X-Spam-Virus: No -X-Spam-Checker-Version: SpamAssassin 3.3.0-r650054 (2008-04-21) on - soman.fdntech.com -X-Spam-Relays-External: [ ip=212.100.132.25 rdns=mail.centroshop.ru - helo=mail.centroshop.ru by=soman.fdntech.com ident= envfrom= intl=0 - id=070E4BA5163 auth= msa=0 ] -X-Spam-Status: No, score=1.7 required=5.0 tests=BAYES_50,DATE_IN_PAST_96_XX - shortcircuit=no autolearn=no version=3.3.0-r650054 -X-Spam-Relays-Internal: -X-Spam-Relays-Untrusted: [ ip=212.100.132.25 rdns=mail.centroshop.ru - helo=mail.centroshop.ru by=soman.fdntech.com ident= envfrom= intl=0 - id=070E4BA5163 auth= msa=0 ] -X-Spam-Relays-Trusted: -X-Spam-Level: * -X-Spam-RBL: -X-Original-To: |0.95jm@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from mail.centroshop.ru (mail.centroshop.ru [212.100.132.25]) - by soman.fdntech.com (Postfix) with ESMTP id 070E4BA5163 - for <|0.95jm@jmason.org>; Wed, 25 Jun 2008 03:11:48 -0500 (CDT) -Received: by mx1.office (Sendmail) - id 907117A5D9D; Sun, 25 Jun 2006 12:13:16 -0400 (EDT) -Date: Sun, 25 Jun 2006 12:13:16 -0400 (EDT) -From: MAILER-DAEMON@mail.centroshop.ru (Mail Delivery System) -Subject: Undelivered Mail Returned to Sender -To: |0.95jm@jmason.org -MIME-Version: 1.0 -Content-Type: multipart/report; report-type=delivery-status; - boundary="694E27A5DD4.1151251996/mx1.office" -Content-Transfer-Encoding: 8bit -Message-Id: <20060625161316.907117A5D9D@mx1.office> - -This is a MIME-encapsulated message. - ---694E27A5DD4.1151251996/mx1.office -Content-Description: Notification -Content-Type: text/plain - -This is the Sendmail program at host mx1.office. - -I'm sorry to have to inform you that your message could not -be delivered to one or more recipients. It's attached below. - -For further assistance, please send mail to - -If you do so, please include this problem report. You can -delete your own text from the attached returned message. - - The Sendmail program - -: host mail.office[10.0.0.2] said: 550 - : Recipient address rejected: User unknown in local - recipient table (in reply to RCPT TO command) - -: host mail.office[10.0.0.2] said: 550 - : Recipient address rejected: User unknown in - local recipient table (in reply to RCPT TO command) - -: host mail.office[10.0.0.2] said: 550 - : Recipient address rejected: User unknown in - local recipient table (in reply to RCPT TO command) - ---694E27A5DD4.1151251996/mx1.office -Content-Description: Delivery report -Content-Type: message/delivery-status - -Reporting-MTA: dns; mx1.office -X-Sendmail-Queue-ID: 694E27A5DD4 -X-Sendmail-Sender: rfc822; |0.95jm@jmason.org -Arrival-Date: Sun, 25 Jun 2006 12:13:16 -0400 (EDT) - -Final-Recipient: rfc822; aleshina@centroshop.ru -Action: failed -Status: 5.0.0 -Diagnostic-Code: X-Sendmail; host mail.office[10.0.0.2] said: 550 - : Recipient address rejected: User unknown in local - recipient table (in reply to RCPT TO command) - -Final-Recipient: rfc822; i.aandrievskih@centroshop.ru -Action: failed -Status: 5.0.0 -Diagnostic-Code: X-Sendmail; host mail.office[10.0.0.2] said: 550 - : Recipient address rejected: User unknown in - local recipient table (in reply to RCPT TO command) - -Final-Recipient: rfc822; i.alekhina@centroshop.ru -Action: failed -Status: 5.0.0 -Diagnostic-Code: X-Sendmail; host mail.office[10.0.0.2] said: 550 - : Recipient address rejected: User unknown in - local recipient table (in reply to RCPT TO command) - ---694E27A5DD4.1151251996/mx1.office -Content-Description: Undelivered Message -Content-Type: message/rfc822 -Content-Transfer-Encoding: 8bit - -From: =?koi8-r?B?9MnN1dIg4sHLwcvJzg==?=<|0.95jm@jmason.org> -To: -Subject: [?? Probable Spam] =?koi8-r?B?9SDXwdMg09fBxNjCwT8=?= -Date: Wed, 25 Jun 2008 14:11:38 +0600 -MIME-Version: 1.0 -Content-Type: text/plain; - charset="koi8-r" -Content-Transfer-Encoding: 8bit -X-Priority: 3 -X-MSMail-Priority: Normal -Message-Id: <20060625161316.694E27A5DD4@mx1.office> - - ! - - ? - ? - - ! 50000 - - (495) 972-4935 - - . - . : ; -; ; . - - : - -- -- -- , -- -- , , -- , -- -- , - ---694E27A5DD4.1151251996/mx1.office-- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_centroshop.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_centroshop.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_centroshop.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_centroshop.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_tbwamerlin spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_tbwamerlin --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_tbwamerlin 2008-07-10 14:07:10.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_tbwamerlin 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -From MAILER-DAEMON Thu Jun 12 16:19:11 2008 -Return-Path: <> -X-Spam-Virus: No -X-Spam-Checker-Version: SpamAssassin 3.3.0-r650054 (2008-04-21) on - soman.fdntech.com -X-Spam-Relays-External: [ ip=81.12.141.90 rdns= helo=tbwamerlin.ro - by=soman.fdntech.com ident= envfrom= intl=0 id=3D05BBA5184 auth= msa=0 ] -X-Spam-Status: No, score=2.7 required=5.0 tests=AWL,BAYES_50,DRUGS_ERECTILE, - DRUG_ED_CAPS,JM_SOUGHT_3,RDNS_NONE shortcircuit=no autolearn=no - version=3.3.0-r650054 -X-Spam-Relays-Internal: -X-Spam-Relays-Untrusted: [ ip=81.12.141.90 rdns= helo=tbwamerlin.ro - by=soman.fdntech.com ident= envfrom= intl=0 id=3D05BBA5184 auth= msa=0 ] -X-Spam-Relays-Trusted: -X-Spam-Level: ** -X-Spam-RBL: -X-Original-To: +._-b16f16@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from tbwamerlin.ro (unknown [81.12.141.90]) - by soman.fdntech.com (Postfix) with ESMTP id 3D05BBA5184 - for <+._-b16f16@jmason.org>; Thu, 12 Jun 2008 16:19:10 -0500 (CDT) -From: postmaster@tbwamerlin.ro -To: +._-b16f16@jmason.org -Date: Fri, 13 Jun 2008 00:19:07 +0300 -MIME-Version: 1.0 -Content-Type: multipart/report; report-type=delivery-status; - boundary="9B095B5ADSN=_01C8CBCFD43646330000550Ctbwamerlin.ro" -X-DSNContext: 335a7efd - 4523 - 00000001 - 80040546 -Message-ID: -Subject: Delivery Status Notification (Failure) - -This is a MIME-formatted message. -Portions of this message may be unreadable without a MIME-capable mail program. - ---9B095B5ADSN=_01C8CBCFD43646330000550Ctbwamerlin.ro -Content-Type: text/plain; charset=unicode-1-1-utf-7 - -This is an automatically generated Delivery Status Notification. - -Delivery to the following recipients failed. - - b16f1252@tequila.ro - - - - ---9B095B5ADSN=_01C8CBCFD43646330000550Ctbwamerlin.ro -Content-Type: message/delivery-status - -Reporting-MTA: dns;tbwamerlin.ro -Received-From-MTA: dns;psmtp.com -Arrival-Date: Fri, 13 Jun 2008 00:19:07 +0300 - -Final-Recipient: rfc822;b16f1252@tequila.ro -Action: failed -Status: 5.1.1 - ---9B095B5ADSN=_01C8CBCFD43646330000550Ctbwamerlin.ro -Content-Type: text/rfc822-headers - -From: VIAGRA Official Site -To: -Message-ID: <20080613141906.2299.qmail@ser-c60bcda6c48> -Subject: Dear b16f1252@tequila.ro June 88% 0FF - - ---9B095B5ADSN=_01C8CBCFD43646330000550Ctbwamerlin.ro-- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_tbwamerlin.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_tbwamerlin.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_tbwamerlin.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug5884_att4343_tbwamerlin.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-1 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-1 2009-06-30 10:10:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -From MAILER-DAEMON Wed Jul 30 05:46:24 2008 -Return-Path: <> -X-Spam-Virus: No -X-Spam-Checker-Version: SpamAssassin 3.3.0-r650054 (2008-04-21) on - soman.fdntech.com -X-Spam-Relays-External: [ ip=81.176.79.62 rdns=smtp.moneypost.ru - helo=smtp1.moneypost.ru by=soman.fdntech.com ident= envfrom= intl=0 - id=46920BA516B auth= msa=0 ] -X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_05 shortcircuit=no - autolearn=ham version=3.3.0-r650054 -X-Spam-Relays-Internal: -X-Spam-Relays-Untrusted: [ ip=81.176.79.62 rdns=smtp.moneypost.ru - helo=smtp1.moneypost.ru by=soman.fdntech.com ident= envfrom= intl=0 - id=46920BA516B auth= msa=0 ] -X-Spam-Relays-Trusted: -X-Spam-Level: -X-Spam-RBL: -X-Original-To: |0.95jm@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from smtp1.moneypost.ru (smtp.moneypost.ru [81.176.79.62]) - by soman.fdntech.com (Postfix) with ESMTP id 46920BA516B - for <|0.95jm@jmason.org>; Wed, 30 Jul 2008 05:46:24 -0500 (CDT) -Received: from mailnull by smtp1.moneypost.ru with local (Exim 4.54 (FreeBSD)) - id 1KO9CD-0009mG-Ed - for |0.95jm@jmason.org; Wed, 30 Jul 2008 14:46:18 +0400 -Auto-Submitted: auto-generated -From: Mail Delivery System -To: |0.95jm@jmason.org -Subject: Warning: message 1KNmHQ-000Md3-Kj delayed 24 hours -Message-Id: -Date: Wed, 30 Jul 2008 14:46:17 +0400 -X-SA-Exim-Connect-IP: -X-SA-Exim-Mail-From: -X-SA-Exim-Scanned: No (on smtp1.moneypost.ru); SAEximRunCond expanded to false - -This message was created automatically by mail delivery software. -A message that you sent has not yet been delivered to one or more of its -recipients after more than 24 hours on the queue on smtp1.moneypost.ru. - -The message identifier is: 1KNmHQ-000Md3-Kj -The subject of the message is: =?koi8-r?B?08TBwNTT0SDPxsnT2SDXINPP19LFzcXOzs/NICDaxMHOyck=?= -The date of the message is: Tue, 29 Jul 2008 17:18:08 +0700 - -The addresses to which the message has not yet been delivered are: - - marketing@moneypost.ru - Delay reason: SMTP error from remote mail server after RCPT TO:: - host imap1.moneypost.ru [81.176.79.60]: 452 4.2.2 Over quota - wowa@moneypost.ru - -No action is required on your part. Delivery attempts will continue for -some time, and this warning may be repeated at intervals if the message -remains undelivered. Eventually the mail delivery software will give up, -and when that happens, the message will be returned to you. - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-1.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-1.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-1.cf 2009-06-30 10:10:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-1.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-2 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-2 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-2 2009-06-30 10:10:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-2 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -From MAILER-DAEMON Thu Jul 10 01:49:15 2008 -Return-Path: <> -X-Spam-Virus: No -X-Spam-Checker-Version: SpamAssassin 3.3.0-r650054 (2008-04-21) on - soman.fdntech.com -X-Spam-Relays-External: [ ip=81.177.3.13 rdns= helo=server.lx-host.net - by=soman.fdntech.com ident= envfrom= intl=0 id=E014CBA5164 auth= msa=0 ] -X-Spam-Status: No, score=0.7 required=5.0 tests=BAYES_50,RCVD_IN_SORBS_WEB, - RDNS_NONE shortcircuit=no autolearn=no version=3.3.0-r650054 -X-Spam-Relays-Internal: -X-Spam-Relays-Untrusted: [ ip=81.177.3.13 rdns= helo=server.lx-host.net - by=soman.fdntech.com ident= envfrom= intl=0 id=E014CBA5164 auth= msa=0 ] -X-Spam-Relays-Trusted: -X-Spam-Level: -X-Spam-RBL: [127.0.0.7] -X-Original-To: |0.95jm@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from server.lx-host.net (unknown [81.177.3.13]) - by soman.fdntech.com (Postfix) with ESMTP id E014CBA5164 - for <|0.95jm@jmason.org>; Thu, 10 Jul 2008 01:49:14 -0500 (CDT) -Received: from mail by server.lx-host.net with local (Exim 4.60) - id 1KGpX2-00084P-7v - for |0.95jm@jmason.org; Thu, 10 Jul 2008 10:21:32 +0400 -Auto-Submitted: auto-replied -From: Mail Delivery System -To: |0.95jm@jmason.org -Subject: Warning: message 1KFsyl-0000YU-6I delayed 48 hours -Message-Id: -Date: Thu, 10 Jul 2008 10:21:32 +0400 - -This message was created automatically by mail delivery software. -A message that you sent has not yet been delivered to one or more of its -recipients after more than 48 hours on the queue on server.lx-host.net. - -The message identifier is: 1KFsyl-0000YU-6I -The subject of the message is: =?koi8-r?B?4cLPzsXO1NPLz8Ugz8LTzNXWydfBzsnFIMvPzdDYwNTF0s/X?= -The date of the message is: Mon, 7 Jul 2008 13:17:11 -0300 - -The address to which the message has not yet been delivered is: - - doska@alldo.ru - Delay reason: mailbox is full - -No action is required on your part. Delivery attempts will continue for -some time, and this warning may be repeated at intervals if the message -remains undelivered. Eventually the mail delivery software will give up, -and when that happens, the message will be returned to you. - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-2.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-2.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-2.cf 2009-06-30 10:10:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-5942-2.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-6051-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-6051-1 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-6051-1 2009-07-23 14:21:09.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-6051-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -Received: from mail02.dd24.net (mail02.dd24.net [217.188.246.117]) - (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) - (No client certificate requested) - by mx1.comprehensive.cc.spammertrap.net (Postfix) with ESMTPS id BA5B61CC027 - for ; Sun, 25 Jan 2009 04:35:07 -0500 (EST) -Received: by mail02.dd24.net (Postfix, from userid 2819) - id DC8118F61; Sun, 25 Jan 2009 09:34:58 +0000 (GMT) -Message-ID: -Date: Sun, 25 Jan 2009 09:34:58 +0000 -From: Mail Delivery Subsystem -To: -MIME-Version: 1.0 -Content-Type: multipart/report; report-type=disposition-notification; - boundary="8911/mail02" -Subject: Automatically rejected mail -Auto-Submitted: auto-replied (rejected) -Precedence: bulk -Return-Path: <> -X-OriginalArrivalTime: 25 Jan 2009 09:32:29.0687 (UTC) FILETIME=[D7938870:01C97ECF] - ---8911/mail02 - -Content-Type: text/plain; charset=utf-8 -Content-Disposition: inline -Content-Transfer-Encoding: 8bit - ---8911/mail02 - -Content-Type: message/disposition-notification - ---8911/mail02 - -Content-Type: message/rfc822 - -Return-Path: -Delivered-To: mail@ohioee.com -Received: from 212-95-32-105.internetserviceteam.com (unknown [201.29.252.182]) - by mail02.dd24.net (Postfix) with SMTP id 7573473083; - Sun, 25 Jan 2009 09:34:34 +0000 (GMT) -X-Originating-IP: 74.30.120.64 by smtp.212.95.32.105; Sun, 25 Jan 2009 08:27:33 -0100 -Message-ID: -Subject: Classic timepieces reps -Date: Sun, 25 Jan 2009 04:34:33 -0500 -From: "Will House" -To: "Delores Burks" -Content-Transfer-Encoding: 7bit - ---8911/mail02-- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-6051-1.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-6051-1.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/bug-6051-1.cf 2009-07-23 14:21:09.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/bug-6051-1.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays mx1.comprehensive.cc.spammertrap.net - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4297 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4297 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4297 2009-06-30 22:00:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4297 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Return-Path: -Received: from mail.ijs.si (mail4.ijs.si [193.2.4.66]) - by edina.ijs.si (Postfix) with ESMTP id 3F03E51854 - for ; Mon, 14 Apr 2008 12:47:30 +0200 (CEST) -Received: by mail.ijs.si (Postfix, from userid 0) - id AD6C167DE82; Mon, 14 Apr 2008 12:47:28 +0200 (CEST) -From: virusupdates@mail.ijs.si -User-Agent: sophos-ide-update/1.2 libwww-perl/5.805 -Subject: IDE-update report -To: postmaster@mail.ijs.si -Message-Id: <20080414104728.AD6C167DE82@mail.ijs.si> -Date: Mon, 14 Apr 2008 12:47:28 +0200 (CEST) - -DOWNLOADED (V4.28) -NEW: drop-zlb.ide -Sophie PID [886] found in a list produced by 'lsof' -SIGHUP sent to Sophie[886] - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4298 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4298 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4298 2009-06-30 22:00:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4298 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -Return-Path: <> -Received: from xyz.ijs.si (localhost.localdomain [127.0.0.1]) - by xyz.ijs.si (Postfix) with ESMTP id 45031100046 - for ; Mon, 14 Apr 2008 20:24:40 +0200 (CEST) -Content-Type: text/plain; - charset="utf-8" -Content-Disposition: inline -Content-Transfer-Encoding: quoted-printable -MIME-Version: 1.0 -Subject: [tt1003797] New ticket notification! ([...]) -X-Powered-BY: OTRS - Open Ticket Request System (http://otrs.org/) -X-Mailer: OTRS Mail Service (2.2.5) -Date: Mon, 14 Apr 2008 20:24:40 +0200 -X-Loop: yes -Message-ID: <1208197480.502380.201967369@xyz.ijs.si> -To: uuu@ijs.si -From: OTRS Notification Master - -Hi uuu, - -there is a new ticket in "Abuse"! - -"Mr. Angela Van Poort" wrote: - -> [...] - - -http://xyz.ijs.si/otrs/index.pl?Action=3DAgentZoom&TicketID=3D5512 - -Your OTRS Notification Master= - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4299 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4299 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4299 2009-06-30 22:00:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4299 1970-01-01 00:00:00.000000000 +0000 @@ -1,146 +0,0 @@ -Return-Path: -Received: from gargantua.jeunes-chercheurs.org (gargantua.jeunes-chercheurs.org [195.140.141.150]) - by mail.ijs.si (Postfix) with ESMTP id F3AAA67DE8C; - Mon, 14 Apr 2008 19:01:32 +0200 (CEST) -Received: by gargantua.jeunes-chercheurs.org (Postfix, from userid 103) - id 56195238C6; Mon, 14 Apr 2008 19:01:32 +0200 (CEST) -X-Sympa-To: consultation@council.eurodoc.net -X-Original-To: eurodoc+consultation@gargantua.jeunes-chercheurs.org -Delivered-To: eurodoc+consultation@gargantua.jeunes-chercheurs.org -Received: from localhost (localhost [127.0.0.1]) - by gargantua.jeunes-chercheurs.org (Postfix) with ESMTP id 0354E23A94 - for ; Mon, 14 Apr 2008 17:03:22 +0200 (CEST) -X-Virus-Scanned: Debian amavisd-new at gargantua.jeunes-chercheurs.org -Received: from gargantua.jeunes-chercheurs.org ([127.0.0.1]) - by localhost (gargantua.jeunes-chercheurs.org [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id 3CpL4nm3Z4lW - for ; - Mon, 14 Apr 2008 17:03:17 +0200 (CEST) -Received: from rv-out-0506.google.com (rv-out-0708.google.com [209.85.198.247]) - by gargantua.jeunes-chercheurs.org (Postfix) with ESMTP id 5E322238C6 - for ; Mon, 14 Apr 2008 17:03:17 +0200 (CEST) -Received: by rv-out-0506.google.com with SMTP id b17so970201rvf.44 - for ; Mon, 14 Apr 2008 08:03:14 -0700 (PDT) -Received: by 10.141.164.13 with SMTP id r13mr3444324rvo.65.1208185394137; - Mon, 14 Apr 2008 08:03:14 -0700 (PDT) -X-Forwarded-To: board@eurodoc.net, consultation@council.eurodoc.net -X-Forwarded-For: admin.schedule@gmail.com board@eurodoc.net, consultation@council.eurodoc.net -Delivered-To: admin.schedule@gmail.com -Received: by 10.140.187.12 with SMTP id k12cs55513rvf; - Mon, 14 Apr 2008 08:03:13 -0700 (PDT) -Received: by 10.78.206.6 with SMTP id d6mr4501430hug.46.1208185388868; - Mon, 14 Apr 2008 08:03:08 -0700 (PDT) -Received: from nf-out-1516.google.com (nf-out-1516.google.com [64.233.182.167]) - by mx.google.com with ESMTP id 35si3723010huc.14.2008.04.14.08.03.07; - Mon, 14 Apr 2008 08:03:08 -0700 (PDT) -Received-SPF: pass (google.com: domain of 3K3IDSA4JDugKNWSX.cMRONeVOQWKSV.MYWKNWSX.cMRONeVOQWKSV.MYW@calendar-server.bounces.google.com designates 64.233.182.167 as permitted sender) client-ip=64.233.182.167; -Authentication-Results: mx.google.com; spf=pass (google.com: domain of 3K3IDSA4JDugKNWSX.cMRONeVOQWKSV.MYWKNWSX.cMRONeVOQWKSV.MYW@calendar-server.bounces.google.com designates 64.233.182.167 as permitted sender) smtp.mail=3K3IDSA4JDugKNWSX.cMRONeVOQWKSV.MYWKNWSX.cMRONeVOQWKSV.MYW@calendar-server.bounces.google.com; dkim=pass (test mode) header.i=@google.com -Received: by nf-out-1516.google.com with SMTP id p21so267887nfd.1 - for ; Mon, 14 Apr 2008 08:03:07 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=google.com; s=beta; - h=domainkey-signature:mime-version:message-id:date:reply-to:auto-submitted:received:subject:from:to:content-type; - bh=LT289zGM99V/BG/5i4RVlD9SS+2xyjnJ1plw0bQSQaU=; - b=sGGpx8M0bTRVHVtkTpl4urtx+pWVkpoCIp9Ix2hEdh1Gzba7heQVoGsYaIP3NLqTXbAQOa/l97AlRWJtU5bHOg== -DomainKey-Signature: a=rsa-sha1; c=nofws; - d=google.com; s=beta; - h=mime-version:message-id:date:reply-to:auto-submitted:subject:from:to:content-type; - b=rE6zCjYbkHDxMt9mDWM4xFAh0Rpg2f3KJjlcgkyHYZG8RaUCWc7jGLZdRXcjnJZ8FVX+X7DtTA/NJfPP8dFJBA== -MIME-Version: 1.0 -Message-ID: <000fea77e35b044ad694d916f81b629@google.com> -Date: Mon, 14 Apr 2008 08:03:07 -0700 -Reply-To: Eurodoc Events -Auto-Submitted: auto-generated -Received: by 10.67.115.11 with SMTP id s11mr160226ugm.18.1208185387554; Mon, - 14 Apr 2008 08:03:07 -0700 (PDT) -From: Google Kalender -To: Eurodoc Events -Content-Type: multipart/alternative; - boundary=000fea77e35b044ad694d9167ccf819 -X-Validation-by: brigitos@gmail.com -Subject: [consultation] [Erinnerung] Discussion on Commission of Regions Conference - (Sardinia)... @ Do 17. Apr. 2008 (Eurodoc Events) -X-Loop: consultation@council.eurodoc.net -X-Sequence: 503 -Errors-To: consultation-owner@council.eurodoc.net -Precedence: list -X-no-archive: yes -List-Id: -List-Help: -List-Subscribe: -List-Unsubscribe: -List-Post: -List-Owner: -List-Archive: - ---000fea77e35b044ad694d9167ccf819 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: quoted-printable - -Eurodoc Events, Dies ist eine Erinnerung f=FCr - -Titel: Discussion on Commission of Regions Conference (Sardinia) presentatio= -n -starts (Mobility WG/Snezana) -Zeit: Do 17. Apr. 2008 (Zeitzone: Br=FCssel) -Kalender: Eurodoc Events - -Sie k=F6nnen diesen Termin anzeigen unter http://www.google.com/calendar/eve= -nt?action=3DVIEW&eid=3DYzVxaWw5bm0ydjRnZGpuNmdjamdjdWZobmsgYWRtaW4uc2NoZWR1b= -GVAbQ&tok=3DMjQjYWRtaW4uc2NoZWR1bGVAZ21haWwuY29tOWYxYWM3MmU5ZGJiZTI2ODNhNTAz= -OTI1ZWM4ZGM5YzY4MDY0NDgzZA&ctz=3DEurope%2FBrussels&hl=3Dde - -Sie k=F6nnen Ihren Kalender auch anzeigen unter http://www.google.com/calend= -ar/ - -Diese E-Mail wurde an admin.schedule@gmail.com gesendet, da Sie sich f=FCr &= -quot;Erinnerungen" bez=FCglich des Kalenders "Eurodoc Events"= - registriert haben. - -Melden Sie sich zur Deaktivierung dieser Benachrichtigungen unter http://www= -.google.com/calendar/ an und =E4ndern Sie Ihre Benachrichtigungseinstellunge= -n f=FCr diesen Kalender. ---000fea77e35b044ad694d9167ccf819 -Content-Type: text/html; charset=ISO-8859-1 -Content-Transfer-Encoding: quoted-printable - -
    3D"Google
    -

    Eurodoc Events, -Dies ist eine Erinnerung f=FCr

    -

    Discuss= -ion on Commission of Regions Conference (Sardinia) presentation starts (Mobi= -lity WG/Snezana)

    -

    Do 17. Apr. 2008 -
    -(Zeitzone: -Br=FCssel) -
    - -
    -Kalender: -Eurodoc Events

    -

    Weitere Termindetails»

    -
    -
    3D""

    Kalender anze= -igen»

    -

    Diese E-Mail wurde an admin.schedule@gmail.com gese= -ndet, da Sie sich f=FCr "Erinnerungen" bez=FCglich des Kalenders "Eurodoc Ev= -ents" registriert haben.

    Melden Sie sich zur Dea= -ktivierung dieser Benachrichtigungen unter http://www.google.com/calendar/ a= -n und =E4ndern Sie Ihre Benachrichtigungseinstellungen f=FCr diesen Kalender= -.

    ---000fea77e35b044ad694d9167ccf819-- diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4300 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4300 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4300 2009-06-30 22:00:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4300 1970-01-01 00:00:00.000000000 +0000 @@ -1,199 +0,0 @@ -Received: from nf-out-1516.google.com (nf-out-1516.google.com [64.233.182.166]) - by mail.ijs.si (Postfix) with ESMTP id 7F9BF67DF5D - for ; Mon, 14 Apr 2008 16:12:10 +0200 (CEST) -Received: by nf-out-1516.google.com with SMTP id d20so261529nfh.8 - for ; Mon, 14 Apr 2008 07:12:10 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=google.com; s=beta; - h=domainkey-signature:mime-version:message-id:date:reply-to:sender:auto-submitted:received:subject:from:to:content-type; - bh=swlIdkD29Bo3aT9dKs2Biw90+ru2oFJ/UodlXE2kcWg=; - b=rxRRfW2vzCqwuwnqtx1xj6ktuF2Rc1Io8eK+sELQKFNMJJF5HA/+ImegQfRrIzyiCQ/5NDW5l9XYP5KSDSXqxQ== -DomainKey-Signature: a=rsa-sha1; c=nofws; - d=google.com; s=beta; - h=mime-version:message-id:date:reply-to:sender:auto-submitted:subject:from:to:content-type; - b=uK21BMkRrQn2cIevKDwAeScuv8npNdmO4P0vwQKh2zyAA/a8XC8X//KF7KDSOozexLPk5HnEJG/JvmAicy4I/g== -MIME-Version: 1.0 -Message-ID: <000fea70e68c044ad5de9db5912034b@google.com> -Date: Mon, 14 Apr 2008 07:12:10 -0700 -Reply-To: Rich Ubachukwu -Sender: Google Calendar -Auto-Submitted: auto-generated -Received: by 10.67.115.3 with SMTP id s3mr187054ugm.1.1208182330209; Mon, 14 - Apr 2008 07:12:10 -0700 (PDT) -Subject: =?windows-1252?Q?=5BInvitation=5D_SINCERE_COMPESATION_=40_Mon_Apr_14_5pm_?= - =?windows-1252?Q?=96_6pm_=28=29?= -From: Rich Ubachukwu -To: uuu@ijs.si -Content-Type: multipart/mixed; boundary=000fea70e68c044ad5de9db55ff5790 - ---000fea70e68c044ad5de9db55ff5790 -Content-Type: multipart/alternative; - boundary=000fea70e68c044ad5de9db55bf578f - ---000fea70e68c044ad5de9db55bf578f -Content-Type: text/plain; charset=windows-1252 -Content-Transfer-Encoding: quoted-printable - -uuu@ijs.si, you are invited to - -Title: SINCERE COMPESATION -Time: Mon Apr 14 5pm =96 6pm (Timezone: Hawaii Time) -Calendar: -Description: -From:Mr.Rich Ubachukwu -Good Day., -You might find it so difficult to remember me. -[...] -Sincerely Yours, -Mr.Rich Ubachukwu - - -You can view this event at http://www.google.com/calendar/event?action=3DVIE= -W&eid=3DNGxlN3JlZjNoZzA4anIxcmh0aXE3ZmN0MDAgdml0by50dXJrQGlqcy5zaQ&tok=3DMjc= -jcmljaHViYWNodWt3dTk4OTBAZ21haWwuY29tMzg1OGRjNzVlMjkxYjYwNzM1ZGQ0YzNhNTk1MjV= -mZDk4ODhlNjJlNQ&ctz=3DPacific%2FHonolulu&hl=3Den - - - -You are receiving this courtesy email at the account uuu@ijs.si becaus= -e you are an attendee of this event. - -To stop receiving future notifications for this event, decline this event. A= -lternatively you can sign up for a Google account at http://www.google.com/c= -alendar/ and control your notification settings for your entire calendar. ---000fea70e68c044ad5de9db55bf578f -Content-Type: text/html; charset=windows-1252 -Content-Transfer-Encoding: quoted-printable - -
    3D"Google
    -

    uuu@ijs.si, -you are invited to

    -

    SINCERE= - COMPESATION

    -

    Mon Apr 14 5pm =96 6p= -m -
    -(Timezone: -Hawaii Time) -
    - -
    -Calendar: -

    -

    -
    From:Mr.Rich Ubachukwu -
    Good Day., -[...] -
    Sincerely Yours, -
    Mr.Rich Ubachukwu -

    More event details= -»

    -
    Will you = -attend?
    -
    Yes -|No -|Maybe<= -/span>
    -
    3D""

     

    -

    You are receiving this courtesy email at the accoun= -t uuu@ijs.si because you are an attendee of this event.

    To stop receiving future notifications for this event, decline= - this event. Alternatively you can sign up for a Google account at http://ww= -w.google.com/calendar/ and control your notification settings for your entir= -e calendar.

    ---000fea70e68c044ad5de9db55bf578f -Content-Type: text/calendar; charset=ISO-8859-1; method=REQUEST -Content-Transfer-Encoding: 7bit - -BEGIN:VCALENDAR -PRODID:-//Google Inc//Google Calendar 70.9054//EN -VERSION:2.0 -CALSCALE:GREGORIAN -METHOD:REQUEST -BEGIN:VEVENT -DTSTART:20080415T030000Z -DTEND:20080415T040000Z -DTSTAMP:20080414T141210Z -ORGANIZER;CN=Rich Ubachukwu:MAILTO:richubachukwu9890@gmail.com -UID:4le7ref3hg08jr1rhtiq7fct00@google.com -ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP= - TRUE;X-NUM-GUESTS=0:MAILTO:uuu@ijs.si -CLASS:PRIVATE -CREATED:20080414T141055Z -DESCRIPTION:\nFrom:Mr.Rich Ubachukwu\nGood Day.\,\nYou might find it so dif - ficult to remember me. Though\, it is indeed\, a very long time. On my[...] - .\nSincerely Yours\,\nMr.Rich Ubachukwu\n\nView your event at http://www.go - ogle.com/calendar/event?action=VIEW&eid=NGxlN3JlZjNoZzA4anIxcmh0aXE3ZmN0MDA - gdml0by50dXJrQGlqcy5zaQ&tok=MjcjcmljaHViYWNodWt3dTk4OTBAZ21haWwuY29tMzg1OGR - jNzVlMjkxYjYwNzM1ZGQ0YzNhNTk1MjVmZDk4ODhlNjJlNQ&ctz=Pacific%2FHonolulu&hl=e - n. -LAST-MODIFIED:20080414T141055Z -LOCATION: -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:SINCERE COMPESATION -TRANSP:OPAQUE -END:VEVENT -END:VCALENDAR - ---000fea70e68c044ad5de9db55bf578f-- ---000fea70e68c044ad5de9db55ff5790 -Content-Type: application/ics; name="invite.ics" -Content-Disposition: attachment; filename="invite.ics" -Content-Transfer-Encoding: 7bit - -BEGIN:VCALENDAR -PRODID:-//Google Inc//Google Calendar 70.9054//EN -VERSION:2.0 -CALSCALE:GREGORIAN -METHOD:REQUEST -BEGIN:VEVENT -DTSTART:20080415T030000Z -DTEND:20080415T040000Z -DTSTAMP:20080414T141210Z -ORGANIZER;CN=Rich Ubachukwu:MAILTO:richubachukwu9890@gmail.com -UID:4le7ref3hg08jr1rhtiq7fct00@google.com -ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP= - TRUE;X-NUM-GUESTS=0:MAILTO:uuu@ijs.si -CLASS:PRIVATE -CREATED:20080414T141055Z -DESCRIPTION:\nFrom:Mr.Rich Ubachukwu\nGood Day.\,\nYou might find it so dif - ficult to remember me. Though\, it is indeed\, a very long time. On my[...] - .\nSincerely Yours\,\nMr.Rich Ubachukwu\n\nView your event at http://www.go - ogle.com/calendar/event?action=VIEW&eid=NGxlN3JlZjNoZzA4anIxcmh0aXE3ZmN0MDA - gdml0by50dXJrQGlqcy5zaQ&tok=MjcjcmljaHViYWNodWt3dTk4OTBAZ21haWwuY29tMzg1OGR - jNzVlMjkxYjYwNzM1ZGQ0YzNhNTk1MjVmZDk4ODhlNjJlNQ&ctz=Pacific%2FHonolulu&hl=e - n. -LAST-MODIFIED:20080414T141055Z -LOCATION: -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:SINCERE COMPESATION -TRANSP:OPAQUE -END:VEVENT -END:VCALENDAR - ---000fea70e68c044ad5de9db55ff5790-- diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4301 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4301 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4301 2009-06-30 22:00:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5882-att4301 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -Return-Path: <> -Received: from uuu (unknown [10.24.231.97]) - by edina.ijs.si (Postfix) with ESMTP id 5801A51851 - for ; Mon, 14 Apr 2008 15:47:45 +0200 (CEST) -Reply-To: -From: "Mihael Sss" -To: "'Miha Rrr'" -Subject: Read: PhD tema -Date: Mon, 14 Apr 2008 15:43:27 +0200 -Message-ID: -MIME-Version: 1.0 -Content-Type: application/ms-tnef; - name="winmail.dat" -Content-Transfer-Encoding: base64 -Content-Disposition: attachment; - filename="winmail.dat" -X-Mailer: Microsoft Office Outlook, Build 11.0.5510 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 -In-Reply-To: -Thread-Index: AcieGtCcH1I0e+kUTNaU/D5M1gZAzwAGoygb -X-MS-TNEF-Correlator: 00000000DF67F186F9519745A31B21698F3B3926C41F4200 - -eJ8+IhsNAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA4gQAAAAAAADmAAEIgAcAIAAAAElQTS5NaWNy -b3NvZnQgTWFpbC5SZWFkIFJlY2VpcHQAAwsBCoABACEAAABBRTMyNzMyMjI2QUE3QTQzQjY3RkJE -QTc5NUE2QTdCMQBFBwEDkAYAUAMAAB0AAAADACYAAAAAAAIBMQABAAAATgAAAFBDREZFQjA5AAEA -AgAAAAAAAAAAAAAAAAAYAAAAAAAAACpOlAMVtzdLgUpQbvEF7SXCgAAAEAAAAIqp6MbN+sBMuVqr -M+gZTLoBAAAAAAAAQAAyAMC2PV01nsgBHgBJAAEAAAAJAAAAUGhEIHRlbWEAAAAAAgFMAAEAAABs -AAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACATQBpAGgAYQAgAFMAbQBvAGwAbgBpAGsAYQByAAAA -UwBNAFQAUAAAAE0AaQBoAGEALgBTAG0AbwBsAG4AaQBrAGEAcgBAAGkAagBzAC4AcwBpAAAAHgBN -AAEAAAAPAAAATWloYSBTbW9sbmlrYXIAAEAATgAAJTzQGp7IAUAAVQCAyfvXGp7IAR4AcAABAAAA -CQAAAFBoRCB0ZW1hAAAAAAIBcQABAAAAGwAAAAHInhrQnB9SNHvpFEzWlPw+TNYGQM8ABqMoGwAe -AHIAAQAAAAEAAAAAAAAAHgBzAAEAAAABAAAAAAAAAB4AdAABAAAAFQAAAG1paGEubW9ob3JjaWNA -aWpzLnNpAAAAAB4AgAABAAAACgAAAGRpc3BsYXllZAAAAB4AgQABAAAAIAAAAG1hbnVhbC1hY3Rp -b24vTUROLXNlbnQtbWFudWFsbHkACwAIDAAAAAALAAEOAQAAAAMAFA4BAAAAHgAoDgEAAAAiAAAA -MDAwMDAwMDgBbWloYS5tb2hvcmNpY0BpanMuc2kBSUpTAAAAHgApDgEAAAAiAAAAMDAwMDAwMDgB -bWloYS5tb2hvcmNpY0BpanMuc2kBSUpTAAAAHgABEAEAAAAVAAAATWVzc2FnZSB3YXMgcmVhZCBv -bjoAAAAACwAfDgEAAAACAfgPAQAAABAAAADfZ/GG+VGXRaMbIWmPOzkmAgH6DwEAAAAQAAAA32fx -hvlRl0WjGyFpjzs5JgMA/g8FAAAAAwANNP0/BQADAA80/T8FAAIBFDQBAAAAEAAAAE5JVEH5v7gB -AKoAN9luAAACAX8AAQAAADEAAAAwMDAwMDAwMERGNjdGMTg2Rjk1MTk3NDVBMzFCMjE2OThGM0Iz -OTI2QzQxRjQyMDAAAAAAIKs= - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5900-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5900-1 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5900-1 2008-08-14 16:05:27.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5900-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Return-Path: <> -Date: 9 Jun 2008 03:39:09 -0000 -From: postmaster@neptun.bn.com.pl -To: aaaa@eire.com -Subject: failure notice -Message-Id: <20080609013409.AA1EE31003A@dogma.boxhost.net> - -Hi. This is the qmail-send program at neptun.bn.com.pl. -I'm afraid I wasn't able to deliver your message to the following addresses. -This is a permanent error; I've given up. Sorry it didn't work out. - -: -user does not exist, but will deliver to /home/vpopmail/domains/player.pl/daniel/ -can not open new email file errno=2 file=/home/vpopmail/domains/player.pl/daniel/Maildir/tmp/1212982749.25263.neptun.bn.com.pl,S=3155 -system error - ---- Below this line is a copy of the message. - -Return-Path: -Received: (qmail 25258 invoked by uid 710); 9 Jun 2008 03:39:06 -0000 -Received: from [1.2.3.14] (HELO foo.bar.com) by baz.fi (CommuniGate Pro SMTP 5.1.11) - with ESMTPS id 10193211 for xx@xxx.fi; Tue, 06 May 2008 19:40:57 +0200 -From: -To: -Subject: foo -Date: Sun, 08 Jun 2008 23:45:34 +0000 - -bar diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5900-1.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5900-1.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5900-1.cf 2008-08-14 16:05:27.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5900-1.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays baz.fi - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4321 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4321 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4321 2009-09-20 19:45:09.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4321 1970-01-01 00:00:00.000000000 +0000 @@ -1,155 +0,0 @@ -Return-Path: <> -Received: by mail.homes-magazine.com (CommuniGate Pro PIPE 5.0.14) - with PIPE id 3346853; Fri, 16 May 2008 10:49:38 -0700 -X-TFF-CGPSA-Version: 1.5 -X-TFF-CGPSA-Filter: Scanned -X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on - apollo.homes-magazine.com -X-Spam-Level: -X-Spam-Status: No, score=0.4 required=5.0 tests=ANY_BOUNCE_MESSAGE,AWL, - BAYES_00,BOUNCE_MESSAGE,HTML_MESSAGE,RAZOR2_CF_RANGE_51_100, - RAZOR2_CF_RANGE_E4_51_100,RAZOR2_CHECK,TVD_FW_GRAPHIC_NAME_MID autolearn=no - version=3.2.4 -Received: from mailgw02.wolfnettech.com ([216.17.53.37] verified) - by mail.homes-magazine.com (CommuniGate Pro SMTP 5.0.14) - with ESMTP id 3346851 for webcare@homesmagazine.com; Fri, 16 May 2008 10:49:21 -0700 -Received: by mailgw02.wolfnettech.com (Postfix) - id B89E29E5968; Fri, 16 May 2008 12:48:50 -0500 (CDT) -Date: Fri, 16 May 2008 12:48:50 -0500 (CDT) -From: MAILER-DAEMON@mailgw02.wolfnettech.com (Mail Delivery System) -Subject: Undelivered Mail Returned to Sender -To: webcare@homesmagazine.com -Auto-Submitted: auto-replied -MIME-Version: 1.0 -Content-Type: multipart/report; report-type=delivery-status; - boundary="3E2479E5965.1210960130/mailgw02.wolfnettech.com" -Message-Id: <20080516174850.B89E29E5968@mailgw02.wolfnettech.com> - -This is a MIME-encapsulated message. - ---3E2479E5965.1210960130/mailgw02.wolfnettech.com -Content-Description: Notification -Content-Type: text/plain; charset=us-ascii - -This is the mail system at host mailgw02.wolfnettech.com. - -I'm sorry to have to inform you that your message could not -be delivered to one or more recipients. It's attached below. - -For further assistance, please send mail to - -If you do so, please include this problem report. You can -delete your own text from the attached returned message. - - The mail system - -: host pbimail5.prodigy.net[207.115.36.20] said: 553 5.3.0 - ... Addressee unknown, relay=[216.17.53.37] (in reply - to RCPT TO command) - ---3E2479E5965.1210960130/mailgw02.wolfnettech.com -Content-Description: Delivery report -Content-Type: message/delivery-status - -Reporting-MTA: dns; mailgw02.wolfnettech.com -X-Postfix-Queue-ID: 3E2479E5965 -X-Postfix-Sender: rfc822; webcare@homesmagazine.com -Arrival-Date: Fri, 16 May 2008 12:48:50 -0500 (CDT) - -Final-Recipient: rfc822; wlycnh1@pacbell.net -Original-Recipient: rfc822;wlycnh1@pacbell.net -Action: failed -Status: 5.3.0 -Remote-MTA: dns; pbimail5.prodigy.net -Diagnostic-Code: smtp; 553 5.3.0 ... Addressee unknown, - relay=[216.17.53.37] - ---3E2479E5965.1210960130/mailgw02.wolfnettech.com -Content-Description: Undelivered Message -Content-Type: message/rfc822 - -Received: from 10.100.0.101 (intmx02.mlsfinder.com [192.168.0.71]) by mailgw02.wolfnettech.com (Postfix) with SMTP id 3E2479E5965 for ; Fri, 16 May 2008 12:48:50 -0500 (CDT) -From: -To: -Message-ID: <06794767.cb647dd91f65@192.168.0.141> -Reply-To: -Subject: Real Estate Listing -Date: Fri, 16 May 2008 12:48:45 -0500 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_06794765_377CEB575348A058" - -------=_NextPart_06794765_377CEB575348A058 -Content-Type: text/plain; charset="iso-8859-1" -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - -Homes Magazine - -Message Sent By: sandra richards - -Email address: svrichards@sbcglobal.net -RE: Listing No. 70021094 - - - -Message: - -Bill, -This is the LEAST EXPENSIVE Glenbrook TOWNHOME with LAKEVIEW. 2 years ago it -would have been listed at $1.8. My recommendation is make an offer, once I -see the profile reflecting how much Seller has owing on it. I will see what -Seller paid for it in making decision on offer. Yes, I think this may be the -better way to go; then you have your NV residence and can trade up. - - - - -Click Here to View the Listing - - - -If your browser does not display a link above you can access the listing by -copying and pasting the following URL into your web browser: - - - - - -http://www.cbvillagerealty.com/search.cfm?action=email_listing_detail&property -_id=70021094 - -Homes Magazine -webcare@homesmagazine.com - -------=_NextPart_06794765_377CEB575348A058 -Content-Type: text/html; charset="iso-8859-1" -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - -Homes Magazine - -Message Sent By: sandra richards
    -Email address: svrichards@sbcglobal.net -RE: Listing No. 70021094
    -
    -Message:
    -Bill,
    This is the LEAST EXPENSIVE Glenbrook TOWNHOME with LAKEVIEW. 2 years ago it would have been listed at $1.8. My recommendation is make an offer, once I see the profile reflecting how much Seller has owing on it. I will see what Seller paid for it in making decision on offer. Yes, I think this may be the better way to go; then you have your NV residence and can trade up.
    -
    - -Click Here to View the Listing - -
    -If your browser does not display a link above you can access the listing by copying and pasting the following URL into your web browser: -
    -
    - -http://www.cbvillagerealty.com/search.cfm?action=email_listing_detail&property_id=70021094 -     -Homes Magazine -webcare@homesmagazine.com - -------=_NextPart_06794765_377CEB575348A058-- - - ---3E2479E5965.1210960130/mailgw02.wolfnettech.com-- diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4321.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4321.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4321.cf 2009-09-20 19:45:09.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4321.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ - -whitelist_bounce_relays mail.homes-magazine.com -whitelist_bounce_relays mailgw02.wolfnettech.com -whitelist_bounce_relays levit.reacheach1.com -whitelist_bounce_relays smtp*.blackberry.com -whitelist_bounce_relays *.tcsn.net - -trusted_networks 66.224.197.128/27 -internal_networks 66.224.197.156 -internal_networks 66.224.197.130 - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4322 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4322 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4322 2009-09-21 03:30:24.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4322 1970-01-01 00:00:00.000000000 +0000 @@ -1,157 +0,0 @@ -Return-Path: <> -Received: by mail.homes-magazine.com (CommuniGate Pro PIPE 5.0.14) - with PIPE id 3346853; Fri, 16 May 2008 10:49:38 -0700 -X-TFF-CGPSA-Version: 1.5 -X-TFF-CGPSA-Filter: Scanned -X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on - apollo.homes-magazine.com -X-Spam-Level: -X-Spam-Status: No, score=0.4 required=5.0 tests=ANY_BOUNCE_MESSAGE,AWL, - BAYES_00,BOUNCE_MESSAGE,HTML_MESSAGE,RAZOR2_CF_RANGE_51_100, - RAZOR2_CF_RANGE_E4_51_100,RAZOR2_CHECK,TVD_FW_GRAPHIC_NAME_MID autolearn=no - version=3.2.4 -Received: from mailgw02.wolfnettech.com ([216.17.53.37] verified) - by mail.homes-magazine.com (CommuniGate Pro SMTP 5.0.14) - with ESMTP id 3346851 for webcare@homesmagazine.com; Fri, 16 May 2008 10:49:21 -0700 -Received: by mailgw02.wolfnettech.com (Postfix) - id B89E29E5968; Fri, 16 May 2008 12:48:50 -0500 (CDT) -Date: Fri, 16 May 2008 12:48:50 -0500 (CDT) -From: MAILER-DAEMON@mailgw02.wolfnettech.com (Mail Delivery System) -Subject: Undelivered Mail Returned to Sender -To: webcare@homesmagazine.com -Auto-Submitted: auto-replied -MIME-Version: 1.0 -Content-Type: multipart/report; report-type=delivery-status; - boundary="3E2479E5965.1210960130/mailgw02.wolfnettech.com" -Message-Id: <20080516174850.B89E29E5968@mailgw02.wolfnettech.com> - -This is a MIME-encapsulated message. - ---3E2479E5965.1210960130/mailgw02.wolfnettech.com -Content-Description: Notification -Content-Type: text/plain; charset=us-ascii - -This is the mail system at host mailgw02.wolfnettech.com. - -I'm sorry to have to inform you that your message could not -be delivered to one or more recipients. It's attached below. - -For further assistance, please send mail to - -If you do so, please include this problem report. You can -delete your own text from the attached returned message. - - The mail system - -: host pbimail5.prodigy.net[207.115.36.20] said: 553 5.3.0 - ... Addressee unknown, relay=[216.17.53.37] (in reply - to RCPT TO command) - ---3E2479E5965.1210960130/mailgw02.wolfnettech.com -Content-Description: Delivery report -Content-Type: message/delivery-status - -Reporting-MTA: dns; mailgw02.wolfnettech.com -X-Postfix-Queue-ID: 3E2479E5965 -X-Postfix-Sender: rfc822; webcare@homesmagazine.com -Arrival-Date: Fri, 16 May 2008 12:48:50 -0500 (CDT) - -Final-Recipient: rfc822; wlycnh1@pacbell.net -Original-Recipient: rfc822;wlycnh1@pacbell.net -Action: failed -Status: 5.3.0 -Remote-MTA: dns; pbimail5.prodigy.net -Diagnostic-Code: smtp; 553 5.3.0 ... Addressee unknown, - relay=[216.17.53.37] - ---3E2479E5965.1210960130/mailgw02.wolfnettech.com -Content-Description: Undelivered Message -Content-Type: message/rfc822 - -Received: from 10.100.0.101 (intmx02.mlsfinder.com [192.168.0.71]) by - mailgw02.wolfnettech.com (Postfix) with SMTP id 3E2479E5965 - for ; Fri, 16 May 2008 12:48:50 -0500 (CDT) -From: -To: -Message-ID: <06794767.cb647dd91f65@192.168.0.141> -Reply-To: -Subject: Real Estate Listing -Date: Fri, 16 May 2008 12:48:45 -0500 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_06794765_377CEB575348A058" - -------=_NextPart_06794765_377CEB575348A058 -Content-Type: text/plain; charset="iso-8859-1" -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - -Homes Magazine - -Message Sent By: sandra richards - -Email address: svrichards@sbcglobal.net -RE: Listing No. 70021094 - - - -Message: - -Bill, -This is the LEAST EXPENSIVE Glenbrook TOWNHOME with LAKEVIEW. 2 years ago it -would have been listed at $1.8. My recommendation is make an offer, once I -see the profile reflecting how much Seller has owing on it. I will see what -Seller paid for it in making decision on offer. Yes, I think this may be the -better way to go; then you have your NV residence and can trade up. - - - - -Click Here to View the Listing - - - -If your browser does not display a link above you can access the listing by -copying and pasting the following URL into your web browser: - - - - - -http://www.cbvillagerealty.com/search.cfm?action=email_listing_detail&property -_id=70021094 - -Homes Magazine -webcare@homesmagazine.com - -------=_NextPart_06794765_377CEB575348A058 -Content-Type: text/html; charset="iso-8859-1" -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - -Homes Magazine - -Message Sent By: sandra richards
    -Email address: svrichards@sbcglobal.net -RE: Listing No. 70021094
    -
    -Message:
    -Bill,
    This is the LEAST EXPENSIVE Glenbrook TOWNHOME with LAKEVIEW. 2 years ago it would have been listed at $1.8. My recommendation is make an offer, once I see the profile reflecting how much Seller has owing on it. I will see what Seller paid for it in making decision on offer. Yes, I think this may be the better way to go; then you have your NV residence and can trade up.
    -
    - -Click Here to View the Listing - -
    -If your browser does not display a link above you can access the listing by copying and pasting the following URL into your web browser: -
    -
    - -http://www.cbvillagerealty.com/search.cfm?action=email_listing_detail&property_id=70021094 -     -Homes Magazine -webcare@homesmagazine.com - -------=_NextPart_06794765_377CEB575348A058-- - - ---3E2479E5965.1210960130/mailgw02.wolfnettech.com-- diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4322.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4322.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4322.cf 2009-09-20 19:45:09.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp_bug5912_att4322.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ - -whitelist_bounce_relays mail.homes-magazine.com -whitelist_bounce_relays mailgw02.wolfnettech.com -whitelist_bounce_relays levit.reacheach1.com -whitelist_bounce_relays smtp*.blackberry.com -whitelist_bounce_relays *.tcsn.net - -trusted_networks 66.224.197.128/27 -internal_networks 66.224.197.156 -internal_networks 66.224.197.130 - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5942-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5942-1 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5942-1 2009-06-30 10:10:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5942-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -X-Envelope-From: -X-Envelope-To: , - , - , - , - , - , - , - , - , - , - -Received: from srv-asgw03.csi.it ([127.0.0.1]) - by localhost (srv-asgw03.csi.it [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id Evx5G8KQCnRW; Wed, 16 Jul 2008 18:44:38 +0200 (CEST) -Received: from ermes.comunic.it (unknown [213.209.215.152]) - by srv-asgw03.csi.it (Postfix) with ESMTP id 7B7BC584029; - Wed, 16 Jul 2008 18:44:37 +0200 (CEST) -Received: from 172.16.16.201 (macj.comunic.it [172.16.16.201]) - by ermes.comunic.it (8.13.6/8.13.6) with ESMTP id m6GD2gko034545; - Wed, 16 Jul 2008 15:02:43 +0200 (CEST) - (envelope-from iscrizioni@comunic.it) -Sender: iscrizioni@comunic.it -Errors-To: iscrizioni@comunic.it -Reply-To: iscrizioni@comunic.it -Message-ID: <995901825@ermes.comunic.it> -Mime-Version: 1.0 -Content-Type: text/plain -From: Parchi-News -Date: Wed, 16 Jul 2008 15:04:31 +0200 -Auto-Submitted: auto-generated -Precedence: Bulk -X-Listserver: Macjordomo 1.6a2 - Macintosh Listserver -To: Multiple recipients of Parchi-News - Sent by -Subject: [Parchi News] - Number 1884 - -[Parchi News] 16 luglio 2008 Issue 1884 - -Today's Topics: -[...] - -This is not a bounce message. Maybe you can fix __AUTO_GEN_AS. -Thank you very much -Regards -Marco - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5942-1.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5942-1.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5942-1.cf 2009-06-30 10:15:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5942-1.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -whitelist_bounce_relays srv-asgw03.csi.it - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug-5942-3 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug-5942-3 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug-5942-3 2009-06-30 10:10:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug-5942-3 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -Return-Path: -X-Original-To: jm@localhost -Delivered-To: jm@localhost.jmason.org -Received: from radish.jmason.org (localhost [127.0.0.1]) - by radish.jmason.org (Postfix) with ESMTP id E19F234134 - for ; Wed, 27 Jun 2007 01:09:30 +0100 (IST) -X-Spam-Virus: No -X-Spam-Checker-Version: SpamAssassin 3.3.0-r543787 (2007-06-02) on - dogma.boxhost.net -X-Spam-Relays-External: [ ip=89.234.66.109 rdns=smtp.boards.ie - helo=muppet.boards.ie by=dogma.boxhost.net ident= envfrom= intl=0 - id=A429C310051 auth= msa=0 ] [ ip=89.234.66.99 rdns= helo=89.234.66.109 - by=muppet.boards.ie ident= envfrom= intl=0 id=07BA5FF43BD auth= msa=0 ] -X-Spam-Status: No, score=2.0 required=5.0 tests=AWL,BAYES_50, - DK_POLICY_SIGNSOME,RCVD_NUMERIC_HELO shortcircuit=no autolearn=no - version=3.3.0-r543787 -X-Spam-Relays-Internal: -X-Spam-Relays-Untrusted: [ ip=89.234.66.109 rdns=smtp.boards.ie - helo=muppet.boards.ie by=dogma.boxhost.net ident= envfrom= intl=0 - id=A429C310051 auth= msa=0 ] [ ip=89.234.66.99 rdns= helo=89.234.66.109 - by=muppet.boards.ie ident= envfrom= intl=0 id=07BA5FF43BD auth= msa=0 ] -X-Spam-Relays-Trusted: -X-Spam-Level: ** -X-Spam-RBL: [10 mail1.hosting.digiweb.ie.] - [89.234.66.107] -X-Original-To: jm-boards@jmason.org -Delivered-To: jm@dogma.boxhost.net -Received: from localhost [127.0.0.1] - by radish.jmason.org with IMAP (fetchmail-6.3.2) - for (single-drop); Wed, 27 Jun 2007 01:09:30 +0100 (IST) -Received: from muppet.boards.ie (smtp.boards.ie [89.234.66.109]) - by dogma.boxhost.net (Postfix) with ESMTP id A429C310051 - for ; Wed, 27 Jun 2007 01:00:14 +0100 (IST) -Received: from 89.234.66.109 (unknown [89.234.66.99]) - by muppet.boards.ie (Postfix) with SMTP id 07BA5FF43BD - for ; Wed, 27 Jun 2007 01:00:32 +0100 (IST) -Date: Wed, 27 Jun 2007 00:02:56 +0000 -To: jm-boards@jmason.org -From: "boards.ie" -Auto-Submitted: auto-generated -Message-ID: <200706270056.18b1fd882360@www.boards.ie> -MIME-Version: 1.0 -Content-Type: text/plain; charset="ISO-8859-1" -Content-Transfer-Encoding: 8bit -X-Priority: 3 -X-Mailer: vBulletin Mail via PHP -Subject: "IrelandOffline" update -Status: O -X-UID: 260300 -X-Keywords: - - -Dear jmason, - -You are subscribed to the forum IrelandOffline, there have been 2 new threads and 2 updated threads. -http://www.boards.ie/vbulletin/forumdisplay.php?f=60 - -The following threads are new: -************ -Orange Romania launches 3.6 Mbps service -http://www.boards.ie/vbulletin/showthread.php?t=2055112566 -In forum: IrelandOffline -Started by: bealtine -Last post: Yesterday 14:05 -************ -Eircom - no service, only humiliation -http://www.boards.ie/vbulletin/showthread.php?t=2055112888 -In forum: IrelandOffline -Started by: tomasAgustafsso -Last post: Yesterday 21:09 - - -The following threads have been updated: -************ -Eircom service & inrastructure separation and the strike -http://www.boards.ie/vbulletin/showthread.php?t=2055111045 -In forum: IrelandOffline -Started by: Dangger -Last post: Yesterday 16:28 -************ -eircom FWA locations -http://www.boards.ie/vbulletin/showthread.php?t=2054855438 -In forum: IrelandOffline -Started by: damien.m -Last post: Yesterday 22:33 - - -All the best, -boards.ie - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Unsubscription information: - -To unsubscribe from this forum, please visit this page: -http://www.boards.ie/vbulletin/subscription.php?do=usub&f=60 - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug-5942-3.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug-5942-3.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug-5942-3.cf 2009-06-30 10:10:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug-5942-3.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5994-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5994-1 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5994-1 2009-07-04 15:31:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5994-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -X-Envelope-From: -X-Envelope-To: , - , - , - , - , - , - , - , - , - , - -Received: from srv-asgw03.csi.it ([127.0.0.1]) - by localhost (srv-asgw03.csi.it [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id Evx5G8KQCnRW; Wed, 16 Jul 2008 18:44:38 +0200 (CEST) -Received: from ermes.comunic.it (unknown [213.209.215.152]) - by srv-asgw03.csi.it (Postfix) with ESMTP id 7B7BC584029; - Wed, 16 Jul 2008 18:44:37 +0200 (CEST) -Received: (from root@localhost) - by daffy.timing.com (8.13.1/8.13.1/Submit) id m96653kR064934; - Mon, 6 Oct 2008 00:05:03 -0600 (MDT) - (envelope-from root) -Sender: iscrizioni@comunic.it -Errors-To: iscrizioni@comunic.it -Reply-To: iscrizioni@comunic.it -Message-ID: <995901825@ermes.comunic.it> -Mime-Version: 1.0 -Content-Type: text/plain -From: Parchi-News -Date: Wed, 16 Jul 2008 15:04:31 +0200 -Auto-Submitted: auto-generated -Precedence: Bulk -X-Listserver: Macjordomo 1.6a2 - Macintosh Listserver -To: Multiple recipients of Parchi-News - Sent by -Subject: [Parchi News] - Number 1884 - -[Parchi News] 16 luglio 2008 Issue 1884 - -Today's Topics: -[...] - -This is not a bounce message. Maybe you can fix __AUTO_GEN_AS. -Thank you very much -Regards -Marco - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5994-1.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5994-1.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5994-1.cf 2009-07-04 15:31:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug5994-1.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -whitelist_bounce_relays daffy.timing.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug6008-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug6008-1 --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug6008-1 2009-07-04 22:15:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug6008-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -x-envelope-from: -x-envelope-to: -x-envelope-to-blocked: -x-quarantine-id: -Received: from fl.us.spammertrap.net ([127.0.0.1]) by localhost (fl.us.spammertrap.net [127.0.0.1]) (SpammerTrap(r) SME-150, port 10024) with LMTP id iKmSutt7dLyh for ; Mon, 9 Feb 2009 12: 31: 43 -0500 (EST) -Received: from bugs1.secnap.com (gw.tpa.secnap.net [216.134.223.58]) by fl.us.spammertrap.net (Postfix) with ESMTP id CCA24E6072 for ; Mon, 9 Feb 2009 12: 31: 43 -0500 (EST) -Received: by bugs1.secnap.com (Postfix, from userid 80) id 9A15466C990; Mon, 9 Feb 2009 12: 31: 43 -0500 (EST) -From: bugzilla-daemon@bugs1.secnap.com -To: jscheidell@secnap.net -Subject: [Bug 132] new install fills quarantine retention to [ ] (blank) -x-bugzilla-reason: QAcontact Reporter -x-bugzilla-type: newchanged -x-bugzilla-watch-reason: None -x-bugzilla-product: SpammerTrap -x-bugzilla-component: GUI -x-bugzilla-severity: normal -x-bugzilla-who: scheidell@secnap.net -x-bugzilla-status: CLOSED -x-bugzilla-priority: P4 -x-bugzilla-assigned-to: wshpoon@secnap.net -x-bugzilla-target-milestone: --- -x-bugzilla-changed-fields: Status CC -in-reply-to: -references: -Auto-Submitted: auto-generated -Content-Type: text/plain; charset="UTF-8" -mime-version: 1.0 -message-id: <20090209173143.9A15466C990@bugs1.secnap.com> -date: Mon, 9 Feb 2009 12:31:43 -0500 (EST) - -testing diff -Nru spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug6008-1.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug6008-1.cf --- spamassassin-3.4.6/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug6008-1.cf 2009-07-04 22:15:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/BOUNCE_MESSAGE/fp-bug6008-1.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -whitelist_bounce_relays bugs1.secnap.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/CHALLENGE_RESPONSE/10 spamassassin-4.0.0~rc3/trunk-only/t.rules/CHALLENGE_RESPONSE/10 --- spamassassin-3.4.6/trunk-only/t.rules/CHALLENGE_RESPONSE/10 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/CHALLENGE_RESPONSE/10 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -From e450@durga.webserversystems.com Thu Jun 19 19:30:51 2008 -Return-Path: -X-Spam-Virus: No -X-Spam-Checker-Version: SpamAssassin 3.3.0-r650054 (2008-04-21) on - soman.fdntech.com -X-Spam-Relays-External: [ ip=74.53.3.206 rdns=durga.webserversystems.com - helo=durga.webserversystems.com by=soman.fdntech.com ident= envfrom= intl=0 - id=774AFBA5163 auth= msa=0 ] -X-Spam-Status: No, score=-3.0 required=5.0 tests=AWL,BAYES_00, - CHALLENGE_RESPONSE,RP_MATCHES_RCVD,WHOIS_DMNBYPROXY shortcircuit=no - autolearn=ham version=3.3.0-r650054 -X-Spam-Relays-Internal: -X-Spam-Relays-Untrusted: [ ip=74.53.3.206 rdns=durga.webserversystems.com - helo=durga.webserversystems.com by=soman.fdntech.com ident= envfrom= intl=0 - id=774AFBA5163 auth= msa=0 ] -X-Spam-Relays-Trusted: -X-Spam-Level: -X-Spam-RBL: [74.53.3.206] - [127.0.0.4, 127.0.0.5] -X-Original-To: jm-wp-2008@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from durga.webserversystems.com (durga.webserversystems.com [74.53.3.206]) - by soman.fdntech.com (Postfix) with ESMTP id 774AFBA5163 - for ; Thu, 19 Jun 2008 19:30:47 -0500 (CDT) -Received: from e450 by durga.webserversystems.com with local (Exim 4.68) - (envelope-from ) - id 1K9UWP-0006d1-TK - for jm-wp-2008@jmason.org; Thu, 19 Jun 2008 19:30:33 -0500 -X-Boxtrapper: _DoJ6cwyZIKmT2MtjGqXrb37zI5T5bLf -X-Autorespond: _DoJ6cwyZIKmT2MtjGqXrb37zI5T5bLf -Precedence: auto_reply -X-Precedence: auto_reply -To: jm-wp-2008@jmason.org -Subject: Your email requires verification verify#WS3cV2x3OKT7bzTMlJwEIxo6uChp3ByV -From: -Message-Id: -Date: Thu, 19 Jun 2008 19:30:33 -0500 -X-AntiAbuse: This header was added to track abuse, please include it with any abuse report -X-AntiAbuse: Primary Hostname - durga.webserversystems.com -X-AntiAbuse: Original Domain - jmason.org -X-AntiAbuse: Originator/Caller UID/GID - [33154 33156] / [47 12] -X-AntiAbuse: Sender Address Domain - durga.webserversystems.com - -The message you sent requires that you verify that you -are a real live human being and not a spam source. - -To complete this verification, simply reply to this message and leave -the subject line intact. - -The headers of the message sent from your address are shown below: - -From wordpress@jmason.org Thu Jun 19 19:30:33 2008 -Received: from soman.fdntech.com ([72.232.31.42]) - by durga.webserversystems.com with esmtp (Exim 4.68) - (envelope-from ) - id 1K9UWN-0006ci-If - for admin@419eater.com; Thu, 19 Jun 2008 19:30:33 -0500 -Received: by soman.fdntech.com (Postfix, from userid 48) - id A6EBEBA5162; Thu, 19 Jun 2008 19:30:40 -0500 (CDT) -To: admin@419eater.com -Subject: [taint.org: Justin Mason's Weblog] New Comment On: The 419ers Meet Their Match -Date: Thu, 19 Jun 2008 19:30:40 -0500 -From: "taint.org - Justin Mason's Weblog" -Message-ID: <4196891b3ec236dbf1383546a76f170a@taint.org> -X-Priority: 3 -MIME-Version: 1.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset="UTF-8" -Content-Transfer-Encoding: quoted-printable -X-Spam-Status: No, score=-2.6 -X-Spam-Score: -25 -X-Spam-Bar: -- -X-Spam-Flag: NO - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/CHALLENGE_RESPONSE/10.cf spamassassin-4.0.0~rc3/trunk-only/t.rules/CHALLENGE_RESPONSE/10.cf --- spamassassin-3.4.6/trunk-only/t.rules/CHALLENGE_RESPONSE/10.cf 2008-12-29 12:41:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/CHALLENGE_RESPONSE/10.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - -whitelist_bounce_relays soman.fdntech.com - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_HOTMAIL_RCVD/fp-5874-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_HOTMAIL_RCVD/fp-5874-1 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_HOTMAIL_RCVD/fp-5874-1 2008-12-29 15:02:03.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_HOTMAIL_RCVD/fp-5874-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Return-Path: -X-Spam-Flag: YES -X-Spam-Checker-Version: SpamAssassin 3.1.9 (2007-02-13) on koala.bok.net -X-Spam-Status: Yes, score=7.1 required=3.0 tests=BAYES_50, - CHARSET_FARAWAY_HEADER,FORGED_HOTMAIL_RCVD,HTML_50_60,HTML_MESSAGE, - T_MULTIPLE_RECIPIENTS autolearn=no version=3.1.9 -Delivered-To: 16-tristan@mpegtv.com -Received: (qmail 6538 invoked by uid 110); 3 Apr 2008 18:24:55 -0400 -Delivered-To: 27-tristan@bok.net -Received: (qmail 6533 invoked from network); 3 Apr 2008 18:24:55 -0400 -Received: from blu139-omc1-s14.blu139.hotmail.com (65.55.175.154) - by tristansf.com with SMTP; 3 Apr 2008 18:24:55 -0400 -Received-SPF: pass (tristansf.com: SPF record at spf-a.hotmail.com designates 65.55.175.154 as permitted sender) -Received: from BLU113-W2 ([65.55.162.183]) by blu139-omc1-s14.blu139.hotmail.com with Microsoft SMTPSVC(6.0.3790.3959); - Thu, 3 Apr 2008 15:24:54 -0700 -Message-ID: -Content-Type: multipart/alternative; - boundary="_37559fca-6063-49c2-a126-f9ba14fdcd4c_" -X-Originating-IP: [75.36.144.135] -From: =?iso-2022-jp?B?GyRCQ2ZCPBsoQiAbJEI3Q019GyhC?= -To: Tristan -Subject: [07.1] Hi! -Date: Fri, 4 Apr 2008 07:24:54 +0900 -Importance: Normal -MIME-Version: 1.0 -X-OriginalArrivalTime: 03 Apr 2008 22:24:54.0144 (UTC) FILETIME=[8A56B800:01C895D9] - -foo diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp10 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp10 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp10 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp10 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -Return-Path: -Received: from batman.home4u.ch ([unix socket]) - by batman.home4u.ch (Cyrus v2.1.18) with LMTP; Wed, 09 Mar 2005 04:57:00 +0100 -X-Sieve: CMU Sieve 2.2 -Received: from lists.grok.org.uk (lists.grok.org.uk [195.184.125.51]) - by batman.home4u.ch (8.13.1/8.13.1) with ESMTP id j293usEY032764 - for ; Wed, 9 Mar 2005 04:56:54 +0100 (CET) - (envelope-from full-disclosure-bounces@lists.grok.org.uk) -Received: from lists.grok.org.uk (localhost [127.0.0.1]) - by lists.grok.org.uk (Postfix) with ESMTP id 1984DBAF25; - Wed, 9 Mar 2005 03:40:14 +0000 (GMT) -X-Original-To: full-disclosure@lists.grok.org.uk -Delivered-To: full-disclosure@lists.grok.org.uk -Received: from hotmail.com (bay104-dav17.bay104.hotmail.com [65.54.175.89]) - by lists.grok.org.uk (Postfix) with ESMTP id 80663BAEBA - for ; - Wed, 9 Mar 2005 03:39:53 +0000 (GMT) -Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; - Tue, 8 Mar 2005 19:21:50 -0800 -Message-ID: -Received: from 65.54.175.205 by BAY104-DAV17.phx.gbl with DAV; - Wed, 09 Mar 2005 03:21:49 +0000 -X-Originating-IP: [65.54.175.205] -X-Originating-Email: [pingywon@hotmail.com] -X-Sender: pingywon@hotmail.com -From: "pingywon" -To: "Crg" , -References: <20050306215917.GA6566@grok.org.uk><4b6ee9310503061534793efd4a@mail.gmail.com><030001c52422$84b6d5f0$0202a8c0@sia.es><47fe5060503081517635f9f9d@mail.gmail.com> - <002001c52453$106ea7a0$0202a8c0@sia.es> -Subject: Re: [Full-disclosure] phrack.org - path disclosure -Date: Tue, 8 Mar 2005 22:21:48 -0500 -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="----------=_422E740C.24319066" -Content-Transfer-Encoding: 7bit -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2800.1437 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1441 -X-OriginalArrivalTime: 09 Mar 2005 03:21:50.0129 (UTC) - FILETIME=[2202CA10:01C52457] -Cc: -X-BeenThere: full-disclosure@lists.grok.org.uk -X-Mailman-Version: 2.1.5 -Precedence: list -List-Id: An unmoderated mailing list for the discussion of security issues - -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Sender: full-disclosure-bounces@lists.grok.org.uk -Errors-To: full-disclosure-bounces@lists.grok.org.uk -X-Virus-Scanned: by amavisd-new -X-Spam-Flag: YES -X-Spam-Status: Yes, score=5.2 required=5.0 tests=BAYES_00,FORGED_MUA_OUTLOOK, - MSGID_FROM_MTA_HEADER,RAZOR2_CF_RANGE_51_100,RAZOR2_CHECK, - RCVD_IN_BL_SPAMCOP_NET,URIBL_SBL autolearn=no version=3.0.2 -X-Spam-Level: ***** -X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on batman.home4u.ch - -test diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp11 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp11 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp11 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp11 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -Received: from spamcop.foobar.com ([192.168.222.6]) by exchange2.foobar.com with Microsoft SMTPSVC(5.0.2195.5329); - Sun, 18 May 2003 21:40:07 +0300 -Received: from localhost (spamcop.foobar.com [127.0.0.1]) - by spamcop.foobar.com (Postfix) with ESMTP id 56B9811A73A - for ; Sun, 18 May 2003 21:40:04 +0300 (EEST) -Received: from spamcop.foobar.com ([127.0.0.1]) - by localhost (spamcop.foobar.com [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id 16479-10 for ; - Sun, 18 May 2003 21:40:04 +0300 (EEST) -Received: from secure (secure.foobar.com [192.168.222.3]) - by spamcop.foobar.com (Postfix) with SMTP id F032C11A6E0 - for ; Sun, 18 May 2003 21:40:03 +0300 (EEST) -Received: from [192.168.222.244]:2780 - with SMTP; Sun, 18 May 2003 18:40:05 -0000 -Received: Message by Barricade gw.foobar.com with SMTP id h4IIbmm24628 - for ; Sun, 18 May 2003 21:37:48 +0300 -Received: from [192.168.222.154]:4283 - with SMTP; Sun, 18 May 2003 18:40:03 -0000 -Received: from jumps ([192.168.222.51]) by sps.foobar.com over TLS secured channel with Microsoft SMTPSVC(5.0.2195.5329); - Sun, 18 May 2003 21:40:02 +0300 -From: Some User -To: -Subject: *****SPAM***** poest vaja -Date: Sun, 18 May 2003 21:39:56 +0300 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0002_01C31D86.08B30900" -X-Mailer: Microsoft Outlook, Build 11.0.4920 -Thread-Index: AcMdbOEBCUpHU07RRZemopslauqysg== -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1165 -Message-ID: -X-OriginalArrivalTime: 18 May 2003 18:40:02.0757 (UTC) FILETIME=[E4B9EF50:01C31D6C] -X-Spam-Status: Yes, hits=4.4 tagged_above=0.0 required=4.0 - tests=FORGED_MUA_OUTLOOK, HTML_70_80, HTML_MESSAGE -X-Spam-Level: **** -X-Spam-Flag: YES -Return-Path: user@xyz.ee - -------=_NextPart_000_0002_01C31D86.08B30900 -Content-Type: text/plain; - charset="iso-8859-4" -Content-Transfer-Encoding: 7bit - -------=_NextPart_000_0002_01C31D86.08B30900 -Content-Type: text/html; - charset="iso-8859-4" -Content-Transfer-Encoding: quoted-printable - - -------=_NextPart_000_0002_01C31D86.08B30900-- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp12 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp12 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp12 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp12 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Return-Path: -Delivered-To: iokotest@singular.org.uk -Received: (qmail 20032 invoked by alias); 6 Jun 2003 10:06:31 -0000 -Received: from gateway.info-com.com (HELO alice.info-com.com) (194.130.104.2) - by duckman.singular.org.uk with SMTP; 6 Jun 2003 10:06:31 -0000 -Received: (qmail 11531 invoked from network); 6 Jun 2003 10:06:34 -0000 -Received: from intyoad01.york.ioko365.com (HELO intyoad01.uk.ioko365.com) (172.18.1.45) - by alice.info-com.com with SMTP; 6 Jun 2003 10:06:34 -0000 -X-MimeOLE: Produced By Microsoft Exchange V6.0.6249.0 -content-class: urn:content-classes:message -MIME-Version: 1.0 -Content-Type: text/plain; - charset="us-ascii" -Content-Transfer-Encoding: quoted-printable -Subject: TEST -Date: Fri, 6 Jun 2003 11:06:34 +0100 -Message-ID: -X-MS-Has-Attach: -X-MS-TNEF-Correlator: -Thread-Topic: TEST -Thread-Index: AcMsE09HfmasJgs1TJmSdZBXeamP5g== -From: "Stuart Smith" -To: -Cc: "Thomas Hudson" - -Test test test test test diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp13 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp13 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp13 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp13 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -Received: from spamcop.foobar.com ([192.168.222.6]) by exchange2.foobar.com with Microsoft SMTPSVC(5.0.2195.5329); - Mon, 19 May 2003 13:59:07 +0300 -Received: from localhost (spamcop.foobar.com [127.0.0.1]) - by spamcop.foobar.com (Postfix) with ESMTP id 6460C11A73A - for ; Mon, 19 May 2003 13:59:03 +0300 (EEST) -Received: from spamcop.foobar.com ([127.0.0.1]) - by localhost (spamcop.foobar.com [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id 21735-06 for ; - Mon, 19 May 2003 13:59:03 +0300 (EEST) -Received: from secure (secure.foobar.com [192.168.222.3]) - by spamcop.foobar.com (Postfix) with SMTP id 034AD11A6E0 - for ; Mon, 19 May 2003 13:59:03 +0300 (EEST) -Received: from [192.168.222.244]:3354 - with SMTP; Mon, 19 May 2003 10:59:05 -0000 -Received: Message by Barricade gw.foobar.com with SMTP id h4JAubZ00720 - for ; Mon, 19 May 2003 13:56:37 +0300 -Received: from [192.168.222.135]:3139 - with SMTP; Mon, 19 May 2003 10:59:03 -0000 -From: "Some User" -To: "Some User" -Subject: Test -Date: Mon, 19 May 2003 13:58:24 +0300 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0004_01C31E0E.B6DCE090" -X-Mailer: Microsoft Outlook, Build 11.0.4920 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 -Thread-Index: AcMd9ZESXO3Id0SmQYqdMjjvuI+Jzw== -Message-ID: -X-Spam-Status: No, hits=4.4 tagged_above=0.0 required=5.0 - tests=FORGED_MUA_OUTLOOK, HTML_70_80, HTML_MESSAGE -X-Spam-Level: **** -Return-Path: some@foobar.com -X-OriginalArrivalTime: 19 May 2003 10:59:07.0286 (UTC) FILETIME=[AB31B360:01C31DF5] - -------=_NextPart_000_0004_01C31E0E.B6DCE090 -Content-Type: text/plain; - charset="us-ascii" -Content-Transfer-Encoding: 7bit - -------=_NextPart_000_0004_01C31E0E.B6DCE090 -Content-Type: text/html; - charset="us-ascii" -Content-Transfer-Encoding: quoted-printable - - -------=_NextPart_000_0004_01C31E0E.B6DCE090-- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp14 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp14 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp14 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp14 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Return-Path: -Received: from Diana (mbcdhcp38.mbcloans.com [10.10.10.38]) - by mailbox.mbcloans.com (8.11.6/8.11.6) with ESMTP id h3FHVbx27426 - for ; Tue, 15 Apr 2003 07:31:37 -1000 -Reply-To: -From: "Diana Cadiz" -To: "'Lee Howard'" -Subject: RE: mail -Date: Tue, 15 Apr 2003 07:31:32 -1000 -Organization: Mortgage Brokers Consortium -Message-ID: -MIME-Version: 1.0 -Content-Type: text/plain; - charset="us-ascii" -Content-Transfer-Encoding: 7bit -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.4024 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 -Importance: Normal -In-Reply-To: <013301c30308$a6fb13c0$0500a8c0@x101.com> -Disposition-Notification-To: "Diana Cadiz" -X-Spam-Status: No, hits=-2.7 required=5.0 - tests=FORGED_MUA_OUTLOOK,IN_REP_TO,MSGID_CHARS_SPAM, - ORIGINAL_MESSAGE - version=2.52 -X-Spam-Level: -X-Spam-Checker-Version: SpamAssassin 2.52 (1.174.2.8-2003-03-24-exp) -Status: - -Hi there! Thanks - -Diana Cadiz - ------Original Message----- -From: Lee Howard [mailto:lee@mbcloans.com] -Sent: Monday, April 14, 2003 6:37 PM -To: diana@mbcloans.com -Subject: mail - -Diana, - -I'm looking into why your e-mail is getting detected as spam. Could you -reply to this e-mail and just type "Hello" or something simple? Thanks. - -Lee. \ No newline at end of file diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp15 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp15 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp15 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp15 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -Received: from www.hostsharing.net ([212.42.230.151] helo=pima.hostsharing.net) - by mailer.gwdg.de with esmtp (TLSv1:DES-CBC3-SHA:168) - (Exim 4.20) - id 19hqSG-0007VX-EY - for rzellwe@gwdg.de; Wed, 30 Jul 2003 14:53:20 +0200 -Received: by pima.hostsharing.net (Postfix) - id 729B82CE9B6; Wed, 30 Jul 2003 14:53:23 +0200 (CEST) -Delivered-To: roa00@pima.hostsharing.net -Received: from mailer.gwdg.de (mailer.gwdg.de [134.76.10.26]) - by pima.hostsharing.net (Postfix) with ESMTP id 657CF2CE9B2 - for ; Wed, 30 Jul 2003 14:53:23 +0200 (CEST) -Received: from [134.76.165.31] (helo=utvt-nt-40) - by mailer.gwdg.de with smtp (Exim 4.20) - id 19hqSF-0007VL-RR - for roald@rzellweger.de; Wed, 30 Jul 2003 14:53:19 +0200 -From: "=?iso-8859-1?Q?Martina_Jan=DFen?=" -To: "Roald A. Zellweger" -Subject: Re: Peter Lang -Date: Wed, 30 Jul 2003 15:05:23 +0100 -Message-ID: <01c356a3$9e760ae0$1fa54c86@utvt-nt-40.utvt> -MIME-Version: 1.0 -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: 8bit -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 4.71.1712.3 -X-MimeOLE: Produced By Microsoft MimeOLE V4.71.1712.3 -X-Spam-Report: 3.7/6.0 - ---- Start SpamAssassin results - 3.70 points, 6 required; - * 3.7 -- Forged mail pretending to be from MS Outlook - ---- End of SpamAssassin results -X-Spam-Report: 3.7/6.0 - ---- Start SpamAssassin results - 3.70 points, 6 required; - * 3.7 -- Forged mail pretending to be from MS Outlook - ---- End of SpamAssassin results -X-Spam-Level: +++ -X-Virus-Scanned: (clean) by exiscan+sophie - -blub - ------Ursprngliche Nachricht----- -Von: Roald A. Zellweger -An: mjansse@gwdg.de -Datum: Montag, 26. Mai 2003 12:52 -Betreff: Peter Lang - - -> ->Hallo Mietz, -> ->das Buch wird Ende dieser Woche ausgeliefert. Beim ersten Druck war wohl ->die Montage nicht OK... -> ->Wief ->-- ->Roald Zellweger ->http://www.rzellweger.de ->PGP-Key: http://www.rzellweger.de/roald.zellweger.asc -> - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5496-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5496-1 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5496-1 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5496-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -Return-Path: -X-Spam-Flag: YES -X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on fnord.ir.bbn.com -X-Spam-Level: * -X-Spam-Status: Yes, score=1.5 required=1.0 tests=AWL,BAYES_00, - FORGED_MUA_OUTLOOK autolearn=no version=3.1.7 -X-Spam-Report: - * -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% - * [score: 0.0000] - * 4.1 FORGED_MUA_OUTLOOK Forged mail pretending to be from MS Outlook - * 0.0 AWL AWL: From: address is in the auto white-list -X-Original-To: gdt@ir.bbn.com -Delivered-To: gdt@ir.bbn.com -Received: from pch.mit.edu (PCH.MIT.EDU [18.7.21.90]) - by fnord.ir.bbn.com (Postfix) with ESMTP id 7BF955289 - for ; Thu, 31 May 2007 22:58:24 -0400 (EDT) -Received: from pch.mit.edu (pch.mit.edu [127.0.0.1]) - by pch.mit.edu (8.13.6/8.12.8) with ESMTP id l512p83e016021; - Thu, 31 May 2007 22:51:13 -0400 -Received: from fort-point-station.mit.edu (FORT-POINT-STATION.MIT.EDU - [18.7.7.76]) - by pch.mit.edu (8.13.6/8.12.8) with ESMTP id l512p6wJ016018 - for ; Thu, 31 May 2007 22:51:06 -0400 -Received: from mit.edu (M24-004-BARRACUDA-3.MIT.EDU [18.7.7.114]) - by fort-point-station.mit.edu (8.13.6/8.9.2) with ESMTP id - l512p3up028645 - for ; Thu, 31 May 2007 22:51:04 -0400 (EDT) -Received: from smtp106.sbc.mail.re2.yahoo.com (smtp106.sbc.mail.re2.yahoo.com - [68.142.229.99]) by mit.edu (Spam Firewall) with SMTP id 9CCD95F4294 - for ; Thu, 31 May 2007 22:51:03 -0400 (EDT) -Received: (qmail 70635 invoked from network); 1 Jun 2007 02:51:03 -0000 -Received: from unknown (HELO CDCHOME) (chrisclausen@sbcglobal.net@76.199.3.163 - with login) - by smtp106.sbc.mail.re2.yahoo.com with SMTP; 1 Jun 2007 02:51:03 -0000 -X-YMail-OSG: eYUkWSMVM1nnl.I9AnuqtOSMg4YD5A.qrPW4QhV0fgw221IdC8nQ5qvp7wst92meohNFSYt_oC8fZ522R6UeMjky3pcFmrSs1.dybQ0ChRPNDnihx5jCjS2vG1ZxACSXxIyqsjOHO61r3Ss- -Message-ID: <8C51A835039D48A6A1CFA74053B91DE0@CDCHOME> -From: "Christopher D. Clausen" -To: -References: -Subject: Re: Use ssh key to acquire TGT? -Date: Thu, 31 May 2007 21:51:02 -0500 -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.3790.3959 -X-RFC2646: Format=Flowed; Original -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.3959 -X-Scanned-By: MIMEDefang 2.42 -X-BeenThere: kerberos@mit.edu -X-Mailman-Version: 2.1.6 -Precedence: list -List-Id: The Kerberos Authentication System Mailing List -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit -Sender: kerberos-bounces@mit.edu -Errors-To: kerberos-bounces@mit.edu -X-Greylist: Sender is SPF-compliant, not delayed by milter-greylist-3.0 (fnord.ir.bbn.com [0.0.0.0]); Thu, 31 May 2007 22:58:24 -0400 (EDT) - -Adam Megacz wrote: -> Our (hcoop.net) users love their new AFS homedirs, but are complaining -> a lot about ssh public keys not working the way they're accustomed to. -> Telling them to "kinit" after logging in doesn't quite cut it either. -> -> We're aware that this goes against the grain of kerberos security, but -> without something like this users will just start hardcoding their -> plaintext password into scripts, which is even worse. At least with -> ssh keys we can urge them to password-encrypt their on-disk private -> keys. - -How exactly is having a private key password different from simply -telling the user to kinit ONCE on their local machine before attempting -to SSH to your Kerberized machines? - -Also, you could rig up a login script (or PAM) that used a local keytab -file to obtain AFS tickets automatically at sucessful login. Not sure -if you'd have to assume that someone logging as the local UNIX user -automatically means that user would have to the matching AFS identity. -You would also have issues of users keeping their passwords and the -keytabs up to date or otherwise differentiating between the keytab login -and their real Kerberos identity. - -This might be question to ask on the AFS mailing lists instead of the -Kerberos ones. - -<) -Message-ID: -From: "Werner Ceusters" -To: "Dan Russler" , "Gary Dickinson" -Cc: "List EHR" , "Lloyd McKenzie" -Subject: Re: DRAFT EHR Lifecycle Model - Review and Comment Requested -Date: Thu, 14 Jun 2007 16:21:41 -0400 -MIME-Version: 1.0 -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2900.3138 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3138 -X-UB-Relay: (ub-vpn-245-184.cc.buffalo.edu) -X-PM-EL-Spam-Prob: : 8% -List-Unsubscribe: -Reply-To: "Werner Ceusters" -precedence:bulk -x-precedence:bulk -Sender: owner-ehr@lists.hl7.org -X-MIMETrack: Itemize by SMTP Server on AX7/ACHQ(Release 7.0.2FP1|January 10, 2007) at 06/14/2007 - 01:35:19 PM, - Serialize by Router on AX7/ACHQ(Release 7.0.2FP1|January 10, 2007) at 06/14/2007 - 01:35:20 PM, - Serialize complete at 06/14/2007 01:35:20 PM, - Itemize by SMTP Server on AX1/ACHQ(Release 7.0.2FP1|January 10, 2007) at 06/14/2007 - 01:35:20 PM, - Itemize by Router on AX1/ACHQ(Release 7.0.2FP1|January 10, 2007) at 06/14/2007 - 01:36:01 PM, - Serialize by Notes Client on Nick Radov/ACHQ(Build V80_M5_05202007|May 20, 2007) at - 06/14/2007 02:52:45 PM, - Serialize complete at 06/14/2007 02:52:45 PM -Content-Type: multipart/alternative; boundary="----=_NextPart_000_0108_01C7AEA0.17932C70" - -This is a multi-part message in MIME format. - -------=_NextPart_000_0108_01C7AEA0.17932C70 -Content-Transfer-Encoding: quoted-printable -Content-Type: text/plain; - charset="iso-8859-1" - -I have 2 remarks to start with. - -I'm flabbergasted by the statement that "acts do not have physical location= -s". If I understand this right, then docters and nurses work "nowhere". What= - about that as a justification for their salary ?! :-) -I think you all agree that if Dr X gives patient Y an injection (in the nor= -mal non-science fiction way), then that act takes place in the room where th= -e docter and the patient are. If he does it by using a robot guided over the= - internet while he being in Paris and the patient in the US, then the act ha= -ppened for sure on planet Earth. I do agree that determining where "the act"= - happened in situations like the latter is not trivial, the problem not bein= -g that much the localisation, but rather what THE act IS. Although we would = -still use the word "injection" for the latter, it is obviously something com= -pletely different than the former, despite the fact that parts of the acts a= -re similar (e.g. the needle being brought into the patient's body). -This said, I have no problem with the fact that the statement that "an Act = -occurs at a specific physical location" be removed from the document however= -: it is not because you don't state "X" in a document, that "not X" should b= -e true. - -Another point that I want to raise is the statement "An Act is documented b= -y an Act Record instance". It should be specified what "instance" refers to = -in this case, precisely in the light of what happens when that "instance" is= - copied into other systems. Thus if act X is injecting patient U by physicia= -n V with product W in place P at time T, then Act Record instance AR1 might = -be the documentation of it by V (thus the Dr registered what he did) and Act= - Record instance AR2 might be that the nurse who was in the room documented = -act X. Thus we have 2 instances documenting act X. If this information gets = -transfered and copied to other systems in persistent records, then I believe= - "copies" of these Act Record instances are created, and not new instances. = -Otherwise, act X would be claimed to be documented by 2, 4, 6, 8 .... instan= -ces, which is actually not true. - -I know, the RIM being based on a Kantian philosophy makes it hard to deal w= -ith (and for some even to see) this problem, but I think it is important. An= -d oh, you want for sure a "use case" for this: well suppose that there is so= -me legal argument about whether or not the injection was actually given. Are= - ten copies of the same documentation instance more proof than just one ? = -(note for Charlie: you can use this paragraph to build further on your file = -to document my "inability to productively collaborate with the community at = -large" and "Dr. Cuesters [sic] prefers to intermittently send sarcastic emai= -ls to various list servers".) - -Note that may objection is not in the use of the word instance in that part= -icular sentence. In fact, I believe it is good practice, even that the state= -ment should read "An Act instance is documented by an Act Record instance", = -and even that the entire document should be checked whether "instance" shoul= -d not be used more often (I believe it does). -But even then, it should be specified what "instance" means in each case, e= -.g. a particular act in physical reality or an entry in a database which doc= -uments that act. - -kind regards, - -Werner - ----- Original Message -----=20 - From: Dan Russler=20 - To: Gary Dickinson=20 - Cc: List EHR ; Lloyd McKenzie=20 - Sent: Thursday, June 14, 2007 8:52 AM - Subject: Re: DRAFT EHR Lifecycle Model - Review and Comment Requested - - - Hi Gary, - - I like this work a lot. - - On quick review, I encountered this line which I think should be deleted. - - "An Act occurs at a specific physical location" - - In the past, our discussions in modeling specifically excluded this state= -ment. The use cases that were discussed included healthcare delivered over t= -he internet. If the patient is in one location, the physician in another loc= -ation, the nurse in a third location, and the EHR is in a fourth location, w= -here did the Act occur? For example, in telemedicine, the patient may be in = -one location and the physician is listening on a remote stethescope in anoth= -er location? Or observation is being performed via camera? Or the surgery is= - being performed via a robot over the internet (as accomplished between US a= -nd Paris)? - - We came to the conclusion that participants have physical locations, but = -that acts do not have physical locations. - - In review of the rest of the document, I did not see that anything else n= -eeded to be changed because the "physical location of an act" comment was de= -leted. - - Also, in M&M, a dynamic model discussion is occurring. This document shou= -ld be sent to M&M for review before the dynamic model work is completed to m= -ake sure that M&M work and the EHR work are consistent. - - Thanks, Dan - - - Gary Dickinson wrote: - -Dear EHR TC Members, - -Within the EHR Interoperability project team, we have spent the past =20 -several months working to develop and refine a model for the =20 -lifecycle of EHR "Act Records", expanding and refining record =20 -lifecycle events specified in Section 3.19 of the EHR =20 -Interoperability Model and in ISO 21089, "Trusted End-to-End =20 -Information Flows". This effort has resulted in our Draft HL7 EHR =20 -Lifecycle Model (now v0.13, dated 23 May 2007). - -Per discussions on the last EHR TC teleconference, I'm distributing =20 -the current Draft EHR/LM for review and comment (within the EHR TC). =20 -Also attached is an initial proposal from Ann Wrightson (HL7-UK) for =20 -additional EHR lifecycle events related to the interim progression of =20 -EHR records. This proposal is awaiting UK consensus and will be =20 -considered in the next EHR/LM update. - -Please take an early opportunity to review these documents and offer =20 -your suggestions (not later than 15 July). Submit comments on the =20 -draft EHR/LM to Gary Dickinson (gary.dickinson@ehr-standards.com) and =20 -on the UK proposal to Ann Wrightson (Ann.Wrightson@csw.co.uk). - -Thank you for your consideration. - -Regards, - -Gary - - - -************************************************ -To access the Archives of this or other lists or change your list settings = -and information, go to: http://www.hl7.org/listservice----------------------= ------------------------------------------------------- - - - =20 - - ************************************************=20 - To access the Archives of this or other lists or change your list setting= -s and information, go to: http://www.hl7.org/listservice=20 - -************************************************ -To access the Archives of this or other lists or change your list settings = -and information, go to: http://www.hl7.org/listservice -------=_NextPart_000_0108_01C7AEA0.17932C70 -Content-Transfer-Encoding: quoted-printable -Content-Type: text/html; - charset="iso-8859-1" - - - - - - - - -     -
    To: Gary Dickinson - -
    Sent: Thursday, June 14, 2007 8:52= -=20 - AM
    -
    Subject: Re: DRAFT EHR Lifecycle M= -odel -=20 - Review and Comment Requested
    -

    Hi Gary,

    I like this work a lot.

    On quick re= -view,=20 - I encountered this line which I think should be deleted.

    "An Act occurs at a specific= -=20 - physical location"

    In the past, our discussions in modeling=20 - specifically excluded this statement. The use cases that were discussed= -=20 - included healthcare delivered over the internet. If the patient is in one= -=20 - location, the physician in another location, the nurse in a third locatio= -n,=20 - and the EHR is in a fourth location, where did the Act occur? For example= -, in=20 - telemedicine, the patient may be in one location and the physician is=20 - listening on a remote stethescope in another location? Or observation is = -being=20 - performed via camera? Or the surgery is being performed via a robot over = -the=20 - internet (as accomplished between US and Paris)?

    We came to the=20 - conclusion that participants have physical locations, but that acts do no= -t=20 - have physical locations.

    In review of the rest of the document, I = -did=20 - not see that anything else needed to be changed because the "physical loc= -ation=20 - of an act" comment was deleted.

    Also, in M&M, a dynamic model= -=20 - discussion is occurring. This document should be sent to M&M for revi= -ew=20 - before the dynamic model work is completed to make sure that M&M work= - and=20 - the EHR work are consistent.

    Thanks, Dan


    Gary=20 - Dickinson wrote:
    - 
    Dear EHR TC Members,
-
-Within the EHR Interoperability project team, we have spent the past =20
-several months working to develop and refine a model for the =20
-lifecycle of EHR "Act Records", expanding and refining record =20
-lifecycle events specified in Section 3.19 of the EHR =20
-Interoperability Model and in ISO 21089, "Trusted End-to-End =20
-Information Flows".  This effort has resulted in our Draft HL7 EHR =20
-Lifecycle Model (now v0.13, dated 23 May 2007).
-
-Per discussions on the last EHR TC teleconference, I'm distributing =20
-the current Draft EHR/LM for review and comment (within the EHR TC).  =20
-Also attached is an initial proposal from Ann Wrightson (HL7-UK) for =20
-additional EHR lifecycle events related to the interim progression of =20
-EHR records.  This proposal is awaiting UK consensus and will be =20
-considered in the next EHR/LM update.
-
-Please take an early opportunity to review these documents and offer =20
-your suggestions (not later than 15 July).  Submit comments on the =20
-draft EHR/LM to Gary Dickinson (gary.dickinson@ehr-standards.com) and =20
-on the UK proposal to Ann Wrightson (Ann.Wrightson@csw.co.uk).
-
-Thank you for your consideration.
-
-Regards,
-
-Gary
-
-
-
-************************************************
-To access the Archives of this or other lists or change your list settings =
-and information, go to: http://www.hl7.org/listservice
    =
-
    
-
-
-


    **********************************************= -**=20 -
    To access the Archives of this or other lists or change your list set= -tings=20 - and information, go to: http://www.hl7.org/listservice=20 -
    -=0D
    -************************************************=0D
    -To access the Archives of this or other lists or change your list settings = -and information, go to: http://www.hl7.org/listservice - - -------=_NextPart_000_0108_01C7AEA0.17932C70-- - - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5496-3 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5496-3 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5496-3 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5496-3 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -From jon@e-nox.net Tue Mar 11 17:06:25 2008 -Return-Path: -Received: from ppsw-5.csi.cam.ac.uk (ppsw-5-intramail.csi.cam.ac.uk [192.168.128.135]) - by cyrus-27.csi.private.cam.ac.uk (Cyrus v2.3.11) with LMTPA; - Tue, 11 Mar 2008 17:06:25 +0000 -X-Sieve: CMU Sieve 2.3 -X-Cam-SpamScore: ssss -X-Cam-SpamDetails: scanned, SpamAssassin-3.2.3 (score=4.2, - FORGED_MUA_OUTLOOK 4.20, STOX_REPLY_TYPE 0.00) -X-Cam-AntiVirus: Not scanned -X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ -Received: from kilo.fastwebhosting.net ([91.102.64.140]:37062) - by ppsw-5.csi.cam.ac.uk (mx.cam.ac.uk [131.111.8.145]:25) - with esmtp id 1JZ7vi-0005a4-JF (Exim 4.67) for postmaster@hermes.cam.ac.uk - (return-path ); Tue, 11 Mar 2008 17:06:23 +0000 -Received: (qmail 7541 invoked from network); 11 Mar 2008 17:06:22 +0000 -Received: from cpc1-cmbg6-0-0-cust343.cmbg.cable.ntl.com (HELO node3) (81.101.137.88) - by kilo.fastwebhosting.net with SMTP; 11 Mar 2008 17:06:22 +0000 -Message-ID: -From: "Jon Heras" -To: -References: -Subject: Re: Ref 27700: SpamAssasin problem -Date: Tue, 11 Mar 2008 17:06:22 -0000 -MIME-Version: 1.0 -Content-Type: text/plain; - format=flowed; - charset="iso-8859-1"; - reply-type=original -Content-Transfer-Encoding: 7bit -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.3790.3959 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.4133 - -Hi Tony, - -I'm using Outlook Express 6.00.3790.3959 on Windows XP 64-bit - -My email is provided by www.ehosting.com (who are probably the same company -as fastwebhosting.net), and they require me to use authentication on the -outgoing server. - -Cheers, - - Jon - - - - ------ Original Message ----- -From: "Tony Finch" -To: "Jon Heras" -Cc: -Sent: Tuesday, March 11, 2008 2:35 PM -Subject: Re: Ref 27700: SpamAssasin problem - - ->> I keep having my emails filtered by the University spam filter, giving ->> the ->> "FORGED_MUA_OUTLOOK" reason (see below). I'm using Outlook Express, and ->> I ->> believe it's being incorrectly identified as trying to spoof an Outlook ->> ID. ->> A quick google shows bug issues with an old version of Spam Assasin, and ->> gives various workarounds - I was hoping you could look into this? Is ->> there ->> any additional information you need? -> -> How are you sending email? Your message has trace lines from -> fastwebhosting.net to our systems, but it looks like whatever is making -> the message look suspicious is happening just before that, on the machine -> that sent the message to fastwebhosting.net. -> -> -- -> postmaster@hermes.cam.ac.uk - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5650-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5650-1 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5650-1 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5650-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -Return-Path: -X-Original-To: chris -Delivered-To: chris@mail.orr.me.uk -Received: by mail.orr.me.uk (Postfix, from userid 96) - id 00900E00384; Tue, 18 Sep 2007 11:19:33 +0100 (BST) -X-Spam-Flag: YES -X-Spam-Checker-Version: SpamAssassin 3.2.0 (2007-05-01) on mail.orr.me.uk -X-Spam-Level: ****** -X-Spam-Status: Yes, score=6.3 required=4.8 tests=BAYES_50,FORGED_MUA_OUTLOOK, - HTML_MESSAGE,MIME_QP_LONG_LINE,OUTLOOK_3416 autolearn=no version=3.2.0 -X-Spam-Report: - * 1.7 OUTLOOK_3416 Claims to be sent by an unusual build of Outlook (3416) - * 0.0 HTML_MESSAGE BODY: HTML included in message - * 0.0 BAYES_50 BODY: Bayesian spam probability is 40 to 60% - * [score: 0.5000] - * 1.4 MIME_QP_LONG_LINE RAW: Quoted-printable line longer than 76 chars - * 3.1 FORGED_MUA_OUTLOOK Forged mail pretending to be from MS Outlook -X-Greylist: delayed 491 seconds by postgrey-1.27 at mail.orr.me.uk; Tue, 18 Sep 2007 11:19:28 BST -Received: from eastdunbarton.gov.uk (mail.killermont.e-dunbarton.sch.uk [194.74.252.50]) - by mail.orr.me.uk (Postfix) with ESMTP id DA5F4E0037E - for ; Tue, 18 Sep 2007 11:19:28 +0100 (BST) -Received: from /spool/local - by eastdunbarton.gov.uk with XMAIL - for from ; - Tue, 18 Sep 2007 11:17:02 +0100 -Received: from boclair.e-dunbarton.sch.uk [[10.18.0.3]] - by eastdunbarton.gov.uk with XMAIL; - Tue, 18 Sep 2007 11:16:58 +0100 -Received: from BOCOFF012 [10.18.0.179] by boclair.e-dunbarton.sch.uk with ESMTP - (SMTPD32-5.04) id A6022BDC0100; Tue, 18 Sep 2007 11:18:42 +0000 -Reply-To: -From: "ADickie" -To: -Subject: [SPAM] the glasgow green map -Date: Tue, 18 Sep 2007 11:09:39 +0100 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_000A_01C7F9E4.682F0480" -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.3416 -Importance: Normal -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869 -x-cbid: 7963C6C7-4E41-0F4B-8AE7-B0A40A0D3FBF -x-cbparentid: D1FEBAD5-91C1-7F42-BDA5-59FB9F4BD223 -Message-Id: <20070918101928.DA5F4E0037E@mail.orr.me.uk> -X-Spam-Prev-Subject: the glasgow green map - -This is a multi-part message in MIME format. - -------=_NextPart_000_000A_01C7F9E4.682F0480 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - -As part of an Eco Schools group in Boclair Academy Bearsden, one of our -teachers has given me your Glasgow Green Map. As they are free I -wondered if it would be possible for you to send us some, around 10. We -would place them strategically around the school and in various pupil -points. This would be very helpful to us. - - - -Please let me know if there is any cost for postage and I can forward -this to you. - - - -Thanks - -Audrey Dickie - - - - - - - - - - -*****************************************************************************= -****** - -DISCLAIMER: -This email and any files transmitted with it are intended for the use of the -individual or entity to whom they are addressed. It may contain information = -of a confidential or privileged nature. - -If you have received this email in error please notify the originator of the -message and destroy the e-mail. - -East Dunbartonshire Council can not be held responsible for viruses, therefor= -e please scan all attachments. - -The views expressed in this message are those of the sender and do not necess= -arily reflect those of East Dunbartonshire Council who will not -necessarily be bound by its contents. - -*****************************************************************************= -****** -East Dunbartonshire Council Web Site http://www.eastdunbarton.gov.uk - - - -------=_NextPart_000_000A_01C7F9E4.682F0480 -Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - -=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A=0D=0A
    =0D= -=0A=0D=0A

    As part of an Eco Scho= -ols group in Boclair Academy=0D=0ABearsden, one of our teachers has given m= -e your Glasgow Green Map.  As they are=0D=0Afree I wondered if it woul= -d be possible for you to send us some, around 10.  We=0D=0Awould place= - them strategically around the school and in various pupil points.  Th= -is=0D=0Awould be very helpful to us.

    =0D=0A=0D=0A

     

    =0D=0A=0D=0A

    Please let me know if there is any= - cost for postage=0D=0Aand I can forward this to you.

    =0D= -=0A=0D=0A

     =0D=0A=0D=0A

    Thanks <= -/font>

    =0D=0A=0D=0A

    Audrey Di= -ckie

    =0D=0A=0D=0A

     

    =0D=0A=0D=0A

     

    =0D=0A=0D=0A

     

    =0D=0A=0D=0A
    =0D=0A=0D=0A
    **************************************************************************= -*********

    DISCLAIMER:
    This email and any files transmitted with i= -t are intended for the use of the
    individual or entity to whom they are = -addressed. It may contain information of a confidential or privileged natu= -re.

    If you have received this email in error please notify the origi= -nator of the
    message and destroy the e-mail.

    East Dunbartonshire = -Council can not be held responsible for viruses, therefore please scan all = -attachments.

    The views expressed in this message are those of the se= -nder and do not necessarily reflect those of East Dunbartonshire Council wh= -o will not
    necessarily be bound by its contents.

    ****************= -*******************************************************************
    East= - Dunbartonshire Council Web Site http://www.eastdunbarton.gov.uk

    =0D=0A=0D=0A=0D=0A - -------=_NextPart_000_000A_01C7F9E4.682F0480-- - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5910-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5910-1 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5910-1 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5910-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -Return-Path: -Delivered-To: mouss@netoyen.net -X-Virus-Scanned: amavisd-new at netoyen.net -X-Spam-Flag: NO -X-Spam-Score: 4.211 -X-Spam-Level: **** -X-Spam-Status: No, score=4.211 required=5 tests=[COUNTRY_FR=0.01, - DK_POLICY_TESTING=0.001, FORGED_MUA_OUTLOOK=4.199, HTML_MESSAGE=0.001] -Received: from smtp4-g19.free.fr (smtp4-g19.free.fr [212.27.42.30]) - by imlil.netoyen.net (Postfix) with ESMTP id 768113ACDB37 - for ; Sun, 18 May 2008 14:33:15 +0200 (CEST) -Received: from smtp4-g19.free.fr (localhost.localdomain [127.0.0.1]) - by smtp4-g19.free.fr (Postfix) with ESMTP id 3B9913EA0CC - for ; Sun, 18 May 2008 14:33:12 +0200 (CEST) -Received: from DADES (ouzoud.netoyen.net [82.239.111.75]) - by smtp4-g19.free.fr (Postfix) with SMTP id 0CCF43EA0AC - for ; Sun, 18 May 2008 14:33:12 +0200 (CEST) -Message-ID: -From: "mouss" -To: -Subject: test OE SP3 -Date: Sun, 18 May 2008 14:33:11 +0200 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0003_01C8B8F4.197A36F0" -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2900.5512 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5512 - -This is a multi-part message in MIME format. - -------=_NextPart_000_0003_01C8B8F4.197A36F0 -Content-Type: text/plain; - charset="windows-1256" -Content-Transfer-Encoding: quoted-printable - -OE SP3 test -------=_NextPart_000_0003_01C8B8F4.197A36F0 -Content-Type: text/html; - charset="windows-1256" -Content-Transfer-Encoding: quoted-printable - - - - - - - - - -
    OE SP3 test
    - -------=_NextPart_000_0003_01C8B8F4.197A36F0-- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5946-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5946-1 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5946-1 2008-12-29 12:44:36.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5946-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Envelope-from: -Envelope-to: -Received: from [65.55.111.156] (helo=blu0-omc4-s17.blu0.hotmail.com) - by xxxxx.cs.yorku.ca with esmtp (Exim x.xx) - (envelope-from ) - id 1KKvTK-0001U2-7O - for xxxx@cse.yorku.ca; Mon, 21 Jul 2008 09:30:38 -0400 -Received: from BLU0-SMTP20 ([65.55.111.137]) by blu0-omc4-s17.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.3959); - Mon, 21 Jul 2008 06:30:33 -0700 -X-Originating-IP: [70.52.148.170] -X-Originating-Email: [xxxx@sympatico.ca] -Message-ID: -Return-Path: xxxxx@sympatico.ca -Received: from YUKIBEAR ([70.52.148.170]) by BLU0-SMTP20.blu0.hotmail.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.2668); - Mon, 21 Jul 2008 06:30:32 -0700 -Reply-To: "xxxxxxxxxxxx" -From: "xxxxxxxxx" -To: "xxxx" -References: <4883BEE0.6000300@cse.yorku.ca> -Subject: Re: Video of James&David on Wednesday -Date: Mon, 21 Jul 2008 08:30:43 -0500 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0003_01C8EB0C.10D8D5C0" -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2900.3138 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 -X-OriginalArrivalTime: 21 Jul 2008 13:30:32.0825 (UTC) FILETIME=[F3546E90:01C8EB35] - -Hi, - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5962-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5962-1 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5962-1 2008-12-29 12:44:36.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-5962-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Received: from bay0-omc3-s31.bay0.hotmail.com (bay0-omc3-s31.bay0.hotmail.com [65.54.246.231]) - by corpmail.outblaze.com (Postfix) with ESMTP - id 8F81B16DD84; Mon, 18 Aug 2008 08:04:42 +0000 (GMT) -Received: from hotmail.com ([10.6.61.21]) by bay0-omc3-s31.bay0.hotmail.com with Microsoft SMTPSVC(6.0.3790.3959); - Mon, 18 Aug 2008 01:04:41 -0700 -Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; - Mon, 18 Aug 2008 01:04:40 -0700 -Message-ID: -Received: from 76.254.79.201 by BLU110-DAV11.phx.gbl with DAV; - Mon, 18 Aug 2008 08:04:35 +0000 -X-Mailer: Microsoft Outlook Express 6.00.2900.3138 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3350 -From: foo@example.com -To: foo@example.com -Subject: foo - -foo diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp7 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp7 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp7 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp7 1970-01-01 00:00:00.000000000 +0000 @@ -1,176 +0,0 @@ -Return-Path: -X-Original-To: jm@localhost -Delivered-To: jm@localhost.jmason.org -Received: from radish.jmason.org (localhost [127.0.0.1]) - by radish.jmason.org (Postfix) with ESMTP id 50DA332D50 - for ; Mon, 2 Apr 2007 02:42:21 +0100 (IST) -X-Spam-Virus: No -X-Spam-Checker-Version: SpamAssassin 3.2.0-pre3-r519015 (2007-03-16) on - dogma.boxhost.net -X-Spam-Relays-External: [ ip=130.133.35.30 rdns=junior.physik.fu-berlin.de - helo=junior.physik.fu-berlin.de by=dogma.boxhost.net ident= envfrom= intl=0 - id=77D33310052 auth= msa=0 ] [ ip=127.0.0.1 rdns=localhost - helo=junior.ATrpms.net by=junior.physik.fu-berlin.de - ident=!U2FsdGVkX1/OAI+6+l6H6XPLMB9Jdo4fgclk/qy74Kk=! envfrom= intl=0 - id=1HYB6Z-0003TS-6h auth= msa=0 ] [ ip=134.84.119.6 rdns=mta-w2.tc.umn.edu - helo=mta-w2.tc.umn.edu by=mail2.atrpms.net ident= envfrom= intl=0 - id=1HY5tp-0002gK-Ue auth= msa=0 ] [ ip=209.162.32.136 - rdns=user-38q4848.cable.mindspring.com helo=Tyr by=mta-w2.tc.umn.edu ident= - envfrom= intl=0 id= auth= msa=0 ] -X-Spam-Status: No, score=0.6 required=5.0 tests=AWL,BAYES_00, - DK_POLICY_SIGNSOME,FORGED_MUA_OUTLOOK,HTML_MESSAGE shortcircuit=no - autolearn=no version=3.2.0-pre3-r519015 -X-Spam-Relays-Internal: -X-Spam-Relays-Untrusted: [ ip=130.133.35.30 rdns=junior.physik.fu-berlin.de - helo=junior.physik.fu-berlin.de by=dogma.boxhost.net ident= envfrom= intl=0 - id=77D33310052 auth= msa=0 ] [ ip=127.0.0.1 rdns=localhost - helo=junior.ATrpms.net by=junior.physik.fu-berlin.de - ident=!U2FsdGVkX1/OAI+6+l6H6XPLMB9Jdo4fgclk/qy74Kk=! envfrom= intl=0 - id=1HYB6Z-0003TS-6h auth= msa=0 ] [ ip=134.84.119.6 rdns=mta-w2.tc.umn.edu - helo=mta-w2.tc.umn.edu by=mail2.atrpms.net ident= envfrom= intl=0 - id=1HY5tp-0002gK-Ue auth= msa=0 ] [ ip=209.162.32.136 - rdns=user-38q4848.cable.mindspring.com helo=Tyr by=mta-w2.tc.umn.edu ident= - envfrom= intl=0 id= auth= msa=0 ] -X-Spam-Relays-Trusted: -X-Spam-Level: -X-Spam-RBL: [130.133.35.30] - [20 mail.atrpms.net., 10 mail.ivtvdriver.org.] -X-Original-To: jm@jmason.org -Delivered-To: jm@dogma.boxhost.net -Received: from localhost [127.0.0.1] - by radish.jmason.org with IMAP (fetchmail-6.3.2) - for (single-drop); Mon, 02 Apr 2007 02:42:21 +0100 (IST) -Received: from junior.physik.fu-berlin.de (junior.physik.fu-berlin.de [130.133.35.30]) - by dogma.boxhost.net (Postfix) with ESMTP id 77D33310052 - for ; Mon, 2 Apr 2007 02:16:16 +0100 (IST) -Received: from localhost - ([127.0.0.1] helo=junior.ATrpms.net ident=[U2FsdGVkX1/OAI+6+l6H6XPLMB9Jdo4fgclk/qy74Kk=]) - by junior.physik.fu-berlin.de with esmtp (Exim 4.66) - id 1HYB6Z-0003TS-6h; Mon, 02 Apr 2007 03:13:08 +0200 -Received: from mta-w2.tc.umn.edu ([134.84.119.6]) - by mail2.atrpms.net with esmtp (Exim 4.66) id 1HY5tp-0002gK-Ue - for ivtv-users@ivtvdriver.org; Sun, 01 Apr 2007 21:39:39 +0200 -X-ACL-Warn: -Received: from Tyr (user-38q4848.cable.mindspring.com [209.162.32.136]) - by mta-w2.tc.umn.edu (UMN smtpd) with ESMTP - for ; Sun, 1 Apr 2007 12:58:59 -0500 (CDT) -X-Umn-Remote-Mta: [N] user-38q4848.cable.mindspring.com [209.162.32.136] - #+TS+AU+HN -Message-ID: -From: "Christopher Karel" -To: -Date: Sun, 1 Apr 2007 12:58:57 -0500 -MIME-Version: 1.0 -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.3790.3959 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.3959 -X-Scanned: No viruses found. -X-Scan-Signature: bda86a20c391bc409b6c6f1245da06d1 -X-Mailman-Approved-At: Mon, 02 Apr 2007 03:13:02 +0200 -Subject: [ivtv-users] Correcting for overscan in X with a PVR350? -X-BeenThere: ivtv-users@ivtvdriver.org -X-Mailman-Version: 2.1.9 -Precedence: list -Reply-To: User discussion about IVTV -List-Id: User discussion about IVTV -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: multipart/mixed; boundary="===============3666850481193695767==" -Sender: ivtv-users-bounces@ivtvdriver.org -Errors-To: ivtv-users-bounces@ivtvdriver.org -X-Scanned: No viruses found. -X-Scan-Signature: 63eccb0ab76eec556b48034f3a7a3d44 -Status: O -X-UID: 698159 -X-Keywords: - -This is a multi-part message in MIME format. - ---===============3666850481193695767== -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0031_01C7745D.8276E900" - -This is a multi-part message in MIME format. - -------=_NextPart_000_0031_01C7745D.8276E900 -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: quoted-printable - - Can anyone help with compensating for overscan in X-windows running = -ivtv 10.1 on a PVR350 ? At the moment, significant chunks of X is lost = -to it. I can manually compensate on the MythTV frontend, but I still = -don't see all the buttons correctly.=20 - - I've seen some mention of fbset and editing configuration files, but = -I couldn't actually get much to change. (using fbset -upper/left just = -makes the screen flicker, without actually impacting anything) - - Are there any decent resources out there for playing with this? Or = -can someone point me to some commands/config files to play with? - - ---Christopher Karel -------=_NextPart_000_0031_01C7745D.8276E900 -Content-Type: text/html; - charset="iso-8859-1" -Content-Transfer-Encoding: quoted-printable - - - - - - - - -
      Can anyone help with = -compensating for=20 -overscan in X-windows running ivtv 10.1 on a PVR350 ?  At the = -moment,=20 -significant chunks of X is lost to it.  I can manually compensate = -on=20 -the MythTV frontend, but I still don't see all the buttons=20 -correctly. 
    -
     
    -
        I've seen some = -mention of fbset=20 -and editing configuration files, but I couldn't actually get much to=20 -change.  (using fbset -upper/left just makes the screen flicker, = -without=20 -actually impacting anything)
    -
     
    -
      Are there any decent resources = -out there for=20 -playing with this?  Or can someone point me to some commands/config = -files=20 -to play with?
    -
     
    -
     
    -
    --Christopher = -Karel
    - -------=_NextPart_000_0031_01C7745D.8276E900-- - - - ---===============3666850481193695767== -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - -_______________________________________________ -ivtv-users mailing list -ivtv-users@ivtvdriver.org -http://ivtvdriver.org/mailman/listinfo/ivtv-users ---===============3666850481193695767==-- - - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp8 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp8 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp8 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp8 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Return-Path: -Received: from unknown (HELO namePC) (myandsomename@provider.com@12.123.12.123 with login) - by smtp804.mail.ukl.yahoo.com with SMTP; 11 Aug 2007 20:43:46 -0000 -From: "my name" -To: "'my name'" -Subject: FW: Some Long Subject Of No Interest -Date: Sat, 11 Aug 2007 21:43:44 +0100 -Message-ID: -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0000_01C7DC60.B140E5E0" -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.6822 -Importance: Normal -Thread-Index: AcfbaEn/djbph3qySZ+pDGmbxqWangA7/tsg -X-MimeOLE: Produced By Microsoft MimeOLE V6.0.6000.16480 - -This is a multi-part message in MIME format. - -------=_NextPart_000_0000_01C7DC60.B140E5E0 -Content-Type: text/plain; - charset="us-ascii" -Content-Transfer-Encoding: quoted-printable - - -------=_NextPart_000_0000_01C7DC60.B140E5E0-- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp9 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp9 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp9 2008-07-10 12:59:53.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp9 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -Return-Path: -Received: from intranator.link-m.de ([unix socket]) - by intranator.net.local (Cyrus v2.2.13) with LMTPA; - Fri, 20 Jul 2007 13:14:40 +0200 -X-Sieve: CMU Sieve 2.2 -Received: from localhost (intranator.net.local [127.0.0.1]) - by localhost (Postfix) with ESMTP id 3508B105 - for ; Fri, 20 Jul 2007 13:14:40 +0200 (CEST) -Received: from maoam.internet-xs.de (maoam.internet-xs.de [212.58.67.13]) - (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) - (No client certificate requested) - by intranator.link-m.de (Postfix) with ESMTP id 1C6E2FA - for ; Fri, 20 Jul 2007 13:14:35 +0200 (CEST) -Received: from [62.154.243.206] (port=43814 helo=mail-ts.local.muc.transearch.de) - by maoam.internet-xs.de with esmtp (Exim 4.66 (FreeBSD)) - (envelope-from ) - id 1IBqRN-000Npx-PQ - for nicki@intranator.link-m.de; Fri, 20 Jul 2007 13:14:33 +0200 -Received: from localhost (mail-ts.local.muc.transearch.de [127.0.0.1]) - by localhost (Postfix) with ESMTP id 2A6D5126 - for ; Fri, 20 Jul 2007 13:14:33 +0200 (CEST) -Received: from GOLLUM (gollum.local.muc.transearch.de [172.16.6.180]) - by mail-ts.local.muc.transearch.de (Postfix) with ESMTP id D04C6D9 - for ; Fri, 20 Jul 2007 13:14:31 +0200 (CEST) -From: "Admin" -To: -Subject: Testmail -Date: Fri, 20 Jul 2007 13:09:14 +0200 -Message-ID: <8AA6EC0FC9214E5D917332E960CE5BE3@haiberg.com> -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0000_01C7CACF.2B94C6C0" -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.6626 -Importance: Normal -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.3959 -X-Virus-Scanned: by Intranator (www.intranator.com) with AMaViS and F-Secure AntiVirus (fsavdb 2007-07-20_04) -X-Virus-Scanned: by Intranator (www.intranator.com) with AMaViS and F-Secure AntiVirus (fsavdb 2007-07-20_04) -X-Spam-Status: hits=7.8 - tests=[BAYES_80=2.5,DKIM_POLICY_SIGNSOME=0,FORGED_MUA_OUTLOOK=3.116,HTML_MESSAGE=0.001,TVD_SPACE_RATIO=2.219] -X-Spam-Level: 1078 - -This is a multi-part message in MIME format. - -------=_NextPart_000_0000_01C7CACF.2B94C6C0 -Content-Type: text/plain; - charset="us-ascii" -Content-Transfer-Encoding: 7bit - -Testmail von Transearch - - -------=_NextPart_000_0000_01C7CACF.2B94C6C0 -Content-Type: text/html; - charset="us-ascii" -Content-Transfer-Encoding: quoted-printable - - - - - - - - - - - - - - - -
    - -

    Testmail von Transearch

    - -
    - - - - - -------=_NextPart_000_0000_01C7CACF.2B94C6C0-- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-bug5919-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-bug5919-1 --- spamassassin-3.4.6/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-bug5919-1 2009-06-30 21:38:20.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FORGED_MUA_OUTLOOK/fp-bug5919-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -Return-Path: -X-Spam-Flag: YES -X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on fnord.ir.bbn.com -X-Spam-Level: * -X-Spam-Status: Yes, score=1.5 required=1.0 tests=AWL,BAYES_00, - FORGED_MUA_OUTLOOK autolearn=no version=3.1.7 -X-Spam-Report: - * -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% - * [score: 0.0000] - * 4.1 FORGED_MUA_OUTLOOK Forged mail pretending to be from MS Outlook - * 0.0 AWL AWL: From: address is in the auto white-list -X-Original-To: gdt@ir.bbn.com -Delivered-To: gdt@ir.bbn.com -Received: from pch.mit.edu (PCH.MIT.EDU [18.7.21.90]) - by fnord.ir.bbn.com (Postfix) with ESMTP id 7BF955289 - for ; Thu, 31 May 2007 22:58:24 -0400 (EDT) -Received: from pch.mit.edu (pch.mit.edu [127.0.0.1]) - by pch.mit.edu (8.13.6/8.12.8) with ESMTP id l512p83e016021; - Thu, 31 May 2007 22:51:13 -0400 -Received: from fort-point-station.mit.edu (FORT-POINT-STATION.MIT.EDU - [18.7.7.76]) - by pch.mit.edu (8.13.6/8.12.8) with ESMTP id l512p6wJ016018 - for ; Thu, 31 May 2007 22:51:06 -0400 -Received: from mit.edu (M24-004-BARRACUDA-3.MIT.EDU [18.7.7.114]) - by fort-point-station.mit.edu (8.13.6/8.9.2) with ESMTP id - l512p3up028645 - for ; Thu, 31 May 2007 22:51:04 -0400 (EDT) -Received: from smtp106.sbc.mail.re2.yahoo.com (smtp106.sbc.mail.re2.yahoo.com - [68.142.229.99]) by mit.edu (Spam Firewall) with SMTP id 9CCD95F4294 - for ; Thu, 31 May 2007 22:51:03 -0400 (EDT) -Received: (qmail 70635 invoked from network); 1 Jun 2007 02:51:03 -0000 -Received: from unknown (HELO CDCHOME) (chrisclausen@sbcglobal.net@76.199.3.163 - with login) - by smtp106.sbc.mail.re2.yahoo.com with SMTP; 1 Jun 2007 02:51:03 -0000 -X-YMail-OSG: eYUkWSMVM1nnl.I9AnuqtOSMg4YD5A.qrPW4QhV0fgw221IdC8nQ5qvp7wst92meohNFSYt_oC8fZ522R6UeMjky3pcFmrSs1.dybQ0ChRPNDnihx5jCjS2vG1ZxACSXxIyqsjOHO61r3Ss- -Message-Id: <746308829575E17C3331BBCB00C0898B@UserName> -From: "Christopher D. Clausen" -To: -References: -Subject: Re: Use ssh key to acquire TGT? -Date: Thu, 31 May 2007 21:51:02 -0500 -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.2900.5512 -X-RFC2646: Format=Flowed; Original -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.3959 -X-Scanned-By: MIMEDefang 2.42 -X-BeenThere: kerberos@mit.edu -X-Mailman-Version: 2.1.6 -Precedence: list -List-Id: The Kerberos Authentication System Mailing List -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit -Sender: kerberos-bounces@mit.edu -Errors-To: kerberos-bounces@mit.edu -X-Greylist: Sender is SPF-compliant, not delayed by milter-greylist-3.0 (fnord.ir.bbn.com [0.0.0.0]); Thu, 31 May 2007 22:58:24 -0400 (EDT) - -Adam Megacz wrote: -> Our (hcoop.net) users love their new AFS homedirs, but are complaining -> a lot about ssh public keys not working the way they're accustomed to. -> Telling them to "kinit" after logging in doesn't quite cut it either. -> -> We're aware that this goes against the grain of kerberos security, but -> without something like this users will just start hardcoding their -> plaintext password into scripts, which is even worse. At least with -> ssh keys we can urge them to password-encrypt their on-disk private -> keys. - -How exactly is having a private key password different from simply -telling the user to kinit ONCE on their local machine before attempting -to SSH to your Kerberized machines? - -Also, you could rig up a login script (or PAM) that used a local keytab -file to obtain AFS tickets automatically at sucessful login. Not sure -if you'd have to assume that someone logging as the local UNIX user -automatically means that user would have to the matching AFS identity. -You would also have issues of users keeping their passwords and the -keytabs up to date or otherwise differentiating between the keytab login -and their real Kerberos identity. - -This might be question to ask on the AFS mailing lists instead of the -Kerberos ones. - -< -To: -References: -Subject: Re: Use ssh key to acquire TGT? -Date: Thu, 31 May 2007 21:51:02 -0500 - -"verifiquem". - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-1 --- spamassassin-3.4.6/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-1 2009-07-15 10:17:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -From: "Christopher D. Clausen" -To: -References: -Subject: Re: Use ssh key to acquire TGT? - -the german word "vollumfänglich" - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-2 spamassassin-4.0.0~rc3/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-2 --- spamassassin-3.4.6/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-2 2009-07-15 10:17:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-2 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -From: "Christopher D. Clausen" -To: -References: -Subject: Re: Use ssh key to acquire TGT? -Date: Thu, 31 May 2007 21:51:02 -0500 - -http://www.comconsult-akademie.de/inxmail/url?vm0vq000000000iw62a3 - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-zmi spamassassin-4.0.0~rc3/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-zmi --- spamassassin-3.4.6/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-zmi 2009-07-15 10:17:50.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/FRT_VALIUM1/fp-bug6086-zmi 1970-01-01 00:00:00.000000000 +0000 @@ -1,1319 +0,0 @@ -Reply-To: -From: "PayPal" -To: ###removed### -Subject: PayPal aktualisiert die AGB -Date: Fri, 1 May 2009 18:08:47 +0200 -Message-ID: -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_NextPart_000_0041_01C9CAA2.36FA3610" -X-Mailer: Microsoft Office Outlook 11 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579 -X-Envelope-From: paypal@email.paypal.at -List-Unsubscribe: -Thread-Index: AcnKd3Fyy7f3Dm69Sbyl9zoWgXcW3w== - -This is a multi-part message in MIME format. - -------=_NextPart_000_0041_01C9CAA2.36FA3610 -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: quoted-printable - - =20 - -Falls diese E-Mail nicht korrekt dargestellt wird, klicken Sie bitte - hier. =20 - PayPal - =09 - PayPal informiert: Neue AGB ab 3. Juni 2009 - =09 -=20 - Guten Tag, ###removed###!=20 - -Wir m=F6chten Sie dar=FCber informieren, dass wir zum 3. Juni 2009 = -unsere -AGB aktualisieren. Denn PayPal f=FChrt in =D6sterreich auf eBay den = -K=E4ufer- -schutz in unbegrenzter H=F6he sowie den Verk=E4uferschutz ein. - -Daher aktualisieren wir in unseren AGB die Bereiche Nutzungsbedingungen -und K=E4uferschutzrichtlinie und auch die Datenschutzgrunds=E4tze. Sie = -finden -die ge=E4nderten AGB am Ende dieser E-Mail. - -Herzliche Gr=FC=DFe, -Ihr PayPal-Team -=20 -=20 - =09 - Wichtiger Hinweis Die ge=E4nderten AGB gelten als von Ihnen angenommen, = -wenn -Sie der =C4nderung nicht innerhalb von drei Wochen nach Erhalt dieser = -E-Mail -schriftlich widersprechen. Sofern Sie PayPal zu den ge=E4nderten = -Bedingungen -nicht weiter nutzen m=F6chten, senden Sie Ihren Widerruf bitte an: = -PayPal -(Europe) S.=E0 r.l. & Cie, S.C.A., - Rechtsabteilung -, 5th Floor, 22-24 -Boulevard Royal, L-2449 Luxemburg. - =09 - PayPal-Kundenhotline: 0820 4000 1508 Mo.-Fr. 8.30-19.00 Uhr, 20 = -Cent/Min. -aus dem =F6sterreichischen Festnetz. F=FCr Anrufe aus Mobilfunknetzen = -k=F6nnen -h=F6here Geb=FChren anfallen. - =09 - -Wir sind aus rechtlichen Gr=FCnden dazu verpflichtet, allen Kunden die = -neuen -AGB mitzuteilen. Daher erhalten Sie diese E-Mail auch, wenn Sie sonst = -keine -Mitteilungen von PayPal w=FCnschen. - -PayPal-K=E4uferschutzrichtlinie - -Diese Richtlinie tritt am 3. Juni 2009 in Kraft. - - - - -1. Allgemeines - - Der im Folgenden beschriebene PayPal-K=E4uferschutz gilt nur bei -K=E4ufen auf eBay.at. F=FCr auf anderen eBay Webseiten gekaufte Artikel = -gilt der -dort g=FCltige K=E4uferschutz. - -Der PayPal-K=E4uferschutz sch=FCtzt den K=E4ufer, falls ein auf eBay.at = -gekaufter -Artikel nicht versandt wurde oder der gelieferte Artikel erheblich von = -der -Artikelbeschreibung des Verk=E4ufers abweicht, siehe hierzu Ziffer 4. - -Der PayPal-K=E4uferschutz gilt nur f=FCr materielle Artikel, die = -versandt werden -k=F6nnen, siehe hierzu Ziffer 3.3. - -Sobald der K=E4ufer einen Antrag auf PayPal-K=E4uferschutz gestellt hat, = -wird -PayPal den Antrag pr=FCfen und gegebenenfalls weitere Informationen von = -K=E4ufer -und Verk=E4ufer anfordern, um eine Kl=E4rung herbeizuf=FChren. - - -2. Auszahlung. Wenn ein Antrag auf PayPal-K=E4uferschutz erfolgreich = -ist, -erstattet PayPal dem K=E4ufer den Kaufpreis inkl. Versandkosten. Wenn = -die -Zahlung in einer anderen W=E4hrung als Euro erfolgt, erfolgt auch die -Auszahlung in dieser W=E4hrung. - -Die Auszahlung erfolgt unabh=E4ngig davon, ob PayPal den = -Erstattungsbetrag von -dem Verk=E4ufer zur=FCckfordern kann. -3. Anspruchsberechtigung. Um den PayPal-K=E4uferschutz in Anspruch = -nehmen -zu k=F6nnen, m=FCssen die folgenden Bedingungen erf=FCllt sein. - - 3.1 Der K=E4ufer hat den Artikel bei eBay.at gekauft und mit PayPal -bezahlt. - -3.2 Der Artikel ist f=FCr den PayPal-K=E4uferschutz qualifiziert. - -Ob ein Artikel f=FCr den PayPal-K=E4uferschutz qualifiziert ist, = -k=F6nnen Sie auf -der eBay-Artikelseite sehen. Dort finden Sie im Feld "Sicher kaufen" im -oberen Bereich der Seite einen Hinweis, wenn der Artikel f=FCr den -PayPal-K=E4uferschutz qualifiziert ist. - -3.3 Bei dem gekauften Artikel handelt es sich um einen materiellen = -Artikel, -der versandt werden kann. - -Die folgenden Artikel sind beispielsweise nicht durch den -PayPal-K=E4uferschutz abgesichert: - - - -* Immaterielle G=FCter, Dienstleistungen, Geschenkgutscheine, Tickets, -Downloads und weitere nicht physische G=FCter -* Artikel, die nicht versandt werden, zum Beispiel Fahrzeuge, -einschlie=DFlich Autos, Motorr=E4der, Boote und Flugzeuge - - - 3.4 Die PayPal-Zahlung steht in Zusammenhang mit dem gekauften -eBay-Artikel. Das bedeutet, dass die Zahlung - - - -a. =FCber die Funktion "Jetzt bezahlen" auf der eBay-Website oder -b. =FCber die die Schaltfl=E4che "eBay-Zahlung senden" in Ihrem -PayPal-Konto unter Angabe der eBay-Artikelnummer erfolgt ist. - - - 3.5 Der Artikel verst=F6=DFt nicht gegen die PayPal-Nutzungsbedingungen - . - -3.6 Der K=E4ufer leitet innerhalb von 45 Tagen nachdem die Zahlung auf = -der -PayPal-Website eingeleitet wurde die Konfliktl=F6sung ein und versucht, = -den -Konflikt mit dem Verk=E4ufer unter Verwendung der hierf=FCr durch PayPal -bereitgestellten Hilfsmittel zu kl=E4ren. Dies ist nach dem Einloggen in = -das -PayPal-Konto unter =84Konfliktl=F6sungen" m=F6glich. - -Falls eine Kl=E4rung hierdurch nicht erreicht wird, stellt der K=E4ufer -innerhalb von 20 Tagen nach Einleitung der Konfliktl=F6sung einen Antrag = -auf -PayPal-K=E4uferschutz. Dies ist ebenfalls nach dem Einloggen in das -PayPal-Konto unter =84Konfliktl=F6sungen" m=F6glich. - -3.7 Des Weiteren erf=FCllt der K=E4ufer die in Ziffer 5 beschriebenen -Bedingungen. - -3.8 Vor einem Antrag auf PayPal-K=E4uferschutz muss der K=E4ufer dem = -Verk=E4ufer -einen ausreichend langen Zeitraum f=FCr den Versand und die Lieferung -einger=E4umt haben, mindestens eine Woche, und zun=E4chst versuchen, den -Konflikt durch direkte Kontaktaufnahme mit dem Verk=E4ufer zu kl=E4ren. - - -4. Welche F=E4lle sind abgesichert? Der K=E4ufer hat = -PayPal-K=E4uferschutz in -den folgenden F=E4llen: - - 4.1 Der bezahlte Artikel wurde durch den Verk=E4ufer nicht versandt. - -Der PayPal-K=E4uferschutz gilt nicht f=FCr Artikel, die w=E4hrend des = -Versands -verloren gehen. Falls der Verk=E4ufer einen g=FCltigen Versandbeleg = -vorlegt, -lehnt PayPal den Antrag auf PayPal-K=E4uferschutz ab. - -4.2 Der gelieferte Artikel weicht erheblich von der Artikelbeschreibung = -des -Verk=E4ufers ab. - -Nachfolgend mehrere Beispiele, in denen ein Artikel erheblich von der -Artikelbeschreibung abweicht. Die Aufz=E4hlung ist nicht abschlie=DFend. - - - -* Der Artikel ist ein v=F6llig anderer, als der in der -Artikelbeschreibung beschriebene, zum Beispiel ein H=F6rbuch anstelle = -einer -Druckversion, ein Desktop-PC anstelle eines Laptops, eine leere = -Schachtel. -* Der Zustand des gelieferten Artikels weicht erheblich von dem -beschriebenen Zustand ab, zum Beispiel ist der Artikel offensichtlich -mehrfach benutzt worden anstelle von neu und originalverpackt. -* Der Artikel kann nicht verwendet werden, dies war jedoch nicht in -der Artikelbeschreibung beschrieben worden, zum Beispiel fehlen wichtige -Komponenten oder Teile, der Artikel funktioniert nicht oder das -Haltbarkeitsdatum ist =FCberschritten. - - Hinweis: Dies gilt f=FCr den Zustand des Artikels, in dem der K=E4ufer -ihn erhalten hat, unabh=E4ngig davon, in welchem Zustand er versandt = -worden -ist. - - -* Der Artikel ist nicht authentisch, dies war jedoch nicht in der -Artikelbeschreibung beschrieben worden, zum Beispiel ein gef=E4lschter = -Artikel -oder eine Raubkopie. -* Es fehlt ein Teil der bestellten Menge, zum Beispiel wurden zehn -Golfb=E4lle bezahlt, jedoch nur vier geliefert. - - - Nachfolgend werden mehrere Beispiele genannt, in denen ein Artikel -nicht erheblich von der Artikelbeschreibung abweicht. Die folgende -Aufz=E4hlung ist nicht abschlie=DFend. - - - -* Der Artikel funktioniert nicht richtig, in der Artikelbeschreibung -war jedoch Folgendes angegeben: "Artikel funktioniert m=F6glicherweise = -nicht -richtig", "Es fehlen Teile", "Das Foto zeigt Kratzer oder = -Besch=E4digungen". -* Der K=E4ufer m=F6chte den Artikel nicht mehr, nachdem er ihn erhalten -hat, oder der Artikel entspricht nicht den Erwartungen des K=E4ufers. = -Der -Artikel war aber in der Artikelbeschreibung richtig beschrieben. -* Die Artikelbeschreibung ist f=FCr beide Seiten missverst=E4ndlich. -Beispielsweise hat der Artikel scheinbar eine andere Farbe als = -angeboten; er -ist in den Augen des K=E4ufers hellgr=FCn, der Verk=E4ufer definiert die = -Farbe in -der Produktbeschreibung aber als t=FCrkis. - - - PayPal entscheidet von Fall zu Fall anhand entsprechend -einzureichender Nachweise, ob der Artikel tats=E4chlich entsprechend von = -der -Artikelbeschreibung abweicht. - -Diese Entscheidung und damit auch die Entscheidung =FCber den Antrag auf -PayPal-K=E4uferschutz ist endg=FCltig und der Rechtsweg gegen=FCber = -PayPal -ausgeschlossen. - -4.3 Der K=E4ufer kann pro PayPal-Zahlung nur einen Antrag auf -PayPal-K=E4uferschutz stellen, entweder weil der Verk=E4ufer den Artikel = -nicht -versandt hat oder weil der Artikel erheblich von der Artikelbeschreibung -abweicht. - -4.4 Ein Antrag auf PayPal-K=E4uferschutz kann f=FCr mehrere Artikel = -gelten, wenn -z.B. der K=E4ufer drei Artikel kauft, von denen zwei nicht versandt = -werden. -Der K=E4ufer muss den Antrag f=FCr beide Artikel gemeinsam als einen = -Antrag -stellen. - - -5. Pflichten des K=E4ufers. - - 5.1 Der K=E4ufer muss s=E4mtliche Anfragen von PayPal bez=FCglich des -Antrags auf PayPal-K=E4uferschutz innerhalb von 10 Tagen beantworten. = -PayPal -wird den Antrag ablehnen, falls eine Beantwortung innerhalb der = -genannten -Frist nicht erfolgt. - -5.2 Wenn der K=E4ufer einen Antrag auf PayPal-K=E4uferschutz stellt, = -weil der -erhaltene Artikel erheblich von der Artikelbeschreibung des Verk=E4ufers -abweicht, muss der K=E4ufer den Artikel in bestimmten F=E4llen auf = -eigene Kosten -an den Verk=E4ufer, an PayPal oder an ein durch PayPal beauftragtes -Unternehmen zur=FCcksenden und einen entsprechenden Zustellbeleg = -vorlegen. -PayPal beh=E4lt sich au=DFerdem vor, weitere Dokumente zur = -Unterst=FCtzung der -Forderung von dem K=E4ufer anzufordern. Der K=E4ufer hat die ihm = -hierf=FCr -eventuell entstehenden Kosten zu tragen. - - -6. Schlussbestimmungen. - - 6.1 Abtretung des R=FCckzahlungsanspruches. Der K=E4ufer tritt mit dem -Empfang der Auszahlung des PayPal-K=E4uferschutzes alle gegen=FCber dem -Verk=E4ufer bestehenden Anspr=FCche aus dem Antrag auf = -PayPal-K=E4uferschutz -zugrunde liegenden Kaufvertrag in H=F6he des Auszahlungsbetrages an = -PayPal ab. - -6.2 Verf=FCgbarkeit des PayPal-K=E4uferschutzes. PayPal beh=E4lt sich = -das Recht -vor, jederzeit im eigenen Ermessen und ohne Angabe von Gr=FCnden den -PayPal-K=E4uferschutz zu =E4ndern oder zu streichen. Offene Forderungen = -zum -Zeitpunkt der Streichung werden weiterbearbeitet, bis eine endg=FCltige -Entscheidung vorliegt. - -6.3 Zugriff auf Versandinformationen. Der K=E4ufer erlaubt PayPal, in = -seinem -Namen auf Versandinformationen des jeweiligen Versandunternehmens -zuzugreifen, um den Versand eines Artikels zu =FCberpr=FCfen. - -6.4 K=E4uferschutz durch PayPal oder eBay. PayPal lehnt einen Antrag auf -PayPal-K=E4uferschutz ab, falls der K=E4ufer bereits eine Auszahlung im = -Rahmen -eines etwaigen K=E4uferschutzprogrammes von eBay erhalten hat. - -6.5 Gesetzliche Rechte. Die PayPal-K=E4uferschutzrichtlinie ber=FChrt = -die -gesetzlichen Rechte des K=E4ufers nicht. PayPal tritt nicht als = -Vertreter von -K=E4ufer oder Verk=E4ufer auf. PayPal entscheidet lediglich =FCber den = -Antrag auf -PayPal-K=E4uferschutz. - -6.6 PayPal-K=E4uferschutz und R=FCckbuchungsrecht gegen=FCber dem -Kreditkartenanbieter. Der K=E4ufer kann entweder einen Antrag auf -PayPal-K=E4uferschutz oder einen Antrag auf R=FCckbuchung einer -Kreditkartenzahlung gegen=FCber dem Kreditkartenanbieter stellen. Eine -zweifache Auszahlung ist nicht zul=E4ssig. - -PayPal kann daher einen Antrag auf PayPal-K=E4uferschutz ablehnen oder -schlie=DFen, wenn eine R=FCckbuchung einer Kreditkartenzahlung = -eingeleitet wird. -Dies gilt unabh=E4ngig von dem Ausgang des Antrags auf R=FCckbuchung = -einer -Kreditkartenzahlung gegen=FCber dem Kreditkartenanbieter. Das = -Zur=FCckziehen -oder das Ablehnen eines Antrags auf PayPal-K=E4uferschutz hat keine -Auswirkungen auf den Antrag auf R=FCckbuchung einer Kreditkartenzahlung -gegen=FCber dem Kreditkartenanbieter. Es gelten die Bestimmungen des -jeweiligen Kreditkartenanbieters. PayPal beh=E4lt sich das Recht vor, = -den -Zugang des K=E4ufers zu dessen PayPal-Konto einzuschr=E4nken oder das -PayPal-Konto zu schlie=DFen, wenn das Recht auf R=FCckbuchung = -gegen=FCber dem -Kreditkartenanbieter missbraucht wird. Dar=FCber hinaus beh=E4lt sich = -PayPal das -Recht vor, unrechtm=E4=DFige R=FCckbuchungen entsprechend anzu fechten. = -Dies -geschieht in =DCbereinstimmung mit den Regeln des jeweiligen -Kreditkartenanbieters. - - - -PayPal-Nutzungsbedingungen - -Die folgenden Bedingungen bilden eine Vereinbarung zwischen Ihnen und = -PayPal -(Europe) S.=E0 r.l. & Cie, S.C.A., 22-24 Boulevard Royal, L-2449 = -Luxemburg (im -Weiteren "PayPal" genannt) und gelten hinsichtlich Ihrer Nutzung von = -PayPal. -Im Rahmen der Anmeldung m=FCssen Sie diese Bedingungen akzeptieren. = -Diese -Nutzungsbedingungen sind ab dem 3. Juni 2009 g=FCltig. - -Die vorliegende Vereinbarung besteht aus f=FCnfzehn Ziffern. - - - -* 1. Allgemeines=20 -* 2. Anmeldung und Kontotypen -* 3. Zahlungsauftr=E4ge -* 4. Zahlungseing=E4nge -* 5. Kontostand -* 6. Abheben von Betr=E4gen -* 7. Kontoaufl=F6sung -* 8. Geb=FChren -* 9. Verbotene Aktivit=E4ten -* 10. Ihre Haftung - Unsere Ma=DFnahmen -* 11. Verk=E4uferschutz -* 12. Irrt=FCmer und Nicht autorisierte Gesch=E4ftsvorg=E4nge=20 -* 13. PayPal-K=E4uferschutz -* 14. Konflikte mit PayPal -* 15. Definitionen - - -1. Allgemeines - - 1.1 PayPal ist ausschlie=DFlich Zahlungsdienstleister. Die -Hauptgesch=E4ftst=E4tigkeit von PayPal liegt in der Ausgabe von E-Geld = -und den -mit der Ausgabe von E-Geld eng verbundenen Leistungen. PayPals -Dienstleistungen stellen insbesondere keine Ein- oder = -Anlagendienstleistung -im Sinne des Gesetzes dar. Sie sind daher nicht durch das Luxemburger -Sicherungssystem f=FCr Anlagen und Forderungen aus = -Wertpapiergesch=E4ften der -Association pour la Garantie des D=E9p=F4ts Luxembourg (AGDL) = -gesch=FCtzt. - -PayPal erm=F6glicht es Ihnen, Zahlungen an Dritte zu leisten und von = -Dritten -entgegenzunehmen. PayPal tritt hierbei als unabh=E4ngiger Auftragnehmer = -auf. -PayPal hat keinerlei Kontrolle =FCber und =FCbernimmt keine Haftung = -f=FCr Waren -oder Dienstleistungen, die mit PayPal gezahlt werden. PayPal garantiert -dar=FCber hinaus nicht die Richtigkeit der Identit=E4t von Nutzern und = -bietet -keine Sicherheit daf=FCr, dass K=E4ufer oder Verk=E4ufer einen = -Gesch=E4ftsvorgang -vollst=E4ndig ausf=FChren. Es bestehen daher Risiken im Hinblick auf = -einen -Gesch=E4ftsabschluss mit Minderj=E4hrigen sowie mit Personen, die unter = -falschem -Namen auftreten. - -1.2 Ihre pers=F6nlichen Daten. PayPal legt gro=DFen Wert auf den Schutz = -Ihrer -pers=F6nlichen Daten. Lesen Sie bitte unsere Datenschutzgrunds - =E4tze, um einen -besseren Einblick in die von uns ergriffenen Ma=DFnahmen zum Schutz = -Ihrer -pers=F6nlichen Daten zu gewinnen. - -1.3 Ihr Umgang mit Nutzerdaten. Sollten Sie durch Nutzung unserer = -Leistungen -Informationen =FCber einen anderen Nutzer erhalten, so haben Sie die -betreffenden Daten vertraulich zu behandeln und nur im Rahmen unserer -Leistungen zu verwenden. Sie d=FCrfen Angaben =FCber einen PayPal-Nutzer = -nicht -Dritten gegen=FCber offen legen oder diese Angaben f=FCr Marketingzwecke = -nutzen, -es sei denn, der betreffende Nutzer hat Ihnen ausdr=FCcklich Anweisung -und/oder seine Zustimmung dazu erteilt. - -1.4 Geistiges Eigentum. Die Internetadressen (URLs) der = -PayPal-Website(s), -die Bezeichnung "PayPal" und s=E4mtliche damit verbundenen Logos unserer -Produkte und Dienstleistungen wie auf unserer Website beschrieben sind -entweder urheberrechtlich gesch=FCtzt oder Warenzeichen oder = -eingetragene -Warenzeichen von PayPal oder den Lizenznehmern. Zudem sind s=E4mtliche -Seiten=FCberschriften, Grafiken, Icons auf Schaltfl=E4chen sowie = -Schriftz=FCge -entweder urheberrechtlich gesch=FCtzt oder Dienstleistungszeichen, -Warenzeichen und/oder Teil des Erscheinungsbilds von PayPal. Sie = -d=FCrfen -diese Internetadressen, Logos, =DCberschriften, Grafiken etc. nicht ohne -unsere vorherige Zustimmung vervielf=E4ltigen, nachbilden, bearbeiten, = -=E4ndern, -erg=E4nzen oder nutzen. Sie k=F6nnen die von PayPal =FCber unseren = -H=E4ndler-Service -zur Verf=FCgung gest ellten HTML-Logos sowie die besondere = -Programmfunktionen -f=FCr Online-Auktionen oder damit verbundene Programme ohne vorherige -Zustimmung nutzen, um dadurch Internetnutzer auf unser Leistungsangebot -aufmerksam zu machen. Sie d=FCrfen diese HTML-Logos jedoch nicht = -=E4ndern, -bearbeiten oder umgestalten, diese in einer f=FCr PayPal oder das -Leistungsangebot herabsetzenden Weise nutzen oder in einer Art und Weise -darstellen, die ein Sponsoring oder eine Unterst=FCtzung Ihrer Inhalte = -oder -Waren durch PayPal suggeriert. - -1.5 Abtretung. Sie d=FCrfen keinerlei Rechte oder Verpflichtungen, die = -Ihnen -aus diesen Nutzungsbedingungen entstehen, ohne die vorherige = -schriftliche -Zustimmung von PayPal =FCbertragen oder abtreten. PayPal beh=E4lt sich = -vor, die -vorliegenden Nutzungsbedingungen oder ein durch diese = -Nutzungsbedingungen -begr=FCndetes Recht oder eine darin eingegangene Verpflichtung jederzeit = -an -verbundene Unternehmen zu =FCbertragen oder abzutreten. - -1.6 An Sie gerichtete Mitteilungen. PayPal sendet Ihnen Mitteilungen per -E-Mail an die in Ihrem PayPal-Konto aufgef=FChrte E-Mail-Adresse oder = -durch -Ver=F6ffentlichung auf der/den Website(s) von PayPal oder durch = -Postsendung an -die in Ihrem PayPal-Konto aufgef=FChrte Postanschrift. Eine solche = -Mitteilung -gilt als zugegangen innerhalb von 24 Stunden nach Ver=F6ffentlichung auf -der/den PayPal-Website(s) oder nach Absendung einer an Sie gerichteten -E-Mail, es sei denn, wir erhalten eine Benachrichtigung =FCber die nicht -erfolgte Zustellung dieser E-Mail. Erfolgt die Versendung der an Sie -gerichteten Mitteilung per Post, so gilt diese nach Ablauf von drei -Werktagen ab Versand als zugegangen. Sie k=F6nnen einen Ausdruck = -s=E4mtlicher -nach gesetzlichen Anforderungen offen zu legender Informationen = -verlangen -und Ihre Zustimmung zum Erhalt solcher Informationen auf elektronischem = -Wege -k=FCndigen, indem Sie in der in untenstehender Ziffer 1.7 beschriebenen = -Weise -mit PayPal Kontakt aufnehmen. PayPal kann Ihnen f=FCr die =DCberlassung = -eines -Ausdrucks von Informationen eine Geb=FChr f=FCr die Anforderung von = -Unterlagen -gem=E4=DF Ziffer 8 berechnen. PayPal beh=E4lt sich vor, Ihr PayPal-Konto = -zu -schlie=DFen, sofern Sie Ihre Zustimmung zum Erhalt elektronischer -Korrespondenz widerrufen. - -1.7 Mitteilungen an PayPal. Mitteilungen an PayPal im Zusammenhang mit = -den -vorliegenden Nutzungsbedingungen m=FCssen per Post an die folgende = -Anschrift -gesandt werden: PayPal (Europe) S.=E0 r.l. & Cie, S.C.A., = -Rechtsabteilung, -22-24 Boulevard Royal, L-2449 Luxemburg. - -1.8 Bisheriger Gesch=E4ftsverlauf. Sie k=F6nnen den gesamten zeitlichen = -Ablauf -Ihrer Gesch=E4ftsvorg=E4nge sowie Ihren Kontostand jederzeit abrufen, = -indem Sie -sich in Ihr Konto einloggen. - -1.9 =C4nderung dieser Nutzungsbedingungen. PayPal ist berechtigt, diese -Nutzungsbedingungen jederzeit und ohne Angabe von Gr=FCnden zu =E4ndern. = -Die -ge=E4nderten Nutzungsbedingungen werden Ihnen per E-Mail sp=E4testens = -einen -Monat vor ihrem Inkrafttreten zugesandt. Widersprechen Sie der Geltung = -der -neuen Nutzungsbedingungen nicht innerhalb von zwei Wochen nach Empfang = -der -E-Mail, gelten sie als angenommen. PayPal weist Sie in der E-Mail, die = -die -ge=E4nderten Nutzungsbedingungen enth=E4lt, gesondert auf die = -zweiw=F6chige Frist -hin. Zus=E4tzlich ver=F6ffentlicht PayPal die ge=E4nderten = -Nutzungsbedingungen auf -der/den PayPal-Website(s). - -1.10 K=FCndigung. - - - -a. Sie haben das Recht diesen Nutzungsvertrag jederzeit mit sofortiger -Wirkung f=FCr die Zukunft zu k=FCndigen. -b. PayPal hat das Recht diesen Nutzungsvertrag mit Ihnen jederzeit mit -einer Frist von zwei Wochen zum Monatsende zu k=FCndigen. - - -2. Anmeldung und Kontotypen - - 2.1 Anmeldung. Sie k=F6nnen sich bei PayPal in =D6sterreich nur -anmelden, wenn Sie vollj=E4hrig sind und einen Wohnsitz in =D6sterreich = -haben. - -2.2 Kontotypen. Wir bieten drei verschiedene Arten von Konten an: = -K=E4ufer-, -Privat- und Gesch=E4ftskonten Sie d=FCrfen gleichzeitig Inhaber eines = -K=E4ufer -sowie entweder eines Privat- oder Gesch=E4ftskontos sein. - - -3. Zahlungsauftr=E4ge - - 3.1 Sendelimit. Wir k=F6nnen angemessene H=F6chstbetr=E4ge f=FCr Ihre -Zahlungsauftr=E4ge mit unserem Service festsetzen. Falls Sie =FCber ein -verifiziertes Konto verf=FCgen, k=F6nnen wir den f=FCr Sie geltenden = -H=F6chstbetrag -heraufsetzen oder aufheben. Das Sendelimit gilt unabh=E4ngig von -Limitierungen, die wir ausnahmsweise im Wege unseres Risikomanagements = -bei -einzelnen Transaktionen vornehmen. - -3.2. =C4nderung und Aufhebung des Sendelimits. Sie k=F6nnen Ihren = -H=F6chstbetrag -f=FCr Zahlungsauftr=E4ge erh=F6hen indem Sie sich verifizieren. Sie = -hierzu -folgende Schritte aus: F=FCgen Sie dazu Ihrem PayPal-Konto als = -Zahlungsquelle -eine Kreditkarte hinzu und best=E4tigen Sie diese. - -PayPal beh=E4lt sich vor, zus=E4tzliche Informationen von Ihnen zur -Verifizierung Ihrer Person anzufordern. Mit unseren = -Verifizierungsma=DFnahmen -kommen wir unseren Pflichten zur Bek=E4mpfung von Geldw=E4sche nach. Sie = -sagen -hiermit zu, s=E4mtlichen Anfragen nach weiteren Informationen zu = -entsprechen, -die wir nach billigem Ermessen ben=F6tigen. Dies kann, ohne darauf = -beschr=E4nkt -zu sein, die Anforderung beinhalten, uns bestimmte Ausweisdokumente oder = -zum -Beispiel eine Stromrechnung per Fax, E-Mail oder in anderer Form zu = -senden. - -3.3 Zahlungsquellen. Als Zahlungsquellen f=FCr eine Zahlung mit PayPal = -stehen -ihnen Guthaben und Kreditkarte zur Auswahl. Sie zahlen aus der f=FCr Sie -geltenden Zahlungsquelle Geld auf ein Bankkonto von PayPal ein. Wir = -geben -daraufhin E-Geld zum gleichen Betrag aus, versenden es entsprechend = -Ihren -Anweisungen an den Empf=E4nger oder schreiben es Ihrem Konto gut. - -Verf=FCgen Sie =FCber ein Guthaben auf Ihrem PayPal-Konto, wird PayPal = -zun=E4chst -stets dieses Guthaben verwenden, um Ihren Zahlungsauftrag auszuf=FChren. -Entscheidend ist hierf=FCr immer der Zeitpunkt der Zahlungsausf=FChrung. = -Dies -gilt insbesondere, wenn es zu einem verz=F6gerten Zahlungsabschluss auf = -Seite -von Zahlungsempf=E4ngern kommt. - -3.4 Bevorzugte Zahlungsquelle. Sollte Ihr Guthaben zur vollst=E4ndigen = -Zahlung -des gew=FCnschten Betrages nicht ausreichen, schlagen wir f=FCr Sie aus = -den -verf=FCgbaren Kreditkarten als eine als Zahlungsquelle vor. Sollten Sie = -eine -bestimmte Kreditkarte bevorzugen, k=F6nnen Sie zum Zeitpunkt Ihres -Zahlungsauftrags oder bei der Vereinbarung einer Zahlung per -H=E4ndlerabbuchung aus den zur Verf=FCgung stehenden Kreditkarten eine = -andere -bestimmen. Sollten Sie =FCber ein Guthaben verf=FCgen und dieses nicht = -f=FCr Ihre -n=E4chsten Zahlungen einsetzen wollen, m=FCssen Sie dieses Guthaben = -abheben, -bevor Sie die n=E4chste Zahlung einleiten. - -3.5 Beschr=E4nkung der Zahlungsquellen. PayPal kann im Rahmen seines -Risikomanagements bestimmte Zahlungsquellen f=FCr bestimmte = -Transaktionen -ausschlie=DFen. - -3.6 Lastschrift. Zurzeit nicht verf=FCgbar. - -3.7 Verweigerung von Gesch=E4ftsvorg=E4ngen. Wenn Sie E-Geld senden, ist = -der -Empf=E4nger nicht verpflichtet, diese Zahlung anzunehmen. Wird eine = -Zahlung -durch den Empf=E4nger abgelehnt, zur=FCckgesandt oder innerhalb von 30 = -Tagen -nicht angenommen, schreiben wir den Betrag der Zahlung Ihrem = -PayPal-Konto -gut. PayPal haftet nicht f=FCr Sch=E4den, die durch die Entscheidung = -eines -Empf=E4ngers verursacht werden, eine Zahlung nicht anzunehmen. - -3.8 Express-Kauf. Bei einem Express-Kauf mit unserem Service bestimmen = -Sie -vor Ihrer Bestellung und/oder Ihrem Kauf bei einem H=E4ndler PayPal als -Zahlungsmethode sowie Ihre Lieferadresse. Auf der Webseite des = -H=E4ndlers -schlie=DFen Sie am Ende Ihres Einkaufes Ihren Kauf durch Best=E4tigung = -des -Kaufpreises ab und erm=E4chtigen den H=E4ndler, den zu zahlenden Betrag = -zu -Lasten Ihres Kontos bei PayPal anzufordern. Den Zeitpunkt der = -Anforderung -bestimmt der H=E4ndler. Sie weisen uns hiermit dazu an einer solchen -Anforderung des H=E4ndlers innerhalb der auf Ihren Kauf folgenden 30 = -Tage zu -entsprechen und den Betrag zu Lasten Ihres Kontos an den H=E4ndler zu = -senden. -Diese Anweisung ist unwiderruflich. Ihre Rechte und Pflichten = -gegen=FCber dem -H=E4ndler bleiben aber unber=FChrt. - -Sollten Sie kein ausreichendes Guthaben auf Ihrem Konto haben, greifen = -wir -in H=F6he des noch fehlenden Betrages hierzu auf Ihre zus=E4tzlich zur = -Verf=FCgung -stehenden Zahlungsquellen zur=FCck. Sollten diese Zahlungsquelle eine -Kreditkarte sein, werden wir den Betrag hier=FCber einziehen. - -Falls Ihre Zahlung einen von uns durchzuf=FChrenden W=E4hrungsumtausch = -notwendig -macht, so wird die H=F6he des Wechselkurses und der Geb=FChr (wie in = -Ziffer 8 -aufgef=FChrt) zum Zeitpunkt der abschlie=DFenden Bearbeitung Ihrer = -Zahlung -bestimmt. - -3.9 H=E4ndlerabbuchung. Sie k=F6nnen uns gegen=FCber einem H=E4ndler bis = -auf -Widerruf eine generelle Genehmigung zur H=E4ndlerabbuchung erteilen -(Lastschrift per Abbuchungsauftrag). Je nach Ausgestaltung dieser -Lastschrift erlauben Sie dem H=E4ndler Geldbetr=E4ge unterschiedlicher = -H=F6he -einmalig, gelegentlich oder regelm=E4=DFig von Ihrem PayPal-Konto = -einzuziehen. -Mit Ihrer Genehmigung zur H=E4ndlerabbuchung weisen Sie uns bis auf = -Widerruf -an, die vom H=E4ndler eingereichten Lastschriften zu Lasten Ihres Kontos -einzul=F6sen. - -3.10 Benachrichtigung =FCber Zahlungen per H=E4ndlerabbuchung. PayPal = -stellt -Ihnen eine Liste aller vom H=E4ndler veranlassten Einzugsverfahren = -inklusive -Betrag in Ihrem Konto zur Verf=FCgung. Dar=FCber hinaus benachrichtigt = -PayPal -Sie nicht im Voraus =FCber Zahlungen die per H=E4ndlerabbuchung = -erfolgen. Ihr -Recht eine solche Vorab-Benachrichtigung =FCber den bevorstehenden = -Einzug von -Ihrem H=E4ndler zu fordern, bleibt hiervon unber=FChrt. - -3.11 Widerruf im Abbuchungsverfahren. Der Widerruf einzelner = -Genehmigungen -zur H=E4ndlerabbuchung ist uns 3 Tage vor der Abbuchung an der daf=FCr -vorgesehenen Stelle in Ihrem Kontoprofil mitzuteilen. Ihre Rechte und -Pflichten gegen=FCber dem H=E4ndler bleiben hiervon unber=FChrt. - -3.12 Versand von E-Geld in verschiedenen W=E4hrungen. Sie k=F6nnen = -Geldbetr=E4ge -in US-Dollar, Kanadischen Dollar, Euro, Britischen Pfund, Yen, = -Australischen -Dollar, Tschechischen Kronen, D=E4nischen Kronen, Hongkong-Dollar, = -Ungarischen -Forint, Neuseel=E4ndischen Dollar, Norwegischen Kronen, Polnischen = -Zloty, -Singapur-Dollar, Schwedischen Kronen und Schweizer Franken senden. Wenn = -Sie -Geld an einen H=E4ndler senden, der die Zahlung in einer anderen als = -Ihrer -Hauptw=E4hrung erbeten hat, sind Sie gehalten, anzugeben, ob Sie den = -H=E4ndler -in der von diesem erbetenen W=E4hrung bezahlen wollen oder in Ihrer -Hauptw=E4hrung (in einigen F=E4llen l=E4sst Ihnen der H=E4ndler keine = -Wahl). Falls -Sie eine elektronische Zahlung in einer W=E4hrung anweisen, die nicht = -Ihre -Hauptw=E4hrung ist, so kommen folgende Verfahren zur Anwendung: - - - -a. Falls Sie =FCber ein Guthaben in der erbetenen W=E4hrung verf=FCgen, = -so -werden wir Ihre Zahlung aus diesem Guthaben heraus t=E4tigen. -b. Falls Sie =FCber ein Guthaben in einer anderen W=E4hrung verf=FCgen, = -so -werden wir einen W=E4hrungsumtausch durchf=FChren und den auf diese = -Weise -erhaltenen Betrag f=FCr Ihre Zahlung verwenden. -c. Falls Sie =FCber kein Guthaben verf=FCgen, so werden wir Ihre Zahlung -mit Hilfe einer Ihrer sonst zu Verf=FCgung stehenden Zahlungsquellen = -t=E4tigen -und den Betrag in die gew=FCnschte W=E4hrung umrechnen. - - - Der in Ziffer 8 dieser Nutzungsbedingungen aufgef=FChrte Wechselkurs -und die entsprechende Geb=FChr gelten f=FCr jeden von PayPal = -durchgef=FChrten -W=E4hrungsumtausch. - - -4. Zahlungseing=E4nge - - 4.1 H=F6chstbetrag f=FCr Zahlungseing=E4nge auf Ihrem K=E4uferkonto. = -Falls -Sie =FCber ein K=E4uferkonto verf=FCgen, so k=F6nnen Sie = -Zahlungseing=E4nge von -anderen Nutzern von h=F6chstens 250 EUR pro Monat verbuchen. Wird dieser -Betrag =FCberschritten, werden wir Ihre Zahlung automatisch als = -unerledigt -behandeln. Sie k=F6nnen diese unerledigten Zahlungen annehmen, indem Sie = -Ihr -Konto in ein Privat- oder Gesch=E4ftskonto =E4ndern. - -4.2 Verbuchung verschiedener Arten von Zahlungseing=E4ngen. Falls Sie = -=FCber ein -K=E4uferkonto verf=FCgen, so k=F6nnen Sie Zahlungen aus Guthaben oder = -per -Bankkonto geb=FChrenfrei entgegen nehmen sowie - innerhalb eines = -bestimmten -Zeitraums, den wir Ihnen mitteilen werden - eine begrenzte Zahl von -Kreditkartenzahlungen (mit Ausnahme solcher f=FCr eBay Transaktionen, = -siehe -Ziffer 4.3) geb=FChrenfrei entgegen nehmen. Falls Sie =FCber ein Privat- = -oder -Gesch=E4ftskonto verf=FCgen, k=F6nnen Sie eine unbegrenzte Anzahl von -Kreditkartenzahlungen entgegen nehmen. Bitte beachten Sie, dass alle auf -einem Privat- oder entsprechenden Steuerbetr=E4ge zu erheben, zu melden = -und an -die zust=E4ndige Steuerbeh=F6rde weiter zu leiten. PayPal tr=E4gt = -keinerlei -Verantwortung f=FCr die Ermittlung der f=FCr Ihren Gesch=E4ftsvorgang -gegebenenfalls anfallenden Ste uern, noch f=FCr die Erhebung, Meldung = -oder -=DCberweisung von Steuern auf beliebige Gesch=E4ftsvorg=E4nge. - - -5. Kontostand - - 5.1 Guthaben. Sie k=F6nnen Ihr Guthaben jederzeit durch Einloggen in -Ihr Konto pr=FCfen. Sie m=FCssen kein Guthaben in Ihrem PayPal-Konto = -vorhalten, -um Zahlungen ausf=FChren zu k=F6nnen. Ein Guthaben entsteht jeweils = -dann, wenn -Sie unseren Service nutzen, um eine Zahlung per Kreditkarte = -auszuf=FChren. -Diesem Guthaben wird Ihre Zahlung an einen Zahlungsempf=E4nger direkt -gegen=FCbergestellt, so dass keine Erh=F6hung Ihres Guthabens erfolgt. = -Sie -erhalten keinerlei Zinsen oder sonstige Eink=FCnfte auf Ihr Guthaben, da = -das -Guthaben E-Geld und kein Bankguthaben darstellt. - -5.2 Negativer Kontostand und W=E4hrungsabweichungen. Die Nutzung des -PayPal-Service ist nicht m=F6glich, wenn Sie einen negativen Kontostand = -haben. -Bei Ihrer n=E4chsten Zahlung mit Kreditkarte als Zahlungsquelle kann = -PayPal -daher den ausstehenden Geldbetrag zus=E4tzlich zum Zahlungsbetrag Ihrer -Kreditkarte belasten. Darauf werden Sie bei der Zahlung hingewiesen. = -Sollte -sich aus ihrem Kontostand ergeben, dass Sie uns einen Geldbetrag in = -einer -bestimmten W=E4hrung schulden, kann PayPal den geschuldeten Betrag durch -Aufrechnung in Euro mit solchen Betr=E4gen einziehen, die Sie in einem = -anderen -W=E4hrungsguthaben oder auf einem anderen PayPal-Konto vorhalten sowie = -den -geschuldeten Betrag durch Abzug von gegebenenfalls bereits beantragten -Abhebungen (Ziffer 6) einziehen.. Falls Sie =FCber einen Zeitraum von 21 = -Tagen -ein Guthaben nur in einer anderen W=E4hrung als Euro haben und der = -geschuldete -Betrag noch nicht ausgeglichen ist, wird PayPal den geschuldeten Betrag = -zum -Zwecke der vorbenannten Aufrechnung in Euro zum Wechselkurs und zu den -Geb=FChren gem=E4=DF Ziffer 8 umrechnen und dann aufrechnen. - -5.3 Risiken bestehender Guthaben in verschiedenen W=E4hrungen. Sie sind = -f=FCr -s=E4mtliche Risiken im Zusammenhang mit bestehenden Guthaben in = -verschiedenen -W=E4hrungen verantwortlich (einschlie=DFlich, ohne darauf beschr=E4nkt = -zu sein, -des Risikos, dass der Wert dieser Guthaben mit =C4nderung der = -Wechselkurse -schwankt, was auf lange Sicht zu einer erheblichen Wertminderung Ihrer -Guthaben f=FChren kann). Sie sagen hiermit zu, dass Sie nicht versuchen -werden, Guthaben in verschiedenen W=E4hrungen f=FCr spekulative = -Gesch=E4fte -einzusetzen. - -5.4 Aufrechnung von Guthaben. PayPal ist berechtigt etwaigen Geb=FChren, -Kosten oder sonstigen uns zustehenden und von Ihnen im Zusammenhang mit = -der -Nutzung unseres Services zahlbaren Betr=E4gen mit Ihren Guthaben oder -k=FCnftigen Zahlungseing=E4ngen auf Ihren Konten aufzurechnen. - -5.5 Sicherungsrecht. Um die Erf=FCllung der vorliegenden Vereinbarung -Ihrerseits zu sichern, gew=E4hren Sie PayPal hiermit ein Pfandrecht = -sowie ein -Sicherungsrecht bez=FCglich Ihres Kontos. - - -6. Abhebung/Einl=F6sen von E-Geld - - 6.1 Wie Sie E-Geld abheben. Sie k=F6nnen ein Guthaben auf -elektronischem Wege auf Ihr in Euro gef=FChrtes Bankkonto =FCberweisen, = -wenn wir -Ihre Identit=E4t angemessen verifiziert haben und so den f=FCr uns = -geltenden -Vorschriften zum Schutz vor Geldw=E4sche und sonstigen rechtlichen -Verpflichtungen entsprechen k=F6nnen und ein Betrugsrisiko minimiert = -haben. -Die Abhebung von E-Geld von Ihrem PayPal Konto stellt eine Einl=F6sung = -des -E-Geld in Euro dar. =DCberweisungen von Guthaben erfolgen = -ausschlie=DFlich in -Euro. Veranlassen Sie die =DCberweisung eines Guthabens in einer anderen -W=E4hrung gilt der Wechselkurs und die Geb=FChren gem=E4=DF Ziffer 8. - -6.2 Mindest- und H=F6chstbetr=E4ge f=FCr eine Abhebung. Der = -Mindestbetrag in -E-Geld, den Sie einl=F6sen k=F6nnen, bel=E4uft sich auf 10 Euro. Der = -H=F6chstbetrag -einer Einl=F6sung ist abh=E4ngig vom Umfang der durchgef=FChrten = -Verifizierung -Ihrer Person und bel=E4uft sich auf 750 Euro pro Monat oder, wenn dieser -Betrag nicht erreicht wird, auf einen Gesamtbetrag von 1.000 Euro = -innerhalb -eines Jahres, nachdem Sie ihr PayPal-Konto zum ersten Mal genutzt haben. = -. -Sie k=F6nnen Ihren H=F6chstbetrag f=FCr Kontoabhebungen in Ihrem Konto = -einsehen. -Abhebungen k=F6nnen bis zu 5 Werktage oder mehr beanspruchen, soweit von = -uns -nicht zu beeinflussende Umst=E4nde oder eine Pr=FCfung zur Vorbeugung = -gegen -Betrug oder Geldw=E4sche hinzutreten. - -6.3 Erh=F6hung Ihres H=F6chstbetrags f=FCr Abhebungen. Sie k=F6nnen = -dieses Limit -erh=F6hen oder aufheben indem Sie sich verifizieren. F=FChren Sie hierzu -folgende Schritte aus: F=FCgen Sie Ihrem PayPal-Konto als Zahlungsquelle = -eine -Kreditkarte hinzu und best=E4tigen Sie diese. - -PayPal beh=E4lt sich vor, zus=E4tzliche Informationen von Ihnen zur -Verifizierung Ihrer Person anzufordern. Mit unseren = -Verifizierungsma=DFnahmen -kommen wir unseren Pflichten zur Bek=E4mpfung von Geldw=E4sche nach. Sie = -sagen -hiermit zu, s=E4mtlichen Anfragen nach weiteren Informationen zu = -entsprechen, -die wir nach billigem Ermessen ben=F6tigen. Dies kann, ohne darauf = -beschr=E4nkt -zu sein, die Anforderung beinhalten, uns bestimmte Ausweisdokumente oder = -zum -Beispiel eine Stromrechnung per Fax, E-Mail oder in anderer Form zu = -senden. - - -7. Kontoaufl=F6sung - - 7.1 Wie Sie Ihr PayPal-Konto aufl=F6sen. Sie k=F6nnen Ihr PayPal-Konto -=FCber den daf=FCr vorgesehenen Weg in Ihrem Kontoprofil aufl=F6sen. Bei -Schlie=DFung eines Kontos werden wir noch ausstehende = -Gesch=E4ftsvorg=E4nge -stornieren. S=E4mtliche Ihrer Guthaben, die mit Gutscheincodes belegt = -sind, -werden mit der Schlie=DFung verfallen. Sie m=FCssen vor Schlie=DFung = -Ihres Kontos -Ihr verbleibendes Guthaben abheben. - -7.2 Beschr=E4nkungen bei Aufl=F6sung Ihres Kontos. Sie d=FCrfen Ihr = -PayPal-Konto -nicht schlie=DFen, um dadurch eine Untersuchung zu umgehen. Sollten Sie -versuchen, Ihr PayPal-Konto zu schlie=DFen, w=E4hrend wir eine = -Untersuchung -durchf=FChren, so k=F6nnen wir Ihr Guthaben f=FCr einen Zeitraum von bis = -zu 180 -Tagen einbehalten, um PayPal oder Dritte gegen das Risiko von -R=FCcklastschriften, Kreditkartenr=FCckbuchungen, Antr=E4gen auf = -K=E4uferschutz, -Geb=FChren, Geldstrafen, Bu=DFgeldern und sonstige Haftung zu = -sch=FCtzen. Sie -bleiben auch nach Aufl=F6sung Ihres Kontos f=FCr s=E4mtliche = -Verpflichtungen im -Zusammenhang mit Ihrem PayPal-Konto haftbar. - -7.3 Nicht eingel=F6ste Guthaben auf ungenutzten Konten. Vorbehaltlich = -der -weiteren Bestimmungen dieser Ziffer bestehen keinerlei = -Verj=E4hrungsfristen im -Hinblick auf die G=FCltigkeit des in Ihrem PayPal-Konto befindlichen = -E-Geldes. -Sollten Sie innerhalb eines Zeitraums von 3 Jahren keinen Zugriff auf = -Ihr -PayPal-Konto aus=FCben, so wird dieses Konto aufgel=F6st. Bei der = -Aufl=F6sung -werden wir die uns von Ihnen vorgelegten Angaben verwenden, um Ihnen = -etwaige -Mittel aus der Einl=F6sung des in Ihrem Konto vorhandenen E-Geldes = -zukommen zu -lassen. Sollten diese Angaben nicht zutreffen und wir infolgedessen = -nicht in -der Lage sein, die Zahlung an Sie vollst=E4ndig auszuf=FChren, werden = -wir Ihr -E-Geld Luxemburger Recht entsprechend bei der Caisse de Consignation -hinterlegen. Die Caisse de Consignation erreichen sie unter: Tresorerie = -de -l=92Etat, 3, rue du St-Esprit, L-1475, Luxemburg, Tel: (+352) 2478-2478, = -Fax: -(+352) 46 72 62. - - -8. Geb=FChren - - 8.1 Geb=FChrentabelle. Sie zahlen folgende Geb=FChren f=FCr die -angegebenen Leistungen: - - - - -Kontoer=F6ffnung und Kontof=FChrung geb=FChrenfrei =20 -Zahlungsauftr=E4ge (mit Ausnahme von Sammelzahlungen) geb=FChrenfrei - -Sammelzahlungen 2 % pro Zahlungsbetrag bis h=F6chstens zur -"Zahlungsobergrenze" Zahlungsobergrenze (abh=E4ngig von der W=E4hrung, = -in -der die Zahlung erfolgt): =A30,65 GBP, =800,85 EUR, $1,00 USD, $1,25 = -CAD, =A5120 -JPY, $1,25 AUD, 1,30 CHF, 6,75 NOK, 9,00 SEK, 6,00 DKK, 3,00 PLN, 210 = -HUF, -24,00 CZK, $1,60 SGD, $7,00 HKD, $1,50 NZD =20 -Eingang von Zahlungen aus Guthaben/Bankguthaben auf ein K=E4uferkonto -geb=FChrenfrei =20 -Eingang von Kreditkartenzahlungen auf ein K=E4uferkonto (Es gilt ein = -Limit von -2 Transaktionen pro Jahr.) 3,4 % + Festgeb=FChr Festgeb=FChr -(abh=E4ngig von der W=E4hrung, in der die Zahlung erfolgt): =A30,20 GBP, = -=800,35 -EUR, $0,30 USD, $0,55 CAD, =A540 JPY, $0,40 AUD, 0,55 CHF, 2,80 NOK, = -3,25 SEK, -2,60 DKK, 1,35 PLN, 90 HUF, 10,00 CZK, $0,50 SGD, $2,85 HKD oder $0,45 = -NZD - -Geld einzahlen vgeb=FChrenfrei =20 -Standardgeb=FChr f=FCr den Zahlungsempfang auf ein Privat- oder = -Gesch=E4ftskonto -(gilt f=FCr s=E4mtliche Zahlungsarten) f=FCr Zahlungen aus:=20 - - -=09 - -=09 - -=09 -1. =D6sterreich -=09 -2. dem Ausland -=09 - -=09 - -=09 - - Bezogen auf den empfangenen Betrag -3,4 % + Festgeb=FChr=20 -3,4 % + Festgeb=FChr Festgeb=FChr (abh=E4ngig von der W=E4hrung, in der = -die -Zahlung empfangen wird): =A30,20 GBP, =800,35 EUR, $0,30 USD, $0,55 CAD, = -=A540 -JPY, $0,40 AUD, 0,55 CHF, 2,80 NOK, 3,25 SEK, 2,60 DKK, 1,35 PLN, 90 = -HUF, -10,00 CZK, $0,50 SGD, $2,85 HKD oder $0,45 NZD =20 -Vorzugskonditionen f=FCr den Zahlungsempfang gewerblicher H=E4ndler auf = -ein -Privat- oder Gesch=E4ftskonto, soweit Sie sich hierzu einmalig gesondert -angemeldet haben: - -Zahlungen aus und in H=F6he von:=20 - - -=09 - -=09 - -=09 -1. =D6sterreich -=802.500,01 EUR - =8010.000,00 EUR -=8010.000,01 EUR - =8050.000,00 EUR -=8050.000,01 EUR - =80100.000,00 EUR -> =80100.000,00 EUR -=09 -2. dem Ausland -=802.500,01 EUR - =8010.000,00 EUR -=8010.000,01 EUR - =8050.000,00 EUR -=8050.000,01 EUR - =80100.000,00 EUR -> =80100.000,00 EUR -=09 - -=09 - -=09 - -Die Vorzugskonditionen f=FCr gewerbliche Verk=E4ufer werden monatlich = -anhand des -Umsatzvolumens im Vormonat festgelegt=20 - - - - -2,9 % + Festgeb=FChr -2,7 % + Festgeb=FChr -2,4 % + Festgeb=FChr -1,9 % + Festgeb=FChr - - - -2,9 % + Festgeb=FChr -2,7 % + Festgeb=FChr -2,4 % + Festgeb=FChr -1,9 % + Festgeb=FChr Festgeb=FChr (abh=E4ngig von der W=E4hrung, in der = -die -Zahlung empfangen wird): =A30,20 GBP, =800,35 EUR, $0,30 USD, $0,55 CAD, = -=A540 -JPY, $0,40 AUD, 0,55 CHF, 2,80 NOK, 3,25 SEK, 2,60 DKK, 1,35 PLN, 90 = -HUF, -10,00 CZK, $0,50 SGD, $2,85 HKD oder $0,45 NZD =20 -Abhebung von Ihrem Guthaben Kostenlos f=FCr =80100,00 EUR oder mehr, = -=801,00 -EUR f=FCr =8099,99 EUR oder weniger auf Bankkonten in =D6sterreich. Geb - =FChren weltweit - -Geb=FChr f=FCr Kreditkartenr=FCckbuchungen Ein der im Rahmen der -Kreditkartenr=FCckbuchung erhobenen Bearbeitungsgeb=FChr entsprechender = -Betrag, -es sei denn, Sie fallen unter den Schutz des PayPal-Verk=E4uferschutz. -Bearbeitungsgeb=FChr (je nach W=E4hrung): =A37,00 GBP, =8011,25 EUR, = -$15,00 CAD, -$10,00 USD, =A51.300 JPY, $15,00 AUD, 10,00 CHF, 65,00 NOK, 80,00 SEK, = -60,00 -DKK, 30,00 PLN, 2.000 HUF, 250,00 CZK, $15,00 SGD, $75,00 HKD, $15,00 = -NZD - -Wechselkurs und Geb=FChr Der Wechselkurs entspricht dem von PayPal zum -Zeitpunkt des Abschlusses eines Gesch=E4ftsvorgangs festgelegten = -Wechselkurs -f=FCr den Einzelhandel. Der Wechselkurs wird den Marktbedingungen in -regelm=E4=DFigen Abst=E4nden angepasst und schlie=DFt eine Geb=FChr von = -2,5% =FCber dem -Kurs ein, zu dem PayPal die entsprechende W=E4hrung erwirbt. Die = -Geb=FChr in -H=F6he von 2,5% wird von PayPal einbehalten. =20 -Geb=FChr f=FCr die Anforderung von Unterlagen =A310 oder der Gegenwert = -in -einer anderen W=E4hrung (pro Exemplar). Wir berechnen Ihnen keine = -Geb=FChren f=FCr -Unterlagen, die im Zusammenhang mit Ihrer im guten Glauben vorgebrachten -Meldung eines Buchungsfehlers auf Ihrem PayPal-Konto angefordert werden. - - - - - - 8.2 F=E4lligkeit, Steuern und Geb=FChren Dritter. Alle angegebenen -Geb=FChren sind sofort f=E4llig. Die Geb=FChren verstehen sich = -einschlie=DFlich -s=E4mtlicher anfallenden Steuern soweit diese =FCberhaupt entstehen; es = -k=F6nnen -weitere Steuern oder Geb=FChren anfallen, die nicht durch PayPal gezahlt = -oder -an Sie weitergegeben werden. Insbesondere Telefongeb=FChren und = -sonstigen -Kosten, wie Geb=FChren Ihres Internetdienstanbieters, die infolge Ihrer -Nutzung unseres Service entstehen sind von Ihnen zu tragen. - - -9. Verbotene Aktivit=E4ten - - Sie sagen hiermit zu, Folgendes im Zusammenhang mit Ihrer Nutzung -unserer Website, Ihres Kontos oder des Services und im Zuge Ihrer -gesch=E4ftlichen Kontakte mit PayPal, einem Nutzer oder einem Dritten, = -nicht -zu tun: - - - -a. gegen die vorliegenden Nutzungsbedingungen, den -Kreditkartenrahmenvertrag, die PayPal-Nutzungsrichtlinie - oder eine = -sonstige -Vereinbarung zu versto=DFen, die Sie mit PayPal abgeschlossen haben; -b. gegen eine gesetzliche Vorschrift, einen Vertrag oder eine -Verordnung zu versto=DFen (beispielsweise gegen Bestimmungen =FCber -Finanzdienstleistungen, Verbraucherschutz, Wettbewerbsrecht, Schutz vor -Diskriminierung oder irref=FChrender Werbung); -c. Urheberrechte (Copyrights), Patente, Warenzeichen, -Handelsgeheimnisse oder Rechte zur Ver=F6ffentlichung oder = -Datenschutzrechte -von PayPal oder einem Dritten oder sonstige Schutzrechte zu verletzen; -d. sich anz=FCglich, ehrverletzend, verleumderisch, in rechtswidrig -drohender oder rechtswidrig bel=E4stigender Weise zu verhalten; -e. falsche, unzutreffende oder irref=FChrende Angaben zu machen; -f. Zahlungen mit Geldern vorzunehmen, bei denen die berechtigte Annahme -besteht, dass diese aus betr=FCgerischen oder sonst verbotene = -Aktivit=E4ten -stammen; -g. die Zusammenarbeit bei einer Untersuchung oder die Best=E4tigung = -Ihrer -Identit=E4t oder sonstige uns gegen=FCber zu leistenden Angaben zu = -verweigern; -h. den Versuch zu unternehmen, eine Handlung vorzunehmen, die zu -ungerechtfertigter Bereicherung im Zuge eines Konflikts f=FChren = -k=F6nnte, weil -Zahlungseing=E4nge sowohl von PayPal als auch dem Verk=E4ufer, der Bank = -oder der -Kreditkartengesellschaft f=FCr ein- und denselben Gesch=E4ftsvorgang = -erfolgen, -oder den Versuch, solche Zahlungseing=E4nge zu erwirken; -i. einen Ihre eigene Identit=E4t verschleiernden Stellvertreter -einzusetzen; -j. ein PayPal-Konto zu f=FChren, das mit einem anderen Konto verbunden -ist, das wiederum in eine der beschriebenen, eingeschr=E4nkten = -Aktivit=E4ten -verwickelt ist. Wir sind berechtigt, au=DFer den Kontoangaben auch = -weitere -Beweismittel zu nutzen, um zu ermitteln, ob Sie unter einem anderen = -Namen -ein PayPal-Konto f=FChren, einschlie=DFlich, ohne darauf beschr=E4nkt zu = -sein, -Internet-Adressen, g=E4ngige Firmennamen, eBay-Mitgliedsnamen, = -Telefonnummern -und Postanschriften; -k. Ihre Gesch=E4fte in einer Weise zu f=FChren oder die Leistungen in = -einer -Weise zu nutzen, die zu Beschwerden, Konflikten, Antr=E4gen auf = -K=E4uferschutz, -R=FCcklastschriften, Kreditkartenr=FCckbuchungen, Geb=FChren, = -Geldstrafen, -Bu=DFgeldern oder einer sonstigen Haftung gegen=FCber PayPal, einem = -Nutzer, -einem Dritten oder Ihnen gegen=FCber Anlass gibt oder geben k=F6nnte; -l. unser Online-Konfliktbeilegungsverfahren und/oder unser -K=E4uferschutzprogramm zu missbrauchen; -m. den Eingang einer =FCberm=E4=DFigen Zahl von Beschwerden im Hinblick = -auf -Ihr PayPal-Konto oder im Hinblick auf das von Ihnen betriebene = -Gesch=E4ft bei -PayPal zu verursachen; -n. unseren Service nutzen, wenn dies ein hohes Risiko f=FCr uns aufgrund -Ihrer Kreditw=FCrdigkeitsbewertung bei Ausk=FCnften darstellt; -o. Ihr PayPal-Konto oder sonst unseren Service in einer Weise zu -nutzen, die von PayPal, Visa, MasterCard, American Express oder einer = -Bank -und/oder Zahlungsbearbeitern berechtigterweise als Missbrauch des -Kreditkartensystems oder als eine Verletzung der Vorschriften der -Kreditkartengesellschaft angesehen wird; -p. zuzulassen, dass Ihr PayPal-Konto einen Kontostand aufweist, der -einem uns geschuldeten Betrag entspricht oder sonstige Handlungen -vorzunehmen, die zu einem Kredit- oder Betrugsrisiko uns gegen=FCber = -f=FChren; -q. sich selbst einen Barvorschuss durch Nutzung Ihrer Kreditkarte zu -gew=E4hren oder einen solchen anderen zu erm=F6glichen; -r. die Leistungen von einem Land aus abzurufen, das sich nicht auf der -Liste der zugelassenen L - =E4nder von = -PayPal -befindet; -s. Daten eines anderen Nutzers gegen=FCber Dritten offenzulegen, an -Dritte weiterzugeben oder solche Daten f=FCr Marketingzwecke zu nutzen, = -es sei -denn, Ihnen ist diesbez=FCglich die ausdr=FCckliche Zustimmung des = -Nutzers -erteilt worden; -t. ungebeten E-Mails an einen Nutzer zu senden oder unseren Service -daf=FCr zu nutzen, Zahlungen f=FCr den Versand oder eine Hilfsleistungen = -beim -Versand von unerbetenen E-Mails (Spam) zu erheben oder zu empfangen; -u. eine Handlung vorzunehmen, die eine unzumutbare oder -unverh=E4ltnism=E4=DFige Belastung unserer Betriebsmittel darstellt; -v. das Eindringen von Viren, Trojanern, W=FCrmern oder sonstigen -Programmabl=E4ufen zu erm=F6glichen, die [Betriebs-] Systeme, Daten oder -Informationen besch=E4digen, beeintr=E4chtigen, heimlich abfangen oder = -au=DFer -Kraft setzen; -w. einen Such-Roboter, eine Spinne, eine sonstige automatische -Vorrichtung oder ein mechanisches Verfahren zur =DCberwachung oder -Vervielf=E4ltigung unserer Website ohne unsere vorherige schriftliche -Einwilligung zu nutzen; -x. eine Vorrichtung, Software oder einen Programm-Ablauf nutzen, die -unsere Seitenk=F6pfe mit Robots-Exclusion-Protokollen zu umgehen, unsere -Webseite oder Dienstleistungen zu st=F6ren oder eine solche St=F6rung zu -versuchen; -y. Inhalte der Website(s) ohne unsere schriftliche Zustimmung oder die -Zustimmung eines zust=E4ndigen Dritten zu vervielf=E4ltigen, = -nachzubilden, an -Dritte weiterzuleiten, zu ver=E4ndern, umzugestalten, davon abgeleitete -Bearbeitungen zu erstellen, =F6ffentlich auszustellen oder darzubieten; -z. Handlungen vorzunehmen, die dazu f=FChren k=F6nnen, dass unsere -Internetdienstleister, Zahlungsbearbeiter oder sonstiger Zulieferer ihre -Leistungen uns gegen=FCber nicht mehr erbringen; -aa. den Service zu nutzen, um die Verfahren und/oder Gewohnheiten bei -Kreditkartennutzung zu testen; -bb. Ihr Passwort an Dritte weiterzugeben oder sich das Passwort eines -anderen Nutzers geben zu lassen; -cc. sonstige Ma=DFnahmen oder Eingriffe vorzunehmen oder zu unterlassen, -die den ordnungsgem=E4=DFen Betrieb des Service oder der als Bestandteil = -des -Services durchgef=FChrten oder sonstigen Aktivit=E4ten gem=E4=DF der = -Bestimmungen -der vorliegenden Nutzungsbedingungen st=F6ren k=F6nnten, oder den = -Versuch hierzu -zu unternehmen. -dd. PayPal als Zahlungsmethode so zu integrieren, dass es f=FCr Kunden -nicht ersichtlich ist, ob sie sich tats=E4chlich auf eine PayPal-Seite -befinden (Beispiel: iFraming, bei dem die URL f=FCr den Kunden nicht = -sichtbar -ist). - - -10. Ihre Haftung - Unsere Ma=DFnahmen - - 10.1 Ihre Haftung. Sie sind verantwortlich f=FCr s=E4mtliche -R=FCcklastschriften, Kreditkartenr=FCckbuchungen, sonstige = -R=FCckbuchungen von -Geldmitteln, Antr=E4ge auf K=E4uferschutz, Geb=FChren, Geldstrafen, = -Bu=DFgelder und -sonstige gegen=FCber PayPal, einem Nutzer von PayPal oder einem Dritten -aufgrund Ihrer Nutzung des Services und/oder durch Ihren Versto=DF gegen = -die -vorliegenden Nutzungsbedingungen entstehenden Schaden. Sie sagen hiermit = -zu, -PayPal, den betreffenden Nutzer oder einen Dritten von solcher Haftung -vollumf=E4nglich freizustellen. - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_4479 spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_4479 --- spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_4479 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_4479 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - -O -eXg by Interwave - -Oiӂ肪ȁj -ĂƁE΂E񂽁[[ - -TEL - - -FAX - - -[AhX -thomas@e-interwave.com - -]R[X - - -̏ڍׁEv] -eXgłB by Interwave Corp. - -] -2008N11 - -؍ݐze diff -Nru spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4491_Gappy-Roadrunner-I spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4491_Gappy-Roadrunner-I --- spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4491_Gappy-Roadrunner-I 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4491_Gappy-Roadrunner-I 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCJW0hPCVJJWklcyVKITwbKEI=?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4493 spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4493 --- spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4493 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4493 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCJVclaiVzJUgbKEI=?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4494 spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4494 --- spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4494 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4494 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCI0EjbSNhI3ojbyNuGyhC?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4495 spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4495 --- spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4495 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4495 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: FW: web =?ISO-2022-JP?B?GyRCJE4jRiNUI1A+cEpzSlE5OSRIJDRPIk1tGyhC?= - =?ISO-2022-JP?B?GyRCNGokJBsoQg==?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4497 spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4497 --- spamassassin-3.4.6/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4497 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/GAPPY_SUBJECT/fp_bug6149_thomas_att4497 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: RE: Corporation =?ISO-2022-JP?B?GyRCJE4jSSNQJSIlSSVsJTkhIhsoQlN1?= - =?ISO-2022-JP?B?Ym5ldCAbJEIhIhsoQkdhdGV3YXkbJEIhIhsoQkROUw==?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/HELO_DYNAMIC_HCC/fp-bug5747-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/HELO_DYNAMIC_HCC/fp-bug5747-1 --- spamassassin-3.4.6/trunk-only/t.rules/HELO_DYNAMIC_HCC/fp-bug5747-1 2009-07-06 10:07:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/HELO_DYNAMIC_HCC/fp-bug5747-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Envelope-from: -Envelope-to: -Received: from [208.97.119.114] (helo=cmr-208-97-119-114.cr.net.cable.rogers.com) - by bronze.cs.yorku.ca with esmtp (Exim 4.67) - (envelope-from ) - id 1J1kaC-0005L5-2Z - for xxx@cse.yorku.ca; Mon, 10 Dec 2007 10:30:12 -0500 -Received: from no.name.available by cmr-208-97-119-114.cr.net.cable.rogers.com - via smtpd (for bronze.cs.yorku.ca [130.63.90.34]) with ESMTP; Mon, 10 Dec 2007 10:28:38 -0500 -Content-class: urn:content-classes:message -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----_=_NextPart_001_01C83B41.8D5A5B33" -Subject: Sending forms error message -Disposition-Notification-To: "Geoffrey xxxx" -X-MimeOLE: Produced By Microsoft Exchange V6.5 -Date: Mon, 10 Dec 2007 10:30:10 -0500 -Message-ID: <96A3D16A89F07147A2B49565DBF5D0900E0024@GOLDSERV.Goldnet.local> -X-MS-Has-Attach: -X-MS-TNEF-Correlator: -Thread-Topic: Sending forms error message -Thread-Index: Acg7QY0VxxYNUxPyQuaSaioCdmPd3A== -From: "Geoffrey xxxx" -To: - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/HELO_STATIC_HOST/bug5747-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/HELO_STATIC_HOST/bug5747-1 --- spamassassin-3.4.6/trunk-only/t.rules/HELO_STATIC_HOST/bug5747-1 2009-07-06 10:08:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/HELO_STATIC_HOST/bug5747-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Envelope-from: -Envelope-to: -Received: from [208.97.119.114] (helo=cmr-208-97-119-114.cr.net.cable.rogers.com) - by bronze.cs.yorku.ca with esmtp (Exim 4.67) - (envelope-from ) - id 1J1kaC-0005L5-2Z - for xxx@cse.yorku.ca; Mon, 10 Dec 2007 10:30:12 -0500 -Received: from no.name.available by cmr-208-97-119-114.cr.net.cable.rogers.com - via smtpd (for bronze.cs.yorku.ca [130.63.90.34]) with ESMTP; Mon, 10 Dec 2007 10:28:38 -0500 -Content-class: urn:content-classes:message -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----_=_NextPart_001_01C83B41.8D5A5B33" -Subject: Sending forms error message -Disposition-Notification-To: "Geoffrey xxxx" -X-MimeOLE: Produced By Microsoft Exchange V6.5 -Date: Mon, 10 Dec 2007 10:30:10 -0500 -Message-ID: <96A3D16A89F07147A2B49565DBF5D0900E0024@GOLDSERV.Goldnet.local> -X-MS-Has-Attach: -X-MS-TNEF-Correlator: -Thread-Topic: Sending forms error message -Thread-Index: Acg7QY0VxxYNUxPyQuaSaioCdmPd3A== -From: "Geoffrey xxxx" -To: - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/MIME_BASE64_TEXT/fp-bug-5909 spamassassin-4.0.0~rc3/trunk-only/t.rules/MIME_BASE64_TEXT/fp-bug-5909 --- spamassassin-3.4.6/trunk-only/t.rules/MIME_BASE64_TEXT/fp-bug-5909 2009-06-29 11:47:38.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/MIME_BASE64_TEXT/fp-bug-5909 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Received: from ns.siemens.com.cn (ns.siemens.com.cn [194.138.237.52]) - by david.siemens.com.cn (8.11.7/8.11.7) with ESMTP id m4CGZs123473 - for ; Tue, 13 May 2008 00:35:54 +0800 (CST) -Received: from pekw906a.cn001.siemens.net (localhost [127.0.0.1]) - by ns.siemens.com.cn (8.11.7/8.11.7) with ESMTP id m4CGZrT04530 - for ; Tue, 13 May 2008 00:35:53 +0800 (CST) -Received: from PEKW977A.cn001.siemens.net ([139.24.237.131]) by pekw906a.cn001.siemens.net with Microsoft SMTPSVC(6.0.3790.3959); Tue, 13 May 2008 00:35:51 +0800 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.4133 -Content-Class: urn:content-classes:message -MIME-Version: 1.0 -Content-Type: text/plain; - charset="gb2312" -Importance: normal -Priority: normal -Content-Transfer-Encoding: base64 -Subject: Out of Office AutoReply: XXXXXX XXXXXX XXXXXX XXXXXX -Date: Tue, 13 May 2008 00:35:51 +0800 -Message-ID: <833F7F60FAF6354197F5F30AE005EF6D0CFE5E@PEKW977A.cn001.siemens.net> -X-MS-Has-Attach: -X-MS-TNEF-Correlator: -Thread-Topic: XXXXXX XXXXXX XXXXXX XXXXXX -thread-index: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -From: "Sender, Example" -To: "Example Recipient" -X-OriginalArrivalTime: 12 May 2008 16:35:51.0755 (UTC) FILETIME=[3DD001B0:01C8B44E] - -VGhhbmtzIGZvciB5b3VyIGVtYWlsLiBJIGFtIG91dCBvZiBvZmZpY2UgdGlsbCBNYXkgMjMuIER1 -cmluZyB0aGlzIHBlcmlvZCwgSSBoYXZlIGxpbWl0ZWQgYWNjZXNzIHRvIG15IG1haWxib3guIEkg -d2lsbCByZXBseSB5b3VyIGVtYWlsIGFzIHNvb24gYXMgcG9zc2libGUuIA0KDQpTb3JyeSBmb3Ig -YW55IGluY29udmVuaWVuY2UgY2F1c2VkLg0KDQpUaGFuayB5b3UsDQpVc2VyDQoNCg0KSU1QT1JU -QU5UIE5PVEU6IFRoaXMgZS1tYWlsIGFuZCBhbnkgYXR0YWNobWVudCBhcmUgY29uZmlkZW50aWFs -IGFuZCBtYXkgY29udGFpbiB0cmFkZSBzZWNyZXRzIGFuZCBtYXkgYWxzbyBiZSBsZWdhbGx5IHBy -aXZpbGVnZWQgb3Igb3RoZXJ3aXNlIHByb3RlY3RlZCBmcm9tIGRpc2Nsb3N1cmUuIElmIHlvdSBo -YXZlIHJlY2VpdmVkIGl0IGluIGVycm9yLCB5b3UgYXJlIGhlcmV3aXRoIGluZm9ybWVkIGFib3V0 -IGl0cyBzdGF0dXMuIFBsZWFzZSBub3RpZnkgdXMgaW1tZWRpYXRlbHkgYnkgcmVwbHkgZS1tYWls -IGFuZCB0aGVuIGRlbGV0ZSB0aGlzIGUtbWFpbCBhbmQgYW55IGF0dGFjaG1lbnQgZnJvbSB5b3Vy -IHN5c3RlbS4gWW91IGFyZSBwcm9oaWJpdGVkIGZyb20gbWFraW5nIHVzZSBvZiBvciBjb3B5aW5n -IHRoaXMgZS1tYWlsIG9yIGFueSBhdHRhY2htZW50IG9yIGRpc2Nsb3NpbmcgdGhlIGNvbnRlbnRz -IHRvIGFueSBvdGhlciBwZXJzb24uDQoNCjxEaXNjbGFpbWVyIGluIENoaW5lc2UgYmVsb3csIGNo -YXJhY3RlcnMgbWF5IG5vdCBiZSBkaXNwbGF5ZWQgY29ycmVjdGx5Lj4NCg0K1tjSqszhyr6jurTL -08q8/rywuL28/r7fsaPD3NDU1sqjrLD8uqzJzNK1w9jD3KGiyty3qMLJsaO7pLK7tcPQucK2oaPI -57n7xPrS4s3iytW1vbTL08q8/qOszNi0y8zh0NHE+rTL08q8/rXEu/rD3NDUo6zH68GivLTNqNaq -ztLDx7KitNPE+rXEz7XNs9bQyb6z/bTL08q8/rywuL28/qGjyOe5+8T6srvKx7TL08q8/tOmtbG1 -xMrVvP7Iy6Osx+vXotLisru/ybbUtMvTyrz+vLDG5Li9vP69+NDQuLTWxrvyz/LL+8jLzbjCtsbk -xNrI3aGjDQoNCg0K - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/NO_RELAYS/fp_bug6049_ex1 spamassassin-4.0.0~rc3/trunk-only/t.rules/NO_RELAYS/fp_bug6049_ex1 --- spamassassin-3.4.6/trunk-only/t.rules/NO_RELAYS/fp_bug6049_ex1 2009-08-06 20:17:01.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/NO_RELAYS/fp_bug6049_ex1 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Received: from annwfn.example.com (annwfn-eth.example.com [IPv6:2001:4bd8:0:104:280:adff:fe74:4c20]) - (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) - (No client certificate requested) - by boaz.example.org (Postfix) with ESMTPS id 90D649C08C - for ; Fri, 23 Jan 2009 11:10:54 +0100 (CET) -X-SMTP-Sender: IPv6:2001:4bd8:0:666:248:54ff:fe12:ee3f -Received: from belenus.example.com (belenus.example.com [IPv6:2001:4bd8:0:666:248:54ff:fe12:ee3f]) - by annwfn.example.com (8.14.3/8.14.1) with ESMTP id n0NAACZu026603 - for ; Fri, 23 Jan 2009 11:10:14 +0100 -X-MSA-Host: belenus.example.com -Received: (from xxxxx@localhost) - by belenus.example.com (8.14.3/8.14.1/Submit) id n0NAAAEE024105; - Fri, 23 Jan 2009 11:10:10 +0100 -From: XXXXXXXXXXXXXXX -Message-Id: <200901231010.n0NAAAEE024105@belenus.example.com> -To: Whoever - -xx diff -Nru spamassassin-3.4.6/trunk-only/t.rules/OBFUSCATING_COMMENT/fp-bug6188-1 spamassassin-4.0.0~rc3/trunk-only/t.rules/OBFUSCATING_COMMENT/fp-bug6188-1 --- spamassassin-3.4.6/trunk-only/t.rules/OBFUSCATING_COMMENT/fp-bug6188-1 2009-09-03 08:45:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/OBFUSCATING_COMMENT/fp-bug6188-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,889 +0,0 @@ -From mail_info@pia.co.jp Fri Jul 04 02:01:35 2008 -Delivered-To: kenji@example.com -Received: by 10.86.23.3 with SMTP id 3cs86913fgw; - Thu, 3 Jul 2008 23:02:19 -0700 (PDT) -Received: by 10.114.201.1 with SMTP id y1mr2765766waf.93.1215151337517; - Thu, 03 Jul 2008 23:02:17 -0700 (PDT) -Return-Path: -Received: from psmtp.com (exprod7mx269.postini.com [64.18.2.123]) - by mx.google.com with SMTP id g31si1659851rvb.2.2008.07.03.23.01.43; - Thu, 03 Jul 2008 23:02:17 -0700 (PDT) -Received-SPF: softfail (google.com: domain of transitioning z-pia-x7kkwi-0-6ao-005kenjiexample.com@bma.www.mp.pia.jp does not designate 64.18.2.123 as permitted sender) client-ip=64.18.2.123; -Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning z-pia-x7kkwi-0-6ao-005kenjiexample.com@bma.www.mp.pia.jp does not designate 64.18.2.123 as permitted sender) smtp.mail=z-pia-x7kkwi-0-6ao-005kenjiexample.com@bma.www.mp.pia.jp -Received: from source ([124.215.209.79]) by exprod7mx269.postini.com ([64.18.6.14]) with SMTP; - Fri, 04 Jul 2008 02:01:42 EDT -Errors-To: z-pia-x7kkwi-0-6ao-005kenjiexample.com@bma.www.mp.pia.jp -Date: Fri, 4 Jul 2008 15:01:35 +0900 (JST) -From: =?ISO-2022-JP?B?GyRCIXckVCQiGyhCLxskQiU3JU0lXhsoQg==?= -Reply-To: =?ISO-2022-JP?B?GyRCIXckVCQiGyhCLxskQiU3JU0lXhsoQg==?= -Subject: =?ISO-2022-JP?B?GyRCIVohdyRUJCIhWyUkJXMlPyVTJWUhPCQiJGohKiFYJTklVCE8JUkhJiVsITwlNSE8IVlMQEZ8OHgzKyFEGyhCZXRjLhskQj5wSnNLfjpcGyhCISE=?= -Message-ID: <1215151248121.2008101330.pia.0.8160.01000000@ad35.www.mp.pia.jp> -To: kenji@example.com -MIME-Version: 1.0 -Content-Type: text/html; charset="ISO-2022-JP" -Content-Transfer-Encoding: quoted-printable -Precedence: bulk -X-pstn-neptune: 3/3/1.00/90 -X-pstn-levels: (S:45.75753/99.90000 CV:99.0000 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) -X-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c -X-pstn-addresses: from [166/7] -X-UID: 1335 -Status: RO -X-Keywords: -Content-Length: 38669 - - - - - -=1B$B!w$T$"%a!<%k%^%,%8%s!?%7%M%^!!!A=1B(B2008/7/4=1B$BG[?.!A=1B= -(B - -pJs!"?7:n%m= -!<%I%7%g!<$N:nIJ>R2p$J$I!"MW%A%'%C%/$N>pJs$,@9$j$@$/$5$s!*Kh=3D56bMKF|G[= -?.Cf!*=1B(B"> - - - - - - - -
    - - - - - - - - - -
    - - - - - -
    2008/07/04
    		=1B$B!!=1B(B
    -
    - - - - - - - - - - - -
    - - - -
    - - - - - -
    - - - - -=20 - -
    3D"=1B$B!X%9%T!<%I!&%l!<%5!<!Y<L??=1B(B"
    -=1B$BF|K\$N%"%K%a!V%^%C%O=1B(BGoGoGo=1B$B!W$,3$$r1[$(!"%O%j%&%C%I$X!*= -=1B(B
    -Rain=1B$B!u%(%_!<%k!&%O!<%7%e$N%$%s%?%S%e!<$b%A%'%C%/!*=1B(B
    - =1B$B!X%9%T!<%I!= -&%l!<%5! -7=1B$B7n=1B(B5=1B$BF|=1B(B(=1B$BEZ=1B(B)=1B$B8x3+=1B(B

    - -Rain=1B$B%$%s%?%S%e!<$O$3$A$i=1B(B
    -=1B$B%(%_!<%k!&%O!<%7%e=1B(B =1B$B%$%s%?%S%e!<$O$3$A$i=1B(B
    -
    -
    - - - - - -
    - - - - - - - -
    - - - - - - - -
    3D"line
    -<= -/TD>
    = -=1B$B!X%/%i%$%^!<%:!&%O%$!Y=1B(B

    -=1B$B?M5$%_%9%F%j!<:n2H!&2#;3=3D(IW$K$h$kF|K\;K>e:G0-$N9R6u5!;v8N$rBj:`= -$K$7$?F1L>>.@b$,=1B(BTV=1B$B%I%i%^$r7P$F1G2h$K!*=1B(B    		3D"=1B$B!X%/%i%$%^!<%:!&%O%$!Y<L??=1B(B"=1B$B!X= -=3Dc5JCc0kJU!Y=1B(B

    - =1B$B%@%a?FIc$,!V%b%F$?$$!W$H$$$&IT=3Dg$JM}M3$G;O$a$?5JCcE9$J$N$= -K!"$J$<$+?4$,L~$5$l$^$9!#=1B(B -     		3D"=1B$B!X=3Dc5JCc0kJU!Y<L??=1B(B"
    -
    - - - - - -
    - - - - - - - - -
    - - - - - - - - -
    = -3D"topics"
    -
    =1B$B!V%Y= -%,%9$NNx$K>!$D%k!<%k!W%"%s%1!<%H=1B(B -

    -=1B$BCjA*$G%-%c%a%m%s!&%G%#%"%9!u%"%7%e%H%s!&%+%C%A%c!7BT= -!#=1B(B

    =1B$B!X%Y%,%9$NNx$K>!$D%k!<%k!Y:nIJ>pJs$O$3$A$i=1B(B    		3D"=1B$B!X%Y%,%9$NNx$K!$D%k!<%k!Y=1B$B!= -X33$N>e$N%]%K%g!Y%(%T%=3D!<%IJg=3D8=1B(B

    -=1B$B$"$J$?$,!V@8$^$l$F$-$F$h$+$C$?!W$H;W$($k%(%T%=3D!<%I$rBgJg=3D8!*= -=1B(B

    =1B$B!X33$N>e$N%]%K%g!Y:nIJ>pJs$O$3$A$i=1B(B    		3D"=1B$B!X33$Ne$N%]%K%g!Y
    -
    -
    - - - - - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    3D""
    -=1B$B!Z=1B(B7=1B$B7n=1B(B6=1B$BF|=1B(B(=1B$BF|=1B(B) 10:00=1B$B![= -=1B(B
    =1B$B!X2V$h$jCK;R%U%!%$%J%k!YBg%R%C%HIqBf0';"=1B(B (=1B$BA49q= -=1B(B)
    -=1B$B?M5$%7%j!<%:$,$D$$$K407k!*=1B(B =1B$BM-=3D*$NH~$r>~$k$Y$/%i%9%Y%,%= -9$H9a9A$G$N0lBg%m%1$r4:9T!#=1B(B100=1B$B2/1_$N9b5i%F%#%"%i$r=3Dd$kBgA{F0= -$r<4$K!"$D$/$7$H=1B(BF4=1B$B$N%a%s%P!<$=3D$l$>$l$NNx$N9TJ}$d%I%i%^$,IA$+= -$l$k!#=1B(B
    -=1B$B""=1B(B7=1B$B7n=1B(B12=1B$BF|=1B(B(=1B$BEZ=1B(B) 11:30=1B$B$N2s>e1= -GA0!!;%KZ%7%M%^%U%m%s%F%#%"=1B(B =1B$B%7%"%?!<=1B(B5
    -=1B$B""=1B(B7=1B$B7n=1B(B12=1B$BF|=1B(B(=1B$BEZ=1B(B) 17:10=1B$B$N2s>e1= -GA0!!=1B(BTOHO=1B$B%7%M%^%:L>8E20%Y%$%7%F%#=1B(B SCREEN4
    -=1B$B""=1B(B7=1B$B7n=1B(B12=1B$BF|=1B(B(=1B$BEZ=1B(B) 19:30=1B$B$N2s>e1= -G8e!!%f%J%$%F%C%I!&%7%M%^%-%c%J%k%7%F%#=1B(B13 =1B$B%9%/%j!<%s=1B(B13 -=1B$B""=1B(B7=1B$B7n=1B(B13=1B$BF|=1B(B(=1B$BF|=1B(B) =1B$BCk=1B(B12:10= -=1B$B$N2s>e1GA0!!=1B(BTOHO=1B$B%7%M%^%:G_ED=1B(B THEATRE1
    -=1B$B""=1B(B7=1B$B7n=1B(B13=1B$BF|=1B(B(=1B$BF|=1B(B) 16:15=1B$B$N2s>e1= -G8e=1B(B/20:00=1B$B$N2s>e1GA0!!F|7`=1B(BPLEX =1B$BF|7`=1B(B2
    -[=1B$BEPCEe??1{=1B(B/=1B$B>>K\=3Da=1B= -(B/=1B$B>.7*=3D\=1B(B/=1B$B>>EDfFB@=1B(B/=1B$B0$ItNO=1B(B/=1B$B@P0f9/@24= -FFD=1B(B
    -=1B$B!X2V$h$jCK;R%U%!%$%J%k!Y:nIJ>pJs$O$3$A$i=1B(B=20 -
    -=1B$B!Z=1B(B7=1B$B7n=1B(B12=1B$BF|=1B(B(=1B$BEZ=1B(B) 10:00=1B$B![= -=1B(B
    =1B$B!X$?$_$*$N$7$"$o$;!Y=3DiF|IqBf0';"=1B(B (=1B$BEl5~=1B(B)
    -=1B$B4d>>N;$,=1B(B15=1B$BG/$V$j$K4FFD$rL3$a$?:G?7:n!#%I%i%^!V;~8z7Y;!!W= -$G%3%s%S$rAH$s$@%*%@%.%j%8%g!<$HKc@85WH~;R$,!"$*8+9g$$$+$i7k:'$^$G$NF;$N= -$j$r1&1}:81}$9$k%+%C%W%k$r1i$8$k!#l$9$k9k2Z6&1i?X$b8+F($;$J$$!#= -=1B(B
    -=1B$B""=1B(B7=1B$B7n=1B(B19=1B$BF|=1B(B(=1B$BEZ=1B(B) 10:40=1B$B$N2s>e1= -G8e=1B(B/13:40=1B$B$N2s>e1GA0!!%7%M%9%$%C%A6d:B=1B(B1
    -[=1B$BEPCE>N;4FFD=1B(B(=1B$B"(D+$N2s$= -N$_=1B(B)/=1B$B%*%@%.%j%8%g!<=1B(B/=1B$BKc@85WH~;R=1B(B/=1B$B86EDK'M:=1B= -(B/=1B$B>.NS70=1B(B
    -=1B$B!T%W%l%j%6!<%V -=1B$B!X$?$_$*$N$7$"$o$;!Y:nIJ>pJs$O$3$A$i=1B(B=20 -
    -=1B$B!Z=1B(B7=1B$B7n=1B(B12=1B$BF|=1B(B(=1B$BEZ=1B(B) 10:00=1B$B![= -=1B(B
    =1B$B!XI4K|1_$H6lCn=3Dw!Y=3DiF|IqBf0';"=1B(B (=1B$BEl5~!&?@F`@n= -!&B>=1B(B)
    -=1B$B?M$H5wN%$r$H$k$3$H$G<+J,$r/$7Iw= -JQ$o$j$JJk$i$7$OH`=3Dw$K$I$s$JJQ2=3D$r$b$?$i$9$N$+!)=1B(B =1B$BAs0fM%$,<= -g?M8x$r9%1i!#=1B(B
    -=1B$B""=1B(B7=1B$B7n=1B(B19=1B$BF|=1B(B(=1B$BEZ=1B(B) 10:00=1B$B$N2s>e1= -G8e=1B(B/=1B$BCk=1B(B12:40=1B$B$N2s>e1GA0!!%7%M%;%>%s=3DBC+=1B(B
    -=1B$B""=1B(B7=1B$B7n=1B(B19=1B$BF|=1B(B(=1B$BEZ=1B(B) 13:10=1B$B$N2s>e1= -G8e!!%7%M!&%j!<%V%kCSB^=1B(B1
    -=1B$B""=1B(B7=1B$B7n=1B(B19=1B$BF|=1B(B(=1B$BEZ=1B(B) 15:50=1B$B$N2s>e1= -G8e!!%A%M%A%C%?=1B(B =1B$B%A%M=1B(B11
    -[=1B$BEPCE -=1B$B!T%W%l%j%6!<%V -=1B$B!z=1B(B7/21(=1B$B7n!&=3DK=1B(B)=1B$B5\>k8x1i$b!"=1B(B7/5(=1B$BEZ= -=1B(B)11:00=1B$B!A@h9T3+;O=1B(B
    -=1B$B!z=1B(B7/9(=1B$B?e=1B(B)=1B$B0&CN!&=1B(BSUNSHINE STUDIO=1B$B8x1i$O= -!"=1B(B7/5(=1B$BEZ=1B(B)=1B$BH/Gd3+;O=1B(B
    -=1B$B!XI4K|1_$H6lCn=3Dw!Y:nIJ>pJs$O$3$A$i=1B(B=20 -
    -=1B$B!Z=1B(B7=1B$B7n=1B(B5=1B$BF|=1B(B(=1B$BEZ=1B(B) 10:00=1B$B![= -=1B(B
    =1B$B!X%S%k$HF0J*1`!Y=3DiF|IqBf0';"=1B(B (=1B$BEl5~=1B(B)
    -=1B$B:d0f??5*$H4|BT$N.NS3nLo/$7$:$D -=1B$B""=1B(B7=1B$B7n=1B(B19=1B$BF|=1B(B(=1B$BEZ=1B(B) =1B$BCk=1B(B12:00= -=1B$B$N2s>e1G8e!!%f!<%m%9%Z!<%9=1B(B2
    -[=1B$BEPCE.NS3nLo=1B= -(B/=1B$B:XF#9'4FFD=1B(B
    -    =1B$B!X%S%k$HF0J*1`!Y:nIJ>pJs$O$3$A$i=1B(B=20 -
    -=1B$B!Z=1B(B7=1B$B7n=1B(B5=1B$BF|=1B(B(=1B$BEZ=1B(B) 10:00=1B$B![= -=1B(B
    =1B$B!X8e2y$J$s$F$7$J$$!YDI2C@h9T>e1G=1B(B (=1B$BEl5~=1B(B)    = -
    -=1B$BA4$/6-6x$N0c$&$U$?$j$NCK$,Nx$KMn$A$F$$$/MM$r!"A!:Y$J%?%C%A$GIA$/%i= -%V!&%9%H!<%j!e1G$r5-O?$7$?:nIJ$@!#=1B(B
    -=1B$B""=1B(B7=1B$B7n=1B(B12=1B$BF|=1B(B(=1B$BEZ=1B(B) 20:30=1B$B$N2s>e1= -GA0!!?7=3DI%P%k%H=1B(B9 =1B$B%7%"%?!<=1B(B2
    -[=1B$BEPCE -=1B$B!X8e2y$J$s$F$7$J$$!Y:nIJ>pJs$O$3$A$i=1B(B=20 -
    -=1B$B!Z=1B(B7=1B$B7n=1B(B5=1B$BF|=1B(B(=1B$BEZ=1B(B) 10:00=1B$B![= -=1B(B
    -=1B$B%9%+%$!&%/%m%i8x3+5-G0!X=1B(BGHOST IN THE SHELL=1B$B!?963L5!F0Bb= -=1B(B2.0=1B$B!Y=1B(B
    -=1B$B=3DiF|IqBf0';"=1B(B (=1B$BEl5~=1B(B)
    -=1B$B;NO:@5=3D!$N?M5$%3%_%C%/$r4p$K$7$?2!0fl!#2!0f4FFD$N4F=3D$$K$h$j!"%G= -%8%?%k%(%U%'%/%H$H?7%+%C%H$rDI2C!"$^$?2;3Z!&2;6A!&%"%U%l%3$b0l?7!*=1B(B<= -br> -=1B$B""=1B(B7=1B$B7n=1B(B12=1B$BF|=1B(B(=1B$BEZ=1B(B) 14:00=1B$B$N2s>e1= -G8e!!?7=3DI%_%i%N=1B(B2
    -[=1B$BEPCE -=1B$B!X=1B(BGHOST IN THE SHELL=1B$B!?963L5!F0Bb=1B(B2.0=1B$B!Y:nIJ>pJ= -s$O$3$A$i=1B(B=20 -
    -=1B$B!ZH/GdCf![=1B(B
    =1B$B!X=3Dc5JCc0kJU!Y=3DiF|IqBf0';"=1B(B (= -=1B$BEl5~=1B(B)
    -=1B$B:J$KF($2$i$l$?9CHe@-%J%7$NCfG/%*%d%8$,K4$-Ic$N0d;:$rEj$8$F;O$a$?!"= -%/%; -=1B$B""=1B(B7=1B$B7n=1B(B5=1B$BF|=1B(B(=1B$BEZ=1B(B) 11:20=1B$B$N2s>e1G= -8e=1B(B/13:50=1B$B$N2s>e1GA0!!%F%"%H%k?7=3DI=1B(B
    -[=1B$BEPCE=1B(B
    -=1B$B!X=3Dc5JCc0kJU!Y:nIJ>pJs$O$3$A$i=1B(B=20 -
    - =1B$B!ZH/GdCf![=1B(B
    -=1B$BBh=1B(B30=1B$B2s=1B(B =1B$B$T$"%U%#%k%`%U%'%9%F%#%P%k=1B(B (=1B$BE= -l5~=1B(B)
    -=1B$B""=1B(B7=1B$B7n=1B(B19=1B$BF|=1B(B(=1B$BEZ=1B(B) =1B$B!A=1B(B 25= -=1B$BF|=1B(B(=1B$B6b=1B(B)=1B$B!!=3DBC+El5^=1B(B
    -=1B$B!c%9%Z%7%c%k%W%m%0%i%`!'=1B(B7=1B$B7n=1B(B26=1B$BF|=1B(B(=1B$BEZ= -=1B(B)=1B$B!A=1B(B8=1B$B7n=1B(B1=1B$BF|=1B(B(=1B$B6b=1B(B)=1B$B!d=1B(B -=1B$B!z=1B(B=1B$B!V=1B(BPFF30=1B$B2s5-G0=1B(B =1B$B$T$"%U%#%k%`%U%'%9= -%F%#%P%k$N50@W=1B(B vol.1=1B$B!W=1B(B =1B$B$b%A%1%C%HHNGdCf=1B(B
    -=1B$B!V$T$"%U%#%k%`%U%'%9%F%#%P%k!W8x<0%5%$%H$O$3$A$i=1B(B=20 -
    - =1B$B!ZH/GdCf![=1B(B
    -=1B$B%?%$<0%7%M%^!z%Q%i%@%$%9=1B(B (=1B$BEl5~=1B(B)
    -=1B$B:G?7$N%?%$1G2h$r0l5s$K3Z$7$a$kFC=3D8>e1G$N3+:E$,7hDj!*=1B(B =1B$BI= -}9-$$%i%$%s%"%C%W$G!H%?%$<0!I$NL%NO$KGw$k!#=1B(B
    -=1B$B"">e1GCf=1B(B =1B$B!A=1B(B 7=1B$B7n=1B(B11=1B$BF|=1B(B(=1B$B6b=1B(= -B)=1B$B!!%7%M%^!<%HO;K\LZ=1B(B -
    - =1B$B!ZH/GdCf![=1B(B
    -=1B$BBh=1B(B17=1B$B2s=1B(B =1B$BEl5~9q:]=1B(BL=1B$B!u=1B(BG=1B$B1G2h:W= -=1B(B (=1B$BEl5~=1B(B)
    -=1B$B%"%8%":GBg5,LO$N4Q5RF00w?t$r8X$kEl5~9q:]%l%:%S%"%s!u%2%$1G2h:W!#:#= -G/$O=1B(B2007=1B$BG/%"%+%G%_!<>^^:nIJ$r$O$8$a!"$3$N1G2h:W$G$7$+8+$i$l= -$J$$@$=1B(B -=1B$B3&$N -=1B$B""=1B(B7=1B$B7n=1B(B11=1B$BF|=1B(B(=1B$B6b=1B(B) =1B$B!A=1B(B 21= -=1B$BF|=1B(B(=1B$B7n!&=3DK=1B(B)=1B$B!!?7=3DI%P%k%H=1B(B9 =1B$B%7%"%?!<= -=1B(B8/=1B$B%9%Q%$%i%k%[!<%k=1B(B -
    - =1B$B!ZH/GdCf![=1B(B
    -=1B$B@$3&$N=1B(BCM=1B$B%U%'%9%F%#%P%k=1B(B 10th Anniversary
    -=1B$B!A??2F$N%_%C%I%J%$%H%+!<%K%P%k!*!A=1B(B (=1B$BEl5~=1B(B)     -=1B$B@$3&$N7f:n=1B(BCM=1B$B$r%*!<%k%J%$%H$G>e1G$7!"D+$^$G@9$j>e$,$k?M5$= -%$%Y%s%H!#3+:E=1B(B10=1B$B<~G/$r5-G0$7$F!":#2s$O2a5n=1B(B10=1B$BG/4V$N%3= -%l%/%7%g%s$NCf$+$i2{$+$7$$=1B(BCM=1B$B$r=1B(B -=1B$BB"=3DP$7$7!"%F!<%^$4$H$K>e1G$9$k$H$$$&I,8+$NFbMF$@!#=1B(B
    -=1B$B""=1B(B7=1B$B7n=1B(B26=1B$BF|=1B(B(=1B$BEZ=1B(B)=1B$B!!?7=3DI%_%i%= -N=1B(B1 -
    7=1B$B7n=1B(B3=1B$= -BF|IU!!%A%1%C%HGd$l6Z%i%s%-%s%0!*=1B(B
    3D"1=1B$B0L=1B(B"=1B$B!!=1B(B=1B$B!X33$N>e= -$N%]%K%g!Y=1B(B3D"=1B$B!X3=e$N%]%K%g!Y<= -/TD> -
    3D"2=1B$B0L=1B(B"= -=1B$B!!=1B(B=1B$BBh=1B(B30=1B$B2s=1B(B =1B$B$T$"%U%#%= -k%`%U%'%9%F%#%P%k=1B(B
    3D"3=1B$B0L=1B(B"= -=1B$B!!=1B(B=1B$B%?%$<0%7%M%^!z%Q%i%@%$%9=1B(B -
    3D"4=1B$B0L=1B(B"= -=1B$B!!=1B(B=1B$B!XF.Cc=1B(B tea fight=1B$B!Y=1B(B
    3D"5=1B$B0L=1B(B"=1B$B!!=1B(B=1B$B!X7`>lHG=1B(BNARUTO=1B$B!]%J%k%H!]= -=1B(B =1B$B<@IwEA!!e+!Y=1B(B
    -

    1=1B$B0L=1B(B=1B$B$O!"5\:j=3DY4FFD^U?H$N1G2h= -=1B(B=1B$B!X33$N>e$N%]%K%g!Y=1B(B=1B$B!#%"%s%G%k%= -;%s$N!V?M5{I1!W$rBj:`$K$7$?!"$5$+$J$N;R%]%K%g$H!"?M4V$N=3D!2p$NKA81$H0&$= -rIA$$$?J*8l!#=1B(B
    -2=1B$B0L=1B(B=1B$B$O!"=1B(B=1B$BBh=1B(= -B30=1B$B2s=1B(B =1B$B$T$"%U%#%k%`%U%'%9%F%#%P%k=1B(B=1B$B!#= -!V1G2h$N?7$7$$:MG=3D$NH/8+!W$H0i@.$r%F!<%^$K!"=1B(B1977=1B$BG/$+$i%9%?!<= -%H$7$?1G2h:W!#L@F|$N1G2h3&$rC4$&:nIJ$r4Q$K9T$-$^$;$s$+!)=1B(B
    -3=1B$B0L=1B(B=1B$B$O!":G?7$N%?%$1G2h$r0l5s$K3Z$7= -$a$kFC=3D8>e1G!"=1B(B=1B$B%?%$<0%7%M%^!z%Q%i%@%$%9=1B(B=1B$B!#6aG/@$3&Cf$N1G2h:W$GBg$-$JCmL\$r=3D8$a$k!"%?%$!&%`!<%S! -
    - =1B$B%A%1%C%H>pJs$O$3$A$i=1B(B

    -
    -
    - -     		- - - - - - - - - - - -
    3D"NEWS"
    =1B$B!&=1B(B=1B$B!VEl5~$K$OFHFC$N

    -=1B$B!&=1B(B    =1B$B?7@8!&54B@O:$,40@.!*!!%&%(%s%D1M;N$,!V3Z$7$/$J$$$o$1= -$,$J$$!W$H<+$iB@8]H=3D=1B(B - -
    -
    - =1B$B$=3D$NB>$N%K%e!<%9$O$3$A$i=1B(B -
    3D"=1B$B!VEl5=
    - -
    - - - - - - - - - - - - - - -
    3D"=
    - - - - - - - - - - -
    - - - - - - - - - - - - -
    3D"1=1B$B0L=1B(B"=1B$B!X2V$h$jCK;R%U%!%$%J%k!Y=1B(B
    3D"2=1B$B0L=1B(B"=1B$B!XJb$$$F$b!!Jb$$$F$b!Y=1B(B
    3=1B$B0L0J2<$O$3$A$i!&!&!&!&!&!&=1B(B -
    >>=1B$B$T$"K~B-EYD4::%i%s%-%s%0=1B(B
    -
    -
    =1B$B$"$N=1B(BF4=1B$B$H$D$/$7$,5"$C$FMh$?!#%U= -%!%sI,8+$N407kJS$,#10L!#%*%9%+!<4FFD$,= -=1B$B:nIJ=1B(B=1B$B$O!D!)=1B(B -
    3D"=
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    3D"DV=
    3D"=1B$B!=
    3D"=1B$B%=
    =1B$B%"%a%j%+$G$OCN$i$J$$?M$O$$$J$$L5K! -=1B$B!X%8%'%7!
    -7=1B$B7n=1B(B9=1B$BF|=1B(B(=1B$B?e=1B(B)=1B$B%l%s%?%k3+;O=1B(B
    3D"=1B$B!X%G%C=
    3D"=1B$B%=
    =1B$B!X%=3D%&!Y$N -=1B$B!X%G%C%I!&%5%$%l%s%9!Y=1B(B
    -7=1B$B7n=1B(B9=1B$BF|=1B(B(=1B$B?e=1B(B)=1B$B%l%s%?%k3+;O=1B(B
    >>=1B$B<+Bp$G%l%s%?%k!*=1B(BTSUTAYA DI= -SCAS=1B$B$O$3$A$i=1B(B -
    - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    3D"PRESENT"
    -=1B$B!X%I%i%4%s!&%-%s%0%@%`!Y;n -=1B$B!X%7%F%#!&%*%V!&%a%s!Y;n -=1B$B!X=1B(B77BOADRUM=1B$B!Y=1B(BT=1B$B%7%c%D=1B(B
    -=1B$B!X%_%i%/%k=1B(B7=1B$B9f!Y%J%J$A$c$s$L$$$0$k$_=1B(B
    -
    - -
    - - -
    - - - - - - - - - -
    =1B$B"#=1B(B =1B$B -
    =1B$B=1B$B!X%2%2%2$N54B@O:!!@iG/=1B$B$,EP>l= -!#F|K\$J$i$G$O$N!HME2x!I$?$A$,%2%2%2@{Iw$r4,$-5/$3$9!*=1B(B
    -
    - -
    - - - - - - - - -
    - -
      -
    • =1B$B$3$A$i$N%a!<%k%"%I%l%9$OAw?.@lMQ$G$9!#D>@\JV?.$5$l$F$b$4J= -VEz$G$-$^$;$s$N$G$"$i$+$8$a$4N;>52<$5$$!#=1B(B
      • -
    • =1B$BEPO?FbMFJQ99!"G[?.2r=3D|$O=1B(B=1B$B!V=1B(BMy=1B$B%Z!<%8!W=1B(B= -=1B$B$N!V%a%k%^%,G[?.!&Dd;_!W$h$j$*$3$J$C$F$/$@$5$$!#=1B(B
      • -
    • =1B$BG[?.@h%a!<%k%"%I%l%9$NDI2C!&JQ99$O=1B(B=1B$B!V=1B(BMy=1B$B%Z!<%8!W= -=1B(B=1B$B$N!V%a!<%k%"%I%l%9DI2C!&JQ99!W$h$j$*$3$J$C$F$/$@$5$$!#=1B(= -B
      • -
    • =1B$B!w$T$"!?!wEE;R%A%1%C%H$T$"!?%7%M%^$T$"$K7G:\$5$l$F$$$k$9$= -Y$F$N%3%s%F%s%D!J5-;v!"2hA|!"2;@5Bz$J$= -7$KL5CGE>:\$9$k$3$H$O$G$-$^$;$s!#=1B(B
      • -
    -
    Copyright (C) PIA Corporation= -. All Rights Reserved.
    - -
    - -
    - - - - - - - - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/OBFUSCATING_COMMENT/fp-bug6188-2 spamassassin-4.0.0~rc3/trunk-only/t.rules/OBFUSCATING_COMMENT/fp-bug6188-2 --- spamassassin-3.4.6/trunk-only/t.rules/OBFUSCATING_COMMENT/fp-bug6188-2 2009-09-03 08:45:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/OBFUSCATING_COMMENT/fp-bug6188-2 1970-01-01 00:00:00.000000000 +0000 @@ -1,520 +0,0 @@ -From crm-ccm.ap-ipg@newsgram.hp.com Wed Jan 07 18:37:47 2009 -Delivered-To: kenji@example.com -Received: by 10.140.174.14 with SMTP id w14cs156238rve; - Wed, 7 Jan 2009 15:22:20 -0800 (PST) -Received: by 10.100.121.12 with SMTP id t12mr12843982anc.96.1231370540108; - Wed, 07 Jan 2009 15:22:20 -0800 (PST) -Return-Path: -Received: from psmtp.com (exprod7mx167.postini.com [64.18.2.125]) - by mx.google.com with SMTP id c37si36289613ana.57.2009.01.07.15.22.12; - Wed, 07 Jan 2009 15:22:20 -0800 (PST) -Received-SPF: neutral (google.com: 64.18.2.125 is neither permitted nor denied by best guess record for domain of crm-ccm.ap-ipg@newsgram.hp.com) client-ip=64.18.2.125; -Authentication-Results: mx.google.com; spf=neutral (google.com: 64.18.2.125 is neither permitted nor denied by best guess record for domain of crm-ccm.ap-ipg@newsgram.hp.com) smtp.mail=crm-ccm.ap-ipg@newsgram.hp.com -Received: from source ([202.157.148.31]) by exprod7mx167.postini.com ([64.18.6.14]) with SMTP; - Wed, 07 Jan 2009 15:22:13 PST -Received: from bondi (unknown [10.0.0.60]) - by mail31.bluerapport.com (Postfix) with ESMTP id 64F0B16F9676 - for ; Thu, 8 Jan 2009 07:37:47 +0800 (SGT) -Message-ID: <26895767.1231370576218.JavaMail.Administrator@bondi> -From: hp customer relations -Reply-To: jp_reply@newsgram.hp.com -To: -Subject: =?ISO-2022-JP?B?GyRCJV8lSyVOITwlSBsoQlBDGyRCJHIlVyVsGyhC?= - =?ISO-2022-JP?B?GyRCJTwlcyVIISojMUt8MV80VDg1JGIbKEI=?= - =?ISO-2022-JP?B?GyRCPSpOOzRWNmEhKhsoQlsbJEIlRyU4JT8laxsoQg==?= - =?ISO-2022-JP?B?GyRCJSQlYSE8JTglcyUwJUslZSE8JTkbKEJd?= -Errors-To: crm-ccm.ap-ipg@newsgram.hp.com -Mime-Version: 1.0 -Content-Type: multipart/alternative; - boundary="----=_Part_142072_19211497.1231370576218" -X-BlueCustId: 1189349 -X-BlueProgId: 9531 -X-BlueMailId: 7044 -Date: Thu, 8 Jan 2009 07:37:47 +0800 (SGT) -X-pstn-neptune: 0/0/0.00/0 -X-pstn-levels: (S:51.05280/99.90000 CV:99.9000 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) -X-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c -X-pstn-addresses: from [374/16] -X-UID: 611 -Status: RO -X-Keywords: -Content-Length: 44173 - -------=_Part_142072_19211497.1231370576218 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - -$B(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(B - -$B!!!!(BHP$B!!%G%8%?%k%$%a!<%8%s%0%K%e!<%9!!(B -$B!!!!!!!!!!!!!A%_%K%N!<%H(BPC$B$r%W%l%<%s%H!*#1K|1_4T85$b=*N;4V6a!*(B - -$B(.(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(/(B - -$B!!!!L@$1$^$7$F$*$a$G$H$&$4$6$$$^$9!#(B -$B!!!!:#G/$b(BHOT$B$G$*F@$J>pJs$r$?$/$5$s$4>R2p$7$?$$$H;W$C$F$*$j$^$9!#(B -$B!!!!=*N;4V6a$N$*F@$J%-%c%s%Z!<%s>pJs$r$*8+F($7$J$/!*(B - -$B!ZL\(B $BpJs!*(B - -$B!!!!!&:GBg(B1$BK|1_4T85!*$*G/6L%-%c%C%7%e%P%C%/%-%c%s%Z!<%s(B - -$B!!!!!&!V$"$J$?$@$1$N%*%j%8%J%kpJs!J%=%U%H%&%'%"!&%I%i%$%P!"5;=Q>pJs(BQ$B!u(BA$B!K(B - -$B!!!!!&(BWindows XP$B$G(BHP $B%G%#%l%/%?$,3+$+$J$$!)(B - -$B!!"#(BHP$B%*%s%i%$%s%9%H%"!'%$%s%/#18D$+$iA49q$I$3$G$bAwNAL5NA!*(B - -$B!!"#:#9f$NFIpJs!*(B - -$B!!"':GBg(B1$BK|1_4T85!*$*G/6L%-%c%C%7%e%P%C%/%-%c%s%Z!<%s(B -$B!!!!9b@-G=$J2HDmMQJ#9g%W%j%s%?!<$,:#$@$1BgJQ$*Gc$$F@!*(B -$B!!!!(B1/12$B!J7n!K$49XF~J,$^$G!*$^$@4V$K9g$&!*(B -https://h50084.www5.hp.com/rd.asp?ID=MTE4OTM0OSY5NTMxJjcwNDQmNDI1MzYmOTMxMzkz&PASS=TVRFNE9UTTBPU1k1TlRNeEpqY3dORFFtTkRJMU16WW1PVE14TXpreg%3D%3D - -$B!!"'!V$"$J$?$@$1$N%*%j%8%J%kpJs!'%=%U%H%&%'%"!&%I%i%$%P(B -https://h50084.www5.hp.com/rd.asp?ID=MTE4OTM0OSY5NTMxJjcwNDQmNDI1MzYmOTMxMzk2&PASS=TVRFNE9UTTBPU1k1TlRNeEpqY3dORFFtTkRJMU16WW1PVE14TXprMg%3D%3D - -$B!!"'%5%]!<%H99?7>pJs!'5;=Q>pJs(B Q$B!u(BA -https://h50084.www5.hp.com/rd.asp?ID=MTE4OTM0OSY5NTMxJjcwNDQmNDI1MzYmOTMxMzk4&PASS=TVRFNE9UTTBPU1k1TlRNeEpqY3dORFFtTkRJMU16WW1PVE14TXprNA%3D%3D - -$B!!"'(BWindows XP$B$G(BHP $B%G%#%l%/%?$,3+$+$J$$!)(B -https://h50084.www5.hp.com/rd.asp?ID=MTE4OTM0OSY5NTMxJjcwNDQmNDI1MzYmOTMxMzk5&PASS=TVRFNE9UTTBPU1k1TlRNeEpqY3dORFFtTkRJMU16WW1PVE14TXprNQ%3D%3D - -$B(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(B - -$B"#(BHP$B%*%s%i%$%s%9%H%"!'%$%s%/#18D$+$iA49q$I$3$G$bAwNAL5NA!*(B -https://h50084.www5.hp.com/rd.asp?ID=MTE4OTM0OSY5NTMxJjcwNDQmNDI1MzYmOTMxMzk0&PASS=TVRFNE9UTTBPU1k1TlRNeEpqY3dORFFtTkRJMU16WW1PVE14TXprMA%3D%3D - -$B(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(B - -$B"#:#9f$NFIMM$X!*(B -https://h50084.www5.hp.com/rd.asp?ID=MTE4OTM0OSY5NTMxJjcwNDQmNDI1MzYmOTMxMzk3&PASS=TVRFNE9UTTBPU1k1TlRNeEpqY3dORFFtTkRJMU16WW1PVE14TXprMw%3D%3D - -$B(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(B - -$B"#$*LrN)$A%j%s%/(B - -$B"'%-%c%s%Z!<%s?7Ce>pJs(B -http://www.hp.com/jp/din_newcampaign -$B"'%$%s%/%8%'%C%H!&%W%j%s%?!<(B -http://www.hp.com/jp/din_inkjet -$B"'BgH=%W%j%s%?!<(B -http://www.hp.com/jp/din_designjet -$B"'%l!<%6!pJs!"%-%c%s%Z!<%s>pJs$K$D$$$FDj4|E*$K(B -$B!!$*FO$1$9$k$b$N$G$9!#(B - -$B!!"(7G:\@=IJ$N?'!"%G%6%$%s!";EMM!"2A3JEy$NFbMF$OM=9p$J$7$KJQ99$H$J$k(B -$B!!!!>l9g$,$4$6$$$^$9!#(B -$B(1(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(0(B - -$B!c$*Ld9g$;Ak8}!d(B - -$B!z(BHP Directplus -$B!!"*%*%s%i%$%s%9%H%"$G07$C$F$$$k@=IJ$K4X$9$k9XF~$N$4AjCL!&0FFb$NAk8}(B -$B!!EEOC!K(B03-6416-6222 -$B!!pJsDs6!$NAk8}(B -$B!!EEOC!K(B03-6416-6660 -$B!!pJsJ]8nJ}?K(B -http://www.hp.com/jp/din_policy -$B"'$3$N%a!<%k$NG[?.@h!&G[?.7A<0$NJQ99$*$h$SG[?.Dd;_$O$3$A$i(B -https://h50084.www5.hp.com/remove.asp?ID=NzA0NCw5NTMxLDExODkzNDk%3D&PASS=TnpBME5DdzVOVE14TERFeE9Ea3pORGslM0Q%3D -$B"(>pJs$NH?1G$K(B2$B!A(B4$B=54V$+$+$k>l9g$,$4$6$$$^$9!#M=$a$4N;>5$/$@$5$$!#(B -$B"($3$N%a!<%k$X$NJV?.$G$OBP1~CW$7$+$M$^$9$N$G$4N;>52<$5$$!#(B - -$B(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(B -$B!cH/9T85!d(B -$BF|K\%R%e!<%l%C%H!&%Q%C%+!<%I3t<02ql9g$O$3$3$r%/%j%C%/$7$F$/$@$5$$!#(B -http://h50084.www5.hp.com/member/view_email.asp?ID=MTE4OTM0OSY3MDQ0JjAmNDI1MzYsNDI1MzcmOTUzMQ%3D%3D&PASS=TVRFNE9UTTBPU1kzTURRMEpqQW1OREkxTXpZc05ESTFNemNtT1RVek1RJTNEJTNE - -HP$B$+$i$N%a!<%k$r3N\$7$$J}K!$O$3$3$r%/%j%C%/!#(B -http://h50084.www5.hp.com/reports/address.asp?ID=MTE4OTM0OSY5NTMxJjcwNDQ%3D&PASS=TVRFNE9UTTBPU1k1TlRNeEpqY3dORFElM0Q%3D ------------------------------------------------------------- - - - -------=_Part_142072_19211497.1231370576218 -Content-Type: text/html;charset="ISO-2022-JP" -Content-Transfer-Encoding: 7bit - - - - -
    -
    $B$3$N%a!<%k$,@5$7$/I=<($5$l$J$$>l9g$O(B$B$3$3(B$B$r%/%j%C%/$7$F$/$@$5$$!#(B -
    -HP$B$+$i$N%a!<%k$r3N -
    -$B$r%"%I%l%9%V%C%/$K$4EPO?$/$@$5$$!#(B$B!!>\$7$$J}K!$O(B$B$3$3(B$B$r%/%j%C%/!#(B
    - - - - - -
    - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - -
    - - - -
    - - - - - -
    - -
    - -
    - - - -
    $BL@$1$^$7$F$*$a$G$H$&$4$6$$$^$9!#:#G/$b(BHOT$B$G$*F@$J>pJs$r$?$/$5$s$4>R2p$7$?$$$H;W$C$F$*$j$^$9!#(B
    $B=*N;4V6a$N$*F@$J%-%c%s%Z!<%s>pJs$r$*8+F($7$J$/!*(B
    - - - - - - - - - -
    HP $B%*%s%i%$%s%9%H%"(B
     $B"d(B - -$B%$%s%/$NH/Cm$O%3%A%i!*(B
    		 
     $BA49q$I$3$G$bAwNAL5NA!*(B
    - - - - - - - - - - - -
    $B%5%]!<%H$+$i$N$*CN$i$;(B
     $B%5%]!<%H99?7>pJs(B 
     $B"d(B - -$B%=%U%H%&%'%"!&%I%i%$%P(B
     $B"d(B - -$B5;=Q>pJs(B Q&A
    $B"d(B - -Windows XP$B$G(BHP $B%G%#%l%/%?$,3+$+$J$$!)(B
    - - - - - - - - - -
    $B:#9f$NFI
     $B"d(B - -$B%_%K%N!<%H(BPC$B$rEv$F$h$&!*(B 
     HP$B$+$i$N$*G/6L!*OCBjJ(F-$N:G?77?%_%K%N!<%H(BPC$B$r%/%$%:EvA*MM$X!*(B
    		-
    - - - - - - - -
    $B=*N;4V6a!*$*F@$J%-%c%s%Z!<%s>pJs$r$*8+F($7$J$/!*(B
    - - -
    $B"d(B - -$B:GBg(B1$BK|1_4T85!*$*G/6L%-%c%C%7%e%P%C%/%-%c%s%Z!<%s(B
    $B$^$@4V$K9g$&!*(B
    $B9b@-G=$J2HDmMQJ#9g%W%j%s%?!<$,:#$@$1BgJQ$*Gc$$F@!*(B
    1/12$B!J7n!K$49XF~J,$^$G(B
    - - -
    $B"d(B - -$B!V$"$J$?$@$1$N%*%j%8%J%k
    $B$b$l$J$/%U%)%H%V%C%/!J%9%?%s%@!<%IHG(B20$B%Z!<%8!K$r(B1$B:}%W%l%<%s%H!*(B
    1/15$B!JLZ!K$49XF~J,$^$G(B
    - - - - - -
    $B%*%j%8%J%k!&%+%l%s%@!<$r%W%j%s%H$7$^$7$g$&!*(B
    - - -
    $B"d(B - -$B%+%l%s%@!
    $B?7$7$$0lG/$,;O$^$j$^$7$?!*(B
    $B$*5$$KF~$j$N2hA|$rF~$l$?%*%j%8%J%k!&%+%l%s%@!<$G!"?7$?$J7W2h$rN)$F$F$_$F$O$$$+$,$G$7$g$&!)(B
    -
    - - - - -
    - - - - - -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    $B@=IJ$K4X$9$k9XF~$4AjCL!&0FFb$NAk8}(B$BF|K\(BHP$B$N@=IJA4HL$K4X$9$k>pJsAk8}(B
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    $B%G%8%?%k%$%a!<%8%s%0%K%e!<%9$O!"F|K\(BHP$B$+$i%+%9%?%^EPO?$r$5$l$F$$$k$*5RMM$X!"(BHP$B@=IJ$N%5%]!<%H>pJs!"%-%c%s%Z!<%s>pJs$K$D$$$FDj4|E*$K$*FO$1$9$k$b$N$G$9!#(B
    $B"d(B$B$3$N%a!<%k$NG[?.@h!&G[?.7A<0$NJQ99$*$h$SG[?.Dd;_$O$3$A$i(B
    $B"((B$B$3$N%a!<%k$X$NJV?.$G$OBP1~CW$7$+$M$^$9$N$G$4N;>52<$5$$!#(B
    $B"((B$B>pJs$NH?1G$K(B2$B!A(B4$B=54V$+$+$k>l9g$,$4$6$$$^$9!#M=$a$4N;>5$/$@$5$$!#(B
    $B"d(B$BF|K\(BHP$B$N8D?M>pJsJ]8nJ}?K(B
    $B"((B$B7G:\@=IJ$N?'!"%G%6%$%s!";EMM!"2A3JEy$NFbMF$OM=9p$J$7$KJQ99$H$J$k>l9g$,$4$6$$$^$9!#(B
      $B"#H/9T(B 
     HP Digital Imaging News -
    -$BF|K\%R%e!<%l%C%H!&%Q%C%+!<%I!J3t!K(BHP DIN$B;vL36I(B -
    -$B")(B168-0072 $BEl5~ET?yJB6h9b0f8MEl(B3-8-13
    -$B$*Ld$$9g$o$;@h$O(B    $B$3$A$i(B
    -© Copyright 2009 Hewlett-Packard Development Company, L.P.
    - -
    -
    - -------=_Part_142072_19211497.1231370576218-- - - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/OBSCURED_EMAIL/fp_bug6149_thomas_4481 spamassassin-4.0.0~rc3/trunk-only/t.rules/OBSCURED_EMAIL/fp_bug6149_thomas_4481 --- spamassassin-3.4.6/trunk-only/t.rules/OBSCURED_EMAIL/fp_bug6149_thomas_4481 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/OBSCURED_EMAIL/fp_bug6149_thomas_4481 1970-01-01 00:00:00.000000000 +0000 @@ -1,157 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - - -@@@@t[}KWRV@@@@@ -@@@@@@@@@@@@@@2009/07/02@@@@@ - - -Tł͗^Ӗbu{jQOOXvɂ‚Č܂B܂A -@h_܂܂ꂽXq胁bZ[W܂B - - -Ýu邭v - -[ƁËSƔɉhڎw] - -@TjA哝̂܂BɏACĈȗA -Wڂ̎]kɂȂ܂BقڌɂPBߋAقǕpɂɁA -̎]d˂Ƃ͂܂B܂ɁuVgOv̒蒅 -B - -@kł́AkN̝fvAjA~TC̖ɑ̎Ԃ -B - -@kŃȀtȍ~A~TC˂Ɠxڂ́ujvđ -s܂B炩ȋЂłBSvō̑ꂽAAۗc -PWVSɎ{Ȃ΂Ȃ܂B - -@{́A̋c̍̑ɌAۗ[hĂ܂B -c{邽߁A{́AZʂݕ܂߁A̓Iȍs -Ă܂BkN̗̕Aoh߁AĎs߂ -V@̍oɌA}ŏi߂Ă܂B - -@]kł́A{Ɗ؍Aĕč܂ޓĊ؂AwA -𖧂ɂāAkNɑΏ邱ƂmF܂B - -@AVAƂٖɘAgAkNɑ΂ċ͂邱Ƃ -KvłBkŃAȏ̒śׂA̗vɂ‚ȂȂ -ƂAێЉ̈vƂāAkNɕ点˂΂Ȃ܂B - -@ŁAΘbɂ̔‚Ă͂܂BkNɑ΂A -c𐽎ŠSɎ{AfvAjA~TCƂ̕I -ȉɌAڂɌsƂ悤AfłƂċ߂Ă܂B - -@́AO̖ړÍAuƂƍ̈SƔɉhmۂ邱Ƃɂv -ƍlĂ܂B - -@kNŖ炩Ȃ悤ɁA{̈SƔɉh́A{ꍑł͊mۂ -܂B܂́Aē̎mۂĂBđo̕sf̓w -͂ʂAĈSۏ̐ɖSȂ̂ƂĂƂKvłB - -@ɁAAȂǁAێЉ̏ŁA{̍v咣A֌W̋ -͂𓾂Ăɂ́A{炪AڂɌ`ŁAۓIȐӔCʂ -˂΂Ȃ܂B - -@̓_ŁAŋ߁A{́AOi܂BCΏ@̐łBC -獑̐EY邽߁A킪̍XƓlAAfpE -\}AɁAC㎩q̌q͂ȂǂhĂ܂B@̐ɂA -́ADЂɊւ炸AODɂΉ邱Ƃ”\ƂȂ܂B - -@AꂽAAEtBs哝̂A^𒸂 -܂B́A{̊OqD̑D̂Vȏ́AtBs̕XłB - -@\}Ał́AQON߂⍬AlX́Az‚Ȃ -قǂ̋ɒʂĂ܂B̌Aٗp̑noȂǁA艻̂ -̎xAS͂ōsĂ܂BqCۈɂ銈ƁA\} -AyюӍւ́AEʂ̎x́A΁uԂ̗ցvłB - -@́AuƁËSƔɉhvO̎ɌāA̓Is -葱܂B - - -uY˂v - -@}Kǎ҂̊FlΏۂɁAւ̃C^r[uY -˂vzMĂ܂B - -ǎ҂̎F -upF猩āA{̗ǂ͉łH -@i{茧AROAAEjv - -Y˂ij - http://www.kantei.go.jp/jp/asovideo/2009/07/1315/normal_play1315.html - - -t{Sb̗^Ӗ]łB - -[uoύv̊{jQOOX`SÉEӔC`vɂ‚] -it{Sb@^Ӗ]j - -@UQR̗ՎtcɂāAuoύv̊{jQOOX` -SÉEӔC`vtc肳܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702daijin.html - - -̐lɕ - -[ӂ̋C߂āAݑ鏗D̓]iD@Xqj - -@O܌ɁAÂqlɂƂł܂u -QLv錀̖܂āAꌎAċƂȂ܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702kikitai.html - - -ҏŴЂƂ - -@ÁAXqɍh_܂𑡂\܂BX -剉̕uQLv́A񔼐Iɂ킽ď㉉QOOOBA -̍̊F𖣗B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702matsumoto.html - --------------------------------------------------------------------- - {C^[lbgerԑgKCh --------------------------------------------------------------------- -@V - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702internettv.html - --------------------------------------------------------------------- - t̓ --------------------------------------------------------------------- -@h_ܕ\i09/07/01j@Ȃ - http://www.kantei.go.jp/jp/asophoto/index.html - -dqubNuCabilbgvV|{L -@WuYfvIv - http://www.gov-online.go.jp/pr/media/prm/cabinet/index.html - -------------------------------------------------------------------- - ӌAz --------------------------------------------------------------------- -@T̊z͂炩iVT܂Łj - http://www.mmz.kantei.go.jp/enquetePcJa -@eȂ̑bւ̎ɂ‚ĂALNɁubɎvƋL -@@̏A񂹂B -@uY˂vł́AȂ̎ɂ܂B -@@ɕĂ݂Ƃɂ‚ĕLWĂ܂̂ŁAǂǂ -@@񂹂B - -@Ťʂ͂炩iVW܂Łj - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/kekka.html - --------------------------------------------------------------------- -t[}KW - -obNio[EzMύXEzM~ - http://www.mmz.kantei.go.jp/jp/m-magazine/ - -ҏWFtb@Y -ҏW@Ft[@{ -sFt[tL񎺁i100-8968@scic1-6-1j diff -Nru spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_4478 spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_4478 --- spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_4478 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_4478 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - - -@@@@t[}KWRU@@@@@ -@@@@@@@@@@@@@@2009/06/25@@@@@ - - -Tł́AlcbCΏ@̐Ǝq̊ɂ‚Č -B܂AHi\ʂf̑򊲍L胁bZ[W܂B - - -Ýu邭v - -[SÉEӔC] - -@TΗjAuoύv̊{jviu{jQOOXvjt -c肵܂B́A̐̑傫ȒAj߂̂łB - -@L[[h́AuSÉEӔCvBʂ̔rȂǁAΏov𑱂 -‚ASƊ̗͂ڎwB́AvÏk̂łB - -@܁ÁA܂Ŕ|ĂuLvAu]vAuMvA -̐Ɉp邩ǂ́AjIȐOɂ܂BF -ݐMAɂāAuSЉvBYfvA -NЉ̑nȂǂʂāÅFƂ́úv߂B -̐ւ́uӔCvB -@uSÉEӔCv𓯎ɒB邽߂́AoςƎЉ̕ϊvKv -łB - -@lxɂ킽AߋɑÔȂAҏďoϑ΍BnA -iCF̂Aŋ߁A悤₭A邢n߂Ă܂ -B -@AƓdʔ̓Xł́AGR|Cg̑ΏۂƂȂȃGl^ -̃er①ɂ̔sA{Ă邻łB -@ꂩ́A{̒̐헪A܂BEŐ[ -usv̎pƁA铹؂łB - -@A݁ÅF񂪋߂Ă̂́AiC΍􂾂ł͂ -B܁ÅF񂪁AlXȕsĂ܂B - -@NÂȂǂ̐x̂قсBi̊gŒ艻BƑn̂ -Ȃ̊󔖉B炪ÅF̕sƁAЉ̕NJ𐶂 -܂B - -@̖ڎwuSЉv́AƂAŊ͂ЉB -lXA荇AxЉBǂȉƒɐ܂ -AłЉB - -@Љ̎̂߁AÂȂǂ̎Љۏ́uقсv -Ή܂BāAlÖSۏAč\zȂ΂Ȃ܂B -҂̌ٗpxAqĎxA{IɊg[Kv܂B -΁ASUASʂẮu؂ڂ̂ȂSۏv̍\złB - -@l̂ƁAL҂̕XɂW܂肢AuSЉ -cvJÂATA񌾂𒸂܂B -@ڎwׂSЉ̎pƁA̎̓؂̂łB - -@PjҐɂ́A܂ƒ̊iAŒ艻Ȃ̒ -@Bt^̏wx̓ȂǁAᏊ̉ƒłwɍs鐧x -@Ɏg݂܂B - -@QjqĐɂ́AЉŜŁAqĂƎd̗dg݁B -@ttŊzTȂǁAqĂ̌oϕS̎xɎg݂܂B - -@Rj̐ɂ́AٗpɁAr̗pAEƌPAЉlw -@̎xxgݍ킹āAꐶ`W邱Ƃł悤 -@邱ƂA}܂B񐳋KJ҂ւ̎ЉیEJی̓Kpg -@i߂܂B - -@Sjɂ́Aٗpn抈ւ̎Q@g債AuVOΌ -@ЉvAāuUЉvڎw܂B{iIȍЉx -@邽߁Anł̈ÁE̘Ag𐄐iAƋ҂ɑ΂Z -@ۏɎg݂܂B - -@́A̎ɑS͂XA]ƐMA̐Ɉp܂B - - -uY˂v - -@}Kǎ҂̊FlΏۂɁAւ̃C^r[uY -˂vzMĂ܂B - -ǎ҂̎F -upF͂ǂȉy𒮂̂ł傤H -i啪AROAjAEAقPjv - -Y˂ij - http://www.kantei.go.jp/jp/asovideo/2009/06/1238/normal_play1238.html - - -hqb̕lcłB - -[CΏ@̐Ǝq̊]ihqb@lcj - -@Csׂ}~A䂪̍vmۂƂƂɁAێЉɑ΂ -ӔCʂ߁AŊ􂷂̂߂ɕKvȖ@ł -ƍlĂ܂B̖@ɂAЂ킸ɊODqA -CɏPĂƂɎ邱Ƃ”\ɂȂ܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625daijin.html - - -̐lɕ - -[ḦSES鉏̗͎̉]i_ѐYȊ֓_Ǔ_ -ES\EKiە\EKiʒ@򊲍Lj - -@Hi\ʂf́AUi̕GƎĂ̍L扻ɑΉׂA -QONSɐVɐݒuꂽASenW߂ꂽHi\f -̐słB - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625kikitai.html - - -ҏŴЂƂ - -@TؗjAJÂЉۏvik̕񍐏܂Ƃ܂ -BVqĎxVXeAEƔ\͊J̋@\Alވ琬 -헪AsҖh~ɂ‚Ă̏dvȒ񌾂荞܂Ă܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625matsumoto.html - --------------------------------------------------------------------- - {C^[lbgerԑgKCh --------------------------------------------------------------------- -@V - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625internettv.html - --------------------------------------------------------------------- - t̓ --------------------------------------------------------------------- -@oύciuoύv̊{jQOOX@`SÉE -ӔC`v̓\j(09/06/23)@Ȃ - http://www.kantei.go.jp/jp/asophoto/index.html - -------------------------------------------------------------------- - ӌAz --------------------------------------------------------------------- -@T̊z͂炩iUQW܂Łj - http://www.mmz.kantei.go.jp/enquetePcJa -@eȂ̑bւ̎ɂ‚ĂALNɁubɎvƋL -@@̏A񂹂B -@uY˂vł́AȂ̎ɂ܂B -@@ɕĂ݂Ƃɂ‚ĕLWĂ܂̂ŁAǂǂ -@@񂹂B - -@Ťʂ͂炩iVP܂Łj - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/kekka.html - --------------------------------------------------------------------- -t[}KW - -obNio[EzMύXEzM~ - http://www.mmz.kantei.go.jp/jp/m-magazine/ - -ҏWFtb@Y -ҏW@Ft[@{ -sFt[tL񎺁i100-8968@scic1-6-1j diff -Nru spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_4480 spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_4480 --- spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_4480 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_4480 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - -O -eXg by Interwave - -Oiӂ肪ȁj -ĂƁE΂E񂽁[[ - -TEL - - -FAX - - -[AhX -thomas@e-interwave.com - -]R[X - - -̏ڍׁEv] -eXgłB by Interwave Corp. - -] -2008N11 - -؍ݐze diff -Nru spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4496 spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4496 --- spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4496 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4496 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: Fwd: FW: =?ISO-2022-JP?B?GyRCJTMlcyVJJV8lSyUiJWAjMiM0IzEjMBsoQj8bJEIjMhsoQg==?= - =?ISO-2022-JP?B?GyRCJE5McExuISEjODduJE49SUdxTT1McyRLJEQkJCRGGyhC?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4498 spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4498 --- spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4498 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4498 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCJTMlcyVUJWUhPCU/JTUhPCVTJTkkTjdvGyhC?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4499 spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4499 --- spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4499 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4499 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCJWEhPCVrJSIlSSVsJTkhIUF3Py4kTjdvGyhC?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4500 spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4500 --- spamassassin-3.4.6/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4500 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/PLING_QUERY/fp_bug6149_thomas_att4500 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: Fw: =?ISO-2022-JP?B?GyRCPzc+JklKISE8aj5HJDIhITJBM0o4K0Q+JDcbKEI=?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex1 spamassassin-4.0.0~rc3/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex1 --- spamassassin-3.4.6/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex1 2008-07-11 10:08:45.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex1 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Received: from ax7.axolotl.com ([63.241.71.50]) - by AX1.axolotl.com (Lotus Domino Release 7.0.3) - with ESMTP id 2008062321122608-167990 ; - Mon, 23 Jun 2008 21:12:26 -0700 -Received: from an-out-0910.google.com ([209.85.132.191]) - by ax7.axolotl.com (Lotus Domino Release 7.0.3) - with ESMTP id 2008062321122538-95836 ; - Mon, 23 Jun 2008 21:12:25 -0700 -Received: by an-out-0910.google.com with SMTP id c25so65685154anc.4 - for ; Mon, 23 Jun 2008 21:12:24 -0700 (PDT) - -foo diff -Nru spamassassin-3.4.6/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex2 spamassassin-4.0.0~rc3/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex2 --- spamassassin-3.4.6/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex2 2008-07-11 10:08:45.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex2 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Received: from ax7.axolotl.com ([63.241.71.50]) - by AX1.axolotl.com (Lotus Domino Release 7.0.3) - with ESMTP id 2008062409262788-172004 ; - Tue, 24 Jun 2008 09:26:27 -0700 -Received: from capricorn.notesdev.ibm.com ([205.159.212.202]) - by ax7.axolotl.com (Lotus Domino Release 7.0.3) - with ESMTP id 2008062409262686-98056 ; - Tue, 24 Jun 2008 09:26:26 -0700 - -none diff -Nru spamassassin-3.4.6/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex3 spamassassin-4.0.0~rc3/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex3 --- spamassassin-3.4.6/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex3 2008-07-11 10:08:45.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex3 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Received: from ax7.axolotl.com ([63.241.71.50]) - by AX1.axolotl.com (Lotus Domino Release 7.0.3) - with ESMTP id 2008062409150082-171923 ; - Tue, 24 Jun 2008 09:15:00 -0700 -Received: from www3.centraldesktop.com ([66.226.4.171]) - by ax7.axolotl.com (Lotus Domino Release 7.0.3) - with ESMTP id 2008062409150032-98001 ; - Tue, 24 Jun 2008 09:15:00 -0700 -Received: from www3.centraldesktop.com (localhost.centraldesktop.com [127.0.0.1]) - (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) - (No client certificate requested) - by www3.centraldesktop.com (Postfix) with ESMTPS id D64485C57 - for ; Tue, 24 Jun 2008 09:14:59 -0700 (PDT) -Received: by www3.centraldesktop.com (Postfix, from userid 80) - id 8B9B15C4F; Tue, 24 Jun 2008 09:14:59 -0700 (PDT) - -test diff -Nru spamassassin-3.4.6/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex4 spamassassin-4.0.0~rc3/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex4 --- spamassassin-3.4.6/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex4 2008-07-11 10:08:45.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/RDNS_NONE/fp_bug5926_ex4 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Received: from ax7.axolotl.com ([63.241.71.50]) - by AX1.axolotl.com (Lotus Domino Release 7.0.3) - with ESMTP id 2008062401551715-169306 ; - Tue, 24 Jun 2008 01:55:17 -0700 -Received: from brutus.apache.org ([140.211.11.140]) - by ax7.axolotl.com (Lotus Domino Release 7.0.3) - with ESMTP id 2008062401551563-96558 ; - Tue, 24 Jun 2008 01:55:15 -0700 -Received: by brutus.apache.org (Postfix, from userid 33) - id 572CD234C149; Tue, 24 Jun 2008 01:55:15 -0700 (PDT) - -test - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/run spamassassin-4.0.0~rc3/trunk-only/t.rules/run --- spamassassin-3.4.6/trunk-only/t.rules/run 2009-09-20 19:45:09.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/run 1970-01-01 00:00:00.000000000 +0000 @@ -1,174 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -sub usage { - die " -usage: t.rules/run [options] [file_or_dir ...] - -options: ---verbose Verbose output ---tests=BOUNCE_MESSAGE,FOO,BAR - Select tests to run, instead of selecting from - the specified files/dirs - "; -} - -use Test::More qw(no_plan); -use Getopt::Long; -Getopt::Long::Configure( - qw(bundling no_getopt_compat - permute no_auto_abbrev no_ignore_case) -); - -my %opt = ( -); - -GetOptions( - 'tests|t=s' => \$opt{'tests'}, - 'verbose|v' => \$opt{'verbose'}, - 'debug|D' => \$opt{'debug'}, -) or usage(); - -my $spamtest; -my $lastconfigtext = ''; -my $configtext = ''; - -use lib 'lib'; -use lib 'blib/lib'; -use Mail::SpamAssassin; -create_spamtest(); - -my $verbose = $opt{'verbose'}; -$opt{'tests'} ||= join " ", ; -my $testsfailed = 0; -$| = 1; - -if (@ARGV) { - foreach my $f (@ARGV) { - if (-d $f) { # recurse down 1 level - $f =~ s/\/+$//; - foreach my $subf (<$f/*>) { - test_msg($subf); - } - } else { # files directly - test_msg($f); - } - } -} else { - main(); -} - -$spamtest->finish(); -exit $testsfailed; - -# --------------------------------------------------------------------------- - -sub main { - foreach my $rule (split(/[\s,]/, $opt{'tests'})) { - $rule =~ s/^t.rules\///; - chomp $rule; - - my $ruledir="t.rules/$rule"; - next unless -d $ruledir; - - warn "\nRunning tests for $rule:\n" if $verbose; - foreach my $f (<$ruledir/*>) { - (-f $f) and test_msg($f); - } - } -} - -# --------------------------------------------------------------------------- - -sub test_msg { - my ($f) = @_; - return if ($f =~ /\.cf$/i); - $f =~ s,//+,/,gs; # multiple slashes are ok - ($f =~ /\/([^\/]+)\/[^\/]+$/) or warn "cannot find rule in '$f'"; - my $rule = $1; - - # if the filename starts with "fp", we want a _miss_ for the named rule - my $want_hit = 1; - if ($f =~ /\/fp/i) { - $want_hit = 0; - } - - $configtext = ''; - if (-f "$f.cf") { - open (CF, "<$f.cf") or warn "cannot open $f.cf"; - $configtext = join("", ); - close CF; - } - recreate_spamtest_if_config_differs(); - - open (STDIN, "<$f") or warn "cannot open $f"; - my $mail = $spamtest->parse(); - my $status = $spamtest->check($mail); - my $testsline = $status->get_names_of_tests_hit().",".$status->get_names_of_subtests_hit(); - $mail->finish(); - $status->finish(); - close STDIN; - - if ($testsline =~ /(?:[ ,]|^)\Q$rule\E(?:[ ,]|$)/) { - if ($want_hit) { - mypass($rule, $f, "$testsline"); - } else { - myfail($rule, $f, "want=n got=y: $testsline"); - } - } else { - if ($want_hit) { - myfail($rule, $f, "want=y got=n: $testsline"); - } else { - mypass($rule, $f, "$testsline"); - } - } -} - -# --------------------------------------------------------------------------- - -sub myfail { - my ($rule, $f, $err) = @_; - ok 0, "$f for $rule: $err"; - $testsfailed++; -} - -sub mypass { - my ($rule, $f, $err) = @_; - if (!$verbose) { - ok 1, $f; - } else { - ok 1, "$f for $rule: $err"; - } -} - -# --------------------------------------------------------------------------- - -sub create_spamtest { - $spamtest->finish() if $spamtest; - $spamtest = new Mail::SpamAssassin( - { - rules_filename => 'rules', - site_rules_filename => 'rules/local.cf', - userprefs_filename => '', - local_tests_only => 1, - debug => $opt{debug}, - dont_copy_prefs => 1, - post_config_text => "use_learner 0\nuse_auto_whitelist 0\n".$configtext, - require_rules => 1, - } - ); - $spamtest->init(1); -} - -sub recreate_spamtest_if_config_differs { - if ($configtext eq $lastconfigtext) { - return; - } - $lastconfigtext = $configtext; - create_spamtest(); -} - -# --------------------------------------------------------------------------- - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/SUBJ_ILLEGAL_CHARS/fp-bug4352-att2882 spamassassin-4.0.0~rc3/trunk-only/t.rules/SUBJ_ILLEGAL_CHARS/fp-bug4352-att2882 --- spamassassin-3.4.6/trunk-only/t.rules/SUBJ_ILLEGAL_CHARS/fp-bug4352-att2882 2009-06-30 22:33:44.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/SUBJ_ILLEGAL_CHARS/fp-bug4352-att2882 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -Received: from web42104.mail.yahoo.com (web42104.mail.yahoo.com [66.218.93.197]) - by mildly.forged.fi (Postfix) with SMTP id 488A567CD3 - for ; Fri, 20 May 2005 15:26:14 +0300 (EEST) -Received: (qmail 66005 invoked by uid 60001); 20 May 2005 12:26:12 -0000 -Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys -DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; - s=s1024; d=yahoo.com; - b=IhjkLOoqWQawwSDQN8tjXr4n6nJV+Qku9Rl2suKTuPntOneQaPUvjJvzWQPYd0UEJrCvXMMeAnnhvzf+CRu+b7hR0LHBKYM62dmtSBSctK4a2cHY4ilgCLZiry41UFKzxFVVQaxnbp1oexYx+XTv4xVL7oduQ5mva3/rD4DJfx8= ; -Message-ID: <20050520122612.66003.qmail@web42104.mail.yahoo.com> -Received: from [62.78.201.221] by web42104.mail.yahoo.com via HTTP; Fri, 20 May 2005 05:26:12 PDT -Date: Fri, 20 May 2005 05:26:12 -0700 (PDT) -From: Forged Example -Subject: tss on jotain skandeja -To: era@iki.fi -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -tEkStivIEsti - - rutsalainen . - - - - - - - -Yahoo! Mail -Stay connected, organized, and protected. Take the -tour: -http://tour.mail.yahoo.com/mailtour.html - - - - -__________________________________ -Do you Yahoo!? -Yahoo! Mail - You care about security. So do we. -http://promotions.yahoo.com/new_mail diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6119_singleword spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6119_singleword --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6119_singleword 2009-09-03 21:01:02.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6119_singleword 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Return-Path: - -test diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4478 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4478 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4478 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4478 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - - -@@@@t[}KWRU@@@@@ -@@@@@@@@@@@@@@2009/06/25@@@@@ - - -Tł́AlcbCΏ@̐Ǝq̊ɂ‚Č -B܂AHi\ʂf̑򊲍L胁bZ[W܂B - - -Ýu邭v - -[SÉEӔC] - -@TΗjAuoύv̊{jviu{jQOOXvjt -c肵܂B́A̐̑傫ȒAj߂̂łB - -@L[[h́AuSÉEӔCvBʂ̔rȂǁAΏov𑱂 -‚ASƊ̗͂ڎwB́AvÏk̂łB - -@܁ÁA܂Ŕ|ĂuLvAu]vAuMvA -̐Ɉp邩ǂ́AjIȐOɂ܂BF -ݐMAɂāAuSЉvBYfvA -NЉ̑nȂǂʂāÅFƂ́úv߂B -̐ւ́uӔCvB -@uSÉEӔCv𓯎ɒB邽߂́AoςƎЉ̕ϊvKv -łB - -@lxɂ킽AߋɑÔȂAҏďoϑ΍BnA -iCF̂Aŋ߁A悤₭A邢n߂Ă܂ -B -@AƓdʔ̓Xł́AGR|Cg̑ΏۂƂȂȃGl^ -̃er①ɂ̔sA{Ă邻łB -@ꂩ́A{̒̐헪A܂BEŐ[ -usv̎pƁA铹؂łB - -@A݁ÅF񂪋߂Ă̂́AiC΍􂾂ł͂ -B܁ÅF񂪁AlXȕsĂ܂B - -@NÂȂǂ̐x̂قсBi̊gŒ艻BƑn̂ -Ȃ̊󔖉B炪ÅF̕sƁAЉ̕NJ𐶂 -܂B - -@̖ڎwuSЉv́AƂAŊ͂ЉB -lXA荇AxЉBǂȉƒɐ܂ -AłЉB - -@Љ̎̂߁AÂȂǂ̎Љۏ́uقсv -Ή܂BāAlÖSۏAč\zȂ΂Ȃ܂B -҂̌ٗpxAqĎxA{IɊg[Kv܂B -΁ASUASʂẮu؂ڂ̂ȂSۏv̍\złB - -@l̂ƁAL҂̕XɂW܂肢AuSЉ -cvJÂATA񌾂𒸂܂B -@ڎwׂSЉ̎pƁA̎̓؂̂łB - -@PjҐɂ́A܂ƒ̊iAŒ艻Ȃ̒ -@Bt^̏wx̓ȂǁAᏊ̉ƒłwɍs鐧x -@Ɏg݂܂B - -@QjqĐɂ́AЉŜŁAqĂƎd̗dg݁B -@ttŊzTȂǁAqĂ̌oϕS̎xɎg݂܂B - -@Rj̐ɂ́AٗpɁAr̗pAEƌPAЉlw -@̎xxgݍ킹āAꐶ`W邱Ƃł悤 -@邱ƂA}܂B񐳋KJ҂ւ̎ЉیEJی̓Kpg -@i߂܂B - -@Sjɂ́Aٗpn抈ւ̎Q@g債AuVOΌ -@ЉvAāuUЉvڎw܂B{iIȍЉx -@邽߁Anł̈ÁE̘Ag𐄐iAƋ҂ɑ΂Z -@ۏɎg݂܂B - -@́A̎ɑS͂XA]ƐMA̐Ɉp܂B - - -uY˂v - -@}Kǎ҂̊FlΏۂɁAւ̃C^r[uY -˂vzMĂ܂B - -ǎ҂̎F -upF͂ǂȉy𒮂̂ł傤H -i啪AROAjAEAقPjv - -Y˂ij - http://www.kantei.go.jp/jp/asovideo/2009/06/1238/normal_play1238.html - - -hqb̕lcłB - -[CΏ@̐Ǝq̊]ihqb@lcj - -@Csׂ}~A䂪̍vmۂƂƂɁAێЉɑ΂ -ӔCʂ߁AŊ􂷂̂߂ɕKvȖ@ł -ƍlĂ܂B̖@ɂAЂ킸ɊODqA -CɏPĂƂɎ邱Ƃ”\ɂȂ܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625daijin.html - - -̐lɕ - -[ḦSES鉏̗͎̉]i_ѐYȊ֓_Ǔ_ -ES\EKiە\EKiʒ@򊲍Lj - -@Hi\ʂf́AUi̕GƎĂ̍L扻ɑΉׂA -QONSɐVɐݒuꂽASenW߂ꂽHi\f -̐słB - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625kikitai.html - - -ҏŴЂƂ - -@TؗjAJÂЉۏvik̕񍐏܂Ƃ܂ -BVqĎxVXeAEƔ\͊J̋@\Alވ琬 -헪AsҖh~ɂ‚Ă̏dvȒ񌾂荞܂Ă܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625matsumoto.html - --------------------------------------------------------------------- - {C^[lbgerԑgKCh --------------------------------------------------------------------- -@V - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625internettv.html - --------------------------------------------------------------------- - t̓ --------------------------------------------------------------------- -@oύciuoύv̊{jQOOX@`SÉE -ӔC`v̓\j(09/06/23)@Ȃ - http://www.kantei.go.jp/jp/asophoto/index.html - -------------------------------------------------------------------- - ӌAz --------------------------------------------------------------------- -@T̊z͂炩iUQW܂Łj - http://www.mmz.kantei.go.jp/enquetePcJa -@eȂ̑bւ̎ɂ‚ĂALNɁubɎvƋL -@@̏A񂹂B -@uY˂vł́AȂ̎ɂ܂B -@@ɕĂ݂Ƃɂ‚ĕLWĂ܂̂ŁAǂǂ -@@񂹂B - -@Ťʂ͂炩iVP܂Łj - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/kekka.html - --------------------------------------------------------------------- -t[}KW - -obNio[EzMύXEzM~ - http://www.mmz.kantei.go.jp/jp/m-magazine/ - -ҏWFtb@Y -ҏW@Ft[@{ -sFt[tL񎺁i100-8968@scic1-6-1j diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4479 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4479 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4479 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4479 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - -O -eXg by Interwave - -Oiӂ肪ȁj -ĂƁE΂E񂽁[[ - -TEL - - -FAX - - -[AhX -thomas@e-interwave.com - -]R[X - - -̏ڍׁEv] -eXgłB by Interwave Corp. - -] -2008N11 - -؍ݐze diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4480 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4480 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4480 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4480 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - -O -eXg by Interwave - -Oiӂ肪ȁj -ĂƁE΂E񂽁[[ - -TEL - - -FAX - - -[AhX -thomas@e-interwave.com - -]R[X - - -̏ڍׁEv] -eXgłB by Interwave Corp. - -] -2008N11 - -؍ݐze diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4481 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4481 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4481 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_4481 1970-01-01 00:00:00.000000000 +0000 @@ -1,157 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - - -@@@@t[}KWRV@@@@@ -@@@@@@@@@@@@@@2009/07/02@@@@@ - - -Tł͗^Ӗbu{jQOOXvɂ‚Č܂B܂A -@h_܂܂ꂽXq胁bZ[W܂B - - -Ýu邭v - -[ƁËSƔɉhڎw] - -@TjA哝̂܂BɏACĈȗA -Wڂ̎]kɂȂ܂BقڌɂPBߋAقǕpɂɁA -̎]d˂Ƃ͂܂B܂ɁuVgOv̒蒅 -B - -@kł́AkN̝fvAjA~TC̖ɑ̎Ԃ -B - -@kŃȀtȍ~A~TC˂Ɠxڂ́ujvđ -s܂B炩ȋЂłBSvō̑ꂽAAۗc -PWVSɎ{Ȃ΂Ȃ܂B - -@{́A̋c̍̑ɌAۗ[hĂ܂B -c{邽߁A{́AZʂݕ܂߁A̓Iȍs -Ă܂BkN̗̕Aoh߁AĎs߂ -V@̍oɌA}ŏi߂Ă܂B - -@]kł́A{Ɗ؍Aĕč܂ޓĊ؂AwA -𖧂ɂāAkNɑΏ邱ƂmF܂B - -@AVAƂٖɘAgAkNɑ΂ċ͂邱Ƃ -KvłBkŃAȏ̒śׂA̗vɂ‚ȂȂ -ƂAێЉ̈vƂāAkNɕ点˂΂Ȃ܂B - -@ŁAΘbɂ̔‚Ă͂܂BkNɑ΂A -c𐽎ŠSɎ{AfvAjA~TCƂ̕I -ȉɌAڂɌsƂ悤AfłƂċ߂Ă܂B - -@́AO̖ړÍAuƂƍ̈SƔɉhmۂ邱Ƃɂv -ƍlĂ܂B - -@kNŖ炩Ȃ悤ɁA{̈SƔɉh́A{ꍑł͊mۂ -܂B܂́Aē̎mۂĂBđo̕sf̓w -͂ʂAĈSۏ̐ɖSȂ̂ƂĂƂKvłB - -@ɁAAȂǁAێЉ̏ŁA{̍v咣A֌W̋ -͂𓾂Ăɂ́A{炪AڂɌ`ŁAۓIȐӔCʂ -˂΂Ȃ܂B - -@̓_ŁAŋ߁A{́AOi܂BCΏ@̐łBC -獑̐EY邽߁A킪̍XƓlAAfpE -\}AɁAC㎩q̌q͂ȂǂhĂ܂B@̐ɂA -́ADЂɊւ炸AODɂΉ邱Ƃ”\ƂȂ܂B - -@AꂽAAEtBs哝̂A^𒸂 -܂B́A{̊OqD̑D̂Vȏ́AtBs̕XłB - -@\}Ał́AQON߂⍬AlX́Az‚Ȃ -قǂ̋ɒʂĂ܂B̌Aٗp̑noȂǁA艻̂ -̎xAS͂ōsĂ܂BqCۈɂ銈ƁA\} -AyюӍւ́AEʂ̎x́A΁uԂ̗ցvłB - -@́AuƁËSƔɉhvO̎ɌāA̓Is -葱܂B - - -uY˂v - -@}Kǎ҂̊FlΏۂɁAւ̃C^r[uY -˂vzMĂ܂B - -ǎ҂̎F -upF猩āA{̗ǂ͉łH -@i{茧AROAAEjv - -Y˂ij - http://www.kantei.go.jp/jp/asovideo/2009/07/1315/normal_play1315.html - - -t{Sb̗^Ӗ]łB - -[uoύv̊{jQOOX`SÉEӔC`vɂ‚] -it{Sb@^Ӗ]j - -@UQR̗ՎtcɂāAuoύv̊{jQOOX` -SÉEӔC`vtc肳܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702daijin.html - - -̐lɕ - -[ӂ̋C߂āAݑ鏗D̓]iD@Xqj - -@O܌ɁAÂqlɂƂł܂u -QLv錀̖܂āAꌎAċƂȂ܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702kikitai.html - - -ҏŴЂƂ - -@ÁAXqɍh_܂𑡂\܂BX -剉̕uQLv́A񔼐Iɂ킽ď㉉QOOOBA -̍̊F𖣗B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702matsumoto.html - --------------------------------------------------------------------- - {C^[lbgerԑgKCh --------------------------------------------------------------------- -@V - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702internettv.html - --------------------------------------------------------------------- - t̓ --------------------------------------------------------------------- -@h_ܕ\i09/07/01j@Ȃ - http://www.kantei.go.jp/jp/asophoto/index.html - -dqubNuCabilbgvV|{L -@WuYfvIv - http://www.gov-online.go.jp/pr/media/prm/cabinet/index.html - -------------------------------------------------------------------- - ӌAz --------------------------------------------------------------------- -@T̊z͂炩iVT܂Łj - http://www.mmz.kantei.go.jp/enquetePcJa -@eȂ̑bւ̎ɂ‚ĂALNɁubɎvƋL -@@̏A񂹂B -@uY˂vł́AȂ̎ɂ܂B -@@ɕĂ݂Ƃɂ‚ĕLWĂ܂̂ŁAǂǂ -@@񂹂B - -@Ťʂ͂炩iVW܂Łj - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/kekka.html - --------------------------------------------------------------------- -t[}KW - -obNio[EzMύXEzM~ - http://www.mmz.kantei.go.jp/jp/m-magazine/ - -ҏWFtb@Y -ҏW@Ft[@{ -sFt[tL񎺁i100-8968@scic1-6-1j diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4491_Gappy-Roadrunner-I spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4491_Gappy-Roadrunner-I --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4491_Gappy-Roadrunner-I 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4491_Gappy-Roadrunner-I 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCJW0hPCVJJWklcyVKITwbKEI=?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4492_Gappy-Roadrunner-U spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4492_Gappy-Roadrunner-U --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4492_Gappy-Roadrunner-U 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4492_Gappy-Roadrunner-U 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?UTF-8?B?44Ot44O844OJ44Op44Oz44OK44O8?= -Content-Type: text/plain; charset=UTF-8; format=flowed -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4493 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4493 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4493 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4493 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCJVclaiVzJUgbKEI=?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4494 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4494 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4494 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4494 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCI0EjbSNhI3ojbyNuGyhC?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4495 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4495 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4495 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4495 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: FW: web =?ISO-2022-JP?B?GyRCJE4jRiNUI1A+cEpzSlE5OSRIJDRPIk1tGyhC?= - =?ISO-2022-JP?B?GyRCNGokJBsoQg==?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4496 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4496 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4496 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4496 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: Fwd: FW: =?ISO-2022-JP?B?GyRCJTMlcyVJJV8lSyUiJWAjMiM0IzEjMBsoQj8bJEIjMhsoQg==?= - =?ISO-2022-JP?B?GyRCJE5McExuISEjODduJE49SUdxTT1McyRLJEQkJCRGGyhC?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4497 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4497 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4497 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4497 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: RE: Corporation =?ISO-2022-JP?B?GyRCJE4jSSNQJSIlSSVsJTkhIhsoQlN1?= - =?ISO-2022-JP?B?Ym5ldCAbJEIhIhsoQkdhdGV3YXkbJEIhIhsoQkROUw==?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4498 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4498 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4498 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4498 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCJTMlcyVUJWUhPCU/JTUhPCVTJTkkTjdvGyhC?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4499 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4499 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4499 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4499 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: =?ISO-2022-JP?B?GyRCJWEhPCVrJSIlSSVsJTkhIUF3Py4kTjdvGyhC?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4500 spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4500 --- spamassassin-3.4.6/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4500 2009-08-18 20:02:16.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/TVD_SPACE_RATIO/fp_bug6149_thomas_att4500 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -MIME-Version: 1.0 -To: SpamAssassin Test -Subject: Fw: =?ISO-2022-JP?B?GyRCPzc+JklKISE8aj5HJDIhITJBM0o4K0Q+JDcbKEI=?= -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/UNRESOLVED_TEMPLATE/fp1 spamassassin-4.0.0~rc3/trunk-only/t.rules/UNRESOLVED_TEMPLATE/fp1 --- spamassassin-3.4.6/trunk-only/t.rules/UNRESOLVED_TEMPLATE/fp1 2008-08-13 21:13:31.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/UNRESOLVED_TEMPLATE/fp1 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Return-Path: -Received: from batman.home4u.ch ([unix socket]) - by batman.home4u.ch (Cyrus v2.1.18) with LMTP; Wed, 09 Mar 2005 04:57:00 +0100 -From: "pingywon" -To: "Crg" , -X-VMS-To: smtp%SCHEIDELL@SECNAP.NET - -foo diff -Nru spamassassin-3.4.6/trunk-only/t.rules/VBOUNCE_MESSAGE/bug5884_att4343_gwava spamassassin-4.0.0~rc3/trunk-only/t.rules/VBOUNCE_MESSAGE/bug5884_att4343_gwava --- spamassassin-3.4.6/trunk-only/t.rules/VBOUNCE_MESSAGE/bug5884_att4343_gwava 2008-07-10 14:32:51.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/VBOUNCE_MESSAGE/bug5884_att4343_gwava 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -From postmaster@cplus.com.pl Sun Jun 8 20:49:06 2008 -Return-Path: -X-Original-To: jm-eire-spamtrap@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from dogma.boxhost.net (dogma.boxhost.net [80.169.141.78]) - by soman.fdntech.com (Postfix) with ESMTP id 038B7BA5209 - for ; Sun, 8 Jun 2008 20:34:21 -0500 (CDT) -Received: from mimas.cplus.com.pl (mimas.cplus.com.pl [81.210.22.234]) - by dogma.boxhost.net (Postfix) with ESMTP id 5562231001A - for ; Mon, 9 Jun 2008 02:34:09 +0100 (IST) -Received: from cplus.com.pl - ([10.48.20.52]) - by mimas.cplus.com.pl; Mon, 09 Jun 2008 03:33:44 +0200 -Date: Mon, 9 Jun 2008 03:33:07 +0200 -X-Mailer: GWAVA Notification Service -X-GWAVADAT: 1q1zqj1h -From: Postmaster -MIME-Version: 1.0 -Message-ID: <3gv295b.postmaster@cplus.com.pl> -Subject: Wiadomosc odrzucona/Blocked Message (RBL block) -Content-Type: multipart/mixed; - boundary="3gv295b.SHELL" -To: undisclosed-recipients:; - -This is a multi-part message in MIME format. - ---3gv295b.SHELL -Content-Type: multipart/alternative; - boundary="3gv295b.MAIN" - ---3gv295b.MAIN -Content-Type: text/plain; charset=ISO-8859-2 -Content-Transfer-Encoding: 8bit - ----English version below------ - -Wiadomo wysana przez Ciebie: - -Temat: Your video file ewa.walewska -OD: ggggg@eire.com -Odbiorca(y): -Ewa.Walewska@cplus.com.pl -[No Cc Addresses] -[No Bc Addresses] - -Nie zostaa dostarczona do odbiorcy. Powd blokady przesyki: - - - -Przesyka zostaa zablokowana z powodu podejrzenia o SPAM i zostanie dostarczona do odbiorcy z opnieniem (o godz. 12.00 lub 16.00) -Poniej szczegy: - -Twj serwer pocztowy znajduje si na liscie serwerow rozsylajacych spam (RBL) -Adress IP Twojego serwera: 68.220.175.137 -Serwer zawierajacy list spamerw: SBL-XBL.SPAMHAUS.ORG - - - -W przypadku wtpliwoci i niejasnoci prosz o kontakt z Administratorem poczty sysadmin@cplus.com.pl - -UWAGA ! Prosz nie odpowiada na adres nadawcy niniejszej przesyki. - ------------------- - -Message send from Your address: - -Subject: Your video file ewa.walewska -From: ggggg@eire.com -Recipient(s): -Ewa.Walewska@cplus.com.pl -[No Cc Addresses] -[No Bc Addresses] - - -Did not reach the recipient. Reasons for block listed below. - - - -Message was suspected as SPAM message and will be delivered to recipient with delay (about 12 AM or 4 PM). - -Technical details: - -This message was rejected by a RBL server. -The IP address of the blocked message is: -68.220.175.137 which the SBL-XBL.SPAMHAUS.ORG RBL Server flagged. - - - -Any help or comment please send to sysadmin@cplus.com.pl - -PLEASE do not directly reply to this message. - - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/VBOUNCE_MESSAGE/bug5884_att4343_kerbango spamassassin-4.0.0~rc3/trunk-only/t.rules/VBOUNCE_MESSAGE/bug5884_att4343_kerbango --- spamassassin-3.4.6/trunk-only/t.rules/VBOUNCE_MESSAGE/bug5884_att4343_kerbango 2008-07-10 14:32:51.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/VBOUNCE_MESSAGE/bug5884_att4343_kerbango 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -From sales@kerbango.com Mon Jun 16 08:00:30 2008 -Return-Path: -X-Spam-Virus: No -X-Spam-Checker-Version: SpamAssassin 3.3.0-r650054 (2008-04-21) on - soman.fdntech.com -X-Spam-Relays-External: [ ip=89.122.58.175 rdns= helo=kerbango.com - by=soman.fdntech.com ident= envfrom= intl=0 id=E3DB7BA5179 auth= msa=0 ] -X-Spam-Status: No, score=2.9 required=5.0 tests=BAYES_40,DNS_FROM_RFC_BOGUSMX, - DNS_FROM_RFC_DSN,RDNS_NONE shortcircuit=no autolearn=no version=3.3.0-r650054 -X-Spam-Relays-Internal: -X-Spam-Relays-Untrusted: [ ip=89.122.58.175 rdns= helo=kerbango.com - by=soman.fdntech.com ident= envfrom= intl=0 id=E3DB7BA5179 auth= msa=0 ] -X-Spam-Relays-Trusted: -X-Spam-Level: ** -X-Spam-RBL: [20 topaz.3com.com., 10 zircon.3com.com.] - [192.136.32.12] - [127.0.0.2, 127.0.0.3, 127.0.0.4, 127.0.0.8] -X-Original-To: jm@jmason.org -Delivered-To: jm@mail.fdntech.com -Received: from kerbango.com (unknown [89.122.58.175]) - by soman.fdntech.com (Postfix) with ESMTP id E3DB7BA5179 - for ; Mon, 16 Jun 2008 08:00:27 -0500 (CDT) -Date: Mon, 16 Jun 2008 16:05:18 +0200 -From: noreply-BitDefender Antivirus -X-Mailer: BitDefender VShield -X-Priority: 3 (Normal) -To: jm@jmason.org -Subject: BitDefender Antivirus found an infected message -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -Message-Id: <20080616130027.E3DB7BA5179@soman.fdntech.com> - - -BitDefender Antivirus detected and blocked an infected message addressed to you - -From: [sales@kerbango.com] -Subject: [hi] -Virus Name [Win32.Worm.Mytob.C] -Virus Description: http://www.bitdefender.com/vfind/?q=Win32.Worm.Mytob.C -Action taken: delete - -This message was generated by the BitDefender mail scanner running on the sending machine to replace the original infected one. Your machine is not affected in any way. Please do not reply to this e-mail. If the From: field contains an address you know and you were expecting mail from, consider informing the owner of that address about this message. - -BitDefender Lab -www.bitdefender.com - - -. - diff -Nru spamassassin-3.4.6/trunk-only/t.rules/WEIRD_QUOTING/fp_bug6149_thomas_4478 spamassassin-4.0.0~rc3/trunk-only/t.rules/WEIRD_QUOTING/fp_bug6149_thomas_4478 --- spamassassin-3.4.6/trunk-only/t.rules/WEIRD_QUOTING/fp_bug6149_thomas_4478 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/WEIRD_QUOTING/fp_bug6149_thomas_4478 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - - -@@@@t[}KWRU@@@@@ -@@@@@@@@@@@@@@2009/06/25@@@@@ - - -Tł́AlcbCΏ@̐Ǝq̊ɂ‚Č -B܂AHi\ʂf̑򊲍L胁bZ[W܂B - - -Ýu邭v - -[SÉEӔC] - -@TΗjAuoύv̊{jviu{jQOOXvjt -c肵܂B́A̐̑傫ȒAj߂̂łB - -@L[[h́AuSÉEӔCvBʂ̔rȂǁAΏov𑱂 -‚ASƊ̗͂ڎwB́AvÏk̂łB - -@܁ÁA܂Ŕ|ĂuLvAu]vAuMvA -̐Ɉp邩ǂ́AjIȐOɂ܂BF -ݐMAɂāAuSЉvBYfvA -NЉ̑nȂǂʂāÅFƂ́úv߂B -̐ւ́uӔCvB -@uSÉEӔCv𓯎ɒB邽߂́AoςƎЉ̕ϊvKv -łB - -@lxɂ킽AߋɑÔȂAҏďoϑ΍BnA -iCF̂Aŋ߁A悤₭A邢n߂Ă܂ -B -@AƓdʔ̓Xł́AGR|Cg̑ΏۂƂȂȃGl^ -̃er①ɂ̔sA{Ă邻łB -@ꂩ́A{̒̐헪A܂BEŐ[ -usv̎pƁA铹؂łB - -@A݁ÅF񂪋߂Ă̂́AiC΍􂾂ł͂ -B܁ÅF񂪁AlXȕsĂ܂B - -@NÂȂǂ̐x̂قсBi̊gŒ艻BƑn̂ -Ȃ̊󔖉B炪ÅF̕sƁAЉ̕NJ𐶂 -܂B - -@̖ڎwuSЉv́AƂAŊ͂ЉB -lXA荇AxЉBǂȉƒɐ܂ -AłЉB - -@Љ̎̂߁AÂȂǂ̎Љۏ́uقсv -Ή܂BāAlÖSۏAč\zȂ΂Ȃ܂B -҂̌ٗpxAqĎxA{IɊg[Kv܂B -΁ASUASʂẮu؂ڂ̂ȂSۏv̍\złB - -@l̂ƁAL҂̕XɂW܂肢AuSЉ -cvJÂATA񌾂𒸂܂B -@ڎwׂSЉ̎pƁA̎̓؂̂łB - -@PjҐɂ́A܂ƒ̊iAŒ艻Ȃ̒ -@Bt^̏wx̓ȂǁAᏊ̉ƒłwɍs鐧x -@Ɏg݂܂B - -@QjqĐɂ́AЉŜŁAqĂƎd̗dg݁B -@ttŊzTȂǁAqĂ̌oϕS̎xɎg݂܂B - -@Rj̐ɂ́AٗpɁAr̗pAEƌPAЉlw -@̎xxgݍ킹āAꐶ`W邱Ƃł悤 -@邱ƂA}܂B񐳋KJ҂ւ̎ЉیEJی̓Kpg -@i߂܂B - -@Sjɂ́Aٗpn抈ւ̎Q@g債AuVOΌ -@ЉvAāuUЉvڎw܂B{iIȍЉx -@邽߁Anł̈ÁE̘Ag𐄐iAƋ҂ɑ΂Z -@ۏɎg݂܂B - -@́A̎ɑS͂XA]ƐMA̐Ɉp܂B - - -uY˂v - -@}Kǎ҂̊FlΏۂɁAւ̃C^r[uY -˂vzMĂ܂B - -ǎ҂̎F -upF͂ǂȉy𒮂̂ł傤H -i啪AROAjAEAقPjv - -Y˂ij - http://www.kantei.go.jp/jp/asovideo/2009/06/1238/normal_play1238.html - - -hqb̕lcłB - -[CΏ@̐Ǝq̊]ihqb@lcj - -@Csׂ}~A䂪̍vmۂƂƂɁAێЉɑ΂ -ӔCʂ߁AŊ􂷂̂߂ɕKvȖ@ł -ƍlĂ܂B̖@ɂAЂ킸ɊODqA -CɏPĂƂɎ邱Ƃ”\ɂȂ܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625daijin.html - - -̐lɕ - -[ḦSES鉏̗͎̉]i_ѐYȊ֓_Ǔ_ -ES\EKiە\EKiʒ@򊲍Lj - -@Hi\ʂf́AUi̕GƎĂ̍L扻ɑΉׂA -QONSɐVɐݒuꂽASenW߂ꂽHi\f -̐słB - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625kikitai.html - - -ҏŴЂƂ - -@TؗjAJÂЉۏvik̕񍐏܂Ƃ܂ -BVqĎxVXeAEƔ\͊J̋@\Alވ琬 -헪AsҖh~ɂ‚Ă̏dvȒ񌾂荞܂Ă܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625matsumoto.html - --------------------------------------------------------------------- - {C^[lbgerԑgKCh --------------------------------------------------------------------- -@V - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0625aw/0625internettv.html - --------------------------------------------------------------------- - t̓ --------------------------------------------------------------------- -@oύciuoύv̊{jQOOX@`SÉE -ӔC`v̓\j(09/06/23)@Ȃ - http://www.kantei.go.jp/jp/asophoto/index.html - -------------------------------------------------------------------- - ӌAz --------------------------------------------------------------------- -@T̊z͂炩iUQW܂Łj - http://www.mmz.kantei.go.jp/enquetePcJa -@eȂ̑bւ̎ɂ‚ĂALNɁubɎvƋL -@@̏A񂹂B -@uY˂vł́AȂ̎ɂ܂B -@@ɕĂ݂Ƃɂ‚ĕLWĂ܂̂ŁAǂǂ -@@񂹂B - -@Ťʂ͂炩iVP܂Łj - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/kekka.html - --------------------------------------------------------------------- -t[}KW - -obNio[EzMύXEzM~ - http://www.mmz.kantei.go.jp/jp/m-magazine/ - -ҏWFtb@Y -ҏW@Ft[@{ -sFt[tL񎺁i100-8968@scic1-6-1j diff -Nru spamassassin-3.4.6/trunk-only/t.rules/WEIRD_QUOTING/fp_bug6149_thomas_4481 spamassassin-4.0.0~rc3/trunk-only/t.rules/WEIRD_QUOTING/fp_bug6149_thomas_4481 --- spamassassin-3.4.6/trunk-only/t.rules/WEIRD_QUOTING/fp_bug6149_thomas_4481 2009-08-18 20:12:33.000000000 +0000 +++ spamassassin-4.0.0~rc3/trunk-only/t.rules/WEIRD_QUOTING/fp_bug6149_thomas_4481 1970-01-01 00:00:00.000000000 +0000 @@ -1,157 +0,0 @@ -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 8bit - - -@@@@t[}KWRV@@@@@ -@@@@@@@@@@@@@@2009/07/02@@@@@ - - -Tł͗^Ӗbu{jQOOXvɂ‚Č܂B܂A -@h_܂܂ꂽXq胁bZ[W܂B - - -Ýu邭v - -[ƁËSƔɉhڎw] - -@TjA哝̂܂BɏACĈȗA -Wڂ̎]kɂȂ܂BقڌɂPBߋAقǕpɂɁA -̎]d˂Ƃ͂܂B܂ɁuVgOv̒蒅 -B - -@kł́AkN̝fvAjA~TC̖ɑ̎Ԃ -B - -@kŃȀtȍ~A~TC˂Ɠxڂ́ujvđ -s܂B炩ȋЂłBSvō̑ꂽAAۗc -PWVSɎ{Ȃ΂Ȃ܂B - -@{́A̋c̍̑ɌAۗ[hĂ܂B -c{邽߁A{́AZʂݕ܂߁A̓Iȍs -Ă܂BkN̗̕Aoh߁AĎs߂ -V@̍oɌA}ŏi߂Ă܂B - -@]kł́A{Ɗ؍Aĕč܂ޓĊ؂AwA -𖧂ɂāAkNɑΏ邱ƂmF܂B - -@AVAƂٖɘAgAkNɑ΂ċ͂邱Ƃ -KvłBkŃAȏ̒śׂA̗vɂ‚ȂȂ -ƂAێЉ̈vƂāAkNɕ点˂΂Ȃ܂B - -@ŁAΘbɂ̔‚Ă͂܂BkNɑ΂A -c𐽎ŠSɎ{AfvAjA~TCƂ̕I -ȉɌAڂɌsƂ悤AfłƂċ߂Ă܂B - -@́AO̖ړÍAuƂƍ̈SƔɉhmۂ邱Ƃɂv -ƍlĂ܂B - -@kNŖ炩Ȃ悤ɁA{̈SƔɉh́A{ꍑł͊mۂ -܂B܂́Aē̎mۂĂBđo̕sf̓w -͂ʂAĈSۏ̐ɖSȂ̂ƂĂƂKvłB - -@ɁAAȂǁAێЉ̏ŁA{̍v咣A֌W̋ -͂𓾂Ăɂ́A{炪AڂɌ`ŁAۓIȐӔCʂ -˂΂Ȃ܂B - -@̓_ŁAŋ߁A{́AOi܂BCΏ@̐łBC -獑̐EY邽߁A킪̍XƓlAAfpE -\}AɁAC㎩q̌q͂ȂǂhĂ܂B@̐ɂA -́ADЂɊւ炸AODɂΉ邱Ƃ”\ƂȂ܂B - -@AꂽAAEtBs哝̂A^𒸂 -܂B́A{̊OqD̑D̂Vȏ́AtBs̕XłB - -@\}Ał́AQON߂⍬AlX́Az‚Ȃ -قǂ̋ɒʂĂ܂B̌Aٗp̑noȂǁA艻̂ -̎xAS͂ōsĂ܂BqCۈɂ銈ƁA\} -AyюӍւ́AEʂ̎x́A΁uԂ̗ցvłB - -@́AuƁËSƔɉhvO̎ɌāA̓Is -葱܂B - - -uY˂v - -@}Kǎ҂̊FlΏۂɁAւ̃C^r[uY -˂vzMĂ܂B - -ǎ҂̎F -upF猩āA{̗ǂ͉łH -@i{茧AROAAEjv - -Y˂ij - http://www.kantei.go.jp/jp/asovideo/2009/07/1315/normal_play1315.html - - -t{Sb̗^Ӗ]łB - -[uoύv̊{jQOOX`SÉEӔC`vɂ‚] -it{Sb@^Ӗ]j - -@UQR̗ՎtcɂāAuoύv̊{jQOOX` -SÉEӔC`vtc肳܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702daijin.html - - -̐lɕ - -[ӂ̋C߂āAݑ鏗D̓]iD@Xqj - -@O܌ɁAÂqlɂƂł܂u -QLv錀̖܂āAꌎAċƂȂ܂B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702kikitai.html - - -ҏŴЂƂ - -@ÁAXqɍh_܂𑡂\܂BX -剉̕uQLv́A񔼐Iɂ킽ď㉉QOOOBA -̍̊F𖣗B - -Sǂ - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702matsumoto.html - --------------------------------------------------------------------- - {C^[lbgerԑgKCh --------------------------------------------------------------------- -@V - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/2009/0702bo/0702internettv.html - --------------------------------------------------------------------- - t̓ --------------------------------------------------------------------- -@h_ܕ\i09/07/01j@Ȃ - http://www.kantei.go.jp/jp/asophoto/index.html - -dqubNuCabilbgvV|{L -@WuYfvIv - http://www.gov-online.go.jp/pr/media/prm/cabinet/index.html - -------------------------------------------------------------------- - ӌAz --------------------------------------------------------------------- -@T̊z͂炩iVT܂Łj - http://www.mmz.kantei.go.jp/enquetePcJa -@eȂ̑bւ̎ɂ‚ĂALNɁubɎvƋL -@@̏A񂹂B -@uY˂vł́AȂ̎ɂ܂B -@@ɕĂ݂Ƃɂ‚ĕLWĂ܂̂ŁAǂǂ -@@񂹂B - -@Ťʂ͂炩iVW܂Łj - http://www.mmz.kantei.go.jp/jp/m-magazine/backnumber/kekka.html - --------------------------------------------------------------------- -t[}KW - -obNio[EzMύXEzM~ - http://www.mmz.kantei.go.jp/jp/m-magazine/ - -ҏWFtb@Y -ҏW@Ft[@{ -sFt[tL񎺁i100-8968@scic1-6-1j diff -Nru spamassassin-3.4.6/UPGRADE spamassassin-4.0.0~rc3/UPGRADE --- spamassassin-3.4.6/UPGRADE 2021-01-11 02:51:19.000000000 +0000 +++ spamassassin-4.0.0~rc3/UPGRADE 2022-09-20 05:19:30.000000000 +0000 @@ -1,607 +1,264 @@ -Note for Users Upgrading to SpamAssassin 3.4.5 +Note for Users Upgrading to SpamAssassin 4.0.0 ---------------------------------------------- -- Spamassassin test suite can now run against the installed - SpamAssassin files (rather than those in the source directory) +Apache SpamAssassin 4.0.0 represents years of work by the project with +numerous improvements, new rule types, and internal native handling +of messages in international languages. We highly recommend looking +through this file and all of the .pre files to evaluate your +configuration thoroughly. Plugins have been added, removed, and +improved throughout. + +- All rules, functions, command line options and modules that contain + "whitelist" or "blacklist" have been renamed to contain more + racially neutral "welcomelist" and "blocklist" terms. This allows + acronyms like WL and BL to remain the same. Previous options will + continue work at least until version 4.1.0 is released. If you have + local settings including scores or meta rules referring to old rule + names, these should be changed and "enable_compat + welcomelist_blocklist" added in init.pre. See: + https://wiki.apache.org/spamassassin/WelcomelistBlocklist (Bug 7826) + +- Setting normalize_charset is now enabled by default. Note that rules + should not expect specific non-UTF8 or UTF8 encoding in + body. Matching is done against the raw data which may vary depending + on normalize_charset setting and whether decoding to UTF8 was + successful. See: + https://wiki.apache.org/spamassassin/WritingRulesAdvanced + +- DKIM plugin has added support for ARC signature verification + +- The DecodeShortURL plugin has been added and decodes URIs from URL + shorteners that may be used to evade scanning + +- Strings can now be captured from rules and later reused using the + special %{TAGNAME} syntax + +- The Bayes stopwords, or noise words, are now configurable in order + to optimize Bayes usage for non-English languages. Stopwords for 16 + foreign languages have been included. See 60_bayes_stopwords.cf in + the rules files. See Mail::SpamAssassin::Plugin::Bayes and the + bayes_stopword_languages option if you wish to use a different + stopword list. This is highly recommended if you are using Bayes and + you are processing messages in languages other than English. + +- The OLEVBMacro plugin has been improved to identify more macros + while also extracting uris from the attachments for automatic + inclusion in RBL lookups + +- Internationalized domain name (IDN) support has been added and + requires Net::LibIDN2 or Net::LibIDN module with a new + Util::idn_to_ascii() function. (Bug 7215) + +- Meta rules no longer use priority values, they are evaluated + dynamically when the rules they depend on are finished. (Bug 7735) + +- API: New $pms->rule_pending() and $pms->rule_ready() functions are + now available. + + $pms->rule_pending($rulename) must be called from rules + eval-function, if the result can arrive later than when exiting the + function (asynchronous lookups). + + $pms->rule_ready($rulename) or $pms->got_hit(...) must be called + when the result has arrived. If these are not used, it can break + meta rule evaluation dependencies. + +- Improved internal header address (From/To/Cc) parser, now also + handles multiple addresses and includes optional support for + external Email::Address::XS parser, which can handle nested comments + and other oddities. + +- Header :addr :name modifiers now return all addresses. Options of + :first :last select only first (topmost) or last header to process + when there are multiple headers with the same name. :addr and :name + may still return multiple values from a single header. + +- API: $pms->get() can and should now be called in list + context. Scalar context continues to return multiple values newline + separated, but this should be considered deprecated. + +- New ExtractText plugin that extracts text from documents or images + to feed the data into SpamAssassin for standard processing with + existing rules, URIs extracted from documents will fall into normal + RBL lookups. + +- New "nolog" tflag added to hide info coming from rules in + SpamAssassin reports + +- All log output (stderr, file, syslog) is now escaped properly for \r + \n \t \\, control chars, DEL, and UTF-8 sequences presented as + \x{XX}. Whitespace is not normalized anymore like in versions prior + to 4.0.0. + +- API: Logger::add() has new optional 'escape' parameter. New + Logger::escape_str() function. + +- API: New $pms->add_uri_detail_list() function. Also new + uri_detail_list types: unlinked, schemeless + +- Util::split_domain, trim_domain, and is_domain_valid functions have + a new optional argument ($is_ascii) + +- Header names support new :host :domain :ip :revip modifiers + +- AskDNS: tag HEADER(hdrname) supported to query any header content + similarly to header rules + +- The HashCash module and support has been removed completely, as it + has been long since deprecated + +- URILocalBL: uri_block_cc/uri_block_cont now support negation (Bug + 7528) + +- URILocalBL: IPv6 lookups for hosts is now support, if provided by + your database + +- DNS and other asynchronous lookups such as Pyzor and DCC are now + only launched when priority -100 is reached. This allows short + circuiting at a lower priority without sending unneeded DNS queries + and starting process forms. (Bug 5930) + +- API: New plugin method callback method check_dnsbl added to launch + network lookups at priority -100 and check_post_dnsbl to harvest own + network lookups + +- API: New plugin callback method check_cleanup for cleaning up + things... + +- FreeMail: new options freemail_import_welcomelist_auth and + freemail_import_def_welcomelist_auth added (Bug 6451) + +- New internal Mail::SpamAssassin::GeoDB module that provides a + unified interface to modules MaxMind::DB::Reader (GeoIP2), Geo::IP, + IP::Country::DB_File, and IP::Country::Fast. + + This is utilized by RelayCountry and URILocalBL with settings + geodb_module, geodb_options, and geodb_search_path. + + Deprecated settings still work such as country_db_type, + country_db_path, uri_country_db_path, and uri_country_db_isp_path + but will print a warning to migrate to geodb_module/options. + +- Razor2 razor_fork option added to create separate Razor2 processes + and read in the results later asynchronously, increasing throughput, + and automatically adjusting rule priorities to -100. + +- DCC checks are now done asynchronously if using dccifd, improving + throughput. With dccifd, rule priorities are automatically adjusted + to -100. Commercial reputation rules can be ignored with the option + "use_dcc_rep 0" to save a few CPU cycles. + +- Pyzor pyzor_fork option added to create separate Pyzor processes and + read in the results later asynchronously, increasing throughput, and + automatically adjusting rule priorities to -100. Renamed pyzor_max + setting to pyzor_count_min. Added pyzor_welcomelist_min and + pyzor_welcomelist_factor setting. Also try to improve false + positives by ignoring "empty body" messages. + +- API: deprecated $pms->register_async_rule_start() and + $pms->register_async_rule_finish() calls though left in for + backwards compatibility. Plugins should only use + $pms->bgsend_and_start_lookup(), which handles required things + Automatically. Direct calls to bgsend or start_lookup should not be + used. $pms->bgsend_and_start_lookup() should always contain + $ent->{rulename} for correct meta dependency handling. Deprecated + start_lookup, get_lookup, lookup_ns, harvest_until_rule_completes, + and is_rule_complete. + +- SPF: Mail::SPF is now the only supported perl module and + Mail::SPF::Query is deprecated along with the settings + do_not_use_mail_spf, and do_not_use_mail_spf_query. SPF lookups are + not done asynchronously so using an MTA filter such as pypolicyd-spf + or spf-engine can generate Received-SPF for SpamAssassin to parse. + +- "ALL" pseudo-header now returns decoded headers, so it's usage is + consistent with single header matching. Using the :raw option mimics + the previous behavior of with undecoded and folded headers. + +- New dns_block_rule option handles blocked DNSBLs (Bug 6728) + +- ASN: Support GeoDB for ASN lookups (asn_use_geodb, asn_prefer_geodb, + asn_use_dns). + +- ASN: Default sa-update ruleset doesn't make ASN lookups or add + headers anymore. Configure desired methods, asn_use_geodb or + asn_use_dns, and add_header clauses manually as described in the + plugin documentation. Usage of asn_use_geodb without DNS is + recommended unless ASNCIDR is needed. Do not use rules that check + metadata X-ASN header! Only the new eval function check_asn() + described in plugin manual works reliably. + +- sa-update: New --score-multiplier, --score-limit, and --forcemirror + options added. + #1 forcemirror: forces sa-update to use a specific mirror server, + #2 score-multiplier: adjust all scores from update channel by a + given multiplier to quickly level set scores to match your + preferred threshold + #3 score-limit adjusts all scores from update channel over a + specified limit to a new limit + +- New dns_options "nov4" and "nov6" added. IMPORTANT:; You must set + nov6 if your DNS resolver is filtering IPv6 AAAA replies. + +- API: Added Message::get_pristine_body_digest(), + Message::get_msgid(), and Message::generate_msgid() + functions. Removed deprecated private Plugin::Bayes::get_msgid() + function. + +- Bayes and TxRep seen Message-ID tracking hashing method changed. No + actions are required. If re-learning some old messages, they might + be learned twice but old IDs should expire automatically. + +- report_charset defaults now to UTF-8. + +- Meta rules inherit net tflag setting from dependencies (Bug 7735) + +- BodyEval: Added plaintext_body_sig_ratio eval rules for the first + text/plain MIME part's body and signature length ratio. + +- API: Now supports multiple calls of $pms->test_log() for + rules. Added $pms->check_cleanup() to finalize tags, reports, + etc. Deprecated internal $pms->{test_log_msgs}, renamed to + $pms->{test_logs}. Deprecated $pms->clear_test_state() as it is not + needed anymore. $pms->test_log() now accepts $rulename as second + argument. + +- URIDNSBL: urirhsbl/urirhssub rules support "notrim" tflag to force + querying the full hostname instead of just the domain. This works + best if the specific uribl supports this mode. (Bug 7835) + +- Removed deprecated --auth-ident and --ident-timeout options from + spamd + +- MIMEHeader: support matching ALL header, tflags range, and tflags + concat + +- Autolearn: add new tflags autolearn_header/autolearn_body. These can + force a rule to count as header or body points accordingly. (Bug + 7907) + +- SSL client certificate support for spamc/spamd is now easier. New + spamc options --ssl-cert, --ssl-key, --ssl-ca-file, and + --ssl-ca-path. New spamd options --ssl-verify, --ssl-ca-file, and + --ssl-ca-path (Bug 7267) + +- ArchiveIterator now automatically uncompressed all gzip, bzip2, xz, + lz4, lzip, and lzo-compressed files (Bug 7598). These apply to + spamassassin and sa-learn commands also. + +- New DMARC policy check plugin. + +- New project maintained DecodeShortURLs plugin which may not be + directly compatible with rules from other third party plugins. See + The plugin documentation for configuration and rule format. + +- Installing module Net::CIDR::Lite allows the use of dash-separated + IP range format (e.g. 192.168.1.1-192.168.255.255) for NetSet tables + including internal_networks, trusted_networks, msa_networks, and + uri_local_cidr. -- unwhitelist_auth now also removes def_whitelist_auth entries +- The HashBL plugin in 342.pre is now enabled by default. -- SPF: add unwhitelist_from_spf to remove both whitelist_from_spf and - def_whitelist_from_spf entries - -- Default SQL schema for userpref.value changed from varchar(100) to - varchar(255), no need to modify unless you hit the limit. (Bug 7803) - -- URIDetail can now match full hostname with "host" key - -- BodyEval: plaintext_body_sig_ratio: eval rules for the (first text/plain - MIME part's) body and signature lengths and ratio - -Note for Users Upgrading to SpamAssassin 3.4.4 ----------------------------------------------- - -- FromNameSpoof: fns_extrachars parameter default value has been increased to 50 - -- nosubject and maxhits tflags now work correctly with sa-compile - -Note for Users Upgrading to SpamAssassin 3.4.3 ----------------------------------------------- - -- New subjprefix keyword added, this can be used to add a prefix to - email Subject if the original email matches a particular rule - -- New Util::is_fqdn_valid() function to validate hostname (DNS name) format - (Bug 7736). To check if a name contains valid TLD, it's still needed to - additionally use RegistryBoundaries::is_domain_valid() - -- New OLEVBMacro plugin to detect OLE Macro inside documents attached to emails, - this plugin requires Archive::Zip and IO::String Perl modules to work. - -- Due to the dangerous nature of sa-update --allowplugins option, it - now prints a warning that --reallyallowplugins is required to use it. - This is to make sure all the legacy installations and wiki guides etc - still using it needlessly get fixed. - -- TxRep and Awl plugins has been modified to be compatible - with latest Postgresql versions. - You should upgrade your sql database running the following command: - MySQL: - "ALTER TABLE `txrep` CHANGE `count` `msgcount` INT(11) NOT NULL DEFAULT '0';" - "ALTER TABLE `awl` CHANGE `count` `msgcount` INT(11) NOT NULL DEFAULT '0';" - "ALTER TABLE `awl` ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;" - PostgreSQL: - "ALTER TABLE txrep RENAME COLUMN count TO msgcount;" - "ALTER TABLE awl RENAME COLUMN count TO msgcount;" - "ALTER TABLE awl ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP;" - -- body_part_scan_size 50000, rawbody_part_scan_size 500000 defaults added (Bug 6582) - These enable safer and faster scanning of large emails. - -- ALL pseudo-header now returns decoded headers, so it's usage is consistent - with single header matching (:raw returns undecoded and folded like before). - -- RegistryBoundaries did not load 20_aux_tlds.cf properly in older versions. - Old hardcoded list is now removed and RB will print "no tlds defined, need - to run sa-update" unless it can find list from config files. - -- Deprecated functions: Parser::is_delimited_regexp_valid(), - Parser::is_regexp_valid(), Util::regexp_remove_delimiters(), - Util::make_qr(). These all are combined into new Util::compile_regexp(). - -- DNSEval: add check_rbl_headers to check specific headers in rbl - -- DNSEval: add check_rbl_ns_from to check against an rbl for dns servers - -- HashBL: Add check_hashbl_bodyre, check_hashbl_emails, check_hashbl_uris, - hashbl_ignore - -- ASN: Support IPv6 with asn_lookup_ipv6 (Bug 7211) - -- sa-update: New option --httputil to force used download utility - -- Add rules_matching() expression to meta rules - -- Add tflags domains_only/ips_only to DNSEval.pm functions - -- RelayCountry: Added new metadata: X-Spam-Countries-External (_RELAYCOUNTRYEXT_), - X-Spam-Countries-Auth (_RELAYCOUNTRYAUTH_), X-Spam-Countries-All (_RELAYCOUNTRYALL_) - -- New tflag "nosubject" for 'body' rules, to stop matching the Subject - header which is part of the body text. - -Note for Users Upgrading to SpamAssassin 3.4.2 ----------------------------------------------- - -- We now support SHA-512 and SHA-256 signatures for our rules updates. - -- We may stop producing SHA-1 signatures in the near future so upgrading -to 3.4.2 is important. sa-update no longer uses these signatures. - -See https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7614 - -- freemail_import_whitelist_auth, freemail_import_def_whitelist_auth added (Bug 6451) - - -New plugins ------------ - -There are four new plugins added with this release: - - Mail::SpamAssassin::Plugin::HashBL - -The HashBL plugin is the interface to The Email Blocklist (EBL). -The EBL is intended to filter spam that is sent from IP addresses -and domains that cannot be blocked without causing significant -numbers of false positives. - - Mail::SpamAssassin::Plugin::ResourceLimits - -This plugin leverages BSD::Resource to assure your spamd child processes -do not exceed specified CPU or memory limit. If this happens, the child -process will die. See the BSD::Resource for more details. - - Mail::SpamAssassin::Plugin::FromNameSpoof - -This plugin allows for detection of the From:name field being used to mislead -recipients into thinking an email is from another address. The man page -includes examples and we expect to put test rules for this plugin into -rulesrc soon! - - Mail::SpamAssassin::Plugin::Phishing - -This plugin finds uris used in phishing campaigns detected by -OpenPhish (https://openphish.com) or PhishTank (https://phishtank.com) feeds. - -These plugins are disabled by default. To enable, uncomment -the loadplugin configuration options in file v342.pre, or add it to -some local .pre file such as local.pre . - -Notable changes ---------------- - -For security reasons SSLv3 support has been removed from spamc(1). - -GeoIP2 support has been added to RelayCountry and URILocalBL plugins due -to GeoIP legacy api deprecations. - -New configuration options -------------------------- - -A new template tag _DKIMSELECTOR_ that maps to the DKIM selector (the 's' tag) -from valid signatures has been added. - -A 'uri_block_cont' option to URILocalBL plugin to score uris per continent has been added. -Possible continent codes are: -af, as, eu, na, oc, sa for Africa, Asia, Europe, North America, -Oceania and South America. - -The 'country_db_type' and 'country_db_path' options has been added to be able -to choose in RelayCountry plugin between GeoIP legacy -(discontinued from 04/01/2018), GeoIP2, IP::Country::Fast -and IP::Country::DB_File. -GeoIP legacy is still the default option but it will be deprecated -in future releases. - -A config option 'uri_country_db_path' has been added to be able to choose -in URILocalBL plugin between GeoIP legacy and new GeoIP2 api. - -A config option 'resource_limit_cpu' (default: 0 or no limit) has been added -to configure how many cpu cycles are allowed on a child process before it dies. - -A config option 'resource_limit_mem' (default: 0 or no limit) has been added -to configure the maximum number of bytes of memory allowed both for -(virtual) address space bytes and resident set size. - -A new config option 'report_wrap_width' (default: 70) has been added -to set the wrap width for description lines in the X-Spam-Report header. - -Notable Internal changes ------------------------- - -SpamAssassin can cope with new Net::DNS module versions. - -The "bytes" pragma has been remove from both core modules and plugins for -better utf-8 compatibility, there has been also some other utf-8 related fixes. - -The spamc(1) client can now be build against OpenSSL 1.1.0. - -The test framework has been switched to Test::More module. - -Other updates -------------- - -A list of top-level domains in registrar boundaries was updated. - - -Note for Users Upgrading to SpamAssassin 3.4.1 ----------------------------------------------- - -- The TxRep plugin is now included and disabled by default for new installs. - To replace an existing AWL configuration with TxRep, follow the steps below: - - Disable AWL - - Enable TxRep - - Set txrep_factor equal to your previous AWL factor - - Set use_txrep to 1 - - For more detailed information and more configuration options, consult the - documentation in Mail::SpamAssassin::Plugin::TxRep. - -- The $VALID_TLDS_RE global in registrar boundaries is deprecated but kept for - third-party plugin compatibility. It will become increasingly out of date - and may be removed in a future release. - - See lib/Mail/SpamAssassin/Plugin/FreeMail.pm for an example of the new way - to obtain a valid list of TLDs, i.e. - - $self->{main}->{registryboundaries}->{valid_tlds_re} - -- Mail::SpamAssassin::Util::RegistrarBoundaries is being replaced by - Mail::SpamAssassin::RegistryBoundaries so that new TLDs can be updated via - 20_aux_tlds.cf delivered via sa-update. - - ***3rd Party Plugin Authors, Please Note*** - - The following functions will be removed in the next release after 3.4.1 - excepting any emergency break/fix releases immediately after 3.4.1: - - Mail::SpamAssassin::Util::RegistrarBoundaries::is_domain_valid - Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain - Mail::SpamAssassin::Util::RegistrarBoundaries::split_domain - Mail::SpamAssassin::Util::uri_to_domain - - And the following variables will also be removed: - - Mail::SpamAssassin::Util::RegistrarBoundaries::US_STATES - Mail::SpamAssassin::Util::RegistrarBoundaries::THREE_LEVEL_DOMAINS - Mail::SpamAssassin::Util::RegistrarBoundaries::TWO_LEVEL_DOMAINS - Mail::SpamAssassin::Util::RegistrarBoundaries::VALID_TLDS_RE - Mail::SpamAssassin::Util::RegistrarBoundaries::VALID_TLDS - - - This change should only affect 3rd party plugin authors who will need to - update their code to utilize Mail::SpamAssassin::RegistryBoundaries - instead of the functions and variables in - Mail::SpamAssassin::Util::RegistrarBoundaries and the function - Mail::SpamAssassin::Util::uri_to_domain which are deprecated and will be - removed. - - For example, the $VALID_TLDS_RE global in registrar boundaries is - deprecated but kept for third-party plugin compatibility. It will become - increasingly out of date and may be removed in a future release. - - See lib/Mail/SpamAssassin/Plugin/FreeMail.pm for an example of the new way - to obtain a valid list of TLDs, i.e. - - $self->{main}->{registryboundaries}->{valid_tlds_re} - -- It is now recommended that users uncomment "normalize_charset 1" in - local.cf. It will break rules that depend on messages being in non-UTF8 - encodings, but going forward this will enable more robust unicode rules and - will eventually become the default. - - - -Note for Users Upgrading to SpamAssassin 3.4.0 ----------------------------------------------- - -- When Bayes classification is in use and messages are 'learned' as spam - or ham and stored in a database, the Bayes plugin generates internal - message IDs of learned messages and stores them in a 'seen' database to - avoid re-learning duplicates and accidental un-learning messages that - were not previously learned. With changes in bug 5185, the calculation - of message IDs in a bayes 'seen' database has changed, so new code can - no longer associate new messages with those learned before the change. - -- Note that this change does not affect recognition of old tokens and the - classification algorithm, only duplicate detection and unlearning of old - messages is affected. - -- Because of this change, if you use Bayes and you are upgrading from a - version prior to 3.4.0, you may consider wiping your Bayes database - and starting fresh. - -- There is a new optional dependency on Net::Patricia to speed up lookups - on internal_networks, trusted_networks or msa_networks when these lists - contain a larger number of entries. Consider installing this module to - speed up classification. - -- The minimal required version of NetAddr::IP was bumped to 4.010 - -- In addition to existing backends, the 3.4.0 introduces support for keeping - a Bayes database on a Redis server, either running locally, or accessed - over network. Similar to SQL backends, the database may be concurrently - used by several hosts running SpamAssassin. - -- For more detail on these and other changes, please see the Announcement - file at: - http://svn.apache.org/repos/asf/spamassassin/branches/3.4/build/announcements/3.4.0.txt - -Note for Users Upgrading to SpamAssassin 3.3.0 ------------------------------------------------ - -- Rules are no longer included with SpamAssassin "out of the box". You will - need to immediately run "sa-update", or download the additional rules .tgz - package and run "sa-update --install" with it, to get a ruleset. - -- The BETA label has been taken off of the SpamAssassin SQL support. Please - be aware that occasional changes may still be made to this area of the - code. You should be sure to read this upgrade document each time you - install a new version to determine if any SQL updates need to be made to - your local installation. - -- The DKIM plugin is now enabled by default for new installs, if the perl - module Mail::DKIM is installed. However, installation of SpamAssassin - will not overwrite existing .pre configuration files, so to use DKIM when - upgrading from a previous release that did not use DKIM, a directive: - - loadplugin Mail::SpamAssassin::Plugin::DKIM - - will need to be uncommented in file "v312.pre", or added to some - other .pre file, such as local.pre. - - -Note for Users Upgrading to SpamAssassin 3.2.0 ------------------------------------------------ - -- The "127/8" network, including 127.0.0.1, is now always implicitly part of - "trusted_networks" and "internal_networks". It's impossible to remove these - from the trusted/internal sets, since if you cannot trust the host where - SpamAssassin is running, you cannot trust SpamAssassin itself. If you - previously had "trusted_networks" and "internal_networks" lines listing those - hosts, you should now remove them, otherwise a minor (non-lint-error) warning - will be output. - -- For ISPs -- version 3.2.0 now includes a new way to specify Mail Submission - Agents, relay hosts which accept mail from your own users and authenticates - them appropriately. See the Mail::SpamAssassin::Conf manual page for the - "msa_networks" setting. - - -Note for Users Upgrading to SpamAssassin 3.1.0 ------------------------------------------------ - -- A significant amount of core functionality has been moved into - plugins. These include, AWL (auto-whitelist), DCC, Pyzor, Razor2, - SpamCop reporting and TextCat. For information on configuring these - plugins please refer to their individual documentation: - perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc) - -- There are now multiple files read to enable plugins in the - /etc/mail/spamassassin directory; previously only one, "init.pre" was - read. Now both "init.pre", "v310.pre", and any other files ending - in ".pre" will be read. As future releases are made, new plugins - will be added to new files named according to the release they're - added in. - -- Due to license restrictions the DCC and Razor2 plugins are disabled - by default. We encourage you to read the appropriate license - yourself and decide if you are able to re-enable the plugins for - your site. - -- The use_auto_whitelist config option has been moved to a user config - option, this allows individual users to turn on or off whitelisting - regardless of what is set in the system config. If you would like to - disable AWL (auto-whitelist) on a site-wide basis, then you can comment - out the plugin in "v310.pre". - -- The bayes_auto_learn_threshold_* config options for bayes have moved - to a plugin. In general the default should work just fine however - if you are interested in changing these values you should see: - perldoc Mail::SpamAssassin::Plugin::AutoLearnThreshold - -- The AWL support for NDBM_File databases has been dropped, due to a - bug in that package which renders it useless (bug 4353). It appears - that SDBM_File, the package which will be used instead, is fully - compatible with NDBM however, so this should be unnoticeable. - -- The prefork algorithm for spamd has been changed. In this version spamd - will attempt to keep a small number of "hot" child processes as busy as - possible, and keep any others as idle as possible, using something - similar to the Apache httpd server scaling algorithm. This reduces - memory usage and swapping. You can use the --round-robin switch for - spamd to disable this scaling algorithm, and the behaviour seen in the - 3.0.x versions will be used instead, where all processes receive an - equal load and no scaling takes place. - -- As of 3.1.0, in addition to the generic BayesSQL support (via - Mail::SpamAssassin::BayesStore::SQL) usable by multiple database - drivers there is now specific support for MySQL 4.1+ and - PostgreSQL. This support is based on non-standard features present - in both database servers that allow for various performance boosts. - - If you were using the previous BayesSQL support with MySQL, and - already have MySQL 4.1+ installed you can begin using the new module - immediately by replacing the bayes_store_module line in your - configuration with: Mail::SpamAssassin::BayesStore::MySQL - - We do however recommend that you switch your MySQL tables over to - InnoDB for better data integrity and multi user support. You can - most often do this via a simple ALTER TABLE command, refer to the - MySQL documentation for more information. - - If you were previously using PostgreSQL for your bayes database then - we STRONGLY recommend switching to the PostgreSQL specific backend: - Mail::SpamAssassin::BayesStore::PgSQL - To switch to this backend you should first run sa-learn --backup to - make a backup of your existing data and then drop and recreate the - database following the instructions in sql/README.bayes. Then you - can restore the database with sa-learn --restore. If you have - multiple users then you will have to run --backup and --restore for - each user to fully restore the database. - -- See http://wiki.apache.org/spamassassin/UpgradeTo310 for a - supplementary list of upgrade notes. It will be updated with any - upgrade notes not captured in this document. - -- Finally, this document is likely not complete. Other configuration - options/arguments may have changed from older versions, etc. It would - be good to double-check any custom configuration options to make sure - they're still valid. This could be as simple as running "spamassassin - --lint", or more complex, as required by the environment. - - -Note for Users Upgrading to SpamAssassin 3.0.x ----------------------------------------------- - -- The SpamAssassin 2.6x release series was the last set of releases to - officially support perl versions earlier than perl 5.6.1. If you are - using an earlier version of perl, you will need to upgrade before you - can use the 3.0.0 version of SpamAssassin. You will also want to make - sure that you have the appropriate versions of required and optional - modules as they may have changed from old versions. The INSTALL - document has the modules and version requirements listed. - -- See http://wiki.apache.org/spamassassin/UpgradeTo300 for a - supplementary list of upgrade notes. It will be updated with any - upgrade notes not captured in this document. - -- SpamAssassin 3.0.0 has a significantly different API (Application Program - Interface) from the 2.x series of code. This means that if you use - SpamAssassin through a third-party utility (milter, etc,) you need to make - sure you have an updated version which supports 3.0.0. See - http://wiki.apache.org/spamassassin/UpgradeTo300 for information about - third-party software. - -- The --auto-whitelist, --whitelist and -a options for "spamd" and - "spamassassin" to turn on the auto-whitelist have been removed and - replaced by the "use_auto_whitelist" configuration option which is - also now turned on by default. - -- The --virtual-config switch for spamd had to be dropped, due to licensing - issues. It is replaced by the --virtual-config-dir switch. - -- The "rewrite_subject" and "subject_tag" configuration options were - deprecated and are now removed. Instead, using "rewrite_header Subject - [your desired setting]". e.g. - - rewrite_subject 1 - subject_tag ****SPAM(_SCORE_)**** - - becomes - - rewrite_header Subject ****SPAM(_SCORE_)**** - -- The "sa-learn --rebuild" command has been deprecated; please use - "sa-learn --sync" instead. The --rebuild option will remain temporarily - for backward compatibility. - -- The Bayesian storage modules have been completely re-written and now - include Berkeley DB (DBM) storage as well as SQL based storage (see - sql/README.bayes for more information). In addition, a new format - has been introduced for the bayes database that stores tokens in fixed - length hashes (Bayes v3). All DBM databases should be automatically - converted to this new format the first time they are opened for write. - You can manually perform the upgrade by running "sa-learn --sync" - from the command line. - - Due to the database format change, you will want to do something like - this when upgrading: - - - stop running spamassassin/spamd (ie: you don't want it to be running - during the upgrade) - - run "sa-learn --rebuild", this will sync your journal. if you skip - this step, any data from the journal will be lost when the DB is - upgraded. - - upgrade SA to 3.0.0 - - run "sa-learn --sync", which will cause the db format to be upgraded. - if you want to see what is going on, you can add the "-D" option. - - test the new database by running some sample mails through - SpamAssassin, and/or at least running "sa-learn --dump" to make sure - the data looks valid. - - start running spamassassin/spamd again - - If, instead of uprading your Bayes database, you want to wipe it and - start fresh, you can run "sa-learn --clear" to safely remove your - Bayes database files. If the --clear command issues an error then - you can simply delete the Bayes database files ("bayes_*") while SA - is not running; SpamAssassin will recreate them in the current - format when it runs. - -- "spamd" now has a default max-children setting of 5; no more than 5 - child scanner processes will be run in parallel. Previously, there was - no default limit unless you specified the "-m" switch when starting - spamd. - -- If you are using a UNIX machine with all database files on local disks, - and no sharing of those databases across NFS filesystems, you can use a - more efficient, but non-NFS-safe, locking mechanism. Do this by adding - the line "lock_method flock" to the /etc/mail/spamassassin/local.cf - file. This is strongly recommended if you're not using NFS, as it is - much faster than the NFS-safe locker. - -- Please note that the use of the following commandline parameters for - spamassassin and spamd have been deprecated and may be removed in - upcoming versions of SpamAssassin. Please discontinue usage of these - options: - - in the 2.6x series: --add-from, --pipe, -F, --stop-at-threshold, - -S, -P (spamassassin only) - in the 3.0.x series: --auto-whitelist, -a, --whitelist-factory, -M, - --warning-from, -w, --log-to-mbox, -l - -- user_scores_sql_table is no longer supported. If you need to use a table - name, other than the default, create a custom query using the - user_scores_sql_custom_query config option. - -- SpamAssassin runs in "taint mode" by default for improved security. - Certain third-party modules may be incompatible with taint mode. - -- 2.6x deprecated the use of the "check_bayes_db" script, and it - has been removed in 3.0.0. Please see the sa-learn man/pod - documentation for more info. - -- Finally, this document is likely not complete. Other configuration - options/arguments may have changed from older versions, etc. It would - be good to double-check any custom configuration options to make sure - they're still valid. This could be as simple as running "spamassassin - --lint", or more complex, as required by the environment. - - An example: "require_version " hasn't changed itself, but the - internal version representation is now "x.yyyzzz" instead of "x.yz" - which could cause issues if "require_version 3.00" is expected to work - (it won't, it needs to be "require_version 3.000000"). - - -Note for Users Upgrading from SpamAssassin 2.5x ------------------------------------------------ - -- Due to major reliability shortcomings in the database support libraries - other than DB_File, we now require that the DB_File module be installed - to use SpamAssassin's Bayes rules. - - SpamAssassin will still work without DB_File installed, but the Bayes - support will be disabled. - - If you install DB_File and wish to import old Bayes database data, each - user with a Bayes db should run "sa-learn --import" to copy old entries - from the other formats into a new DB_File file. - - Due to the database library change, and the change to the database - format itself, you will want to do something like this when upgrading: - - - stop running spamassassin/spamd (ie: you don't want it to be running - during the upgrade) - - run "sa-learn --rebuild", this will sync your journal. if you skip - this step, any data from the journal will be lost when the DB is - upgraded. - - install DB_File module if necessary - - upgrade SA to 3.0.0 - - if you were using another database module previously, run "sa-learn - --import" to migrate the data into new DB_File files - - run "sa-learn --sync", which will cause the db format to be upgraded. - if you want to see what is going on, you can add the "-D" option. - - test the new database by running some sample mails through - SpamAssassin, and/or at least running "sa-learn --dump" to make sure - the data looks valid. - - start running spamassassin/spamd again - - Obviously the steps will be different depending on your environment, but - you get the idea. :) - - -Note For Users Upgrading From SpamAssassin 2.3x or 2.4x -------------------------------------------------------- - -- SpamAssassin no longer includes code to handle local mail delivery, as - it was not reliable enough, compared to procmail. So now, if you relied - on spamassassin to write the mail into your mail folder, you'll have to - change your setup to use procmail as detailed below. If you used - spamassassin to filter your mail and then something else wrote it into a - folder for you, then you should be fine. - -- Support for versions of the optional Mail::Audit module is no longer - included. - -- The default mode of tagging (which used to be ***SPAM*** in the subject - line) no longer takes place. Instead the message is rewritten. If an - incoming message is tagged as spam, instead of modifying the original - message, SpamAssassin will create a new report message and attach the - original message as a message/rfc822 MIME part (ensuring the original - message is completely preserved and easier to recover). If you do not - want to modify the body of incoming spam, use the "report_safe" option. - The "report_header" and "defang_mime" options have been removed as a - result. +- HeaderEval check_for_unique_subject_id() function is deprecated. (end of UPGRADE) - -//vim:tw=74: diff -Nru spamassassin-3.4.6/USAGE spamassassin-4.0.0~rc3/USAGE --- spamassassin-3.4.6/USAGE 2019-11-11 04:09:44.000000000 +0000 +++ spamassassin-4.0.0~rc3/USAGE 2022-04-23 12:18:23.000000000 +0000 @@ -84,7 +84,7 @@ If you want to use SpamAssassin site-wide: - take a look at the notes on the Wiki website, currently at - . You will probably + . You will probably want to use 'spamd' (see below). You may want to investigate the new Apache mod_perl module, in the 'spamd-apache2' directory, too. @@ -101,11 +101,11 @@ add the line 'DROPPRIVS=yes' at the top of the file. -The Auto-Whitelist +The Auto-Welcomelist ------------------ -The auto-whitelist is enabled using the 'use_auto_whitelist' option. -(See http://wiki.apache.org/spamassassin/AutoWhitelist for details on +The auto-welcomelist is enabled using the 'use_auto_welcomelist' option. +(See https://wiki.apache.org/spamassassin/AutoWelcomelist for details on how it works, if you're curious.) @@ -113,15 +113,6 @@ ------------------------ - - Hashcash is a useful system; it requires that senders exercise a - CPU-intensive task before they can send mail to you, so we give that - some bonus points. However, it requires that you list what addresses - you expect to receive mail for, by adding 'hashcash_accept' lines to - your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf - files. See the Mail::SpamAssassin::Plugin::Hashcash manual page for - details on how to specify these. - - - SpamAssassin now uses a temporary file in /tmp (or $TMPDIR, if that's set in the environment) for Pyzor and DCC checks. Make sure that this directory is either (a) not writable by other users, or (b) not shared @@ -161,7 +152,7 @@ - A very handy new feature is SPF support, which allows you to check that the message sender is permitted by their domain to send from the IP address used. This has the potential to greatly cut down on mail - forgery. (see http://spf.pobox.com/ for more details.) + forgery. - MDaemon users should add this line to their "local.cf" file: @@ -219,7 +210,7 @@ to do this, take a look here [1] for a simple forwarding-based alternative. - [1]: http://wiki.apache.org/spamassassin/SpamTrapping + [1]: https://wiki.apache.org/spamassassin/SpamTrapping - Scores and other user preferences can now be loaded from, and Bayes @@ -242,7 +233,7 @@ - Lots more ways to integrate SpamAssassin can be read at - http://wiki.SpamAssassin.org/ . + https://wiki.apache.org/spamassassin/ . (end of USAGE) diff -Nru spamassassin-3.4.6/xt/10_rule_test_suite.t spamassassin-4.0.0~rc3/xt/10_rule_test_suite.t --- spamassassin-3.4.6/xt/10_rule_test_suite.t 2009-08-18 21:06:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/10_rule_test_suite.t 2022-05-08 05:40:03.000000000 +0000 @@ -2,7 +2,6 @@ # # run the "t.rules" rule test suite in its entirety -(-d "xt") and chdir "xt"; # boilerplate for xt, ensure we know where we are +(-d "../t") and chdir ".."; -chdir ".."; exec "t.rules/run" or die "exec failed"; diff -Nru spamassassin-3.4.6/xt/20_saw_ampersand.t spamassassin-4.0.0~rc3/xt/20_saw_ampersand.t --- spamassassin-3.4.6/xt/20_saw_ampersand.t 2019-06-24 06:32:24.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/20_saw_ampersand.t 2022-05-27 09:59:23.000000000 +0000 @@ -3,23 +3,6 @@ # detect use of dollar-ampersand somewhere in the perl interpreter; # once it is used once, it slows down every regexp match thereafter. -BEGIN { - if (-d 'xt') { chdir 'xt'; } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -use lib '../t'; -use SATest; -sa_t_init("saw_ampersand"); - -use Test; - -use Carp qw(croak); - # Starting with perl 5.17.7, this entire test becomes irrelevant: # perldelta 5.17.7: # @@ -30,34 +13,22 @@ # down your program when used. Hence, the /p regular expression flag # now does nothing. -our $RUN_THIS_TEST; - -BEGIN { - $RUN_THIS_TEST = 1; - if ($] >= 5.017007) { - $RUN_THIS_TEST = 0; - } - use constant HAS_DSA => eval 'use Devel::SawAmpersand; 1;'; - plan tests => 0 if ! ( $RUN_THIS_TEST and HAS_DSA) ; +use lib '../t'; use lib 't'; +use SATest; +sa_t_init("saw_ampersand"); - if (!$RUN_THIS_TEST) { - print "NOTE: This test is unnecessary as of perl 5.17.7.\n"; - exit; - } - if ( !HAS_DSA ) { - print "NOTE: This test requires Devel::SawAmpersand\n"; - exit; - } -} +use Test::More; +plan skip_all => "This test is unnecessary as of perl 5.17.7" if ($] >= 5.017007); +plan skip_all => "This test requires Devel::SawAmpersand" unless (eval { require Devel::SawAmpersand; 1} ); +plan tests => 41; -plan tests => 37; +use Carp qw(croak); # --------------------------------------------------------------------------- use strict; require Mail::SpamAssassin; -use Devel::SawAmpersand; # it is important to order these from least-plugin-code-run to most. @@ -66,10 +37,9 @@ print "\ntrying net with only local rule plugins\n"; - # kill all 'loadplugin' lines foreach my $file - (, ) #*/ + (<$siterules/*.pre>, <$localrules/*.pre>) #*/ { $file = untaint_var($file); rename $file, "$file.bak" or die "rename $file failed"; @@ -104,13 +74,12 @@ tryone (0, ""); print "\ntrying net with more local rule plugins\n"; - $plugins .= q{ loadplugin Mail::SpamAssassin::Plugin::SpamCop loadplugin Mail::SpamAssassin::Plugin::AntiVirus loadplugin Mail::SpamAssassin::Plugin::TextCat loadplugin Mail::SpamAssassin::Plugin::AccessDB - loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject + loadplugin Mail::SpamAssassin::Plugin::WelcomeListSubject loadplugin Mail::SpamAssassin::Plugin::MIMEHeader loadplugin Mail::SpamAssassin::Plugin::ReplaceTags loadplugin Mail::SpamAssassin::Plugin::Shortcircuit @@ -119,6 +88,38 @@ write_plugin_pre($plugins); tryone (0, ""); +print "\ntrying net with even more local rule plugins\n"; +$plugins .= q{ + loadplugin Mail::SpamAssassin::Plugin::ASN + loadplugin Mail::SpamAssassin::Plugin::AWL + loadplugin Mail::SpamAssassin::Plugin::AskDNS + loadplugin Mail::SpamAssassin::Plugin::AuthRes + loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold + loadplugin Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor + loadplugin Mail::SpamAssassin::Plugin::Check + loadplugin Mail::SpamAssassin::Plugin::DecodeShortURLs + loadplugin Mail::SpamAssassin::Plugin::ExtractText + loadplugin Mail::SpamAssassin::Plugin::FreeMail + loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof + loadplugin Mail::SpamAssassin::Plugin::HashBL + loadplugin Mail::SpamAssassin::Plugin::ImageInfo + loadplugin Mail::SpamAssassin::Plugin::OLEVBMacro + loadplugin Mail::SpamAssassin::Plugin::OneLineBodyRuleType + loadplugin Mail::SpamAssassin::Plugin::P595Body + loadplugin Mail::SpamAssassin::Plugin::PhishTag + loadplugin Mail::SpamAssassin::Plugin::Phishing + loadplugin Mail::SpamAssassin::Plugin::RelayCountry + loadplugin Mail::SpamAssassin::Plugin::RelayEval + loadplugin Mail::SpamAssassin::Plugin::ResourceLimits + loadplugin Mail::SpamAssassin::Plugin::Reuse + loadplugin Mail::SpamAssassin::Plugin::SPF + loadplugin Mail::SpamAssassin::Plugin::Test + loadplugin Mail::SpamAssassin::Plugin::URIDNSBL + loadplugin Mail::SpamAssassin::Plugin::URILocalBL +}; +write_plugin_pre($plugins); +tryone (0, ""); + print "\ntrying net with DCC rule plugins\n"; $plugins .= q{ loadplugin Mail::SpamAssassin::Plugin::DCC @@ -168,7 +169,7 @@ # TODO: unportable untaint_system "perl -pi.bak -e 's/^###loadplugin/loadplugin/g' ". - " log/localrules.tmp/*.pre log/test_rules_copy/*.pre"; + " $siterules/*.pre $localrules/*.pre"; ($? >> 8 != 0) and die "perl failed"; @@ -181,12 +182,12 @@ sub write_plugin_pre { my $cftext = shift; - open OUT, ">log/localrules.tmp/test.pre" - or die "cannot create log/localrules.tmp/test.pre: $!"; + open OUT, ">$siterules/test.pre" + or die "cannot create $siterules/test.pre: $!"; print OUT $cftext - or die "error writing to log/localrules.tmp/test.pre: $!"; + or die "error writing to $siterules/test.pre: $!"; close OUT - or die "cannot close log/localrules.tmp/test.pre: $!"; + or die "cannot close $siterules/test.pre: $!"; } sub tryone { diff -Nru spamassassin-3.4.6/xt/50_bayesbdb.t spamassassin-4.0.0~rc3/xt/50_bayesbdb.t --- spamassassin-3.4.6/xt/50_bayesbdb.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_bayesbdb.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/bayesbdb.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_bayesdbm_flock.t spamassassin-4.0.0~rc3/xt/50_bayesdbm_flock.t --- spamassassin-3.4.6/xt/50_bayesdbm_flock.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_bayesdbm_flock.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/bayesdbm_flock.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_bayesdbm.t spamassassin-4.0.0~rc3/xt/50_bayesdbm.t --- spamassassin-3.4.6/xt/50_bayesdbm.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_bayesdbm.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/bayesdbm.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_bayessdbm_seen_delete.t spamassassin-4.0.0~rc3/xt/50_bayessdbm_seen_delete.t --- spamassassin-3.4.6/xt/50_bayessdbm_seen_delete.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_bayessdbm_seen_delete.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/bayessdbm_seen_delete.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_bayessdbm.t spamassassin-4.0.0~rc3/xt/50_bayessdbm.t --- spamassassin-3.4.6/xt/50_bayessdbm.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_bayessdbm.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/bayessdbm.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_db_based_whitelist_ips.t spamassassin-4.0.0~rc3/xt/50_db_based_whitelist_ips.t --- spamassassin-3.4.6/xt/50_db_based_whitelist_ips.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_db_based_whitelist_ips.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/db_based_whitelist_ips.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_db_based_whitelist.t spamassassin-4.0.0~rc3/xt/50_db_based_whitelist.t --- spamassassin-3.4.6/xt/50_db_based_whitelist.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_db_based_whitelist.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/db_based_whitelist.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_dcc.t spamassassin-4.0.0~rc3/xt/50_dcc.t --- spamassassin-3.4.6/xt/50_dcc.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_dcc.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/dcc.t", - "--override", "run_dcc_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_debug.t spamassassin-4.0.0~rc3/xt/50_debug.t --- spamassassin-3.4.6/xt/50_debug.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_debug.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/debug.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_dkim.t spamassassin-4.0.0~rc3/xt/50_dkim.t --- spamassassin-3.4.6/xt/50_dkim.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_dkim.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/dkim.t", - "--override", "run_net_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_dnsbl_sc_meta.t spamassassin-4.0.0~rc3/xt/50_dnsbl_sc_meta.t --- spamassassin-3.4.6/xt/50_dnsbl_sc_meta.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_dnsbl_sc_meta.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/dnsbl_sc_meta.t", - "--override", "run_net_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_dnsbl.t spamassassin-4.0.0~rc3/xt/50_dnsbl.t --- spamassassin-3.4.6/xt/50_dnsbl.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_dnsbl.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/dnsbl.t", - "--override", "run_net_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_lang_lint.t spamassassin-4.0.0~rc3/xt/50_lang_lint.t --- spamassassin-3.4.6/xt/50_lang_lint.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_lang_lint.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/lang_lint.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_line_endings.t spamassassin-4.0.0~rc3/xt/50_line_endings.t --- spamassassin-3.4.6/xt/50_line_endings.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_line_endings.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/line_endings.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_razor2.t spamassassin-4.0.0~rc3/xt/50_razor2.t --- spamassassin-3.4.6/xt/50_razor2.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_razor2.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/razor2.t", - "--override", "run_net_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_root_spamd.t spamassassin-4.0.0~rc3/xt/50_root_spamd.t --- spamassassin-3.4.6/xt/50_root_spamd.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -#!/usr/bin/perl - - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; diff -Nru spamassassin-3.4.6/xt/50_root_spamd_tell_paranoid.t spamassassin-4.0.0~rc3/xt/50_root_spamd_tell_paranoid.t --- spamassassin-3.4.6/xt/50_root_spamd_tell_paranoid.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_tell_paranoid.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#!/usr/bin/perl - - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd_tell_paranoid.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; - diff -Nru spamassassin-3.4.6/xt/50_root_spamd_tell.t spamassassin-4.0.0~rc3/xt/50_root_spamd_tell.t --- spamassassin-3.4.6/xt/50_root_spamd_tell.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_tell.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#!/usr/bin/perl - - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd_tell.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; - diff -Nru spamassassin-3.4.6/xt/50_root_spamd_tell_x_paranoid.t spamassassin-4.0.0~rc3/xt/50_root_spamd_tell_x_paranoid.t --- spamassassin-3.4.6/xt/50_root_spamd_tell_x_paranoid.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_tell_x_paranoid.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd_tell_x_paranoid.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; - diff -Nru spamassassin-3.4.6/xt/50_root_spamd_tell_x.t spamassassin-4.0.0~rc3/xt/50_root_spamd_tell_x.t --- spamassassin-3.4.6/xt/50_root_spamd_tell_x.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_tell_x.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd_tell_x.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; - diff -Nru spamassassin-3.4.6/xt/50_root_spamd_u_dcc.t spamassassin-4.0.0~rc3/xt/50_root_spamd_u_dcc.t --- spamassassin-3.4.6/xt/50_root_spamd_u_dcc.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_u_dcc.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/root_spamd_u_dcc.t", - "--override", "run_dcc_tests:run_root_tests", "1:1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_root_spamd_u.t spamassassin-4.0.0~rc3/xt/50_root_spamd_u.t --- spamassassin-3.4.6/xt/50_root_spamd_u.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_u.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd_u.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; - diff -Nru spamassassin-3.4.6/xt/50_root_spamd_virtual.t spamassassin-4.0.0~rc3/xt/50_root_spamd_virtual.t --- spamassassin-3.4.6/xt/50_root_spamd_virtual.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_virtual.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd_virtual.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; - diff -Nru spamassassin-3.4.6/xt/50_root_spamd_x_paranoid.t spamassassin-4.0.0~rc3/xt/50_root_spamd_x_paranoid.t --- spamassassin-3.4.6/xt/50_root_spamd_x_paranoid.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_x_paranoid.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd_x_paranoid.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; - diff -Nru spamassassin-3.4.6/xt/50_root_spamd_x.t spamassassin-4.0.0~rc3/xt/50_root_spamd_x.t --- spamassassin-3.4.6/xt/50_root_spamd_x.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_x.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#!/usr/bin/perl - - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd_x.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; - diff -Nru spamassassin-3.4.6/xt/50_root_spamd_x_u.t spamassassin-4.0.0~rc3/xt/50_root_spamd_x_u.t --- spamassassin-3.4.6/xt/50_root_spamd_x_u.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_root_spamd_x_u.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#!/usr/bin/perl - - (-d "../t") and chdir ".."; - system("sudo", "-n", "$^X", "-T", "t/root_spamd_x_u.t", - "--override", "run_root_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - my $uid = (stat("t"))[4]; - system("sudo -n chown -R $uid t/log") if $uid; - diff -Nru spamassassin-3.4.6/xt/50_sa_compile.t spamassassin-4.0.0~rc3/xt/50_sa_compile.t --- spamassassin-3.4.6/xt/50_sa_compile.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_sa_compile.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/sa_compile.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamc_H.t spamassassin-4.0.0~rc3/xt/50_spamc_H.t --- spamassassin-3.4.6/xt/50_spamc_H.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamc_H.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamc_H.t", - "--override", "run_net_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamc_x_E_R.t spamassassin-4.0.0~rc3/xt/50_spamc_x_E_R.t --- spamassassin-3.4.6/xt/50_spamc_x_E_R.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamc_x_E_R.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamc_x_E_R.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamd_client.t spamassassin-4.0.0~rc3/xt/50_spamd_client.t --- spamassassin-3.4.6/xt/50_spamd_client.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamd_client.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamd_client.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamd_hup.t spamassassin-4.0.0~rc3/xt/50_spamd_hup.t --- spamassassin-3.4.6/xt/50_spamd_hup.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamd_hup.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamd_hup.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamd_kill_restart_rr.t spamassassin-4.0.0~rc3/xt/50_spamd_kill_restart_rr.t --- spamassassin-3.4.6/xt/50_spamd_kill_restart_rr.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamd_kill_restart_rr.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamd_kill_restart_rr.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamd_kill_restart.t spamassassin-4.0.0~rc3/xt/50_spamd_kill_restart.t --- spamassassin-3.4.6/xt/50_spamd_kill_restart.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamd_kill_restart.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamd_kill_restart.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamd_prefork_stress_2.t spamassassin-4.0.0~rc3/xt/50_spamd_prefork_stress_2.t --- spamassassin-3.4.6/xt/50_spamd_prefork_stress_2.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamd_prefork_stress_2.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamd_prefork_stress_2.t", - "--override", "run_spamd_prefork_stress_test", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamd_prefork_stress_3.t spamassassin-4.0.0~rc3/xt/50_spamd_prefork_stress_3.t --- spamassassin-3.4.6/xt/50_spamd_prefork_stress_3.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamd_prefork_stress_3.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#!/usr/bin/perl - - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamd_prefork_stress_3.t", - "--override", "run_long_tests:run_spamd_prefork_stress_test", "1:1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamd_prefork_stress_4.t spamassassin-4.0.0~rc3/xt/50_spamd_prefork_stress_4.t --- spamassassin-3.4.6/xt/50_spamd_prefork_stress_4.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamd_prefork_stress_4.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamd_prefork_stress_4.t", - "--override", "run_long_tests:run_spamd_prefork_stress_test", "1:1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spamd_prefork_stress.t spamassassin-4.0.0~rc3/xt/50_spamd_prefork_stress.t --- spamassassin-3.4.6/xt/50_spamd_prefork_stress.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spamd_prefork_stress.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spamd_prefork_stress.t", - "--override", "run_spamd_prefork_stress_test", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_spf.t spamassassin-4.0.0~rc3/xt/50_spf.t --- spamassassin-3.4.6/xt/50_spf.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_spf.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/usr/bin/perl - - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/spf.t", "--override", "run_long_tests:run_net_tests", "1:1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_strip2.t spamassassin-4.0.0~rc3/xt/50_strip2.t --- spamassassin-3.4.6/xt/50_strip2.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_strip2.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/strip2.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_strip_no_subject.t spamassassin-4.0.0~rc3/xt/50_strip_no_subject.t --- spamassassin-3.4.6/xt/50_strip_no_subject.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_strip_no_subject.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/strip_no_subject.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_trust_path.t spamassassin-4.0.0~rc3/xt/50_trust_path.t --- spamassassin-3.4.6/xt/50_trust_path.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_trust_path.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/trust_path.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_uribl.t spamassassin-4.0.0~rc3/xt/50_uribl.t --- spamassassin-3.4.6/xt/50_uribl.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_uribl.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/uribl.t", - "--override", "run_net_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_whitelist_addrs.t spamassassin-4.0.0~rc3/xt/50_whitelist_addrs.t --- spamassassin-3.4.6/xt/50_whitelist_addrs.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_whitelist_addrs.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/whitelist_addrs.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/50_whitelist_from.t spamassassin-4.0.0~rc3/xt/50_whitelist_from.t --- spamassassin-3.4.6/xt/50_whitelist_from.t 2019-06-22 16:00:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/50_whitelist_from.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -#!/usr/bin/perl - (-d "../t") and chdir ".."; - system( "$^X", "-T", "t/whitelist_from.t", - "--override", "run_long_tests", "1", @ARGV); - ($? >> 8 == 0) or die "exec failed"; - - diff -Nru spamassassin-3.4.6/xt/60_perlcritic.t spamassassin-4.0.0~rc3/xt/60_perlcritic.t --- spamassassin-3.4.6/xt/60_perlcritic.t 2011-07-27 00:29:26.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/60_perlcritic.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use File::Spec; -use Test::More; -use English qw(-no_match_vars); - -BEGIN { - if (-d 'xt') { chdir 'xt'; } - - if (-e 'test_dir') { # running from test directory, not .. - unshift(@INC, '../blib/lib'); - unshift(@INC, '../lib'); - } -} - -eval { require Test::Perl::Critic; }; - -if ( $EVAL_ERROR ) { - my $msg = 'Test::Perl::Critic required to criticise code'; - plan( skip_all => $msg ); -} - -open RC, ">../t/log/perlcritic.rc" or die "cannot create t/log/perlcritic.rc"; - -# we should remove some of these excludes if/when we feel like fixing 'em! -print RC q{ - - severity = 5 - verbose = 10 - exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen BuiltinFunctions::ProhibitStringyEval InputOutput::ProhibitInteractiveTest - - [TestingAndDebugging::ProhibitNoStrict] - allow = refs - -} or die "cannot write t/log/perlcritic.rc"; -close RC or die "cannot close t/log/perlcritic.rc"; - -Test::Perl::Critic->import( -profile => "../t/log/perlcritic.rc" ); -all_critic_ok("../blib"); - diff -Nru spamassassin-3.4.6/xt/config.dist spamassassin-4.0.0~rc3/xt/config.dist --- spamassassin-3.4.6/xt/config.dist 2015-06-10 12:15:22.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/config.dist 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -# Settings for SpamAssassin test suite. These are the default settings. -# Please copy this file to 'config' and edit to your taste. - -# --------------------------------------------------------------------------- -# Run time-consuming tests during 'make test'. (These tests take longer -# than 10 seconds each on a reasonably fast box circa year 2000.) - -# Defaulting to run long tests per bug 6776 -run_long_tests=y - -# --------------------------------------------------------------------------- -# Run network rule tests during 'make test'. -# test scripts may fail due to network problems) - -run_net_tests=n - -# Run DCC Tests -run_dcc_tests=n - -# --------------------------------------------------------------------------- -# Run SQL-based user pref tests during 'make test' REQUIRES DBD::SQLite -run_sql_pref_tests=n - -# --------------------------------------------------------------------------- -# Run SQL-based Auto-whitelist tests during 'make test' (additional -# information required, below:) -run_awl_sql_tests=n - -# SQL AWL DSN -user_awl_dsn=dbi:mysql:spamassassin:localhost -# SQL AWL DB username -user_awl_sql_username= -# SQL AWL DB password -user_awl_sql_password= -# SQL AWL tablename -user_awl_sql_table=awl - -# --------------------------------------------------------------------------- -# Run Bayes SQL storage tests during 'make test' (additional -# information required, below:) -run_bayes_sql_tests=n - -# Bayes Store Module (bayes_store_module) -bayes_store_module=Mail::SpamAssassin::BayesStore::SQL -# Bayes SQL DSN (bayes_sql_dsn) -bayes_sql_dsn=dbi:mysql:spamassassin:localhost -# Bayes SQL DB username (bayes_sql_username) -bayes_sql_username= -# Bayes SQL DB password (bayes_sql_password) -bayes_sql_password= - -# --------------------------------------------------------------------------- - -# This test will kill any processes on the system containing the string 'spamd -# child' in their process title, so is not run by default. Enable by setting -# this to "y". -run_spamd_prefork_stress_test=n - -# --------------------------------------------------------------------------- - -# rule_names.t fails continually due to changes in the rulesrc repository; -# TODO: we need a better way to test this. -run_rule_name_tests=n - -# --------------------------------------------------------------------------- - -# This test requires the Devel::SawAmpersand CPAN module, and may also fail -# depending on changes in the third-party modules we import. -run_saw_ampersand_test=n - -# --------------------------------------------------------------------------- - -# The "root_*.t" tests require root privileges, and may create files in -# the filesystem as part of the test. Disabled by default. -run_root_tests=n - -# the lang_pl_tests.t checks for problems in Polish language locales. -# disabled per bug 6992 -run_pl_tests=n diff -Nru spamassassin-3.4.6/xt/data/01_test_rules.cf spamassassin-4.0.0~rc3/xt/data/01_test_rules.cf --- spamassassin-3.4.6/xt/data/01_test_rules.cf 2019-06-13 06:10:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/01_test_rules.cf 1970-01-01 00:00:00.000000000 +0000 @@ -1,270 +0,0 @@ -# Rules used in the test suite. This allows us to change the -# main ruleset without breaking the test suite. - -# <@LICENSE> -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# copied from 10_default_prefs.cf -clear_report_template -report Spam detection software, running on the system "_HOSTNAME_", has -report identified this incoming email as possible spam. The original message -report has been attached to this so you can view it (if it isn't spam) or label -report similar future email. If you have any questions, see -report _CONTACTADDRESS_ for details. -report -report Content preview: _PREVIEW_ -report -report Content analysis details: (_SCORE_ points, _REQD_ required) -report -report " pts rule name description" -report ---- ---------------------- -------------------------------------------------- -report _SUMMARY_ - -report_contact @@CONTACT_ADDRESS@@ - -clear_unsafe_report_template -unsafe_report The original message was not completely plain text, and may be unsafe to -unsafe_report open with some email clients; in particular, it may contain a virus, -unsafe_report or confirm that your address can receive spam. If you wish to view -unsafe_report it, it may be safer to save it to a file and open it with an editor. - -clear_headers -add_header all Checker-Version SpamAssassin _VERSION_ (_SUBVERSION_) on _HOSTNAME_ -add_header spam Flag _YESNOCAPS_ -add_header all Level _STARS(*)_ -add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_" - -clear_originating_ip_headers -originating_ip_headers X-Yahoo-Post-IP X-Originating-IP X-Apparently-From -originating_ip_headers X-SenderIP - -required_score 5 -ok_locales all -ifplugin Mail::SpamAssassin::Plugin::TextCat -ok_languages all -endif # Mail::SpamAssassin::Plugin::TextCat - -ifplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold -bayes_auto_learn_threshold_nonspam 0.1 -bayes_auto_learn_threshold_spam 12.0 -endif # Mail::SpamAssassin::Plugin::AutoLearnThreshold - -bayes_auto_learn 1 - -report_safe 1 - - -header TEST_NOREALNAME From =~ /^["\s]*\?\s*$/ -describe TEST_NOREALNAME From: does not include a real name -score TEST_NOREALNAME 5 - -header TEST_ENDSNUMS From:addr =~ /\D\d{8,}\@/i -describe TEST_ENDSNUMS From: ends in many numbers -score TEST_ENDSNUMS 5 - -header TEST_FORGED_YAHOO_RCVD eval:check_for_forged_yahoo_received_headers() -describe TEST_FORGED_YAHOO_RCVD 'From' yahoo.com does not match 'Received' headers -score TEST_FORGED_YAHOO_RCVD 5 - -uri TEST_NORMAL_HTTP_TO_IP m{^https?://\d+\.\d+\.\d+\.\d+}i -describe TEST_NORMAL_HTTP_TO_IP Uses a dotted-decimal IP address in URL -score TEST_NORMAL_HTTP_TO_IP 5 - -body TEST_EXCUSE_12 /this (?:e?-?mail|message) (?:(?:has )?reached|was sent to) you in error/i -describe TEST_EXCUSE_12 Nobody's perfect -score TEST_EXCUSE_12 5 - -body TEST_EXCUSE_4 /To Be Removed,? Please/i -describe TEST_EXCUSE_4 Claims you can be removed from the list -score TEST_EXCUSE_4 5 - -header TEST_INVALID_DATE Date !~ /^\s*(?:(?i:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s+)?[0-3\s]?[0-9]\s+(?i:Jan|Feb|Ma[ry]|Apr|Ju[nl]|Aug|Sep|Oct|Nov|Dec)\s+(?:[12][901])?[0-9]{2}\s+[0-2]?[0-9](?:\:[0-5][0-9]){1,2}\s+(?:[AP]M\s+)?(?:[+-][0-9]{4}|UT|[A-Z]{2,3}T)(?:\s+\(.*\))?\s*$/ [if-unset: Wed, 31 Jul 2002 16:41:57 +0200] -describe TEST_INVALID_DATE Invalid Date: header (not RFC 2822) -score TEST_INVALID_DATE 5 - -header TEST_MSGID_OUTLOOK_INVALID eval:check_outlook_message_id() -describe TEST_MSGID_OUTLOOK_INVALID Message-Id is fake (in Outlook Express format) -score TEST_MSGID_OUTLOOK_INVALID 5 - -ifplugin Mail::SpamAssassin::Plugin::Hashcash -header HASHCASH_20 eval:check_hashcash_value('20', '21') -header HASHCASH_21 eval:check_hashcash_value('21', '22') -header HASHCASH_22 eval:check_hashcash_value('22', '23') -header HASHCASH_23 eval:check_hashcash_value('23', '24') -header HASHCASH_24 eval:check_hashcash_value('24', '25') -header HASHCASH_25 eval:check_hashcash_value('25', '26') -header HASHCASH_HIGH eval:check_hashcash_value('26', '9999') -tflags HASHCASH_20 nice userconf -tflags HASHCASH_21 nice userconf -tflags HASHCASH_22 nice userconf -tflags HASHCASH_23 nice userconf -tflags HASHCASH_24 nice userconf -tflags HASHCASH_25 nice userconf -tflags HASHCASH_HIGH nice userconf -describe HASHCASH_20 Contains valid Hashcash token (20 bits) -describe HASHCASH_21 Contains valid Hashcash token (21 bits) -describe HASHCASH_22 Contains valid Hashcash token (22 bits) -describe HASHCASH_23 Contains valid Hashcash token (23 bits) -describe HASHCASH_24 Contains valid Hashcash token (24 bits) -describe HASHCASH_25 Contains valid Hashcash token (25 bits) -describe HASHCASH_HIGH Contains valid Hashcash token (>25 bits) -header HASHCASH_2SPEND eval:check_hashcash_double_spend() -describe HASHCASH_2SPEND Hashcash token already spent in another mail -tflags HASHCASH_2SPEND userconf -endif # Mail::SpamAssassin::Plugin::Hashcash - -header MISSING_HB_SEP eval:check_msg_parse_flags('missing_head_body_separator') -describe MISSING_HB_SEP Missing blank line between message header and body -tflags MISSING_HB_SEP userconf - -header X_MESSAGE_INFO exists:X-Message-Info -describe X_MESSAGE_INFO Bulk email fingerprint (X-Message-Info) found - -header SORTED_RECIPS eval:sorted_recipients() -describe SORTED_RECIPS Recipient list is sorted by address - -header SUSPICIOUS_RECIPS eval:similar_recipients('0.65','undef') -describe SUSPICIOUS_RECIPS Similar addresses in recipient list - -body GTUBE /XJS\*C4JDBQADN1\.NSBN3\*2IDNEN\*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL\*C\.34X/ -describe GTUBE Generic Test for Unsolicited Bulk Email -score GTUBE 1000 -tflags GTUBE userconf noautolearn - -body BAYES_99 eval:check_bayes('0.99', '1.00') -tflags BAYES_99 learn -describe BAYES_99 Bayes spam probability is 99 to 100% -score BAYES_99 0 0 3.5 3.5 - -ifplugin Mail::SpamAssassin::Plugin::WLBLEval -header USER_IN_WHITELIST eval:check_from_in_whitelist() -tflags USER_IN_WHITELIST userconf nice noautolearn -score USER_IN_WHITELIST -100.000 -header USER_IN_DEF_WHITELIST eval:check_from_in_default_whitelist() -tflags USER_IN_DEF_WHITELIST userconf nice noautolearn -score USER_IN_DEF_WHITELIST -15.000 -header USER_IN_WHITELIST_TO eval:check_to_in_whitelist() -tflags USER_IN_WHITELIST_TO userconf nice noautolearn -score USER_IN_WHITELIST_TO -6.000 -header USER_IN_BLACKLIST eval:check_from_in_blacklist() -tflags USER_IN_BLACKLIST userconf noautolearn -score USER_IN_BLACKLIST 100.000 -header USER_IN_BLACKLIST_TO eval:check_to_in_blacklist() -tflags USER_IN_BLACKLIST_TO userconf noautolearn -score USER_IN_BLACKLIST_TO 10.000 -endif # Mail::SpamAssassin::Plugin::WLBLEval - -ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject -header SUBJECT_IN_WHITELIST eval:check_subject_in_whitelist() -tflags SUBJECT_IN_WHITELIST userconf nice noautolearn -header SUBJECT_IN_BLACKLIST eval:check_subject_in_blacklist() -tflags SUBJECT_IN_BLACKLIST userconf noautolearn -score SUBJECT_IN_BLACKLIST 100 -score SUBJECT_IN_WHITELIST -100 -endif # Mail::SpamAssassin::Plugin::WhiteListSubject - -header __HAS_MSGID MESSAGEID =~ /\S/ -header __SANE_MSGID MESSAGEID =~ /^<[^<>\\ \t\n\r\x0b\x80-\xff]+\@[^<>\\ \t\n\r\x0b\x80-\xff]+>\s*$/m -header __MSGID_COMMENT MESSAGEID =~ /\(.*\)/m -meta INVALID_MSGID __HAS_MSGID && !(__SANE_MSGID || __MSGID_COMMENT) -describe INVALID_MSGID Message-Id is not valid, according to RFC 2822 -score INVALID_MSGID 2.999 2.603 2.489 1.900 - -header TEST_MSGID_SPAM_CAPS Message-ID =~ /^\s* -To: undisclosed-recipients:; -Subject: test message (should fail) 11 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-12.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-12.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-12.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-12.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP override test, nxdomain -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 12 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-13.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-13.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-13.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-13.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP override test, all -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 13 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-14.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-14.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-14.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-14.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP override test, discard -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 14 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-15.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-15.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-15.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-15.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP override test, discard (2) -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 15 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-16.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-16.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-16.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-16.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP test, unrecognized/unknown -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 16 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-17.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-17.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-17.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-17.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP test, unknown -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 17 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-18.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-18.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-18.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-18.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP test, all -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 18 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-19.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-19.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-19.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-19.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP test, discardable -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 19 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-20.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-20.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-20.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-20.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP test, discardable (2) -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 20 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-21.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-21.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-21.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-21.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP test, discardable (no MX) -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 21 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-adsp-22.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-22.msg --- spamassassin-3.4.6/xt/data/dkim/test-adsp-22.msg 2009-07-09 00:31:15.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-adsp-22.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -X-Test: ADSP test, unknown / NXDOMAIN -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 22 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-fail-01.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-01.msg --- spamassassin-3.4.6/xt/data/dkim/test-fail-01.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-01.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 1 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-fail-02.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-02.msg --- spamassassin-3.4.6/xt/data/dkim/test-fail-02.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-02.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=mIrAui3j2XnmatMmIz4LaV02wt - OY7v3zJAq+pIdOjyhqgSehCByD0/+DJWjOHXFjul0ZLSqMd+M+13ZQo/5Z0OValm - FTva44EC7CPc1ZvZn7S9WpDyBW5pz7qGD4d8q3 -From: SpamAssassin Test FAKE -To: undisclosed-recipients:; -Subject: test message (should fail) 2 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-fail-03.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-03.msg --- spamassassin-3.4.6/xt/data/dkim/test-fail-03.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-03.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=EiCs7/1kFKbYl6hdaIR5N2Qjvz - qxqoR0jI/vud0XWCxcmvbrCO7BCy7bfrewMndHMBdWHYOjlK7JwF7re8dfx2PKm1 - n/zyLE+irAIBAsKaA3sWIqdq8swlp04Rb/6CJn -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 3 -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-fail-04.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-04.msg --- spamassassin-3.4.6/xt/data/dkim/test-fail-04.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-04.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:from:subject:message-id:date - :mime-version:content-type; s=t0768; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=QpX3ST7TgW/mZLgCkHRpUzWkFu - 0t27yxMr780SFx4V6AouVaJ902fyVvHw9rXMEv9rSp+uIYwJvuekgxNgRNHT0Pg2 - Ve4ohhi/WNfaAzPFjMpeI7dLK8uPN20k5xxj2c -From: SpamAssassin Test -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 4 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-fail-05.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-05.msg --- spamassassin-3.4.6/xt/data/dkim/test-fail-05.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-05.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0000; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=ew3dq85AwDg60ap6eG31FJfvvC - XaYMYXKc6oepATDhzciHeXZQF7hPJNIS12sMrVjULEnBOK9rv3s9Zt2LWszfbnqP - 2r0wsYtZ9CX469vltG+n91BqT+qrfTl0curQ4o -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 5 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-fail-06.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-06.msg --- spamassassin-3.4.6/xt/data/dkim/test-fail-06.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-06.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=txxxx; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=ew3dq85AwDg60ap6eG31FJfvvC - XaYMYXKc6oepATDhzciHeXZQF7hPJNIS12sMrVjULEnBOK9rv3s9Zt2LWszfbnqP - 2r0wsYtZ9CX469vltG+n91BqT+qrfTl0curQ4o -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 6 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-fail-07.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-07.msg --- spamassassin-3.4.6/xt/data/dkim/test-fail-07.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-07.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=eV6LkWhajlYSsITDKosr4TrlUi/+q+AVtdYQ3JdF - pTwA0rJ/t7YbrRE6/U2e5bhEswrGymR8guzs2Xf0qlK0Ti2XX51LxP9UU/tROWq1 - Dd1paCom25LeMoUZ8JVxS6tywKmKKc8n1bhzXEnSNYO55YoVs/QehP3etQAnjsT2 - aKo= -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 7 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-fail-08.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-08.msg --- spamassassin-3.4.6/xt/data/dkim/test-fail-08.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-08.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t1024a; bh=15pFrAvOGi+eHKJgB6psh6i - IBCbvYSuhPj+wQn6C7Ss=; b=IAdlIs0kt/UsFvUEDoLToL45HAaB1IqXtJxATY2 - m3bYmDqF2G48cPc5BvQzaGB4cbjsuYEuLFnhnEgWGoLztjVAMlOlf8Fl7Qq0wXVp - nWUxJPAGHJBXarvKwnrMrhXGS -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 8 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-fail-09.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-09.msg --- spamassassin-3.4.6/xt/data/dkim/test-fail-09.msg 2009-07-07 20:10:37.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-fail-09.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test-nxd.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=txxxx; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=ew3dq85AwDg60ap6eG31FJfvvC - XaYMYXKc6oepATDhzciHeXZQF7hPJNIS12sMrVjULEnBOK9rv3s9Zt2LWszfbnqP - 2r0wsYtZ9CX469vltG+n91BqT+qrfTl0curQ4o -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message (should fail) 9 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-01.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-01.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-01.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-01.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha1; d=sa-test.spamassassin.org; h=from:to - :subject:message-id:date:mime-version:content-type; s=t0768; bh= - vxHXq7bMZ9+UHGuKBsbQKsDHmmk=; b=oRxHoP0YN5LfqwKiqM0iFIeG6J0odmtG - bttw9VPWjmTouQl15+EEPNfmWNyKqbXYSs0BbmfkWZuYHSf56lj1F89xqbf62w2h - cnelgVK2HSbyD8kzbAAGR/yPWamnRhne -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 1 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-02.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-02.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-02.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-02.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; d=sa-test.spamassassin.org; h=from:to - :subject:message-id:date:mime-version:content-type; s=t0768; bh= - 15pFrAvOGi+eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=ZFopU9lJ/WFWddnO - 1nrYuptGphxfk2c4Tl0w/5HP0LhDMXX2KQRKHDh8p/AXxCERk6esOtX+BjME/ZOF - PnFrSh7naSjaT22YrT91gLD548OK73YUxR3Zh5nVOmSfn0TM -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 2 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-03.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-03.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-03.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-03.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=YtY1X9FaRsHzUvYU8X/XG1NI+tmKmx1d/uzkrnAF - qry2NWv+8FI3HCvXXRa9g8bmqPI+hbxUKv7MiQHkihrKIYr/kA9DIYyZEVOBO/Um - jqemqkPx6GRmsqmB9GyBnOiU -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 3 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-04.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-04.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-04.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-04.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=1nTkj8819Yz/UW6F6rDKUERtV5QwdnFE46jDbvvj - E7x2x5C8CIjhnBiy6ImT7YBT6W//erPosz5sKxu22PUj5/Zcd9e1tBLq5Q/lGDrX - tdWepMsUxOUTFukn1GAmhFQx -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 4 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-05.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-05.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-05.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-05.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=DgfhH71pMATYjqKko32MsRWxsO - Js9XWb64+xVB8VzpypX3NaI7DyHTcTsEj+canFx8mLlk8ahNJb6XQHj+Lz9do4HB - Jw4r9iuBvbxnJdbp9Tcw5Bey2zXYpKVmqQoMHr -Content-Type: text/plain; charset=us-ascii -MIME-Version: 1.0 -Date: Mon, 08 Jun 2009 12:00:00 +0000 -Message-ID: <4A294538.10002@spamassassin.org> -Subject: test message 5 -To: undisclosed-recipients:; -From: SpamAssassin Test - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-06.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-06.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-06.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-06.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=NSUjTvM8mmW8D43clzf8wswBCr - YSnBNsMhw6LEPGlZWXEUiSSgculoBK2V8L0hRTqMqpCzHpei8PesccAxrhSRPSBb - CD9bqyd79GqAPxbgEGUlL0r9rpEV4ZVcUrIKHv -Content-Type: text/plain; charset=us-ascii -MIME-Version: 1.0 -Date: Mon, 08 Jun 2009 12:00:00 +0000 -Message-ID: <4A294538.10002@spamassassin.org> -Subject: test message 6 -To: undisclosed-recipients:; -From: SpamAssassin Test - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-07.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-07.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-07.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-07.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 7 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=r77n22svRRIvdSz7r7+4voona+ - QvX0Rlb5aPXS4P0pyHgYz/w/PklSfqhAdZbfUkhYfdQ3UcczfsdoDBjkhTQ8c8bK - 3qo0rBY5yoKp+Nb9qxIwHkkPpUfoAfEC02SBgo - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-08.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-08.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-08.msg 2009-06-08 19:53:49.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-08.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; t=1244419200; bh=15pFrAvOGi - +eHKJgB6psh6iIBCbvYSuhPj+wQn6C7Ss=; b=LOg+IyOPKmSkio7w57bKMSsLlE - R2uatTzmrYlvo81oEhClmEE3sBza9nrkfaIfnGQFrFGGfRG8Lqu/XJCm4BIoZX5a - 2HK1EotKYyqXDTrJw44DqDS6SVPBFzeEMgI+Un -Subject: fake subject -MIME-Version: 2.0 -Message-ID: <123@example.com> -To: SpamAssassin Test -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 8 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-1 -Content-Type: text/plain; charset=utf8 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-09.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-09.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-09.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-09.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t1024a; bh=15pFrAvOGi+eHKJgB6psh6i - IBCbvYSuhPj+wQn6C7Ss=; b=cNfGPTeDK0VNVuF/gkCbtdnLK8ySX8RLEQRwhEu - tgFS3lgvbxHSvCcVx/M3WauzXlGBOV8apjbB8Wom7X7gFbq3OOCEtwbslb+EpfaZ - qR3CgUUK5xvtl8KvGhYikLwWfeA3J67TfbbPN1XsCWEvXfml2RaFs2+ttdCabZ9D - Uwqg= -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 9 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-10.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-10.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-10.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-10.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t1024b; bh=15pFrAvOGi+eHKJgB6psh6i - IBCbvYSuhPj+wQn6C7Ss=; b=V84iCIHoIcDF0WJmh0Xq7BcUPqO56b6+TkJw4nr - nk1wt0bwXnJldd8o9sf/EB84Dwle1URsnoBOi83b+lVe8K0uIJbQcfGUIpE4J57Z - YWj978mJImZuClTJnDcoAdHBeG2OHT/KCw2XmpDOBUr1CXAySqJweetbakqxQxNj - 0vuk= -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 10 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-11.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-11.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-11.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-11.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t1024c; bh=15pFrAvOGi+eHKJgB6psh6i - IBCbvYSuhPj+wQn6C7Ss=; b=VlSVJyxKuRBvcrM/jfJvCoio0KQsm7qe+elakmn - QGGFQDdWZh682GdBlRIqfHL6gCdEe0cjpSvZoHXlQGyRaHN9a63bU9DFtzSGTj3D - lXrEI1UA71GV2PJjVqLO5CIzsUCrmVYuzX0eoUGtDmyPS7VPRGZjMNGwIaTgukVw - igso= -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 11 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-12.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-12.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-12.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-12.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t1024d; bh=15pFrAvOGi+eHKJgB6psh6i - IBCbvYSuhPj+wQn6C7Ss=; b=kveZJvWvWEUEJY1769i6WEEQcDm5pgS36dxcSYK - CMbWzMt0YsfBJ6HZw8OL7L/wmMBlBkfCPGuA/thirxdXq2xYpFZaZ6nDvkNWezXS - QCLi9RQlZB0OgkvkcnNIwS1X3n270QuumZYMjOGU7p9s4ABkeNbht5xguxCnoIBZ - lyy0= -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 12 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-13.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-13.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-13.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-13.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t1280; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=f2vBvTkR2Fazg5I1pBae55DyY2y7GTGgiUpd5+Rk - Yl6Y2rTOiiBhE7EiffuxHPYWS8LEi37JDW0q5RTKJrEe2cNqAuIxerXigXMqMvs5 - PNk/jyN9tkcq2STEAfwAzp71VDHkGcTd7V729MBTMmC7hJ/3TE7vYjtevmo1uYUP - jTJeDD5baDximaxnyE64ckJ43kEC4nUo1rkZ/aFPt5tUKQ== -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 13 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-14.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-14.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-14.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-14.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t1536; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=KizphoLujIr3BRA9Pb6c3kaDhzsbdPsQB8Nc7S9c - vJDRk9LwGRT2dZgpmoFqqnhKztYcrq4fhC2XrYxHobX/uJRn7ouP6FpefMSanRK5 - uTZHiJiH0w/jlWPs4k+NlO9eaoWvm1ju32jS/y9seQVcVATZzqI1FaQtlzXzBqBY - pgUoB/MmtiUQM39cPWVX0QeoXmSQmsxLafblXT49Pp/GgwVPfhu4m+NTVhlUi8J4 - Cw7LMWp6QXYs72nlis3iMJMJ -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 14 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-15.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-15.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-15.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-15.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t2048a; bh=15pFrAvOGi+eHKJgB6psh6i - IBCbvYSuhPj+wQn6C7Ss=; b=R5ridJNpcMCrKMc2FOG3ze+4GwrMK5IvICIN4kx - PvrbRuMTJFp4Tj93rfm71eVXrc7S1ZFXdSV3S4Nyaz4eHWraNmnzSXwjKloXDk6B - sk+3gO0KaaoJwYtctbgCUXcx/9v9QWwLwFoEhk67BigvqjPXDOLMDg4ei9q1dpgR - FHzKs149Q8PzMWqYD0Um+0mNe+Mu/43Ze+HkQt7lkXD9iBhs1c5slj0Nmn+0sSyW - ewRtyYDxLc5N72M9LLAQ8x7zpLBhKURpX0+aowNUSOA9Zkz3YwmJIx5a9qVPhDkK - yuDXmRvvx2cP+2BnpaEUMGV9ftZ3Qrg/bqSI63u7eFVGwIw== -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 15 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-16.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-16.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-16.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-16.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t2048b; bh=15pFrAvOGi+eHKJgB6psh6i - IBCbvYSuhPj+wQn6C7Ss=; b=pxVnohrPidydig1tDpB5IsIejSsxzbrpqSyOQh0 - jfNwfzlUli098twNZPue+IqOosGV1HJtFHU5TOZyfB9P9nPbBnWmCHI2EKTp3uaV - Iy/xeTbf20x17ZvwGqOITz81yUESB+4rFHFaAaL4lBf/9BHd7fU/kZbsX1sefp22 - TH4Zzm3f+q9Mx7zbg0vMfWRe8iZ5rA0rbj3FIX/i6oSmXtSIkV/9XHRJnG1fwsLS - V9mltYNc/GN27ODQCJ9QBFBHZnGgONBd/QXXCJWTXMR2N6zi9ex36MQMF+R0u7q5 - 0S+zFiR5MsX8upEIFOIP0JU+WS/2eaG8drhTHm3SkyQT6xQ== -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 16 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-17.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-17.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-17.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-17.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0768; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=iWP4EFdIfxFV+LOvwL7bLA5qIzHOcmvZXCJbmb1X - 8SAAhZHz6FJ7TTP6EfSbg2jtHZfrZSsHo5III1BTD2DMC0d/wMjNS+LJh8E1akU4 - jRc1yNNpKJ7FyUaydvimvOmg -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 17 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-18.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-18.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-18.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-18.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0640; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=WWBboo8qsl8/fCw5qKYTLnI94l1InwVD8gWqm5b2 - pnbdN+ze6YUQI0J7ngb37nllzXZgIbOiMaHxaax0YARt98qTFdJErzaaMOLkWy2E - 53s= -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 18 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-19.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-19.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-19.msg 2009-06-18 15:06:14.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-19.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0512; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=XaUxvujH+n+i0ABzd5x1ItymfUliXUaW3CuyMCIG - aMalpjxOZsu95GzcVpGsIE5qX5RY4ENP3cn6hfs634FDHw== -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 19 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-20.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-20.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-20.msg 2020-01-27 09:43:17.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-20.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0512; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=XaUxvujH+n+i0ABzd5x1ItymfUliXUaW3CuyMCIG - aMalpjxOZsu95GzcVpGsIE5qX5RY4ENP3cn6hfs634FDHw== -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 19 -X-Foobar: it's really test 20 but with crlf added -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-21.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-21.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-21.msg 2020-01-27 09:43:17.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-21.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0512; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=XaUxvujH+n+i0ABzd5x1ItymfUliXUaW3CuyMCIG - aMalpjxOZsu95GzcVpGsIE5qX5RY4ENP3cn6hfs634FDHw== -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 19 -X-Foobar: it's really test 21 but with crlf added and bug 7785 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-22.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-22.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-22.msg 2020-01-27 09:43:17.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-22.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -X-Foobar: first line, verify crlf detection works vs test 21 -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0512; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=XaUxvujH+n+i0ABzd5x1ItymfUliXUaW3CuyMCIG - aMalpjxOZsu95GzcVpGsIE5qX5RY4ENP3cn6hfs634FDHw== -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 19 -X-Foobar: it's really test 22 but with crlf added and bug 7785 -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/dkim/test-pass-23.msg spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-23.msg --- spamassassin-3.4.6/xt/data/dkim/test-pass-23.msg 2020-01-27 09:43:17.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/dkim/test-pass-23.msg 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= - sa-test.spamassassin.org; h=from:to:subject:message-id:date - :mime-version:content-type; s=t0512; bh=15pFrAvOGi+eHKJgB6psh6iI - BCbvYSuhPj+wQn6C7Ss=; b=XaUxvujH+n+i0ABzd5x1ItymfUliXUaW3CuyMCIG - aMalpjxOZsu95GzcVpGsIE5qX5RY4ENP3cn6hfs634FDHw== -From: SpamAssassin Test -To: undisclosed-recipients:; -Subject: test message 19 -X-Foobar: it's really test 23 with crlf only in the end test -Message-ID: <4A294538.10002@spamassassin.org> -Date: Mon, 08 Jun 2009 12:00:00 +0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii - -testing diff -Nru spamassassin-3.4.6/xt/data/Dumpheaders.pm spamassassin-4.0.0~rc3/xt/data/Dumpheaders.pm --- spamassassin-3.4.6/xt/data/Dumpheaders.pm 2009-08-08 00:12:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/Dumpheaders.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -package Dumpheaders; -use strict; -use Mail::SpamAssassin; -use Mail::SpamAssassin::Plugin; -our @ISA = qw(Mail::SpamAssassin::Plugin); - -sub new { - my ($class, $mailsa) = @_; - $class = ref($class) || $class; - my $self = $class->SUPER::new($mailsa); - bless ($self, $class); - return $self; -} - -sub check_end { - my ($self, $opts) = @_; - - local $_; - $_ = $opts->{permsgstatus}->get("ALL:raw"); - s/\n/[\\n]/gs; s/\t/[\\t]/gs; s/\n+//gs; - - # ignore the M:SpamAssassin:compile() test message - return if /I need to make this message body somewhat long so TextCat preloads/; - print STDOUT "text-all-raw: $_\n"; - - $_ = $opts->{permsgstatus}->get("ALL"); - s/\n/[\\n]/gs; s/\t/[\\t]/gs; s/\n+//gs; - print STDOUT "text-all-noraw: $_\n"; - - $_ = $opts->{permsgstatus}->get("From:raw"); - s/\n/[\\n]/gs; s/\t/[\\t]/gs; s/\n+//gs; - print STDOUT "text-from-raw: $_\n"; - - $_ = $opts->{permsgstatus}->get("From"); - s/\n/[\\n]/gs; s/\t/[\\t]/gs; s/\n+//gs; - print STDOUT "text-from-noraw: $_\n"; - - $_ = $opts->{permsgstatus}->get("From:addr"); - s/\n/[\\n]/gs; s/\t/[\\t]/gs; s/\n+//gs; - print STDOUT "text-from-addr: $_\n"; - -} - -1; - diff -Nru spamassassin-3.4.6/xt/data/etc/hello.txt spamassassin-4.0.0~rc3/xt/data/etc/hello.txt --- spamassassin-3.4.6/xt/data/etc/hello.txt 2004-01-09 22:40:18.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/etc/hello.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -hello world diff -Nru spamassassin-3.4.6/xt/data/etc/testhost.cert spamassassin-4.0.0~rc3/xt/data/etc/testhost.cert --- spamassassin-3.4.6/xt/data/etc/testhost.cert 2020-04-10 07:47:37.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/etc/testhost.cert 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIELTCCAxWgAwIBAgIUCEYDt5yF4chKPuWTkkbpgLAZWycwDQYJKoZIhvcNAQEL -BQAwgaUxCzAJBgNVBAYTAlNBMQswCQYDVQQIDAJTQTEaMBgGA1UEBwwRU3BhbUFz -c2Fzc2luIENpdHkxFTATBgNVBAoMDFNwYW1Bc3Nhc3NpbjEZMBcGA1UECwwQRk9S -IFRFU1RJTkcgT05MWTESMBAGA1UEAwwJbG9jYWxob3N0MScwJQYJKoZIhvcNAQkB -FhhzcGFtYXNzYXNzaW5AZXhhbXBsZS5jb20wHhcNMjAwNDEwMDczMTA3WhcNMzAw -NDA4MDczMTA3WjCBpTELMAkGA1UEBhMCU0ExCzAJBgNVBAgMAlNBMRowGAYDVQQH -DBFTcGFtQXNzYXNzaW4gQ2l0eTEVMBMGA1UECgwMU3BhbUFzc2Fzc2luMRkwFwYD -VQQLDBBGT1IgVEVTVElORyBPTkxZMRIwEAYDVQQDDAlsb2NhbGhvc3QxJzAlBgkq -hkiG9w0BCQEWGHNwYW1hc3Nhc3NpbkBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAK+IP5AWcdwiGG33Tt9pAjQ/tWnqhoUoSGHJMq9n -hV3GI6CyqbbJXN/VFDC27F9qltoZp2eSEigRvLgnrjmnJFJ3H34CcKghx3TfEFdf -ILCKPXvYSIe7fpeD5+0LN2t+0Kr56vejyGkQAiGDs7FU9rPOHENolU8SvRv102M0 -K65sZU940ML43ns3JCg1AGGBQj3LabqlxHM+zBAYHFLMd9/fMzKfaFgvyPvZIlIv -zhzdBksBrl2Wa8RPdJUtWhDGbYMEAHPreZQmiqdtfBbOc946LYYrDTaCAPaAYzUd -WOqOU9grNcWjIuiIlUjcCPdRe1njDSerfsMdcXUjGroGj90CAwEAAaNTMFEwHQYD -VR0OBBYEFP8lys2m3PDCcYXieVxpOBaBUX/eMB8GA1UdIwQYMBaAFP8lys2m3PDC -cYXieVxpOBaBUX/eMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB -AAuVryADs+3mv4mLLzWPmjBLSzlemqXqZPu7OPe8GrzD3BkovudWErI/nW7OTWcJ -JixVeL5IgJ/ddDZXIaLM6c73NqcVpOQ+E/vnkbHHJtYTPJ8aSl5DWFd7Pid8JV2M -gHcNFXStCWQ2XN3iXliDnb7LBI2DphCIBBKGajbP3mlVcVwZstqqyoqRn8wshlrJ -j7FlrmDF2f62huGBKgfgC4lov95B7TH45hjUnIHaemgVw9VLyZHqw0jQ7Fd14069 -RMHuzP2DGi6+uJ4rS8pnDGYXHh4Exyl3TXGLAoWFjCmh3TWGRqwbs/VWC6TrbUSe -mmPZfIFNtvb9bh/uatmTIFU= ------END CERTIFICATE----- diff -Nru spamassassin-3.4.6/xt/data/etc/testhost.key spamassassin-4.0.0~rc3/xt/data/etc/testhost.key --- spamassassin-3.4.6/xt/data/etc/testhost.key 2020-04-10 07:47:37.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/etc/testhost.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCviD+QFnHcIhht -907faQI0P7Vp6oaFKEhhyTKvZ4VdxiOgsqm2yVzf1RQwtuxfapbaGadnkhIoEby4 -J645pyRSdx9+AnCoIcd03xBXXyCwij172EiHu36Xg+ftCzdrftCq+er3o8hpEAIh -g7OxVPazzhxDaJVPEr0b9dNjNCuubGVPeNDC+N57NyQoNQBhgUI9y2m6pcRzPswQ -GBxSzHff3zMyn2hYL8j72SJSL84c3QZLAa5dlmvET3SVLVoQxm2DBABz63mUJoqn -bXwWznPeOi2GKw02ggD2gGM1HVjqjlPYKzXFoyLoiJVI3Aj3UXtZ4w0nq37DHXF1 -Ixq6Bo/dAgMBAAECggEAGrgqtMw12MR344VZxDg/1aQ9ATpp76sKGZh+1qRzcKrQ -kY2gt+o+8POGd0PhB0U6YUi2atWZXfAVQhMIOk5vAP6RFKVacL1zlx69Zg9c8oKY -iVmK8N5hjr7Ndw/WB87uBJi2Y6vSvetp56AcoknEo+oj8z7gO4EmuDLbUqaGX65v -08wyrSoWYAUPDhXvOclReBITDkWuGzhd5IDv3kVmf9oizOO6gbKxh5speFKA91Yg -WMuBbi7hWB41Nn1ycSKfAx9W7kvBhxA35G/QKupXoTPoNNw5Z08zpg2tiqGlrVFS -xs5SagfBjxqF2I44y/xH9xv3WuYNPSsQDZANxat+AQKBgQDVbWWryhas9AyyQQdr -uJRCpBf6Gyzd/FwUnb3370YhK/mVogAIbyT2TwTliXjPYTccvDzP9mWnmH2QVBfG -e5NW7A3zYwCrculucdKL+PZ58PF/LuCzQUuSlZ72fhqIPHXi3Acipjk6NDLntI/4 -OF6HO1ZwNqL7tsf2bFjarOjIbQKBgQDSi7+hI6rg/8ovt9UrJYZEv5bR8wHsZRB3 -4uHvCHHkbNlvZiorAsaVO8w0EoSqT3tsxHTz6l1TskxQhznjru+/mn5QDVu4gHMh -BFewZ+PRZKxqx61Y1zlvRSHLWM1uXxVcCrBCIC3fFb50oluiCVcI+OE7qXPgX6zN -Iqd4XB8fMQKBgBT1nVp1iiyJ+wU2ZagqhETXIJOrP4i9U72ikBldIiH305biReaO -I68cq3pvObID9gmYYtB5fhorW4lk+MDBOgL7Q5N3UYWEz2/NNcQROwNWqiC3VdHE -w8stbmL+l1Rxu5H/0aORd2VD4wvmK41Q29ej+CUk+HSHyrNkiIVRHbsxAoGBALlq -rskG8y6QtQsO9uC3fCZBH14nhrMbUcRyfwwVwM8seNQdAde86wtzjOLyx/iAZK6l -2GUSKTxTEdf9LqLvZV20fbab/QFfxYP3Ig5Nf5jg8uJalLNfXso59Ify3X9spw/W -reCeHCeRK5flf5MUbJyPKTN0iIK5XyGMejWJ0zKRAoGAc2lrUlT64htPj1//kcgl -ILzQo51ujjzjOlHYanvN6ekMSfj3Q1ZCTJUp2ArVA64w7Jt16cEEEFCaP4+i9UaW -aM9/8tho4J29QSllAyxfUIF9i5gcElTfzRhpNGMVrnV/ynyOaTXzUkk7L6FH9soq -JS3kXA6oQN5NkW6AF/3X314= ------END PRIVATE KEY----- diff -Nru spamassassin-3.4.6/xt/data/mime-subject.txt spamassassin-4.0.0~rc3/xt/data/mime-subject.txt --- spamassassin-3.4.6/xt/data/mime-subject.txt 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/mime-subject.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From stefanie.schwabe@wanadoo.fr Wed, 2 May 2001 10:10:26 +0200 -Date: Wed, 2 May 2001 10:10:26 +0200 -From: Stefanie Schwabe stefanie.schwabe@wanadoo.fr -Subject: [Demuseum] =?iso-8859-1?Q?Re:_Multimedia_f=FCr_Preussen?= - -Sehr geehrte Frau Bieber, - -wenn Sie ihn nicht schon auf Ihrer Liste haben, so w=FCrde ich Ihnen folgend= -en -Link empfehlen: - -Peter STEPHAN: "Die Fassadensysteme des sog=2E 'Schl=FCterhofes' im Stadtsch= -loss -zu Berlin" Freiburg: 2000=2E -On-Line-Publikation der Universit=E4t Freiburg: -http://www=2Eruf=2Euni-freiburg=2Ede/arthist/Online-Publikationen/Stephan_St= -adtsch -loss/ - -Mit freundlichen Gr=FCssen, Stefanie Schwabe=2E - - - - - diff -Nru spamassassin-3.4.6/xt/data/nice/001 spamassassin-4.0.0~rc3/xt/data/nice/001 --- spamassassin-3.4.6/xt/data/nice/001 2004-08-06 07:35:59.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/001 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -From jm@dogma.slashnull.org Wed May 16 00:40:34 2001 -Return-Path: -Delivered-To: jm@netnoteinc.com -Received: from dogma.slashnull.org (dogma.slashnull.org [212.17.35.15]) by - mail.netnoteinc.com (Postfix) with ESMTP id 830E5115158 for - ; Tue, 15 May 2001 23:40:33 +0000 (Eire) -Received: (from jm@localhost) by dogma.slashnull.org (8.9.3/8.9.3) id - AAA30873 for jm@netnoteinc.com; Wed, 16 May 2001 00:40:33 +0100 -Received: from trna.ximian.com ([141.154.95.22]) by dogma.slashnull.org - (8.9.3/8.9.3) with ESMTP id AAA30867 for ; - Wed, 16 May 2001 00:40:31 +0100 -Received: from trna.ximian.com (IDENT:nobody@localhost [127.0.0.1]) by - trna.ximian.com (8.9.3/8.9.3) with ESMTP id SAA19408; Tue, 15 May 2001 - 18:26:07 -0400 -Received: from milkplus (62-122-4-47.flat.galactica.it [62.122.4.47]) by - trna.ximian.com (8.9.3/8.9.3) with ESMTP id RAA19544; Tue, 15 May 2001 - 17:31:24 -0400 -Received: by milkplus (Postfix, from userid 1000) id D3FDD10B051; - Tue, 15 May 2001 17:31:22 -0400 (EDT) -From: "Ximian, Inc." -To: announce@ximian.com -Content-Type: text/plain -X-Mailer: Evolution/0.10 (Preview Release) -X-Loop: just so a test passes -Date: 15 May 2001 17:31:22 -0400 -Message-Id: <989962282.546.27.camel@milkplus> -MIME-Version: 1.0 -Subject: [HC Announce] Ximian Evolution 0.10 "Tasmanian Devil" is Now - Available! -Sender: announce-admin@helixcode.com -Errors-To: announce-admin@helixcode.com -X-Mailman-Version: 1.1 -Precedence: bulk -X-Hashcash: 0:040315:test@example.com:69781c87bae95c03 -X-hashcash: 1:20:040806:test1@example.com:test=foo:482b788d12eb9b56:2a3349 -List-Id: Announcements about Ximian. -X-Beenthere: announce@helixcode.com -X-Spam-Status: No, hits=2 required=5 - -A new preview release of Ximian Evolution is now available. Evolution -is a personal and workgroup information management tool that seamlessly -combines email, calendar, address book and more. Its extensive network -support lets you connect to a wide range of services. Release 0.10 -includes a host of new features and fixes. - -TO GET THE EVOLUTION PREVIEW RELEASE - -- For those of you using Ximian GNOME, this version can be installed - by subscribing to the Evolution channel in Red Carpet (System -> Get - Software). - -- To download the preview release from the Ximian web site, go to: - http://www.ximian.com/apps/evolution-preview/index.php3 - -TO GET SOURCE CODE - -You can also get the Evolution source tarball here: - - ftp://ftp.gnome.org/pub/GNOME/unstable/sources/evolution - - Evolution also requires Gal (0.7), GtkHTML (0.8.2), Bonobo (1.0), - OAF (0.6.2), GNOME VFS (1.0), libunicode (0.4.gnome), GNOME Print - (0.25) and ORBit (0.5.6). - - ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gal - ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gtkhtml - ftp://ftp.gnome.org/pub/GNOME/unstable/sources/bonobo - ftp://ftp.gnome.org/pub/GNOME/unstable/sources/oaf - ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gnome-vfs - ftp://ftp.gnome.org/pub/GNOME/unstable/sources/libunicode - ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-print - ftp://ftp.gnome.org/pub/GNOME/stable/sources/ORBit - -TO VIEW 0.10 RELEASE NOTES - -The 0.10 release notes are available at: -http://www.ximian.com/newsitems/evolution-0.10-announce.php3 - - - -_______________________________________________ -Announce maillist - Announce@helixcode.com -http://lists.helixcode.com/mailman/listinfo/announce - - - diff -Nru spamassassin-3.4.6/xt/data/nice/002 spamassassin-4.0.0~rc3/xt/data/nice/002 --- spamassassin-3.4.6/xt/data/nice/002 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/002 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -Received: from localhost (localhost.localdomain [127.0.0.1]) by - stinkpad.jmason.org (Postfix) with ESMTP id 3AF5610710 for ; - Fri, 7 Dec 2001 10:47:43 +1100 (EST) -Received: from dogma.slashnull.org [212.17.35.15] by localhost with IMAP - (fetchmail-5.7.4) for jm@localhost (single-drop); Fri, 07 Dec 2001 - 10:47:44 +1100 (EST) -Received: from usw-sf-list1.sourceforge.net (usw-sf-fw2.sourceforge.net - [216.136.171.252]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id - fB69MYV12654 for ; Thu, 6 Dec 2001 09:22:34 GMT -Received: from localhost ([127.0.0.1] helo=usw-sf-list1.sourceforge.net) - by usw-sf-list1.sourceforge.net with esmtp (Exim 3.31-VA-mm2 #1 (Debian)) - id 16BujB-0003YE-00; Thu, 06 Dec 2001 01:22:01 -0800 -Received: from dogma.slashnull.org ([212.17.35.15]) by - usw-sf-list1.sourceforge.net with esmtp (Exim 3.31-VA-mm2 #1 (Debian)) id - 16BuiR-0003Pd-00 for ; - Thu, 06 Dec 2001 01:21:15 -0800 -Received: (from apache@localhost) by dogma.slashnull.org (8.11.6/8.11.6) - id fB69L7c12619; Thu, 6 Dec 2001 09:21:07 GMT -X-Authentication-Warning: dogma.slashnull.org: apache set sender to - jmmail@jmason.org using -f -Received: from 144.137.3.98 (SquirrelMail authenticated user jmmail) by - jmason.org with HTTP; Thu, 6 Dec 2001 09:21:06 -0000 (GMT) -Message-Id: <1896.144.137.3.98.1007630466.squirrel@jmason.org> -Subject: Re: [SAtalk] auto-whitelisting order -From: "Whitelist Nonspam Testing" -To: craig@hughes-family.org -In-Reply-To: <1007628628.465.0.camel@belphegore.hughes-family.org> -References: <1007628628.465.0.camel@belphegore.hughes-family.org> -Cc: spamassassin-talk@lists.sourceforge.net -X-Mailer: SquirrelMail (version 1.0.6) -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-1 -Content-Transfer-Encoding: 8bit -Sender: spamassassin-talk-admin@lists.sourceforge.net -Errors-To: spamassassin-talk-admin@lists.sourceforge.net -X-Beenthere: spamassassin-talk@lists.sourceforge.net -X-Mailman-Version: 2.0.5 -Precedence: bulk -List-Help: -List-Post: -List-Subscribe: , -List-Id: Talk about SpamAssassin -List-Unsubscribe: , - -List-Archive: -X-Original-Date: Thu, 6 Dec 2001 09:21:06 -0000 (GMT) -Date: Thu, 6 Dec 2001 09:21:06 -0000 (GMT) - -> eh? Craig, why'd you set the auto-whitelist dir to 'undef'? -blah blah blah... no body needed, this is a test -Well, let's toss in some evite.citysearch.com score reducers -We have received a request for subscription of your email address to the happy mailing list - ---j. diff -Nru spamassassin-3.4.6/xt/data/nice/003 spamassassin-4.0.0~rc3/xt/data/nice/003 --- spamassassin-3.4.6/xt/data/nice/003 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/003 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -Subject: Re: [SAtalk] auto-whitelisting order -From: "Whitelist Nonspam Testing" -To: aaa@aaa.de, bbb@bbb.de, ccc@ccc.de, ddd@ddd.de, eee@eee.de, fff@fff.de, ggg@ggg.de, hhh@hhh.de, iii@iii.de, jjj@jjj.de, kkk@kkk.de, lll@lll.de - -tst diff -Nru spamassassin-3.4.6/xt/data/nice/004 spamassassin-4.0.0~rc3/xt/data/nice/004 --- spamassassin-3.4.6/xt/data/nice/004 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/004 1970-01-01 00:00:00.000000000 +0000 @@ -1,1180 +0,0 @@ -Message-ID: <000301c21009$256f5ac0$190863d9@ppp> -From: "Jerzy Krykowski" -To: "Jozef Naumowicz" -Subject: Jurek - popr Hom Kolosan -Date: Mon, 10 Jun 2002 00:52:45 +0200 -MIME-Version: 1.0 -Content-Type: multipart/mixed; - boundary="----=_NextPart_000_0007_01C21019.229C7160" -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 4.72.3110.5 -X-MimeOLE: Produced By Microsoft MimeOLE V4.72.3110.3 - -This is a multi-part message in MIME format. - -------=_NextPart_000_0007_01C21019.229C7160 -Content-Type: multipart/alternative; - boundary="----=_NextPart_001_0008_01C21019.229C7160" - - -------=_NextPart_001_0008_01C21019.229C7160 -Content-Type: text/plain; - charset="iso-8859-2" -Content-Transfer-Encoding: quoted-printable - - - -------=_NextPart_001_0008_01C21019.229C7160 -Content-Type: text/html; - charset="iso-8859-2" -Content-Transfer-Encoding: quoted-printable - - - - - - - - - -
     
    - -------=_NextPart_001_0008_01C21019.229C7160-- - -------=_NextPart_000_0007_01C21019.229C7160 -Content-Type: application/msword; - name="Jurek - Poprawiona Homilia XII na List to Kolosan.rtf" -Content-Transfer-Encoding: quoted-printable -Content-Disposition: attachment; - filename="Jurek - Poprawiona Homilia XII na List to Kolosan.rtf" - -{\rtf1\ansi\ansicpg1250\uc1 = -\deff0\deflang1033\deflangfe1045{\fonttbl{\f0\froman\fcharset0\fprq2{\*\p= -anose 02020603050405020304}Times New = -Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose = -020b0604020202020204}Arial;} -{\f112\froman\fcharset238\fprq2 Times New Roman = -CE;}{\f113\froman\fcharset204\fprq2 Times New Roman = -Cyr;}{\f115\froman\fcharset161\fprq2 Times New Roman = -Greek;}{\f116\froman\fcharset162\fprq2 Times New Roman Tur;} -{\f117\froman\fcharset186\fprq2 Times New Roman = -Baltic;}{\f118\fswiss\fcharset238\fprq2 Arial = -CE;}{\f119\fswiss\fcharset204\fprq2 Arial = -Cyr;}{\f121\fswiss\fcharset161\fprq2 Arial = -Greek;}{\f122\fswiss\fcharset162\fprq2 Arial Tur;} -{\f123\fswiss\fcharset186\fprq2 Arial = -Baltic;}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green25= -5\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue= -0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128; -\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red12= -8\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\gr= -een192\blue192;}{\stylesheet{\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid \snext0 Normal;}{ -\s1\qj\sl360\slmult1\keepn\nowidctlpar\widctlpar\adjustright = -\i\fs20\lang1045\cgrid \sbasedon0 \snext0 heading = -1;}{\s2\qj\fi708\sl360\slmult1\keepn\nowidctlpar\widctlpar\adjustright = -\i\fs20\lang4108\cgrid \sbasedon0 \snext0 heading 2;}{\*\cs10 \additive=20 -Default Paragraph Font;}{\s15\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid \sbasedon0 \snext15 footnote text;}{\*\cs16 = -\additive \super \sbasedon10 footnote = -reference;}{\s17\qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright=20 -\fs20\lang1045\cgrid \sbasedon0 \snext17 Body = -Text;}{\s18\nowidctlpar\widctlpar\tqc\tx4536\tqr\tx9072\adjustright = -\fs20\lang1036\cgrid \sbasedon0 \snext18 = -header;}{\s19\nowidctlpar\widctlpar\tqc\tx4536\tqr\tx9072\adjustright = -\fs20\lang1036\cgrid=20 -\sbasedon0 \snext19 = -footer;}{\s20\qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1045\cgrid \sbasedon0 \snext20 Body Text 2;}}{\info{\title Jan = -Chryzostom, Homilia XII na List to Kolosan (4, 12-18) }{\subject = -Patrologia} -{\author Maciej Gajewski}{\operator Jerzy = -Krykowski}{\creatim\yr2002\mo6\dy10\min27}{\revtim\yr2002\mo6\dy10\min27}= -{\version2}{\edmins1}{\nofpages13}{\nofwords4890}{\nofchars27877}{\*\comp= -any }{\nofcharsws0}{\vern73}} -\paperw11906\paperh16838\margl1417\margr1417\margt1417\margb1417 = -\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\noxlattoyen\expshrtn\noult= -rlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\viewkind4\viewscale95\v= -iewzk2\pgbrdrhead\pgbrdrfoot \fet0\sectd=20 -\linex0\headery709\footery709\colsx709\endnhere\sectdefaultcl = -{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta = -.}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang{\pntxta = -.}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta = -.}}{\*\pnseclvl4 -\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta = -)}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta = -)}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta = -)}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (} -{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb = -(}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb = -(}{\pntxta )}}\pard\plain = -\qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid { -\f1\lang1045 Homilia XII na List to Kolosan (4, = -12-18)}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Tekst grecki zosta\'b3 - wydany przez B. de Montfaucon i ponownie wydany w Migne, }{\i\lang1045 = -Patrologia Graeca}{\lang1045 62, Paris 1862, kol. = -379-392.}}}{\f1\lang1045=20 -\par=20 -\par }{\i\f118\lang1045 Pozdrawia was rodak wasz, Epafras, s\'b3uga = -Chrystusa Jezusa, zawsze walcz\'b9cy za was w modlitwach o to, = -aby\'9ccie stali mocno, doskonali w pe\'b3nieniu ka\'bfdej woli = -Bo\'bfej. \'8cwiadcz\'ea o nim, \'bfe usilnie si\'ea - troszczy o was oraz o tych, kt\'f3rzy s\'b9 w Laodycei i w = -Hierapolis.}{\f1\lang1045 =20 -\par }\pard \qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f1\lang1045=20 -\par }\pard\plain = -\s1\qj\sl360\slmult1\keepn\nowidctlpar\widctlpar\outlinelevel0\adjustrigh= -t \i\fs20\lang1045\cgrid {\f118 Pozdrowienia Paw\'b3a -\par }\pard\plain \nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\lang1045=20 -\par }\pard \qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 1. R\'f3wnie\'bf na pocz\'b9tku listu poleci\'b3 tego = -cz\'b3owieka ze wzgl\'eadu na jego mi\'b3o\'9c\'e6; tak\'bfe oddawanie = -chwa\'b3y uwidocznia mi\'b3o\'9c\'e6, tak jak m -\'f3wi\'b3 od pocz\'b9tku: "On te\'bf nam ukaza\'b3 wasz\'b9 = -mi\'b3o\'9c\'e6 w duchu}{\f1\lang1045 "}{\cs16\i\f1\lang1045\super = -\chftn {\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{ -\lang1045 Kol 1, 8.}}}{\f118\lang1045 . Ukazuje mi\'b3o\'9c\'e6, a = -fakt, \'bfe si\'ea modli, sprawia, \'bfe jest mi\'b3owany. -\par Poleca go, otwieraj\'b9c drzwi do jego nauczania (albowiem to, = -\'bfe nauczyciel jest szanowany, jest korzystne dla uczni\'f3w) i = -ponownie m\'f3wi\'b9c}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright=20 -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Zamiast = -}{\i\lang1045 to eipein}{\f112\lang1045 wyst\'eapuj\'b9cego w kodeksach = -nale\'bfy prawdopodobnie czyta\'e6 w dativie: }{\i\lang1045 toi = -eipein}{\lang1045 (PG 62, 381, przypis }{ -\i\lang1045 b}{\lang1045 ).}}}{\f118\lang1045 "wasz rodak" - aby oni = -byli dumni z tego cz\'b3owieka jako ci, kt\'f3rzy wydaj\'b9 na \'9cwiat = -takich ludzi. -\par }{\f1\lang1045 I m\'f3wi: "zawsze}{\i\f1\lang1045 }{\f118\lang1045 = -walcz\'b9cy za was w modlitwach}{\i\f1\lang1045 "}{\f118\lang1045 . Nie = -powiedzia\'b3 po prostu: "modl\'b9cy si\'ea", lecz "walcz\'b9cy", = -dr\'bf\'b9cy i l\'eakaj\'b9cy si\'ea. "\'8cwiadcz -\'ea o nim - m\'f3wi - \'bfe usilnie si\'ea troszczy o was". = -\'8cwiadectwo to jest godne zaufania. To, \'bfe - jak m\'f3wi - "usilnie = -si\'ea troszczy o was" oznacza, \'bfe mi\'b3uje was niezmiernie i = -pa\'b3a do was gor\'b9cym uczuciem.=20 -\par }{\f1\lang1045 "I o tych w Laodycei, i o tych w = -Hierapolis".}{\i\f1\lang1045 }{\f118\lang1045 Im tak\'bfe jego poleca. = -Lecz sk\'b9d mieli to wiedzie\'e6? -\par }\pard \qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 Z pewno\'9cci\'b9 mogli to us\'b3ysze\'e6, lecz mogli = -tak\'bfe dowiedzie\'e6 si\'ea o tym, gdy zosta\'b3 odczytany List. = -Dlatego powiedzia\'b3: "Sprawcie, by odczytano go te\'bf - w Ko\'9cciele w Laodycei. Aby\'9ccie stali mocno, doskonali" - m\'f3wi. = -Oskar\'bfaj\'b9c ich, a zarazem nie obra\'bfaj\'b9c, daje = -wskaz\'f3wk\'ea oraz rad\'ea. Jest bo}{\f1\lang1045 w}{\f118\lang1045 = -iem rzecz\'b9 mo\'bfliw\'b9 by\'e6 doskona\'b3 -ym, a zarazem nie "sta\'e6 mocno", tak jakby kto\'9c wiedzia\'b3 = -wszystko, ale nadal si\'ea chwia\'b3}{\f1\cf13\lang1045 . = -}{\f118\lang1045 Jest r\'f3wnie\'bf rzecz\'b9 mo\'bfliw\'b9 nie by\'e6 = -doskona\'b3ym, lecz nadal "sta\'e6 mocno", tak jakby kto\'9c - wiedzia\'b3 tylko cz\'ea\'9c\'e6, a "sta\'b3 mocno". Ten cz\'b3owiek = -jednak modli si\'ea o obie te rzeczy: "Aby\'9ccie stali mocno, = -doskonali" - m\'f3wi. Zobacz, jak ponownie przypomnia\'b3 im o tym, co = -powiedzia\'b3 o anio\'b3ach i o \'bfyciu. "Aby\'9c -cie w pe\'b3ni doszli do poznania woli Boga" - m\'f3wi. Nie wystarcza = -tylko czyni\'e6 wol\'ea Boga. Ten, }{\f1\lang1045 k}{\f118\lang1045 to = -jest w pe\'b3ni przekonany, nie znosi w sobie \'bfadnej innej woli, a = -je\'9cli nie, to nie jest w pe\'b3 -ni przekonany. M\'f3wi: "\'8cwiadcz\'ea o nim, \'bfe usilnie si\'ea = -troszczy}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Dos\'b3 -.: Jest wielce gorliwy (zazdrosny) o was. }}}{\f118\lang1045 o was". = -Zar\'f3wno "troska", jak i "usilna": oba okre\'9clenia s\'b9 intensywne. = -M\'f3wi bowiem m\'f3wi sam o sobie, pisz\'b9c do Koryntian: "Jestem = -bowiem o was zazdrosny Bo\'bf\'b9 zazdro\'9c -ci\'b9" (2 Kor 11, 2). -\par \tab "Pozdrawia was \'a3ukasz, lekarz umi\'b3owany = -"}{\i\f1\lang1045 .=20 -\par }\pard \qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 Jest to Ewangelista. To, \'bfe wymienia go = -p\'f3\'9fniej, nie znaczy, \'bfe poni\'bfa tego cz\'b3owieka, lecz \'bfe = -wywy\'bfsza drugiego, to jest Epafrasa. Wydaje si\'ea - prawdopodobne, \'bfe byli i inni nazywani tym = -imieniem.}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 To jest imieniem \'a3 -ukasz. Prawdopodobnie \'abi Demas\'bb powinno wyst\'b9pi\'e6 po = -nast\'eapnym akapicie. Mamy tutaj do czynienia tylko z notatkami = -pisanymi pod dyktando b\'b9d\'9f te\'bf ze skr\'f3tami.}}}{\f1\lang1045 = -"I Demas". Powiedziawszy: }{\i\f118\lang1045=20 -Pozdrawia was \'a3ukasz, lekarz}{\f118\lang1045 , doda\'b3: = -}{\i\f118\lang1045 umi\'b3owany}{\f118\lang1045 . I nie jest to ma\'b3a = -pochwa\'b3a, lecz niezmiernie du\'bfa: by\'e6 umi\'b3owanym Paw\'b3a. -\par }\pard \qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f1\lang1045 \tab "Pozdr\'f3wcie braci w Laodycei, zar}{\f118\lang1045 = -\'f3wno Nimfasa, jak i Ko\'9cci\'f3\'b3 [gromadz\'b9cy si\'ea] w jego = -domu". -\par }{\i\f1\lang1045 \tab }{\f118\lang1045 Zobacz, jak on spaja i = -wi\'b9\'bfe ich ze sob\'b9, nie tylko przez pozdrowienie, lecz = -r\'f3wnie\'bf przez wymian\'ea list\'f3w. Nast\'eapnie znowu wyra\'bfa = -komplement, zwracaj\'b9c si\'ea - do niego indywidualnie. Nie robi za\'9c tego bez powodu, lecz w celu = -sk\'b3onienia r\'f3wnie\'bf innych do na\'9cladowania jego = -gorliwo\'9cci. Albowiem nie jest rzecz\'b9 ma\'b3\'b9, \'bfe nie = -wymienia go wsp\'f3 -lnie z innymi. Zobacz, jak pokazuje on dalej wielko\'9c\'e6 tego = -cz\'b3owieka, zauwa\'bfaj\'b9c, \'bfe jego dom by\'b3 Ko\'9ccio\'b3em. -\par }{\f1\lang1045 \tab "A skor}{\f118\lang1045 o list zostanie u was = -odczytany, postarajcie si\'ea, by odczytano go te\'bf w Ko\'9cciele w = -Laodycei"}{\i\f1\lang1045 . -\par \tab }{\f118\lang1045 Wydaje mi si\'ea, \'bfe by\'b3y tam zapisane = -pewne rzeczy, kt\'f3re tak\'bfe i oni powinni byli us\'b3ysze\'e6. A dla = -nich by\'b3oby bardziej korzystne, gdyby przywo\'b3awszy innych, uznali = -w\'b3asne winy. -\par \tab "A wy \'bfeby\'9ccie te\'bf przeczytali list z Laodycei". = -Niekt\'f3rzy twierdz\'b9, \'bfe nie chodzi o list Paw\'b3a wys\'b3any do = -nich, lecz o list wys\'b3any przez nich do Paw\'b3a. Nie powiedzia\'b3 = -bowiem: "list do Laodycejczyk\'f3 -w", lecz "list z Laodycei". -\par }{\f1\lang1045 \tab "Powiedzcie }{\f118\lang1045 za\'9c Archipowi: = -\'abUwa\'bfaj, aby\'9c wype\'b3ni\'b3 pos\'b3ug\'ea, kt\'f3r\'b9 = -wzi\'b9\'b3e\'9c od Pana\'bb". -\par \tab Z jakiego powodu nie pisze do niego? By\'e6 mo\'bfe nie = -by\'b3o takiej potrzeby, lecz wystarczy\'b3o zwyk\'b3e przywo\'b3anie go = -do wi\'eakszej gorliwo\'9cci. -\par \tab "Pozdrowienie r\'eak\'b9 moj\'b9 - Paw\'b3a".}{\i\f1\lang1045=20 -\par \tab }{\f1\lang1045 Jest to znak}{\f118\lang1045 ich szczero\'9cci = -i przywi\'b9zania: m\'f3c widzie\'e6 cho\'e6by jego pismo i = -do\'9cwiadczy\'e6 z tego powodu wzruszenia. -\par \tab "Pami\'eatajcie o moich kajdanach!" -\par }{\i\f1\lang1045 \tab }{\f118\lang1045 O, jak\'bfe wielkie = -pocieszenie! To bowiem wystarcza, aby zach\'eaci\'e6 ich do wszystkiego = -i uczyni\'e6 bardziej m\'ea\'bfnymi w walkach: i to nie tylko = -uczyni\'b3o ich bardziej m\'ea\'bfnymi, lecz tak\'bf -e bardziej obeznanymi. -\par \tab "\'a3aska niech b\'eadzie z wami! Amen". -\par \tab 2. Wielka to pochwa\'b3a, lecz najwi\'eaksz\'b9 ze wszystkich = -wypowiada o Epafrasie: "Rodak wasz}{\cs16\i\f1\lang1045\super \chftn = -{\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{ -\f112\lang1045 Dos\'b3.: kt\'f3ry jest z was.}}}{\i\f1\lang1045 , = -}{\f118\lang1045 s\'b3uga Chrystusa". I nazywa go ich s\'b3ug\'b9, tak = -jak nazywa tak\'bfe siebie samego s\'b3ug\'b9 Ko\'9ccio\'b3a, = -m\'f3wi\'b9c: "Jego s\'b3ug\'b9 sta\'b3em si\'ea - [ja, Pawe\'b3]" (Kol 1, 25). Wynosi tego cz\'b3owieka do tej samej = -godno\'9cci i dalej nazywa go "wsp\'f3\'b3s\'b3ug\'b9" (Kol 1, 7), a = -tutaj "s\'b3ug\'b9". -\par \tab M\'f3wi: "Rodak wasz", tak jakby rozmawiaj\'b9c z jak\'b9\'9c = -matk\'b9, powiedzia\'b3: "Kt\'f3ry jest z twego \'b3ona". -\par \tab Ta pochwa\'b3a mog\'b3aby jednak zrodzi\'e6 nienawi\'9c\'e6. = -Dlatego poleca go nie tylko z tych wzgl\'ead\'f3w, lecz tak\'bfe z tych, = -kt\'f3re ich dotycz\'b9. I tam, i tu usuwa nienawi\'9c\'e6. -\par \tab M\'f3wi: "Zawsze walcz\'b9cy za was"; nie tylko teraz u nas, = -aby nam to pokaza\'e6, ani tylko u was, aby to wam pokaza\'e6. Okaza\'b3 = -wielk\'b9 \'bfarliwo\'9c\'e6, m\'f3wi\'b9c: = -"walcz\'b9cy".}{\i\f1\lang1045 }{\f118\lang1045 Nast\'ea -pnie, aby nie wydawa\'b3o si\'ea, \'bfe im schlebia, doda\'b3: "Usilnie = -troszczy si\'ea o was oraz o tych, kt\'f3rzy s\'b9 w Laodycei i w = -Hierapolis". -\par \tab R\'f3wnie\'bf powiedzenie: "aby\'9ccie stali mocno, doskonali" = -nie jest oznak\'b9 schlebiania, lecz jest w\'b3a\'9cciwe godnemu = -szacunku nauczycielowi. -\par \tab "I w pe\'b3ni oddani, i doskonali". Przyzna\'b3 im t\'ea = -pierwsz\'b9 cech\'ea i stwierdzi\'b3, \'bfe drugiej im brakuje. I nie = -powiedzia\'b3: "aby\'9ccie si\'ea nie }{\f1\lang1045 = -chwiali}{\i\f1\lang1045 "}{\f118\lang1045 , lecz: "aby\'9ccie stali". - -\par \tab To za\'9c, \'bfe s\'b9 pozdrawiani przez wielu, umacnia ich, = -poniewa\'bf pami\'eataj\'b9 o nich nie tylko ich bliscy, lecz tak\'bfe = -inni. -\par \tab "Powiedzcie za\'9c Archipowi: Uwa\'bfaj, aby\'9c = -wype\'b3ni\'b3 pos\'b3ug\'ea, kt\'f3r\'b9 wzi\'b9\'b3e\'9c od = -Pana"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid { -\cs16\lang1045\super \chftn }{\f112\lang1045 Dos\'b3.: w = -Panu.}}}{\f118\lang1045 . Podporz\'b9dkowuje ich przede wszystkim jemu. = -Nie mieliby bowiem powodu, by oskar\'bfa\'e6 tego, kt\'f3ry ich upomina, = -gdyby przyj\'eali wszystko; nie jest bowiem rzecz -\'b9 rozs\'b9dn\'b9, aby uczniowie krytykowali nauczyciela. Lecz pisze = -to, zamykaj\'b9c im usta. -\par \tab M\'f3wi: "Powiedzcie za\'9c Archipowi: Uwa\'bfaj". Jest to = -zawsze s\'b3owo tego, kt\'f3ry chce wzbudzi\'e6 l\'eak, jak w\'f3wczas = -gdy m\'f3wi: "Strze\'bfcie si\'ea ps\'f3w}{\cs16\f1\lang1045\super = -\chftn {\footnote \pard\plain=20 -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Flp 3, 2. Tak = -okre\'9cleni zostali tzw. }{\i\lang1045 iudaizantes}{\lang1045 = -.}}}{\f118\lang1045 ; baczcie, aby kto was nie zagarn\'b9\'b3 - w niewol\'ea}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Kol 2, 8. Aluzja do = -b\'b3\'eadnych nauk filozoficznych.}}}{\f118\lang1045=20 -; baczcie jednak, aby ta wasza wolno\'9c\'e6 nie sta\'b3a si\'ea = -przeszkod\'b9 dla s\'b3abych"}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{ -\f112\lang1045 1 Kor 8, 9. Nawi\'b9zuje do wolno\'9cci co do = -spo\'bfywania mi\'easa ofiarowanego bo\'bfkom, nieuznawanej przez = -wszystkich wiernych.}}}{\f1\lang1045 . -\par \tab I stale m\'f3wi w ten spos\'f3b, kiedy}{\f118\lang1045 = -wzbudza boja\'9f\'f1. M\'f3wi: "Uwa\'bfaj, aby\'9c wype\'b3ni\'b3 = -pos\'b3ug\'ea, kt\'f3r\'b9 wzi\'b9\'b3e\'9c od Pana". I nie pozwala mu = -decydowa\'e6, tak jak sam m\'f3wi: "Gdybym to czyni\'b3 - z w\'b3asnej woli, mia\'b3bym zap\'b3at\'ea, lecz je\'9cli dzia\'b3am = -nie z w\'b3asnej woli, to tylko spe\'b3niam obowi\'b9zki = -szafarza"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright=20 -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 1 Kor 9, = -17.}}}{\f1\lang1045 . -\par \tab }{\f118\lang1045 "Aby\'9c wype\'b3ni\'b3 pos\'b3ug\'ea - = -ci\'b9gle si\'ea ni\'b9 zajmuj\'b9c. -\par }\pard \qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 "Kt\'f3r\'b9 wzi\'b9\'b3e\'9c od Pana". Teraz s\'b3owo = -"od"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright=20 -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\f112\lang1045 = -Dos\'b3.: w.}}}{\f118\lang1045 znaczy "za spraw\'b9 = -Pana"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid { -\cs16\lang1045\super \chftn }{\f112\lang1045 Jest prawdopodobne, \'bfe = -- tak jak w wielu innych wypadkach - grecki przyimek }{\i\lang1045 = -en}{\f112\lang1045 wyra\'bfa r\'f3\'bfnorodne znaczenia hebrajskiego = -}{\i\lang1045 be.}}}{\f118\lang1045=20 -. To On ci j\'b9 da\'b3, nie my. -\par }\pard \qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 \tab I tak\'bfe ich jemu podporz\'b9dkowuje, aby = -pokaza\'e6, \'bfe otrzyma\'b3 ich od Boga. -\par \tab "Pami\'eatajcie o moich kajdanach! \'a3aska niech b\'eadzie z = -wami! Amen". Usun\'b9\'b3 l\'eak. Albowiem je\'9cli nauczyciel jest w = -kajdanach, to jednak \'b3aska go uwalnia. I r\'f3wnie\'bf to jest = -znakiem \'b3aski: pozwoli\'e6, aby on by\'b3 - w kajdanach. Pos\'b3uchaj \'a3ukasza, kt\'f3ry m\'f3wi: "A oni = -odchodzili sprzed Sanhedrynu i cieszyl}{\f1\lang1045 i}{\f118\lang1045 = -si\'ea, \'bfe stali si\'ea godni cierpie\'e6 dla imienia = -Jezusa"}{\cs16\f1\lang1045\super \chftn {\footnote=20 -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Dz 5, = -41.}}}{\f1\lang1045 . -\par }{\i\f1\lang1045 \tab }{\f118\lang1045 Zaprawd\'ea bowiem by\'e6 = -uznanym za godnego to by\'e6 zniewa\'bfonym i uwi\'eazionym. Je\'9cli = -wi\'eac kto\'9c ma osob\'ea, kt\'f3r\'b9 kocha, to uwa\'bfa za zysk = -wycierpie\'e6 co\'9c - dla niej, a o wiele bardziej dla Chrystusa. -\par \tab Nie smu\'e6my si\'ea wi\'eac z powodu umartwie\'f1 dla = -Chrystusa, ale r\'f3wnie\'bf pami\'eatajmy o kajdanach Paw\'b3a i niech = -b\'eadzie to dla nas umocnieniem. -\par \tab Na przyk\'b3ad, czy zach\'eacasz innych, aby dali co\'9c = -ubogim ze wzgl\'eadu na Chrystusa? Wspomnij kajdany Paw\'b3a i = -wsp\'f3\'b3czuj sobie samemu. On odda\'b3 cia\'b3o w kajdany ze = -wzgl\'eadu na Niego, a ty nie dzielisz si\'ea nawet po\'bf -ywieniem. -\par \tab Che\'b3pisz si\'ea dobrymi uczynkami? Wspomnij kajdany = -Paw\'b3a i to, \'bfe ty nie wycierpia\'b3e\'9c niczego podobnego, a nie = -b\'eadziesz ju\'bf si\'ea che\'b3pi\'b3. Po\'bf\'b9da\'b3e\'9c d\'f3br = -bli\'9fniego? Wspomnij kajdany Paw\'b3 -a, a zobaczysz, jak bardzo jest niestosowne, \'bfe on trwa w utrapieniu, = -a ty w luksusie. -\par }\pard \qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 Po\'bf\'b9da\'b3e\'9c ze swej strony luksusu? Pomy\'9cl = -o wi\'eazieniu Paw\'b3a: jeste\'9c jego uczniem, jego towarzyszem broni. = -Jaki sens ma to, aby \'bfo\'b3nierz by\'b3 - w kajdanach, a ty w}{\f1\lang1045 luksusie? -\par }\pard \qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 \tab Pogr\'b9\'bfy\'b3e\'9c si\'ea w smutku, = -uzna\'b3e\'9c, \'bfe jeste\'9c opuszczony? S\'b3uchaj m\'f3w Paw\'b3a, a = -zobaczysz, \'bfe bycie w smutku nie oznacza opuszczenia. - -\par \tab Chcesz nosi\'e6 jedwabne szaty?}{\cs16\f1\lang1045\super = -\chftn {\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\f112\lang1045 = -Odt\'b9d, niepostrze\'bfenie, mowa zaczyna odnosi\'e6 - si\'ea do kobiety.}}}{\f118\lang1045 . Wspomnij kajdany Paw\'b3a, a te = -szaty uka\'bf\'b9 ci si\'ea jako bardziej niegodne czci ni\'bf = -\'b3achmany pokryte b\'b3otem. -\par \tab Chcesz nosi\'e6 ozdoby ze z\'b3ota? Pomy\'9cl o kajdanach = -Paw\'b3a, a ozdoby wydadz\'b9 ci si\'ea nie lepsze od starego sitowia. -\par \tab Chcesz przyozdabia\'e6 fryzur\'ea i pokazywa\'e6 si\'ea = -pi\'eakn\'b9? Pomy\'9cl o n\'eadzy Paw\'b3a w wi\'eazieniu, a = -zapa\'b3asz do tamtego pi\'eakna, a to uznasz za najgorsz\'b9 = -brzydot\'ea i gorzko si\'ea zasmucisz, pragn\'b9c owych kajdan. -\par \tab Chcesz u\'bfywa\'e6 pachnide\'b3, kolor\'f3w i tym podobnych = -rzeczy? Pomy\'9cl o jego \'b3zach: przez trzy lata, noc\'b9 i dniem, nie = -przestawa\'b3 p\'b3aka\'e6}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain=20 -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Por. Dz 20, 31. = -Rozpoczyna si\'ea tutaj obszernie potraktowany temat \'b3ez, = -}}}{\f118\lang1045 . Upi\'eaksz policzki tym malowid\'b3em: te \'b3 -zy czyni\'b9 je wspania\'b3ymi. -\par \tab Nie m\'f3wi\'ea, aby\'9c p\'b3aka\'b3a za innych (chcia\'b3bym = -oczywi\'9ccie tak\'bfe tego, lecz to ciebie przerasta), lecz zach\'eacam = -ci\'ea, aby\'9c to czyni\'b3a ze wzgl\'eadu na twe grzechy. -\par \tab Poleci\'b3a\'9c, aby zosta\'b3 uwi\'eaziony s\'b3uga oraz = -z\'b3o\'9cci\'b3a\'9c si\'ea i unosi\'b3a\'9c gniewem? Wspomnij wi\'eazy = -Paw\'b3a, a zaraz uspokoisz gniew. Pami\'eataj, \'bfe nale\'bfymy do = -tych, kt\'f3rzy s\'b9 zwi\'b9 -zani, a nie do tych, kt\'f3rzy wi\'b9\'bf\'b9; do tych, kt\'f3rzy s\'b9 = -zasmuceni w sercu, a nie do tych, kt\'f3rzy zasmucaj\'b9. = -Pozwala\'b3a\'9c sobie chodzi\'e6, \'9cmiej\'b9c si\'ea nieumiarkowanie. = -Wspo}{\f1\lang1045 m}{\f118\lang1045 nij jego \'b3 -kania, a si\'ea zasmucisz. Te \'b3zy sprawi\'b9, \'bfe oka\'bfesz si\'ea = -o wiele bardziej wspania\'b3a. -\par \tab Widzia\'b3a\'9c tego, kt\'f3ry \'bfyje w mi\'eakko\'9cci i = -ta\'f1czy? Pomy\'9cl o jego \'b3zach. -\par \tab Jakie\'bf inne \'9fr\'f3d\'b3o pozwoli\'b3o wytrysn\'b9\'e6 = -takim rzekom ni\'bf te oczy, kt\'f3re wylewa\'b3y \'b3zy? "Wspomnijcie = -moje \'b3zy"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright=20 -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Por. 2 Tm = -1, 4.}}}{\f118\lang1045 - m\'f3wi, tak jak tutaj o kajdanach. I = -s\'b3usznie im to powiedzia\'b3, kiedy kaza\'b3 im przyby\'e6 z Efezu do = -Miletu}{\cs16\f1\lang1045\super \chftn=20 -{\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\f112\lang1045 Por. = -Dz 20, 17-38: mowa po\'bfegnalna Paw\'b3a do starszych Ko\'9ccio\'b3a w = -Efezie.}}}{\f118\lang1045 . M\'f3wi\'b3 - bowiem do nauczycieli. Wymaga wi\'eac od tamtych, aby r\'f3wnie\'bf z = -nim wsp\'f3\'b3cierpieli, a od tych - tylko aby = -wspomnieli}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid { -\cs16\lang1045\super \chftn }{\f112\lang1045 Wsp\'f3\'b3cierpieli\'85 = -pami\'eatali, zgodnie z wariantem }{\i\lang1045 synalgein\'85 = -mnemoneuein.}{\f112\lang1045 Istnieje r\'f3wnie\'bf wariant: = -}{\i\lang1045 synagein\'85 kindyneuein}{\f112\lang1045=20 -: zbiera\'e6 si\'ea razem\'85 znosi\'e6 niebezpiecze\'f1stwa. Zob. PG = -62, 384, przypis b.}}}{\f1\lang1045 .=20 -\par=20 -\par \tab }{\i\f118\lang1045 \'a3zy Paw\'b3a -\par }{\f1\lang1045=20 -\par }{\f118\lang1045 \tab 3. Jakie \'9fr\'f3d\'b3o chcesz = -por\'f3wna\'e6 do tych \'b3ez? \'8fr\'f3d\'b3o rajskie, kt\'f3re = -nawadnia\'b3o ca\'b3\'b9 ziemi\'ea? Lecz nie powiesz czego\'9c = -podobnego, albowiem to \'9fr\'f3d\'b3o \'b3ez nawadnia\'b3o dusz\'ea -, a nie ziemi\'ea. -\par \tab Je\'bfeli kto\'9c przedstawi\'b3by nam Paw\'b3a = -p\'b3acz\'b9cego i j\'eacz\'b9cego, czy\'bf nie by\'b3oby o wiele lepiej = -widzie\'e6 jego, ni\'bf niezliczone, wspaniale uwie\'f1czone ch\'f3ry? -\par \tab Nie m\'f3wi\'ea o was. Lecz je\'9cli kto\'9c, = -wyci\'b9gn\'b9wszy z teatru i ze sceny jednego z tych rozpustnik\'f3w, = -kt\'f3ry p\'b3onie i szaleje z mi\'b3o\'9cci cielesnej, pokaza\'b3by mu = -m\'b3od\'b9 dziewic\'ea}{\cs16\f1\lang1045\super \chftn=20 -{\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\f112\lang1045 Opis = -m\'b3odej dziewczyny w realistyczny spos\'f3b wyra\'bf -a oczarowanie, jakie ona wzbudza, oraz ukazuje ludzkie i psychologiczne = -do\'9cwiadczenie Jana Chryzostoma. Por. analogiczny opis w rozdz. 2. = -traktatu \'abO marno\'9cci\'bb.}}}{\f1\lang1045 w pe}{\f118\lang1045 = -\'b3nym rozkwicie jej m\'b3odo\'9cci, kt\'f3 -ra przewy\'bfsza we wszystkim swe r\'f3wie\'9cniczki, lecz bardziej = -je\'9cli chodzi o twarz, ni\'bf o wszystkie inne cz\'ea\'9cci cia\'b3a, = -ze spojrzeniem s\'b3odkim i \'b3agodnym, kt\'f3re spokojnie si\'ea = -opuszcza i spokojnie si\'ea - wznosi, delikatne, spokojne}{\f1\lang1045 ,}{\f118\lang1045 pogodnie = -u\'9cmiechaj\'b9ce si\'ea i otoczone wielk\'b9 wstydliwo\'9cci\'b9, = -wielk\'b9 gracj\'b9, uwie\'f1czone u g\'f3ry i u do\'b3u ciemnymi = -powiekami, ze \'9frenic\'b9 - mo\'bfna powiedzie -\'e6 - o\'bfywion\'b9, z czo\'b3em jasnym, z policzkiem pokrytym u = -do\'b3u g\'b3\'eabokim rumie\'f1cem, odpr\'ea\'bfona, g\'b3adka i = -delik}{\f1\lang1045 a}{\f118\lang1045 tna jak marmur. Je\'bfeli potem = -pokaza\'b3by mi Paw\'b3a p\'b3acz\'b9 -cego, ja, pozostawiwszy j\'b9, ca\'b3kowicie odda\'b3bym si\'ea jego = -kontemplowaniu: albowiem z tych oczu ja\'9cnia\'b3o pi\'eakno duchowe. -\par \tab To pi\'eakno ekscytuje, pali i po\'bfera dusze m\'b3odych, = -tamto natomiast je uspokaja. Ten, kt\'f3ry patrzy w jego oczy, czyni = -pi\'eakniejszym oko duszy, pohamowuje brzuch, nape\'b3nia go = -m\'b9dro\'9cci\'b9 i wielkim wsp\'f3\'b3czuciem, i mo\'bfe os -\'b3odzi\'e6 dusz\'ea nawet tak tward\'b9 jak diament. -\par \tab Tymi \'b3zami nawadnia si\'ea Ko\'9cci\'f3\'b3, tymi \'b3zami = -uprawia si\'ea dusze: nawet je\'bfeli by\'b3by ogie\'f1, to te dusze = -mog\'b3yby go ugasi\'e6, zar\'f3wno ten duchowy, jak i ten = -materialny}{\cs16\f1\lang1045\super \chftn {\footnote=20 -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\f112\lang1045 = -Tekst grecki w ko\'f1cowej cz\'ea\'9cci jest niepewny; por. PG 62, 384, = -przypis b.}}}{\f118\lang1045 . Te \'b3zy gasz\'b9 - rozpalone strza\'b3y z\'b3ego. -\par \tab Wspomnijmy wiec jego \'b3zy, a nawodnimy wszystkie obecne = -rzeczy. -\par \tab Chrystus nazywa\'b3 te \'b3zy szcz\'ea\'9cliwymi, = -m\'f3wi\'b9c: "B\'b3ogos\'b3awieni, kt\'f3rzy si\'ea smuc\'b9 i = -b\'b3ogos\'b3awieni, kt\'f3rzy p\'b3acz\'b9, albowiem oni \'9cmia\'e6 = -si\'ea b\'ead\'b9"}{\cs16\f1\lang1045\super \chftn {\footnote=20 -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Por. Mt = -5, 5 z wariantami.}}}{\f1\lang1045 . -\par }{\f118\lang1045 \tab R\'f3wnie\'bf Izajasz i Jeremiasz wylewali = -takie \'b3zy. Jeden m\'f3wi\'b3: "Zostawcie mnie, b\'ead\'ea gorzko = -p\'b3aka\'b3"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright=20 -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Iz 22, = -4.}}}{\f118\lang1045 . Drugi pyta\'b3: "Kt\'f3\'bf da na moj\'b9 = -g\'b3ow\'ea wody i moim oczom \'9fr\'f3d\'b3o = -\'b3ez?"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain=20 -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\lang1045 Jer 9, 1.}}}{\f1\lang1045 , = -tak jakby nie}{\f118\lang1045 wystarcza\'b3o to materialne. -\par \tab Nic nie jest s\'b3odsze od tych \'b3ez; one s\'b9 s\'b3odsze = -od wszelkiego u\'9cmiechu. -\par \tab Ci, kt\'f3rzy si\'ea smuc\'b9, dobrze wiedz\'b9, jakie to daje = -umocnienie. Nie utrzymujemy, \'bfe to godne pot\'eapienia, lecz = -przeciwnie, bardzo po\'bf\'b9dane. -\par }{\f1\lang1045 \tab Wspomnijmy te }{\f118\lang1045 \'b3zy, te = -kajdany, nie dlatego}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 }{ -\i\lang1045 Oste }{\f112\lang1045 w funkcji = -celowo\'9cci-nast\'eapstw}{\lang1045 a.}}}{\f118\lang1045 , aby inni = -grzeszyli, lecz aby\'9cmy my si\'ea smucili, gdy oni grzesz\'b9. -\par \tab Teraz tak\'bfe na kajdany zst\'b9pi\'b9 jego \'b3zy: = -\'9cmier\'e6 tych, kt\'f3rzy si\'ea zatracali, kt\'f3ry go zakuwali, nie = -pozwala\'b3a mu smakowa\'e6 rado\'9cci pochodz\'b9cej z kajdan. Albowiem = -cierpia\'b3 tak\'bfe za nich: by\'b3 - uczniem Tego, kt\'f3ry p\'b3acze nad kap\'b3anami \'bfydowskimi, nie = -dlatego, \'bfe mieli go ukrzy\'bfowa\'e6, lecz dlatego, \'bfe si\'ea = -zatracali.=20 -\par \tab I nie tylko sam to czyni, lecz zach\'eaca tak\'bfe innych, tak = -m\'f3wi\'b9c: "C\'f3rki jerozolimskie, nie p\'b3aczcie nade = -mn\'b9"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid { -\cs16\lang1045\super \chftn }{\f112\lang1045 \'a3k 23, = -38.}}}{\f1\lang1045 . -\par }{\f118\lang1045 \tab Te oczy widzia\'b3y raj, widzia\'b3y trzecie = -niebo. Lecz ja nie uwa\'bfam ich za b\'b3ogos\'b3awione tak z powodu tej = -wizji, jak z powodu tych \'b3ez, moc\'b9 kt\'f3rych zobaczy\'b3y = -Chrystusa. To jest rzecz prawdziwie b\'b3ogos\'b3 -awiona i tak\'bfe on sam chwali si\'ea tym, m\'f3wi\'b9c: "Czy\'bf nie = -widzia\'b3em naszego Pana Jezusa Chrystusa?"}{\cs16\f1\lang1045\super = -\chftn {\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid { -\cs16\lang1045\super \chftn }{\lang1045 1 Kor 9, 1.}}}{\f118\lang1045 . = -Lecz jest rzecz\'b9 bardziej b\'b3ogos\'b3awion\'b9 w ten spos\'f3b = -zap\'b3aka\'e6. -\par \tab Wielu uczestniczy\'b3o w tej wizji, tych za\'9c, kt\'f3rzy w = -niej nie uczestniczyli, Chrystus okre\'9cla ze swej strony = -b\'b3ogos\'b3awionymi, m\'f3wi\'b9c: "B\'b3ogos\'b3awieni, kt\'f3rzy nie = -widzieli, a uwierzyli"}{\cs16\f1\lang1045\super \chftn=20 -{\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 J 20, = -29.}}}{\f1\lang1045 . -\par }{\f118\lang1045 \tab Niewielu mia\'b3o w udziale to = -szcz\'ea\'9ccie. Albowiem je\'bfeli pozostawanie dla Chrystusa tutaj = -jest bardziej konieczne dla zbawienia innych ni\'bf odej\'9ccie do = -Niego}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain=20 -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\lang1045 Por. Flp 1, = -23-24.}}}{\f118\lang1045 , to tak\'bfe cierpienie dla innych jest = -bardziej konieczne od widzenia Go. I je\'bfeli bycie w piekle}{ -\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Zob. Homilia Jana = -Chryzostoma na List do Rzymian 9, 3, gdzie m\'f3wi on, \'bfe by\'b3 -o pragnieniem \'abby\'e6 oddzielonym od Jego obecno\'9cci, a nie od Jego = -mi\'b3o\'9cci\'bb.}}}{\f118\lang1045 ze wzgl\'eadu na Niego jest = -bardziej po\'bf\'b9dane ni\'bf bycie z Nim, a tak\'bfe bycie oddzielonym = -od Niego jest bardziej po\'bf\'b9 -dane od zjednoczenia si\'ea z Nim (to w\'b3a\'9cnie m\'f3wi\'b3: = -"Pragn\'b9\'b3em bowiem sam by\'e6 od\'b3\'b9czonym od = -Chrystusa}{\f1\lang1045 "}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright=20 -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Rz 9, = -3.}}}{\f118\lang1045 ), to tym bardziej [po\'bf\'b9dany jest] p\'b3acz = -ze wzgl\'eadu na Niego. -\par \tab "Nie przestawa\'b3em ze \'b3zami upomina\'e6 ka\'bfdego z = -was"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\lang1045 Dz 20, 31.}}}{ -\f118\lang1045 . Z jakiego powodu? Nie dlatego, \'bfe ba\'b3 si\'ea = -niebezpiecze\'f1stw, lecz tak jakby kto\'9c, usiad\'b3szy przy chorym i = -nie znaj\'b9c ko\'f1ca jego cierpienia, p\'b3aka\'b3 ze = -wsp\'f3\'b3czucia, obawiaj\'b9c si\'ea, \'bfe straci on=20 -\'bfycie; w ten spos\'f3b tak\'bfe on, widz\'b9c chorego i nie mog\'b9c = -go upomnie\'e6, nie m\'f3g\'b3 niczego uczyni\'e6, jak tylko = -p\'b3aka\'e6. -\par \tab Tak\'bfe Chrystus to uczyni\'b3, aby wzruszyli si\'ea z powodu = -Jego \'b3ez. Na przyk\'b3ad upomina\'b3 On tego, kto grzeszy\'b3; = -upomniany gardzi\'b3 tym i odchodzi\'b3: On p\'b3aka\'b3, aby = -przygarn\'b9\'e6 go tak\'bfe w taki spos\'f3b. -\par }{\f1\lang1045=20 -\par }\pard\plain = -\s1\qj\sl360\slmult1\keepn\nowidctlpar\widctlpar\outlinelevel0\adjustrigh= -t \i\fs20\lang1045\cgrid {\f118 \tab \'a3zy i fa\'b3szywe wesele -\par }\pard\plain \qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\i\f1\lang1045=20 -\par }\pard\plain = -\s17\qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1045\cgrid {\f118 \tab 4. Pami\'eatajmy o tych \'b3zach. = -Wychowujmy w ten spos\'f3b nasze c\'f3rki, naszych syn\'f3w, = -p\'b3acz\'b9c, kiedy widzimy ich ogarni\'eatych przez z -\'b3o. -\par }\pard\plain \qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\f118\lang1045 \tab Wszystkie, kt\'f3re chc\'b9 = -by\'e6 kochane, niech wspomn\'b9 \'b3zy Paw\'b3a i niech j\'eacz\'b9; wy = -wszystkie, kt\'f3re jeste\'9ccie szcz\'ea\'9c -liwe, wy, kt\'f3re jeste\'9ccie w komnacie ma\'b3\'bfe\'f1skiej, wy, = -kt\'f3re jeste\'9ccie w rado\'9cci, pami\'eatajcie o nich. Wy wszystkie, = -kt\'f3re jeste\'9ccie w smutku, zmie\'f1cie \'b3zy na \'b3zy. -\par \tab To nie zasmuca\'b3o umar\'b3ych, ale tych, kt\'f3rzy si\'ea = -zatracali, lecz byli \'bfywi. -\par \tab Chcesz, abym ci m\'f3wi\'b3 o innych \'b3zach? Tak\'bfe = -Tymoteusz p\'b3aka\'b3, by\'b3 bowiem uczniem Paw\'b3a, dlatego = -pisz\'b9c, m\'f3wi\'b3: "Pomny na twoje \'b3zy, aby nape\'b3ni\'b3a mnie = -rado\'9c\'e6"}{\cs16\f1\lang1045\super \chftn {\footnote=20 -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 2 Tm 1, = -4.}}}{\f1\lang1045 . -\par }{\f118\lang1045 \tab Wielu p\'b3acze tak\'bfe z rado\'9cci, a to = -jest powodem rado\'9cci i to bardzo wielkiej. W ten spos\'f3b \'b3zy, = -kt\'f3re pochodz\'b9 z tej rado\'9cci, nie s\'b9 uci\'b9\'bfliwe, lecz o = -wiele lepsze od tych, kt\'f3re pochodz\'b9 - z rado\'9cci \'9cwiatowej. -\par \tab Pos\'b3uchaj proroka, kt\'f3ry m\'f3wi: "Pan us\'b3ysza\'b3 = -g\'b3os mego p\'b3aczu"}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Ps - 6, 9.}}}{\f1\lang1045 . -\par }{\f118\lang1045 \tab Gdzie bowiem nie jest u\'bfyteczna \'b3za?\~W = -modlitwach? W napomnieniach? My ich nie szanujemy, nie pos\'b3uguj\'b9c = -si\'ea nimi w celu, do kt\'f3rego zosta\'b3y nam dane. -\par \tab Kiedy napominamy brata, kt\'f3ry grzeszy, trzeba p\'b3aka\'e6, = -bij\'b9c si\'ea w piersi i j\'eacz\'b9c; kiedy kogo\'9c, kto nic sobie z = -tego nie robi i idzie ku upadkowi, trzeba p\'b3aka\'e6. -\par \tab S\'b9 to \'b3zy m\'b9dro\'9cci. Kiedy za\'9c kto\'9c staje = -si\'ea ubogim, kiedy znajduje si\'ea w chorobie cia\'b3a, kiedy umiera, = -w\'f3wczas ju\'bf nie s\'b9 to \'b3zy m\'b9dro\'9cci; te sprawy nie = -s\'b9 godne \'b3ez. -\par }{\f1\lang1045 \tab Jak }{\f118\lang1045 za\'9c pogardzamy = -u\'9cmiechem, pos\'b3uguj\'b9c si\'ea nim nieodpowiednio, tak = -r\'f3wnie\'bf \'b3zami, u\'bfywaj\'b9c ich w nieodpowiedni spos\'f3b. = -Albowiem cnota ka\'bfdego okazuje si\'ea w\'f3 -wczas, gdy jest skierowana na w\'b3a\'9cciw\'b9 spraw\'ea, kiedy za\'9c = -na spraw\'ea obc\'b9, w\'f3wczas ju\'bf nie. -\par \tab Na przyk\'b3ad wino jest dane dla rado\'9cci, a nie dla = -pija\'f1stwa; chleb dla po\'bfywienia; wsp\'f3\'b3\'bfycie dla zrodzenia = -dzieci. -\par \tab Jak wi\'eac bezcze\'9cci si\'ea te rzeczy, gdy si\'ea ich = -nadu\'bfywa, tak samo i \'b3zy. -\par \tab Niech b\'eadzie wi\'eac ustanowiona zasada, \'bfe nale\'bfy = -korzysta\'e6 z nich jedynie w modlitwach i w napomnieniach: popatrz, = -\'bfe b\'eadzie to nawet po\'bf\'b9dane. -\par \tab Nic tak nie obmywa z grzech\'f3w jak \'b3zy, a \'b3zy = -czyni\'b9 pi\'eaknym tak\'bfe oblicze zewn\'eatrzne: albowiem = -poci\'b9gaj\'b9 do wsp\'f3\'b3czucia tego, kt\'f3ry je widzi i czyni\'b9 = -je godnym szacunku. -\par \tab Nic nie jest s\'b3odsze ni\'bf oczy, kt\'f3re p\'b3aka\'b3y. = -To jest w nas cz\'ea\'9c\'e6 najszlachetniejsza i najpi\'eakniejsza oraz = -w\'b3a\'9cciwa dla duszy. Wzruszamy si\'ea a\'bf tak, jakby\'9cmy = -widzieli sam\'b9 dusz\'ea, kt\'f3ra p\'b3acze. - -\par \tab To zosta\'b3o wam powiedziane nie bez powodu, lecz dlatego, = -aby\'9ccie nie uczestniczyli w weselach, ta\'f1cach, w szata\'f1skich = -ch\'f3rach. -\par \tab Zobacz zatem, co wymy\'9cli\'b3 diabe\'b3. Poniewa\'bf sama = -natura oddali\'b3a kobiety od sceny i od rzeczy nieczystych, kt\'f3re = -tam si\'ea odbywaj\'b9, on wprowadzi\'b3 do ich mieszkania rzeczy = -w\'b3a\'9cciwe dla teatru, to znaczy zniewie\'9ccia -\'b3ych m\'ea\'bfczyzn i nierz\'b9dnice. T\'ea ruin\'ea wprowadzi\'b3y = -zwyczaje \'9clubne, to znaczy nie zwyczaje \'9clubne, w \'bfadnym = -wypadku, lecz zwyczaje naszej rozwi\'b9z\'b3o\'9cci. -\par \tab Co czynisz, cz\'b3owieku? Ty nie wiesz, co czynisz. Bierzesz = -\'bfon\'ea dla umiarkowania i dla zrodzenia dzieci. Po c\'f3\'bf wi\'eac = -nierz\'b9dnice? M\'f3wi kto\'9c: aby by\'b3a wi\'eaksza rado\'9c\'e6. = -Lecz czy nie jest to znakiem g\'b3 -upoty? Zniewa\'bfasz pann\'ea m\'b3od\'b9, zniewa\'bfasz zaproszone = -osoby. Albowiem jest to zniewaga, je\'9cli raduj\'b9 si\'ea z tych = -rzeczy. -\par \tab Je\'bfeli widzenie nieprzyzwoitych nierz\'b9dnic wzbudza = -poczucie wznios\'b3o\'9cci, to dlaczego nie sprowadzisz panny m\'b3odej, = -aby i ona je widzia\'b3a? -\par \tab Jest rzecz\'b9 ca\'b3kowicie nieodpowiedni\'b9 i wstydliw\'b9 = -sprowadza\'e6 do domu zniewie\'9ccia\'b3ych m\'ea\'bfczyzn oraz tancerzy = -i ca\'b3\'b9 t\'ea szata\'f1sk\'b9 pomp\'ea. -\par \tab "Wspomnijcie moje wi\'eaz}{\f1\lang1045 = -y}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Wcze\'9cniej t\'b3 -umaczone jako kajdany. To s\'b3owo nie odda\'b3oby jednak zestawienia z = -wi\'eazami czy te\'bf w\'eaz\'b3em ma\'b3\'bfe\'f1skim, o kt\'f3rym = -m\'f3wi teraz Jan Chryzostom.}}}{\f118\lang1045 " - m\'f3wi. Wi\'eazami = -s\'b9 za\'9clubiny, wi\'ea -zami ustanowionymi przez Boga: rozwi\'b9z\'b3o\'9c\'e6 i rozpasanie = -s\'b9 ich nierz\'b9dnic\'b9. -\par \tab Jest dopuszczalne rozweselanie za\'9clubin za pomoc\'b9 innych = -rzeczy, na przyk\'b3ad zastawionych sto\'b3\'f3w oraz stroj\'f3w. Ja = -oczywi\'9ccie tego nie usuwam, aby nie wydawa\'b3o si\'ea, \'bfe jestem = -zbyt surowy; Nie usuwam tego, chocia\'bf - Rebece wystarczy\'b3 zwyk\'b3y str\'f3j}{\cs16\f1\lang1045\super \chftn = -{\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Por. Rdz = -24, 65.}}}{\f1\lang1045 . -\par }{\f118\lang1045 \tab Jest dopuszczalne radowanie si\'ea ze = -stroj\'f3w, z obecno\'9cci godnych szacunku m\'ea\'bfczyzn i godnych = -szacunku kobiet. -\par \tab Dlaczego wi\'eac wprowadzasz te przewrotne rado\'9cci, = -dlaczego te monstra? Powiedz mi, co od nich s\'b3yszysz? Czy wstydzisz = -si\'ea, gdy to m\'f3wi\'b9? Ty si\'ea wstydzisz, lecz zmuszasz ich, aby = -to czynili. Je\'9cli jest to rzecz\'b9 dobr\'b9 -, to dlaczego nie czynisz tego tak\'bfe ty? Je\'bfeli za\'9c jest to = -nikczemne, to dlaczego}{\f1\lang1045 zmuszasz do tego innych? -\par }{\f118\lang1045 \tab Wszystko musi by\'e6 pe\'b3ne umiarkowania, = -pe\'b3ne poszanowania, wszystko pe\'b3ne godno\'9cci. Teraz za\'9c = -widz\'ea co\'9c przeciwnego: m\'ea\'bfczyzn, kt\'f3rzy skacz\'b9 jak = -wielb\'b3\'b9dy i jak mu\'b3y. -\par \tab Tylko komnata ma\'b3\'bfe\'f1ska jest odpowiednia dla kobiety. = -Lecz ona m\'f3wi, \'bfe jest uboga. Poniewa\'bf jest uboga, musi = -tak\'bfe by\'e6 przyzwoita: niech b\'eadzie przyzwoita zamiast bogata. = -Nie mo\'bfe wnie\'9c\'e6 posagu? Dlaczego czynisz j -\'b9 godn\'b9 pogardy r\'f3wnie\'bf w inny spos\'f3b, przy pomocy = -przewrotno\'9cci? -\par \tab Uznaj\'ea to, aby dziewice by\'b3y obecne dla uczczenia swej = -kole\'bfanki, aby by\'b3y obecne zam\'ea\'bfne dla uczczenia tej, = -kt\'f3ra zosta\'b3a przyj\'eata do ich grona: to s\'b3usznie zosta\'b3o = -ustanowione. Albowiem s\'b9 dwa ch\'f3 -ry: jeden dziewic i jeden zam\'ea\'bfnych. Tamte j\'b9 przekazuj\'b9, a = -te j\'b9 przyjmuj\'b9. Panna m\'b3oda stoi p}{\f1\lang1045 = -o}{\f118\lang1045 \'9cr\'f3d nich - ani panna, ani \'bfona, poniewa\'bf = -pochodzi od tych, a przechodzi do grona tamtych. - -\par \tab Z jakiego za\'9c powodu s\'b9 obecne nierz\'b9dnice? = -Nale\'bfa\'b3oby, aby ukry\'b3y si\'ea ze wstydu, kiedy odbywa si\'ea = -wesele, aby zapad\'b3y si\'ea pod ziemi\'ea (poniewa\'bf nierz\'b9d jest = -zepsuciem ma\'b3\'bfe\'f1stwa): my za\'9c - sprowadzamy je na wesele. -\par \tab A przecie\'bf, gdy cokolwiek czynicie, nawet s\'b3owem = -odwracacie wszystkie przeciwno\'9cci. -\par \tab Na przyk\'b3ad}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\f112\lang1045 = -Nale\'bfy dostrzec realizm obraz\'f3w, wzi\'eatych z bezpo\'9c -redniego do\'9cwiadczenia spo\'b3eczno\'9cci, z\'b3o\'bfonej m.in. z = -rolnik\'f3w i kupc\'f3w, do kt\'f3rych sposobu my\'9clenia dostosowuje = -si\'ea Jan Chryzostom.}}}{\f118\lang1045 , kiedy siejesz, kiedy = -czerpiesz wino z kadzi, czy nie odpowiedzia\'b3by -\'9c na to, co oznacza zakwaszenie? A tym przecie\'bf jest = -nierz\'b9dnica. Kiedy sporz\'b9dzacie ma\'9c\'e6, nie pozwalacie, aby = -si\'ea zbli\'bfy\'b3o co\'9c cuchn\'b9cego. Ma\'9cci\'b9 jest = -ma\'b3\'bfe\'f1stwo. Dlaczego wi\'eac pozwalasz, aby do sporz -\'b9dzanej ma\'9cci zbli\'bfy\'b3 si\'ea fetor gnoju? -\par \tab Co m\'f3wisz? Czy gdy panna ta\'f1czy, nie wstyd jej przed = -kole\'bfank\'b9? Trzeba, aby by\'b3a godniejsza i powa\'bfniejsza ni\'bf = -tamta: wysz\'b3a bowiem od r\'eaki}{\cs16\f1\lang1045\super \chftn = -{\footnote \pard\plain=20 -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\lang1045 Gr. }{\i\lang1045 eks = -ankales}{\f112\lang1045 : od ramienia. Niekt\'f3rzy t\'b3umacze = -uzupe\'b3niaj\'b9: od r\'eaki piel\'eagniarki.}}}{ -\f118\lang1045 , a nie z sali \'e6wicze\'f1}{\cs16\f1\lang1045\super = -\chftn {\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\f112\lang1045 To = -jest sali \'e6wicze\'f1 - gimnastycznych; w przeno\'9cni okre\'9clano tak te\'bf dom = -publiczny.}}}{\f118\lang1045 . Dlatego bowiem w og\'f3le nie nale\'bfy, = -aby dziewica pokazywa\'b3a si\'ea na weselu. -\par }{\f1\lang1045=20 -\par }\pard\plain = -\s1\qj\sl360\slmult1\keepn\nowidctlpar\widctlpar\outlinelevel0\adjustrigh= -t \i\fs20\lang1045\cgrid {\f118 \tab Tajemnica za\'9clubin i prokreacji -\par }\pard\plain \qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\f1\lang1045=20 -\par }{\f118\lang1045 \tab 5. Czy nie widzisz, \'bfe na dworach = -kr\'f3lewskich ci, kt\'f3rych darzy si\'ea szacunkiem, znajduj\'b9 = -si\'ea wewn\'b9trz przy kr\'f3lu, podczas gdy te, kt\'f3re nie s\'b9 = -szanowane, stoj\'b9 na zewn\'b9trz? B\'b9d\'9f}{ -\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 S\'b3owo jest skierowane = -do towarzyszki panny m\'b3odej.}}}{\f118\lang1045 przeto wewn\'b9 -trz, przy pannie m\'b3odej. I pozosta\'f1 czysta w domu, a nie obno\'9c = -si\'ea z dziewictwem po obchodach weselnych. Obecne s\'b9 dwa ch\'f3ry. = -Jeden oznacza, jak\'b9 przekazuje [kobiet\'ea], drugi za\'9c to, aby = -by\'b3a strze\'bf -ona. Dlaczego pozbawiasz dziewictwo szacunku? -\par \tab Albowiem je\'bfeli ty jeste\'9c taka, o to samo b\'eadzie = -j\'b9 podejrzewa\'b3 pan m\'b3ody. Chcesz oddawa\'e6 si\'ea = -mi\'b3o\'9cci cielesnej: jest to rzecz handlarek, sprzedawczy\'f1 = -zieleniny i rzemie\'9clniczek. -\par \tab Czy to nie wstyd i ha\'f1ba? To wstyd i ha\'f1ba zachowywa\'e6 = -si\'ea w spos\'f3b nieprzyzwoity, nawet gdyby by\'b3a ona c\'f3rk\'b9 = -kr\'f3la. Czy stoi jej na przeszkodzie ub\'f3stwo? Czy stan i warunki = -\'bfycia? Chocia\'bfby dziewica by\'b3 -a niewolnic\'b9, niech trwa w przyzwoito\'9cci. "Albowiem w Jezusie = -Chrystusie nie ma niewolnika ani wolnego"}{\cs16\f1\lang1045\super = -\chftn {\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super=20 -\chftn }{\lang1045 Gal 3, 28.}}}{\f118\lang1045 . Czy\'bf = -ma\'b3\'bfe\'f1stwo jest teatrem? Jest tajemnic\'b9 i = -figur\'b9}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid { -\cs16\lang1045\super \chftn }{\lang1045 Gr. }{\i\lang1045 = -typos}{\lang1045 .}}}{\f118\lang1045 wielkiej rzeczy; nawet je\'9cli go = -nie szanujesz, to szanuj przynajmniej to, czego jest figur\'b9. -\par \tab "Tajemnica to wielka - m\'f3wi - w odniesieniu do Chrystusa i = -do Ko\'9ccio\'b3a"}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Ef 5, 32. -}}}{\f118\lang1045 . Jest figur\'b9 Ko\'9ccio\'b3a i Chrystusa, a ty = -wprowadzasz nierz\'b9dnice?=20 -\par \tab Je\'bfeli wi\'eac - powie kto\'9c - nie ta\'f1cz\'b9 ani = -panny, ani te, kt\'f3re wysz\'b3y za m\'b9\'bf, to kto b\'eadzie = -ta\'f1czy\'b3? S\'b9 ta\'f1ce w misteriach}{\cs16\f1\lang1045\super = -\chftn {\footnote \pard\plain=20 -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\lang1045 Misterium (}{\i\lang1045 = -mysterion}{\f112\lang1045 ), w znaczeniu obrz\'eadu, kt\'f3ry wprowadza = -w tajemnic\'ea.=20 -\par Ko\'9cci\'f3\'b3 grecki przyj\'b9\'b3 s\'b3owo }{\i\lang1045 = -mysterion }{\lang1045 na oznaczenie tajemnicy wiary,}{\f112\lang1045 w = -kt\'f3rej si\'ea uczestniczy, rzeczywisto\'9cci sakramentalnej = -(\'b3aci\'f1ski termin }{\i\lang1045 sacramentum}{ -\f112\lang1045 ma inny \'9fr\'f3d\'b3os\'b3\'f3w, a przeto nieco inny = -odcie\'f1 znaczeniowy).}}}{\f118\lang1045 Grek\'f3w, w naszych za\'9c = -cisza i dostojna powaga, przyzwoito\'9c\'e6 i skromno\'9c\'e6. -\par \tab Dokonuje si\'ea wielkie misterium: precz z nierz\'b9dnicami, = -precz z profanami.}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Gr. }{ -\i\lang1045 bedelos}{\f112\lang1045 , \'b3ac. }{\i\lang1045 = -profanus}{\lang1045 - niewtajemniczony (w misterium).}}}{\f118\lang1045 = - W jaki spos\'f3b odbywa si\'ea to misterium?=20 -\par \tab Schodz\'b9 si\'ea razem dwoje i staj\'b9 si\'ea jednym. = -Dlaczego wi\'eac, kiedy wchodzi, nie ma ta\'f1ca ani d\'9fwi\'eaku = -cymba\'b3\'f3w, lecz wielka cisza i wielki spok\'f3j; kiedy za\'9c oni = -si\'ea schodz\'b9, tworz\'b9c nie obraz nieo\'bf -ywiony, nie co\'9c z tych rzeczy, kt\'f3re s\'b9 na ziemi, lecz obraz i = -podobie\'f1stwo samego Boga, w\'f3wczas tak wielki}{\f1\lang1045 = -}{\f118\lang1045 wprowadzasz zam\'eat, przeszkadzasz obecnym, = -bezcze\'9ccisz i niepokoisz dusz\'ea.=20 -\par }\pard \qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 Schodz\'b9 si\'ea, aby sta\'e6 si\'ea jednym cia\'b3em. = -Oto znowu tajemnica mi\'b3o\'9cci. Je\'bfeli dwoje nie sta\'b3oby si\'ea = -jednym, to nie wyda\'b3oby wielu, dop\'f3 -ki pozostawa\'b3oby dwojgiem. Kiedy jednak osi\'b9gaj\'b9 jedno\'9c\'e6, = -w\'f3wczas to czyni\'b9. -\par }\pard \qj\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 \tab Czego si\'ea z tego uczymy? \'afe wielka jest = -si\'b3a jedno\'9cci. M\'b9dra zdolno\'9c\'e6 Boga podzieli\'b3a na = -pocz\'b9tku jedno na dwoje, a chc\'b9c pokaza\'e6, \'bfe r\'f3 -wnie\'bf po podziale pozostaje jedno, nie pozwoli\'b3a, aby jedno = -wystarcza\'b3o dla zrodzenia pot}{\f1\lang1045 omstwa.=20 -\par }\pard \qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -{\f118\lang1045 Albowiem jeszcze nie jest jednym, lecz po\'b3ow\'b9 = -jednego i jest rzecz\'b9 oczywist\'b9, \'bfe nie mo\'bfe rodzi\'e6 = -dzieci, tak jak i wcze\'9cniej.=20 -\par Czy zobaczy\'b3e\'9c tajemnic\'ea ma\'b3\'bfe\'f1stwa? Uczyni\'b3 = -jedno z jednego i ponownie, uczyniwszy tych dwoje jednym, tak czyni z = -nich jedno. W ten spos\'f3b tak\'bfe z jednego rodzi si\'ea cz\'b3owiek. = -Albowiem kobieta i m\'ea\'bfczyzna nie s\'b9 - dwojgiem ludzi, lecz jednym cz\'b3owiekiem. I mo\'bfna si\'ea o tym = -przekona\'e6 z wielu \'9fr\'f3de\'b3: od Jakuba, od Maryi, Matki = -Chrystusa, ze s\'b3\'f3w: "Uczyni\'b3 ich m\'ea\'bfczyzn\'b9 i = -niewi}{\f1\lang1045 a}{\f118\lang1045 st\'b9"}{ -\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\lang1045 Rdz 1, 27. Niejasna jest = -aluzja do Jakuba.}}}{\f118\lang1045 . Je\'bfeli on jest g\'b3ow\'b9 -, ona za\'9c cia\'b3em, to dlaczego s\'b9 dwoje? Dlatego te\'bf ona = -zajmuje miejsce ucznia, on za\'9c nauczyciela, on kieruj\'b9cego, ona = -tej, kt\'f3ra jest pos\'b3uszna kieruj\'b9cemu. Z samej struktury = -cia\'b3a zobaczysz, \'bfe s\'b9 - jednym. Albowiem zosta\'b3a uczyniona z jego boku i s\'b9 jakby dwiema = -odci\'eatymi po\'b3owami. Dlatego te\'bf nazywa j\'b9 pomoc\'b9, aby = -pokaza\'e6, \'bfe s\'b9 jednym. Przeto i nad ojca, i nad matk\'ea = -przedk\'b3ada zwi\'b9zek i po\'bfycie ma\'b3\'bf -e\'f1skie, aby pokaza\'e6, \'bfe s\'b9 jednym. -\par Ojciec te\'bf podobnie cieszy si\'ea z c\'f3rki i syna = -po\'b3\'b9czonych ma\'b3\'bfe\'f1stwem, gdy\'bf cia\'b3o = -po\'b3\'b9czy\'b3o si\'ea jakby z w\'b3asn\'b9 cz\'ea\'9cci\'b9. Ponosi = -znaczny wydatek i uszczuplenie maj\'b9tku, a jednak nie mo\'bfe znosi -\'e6 tego, by widzie\'e6 go nieo\'bfenionego. -\par Albowiem tak jak po rozci\'eaciu tego samego cia\'b3a obydwoje sami = -s\'b9 niezdolni do zrodzenia dzieci, tak obydwoje sami s\'b9 niezdolni = -do ustanowienia obecnego \'bfycia. Dlatego te\'bf m\'f3wi prorok: "Tym, = -co pozostaje z twego ducha"}{ -\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Mal 2, 15, Septuaginta. = -Greckie wyra\'bfenie }{\i\lang1045 hypoleimma pneumatos sou }{ -\f112\lang1045 jest niejasne, mo\'bfe oznacza\'e6 drug\'b9 = -cz\'ea\'9c\'e6, to, co pozostaje, zostaje w spadku. Jan Chryzostom = -cytuje je w relacji do nierozerwalnej jedno\'9cci = -ma\'b3\'bfe\'f1skiej.}}}{\f118\lang1045 . W jaki\'bf wi\'eac spos\'f3b = -s\'b9 - w jednym ciele? Tak jakby\'9c ty naby\'b3 najczystsz\'b9 cz\'ea\'9c\'e6 = -z\'b3ota i zmiesza\'b3 j\'b9 z inn\'b9, tak te\'bf jest tutaj \endash = -to, co jest najbogatsze, jakby dzi\'eaki wylanej rozkoszy, kobieta, = -przyjmuj\'b9c, od\'bf -ywia i ogrzewa, i po wniesieniu swojej cz\'ea\'9cci oddaje m\'ea\'bfowi. -\par Dziecko jest jak most. Tak te\'bf troje staj\'b9 si\'ea jednym = -cia\'b3em, gdy\'bf dziecko \'b3\'b9czy oboje z obu stron}{\f1\lang1045 . -\par }{\f118\lang1045 Jak bowiem, je\'bfeli dwa miasta ca\'b3kowicie = -rozdziela rzeka, to staj\'b9 si\'ea one jednym, wtedy gdy z obu stron = -po\'b3\'b9czy je most - tak samo te\'bf jest i tutaj, a nawet bardziej, = -gdy\'bf ten most jest z substancji obojga. -\par I z tego powodu s\'b9 jednym, tak jak cia\'b3o i g\'b3owa s\'b9 = -jednym cia\'b3em. Oddzielone s\'b9 bowiem szyj\'b9, lecz nie tyle s\'b9 = -oddzielone, co po\'b3\'b9czone: albowiem b\'ead\'b9c \'9crodkiem, = -\'b3\'b9czy ona oboje.=20 -\par Zachodzi te\'bf to samo, jak gdyby rozdzielony ch\'f3r sta\'b3 = -si\'ea jednym, gdy jedna jego cz\'ea\'9c\'e6 uchwyci\'b3a si\'ea z tej = -strony, a druga z prawej albo jak gdyby ci, zgromadziwszy si\'ea razem i = -wyci\'b9gn\'b9wszy r\'eace, stali si\'ea - jednym: albowiem wyci\'b9gni\'eate r\'eace nie pozwalaj\'b9, aby = -stanowili dwie cz\'ea\'9cci. -\par Dlatego w\'b3a\'9cciwie i s\'b3usznie nie powiedzia\'b3: = -"B\'ead\'b9 jednym cia\'b3em", lecz\~: "w jednym = -ciele"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super=20 -\chftn }{\lang1045 Jan Chryzostom nie pojmuje typowe}{\f112\lang1045 j = -konstrukcji hebrajskiej tego wyra\'bfenia (zob. w tym kontek\'9ccie: Jan = -Chryzostom, Homilia 20, 3), lecz nadaje jej r\'f3wnie mocn\'b9 = -interpretacj\'ea osobist\'b9.}}}{\f1\lang1045=20 -, oc}{\f118\lang1045 zywi\'9ccie po\'b3\'b9czeni przez dziecko. -\par C\'f3\'bf wi\'eac? O ile nie b\'eadzie dziecka, nie b\'ead\'b9 = -jednym? B\'ead\'b9. Tego bowiem dokonuje wsp\'f3\'b3\'bfycie, = -stapiaj\'b9c i mieszaj\'b9c cia\'b3a obydwojga. I tak jak ten, kt\'f3ry = -do oleju dodaje ma\'9c -ci, wszystko czyni jednym, tak jest r\'f3wnie\'bf tutaj. -\par }{\f1\lang1045=20 -\par }\pard\plain = -\s2\qj\fi708\sl360\slmult1\keepn\nowidctlpar\widctlpar\outlinelevel1\adju= -stright \i\fs20\lang4108\cgrid {\f118\lang1045 Chrze\'9ccija\'f1skie = -ma\'b3\'bfe\'f1stwo=20 -\par }\pard\plain = -\qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\i\f1\lang1045=20 -\par }{\f118\lang1045 6. Wiem, \'bfe wielu wstydzi si\'ea z powodu tego, = -co zosta\'b3o powiedziane, a przyczyn\'b9 tego, co powiedzia\'b3em, jest = -nieczysto\'9c\'e6 i rozwi\'b9z\'b3o\'9c\'e6. To, \'bfe tak si\'ea = -odbywaj\'b9 za\'9clubiny, \'bfe ulegaj\'b9 - zepsuciu, doprowadzi\'b3o do ich znies\'b3awienia. Skoro "godne czci = -s\'b9 za\'9clubiny i \'b3o\'bfe nieskalane"}{\cs16\f1\lang1045\super = -\chftn {\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super=20 -\chftn }{\lang1045 Hbr 13, 4.}}}{\f118\lang1045 , to dlaczego wstyd ci = -z powodu rzeczy godnej czci, dlaczego rumienisz si\'ea z powodu tego, co = -jest nieskalane? To jest w\'b3a\'9cciwe heretykom, kt\'f3rzy = -wprowadzaj\'b9 nierz\'b9dnice. Dlatego chce oczy -\'9cci\'e6 samo ma\'b3\'bfe\'f1stwo, aby mu przywr\'f3ci\'e6 jego = -szlachetno\'9c\'e6 i zamkn\'b9\'e6 usta heretykom. Jest zniewa\'bfany = -dar Bo\'bfy, \'9fr\'f3d\'b3o naszego zrodzenia. Albowiem wiele gnoju i = -b\'b3ota wrzucono do \'9fr\'f3d\'b3a.=20 -\par Oczy\'9c\'e6my wi\'eac to zgodnie z rozs\'b9dkiem. Znie\'9ccie = -jeszcze troch\'ea, poniewa\'bf ten, kto ma do czynienia z b\'b3otem, = -znosi brzydki zapach. -\par Chc\'ea wam pokaza\'e6, \'bfe nie trzeba wstydzi\'e6 si\'ea z = -tamtego powodu, lecz z powodu tego, co ty czynisz. Ty za\'9c, = -przestaj\'b9c wstydzi\'e6 si\'ea z tamtego powodu, popadasz we wstyd z = -tego powodu. Pot\'eapiasz bowiem Boga, kt\'f3ry tak=20 -postanowi\'b3.=20 -\par Czy musz\'ea ci m\'f3wi\'e6, w jaki spos\'f3b jest to tajemnic\'b9 = -Ko\'9ccio\'b3a? -\par Chrystus przyszed\'b3 do Ko\'9ccio\'b3a i narodzi\'b3 si\'ea z = -niego, i z\'b3\'b9czy\'b3 si\'ea z nim jedno\'9cci\'b9 duchow\'b9. = -"Po\'9clubi\'b3em was przecie\'bf - m\'f3wi - z jednym oblubie\'f1cem = -jak czyst\'b9 dziewic\'ea"}{\cs16\f1\lang1045\super=20 -\chftn {\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 2 Kor 11, = -2.}}}{\f1\lang1045 . -\par }{\f118\lang1045 A \'bfe pochodzimy od niego - i z jego = -cz\'b3onk\'f3w, i z jego cia\'b3a - pos\'b3uchaj, w jaki spos\'f3b to = -m\'f3wi. -\par To wszystko za\'9c maj\'b9c na my\'9cli, nie wstyd\'9fmy si\'ea = -takiej tajemnicy. -\par Ma\'b3\'bfe\'f1stwo jest figur\'b9 obecno\'9cci Chrystusa, a ty = -si\'ea upijasz? -\par Powiedz mi: je\'bfeli widzia\'b3by\'9c obraz kr\'f3la, czy nie = -do\'9cwiadczy\'b3by\'9c wstydu? \'afadn\'b9 miar\'b9. Uwa\'bfa si\'ea = -za\'9c, \'bfe s\'b9 oboj\'eatne te rzeczy, kt\'f3re dotycz\'b9 = -ma\'b3\'bfe\'f1stwa, podczas gdy s\'b9 one przyczyn\'b9 - wielkiego z\'b3a. -\par Wszystko jest pe\'b3ne nieprawo\'9cci. "To, co haniebne, = -niedorzeczne gadanie i nieprzyzwoite \'bfarty - m\'f3wi - niech nie = -wychodz\'b9 z waszych ust"}{\cs16\f1\lang1045\super \chftn {\footnote = -\pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright=20 -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{\lang1045 Ef 5, = -4.}}}{\f118\lang1045 . Wszystko za\'9c to jest rzecz\'b9 haniebn\'b9, = -niedorzecznym gadaniem i nieprzyzwoitymi \'bfartami, nie w spos\'f3b = -lekki, lecz ponad miar\'ea -. Jest to bowiem sztuka i przynosi wiele chwa\'b3y tym, kt\'f3rzy j\'b9 = -uprawiaj\'b9. Sztuk\'b9 sta\'b3y si\'ea grzechy. Nie traktujemy ich = -lekko, lecz z nabytym do\'9cwiadczeniem i \'9cwiadomo\'9cci\'b9, a co do = -reszty diabe\'b3 jest wodzem i w\'b3adc -\'b9 swych zast\'eap\'f3w. -\par Albowiem tam, gdzie jest pija\'f1stwo, tam jest = -rozwi\'b9z\'b3o\'9c\'e6; tam, gdzie jest nieprzyzwoite gadanie, obecny = -jest diabe\'b3, przynosz\'b9cy rzeczy w\'b3a\'9cciwe sobie. Powiedz, = -prosz\'ea, czy uczestnicz\'b9 -c z nimi w uczcie, dokonujesz tajemnicy Chrystusa i przyzywasz = -diab\'b3a? -\par Uwa\'bfacie mo\'bfe, \'bfe jestem powa\'bfny i uci\'b9\'bfliwy. = -Albowiem tak\'bfe to jest spraw\'b9 przewrotno\'9cci, \'bfe ten, kto = -gani, wystawia si\'ea na wyszydzenie jako osoba przykra. -\par Czy nie s\'b3yszycie Paw\'b3a, kt\'f3ry m\'f3wi: To, co czynicie, = -"czy jecie, czy pijecie, czy cokolwiek innego czynicie, wszystko na = -chwa\'b3\'ea Bo\'bf\'b9 czy\'f1cie"?}{\cs16\f1\lang1045\super \chftn = -{\footnote \pard\plain=20 -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\lang1045 1 Kor 10, = -31.}}}{\f118\lang1045 Wy za\'9c sk\'b3onni jeste\'9ccie do obelgi i = -ha\'f1by.=20 -\par Czy nie s\'b3yszycie proroka, kt\'f3ry m\'f3wi: "S\'b3u\'bfcie Panu = -z boja\'9fni\'b9 i wychwalajcie Go z = -dr\'bfeniem"?}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid { -\cs16\lang1045\super \chftn }{\lang1045 Ps 2, 11.}}}{\f118\lang1045 . = -Wy za\'9c jeste\'9ccie rozrzutni i op\'b3ywacie w luksus. -\par Czy nie jest jednak mo\'bfliwe weseli\'e6 si\'ea w spos\'f3b = -bezpieczny? Chcesz pos\'b3ucha\'e6 pi\'eaknych pie\'9cni? Z = -pewno\'9cci\'b9 wcale nie by\'b3oby to potrzebne. Jednak si\'ea do = -ciebie przychyl\'ea, je\'9cli chcesz: nie s\'b3uchaj pie\'9c -ni szata\'f1skich, lecz duchowych. -\par Chcesz widzie\'e6 ta\'f1cz\'b9cych? Popatrz na ch\'f3r anielski. A = -jak mo\'bfna go zobaczy\'e6? - pytasz. Je\'bfeli odrzucisz te rzeczy, = -przyb\'eadzie na te za\'9clubiny, a kiedy jest obecny Chrystus, jest = -r\'f3wnie\'bf obecny ch\'f3r anio\'b3\'f3w. - -\par Je\'9cli b\'eadziesz chcia\'b3, b\'eadzie On czyni\'b3 cuda = -tak\'bfe teraz, tak jak w\'f3wczas. Uczyni tak\'bfe teraz wod\'ea winem = -oraz - co jeszcze cudowniejsze - zamieni rozwi\'b9z\'b3\'b9 rado\'9c\'e6 = -i smutn\'b9 po\'bf\'b9dliwo\'9c\'e6 - i przemieni je w to, co duchowe. To oznacza uczyni\'e6 z wody wino. -\par Tam, gdzie s\'b9 fleci\'9cci, w \'bfaden spos\'f3b nie ma = -Chrystusa; lecz gdyby nawet przyszed\'b3, najpierw by ich wyrzuci\'b3, a = -potem uczyni\'b3by cuda. -\par C\'f3\'bf jest bardziej obrzydliwego ni\'bf diabelskie obchody, = -gdzie wszystko jest nieokre\'9clone, zaraz wszystko staje si\'ea = -szkaradne, wszystko obrzydliwe. -\par }{\f1\lang1045=20 -\par }\pard\plain = -\s2\qj\fi708\sl360\slmult1\keepn\nowidctlpar\widctlpar\outlinelevel1\adju= -stright \i\fs20\lang4108\cgrid {\f118\lang1045 Wyb\'f3r oblubie\'f1ca i = -prawdziwe za\'9clubiny -\par }\pard\plain = -\qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\i\f1\lang1045=20 -\par }\pard\plain = -\s20\qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1045\cgrid {\f118 7. Nic nie jest s\'b3odsze od cnoty, nic nie = -jest bardziej \'b3agodne od umiarkowania, nic nie jest bardziej = -po\'bf\'b9dane od zacno\'9cci. Niech kto -\'9c wyprawi wesele, tak jak ja m\'f3wi\'ea, a zobaczy, jaka to = -rado\'9c\'e6. -\par }\pard\plain = -\qj\fi708\sl360\slmult1\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\f118\lang1045 Uwa\'bfajcie na to, jakie s\'b9 = -za\'9clubiny. Przede wszystkim szukaj dla panny m\'ea\'bfa, kt\'f3rzy = -b\'eadzie rzeczywi\'9ccie m\'ea\'bfem i obro -\'f1c\'b9, tak jakby\'9c powsta\'b3a, aby umie\'9cci\'e6 g\'b3ow\'ea na = -ciele i aby powierzy\'e6 mu nie niewolnic\'ea, lecz c\'f3rk\'ea. -\par Nie poszukuj bogactw ani splendoru urodzenia, ani wielko\'9cci = -ojczyzny - wszystko to jest zbyteczne - lecz dobroci duszy, = -\'b3agodno\'9cci, prawdziwej m\'b9dro\'9cci, boja\'9fni Bo\'bfej, = -je\'bfeli chcesz, aby twoja c\'f3rka \'bfy\'b3a w rado\'9cci. - -\par Albowiem je\'9cli poszukujesz boga}{\f1\lang1045 = -tszego}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 S\'b3 -owo jest adresowane do matki panny m\'b3odej b\'b9d\'9f te\'bf do = -kobiety, kt\'f3rej zosta\'b3a ona powierzona (kt\'f3r\'b9 Jan Chryzostom = -nazywa }{\i\lang1045 kedestria}{\lang1045 ).}}}{\f118\lang1045 , to nie = -tylko nie przyniesiesz jej po\'bf -ytku, lecz przeciwnie, przyniesiesz jej szkod\'ea, czyni\'b9c j\'b9 = -niewolnic\'b9 zamiast woln\'b9. -\par Ze z\'b3ota nie wydob\'eadzie ona tyle przyjemno\'9cci, ile = -nieprzyjemno\'9cci pochodz\'b9cej z bycia niewolnic\'b9. -\par }{\f1\lang1045 Nie poszukuj tych rzeczy, }{\f118\lang1045 lecz = -przede wszystkim kogo\'9c r\'f3wnego stanu. Je\'bfeli nie jest to = -mo\'bfliwe, to raczej kogo\'9c ubo\'bfszego ni\'bf bogatszego, je\'bfeli = -nie chcesz sprzeda\'e6 c\'f3rki panu, lecz powierzy -\'e6 j\'b9 ma\'b3\'bfonkowi. -\par W\'f3wczas uwa\'bfnie ocenisz cnoty m\'ea\'bfa i gdy b\'eadziesz = -mia\'b3 mu j\'b9 powierzy\'e6, wezwij pomocy Chrystusa. Nie b\'eadzie mu = -bowiem wstyd: jest to tajemnica Jego obecno\'9cci. -\par Przede wszystkim nie wzywaj Go, aby ci da\'b3 takiego kandydata. = -Nie b\'b9d\'9f ni\'bfszy od Abrahama}{\cs16\f1\lang1045\super \chftn = -{\footnote \pard\plain \s15\qj\nowidctlpar\widctlpar\adjustright = -\fs20\lang1036\cgrid {\cs16\lang1045\super \chftn }{ -\lang1045 Por. Rdz 24.}}}{\f118\lang1045 , kt\'f3ry - przeznaczony, aby = -odby\'e6 tak\'b9 podr\'f3\'bf - dobrze wiedzia\'b3, gdzie nale\'bfy = -si\'ea schroni\'e6: dlatego wszystko otrzyma\'b3. -\par Kiedy troszczysz si\'ea i idziesz na poszukiwanie m\'ea\'bfa, = -m\'f3dl si\'ea. Powiedz Bogu: "Przeznacz tego, kt\'f3rego chcesz Ty". = -Pole\'e6 mu T\'ea spraw\'ea, a On, uczczony przez ciebie t\'b9 czci\'b9, = -tobie to odwzajemni. -\par Trzeba uczyni\'e6 dwie rzeczy: powierzy\'e6 si\'ea Jemu i szuka\'e6 = -tego, kogo On chce, skromnego, m\'b9drego. -\par Kiedy za\'9c wyprawiasz wesele, nie kr\'b9\'bf po domach, = -po\'bfyczaj\'b9c lustra i szaty. Albowiem to, co si\'ea odbywa, nie jest = -dla ostentacji ani te\'bf nie prowadzisz c\'f3rki na parad\'ea. = -Rozweselaj\'b9c natomiast dom tym, co w nim jest, zwo\'b3 -aj s\'b9siad\'f3w, przyjaci\'f3\'b3 i krewnych. -\par Tych, o kt\'f3rych wiesz, \'bfe s\'b9 m\'b9drzy, tych zwo\'b3aj i = -zach\'eacaj, aby zadowolili si\'ea tym, co jest. -\par Niech nie b\'eadzie obecny nikt spo\'9cr\'f3d tych, kt\'f3rzy = -przychodz\'b9 z miejsca ta\'f1c\'f3w. Jest to bowie}{\f1\lang1045 m = -wydatek zbyteczny i niestosowny. -\par }{\f118\lang1045 Przede wszystkim zapro\'9c Chrystusa. Wiesz, z = -jakiego powodu powiniene\'9c Go zaprosi\'e6? "Kto\~uczyni\'b3 co\'9c dla = -jednego z tych najmniejszych, dla mnie to = -uczyni\'b3"}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain=20 -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\lang1045 Por. Mt 25, = -45.}}}{\f1\lang1045 . -\par }{\f118\lang1045 Nie s\'b9d\'9f, \'bfe jest rzecz\'b9 przykr\'b9 = -zaprasza\'e6 ubogich ze wzgl\'eadu na Chrystusa; jest rzecz\'b9 = -przykr\'b9 zaprasza\'e6 nierz\'b9dnice. Albowiem zapraszanie ubogich = -jest pocz\'b9tkiem bogactwa, tamto za\'9c pocz\'b9 -tkiem ruiny. -\par Nie przyozdabiaj panny m\'b3odej ozdobami wykonanymi ze z\'b3ota, = -lecz \'b3agodno\'9cci\'b9, dyskrecj\'b9 oraz zwyk\'b3ym odzieniem, w = -miejsce wszystkich ozd\'f3b ze z\'b3ota i fryzury, przyodziewaj\'b9c = -j\'b9 we wstydliwo\'9c\'e6 i skromno\'9c\'e6 - oraz przekonuj\'b9c j\'b9, aby nie szuka\'b3a owych = -rzeczy}{\cs16\f1\lang1045\super \chftn {\footnote \pard\plain = -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Wyra\'bfenie to w tek\'9c -cie oryginalnym jest niejasne, a sam tekst - niepewny.}}}{\f1\lang1045 . -\par }{\f118\lang1045 Niech nie b\'eadzie \'bfadnego zgie\'b3ku, = -\'bfadnego zamieszania. Niech zostanie wezwany oblubieniec, niech = -przyjmie pann\'ea. Obiady i wieczerze niech b\'ead\'b9 pe\'b3ne nie = -pija\'f1stwa, lecz rado\'9cci duchowej. -\par Albowiem niesko\'f1czone b\'ead\'b9 bogactwa pochodz\'b9ce z = -takiego ma\'b3\'bfe\'f1stwa, a zasoby \'bfyciowe b\'ead\'b9 zapewnione. = -Zobacz natomiast, ile z\'b3a pochodzi z wesel, kt\'f3re odbywaj\'b9 = -si\'ea obecnie (je\'bfeli w og\'f3le mo\'bfna nazywa -\'e6 je weselami, a nie zewn\'eatrznymi obchodami). -\par Zako\'f1czy\'b3y si\'ea \'9cwi\'eata za\'9clubin, a zarazem obawa i = -l\'eak, czy nie zniszczy\'b3 si\'ea \'bfaden z wypo\'bfyczonych = -przedmiot\'f3w, a na miejsce rado\'9cci wchodzi zniech\'eacenie nie do = -zniesienia. -\par }{\f1\lang1045 Takie jest zmartwienie}{\f118\lang1045 tej, = -kt\'f3ra troszczy si\'ea o pann\'ea m\'b3od\'b9, albo raczej sama panna = -m\'b3oda nie jest z tego wy\'b3\'b9czona: wszystko to, co ma miejsce = -p\'f3\'9fniej, dotyczy samej panny m\'b3odej. -\par Uwa\'bfanie, \'bfe wszystko si\'ea sko\'f1czy\'b3o, jest powodem do = -zmartwienia; zobaczenie opustosza\'b3ego domu }{\f1\lang1045 jest = -powodem smutku. -\par }{\f118\lang1045 Tam jest Chrystus, tutaj szatan; tam = -przyjemno\'9c\'e6, tutaj utrapienie; tam rado\'9c\'e6, tutaj smutek; tam = -wydatek, tutaj nic podobnego; tam}{\cs16\f1\lang1045\super \chftn = -{\footnote \pard\plain=20 -\s15\qj\nowidctlpar\widctlpar\adjustright \fs20\lang1036\cgrid = -{\cs16\lang1045\super \chftn }{\f112\lang1045 Ze wzgl\'eadu na styl = -oratorski zosta\'b3 nie\'9cwiadomie, a mo\'bfe \'9cwiadomie, = -odwr\'f3cony porz\'b9dek antytez.}}}{\f118\lang1045=20 - zbezczeszczenie, tutaj skromno\'9c\'e6; tam pija\'f1stwo, tutaj = -trze\'9fwo\'9c\'e6, tu zbawienie, tu umiarkowanie. -\par }{\f1\lang1045 Rozwa}{\f118\lang1045 \'bfaj\'b9c to wszystko, = -zatrzymajmy w tym miejscu z\'b3o, aby\'9cmy mogli podoba\'e6 si\'ea Bogu = -i byli uznani za godnych otrzymania dar\'f3w obiecanych tym, kt\'f3rzy = -Go mi\'b3uj\'b9, z \'b3aski i \'bfyczliwo\'9c -ci naszego Pana Jezusa Chrystusa, kt\'f3remu razem z Ojcem i Duchem = -\'8cwi\'eatym niech b\'eadzie chwa\'b3a, moc, cze\'9c\'e6, teraz i = -zawsze, i na wieki wiek\'f3w. Amen. -\par }{\f1\lang1045=20 -\par=20 -\par }} -------=_NextPart_000_0007_01C21019.229C7160-- - diff -Nru spamassassin-3.4.6/xt/data/nice/005 spamassassin-4.0.0~rc3/xt/data/nice/005 --- spamassassin-3.4.6/xt/data/nice/005 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/005 1970-01-01 00:00:00.000000000 +0000 @@ -1,210 +0,0 @@ -Return-Path: -Delivered-To: maillist@jg555.com -Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) - by mail.jg555.com (Postfix) with ESMTP id 0197E43E6 - for ; Wed, 10 Jul 2002 08:21:12 -0700 (PDT) -Date: Wed, 10 Jul 2002 11:18:57 -0400 (EDT) -Errors-To: procmail-admin@Lists.RWTH-Aachen.DE -From: Poohba -List-Archive: -List-Help: -List-Id: discussion of the procmail program -List-Post: -List-Subscribe: , - -List-Unsubscribe: , - -Message-id: -Precedence: bulk -Received: from mail.jg555.com (localhost.localdomain [127.0.0.1]) - by localhost.localdomain (AvMailGate-2.0.0.6) id 15806-73863AE7; - Wed, 10 Jul 2002 08:20:56 -0700 -Received: from r220-1.rz.RWTH-Aachen.DE (r220-1.rz.RWTH-Aachen.DE [134.130.3.31]) - by mail.jg555.com (Postfix) with ESMTP id 2C0B143E4 - for ; Wed, 10 Jul 2002 08:20:55 -0700 (PDT) -Received: from r220-1.rz.RWTH-Aachen.DE (relay2.RWTH-Aachen.DE [134.130.3.1]) - by r220-1.rz.RWTH-Aachen.DE (8.10.1/8.11.3-2) with ESMTP id g6AFKR824557; - Wed, 10 Jul 2002 17:20:27 +0200 (MEST) -Received: from nets2.rz.RWTH-Aachen.DE (nets2.rz.RWTH-Aachen.DE [137.226.144.243]) - by r220-1.rz.RWTH-Aachen.DE (8.10.1/8.11.3/8) with ESMTP id g6AFKO224514; - Wed, 10 Jul 2002 17:20:24 +0200 (MEST) -Received: from nets2.rz.RWTH-Aachen.DE (localhost [127.0.0.1]) - by nets2.rz.RWTH-Aachen.DE (8.9.1a/8.9.1/1) with ESMTP id RAA06668; - Wed, 10 Jul 2002 17:17:47 +0200 (MET DST) -Received: from ue250-1.rz.RWTH-Aachen.DE (ue250-1.rz.RWTH-Aachen.DE [134.130.3.33]) - by nets2.rz.RWTH-Aachen.DE (8.9.1a/8.9.1/1) with ESMTP id RAA06646 - for ; Wed, 10 Jul 2002 17:15:50 +0200 (MET DST) -Received: from ue250-1.rz.RWTH-Aachen.DE (relay1.RWTH-Aachen.DE [134.130.3.3]) - by ue250-1.rz.RWTH-Aachen.DE (8.12.1/8.11.3-3) with ESMTP id g6AFFm1I005140 - for ; Wed, 10 Jul 2002 17:15:49 +0200 (MEST) -Received: from mails.rz.rwth-aachen.de (mails.rz.RWTH-Aachen.DE [134.130.1.251]) - by ue250-1.rz.RWTH-Aachen.DE (8.12.1/8.11.3/23) with ESMTP id g6AFFm8W005132 - for ; Wed, 10 Jul 2002 17:15:48 +0200 (MEST) -Received: from ue250-1.rz.RWTH-Aachen.DE ("port 34611"@ue250-1.rz.RWTH-Aachen.DE [134.130.3.33]) - by mails.rz.rwth-aachen.de - (Sun Internet Mail Server sims.4.0.2000.10.12.16.25.p8) - with ESMTP id <0GZ100BMXH2CP5@mails.rz.rwth-aachen.de> for - procmail@lists.RWTH-Aachen.DE - (ORCPT rfc822;procmail@informatik.rwth-aachen.de); Wed, - 10 Jul 2002 17:15:48 +0200 (MET DST) -Received: from ue250-1.rz.RWTH-Aachen.DE (relay1.RWTH-Aachen.DE [134.130.3.3]) - by ue250-1.rz.RWTH-Aachen.DE (8.12.1/8.11.3-3) with ESMTP id g6AFFk1I005103 - for ; Wed, - 10 Jul 2002 17:15:47 +0200 (MEST) -Received: from hera.cuci.nl (hera.cuci.nl [212.125.128.1]) - by ue250-1.rz.RWTH-Aachen.DE (8.12.1/8.11.3/23) with ESMTP id g6AFFh8W005075 - for ; Wed, - 10 Jul 2002 17:15:46 +0200 (MEST) -Received: from mail6.nc.rr.com (fe6.southeast.rr.com [24.93.67.53]) - by hera.cuci.nl (BuGless_3.01) with ESMTP id g6AFFbnt030550 for - ; Wed, 10 Jul 2002 17:15:38 +0200 -Received: from rdu26-72-228.nc.rr.com ([66.26.72.228]) - by mail6.nc.rr.com with Microsoft SMTPSVC(5.5.1877.757.75); Wed, - 10 Jul 2002 11:13:33 -0400 -Sender: procmail-admin@Lists.RWTH-Aachen.DE -Subject: *****SPAM***** Running a script -To: Procmail List -X-AntiVirus: OK! AntiVir MailGate Version 2.0.0.6 - at server.jg555.com has not found any known virus in this email. -X-BeenThere: procmail@lists.RWTH-Aachen.DE -X-Mailman-Version: 2.0.11 -X-Sanitizer: JG555.com mail filter -MIME-Version: 1.0 -Content-Type: TEXT/PLAIN; charset="US-ASCII" -X-Spam-Status: Yes, hits=5.4 required=5.0 - tests=FROM_NAME_NO_SPACES,DOUBLE_CAPSWORD,NO_MX_FOR_FROM, - MSG_ID_ADDED_BY_MTA_2,RCVD_IN_MULTIHOP_DSBL, - X_RCVD_IN_UNCONFIRMED_DSBL,FUDGE_MULTIHOP_RELAY - version=2.31 -X-Spam-Flag: YES -X-Spam-Level: ***** -X-Spam-Checker-Version: SpamAssassin 2.31 (devel $Id: SpamAssassin.pm,v -1.94.2.2 2002/06/20 17:20:29 hughescr Exp $) - - ------ Original Message ----- -From: -To: -Sent: Wednesday, July 10, 2002 10:00 AM -Subject: [Bug 531 ] New: whitelist_to problem - - -> http://www.hughes-family.org/bugzilla/show_bug.cgi?id=531 -> -> Summary: whitelist_to problem -> Product: Spamassassin -> Version: 2.31 -> Platform: Other -> OS/Version: other -> Status: NEW -> Severity: normal -> Priority: P2 -> Component: spamassassin -> AssignedTo: spamassassin-devel@lists.sourceforge.net -> ReportedBy: giffordj@linkline.com -> -> -> I have seen the following problem with the whitelist_to. I have -> list@dshield.org in my local.cf file. But when the email gets processed, -it -> ends up with a spam header. If you need more examples I have them. -> -> whitelist_to list@dshield.org is in my local.cf file -> -> here is a header from an email. -> -> Return-Path: -> Delivered-To: maillist@jg555.com -> Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) -> by mail.jg555.com (Postfix) with ESMTP id E8FD14636 -> for ; Wed, 10 Jul 2002 09:58:25 -0700 (PDT) -> Cc: list@dshield.org, intrusions@incidents.org -> Date: Wed, 10 Jul 2002 09:25:45 -0700 -> Errors-To: list-admin@dshield.org -> From: John Sage -> In-Reply-To: -<2D00AD0E4D36D411BD300008C786E42409558EF0@Denntex021.qwest.net>; -> from Donald.Smith@qwest.com on Wed, Jul 10, 2002 at 08:05:10AM -0600 -> List-Archive: -> List-Help: -> List-Id: General DShield Discussion List -> List-Post: -> List-Subscribe: , -> -> List-Unsubscribe: , -> -> Message-ID: <20020710092545.D20950@finchhaven.com> -> Precedence: bulk -> Received: from mail.jg555.com (localhost.localdomain [127.0.0.1]) -> by localhost.localdomain (AvMailGate-2.0.0.6) id 04801-76401F47; -> Wed, 10 Jul 2002 09:58:01 -0700 -> Received: from iceman2.incidents.org (unknown [63.100.47.43]) -> by mail.jg555.com (Postfix) with SMTP id 01D944528 -> for ; Wed, 10 Jul 2002 09:58:01 -0700 (PDT) -> Received: (qmail 22665 invoked by uid 504); 10 Jul 2002 16:58:00 -0000 -> Received: from localhost (HELO iceman2.incidents.org) (127.0.0.1) -> by 0 with SMTP; 10 Jul 2002 16:58:00 -0000 -> Received: (qmail 20596 invoked by uid 504); 10 Jul 2002 16:57:45 -0000 -> Received: from unknown (HELO viper.incidents.org) (10.36.0.4) -> by 0 with SMTP; 10 Jul 2002 16:57:46 -0000 -> Received: from localhost.localdomain (viper2 [127.0.0.1]) -> by viper.incidents.org (8.11.6/8.11.6) with ESMTP id g6AFvDU11201; -> Wed, 10 Jul 2002 11:57:13 -0400 -> Received: from iceman2.incidents.org (63-100-47-43.secsup.org -[63.100.47.43] -> (may be forged)) -> by viper.incidents.org (8.11.6/8.11.6) with SMTP id g6AFPmU10449 -> for ; Wed, 10 Jul 2002 11:25:48 -0400 -> Received: (qmail 25261 invoked by uid 504); 10 Jul 2002 16:25:57 -0000 -> Received: from unknown (HELO dshield.org) (10.36.0.9) -> by 0 with SMTP; 10 Jul 2002 16:25:57 -0000 -> Received: (from dshield@localhost) -> by dshield.org (8.11.6/8.11.6) id g6AGPvI04259 -> for list@viper.uunet; Wed, 10 Jul 2002 12:25:57 -0400 -> Received: from iceman2.incidents.org (63-100-47-43.secsup.org -[63.100.47.43] -> (may be forged)) -> by dshield.org (8.11.6/8.11.6) with SMTP id g6AGPve04252 -> for ; Wed, 10 Jul 2002 12:25:57 -0400 -> Received: (qmail 25248 invoked by uid 504); 10 Jul 2002 16:25:57 -0000 -> Received: from mtiwmhc23.worldnet.att.net (204.127.131.48) -> by 0 with SMTP; 10 Jul 2002 16:25:57 -0000 -> Received: from sparky.finchhaven.net ([12.82.128.223]) -> by mtiwmhc23.worldnet.att.net -> (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP -> id -> -<20020710162554.PZHG5870.mtiwmhc23.worldnet.att.net@sparky.finchhaven.net>; -> Wed, 10 Jul 2002 16:25:54 +0000 -> Received: (from root@localhost) -> by sparky.finchhaven.net (8.11.2/8.11.2) id g6AGPj809404; -> Wed, 10 Jul 2002 09:25:45 -0700 -> References: -<2D00AD0E4D36D411BD300008C786E42409558EF0@Denntex021.qwest.net> -> Reply-To: list@dshield.org -> Sender: list-admin@dshield.org -> Subject: [Dshield] Re: 1524 -> 1524 TTLS -> To: "Smith, Donald " -> User-Agent: Mutt/1.2.5i -> X-AntiVirus: OK! AntiVir MailGate Version 2.0.0.6 -> at server.jg555.com has not found any known virus in this email. -> X-BeenThere: list@dshield.org -> X-Envelope-To: list@dshield.org -> X-Mailman-Version: 2.0.11 -> X-Sanitizer: JG555.com mail filter -> MIME-Version: 1.0 -> Content-Type: text/plain; charset="us-ascii" -> Content-Disposition: inline -> X-Spam-Status: No, hits=-6.2 required=5.0 -> tests=IN_REP_TO,MAY_BE_FORGED,USER_IN_WHITELIST_TO, -> MSG_ID_ADDED_BY_MTA_2 -> version=2.31 -> X-Spam-Level: -> -> -> -> ------- You are receiving this mail because: ------- -> You reported the bug, or are watching the reporter. -> -> - diff -Nru spamassassin-3.4.6/xt/data/nice/006 spamassassin-4.0.0~rc3/xt/data/nice/006 --- spamassassin-3.4.6/xt/data/nice/006 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/006 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Subject: Re: [SAtalk] recipients testing -From: "Recipients Nonspam Testing" -To: aaa@example.com -Cc: bbb@example.com, ccc@example.com, ddd@example.com, eee@example.com, fff@example.com - -tst diff -Nru spamassassin-3.4.6/xt/data/nice/007 spamassassin-4.0.0~rc3/xt/data/nice/007 --- spamassassin-3.4.6/xt/data/nice/007 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/007 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -Return-path: -Envelope-to: daf-rogers@localhost -Delivery-date: Sun, 06 Apr 2003 21:21:25 -0400 -Received: from localhost ([127.0.0.1]) - by green.daf.ddts.net with esmtp (Exim 3.36 #1 (Debian)) - id 192LK9-0005OD-01 - for ; Sun, 06 Apr 2003 21:21:25 -0400 -Received: from pop.bloor.is.net.cable.rogers.com [66.185.95.101] - by localhost with POP3 (fetchmail-6.2.1) - for daf-rogers@localhost (single-drop); Sun, 06 Apr 2003 21:21:25 -0400 (EDT) -Received: from green.daf.ddts.net ([24.102.84.250]) - by fep02-mail.bloor.is.net.cable.rogers.com - (InterMail vM.5.01.05.12 201-253-122-126-112-20020820) with ESMTP - id <20030407012009.DZS311274.fep02-mail.bloor.is.net.cable.rogers.com@green.daf.ddts.net> - for ; Sun, 6 Apr 2003 21:20:09 -0400 -Received: from daf by green.daf.ddts.net with local (Exim 3.36 #1 (Debian)) - id 192LJf-0005O7-00 - for ; Sun, 06 Apr 2003 21:20:55 -0400 -Date: Sun, 6 Apr 2003 21:20:53 -0400 -From: Duncan Findlay -To: duncf@rogers.com -Subject: Testing -Message-ID: <20030407012053.GA20701@green.daf.ddts.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline -X-Habeas-SWE-1: winter into spring -X-Habeas-SWE-2: brightly anticipated -X-Habeas-SWE-3: like Habeas SWE (tm) -X-Habeas-SWE-4: Copyright 2002 Habeas (tm) -X-Habeas-SWE-5: Sender Warranted Email (SWE) (tm). The sender of this -X-Habeas-SWE-6: email in exchange for a license for this Habeas -X-Habeas-SWE-7: warrant mark warrants that this is a Habeas Compliant -X-Habeas-SWE-8: Message (HCM) and not spam. Please report use of this -X-Habeas-SWE-9: mark in spam to . -User-Agent: Mutt/1.5.3i -X-Authentication-Info: Submitted using SMTP AUTH LOGIN at fep02-mail.bloor.is.net.cable.rogers.com from [24.102.84.250] using ID at Sun, 6 Apr 2003 21:20:09 -0400 -Lines: 8 - -This is a very boring test message with the Habeas mark in it for -testing purposes. - --- -Duncan Findlay - diff -Nru spamassassin-3.4.6/xt/data/nice/008 spamassassin-4.0.0~rc3/xt/data/nice/008 --- spamassassin-3.4.6/xt/data/nice/008 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/008 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from example.com (mail1.example.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.example.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "Baz Test" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test whitelist_from baz@example.com diff -Nru spamassassin-3.4.6/xt/data/nice/009 spamassassin-4.0.0~rc3/xt/data/nice/009 --- spamassassin-3.4.6/xt/data/nice/009 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/009 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from example.com (mail1.example.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.example.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "Foo Test" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test whitelist_from_rcvd foo@example.com diff -Nru spamassassin-3.4.6/xt/data/nice/010 spamassassin-4.0.0~rc3/xt/data/nice/010 --- spamassassin-3.4.6/xt/data/nice/010 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/010 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from spamassassin.org (mail1.spamassassin.org [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.spamassassin.org with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "Foo Test" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test whitelist_from_rcvd foo@example.com diff -Nru spamassassin-3.4.6/xt/data/nice/011 spamassassin-4.0.0~rc3/xt/data/nice/011 --- spamassassin-3.4.6/xt/data/nice/011 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/011 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from paypal.com (mail1.paypal.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.paypal.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "PayPal Info" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test def_whitelist_from_rcvd with a paypal.com address and paypal.com relay diff -Nru spamassassin-3.4.6/xt/data/nice/012 spamassassin-4.0.0~rc3/xt/data/nice/012 --- spamassassin-3.4.6/xt/data/nice/012 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/012 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from ebay.com (mail1.ebay.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.ebay.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "PayPal Info" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test def_whitelist_from_rcvd with a paypal.com address and ebay.com relay diff -Nru spamassassin-3.4.6/xt/data/nice/013 spamassassin-4.0.0~rc3/xt/data/nice/013 --- spamassassin-3.4.6/xt/data/nice/013 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/013 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from paypal.com (mail1.paypal.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.paypal.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "Bar Test" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test whitelist_from_rcvd bar@example.com when relay is forged diff -Nru spamassassin-3.4.6/xt/data/nice/014 spamassassin-4.0.0~rc3/xt/data/nice/014 --- spamassassin-3.4.6/xt/data/nice/014 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/014 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from example.com (mail1.example.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.example.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "Bam Test" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test unwhitelist_from mumble@example.com diff -Nru spamassassin-3.4.6/xt/data/nice/015 spamassassin-4.0.0~rc3/xt/data/nice/015 --- spamassassin-3.4.6/xt/data/nice/015 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/015 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from example.com (mail1.example.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.example.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "Mumble Test" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test unwhitelist_from_rcvd mumble@example.com diff -Nru spamassassin-3.4.6/xt/data/nice/016 spamassassin-4.0.0~rc3/xt/data/nice/016 --- spamassassin-3.4.6/xt/data/nice/016 2004-06-15 22:24:25.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/016 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -From jm@dogma.slashnull.org Wed May 16 00:40:34 2001 -Return-Path: -Received: from dogma.slashnull.org (dogma.slashnull.org [212.17.35.15]) by - mail.netnoteinc.com (Postfix) with ESMTP id 830E5115158 for - ; Tue, 15 May 2001 23:40:33 +0000 (Eire) -Received: (from jm@localhost) by dogma.slashnull.org (8.9.3/8.9.3) id - AAA30873 for jm@netnoteinc.com; Wed, 16 May 2001 00:40:33 +0100 -Received: from trna.ximian.com ([141.154.95.22]) by dogma.slashnull.org - (8.9.3/8.9.3) with ESMTP id AAA30867 for ; - Wed, 16 May 2001 00:40:31 +0100 -From: "Ximian, Inc." -To: announce@ximian.com -Date: 15 May 2001 17:31:22 -0400 -Message-Id: <989962282.546.27.camel@milkplus> -Subject: [HC Announce] Ximian Evolution 0.10 "Tasmanian Devil" is Now Available! -X-Hashcash: 0:040315:test@example.com:69781c87bae95c03 -X-Hashcash: 0:040615:test2@example.com:605f81ceef19eaa8 - -[message body deleted] diff -Nru spamassassin-3.4.6/xt/data/nice/base64.txt spamassassin-4.0.0~rc3/xt/data/nice/base64.txt --- spamassassin-3.4.6/xt/data/nice/base64.txt 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/base64.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,168 +0,0 @@ -Replied: Fri, 22 Dec 2000 13:22:17 +0000 -Replied: webmake-talk@lists.sourceforge.net -Return-Path: jm@dogma.slashnull.org -Delivery-Date: Thu, 21 Dec 2000 18:46:44 +0000 -Return-Path: -Delivered-To: jm@netnoteinc.com -Received: from dogma.slashnull.org (dogma.slashnull.org [212.17.35.15]) - by mail (Postfix) with ESMTP id 135A6114342 - for ; Thu, 21 Dec 2000 18:46:34 +0000 (Eire) -Received: (from jm@localhost) - by dogma.slashnull.org (8.9.3/8.9.3) id SAA16010 - for jm@netnoteinc.com; Thu, 21 Dec 2000 18:46:02 GMT -Received: from usw-sf-list1.sourceforge.net (usw-outbound.sourceforge.net [216.136.171.194]) - by dogma.slashnull.org (8.9.3/8.9.3) with ESMTP id SAA16005 - for ; Thu, 21 Dec 2000 18:46:01 GMT -Received: from localhost ([127.0.0.1] helo=usw-sf-list1.sourceforge.net) - by usw-sf-list1.sourceforge.net with esmtp (Exim 3.16 #1 (Debian)) - id 149Aj4-0005fj-00; Thu, 21 Dec 2000 10:46:02 -0800 -Received: from admin.csn.ul.ie ([136.201.105.1]) - by usw-sf-list1.sourceforge.net with esmtp (Exim 3.16 #1 (Debian)) - id 149Aia-0005f4-00 - for ; Thu, 21 Dec 2000 10:45:32 -0800 -Received: from skynet.csn.ul.ie (skynet.csn.ul.ie [136.201.105.2]) - by admin.csn.ul.ie (Postfix) with ESMTP id 733A0205DE - for ; Thu, 21 Dec 2000 18:51:22 +0000 (GMT) -Received: by skynet.csn.ul.ie (Postfix, from userid 1341) - id 86E3E4E5CA; Thu, 21 Dec 2000 13:37:16 +0000 (GMT) -Received: from localhost (localhost [127.0.0.1]) - by skynet.csn.ul.ie (Postfix) with ESMTP id 7FD614E5C3 - for ; Thu, 21 Dec 2000 13:37:16 +0000 (GMT) -From: Mark McLoughlin -X-Sender: -To: -Subject: Re: [WM] Using print to output from <{perl }> blocks? -In-Reply-To: <20001219165455.74110114087@mail> -Message-ID: -MIME-Version: 1.0 -Content-Type: MULTIPART/MIXED; BOUNDARY="-913833367-1359000879-977405836=:7395" -Sender: webmake-talk-admin@lists.sourceforge.net -Errors-To: webmake-talk-admin@lists.sourceforge.net -X-BeenThere: webmake-talk@lists.sourceforge.net -X-Mailman-Version: 2.0 -Precedence: bulk -Reply-To: webmake-talk@lists.sourceforge.net -List-Help: -List-Post: -List-Subscribe: , - -List-Id: Discussion of WebMake. -List-Unsubscribe: , - -List-Archive: -Date: Thu, 21 Dec 2000 13:37:16 +0000 (GMT) - - This message is in MIME format. The first part should be readable text, - while the remaining parts are likely unreadable without MIME-aware tools. - Send mail to mime@docserver.cac.washington.edu for more info. - ----913833367-1359000879-977405836=:7395 -Content-Type: TEXT/PLAIN; charset=US-ASCII - -Hi, - -> What I'd prefer would be another block tag, like <{perl}> but indicating -> that the "print" output from the block should be added to the document -> instead of the return value. -> -> <{perlprint}>? Urgh, sounds awful. Please people, suggest a better name -> for it! - -Attached is a better patch - only one pipe is opened and the <{perlprint}> -block thing is there as well. Yeah, 'perlprint' ugly - but I couldn't -think of anything better either ;) - -I don't have time at the mo', but I profiled the last patch and, surprisingly, -it wasn't that much slower at all. If I get a chance I'll do it again with -this patch and post the results. - -Good Luck, -Mark - ----913833367-1359000879-977405836=:7395 -Content-Type: TEXT/PLAIN; charset=US-ASCII; name="UseStdoutForOutputAgainst_HTML-WebMake-0.8.update" -Content-Transfer-Encoding: BASE64 -Content-ID: -Content-Description: UseStdoutForOutputAgainst_HTML-WebMake-0.8.update -Content-Disposition: attachment; filename="UseStdoutForOutputAgainst_HTML-WebMake-0.8.update" - -ZGlmZiAtdXIgL2hvbWUvbWFyay93ZWJtYWtlL2xpYi9zaXRlX3BlcmwvNS42 -LjAvSFRNTC9XZWJNYWtlL01haW4ucG0gL2hvbWUvbWFyay93ZWJtYWtlL2Rl -dmVsL2xpYi9zaXRlX3BlcmwvNS42LjAvSFRNTC9XZWJNYWtlL01haW4ucG0N -Ci0tLSAvaG9tZS9tYXJrL3dlYm1ha2UvbGliL3NpdGVfcGVybC81LjYuMC9I -VE1ML1dlYk1ha2UvTWFpbi5wbQlUaHUgRGVjIDIxIDExOjEwOjU2IDIwMDAN -CisrKyAvaG9tZS9tYXJrL3dlYm1ha2UvZGV2ZWwvbGliL3NpdGVfcGVybC81 -LjYuMC9IVE1ML1dlYk1ha2UvTWFpbi5wbQlUaHUgRGVjIDIxIDEzOjA2OjE2 -IDIwMDANCkBAIC0xMDAwLDEwICsxMDAwLDExIEBADQogDQogIyBldmFsdWF0 -ZSBwZXJsIGNvZGUgZnJvbSB0aGUgV2ViTWFrZSBmaWxlLiBXZSBzdXBwb3J0 -IHBlcmxwcmVwcm9jIGFuZA0KICMgcGVybHBvc3RkZWNsIGFzIHRhZyBuYW1l -cyBmb3IgYmFja3dhcmRzIGNvbXBhdC4NCisjIHBlcmxwcmludCB1c2VzIHN0 -ZG91dCBmcm9tIHRoZSBjb2RlIGJsb2NrLg0KIHN1YiBldmFsX2NvZGVfYXRf -cGFyc2Ugew0KICAgbXkgKCRzZWxmLCAkc3RyKSA9IEBfOw0KLSAgJHN0ciA9 -fiBzL15ccypcPFx7KD86cGVybHByZXByb2N8cGVybHBvc3RkZWNsfHBlcmwp -XHMrKC4rPylccypcfVw+Lw0KLQkgICAgJHNlbGYtPl9wX2ludGVycHJldCgk -MSk7DQorICAkc3RyID1+IHMvXlxzKlw8XHsocGVybHByZXByb2N8cGVybHBv -c3RkZWNsfHBlcmxwcmludHxwZXJsKVxzKyguKz8pXHMqXH1cPi8NCisJICAg -ICRzZWxmLT5fcF9pbnRlcnByZXQoJDEsJDIpOw0KIAkgIC9naWVzOw0KICAg -JHN0cjsNCiB9DQpAQCAtMTAyMiw3ICsxMDIzLDcgQEANCiAgICAgICAkc2Vs -Zi0+YWRkX2ZpbGVsZXNzX2NvbnRlbnQgKCQxLCAkMiwgdW5kZWYsIDEpOyAi -IjsNCiAgICAgL2dpZXM7DQogDQotICAgICQkc3RyID1+IHMvXDxce3Blcmxc -cyooLis/KVxzKlx9XD4vICRzZWxmLT5fcF9pbnRlcnByZXQoJDEpOyAvZ2ll -czsNCisgICAgJCRzdHIgPX4gcy9cPFx7KHBlcmxwcmludHxwZXJsKVxzKigu -Kz8pXHMqXH1cPi8gJHNlbGYtPl9wX2ludGVycHJldCgkMSwgJDIpOyAvZ2ll -czsNCiANCiAgICAgJHNlbGYtPmdldHVzZXJ0YWdzKCktPnN1YnN0X3RhZ3Mg -KCRmcm9tLCAkc3RyKTsNCiAgIH0NCkBAIC0xMDQ2LDkgKzEwNDcsOSBAQA0K -IA0KICMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t -LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIA0KLXN1YiBf -cF9pbnRlcnByZXQgKCQkKSB7DQotICBteSAoJHNlbGYsICR0eHQpID0gQF87 -DQotICAkc2VsZi0+Z2V0cGVybGludGVycCgpLT5pbnRlcnByZXQgKCR0eHQp -Ow0KK3N1YiBfcF9pbnRlcnByZXQgKCQkJCkgew0KKyAgbXkgKCRzZWxmLCAk -dHlwZSwgJHR4dCkgPSBAXzsNCisgICRzZWxmLT5nZXRwZXJsaW50ZXJwKCkt -PmludGVycHJldCAoJHR5cGUsICR0eHQpOw0KIH0NCiANCiAjIC0tLS0tLS0t -LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t -LS0tLS0tLS0tLS0tLS0tLS0tLS0NCmRpZmYgLXVyIC9ob21lL21hcmsvd2Vi -bWFrZS9saWIvc2l0ZV9wZXJsLzUuNi4wL0hUTUwvV2ViTWFrZS9QZXJsQ29k -ZS5wbSAvaG9tZS9tYXJrL3dlYm1ha2UvZGV2ZWwvbGliL3NpdGVfcGVybC81 -LjYuMC9IVE1ML1dlYk1ha2UvUGVybENvZGUucG0NCi0tLSAvaG9tZS9tYXJr -L3dlYm1ha2UvbGliL3NpdGVfcGVybC81LjYuMC9IVE1ML1dlYk1ha2UvUGVy -bENvZGUucG0JV2VkIE5vdiAxNSAwMDowOTowMSAyMDAwDQorKysgL2hvbWUv -bWFyay93ZWJtYWtlL2RldmVsL2xpYi9zaXRlX3BlcmwvNS42LjAvSFRNTC9X -ZWJNYWtlL1BlcmxDb2RlLnBtCVRodSBEZWMgMjEgMTM6MjM6NTAgMjAwMA0K -QEAgLTUsNiArNSw3IEBADQogcmVxdWlyZSBFeHBvcnRlcjsNCiB1c2UgQ2Fy -cDsNCiB1c2Ugc3RyaWN0Ow0KK3VzZSBJTzo6SGFuZGxlOw0KIA0KIHVzZSBI -VE1MOjpXZWJNYWtlOjpNYWluOw0KIHVzZSBIVE1MOjpXZWJNYWtlOjpQZXJs -Q29kZUxpYnJhcnk7DQpAQCAtMjQsOCArMjUsMTYgQEANCiAgICRjbGFzcyA9 -IHJlZigkY2xhc3MpIHx8ICRjbGFzczsNCiAgIG15ICgkbWFpbikgPSBAXzsN -CiANCisgICMgT3BlbiBhIHBpcGUsIHNldCBhdXRvZmx1c2ggb24gZm9yIHRo -ZSB3cml0ZSANCisgICMgc2lkZSBhbmQgbWFrZSB0aGUgcmVhZCBzaWRlIG5v -bi1ibG9ja2luZw0KKyAgcGlwZShSUCxXUCk7DQorICBXUC0+YXV0b2ZsdXNo -KDEpOw0KKyAgUlAtPmJsb2NraW5nKDApOw0KKw0KICAgbXkgJHNlbGYgPSB7 -DQogICAgICdtYWluJwkJPT4gJG1haW4sDQorICAgICdyZWFkcGlwZScgICAg -ICAgICAgPT4gKlJQLA0KKyAgICAnd3JpdGVwaXBlJyAgICAgICAgID0+ICpX -UA0KICAgfTsNCiAgIGJsZXNzICgkc2VsZiwgJGNsYXNzKTsNCiAgICRzZWxm -Ow0KQEAgLTM2LDcgKzQ1LDggQEANCiAjIC0tLS0tLS0tLS0tLS0tLS0tLS0t -LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t -LS0tLS0tLS0NCiANCiBzdWIgaW50ZXJwcmV0IHsgDQotICBteSAoJHNlbGYs -ICRzdHIpID0gQF87DQorICBteSAoJHNlbGYsICR0eXBlLCAkc3RyKSA9IEBf -Ow0KKyAgbXkgKCRyZXQpOw0KICAgbG9jYWwgKCRfKSA9ICcnOw0KIA0KICAg -aWYgKCRzZWxmLT57bWFpbn0tPntwYXJhbm9pZH0pIHsNCkBAIC00Nyw3ICs1 -NywyMCBAQA0KICAgIyBwZXJsIGNvZGUuDQogDQogICAkc2VsZi0+ZW50ZXJf -cGVybF9jYWxsKCk7DQotICBteSAkcmV0ID0gZXZhbCAncGFja2FnZSBtYWlu -OycuJHN0cjsNCisNCisgIGlmICggJHR5cGUgbmUgInBlcmxwcmludCIgKSB7 -DQorICAgICAkcmV0ID0gZXZhbCAncGFja2FnZSBtYWluOycuJHN0cjsNCisg -IH0gDQorICBlbHNlIHsNCisgICAgIG15ICgkcmVhZHBpcGUsICR3cml0ZXBp -cGUpID0gKCRzZWxmLT57cmVhZHBpcGV9LCAkc2VsZi0+e3dyaXRlcGlwZX0p -Ow0KKyAgICAgbG9jYWwoKlNURE9VVCkgPSAqJHdyaXRlcGlwZTsNCisgICAg -ICRyZXQgPSBldmFsICdwYWNrYWdlIG1haW47Jy4kc3RyOw0KKyAgICAgaWYg -KGRlZmluZWQoJHJldCkpIHsNCisgICAgICAgICRyZXQgPSBqb2luKCAnJyAs -IDwkcmVhZHBpcGU+ICk7DQorICAgICB9DQorICB9DQorDQorDQogICAkc2Vs -Zi0+ZXhpdF9wZXJsX2NhbGwoKTsNCiANCiAgIGlmICghZGVmaW5lZCAkcmV0 -KSB7DQo= ----913833367-1359000879-977405836=:7395-- - -_______________________________________________ -webmake-talk mailing list -webmake-talk@lists.sourceforge.net -http://lists.sourceforge.net/mailman/listinfo/webmake-talk - - diff -Nru spamassassin-3.4.6/xt/data/nice/cjk/big5-base64.1 spamassassin-4.0.0~rc3/xt/data/nice/cjk/big5-base64.1 --- spamassassin-3.4.6/xt/data/nice/cjk/big5-base64.1 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/cjk/big5-base64.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -Return-Path: -Received: from softwareliberty.org (freebsd.sinica.edu.tw [140.109.13.51]) - by mail.hyweb.com.tw (8.9.3/8.9.3) with SMTP id BAA14990 - for ; Tue, 19 Jun 2001 01:08:09 +0800 -Received: from freebsd.sinica.edu.tw (localhost [127.0.0.1]) - by softwareliberty.org (Postfix) with ESMTP - id 66A4575C5; Tue, 19 Jun 2001 01:16:04 +0800 (CST) -Delivered-To: slat-talk@softwareliberty.org -Received: from tlug.sinica.edu.tw (tlug.sinica.edu.tw [140.109.13.42]) - by softwareliberty.org (Postfix) with ESMTP id 3CB2075C4 - for ; Tue, 19 Jun 2001 01:15:42 +0800 (CST) -Received: by tlug.sinica.edu.tw (Postfix) - id 270D612EC7; Tue, 19 Jun 2001 01:15:38 +0800 (CST) -Delivered-To: 2m@linux.org.tw -Received: from mail.human.com.tw (unknown [210.243.215.60]) - by tlug.sinica.edu.tw (Postfix) with ESMTP - id 46A1A12EC5; Tue, 19 Jun 2001 01:15:36 +0800 (CST) -Received: from 210.243.215.60 (h137.s1.ts31.hinet.net [163.31.1.137]) - by mail.human.com.tw (8.8.7/8.8.7) with SMTP id BAA15500; - Tue, 19 Jun 2001 01:04:22 +0800 -From: y971880896@pchome.com.tw -Message-Id: <200106181704.BAA15500@mail.human.com.tw> -To: plateau@linux.org.tw -MIME-Version: 1.0 -Content-Type: text/html; charset=big5 -Content-Transfer-Encoding: base64 -Subject: [SLAT-talk] d617sS.pƱHo.qЭ!DDDDDDd617sS.pƱHo.qЭ!DDD -Date: Tue, 19 Jun 2001 01:16:04 +0800 (CST) -Sender: slat-talk-admin@softwareliberty.org -Errors-To: slat-talk-admin@softwareliberty.org -X-BeenThere: slat-talk@softwareliberty.org -X-Mailman-Version: 2.0 -Precedence: bulk -Reply-To: slat-talk@softwareliberty.org -X-Reply-To: y971880896@pchome.com.tw -List-Help: -List-Post: -List-Subscribe: , - -List-Id: Software Liberty Movement in Taiwan - nۥѪsqll׾ -List-Unsubscribe: , - -List-Archive: -Date: Tue, 19 Jun 2001 01:04:22 +0800 - -PCEtLSBzYXZlZCBmcm9tIHVybD0oMDAyMilodHRwOi8vaW50ZXJuZXQuZS1tYWlsIC0tPg0K -PGh0bWw+DQoNCjxoZWFkPg0KPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250 -ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9YmlnNSI+DQo8dGl0bGU+uWTD+7r0r7g8L3RpdGxl -Pg0KPC9oZWFkPg0KDQo8Ym9keSBiZ2NvbG9yPSIjMDAwMDAwIiBsaW5rPSIjRkZGRjAwIiB2 -bGluaz0iIzAwRkYwMCI+DQo8ZGl2IGFsaWduPSJjZW50ZXIiPjxjZW50ZXI+DQoNCjx0YWJs -ZSBib3JkZXI9IjAiIHdpZHRoPSI0NyUiIGNlbGxzcGFjaW5nPSIwIiBjZWxscGFkZGluZz0i -MyI+DQogIDx0cj4NCiA8dHI+DQogICAgPHRkIHdpZHRoPSIxMDAlIiBhbGlnbj0iY2VudGVy -Ij48c3Ryb25nPjxmb250IGNvbG9yPSIjRkZEQUEyIj48YnI+DQogICAgPC9mb250Pjwvc3Ry -b25nPjxmb250IGNvbG9yPSIjRkZGRkZGIj6lw6RbuvSnfaFHZ2ltaXQuY24uc3SpzmdpbWl0 -OTkuaXNjb29sLm5ldDwvZm9udD48L3RkPg0KICA8dHI+DQogICAgPHRkIHdpZHRoPSIxMDAl -Ij48YnI+DQogICAgIDwvdGQ+DQogIDwvdHI+DQogIDx0cj4NCiAgICA8dGQgd2lkdGg9IjEw -MCUiPjwhLS13ZWJib3QgYm90PSJJbWFnZU1hcCIgc3RhcnRzcGFuDQogICAgcmVjdGFuZ2xl -PSIgKDYsNikgKDI5OSwgMTc1KSAgaHR0cDovL3d3dy5nZW9jaXRpZXMuY29tL3FlbHNvdW5s -bDMiDQogICAgc3JjPSJodHRwOi8vd3d3Lmdlb2NpdGllcy5jb20vTmFzaHZpbGxlL1JvZGVv -LzkwNzMvbWFpbi5qcGciDQogICAgYWx0PSKzzLdzuOqwVKq6s27F6ap3xNGvuKFJIiBib3Jk -ZXI9IjAiIC0tPjxNQVAgTkFNRT0iRnJvbnRQYWdlTWFwMCI+PEFSRUEgU0hBUEU9IlJFQ1Qi -IENPT1JEUz0iNiwgNiwgMjk5LCAxNzUiIEhSRUY9Imh0dHA6Ly93d3cuZ2VvY2l0aWVzLmNv -bS9xZWxzb3VubGwzIj48L01BUD48aW1nIHNyYz0iaHR0cDovL3d3dy5nZW9jaXRpZXMuY29t -L05hc2h2aWxsZS9Sb2Rlby85MDczL21haW4uanBnIiBhbHQ9IrPMt3O46rBUqrqzbsXpqnfE -0a+4oUkiIGJvcmRlcj0iMCIgdXNlbWFwPSIjRnJvbnRQYWdlTWFwMCI+PCEtLXdlYmJvdCBi -b3Q9IkltYWdlTWFwIg0KICAgIGktY2hlY2tzdW09IjMxMTYzIiBlbmRzcGFuIC0tPjwvdGQ+ -DQogIDwvdHI+DQogIDx0cj4NCiAgICA8dGQgd2lkdGg9IjEwMCUiPjxmb250IGNvbG9yPSIj -RkZGRkZGIj48cCBhbGlnbj0icmlnaHQiPjwhLS13ZWJib3QgYm90PSJJbWFnZU1hcCINCiAg -ICBzdGFydHNwYW4NCiAgICByZWN0YW5nbGU9IiAoOSwzKSAoMjk5LCA1OSkgIGh0dHA6Ly93 -d3cuZ2VvY2l0aWVzLmNvbS9xZWxzb3VubGwzIg0KICAgIHNyYz0iaHR0cDovL3d3dy5nZW9j -aXRpZXMuY29tL05hc2h2aWxsZS9Sb2Rlby85MDczL2pveS5qcGciDQogICAgYWx0PSKlraeh -qEMxMKTptE6n87dzoUkiIGJvcmRlcj0iMCIgLS0+PE1BUCBOQU1FPSJGcm9udFBhZ2VNYXAx -Ij48QVJFQSBTSEFQRT0iUkVDVCIgQ09PUkRTPSI5LCAzLCAyOTksIDU5IiBIUkVGPSJodHRw -Oi8vd3d3Lmdlb2NpdGllcy5jb20vcWVsc291bmxsMyI+PC9NQVA+PGltZyBzcmM9Imh0dHA6 -Ly93d3cuZ2VvY2l0aWVzLmNvbS9OYXNodmlsbGUvUm9kZW8vOTA3My9qb3kuanBnIiBhbHQ9 -IqWtp6GoQzEwpOm0Tqfzt3OhSSIgYm9yZGVyPSIwIiB1c2VtYXA9IiNGcm9udFBhZ2VNYXAx -Ij48IS0td2ViYm90IGJvdD0iSW1hZ2VNYXAiDQogICAgaS1jaGVja3N1bT0iNjM5MzAiIGVu -ZHNwYW4gLS0+PC9mb250PjwvdGQ+DQogIDwvdHI+DQo8L3RhYmxlPg0KPC9jZW50ZXI+PC9k -aXY+PGRpdiBhbGlnbj0iY2VudGVyIj48Y2VudGVyPg0KDQo8dGFibGUgYm9yZGVyPSIwIiB3 -aWR0aD0iNjIlIiBjZWxsc3BhY2luZz0iMCIgY2VsbHBhZGRpbmc9IjAiIGhlaWdodD0iNzEi -Pg0KICA8dHI+DQogICAgPHRkIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjIxIj48aHIgYWxpZ249 -ImxlZnQiIHNpemU9IjEiPg0KICAgIDwvdGQ+DQogIDwvdHI+DQogIDx0cj4NCiAgICA8dGQg -d2lkdGg9IjEwMCUiIGFsaWduPSJjZW50ZXIiIGhlaWdodD0iMTYiPjxmb250IGNvbG9yPSIj -ODA4MEZGIj48c3Ryb25nPjxtYXJxdWVlDQogICAgYm9yZGVyPSIwIiB3aWR0aD0iNDE2IiBo -ZWlnaHQ9IjE2Ij6xaqT5pFfAyaFBpnCqR6W7r7ikd7hnwl+kRqFBvdC/777cpFetsaXDpFu6 -9Kd9qrqvuKFJp9qtzLd8u1CxeqpBsMg8L21hcnF1ZWU+PC9zdHJvbmc+PC9mb250PjwvdGQ+ -DQogIDwvdHI+DQogIDx0cj4NCiAgICA8dGQgd2lkdGg9IjEwMCUiIGFsaWduPSJjZW50ZXIi -IGhlaWdodD0iMzQiPjxzdHJvbmc+PGZvbnQgY29sb3I9IiNGRkRBQTIiPjxicj4NCiAgICA8 -L2ZvbnQ+PC9zdHJvbmc+PGZvbnQgY29sb3I9IiNGRkZGMDAiPqfzt3Ok6bTBoUekvaS4MjAw -MaZ+MDak6zE3pOk8L2ZvbnQ+PC90ZD4NCiAgPC90cj4NCjwvdGFibGU+DQo8L2NlbnRlcj48 -L2Rpdj4NCjwvYm9keT4NCjwvaHRtbD4NCg08SFRNTD4NCjxBIG5hbWU9Ig0KuWTD+zak6zE3 -pOm3c6T5pFOo7C6mcKazrau9xrFItW8ut3G90K3svcwNClBNIDA5OjQ3OjE3DQoyMDAxLzYv -MTgNCjEwMDAwMw0KIj48L2E+DQo8L0hUTUw+DTxIVE1MPg0KPEEgbmFtZT0iDQq5ZMP7NqTr -MTek6bdzpPmkU6jsLqZwprOtq73GsUi1by63cb3QrewNClBNIDA5OjU0OjM5DQoyMDAxLzYv -MTgNCjEwMDAwMw0KIj48L2E+DQo8L0hUTUw+DTxIVE1MPg0KPEEgbmFtZT0iDQoNCkFNIDAx -OjIxOjM2DQoyMDAxLzYvMTkNCjEwMDAwMw0KIj48L2E+DQo8L0hUTUw+DQo= - - -_______________________________________________ -SLAT-talk mailing list -SLAT-talk@softwareliberty.org -http://www.softwareliberty.org/mailman/listinfo/slat-talk - diff -Nru spamassassin-3.4.6/xt/data/nice/cjk/gb2312.1 spamassassin-4.0.0~rc3/xt/data/nice/cjk/gb2312.1 --- spamassassin-3.4.6/xt/data/nice/cjk/gb2312.1 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/cjk/gb2312.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,574 +0,0 @@ -Return-Path: <1234@e34.com> -Delivered-To: seawalkhardware.com-caren@seawalkhardware.com -Received: (qmail 21332 invoked by uid 505); 7 Jan 2003 12:01:04 -0000 -Received: from 1234@e34.com by ahead.ncmbox.net by uid 89 with qmail-scanner-1.14 - (NetCom Media AV Sweep Clear:SA:1(19.4/5.0):. - Processed in 67.40605 secs); 07 Jan 2003 12:01:04 -0000 -Received: from unknown (HELO pc3) (202.108.68.140) - by 0 with SMTP; 7 Jan 2003 11:59:56 -0000 -x-esmtp: 0 0 1 -Message-ID: <1811099-2200312752653615@pc3> -To: "NEW02-11-19" <1234@e34.com> -From: "̨óŹ˾" <1234@e34.com> -Subject: ȫԭװڣͻţ̨óŹ˾! -Date: Tue, 7 Jan 2003 13:26:53 +0800 -MIME-Version: 1.0 -Content-type: text/plain; charset=gb2312 -Content-Transfer-Encoding: quoted-printable - - =CC=A8=CD=E5=F6=CE=C1=FA=C9=CC=C3=B3=BC=AF=CD=C5=B9=AB=CB=BE=CF=F2=C4=FA= -=B0=DD=C4=EA!=20 -=B1=BE=B9=AB=CB=BE=B3=A4=C6=DA=BE=AD=CF=FA=B5=E7=C4=D4=C5=E4=BC=FE=A1=A2=CA= -=D6=BB=FA=A1=A2=B1=CA=BC=C7=B1=BE=D2=E2=D4=DA=B9=F3=B5=D8=D1=B0=D5=D2=BA=CF= -=D7=F7=CF=FA=CA=DB=BB=EF=B0=E9=A3=AC=20 -=D3=D0=D2=E2=D5=DF=C7=EB=C0=B4=C8=CB=C0=B4=B5=E7=C7=A2=CC=B8=A1=A3 -=C8=AB=D0=C2=D4=AD=D7=B0=BD=F8=BF=DA=A3=AC=CB=CD=BB=F5=C9=CF=C3=C5=A3=AC=BB= -=F5=B5=BD=B8=B6=BF=EE=A1=A3 - -=C1=AA=CF=B5=C8=CB=A3=BA=BA=E9 =CE=E4 =D2=BB=A1=A2 =B5=E7 =BB=B0=A3=BA=A3= -=A80=A3=A913960361753 - -=CF=EA=CF=B8=B1=A8=BC=DB=C8=E7=CF=C2=A3=BA =B5=A5=CE=BB/=D4=AA -=B1=CA=BC=C7=B1=BE=B5=E7=C4=D4=A3=BA -IBM=20 -T23-9TC P=A2=F31=2E2G/256M SDRAM/60G HDD/8XDVD/56K/=CE=DE=CF=DF=CD=F8=BF=A8= -/14=2E1"TFT 7800 -T30-2366-86C P4 2=2E0G/256M DDR/40G/8X DVD/56K/10-100M/14=2E1"TFT 1000= -0 -R32-2658-GEC(256M DDR) P4 1=2E7G/256M DDR/30G/8X DVD/56K/10-100M/14=2E1"T= -FT 7000 -T30-2366-19C(20G) P4 1=2E9G/256M DDR/20G/8X DVD/56K/10-100M/14=2E1"TFT 9= -500 -T30-2366-87C P42=2E0G/256M/40GB/DVD/56K/10/100M/14=2E1"TFT/802=2E11b 1= -1000 -A30P-2652-102 P=A2=F31=2E2G/128M SDRAM/30G/8X DVD/56K/10-100M/15=2E1"TFT = - 6100 -A31-CKC P4 1=2E6/256MB SDRAM/30G HDD/8XDVD/56K/100M/15=2E1"TFT/=C8=AB=C4=DA= -=D6=C3 7300 -A31P-2652-R5C P4 2=2E0G/256M DDR/60G/DVD-COMBO/56K/10-100M/15=2E1"TFT 130= -00=20 - - =BF=B5=B0=D8=20 -Presario 2820sc P4 1=2E9G-M/256M/30G/8XDVD/64M=CF=D4=B4=E6/56K/10-100M/WI= -N XP/14=2E1"TFT 8000 -Presario 2821sc P4 1=2E8G-M/256M/30G/8XDVD/56K/10-100M/WIN XP/14=2E1"TFT = - 7200 - -=CB=F7=C4=E1 -GRX3UCP P4-1=2E8G/512M/40G/16=2E1UXGA/8XDVD-CDRW/56K/10-100M 9990 -GRX3XCP P4-1=2E6G/256M/30G/15=2E1XGA/8XDVD-CDRW/56K/10-100M 7900 -R505MXC P=A2=F31=2E13G/256MB SDRAM/40GB HDD/DVD/100M/12=2E1"TFT 6800 -PCG-SRX55C P=A2=F3 M850/256MB SDRAM/30GB HDD/DVD+CDRW/56K/10-100M/10=2E4"= -TFT/WinXP 4800 -PCG-SRX55TC P=A2=F3-M900/256M SDRAM/40G/DVD+CDRW/56K/10-100M/10=2E4"TFT = - 5600 -PCG-R505TXCP P=A2=F31=2E2G/256M SDRAM/60G/DVD/100M/12=2E1"TFT 6500 -PCG-GRX5CP P4-M 1=2E8G/512M DDR/60G/8X DVD-CDRW/56K/10-100M/16=2E1"UXGA 1= -0100=20 -=C8=FD=D0=C7 P10-R1 P4 1=2E8G/512M/40G/DVD-RW/56K/10-100M/=B9=E2=C8=ED= -=BB=A5=BB=BB/1394=BD=D3=BF=DA/14=2E1"TFT 10000 =20 -P10-ZU P4 1=2E6G/128/30G/8XDVD-ROM/56K/10-100M/14=2E1"TFT/=B9=E2=C8=ED=BB= -=A5=BB=BB/2=2E3kg 6300 -T10-3F P4-M 1=2E4G/256M/20G/14"/DVD/56K/10-100M/=C8=AB=C4=DA=D6=C3 590= -0 =20 -Q10-800 PIII800-M/256M/20G/10-100M/56K/12=2E1"TFT/1=2E35kg/WIN XP 5100 =20= - - -=B6=FE=A1=A2CPU=A3=BA=20 -=B1=BC=CC=DA4 2=2E53A Socket 478/512KB/533MHz/=BA=D0=D7=B0 890 =20 -=B1=BC=CC=DA4 2=2E4B Socket 478/512KB/533MHz/=BA=D0=D7=B0 650 =20 -=B1=BC=CC=DA4 2=2E0A Socket 478/512KB/400MHz/=BA=D0=D7=B0 580 =20 -=B1=BC=CC=DA4 1=2E8A Socket 478/512KB/400MHz/=BA=D0=D7=B0 500 =20 -=B1=BC=CC=DA4 1=2E7G Socket 478/256KB/400MHz/=BA=D0=D7=B0 480 =20 -=B1=BC=CC=DA4 1=2E6G Socket 478/256KB/400MHz/=BA=D0=D7=B0 400 =20 -=B1=BC=CC=DA4 1=2E5G Socket 478/256KB/400MHz/=BA=D0=D7=B0 390 =20 -=C8=FC=D1=EF4 2=2E0G Socket 478/128KB/400MHz/=BA=D0=D7=B0 300 =20 -=C8=FC=D1=EF4 1=2E8G Socket 478/128KB/400MHz/=BA=D0=D7=B0 250=20 -=C8=FC=D1=EF4 1=2E7G Socket 478/128KB/400MHz/=BA=D0=D7=B0 200 =20 -AMD =20 -AthlonXP 2200+ Socket-A/=D2=BB=BC=B6=BB=BA=B4=E6128KB/=B6=FE=BC=B6=BB=BA=B4= -=E6256KB/266MHz 560 =20 -Athlon XP 2000+ Socket-A/256K/133=CD=E2=C6=B5/=C9=A2=D7=B0 250 =20 -Athlon XP 1800+ Socket-A/256K/133=CD=E2=C6=B5/=C9=A2=D7=B0 210 =20 -Athlon XP 1700+ Socket-A/256K/133=CD=E2=C6=B5/=C9=A2=D7=B0 190 =20 - -=C8=FD=A1=A2=C4=DA=B4=E6: =BD=F0=CA=BF=B6=D9(Kingston) =20 -128MB SDRAM SD128MB/168PIN/PC133 55 =20 -256MB SDRAM SD256MB/168PIN/PC133 100=20 -128MB DDR DDR128MB/184PIN/PC266 85 =20 -256MB DDR DDR256MB/184PIN/PC266 130 =20 -KVR333X64C25/256 256MB/184PIN DDR/PC333 150 =20 -=C8=FD=D0=C7 =20 -128M 7ns/168PIN SDRAM/PC133 58 =20 -256M 7ns/168PIN SDRAM/PC133 110 =20 -128M DDR 7ns/184PIN DDR/=D4=AD=B3=A7=C4=DA=B4=E6 60 256M DDR 7ns/184P= -IN DDR 125 =20 -512M DDR 7ns/184PIN DDR/=D4=AD=B3=A7=C4=DA=B4=E6 400 128M Rambus 18= -4PIN RDRAM/=D4=AD=B3=A7=C4=DA=B4=E6/PC800 95 =20 -256M Rambus 184PIN RDRAM/=D4=AD=B3=A7=C4=DA=B4=E6/PC800 180 =20 -Kingmax =20 -128M 7ns/168PIN SDRAM/PC-150 60 =20 -256M 7ns/168PIN SDRAM/PC150 110 =20 -128M DDR333 168PIN DDR RAM 88 =20 -256M DDR333 168PIN DDR RAM 128 =20 -256M DDR 400 184PIN DDR RAM/DDR400 140 =20 -Hy =20 -64M 7ns/168PIN SDRAM/PC-133 30 =20 -128M 7ns/168PIN SDRAM/PC133 50 =20 -256M 7ns/168PIN SDRAM/PC133 89 =20 -256M T-H/168PIN SDRAM/PC133(=CB=AB=C3=E6)90 =20 -128M DDR 184PIN DDR RAM 65 =20 -256M DDR 184PIN DDR RAM 120 =20 -=C6=B7=B0=B2(panRAM) =20 -128M SDRAM 128MB/168P PC-133/CL3/16M8 8ea 45 =20 -256M SDRAM 256MB/168P PC-133/CL3/16M8 16ea 85=20 -512M SDRAM 512MB/168P PC-133/CL3/64M4 16ea 120 =20 -512MB DDR 512MB/184P DDR 266/CL2=2E5/32M8 16ea 380 =20 -128MDDR 128MB/184P DDR333/CL2=2E5/32M8 16ea 90 =20 -256MDDR 256MB/184P DDR333/CL2=2E5/32M8 8ea 135 =20 -1G DDR 184P=B7=FE=CE=F1=C6=F7DDR 266 CL2=2E5 1GB ECC/RIG BGA 1200 =20 -128M 144P=B1=CA=BC=C7=B1=BEPC-133 CL3 128MB(16M16 4ea) 50 =20 -256M 144P=B1=CA=BC=C7=B1=BEPC-133 CL3 256MB(16M16 8ea) 90 =20 -128MBDDR(=B1=CA) 200P=B1=CA=BC=C7=B1=BEDDR 266 CL2=2E5 128MB(16M8 8ea) 10= -0 =20 -256MBDDR(=B1=CA) 200P=B1=CA=BC=C7=B1=BEDDR 266 CL2=2E5 256MB(32M8 8ea) 21= -0 =20 - -=CB=C4=A1=A2=D6=F7=B0=E5:=20 -=BB=AA=CB=B6 =20 -P4T533-CIntel 850E/Socket478/=D6=A7=B3=D6P4/FSB533MHz/ATX/ATA100/CMI8738 6= -CH/5PCI/2RD1066DIMM/AGP4X/2USB2=2E0 600=D4=AA P4B533-M Intel845E/Socket= -478/=D6=A7=B3=D6P4/FSB533MHz/MATX/ATA100/CMI8738 6CH/3PCI/2DDR266DIMM/AGP4= -X/6USB2=2E0 400=D4=AA P4B533-VMIntel845G/Socket478/=D6=A7=B3=D6P4/FSB5= -33MHz/MATX/ATA100/=C4=DA=D6=C3=CF=D4=BF=A8/ALC650 6CH/=C4=DA=D6=C3Intel=CD= -=F8=BF=A8/3PCI/3DDR266 DIMM/AGP 4X/6 USB2=2E0 450=D4=AA =20 -P4B266-M Intel845D/Socket478/=D6=A7=B3=D6P4/FSB400MHz/MATX/ATA100/CMI8738 = -6CH/3PCI/2DDR266DIMM/AGP 4X/4 USB 360 =D4=AA P4S8X/1394 SIS 648/Socket= - 478/=D6=A7=B3=D6 P4/FSB 533MHz/ATX/ATA133/Serial ATA/=C4=DA=D6=C3=CD=F8=BF= -=A8/CMI8738 6CH/6 PCI/3 DDR333 DIMM/AGP 8X/1394/6 USB2=2E0 490=D4=AA - A7N266-E nVIDIAnForce420/Socket462/=D6=A7=B3=D6AthlonXP/FSB266MHz/ATX/ATA= -100/=C4=DA=D6=C3=CF=D4=BF=A8/CMI87386CH/5PCI/3 DDR266 DIMM/AGP 4X/6 USB = - 430=D4=AA =20 -A7V8X/LAN VIAKT400/Socket462/=D6=A7=B3=D6AthlonXP/FSB333MHz/ATX/ATA133/=C4= -=DA=D6=C3=CD=F8=BF=A8/6PCI/3DDR400DIMM/AGP8X/6USB2=2E0 410=D4=AA=20 -=CE=A2=D0=C7 845GE MAX Intel 845GE/Socket 478/=D6=A7=B3=D6P4/FSB 533= -MHz/ATX/ATA100/=C4=DA=D6=C3=CF=D4=BF=A8/AC97 6CH/6 PCI/2 DDR333 DIMM/AGP 4= -X/1 CNR/6 USB2=2E0/=C8=FD=C4=EA=B1=A3=D0=DE 420=D4=AA =20 -645E Max2 SiS 645DX/Socket 478/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA133/AC97/= -5 PCI/3 DDR333 DIMM/AGP 4X/1 CNR/2 USB/=C8=FD=C4=EA=B1=A3=D0=DE 320=D4= -=AA=20 -645 Pro SIS645/Socket 478/=D6=A7=B3=D6P4/FSB 400MHz/ATX/ATA100/AC97/5 PCI/= -3 SDR DIMM/AGP 4X/1 CNR/2 USB/=C8=FD=C4=EA=B1=A3=D0=DE250=D4=AA 645 Ultra= --c SIS645/Socket 478/=D6=A7=B3=D6P4/FSB 400MHz/ATX/ATA100/AC97/5 PCI/3 DD= -R333 DIMM/AGP 4X/1 CNR/6 USB/=C8=FD=C4=EA=B1=A3=D0=DE 300=D4=AA =20 -745 UItra SIS 745/Socket 462/=D6=A7=B3=D6AthlonXP/FSB 266MHz/ATX/ATA100/A= -C97/5 PCI/3 DDR333 DIMM/AGP 4X/1 CNR/2 USB/=C8=FD=C4=EA=B1=A3=D0=DE 280=D4= -=AA =20 -845 D-M Intel 845D/Socket 478/=D6=A7=B3=D6P4/FSB 400MHz/MATX/ATA100/AC97/= -3 PCI/2 DDR DIMM/AGP 4X/2 USB/=C8=FD=C4=EA=B1=A3=D0=DE300=D4=AA 845E Max= -2-BLR Intel 845E/Socket 478/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA133/AC97 6CH= -/=C4=DA=D6=C3Intel=CD=F8=BF=A8/6 PCI/3 DDR DIMM/AGP 4X/1 CNR/RAID/6 USB2=2E= -0/=C8=FD=C4=EA=B1=A3=D0=DE 650=D4=AA =20 -845E Max Intel 845E/P4 478Socket 478/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA133= -/AC97 6CH/6 PCI/3 DDR DIMM/AGP 4X/1 CNR/RAID/6 USB2=2E0/=C8=FD=C4=EA=B1=A3= -=D0=DE 380=D4=AA =20 -845G Max Intel 845G/Socket 478/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA100/=C4=DA= -=D6=C3=CF=D4=BF=A8/AC97/6 PCI/3 DDR DIMM/AGP 4X/1 CNR/6 USB2=2E0/=C8=FD=C4= -=EA=B1=A3=D0=DE 400=D4=AA =20 -845 Ultra Intel 845D/Socket 478/=D6=A7=B3=D6P4/FSB 400MHz/ATX/ATA100/CMI8= -738/5 PCI/3 DDR DIMM/AGP 4X/4 USB/=C8=FD=C4=EA=B1=A3=D0=DE = - 310=D4=AA =20 -KT3 Ultra2-C VIA KT333/Socket 462/=D6=A7=B3=D6Athlon XP/FSB 266MHz/ATX/AT= -A133/AC97 6CH/6 PCI/2 DDR DIMM/AGP 4X/1 CNR/6 USB2=2E0/=C8=FD=C4=EA=B1=A3=D0= -=DE 320 =D4=AA -KT3 Ultra-BR VIA KT333/Socket 462/=D6=A7=B3=D6Athlon XP/FSB 266MHz/ATX/AT= -A133/AC97 6CH/6 PCI/2 DDR DIMM/AGP 4X/1 CNR/RAID/=C0=B6=D1=C0/6 USB2=2E0/=C8= -=FD=C4=EA=B1=A3=D0=DE 590=D4=AA =20 -KT4V VIA KT400/8235/Socket 462/=D6=A7=B3=D6Athlon XP/FSB 333MHz/ATX/ATA13= -3/AC97 6CH/6 PCI/3 DDR400 DIMM/AGP 8X/1 CNR/6 USB2=2E0/=C8=FD=C4=EA=B1=A3=D0= -=DE 360=D4=AA =20 -648 MAX SIS 648/Socket 478/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA133/AC97 6CH/= -6 PCI/3 DDR400 DIMM/AGP 8X/1 CNR/6 USB2=2E0/=C8=FD=C4=EA=B1=A3=D0=DE 400=D4= -=AA =20 -=C9=FD=BC=BC AT7 KT333/Socket 462/=D6=A7=B3=D6Athlon XP/FSB 266MHz/A= -TX/ATA133/AC97 6CH/6 PCI/3 DDR333 DIMM/AGP 4X/RAID/8 USB/2 1394/SPDIF 69= -0=D4=AA =20 -BD7-=A2=F2 Intel 845E/Socket 478/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA100/AC9= -7/5 PCI/3 DDR DIMM/AGP 4X/USB2=2E0 400=D4=AA BG7 Intel 845G/Socket 478= -/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA100/=C4=DA=D6=C3=CF=D4=BF=A8/AC97/=C4=DA= -=D6=C3=CD=F8=BF=A8/5 PCI/3 DDR DIMM/AGP 4X/USB2=2E0 410=D4=AA BG-71 Int= -el 845GL/Socket 478/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA100/=C4=DA=D6=C3=CF=D4= -=BF=A8/AC97/=C4=DA=D6=C3=CD=F8=BF=A8/4 PCI/2 DDR DIMM/AGP 4X/USB2=2E0 330=D4= -=AA =20 -KX7-333 Raid VIA KT333/Socket 462/=D6=A7=B3=D6Athlon XP/FSB 266MHz/ATX/AT= -A133/6 PCI/4 DDR DIMM/AGP 4X/1 CNR/RAID/USB2=2E0 320=D4=AA =20 -IT7 Intel 845E/Socket 478/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA133/AC97 6CH/=C4= -=DA=D6=C3=CD=F8=BF=A8/4 PCI/3 DDR DIMM/AGP 4X/RAID/2 1394/10 USB2=2E0/SPDI= -F 650=D4=AA =20 -SA7 SIS 645DX/Socket 478/=D6=A7=B3=D6P4/FSB 533MHz/ATX/ATA133/AC97/3 PCI/= -4 DDR DIMM/AGP 4X/4 USB 300=D4=AA SR7-8X SiS 648/Socket 478/=D6=A7=B3=D6= -P4/FSB 533MHz/ATX/ATA133/AC97/5 PCI/2 DDR DIMM/AGP 8X/4 USB 400=D4=AA =20= - -=CE=E5=A1=A2=D3=B2=C5=CC:=20 -=CF=A3=BD=DD U7=CF=B5=C1=D0 ST320014A 20=2E4GB/UDMA 100/2M/5400rpm/I= -DE/3=2E5" 200 =20 -U6=CF=B5=C1=D0 ST340810A 40GB/UDMA 100/2M/5400rpm/IDE/3=2E5" 280 =20= - -=BF=E1=D3=E3=A2=F4=CF=B5=C1=D0 ST340016A 40=2E8GB/UDMA100/2MB/7200rpm/IDE= -/3=2E5" 300=20 -=BF=E1=D3=E3=A2=F4=CF=B5=C1=D0 ST360021A 60GB/UDMA 100/2MB/7200rpm/IDE/3=2E= -5" 330 =20 -=BF=E1=D3=E3=A2=F4=CF=B5=C1=D0 ST380021A 80GB/UDMA 100/2MB/7200rpm/IDE/3=2E= -5" 390=20 -=BF=E1=D3=E3V=CF=B5=C1=D0 ST3120023A 120GB/ATA100/2MB/7200rpm/IDE/=B5=A5=B5= -=FA60G 500=20 -Maxtor =20 -=C3=C0=D7=EA=C8=FD=B4=FA/2F020J0 20G/UDMA 133/5400rpm/2M/IDE/=B5=A5=B5=FA= -40GB 230 =20 -=D0=C7=D7=EA=C8=FD=B4=FA/4D040H2 40GB/UDMA 100/5400rpm/2M/IDE/=B5=A5=B5=FA= -40GB/ 300 =20 -=D0=C7=D7=EA=C8=FD=B4=FA/4D160H8 160GB/UDMA 133/5400rpm/2M/IDE/=B5=A5=B5=FA= -40GB 1000 =20 -DiamondMax Plus 8/6E040L0 40GB/UDMA 133/7200rpm/2M/IDE/=C1=BD=C4=EA=B1=A3= -=D0=DE 300 =20 -DiamondMax Plus 9/6Y060L0 60GB/UDMA 133/7200rpm/2M/IDE/=C1=BD=C4=EA=B1=A3= -=D0=DE 340=20 -DiamondMax Plus 9/6Y080L0 80GB/UDMA 133/7200rpm/2M/IDE/=C1=BD=C4=EA=B1=A3= -=D0=DE 400 =20 -DiamondMax Plus 9/6Y120L0 120GB/UDMA 133/7200rpm/2M/IDE/=C1=BD=C4=EA=B1=A3= -=D0=DE 590=20 -DiamondMax Plus 9/6Y160L0 160GB/UDMA 133/7200rpm/2M/IDE/=C1=BD=C4=EA=B1=A3= -=D0=DE 1000=20 -DiamondMax Plus 9/6Y200L0 200GB/UDMA 133/7200rpm/2M/IDE/=C1=BD=C4=EA=B1=A3= -=D0=DE 1100 =20 -IBM =CC=DA=C1=FA=CB=C4=B4=FADTLA-307040 40GB/UDMA 100/2M/7200rpm/IDE/= -3=2E5" 280 =20 -=CC=DA=C1=FA=CB=C4=B4=FA60GXP 60AVER07 60G/UDMA 100/2M/7200rpm/IDE/3=2E5"= -=B5=A5=B5=FA20GB 300 =20 -=CC=DA=C1=FA=CB=C4=B4=FADTLA-307080 80GB/UDMA 100/2M/7200rpm/IDE/3=2E5" = - 390=20 -=CC=DA=C1=FA=CB=C4=B4=FADTLA-307120 120GB/UDMA 100/2M/7200rpm/IDE/3=2E5" = - 590=20 -=CC=DA=C1=FA=CE=E5=B4=FA/180AVV207 180G/ATA100/7200rpm/8M/=B5=A5=B5=FA60G= - 1100=20 -=CE=F7=B2=BF=CA=FD=BE=DD WD200EB 20=2E5GB/UDMA 100/2MB/5400rpm/IDE/3= -=2E5" 200 =20 -WD400EB 40G/UDMA 100/2M/5400rpm/IDE/3=2E5" 250 =20 -WD400BB 40G/UDMA 100/2MB/7200rpm/IDE/3=2E5" 300 =20 -WD600BB 60G/UDMA 100/2M/7200rpm/IDE/3=2E5" 320=20 -WD800JB 80G/UDMA 100/8M/7200rpm/IDE/3=2E5=B4=E7 460=20 -WD800BB 80G/UDMA 100/2M/7200rpm/IDE/3=2E5" 380 =20 -WD1000BB 100G/UDMA 100/2M/7200rpm/IDE/3=2E5=B4=E7 480 =20 -WD1200BB 120G/UDMA 100/2M/7200rpm/IDE/3=2E5" 600 =20 -WD1200JB 120G/UDMA 100/8M/7200rpm/IDE/3=2E5" 650=20 -WD1800BB 180G/UDMA 100/2M/7200rpm/IDE/3=2E5=B4=E7 1090 =20 -WD2000JB 200G/UDMA 100/8M/7200rpm/IDE/3=2E5=B4=E7 1400 =20 -=C0=B6=D1=C7 D60/IC35L060AVVA07-0 60GB/7200RPM/2M=BB=BA=B4=E6/=C8=DD=C1= -=BF60G/=B5=A5=B5=FA40G/=C8=FD=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 390=20 -D80/IC35L080AVVA07-0 80GB/7200RPM/2M=BB=BA=B4=E6/=C8=DD=C1=BF80G/=B5=A5=B5= -=FA40G/=C8=FD=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 420=20 -D120/IC35L120AVV207-0 120GB/7200RPM/2M=BB=BA=B4=E6/=C8=DD=C1=BF120G/=B5=A5= -=B5=FA60G/=C8=FD=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 680=20 -T20/IC25N020ATCS04-0 20GB/4200RPM/2M=BB=BA=B4=E6/=BA=F1=B6=C89=2E5mm/=C8=FD= -=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 700=20 -T30/IC25N030ATCS04-0 30GB/4200RPM/2M=BB=BA=B4=E6/=BA=F1=B6=C89=2E5mm/=C8=FD= -=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 780=20 -T40/IC25N040ATCS04-0 40GB/4200RPM/2M=BB=BA=B4=E6/=BA=F1=B6=C89=2E5mm/=C8=FD= -=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 800 =20 -T60/IC25N060ATCS04-0 60GB/5400RPM/2M=BB=BA=B4=E6/=BA=F1=B6=C812=2E5mm/=C8= -=FD=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 2000 =20 -U18/IC35L018UWD210-0 18GB/10000RPM/4M=BB=BA=B4=E6/68=D5=EB/U160 SCSI=BD=D3= -=BF=DA/=C8=FD=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 800 =20 -U36/IC35L036UWD210-0 36GB/10000RPM/4M=BB=BA=B4=E6/68=D5=EB/U160 SCSI=BD=D3= -=BF=DA/=C8=FD=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 1500 =20 -U73/IC35L073UWDY10-0 73GB/10000RPM/8M=BB=BA=B4=E6/68=D5=EB/U160/320 SCSI=BD= -=D3=BF=DA/=C8=FD=C4=EA=C8=AB=B9=FA=C1=AA=B1=A3 3500 =20 -=C1=F9=A1=A2=A3=C3=A3=C4=A3=AF=A3=C4=A3=D6=A3=C4=B9=E2=C7=FD: =20 -=CB=F7=C4=E1 DDU1621 16X/512K/ATAPI/EIDE/SAS=BC=BC=CA=F5/16=B1=B6=CB=D9= -DAE=A3=A8=CA=FD=C2=EB=D2=F4=D0=A7=BD=E2=D1=B9=A3=A9=CB=D9=B6=C8/=B6=CC=C9=ED= -=C9=E8=BC=C6 150=20 -52X 52X CD-ROM/128KB cache/E-IDE/=CD=D0=C5=CC=CA=BD 90 =20 -=B4=F3=B0=D7=F6=E8 52X =B0=D7=BD=F0=B0=E6 52X/=CA=D6=B6=AF=B5=F7=CB=D9= - 100 =20 -52XLE 52X CD-ROM/128KB cache/E-IDE 95 =20 -=B4=F3=B0=D7=F6=E8=CD=F516X DVD 16X PC-DVD/256KB cache/E-IDE 150 =20 -=C6=DF=A1=A2=CF=D4=BF=A8:=20 -=B0=AC=B6=FB=C9=AF Winner4 200NVS nVIDIA Quadro4 200NVS/64MB SDR/2X/4= -X/=C8=AB=C7=F26=C4=EA=D6=CA=B1=A3/=D2=BB=C4=EA=B0=FC=BB=BB 900 =20 -Synergy3 nVIDIA Quadro2 MXR/32MB 980 =20 -Synergy2000 nVIDIA Quadro2 EX/32MB 700 =20 -=D3=B0=C0=D7=D5=DF925VIVO nVIDIA GeForce4 Ti4600/128MB DDR/DVI/TV-Out/VIV= -O 1400 =20 - =D3=B0=C0=D7=D5=DF725 nVIDIA GeForce4 Ti4400/128MB DDR/DVI/TV-Out = - 930 =20 -=D3=B0=C0=D7=D5=DF525 nVIDIA GeForce4 Ti4200/64MB DDR/AGP 4X/DVI/TV-Out = - 700 =20 -525/128M nVIDIA GeForce4 Ti4200/128M DDR -4ns/VIVO/DVI = -800 =20 - =D3=B0=C0=D7=D5=DF517VIVO nVIDIA GeForce4 MX460/64MB DDR/DVI/TV-Out/VIVO= - 580 =20 -=D3=B0=C0=D7=D5=DF517 nVIDIA GeForce4 MX440/64MB DDR/TV-Out = - 290 =20 -=D3=B0=C0=D7=D5=DF517/DV nVIDIA GeForce4 MX420/64MB DDR(5ns)/TV-Out = - 250 =20 -511 64M DDR nVidia GeForce2 MX400/64M-5ns DDR/=BA=CB=D0=C4200MHz/=CF=D4=B4= -=E6400MHz/AGP4X230 =20 -=D3=B0=C0=D7=D5=DF511 nVIDIA GeForce2 MX400/64MB SDRAM/TV-Out 200 =20 -=D3=B0=C0=D7=D5=DF511 nVIDIA GeForce2 MX400/32MB SDRAM 150 =20 -=D3=B0=C0=D7=D5=DF 518 nVIDIA GeForce4 MX440-8X/64M 3=2E3ns DDR/AGP 8X/VG= -A+DVI+TV-Out 450=20 - -=B0=CB=A1=A2=A3=C3=A3=D2=A3=D4=CF=D4=CA=BE=C6=F7:=20 -=C8=FD=D0=C7(SAMSUNG) 551S 15"/=CB=AE=C6=BD=B5=E3=BE=E00=2E24mm/=D7=EE= -=B8=DF=B7=D6=B1=E6=C2=CA1024*768@68Hz/=B4=F8=BF=ED65MHz/MPR II = -390 -753S 17"=C6=BD=C3=E6=D6=B1=BD=C7/0=2E23mm=CB=AE=C6=BD=B5=E3=BE=E0/=D7=EE=B8= -=DF=B7=D6=B1=E6=C2=CA1280*1024@65Hz/=B4=F8=BF=ED110MHz/TCO99 480 =20 -753DFX 17"=B4=BF=C6=BD/=C8=FD=D0=C7=D0=C2=B5=A4=C4=C8=B9=DC/0=2E20mm=CB=AE= -=C6=BD=B5=E3=BE=E0/=D7=EE=B8=DF=B7=D6=B1=E6=C2=CA1280*1024@65Hz/ TCO99 50= -0 =20 -757DFX 17"=B4=BF=C6=BD/ 0=2E20mm=CB=AE=C6=BD=B5=E3=BE=E0/=D7=EE=B8=DF=B7=D6= -=B1=E6=C2=CA1920*1440@73Hz/=B4=F8=BF=ED250MHz/ TCO99 750 =20 -763MB 17"=B4=BF=C6=BD/0=2E20mm=CB=AE=C6=BD=B5=E3=BE=E0/=D7=EE=B8=DF=B7=D6= -=B1=E6=C2=CA1280*1024@65Hz/=B4=F8=BF=ED110MHz/TCO99 600 =20 -765MB 17"=B4=BF=C6=BD/0=2E20mm=CB=AE=C6=BD=B5=E3=BE=E0/=D7=EE=B4=F3=B7=D6= -=B1=E6=C2=CA1600*1200@68Hz/=B4=F8=BF=ED185MHz/TCO99 650 =20 -957DF 19"=B4=BF=C6=BD/ 0=2E20mm=CB=AE=C6=BD=B5=E3=BE=E0/=D7=EE=B8=DF=B7=D6= -=B1=E6=C2=CA1920*1440@64Hz/=B4=F8=BF=ED250MHz/TCO99 1100 =20 -959NF 19"=B4=BF=C6=BD/0=2E24mm=B5=E3=BE=E0/=D7=EE=B4=F3=B7=D6=B1=E6=C2=CA= -1920*1440@73Hz/=B4=F8=BF=ED290MHz/TCO99 1450 =20 -=B7=C9=C0=FB=C6=D6(Philips) 105E 15"=C6=BD=C3=E6=D6=B1=BD=C7/0=2E28m= -m=B5=E3=BE=E0/=D7=EE=B4=F3=B7=D6=B1=E6=C2=CA1024*768@54Hz 380 =20= - -107S4 17"=B4=BF=C6=BD/0=2E21mm=CB=AE=C6=BD=B5=E3=BE=E0/=D7=EE=BC=D1=B7=D6= -=B1=E6=C2=CA1024*768/=B4=F8=BF=ED108MHz 500 =20 -07F4 17"=B4=BF=C6=BD/=CB=AE=C6=BD=B5=E3=BE=E00=2E21mm/=D7=EE=B8=DF=B7=D6=B1= -=E6=C2=CA1280*1024/=B4=F8=BF=ED110MHz 510 =20 -107B3 17"=B4=BF=C6=BD/0=2E25mm/1600*1200 650=20 -107X2 17"=B4=BF=C6=BD/0=2E25mm/1280*1024/108MHz/TCO 95 700 =20 -107P 17"=B4=BF=C6=BD/0=2E25mm/1920*1440/232MHz 780 =20 -109S 19"/0=2E26mm/1600*1280 710 =20 -109B 19"=B4=BF=C6=BD/0=2E25mm/1920*1440/234MHz/TCO 99 800 =20 -109P 19"=B4=BF=C6=BD/0=2E25mm/1920*1440/261MHz 1300 =20 -201B 21"/0=2E26mm=B5=E3=BE=E0/=D7=EE=B8=DF=B7=D6=B1=E6=C2=CA1920*1024/261= -MHz/TCO99 2000 =20 -202P 22"=B4=BF=C6=BD=D7=EA=CA=AF=E7=E7/0=2E25mm/1920*1440 = - 2900 =20 - -=BE=C5=A1=A2=D2=BA=BE=A7=CF=D4=CA=BE=C6=F7:=20 -=C8=FD=D0=C7 =20 -151B 15"TFT/0=2E297mm=B5=E3=BE=E0/=B7=D6=B1=E6=C2=CA1024*768/=B6=D4=B1=C8= -=B6=C8330:1/=C1=C1=B6=C8200cd/m2/=D0=FD=D7=AA 1600=D4=AA=20 -151MP 15=2E1"TFT/0=2E297mm=B5=E3=BE=E0/=C1=C1=B6=C8250cd/m2/=B4=F3=D0=A1=BF= -=C9=B5=F7PIP(=BB=AD=D6=D0=BB=AD)/=BF=C9=D6=B1=BD=D3=CA=D5=BF=B4=B5=E7=CA=D3= -/=B4=F8=D2=F4=CF=E4/TCO95 2600=D4=AA =20 -151S 15=2E0"TFT/0=2E297mm=B5=E3=BE=E0/=B7=D6=B1=E6=C2=CA1024*768/=B6=D4=B1= -=C8=B6=C8330:1/=C1=C1=B6=C8250cd/m2/TCO99 1200=D4=AA =20 -152S 15"TFT/0=2E297mm=B5=E3=BE=E0/ =C1=C1=B6=C8250cd/m2/=CF=EC=D3=A6=CA=B1= -=BC=E425ms/=B3=AC=B1=A1=BB=FA=C9=ED=C9=E8=BC=C620=2E3mm/=CB=AB=D6=E1=CA=BD= -=B5=D7=D7=F9/=B8=A9=D1=F6=CB=E6=D2=E2/=B8=DF=B5=CD=D7=D4=D6=F7/=D6=A7=B3=D6= -VESA=D6=A7=BC=DC=CA=BD=B0=B2=D7=B0/TCO99 1300=D4=AA 171MP 17"TFT/0=2E= -297mm=B5=E3=BE=E0/=B7=D6=B1=E6=C2=CA1280*1024/=B6=D4=B1=C8=B6=C8400:1/=C1=C1= -=B6=C8240cd/m2/=B4=F3=D0=A1=BF=C9=B5=F7PIP(=BB=AD=D6=D0=BB=AD)/=BF=C9=D6=B1= -=BD=D3=CA=D5=BF=B4=B5=E7=CA=D3/=C4=DA=D6=C3=D2=F4=CF=E4(5W/chx2)/TCO95 = -5900=D4=AA =20 -171S 17"TFT/0=2E264mm=B5=E3=BE=E0/=B7=D6=B1=E6=C2=CA1280*1024/=B6=D4=B1=C8= -=B6=C8350:1/=C1=C1=B6=C8240cd/m2/TCO99 2800=D4=AA =20 -=B7=C9=C0=FB=C6=D6 =20 -150S3 15=2E1"TFT/=B5=E3=BE=E00=2E297mm/=B7=D6=B1=E6=C2=CA1024*768/=D7=EE=B8= -=DF=B6=D4=B1=C8=B6=C8400:1/=C1=C1=B6=C8210cd/m2/TCO99 1100 =20 -150B 15=2E1"/0=2E297mm/1024*768/=C1=C1=B6=C8210cd/m2/250:1/ 80MHz/TCO99 = - 1200 =20 -150P 15"TFT/=B5=E3=BE=E00=2E297mm/=B7=D6=B1=E6=C2=CA1024*768/DVI-D=CA=FD=D7= -=D6=CA=E4=C8=EB=BD=D3=BF=DA/=D0=FD=D7=AA/=B4=F8=D2=F4=CF=E4 1350 = -=20 - -=CA=AE=A1=A2=C5=E7=C4=AB=B4=F2=D3=A1=BB=FA: - =BB=DD=C6=D5 =20 - DJ-948c 2400*1200dpi/=B8=BB=C0=F6=CD=BC/=C8=AB=D7=D4=B6=AF=CB=AB=C3=E6=B4= -=F2=D3=A1/=BA=DA=C9=AB12PPM=B2=CA=C9=AB10PPM/USB=BD=D3=BF=DA/=B2=A2=BF=DA = - 480=D4=AA =20 -DJ-1125c =B8=BB=C0=F6=CD=BC/4MB=BB=BA=B4=E6/=B8=DF=CB=D9=B4=F2=D3=A1/A3/=BA= -=DA=B0=D77PPM/USB=BD=D3=BF=DA/=B2=A2=BF=DA/=BF=C9=C9=FD=BC=B6=CE=AA=CD=F8=C2= -=E7=B4=F2=D3=A1=BB=FA 980=D4=AA =20 -DJ-1220c 2400*1200dpi/=B8=BB=C0=F6=CD=BC/sRGB=BC=B0ColorSync=C9=AB=B2=CA=B9= -=DC=C0=ED=B1=EA=D7=BC/A3/=BA=DA=C9=AB11PPM=B2=CA=C9=AB9=2E5PPM/=C8=AB=D7=D4= -=B6=AF=CB=AB=C3=E6=B4=F2=D3=A1 1390=D4=AA=20 -DJ3420C =CB=AB=C4=AB=CD=B7/2400*1200DPI/10ppm 280=D4=AA =20 - DJ-5550 =B7=D6=B1=E6=C2=CA4800*1200dpi/SRGB=BC=B0COLORSYNE=C9=AB=B2=CA=B9= -=DC=C0=ED=B1=EA=D7=BC/A4/=BA=DA=C9=AB17PPM=B2=CA=C9=AB12PPM 780=D4=AA=20= - - -=CA=AE=D2=BB=A1=A2=BC=A4=B9=E2=B4=F2=D3=A1=BB=FA:=20 -=BB=DD=C6=D5 LJ1000 =B7=D6=B1=E6=C2=CA600*600dpi/A4/10ppm/=BA=DA=B0= -=D7/USB=BD=D3=BF=DA 1000=20 -LJ1200 =B7=D6=B1=E6=C2=CA1200*1200dpi/A4/14ppm/USB 2=2E0 = - 1500=20 -LJ1220 =B7=D6=B1=E6=C2=CA1200*1200dpi/A4/14ppm/=B4=F2=D3=A1/=B8=B4=D3=A1/= -=C9=A8=C3=E8/USB 2=2E0 1900 =20 -LJ2200D =B7=D6=B1=E6=C2=CA1200*1200dpi/A4/18ppm/=D7=D4=B6=AF=CB=AB=C3=E6=B4= -=F2=D3=A1/=CB=AB=CF=F2=B2=A2=D0=D0=B6=CB=BF=DA 2900 =20 -LJ3200 =B7=D6=B1=E6=C2=CA1200*1200dpi/A4/9ppm/=B4=F2=D3=A1/=B8=B4=D3=A1/=B4= -=AB=D5=E6/=C9=A8=C3=E8/=B2=A2=D0=D0=B6=CB=BF=DA 2000=20 -LJ3300 =B7=D6=B1=E6=C2=CA1200*1200dpi/A4/14ppm/=B4=F2=D3=A1/=B8=B4=D3=A1/= -=C9=A8=C3=E8 1800 =20 -LJ3330 =B7=D6=B1=E6=C2=CA1200*1200dpi/A4/14ppm/=B4=F2=D3=A1/=B8=B4=D3=A1/= -=B4=AB=D5=E6/=C9=A8=C3=E8/=C5=E4=D2=BB=B8=F650=D2=B3=D7=D4=B6=AF=BD=F8=D6=BD= -=BA=D0 3000 =20 -LJ4100 =B7=D6=B1=E6=C2=CA1200*1200dpi/A4/18ppm/=BA=DA=B0=D7/=CB=AB=CF=F2=B2= -=A2=D0=D0=B6=CB=BF=DA 3900 =20 -LJ5100 =B7=D6=B1=E6=C2=CA1200*1200dpi/A3/22ppm(A4)/11ppm(A3)/=BA=DA=B0=D7= -/=B1=EA=D7=BC=B2=A2=D0=D0=BD=D3=BF=DA 5000=20 - LJ5000LE =B7=D6=B1=E6=C2=CA1200*1200dpi/A3/22ppm(A4)/11ppm(A3)/=BA=DA=B0= -=D7/=B1=EA=D7=BC=B2=A2=D0=D0=BD=D3=BF=DA 4000 =20 -CLJ4600 =B7=D6=B1=E6=C2=CA600*600dpi/A4/16ppm/=CB=AB=CF=F2=B2=A2=D0=D0=B6= -=CB=BF=DA 12000 =20 - CLJ8550 =B7=D6=B1=E6=C2=CA600*600dpi/A3/24ppm/=B2=A2=D0=D0C=D0=CD=BD=D3=BF= -=DA 20000 =20 - -=CA=AE=B6=FE=A1=A2=A3=CD=A3=C4: =CB=F7=C4=E1 MZ-R909 37=D0=A1=CA=B1=B2= -=A5=B7=C5/84=D0=A1=CA=B1=B2=A5=B7=C5/=C3=BE=BB=FA=B8=C7 1000 = -=20 - MZ-N1 NetMD/MDLP/100=D0=A1=CA=B1/160=C3=EB=B7=C0=D5=F0/117=BF=CB/=D2=BA=BE= -=A7=CF=DF=BF=D81090=20 -MZ-N505 10=D0=A1=CA=B1=C2=BC=D2=F4/56=D0=A1=CA=B1=B2=A5=B7=C5 = - 800 =20 - MZ-N707 16=D0=A1=CA=B1=C2=BC=D2=F4/56=D0=A1=CA=B1=B7=C5=D2=F4/=C3=BE=BB=FA= -=B8=C7 900 =20 - MZ-E707 MDLP/NH-14WM=B5=E7=B3=D8/120=D0=A1=CA=B1=B2=A5=B7=C560g = - 690 =20 -MZ-E909 MDLP/G=B7=C0=D5=F0/=D2=BB=BC=FC=BB=BB=B5=FA/145=D0=A1=CA=B1=B2=A5= -=B7=C5/76=BF=CB 700 =20 - -=CA=AE=C8=FD=A1=A2=A3=CD=A3=D0=A3=B3:=20 -=CB=F7=C4=E1 NW-MS6 32MB/=CC=F5=CA=BD=B3=E4=B5=E7=B5=E7=B3=D8/4=D0=A1= -=CA=B1=B2=A5=B7=C5=CA=B1=BC=E4/=D3=D0=B5=B5=B0=B8=B4=E6=C8=A1=B9=A6=C4=DC/= -USB=BD=D3=BF=DA1000=20 -NW-MS9 64MB/=CC=F5=CA=BD=B3=E4=B5=E7=B5=E7=B3=D8/4=D0=A1=CA=B1=B2=A5=B7=C5= -=CA=B1=BC=E4/=D3=D0=B5=B5=B0=B8=B4=E6=C8=A1=B9=A6=C4=DC/USB=BD=D3=BF=DA 11= -00=20 -NW-MS7 64MB/1=BD=DA=CE=E5=BA=C5=B5=E7=B3=D8/4=D0=A1=CA=B1=B2=A5=B7=C5=CA=B1= -=BC=E4/USB=BD=D3=BF=DA/69=BF=CB 1200 =20 -MC-P10 64MB/1=BD=DA=CE=E5=BA=C5=B5=E7=B3=D8/5=D0=A1=CA=B1=B2=A5=B7=C5=CA=B1= -=BC=E4/USB=BD=D3=BF=DA/48=BF=CB 1300=20 - -=CA=AE=CB=C4=A1=A2=C9=E3=CF=F1=CD=B7:=20 -=CD=F8=D1=DB =20 -PC300 CMOS=B8=D0=B9=E2=C6=F7=BC=FE/30=CD=F2=B4=AB=B8=D0=C6=F7=CF=F1=CB=D8= -=CA=FD/USB=BD=D3=BF=DA=BD=D3=BF=DA=C0=E0=D0=CD/640=A1=C1480=D7=EE=B4=F3=B7= -=D6=B1=E6=C2=CA/30fps=D7=EE=B4=F3=D6=A1=C6=B5 180 =20 -PC370 CCD=B8=D0=B9=E2=C6=F7=BC=FE/37=CD=F2=B4=AB=B8=D0=C6=F7=CF=F1=CB=D8=CA= -=FD/USB=BD=D3=BF=DA=BD=D3=BF=DA=C0=E0=D0=CD/640x480=D7=EE=B4=F3=B7=D6=B1=E6= -=C2=CA/30fps=D7=EE=B4=F3=D6=A1=C6=B5 200 =20 -2000B CMOS=B8=D0=B9=E2=C6=F7=BC=FE/30=CD=F2=B4=AB=B8=D0=C6=F7=CF=F1=CB=D8= -=CA=FD/USB=BD=D3=BF=DA=BD=D3=BF=DA=C0=E0=D0=CD/640(=CB=AE=C6=BD)x480(=B4=B9= -=D6=B1)=D7=EE=B4=F3=B7=D6=B1=E6=C2=CA/30fps=D7=EE=B4=F3=D6=A1=C6=B5 120=20= - - -=CA=AE=CE=E5=A1=A2=CA=FD=C2=EB=CF=E0=BB=FA:=20 -=B6=AB=D6=A5 =20 -PDR-T10 214=CD=F2=CF=F1=CB=D8/4=B1=B6=CA=FD=D7=D6=B1=E4=BD=B9/1=2E6=D3=A2= -=B4=E7=B4=A5=C3=FE=BC=E0=BF=D8=C6=C1/=BF=C9=BB=BB=C3=E6=BF=C7/8M SD=BF=A8/= -USB=BD=D3=BF=DA 900 =20 -PDR-M71 340=CD=F2=CF=F1=CB=D8/2=2E8=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9=BE=B5=CD= -=B7/=BF=C9=C5=C4=B6=AF=CC=AC/USB=BD=D3=BF=DA/8MSM=BF=A8/1=2E5=B4=E7=D2=BA=BE= -=A7=C6=C1 1000 =20 -PDR-M81 420=CD=F2=CF=F1=CB=D8/2=2E8=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9=BE=B5=CD= -=B7/=BF=C9=C5=C4=B6=AF=CC=AC/USB=BD=D3=BF=DA/8MSM=BF=A8/1=2E5=B4=E7=D2=BA=BE= -=A7=C6=C1 1400 =20 -=CB=F7=C4=E1(SONY) DSC-P5 2048*1536=BD=E2=CE=F6=B6=C8/334=CD=F2=CF=F1= -=CB=D8/6=B1=B6=CA=FD=C2=EB=B1=E4=BD=B9/3=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/USB= - 1500 =20 - DSC-P9 410=CD=F2=CF=F1=CB=D8/3=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/2=B1=B6=CA=FD= -=D7=D6=B1=E4=BD=B9/=D7=D4=B6=AF=C8=FD=B5=E3=B6=D4=BD=B9 1900 =20= - -DSC-P31 210=CD=F2=CF=F1=CB=D8/=D7=EE=B4=F3=B7=D6=B1=E6=C2=CA1600=A1=C1120= -0/3=B1=B6=CA=FD=C2=EB=B1=E4=BD=B9/16MB=BC=C7=D2=E4=B0=F4/5=BA=C5=C4=F8=C7=E2= -=B5=E7=B3=D8/USB 980 =20 -DSC-F707 502=CD=F2=CF=F1=CB=D8/5=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/16MB/=B2=CC= -=CB=B9=BE=B5=CD=B7 3000 =20 -DSC-S75 334=CD=F2=CF=F1=CB=D8/1600*1200=BD=E2=CE=F6=B6=C8/3=B1=B6=B9=E2=D1= -=A7=B1=E4=BD=B9/2=B1=B6=CA=FD=C2=EB=B1=E4=BD=B9/8MB 1800=20 -DSC-S85 413=CD=F2=CF=F1=CB=D8/2272*1704=BD=E2=CE=F6=B6=C8/3=B1=B6=B9=E2=D1= -=A7=B1=E4=BD=B9/6=B1=B6=CA=FD=C2=EB=B1=E4=BD=B9/16MB 2200 =20 -=CA=AE=C1=F9=A1=A2=CA=FD=C2=EB=C9=E3=CF=F1=BB=FA:=20 -=CB=F7=C4=E1(SONY) =20 -TRV340E 80=CD=F2=CF=F1=CB=D8/25=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/700=B1=B6=CA= -=FD=C2=EB=B1=E4=BD=B9/=B3=AC=BC=B6=D2=B9=C9=E3=B9=A6=C4=DC 2000=20 -TRV140E 54=CD=F2=CF=F1=CB=D8/20=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/560=B1=B6=CA= -=FD=C2=EB=B1=E4=BD=B9/=B3=AC=BC=B6=D2=B9=C9=E3=B9=A6=C4=DC 1800 =20= - - TRV40E 155=CD=F2=CF=F1=CB=D8/10=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/120=B1=B6=CA= -=FD=C2=EB=B1=E4=BD=B9/=B2=CC=CB=BE=BE=B5=CD=B7 4500=20 -TRV27E 107=CD=F2=CF=F1=CB=D8/10=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/20=B1=B6-12= -0=B1=B6=D1=A1=D4=F1=D0=D4=CA=FD=C2=EB=B1=E4=BD=B9/=B2=CC=CB=BE=BE=B5=CD=B7= - 3200 =20 - TRV18E 80=CD=F2=CF=F1=CB=D8/10=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/20=B1=B6-12= -0=B1=B6=D1=A1=D4=F1=D0=D4=CA=FD=C2=EB=B1=E4=BD=B9/=B2=CC=CB=BE=BE=B5=CD=B7= - 2800 =20 - DCR-IP45E 107=CD=F2=CF=F1=CB=D8/10=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/120=B1=B6= -=CA=FD=C2=EB=B1=E4=BD=B9/2=2E5=D3=A2=B4=E7=D2=BA=BE=A7=C6=C1/MICROMV 5000 = -=20 -=CB=C9=CF=C2 DS30 80=CD=F2=CF=F1=CB=D8/10=B1=B6=B9=E2=D1=A7=B1=E4=BD= -=B9/=B4=F8=C9=E3=CF=F1=B5=C6/OLVX=D2=B9=CA=D3=B9=A6=C4=DC 1500 =20 -DS35 80=CD=F2CCD/15=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/150=B1=B6=CA=FD=C2=EB/2= -=2E5=B4=E7=B2=CA=C6=C1 2300 =20 - DS88 80=CD=F2=CF=F1=CB=D8/12=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/600=B1=B6=CA=FD= -=C2=EB=B1=E4=BD=B9/3=D3=A2=B4=E7=D2=BA=BE=A7=CF=D4=CA=BE=C6=C1/SD=C8=E7=D2= -=E2=BF=A8=B2=E5=B2=DB 2800 =20 -EX21 108=CD=F2=CF=F1=CB=D8/10=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/100=B1=B6=CA=FD= -=C2=EB=B1=E4=BD=B9/2=2E5=D3=A2=B4=E7=D2=BA=BE=A7=CF=D4=CA=BE=C6=C1/SD=C8=E7= -=D2=E2=BF=A8=B2=E5=B2=DB 3800=20 - MX300 108=CD=F2=CF=F1=CB=D8/12=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/120=B1=B6=CA= -=FD=C2=EB=B1=E4=BD=B9/3CCD=E1=E2=BF=A8=BE=B5=CD=B7/SD=CD=F8=C2=E7=B9=A6=C4= -=DC/=D4=B2=B8=D5DV=BF=A8 5500 =20 -GS5 80=CD=F2=CF=F1=CB=D8/10=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/=D5=C6=D6=D0=B1= -=A6/=D6=A7=B3=D6SD=BF=A8/USB=C1=AC=CF=DF/MPEG4=B8=F1=CA=BD 3000 =20 -GX-7 120=CD=F2=CF=F1=CB=D8/10=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/100=B1=B6=CA=FD= -=C2=EB/3=2E0=B4=E7=B2=CA=C6=C1/SD=BF=A8 4000 =20 -VZ-15 80=CD=F2=CF=F1=CB=D8/10=B1=B6=B9=E2=D1=A7=B1=E4=BD=B9/100=B1=B6=CA=FD= -=C2=EB/2=2E5=B4=E7=B2=CA=C6=C1 1100 =20 - -=CA=AE=C6=DF=A1=A2 -=C4=A6=CD=D0=C2=DE=C0=AD=CA=D6=BB=FA: =20 -T190/300 T191/350 E360/900 C289/400 A6288/880 = - V60/950 V60i/990 V66/690 V70/1450 V9= -98++ /500 V8088 /520 M388/1100=20 - -=C5=B5=BB=F9=D1=C7 3310/300 3315/380 3330/430 = - 3350/390 3510/500 3610/530 5210/630 5510/= -510 6500/950 6510/900 7210/1600 7650/1900 821= -0/600 8250/659 8310/920 8855/1100 8910/2200 = - 9210C/2380=20 - -=B0=AE=C1=A2=D0=C5 T29/500 T39/450 T65sc/430 = - T66sc/1200 T68sc/1090 A3618/390 =20 - -=CE=F7=C3=C5=D7=D3 1118/280 2118/350 2128/800 = - 3118/550 3508i/300 3518i/300 3568/400 3618/= -680 6618/690 6686/1000 6688i/1190 6688/1200 8008/= - 1350 =20 - -=B7=C9=C0=FB=C6=D6 969+/650 9@9+/630 820/930 = - 620/650 120/300=20 -=C8=FD=D0=C7 N188/910 N288/980 N628/1200 A18= -8/750 A288/1100 A308/1230 A408/1150 T108/1700 = -T208/ 2500 Q208 /1650 =20 -=CB=C9=CF=C2 GD93/320 GD92/480 GD88/3000 G= -D85/500 GD80/450 GD76/490 GD75/440 GD68/990 = - =20 -=CB=F7=C4=E1 Z28/880 J70C/400 - - =CC=A8=CD=E5=F6=CE=C1=FA=C9=CC=C3=B3=BC=AF=CD=C5=B9=AB=CB=BE=CF=F2=C4=FA= -=B0=DD=C4=EA!=20 -=B1=BE=B9=AB=CB=BE=B3=A4=C6=DA=BE=AD=CF=FA=B5=E7=C4=D4=C5=E4=BC=FE=A1=A2=CA= -=D6=BB=FA=A1=A2=B1=CA=BC=C7=B1=BE=D2=E2=D4=DA=B9=F3=B5=D8=D1=B0=D5=D2=BA=CF= -=D7=F7=CF=FA=CA=DB=BB=EF=B0=E9=A3=AC=20 -=D3=D0=D2=E2=D5=DF=C7=EB=C0=B4=C8=CB=C0=B4=B5=E7=C7=A2=CC=B8=A1=A3 - -=C1=AA=CF=B5=C8=CB=A3=BA=BA=E9 =CE=E4 =D2=BB=A1=A2 =B5=E7 =BB=B0=A3=BA=A3= -=A80=A3=A913960361753 - - - - diff -Nru spamassassin-3.4.6/xt/data/nice/cjk/gb2312.2 spamassassin-4.0.0~rc3/xt/data/nice/cjk/gb2312.2 --- spamassassin-3.4.6/xt/data/nice/cjk/gb2312.2 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/cjk/gb2312.2 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -From bounce-debian-chinese-gb=zzz=jmason.org@lists.debian.org Mon Feb 10 11:01:48 2003 -Return-Path: -Delivered-To: zzz@localhost.jmason.org -Received: from localhost (jalapeno [127.0.0.1]) - by jmason.org (Postfix) with ESMTP id 40F1316F17 - for ; Mon, 10 Feb 2003 11:01:48 +0000 (GMT) -Received: from jalapeno [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for zzz@localhost (single-drop); Mon, 10 Feb 2003 11:01:48 +0000 (GMT) -Received: from murphy.debian.org (murphy.debian.org [65.125.64.134]) by - dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id h1A27cE07189 for - ; Mon, 10 Feb 2003 02:07:38 GMT -Received: from localhost (localhost [127.0.0.1]) by murphy.debian.org - (Postfix) with QMQP id BE2F41F8CC; Sun, 9 Feb 2003 20:10:09 -0600 (CST) -Old-Return-Path: -Received: from master.debian.org (master.debian.org [65.125.64.135]) by - murphy.debian.org (Postfix) with ESMTP id D77981FAEE for - ; Sun, 9 Feb 2003 19:55:16 -0600 - (CST) -Received: from foka by master.debian.org with local (Exim 3.12 1 (Debian)) - id 18i3AC-0003Ll-00; Sun, 09 Feb 2003 19:55:16 -0600 -Received: from murphy.debian.org [65.125.64.134] by master.debian.org with - esmtp (Exim 3.12 1 (Debian)) id 18i3AB-0003La-00; Sun, 09 Feb 2003 - 19:55:15 -0600 -Received: from localhost (localhost [127.0.0.1]) by murphy.debian.org - (Postfix) with QMQP id E168C1FAB3; Sun, 9 Feb 2003 19:55:12 -0600 (CST) -Old-Return-Path: -Received: from qcife1.quanta.corp (qcife1.quantatw.com [202.145.134.6]) by - murphy.debian.org (Postfix) with ESMTP id 6E3C41F8C0 for - ; Sun, 9 Feb 2003 19:44:09 -0600 - (CST) -Received: from mail03.quanta.corp ([192.168.66.6]) by qcife1.quanta.corp - with Microsoft SMTPSVC(5.0.2195.5329); Mon, 10 Feb 2003 09:48:33 +0800 -Content-Class: urn:content-classes:message -MIME-Version: 1.0 -Content-Type: text/plain; charset=gb2312 -Content-Transfer-Encoding: 8bit -X-Mimeole: Produced By Microsoft Exchange V6.0.5762.3 -Subject: RE: =?GB2312?Q?=D7=B0=D3=B2=B5=FA=CE=CA=CC=E2?= -Date: Mon, 10 Feb 2003 09:48:33 +0800 -Message-Id: -X-MS-Has-Attach: -X-MS-Tnef-Correlator: -Thread-Topic: =?GB2312?Q?=D7=B0=D3=B2=B5=FA=CE=CA=CC=E2?= -Thread-Index: AcLOVWAxnvGEuDtXRdO/mL5A7qeYhACT5bXw -From: Jason Lee (=?GB2312?Q?=C0=EE=D5=B9=B7=E6?=) -To: -X-Originalarrivaltime: 10 Feb 2003 01:48:33.0734 (UTC) FILETIME=[852E2E60:01C2D0A6] -X-Loop: debian-chinese-big5@lists.debian.org -Delivered-To: foka-gateway-big5@debian.org -X-Loop-Convert: foka-gateway-big5@debian.org -Sender: Anthony Fok -Resent-Message-Id: -Resent-From: debian-chinese-gb@lists.debian.org -X-Mailing-List: archive/latest/7971 -X-Loop: debian-chinese-gb@lists.debian.org -List-Post: -List-Help: -List-Subscribe: -List-Unsubscribe: -Precedence: list -Resent-Sender: debian-chinese-gb-request@lists.debian.org -Resent-Date: Sun, 9 Feb 2003 20:10:09 -0600 (CST) -X-Spam-Status: No, hits=0.7 required=5.0 - tests=BAYES_70,MAILTO_TO_SPAM_ADDR,SIGNATURE_SHORT_SPARSE,X_LOOP, - X_MAILING_LIST - version=2.50-cvs -X-Spam-Level: -X-Spam-Checker-Version: SpamAssassin 2.50-cvs (1.168-2003-02-09-exp) - -ӲIDE(SCSI) -һ,Ӳ趨(master/slave/cable select),һӲ"40PIN ""Դ".... -Master,Ϊslaveͺ. - -: ⼰ѶϢ -ҵĵϣװһ̨ӲҰµӲ߼Դ߽Ӻú -ΪεʾbootָֻܿWhy -A.HDD(Ӳ)Ľ(IDE),ͺ(IC35L120AVVA07-0),(IMBM,Qu..,Cry...), - С(30G,80G,140G....) -B.bootܿ,,Message,,... - -From: ˻ݳ [mailto:tesp2645@ms29.hinet.net] -Subject: װӲ -ҵĵϣװһ̨ӲҰµӲ߼Դ߽Ӻú -ΪεʾbootָֻܿWhy - --- -To UNSUBSCRIBE, email to debian-chinese-big5-request@lists.debian.org -with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org - --- -| This message was re-posted from debian-chinese-big5@lists.debian.org -| and converted from big5 to gb2312 by an automatic gateway. - - --- -To UNSUBSCRIBE, email to debian-chinese-gb-request@lists.debian.org -with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org - - diff -Nru spamassassin-3.4.6/xt/data/nice/cjk/iso-2022-jp.1 spamassassin-4.0.0~rc3/xt/data/nice/cjk/iso-2022-jp.1 --- spamassassin-3.4.6/xt/data/nice/cjk/iso-2022-jp.1 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/cjk/iso-2022-jp.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,160 +0,0 @@ -From owner-mhonarc-users@mhonarc.org Mon Dec 16 14:31:36 2002 -Return-Path: -Delivered-To: ach@xray.mpe.mpg.de -Received: (qmail 18769 invoked from network); 16 Dec 2002 14:31:36 -0000 -Received: from mpehp1.mpe-garching.mpg.de (root@130.183.70.10) - by o05.xray.mpe.mpg.de with SMTP; 16 Dec 2002 14:31:36 -0000 -Received: from lorien.mallorn.com (lorien.mallorn.com [64.5.98.30]) - by mpehp1.mpe-garching.mpg.de (8.8.6 (PHNE_17135)/8.8.6) with ESMTP id PAA07075 - for ; Mon, 16 Dec 2002 15:31:34 +0100 (MET) -Received: (from majordomo@localhost) - by lorien.mallorn.com (8.11.6/8.11.6) id gBGE8lW08971; - Mon, 16 Dec 2002 08:08:47 -0600 -X-Envelope-From: shinichiro@stained-g.net -X-Envelope-To: -Received: from st26.arena.ne.jp (st26.arena.ne.jp [210.136.155.2]) - by lorien.mallorn.com (8.11.6/8.11.6) with ESMTP id gBGE8ia08961 - for ; Mon, 16 Dec 2002 08:08:44 -0600 -Received: (qmail 29852 invoked by uid 114); 16 Dec 2002 23:08:43 +0900 -Received: from shinichiro@stained-g.net by st26.arena.ne.jp - by uid 111 with qmail-scanner-1.10 (sophie: 2.10/3.64. . Clear:0. Processed in 0.057111 secs); 16 Dec 2002 23:08:43 +0900 -Received: from unknown (HELO lune.stained-g) (202.214.129.125) - by stained-g.net with SMTP; 16 Dec 2002 23:08:43 +0900 -Date: Mon, 16 Dec 2002 23:07:49 +0900 -Message-ID: <87pts29hvu.wl@shinichiro.stained-g.net> -From: Shinichiro HIDA -To: mhonarc-users@mhonarc.org -Subject: MIME text/plain attach with Shift_JIS (CP932) -User-Agent: Wanderlust/2.9.15 (Unchained Melody) SEMI/1.14.4 (Hosorogi) - FLIM/1.14.4 (=?ISO-8859-4?Q?Kashiharajing=FE-mae?=) APEL/10.4 MULE - XEmacs/21.4 (patch 10) (Military Intelligence) (i386-debian-linux) -Organization: Stained Glass -X-GnuPG-Version: gpg (GnuPG) 1.2.1 -X-GnuPG-Public-Key: http://www.stained-g.net/shinichiro/shinichiro-gpg.key -X-GnuPG-Fingerprint: 5F2D 1656 FFF6 F691 A51C 5E61 E416 D398 470C 1CE9 -X-URI: http://www.stained-g.net/ -X-Face: "+/#(k[%E{,A*R~]BQ;$}j4`A/l\!fGUsqWE]_Ss/CqBX091]WBCJVV<>gDweDL(-H=6@cZA1x|W2F"DUf,5t7M[R[g@Y5qFZ2;u=]d# -MIME-Version: 1.0 (generated by SEMI 1.14.4 - "Hosorogi") -Content-Type: multipart/mixed; - boundary="Multipart_Mon_Dec_16_23:07:49_2002-1" -Sender: owner-mhonarc-users@mhonarc.org -Precedence: bulk -Reply-To: mhonarc-users@mhonarc.org - ---Multipart_Mon_Dec_16_23:07:49_2002-1 -Content-Type: text/plain; charset=US-ASCII - -Hi, - -Now, I try to test MHonArc2002-12-16-snap. - -Sometime, I would like to send the mail with some attachement in -the plain-text-file wrote with Shift_JIS for MS Windoze users. - -;; Japanese Windows using Shift_JIS, the simple text file wrote with -;; Shift_JIS is easy hadling and editing with NOTEPAD for a lot of -;; Windoze users. - -MHonArc could not handle these type attachement yet? - - Problem: unintelligible sequence of characters. - plain/text file could not be attachement (only inline..). - -If I send text/plain part with ISO-2022-JP or EUC-JP, view only -inline(would not be attachment), but no problem for reading. - -like these -(I try content-disposition: attachment with base64) - - ---Multipart_Mon_Dec_16_23:07:49_2002-1 -Content-Type: text/plain; charset=SHIFT_JIS -Content-Disposition: attachment; filename="test-sjis.txt" -Content-Transfer-Encoding: base64 - -grGCzIN0g0CDQ4OLgsyMYI6ugs2BQQ0KDQqVto6ag1KBW4NoKGNoYXJzZXQpICAgIDogU2hp -ZnRfSklTDQqJ/I1zg1KBW4NoKGxpbmUtYnJlYWspIDogQ1IgTEYNCg0KgsWCt4FCDQoNCg== - ---Multipart_Mon_Dec_16_23:07:49_2002-1 -Content-Type: text/plain; charset=US-ASCII - - -MHonArc converted as follow (source); -(I try content-disposition: inline with base64) - - ---Multipart_Mon_Dec_16_23:07:49_2002-1 -Content-Type: text/plain; charset=US-ASCII -Content-Disposition: inline; filename="test-archive.txt" -Content-Transfer-Encoding: base64 - -PCEtLVgtSGVhZC1Cb2R5LVNlcC1FbmQtLT4KPCEtLVgtQm9keS1vZi1NZXNzYWdlLS0+Cgo8 -cHJlPiYjeDk4REI7JiN4NzUzMDsmI3gzMDY3OyYjeDMwNTk7JiN4MzAwMjsKCiYjeDMwNTM7 -JiN4MzA4QzsmI3gzMDZGOyYjeDMwMDE7dGV4dC9wbGFpbiBTaGlmdF9KSVMgJiN4MzA2QTsm -I3gzMEM2OyYjeDMwQUQ7JiN4MzBCOTsmI3gzMEM4OyYjeDMwRDU7JiN4MzBBMTsmI3gzMEE0 -OyYjeDMwRUI7JiN4NkRGQjsmI3g0RUQ4OyYjeDMwNkU7JiN4MzBDNjsmI3gzMEI5OyYjeDMw -Qzg7JiN4MzA2NzsmI3gzMDU5OyYjeDMwMDI7CgogPT0gYXR0YWNobWVudCBzcGVjID09CiBv -IHRleHQvcGxhaW47IGNoYXJzZXQ9U2hpZnRfSklTIChDUkxGKQogbyBjb250ZW50LWRpc3Bv -c2l0aW9uOiBhdHRhY2htZW50OwogbyBlbmNvZGluZzogYmFzZTY0Cgo8L3ByZT48cHJlPj8m -I3hGRjcxOz8mI3hGRjhDOz90P0A/Qz8/PyYjeEZGOEM7P2A/JiN4RkY2RTs/JiN4RkY4RDs/ -QQoKPyYjeEZGNzY7Pz8/Uj9bP2goY2hhcnNldCkgICAgOiBTaGlmdF9KSVMKPz8/cz9SP1s/ -aChsaW5lLWJyZWFrKSA6IENSIExGCgo/JiN4RkY4NTs/JiN4RkY3Nzs/QgoKCgoKPC9wcmU+ -PHByZT4KCjwvcHJlPjxwcmU+JiN4MzA0NjsmI3gzMDdFOyYjeDMwNEY7JiN4MzBBMjsmI3gz -MEZDOyYjeDMwQUI7JiN4MzBBNDsmI3gzMEQ2OyYjeDUxRkE7JiN4Njc2NTsmI3gzMDhCOyYj -eDMwNjc7JiN4MzA1NzsmI3gzMDg3OyYjeDMwNDY7JiN4MzA0Qjs/Cg== - ---Multipart_Mon_Dec_16_23:07:49_2002-1 -Content-Type: text/plain; charset=US-ASCII - - -I copy and convert charset CharEnt/EUC_JP.pm to CharEnt/SHIFT_JIS.pm -(trying by NKF and XEmacs 21.4.10 with mule-ucs, and Emacs 21.2 with mule-ucs) - -;; I just had made "2002-12-02-snap" style one, refer from -;; http://www.unicode.org/ (-; -;; http://www.stained-g.net/shinichiro/mhonarc/CP932.pm.gz (and also bz2) -;; It's noneed now.. - -and adding follow 1 line in CharEnt.pm; - -line 121: 'shift-jis' => 'MHonArc/CharEnt/SHIFT_JIS.pm' - -;; I'm sorry, I could not understand Perl.. - -I must through the sub functions in CharEnt.pm? - -My .mrc file as follow; - - - -ISO-2022-JP; MHonArc::CharEnt::str2sgml; MHonArc/CharEnt.pm -Shift_JIS; MHonArc::CharEnt::str2sgml; MHonArc/CharEnt.pm -iso-8859-1; MHonArc::CharEnt::str2sgml; MHonArc/CharEnt.pm -iso-8859-4; MHonArc::CharEnt::str2sgml; MHonArc/CharEnt.pm - - - -m2h_external::filter; attachcheck - - - -m2h_text_plain::filter; attachcheck,asis:us-ascii,default=iso-2022-jp - - -[...] - -If I had some wrong settings, please pointing out. - -Thanks. - - --- - Shinichiro HIDA mailto:shinichiro@stained-g.net - GPG fingerprint = 5F2D 1656 FFF6 F691 A51C 5E61 E416 D398 470C 1CE9 ---Multipart_Mon_Dec_16_23:07:49_2002-1-- - ---------------------------------------------------------------------- -To sign-off this list, send email to majordomo@mhonarc.org with the -message text UNSUBSCRIBE MHONARC-USERS - diff -Nru spamassassin-3.4.6/xt/data/nice/cjk/iso-2022-jp.2 spamassassin-4.0.0~rc3/xt/data/nice/cjk/iso-2022-jp.2 --- spamassassin-3.4.6/xt/data/nice/cjk/iso-2022-jp.2 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/cjk/iso-2022-jp.2 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -Return-Path: owner-ports-jp@jp.freebsd.org -Return-Path: -Received: from updraft.jp.freebsd.org (updraft.jp.FreeBSD.ORG [210.157.158.42]) - by coconut.itojun.org (8.9.3+3.2W/3.7W) with ESMTP id WAA10857 - for ; Sun, 20 Feb 2000 22:08:59 +0900 (JST) -Received: from castle.jp.freebsd.org (castle.jp.freebsd.org [210.226.20.15]) - by updraft.jp.freebsd.org (8.9.3+3.2W/8.7.3/smtpfeed 1.04) with ESMTP id WAA06847; - Sun, 20 Feb 2000 22:07:34 +0900 (JST) - (envelope-from owner-ports-jp@jp.freebsd.org) -Received: (from daemon@localhost) - by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA22962; - Sun, 20 Feb 2000 22:07:32 +0900 (JST) - (envelope-from owner-ports-jp@jp.FreeBSD.org) -Received: from prince.net.ebina.hitachi.co.jp (sagami134136.allnet.ne.jp [210.251.134.136]) - by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id WAA22957 - for ; Sun, 20 Feb 2000 22:07:31 +0900 (JST) - (envelope-from sumikawa@ebina.hitachi.co.jp) -From: sumikawa@ebina.hitachi.co.jp -Received: from ebina.hitachi.co.jp (localhost [127.0.0.1]) - by prince.net.ebina.hitachi.co.jp (8.9.3/3.7W) with SMTP id WAA10556 - for ; Sun, 20 Feb 2000 22:07:30 +0900 (JST) -Message-Id: <200002201307.WAA10556@prince.net.ebina.hitachi.co.jp> -Date: Sun, 20 Feb 2000 22:07:29 +0900 (JST) -To: ports-jp@jp.freebsd.org -In-Reply-To: <20149.950850047@lychee.itojun.org> -References: <200002180440.NAA74451@prince.net.ebina.hitachi.co.jp> - <20149.950850047@lychee.itojun.org> -X-Mailer: xcite1.31> Mew version 1.95b10 on Emacs 20.4 / Mule 4.0 (HANANOEN) -Mime-Version: 1.0 -Content-Type: Text/Plain; charset=iso-2022-jp -Content-Transfer-Encoding: 7bit -Reply-To: ports-jp@jp.freebsd.org -Precedence: list -X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727 -X-Sequence: ports-jp 8947 -Subject: [ports-jp 8947] Re: ipv6 & ruby -Errors-To: owner-ports-jp@jp.freebsd.org -Sender: owner-ports-jp@jp.freebsd.org -X-Originator: sumikawa@ebina.hitachi.co.jp -X-Filter: mailagent [version 3.0 PL68] for itojun@itojun.org - ->꤬ޤ֤󡢤sshƱǤ ->Ĵ٤ޤ -itojun> ruby repositoryˤϽƤȤ⤤ޤ 1.4.x branch -itojun> 1.5 branch⡣ - -Web򸫤뤫äƤʤ褦˸ޤHEAD1.4.x⡣ -http://cvs.netlab.co.jp/cgi-bin/cvsweb/ruby/ext/socket/extconf.rb - -ʲpatches/patch-aa ФѥåǤ - -Index: patches/patch-aa -=================================================================== -RCS file: /home/ncvs/ports/lang/ruby/patches/patch-aa,v -retrieving revision 1.1 -diff -u -r1.1 patch-aa ---- patches/patch-aa 2000/01/12 19:16:44 1.1 -+++ patches/patch-aa 2000/02/20 13:06:46 -@@ -1,5 +1,5 @@ - --- ext/socket/extconf.rb.orig Fri Oct 29 13:45:41 1999 --+++ ext/socket/extconf.rb Wed Jan 12 17:15:03 2000 -++++ ext/socket/extconf.rb Sun Feb 20 22:04:32 2000 - @@ -57,8 +57,6 @@ - #endif - EOF -@@ -9,3 +9,14 @@ - $CFLAGS="-DINET6 "+$CFLAGS - elsif File.directory? "/usr/inet6" - $ipv6type = "linux" -+@@ -225,7 +223,9 @@ -+ } -+ } -+ -+- if (inet6 != 2 || inet4 != 2) -++ if (!(inet4 == 0 || inet4 == 2)) -++ goto bad; -++ if (!(inet6 == 0 || inet6 == 2)) -+ goto bad; -+ -+ if (aitop) - ---- -KAME Project - diff -Nru spamassassin-3.4.6/xt/data/nice/crlf-endings spamassassin-4.0.0~rc3/xt/data/nice/crlf-endings --- spamassassin-3.4.6/xt/data/nice/crlf-endings 2007-01-23 18:42:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/crlf-endings 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from example.com (mail1.example.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.example.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "Foo Test" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test whitelist_from_rcvd foo@example.com diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/AddedVtag_07 spamassassin-4.0.0~rc3/xt/data/nice/dkim/AddedVtag_07 --- spamassassin-3.4.6/xt/data/nice/dkim/AddedVtag_07 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/AddedVtag_07 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -From mickey@dkim.org Mon Oct 3 16:07:28 2005 -Return-Path: -Received: from sj-iport-1.cisco.com (sj-iport-1-in.cisco.com [171.71.176.70]) - by testing.dkim.org (8.12.11/8.12.10) with ESMTP id j93N7Svo006972 - for ; Mon, 3 Oct 2005 16:07:28 -0700 -Received: from sj-core-2.cisco.com ([171.71.177.254]) - by sj-iport-1.cisco.com with ESMTP; 03 Oct 2005 17:05:17 -0700 -X-IronPort-AV: i="3.97,170,1125903600"; - d="scan'208"; a="663225955:sNHT21674088" -Received: from localhost.localdomain (msd-dev1.cisco.com [172.23.250.157]) - by sj-core-2.cisco.com (8.12.10/8.12.6) with ESMTP id j9405CKC009921 - for ; Mon, 3 Oct 2005 17:05:12 -0700 (PDT) -Message-Id: <200510040005.j9405CKC009921@sj-core-2.cisco.com> -Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) -From: mickey@dkim.org -To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, - s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com -Subject: GM - Very Promising Beginning -Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -X-bcc: -X-Folder: \ExMerge - Zipper, Andy\origination -X-Origin: ZIPPER-A -X-FileName: andy zipper 6-26-02.PST -Status: RO -Lines: 29 -DKIM-Signature: v=DKIM1; a=rsa-sha1; q=dns; l=86; t=1128380848; x=-1019102801; - c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:GM=20-=20Very=20Promising=20Beginning; - b=WHPaw9WX707uYfqQDQhRuhJg+zXnm0LygVgLhHz8muCQCGuAN2rlvCLg5kss7+2NCM6x1pvy - 1JcYI3w4uWrYoQ==; -Authentication-Results: testing.dkim.org; header.from=mickey@dkim.org; dkim=neutral - -Team - -I think this is good news. We can cover this with Derrick on our conference call this morning. - --John - diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/BasicTest_01 spamassassin-4.0.0~rc3/xt/data/nice/dkim/BasicTest_01 --- spamassassin-3.4.6/xt/data/nice/dkim/BasicTest_01 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/BasicTest_01 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) -From: mickey@dkim.org -To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, - s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com -Subject: GM - Very Promising Beginning -Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -X-bcc: -X-Folder: \ExMerge - Zipper, Andy\origination -X-Origin: ZIPPER-A -X-FileName: andy zipper 6-26-02.PST -Status: RO -Lines: 29 -X-PMX-Version: 4.7.1.128075 -X-from-outside-Cisco: [171.71.17.133] -DKIM-Signature: a=rsa-sha1; q=dns; l=86; t=1128376560; x=-1019107089; - c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:GM=20-=20Very=20Promising=20Beginning; - b=HiaRUOyeTZBMD+n7U8rVToTwV3tKEsrOJhMgFnNYXRdNEBanH8KRphVVVxZ5qIj6HbhJqLe0 - SrqDLUM9yNLyiQ==; - -Team - -I think this is good news. We can cover this with Derrick on our conference call this morning. - --John - diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/MIMEnowsp_05 spamassassin-4.0.0~rc3/xt/data/nice/dkim/MIMEnowsp_05 --- spamassassin-3.4.6/xt/data/nice/dkim/MIMEnowsp_05 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/MIMEnowsp_05 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -From: mickey@dkim.org -To: craig@myittybitty.com -Subject: Purchase Soma Online - Huge Savings! catskill -Date: Fri, 06 Aug 2004 08:02:18 -0200 -X-Mailer: cusp employer -adobe-chieftain: bobcat whether windowpane -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="--782414426019314" -X-Spam-Status: No, hits=4.4 required=5.0 - tests=BAYES_90,HTML_30_40,NORMAL_HTTP_TO_IP,RCVD_IN_ORBS - version=2.55 -X-Spam-Level: **** -X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) -Status: RO -X-Status: -X-Keywords: -X-UID: 15148 -X-Aztec-Id: spamFN-6 -X-PMX-Version: 4.7.1.128075 -X-from-outside-Cisco: [171.71.17.133] -DKIM-Signature: a=rsa-sha1; q=dns; l=4771; t=1128379378; x=-1019104271; - c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:Purchase=20Soma=20Online=20-=20Huge=20Savings!=20catskill; - b=FUmCIY68uC3AJEZktmvjLurc4s40P3qgn6qTBVqBLbtmg/7cMfJD7hJJaZNiCpkGyALzvKp7 - Q0JXRSvWMSOo0A==; - -----782414426019314 -Content-Type: text/plain; - - - -----782414426019314 -Content-Type: text/html; -Content-Transfer-Encoding: QUOTED-PRINTABLE - - - - -loosen et ready - - - - -

    -
    - -


    -

     

    -
    -
    -

     

    -

    jujube dudley caliphate tantrum pyongyang earnest bowe= -l bronchitis sacrament pullman amigo postmen immodest bratwurst appendices= - atheist battlefield jew knoweth diffract otiose change viz absorbent stei= -n juno joey voice indigo longstanding washington glyceride hudson crescend= -o churchgoer=20 cardinal cancel chalice lot restrain schoolroom committeew= -oman diamagnetic pictorial ternary multiplex coset shadowy emery mephistop= -heles superb bible west spokane portland mcdonnell shah chalkboard done bo= -o coup wherein=20 portage downstate gerry doormen cramp sable ranch acknow= -ledgeable cyprian erik course surjection mohammedan ukraine elizabeth anse= -lmo luxury lombard heterozygous disrupt hyperbolic friedman backbone canis= -ter abridgment stronghold hypoactive craze=20 loosestrife - visit avionic slapstick yodel lop avarice possessive plural niagara gerh= -ard gagwriter pizzicato tantalus drunken waldorf snore=20 chlorate violin = -ordeal convulse casework behave trollop bunch illusion topocentric kudzu e= -ighth startup incongruous thaw tone tetrahedron flabbergast latrobe capric= -orn blissful junkerdom along abridge regulate straggle sequin reputation l= -afayette bulkhead needy awaken chaste constrain cafeteria=20 the ahem eucr= -e craftsperson and telemeter soulful - gentle >

    -

     

    -
    -

     

    -convergent abalone atlas axon attic dauphine tentacle jacobson francoise d= -rug arsenic shah lap bingle flat preemptor afar bocklogged indistinguishab= -le hollowware docket sickroom heritable inflammation aitken crump swarm ce= -zanne respecter timetable bodleian salmonella lifelong dominant squeak=20 = -the insuppressible sunrise stethoscope null campaign barbarism triangulate= - bebop disparate lipscomb incendiary notre dulcet ridden ethos glue pearls= -tone santiago conciliatory eradicable chorale frail servile quillwort came= -llia performance buttermilk urine dean detente winthrop zigzagging enigma = -austin coattail=20 coda only and abate athenian mollie capo citizen bipola= -r diffusive slung tick alcott chaperon snook beret messenger oblivious car= -lson hornbeam charity croupier ancestor depreciate duress vent bidden kett= -ering scandium armageddon lure knobby=20 -goggle helen zan skyjack kelvin dominate polar attire guilt bankrupt luthe= -r blitz kerr deluxe=20 the carib edematous powerful leeuwenhoek nichols fr= -igid aden quintillion door derail physik ct holiday tomatoes carolingian h= -andcuff cashier dabble turtleback=20 freestone wino reagan access appertai= -n epistle clonic beechwood array bey lynx cowpoke fayette zorn cosmic hex = -felony compound abstracter accusative inequity cessation copperas perfuse = -wipe assent crossbow euphoric schantz contract box deathbed battelle mine = -applejack blocky naivete seminal senate budgetary contingent=20 and shopke= -ep fidelity cometh poach mcguire general possessive adagio luxuriant befud= -dle realisable secession wayward clutch forsake hangar accreditate phloem = -ursuline silo winch circuit vicksburg boutique marvin dam imperfect contor= -t stonewall guidance assai=20 logic candlelight irishman compulsory artill= -ery appointe mansfield sandhill blanket nordstrom decibel activation wishy= - fairfield guernsey nuptial clarendon thwart credenza prevent silicide col= -e=20 airdrop the gentility bench crimp metallic nucleic involute rpm namep= -late tape sulfide area corps depress betide compagnie boathouse carrara be= -nnington alabama friday crosswise areawide procedure health spacesuit kenn= -an the=20 - - - -----782414426019314-- - diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/MIMEsimple_04 spamassassin-4.0.0~rc3/xt/data/nice/dkim/MIMEsimple_04 --- spamassassin-3.4.6/xt/data/nice/dkim/MIMEsimple_04 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/MIMEsimple_04 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -From: mickey@dkim.org -To: craig@myittybitty.com -Subject: Purchase Soma Online - Huge Savings! catskill -Date: Fri, 06 Aug 2004 08:02:18 -0200 -X-Mailer: cusp employer -adobe-chieftain: bobcat whether windowpane -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="--782414426019314" -X-Spam-Status: No, hits=4.4 required=5.0 - tests=BAYES_90,HTML_30_40,NORMAL_HTTP_TO_IP,RCVD_IN_ORBS - version=2.55 -X-Spam-Level: **** -X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) -Status: RO -X-Status: -X-Keywords: -X-UID: 15148 -X-Aztec-Id: spamFN-6 -X-PMX-Version: 4.7.1.128075 -X-from-outside-Cisco: [171.71.17.133] -DKIM-Signature: a=rsa-sha1; q=dns; l=5560; t=1128378923; x=-1019104726; - c=simple; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:Purchase=20Soma=20Online=20-=20Huge=20Savings!=20catskill; - b=XvfZthg49JPHwJxO1LJ0RhQt87D0kylN+OzyxbotV5ImhB6Vx8XeLkICUB74detRQ02Cmp2b - CpvhaGjt64F76g==; - -----782414426019314 -Content-Type: text/plain; - - - -----782414426019314 -Content-Type: text/html; -Content-Transfer-Encoding: QUOTED-PRINTABLE - - - - -loosen et ready - - - - -

    -
    - -


    -

     

    -
    -
    -

     

    -

    jujube dudley caliphate tantrum pyongyang earnest bowe= -l bronchitis sacrament pullman amigo postmen immodest bratwurst appendices= - atheist battlefield jew knoweth diffract otiose change viz absorbent stei= -n juno joey voice indigo longstanding washington glyceride hudson crescend= -o churchgoer=20 cardinal cancel chalice lot restrain schoolroom committeew= -oman diamagnetic pictorial ternary multiplex coset shadowy emery mephistop= -heles superb bible west spokane portland mcdonnell shah chalkboard done bo= -o coup wherein=20 portage downstate gerry doormen cramp sable ranch acknow= -ledgeable cyprian erik course surjection mohammedan ukraine elizabeth anse= -lmo luxury lombard heterozygous disrupt hyperbolic friedman backbone canis= -ter abridgment stronghold hypoactive craze=20 loosestrife - visit avionic slapstick yodel lop avarice possessive plural niagara gerh= -ard gagwriter pizzicato tantalus drunken waldorf snore=20 chlorate violin = -ordeal convulse casework behave trollop bunch illusion topocentric kudzu e= -ighth startup incongruous thaw tone tetrahedron flabbergast latrobe capric= -orn blissful junkerdom along abridge regulate straggle sequin reputation l= -afayette bulkhead needy awaken chaste constrain cafeteria=20 the ahem eucr= -e craftsperson and telemeter soulful - gentle >

    -

     

    -
    -

     

    -convergent abalone atlas axon attic dauphine tentacle jacobson francoise d= -rug arsenic shah lap bingle flat preemptor afar bocklogged indistinguishab= -le hollowware docket sickroom heritable inflammation aitken crump swarm ce= -zanne respecter timetable bodleian salmonella lifelong dominant squeak=20 = -the insuppressible sunrise stethoscope null campaign barbarism triangulate= - bebop disparate lipscomb incendiary notre dulcet ridden ethos glue pearls= -tone santiago conciliatory eradicable chorale frail servile quillwort came= -llia performance buttermilk urine dean detente winthrop zigzagging enigma = -austin coattail=20 coda only and abate athenian mollie capo citizen bipola= -r diffusive slung tick alcott chaperon snook beret messenger oblivious car= -lson hornbeam charity croupier ancestor depreciate duress vent bidden kett= -ering scandium armageddon lure knobby=20 -goggle helen zan skyjack kelvin dominate polar attire guilt bankrupt luthe= -r blitz kerr deluxe=20 the carib edematous powerful leeuwenhoek nichols fr= -igid aden quintillion door derail physik ct holiday tomatoes carolingian h= -andcuff cashier dabble turtleback=20 freestone wino reagan access appertai= -n epistle clonic beechwood array bey lynx cowpoke fayette zorn cosmic hex = -felony compound abstracter accusative inequity cessation copperas perfuse = -wipe assent crossbow euphoric schantz contract box deathbed battelle mine = -applejack blocky naivete seminal senate budgetary contingent=20 and shopke= -ep fidelity cometh poach mcguire general possessive adagio luxuriant befud= -dle realisable secession wayward clutch forsake hangar accreditate phloem = -ursuline silo winch circuit vicksburg boutique marvin dam imperfect contor= -t stonewall guidance assai=20 logic candlelight irishman compulsory artill= -ery appointe mansfield sandhill blanket nordstrom decibel activation wishy= - fairfield guernsey nuptial clarendon thwart credenza prevent silicide col= -e=20 airdrop the gentility bench crimp metallic nucleic involute rpm namep= -late tape sulfide area corps depress betide compagnie boathouse carrara be= -nnington alabama friday crosswise areawide procedure health spacesuit kenn= -an the=20 - - - -----782414426019314-- - diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/MultipleAuthRes_10 spamassassin-4.0.0~rc3/xt/data/nice/dkim/MultipleAuthRes_10 --- spamassassin-3.4.6/xt/data/nice/dkim/MultipleAuthRes_10 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/MultipleAuthRes_10 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) -From: mickey@dkim.org -To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, - s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com -Subject: GM - Very Promising Beginning -Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -X-bcc: -X-Folder: \ExMerge - Zipper, Andy\origination -Authentication-Results: somewhere.someplace.org; header.From=mickey@someplace.org; dkim=pass ( - message from someplace.org verified; ); -X-Origin: ZIPPER-A -X-FileName: andy zipper 6-26-02.PST -Status: RO -Lines: 29 -Authentication-Results: somewhere.someplace.org; header.From=mickey@someplace.org; dkim=pass ( - message from someplace.org verified; ); -X-PMX-Version: 4.7.1.128075 -X-from-outside-Cisco: [171.71.17.133] - -Team - -I think this is good news. We can cover this with Derrick on our conference call this morning. - --John - diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/MultipleReceived_08 spamassassin-4.0.0~rc3/xt/data/nice/dkim/MultipleReceived_08 --- spamassassin-3.4.6/xt/data/nice/dkim/MultipleReceived_08 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/MultipleReceived_08 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -From mickey@dkim.org Mon Oct 3 16:23:11 2005 -Return-Path: -Received: from sj-iport-3.cisco.com (sj-iport-3-in.cisco.com [171.71.176.72]) - by testing.dkim.org (8.12.11/8.12.10) with ESMTP id j93NNBLM007069 - for ; Mon, 3 Oct 2005 16:23:11 -0700 -Received: from sj-core-5.cisco.com ([171.71.177.238]) - by sj-iport-3.cisco.com with ESMTP; 03 Oct 2005 17:20:47 -0700 -X-IronPort-AV: i="3.97,170,1125903600"; - d="scan'208"; a="347921400:sNHT1313223096" -Received: from localhost.localdomain (msd-dev1.cisco.com [172.23.250.157]) - by sj-core-5.cisco.com (8.12.10/8.12.6) with ESMTP id j940Ki4V000732 - for ; Mon, 3 Oct 2005 17:20:45 -0700 (PDT) -Message-Id: <200510040020.j940Ki4V000732@sj-core-5.cisco.com> -Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) -From: mickey@dkim.org -To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, - s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com -Subject: GM - Very Promising Beginning -Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -X-bcc: -X-Folder: \ExMerge - Zipper, Andy\origination -X-Origin: ZIPPER-A -X-FileName: andy zipper 6-26-02.PST -Status: RO -Lines: 29 -DKIM-Signature: a=rsa-sha1; q=dns; l=86; t=1128381791; x=-1019101858; - c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version:Received:Received; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:GM=20-=20Very=20Promising=20Beginning; - b=Em5nrNOWNehnnsL4VjXj0ijk8TkOgg1xn37Qxd/kYAOvoBXjHVDKmd/jQ+kM9QTQhMzre0Cu - J5WyEN9oKrmskA==; - -Team - -I think this is good news. We can cover this with Derrick on our conference call this morning. - --John - diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/MultipleSig_06 spamassassin-4.0.0~rc3/xt/data/nice/dkim/MultipleSig_06 --- spamassassin-3.4.6/xt/data/nice/dkim/MultipleSig_06 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/MultipleSig_06 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -DKIM-Signature: a=rsa-sha1; q=dns; l=86; t=1128380111; x=-1019103538; - c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:GM=20-=20Very=20Promising=20Beginning; - b=FyLa7/cquySLyz3CZcTwASVIylFXitD7U1xIwpe8enLknN/UJnw5rPIpsGDqYtxKdlm9hFrb - SIc5FYKCQ0Xtqw==; -DKIM-Signature: a=rsa-sha1; q=dns; l=86; t=1128376560; x=-1019107089; - c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:GM=20-=20Very=20Promising=20Beginning; - b=HiaRUOyeTZBMD+n7U8rVToTwV3tKEsrOJhMgFnNYXRdNEBanH8KRphVVVxZ5qIj6HbhJqLe0 - SrqDLUM9yNLyiQ==; -Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) -From: mickey@dkim.org -To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, - s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com -Subject: GM - Very Promising Beginning -Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -X-bcc: -X-Folder: \ExMerge - Zipper, Andy\origination -X-Origin: ZIPPER-A -X-FileName: andy zipper 6-26-02.PST -Status: RO -Lines: 29 -X-PMX-Version: 4.7.1.128075 -X-from-outside-Cisco: [171.71.17.133] - -Team - -I think this is good news. We can cover this with Derrick on our conference call this morning. - --John - diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/NonExistingHeader_09 spamassassin-4.0.0~rc3/xt/data/nice/dkim/NonExistingHeader_09 --- spamassassin-3.4.6/xt/data/nice/dkim/NonExistingHeader_09 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/NonExistingHeader_09 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -From mickey@dkim.org Mon Oct 3 23:34:13 2005 -Return-Path: -Received: from sj-iport-5.cisco.com (sj-iport-5.cisco.com [171.68.10.87]) - by testing.dkim.org (8.12.11/8.12.10) with ESMTP id j946YDQp007981 - for ; Mon, 3 Oct 2005 23:34:13 -0700 -Received: from sj-core-4.cisco.com ([171.68.223.138]) - by sj-iport-5.cisco.com with ESMTP; 04 Oct 2005 00:32:01 -0700 -X-IronPort-AV: i="3.97,171,1125903600"; - d="scan'208"; a="216807210:sNHT21216320" -Received: from localhost.localdomain ([171.71.17.133]) - by sj-core-4.cisco.com (8.12.10/8.12.6) with ESMTP id j947Vwuk003169 - for ; Tue, 4 Oct 2005 00:31:58 -0700 (PDT) -Message-Id: <200510040731.j947Vwuk003169@sj-core-4.cisco.com> -Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) -From: mickey@dkim.org -To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, - s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com -Subject: GM - Very Promising Beginning -Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -X-bcc: -X-Folder: \ExMerge - Zipper, Andy\origination -X-Origin: ZIPPER-A -X-FileName: andy zipper 6-26-02.PST -Status: RO -Lines: 29 -X-PMX-Version: 4.7.1.128075 -X-from-outside-Cisco: [171.71.17.133] -DKIM-Signature: a=rsa-sha1; q=dns; l=86; t=1128407653; x=-1019075996; - c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version:X-DKIM; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:GM=20-=20Very=20Promising=20Beginning; - b=arNPPGvmpIRG9XQP8qDp1L9AW8pSAphkFmLlN4fMjOHHfdU1vsWfBOzWgcAcBkvSnlYBvpRK - 7W1xBb+SOrBCvQ==; -Authentication-Results: testing.dkim.org; header.From=mickey@dkim.org; dkim=pass ( - message from dkim.org verified; ); - -Team - -I think this is good news. We can cover this with Derrick on our conference call this morning. - --John - diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/Nowsp_03 spamassassin-4.0.0~rc3/xt/data/nice/dkim/Nowsp_03 --- spamassassin-3.4.6/xt/data/nice/dkim/Nowsp_03 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/Nowsp_03 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) -From: mickey@dkim.org -To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, - s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com -Subject: GM - Very Promising Beginning -Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -X-bcc: -X-Folder: \ExMerge - Zipper, Andy\origination -X-Origin: ZIPPER-A -X-FileName: andy zipper 6-26-02.PST -Status: RO -Lines: 29 -X-PMX-Version: 4.7.1.128075 -X-from-outside-Cisco: [171.71.17.133] -DKIM-Signature: a=rsa-sha1; q=dns; l=86; t=1128376560; x=-1019107089; - c=nowsp; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:GM=20-=20Very=20Promising=20Beginning; - b=HiaRUOyeTZBMD+n7U8rVToTwV3tKEsrOJhMgFnNYXRdNEBanH8KRphVVVxZ5qIj6HbhJqLe0 - SrqDLUM9yNLyiQ==; - -Team - -I think this is good news. We can cover this with Derrick on our conference call this morning. - --John - diff -Nru spamassassin-3.4.6/xt/data/nice/dkim/Simple_02 spamassassin-4.0.0~rc3/xt/data/nice/dkim/Simple_02 --- spamassassin-3.4.6/xt/data/nice/dkim/Simple_02 2006-03-24 02:19:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/dkim/Simple_02 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -Date: Thu, 31 May 2001 07:13:26 -0700 (PDT) -From: mickey@dkim.org -To: andy.zipper@enron.com, david.berberian@enron.com, rex.shelby@enron.com, - s..palmer@enron.com, david.forster@enron.com, marc.eichmann@enron.com -Subject: GM - Very Promising Beginning -Cc: john.pavetto@enron.com, leonardo.pacheco@enron.com -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit -X-bcc: -X-Folder: \ExMerge - Zipper, Andy\origination -X-Origin: ZIPPER-A -X-FileName: andy zipper 6-26-02.PST -Status: RO -Lines: 29 -X-PMX-Version: 4.7.1.128075 -X-from-outside-Cisco: [171.71.17.133] -DKIM-Signature: a=rsa-sha1; q=dns; l=114; t=1128376791; x=-1019106858; - c=simple; s=testing1234; h=Subject:From:To:Cc:Date:Content-Type:Content-Transfer-Encoding:MIME-Version; - d=dkim.org; i=mickey@dkim.org; z=From:mickey@dkim.org| - Subject:GM=20-=20Very=20Promising=20Beginning; - b=VkR/8NBKRZtNWxozFYrkQ+gRVQguBmzFSsjI3103dEifArEjv+YydmsqODwnXz54BiBuLGzn - 5cl4ME55ulLxlw==; - -Team - -I think this is good news. We can cover this with Derrick on our conference call this morning. - --John - diff -Nru spamassassin-3.4.6/xt/data/nice/mailman_message.txt spamassassin-4.0.0~rc3/xt/data/nice/mailman_message.txt --- spamassassin-3.4.6/xt/data/nice/mailman_message.txt 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mailman_message.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -From julliard@winehq.com Wed Sep 4 19:07:34 2002 -Received: (qmail 27859 invoked by uid 1001); 5 Sep 2002 02:25:41 -0000 -Received: from pop.pi.sbcglobal.net [207.115.63.84] - by localhost with POP3 (fetchmail-5.9.11 polling pop.sbcglobal.net account matt_relay) - for matt@localhost (single-drop); Wed, 04 Sep 2002 19:25:41 -0700 (PDT) -Received: from vm4-ext.prodigy.net by vm4 with SMTP; Wed, 4 Sep 2002 22:26:20 -0400 -X-Originating-IP: [64.49.198.145] -Received: from mail1.mailwizards.com (mail1.mailwizards.com [64.49.198.145]) - by vm4-ext.prodigy.net (8.12.3 da nor stuldap/8.12.3) with ESMTP id g852QJix196066 - for ; Wed, 4 Sep 2002 22:26:19 -0400 -Received: from wine.codeweavers.com (wine.codeweavers.com [198.144.4.3]) - by mail1.mailwizards.com (8.11.4/MW-2.03) with ESMTP id g852QIu06714 - for ; Wed, 4 Sep 2002 21:26:18 -0500 (CDT) -Received: from localhost.localdomain (wine [127.0.0.1]) - by wine.codeweavers.com (8.11.6/8.11.6) with ESMTP id g852ClF25431; - Wed, 4 Sep 2002 21:12:47 -0500 -Received: from mail.wine.dyndns.org (12-235-88-76.client.attbi.com [12.235.88.76]) - by wine.codeweavers.com (8.11.6/8.11.6) with ESMTP id g8527bF25126 - for ; Wed, 4 Sep 2002 21:07:37 -0500 -Received: from mail.wine.dyndns.org (julliard@localhost [127.0.0.1]) - by mail.wine.dyndns.org (8.12.3/8.12.3/Debian -4) with ESMTP id g8527Z0a029784 - for ; Wed, 4 Sep 2002 19:07:35 -0700 -Received: (from julliard@localhost) - by mail.wine.dyndns.org (8.12.3/8.12.3/Debian -4) id g8527Zmq029780; - Wed, 4 Sep 2002 19:07:35 -0700 -To: wine-announce@winehq.com -Subject: Wine release 20020904 -From: Alexandre Julliard -Message-ID: <87elc9xk7t.fsf@mail.wine.dyndns.org> -Lines: 48 -User-Agent: Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Common Lisp) -MIME-Version: 1.0 -Content-Type: text/plain; - charset=us-ascii -Sender: wine-announce-admin@winehq.com -Errors-To: wine-announce-admin@winehq.com -X-BeenThere: wine-announce@winehq.com -X-Mailman-Version: 2.0 -Precedence: bulk -Reply-To: wine-devel@winehq.com -List-Help: -List-Post: -List-Subscribe: , - -List-Id: Wine Announcements -List-Unsubscribe: , - -List-Archive: -Date: 04 Sep 2002 19:07:34 -0700 -X-DCC-wanadoo-be-Metrics: kagome 1016; Body=1 Fuz1=1 Fuz2=1 -X-Spam-Status: No, hits=-2.9 required=5.0 - tests=KNOWN_MAILING_LIST,SPAM_PHRASE_03_05,SUBJ_HAS_UNIQ_ID, - USER_AGENT - version=2.50-cvs -X-Spam-Level: -Status: R -X-Status: N - -This is release 20020904 of Wine, a free implementation of Windows on -Unix. This is still a developers only release. There are many bugs -and unimplemented features. Most applications still do not work -correctly. - -Patches should be submitted to "wine-patches@winehq.com". Please don't -forget to include a ChangeLog entry. - -WHAT'S NEW with Wine-20020904: (see ChangeLog for details) - - Much improved PowerPC support. - - More correct locale definitions. - - Progress on the conversion of handle types to pointers. - - Many Visio and Quicken fixes merged from Crossover. - - Lots of bug fixes. - -See the README file in the distribution for installation instructions. - -Because of lags created by using mirror, this message may reach you before -the release is available at the ftp sites. The sources will be available -from the following locations: - - http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-20020904.tar.gz - ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/ALPHA/wine/development/Wine-20020904.tar.gz - ftp://ftp.fu-berlin.de/unix/linux/mirrors/sunsite.unc.edu/ALPHA/wine/development/Wine-20020904.tar.gz - ftp://orcus.progsoc.uts.edu.au/pub/Wine/development/Wine-20020904.tar.gz - -It should also be available from any other site that mirrors ibiblio.org. -For more download locations, see http://ftpsearch.lycos.com. These -locations also hold pre-built documentation packages in various -formats: wine-doc-html.tar.gz, wine-doc-txt.tar.gz, wine-doc.pdf.gz -and wine-doc.ps.gz. - -You can also get the current source directly from the CVS tree. Check -http://www.winehq.com/development/ for details. - -If you submitted a patch, please check to make sure it has been -included in the new release. - -If you want to receive by mail a patch against the previous release -when a new one is released, you can subscribe to the mailing list at -http://tiger.informatik.hu-berlin.de/cgi-bin/mailman/listinfo/wine-patches. - -Wine is available thanks to the work of many people. See the file -AUTHORS in the distribution for the complete list. - --- -Alexandre Julliard -julliard@winehq.com - - diff -Nru spamassassin-3.4.6/xt/data/nice/mime1 spamassassin-4.0.0~rc3/xt/data/nice/mime1 --- spamassassin-3.4.6/xt/data/nice/mime1 2004-01-26 23:27:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mime1 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -From nsb@thumper.bellcore.com Tue Dec 24 08:52:04 1991 -Received: from dimacs.rutgers.edu by akbar.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA21889; Tue, 24 Dec 91 05:52:04 -0800 -Received: by dimacs.rutgers.edu (5.59/SMI4.0/RU1.4/3.08) - id AA09350; Tue, 24 Dec 91 08:14:38 EST -Received: from thumper.bellcore.com by dimacs.rutgers.edu (5.59/SMI4.0/RU1.4/3.08) - id AA09346; Tue, 24 Dec 91 08:14:33 EST -Received: from greenbush.bellcore.com by thumper.bellcore.com (4.1/4.7) - id for ietf-822@dimacs.rutgers.edu; Tue, 24 Dec 91 08:14:30 EST -Received: by greenbush.bellcore.com (4.1/4.7) - id for ietf-822@dimacs.rutgers.edu; Tue, 24 Dec 91 08:14:29 EST -Received: from Messages.8.0.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41 - via MS.5.6.greenbush.galaxy.sun4_41; - Tue, 24 Dec 1991 08:14:27 -0500 (EST) -Message-Id: -Date: Tue, 24 Dec 1991 08:14:27 -0500 (EST) -From: Nathaniel Borenstein -X-Andrew-Message-Size: 747+0 -Mime-Version: 1.0 -Content-Type: multipart/alternative; - boundary="Interpart_Boundary_AdJn:mu0M2YtJKaFh9AdJn:mu0M2YtJKaFk=" -To: ietf-822@dimacs.rutgers.edu -Subject: Re: a MIME-Version misfeature -Status: RO - -This message has been composed in the 'multipart' format for extended -mail bodies. If you are reading this prefix, your mail reader probably has -not yet been modified to understand the new format, and some of what follows -may look strange. You may wish to look into upgrading your mail reader. - -However, the first part of this message (immediately after the funny-looking -boundary line) is the text-only version of the message. If you read that part -and skip the rest, you will probably understand the gist of the message. ---Interpart_Boundary_AdJn:mu0M2YtJKaFh9AdJn:mu0M2YtJKaFk= - -I have no problem with changing the BNF to permit the period, as Mark -suggests. However, I disagree violently with the following comment: - -Excerpts from internet.ietf-822: 23-Dec-91 a MIME-Version misfeature -Mark Crispin@cac.washing (429*) - -> All in all, it's starting to look like MIME-Version is not really all that -> well thought out and is in danger of being superfluous baggage. - -Some kind of version number is, in my opinion, totally vital -- getting -rid of MIME-Version without some similar versioning mechanism to replace -it would be, for me, a real show-stopper. - -By the way, this message is being sent by an experimental version of -Andrew I'm playing with. I'd be interested in any comments you have on -its formatting, etc. -- Nathaniel - ---Interpart_Boundary_AdJn:mu0M2YtJKaFh9AdJn:mu0M2YtJKaFk= -Content-Type: multipart/mixed; - boundary="Alternative_Boundary_8dJn:mu0M2Yt5KaFZ8AdJn:mu0M2Yt1KaFdA" - ---Alternative_Boundary_8dJn:mu0M2Yt5KaFZ8AdJn:mu0M2Yt1KaFdA -Content-type: text/richtext -Content-Transfer-Encoding: quoted-printable - -I have no problem with changing the BNF to permit the period, as Mark -suggests. However, I disagree violently with the following -comment:Excerpts from internet.ietf-822: 23-Dec-91 a -MIME-Version misfeature Mark Crispin@cac.washing -(429*)All in all, it's starting to look -like MIME-Version is not really all thatwell -thought out and is in danger of being superfluous -baggage.Some kind of version number is, in my opinion, -totally vital -- getting rid of MIME-Version without some similar versioning -mechanism to replace it would be, for me, a real show-stopper.By the -way, this message is being sent by an experimental version of Andrew I'm -playing with. I'd be interested in any comments you have on its formatting, -etc. -- Nathaniel\ - ---Alternative_Boundary_8dJn:mu0M2Yt5KaFZ8AdJn:mu0M2Yt1KaFdA-- - ---Interpart_Boundary_AdJn:mu0M2YtJKaFh9AdJn:mu0M2YtJKaFk= -Content-type: application/andrew-inset - -\begindata{text,1672608} -\textdsversion{12} -\template{messages} -I have no problem with changing the BNF to permit the period, as Mark -suggests. However, I disagree violently with the following comment: - - -\excerptedcaption{Excerpts from internet.ietf-822: 23-Dec-91 a MIME-Version -misfeature Mark Crispin@cac.washing (429*)} - - -\quotation{All in all, it's starting to look like MIME-Version is not really -all that - -}\quotation{well thought out and is in danger of being superfluous baggage. - -} -Some kind of version number is, in my opinion, totally vital -- getting rid of -MIME-Version without some similar versioning mechanism to replace it would be, -for me, a real show-stopper. - - -By the way, this message is being sent by an experimental version of Andrew -I'm playing with. I'd be interested in any comments you have on its -formatting, etc. -- Nathaniel - -\enddata{text,1672608} - ---Interpart_Boundary_AdJn:mu0M2YtJKaFh9AdJn:mu0M2YtJKaFk=-- - diff -Nru spamassassin-3.4.6/xt/data/nice/mime2 spamassassin-4.0.0~rc3/xt/data/nice/mime2 --- spamassassin-3.4.6/xt/data/nice/mime2 2004-01-26 23:27:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mime2 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -From nsb@thumper.bellcore.com Tue Oct 8 10:29:39 1991 -Received: from Tomobiki-Cho.CAC.Washington. (Tomobiki-Cho.CAC.Washington.EDU) by Ikkoku-Kan.Panda.COM - (NeXT-1.0 (From Sendmail 5.52)/UW-NDC Revision: 2.22 ) id AA12299; Tue, 8 Oct 91 07:29:39 PDT -Return-Path: -Received: from thumper.bellcore.com by Tomobiki-Cho.CAC.Washington.EDU - (NeXT-1.0 (From Sendmail 5.52)/UW-NDC Revision: 1.60.MRC ) id AA27545; Tue, 8 Oct 91 07:28:25 PDT -Received: from greenbush.bellcore.com by thumper.bellcore.com (4.1/4.7) - id for mrc@panda.com; Tue, 8 Oct 91 10:25:41 EDT -Received: by greenbush.bellcore.com (4.1/4.7) - id for mrc@panda.com; Tue, 8 Oct 91 10:25:36 EDT -Date: Tue, 8 Oct 91 10:25:36 EDT -From: nsb@thumper.bellcore.com (Nathaniel Borenstein) -Message-Id: <9110081425.AA00616@greenbush.bellcore.com> -To: mrc@panda.com -Subject: Re: multipart mail -MIME-Version: 1.0 -Content-Type: audio/basic -Content-Transfer-Encoding: base64 -Content-Description: Hi Mark -Status: RO - -+Pv/d3RydWlnbGtnYWJiaWxqaWxucHrx7erk7X709Pfx6eXo5uXe3Ojw+Px1cXZra2dsbGdr - diff -Nru spamassassin-3.4.6/xt/data/nice/mime3 spamassassin-4.0.0~rc3/xt/data/nice/mime3 --- spamassassin-3.4.6/xt/data/nice/mime3 2004-01-26 23:27:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mime3 1970-01-01 00:00:00.000000000 +0000 @@ -1,134 +0,0 @@ -From nsb Thu Oct 3 16:04:09 1991 -Received: from hanna.cac.washington.edu by akbar.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA29543; Thu, 3 Oct 91 13:04:09 -0700 -Received: from thumper.bellcore.com by hanna.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA19372; Thu, 3 Oct 91 13:03:25 -0700 -Received: from greenbush.bellcore.com by thumper.bellcore.com (4.1/4.7) - id for MRC@CAC.Washington.EDU; Thu, 3 Oct 91 16:03:12 EDT -Received: by greenbush.bellcore.com (4.1/4.7) - id for MRC@CAC.Washington.EDU; Thu, 3 Oct 91 16:03:09 EDT -Received: from Messages.7.14.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.40 - via MS.5.6.greenbush.galaxy.sun4_40; - Thu, 3 Oct 1991 16:03:08 -0400 (EDT) -Resent-Message-Id: -Resent-Date: Thu, 3 Oct 1991 16:03:08 -0400 (EDT) -Resent-From: Nathaniel Borenstein -If-Type-Unsupported: send -Resent-To: Mark Crispin -Return-Path: -Date: Thu, 19 Sep 91 12:41:43 EDT -From: nsb@thumper.bellcore.com (Nathaniel Borenstein) -Message-Id: <9109191641.AA12840@greenbush.bellcore.com> -To: abel@thumper.bellcore.com, bianchi@thumper.bellcore.com, - braun@thumper.bellcore.com, cameron@thumper.bellcore.com, - carmen@thumper.bellcore.com, jfp@thumper.bellcore.com, - jxr@thumper.bellcore.com, kraut@thumper.bellcore.com, - lamb@thumper.bellcore.com, lowery@thumper.bellcore.com, - lynn@thumper.bellcore.com, mlittman@thumper.bellcore.com, - nancyg@thumper.bellcore.com, sau@thumper.bellcore.com, - shoshi@thumper.bellcore.com, slr@thumper.bellcore.com, - stornett@flash.bellcore.com, tkl@thumper.bellcore.com -Cc: nsb@thumper.bellcore.com, trina@flash.bellcore.com -MIME-Version: 1.0 -Content-Type: MULTIPART/MIXED;boundary=Outermost_Trek -Status: RO - ---Outermost_Trek -Content-type: MULTIPART/MIXED;boundary=Where_No_One_Has_Gone_Before - ---Where_No_One_Has_Gone_Before - -You are invited to a - -*** STAR TREK 25TH ANNIVERSARY PARTY *** - -When: September 28, 1991, 4:30 PM until whenever -What: For those interested, we'll have a rerun of last year's season-ending - cliffhanger, and then we'll tune in the season opener and the 25th - anniversary TV special. Prior to that, if you bring some food - we'll have a pot-luck meal, and general merriment before and after. -Who: You and your family, including kids of course. -Where: 25 Washington Avenue, Morristown. - (See Nathaniel if you need directions.) -RSVP: 993-8586 - -What follows is some Star Trek related multimedia mail, the last of which will give you a chance to RSVP on line. - -Live Long and Prosper! -- Nathaniel & Trina ---Where_No_One_Has_Gone_Before -Content-type: audio/x-sun -Content-transfer-encoding: base64 -Content-Description: He's dead, Jim - -LnNuZAAAACAAAFmUAAAAAQAAH0AAAAABAAAAAAAAAAD////////37+/r7e/z9/f7//93b29z - ---Where_No_One_Has_Gone_Before-- ---Outermost_Trek -Content-type: MULTIPART/MIXED;boundary=Where_No_Man_Has_Gone_Before - ---Where_No_Man_Has_Gone_Before -Content-type: image/gif -Content-transfer-encoding: base64 -Content-description: Kirk/Spock/McCoy - -R0lGODdhQAHIAKMAAAAAAP+2bQAAACQAAAAASEgAAAAkSEgkJG0kJJEkAABIkZFIJCRttrZt - ---Where_No_Man_Has_Gone_Before -Content-type: image/gif -Content-transfer-encoding: base64 -Content-description: Star Trek Next Generation - -R0lGODdhQAHIAKcAACQkJNsAAAAAALZJJP+SbbZtJLYAANuSSZJJANttSf+2bZIkAJIAAEkk - ---Where_No_Man_Has_Gone_Before -Content-Type: APPLICATION/X-BE2;version=12 - -\begindata{text, 269602880} -\textdsversion{12} -\template{messages} - -Where no man has gone before... - -Click on the "death star" icon to start the animation: - -... by Curt Galloway -\enddata{text,269602880} ---Where_No_Man_Has_Gone_Before -Content-Type: application/atomicmail;version="1.12" - -; -; -; -; -; This message contains a ATOMICMAIL program. If you are reading -; this now, that probably means that your mail reader does not know -; how to handle ATOMICMAIL programs. -; -; If you were reading this with a mailer that had been extended to understand -; the ATOMICMAIL language, this mail message would automatically interact -; with you and take certain actions based on your responses. However, -; the language is designed in such a way that ATOMICMAIL programs can -; NEVER do you serious harm. -; -; If your computer has a ATOMICMAIL interpreter but it has not been linked -; into your mail system, you can run this program by piping the mail -; through the ATOMICMAIL interpreter. (In Berkeley mail, for example, you simply type -; "pipe atomicmail".) Otherwise, you can simply write the mail -; out to a file and then type "atomicmail that-file-name". -; -; If your computer doesn't have any ATOMICMAIL software at all, you -; should probably reply to the sender of this message to tell -; him or her that you were unable to run this program. -; - ---Where_No_Man_Has_Gone_Before-- ---Outermost_Trek -Content-type: audio/x-sun -Content-transfer-encoding: base64 -Content-Description: Distress calls - -LnNuZAAAACAAAIguAAAAAQAAH0AAAAABAAAAAAAAAAD///////93//////////////////// - ---Outermost_Trek-- - - diff -Nru spamassassin-3.4.6/xt/data/nice/mime4 spamassassin-4.0.0~rc3/xt/data/nice/mime4 --- spamassassin-3.4.6/xt/data/nice/mime4 2004-01-26 23:27:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mime4 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -From sau@sleepy.bellcore.com Thu Oct 3 16:04:23 1991 -Received: from hanna.cac.washington.edu by akbar.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA29550; Thu, 3 Oct 91 13:04:23 -0700 -Received: from thumper.bellcore.com by hanna.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA19374; Thu, 3 Oct 91 13:04:04 -0700 -Received: from greenbush.bellcore.com by thumper.bellcore.com (4.1/4.7) - id for MRC@CAC.Washington.EDU; Thu, 3 Oct 91 16:04:01 EDT -Received: by greenbush.bellcore.com (4.1/4.7) - id for MRC@CAC.Washington.EDU; Thu, 3 Oct 91 16:03:59 EDT -Received: from Messages.7.14.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.40 - via MS.5.6.greenbush.galaxy.sun4_40; - Thu, 3 Oct 1991 16:03:59 -0400 (EDT) -Resent-Message-Id: -Resent-Date: Thu, 3 Oct 1991 16:03:59 -0400 (EDT) -Resent-From: Nathaniel Borenstein -If-Type-Unsupported: send -Resent-To: Mark Crispin -Return-Path: -Date: Fri, 24 May 91 10:40:25 EDT -From: sau@sleepy.bellcore.com (Stephen A Uhler) -Message-Id: <9105241440.AA08935@sleepy.bellcore.com> -To: nsb@sleepy.bellcore.com -Subject: A cheap digitizer test -Cc: sau@sleepy.bellcore.com -MIME-Version: 1.0 -Content-Type: MULTIPART/MIXED;boundary="mail.sleepy.sau.144.8891" -Status: RO - ---mail.sleepy.sau.144.8891 - -Well, here's a sample ---mail.sleepy.sau.144.8891 -Content-type: image/pgm -Content-transfer-encoding: base64 -Content-Description: Bellcore mug -Comments: 256 x Image wrapped by /usr/sau/bin/fetch_video -Date: Fri May 24 10:35:57 EDT 1991 - -UDUKMjU2IDI0NAoyNTUKAHaPj4+Pj4+Pj4+Pj4+Pj4+Pj5ubm5ubm5ubm5ubm5ubm5ubp6enp6enp6enp6enp6enp6enp6e0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0p5uCaWl2dml2dnZ2gnZ2goJvfHx8aXx8aWl2Y1dKMTEx - - -The digitizer does 64 gray levels at any of: - 256 x 244 (included) - 128 x 122 - 66 x 61 - -At 19.2k baud (it uses an rs232 interface) it takes up to 32 seconds to -fetch the image (with no compression). The lower resolutions take -8 and 2 seconds respectively. ---mail.sleepy.sau.144.8891-- - - diff -Nru spamassassin-3.4.6/xt/data/nice/mime5 spamassassin-4.0.0~rc3/xt/data/nice/mime5 --- spamassassin-3.4.6/xt/data/nice/mime5 2004-01-26 23:27:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mime5 1970-01-01 00:00:00.000000000 +0000 @@ -1,434 +0,0 @@ -From sau@sleepy.bellcore.com Thu Oct 3 16:05:05 1991 -Received: from hanna.cac.washington.edu by akbar.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA29595; Thu, 3 Oct 91 13:05:05 -0700 -Received: from thumper.bellcore.com by hanna.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA19384; Thu, 3 Oct 91 13:04:49 -0700 -Received: from greenbush.bellcore.com by thumper.bellcore.com (4.1/4.7) - id for MRC@CAC.Washington.EDU; Thu, 3 Oct 91 16:04:44 EDT -Received: by greenbush.bellcore.com (4.1/4.7) - id for MRC@CAC.Washington.EDU; Thu, 3 Oct 91 16:04:43 EDT -Received: from Messages.7.14.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.40 - via MS.5.6.greenbush.galaxy.sun4_40; - Thu, 3 Oct 1991 16:04:42 -0400 (EDT) -Resent-Message-Id: -Resent-Date: Thu, 3 Oct 1991 16:04:42 -0400 (EDT) -Resent-From: Nathaniel Borenstein -If-Type-Unsupported: send -Resent-To: Mark Crispin -Return-Path: -Date: Fri, 7 Jun 91 09:09:05 EDT -From: sau@sleepy.bellcore.com (Stephen A Uhler) -Message-Id: <9106071309.AA00574@sleepy.bellcore.com> -To: nsb@sleepy.bellcore.com -Subject: meta-mail -MIME-Version: 1.0 -Content-Type: MULTIPART/MIXED;boundary="mail.sleepy.sau.158.532" -Status: RO - ---mail.sleepy.sau.158.532 - -2 Questions: - -1) MM_QUIET doesn't seem to work in the 212 version of metamail. - -2) I've been pondering how I am going to send you this 40mb mail message. - I was going to split it up using the "parts" mechanism, but then it occurred to me. - My software has no business worrying about message size. Its up to the mail - delivery agent to do that form me. I should be able to compose a very - long message, and pass it off to sendmail (well, a pre-processor to sendmail). - if the message is too long, based upon the src/dst etc, then sendmail should - break it into multiple parts for me, and send it as multiple messages. As the - user (sender) I should be unaware this is happening. - - Similarly, on the receiving end, the separate parts should be assembled as they - arrive; I shouldn't have do deal with them at all as multiple messages. - - I guess what I am proposing are two utility programs: - - msplit - - that takes 1 mail message and splits it into N messages and - - mcombine - mcombine - - that any mail system can call to achieve a uniform mechanism of splitting - and recombining messages, Kind of like: ---mail.sleepy.sau.158.532 -Content-type: image/pbm -Content-transfer-encoding: base64 -Content-Description: Mail architecture slide -Comments: Image wrapped by /usr/sau/bin/fetch_image - -UDQKNzk4IDUzMgoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAANwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKMAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAB////4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////wAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/////////+AAAAAAAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAP///////////AAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB////wAAAD////gAAAAAAAAAAAAAAAAAAAAAAAAAEAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH///gAAAAAAH///gAAAAAAAAAAAAAAAAAAAAAAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//wAAAAAAAAA///AAAAAAAAAAAAAAAAAAAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAf//AAAAAAAAAAA -AAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB//wAAAAAAAAAAAAP/+AAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//AAAAAAAAAAAAAAP/8AAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/+AAAAAAAAAAA -AAAAf/4AAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAAAAAAAAAAAAAAAf/gAAAAAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/wAAAAAAAAAAAAAAAAA//AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AP/gAAAAAAAAAAAAAAAAAB/8AAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAAAAAAAAAAIkAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAAP/gAAAAAAAAAAAAAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAfAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAABwAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAAAB/4AAAAAAAAAAAAAAAAA -AAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAeAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAHgC4AAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAAAAAAAAAAAAAAAAAP+AAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAABcAuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAAAAAAAAAAAAAAAAAA/4 -AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAXATgHgdB0DwDwB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAF4E4GMIwjBGB -HxjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAABOCODBmEYQwwwwwYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAAAAAAAAAA -AAAAAAAAAAAAAAB/wAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAATwjggZgGAMMMMIGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAAAAAAAAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAA -AAAAEcQ4f+eB4ADDDH/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAABHkOGAD4PgHwwxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAH+AAAAAAAAAAAAAAAAAAAAAAAAAAAB/gAAAAAAAAAAAAAAAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAQ6DhgAPA8HMGIYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAAAAAAAAAAAAAAAAjAAAAAAA -AAAAAAAAAAAAAAAAAAAAEPg4YAA4DjDA8GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAABBwOHAUGQZgwQBwEAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAQcDg4JBkGYMMAOCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAA -AAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAECA4P8YRhHPz/j/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/gAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAHwg/g8F4Xg+Yf8PAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAA/wAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+AAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAABgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf4AAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP8AAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/AAAAAAAAAAAAAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAD+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAAAEAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+ -AAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAQEAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+AAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+AAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAfwAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADADAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAwBwcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAHQRwME/v4HgJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAACM9/DPDAwGMe8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAIkAAAAAAAAAAAA -AAAAAAAAAAAAAABhDgwwwwMDBhyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAYAwOMMMDAgYYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAHgMBjDDAwf+GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAA -AAEUAAAAAAAAAAAAAAAAAAAAAAAAAAA+DAYwwwMGABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAADwwGMMMDBgAYAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAOMBjDDAwYAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAPwAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAABBjAwwwwMHARgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAQYwMMMMDA4IY -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAGEOGDDDIyP8GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAABeDeD/8cHA8H4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAjAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwA -AAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAD8AAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAAAARQAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAIkAAAAAAAAA////////////4AAAAAD////////////gAAAAAB////////////wAAAAAAAAAAAAAAB+ -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAAjAAAAAAAAAf////////////AAAAAB////////////8AAAAAA////////////+AAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAEAA -AAAAAAAH////////////wAAAAAf////////////AAAAAAP////////////gAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAEUAAAAAAAAB////////////8AAAAAH////////////wAAAAAD////////////4 -AAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAACJAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAAAAD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAPwAAAAAAAIwAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAABAAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAA -AADwAAAAAAAAAAB4AAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAABFAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAB8AAAAAAAiQAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAACMAAAAAAAAB4AAAAAAAAAAA8AAAAAH -gAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAAAQAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAAAA+AAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAARQAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAIkAAAAAAAAB4AA -AAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAjAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAA -AAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAEAAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAA -AAEUAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAACJAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAA -AAAAeAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAIwAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAfgAAAAABAAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAABFAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAA -A8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAiQAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACMAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAQAAAAAAAAAeAAAAAAAAAAAPA -AAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAAD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAARQAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAAA+AAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAIkAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAjAAAAAAA -AAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAEAAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAA -AAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAEUAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AHwAAAACJAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAIwAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAA -AAAAAAAAAHgAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAABAAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAB8AAAABFAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAiQAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAA -AAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAACMAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAQAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAARQAAAAAAAAHgAAAAAAA -AAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAIkAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAAAfAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAjAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAEAA -AAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAEUAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4 -AAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAACJAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAA8AAAAIwAAAAAAAAHgAAAAAAAAAADwADwAAeAAAAAAAAAAAPAAB4AAPAAAAAAAAAAAHgAAAAAAeAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAABAAAAAAAAAB4AAAAAAAAAAA8AB/AAHgAAAAAAAAAADwAA/ -gADwAAAAAAAAAAB4AAAAAAP4AAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAABFAAAAAAAAAeAAAAAAAAAAAPAAf+AB4AAAAAAAAAAA8AAP/AA8AAAAAAAAAAAeAAAAAAD/wAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAfAAAAiQAAAAAAAAHgAAAAAAAAAADwAH/4AeAAAAAAAAAAAPAAD/8APAAAAAAAAAAAHgAAAAAA//AAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAACMAAAAAAAAB4AAAAAAAAAAA8AA//wH -gAAAAAAAAAADwAAf/4DwAAAAAAAAAAB4AAAAAAH/+AHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAQAAAAAAAAAeAAAAAAAAAAAPAAD//B4AAAAAAAAAAA8AAB//g8AAAAAAAAAAAeAAAAAAAf/4B4AAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAARQAAAAAAAAHgAAAAAAAAAADwAAP/+eAAAAAAAAAAAPAAAH//PAAAAAAAAAAAHgAAAAAAB//w+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAIkAAAAAAAAB4AA -AAAAAAAAA8AAAf//gAAAAAAAAAADwAAAP//wAAAAAAAAAAB4AAAAAAAD//PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAjAAAAAAAAAeAAAAAAAAAAAP//////4AAAAAAAAAAA///////8AAAAAAAAAAAf/////////// -wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAEAAAAAAAAAHgAAAAAAAAAAD//////+AAAAAAAAAAAP///////AAAAAAAAAAAH///////////4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeA -AAEUAAAAAAAAB4AAAAAAAAAAA///////gAAAAAAAAAAD///////wAAAAAAAAAAB///////////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAACJAAAAAAAAAeAAAAAAAAAAAP//////4AAAAAAAAAAA///////8AAAAAAA -AAAAf///////////gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAIwAAAAAAAAHgAAAAAAAAAADwAAA//+AAAAAAAAAAAPAAAAf//AAAAAAAAAAAHgAAAAAAAH//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAPAAABAAAAAAAAAB4AAAAAAAAAAA8AAB///gAAAAAAAAAADwAAA///wAAAAAAAAAAB4AAAAAAAP//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AABFAAAAAAAAAeAAAAAAAAAAAPAAD//x4AAAAAAAAAA -A8AAB//48AAAAAAAAAAAeAAAAAAAf/+eAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAiQAAAAAAAAHgAAAAAAAAAADwAD//geAAAAAAAAAAAPAAB//wPAAAAAAAAAAAHgAAAAAAf/8HgAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAACMAAAAAAAAB4AAAAAAAAAAA8AB//gHgAAAAAAAAAADwAA//wDwAAAAAAAAAAB4AAAAAAP/8D4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAQAAAAAAAAAeAAAAAAAAAAAPA -Af/AB4AAAAAAAAAAA8AAP/gA8AAAAAAAAAAAeAAAAAAD/4A8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAARQAAAAAAAAHgAAAAAAAAAADwAH+AAeAAAAAAAAAAAPAAD/AAPAAAAAAAAAAAHgAAAAAA/wAPAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAIkAAAAAAAAB4AAAAAAAAAAA8AA8AAHgAAAAAAAAAADwAAeAADwAAAAAAAAAAB4AAAAAAHgAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAjAAAAAAA -AAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAEAAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAA -AAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAEUAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAPAACJAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAIwAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAA -AAAAAAAAAHgAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AABAAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAHgABFAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAiQAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAA -AAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAACMAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAQAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AARQAAAAAAAAHgAAAAAAA -AAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAIkAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAB8AAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAjAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAEAA -AAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAEUAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4 -AAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8ACJAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAPAAIwAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwABAAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAA -AADwAAAAAAAAAAB4AAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+ABFAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAHgAiQAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4ACMAAAAAAAAB4AAAAAAAAAAA8AAAAAH -gAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAQAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAD4AAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwARQAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AIkAAAAAAAAB4AA -AAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAjAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAADwA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAEAAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -+AEUAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgCJAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAA -AAAAeAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AIwAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAeABAAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgBFAAAAAAAAAeAAAAAAAAAAAPAAAAAB4AAAAAAAAAA -A8AAAAAA8AAAAAAAAAAAeAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AiQAAAAAAAAHgAAAAAAAAAADwAAAAAeAAAAAAAAAAAPAAAAAAPAAAAAAAAAAAHgAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPACMAAAAAAAAB4AAAAAAAAAAA8AAAAAHgAAAAAAAAAADwAAAAADwAAAAAAAAAAB4AAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAQAAAAAAAAAeAAAAAAAAAAAPA -AAAAB4AAAAAAAAAAA8AAAAAA8AAAAAAAAAAAeAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8ARQAAAAAAAAH////////////wAAAAAf////////////AAAAAAP////////////gAAAAAAAHwAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgIkAAAAAAAAB////////////8AAAAAH////////////wAAAAAD////////////4AAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AjAAAAAAA -AAf////////////AAAAAB////////////8AAAAAA////////////+AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAEAAAAAAAAAD////////////gAAAAAP///////////+AAAAAAH////////////AAAAAA -AAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAB4CJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAA8BFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwCMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPARQAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4IkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAwQAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgEAA -AAA/gfAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPkAAAAADwAAAAAM8AAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4EUAAAADgBAAAAAAAACAAAAAAAAQAAAAAAAAAAAAAAAAAAAAOHAAAAAAMAAAAAA -DAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeCJAAAAA4AQAAAAAAABwAAAAAAAEAAAAAAAAAAAAAAAAAAAADAwAAAAADAAAAAAAwAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAHgIwAAAAOAEAAAAAAAAcAAAAAAADAAAAAAAAAAAAAAAAAAAABwEAAAAAAwAAAAAAMAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4BAAAAADgBAAAAAAAALgAAAAAABwAAAAAAAAAAAAAAAAAAA -AcBAAAAAAMAAAAAADAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeBFAAAAA4AQOgPATAAC4APAHgTw/gAAAAAAAAAAAAAAAAAAAHgAHgTwB7BOHAPAQwAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAHwiQAAAAOAEEYMY94ABHAEfGM9+DAAAAAAAAAAAAAAAAAAAAA+AGM9+Bhz334EY8MAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8CMAAAADgBDCGDDkAARwDDDBjhwwAAA -AAAAAAAAAAAAAAAAAH4DBjhwwMOPHDDDDAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAQAAAAA4AQwBAwwAAIOAwwgYwMMAAAAAAAAAAAAAAAAAAAAAfggYwMMDDBgwwwwwAAAAADwAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwRQAAAAOAEPA/8MAACDgMMf+MDDAAAAAAAAAAAAAAAAAAAAAB8f+MDGAwwYMAMMMAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8IkAAAADgBB8MAD -AAB/8DDGADAwwAAAAAAAAAAAAAAAAAAAAAHmADAxgMMGDAfDDAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAjAAAAA4AQHjAAwAAQHAYhgAwMMAAAAAAAAAAAAAAAAAAAAAA5gAwMYDDBgwcwwwAAAAADwAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwEAAAAAOAMAcwAMAAIA4DwYAMDDAAAAAAAAAAAAAAAAAAAABAOYAMDGAwwYMMMMMAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -A8EUAAAABwCCDOAjAACAOBAHATAwwAAAAAAAAAAAAAAAAAAAAYDnATAxwMMGDGDDDAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPCJAAAAAcBggxwQwABABwwA4IwMMAAAAAAAAAAAAAAAAAAAAGAw4IwMMHD -BgxgwwwAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwIwAAAADxwMIf4MAAQAcP+P8MDDIAAAAAAAAAAAAAAAAAAAA4cP8MDD+8wYMc/MMAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAA8BAAAAAAPwC8B4PwAfAfx/w8Pz4cAAAAAAAAAAAAAAAAAAAAL8A8Pz4PI/fvj5v/wAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPhFAAAAAAAAAAAAAAAAAAwMAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4iQAAAAAAAAAAAAAAAAAYDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeCMAAAAAAAAAAAAAAAAAGAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgQAAAAAAAAAAAAAAAAABwwAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4RQAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgjAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAHiJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4IwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAHhFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4iQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAB/gA/wAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAeCMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAH4ADwAA -AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAHgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAA/AAYAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAB4RQAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAH4AGAAAAAAAAAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAeIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAA -AAAAAAAAAB/ABgAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAHgjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAfwAYAAAAQAAAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAB4EAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAG+AGAAAAEAAAAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAeEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAeAAAAAAAAAAAAAAAAABnwBgAAADAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAHiJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAY+AYAAABwAAAAAAAAAADgAAAAAAAAAAAA -AAAAAAAAAAAB4IwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAGHwGAD4A8AAAAAB+ABjg4AAAAAAAAAAAAAAAAAAAAAAAAeBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAABh8BgDjg/9+P4fhx4H58OH8AAAAAAAAAAAAAAAAAAAAAAHhFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAYPgYBgcBwPB4Bw4HA -OnDgcAAAAAAAAAAAAAAAAAAAAAAB4iQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAGB8GAYDAcBwOAYcB4Dxg4MAAAAAAAAAAAAAAAAAAAAAAAeCMAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAABgPhgMA4HAeDwEHAOA8AOGAAAAAAAAAAAAAAAAAAAAAAAHgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAY -B8YDAOBwDgcDDgDwOADjAAAAAAAAAAAAAAAAAAAAAAAB4RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAGAfGB//gcA4HAg4AcDgA5gAAAAAAAAAAAAAAAAAAAAAAAeIkAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAABgD5gcAAHAPD4YOAHA4AOwAAAAAAAAAAAAAAAAAAAAAAAHgjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAA -AAAAAAAAAAAAAAAYAfYHAABwBwuEDgBwOAD8AAAAAAAAAAAAAAAAAAAAAAAD4EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAGAD+BwAAcAcbjA4AcDgA/gAAAAAAAAAAAAAAAAAAAAAA -A8EUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAABgAfgcAAHAHk8gOAHA4AO8AAAAAAAAAAAAAAAAAAAAAAAPCJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAADwAAAAAAAAAAAAAAAAAYAH4HAABwA7HYDgBwOADngAAAAAAAAAAAAAAAAAAAAAADwIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAGAA+B4AgcAOh0A8AcDgA48AAAAAA -AAAAAAAAAAAAAAAAA8BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAABgAHgOAIHAD4fAHAOA4AOHgAAAAAAAAAAAAAAAAAAAAAAPBFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAYAA4DwEBwgcDgB4DgOADg8AAAAAAAAAAAAAAAAAAAAAADwiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAGAAGAfHAeIHA -4AOBwDgA4HgAAAAAAAAAAAAAAAAAAAAAA8CMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAADwABgD/gD8BgMAB44B8AfA8AAAAAAAAAAAAAAAAAAAAAAPAQAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAD/AAIAPgAeAIBAAH4B/wf8/wAAAAAAAAAAAAAAAAAAAAADwRQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8IkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAjAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4EUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAeCJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAeBFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4CMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPARQAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAEAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4CJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAeAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4BFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAeAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgCMAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8ARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAIkAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -eAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgCJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAA+ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8ACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAQAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAjAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAA8ACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAB4ABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AARQAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAEAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAADwAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAPgAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAIkAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA -AAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAeAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAQAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAIkAAAAAAAAA//////////////////8AAAAAAAAAP//////////////////AAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAjAAAAAAA -AAf//////////////////gAAAAAAAAH//////////////////4AAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAEAAAAAAAAAH//////////////////4AAAAAAAAB//////////////////+AAAAAAAAA -AAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAEUAAAAAAAAB//////////////////+AAAAAAAAAf//////////////////gAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AADwAAACJAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAIwAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAA -AAAAAAeAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAABAAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAHgAAABFAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAiQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAA -AAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAACMAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAQAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAARQAAAAAAAAHgAAAAAAA -AAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAIkAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAH4AAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAjAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAEAA -AAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAEUAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAA -AAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAACJAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAB8AAAAAIwAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAABAAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAA -AAAAAAAAAAAHgAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAABFAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAD4AAAAAiQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAACMAAAAAAAAB4AAAAAAAAAAAAAAAAAe -AAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAQAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAB8AAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAARQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAIkAAAAAAAAB4AA -AAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAjAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAA -AAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAEAAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAA -AAEUAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACJAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAA -B4AAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAAIwAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAB+AAAAAABAAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAABFAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHg -AAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAiQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAACMAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAQAAAAAAAAAeAAAAAAAAAAAAA -AAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAARQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAH4AAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIkAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAjAAAAAAA -AAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAAAEAAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAA -AAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAEUAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ -AAAAAAACJAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAIwAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAA -AAAAAAeAAAAAAAAAAAAAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAABAAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAHgAAAAAeAAAAAAAAAAAAAAAAAHgAADwAAAAAAAAAAAAAD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAD8AAAAAAABFAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAH8AAAAAHgAAAAAAAAAAAAAAAAB4AAD+AAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAiQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AP/AA -AAAB4AAAAAAAAAAAAAAAAAeAAH/gAAAAAAAAAAAAAD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAACMAAAAAAAAB4AAAAAAAAAAAAAAAAAeAP/wAAAAAeAAAAAAAAAAAAAAAAAHgAH/4AAAAAAAAAAAAAAfAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAAQAAAAAAAAAeAAAAAAAAAAAAAAAAAHgf/4AAAAAHgAAAAAAAAAAAAAAAAB4AP/8AAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAARQAAAAAAAAHgAAAAAAA -AAAAAAAAAB4f/4AAAAAB4AAAAAAAAAAAAAAAAAeAP/8AAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAIkAAAAAAAAB4AAAAAAAAAAAAAAAAAe//4AAAAAAeAAAAAAAAAAAAAAAAAHgf/8AAAAAAAAAAAAAAAH -4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAjAAAAAAAAAeAAAAAAAAAAAAAAAAAH//wAAAAAAHgAAAAAAAAAAAAAAAAB4f/4AAAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAEAA -AAAAAAAHgAAAAAAAAAAAAAAAAB//////////4AAAAAAAAAAAAAAAAAf////////////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAAEUAAAAAAAAB4AAAAAAAAAAAAAAAAAf/////////+AAAAAAAAAAAAAAAAAH//// -////////////////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAACJAAAAAAAAAeAAAAAAAAAAAAAAAAAH//////////gAAAAAAAAAAAAAAAAB/////////////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAD8AAAAAAAAAIwAAAAAAAAHgAAAAAAAAAAAAAAAAB//////////4AAAAAAAAAAAAAAAAAf///////////////////9+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAABAAAAAAAAAB4AAAAAAAAAAAAAAAAAf/8AAAAAAAeAAAAAA -AAAAAAAAAAAHn/+AAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAABFAAAAAAAAAeAAAAAAAAAAAAAAAAAH//wAAAAAAHgAAAAAAAAAAAAAAAAB4f/4AAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAfgAAAAAAAAAiQAAAAAAAAHgAAAAAAAAAAAAAAAAB7//gAAAAAB4AAAAAAAAAAAAAAAAAeB//wAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAACMAAAAAAAAB4AAAAAAAAAAAAAAAAAe -H/+AAAAAAeAAAAAAAAAAAAAAAAAHgD//AAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAAAAQAAAAAAAAAeAAAAAAAAAAAAAAAAAHgf/4AAAAAHgAAAAAAAAAAAAAAAAB4AP/8AAAAAAAAAAAAAAAAPwAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAAARQAAAAAAAAHgAAAAAAAAAAAAAAAAB4A//AAAAAB4AAAAAAAAAAAAAAAAAeAAf/gAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAIkAAAAAAAAB4AA -AAAAAAAAAAAAAAAeAD/wAAAAAeAAAAAAAAAAAAAAAAAHgAB/4AAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAAjAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAH8AAAAAHgAAAAAAAAAAAAAAAAB4AAD+AAAAAAAAAA -AAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAEAAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAeAAAAAB4AAAAAAAAAAAAAAAAAeAAAPAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAA -AAEUAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAAAACJAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAA -B4AAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAAAAIwAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAB+AAAAAAAAAAABAAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAABFAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHg -AAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAiQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAACMAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAAAAAAQAAAAAAAAAeAAAAAAAAAAAAA -AAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAAAAAAAAAARQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAB+A -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAAAAAIkAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/AAAAAAAAAAAAAjAAAAAAA -AAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAB/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAAEAAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAA -AAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAEUAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAB/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP4AAAAA -AAAAAAACJAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAIwAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAA -AAAAAAeAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAABAAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAD+AAAAAAAAAAAAABFAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/AAAAAAAAAAAAAAiQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAA -AAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAD+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/AAAAAAAAAAAAAACMAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAAAAQAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAARQAAAAAAAAHgAAAAAAA -AAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAf4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf4AAAAAAAAAAAAAAIkAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAA -AAAAAB/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAjAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP8AAAAAAAAAAAAAAAEAA -AAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAEUAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAA -AAAAAAAAAAAAAAAAAAAAAAH+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH+AAAAAAAAAAAAAAACJAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/AAA -AAAAAAAAAAAAAIwAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAABAAAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAeAAAAAA -AAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAD/gAAAAAAAAAAAAAAABFAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAB/wAAAAAAAAAAAAAAAAA -AAAAAAAAAAD/gAAAAAAAAAAAAAAAAiQAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAB4AAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAH+AAAAAAAAAAAAAAAAAAAAAAAAAAAB/gAAAAAAAAAAAAAAAACMAAAAAAAAB4AAAAAAAAAAAAAAAAAe -AAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAAAAAAAAAAAB/wAAAAAAAAAAAAAAAAAQAAAAAAAAAeAAAAAAAAAAAAAAAAAHgAAAAAAAAHgAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAD/g -AAAAAAAAAAAAAAAAAAAAAAAAAB/wAAAAAAAAAAAAAAAAARQAAAAAAAAH//////////////////4AAAAAAAAB//////////////////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAAAAAAAAAAAAAAAAAAAAAAAAB/wAAAAAAAAAAAAAAAAAIkAAAAAAAAB/// -///////////////+AAAAAAAAAf//////////////////gAAAAAAAAAAAAAAAAAAAAAAAAAAAB/4AAAAAAAAAAAAAAAAAAAAAAAAB/4AAAAAAAAAAAAAAAAAAjAAAAAAAAAf//////////////////gAAAAAAAAH//////////////////4AAAAAAAAAAAAAA -AAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAAAEAAAAAAAAAD//////////////////wAAAAAAAAA//////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAf8AAAAAAAAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAA -AAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/wAAAAAAAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAAAB/4A -AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/4AAAAAAAAAAAAAAAAAAAAB/4AAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAAAAAAA -AAAAAAAAAAAD/4AAAAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/+AAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/8AAAAAAAAAAAAAAAAAP/wAAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAH/4AAAAAAAAAAAAAAAAf/gAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/4AAAAAAAAAAAAAAB//gAAAAAAAAAAAAAAAAAAAAAAjAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//wAAAAAAAAAAAAAD//AAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAB//wAAAAAAAAAAAAP/+AAAAAAAAAAAAAAAAAAAAAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//4AAAAAAAAAAB//8AAAAAAAAAAAAAAAA -AAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//8AAAAAAAAAP//wAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH///gAAAAAAH///gAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH////AAAAP///+AA -AAAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4APAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAPADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/////////+AAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwBcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAP///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf///+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAALgJwDwOg6B4B4A8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAD+B8AAAAAAAAgAAAAAAAAAAAAAAAAAAAC8CcDGEYRgjAj4xgAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAOAEAAAAAAAAIAAAAAAABAAAAAAAAAAAAnBHBgzCMIYYYYYMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAA -AAAAAADgBAAAAAAAAHAAAAAAAAQAAAAAAAAAAAJ4RwQMwDAGGGGEDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAAAAAAA4AQAAAAAAABwAAAAAAAMAAAAAAAAAAACOIcP/PA8ABhhj/wAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACJAAAAAAAAOAEAAAAAAAAuAAAAAAAHAAAAAAAAAAAAjyHDAB8HwD4YYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAIwAAAAAAADgBA6A8BMAALgA8AeBPD+AAAAAAAAAAAIdBwwAHgeDmDEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAA4AQRgxj3gAEcAR8Yz34MAAAAAAAAAAACHwcM -AAcBxhgeDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAOAEMIYMOQABHAMMMGOHDAAAAAAAAAAAAg4HDgKDIMwYIA4CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAADgBDAEDDAAAg4DDCBjAwwAAAAAAAAAAAIOBwcEgyDMGGAHBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAA4AQ8D/wwAAIOAwx/4wMM -AAAAAAAAAAACBAcH+MIwjn5/x/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAOAEHwwAMAAH/wMMYAMDDAAAAAAAAAAAD4QfweC8LwfMP+HgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAADgBAeMADAABAcBiGADAwwAAAAAAAAAAAAAAAAAAAAAAGBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAA4AwB -zAAwAAgDgPBgAwMMAAAAAAAAAAAAAAAAAAAAAADAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAHAIIM4CMAAIA4EAcBMDDAAAAAAAAAAAAAAAAAAAAAAAwEAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABwGCDHBDAAEAHDADgjAwwAAAAAAAAAAAAAAAAAAAAAAOGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAEUAAAAAAAAPHAwh/gwABABw/4/wwMMgAAAAAAAAAAAAAAAAAAAAAB/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACJAAAAAAAAA/ALwHg/AB8B/H/Dw/PhwAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAADAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAABgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAYCAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAHDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAA/gAAAAAAAAAAAAAAAAAAAAAAAAABDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAfwPgAAAAAAADwwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAgAAAAAAAAMAEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAIAAAAAAAADABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHACAAAAAAAAAwAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAgAAAAAAAAMAcHAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAIE8AAB0EcDBP7+B4CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHACPfgAAjPfwzwwMBjHvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAg4cAAYQ4MM -MMDAwYcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAIMDAAGAMDjDDAwIGGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHACDAwAB4DAYwwwMH/hgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAABwAgwMf+PgwGMMMDBgAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAIMDH/g8MBjDDAwYAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAGDAwAADjAYwwwMGABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAA4BAwMAAQYwMMMMDBwEYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAwMDAAEGMDDDDAwOCGAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB44DAwABhDhgwwyMj/BgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4D8+AAXg3g//HBwPB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACM ---mail.sleepy.sau.158.532-- - diff -Nru spamassassin-3.4.6/xt/data/nice/mime6 spamassassin-4.0.0~rc3/xt/data/nice/mime6 --- spamassassin-3.4.6/xt/data/nice/mime6 2004-01-26 23:27:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mime6 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From nsb@thumper.bellcore.com Mon Oct 7 12:15:36 1991 -Received: from hanna.cac.washington.edu by akbar.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA19503; Mon, 7 Oct 91 09:15:36 -0700 -Received: from thumper.bellcore.com by hanna.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA28214; Mon, 7 Oct 91 09:14:12 -0700 -Received: from greenbush.bellcore.com by thumper.bellcore.com (4.1/4.7) - id for mrc@cac.washington.edu; Mon, 7 Oct 91 12:13:58 EDT -Received: by greenbush.bellcore.com (4.1/4.7) - id for mrc@cac.washington.edu; Mon, 7 Oct 91 12:13:55 EDT -Date: Mon, 7 Oct 91 12:13:55 EDT -From: nsb@thumper.bellcore.com (Nathaniel Borenstein) -Message-Id: <9110071613.AA10867@greenbush.bellcore.com> -To: mrc@cac.washington.edu -Subject: An image that went gif->ppm->ps -MIME-Version: 1.0 -Content-Type: application/postscript -Content-Description: Captain Picard -Status: RO - -%!PS-Adobe-2.0 EPSF-2.) - diff -Nru spamassassin-3.4.6/xt/data/nice/mime7 spamassassin-4.0.0~rc3/xt/data/nice/mime7 --- spamassassin-3.4.6/xt/data/nice/mime7 2004-01-26 23:27:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mime7 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From nsb@thumper.bellcore.com Sat Oct 26 09:35:15 1991 -Received: from thumper.bellcore.com by akbar.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA18271; Sat, 26 Oct 91 06:35:15 -0700 -Received: from greenbush.bellcore.com by thumper.bellcore.com (4.1/4.7) - id for mrc@akbar.cac.washington.edu; Sat, 26 Oct 91 09:35:12 EDT -Received: by greenbush.bellcore.com (4.1/4.7) - id for mrc@akbar.cac.washington.edu; Sat, 26 Oct 91 09:35:10 EDT -Date: Sat, 26 Oct 91 09:35:10 EDT -From: nsb@thumper.bellcore.com (Nathaniel Borenstein) -Message-Id: <9110261335.AA01130@greenbush.bellcore.com> -To: mrc@akbar.cac.washington.edu -Subject: Audio in q-p -MIME-Version: 1.0 -Content-Type: MULTIPART/MIXED;boundary=hal_9000 -Status: RO - ---hal_9000 -Content-Type: AUDIO/BASIC -Content-Description: I'm sorry, Dave (q-p) -Content-Transfer-Encoding: QUOTED-PRINTABLE - -=EA=EE=F9=FD=FB=F7=F1=E9=E3=E3=E2=E4=E7=E7=EC=F3=FD=FExwsomhca`]]^\ZYY[^c= ---hal_9000 -Content-Type: AUDIO/BASIC -Content-Description: I'm sorry, Dave (BASE64) -Content-Transfer-Encoding: BASE64 - -6u75/fv38enj4+Lk5+fs8/3+eHdzb21oY2FgXV1eXFpZWVteY2v66eTd29fV1dfa3N3e3t/f - ---hal_9000-- diff -Nru spamassassin-3.4.6/xt/data/nice/mime8 spamassassin-4.0.0~rc3/xt/data/nice/mime8 --- spamassassin-3.4.6/xt/data/nice/mime8 2004-01-26 23:27:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mime8 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -From mrc@Tomobiki-Cho.CAC.Washington.EDU Thu Oct 24 20:34:03 1991 -Received: from tomobiki-cho.cac.washington.edu by akbar.cac.washington.edu - (5.65/UW-NDC Revision: 2.23 ) id AA17676; Thu, 24 Oct 91 17:34:03 -0700 -Date: Thu, 24 Oct 1991 17:32:56 -0700 (PDT) -From: Mark Crispin -Sender: Mark Crispin -Subject: Here's some more -To: Mark Crispin -Message-Id: -MIME-Version: 1.0 -Content-Type: MULTIPART/MIXED;BOUNDARY="16819560-2078917053-688350843:#11603" -Status: RO - ---16819560-2078917053-688350843:#11603 -Content-Type: APPLICATION/POSTSCRIPT -Content-Transfer-Encoding: BASE64 -Content-Description: The Simpsons!! - -JSEKJSVCb3VuZGluZ0JveDogKGF0ZW5kKQolJVBhZ2VzOiAoYXRlbmQpCiUl - ---16819560-2078917053-688350843:#11603 -Content-Type: BINARY;name="Alices_PDP-10" -Content-Transfer-Encoding: BASE64 -Content-Description: Alice's PDP-10 w/ TECO & DDT - -CQkJCUFsaWNlJ3MgUERQLTEwCgo7OzsgV2l0aCB0aGFua3MgKGFuZCBhcG9s - ---16819560-2078917053-688350843:#11603 -Content-Type: MESSAGE/RFC822 -Content-Description: Going deeper - -Date: Thu, 24 Oct 1991 17:08:20 -0700 (PDT) -From: Nathaniel S. Borenstein -Subject: A Multipart message -MIME-Version: 1.0 -Content-type: multipart/mixed;boundary=foobarbazola -To: nsb@thumper.bellcore.com - ---foobarbazola - -This is a text prefix. -You should be able to read this, no matter where you are. - -Once you've had a chance to read this, interesting things should start to -happen. In particular, a picture and audio should appear, -more or less *in parallel*. - -After that, an atomicmail message will ask you a few questions. ---foobarbazola -Content-type: multipart/parallel;boundary=seconddivider - ---seconddivider -Content-type: image/gif -Content-Transfer-Encoding: base64 -Content-Description: Bunny - -R0lGODdhQAHIAKMAAP///7YAAP+RkbZIALZtSP/akdq2kba2tm1tbf9tbW3/bf//bW1t//9t/23//wAAACwAAAAAQAHIAEAE/lDJSau9OOvNu/9gKI5kaZ5oqq5s675wLM90bd94ru987//AoHBI5D0OyKQy+XgYntBoc7l8FK/YrPAh6Hq9x2X02Sw/BugB -AOAcU98Hq3ZOr5+aazY+z++3x4CBBlNwYVRydomKi3+AZg8BkZKTkmWCl5gGSIRwSk2LoKE6jxKNgQdsCaqqD2ummbCCm3GdtYiiuLkWR3xJfb/Av0jBxHlIUrGXtHJhX85gTLrSobzF1tfY2J1NmFwC0Rjez1+b0+Z0htnq2rXtcR6Etx/iX/Ln96PuqOv8 -xvrt9vAJHDjBkD5j/fr9cxeQoENdBm1VeKVpX0IAx6BEXLjR08OP/rmOGBxZ0FMyQR0XFlIZJ49Bdu9AygSSchOsmiy5RWF56GLMmUBz4Cw0ZijRWDzftFq3FGPDoFBRGN12KYyhq0iT2vL5NOo9iiencgR7EqVWjgnLeSXohGzZt3ADMdNpdpvbsl3X6tV7 -N66jvYADF6wai2JewYgTK17MuPGoXQrsWTnsuLLly5gza97MubOMMjzLeB6dZSjKpXQdASTNukVTPXuKbbIkxczOpJRb694l1w8lSn2TcZolcbfxC20zoYJUJkATVhj9wiIuFtxxwcOHqVPi6BFe6U9ms0kiwMzq61B5KbnInl3worR+Rj4w7plV9DLDtN+P -EXe4cWpt/kDPM/LhJ81G/KV1Vm4GOiZWgtudZV2DmVX3UxsWQbjGAeFJeAiFmE11i0hlwaGah/ExNFFEDIIokBnIHYIXikpJ+Np2Lbo4TXWGcWTTSR7eGGGOOipioUnwcZQMjS0pJFKRPzxCSghHVgGeMkz2pFCBUMbwXmGg2SXll35VmdN81nhCZJczjOnm -m6KNYspsZMa1Jps61vnWnXjimRoZmTTCZ5+E+kmBZJIVqqgJU8ID46KQRirppJRWaumlmGaq6aacuvZmp5Rmh+KgoFY2VVE3FVcqZ1LSyV1RTQSQhhqunKLiqg4OWM8er5IhZRq13sYRrosJmU2dog5LLGCC/pbhUmyuMHflIB3VROqyopD1GiS/TaKncp4A -dC226EzHbbeVRDfItFCEqyy5+PS1HCurJNAKh+zKEl+V48JbA2h9qAlWhnwE960bIsVxZL/+3kEwhBl12Alh4C0zHxL1ZcdwwyVUs9/DHwPql8WlYFwfNFxyTIPHGrYc8J/dVLHLyeSkrDIMHoPsMkz/zGUGgTYXRPM3G9+sAcs7y7bg0c4E2IGuXQRttMO+ -JM2zSkU/HefUK9S0odXCBMn1gQeBHbaNY2e7EEJm9zdq2kZibZPOEGcpNdxB8HjobRpGbLfTeBMh4oqYrJdmEhqZycStgQ9h1Ig/Tqv4Sj1f7Eey/482rkLCi8vHop1/E5cTRjjem7XmGVhbWOhOBMkV6jY8XpVWthW+IHt3w051zyfmBKSNuJ8Ou5mvLLwk -jcbKZrruLCgO1khHTZdl8ml+wnwKkxtce1aspyX8pDCn+maQ+Qob+iYKfr/owVIgz36g51fBz4Q3/xF++dK5CZdY3lUV5ogbydzw3oe/bmyNcHI5BAFRcr1iFVAuDUzMAm8SQcVMkIEVZMzzbvKXDFaIFDAToAdHmLfmkbAxiUrhCTcjD0RYz3qRWeFl4ETD -T8nwhjjMoQ53yMMe+vCHQAyiEIdIxCIa8YhITKISHRemQhxwiWyZHBNgCEVcNFFMY7KF+v6q6IJkyWh12+AiOtxxGviFUYxFMM8b5MKtgtXljGg0gq6gh6/amGFWwWof4+J4A6jVQwx2vCOw2OCGd/GxTa7YFbT8gThqlWGQczrTIRF5kfdwY2mT/ExCDua8 -TL6gDdta5OWulBJrebJrvSmYc8xQiXwFUIunvANKVImuSFxQYqIrRCxHoC1a1tI5BazCHncpIOWc65f3Wlf5ZjMWYh5NmbJgA7qcpa5gdq5nW/yhvFyxigd0c0MPbNe+JOnMvSknFfWyFzjD2S6rhGaXLCpF4aJFTUKyU5xT4JcYW/WGgEXMEaMszLSWYRUv -fkiJ+klQI0l5JfEYRJHVQiLSWv62hMP9E5oje5IhaDacbOLtJR/TTnsy8j6SNWNoV5FohujWtmBw6GCzgNzQykM/IKajpfxBVkoPNVOa5g6HE8XplqZYmG/UNDI9/akMWcZSoTKSIcUTx1GFNjSlnrAaTW2pfyZSH8Ahh2ZWvWpWwYbJrxKIQX4kWhAT6tQN -lTV1UiUS1MJawZu21a20AwEVqUQPj/orInd9KjnLyYGUfA2nYiOsgMrWNuQpNnWMbSwqEvvYQ/2jrY6tbMkue1izMcmvPKxOLySbWcUeya1a/exjLcSM8JC1Iqotp94G41qX4Yt1sq2cOcWpUPPJDY6n5N9EsDRWf+oRN+cJrm5LJv8vw/XiolLMJXAPJUIj -Dq4kcSifQXOyXE74Y0xErJZHNhu5MkX3EGOxiBofVgXQwotzooMckvZ3voW5YqxN2pB739vEvQZwT/Wl3Zb2itDopepv0aVe9biIk76cV03ivJ33qjgUt5yXNoAA3uuWKKI36mN70pOwkzispN5h7XciHrFKT5wk33FPw9mwiFfXipsWlzjErltHS2Zs0xrb -mCHHQ56T6LpU2iXwml/EcY7n96QiOm92KRpJkD87YesuyIDtDU59NxzeK4czfgpWnuYwzMZG7UKKt4wwmKsMN07WN81kiB8T2Dw2Aj64vPi78zbS12Z2JRjOx5VzUF06mz6kJ86Vb7pnzEIzvoOyFa90ahwoFZ2/55EZylr8lgilFMH7URo8BNaWEwu431VJ -Sbs1THVuwscJQGtEs33UH6VLDWvaKprWtY7Mp3Gda1e/Otc98PUggO0DbQmng8QONkoEWpRk523Z3Wi2s5kIq2gTeNpz4DS2PajqbvN625Gp7tHEDW4ctLAgcylIuQUHGRWu23Htjve7t3CoM0Nm3sE2Ib5zEQEAOxoaGhoaGhoaGhoaGhoaGhoaGhoaGhoa -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= ---seconddivider -Content-type: audio/basic -Content-Transfer-Encoding: base64 -Content-Description: TV Theme songs - -8vp7cnRvc29ubWxcUebUX0tM1N5bauLZ5ejv2N5772hiX1lVVFdZWWPm0dDU1+LubmZhW1VXXVlfdOnZ0tHPz9TY3/ZgV1VUV2Lw7e/0cmRcV1FPUFZeb+7g2dLOzc7U5HJfYFxYWF/66uni3el0Zl5ZXFtdZnPx4djOyMXGz3FJPkzjXFVf/NfX2dzf5vj2 ---seconddivider-- -This is junk. - -What will it do? ---foobarbazola -Content-type: application/atomicmail - -; This is a a MAGICMAIL message that contains a survey. -; If you are reading this after receiving it in the mail, that -; means that your mail-reading program needs to be upgraded -; to know how to run MAGICMAIL programs. -; -; If you are reading this in the hope of editing your survey -; before sending it, you should start at the END of the message, -; which is where you'll find the parts you're likely to want -; to try to edit. - ---foobarbazola -Content-Type: MESSAGE/RFC822 -Content-Description: Yet another level deeper... - -Date: Thu, 24 Oct 1991 17:09:10 -0700 (PDT) -From: Nathaniel Borenstein -Subject: Monster! -MIME-Version: 1.0 -Content-Description: I'm Twying... -Content-Transfer-Encoding: base64 -Content-type: AUDIO/X-SUN - -LnNuZAAAADAAANeKAAAAAQAAH0AAAAABRWxtZXIgRnVkZCB0YWxraW5nAAAAAAAAVFZYan39 - ---foobarbazola-- ---16819560-2078917053-688350843:#11603-- diff -Nru spamassassin-3.4.6/xt/data/nice/mime9 spamassassin-4.0.0~rc3/xt/data/nice/mime9 --- spamassassin-3.4.6/xt/data/nice/mime9 2004-08-30 21:40:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/mime9 1970-01-01 00:00:00.000000000 +0000 @@ -1,458 +0,0 @@ -From user@aol.com Wed Feb 18 16:25:21 2004 -Return-path: -Envelope-to: user@example.com -Delivery-date: Wed, 18 Feb 2004 18:42:47 +0000 -Received: from user by server11.arteryserver11.net with local-bsmtp (Exim 4.24) - id 1AtWef-0007YH-Cj - for user@example.com; Wed, 18 Feb 2004 18:42:47 +0000 -Received: from [205.188.139.136] (helo=imo-d20.mx.aol.com) - by server11.arteryserver11.net with esmtp (Exim 4.24) - id 1AtWef-0007Y2-44 - for user@example.com; Wed, 18 Feb 2004 18:42:41 +0000 -Received: from user@aol.com - by imo-d20.mx.aol.com (mail_out_v36_r4.14.) id o.23.3af50667 (4262) - for ; Wed, 18 Feb 2004 13:42:23 -0500 (EST) -From: user@aol.com -Message-ID: <23.3af50667.2d650c0e@aol.com> -Date: Wed, 18 Feb 2004 13:42:22 EST -Subject: Fwd: Fw: New University.... -To: user@example.com -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="part1_23.3af50667.2d650c0e_boundary" -X-Mailer: AOL 5.0 for Mac sub 46 - ---part1_23.3af50667.2d650c0e_boundary -Content-Type: text/plain; charset="US-ASCII" -Content-Transfer-Encoding: 7bit - -I just had to share this with all of you! - ---part1_23.3af50667.2d650c0e_boundary -Content-Type: message/rfc822 -Content-Disposition: inline - -Return-Path: -Received: from rly-ya01.mx.aol.com (rly-ya01.mail.aol.com [172.18.141.33]) by air-ya02.mail.aol.com (v98.6) with ESMTP id MAILINYA24-13e40337c8181; Wed, 18 Feb 2004 09:54:28 -0500 -Received: from mail.deltacounty.com (mail.deltacounty.com [156.108.140.66]) by rly-ya01.mx.aol.com (v98.5) with ESMTP id MAILRELAYINYA18-13e40337c8181; Wed, 18 Feb 2004 09:53:54 -0500 -Received: from Delta County-MTA by mail.deltacounty.com - with Novell_GroupWise; Wed, 18 Feb 2004 07:53:53 -0700 -Message-Id: -X-Mailer: Novell GroupWise Internet Agent 6.0.2 -Date: Wed, 18 Feb 2004 07:53:31 -0700 -From: "Foo BarBaz" -To: user@example.com -Subject: Fwd: Fw: New University.... -Mime-Version: 1.0 -Content-Type: message/rfc822 -X-AOL-IP: 156.108.140.66 - -Received: from m11.nyc.untd.com - by mail.deltacounty.com; Sat, 14 Feb 2004 12:54:19 -0700 -Received: from cookie.untd.com by cookie.untd.com for <"IdYffSwumi6wA8UbKGMM+P8lG9LgcPawmOQAcxZ/RpMO5f+lY1OlrG==">; Sat, 14 Feb 2004 11:53:49 PST -Received: (from user@example.com) - by m11.nyc.untd.com (jqueuemail) id JNDGJDKK; Sat, 14 Feb 2004 11:53:49 PST -To: user@example.com -Date: Sat, 14 Feb 2004 12:52:11 -0700 -Subject: Fw: New University.... -Message-ID: <20040214.125212.220.6.user@example.com> -X-Mailer: Juno 5.0.33 -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary=--__JNP_000_3c67.4591.1173 -From: Foo BarBaz - - -----__JNP_000_3c67.4591.1173 -Content-Type: multipart/alternative; boundary=--__JNP_000_611f.0dd6.5940 - - - -----__JNP_000_611f.0dd6.5940 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit - - ------ Forwarded Message ----- -From: "example user" -To: Undisclosed-recipients:; -Date: Sat, 14 Feb 2004 09:58:21 -0700 -Subject: New University.... -Message-ID: - -Subject: New University.... - -----__JNP_000_611f.0dd6.5940 -Content-Type: text/html; charset=us-ascii -Content-Transfer-Encoding: quoted-printable - - - - - - - - -
     
    -
    ----- Forwarded Message -----
    <= -DIV>From: "example user" <use= -r@example.com>
    To: Undisclosed-recipients:;
    <= -DIV>Date: Sat, 14 Feb 2004 09:58:21 -0700
    Subject:=20= -New University....
     
    Subject:  New University....

     

    =20 - -----__JNP_000_611f.0dd6.5940-- - -----__JNP_000_3c67.4591.1173 -Content-Type: image/jpeg; name="NeverlandUniversity.jpg" -Content-Transfer-Encoding: base64 - -/9j/4RczRXhpZgAATU0AKgAAAAgADQEOAAIAAAAgAAAAqgEPAAIAAAAYAAAAygEQAAIAAAAI -AAAA4gESAAMAAAABAAEAAAESAAMAAAABAAEAAAEaAAUAAAABAAAA6gEbAAUAAAABAAAA8gEo -AAMAAAABAAIAAAExAAIAAAAQAAAA+gEyAAIAAAAUAAABCgE8AAIAAAAQAAABHgITAAMAAAAB -AAIAAIdpAAQAAAABAAABLgAABOpPTFlNUFVTIERJR0lUQUwgQ0FNRVJBICAgICAgICAgAE9M -WU1QVVMgT1BUSUNBTCBDTy4sTFREAEMyMTAwVVoAAEgAAAABAAAASAAAAAEAAFF1aWNrVGlt -ZSA2LjUuMQAyMDA0OjA4OjI3IDE1OjQwOjI5AE1hYyBPUyBYIDEwLjMuNQAAF4KaAAUAAAAB -AAACSIKdAAUAAAABAAACUIgiAAMAAAABAAIAAIgnAAMAAAABAGQAAJAAAAcAAAAEMDIyMJAD -AAIAAAAUAAACWJAEAAIAAAAUAAACbJEBAAcAAAAEAQIDAJECAAUAAAABAAACgJIEAAoAAAAB -AAACiJIFAAUAAAABAAACkJIHAAMAAAABAAUAAJIIAAMAAAABAAAAAJIJAAMAAAABAAAAAJIK -AAUAAAABAAACmJJ8AAcAAAHMAAACoJKGAAcAAAB9AAAEbKAAAAcAAAAEMDEwMKABAAMAAAAB -AAEAAKACAAQAAAABAAAGQKADAAQAAAABAAAEsKMAAAcAAAABAwAAAKMBAAcAAAABAQAAAAAA -AAAAAAAKAAATiAAAAD8AAAAKMjAwNDowNjoxNiAyMTowMzo0OQAyMDA0OjA2OjE2IDIxOjAz -OjQ5AAAAAAUAAAABAAAAAAAAAAoAAAAeAAAACgAAAE4AAAAKT0xZTVAAAQALAAACBAADAAAA -JgQAAAECAwABAAAAAgAAAAICAwABAAAAAAAAAAMCAwABAAAAAAAAAAQCBQABAAAAMgQAAAUC -BQABAAAAOgQAAAYCCAAGAAAAQgQAAAcCAgAFAAAATgQAAAgCAgA0AAAAVgQAAAkCBwAgAAAA -kgQAAAAPBwCuAAAAsgQAAAAAAAAAAAAAAAAAAAAAAABkAAAAZAAAAAwDAABkAAAAMf9s/jj+ -mP+P/7//U1I5NUEAAABbcGljdHVyZUluZm9dIFJlc29sdXRpb249MiBbQ2FtZXJhIEluZm9d -IFR5cGU9U1I5NUEAAAAAAAAAAABPTFlNUFVTIERJR0lUQUwgQ0FNRVJBAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAABZyseAAAAAAFiAAAgsQAAB2EAAB5OAAAeTgYLHwcGUgBBCZ4DagAA -AAAAAAAAAAAA+BEAAAAeKR4AAAAgAAAAAAAAMBACSSoAMDkFFZgAAWIlAD8AABgcFB4YGQAA -AQAFKwAAAAH/8E5BAAAAAgAAAAAPA8KQATkSIgAAW10BCwE7ICAjCyAMTqYA+ABXYfzrYA4U -CgYAZADwEjRDIQAAAAAAAAAAICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg -ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg -ICAgICAgICAgICAgICAgICAgICAgICAgICAgAAAHAQMAAwAAAAEABgAAARoABQAAAAEAAAVE -ARsABQAAAAEAAAVMASgAAwAAAAEAAgAAAgEABAAAAAEAAAVUAgIABAAAAAEAABHXAhMAAwAA -AAEAAQAAAAAAAABIAAAAAQAAAEgAAAABAAD/2P/gABBKRklGAAEBAQBIAEgAAP/+AAxBcHBs -ZU1hcmsK/9sAhAAHBQUGBQUHBgYGCAcHCAoRCwoJCQoUDw8MERgVGRkXFRcXGh0lIBocIxwX -FyEsISMnKCoqKhkfLjEtKTElKSooAQcICAoJChMLCxMoGxcbKCgoKCgoKCgoKCgoKCgoKCgo -KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/xAGiAAABBQEBAQEBAQAAAAAAAAAA -AQIDBAUGBwgJCgsBAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKCxAAAgEDAwIEAwUFBAQA -AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0 -NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZ -mqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3 -+Pn6EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVi -ctEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4 -eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY -2dri4+Tl5ufo6ery8/T19vf4+fr/wAARCABfAHcDASIAAhEBAxEB/9oADAMBAAIRAxEAPwD1 -DUbSPTZhFJdRSPnDLFlin+9x8v41hxXEWq31ibNLgXIc7WOD83dAQCFBXBJOTg4riJ9ZeWwj -tLczShAZZpPPcjdnhV5GQOOWyc9MCtSz8RS6Lob4SOa3hzJJGhIbezARhzxxuBOQScHB6jHo -TnUkuVs44U4x95I79rmDTNR8uS6ubm7SMjzLgbIVIGThgMDA68Y4HTmp4b631G5Wf7XAyJIc -NvCsxC5yi/NuPoD9Qa8nsde1SS4lu/tUkktxN50zvhkboRhCMcHI9uMVs6VrWr2US2iav5UN -sxnijcb1ZiTlcqNw6n2rnkrdTeKfY7TxD8QzFaR3ejRwyx4KuJgRNA2SMlMj5TwMg9SPWsWw -8XSwrbWZ1K4mt5YQZpZbZZPIMh2omM5wpxyScg1ijXbSbzn1q1fULsSfubxLgwyqg6djnHHJ -56Z6VzOveLtOvDJFDHZwKshkWOBQZeezP1I57+3pUqyHyndQ+Np5tdxaZTS0yJvOZv3iqMsT -luO5AGD0FVvE3xas9Na6isbK2naKFY42VSBKvV1B6gc44J6Z714zd+K9UkWa5tUUxBeVCg4H -c1yV7rFzdTSTszgg9jjH4VLkmPlaPbZfjJrerWLLb3f2MRsfNESbXGOFXPPHXnNZo8UmRRC9 -ukrupMslzK8jSKeOMnjnHT0ry3T7uTdJcgnY4y6hvvYIz+mTXTaZqltqd0I41ZnjyFDdQPX+ -lXGUbakuHU7pbrS7nRNVt3hNnKFjntlSR2R5FOCCDkcqWGT0zWDr7wQ20cNi8sabAHMqjLMe -TjHQZx71RebBBHQADj1pLm4kmfEm0IDlQB3Pt+FXHRictLFi1uprMIFAQFCp3gEnPXGR+tVr -m5+yWruVU54A6kc9M/gKjDM5Mr7ZDnaAc5A9azNQmNxJ5aAiJTjPqauKUpEOVkVD5t3KXfBL -E5YnAp/2Nv70f/fYq0LZn2xqVUuMnJxjFL/ZUn/PWL/vo1v7RIzVNs9OSxtrdF2R/LuBYscg -EH0704Z4AO9CcMDjHtx6V7Dqng/TNXMkpsprSRxgvC6ru9yvT9Kyz8M9InQCOe7t5AoOGZT9 -c8V5rbe53xlBHmTFYkxtACjIAUDPXgelRksiF9qngYPeu9vfhk6qBBdPsDZGUVhj3ORz+FRP -4CitfMmudRkFvsZmLRAAYBPByRgYzz2FAcy7ngXxB8SCPbpNjMT1M8nceiA/zrhrNpHYpEsj -85JTt71FqVwJ72d0ZijSMwLHkgmktL2WzG6B2jcn7wNDIXdm6TBZlVhDSO46uPlHr9abqbRr -bw+VaxxqzYkkA+bPFZdp591NukJZV5YkjoTjjNbsitIwgWzlZQpWQ8fN/dIPqKhuxrFOWiME -O0YMattUvuxjp/nNX4LmS1uI7m3kZJIyMOOhX0NW00Rbcr9p3RMCoCuuQQeefwxVuHSJMxKc -bps844AxnGKOZB7N7M3LWZrzT4J2IxIMkAYAbPNKInnnRYslmXAUDOf8803wzol/cP8A2dHb -TSziT5Y4lLZBJ6AfSu+1nwm2g6Vp0emW9xda3NC0lx5S58hFAJyPUciuiMkzmlB3dzhJnSNW -SJ8yk4Ixwv8A9es4xxxAMxIXPrwasS28yoHWGV+p+RCc/wCc1RlsLhoTcXLeUn/LOIn5m/Ds -PeuiEb7MwlfqhYtV8h3MEUcm7r5qBgPoDUn9u3H/AD7Wf/gOn+FMstEnvFYomFXuTgfn/SrH -/CMXHon/AH8q24LRlKMmj7Ctb9rl5GjSd0LsnQAJt6/rkfhUkZttQCzq8nyllB+ZMdMg+vas -+ztfJtfsUDPaCNPlcIeR7Dp2qGwtLpNISzkm/wBJlk3SzIrDndnPqBgAc/jXnm2pPI2nWEaw -krJIBsdkkVevc88HvXI/FbWrPw74Gv7gWTzrMotEJxsDMD8xx29fWvQ4orKaTzY0iZ48puUD -Izgkfyrzf4/6Ylx8N9QmggHmRTQu5RedocZJx6Z60J6jcdD44KF5gvYnFbB0kTFREDuxgBRm -qdrCZbwcfdGTXRafqDWF7HMiByvXJ4pG1NJvU1/Dvgx7jy1ltZpN0sZkYpjag3ZAB687a9N0 -HwcwsB51skMrkYD9j1LN6+mBiuNsvGdrBc/6VE0DY/1sEodfxFek2niu1urG3v4GMttG2yVw -Pu8cH88D8a45p3uz16Xs+W0TnvG3gPWNRMY0m1e7e4kMlxMdqqGxgAL2ArzHXdJ8TaIxnvLS -4ht4WwJXUhWcYBAP419Hab42027YQW63M7AZIigyB+OaPEKWvi3QL/TzGJPOhdFVx8yPg7T7 -HNCk4inSjM8y+GGvtpviWDa5eK/Ro5Y1OHXcQwZfXvx7GvoK7uYjEAkqQBgypM3ATuT6kEke -gNfFemalcWl9ZSQM6TQSFsg/NkGvsjwzKmvaBZXl7brungWRgx53e/5V2Q2PEqr3tDTgUgx+ -S0csbYDMmAIyPQD1rgfiHoNr9sF3cWNtMhjMcMTKQxYnOdw5JHPB4HHWvRQTbLu8tI4UTgA8 -8VVuLGW8kWf7RNEHAzGmMdDgnIyDTfkTF20PAdTtoY7xLa2dIIwXciAcKCThQT39/p61B9jH -/P8Az/kP8K7HWdMksdUvftfkS+dIPLby/lKj16HdnOTVDybf/njbf9+z/jT5i7HrOqRINf0m -De4WaKVSA2MbdpDfgf51u+RHyPLXnGSBjOPWqM9tFeXlnexnLwhgjk8bTjP1zirkkuxSxdUJ -Hyq5ABI96TJWlyYKASR1Nc946t57jwnqsVrPHblraQuzx7wU2ndxg9var9vOXtlM8+ZLglkx -JjcB2Ujpx/8AXo1fUI7XSLy4LKpihJYOM7SRxuFCWocyaPhuytVjR5sEFyQARyAPX3rofD/h -MeIJdv2uOH2Izms68R4JpIpQVkR3DgjBDbjnI7c1peD9T+x6tGpbhzj8amd7aHZQUXJKR2es -+AdP0nwte74raS6aMeXMsYV1YEcg5+tdB8HGibw5cWkkatHJIVbIzuBrhfiP40juzFo1oxaG -M7rqRD95uyD2B5Pv9K6n4TeI9PTTWtikpm2kFY0LHORg8D6Vzyi+XU9Om4ObSNWw+Hmr6Xqs -hhvruBOTHNBP8jDnGVI7eldzZ2M9pEJr2VZrgAK0iLtD4747UzRPEsc97d6dfK6XFnIUDMu0 -svVSR9DVu+uxIpwRjOaw+ZfK29UeD+Evhdc+L9W10I7xx2t7JCCgH3txPUngDivpzSNOtdA0 -q1sXL+VbKI0luCCcYwOfTtz2rC+HfhxvDdvqBlJa51G6e6lAGVjDMxVc+uDz9a7J0WZDHIoK -twQwBBrujdLU8Go1KTaMmJJbi6m+zziMxsCh+8JAcHJGen8P4Vekla2AedgWbgbFOCfSqlxp -4YiSGV45FJIGRlvbPYH+lPjS7QcTNIpcHbMPmA6Yz69KsxtYwdZ8M2eqtLLI0sM7MG/dpng5 -6gEg/pWP/wAIHbf8/V1/4C//AF665LmO3Hm37WqqxO0InQ5wck8k5z2p39saP/z1g/74P+FF -h+0sP1C0UXUN6jnzI0aNYySVZTyeMHmmWwsTZiS4VYAEwUlYExjOPXAOfSuA8X67qOlFY7iQ -vHPPiKWORo2UlBkEDtz/AAnua09OGk6Jot1JNqVrNcSKZAA4VQoYkRgA/wC99a0cWkYqadzj -viR8fLTwtdy6F4dsI728s22SXVwP3ULd1VRgkjoeQPrXkVz8fPHc8VxA2oW/kXG4SQ/ZI9pD -dR0z7daw/iHaadb+MdU/srUYb2zmmM8UiNuxv+YoT6qSR+VcybKYjeYmMf8AfQbh+lTr0NVF -PU3l1SfU1a7un33EzM0j4xuOetPs0mnuoorbPnSNtTBwcn3rFhm+zgKD8orT07UmsrmO5jwW -Q5ANSzog11J3026g1V7G4SOOWN9rrK+AD9RXvPg65m062iMOhWsGIQjfZbhdsgH8XPJP1ryT -w9p+ma9dNJqFzKZpWJb5gCW65r2Pwz4RsNJZXtbuUcf6uQ5xzng1zVXdnrYTljB3W5ruo1PU -TctayWd1EoRt+P3qEZU5BOe4q9h3eOE8szBRn+tMuZUimVy4LKMdaZ4f8T6MniJ9OvJEa8kj -CRLJgRAseQx7MRjA/wAainDmkKrW5KbZ26C52GG2uY4WVAojI7nkHPXn6/jVKO8NlcGSY7XL -BmM8m49ByuDkg9MADpW4ljbpFJDsyoJyGzgA+hNRyWcL3KOETzYUCq/8R9R9MDpXbc8JoYlr -JPGnlTgqCXV9xZ1BORjP9akuFMMsEkszIqvtULwHZum4+n5U9Z7ePUFs44nEpj3ErGQiqDxk -9Op4AqS48iUI1yCoil3ICfvEcA4HX6Uh20Ipjcgb2trZiD8qvJjH47TUPnXP/PjZf+BJ/wDi -Kz9TuXnlWVrie2CAr5Me3IyepPPXA7VR88f8/wBe/wDfY/8AiKtRJcmeDaz4tivJ3e/lk1GY -x7VO/G1sAA5HHAA4rgfFfi7WbqOPTmuhDZqrFYYU2cN1DN1bPucUqtgcU2aOG4ANxCkmOhI5 -FdM3zLQ0hh4xRxxzUsF/dWqssM7xqxBIU8EjOP5n866Y6fprA/6MFPtmkOm2wH7sKv1XNc/s -2a8jOdN+ZQRcIsmf4sYb8x/Wo4pzE52klPQ9a3bjRhNyFTP95eKpHRApIZ2GPYVLjIXLIfaX -ZSRZIJSjqcjBwRXq/hLxTf3EC/a9Qgj2jHP3iK8pg0MNIu25P/fODXtHw30/w7eae0b2TSX1 -qu+dpiWUrzhl7Y4PHX61nODa2N6dR002y9rnif7FpwkhG+WbIhZv4j3P0Ga84k1GON2lurkG -dzl2Y/Mxq9r2st4j1CS+2+TbbQltCOPLiHTp3PU/WsqG2ieZJvLUbAfLAHr1Nb04ci8y3KUk -dhonxQ8Q2Y/0DXZ5kTAaKZvNX6YbOPwr1Dwn8WbTWJTa60VsLyZkCXG4+Rxwcd0JHqSM9xXh -KRxqzlECljliBjNJclxC7IcMi7vritXFNamEqSaPsVJo7kfaIwUxlFkz9/BIHTqO4rDk1awQ -N9qKvNHN88rRBFPzbcrknAHf1wfWvnTwH8a7zw+V0fVWmn0hpcxyLhpLXk/dDAgrznb2xx6V -7/qVrpuq/YLa5E3mTI00bq2WA2YPJHcdfp2rBR1OKc7bl620pbm9EgYtFErcEgKzHGPl5xgc -9e44FaX9kJ/zyi/If4VzthBHp2+zs7m4jexco+5sq+4Bs49wfwq79svP+f3/AMdNU4yM1UT3 -R//Z//4ADEFwcGxlTWFyawr/2wCEAAEBAQEBAQEBAQECAgECAgMCAgICAgMDAwIDBAQEBAQE -BAQEBQYFBAUGBQQEBQcFBgYGBwcHBAUHCAcHCAYHBwcBAgICAgICAwICAwcFBAUHBwcHBwcH -BwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHB//EAaIAAAEFAQEB -AQEBAAAAAAAAAAABAgMEBQYHCAkKCwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoLEAAC -AQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoW -FxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaH -iImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm -5+jp6vHy8/T19vf4+foRAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRC -kaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2Rl -ZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG -x8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/AABEIAF8AdwMBIQACEQEDEQH/2gAM -AwEAAhEDEQA/AP6Mfin4J0n4T69b6BrfjrSr7U/NCXkGk+dcyaVuHyNefIEtQ5wqmV0BJzwA -TXxvo/ibw/8AGv4i/B6T4aadr0fjyK/dbO5lW2nC3rKyyabFJAlxbWEUlu0VxcXEolkaKUQh -kDAH9DzHP1jsF+5i4RfxJ2u+y+e/mfF5bkawuNfM+f8Ala0t3ez2el+mvU+xrnxZ4X+D3xXb -RNX8f+JvEHxOtNJkjbUfEka2OhWUscTTyJbXVvCkcCwIzBwIBGyxxBWjZ3du10D4i+Dvir4s -tPFX/CxNFl0e11OVobo38Vvc3txHbCYy6bZlbwX0yBSkVvM3zY8yORchK+TrVKnKpvqvz6H0 -lOMObkhFpLa+r33vvq9vx2PMf2pP+CqM2ieCtD+IX7Nej6LqeirBLaajDrsFxDr3hO9ad4Vl -uNNLxlrOQrHF56Pt8yWJSxEmB8j/AA2/bo1vQrfwB8OLj43+IdU8CaroMcuuatq3hK01L/hE -7jVZDZ6fZMhkebyLabyyXlmnWWKVM7XYsrpYdeySVuZ7379LW6Myn7Sc3VlGWmyVotfzRkpX -Tl/w6ffldB/4KIeK/EH7R5t/h+klt+ztaK8GuNrt5esNVsrWMve3Fwkt0yQ7VWaW3gt/JkZj -BGzYIReB/bA/4LifDb4S3XxD0L4U/DHw5rGoaVoVrpWlT2tvIkWvWrlZ9Ut0cYnSFt7xKY5J -1ZoPMwBJuE1aCT1v7q183/wwRdWP7qnZOetrbJ/1t11Z+eusf8F9P2o/jh8N9RtPCPxC/wCE -UtbG8mXWU0rT0tb+HYRFa2nmHe6wvh33q+9iCpfAIPgCftmy6rZw+HdS8HWOp6re2s0usap4 -n1nVdUvNWtJQke2ISzp5BZ1iLCI7v9HT5goZa7MPQ9pRVSgrJ9nu1+JhUocs71mpT7zjzWV9 -oq6jr1unfY9lt/GfwI8X/s8ftK+DdS8Nv4V8Qpb6T4n8I29hqmr3Nlf6vZSCOeGaJ2eLdLaT -XUImlCeWJSFz8xr4u/aavfCuh+E9A8NfCzUNUstKNhbw6hNqtrCXv72XMsv2cQZSOLzDH952 -kJDPhQwSlhlJVYQm7xTvZ9fnp5nbOX+zzjGmo2XxRVkuukby32vdW7HFeD/GHiXwDDpMVhHF -a276dJbSreRwzPctIrid0WSNz/CFMwG5XI24IJHn3i7xcvgfwXq+oy2MDPIxiijbLyQhnUKj -SEZYEIjEYBwOxOK6I0YV8XGEdOZq/TdnPOrUhSlJy+Fbau2i9UfCrrrnjXWZdS1Bke5mkdnn -llCJgAYGW4VV4Ue56mtT/hBLv/n70/8A8GENfWOcaX7qlBtR008tO585yOTcpzUW/X9D+jnx -D8ftQ1n4a6L8PfCM+saja2aS69r2pjxDqM0H2ku+y1tiHQzwxBod1xdedKzptjMcYw/0P4C/ -aq1z9n/9nPUjBp9hqvgjRvP1bUtMsnkhu21O7uoIdJh1KQtEzoLyKWXz7eSWZYJHidUR4ynz -WKoqco4ZveXTRJv09T3KUfZ4edWEFHTRW3S2ve9r26+nmeA/Dn9pb476r4o8SfEBfHmo3/iL -XtcPiHXNQ1Dy7mxvW/dzRrHp88TRMYnDxfMrImI/LVdoevrP4L/tBftFfD7RLP4f6b+0T/Zn -hfw3dTeJtI067h/tGzubqeRzLbPLaxtdJ8txcMV3mMHGNrMCOHGyw1OcoOKb/K3/AADtw2Ck -qMFzzS8m9fNp992hkH7SPw/17/hLdS/ab8CXfjf4nRamq6B40sPE11oetWdhEHe33IYpElWN -kQtNMhlIaESF2RWr88/2l/25fgt48k1nQPDeleDtHsLXUrjWLXT9Atopdbdn3u0F5qgAluow -Xd8SbMBUAXEYFcHNy3qQvbp2+X6HWlUg40ZyjbyXvSt0le606tavufkZ41/bV+PWp2/ijxp4 -D0y2bw3DbMXt47eGQW8aja7kEbiVXJOQB1wCAa/Mbx/8ePG3jDxBr/im6vbxbmKREbyZ9ixs -FwGEXIQHnlcdfWub6w5XUe/9eprWpNSUm99j0D4Y+OdZFxrfjWG4kXSbuJZb63W43NdNC8Jk -UrkEsU3uqDkljt9K/Qv4P/GLwT8XfGVvo+lWFxNrFgskdrHcLtkRNoDyspByVZljHZmYHGDi -ujCYucL029Onz3MK9GMkpW1/yPYtR18o9vLEWFsscMZaLGGddpOQDg85+U8qWYCq3i7xVrXi -DUHj1YwppkbrPbxLEWDTuOhTg9EUbs4G0D6+hTsqvN17eZ5sqz9nKC0u7vQ55Li5vpJNe1EQ -X04lS1iSXzd8EOWJcYwAqknC5PJ7187/ABQ1+bxNqqaNp6SL4etZjAZV5M85Gfm7HBzj6mvQ -wKUsV7Zv4V8r9EcGIcvZKD1b62s/O997dy7H4Tv7/wCw6JazWsMt3Dvn81/LW38sKQuVI5PX -I681a/4UxrH/AEHtM/8AAyX/AOKraWJUHpza66WOijhKbhepVin5q/5H9Emn/DfwZ4ZsbBtP -0RjZG6gnu5rt98STI5YExFtkuOeTwcnB+WrkPmKIEgnN1pruUuUmEaoGYEoDGwxswSBgN68E -ivk6+Lr1pc853f5H2OFwlO/wcsVt/mLeTWmj2C26WaxRQpvSKO2jj81mDsY0XAWLOOG+6Se2 -K5+SW907T5dVWwt5EMcZglxh0DEMQGwdxCliCeCQD0Gay10k3uZudpShfT/I/CD/AIKiftZJ -pv8AZ/7Pnws8RPId0z+JdTVWV7dSQEsIpD83GCZGGD91B3r8bfANzq97dXGmaHYX92Vf7RLJ -Zh2MfBXecc7cMw59fzqtJqy2sefFe1qOSV2387f1qfUDz+F/AT6fZ+G4bm91a+RGZ9QhK2sL -ZxKCob94WztG04AZvQVT+Lt3pVt4W8MDw94G0+w0+4uETU9QSDF0zhkLITuJRcYIBzkZ5rk3 -km2d15KnOFOKSXe1/O39dD5wj1C70qKfSbG+WC0a9+1GEx5MagDa3uArsOMY556V7N4c8Xat -4M8VaL4z8HavPaa5p0iGK7jAME1pjGyQYy5O1VbORzgjIBrZSlGUWuhypKacZN/I/WHwXr99 -47+GHgvxRczoYdRhaeSKKJUit7tZCs3A9WVtrZPHGadHompeIvEmlWuib3vLi2WKK2hid2nK -s5ACqM7jiQDr0PSvapy932k/hs32PDxFKbrezvdu3Zv+vLQu69f2GlWl9peg6oJPEUj+VPGE -Zo7NdrB05IxJkEBf4drE88V4FNpuk6NFb3d1PJHY78sDKCkitgk4ZR09ev513YZzhFw5dZbr -8jmr8ravrGK/Hqc9o/xp/wCEcv8AV5fC/h/Tb77SzFzrFlHeRRfMCDHHL8pIChQzA4VmAGea -6D/ho/xj/wBCP4N/8JXS/wD4ivUjl8JrmqJ38m0SsTWaXK7L0j+qP9Nv4xfsIfAr46T69r0/ -wz1jwxrl3GIpLzQr20tftoVlw8tkxaAkjcOYwxDMSd2CPnWT/gkJ+zt4lsYYNK8U+LtD19ba -KVY7i7s5wdpCyNIDACSxVgdrYUFSOMLXwbha8oy1PqqePqxiqNSlo+t9fTTqfNvxB/4I/wCo -W1tFB4V8fXw02K7EkXm6daXkPkhjnfOLiNg4U4IMaK+QqgYxXP6h/wAEztA8HDWvEvjf4yaj -F4IFje3l3Lc6JEkVt5cE0v8Ao9wlxLbmNGQSN5hDLGjLngNWiUpuKUvwJliqFK8vZ9H9pW+4 -/wAuD4t+KLfxD8QPF+p6Zc3Eml3Op3VxFLcOWleN5XZC57kqQSfWmeCPiD4g8BIt34T1Wey1 -RnLNPC5UvkFRnHUBSeDn7xOKmXxMyp6K60Ou8DHxV4w183mrXL3FpAUlupJpYlYRySCMGNZG -VW5cHAxjBPavszVLW71O6t/Ctp8OdVntFtpbLVXJjK3YJZrWaK4C7PNTDBCQTtDDLrwOSvNQ -alKVlZnqYChVrqVOlT5m7dfz9e5h6d+zxY+GZ7FvGZuNP1COa2t0t7+3Z0mik3T/ALzOAwEZ -i4JAIYDI7en6F8DNVE3h2zkVP7R1ZZw0nlbYoEWNJhGY8Abgdq7QMDC7azWIUpJrVPa39dzt -/s/2E3Tmmmt77ff1Prj9kH9nr4seKr9/gvo/gjVtT8Yx6lm203SrOS5aeOaSZQ0aRqQV3ROC -cDB5PWv22+P/AOxFdfs1/Bj4E6R8C/CPiDxL+11q+h32qeKP7Js2kHhPT7SCG4mEiBXImiDz -RsVYBmYj7ygN7WHxCqulGcrU1q/O2yPnKuDnQniXGF5vSOv4/wCXQ/CXW/C3iO30+DULXw5q -t0qmSZms7KaTzN42gsQpGCX6k968d1v4aeLbvw/J4v8AG122naac/wBm6RI5a8umPCnyzzHH -1LSNzgHA5FfW5a6NZzqKcW/VX/rofM4jDV6SjKtRkk+rTSfkW/AH7PHi3x5Z6hPYaeFsYFUt -NLIIYGYkDaJTwzjKnyxzhtxxgZ7v/hjzxh/zzsf/AAaJ/hUV8yjRqypx1sehQy+Nakpydv69 -D/VM8GfEq68X6jr97pOn63c6bLfXOnKTHHHHp7WjFJCFG4AmQvFv3EM0BOAMZ3tLn8FfFJLH -xZa39+VtnubaGQfa7JoWJQyRyAlTIMhCoIZMqcdDXxWq96PQ9BSVRRjU2ev9elzxbUrn4M/D -TTbLw5Ncw3+upCthe3Wn6rZWhDzsqmedTcII5GdhIWHz4LHJyQfy4/4LWftAfDb9lf8A4Jxf -GjxjH8MLzWLPV7SPwLYtIbZdOiub6GRGuXEZ3uhZ13qdnmMFAYKWLbU7uau9DKafs2qSXN36 -erP8m+eyk1HxBbWT58qSZY8k5LDOM+5r6of4H22uS2dtocEpvjGIkigRnL98hQMk1j0cmeth -qDryVOOsm0kj9Of2U/2ANQ8TNotprngHWL4z6xpdxqdw9hsazsIlunlihjkYCUNKbUnjJCvx -gYP9Df7NP7Bl9D8MrdfEngi00rxLdvF5cN+3ywzF1ea5uVA3zKRviESeX8rHaUGDXyWOrV6m -IlFu8dfT/M/WcryijhMGopJS0u9Gzzn/AIKHf8E1f2kfitNoMP7P3gW78Tav4g1afVPFGuyL -aW1vbXRiENukFomBbW6IAFTL4CjLsev87/7SfwQ/bi/Z5uLjxX8SPh9r2leCdGvFhj1a9s5Y -bW71G3EcMiQyuoDMpcDjqFJGdua6MHjKSfsal7vZ20u+3kjyc8ybEVKcsVh5xfKtY31SV3d3 -3bt0P3F/4I5/tN3/AMJf2u/CCWOoSXPh/wAdWV3pesaZavsvrEXMkV2lxbFSDKuTPuiUhlMU -mOR839xvjjxd4fm0aCDTtctNIhnS5ttO127YQxWCooeSX5WElzFJK8JKt5UbqSS3Iz9LhFz0 -4pLVP7+v46n5Xmb9jiql5NRkk0+3T8Hqdl4cs5In0MeHbqw1DRbpUgvLmx+zJFpUsaoNsccS -/OJW3jLZCgfKRkCvxM/4Kofs0+A18d2/xF8YfCzw1q+kyaTPo+g6VcW0kdxc308iyLcG7h3T -TPETKxjkKxoDBtWT5qucvZTUoe6120a/r9R4SdaVOa5ua/fVPrt/Wx+F3xh8JeGtJ8d6X4J8 -EapaaLoazX+oSx6BBuhsYpppWito3kADyAj55CuGRYyOXOOO/wCECi/6Kvrv/fu1/wDiK6VU -aSc1dvU1d23aVvwP7avAXg7+wvBr/DHwtd3Xhq30/TmW0vorKUF7fKlVihz5bEGNgww7EAno -xJ5L4beCvH2nfA3R/hprPib/AIuBq2rfbNZ1qwt72IGT7aspkULmSGI28EVt++OW3ZkJJfOE -ZRUeW2zv9xySpJy5nLdWt0SfY+xdE0f4aa7qg8QaNpek3GsWAm083MEMJkgLmOWaM7R8pLeW -zA8gntk5/An/AIOevg9p3ij/AIJL/HLxJ4V8KxnWdK13w7qV9LYWgLm1i1GJJXl2D7sYkLFz -naMjIBNYRvz276Hc/ehorn+W/wCC9Bk1rx1akwjbboZ5ARwCDgfr/Kvu34YfFG/+GXj/AEbx -DpWlR3VxanMnnSBY0VuDlj0+tKcVKnKL6np5ZVlh6sKsN0/Q/WPwB+3/AOBPDni3/iu9Cn0a -+MCour+HtYgv7Qszb1aSIZxxjoQRkg+lfvz4H/bW8DeMPhx4I+LHhe7bU/ANjef2dq9/DExF -rmJxHI4xkL5myMnpl1r5rFUnSlzT2en9fI/SsuzB4iDpxir+X4fifbPwl/4KH/BbxtdR+FvC -Ft4k1e9iiDzpo/hsvDC3Bw0wl5PPOQOnHtJ+1LZeA/24P2ZPjZ8HX0hb461oV9Y2trqECrda -ZqSwSG0fDAmCRZdm1lPcjPWuSco8q5Z3V/69TrjFupJVYOL83e9/y9D/ADpvg/8AFjxl4I+I -/wAJda8L3t3Z+J9F1Z7wzQv/AKQtxBMNuDjKv8gXHILD8v8AV0/ZD1jTv2lP2ZvhH8SPib4Q -g/tHW/DdjrF0lxMnmNc43ASbju34j3FSzKAMGvscNJxo3W+jPxfM4f7dd2tqn8v+HZ9bpM/h -GzW6/sa10/wtaWIMUKTHzT5RyquFQ8bSxLAtjH8Wa888UfDrxD4+1bTvFa+MdY0y2u4Iw+m2 -IjKIBG5R3M1uJoJFLFdyMjEHGBjBucYyXNc46c5RfI4+ejenl69WfzY/Hv4Qaz8OPjN8WV+I -p0TUjq2po2lXR0wi3ns4lz+8X93I135jS+ZI53HBALJtrxj/AIR/wj/0Lfhn/wAFc/8A8kUk -3bT8z0eaMdG/vR/Th8Y9G06H9pn9mjwp9vvVs9Z0jXrOWCG4MSwizW1uILjK9XjkfavfL4+6 -WDfYy+HNIZrhP7GtlRzCZWjQJ9oMeSu8KBuC9gSRzTqaRpvuv1aOOhFKVVLW0rfgmb0FpDA8 -sqJiR2LMSSeTjOM9Og4HFfDH/BSTwx4t8VfsR/tK+HvAvizT9CuZ/COrSajc3+mC9ilsVtpG -u08kRylnePcARG53Ecc5EUtakdLm1X+HKza9N/l5n+Rd8PvBttpWnav4jSB45b64kjgSdAss -MEbFdsi5O1wwO4ZOCCMmvuP9l/8AYjg/ah1kWI+IlhpTkq/kyRNK0uemVyB+BNZYupOhQlOK -uz6HJsvjjK1KlUeiV3bfv/XzP1u+P/8AwTK+EXwS/Yw+LK6nofhy++Ik+lRvpOuQabFaXtrc -wSIyvFL5hCDBdTjG8OV5JFfcf/BBC40O5/ZS8b/D3VtKgn0PUdVuLK7E0If7XDJsBDZ7fMRj -ivnMRKdTBwqVFrzfoz9HwWEpfXKsaUOVKGlrLZp30S69TZ+Gn/BLD9oz4OfGfXn8MfFbxVo2 -ks1xJpWt+H/Ea/YL+Nnd4GuLGSMplAwUx7cYQA5HX9kPAnw48W+B9FtvEnxQ1611XxysMNle -ajY2htI9TEbArM0OSEc5OVBIBztIHFebOpPmhTtZJ9PzNZwoTrOrRbvKzd35aqz7NH8eH7Dn -/BGnxv8At1fG39suLStSurLQfC3xB1fw6k1nFCdty15LMC0krgRRovlsWCvnBUBjxX+iF8C/ -hZ4F/Zi+DHw8+F1/Jdt4e8O28Oj2Oq+I5bWWcpsaNE89MnZ8zRp5rbgjhCzY5+zwkpTw8ZX3 -tZH47mvIsdU9y/LKSb/7e7EGj2WueJ/GHiseEPFK2E+m3EdxYysv2iDVoLgJKZZIfNAEWA1q -MKGAiLq3zAV7JqmtXXhGG31DxPeRte3AEafY7ScpJKpYhOGOWYMAgOMlT1zx2T1aj1t/wTxq -d4xlU2Sb+etk/mj89vj7+yD8NPjVc+Itc1i61XSvGk13Fe507Tkm3pIZA3mW8c0qSsSpO8tG -UwM8tg/K3/DtLwP/AND94o/8I5f/AI5WTpyvo18z0KeKpSgnKDb8mfsH4j8I+H/Hvjr4XfFH -Spw+q6THfQ6dfPOFh+zTtb/aNq8+cHWBduNvQsWA4b1DVdYNhbTXUmqwWt06MtrBdzwxxyvH -uOd4ydrDaDzwMcA1bvLlg1tp+JyRtD2lSErKWt2+tlvfv+h5Z4V8SSaj4QsZPFHihm1rxBJN -c2Rh1IRreomMR2LxMvlLsUMozuxl35LYT45/FLSfB3wM+KPjGa7t4LnTfD809xBdoJhZvLAd -guY1JyF3hnXqVBx1BqlT/eRVtL/rYmNZypyXN73L09L7ea/rQ/yNPH2nal4e1zXdB16GWHXL -W+vkv4poDBJHdG4maZXi6xNvLZT+E8dq9/8A2DfjAPAPxt0G0muiba9cQqB2ftj0rLGqM8PU -svuPtOHqqo46g2+lvwPq7/grL/wUF0nxtP4d/Zo+HV7Lc+E9Of7X401Kxk3C+vUGYNPjIOHi -icCSUj70ionRDn9Hv+CIn7V/we0/4TX/AIGl0rUn8WfZ5457XTrC4uZWl8+MwzKkKOzOSUXZ -1OD2FeJi6Kw+Dp+026/NH3OWZksVmeLo0l73Lo917rTZ/Qb+zx+1vo/iX4h/E74L/FKxvbbx -x4P1WXTobi4tvs015bYWS1llhPQtC6fMvB56ivTPiN41j1K1uhHcKsXm7xgZBAOegrxnOEoR -095Oz+Wh6tPC+yrVKknenZOPo9de9jsv+CVX7J13+yV4V+N0muTvP8QPiL401DxzrMcMZe30 -hLu4uZbK1Myko8y27hnAxsMiKScjP6u6jZWOvafNpWs2KSWc6tHJDPHG6SY77XyDzhhwegNf -YQh7OnCD3SX4I/D8RWjXxNarH4ZTk0/WR8++J/hfFcSwa34d1+7sNatpJJo4xPGsl2eFaNXP -MUUhCg7ThSibQoBFa+lad8QNOgXyPEtzf2k19FKttrUQFwkClkMBkUFQ4JTLAgkpuHBwejmv -Fcx5vJaTcLq+/btqjhbHxbovhmN9c+LV14YgsJp52t47GwfbFKsjxyh5X3PNJ5jPkKmAc88E -1of8L3/Zt/6Dei/+AUv/AMYq3FuzjscbqwhJxqRu/uL/AMUPA1rD4y8K/E3TdVk/tyx0670q -3055JHt7y1lKyTnygkmJEVCAwX5gwDY2qRl+EIvhVJ4FttV8X2Nvo8cdh5c1hq91A8+lIrsj -FyHeCOQybXKxcB2QHJxkc5yjHl3Wn5mzpUac5SqS9166/wBfPsj+Xj/grN/wc1/D39jDxv4i -/ZP/AGMfhPpvi74peELp7DUvFfiJHXR/Dd6M+baWdpAY5bmSHcYnYyQxoysmJNpx/Lr4r/4O -bf8AgrH4j0fxr4Yu/jF4d/4Q7xAt5HqmijwNohtLmK7LefGxaAzFWRjHzKTswueBVOoqXuuK -k99b/hqTTw8sQ/aucoRtZJWTa7y03fbovM/P+0+Mnin4v2998QPHmpNeeNdXurm61S8KKhur -hpWLSELgBmzknHLEk8kmtTwJp3ifxD4y8O+H/A4l/wCEqvrpbSy8mURuZZPlG1yQEzkjJI+t -ZTmuWVSe27PqMHGT9lTov3tF/X+YuofCTx94b+NGq/Czxjp+nWHiLT70Wt/b6rfiJI5OHYNN -GWVtwYEFTzngnIr+1H9gzxd4i+FnhHw7J4a/ZQ8MaOsOgwadc/8ACI+JrIWmrRxsCtxvfMr3 -DHczeaxJ3EZFeFm0uaVO0W7K/kfp3BOV8+Cxk51oRk5W3bbt6Lbqu/3H2zqFnB8Xfivc+N77 -wDqPhb4k6Xbwafcfbhbn+29NeMTWs6SwPIkgQtJHydyFSrAcV6+qahe32g+GpGWTULm5S1iD -cKWYkFn7hVG5yewUntXkUKUq1eEKS3f43OrFYlYfBYidaStTjJt9LJNn6tWUfjY2Fx4b8F+O -NO0u/hsorZNOlQlmuHUyRyNOhMpEiggh5N4JB8wE4PkGl+PZ/h/4nudV8SXAh1h7qK7uZNf1 -MXDkNBGBNZtHI0jxSbmQxJFEv7sNtZsZ+3UtZKS1fU/AZxg4qpTleK1t69V/W59KWXgvWPEW -l6WuheJ4mtI5pL+zvGu5bi/s4pZPNiaN50+4xUoEcfKhdQxwAN/xPaXGha14M1jxB4lntbKC -9Npbx2yiGLVbu6b5FunJYKi7c9IwzEAEnahm6btbUvllCCqJ3i+vb+v62L2uv41SBdSvvBnh -y4uY5GW2tL/UjEId/wB9kuBbSYzg5+QFs84xg8t/b/jj/olfgv8A8K2T/wCVtJQctYN2NpVl -F2qWufhP+3b+0l8ZfgpLZ6J4w1iS60TXfEoh0jVdO1O70m7sHl02NZ454o2YfZysqtutplT9 -4+8BmRq+hPhSn7Pv7PX7PvxE1vxF8bPCuqeOL63k1SJE1G1s7WK0trqS5TSreGOVwSp+18sr -LOWBbcqbU9bEUpRp03Rg3zfp+ep89hqtNuq8TNLk09b9fLsf5rH/AAVR8E/Bjwr+3t+0cP2f -/jTpPi74U61r83ibSNTsrw3At/7SZrqexuJUXb59rPJNA23KsqRuG+bj8+pvh74leNNTk0O5 -fRS2GvLNPtEI/wCBR5ArglSnKTvq1vbofS0PfpxdJO1tPQ7HQ9eHheKGyt5SbKM7Qc5685/W -vob4V/Fy98AeLNC8c6IsMt/Yv5saSYKkkEZ9cjIIPqBWFSMZJwZ34XEToyU47o/QD9lj4Y/B -D9pjxle618XvGuqyeKdTvJJbvNxHE73T/vGfdg7lOT9MY7V/Vp+yF+wv8JPgncWmq+AviBqs -biPcdM1OTzQiM7SL5ci8MuWK5IHGAScZr53MJVfaOnJ6LZWP03IFRp4P21BPmn8Tu7v9D7u8 -W6xpWj65Z38moLJdwQmNsSLkLnjPXuPbr2rK/Zh/bD/ZmsP2q9T+DfxK1e0m+KWoaVDYaJb6 -kYY9IimvX/ew3M7M3l3UkAQxRlCGVyu4NItVlGGnUxSa3im/wPJ4gxsoZPieWN7tJ+l9b+Xf -yP3o074d+DrLRte8NtppexikuDJDcm5WNI7hRjZLLuDfIqAsrMFII+UgKMfVvAvh3UPFem38 -WmWn/CRaRZR21veA4u5A4VZI/lB2oYI9mzHzFycDaGr6BTcpc0vX7z8ylSVOHLDqrf192hs2 -viPwfpPxQsPh1pOgXq+IpNK+2vLaaXJHZWVnC5ESzXBCxcvMyxxoXOd+QACa3vFK+GNYj026 -8aRPbw6ZrCXNjC87j7XPGdkMnlRnMw3OSqEMNwVsZAIl3Uk1uaQS9nOE00r9f6+R8g/GHxbf -+Jda07XL3xjregQWMD2zaLprWJnR5JDiWaZVuRh0SMhVjyMYLKSyt5D/AMJJbf8ARVvGv/gb -bf8Ayrr1KUWqcYxtZHmzipzlOpe7fc/ix+P/AO3Bofj3xJqupfFjW77x14sbSha27jUWjNnd -GKOOOZ5Ix5ZKJHGpjUHdjDcjNfiX+2z+3P8AtM+M9M0D4L3fj1NL+FNra3Ulpomh2S2RaG6Z -kmS7ulJnvFcBk2vJs2Dbs659nNpqnSXsnZR0SXS++pjlWTyhh1i8UrSlbTq9bpy/yPydnaZi -XD8/Wuo8N/Erx94Ntruy8M+Kb2ysbiSOWeGCdljldA6ozL90lRLIAcZAdvWvk+acZc0HqfQx -bjqnY1J/iZca3FJB4t0q2v2YYN1sEF0vXkSxgb+v8atWDpHiR9HvZPsrvLppY7Ukwrhc8dOM -47dKqpV9raTVpeXUq+qZ9CeBvG9xZanZa14X1yS21aCRZomico8bDBBx+H0r+mH9h/8AbO+K -/ifw7Zf8LB+MeiWCWqLExkDfapoxnG4MQm7jqD0HNedjqanTU4xu1ofXcP4mUIzpe0tDfzPu -H9o79sEfD/4URav4ci+1+JNWM0Gg3N0pZb2RAgknGfvxRmRMnoWZVGcNj8EdS+Kek6ZfXeue -OfHMUvi+8la4vru6nU3F/OxyzMB8zPkcADjGAAABXrcP4X2VGWKlbXvskaZjiqLpyjN+67q3 -c/Rr9nb/AILHfth+AU/4tP8AtV63q+l2hSK60rXLr+2rRVIICNDfiUxK2CMRsh44Ir+jT9iH -/gt/8PPjzrEvgT9p+e18FfFPVrvTYdP8RfaJD4eYxsIpljLbp9JmljJAEkkkBkO7zIy2D62J -wdKpGVXDpX8tnr/wD4rGYFRpLF4VvkV7x1dt1zLrZbtfda2v9EVjr2keK0fxhpEEtsEM2mWm -pNIm3UWR5I0YKjN9ot8s0sbZzhmOAc18ean8b/hJp8Oonx1cW1z4psNcZ73V7jRY7G2kT7Q1 -mXtBNcO0EMBAeRmbLpFIwU+YAPHpU5ybilqjgr1UoKotn816+X9Mu+EPgtbeLviBFq0V003h -/TLa5xHNJbR293dytGEVbJFkECpbv5gdpnZhNHlI+AffP+FFaX/0AtM/74tv/jVXOvytRa2M -44ZVr1L7+Z/kdWd40cQaADYD1xzmqeu6Z4Z8UR28ni/wxaXyxnbE8iEOgPOARzj26d6+gqON -WLhNc3c+rhSpzh3XY5J/hf8ABW5jlx4MWKT1RnIBx6Fveq8nwj8EIinRYIIHDdJLRXHbjkGu -P6th3rBWafqWsNRnFyjBK39dThPFXwATxAq3EdpaCfO1Z7QCBjjONyY2t+WfevI5f2eIbaWa -O91W4jKjqqRNj/x7muKtg/f5np6f5HLUwM1JtM2vDX7Ottd6tZ/ZfGb7QythbUxyMM8gNuZQ -frxX9bH/AASZ+F37GXj74W3mk6j8M7i8+Mnha0XUPEV1rk0l3bz2xaQJdWaLtiRMxOGt3RpF -ZThpFINcmIy3nhGUpvlT2Wl/J+Q/aV8uw9SrQabejbWsfNefn9x+aX7THx/vv2sfifrfxUaw -/srwE1pHp3hTRoP3a6PoUJY26lY8BZZiz3Eu3o0xUZCivm/QvCWhX2u6V4jOk26LZRSDTVWF -AwMgHmSs3XcwAABJwMnqTXtUqUI0qcWtFY9KhR5aFJS1lo331139T0ay03SbS51S40zTYYLq -5dZbl4Y1Q3DAYVnIA3ED1qt4sl1KDw/qV7p04S8srZ73GOJBGCzLg8HKhsZ4yFzxXeowVNJL -+nqaTVoM+1f+CaX/AAcM/Ef9l+Sx/Zw+P15rGsfsuza0s+manatDd6t4CDPIA1nFdxyx3NkN -6yG0YBozGGhKn5G/t5+LXg/4I/Ghfgn4K8bQawdc1myvfEGk31veGW7gj/s9bedWuJkG4XCM -u8Mpz5Kj5K8dQ56/tqWju/vt+p+bY+t9VcqUo3pvbXo3a3yvp5fMz/hp4d0T4Wf2r8N/hx45 -8Q2ereCL6bTdQN3eNLa6i15HBdLcGFAqnekynaeYmQqPlxn1z/hPfiP/ANFMb/wEk/8Aiq6K -mH5mpTgrtJ/fr+p5GHrWg1GrJK7XXpp+h//Z -----__JNP_000_3c67.4591.1173-- - ---part1_23.3af50667.2d650c0e_boundary-- diff -Nru spamassassin-3.4.6/xt/data/nice/no_body spamassassin-4.0.0~rc3/xt/data/nice/no_body --- spamassassin-3.4.6/xt/data/nice/no_body 2007-01-23 18:42:57.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/no_body 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -Message-ID: <000301c21009$256f5ac0$190863d9@ppp> -From: "Jerzy Krykowski" -To: "Jozef Naumowicz" -Subject: This message has no body! (EOM) -Date: Mon, 10 Jun 2002 00:52:45 +0200 diff -Nru spamassassin-3.4.6/xt/data/nice/not_gtube.eml spamassassin-4.0.0~rc3/xt/data/nice/not_gtube.eml --- spamassassin-3.4.6/xt/data/nice/not_gtube.eml 2004-02-07 23:47:08.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/not_gtube.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Message-ID: -Date: Mon, 07 Oct 2002 09:00:00 +0000 -From: Sender -MIME-Version: 1.0 -To: Recipient -Subject: Not The GTUBE -Content-Type: text/plain; charset=us-ascii; format=flowed -Content-Transfer-Encoding: 7bit - -What, I sent you the GTUBE? oops! diff -Nru spamassassin-3.4.6/xt/data/nice/orig_ip_hdr.eml spamassassin-4.0.0~rc3/xt/data/nice/orig_ip_hdr.eml --- spamassassin-3.4.6/xt/data/nice/orig_ip_hdr.eml 2011-05-05 15:32:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/orig_ip_hdr.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Received: from 1.2.3.4 by probeer.bokxing.nl - (probeer.alt001.com [87.253.148.98]) with ESMTP id YN8t6r6y41Ly - for ; Mon, 11 Oct 2010 14:21:26 +0200 (CEST) -X-Originating-Ip: [198.51.100.1] -X-Testing-Ip: [198.51.100.2] -Subject: test -From: Roel -To: Roel -Date: Mon, 11 Oct 2010 14:21:30 +0200 -Message-Id: - -test diff -Nru spamassassin-3.4.6/xt/data/nice/spf1 spamassassin-4.0.0~rc3/xt/data/nice/spf1 --- spamassassin-3.4.6/xt/data/nice/spf1 2005-12-19 02:25:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/spf1 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Return-Path: -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [64.142.3.173]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: by proxy.google.com with SMTP id so1951389 for ; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b@persist.google.com> -Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST) -From: newsalerts-noreply@dnsbltest.spamassassin.org -To: jm-google-news-alerts@jmason.org -Subject: Google News Alert - spamassassin -MIME-Version: 1.0 -Content-Type: text/plain; charset="ISO-8859-1"; - -SWSOFT Unveils Plesk 7, Deployed by 1&1 -Web Host Industry Review - USA -... The software also features a newly designed Windows XP-like user interface, -is equipped SpamAssassin, an open source anti-spam tool, and includes -"Application ... - -See all stories on this topic: - - diff -Nru spamassassin-3.4.6/xt/data/nice/spf2 spamassassin-4.0.0~rc3/xt/data/nice/spf2 --- spamassassin-3.4.6/xt/data/nice/spf2 2005-12-19 02:25:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/spf2 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Return-Path: -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.157]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [64.142.3.173]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: by proxy.google.com with SMTP id so1951389 for ; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b@persist.google.com> -Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST) -From: newsalerts-noreply@dnsbltest.spamassassin.org -To: jm-google-news-alerts@jmason.org -Subject: Google News Alert - spamassassin -MIME-Version: 1.0 -Content-Type: text/plain; charset="ISO-8859-1"; - -SWSOFT Unveils Plesk 7, Deployed by 1&1 -Web Host Industry Review - USA -... The software also features a newly designed Windows XP-like user interface, -is equipped SpamAssassin, an open source anti-spam tool, and includes -"Application ... - -See all stories on this topic: - - diff -Nru spamassassin-3.4.6/xt/data/nice/spf3 spamassassin-4.0.0~rc3/xt/data/nice/spf3 --- spamassassin-3.4.6/xt/data/nice/spf3 2005-12-22 23:40:37.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/spf3 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Return-Path: -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.158]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [64.142.3.173]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.155]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.156]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: by proxy.google.com with SMTP id so1951389 for ; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b@persist.google.com> -Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST) -From: newsalerts-noreply@dnsbltest.spamassassin.org -To: jm-google-news-alerts@jmason.org -Subject: Google News Alert - spamassassin -MIME-Version: 1.0 -Content-Type: text/plain; charset="ISO-8859-1"; - -SWSOFT Unveils Plesk 7, Deployed by 1&1 -Web Host Industry Review - USA -... The software also features a newly designed Windows XP-like user interface, -is equipped SpamAssassin, an open source anti-spam tool, and includes -"Application ... - -See all stories on this topic: - - -"v=spf1 ip4:64.142.3.173 -ip4:65.214.43.155 ~ip4:65.214.43.156 ?ip4:65.214.43.157 -all" - diff -Nru spamassassin-3.4.6/xt/data/nice/spf3-received-spf spamassassin-4.0.0~rc3/xt/data/nice/spf3-received-spf --- spamassassin-3.4.6/xt/data/nice/spf3-received-spf 2008-02-07 00:18:37.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/nice/spf3-received-spf 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Return-Path: -X-Comment: Yeah, the Received-SPF headers make no sense, there just there to test that the SPF plugin will parse the results from them... the IPs and comments are bogus -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.158]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [64.142.3.173]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received-SPF: fail (dostech.ca: 69.61.78.188 is authorized to use 'spamassassin@dostech.ca' in 'mfrom' identity (mechanism 'mx' matched)) receiver=FC5-VPC; identity=mfrom; envelope-from="spamassassin@dostech.ca"; helo=smtp.dostech.net; client-ip=69.61.78.188 -Received-SPF: softfail (dostech.ca: 69.61.78.188 is authorized to use 'dostech.ca' in 'helo' identity (mechanism 'mx' matched)) receiver=FC5-VPC; identity=helo; helo=dostech.ca; client-ip=69.61.78.188 -Received-SPF: neutral (herse.apache.org: domain of spamassassin@dostech.ca designates 69.61.78.188 as permitted sender) -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.155]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.156]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: by proxy.google.com with SMTP id so1951389 for ; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b@persist.google.com> -Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST) -From: newsalerts-noreply@dnsbltest.spamassassin.org -To: jm-google-news-alerts@jmason.org -Subject: Google News Alert - spamassassin -MIME-Version: 1.0 -Content-Type: text/plain; charset="ISO-8859-1"; - -SWSOFT Unveils Plesk 7, Deployed by 1&1 -Web Host Industry Review - USA -... The software also features a newly designed Windows XP-like user interface, -is equipped SpamAssassin, an open source anti-spam tool, and includes -"Application ... - -See all stories on this topic: - - -"v=spf1 ip4:64.142.3.173 -ip4:65.214.43.155 ~ip4:65.214.43.156 ?ip4:65.214.43.157 -all" - diff -Nru spamassassin-3.4.6/xt/data/phishing/openphish-feed.txt spamassassin-4.0.0~rc3/xt/data/phishing/openphish-feed.txt --- spamassassin-3.4.6/xt/data/phishing/openphish-feed.txt 2019-02-10 08:54:17.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/phishing/openphish-feed.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -https://ehawkerbd.com/wp/wp-admin/js/office365/auth.php -https://ottobenecker.org/nvx/365/login.php?l=_JeHFUq_VJOXK0QWHtoGYDw1774256418&fid.13InboxLight.aspxn.1774256418&fid.125289964252813InboxLight99642_Product-userid&userid= diff -Nru spamassassin-3.4.6/xt/data/phishing/phishtank-feed.csv spamassassin-4.0.0~rc3/xt/data/phishing/phishtank-feed.csv --- spamassassin-3.4.6/xt/data/phishing/phishtank-feed.csv 2019-02-10 08:54:17.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/phishing/phishtank-feed.csv 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -phish_id,url,phish_detail_url,submission_time,verified,verification_time,online,target -5766500,http://www.nlcmacon.com/login/www.made-in-china.com/Made-in-China.htm,http://www.phishtank.com/phish_detail.php?phish_id=5766500,2018-08-29T06:15:18+00:00,yes,2018-08-29T06:30:41+00:00,yes,Other -5766442,https://www.anatolialamps.com/wp-content/themes/sketch/fopo/fur50/signin.php?locale.x=en&_token=MTUzNTUxMzAxOQ=message-id:,http://www.phishtank.com/phish_detail.php?phish_id=5766442,2018-08-29T03:47:32+00:00,yes,2018-08-29T06:39:51+00:00,yes,PayPal diff -Nru spamassassin-3.4.6/xt/data/reporterplugin.pm spamassassin-4.0.0~rc3/xt/data/reporterplugin.pm --- spamassassin-3.4.6/xt/data/reporterplugin.pm 2005-05-07 16:08:32.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/reporterplugin.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -=head1 WARNING - -This is a sample plugin, it may not work at all, so buyer beware. - -=cut - -package reporterplugin; - -use strict; -use bytes; -use Cwd; - -use Mail::SpamAssassin::Plugin; - -use vars qw(@ISA); -@ISA = qw(Mail::SpamAssassin::Plugin); - -sub new { - my $class = shift; - my $mailsaobject = shift; - - # some boilerplate... - $class = ref($class) || $class; - my $self = $class->SUPER::new($mailsaobject); - bless ($self, $class); - - return $self; -} - -sub plugin_report { - my ($self, $options) = @_; - - if (-e 'log/rptfail') { - $options->{report}->{report_available} = 0; - $options->{report}->{report_return} = 0; - } - else { - $options->{report}->{report_available} = 1; - $options->{report}->{report_return} = 1; - } - - return; -} - -sub plugin_revoke { - my ($self, $options) = @_; - - if (-e 'log/rptfail') { - $options->{revoke}->{revoke_available} = 0; - $options->{revoke}->{revoke_return} = 0; - } - else { - $options->{revoke}->{revoke_available} = 1; - $options->{revoke}->{revoke_return} = 1; - } - - return; -} - -1; diff -Nru spamassassin-3.4.6/xt/data/spam/001 spamassassin-4.0.0~rc3/xt/data/spam/001 --- spamassassin-3.4.6/xt/data/spam/001 2005-01-29 03:02:38.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/001 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -Return-Path: sb55sb55@yahoo.com -Delivery-Date: Mon, 19 Feb 2001 13:57:29 +0000 -Return-Path: -Delivered-To: jm@netnoteinc.com -Received: from webnote.net (mail.webnote.net [193.120.211.219]) - by mail.netnoteinc.com (Postfix) with ESMTP id 09C18114095 - for ; Mon, 19 Feb 2001 13:57:29 +0000 (GMT) -Received: from netsvr.Internet (USR-157-050.dr.cgocable.ca [24.226.157.50] (may be forged)) - by webnote.net (8.9.3/8.9.3) with ESMTP id IAA29903 - for ; Sun, 18 Feb 2001 08:28:16 GMT -From: sb55sb123456789@yahoo.com -Received: from R00UqS18S (max1-45.losangeles.corecomm.net [216.214.106.173]) by netsvr.Internet with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13) - id 1429NTL5; Sun, 18 Feb 2001 03:26:12 -0500 -DATE: 18 Feb 01 12:29:13 AM -Message-ID: <9PS291LhupY> -Subject: There yours for FREE! -To: undisclosed-recipients:; - -For tests that use this mesasge to work, it must contain spammy phrases, -the body must be at least 2048 bytes long, the first 1024 bytes of the -body must remain unchanged, the last line must remain unchanged and -the very first line of this file must remain unchanged. - -Subject to those constraints you can add spammy stuff at the end of this -message as long as you add it after the first 1024 bytes of the body and -before the last line. - -Some tests scripts hard code the SHA1 hash of the first 1024 bytes of this -message which is why you must not alter those first 1024 bytes. - -The hash is actually calculated on the minimum of 1024 and half the length -of the body of the message, which is why the body of this message has to be -at least 2048 bytes. - -Another test script checks for the first line and the last line of this file. - -Enough filler, now for the spammy stuff: - -Congratulations! You have been selected to receive 2 FREE 2 Day VIP Passes to Universal Studios! - -Click here http://209.61.190.180 - -As an added bonus you will also be registered to receive vacations discounted 25%-75%! - - - -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -This mailing is done by an independent marketing co. -We apologize if this message has reached you in error. -Save the Planet, Save the Trees! Advertise via E mail. -No wasted paper! Delete with one simple keystroke! -Less refuse in our Dumps! This is the new way of the new millennium -To be removed please reply back with the word "remove" in the subject line. -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - -C1a115 is a spammy way to write Cialis. -V1c0d1n is a spammy way to write Vicodin. - -Hello, I have a special offer for you... - -WANT TO LOSE WEIGHT? - -The most powerful weightloss is now available -without prescription. All natural Spampro720 -100% Money Back Guarantie! - -- Lose up to 19% Total Body Weight. -- Up to 300% more Weight Loss while dieting. -- Loss of 20-35% abdominal Fat. -- Reduction of 40-70% overall Fat under skin. -- Increase metabolic rate by 76.9% without Exercise. -- Burns calorized fat. -- Suppresses appetite for sugar. -- Boost your Confidence level and Self Esteem. - -Get the facts about all-natural Spampro720: http://209.61.190.180 - -(add any other spammy stuff here) -This must be the very last line diff -Nru spamassassin-3.4.6/xt/data/spam/002 spamassassin-4.0.0~rc3/xt/data/spam/002 --- spamassassin-3.4.6/xt/data/spam/002 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/002 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -From tstfromline@localhost Sat Jan 19 15:26:33 EST 2002 -Return-Path: jm@netnoteinc.com -Delivery-Date: Thu, 10 Aug 2000 07:18:55 +0100 -Return-Path: -Delivered-To: jm@netnoteinc.com -Received: by mail (Postfix, from userid 500) - id 66ADCD88BE; Thu, 10 Aug 2000 06:18:47 +0000 (Eire) -Received: from godzilla.justlinux.com (ns1.userchoice.com [209.90.19.2]) - by webnote.net (8.9.3/8.9.3) with ESMTP id GAA09378 - for ; Thu, 10 Aug 2000 06:44:36 +0100 -From: bigmoney@fasttrec.com -Subject: ADV: --YOUR BRAND NEW HOUSE-- -Received: from www.fasttrec.com (04-160.034.popsite.net [192.216.54.160]) - by godzilla.justlinux.com (8.8.7/8.8.7) with SMTP id AAA17668; - Thu, 10 Aug 2000 00:35:18 -0500 -Date: Thu, 10 Aug 2000 02:53:01 -Message-Id: <503.767473.93364@www.fasttrec.com> -Sender: jm@netnoteinc.com -To: undisclosed-recipients:; - -Hi there, - -To be removed please visit: -http://www.supersitescentral.com/rl/remove.html - -BIG News... - -Visit http://www.supersitescentral.com/rl/x601001.html for full details. - -We have discovered a secret to generating a fortune over -the Internet and are looking for a few good people to -share it with. - -This could finally be your chance to get that brand new -car and go on that dream vacation you have always wanted. -This is THE BIG ONE! So pay real close attention... - -Literally thousands of people are making obscene amounts -of money from the Internet and ecommerce. We found an -Internet giant who markets 11 million products with HUGE -demand in every country around the globe. - -You can sit in the comfort of your home making money -hand over fist with a HUGE global market at your -fingertips. Most people never get the opportunity like -this to join *BEFORE* the masses come in. - -Consider this: - - * Debt Free Multi-Million Dollar Company - * International - in over 180 Countries - * A 100 Billion Dollar Industry - * 3 Year Proven Track Record - * eCommerce Shopping Giant - * Online Marketing Tools - * Phenomenal Support Systems - * Automated Recruiting Systems - * Proprietary Back Office Technology - * Huge Compensation Plan - * Lifetime Residual income - - -Go to the web site below to get all the details. - - http://www.supersitescentral.com/rl/x601001.html - - -Isn't it your turn to make a fortune over the -Internet? Don't drag your feet on this one. It -could be the one you have been waiting for all -your life. - -Talk to you soon, -Mark - -iNet Marketing Services - - - - - - - - - diff -Nru spamassassin-3.4.6/xt/data/spam/003 spamassassin-4.0.0~rc3/xt/data/spam/003 --- spamassassin-3.4.6/xt/data/spam/003 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/003 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -From pertand@email.mondolink.com Fri Aug 31 13:39:16 2001 -Return-Path: -Delivered-To: jm@localhost.jmason.org -Received: from localhost (localhost.localdomain [127.0.0.1]) by - jmlaptop.jmason.org (Postfix) with ESMTP id 7C912107E8 for ; - Fri, 31 Aug 2001 04:39:15 +0100 (IST) -Received: from dogma.slashnull.org [212.17.35.15] by localhost with IMAP - (fetchmail-5.7.4) for jm@localhost (single-drop); Fri, 31 Aug 2001 - 13:39:15 +1000 (EST) -Received: from mail.netnoteinc.com (gw.netnoteinc.com [193.120.149.226]) - by dogma.slashnull.org (8.9.3/8.9.3) with ESMTP id MAA27911 for - ; Thu, 30 Aug 2001 12:13:06 +0100 -Received: by mail.netnoteinc.com (Postfix) id 919BF114155; Thu, - 30 Aug 2001 12:13:21 +0100 (IST) -Delivered-To: jm@netnoteinc.com -Received: from www.goabroad.com.cn (unknown [211.100.6.104]) by - mail.netnoteinc.com (Postfix) with ESMTP id 9515F1140BA for - ; Thu, 30 Aug 2001 11:13:19 +0000 (Eire) -Received: from yahoo.com - (PPPa33-ResaleLosAngelesMetroB2-2R7452.dialinx.net [4.48.136.190]) by - www.goabroad.com.cn (8.9.3/8.9.3) with SMTP id TAA96146; Thu, - 30 Aug 2001 19:06:45 +0800 (CST) (envelope-from - pertand@email.mondolink.com) -X-Mailer: Mozilla 4.04 [en]C-bls40 (Win95; U) -To: jenny33436@netscape.net -Subject: *****SPAM***** *****SPAM***** "100% HERBALSENSATION" -X-Spam-Prev-Content-Type: text/html -Content-Transfer-Encoding: 8BIT -Message-Id: <78w08.t365th3y6x7h@yahoo.com> -From: renterr989@hotmail.com -Date: Wed, 29 Aug 2001 04:20:43 -0800 -Sender: pertand@email.mondolink.com -X-Spam-Status: Yes, hits=15 required=5 -X-Spam-Flag: YES -X-Spam-Status: Yes, hits=15 required=5 -X-Spam-Flag: YES - -SPAM: -------------------- Start SpamAssassin results ---------------------- -SPAM: This mail is probably spam. The original message has been altered -SPAM: so you can recognise or block similar unwanted mail in future, using -SPAM: the built-in mail filtering support in your mail reader. -SPAM: Content analysis details: (15 hits, 5 required) -SPAM: Hit! (1 point) Subject is all capitals -SPAM: Hit! (1 point) From: ends in numbers -SPAM: Hit! (1 point) From: does not include a real name -SPAM: Hit! (2 points) Forged From: line claiming to be from hotmail.com -SPAM: Hit! (3 points) BODY: /http\:\/\/\d+\//i -SPAM: Hit! (1 point) BODY: /to be removed (?:from|send|reply)/i -SPAM: Hit! (3 points) /click here.{0,100}<\/a>/is -SPAM: Hit! (1 point) Received via a relay in relays.ordb.org -SPAM: [RBL check: found relay 104.6.100.211.relays.ordb.org.] -SPAM: Hit! (1 point) Received via RSS-listed relay, see http://www.mail-abuse.org/rss/ -SPAM: [RBL check: found relay 104.6.100.211.relays.mail-abuse.org.] -SPAM: Hit! (1 point) Received from a dialup IP, see http://www.mail-abuse.org/dul/ -SPAM: [RBL check: found relay 190.136.48.4.dialups.mail-abuse.org.] -SPAM: -SPAM: -------------------- End of SpamAssassin results --------------------- - - -SPAM: -------------------- Start SpamAssassin results ---------------------- -SPAM: This mail is probably spam. The original message has been altered -SPAM: so you can recognise or block similar unwanted mail in future, using -SPAM: the built-in mail filtering support in your mail reader. -SPAM: Content analysis details: (15 hits, 5 required) -SPAM: Hit! (1 point) From: does not include a real name -SPAM: Hit! (1 point) Subject is all capitals -SPAM: Hit! (1 point) From: ends in numbers -SPAM: Hit! (2 points) Forged From: line claiming to be from hotmail.com -SPAM: Hit! (3 points) BODY: /http\:\/\/\d+\//i -SPAM: Hit! (1 point) BODY: /to be removed (?:from|send|reply)/i -SPAM: Hit! (3 points) /click here.{0,100}<\/a>/is -SPAM: Hit! (1 point) Received via a relay in relays.ordb.org -SPAM: [RBL check: found relay 104.6.100.211.relays.ordb.org.] -SPAM: Hit! (1 point) Received from a dialup IP, see http://www.mail-abuse.org/dul/ -SPAM: [RBL check: found relay 190.136.48.4.dialups.mail-abuse.org.] -SPAM: Hit! (1 point) Received via RSS-listed relay, see http://www.mail-abuse.org/rss/ -SPAM: [RBL check: found relay 104.6.100.211.relays.mail-abuse.org.] -SPAM: -SPAM: -------------------- End of SpamAssassin results --------------------- - -

    SWEET -SENSATIONS ! (tm)
    -    The #1 BEST SELLING 100% ALL -NATURAL APHRODISIAC IN AMERICA!

     - HARDCOPY -EPISODE-
    "The Story you -have been waiting for that's making men and women go wild!
    Men and Women -who are taking this powerful little natural pill are loving what it's doing to -their libido!"

    - -EYEWITNESS NEWS -
    -"Americas Number 1 Natural Love Pill and It's Selling Like Hot Cakes!"
    -
    For more details please
    CLICK HERE
    -
    To be Removed Send An Email To twema2001@yahoo.com.



    - - diff -Nru spamassassin-3.4.6/xt/data/spam/004 spamassassin-4.0.0~rc3/xt/data/spam/004 --- spamassassin-3.4.6/xt/data/spam/004 2009-11-24 16:32:51.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/004 1970-01-01 00:00:00.000000000 +0000 @@ -1,175 +0,0 @@ -From travelincentives@aol.com Fri Dec 7 11:07:41 2001 -Return-Path: -Delivered-To: jm@localhost.jmason.org -Received: from localhost (localhost.localdomain [127.0.0.1]) by - stinkpad.jmason.org (Postfix) with ESMTP id 5D48F10710 for ; - Fri, 7 Dec 2001 11:07:40 +1100 (EST) -Received: from dogma.slashnull.org [212.17.35.14] by localhost with IMAP - (fetchmail-5.7.4) for jm@localhost (single-drop); Fri, 07 Dec 2001 - 11:07:40 +1100 (EST) -Received: from mail.netnoteinc.com (gw.netnoteinc.com [193.120.149.226]) - by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id fB6Nw4V09475 for - ; Thu, 6 Dec 2001 23:58:04 GMT -Received: by mail.netnoteinc.com (Postfix) id A81F511441C; Thu, - 6 Dec 2001 23:58:03 +0000 (GMT) -Delivered-To: jm@netnoteinc.com -Received: from ns.sakakura-kk.co.jp (ns.sakakura-kk.co.jp [61.119.13.18]) - by mail.netnoteinc.com (Postfix) with ESMTP id 4FD6F1143D6 for - ; Thu, 6 Dec 2001 23:58:02 +0000 (Eire) -Received: from plain (ZHONGXIN [212.17.35.134]) by ns.sakakura-kk.co.jp - with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13) - id YJQP6DKP; Fri, 7 Dec 2001 08:15:01 +0900 -Received: from 144.137.3.98 (SquirrelMail authenticated user jmmail) by - jmason.org with HTTP; Thu, 6 Dec 2001 09:21:06 -0000 (GMT) -From: "Whitelist Spam Testing" -To: jm@north.com -Cc: edombrow@eos.hitc.com, sthain@hotmail.com, yanni@usa.net, - robrassler@hotmail.com, jm@normanrockwellvt.com, edomenick@hotmail.com, - edomin@hotmail.com, sthaker@att.net -Subject: 4000 Your Vacation Winning ! 35001 -Date: Fri, 7 Dec 2001 07:01:03 -MIME-Version: 1.0 -Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com> -Sender: travelincentives@aol.com -Content-Type: text/plain; charset="us-ascii" - -You have been specially selected to qualify for the following: - -Premium Vacation Package and Pentium PC Giveaway -To review the details of the please click on the link -with the confirmation number below: - -http://vacation.81832.com - -Confirmation Number#Lh340 -Please confirm your entry within 24 hours of receipt of this confirmation. - -Wishing you a fun filled vacation! -If you should have any additional questions or cann't connect to the site -do not hesitate to contact me direct: -mailto:vacation@btamail.net.cn?subject=Help! - -MAKE MONEY FAST! - -C1a115 is a spammy way to write Cialis. -V1c0d1n is a spammy way to write Vicodin. - -(add any other spammy stuff here) - - - -Diamond White | professional teeth whitening system -

    - -


           

    -BEFORE -AFTER


    3D""
     = - - -

     


    -Your email address was obtained from a purch= -ased -list, Reference # 4060-6106.  If you wish to unsubscribe from th= -is list, please -Click here and e= -nter your -name into the remove box. If you have previously -unsubscribed and are still receiving this message, you may email our -Abuse Contr= -ol Center, -or call 1-888-763-2497, or write us at: NoSpam, 6484 Coral Way, -Miami, FL, 33155". -

      -
    - -
    -
    - - -
    You are receiving this -email -because you requested to receive info and updates via email. - - - - - - - diff -Nru spamassassin-3.4.6/xt/data/spam/005 spamassassin-4.0.0~rc3/xt/data/spam/005 --- spamassassin-3.4.6/xt/data/spam/005 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/005 1970-01-01 00:00:00.000000000 +0000 @@ -1,183 +0,0 @@ -From seemsg_8452970@gmx.net Wed Jul 24 10:43:10 2002 -Return-Path: -Delivered-To: jm@localhost.netnoteinc.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.netnoteinc.com (Postfix) with ESMTP id B9527440CC - for ; Wed, 24 Jul 2002 05:43:09 -0400 (EDT) -Received: from dogma.slashnull.org [212.17.35.15] - by localhost with IMAP (fetchmail-5.9.0) - for jm@localhost (single-drop); Wed, 24 Jul 2002 10:43:09 +0100 (IST) -Received: from mandark.labs.netnoteinc.com ([213.105.180.140]) by - dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g6O9fF401441 for - ; Wed, 24 Jul 2002 10:41:15 +0100 -Received: from online.affis.net ([211.237.50.21]) by - mandark.labs.netnoteinc.com (8.11.6/8.11.6) with ESMTP id g6O9eQp17913 for - ; Wed, 24 Jul 2002 10:40:27 +0100 -Received: from 212.19.84.198 (wireless-084-198.tele2.co.uk - [212.19.84.198]) by online.affis.net (8.11.0/8.11.0) with SMTP id - g6O9ZQW15692; Wed, 24 Jul 2002 18:35:28 +0900 (KST) -Message-Id: <200207240935.g6O9ZQW15692@online.affis.net> -From: "New Product Showcase" -Reply-To: remv0615c@bk.ru -To: ciccio80@aol.com, bugarman1@aol.com -Cc: danz@thewelcomegroup.com, ea@mcb.net, kingsx2000@aol.com, - fxusall@aol.com, dmxmage27@aol.com, gister@firsthost.net, - egor@san.rr.com, danzaman@prodigy.net, moser@rochester.rr.com, - makita1839@aol.com, bones83462@aol.com, cwest@firstate.com, - jm@netnoteinc.com, wimmerl@aol.com, jewell@delrio.com, - bugasm74@aol.com, john@tomcat.net -Date: Wed, 24 Jul 2002 02:32:34 -0700 -Subject: New Version 7: Uncover the TRUTH about ANYONE! -X-Mailer: Microsoft Outlook Express 6.00.2600.0000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 7bit - -============================================= -Brand-New VERSION 7.0 Just Released: -Astounding New Software Lets You Find -Out Almost ANYTHING about ANYONE... -============================================= - -Download it right now (no charge card needed): - -For the brand-new VERSION 7.0, click here: - - -http://lv724super.supereva.it/gen.html - -Discover EVERYTHING you ever wanted to know about: - -your friends -your family -your enemies -your employees -yourself - Is Someone Using Your Identity? -even your boss! - -DID YOU KNOW you can search for ANYONE, ANYTIME, -ANYWHERE, right on the Internet? - -Download this software right now--click here: - - -http://lv724super.supereva.it/gen.html - -This mammoth COLLECTION of internet investigative -tools & research sites will provide you with NEARLY -400 GIGANTIC SEARCH RESOURCES to locate information on: - -* people you trust -* screen new tenants or roommates -* housekeepers -* current or past employment -* people you work with -* license plate number with name and address -* unlisted phone numbers -* long lost friends - - -Locate e-mails, phone numbers, or addresses: - -o Get a Copy of Your FBI file. - -o Get a Copy of Your Military file. - -o FIND DEBTORS and locate HIDDEN ASSETS. - -o Check CRIMINAL Drug and driving RECORDS. - -o Lookup someone's EMPLOYMENT history. - - -For the brand-new VERSION 7.0, click here: - - -http://lv724super.supereva.it/gen.html - - -Locate old classmates, missing family -member, or a LONG LOST LOVE: - -- Do Background Checks on EMPLOYEES before you - hire them. - -- Investigate your family history, birth, death - and government records! - -- Discover how UNLISTED phone numbers are located. - -- Check out your new or old LOVE INTEREST. - -- Verify your own CREDIT REPORTS so you can - correct WRONG information. - -- Track anyone's Internet ACTIVITY; see the sites - they visit, and what they are typing. - -- Explore SECRET WEB SITES that conventional - search engines have never found. - -For the brand-new VERSION 7.0, click here: - - -http://lv724super.supereva.it/gen.html - - -==> Discover little-known ways to make UNTRACEABLE - PHONE CALLS. - -==> Check ADOPTION records; locate MISSING CHILDREN - or relatives. - -==> Dig up information on your FRIENDS, NEIGHBORS, - or BOSS! - -==> Discover EMPLOYMENT opportunities from AROUND - THE WORLD! - -==> Locate transcripts and COURT ORDERS from all - 50 states. - -==> CLOAK your EMAIL so your true address can't - be discovered. - -==> Find out how much ALIMONY your neighbor is paying. - -==> Discover how to check your phones for WIRETAPS. - -==> Or check yourself out, and you will be shocked at - what you find!! - -These are only a few things you can do, There -is no limit to the power of this software!! - -To download this software, and have it in less -than 5 minutes click on the url below to visit -our website (NEW: No charge card needed!) - - -http://lv724super.supereva.it/gen.html - - -If you no longer wish to hear about future -offers from us, send us a message with STOP -in the subject line, by clicking here: - - -mailto:remv0615a@bk.ru?subject=STOP_GN724 - -Please allow up to 72 hours to take effect. - -Please do not include any correspondence in your -message to this automatic stop robot--it will -not be read. All requests processed automatically. - - - - - - [:KJ)_8J7BJK9^":}H&*TG0] - - - diff -Nru spamassassin-3.4.6/xt/data/spam/006 spamassassin-4.0.0~rc3/xt/data/spam/006 --- spamassassin-3.4.6/xt/data/spam/006 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/006 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -From itereocicvim@hotmail.com Tue Jul 2 12:54:01 2002 -Return-Path: -Delivered-To: jm@localhost.labs.netnoteinc.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.netnoteinc.com (Postfix on SuSE Linux 8.0 (i386)) with ESMTP id 07C8914F703 - for ; Tue, 2 Jul 2002 12:49:36 +0100 (IST) -Received: from dogma.slashnull.org [212.17.35.15] - by localhost with IMAP (fetchmail-5.9.0) - for jm@localhost (single-drop); Tue, 02 Jul 2002 12:49:36 +0100 (IST) -Received: from mandark.labs.netnoteinc.com ([213.105.180.140]) by - dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g5T1PAX10009 for - ; Sat, 29 Jun 2002 02:25:10 +0100 -Received: from kr-sel-opccmail.oakwoodpremier.co.kr ([211.218.220.77]) by - mandark.labs.netnoteinc.com (8.11.6/8.11.2) with ESMTP id g5T1P4A08757; - Sat, 29 Jun 2002 02:25:06 +0100 -Received: from mx14.hotmail.com ([200.83.20.140]) by - kr-sel-opccmail.oakwoodpremier.co.kr with Microsoft SMTPSVC(5.0.2195.2966); - Sat, 29 Jun 2002 02:36:44 +0900 -Message-Id: <000042a071ee$00001aa9$00003e50@mx14.hotmail.com> -To: -Cc: , , , - , , , - , , , - , , , - , , , - , , , - , , , - , , , - , , , - , , , - , , , - , , - , , , - , , , - , , , - , , -From: "Carla Somers" -Subject: Say goodbye to yellow stained teeth!!! 5805 -Date: Sat, 29 Jun 2002 03:05:59 -0300 -MIME-Version: 1.0 -Reply-To: itereocicvim@hotmail.com -X-Originalarrivaltime: 28 Jun 2002 17:36:46.0093 (UTC) FILETIME=[5FE5FBD0:01C21ECA] -Content-Type: text/html; charset="iso-8859-1" -Content-Transfer-Encoding: 7bit - - - -Diamond White | professional teeth whitening system -
    - -


           

    -BEFORE -AFTER


    3D""
     = - - -

     


    -Your email address was obtained from a purch= -ased -list, Reference # 4060-6106.  If you wish to unsubscribe from th= -is list, please -Click here and e= -nter your -name into the remove box. If you have previously -unsubscribed and are still receiving this message, you may email our -Abuse Contr= -ol Center, -or call 1-888-763-2497, or write us at: NoSpam, 6484 Coral Way, -Miami, FL, 33155". -

      -
    - -
    -
    - - -
    You are receiving this -email -because you requested to receive info and updates via email. - - - - - - - diff -Nru spamassassin-3.4.6/xt/data/spam/007 spamassassin-4.0.0~rc3/xt/data/spam/007 --- spamassassin-3.4.6/xt/data/spam/007 2004-06-15 05:38:36.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/007 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -From travelincentives@aol.com Fri Dec 7 11:07:41 2001 -Return-Path: -Delivered-To: jm@localhost.jmason.org -Received: from localhost (localhost.localdomain [127.0.0.1]) by - stinkpad.jmason.org (Postfix) with ESMTP id 5D48F10710 for ; - Fri, 7 Dec 2001 11:07:40 +1100 (EST) -Received: from dogma.slashnull.org [212.17.35.15] by localhost with IMAP - (fetchmail-5.7.4) for jm@localhost (single-drop); Fri, 07 Dec 2001 - 11:07:40 +1100 (EST) -Received: from mail.netnoteinc.com (gw.netnoteinc.com [193.120.149.226]) - by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id fB6Nw4V09475 for - ; Thu, 6 Dec 2001 23:58:04 GMT -Received: by mail.netnoteinc.com (Postfix) id A81F511441C; Thu, - 6 Dec 2001 23:58:03 +0000 (GMT) -Delivered-To: jm@netnoteinc.com -Received: from ns.sakakura-kk.co.jp (ns.sakakura-kk.co.jp [61.119.13.18]) - by mail.netnoteinc.com (Postfix) with ESMTP id 4FD6F1143D6 for - ; Thu, 6 Dec 2001 23:58:02 +0000 (Eire) -Received: from plain (ZHONGXIN [210.73.88.134]) by ns.sakakura-kk.co.jp - with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13) - id YJQP6DKP; Fri, 7 Dec 2001 08:15:01 +0900 -From: "Whitelist Spam Testing" -To: jm@north.com -Cc: edombrow@eos.hitc.com, sthain@hotmail.com, yanni@usa.net, - robrassler@hotmail.com, jm@normanrockwellvt.com, edomenick@hotmail.com, - edomin@hotmail.com, sthaker@att.net -Subject: 4000 Your Vacation Winning ! 35001 -Date: Fri, 7 Dec 2001 07:01:03 -MIME-Version: 1.0 -Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com> -Sender: travelincentives@aol.com -Content-Type: text/plain; charset="us-ascii" - -You have been specially selected to qualify for the following: - -Premium Vacation Package and Pentium PC Giveaway -To review the details of the please click on the link -with the confirmation number below: - -http://vacation.81832.com - -Confirmation Number#Lh340 -Please confirm your entry within 24 hours of receipt of this confirmation. - -Wishing you a fun filled vacation! -If you should have any additional questions or cann't connect to the site -do not hesitate to contact me direct: -mailto:vacation@btamail.net.cn?subject=Help! - -MAKE MONEY FAST! - -C1a115 is a spammy way to write Cialis. -V1c0d1n is a spammy way to write Vicodin. - -(add any other spammy stuff here) diff -Nru spamassassin-3.4.6/xt/data/spam/008 spamassassin-4.0.0~rc3/xt/data/spam/008 --- spamassassin-3.4.6/xt/data/spam/008 2009-08-08 00:12:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/008 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -From travelincentives@aol.com Fri Dec 7 11:07:41 2001 -Received: from yahoo.com - (PPPa33-ResaleLosAngelesMetroB2-2R7452.dialinx.net [4.48.136.190]) by - www.goabroad.com.cn (8.9.3/8.9.3) with SMTP id TAA96146; Thu, - 30 Aug 2001 19:06:45 +0800 (CST) (envelope-from - pertand@email.mondolink.com) -From : -X-Mailer: Mozilla 4.04 [en]C-bls40 (Win95; U) -To: jenny33436@netscape.net -Subject: via.gra -From: -DATE: Fri, 7 Dec 2001 07:01:03 -MIME-Version: 1.0 -Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com> -Sender: travelincentives@aol.com -Content-Type: text/plain; charset="us-ascii" - -mailto:vacation@btamail.net.cn?subject=Help! - -e - -dq[L - -AL]Ȃ͂ -info_sst@yahoo.co.jp -K{ɂȂ̃[AhX݂̂ - - -=============================================================== -Ђ̋ȍL͂܂񂩁I -zMƖz[y[W܂ŊiɂĂ󂯒v܂B -Le`wɂĂ\݉B -=============================================================== - -104-0061 -s8-19-3 -2ECOr@3F -[}KWs - -TEL@03-3544-6222 -FAX@03-3544-6218@@ - -=============================================================== -菤i΂W߂܂B鋰ꂪ܂̂ -\݂͂߂ɁI -================================================================= - -\\\\\\\\\\\\\\\\\\\\\\\\ - - rfI̔E_b`CtErlNu -@@ `ujDWEہErdwthEA_gObYȂ - @A_g֘Ȁ񖞍ځ@ - - - @@\݁EEiڍד́@ -@@@@@LtqkNbNĂB - - @@@@@@@@@ - @@@http://www.xx-koukoku.com/ - -\\\\\\\\\\\\\\\\\\\\\\\\ - -@@J^ObYEɔ񎏁EhƃObYEׂȂǁ@ -@@@@@@@@@@̑񖞍ځ@ - - - @@\݁EEiڍד́@ -@@@@@LtqkNbNĂB - - @@@@@@@@@ - http://www.ww-koukoku.com/ - -\\\\\\\\\\\\\\\\\\\\\\\\ - - diff -Nru spamassassin-3.4.6/xt/data/spam/009 spamassassin-4.0.0~rc3/xt/data/spam/009 --- spamassassin-3.4.6/xt/data/spam/009 2005-03-23 03:10:13.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/009 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -From pertand@email.mondolink.com Fri Aug 31 13:39:16 2001 -To: jenny33436@netscape.net -Subject: foo -Content-Type: text/html -Content-Transfer-Encoding: quoted-printable -Message-Id: <78w08.t365th3y6x7h@yahoo.com> -From: renterr989@hotmail.com -Date: Wed, 29 Aug 2001 04:20:43 -0800 -Sender: pertand@email.mondolink.com - - -subscription cancelable at anytime. Click the “Your= -Account”=20 -Poster1">CUMSLUTS..VIRGIN - TEENS..EXTREME HARDCORE FETISH !!!!

    -

    Completely - UNCENSORED and DISCREET

    -

    100% - Cumming Satisfaction Guaranteed

    -

    :::: - INSTANT ACCESS ::::

    -

    CLICK HERE TO ENTER

    -

    !! - NO CREDIT CARD NEEDED !!

    - -CALL NOW! You have received this email because I'm a spammer. Here, have -some HERBAL VIAGRA and TEMPLE KIFF. - -testing IP -testing IP -testing IP -another - -

    -cut and paste spamassassin.org for hot spamfiltering action -address@foo.net -

    - - (that should do it...) - - -

    SWEET -SENSATIONS ! (tm)
    -    The #1 BEST SELLING 100% ALL -NATURAL APHRODISIAC IN AMERICA!

     - HARDCOPY -EPISODE-
    "The Story you -have been waiting for that's making men and women go wild!
    Men and Women -who are taking this powerful little natural pill are loving what it's doing to -their libido!"

    - -EYEWITNESS NEWS -
    -"Americas Number 1 Natural Love Pill and It's Selling Like Hot Cakes!"
    -
    For more details please
    CLICK HERE
    -
    To be Removed Send An Email To twema2001@yahoo.com.



    - diff -Nru spamassassin-3.4.6/xt/data/spam/010 spamassassin-4.0.0~rc3/xt/data/spam/010 --- spamassassin-3.4.6/xt/data/spam/010 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/010 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -Return-path: -Delivery-date: Wed, 13 Nov 2002 17:46:12 -0800 -Message-Id: <3XTG6.H2NL8M5O589G.Bangura803038@yahoo.com> -From: Bangura803038@yahoo.com -To: postmaster@qwnxminder.com, - postmaster@qwnxname.com, - postmaster@qwnxogen.com, - postmaster@qwnxpoint.com, - postmaster@qwnxsrv.com, - postmaster@qwnxstar.com, - postmaster@qwnxstone.com, - postmaster@qwnxtec.com, - postmaster@qwnxtrace.com, - postmaster@qwnxunt.com, - postmaster@qwnxvalleyfarm.com -Content-Type: text/plain; charset=iso-8859-1 -Content-Transfer-Encoding: 8bit -Importance: Normal -Date: Wed, 13 Nov 2002 20:45:10 -0500 -X-Priority: 3 -Subject: Fw: PROTECT YOUR COMPUTER,YOU NEED SYSTEMWORKS2002! -Lines: 87 - -*NEW-Special Package Deal!* -Norton SystemWorks 2002 Software Suite -Professional Edition- - -ATTN: This is a MUST for ALL Computer Users!!! - -Includes SIX - Feature-Packed Utilities...ALL For ONE Special LOW Price! - --Norton AntiVirus 2002 --Norton Ghost 2002 --GoBack 3 Personal Edition --Norton Utilities 2002 --Norton CleanSweep 2002 --Norton WinFax Basic Edition - -This Software Will: -- Protect your computer from unwanted and hazardous viruses -- Help secure your private & valuable information -- Allow you to transfer files and send e-mails safely -- Backup your ALL your data quick and easily -- Improve your PC's performance w/superior integral diagnostics! - -Six Feature-Packed Utilities...For One Great Price! -A $300-Plus Combined Retail Value! - -YOURS for Only $29.99! (Includes FREE Shipping TOO!) - -Don't fall prey to destructive viruses or hackers! -Protect your computer and your valuable information! - -CLICK HERE to Order Yours NOW! -http://www.saving-much.com/systemworks22.htm - - ------------- -Opt-Out Instructions: -We are strongly against sending unsolicited emails to those -who do not wish to receive our special mailings. You have opted -in to one or more of our affiliate sites requesting to be notified -of any special offers we may run from time to time. We also have -attained the services of an independent 3rd party to overlook list -management and removal services. This is NOT unsolicited email. -If you do not wish to receive further mailings, please visit the -link below be removed from the list. Please accept our apologies -if you have been sent this email in error. We honor all removal -requests. Submit your remove request at: -http://www.saving-much.com/removeme.html - - diff -Nru spamassassin-3.4.6/xt/data/spam/011 spamassassin-4.0.0~rc3/xt/data/spam/011 --- spamassassin-3.4.6/xt/data/spam/011 2009-08-05 09:27:48.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/011 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Return-path: -Delivery-date: Sat, 19 Oct 2002 07:12:53 -0700 -From: "Yoda" -To: webmaster@nuhxirc.com, webmaster@odyssea.com, webmaster@obsceniebaby.com -CC: webmaster@ohthehumanity.com, webmaster@ollan.com, webmaster@oneninestudios.com -Date: Sat, 19 Oct 2002 09:37:18 -0400 -Subject: Teenie Camp -MIME-Version: 1.0 -X-Mailer: Microsoft Outlook Express 6.00.2600.0000 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 -X-Precedence-Ref: l234056789zxcv -Content-Type: text/html; charset=us-ascii -Content-Transfer-Encoding: 7bit -Message-Id: <200210192141953.SM01220@217.125.101.38> - - - -example.org

    example.net

    - -

    tests

    - - - -million e-mail addresses
    -VIAGRA
    -GUARANTEE
    -100% NATURAL
    -our affiliate partners
    - -

    anti-tests

    - - -OPPO<>RTUNITY
    -OPPO< >RTUNITY
    -OPPO< foo >RTUNITY
    -OPPO< /foo>RTUNITY
    -OPPO< /foo >RTUNITY
    -OPPO< / foo>RTUNITY
    -OPPO< / foo >RTUNITY
    - - -

    foo

    bar

    -

    foo

    baz

    - - - diff -Nru spamassassin-3.4.6/xt/data/spam/012 spamassassin-4.0.0~rc3/xt/data/spam/012 --- spamassassin-3.4.6/xt/data/spam/012 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/012 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from paypal.com (mail1.paypal.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.paypal.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "Foo Test" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test whitelist_from_rcvd foo@example.com when relay is forged diff -Nru spamassassin-3.4.6/xt/data/spam/013 spamassassin-4.0.0~rc3/xt/data/spam/013 --- spamassassin-3.4.6/xt/data/spam/013 2005-07-14 00:50:52.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/013 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Return-Path: -Received: from example.com (mail1.example.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.example.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "baz@example.com" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 04 23:17:44 GMT -MIME-Version: 1.0 -Content-Type: text/plain - -Test def_whitelist_from_rcvd info@paypal.com when relay is forged diff -Nru spamassassin-3.4.6/xt/data/spam/014 spamassassin-4.0.0~rc3/xt/data/spam/014 --- spamassassin-3.4.6/xt/data/spam/014 2004-11-06 00:37:21.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/014 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -Message-ID: -Date: Wed, 23 Jul 2003 23:30:00 +0200 -From: Sender -To: Recipient - -XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X - diff -Nru spamassassin-3.4.6/xt/data/spam/015 spamassassin-4.0.0~rc3/xt/data/spam/015 --- spamassassin-3.4.6/xt/data/spam/015 2004-12-05 02:28:47.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/015 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From Gagnenljl@mindspring.com Thu Dec 2 10:55:56 2004 -Return-Path: -X-Original-To: user@example.com -Delivered-To: user@example.com -Received: from CM-vtr0-104-67.cm.vtr.net (unknown [200.83.104.67]) - by eclectic.kluge.net (Postfix) with SMTP id 23F574480F4 - for ; Thu, 2 Dec 2004 10:55:53 -0500 (EST) -Received: from 196.170.26.200 by 200.83.104.67; Thu, 02 Dec 2004 10:55:50 -0500 -Message-ID: -From: "Tameka Otto" -Reply-To: "Tameka Otto" -To: user@example.com -Subject: no r-x req -Date: Thu, 02 Dec 2004 10:55:50 -0500 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="--9-274170048-9813316604=:18061" - -----9-274170048-9813316604=:18061 -Content-Type: text/plain; -Content-Transfer-Encoding: 7Bit - -Good Day, - -I heard you would be curious about a massive dizcounnt on your medz-rx & you may purrchaze directly from our fda-manufacturers. -Lower overhead allows us to provide quality drugs at much lower than normal. No dr-script required. -Gotothis: http://xqr.benefitsanditsother.com/?a=552lr - -Cordially, -Tameka Otto - -----9-274170048-9813316604=:18061-- diff -Nru spamassassin-3.4.6/xt/data/spam/016 spamassassin-4.0.0~rc3/xt/data/spam/016 --- spamassassin-3.4.6/xt/data/spam/016 2004-12-05 02:28:47.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/016 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -From Gagnenljl@mindspring.com Thu Dec 2 10:55:56 2004 -Return-Path: -X-Original-To: user@example.com -Delivered-To: user@example.com -Received: from CM-vtr0-104-67.cm.vtr.net (unknown [200.83.104.67]) - by eclectic.kluge.net (Postfix) with SMTP id 23F574480F4 - for ; Thu, 2 Dec 2004 10:55:53 -0500 (EST) -Received: from 196.170.26.200 by 200.83.104.67; Thu, 02 Dec 2004 10:55:50 -0500 -Message-ID: -From: "Tameka Otto" -Reply-To: "Tameka Otto" -To: user@example.com -Subject: no r-x req -Date: Thu, 02 Dec 2004 10:55:50 -0500 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="--9-274170048-9813316604=:18061" -----9-274170048-9813316604=:18061 -Content-Type: text/plain; -Content-Transfer-Encoding: 7Bit - -Good Day, - -I heard you would be curious about a massive dizcounnt on your medz-rx & you may purrchaze directly from our fda-manufacturers. -Lower overhead allows us to provide quality drugs at much lower than normal. No dr-script required. -Gotothis: http://xqr.benefitsanditsother.com/?a=552lr - -Cordially, -Tameka Otto - -----9-274170048-9813316604=:18061-- diff -Nru spamassassin-3.4.6/xt/data/spam/017 spamassassin-4.0.0~rc3/xt/data/spam/017 --- spamassassin-3.4.6/xt/data/spam/017 2004-12-05 02:28:47.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/017 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -From Gagnenljl@mindspring.com Thu Dec 2 10:55:56 2004 -Return-Path: -X-Original-To: user@example.com -Delivered-To: user@example.com -Received: from CM-vtr0-104-67.cm.vtr.net (unknown [200.83.104.67]) - by eclectic.kluge.net (Postfix) with SMTP id 23F574480F4 - for ; Thu, 2 Dec 2004 10:55:53 -0500 (EST) -Received: from 196.170.26.200 by 200.83.104.67; Thu, 02 Dec 2004 10:55:50 -0500 -Message-ID: -From: "Tameka Otto" -Reply-To: "Tameka Otto" -To: user@example.com -Subject: no r-x req -Date: Thu, 02 Dec 2004 10:55:50 -0500 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="--9-274170048-9813316604=:18061" diff -Nru spamassassin-3.4.6/xt/data/spam/018 spamassassin-4.0.0~rc3/xt/data/spam/018 --- spamassassin-3.4.6/xt/data/spam/018 2011-05-18 16:32:56.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/018 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Return-Path: -Received: from paypal.com (mail1.paypal.com [80.8.136.186]) - by b.mx.sonic.net (8.12.10/8.12.7) with SMTP id i19FLtmt026870 - for ; Mon, 9 Feb 2004 07:21:57 -0800 -Received: from [8.141.200.111] by mail1.paypal.com with SMTP; Mon, 09 Feb 2004 23:17:44 -0600 -Message-ID: -From: "Foo Test" -To: user@example.com -Subject: whitelist test case -Date: Mon, 09 Feb 2004 23:17:44 +0000 (UTC) -MIME-Version: 1.0 -Content-Type: text/plain - -This is a test msg. - -XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X - -yes, you should keep the last line free of a newline - -0 \ No newline at end of file diff -Nru spamassassin-3.4.6/xt/data/spam/badctype1 spamassassin-4.0.0~rc3/xt/data/spam/badctype1 --- spamassassin-3.4.6/xt/data/spam/badctype1 2007-04-03 18:14:43.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/badctype1 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Return-path: -From: "Yoda" -To: webmaster@nuhxirc.com, webmaster@odyssea.com, webmaster@obsceniebaby.com -Date: Sat, 19 Oct 2002 09:37:18 -0400 -Subject: Teenie Camp -MIME-Version: 1.0 -Content-Type: text plain -Content-Transfer-Encoding: 7bit - -totally
    natural - diff -Nru spamassassin-3.4.6/xt/data/spam/badctype2 spamassassin-4.0.0~rc3/xt/data/spam/badctype2 --- spamassassin-3.4.6/xt/data/spam/badctype2 2007-04-03 18:14:43.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/badctype2 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Return-path: -From: "Yoda" -To: webmaster@nuhxirc.com, webmaster@odyssea.com, webmaster@obsceniebaby.com -Date: Sat, 19 Oct 2002 09:37:18 -0400 -Subject: Teenie Camp -MIME-Version: 1.0 -Content-Type: text/html; charset=us-ascii -Content-Transfer-Encoding: 7bit - -totally
    natural - diff -Nru spamassassin-3.4.6/xt/data/spam/badmime2.txt spamassassin-4.0.0~rc3/xt/data/spam/badmime2.txt --- spamassassin-3.4.6/xt/data/spam/badmime2.txt 2004-09-23 22:08:38.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/badmime2.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -From odubciokci@isomedia.com Wed Feb 4 14:23:02 2004 -Return-Path: -X-Original-To: user@example.com -Delivered-To: user@example.com -Received: from c-24-3-96-11.client.comcast.net (c-24-3-96-11.client.comcast.net [24.3.96.11]) - by eclectic.kluge.net (Postfix) with SMTP id 77E6C43A4CB - for ; Wed, 4 Feb 2004 14:23:01 -0500 (EST) -Received: from by 24.3.96.11; Thu, 05 Feb 2004 00:24:38 +0500 -From: " " -Reply-To: " " -To: user@example.com -Subject: -Date: Wed, 04 Feb 2004 20:22:38 +0100 -MIME-Version: 1.0 -X-MimeOLE: Produced By Microsoft MimeOLE V4.72.1962.2 -Content-Type:multipart/related; boundary =bar; other=foo -Content-Type: multipart/alternative; - boundary ="foo" -Message-ID: <2wbs8otwrn5-o0ap8qij7-27odubciokci@isomedia.com> -Status: RO -X-Status: -X-Keywords: -X-UID: 19276 ---foo -Content-Type: text/plain; charset=us-ascii -Content-Transfer-Encoding: 8bit - - - - - ---foo -Content-Type: text/html; charset=us-ascii -Content-Transfer-Encoding: 8bit - - - - - - -
    - . . . - -
    -Cheap Soft at Damn Low Pri ce
    - -
    - -
    -Hello friends, hope you can find cheeap soft on our site! In our archive you can find a lot of popular programs: Adobe PhotoShop CS 8.0 only for 40$, Autodesk Building Systems 2004 (2 cds) for 40$, Borland C++ Builder 6 Enterprise for 40$, Corel Draw 11 Graphic Suite SP1 (5 cds) only for 50$, Catia 5 R12 P3 with SP2 (3 cds) 50$, Finale 2004 (1 cd) 40$.... and a lot of more....If you want see list with all our programs click on "Price List", or choose category which you want.

    - -Categories we have for now - over 328 expensive softwares to blast off
    -Audio (Music) (75 popular softwares)
    -Internet (126 popular softwares)
    -Games (102 popular softwares)
    -Business (31 popular softwares)
    -IS/IT (72 popular softwares)
    -Mobile, Palm, Pocket (21 popular softwares)
    -Design, Photo, Flash, Media,Illustration (89 popular softwares)
    -Web Developer (56 popular softwares)
    -Software Developer (45 popular softwares)
    -Utilities, Drivers, Antivirus, Security (39 popular softwares)
    -Desktop Enhancements (28 popular softwares)
    -Home & Education ( 23 popular softwares)
    -3D Studio, Adobe, Maya... Plugins (50 popular softwares)
    -Video (33 popular softwares)
    -CAD/CAM (12 popular softwares)
    -Mac (52 popular softwares)
    -& many more latest released softwares, DON'T MISS IT! -

    - -You may pur- chase these softwares in 3 ways:
    -i) download from server (immediate download after payment)
    -ii) we ship you physical CDs
    -iii) [both of above (i) & (ii)] download from our server & we ship you the physical CDs as backup for ur future re-installation

    -     -
    -L i m i t e d - t i m e offer only

    Each software offer will end after 20 copies sold

    The one & only cheap softwares bargain site on web

    Don't MISS these GREAT offfers!

    C-L-I-C-K   H-E-R-E TO GET ONE TODAY
    -r m v - -
    -
    -
    -
    -
    - - - ---foo-- diff -Nru spamassassin-3.4.6/xt/data/spam/badmime3.txt spamassassin-4.0.0~rc3/xt/data/spam/badmime3.txt --- spamassassin-3.4.6/xt/data/spam/badmime3.txt 2012-10-11 14:28:12.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/badmime3.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -Return-Path: -Delivered-To: spam-quarantine -X-SMTP-MAIL: -X-SMTP-RCPT: -X-Quarantine-id: -Received: from mailer1.linksandmail.com (mailer1.linksandmail.com [64.38.215.194]) - by Tink.ijs.si (Postfix) with SMTP id 5D7334812C - for ; Thu, 20 Jun 2002 08:00:10 +0200 (CEST) -Content-Transfer-Encoding: binary -Content-Type: multipart/alternative; boundary="_----------=_1024552428234762025905" -MIME-Version: 1.0 -X-Mailer: MIME::Lite 2.117 (F2.6; B2.11; Q2.03) -Date: Thu, 20 Jun 2002 05:53:48 UT -From: "Newsletter" -To: joh.dokler@nsc.ijs.si -Reply-To: customer-service@linksandmail.com -Subject: To get on the cheer squad I, licked a lot of pus... -Message-Id: <20020620060010.5D7334812C@Tink.ijs.si> - -Content-Disposition: inline -Content-Length: 5162 -Content-Transfer-Encoding: binary -Content-Type: text/html - - - -Untitled-1 - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    -
    - - - - - - - -
    -
    -
    -
    - - - ---_----------=_1024552428234762025905-- - - - diff -Nru spamassassin-3.4.6/xt/data/spam/badmime.txt spamassassin-4.0.0~rc3/xt/data/spam/badmime.txt --- spamassassin-3.4.6/xt/data/spam/badmime.txt 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/badmime.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,126 +0,0 @@ -Return-Path: -Delivered-To: spam-quarantine -X-SMTP-MAIL: -X-SMTP-RCPT: -X-Quarantine-id: -Received: from mailer1.linksandmail.com (mailer1.linksandmail.com [64.38.215.194]) - by Tink.ijs.si (Postfix) with SMTP id 5D7334812C - for ; Thu, 20 Jun 2002 08:00:10 +0200 (CEST) -Content-Transfer-Encoding: binary -Content-Type: multipart/alternative; boundary="_----------=_1024552428234762025905" -MIME-Version: 1.0 -X-Mailer: MIME::Lite 2.117 (F2.6; B2.11; Q2.03) -Date: Thu, 20 Jun 2002 05:53:48 UT -From: "Newsletter" -To: joh.dokler@nsc.ijs.si -Reply-To: customer-service@linksandmail.com -Subject: To get on the cheer squad I, licked a lot of pus... -Message-Id: <20020620060010.5D7334812C@Tink.ijs.si> - -This is a multi-part message in MIME format. - ---_----------=_1024552428234762025905 -Content-Disposition: inline -Content-Length: 712 -Content-Transfer-Encoding: binary -Content-Type: text/plain - -Visit the link below to see me tongue-f*ck the entire cheersquad. - -http://harder-please.com/forward/LSU.htm - -if the address above does not appear as a link, then copy it and paste into the address bar of your browser - hit enter :) - -To see future emails in full color graphic, change your "receiving" option to "HTML" in your email program. - -Note: -This email was sent to you because your email address -was entered requesting to be a registered subscriber. - -If you do not wish to receive daily entertainment, please visit link below: - -http://sexmailnetwork.com/unsubscribe.cgi?subscription_id=1001900781 - -You will be permanently removed from the list! -Please allow up to 24 hrs for mail to stop. ---_----------=_1024552428234762025905 -Content-Disposition: inline -Content-Length: 5162 -Content-Transfer-Encoding: binary -Content-Type: text/html - - - -Untitled-1 - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    -
    - - - - - - - -
    -
    -
    -
    - - - ---_----------=_1024552428234762025905-- - - - diff -Nru spamassassin-3.4.6/xt/data/spam/base64.txt spamassassin-4.0.0~rc3/xt/data/spam/base64.txt --- spamassassin-3.4.6/xt/data/spam/base64.txt 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/base64.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -Return-Path: hello@public.hzptt.sd.cn -X-Mmdf-To: jm -Received: from salmon.maths.tcd.ie by maccullagh.maths.tcd.ie with SMTP - id ; 15 Apr 2001 02:36:50 +0100 (BST) -Received: from dux1.tcd.ie by salmon.maths.tcd.ie with SMTP - id ; 15 Apr 2001 02:36:50 +0100 (BST) -Received: from qd_mail3.sd.cninfo.net ([61.156.13.71]) - by dux1.tcd.ie (8.11.1/8.11.1) with ESMTP id f3F1ans26770 - for ; Sun, 15 Apr 2001 02:36:50 +0100 (BST) -Received: from Good ([206.172.87.3]) by qd_mail3.sd.cninfo.net with SMTP - id <20010415013005.EXEK607.qd_mail3@Good> for ; - Sun, 15 Apr 2001 09:30:05 +0800 -From: keywordranking@excite.com -To: jm@maths.tcd.ie -Subject: Website traffic Building -X-Mailer: WC Mail __ty__ -MIME-Version: 1.0 -Content-Type: multipart/mixed;boundary= "Z_MULTI_PART_MAIL_BOUNDAEY_S" -Message-Id: <20010415013005.EXEK607.qd_mail3@Good> -Date: Sun, 15 Apr 2001 09:30:33 +0800 - -This is a multi-part message in MIME format. - ---Z_MULTI_PART_MAIL_BOUNDAEY_S -Content-Type: text/plain -Content-Transfer-Encoding: base64 - -V2UgaGF2ZSByYW5rZWQgdGhlIHRvcCB0ZW4gdHJhZmZpYyBidWlsZGluZyBzaXRlcyBvbiB0 -aGUgd2ViLCB0aGVzZSBzaXRlcw0KaGF2ZSBiZWVuIHJhbmtlZCBieSBvdXIgZXhwZXJ0cywg -b3VyIGNsaWVudHMgYW5kIGJ5IHlvdSBvdXIgdmlzaXRvcnMuIENvbWUNCnRvIGh0dHA6Ly9t -ZW1iZXJzLnRyaXBvZC5jby51ay90b3B0ZW5zaXRlcw0KDQpPbmUgb2YgdGhlIHRvcCB0ZW4g -c2l0ZXMsIGNhbiBldmVuIGd1YXJhbnRlZSB0b3AgcGxhY2VtZW50IG9uIHRoZSB0b3AgdGVu -DQpzZWFyY2ggZW5naW5lcy4gUmlnaHQgbm93IHRoZXkgYXJlIGFsc28gb2ZmZXJpbmcgdG8g -Y2hlY2sgeW91ciBzaXRlJ3MNCnBvc2l0aW9uDQppbiB0aGUgc2VhcmNoIGVuZ2luZXMsIEZS -RUUgT0YgQ0hBUkdFIQ0KDQpPdXIgc2l0ZSBoYXMgYmVlbiBkZXZlbG9wZWQgdG8gaGVscCB5 -b3UgZmluZCB0aGUgbW9zdCBjb3N0LWVmZmVjdGl2ZSB0cmFmZmljDQpvbiB0aGUgd2ViLiBQ -bGVhc2UgZmVlbCBmcmVlIHRvIGNvbnRhY3QgdXMgd2l0aCBhbnkgcXVlc3Rpb25zLg0KDQoN -Cg0KDQpUbyBCZSBSZW1vdmVkIFNlbmQgRS1NYWlsIHRvIHJlbW92ZWt3QGV4Y2l0ZS5jb20N -Cg0KSUYgVEhJUyBJUyBOT1QgRE9ORSBPVVIgTElTVCBNQU5BR0VNRU5UIFNPRlRXQVJFIFdJ -TEwgTk9UIEtOT1cgVE8NClJFTU9WRSBZT1UuDQoNCkFnYWluIHNlbmQgbWFpbCwgb3IgZm9y -d2FyZCBtZXNzYWdlIHRvIHJlbW92ZWt3QGV4Y2l0ZS5jb20NCnRvIGJlIHJlbW92ZWQuDQog -ICAg ---Z_MULTI_PART_MAIL_BOUNDAEY_S-- diff -Nru spamassassin-3.4.6/xt/data/spam/bsmtp spamassassin-4.0.0~rc3/xt/data/spam/bsmtp --- spamassassin-3.4.6/xt/data/spam/bsmtp 2004-07-23 02:41:35.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/bsmtp 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -HELO example.com -MAIL FROM: -RCPT TO: -DATA -From pertand@email.mondolink.com Fri Aug 31 13:39:16 2001 -To: jenny33436@netscape.net -Subject: foo -Content-Type: text/html -Content-Transfer-Encoding: quoted-printable -Message-Id: <78w08.t365th3y6x7h@yahoo.com> -From: renterr989@hotmail.com -Date: Wed, 29 Aug 2001 04:20:43 -0800 -Sender: pertand@email.mondolink.com - - -subscription cancelable at anytime. Click the “Your= -Account”=20 -Poster1">CUMSLUTS..VIRGIN - TEENS..EXTREME HARDCORE FETISH !!!!

    -

    Completely - UNCENSORED and DISCREET

    -

    100% - Cumming Satisfaction Guaranteed

    -

    :::: - INSTANT ACCESS ::::

    -

    CLICK HERE TO ENTER

    -

    !! - NO CREDIT CARD NEEDED !!

    - -CALL NOW! You have received this email because I'm a spammer. Here, have -some HERBAL VIAGRA and TEMPLE KIFF. -C1a115 is a spammy way to write Cialis. -V1c0d1n is a spammy way to write Vicodin. - -

    SWEET -SENSATIONS ! (tm)
    -    The #1 BEST SELLING 100% ALL -NATURAL APHRODISIAC IN AMERICA!

     - HARDCOPY -EPISODE-
    "The Story you -have been waiting for that's making men and women go wild!
    Men and Women -who are taking this powerful little natural pill are loving what it's doing to -their libido!"

    - -EYEWITNESS NEWS -
    -"Americas Number 1 Natural Love Pill and It's Selling Like Hot Cakes!"
    -
    For more details please
    CLICK HERE
    -
    To be Removed Send An Email To twema2001@yahoo.com.



    - - - (that should do it...) - -. -QUIT - diff -Nru spamassassin-3.4.6/xt/data/spam/bsmtpnull spamassassin-4.0.0~rc3/xt/data/spam/bsmtpnull --- spamassassin-3.4.6/xt/data/spam/bsmtpnull 2005-11-27 18:06:30.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/bsmtpnull 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ - diff -Nru spamassassin-3.4.6/xt/data/spam/dnsbl_domsonly.eml spamassassin-4.0.0~rc3/xt/data/spam/dnsbl_domsonly.eml --- spamassassin-3.4.6/xt/data/spam/dnsbl_domsonly.eml 2010-03-01 10:37:03.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/dnsbl_domsonly.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -From spammer@example.net Fri Dec 7 11:07:10 2001 -Received: from evil.example.net [144.137.3.98] by chaos.example.net - for someone@example.com; Fri, 07 Dec 2001 11:07:15 +1100 (EST) -From: "DNSBL Testing" -To: someone@example.com -Subject: no subject needed -Date: Fri, 7 Dec 2001 07:01:03 -Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com> - -I should not be listed: http://144.137.3.98/blah - diff -Nru spamassassin-3.4.6/xt/data/spam/dnsbl.eml spamassassin-4.0.0~rc3/xt/data/spam/dnsbl.eml --- spamassassin-3.4.6/xt/data/spam/dnsbl.eml 2010-03-01 10:37:03.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/dnsbl.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -From spammer@example.net Fri Dec 7 11:07:10 2001 -Received: from internal.example.com [127.0.0.1] by localhost - for someone@example.com; Fri, 07 Dec 2001 11:07:40 +1100 (EST) -Received: from dmz.example.com [150.51.53.1] by internal.example.com - for someone@example.com; Fri, 07 Dec 2001 11:07:35 +1100 (EST) -Received: from friend.example.com [212.17.35.14] by dmz.example.com - for someone@example.com; Fri, 07 Dec 2001 11:07:35 +1100 (EST) -Received: from notrust.example.com [193.120.149.226] by friend.example.com - for someone@example.com; Fri, 07 Dec 2001 11:07:30 +1100 (EST) -Received: from loser.example.org [61.119.13.18] by notrust.example.com - for someone@example.com; Fri, 07 Dec 2001 11:07:25 +1100 (EST) -Received: from chaos.example.net [210.73.88.134] by loser.example.org - for someone@example.com; Fri, 07 Dec 2001 11:07:20 +1100 (EST) -Received: from evil.example.net [144.137.3.98] by chaos.example.net - for someone@example.com; Fri, 07 Dec 2001 11:07:15 +1100 (EST) -From: "DNSBL Testing" -To: someone@example.com -Subject: no subject needed -Date: Fri, 7 Dec 2001 07:01:03 -Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com> - -hello! I'm a link: http://foo.bar.baz.uribl-example-a.com/ -me too: http://uribl-example-b.com/ -me too: http://uribl-example-c.com/ - -Also -- http://spamassassin.org/ -And -- http://144.137.3.98/blah - diff -Nru spamassassin-3.4.6/xt/data/spam/dnsbl_ipsonly.eml spamassassin-4.0.0~rc3/xt/data/spam/dnsbl_ipsonly.eml --- spamassassin-3.4.6/xt/data/spam/dnsbl_ipsonly.eml 2010-03-01 10:37:03.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/dnsbl_ipsonly.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -From spammer@example.net Fri Dec 7 11:07:10 2001 -Received: from evil.example.net [144.137.3.98] by chaos.example.net - for someone@example.com; Fri, 07 Dec 2001 11:07:15 +1100 (EST) -From: "DNSBL Testing" -To: someone@example.com -Subject: no subject needed -Date: Fri, 7 Dec 2001 07:01:03 -Message-Id: <20011206235802.4FD6F1143D6@mail.netnoteinc.com> - -I should not be listed: http://foo.bar.baz.uribl-example-a.com/ - diff -Nru spamassassin-3.4.6/xt/data/spam/gtubedcc.eml spamassassin-4.0.0~rc3/xt/data/spam/gtubedcc.eml --- spamassassin-3.4.6/xt/data/spam/gtubedcc.eml 2008-01-08 22:31:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/gtubedcc.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Received: from [192.168.1.1] - by mail.example.com with SMTP id gQQvHEt9CmmU - for ; Mon, 07 Oct 2002 09:00:01 +0000 -Message-ID: -Date: Mon, 07 Oct 2002 09:00:00 +0000 -From: Sender -MIME-Version: 1.0 -To: Recipient -Subject: GTUBE -Content-Type: text/plain; charset=us-ascii; format=flowed -Content-Transfer-Encoding: 7bit - -XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X - -Generic -Test for -Unsolicited -Bulk -Email - -Repeated to ensure that DCC fuzzy match sees this as unique - -XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X - -Generic -Test for -Unsolicited -Bulk -Email - -Repeated to ensure that DCC fuzzy match sees this as unique - diff -Nru spamassassin-3.4.6/xt/data/spam/gtube.eml spamassassin-4.0.0~rc3/xt/data/spam/gtube.eml --- spamassassin-3.4.6/xt/data/spam/gtube.eml 2004-08-23 05:38:20.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/gtube.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Message-ID: -Date: Mon, 07 Oct 2002 09:00:00 +0000 -From: Sender -MIME-Version: 1.0 -To: Recipient -Subject: GTUBE -Content-Type: text/plain; charset=us-ascii; format=flowed -Content-Transfer-Encoding: 7bit - -XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X - -Generic -Test for -Unsolicited -Bulk -Email - diff -Nru spamassassin-3.4.6/xt/data/spam/olevbmacro/encrypted.eml spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/encrypted.eml --- spamassassin-3.4.6/xt/data/spam/olevbmacro/encrypted.eml 2019-11-20 18:19:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/encrypted.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,366 +0,0 @@ -To: victim@example.com -From: spammer@example.com -Subject: Encrypted Word -Date: Tue, 12 Nov 2019 09:12:59 +0100 -MIME-Version: 1.0 -Content-Type: multipart/mixed; - boundary="------------852960FBCE7C028BA30CBF59" -Content-Language: en-GB - -This is a multi-part message in MIME format. ---------------852960FBCE7C028BA30CBF59 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 7bit - -Doc password is password - ---------------852960FBCE7C028BA30CBF59 -Content-Type: application/vnd.openxmlformats-officedocument.wordprocessingml.document; - name="encrypted_word_doc.docx" -Content-Transfer-Encoding: base64 -Content-Disposition: inline; - filename="encrypted_word_doc.docx" - -0M8R4KGxGuEAAAAAAAAAAAAAAAAAAAAAPgADAP7/CQAGAAAAAAAAAAAAAAADAAAAAQAAAAAA -AAAAEAAAAgAAAAEAAAD+////AAAAAAAAAAAHAAAACAAAAP////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -///////////////////////////////////9////BAAAAP7///8GAAAABQAAAP7///8hAAAA -/f////3///8KAAAACwAAAAwAAAANAAAADgAAAA8AAAAQAAAAEQAAABIAAAATAAAAFAAAABUA -AAAWAAAAFwAAABgAAAAZAAAAGgAAABsAAAAcAAAAHQAAAB4AAAAfAAAAIAAAAP7///8iAAAA -/v////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////1IA -bwBvAHQAIABFAG4AdAByAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAWAAUA//////////8KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBg -fo0KmdUBAwAAAIAHAAAAAAAARQBuAGMAcgB5AHAAdABlAGQAUABhAGMAawBhAGcAZQAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIAAgD///////////////8AAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAASC4AAAAAAAAGAEQAYQB0AGEAUwBwAGEA -YwBlAHMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAABAP// -////////BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUJx0jQqZ1QFwzHmNCpnVAQAAAAAAAAAA -AAAAAFYAZQByAHMAaQBvAG4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAQAAIB////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAEwAAAAAAAAAAQAAAP7///8DAAAA/v////7///8GAAAABwAAAAgA -AAD+////CgAAAAsAAAAMAAAADQAAAA4AAAAPAAAAEAAAABEAAAASAAAAEwAAABQAAAAVAAAA -FgAAABcAAAAYAAAAGQAAABoAAAAbAAAAHAAAAB0AAAD+//////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////88AAAA -TQBpAGMAcgBvAHMAbwBmAHQALgBDAG8AbgB0AGEAaQBuAGUAcgAuAEQAYQB0AGEAUwBwAGEA -YwBlAHMAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAgAAAABAAAAaAAAAAEAAAAAAAAAIAAAAEUAbgBjAHIAeQBwAHQA -ZQBkAFAAYQBjAGsAYQBnAGUAMgAAAFMAdAByAG8AbgBnAEUAbgBjAHIAeQBwAHQAaQBvAG4A -RABhAHQAYQBTAHAAYQBjAGUAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAEAAAAyAAAAUwB0AHIA -bwBuAGcARQBuAGMAcgB5AHAAdABpAG8AbgBUAHIAYQBuAHMAZgBvAHIAbQAAAFgAAAABAAAA -TAAAAHsARgBGADkAQQAzAEYAMAAzAC0ANQA2AEUARgAtADQANgAxADMALQBCAEQARAA1AC0A -NQBBADQAMQBDADEARAAwADcAMgA0ADYAfQBOAAAATQBpAGMAcgBvAHMAbwBmAHQALgBDAG8A -bgB0AGEAaQBuAGUAcgAuAEUAbgBjAHIAeQBwAHQAaQBvAG4AVAByAGEAbgBzAGYAbwByAG0A -AAABAAAAAQAAAAEAAAAAAAAAAAAAAEQAYQB0AGEAUwBwAGEAYwBlAE0AYQBwAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAIBAwAAAAUAAAD/////AAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAHAAAAAAAAAARABhAHQAYQBTAHAA -YQBjAGUASQBuAGYAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwA -AQH/////BwAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMCtdY0KmdUB8CJ2jQqZ1QEAAAAA -AAAAAAAAAABTAHQAcgBvAG4AZwBFAG4AYwByAHkAcAB0AGkAbwBuAEQAYQB0AGEAUwBwAGEA -YwBlAAAAAAAAAAAAAAAAAAAANAACAf///////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAQAAABAAAAAAAAAAFQAcgBhAG4AcwBmAG8AcgBtAEkAbgBmAG8A -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAEA//////////8IAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAgmHaNCpnVAUBXeY0KmdUBAAAAAAAAAAAAAAAAUwB0AHIA -bwBuAGcARQBuAGMAcgB5AHAAdABpAG8AbgBUAHIAYQBuAHMAZgBvAHIAbQAAAAAAAAAAAAAA -AAAAADQAAQH//////////wkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCYdo0KmdUBALt4jQqZ -1QEAAAAAAAAAAAAAAAAGAFAAcgBpAG0AYQByAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgACAf///////////////wAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADIAAAAAAAAAEUAbgBjAHIAeQBwAHQAaQBvAG4A -SQBuAGYAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAIBAgAAAAEA -AAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAkFAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAD///////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAEAAAAA8P3htbCB2ZXJzaW9uPSIx -LjAiIGVuY29kaW5nPSJVVEYtOCIgc3RhbmRhbG9uZT0ieWVzIj8+DQo8ZW5jcnlwdGlvbiB4 -bWxucz0iaHR0cDovL3NjaGVtYXMubWljcm9zb2Z0LmNvbS9vZmZpY2UvMjAwNi9lbmNyeXB0 -aW9uIiB4bWxuczpwPSJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL29mZmljZS8yMDA2 -L2tleUVuY3J5cHRvci9wYXNzd29yZCIgeG1sbnM6Yz0iaHR0cDovL3NjaGVtYXMubWljcm9z -b2Z0LmNvbS9vZmZpY2UvMjAwNi9rZXlFbmNyeXB0b3IvY2VydGlmaWNhdGUiPjxrZXlEYXRh -IHNhbHRTaXplPSIxNiIgYmxvY2tTaXplPSIxNiIga2V5Qml0cz0iMjU2IiBoYXNoU2l6ZT0i -NjQiIGNpcGhlckFsZ29yaXRobT0iQUVTIiBjaXBoZXJDaGFpbmluZz0iQ2hhaW5pbmdNb2Rl -Q0JDIiBoYXNoQWxnb3JpdGhtPSJTSEE1MTIiIHNhbHRWYWx1ZT0iNW82aWZ2aP////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////8/LgAAAAAAADnC -Iipc02MEgFyqB046D6n2S9JjWKgTha3Y5im9sC65Lwc8XESm7fLVz8eSsiMt7e013GGC8DKH -OuXrO/dn947L9TY1TzVqC0iylrRrR8CSZRRssKVAZQQWhQpHEa5djutcUSzWf6mZxsXNjfXl -PDJpP7tfBB52WsCTq2n+iOua19wGn3/0W6ePHgGJqCC4eVw3P0SeP097NGJg2LK5KEZVZSLy -P5+6bji5NTA+MXCtatLvCnRNIWl3Scvs3d4GH4uBB9xcpdVZ0DxXox/y1Mo5ew1iSP4KaVn0 -JlLoxcVx0rx4qgIBRRQGesp+M4hmh0/oJ9REF3Ix9yFgwM0BYxdahMt6ieS/5tpvinGdQ/HI -0JWyPbS6hQXNgot+RNChQgNEmQbPkcvw7iJ0O7IZlc9kYQLDDMHheQ0CN1EBQzzrOZaDVHSs -LrkGTk4r9l37FEuDEcayi6b3EBxM5ndUG4VEG+Z2+NT7/uaimAWMu23prb2YqR925NJgayUE -cLhIIMg0+ff9Hq0EhxX0Vc+nMt8Jd/c+xC9jtXrnapP5C7Tx6L5hCSVrsY0mQVhtfCQJQNOy -UdvKgqTKCDIlGO3gS/Vhynvu+Mm/+r7JDdxfYY4vQjPjgXQ7S4tIplCKmkmlcR2ppFM3ninT -gqDUvPhDgsbvgUO7eI5E689ZSQLmf0J9m914WGVmya+su0TDaJzRen1jhFWhIJq5AOjz6Gxh -uqnTmYeznpwjDh7xk0YOLfRT6S5nGHtXMq1NYmXo1VqBB2fWX8jvWWzZa9pEacbrpoWz7gi9 -4PjVTW0fkm14/evsVHnG7FHrNSuxpgG5OJ8Dc2TL8rPD4h4zBgsVHvFvNQeRMS1UBp1oaroo -EvYzM6LcIffFnxDlfc8O0VVikvOOR4uRWw0j0pkpk057rDd05GiVGfPtWmBpdZhJkb/fP256 -cX/f06hR6acoDlAk/dusBjRHPpvw2X5emvpGuVXHAoISSBtAR0et9Um6QE0siDf0ndgNa9z8 -IsByrHAJjUzxy05DUx+a+z+w4YyZ3VRMsdCrbtzhLt377NWhlrFKrq3DJTmZdsRR3YVE6aXK -mfOabnHBZ0362dyfH/lv64uXrJRQIEqmkOKgweNMQniE4o5dVI0pWP9UOXz8DSktqO98aIg4 -/27LlgoPufDk5Csa1gYy5BugL7NGAerOrhXh2ApCWJvJpyXue+WdPdvXgbS1bwS9ckAxM7IM -3ui9z98qLIEXjUbLStohLbg2dAbBniBFCxa4tHBLxSVsLqztELvLoWogSjaFY2MYXsxPE+qi -ySWKX5P31WUhHLw7txkT17YCdyQFQ3m16oYIZCxTjJFF3HVM5iTy+6+xmMVKa5ib6XISEMIb -GmkWrmWSv483X3Wouk4odOSojOBF1r43Hitw6RPoJFTkeXK7cyTH1SJVPL5VpDjFTPDblcRY -RgHB4ySui1U28VY/4/tX4MrSECh3H6zYEGyizFTJ0vXhZUwHiwZ8sx3PfuxmXyzIYoNwIkMk -dLLQyfbTsUo6EhzM6T4S38GUCG7Vj/JGquEEJA2YTpkM+WX7BEFv6haeNQpz3PqXhjpEY8rm -yKnsJQQoTQ/X4bILJGniXujflQa7tz/AYABFu5QC1/22DPsDYqroAv3oQLnrtWN4aSTS7Aq8 -w4vLO7VSovSghgh9bw+GNH7TDRyPw3pVCII5xl8tIsSCoyZ5UuwAjAHtJgdg4KO64AQJP2T6 -peZbOSr8mbQlT1S4BIVOuGcuUtkVSDU4FVV/c06L0EVdf2eakdbgZTWuhhi48vdZeg4Odysc -14gMrbOY5+Sixa3x+uTSK6fDE2u4MMZ9jVLE0MFgIAX6ZKFk4Qk3CiNQyqJ6Ek24wFQqJyz6 -h0ChZw/BwppiPefpmk/e7Pk9r90QSsiWnE1W5ZAQXzHp22Lls7t1BTXHL5uaPvdFTsFVqHWC -esKrFNhz0M7fYUhMOB5+z01l/sUXY6ymfTSUvOixOg+TBSt8YcwK6Jio9qqNaE61i+mbBwCZ -7sZlfPV62XccxL0t/FkBDg/PNSXOYZUOlauCM9CTAE20OL9MGIoKw9FxTs2z5o2TMtgchImO -5ZQ138T0Sf/DqWSLDfG/0eDF++wNseVA9einE3U/dPMLRWRDa8yYjcE8MiI6M7lxGRR64dRJ -JOCV59AUhbU6LCuf7IVT1CKs762aQMlb/ZYyS5IkRdxKNN6pjt7ufhvywyi5gxwTKQwdF0Eg -vwibHd9wt5IK6mgVKPz3wtGBKEloHWVGgb8ktunMdZ4T0Cb0NNYTUJQhL3O5X0A8yBJAFG9h -vC+++xdqvjPDAtTHhJaeP6qmW7kmkrv7Fa/2VOJS2SBEU+gfM0gEZEYLGT1rzSvzid9REFsa -ZEN4LMvO1t3PnX491jb3vBiaapRs/3LwDim3kCarwu4REUHbFtrM5HxBG3qbiT2DnhkWaniO -HzFJAJ4TCrsr+FltfhFGbor3iER12BxmMPwIcepNhG98DvdLpOxcH2JWY0UPZPvDbnUySqwV -y9SNodAZVui/Lbtp200YGIMBMXHEOT4kQNR2V5QKVZ/zVvFMl7pffaVZUmVIkz4mwKLI4M8F -UEErfImCg10W1Q/cflnrkuusdepxdtLFdlCKEo2Xi0tb4Wtt4Mb/Uk09a0SeoCVdGDVztfb9 -rNAclj/jhPG+niDLt+yM145h+twmerEexh1VazIW+kaMyD8RmxJOJQNg7YYyv7zlfWQPoXRk -ByAsBP5zKr6L7jEr86xZuEs9PvoIsgsuaVgcDEyADEqukpnkvm134SPdIpNLhryyPK0rduch -KNbcmBYJOv8zmrpC0C/PYBXOUJka1AdAixyKiDEs2dztdF0JAv5btBHdMxLlXuYfJr6gma+T -43W7u0KWdCY/rmlBfneF67Fsy6JggScWIqFkj9fH+SRgEhaxvRt+/hoL/ZX8lOzhWeLcyEjI -ngXi4O1yizW18WDDNLxHdSRLBqEO6MPfKJyI1c6IQ8gcBT0Ome+BE6kKrXP0E0Ro7t4tDtPW -dpSMCJpPv+N8Syr4do1BcRLbElFryuZSIzlkzWp0Q9eB+Trb3pYq7WTgs+VBfkdF+ilT7No/ -6UkJYpX5xLhtwKnSXUCJFL/ph1QgnXBxAz2icXrKsN887+Q8Pv+2vBNzwBpcHBLkKPD1LiSD -voYvgh1VIYpL1Tq+M9VBbXtKGgmE9wpTWItArgBMXmNtR1X84gML9qQbuzaz9q95HY9zHuq6 -5/cgBIEo1twiWr/clV2fyM/3lLPJ8ey2TriQY0HHR79yzct3Dv//58ZArZXMaw/yP3dpVSd0 -2aGfC9SPO6yc+ikZSuUpxQGCfeDCSqB0NcJkQEhYWLSvssGrBRSBN26QEkKVOV0FtPswEaoo -26fcgCCbrHnT2vpm5aWPcURWcm+Y6Eg2dC7pJv6v8hKAzcKdb6krUPKMKyzrITJU0jfSCF59 -cKpoAbI8LAMXjIpcGZ2uzNQQgvYUqKlW8/+u/wf3c6+hB4BdOkKIKpvdQZk5191mKRSqqQdr -QalUEiss3RRY1mmjhfpxPpMbk3gWr5SfEvbIctHgmN6XnQzMSqR20ij5a+73x/KyH4dIWDim -BwTZ1sNoQlng2LcrvdwEzMZMluHYbWU0b2YWY84mKDqXNfFkpvFIUFlfP3hvZ4GfmNXz+Kx3 -Au66E/uJBfCCpvtHLW+Yqt1CECoUrs2TL1tTTFurkkk9wvsQBRSq0ArwZoiGbYlwDl2Hngar -EKYMv+dK2gwvmmE2rCUhrASHFaO5Wcw9PlpI0NOdAL1dy1S2Ve+3l7TkveWxnpsj5cwvH28h -lahIAqWEZQ+w6Tfo+9cmg3TtRn7ZYFMhDyWoaWUWESBXoVuzOGlBC/75V9FFPZo9wprBAeHJ -jkKI0OiUQfFtTWTR/auacD1QbRNywawl2t9k9GTEBUn1z3grfAEoM0iZ4+TWuU00yaT+cVeN -FHtOM8UzHsyG3HZ8L7f37ONpWjwoK1tMKwDjyBIGaWd8KtG0G1dWxRxMtGB0Et4AjE4vyhh5 -W0WN8dfokdegJXP240X1qs/ei5qjgdMxRakDqx5Bzw9gv0wAO8OhSnunQmi60eOYU9hKPQZq -6SFar3FIiR2GtB+5lOiZ8fI2uuok+3J2bIdrIW2JuFU+GoCcjd3QubMyKW8bCOu+R9lKSWnh -yxNEtjWqE3X3REaOwbhGtksqaPmnA9aWSAHeal3JhWi53lH+YGaycaXQakJoa1OuZosjI2sE -daVr4jcYCKbgxOOjFrCQV7Sb7Odr7aW+EnQ5C2RYg+iRb6pnO5fos/MUr1JeksgcqoGHlfhn -cTxBO2s4E7X6wOIBTQpaVh6Sr1peOj3delaP2P+1eIAZitdkZ790ZAAYoQ5EHkTlJr1uq5rw -1SZbt1riDwRPcvx7h6AYSfGxo6g/eIcZG+USXkOy0xxcKXb6qfusZr1ZhUA0/KCauwASKxik -duMizSUeIfUPUEU21WQEv5Yzf4jTHmhwa55FjF+UifJxNN7qcenNpzitEzy/mmW0k0q+D/wk -8rTxyJfSQzYEYpBDFHHoBs+J/EfaNzYcvUcvcxtWypAiledMKAKZAHlseu8+32mo+1eeyflW -ZJn3SUMOVuUcMZeGdrhJyfmLAgBPmsRdTJj54j9YjQpmYsso8k7i2e2RaSwEvSIztjRXjns2 -ZuID/SwXdcvaspJWibELrML7rZMzTjUmSmjDvshYZFh4/KBCiB4cwYg0DUd6umwoco5IJ2+a -iXk7wmktTuxpioyaq7esgBLEGP/wXotUg3qsJum5eizcz2We9g4hZtQNlHDtPAkXCHuSOCEx -jDCtw4sjJUGuwwNXW0MzBJEx2ub0zLmQ3TyKwvW6W8/oM0nJccqfEuB8jE0jq6xXXVsYZr23 -acEieRJtM4EAcfkLGgQIl0UJDU7sVHhZnyf6g13fzHTLeafEvL22zsgsBQDAKrsukXfAuq9s -hN5XVg/x2Kjx9zgjg2tZDdXixXQX9OaaIYn7nHqvnhYa9/c4cgiqrbyvWUHg3Gx2WibxELqH -W673vgBO2n5bDp4GZQ6ZK57AiydJReOPihIpzPM37u4c9jW+j+A1CDvV6NzaM71aCZGVG3Xd -J2Q3y4WxiSfFSbxX/6A1i6iP2RR4Xx2hl09hi3cQfVpbX6iyfE+0t0TDNZCQ6E0UGNIVIJ48 -jSPmGw8e/l8cN+qTr3aMnnZJVAkDhZLvSWehgHJvtgj+81/XIok0SJbrGbFVmA1z26GyvU4c -z/QjesW84yRi4+SfDZwOLUK3kOineNuVq1vghgX1wDt5t02Dwvlz5HYFQU1Xv4Oxbi/VQv0G -vN86moYe4UD8Fn27o5IFZSqZ8j5VQn4drGXVxG4Vrvof/ZmlqoLsym26GjwQRDk7uzULC8ve -djVhh9smdKTbYV1fJBinILONF0c/Y3+YWoH2KWVhjTDSTJySazZJ0wFcZl5ZWsEujuvr+k7W -VNI2rWj6rXIX/3y4EL0l8bvdq+rcDzJKfPmy0Wzjit3z7/iRA5jLf1ucOLaNivHRrkdedyvF -3dD2wTEil8nB4WoiOJzXhmj1hmbfVkaXRYj5TkpHHukhYPvVTSErVYbUjLMawZ81S7KJtvC3 -gEarktzJ1F9J0FE0GquCIj8ODA2R23G3mFXF5xzhNxEcG8nudDVa4V7e0tOmRmISyGe/zB8p -hBI/IPphSGAFziikfZ0rrF2bO7uuRAnpMv4GAAovan4xBXPY3hopNYBnm9ka+Y0sd2X65kDP -2yPq/wiSEfBDPMw6ddR0VtuI8EtC9SLQbwNsVcfHBlTCAobCx0dlZFyvjcdgKBw8pFwPW3ND -VIFqDEHj/jYO93yKoYO6QhypogvCNmpY4Ln0M1aoJQecaFHDuuFIFuKpNpc+th+f9v9KBRvA -WuaGyRjghNG52L7wl69UdOq5c065Nn47jk1KiJ6d4nsytudO7D5+84milLFeRHA6mFcCE+tn -WbQi3iNyUOajsWbuiFJSzfpqtER2ltqF11BP73xspjBiS5gG3lKA8EqNn0NIxqCylxXNrrYt -B/YvcE2uiDkK3Qc84OWwwBt/YakxD1Xi3agOYlrG2N6NHvV5cncQhlvRMwxC+kx/ncmbSPoX -buFtVZPx7uoiZgZaheoLbp0JgyKqpGZha2jBTFO/5pm1miSSw9NzhYZDOIucLOHhtY26lG9J -SQPeWS/9iaUcKca0RUrhI9gWwC02pex+4c3xZZKBFgapvCL9zY0ADJkWH+io/cBanJ0T2qoH -NqEWdvP9855uhy7hYnRMpwfwuypRR1PhBDDpcEZWirNaw8fWvVsCdse4fjpGoJK+MRDxUxtU -I9S1OBGLzGLqKlHmrYEkKQ/qgM6NFMJMKvB+MVa7QmYcFQ0kHGTplTc3s0FyT7lYN42iaR5F -/udV9/H6BSxk/5npTEryhDSBNgiF4jKpmK0uXGDtuEbf/rl7KNDoQ60HhlQGIZxvtvfvfj3Z -GE55cMhZ7svGsBnQeu7aLBnZWWhWILFEEYuUUiaJ+hXb9e84a1dwT6DMc24Xs6010kB+jhnZ -9MoGsZazQbNK5wof6YOGvUHCXxZP5eNASOXekCS4OlWn6zVnbWyiOw/bPLF5ezZ3i7VFSn7a -W7VGY0j/MO73uotfC1iLGxatvRJpedfGKBX17lYfuNSPgKwLjE0UcHyBRLpDcJXGOd7aMqXr -RHLZ8iJKW/cjF/e5ebhKp3NL/LLhVwqmgbXS0/9/2YA69DERI7ry1FrntcDRsLIzp9dghS96 -YP3xk76UX4tUjL9ORGVumuu0gfg0fFJvPQau++/aVD78x9Ype4PA+/UyaDxiCp6z5FV8vSJ3 -OomAAMUDinJXI+Gz/5VZOLISfYgDLgFi7m4xbQdL/kZB8svuymnmFFqbnjuHO2HfpsVOlhIF -H2HiJxgeVjWkwxBx8O9lYUC2xZpV+icCRqgyG+0r73A1CcE9VIaMcr/4k1ULlXSe55gMuH9z -0IrAd76jsfXiT4I3f6Yyt2V8NnQXkCMw9vYh9tAliVxg2x3+ZTpoNG8bq33oOuDkxM0PgYXa -YB71PKAPdjfKRiFPopaDbhv/YZ5VRl+kTokWe97LryKhu5dsJYvk0cqqzbE4Twg0gIjE5JmC -h2Si4NwmJcysCJkFdkkCuKphZo9XVYEqt8EOFX8lpa60FbZCYSMjVJskwUDmtzXwh3QgsTcC -LRAG8H/nFTUzl0iBNpNetSL1r0Yn2wOLM0UMxRSECL47kY3gMZUVTLv/zzHYKNCzaoeGG5mJ -vVaZF5vFeb9Vbg/5JbDrn/58INT2bD2u7NAOHD7p5CaGjODss26kz/3xlW484b5sg0QInU+i -hE/2SHS0vI2ZRoBMU48xzVnkX4+t+6rU5e5u7lwqo34ZMZY8Qpqs5k2DheSCn14wwDitV+EC -JgNujWSr/5dByEqOyIdBpMApWciMySI8wg2SsVMC11HxCLfjPlLNp37nL8zRnHqNKfcoDxiI -/lt5f3TI8oi+6QtoqfI6N4z7RXFMAfqpB5X7rhzc/pPopmLvmu4y6geGRMFas/ZzGXH/oe9n -cX5ZPkWAbAlTSnBzZy8VmP69gi9p1A3GsBwg/fY7xPtpA/+c7FYtxqdXvjQr1yhPShK7BAlp -3UIPrvdQ7QQN0PmsYmgP3OgBQ8xyg4PAPQEyccgOBymbDicOB+T0Uv0/xE/wHrsqBeN9dmfF -A/Njcdn2IJE4MzBZCEYqsjegC7bKqemy2lJYhfCcZwOYriAiFSMfdhcqlfGLs/Ad5XsxEh+j -TMebPp5kHRWLh52VTWWkR7ivXs5VxWvyyNA8yF2WcNYTcd2rBhWaloqACFHfX0VZdtyaZvdd -7vfJ+3mPNcfLoqI+0zwaqely+kETjJ+Z0aEsaFYqs6jr5BYXbuH5O427YeoCpx8dSKglUbQi -PS6Rn8XbB7UivM5Nm/r3oDMrXpTHAkXQmApG4iEBSyp2DFAL/gCrje1ZiioaArVvJmBVI+Mu -Ld4FvQpYeXt7I22rbYCCFI4AVzBvtkml+abKgGcb2AEBeN3yHljVpEFFQgJXxYFYjBNuAcf/ -jxNZJtU2p/geRWNMcSZyhR+XJbPv/YuM4FoI1yWcgTrMARiz+Opp57AylD4FNjx0OlThW7Tg -hm/HP/UpDIxkomAq9OnGpcCR+xF7uk2XGIb6+TlK+uTL+lBTDE4TsvWhK6W0HFw+H6m7PO8G -rub1xY1BBoydVLlMU6P3+H74Lwf4fvi2YO4R4eBm4KEUrNoNkwD2gFS+NUWJHgxsrtX5XeFM -KqcYFyxXi7G8Y8n8QJCJN23+B8aE8F2jvGroww48/rz5Li7Fr7gGG5h/9Gll8aegRgCmzhqc -gx+WcrGv609Sqtm1naHqpPTlYlCurXQ1M/9iNOnzOx13D1QYiacPplYIIGzQ94eMcSASqot7 -OaWa9O4EdutNZudogK14xW0+VBizj5SWi++1FWq+Nqhqj1VIDF2knvQWSKzu7n/A9c3UAPK5 -fnIdAzr9/fpdHOOHRMHkpiapJvedey/6VSWWCJOtqNGiT7ahTWM3cH+ABhgNm773q1pBRN1R -plWmpCHpR1XWGWHbqcAiAJ5bIZMIuToVax4G15Q/M8D554i+9dx5fKrM94F8rKhG/PGrsVeE -wgn+ORh7VByhwMW2lSp7W1R0zeLYFeVijiw/gNy5Q3p7X97F2nnYW/MWydTnVf+3CXPpnpl/ -vmC2EXUiKU2K/hTQRDvaxKKAILfuKIupg1ezV331eoCChdN5JHBHUYRquM17h/z8kVBhN5wz -HHoy8GMaZ6ZtZcfg9Qo5VgIwyJZ6is5m89TaP//1QlC6ZNfsAkvEDaVxwL2TUOW+FyVKM+Qa -/8lgony8Fc4HCnmJgsyDOI3QVKVyNnhBgHscsEoPDXu7OiM8tP7puqzM9JM8iaZxTGnfGGbf -IBEi09lVD6F1Q6ZWHSbxWnDspYnN9eqG/1zGLnu8WV19/XxWcXJSeCzAGfPc9Qg0s6ez0ilA -GV+jQ8qvvI3lqOnJZiqpFDGCylUahEJ7pudnuS+WWueeQ1oHXpl5DlYykBT7ksGDLV8egx1J -gCYPKc404rPcSNFumg3zvV0SmOhhjZBvlML0mUeapPnr88Gq788RPKZohMiFcrBCrlJfty9o -I/VlAtomHwzzgMhwbf+raJbkplekpmgNzojk4cCYLsuWiIf0lSmyGQossYDyHoU66+D5SoGF -ZAN6JTLZ35QK0A2MyEG7FLlmJbSsSbtX8muD0UPLrCVwNs8Rbf9BHlPrEM6V+zMeEaVRu4pZ -41OkeDdbr4cQ4d2nW5vYSZHTEpjq0Q7mtVFGdt+Re34N+Y34eC//yoSIsLQAAmLL9QDlHL6b -9NVx4RLl83eMeBnZkWc5tuVAeVN5oc4VJe9YvjX9mD81qLxEyH6NvDKmNB9VYe3LQ5PxRh8J -ApsAW7nOH/NLblbdg5qF2/j26ApgVVKxS6PyUN5q5kUySXGGBDj2IYio6tlwixoZzVtHdKhY -Ahqq0A4zsJuVyqdwq0jvejnjEjkBgueu20netGk6ERvK49e8hHJNuaYV5F90e0nrVkxAMHOF -+293fsnSD5klTBPxPcwgyI9Paw+vjygmiDDIn5ZkK52xTkIkRGCOBpMxAad6cZOpCKTt6p/p -aEWWCQn+8v/+WlIm/uvJSGHdXsggFuMRO0NLRdOsq+C5lXcMUJ/oP7ZooAPeQJLLW2ng2wTB -58IGd58dIrr5ic7BXBOYfeNo8ZPLQQgS9YkP0Piz6a5b+AqFjB3AqfSG9E5haE8wpnez4Q2m -LsjL4gdDcK40g1F+MVuCgtSHT40MrUMdnQJYDJIy2KtDyYgmNY4v0XERNzhROTH8x57xX0NS -5b15MGa1Ntgy2Ur6Q8DjzN6NoekTXlSBKTGs2l+26jo2u5RC41sPww7HSi2ymGRj2qaBR6i4 -B6gxanAZNx7UCscuiSjSX45H1Fz/xKco0wv2kNc4sLwfb+HHYGtwzUXDC1CLMUALSIMpEv1+ -c1XlABv0Ajjw3IGLT3by5SC8tUn+1r4u5si61Q9aO1VJXMRyBN2wb1mALtjw3KUxlm7hentI -e5TtxtD6d7LZWzBC4gPzuaEi+ukBDe7EZEvpyo+yLy+7gN/sofaGRovl/XKeQLaVnPfK3LdL -+QObZVPRdu2qXglYJ/3FZ4UazHwgpaZe3f7TzjPiGOh9QSLPn4brr7lDM9IRgAv6N0J3hn9Q -HzhEUGrjkD2qO2yjxh58MGg+IIg7g2tk/ZAyKCUDwz+UucMjEB0SP3ApR/yM2VME3jbGnZo/ -7BllXmDIbGdNUV+fyh37Nxa6uSihc3xRCXZZidhEgBVJPNDQyHY+2ITFuEgGI23c52OMmw7X -S2EZYAa9uNh/btZPFsKI9307qA1LQcvOSLY0iEF/Luk5Ns2H3SyjIIvp4Q4GLv89phI0cn+F -pGl8IXRFW/yDZlLeaqan1uDDX9KMAzzgV+rhrjh2ztecdpvCuh+BLaRCvM7Ux+eajujQ3AmN -gi8F1RjBsV39sfjqQUOQLT0rwD75uhG88KCXDpIUnwdGYnWxMADgtPiRotbMtoNHCXS3qc7l -QE2/p4SeLN/HV/rw5aEtvEkvqVkk3HiXq0B+IMDcvTTZ8Aqa7ACkso2cfIxGK+0EXYZrTBOU -tM3zl8h7A1ZNp+5BjjjUC9gFqXJ4VvDWMrkdltDhY2icy00bz/VzZVhCFCpERcd+c5Ci3jGk -cZqKAYzwigiA8yGuvr26m81bZRDqAn3CPlMAp7y8rnre1sgEthRZ8lUSiO31tQtX4ZfsmBTI -O00uIecx1oZcyJAoyw2agkuJi+bNMvo444yYxZGILXst2uI+vHbtqAnl4TduAD54Jkkj1ZxF -ug3medQ3Fs/BlA2U0RLhyDQn+bmL/LfQXWlJj6DJAM2g4ZsZUl0xOcCHrMxumVJGaTVSsPPV -9axdgLT8HOKRB0t20mBhqNXQwCGrwvGW30n/yzFViD/hP80NKOp85VXaeEvYPhBnj2N67QyP -uJaufkqikE/JsDXX5NCJdr6DJoS6fdXWBmoDZ+LcHEbesihSsoytndEGmFeOpi2C/23+H56k -ZtlcxRIzV02HIAUWBcw+eEiLe700218bQy5NzsNsJWfefkUuqoZbo6ufN+ZhWafD0fE82+2K -JKuISLwYSxoMYRYkCEEfEL1KVnGg/CvL91AFQqFA8YazcBn4vT2lhwnJrRTrTbMan++78Eip -jA8jkzG2O61jHFs57J0P6Xkiq5Fm0xNtKZiukh57y7BMrw6wne/IRSk/vRqI//m2vDb8QM+q -tFdG1aLVikaaB2eXBgiZnz4UIyDhuQE9RM77WxYdDI9EaRDN7wb/6pLw8QhpqevE9fDluR30 -7GI7MABIxGqAI0rMhTCjFrpSWvUeCCruabudTORWA1wXgNsmzyL5P4uLfdctsCZc1//Zqlhw -JmBn1HOqCmHTfiR9IvesYnf6In5nhCu2ywLZENvSxOYRvHNqN2BkKMMpIcHeCTbl2Qisn50u -kS600JEmSP/zaOkL6yR09t/0gcPcEltAxL3NKdAx/mHUV/kHea9XIAXi5d8npCug4hQwQkUZ -SFxjOqKXtvzhLkZmGCK6aNrRfNV41Km5umbMfzGbpTur/yqfZuvmGOI2RQvhvkw4adGeHBNA -0ZLOCpKUa+W0z3Gz2Eav3/8PSWZJLTRCruQ+9IYFMxf9B8Pyo7TUlkZwg7OIplFwgb5fFnIn -Z+NsDDmXzG0jwuqR8gziV4BGiprwJQYd5JuEmO/dCDvqJW8b2+ufaygxRqH5eodZ++WCcvO9 -fWiBTLJHdO8bQYim5t3uFFwni8zTR1UafWQyLQvRrODxv3eDbPKSDdx23G7ffFOGypm0SyU6 -wl7c+rW8cshqsPdkpdSrAWVtudQGhpS8LjHre2BaeuBrycDXkIEDeWrI00YhY3kfl22PNaeh -Dlu0lQaEMjNnJw7ECnh3+iWq1zhmC3FP7dL+GOIRrlS+/wa+59znQH2mDf3mgSQMmnrShW8f -+5REKbv5ctjSLaEgP0kv6ytYOm/02sEPKhpjdC4jjLNFMadQUdDNBRH/LytZmv1XjvxlLgC6 -eAkd2vTiVqp9RDv0n5uIUFgLtv+bdas84bSiKWbSQ/XNpgMywfBggWAODIFNsExgCXeASoWE -wTYQburkzgcPuu/Jy1MRU3NNhSfS/gIwBBIUFEpwWjDHqCIrHMdzMQ4Nn5Q9u+fRZ5TPjr+0 -oGQbptELRxHvZBEaMjlhaZODO/Lt0/Q9AHsNaV8U+rpJySitto3EatH9l1/6zPIgEOqVqwsv -PU3DP2iSgEpkcoGSj4e4sGjia5ywdNgqJPvuOxs/6wTZAaD83oQJWNSNEHdClHRIH9b5VxUM -MBQLOaXdSWEFd8ERctB96tgU4hnOZzJE9B68Tt6ydFlj4LKomxGt7XaSo3ZbezgJnTptbmLY -sqodsNYIVbtVVV/3cx+rVk96qqWJkK7qXqcXThTAAom7hDB56MWcC8qQsIlHs5XNI8wTCFj8 -evRxVQ/7OwIqSU6aaAZmjVPMrve+C+mS5nGtPOqa/ktn5llVSbJ7JnDwKkEIFMsccxXwwHvp -+BoKXaXcBD1MJXYGUFNd9Ww/vYmkesg3QJD/J72WT8Ic1c6mRcG58nB+NeP5psaL3kGit+Oi -MwCO8TS601G2ySwbfAkLQR78iuGgMFkKxy/A9r6QVlMTVof859sS7dq6RxwGuyxRAN9nTAhF -8kCm+DSVKpVVx07qIXsntO6xhIHofLgBHxota9YKqDSA3stMQ6cm0PmsROlcTr6P+FO6Z48I -bvg5YBpLK2ugpw8wXeTsh3AqkmG0FdM60BgTEBDXHI+CvHWokdnEvSUv9cuj/QAZpgt1IPzp -VED13btk2ARr16CR2lBCDQpkYDrZtx/w2aw3t6HVR2bWp6teelbTrrp7Mv4zGlxukl/u65rU -KXmHldShNmt4F1mrDSUwjq//qMN2lGvGjg9A/I9yyHMpv2iiE37VxugcRFpVKgAHZNKadyhz -XNZiP5HIQsjq+bq+ei6YH/fLDSYGwG9r/j2T8nRzwRgw0NURf0ZNDWm8M/i+HMyCwNXTdxJd -8XSqhZzWi0g3Ce/jVivqStIDyySDlqEBo/czMTesFdhGwNpOyVQDe1edCowumE8JYWzht0jl -Vhkc6Dck0pB+0EYKcgGv4qDpoY9+SKcW0uQRr1Nj64ext9OxQ2SngZdWvSlBkUnIfCpN22Pc -WF7ihBHqF71iyYMkuWZBqBw6MFzPE9KxEhgnCTLSilHaMIhArbXqnrM2bf3NBCtJPj/MBcxS -yCiKofMmS7gyc8UN/7Pe+x/6fUHoVv2NY0TUKl26ABOQMbeJV3DTzzrFca3bCUUTjJJTgtC4 -CRlfzfTKeqK2jeGnJfdNAY1JkcJPjt2HXGLAoB30p6bU2ozO2G24C+1LL/UgB5b0TMCa/4z5 -62xno/MjXSIbaXmh6JhXNcLt7NCdhHm5lHPPVgFBM/M84R25aAQI8IFUa+MOb+RrAXmlkLv7 -cbB72QjnRqEOS+aWuj3wnbMgJxwzb9N9Vme0IshhT0DA6LuQayCADYbXJzqL8MtzU7falQ87 -ZPYmXVhjPn0shDePKkOGQ7DbF1ORWNZn33YsVleDyx3OvUrayV3/WyB8chk5Udxf/yWsYWV1 -7c0Lf0RPKNsOy4AKPpgCNHF4LeTNvS4paVpzHrZYRxi4525H30TdYSskqabE3klrhuYygizq -LpknJ+O8bwcrbvPW1KZdflAuneJ6hxe4CZU/F5+fttKF4uBCzQCICdqc/rYVs1zx3ILodKWM -/UzvYX/6O1YNdGdfJT7J9loF6lRFyz6LUcrnXatyYSpb6pIgAGf7yKjNVT020LTGsF+T842k -8dEp7TGbaPwljkwWJkhV545Ja9TR1BpKfCQqRMphgAD6REV1MI94uSbOxmjUxpvzg6a31LE+ -nC6mSBSxuBsWOl3UgXKMf62j347T/+KQlZdUkYlNMi2T7uGf5e3ooDTN+rrLGM9U6psFSQsh -ESsKpV0rUswBSDDYSNhe7wMTrHCpEMFZs+zElkVAM/KRVC2wRS9sDpP7Rzp1sFp1gKC2Ux74 -lkmSgFZygGPlODWOk2cFoitJ4Uh0sFRVcT8IbrUMxau4fK1fLKBG5WVlQV7vqTlOslxgaMXK -21jtgTx/88YTK2CvIm2QOEviDIjhRVAuWqL6WAaZDAs6FJjvVXnoZunHR+/9rrHsdx67JcI5 -zdJD+VC9Ha1pq75R/N/nGdnbRo6ISljU1DuqUXVozJU/5GImtFgXz9VjhcK7HQPh3GRWA2eF -pbuuVlpShDrLQfVXVDX+l45RiLKQ2obZF7JYEIM6+4eu1c2w5yBvmrfiXEeRS6/e5koLwbSp -BbU+5Xi9jdccXzOP9J2YJMs4u8fiRdCZMrhvqf66FnXyR/wivh/fmpVoYtSqREUt81B1cb1p -eaox5fPmVBCsHs4TNybn/Ecvp+jmzv0S9dwnnDgujk56LL2FA+Qrvc/gPUDt1jIMwPIkG0sb -3IY9PC4XfzDOUJA503YLq66haIBBWhx+gQsHDr6F4DUddVV1u6tanlx3gHkjqO/+Pz495TPU -jgIb7y0dTelSAqiUu3DP+xaYhJ+SsEpYaLSF6sGs8IMSG+LfaYT5uebE6RbLNCUJFBY4IjiX -Hh+6xHCfKvg0129SysL2vZHILQoU4lxcKLE9xcjhHUQyNI4Gjrk0t3w4DaOmohj990Zx6sbL -rzbuRougt8crFRZpepBox0M6sfaOjQfXUeVC9y+yskDILwAZjT5xSEUfKA4qKPcz7Q5cfcUM -qJK1cAVvYaKPvusBWWFJwpZeevjd33aNqG57H5Yts7aDry28LrBkPw5jSqaSzudziNIKHpg4 -4Wasyu6aqvIMwKGJKgKpe+L/xdW5yb+rkJ/iV47MKtxTfr1+Mc3qHgfiUDg+xmtSkYdIci9y -SBDTovVyanSuT0OeQZxyT7E2Dd3y5ZoukulOcC9PX3GidlvlgThng5QKQBrkoO2f7dwz2W7I -SE04yC1QwlpCo4ejrYiE/t3AeYe9xBkC6L4Ulfccntan6mmeiOl4vJUwh5x50NdJbIk+fnBr -q8HWC+EPmpDWTejrYXXrYi+FyixvT/GObLN0OQsZCLVF+Q0B2w1DJrwcHRy2D0RkXDVKOzgP -PmanPBigLNe0LHIq87lGDu7+TpjAQlBK0cXwkHQmfiga59F6g6leV5TvPVsuKXQHRbFV8Ztu -lA3r49b0IbaDqHD4BfIrXd3JQh/TNP5cKmmQD7k/hI0xbg/LytDarLXf4IgG/ekAQa2SWJkC -GCl5qyRyxv8UQ8NIKzvJe+eRl3o/FD+KFNWpSKH1RTvKncIfgCjML/VSKTihVUwSgSZKQnxI -FprZqMJHTlvyaNFy7wx91NiQYXW5KwFiDKodbvCi1s0lSUrX8Win2XHXtyEaBi9y0fVntEIU -6Ih0LMBygPcZw3wYlOKeMdy9slm1JPuUTKs9DVgHyhXgGv58pRKSsrljZt/MsI7+EupxR0/f -jmNRN5IKHWJXLsZQNJKHuktjlj+Iek/9XAvMBdklQb1CM3bqtYNw60fLUHSEPetHHPR+MK/c -a8MVa2ntz8sxgvh8KO7G034mQjqvJt6lj7X1YNrRxz+/2T+MlB5InY6LBuY0klKg7aPBxmV5 -lqkoCHVBndEbdnBfDnNAKSagN0tHXAOGphr+WVGrPox1lYRPXXFXFZs1LLGiJFSafFu5hW37 -tQAMvHmvBvQlb4KrJNJcs2CM1zm9Sapi+yYQ/j+cWtvVDqcaXnhn9fSoa9arsCbA+tVCb4YN -V+nPjY88UEFq7uzNYcBGoRnq3DMG6kZSVWiTFpywAl+zVg1+mbnEexU6L15Jh7v7sJ29/IdS -Maigu6POYt1J18I2/C6040uTDWIimu29MvwtiamZ/qaIJBtp7Z05nl8TWhH2EVAXi3yit4OQ -rDbpYH2Gx8z+SoL4pKVNbmFZnixcLyHfAklV0ciN3/UmcNDxz8MLcGhhgW3p1Rb3tlYt1EUP -J09jIxB1q406YKEyeoFj/3FFnGetroxz1NlUVS2n99mlL7mWZsdb7U1xTn/nhyfXcq5qCbwC -LQcP3zxronDi3GqWNeIY8qxU1apCa5pOH3QOTenMsNZV2yhE74ojzCIRJ8BPTQ146dyYlmry -O/LTrPh0lfkl36HY3q7CFEd9QdSZXRir6L+Tz8echUF5HYSf5va5r+nUwhUvs203NL+fgjlo -EVph1L9k8LxMDWcJPJTjjZJD/swaYs1bBi+5A3kaKWoVMxd1GmKgJktOIGxWpcLSuxM6YKpt -ZxnB2RWciE8WAfkmJpYofogxCBxILzgzTXFQc3VYOFl4WVE9PSIvPjxkYXRhSW50ZWdyaXR5 -IGVuY3J5cHRlZEhtYWNLZXk9IndHbHlhOURyVmJwMTFwUC9sUlh6TW94bm5SNEdwK0NLbXQ0 -eUhjODRYT1BxdmgvN2RGdk1YeHlycVBQWGZzNFFvV01zRnkrUEh3TkxoMWJWODhYa1NBPT0i -IGVuY3J5cHRlZEhtYWNWYWx1ZT0iQnIzeVlVUlpRd2oyNUVWaXByaDRVWFN6dHdTMWpFcnAz -UStmTjhUUjVJNktlalNkYkxhc2ZaVU1oSlJISHZSckJaQ3RRM2pjcXpyWURsaDJITnE5cUE9 -PSIvPjxrZXlFbmNyeXB0b3JzPjxrZXlFbmNyeXB0b3IgdXJpPSJodHRwOi8vc2NoZW1hcy5t -aWNyb3NvZnQuY29tL29mZmljZS8yMDA2L2tleUVuY3J5cHRvci9wYXNzd29yZCI+PHA6ZW5j -cnlwdGVkS2V5IHNwaW5Db3VudD0iMTAwMDAwIiBzYWx0U2l6ZT0iMTYiIGJsb2NrU2l6ZT0i -MTYiIGtleUJpdHM9IjI1NiIgaGFzaFNpemU9IjY0IiBjaXBoZXJBbGdvcml0aG09IkFFUyIg -Y2lwaGVyQ2hhaW5pbmc9IkNoYWluaW5nTW9kZUNCQyIgaGFzaEFsZ29yaXRobT0iU0hBNTEy -IiBzYWx0VmFsdWU9IjNUdHpNemxFZHVESzd0S0lGWGdseEE9PSIgZW5jcnlwdGVkVmVyaWZp -ZXJIYXNoSW5wdXQ9IlpaWGxTV2wvVjBvalBnRkowd0YzR1E9PSIgZW5jcnlwdGVkVmVyaWZp -ZXJIYXNoVmFsdWU9IjlkNmMrVGNIZFFEZlpUcVhiaEgyKy9KZTM5cGVjOEdPR3hwV0U1VElk -a3E3eVgvdUNNM3gxcXVmOHl6VEFWd3VqVHkzdnhVSnFaRzVpUlMzaVBCdGlRPT0iIGVuY3J5 -cHRlZEtleVZhbHVlPSJubFJFdlk3NG1lZXBmMG1qdWY1MXFEVkkrMm1USjRva0p3eUtMZ0Z4 -cVhNPSIvPjwva2V5RW5jcnlwdG9yPjwva2V5RW5jcnlwdG9ycz48L2VuY3J5cHRpb24+AAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAA ---------------852960FBCE7C028BA30CBF59-- diff -Nru spamassassin-3.4.6/xt/data/spam/olevbmacro/goodcsv.eml spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/goodcsv.eml --- spamassassin-3.4.6/xt/data/spam/olevbmacro/goodcsv.eml 2019-11-20 18:19:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/goodcsv.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Date: Mon, 11 Nov 2019 17:04:10 +0100 -From: spammer@example.com -To: victim@example.com -Subject: good csv -Message-ID: <20191111160410.GH97706@example.com> -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="ZLmNAHp9yJE7SW8z" -Content-Disposition: inline - - ---ZLmNAHp9yJE7SW8z -Content-Type: text/plain; charset=utf-8 -Content-Disposition: inline - - ---ZLmNAHp9yJE7SW8z -Content-Type: text/plain; charset=utf-8 -Content-Disposition: attachment; filename="good.csv" - -"A","B",,,,"",, - ---ZLmNAHp9yJE7SW8z-- - diff -Nru spamassassin-3.4.6/xt/data/spam/olevbmacro/macro.eml spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/macro.eml --- spamassassin-3.4.6/xt/data/spam/olevbmacro/macro.eml 2019-11-20 18:19:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/macro.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,259 +0,0 @@ -Date: Mon, 11 Nov 2019 16:27:11 +0100 -From: spammer@example.com -To: victim@example.com -Subject: Macro -Message-ID: <20191111152711.GC97706@example.com> -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="ETDFsshmzrOmOVdZ" -Content-Disposition: inline - ---ETDFsshmzrOmOVdZ -Content-Type: text/plain; charset=utf-8 -Content-Disposition: inline - - ---ETDFsshmzrOmOVdZ -Content-Type: application/octet-stream -Content-Disposition: attachment; filename="macro.xlsm" -Content-Transfer-Encoding: base64 - -UEsDBBQABgAIAAAAIQDxGuVmhQEAAE8FAAATANkBW0NvbnRlbnRfVHlwZXNdLnhtbCCi1QEo -oAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzFTLbsIwELxX6j9EvlbYQKWq -qhI4tPTYcqAfYJwNuDi25TU0/H034SEhpSmUSy+J8tiZ2ZlJ0nFVmmQDAbWzGRvwPkvAKpdr -u8jYx+y198gSjNLm0jgLGdsCsvHo9iadbT1gQtMWM7aM0T8JgWoJpUTuPFh6UrhQykiXYSG8 -VCu5ADHs9x+EcjaCjb1YY7BR+gKFXJuYTCq6vVMy15Ylz7v3aqqMSe+NVjKSULGxOS+x54pC -K+CbuZwG9wkqMjFK32mboHNIpjLEN1nSqKiMiCQNdscBJ3G/oJ+usGfKnVqXJJw3YHc1ys+E -GLcG8Goq9AFkjkuAWBq+Az0wt/gWwOBlq+2T4TTZmItL7bGDodu7bk++XFjNnVud4QrFC5UC -WrlenZdSBTexcm6AopfaHhS2xU05USE8CurMGVTdWUNdyhzynidICFHD0Z02bqpavWWjGkVz -Gl6t4bQER/wuD1p03P8THdd/f3/w49gJ5QJcbsThK6mnW5ogmt/h6BsAAP//AwBQSwMEFAAG -AAgAAAAhALVVMCP1AAAATAIAAAsAzgFfcmVscy8ucmVscyCiygEooAACAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAIySz07DMAzG70i8Q+T76m5ICKGlu0xIuyFUHsAk7h+1jaMkQPf2hAOCSmPb -0fbnzz9b3u7maVQfHGIvTsO6KEGxM2J712p4rZ9WD6BiImdpFMcajhxhV93ebF94pJSbYtf7 -qLKLixq6lPwjYjQdTxQL8exypZEwUcphaNGTGahl3JTlPYa/HlAtPNXBaggHeweqPvo8+bK3 -NE1veC/mfWKXToxAnhM7y3blQ2YLqc/bqJpCy0mDFfOc0xHJ+yJjA54m2lxP9P+2OHEiS4nQ -SODzPN+Kc0Dr64Eun2ip+L3OPOKnhOFNZPhhwcUPVF8AAAD//wMAUEsDBBQABgAIAAAAIQCc -fziWGAEAAMEDAAAaAAgBeGwvX3JlbHMvd29ya2Jvb2sueG1sLnJlbHMgogQBKKAAAQAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8U0FqwzAQvBf6B6F7LdtpQymR -cymF3EpJH6DIa1uNrTVaNa1/X+GAk4DtXEougt1FMyPN7Gr929TsAI4MWsmTKOYMrMbc2FLy -z+3bwzNn5JXNVY0WJO+A+Dq7v1t9QK18uESVaYkFFEuSV963L0KQrqBRFGELNkwKdI3yoXSl -aJXeqxJEGsdL4c4xeHaByTa55G6TLzjbdm1gvo6NRWE0vKL+bsD6EQrxg25PFYAPoMqV4CUf -WiT6ySIKirkYF5PeWEw6Jya5sZhkTsxyQkxjtEPCwkcaG3F0aMyZw069O/wCfWbNqRftjJ3y -5GmCeSR81wNCvqtDwod0HOu5hz/+J70PewMn9r4U/Tl8vrhYvOwPAAD//wMAUEsDBBQABgAI -AAAAIQA10IKBkwEAALwCAAAPAAAAeGwvd29ya2Jvb2sueG1sjFLBjpswEL1X6j9Yc2cBA9lV -FLIqS6Lupeoh3ZxdPARrjY1sp2RV9d87kCZN1R568hvP8/PzG68eT71m39B5ZU0J6V0CDE1j -pTKHEr7sttEDMB+EkUJbgyW8oYfH9ft3q9G616/WvjISML6ELoRhGce+6bAX/s4OaKjTWteL -QKU7xH5wKKTvEEOvY54ki7gXysBZYen+R8O2rWqwts2xRxPOIg61CGTfd2rwsF61SuPL+UVM -DMMn0ZPvkwamhQ8bqQLKEnIq7Yh/bLjjUB2VnrpFsgBGMeD59PfqfrtZZFkePaUfeLQpkjqq -6qyOim1e52lVPfFN9gPi9TWWz+7m+K5Tfv8rL2ASW3HUYUdBXXxS8jznfDEpTKG+KBz9b7Gp -ZKe9MtKOJdCI3i44TQpg49zYKxk6Eiqy9Lr3EdWhCyU8JGkyacc34vMg6JJ5ZWZOaWsPWtmU -Rj5N6ZmSIOyWioB7lukk8Ted39AJX+n83/Tshk74Ss9mgxdXjdDNlCEtsw1e3PNiZlw+3von -AAAA//8DAFBLAwQUAAYACAAAACEANJKbPYMGAABVGwAAEwAAAHhsL3RoZW1lL3RoZW1lMS54 -bWzsWU1vG0UYviPxH0Z7b2MndhpHdarYsRto00axW9TjeHe8O/XszmpmnNQ31B6RkBAFcUHi -xgEBlVqJS/k1gSIoUv8C78zsrnfiNUnaCESpD4l39nm/P+ad8dVrD2KGDomQlCdtr3655iGS -+DygSdj27gz7lzY8JBVOAsx4QtrejEjv2tb7713FmyoiMUFAn8hN3PYipdLNlRXpwzKWl3lK -Eng35iLGCh5FuBIIfAR8Y7ayWqutr8SYJh5KcAxsh0CDAopuj8fUJ95Wzr7HQEaipF7wmRho -5iSjKWGDSV0j5Ex2mUCHmLU9kBTwoyF5oDzEsFTwou3VzMdb2bq6gjczIqaW0Jbo+uaT0WUE -wWTVyBThqBBa7zdaV3YK/gbA1CKu1+t1e/WCnwFg3wdLrS5lno3+Rr2T8yyB7NdF3t1as9Zw -8SX+aws6tzqdTrOV6WKZGpD92ljAb9TWG9urDt6ALL65gG90trvddQdvQBa/voDvX2mtN1y8 -AUWMJpMFtA5ov59xLyBjznYr4RsA36hl8DkKsqHILi1izBO1LNdifJ+LPgA0kGFFE6RmKRlj -H/K4i+ORoFgLwJsEl97YJV8uLGlZSPqCpqrtfZhiqIk5v1fPv3/1/Cl69fzJ8cNnxw9/On70 -6Pjhj5aXQ7iLk7BM+PLbz/78+mP0x9NvXj7+ohovy/hff/jkl58/rwZCBc01evHlk9+ePXnx -1ae/f/e4Ar4t8KgMH9KYSHSLHKEDHoNtxjGu5mQkzkcxjDB1KHAEvCtY91TkAG/NMKvCdYjr -vLsCmkcV8Pr0vqPrIBJTRSsk34hiB7jHOetwUemAG1pWycPDaRJWCxfTMu4A48Mq2V2cOKHt -TVPomnlSOr7vRsRRc5/hROGQJEQh/Y5PCKmw7h6ljl/3qC+45GOF7lHUwbTSJUM6chJpTrRL -Y4jLrMpmCLXjm727qMNZldU75NBFQkFgVqH8kDDHjdfxVOG4iuUQx6zs8JtYRVVKDmbCL+N6 -UkGkQ8I46gVEyiqa2wLsLQX9BoZ+VRn2PTaLXaRQdFLF8ybmvIzc4ZNuhOO0CjugSVTGfiAn -kKIY7XNVBd/jboXoZ4gDTpaG+y4lTrhPbwR3aOioNE8Q/WYqdCyhUTv9N6bJ3zVjRqEb2xx4 -14zb3jZsTVUlsXuiBS/D/Qcb7w6eJvsEcn1x43nXd9/1Xe+t77vLavms3XbeYKH36uHBzsVm -So6XDsljythAzRi5Kc2cLGGzCPqwqOnMEZEUh6Y0gq9Zc3dwocCGBgmuPqIqGkQ4hRm77mkm -ocxYhxKlXMLZzixX8tZ4mNOVPRk29ZnB9gOJ1R4P7PKaXs6PBgUbs+WE5vyZC1rTDM4qbO1K -xhTMfh1hda3UmaXVjWqm1TnSCpMhhoumwWLhTZhCEMwu4OV1OKRr0XA2wYwE2u92A87DYqJw -kSGSEQ5IFiNt92KM6iZIea6YywDInYoY6XPeKV4rSWtptm8g7SxBKotrLBGXR+9NopRn8DxK -um5PlCNLysXJEnTU9lrN1aaHfJy2vTEca+FrnELUpR78MAvhdshXwqb9qcVsqnwezVZumFsE -dbipsH5fMNjpA6mQagfLyKaGeZWlAEu0JKv/ahPcelEG2Ex/DS3WNiAZ/jUtwI9uaMl4THxV -DnZpRfvOPmatlE8VEYMoOEIjNhUHGMKvUxXsCaiE2wnTEfQDXKVpb5tXbnPOiq58gWVwdh2z -NMJZu9UlmleyhZs6LnQwTyX1wLZK3Y1x5zfFlPwFmVJO4/+ZKXo/geuCtUBHwIe7XIGRrte2 -x4WKOHShNKJ+X8DgYHoHZAtcx8JrSCq4UTb/BTnU/23NWR6mrOHUpw5oiASF/UhFgpB9aEsm -+05hVs/2LsuSZYxMRpXUlalVe0QOCRvqHriu93YPRZDqpptkbcDgTuaf+5xV0CjUQ0653pwe -Uuy9tgb+6cnHFjMY5fZhM9Dk/i9UrNhVLb0hz/fesiH6xXzMauRVAcJKW0ErK/vXVOGcW63t -WAsWrzZz5SCKixbDYjEQpXDpg/Qf2P+o8Jn9cUJvqEN+AL0VwW8NmhmkDWT1JTt4IN0g7eII -Bie7aJNJs7KuzUYn7bV8s77gSbeQe8LZWrOzxPuczi6GM1ecU4sX6ezMw46v7dpSV0NkT5Yo -LI3zg4wJjPldq/zDEx/dh0DvwBX/lClpkgl+VhIYRs+BqQMofivRkG79BQAA//8DAFBLAwQU -AAYACAAAACEA8E99xCUBAADUAQAAGAAAAHhsL3dvcmtzaGVldHMvc2hlZXQyLnhtbIxRTU/D -MAy9I/EfIt9puqEBmtpOSFMFBxBCwD1rnTZaEleJR+Hfk3bahMSFmz/ee/azi82Xs+ITQzTk -S1hkOQj0DbXGdyW8v9VXdyAiK98qSx5L+MYIm+ryohgp7GOPyCIp+FhCzzyspYxNj07FjAb0 -qaMpOMUpDZ2MQ0DVziRn5TLPb6RTxsNRYR3+o0Famwa31Bwcej6KBLSK0/6xN0OEqpgnvASR -bOCzcmnrmjpraAmyKlqTiJNbEVCXcL+YijPjw+AYf8Visrgj2k+Nx7aEfILKP9h6tpjmtajV -wfIrjQ9oup7TPVdn9a1ileiD6vBJhc74KCzqhMmzWxDhiJ9jpmGurkDsiJncKevT9TBdKc+u -QWgiPiXTWud/VD8AAAD//wMAUEsDBBQABgAIAAAAIQAj/NISJQEAANQBAAAYAAAAeGwvd29y -a3NoZWV0cy9zaGVldDMueG1sjFFNT8MwDL0j8R8i32k6pgGa2k5IUwUHEELAPWudNloSV4lH -4d+TdtqExIWbP9579rOLzZez4hNDNORLWGQ5CPQNtcZ3Jby/1Vd3ICIr3ypLHkv4xgib6vKi -GCnsY4/IIin4WELPPKyljE2PTsWMBvSpoyk4xSkNnYxDQNXOJGfldZ7fSKeMh6PCOvxHg7Q2 -DW6pOTj0fBQJaBWn/WNvhghVMU94CSLZwGfl0tY1ddbQEmRVtCYRJ7cioC7hfjEVZ8aHwTH+ -isVkcUe0nxqPbQn5BJV/sPVsMc1rUauD5VcaH9B0Pad7rs7qW8Uq0QfV4ZMKnfFRWNQJk2e3 -IMIRP8dMw1xdgdgRM7lT1qfrYbpSni1BaCI+JdNa539UPwAAAP//AwBQSwMEFAAGAAgAAAAh -AC3pH5ISEgAAAD4AABEAAAB4bC92YmFQcm9qZWN0LmJpbuxbfXBb1ZW/70m2ZfkDxThZJ7GJ -YgcSQhSenmTZCXFqfTzZDnLs2kkcisCRZCUIy5YrycEhJFECuyQspRQoTaHJLrS7hZa2Bjqd -6Qy7hEJ3ZneSLdtmZ7vdnWXZpf/tB2zbaafD5u3vvA/ryZVlOWSyhcmVf+/ed865X+fee+59 -916//aNl//rcy6veZfPcdmZil+RqVmmgcwgTFGdjjEeAcEmWZYWGB4LX3MdIA/+Lslah3ZYD -ZqACoDa3APVANWAFaoBaoA64DlgN2IBlQANwPdAIrACoP/wB/CZgJbAKaAaI3qL5HyMVfaKL -OsRS+GWZnUlsEn6aHUILle9WoMfoCqL+UsrZf/Ha2q+e/nvOBKFuhyq5h/mYt1SkRXgWWCQ9 -f7JFxZyer+4bZfpR+zE2zZLwnUZGmWEb4zkaP1QnKkeZ0ViSBhrcKH7DbIgNwhdV0pKeyF8Z -m5RcufnTGP2plgsHn/RG5TeOf6oT2YBi45/amWyADVgGGMc/2ZH545/eyV7o4/8GhNcAdmAt -0Aq0AeuAG4GbgPXABuBmYCNwC0DxqdtsBm4FBMAJkN5cgBtoBzxAB9AJbAG2ArcBFL8L/nbg -U0A34AV8gB8IABIQBHqAXqAP2AHcDlD8fvg7gQFgEPg0MAQMA7uA3cAeYATYC9wBfAa4E6D4 -d8G/GxgF9gERIArEgDEgDuwHDgD3AAngXmAcSAITwCSQAqaAzwJpIANkgWngIHAfMAMcAu4H -DgMPAEeAo8AxIAdwKzhW+T4CbjNjF+HPcmpHmsb78goQ4EBiZ87GZoljIgLc9xDmiDHX7WTZ -jDBRlu5siEIpU4ZVADSlOI6zaG9UGR4o6dTs+yU9ARJWaXph39HeLXNZ6FldbX+DUhOPlfKl -4CqLHuK31Wql5LepNL30alMQjeN+A+V3KvWTZf7BRp6oVCuBEtNqlw+pebSAcCNQ09CkyCO4 -D5jTBYXJkbI/vDQ+R6fYJqWBHlLaifK6Uq5X63CC5n+UdJsMabSitxjTonmi23xJ3geZJBik -YzvqSTJEnwE9XIT+OOihIvQXQKfmmZ/OOdA3FaH/FPRmAz2HvClfcrUGOshz9A/B1tMnOsn2 -wufwMzq9HxDf6Bai6zIWQyIW2H+iE0nnz/fVAXienx2tYtw6GOYwjN9+7bcRBvkuGOD9MGgC -fiIMmodxNk1MgN8Ge+1m7xhyXXLw0t9w6Iitxy1Ypmr24LiFa8AEYUNaZtB58KliVHiOExB6 -2kyKIKMpy1Pwvwc70x+JpVOshXm7W3kO5jetcGV5EHyKCSX3zzJvNptORKezLG7f4xvdGZlA -oMve2p/CmiGZcrbWWYfZdNSejWeyG9jNdVZ7f+aAj6Vm7BtakYElnWplvdLkmJ1jgTorUv4d -l96dA80IVOooLPUxEq0HqikAp/pq1cgUUh8gBfy1ZqSXVSpiyqwgUJBnt6z/8NL6Znn9NvlX -RNiaRK12hmVzWLZyWK17LOjw2+Rm+cNL6uIdPSCHhlunqE+d49RVP8UmR6t4dZ1AY4VH/+fR -p3nYCh5xaSGAeUopuSJYxkOtPwnmNFDYBqj15ef6ItGpWc0o33F6UWpP9ou+YXSnMPKPycWK -Q/Mf9z4inIcuL1JE+JTYT+Cv1yY7GmxnzkZRQ1luw8tJvBeb/ygeJbF0Z0OUxec/qn5Jp2Zf -zvxHVoWccf3pKpl2caYN+lJTUp/FpQqpq/BK6xtyu7DKSWD1MoLhl0bvicJPKasdlb/YcxXW -32gXpbdQCRaTJz714ne1pg0itwNYWSXgO8uJPE8G9edoYOs6mMcu+roJ1J8VyV8sKl2aSPqn -gU9do9z6b4Osnr9e7qvvb0ApeDYcUkvNsWHbXOgpNQT+NjWkr384rL0FrGVpeqEJRsAKyIk1 -vkOjCAUhv0bNc9V46tONyemIojvKg+O6qTw5dT62QZdK+bh8jyIpchDDtKGuo+i9F2Hyu+Gr -jsyF6oiuO6LoYaNfim7kGcPG+BTmUFMyYTQvv0OCl+todlWLWbjypkwwI84uOCPuugejeCSV -Ho+mUrZxzIvWR32RDMc/KhwWBEEUBjudWxzMJpgs/irWyDdw6wTB7TlyvO6BnmQqGklyb9uG -pyIx7olgJGnOxGvH/Ol4JGuJRJPL1wym42OPx2PJCKvsG2MvW3alp+t80sxUCoKNzbviE1NJ -FsnGA/F04qCJb3jCN53JpiYSlfebA6bFxtQS7H/jw6SZT5j9p4b9/3FXavyTFciPcGPo2vhf -shlYZPy/uOD4D6YO5JIJZUVsfd+Coc/P0MjPYeh3ioKD2VvMFj8GfrMy8M2eI9rA9yW5v9IG -vi2S1Aa+PZLVBn53fEwb+K1j7CVt4NumUtrAZ1NJdeDXJg7y69SB3zSRKGfga6pZwvi/8INr -4/8Kmopr419VJnXEYmrVx67OW0iO+Fdr/l90/Is0839Cx/9jKz6B49/4/XOZ339YI+ed3mtL -+SEw9e+PUeyW0wnQKHbTh7CrvgM78H5lJ71UCnkevv8KRk+es3AoDFZFjcofw5dfemHRRTm0 -3ZSvff5roVTEU2BGeVXC+P0tlIq0AA/ff4r+a8GnciwgVkB+Em8/p49mOGPZr274mv1X9b1Q -KyjNY2ihheQold8b++/6uNn/85GTtJ0u2zAeqoH3zPmvdw57jTz7rbJ/3VOw6+CGlQp+hK+O -NuyCb8Z3Sxv2Ltpg77ZiI121fz2wgl6c0Img+GEP+/EbwK7HUexzhBHuA5Xs5LBGUa1nWLOi -HsgQRcLexmacZ4bwawOFdtimcdaYZHZwI3hLYMvbjjrQrpsdOU7hR7tgMXCz8FM4ZczoXVDx -mzna7i/UA+2+uD6SHpwopwdlJF3oeqCt+AMoVwSnnVTGBEoWR2nsOBGewY6PB6fCpAsqLclm -gP3KHYYB5SiC6HFIGN+cikYlnMn6oZ0QcqWwhFyLpSMhH0qD9EUxqa3sSC+Ks9g4OHRfIoT8 -o0op59+ZeK1oj3F9pO/UNq0URk2NoASTOGRJ4bQ3g/oO47SXdlIHAA96WBhvWYVP+qNaZFGj -KOo8gNJLqIMXvSKL+BOGVjc2unuuzUX0piB0H0At3NChAwc9PlC8CDlBc+LNAQSQbrvWI7zg -0l6bGz+VLmLHTa2JG/7S29yvlHUCz0mUPt8ziveGYewtR9BCceiAekMQPxo/ktKmFGcY1Pw4 -KdYTjH3ocvpChXJKw8OO0AmJGbN+Jc8xC3wrfJtyCpuftdUdvMJ5uPw52oQc6EyIMzahFj5z -tgKnSYW3XRrRAr97YCfLjfx8SVmmw3/F0bplNY6cZLlpwc17SnhvwUlgDIMGl0D4hePIclRb -kjRRFg4TZVGPFjPuz1PCdxRJuAUlLpRELbBdR05YKDkRR2ACLmcYTyzVcq6Zl5yIotDXP7ne -hZJzKcndWSS5tfOScyE5+pggty+f3AyCHJfDs7ADFH+jchTnXD6VClMqNluEXyruUnnCVciL -etpSy3U15D/3T+9vTFleD5w6+6xPYv98nvKkQf3srbb0E2++1vNYZvDNX+7dndPpRz/1dMsD -VW/c/sJI6+D5wz9eqdNPBBIH3/hPq/RM5Lkfn+585IJOdx36vBRevWvHS5X/cRzJngAeBB4C -/hD4I4AGD1ZGyp2lR+D/MfAo8DngMeDzwOPAF4AnADo3eQr+F4GngS8Bp4EvA88AzwJfAc4A -Z4E/Af4UeA54Hvgq8DXgz4A/Byi9FzT/G/C/qYW/Bf/bwHeAWeBl4BXgVeC7gHp+QxW95srR -wA9/uf0GOwlyUB758FiOHqyBu57J7KGb8LFcK83E4sncLTZmqt3j8/7632yswjySmHR63jiq -BV1i1TGwzbj28OorNmY2Q87zrTYbVtWD6dSBeDabcgZCNlZZm8mOpZLxJ/fZmJUSA/feeCz7 -l68Tb2D//kQsvnzaxqpqccmC7lhcbEAaKJFs4tiodDCSnMaWb9M/IouXNqDQskyXL9zftLHa -WhxC6WdQ4w/8O6WBbWnalf6gPv8i/o/hxfULvFQyurWRmvnSkI1ZzNoh1vh4E76toRduBrog -zRS6ep4+/NUJvIE3Ibycp2vSRqnVmOIrWQskrWwNZKxsLW/GUbVRRg3jKx5UCM7j1SqXqjnl -CiG1iXo1Qg1RixW6K0UpTLXkG3f3Kzn6TqKPKGEjzz9ezaYaK3tN7ATPxt4zm1HnZqa38slY -tgJrQdbNN95byVu7eGsVn+YaLRWVDdV8g7L4eYrV8ju28dYVjEvn1J6ynV85t5DN0Uq2Duu6 -G/m7mWljuEc7Y3C7BAeztJjNfqyr6rkGHC4yz5E2cbPQhlWmf2sYnRUL5fsy4eFDmRH7wIjH -HTbFRayIk9G2gZCEpfA0zgwj2URzapLtY9yDErpiIBF7SMIKMMcSF1nshPS13LJnctxxiYmB -YGdAcGMZ3O4Leh1OIef0OXwBqT0nXfR6c353rkI8KeVOswPpyIQ9mECpM/YNM52em3Nhf2pi -IjVpqmbh/gSuIGVSbH/WPnxPJI1langgGOzzY30qhvuHBzYHTodCbQ/bHhy0O3NZi30gevwt -eygRnU1H0ofYTsZdd+IfLBXs+hOmM2dXMr4qZ1WHjODsYfVcJZsdYyem2St0sWFVte0R0WZp -zmGfqNfH3ev0pVezYzf4eK5i06d9q2Kza32WW3zcSs6X0QYRo5Pc8R7WVNFduetclr4gR7w5 -u3JH4xyXaj/HrfrbGvFnNT9a5zC9xdiFdVFzq6/th+u8Xp8y6CRf8Fe5NQfOeRPnOMmHwx/f -T2ossZbGh3e3iG+OVi9/Wnxr1N8iDrSILNay68IPdre4BlpcO1pc/d+pd71e//z2x1a8WG/j -nneU7H7syds3nsQ6GkKq6aL1rx7SY6r3pOiNw8Wv4j/cot1NC+ccpHSYcRMLpAJghB41AePa -xaLlkFdvKmFVjzC5v1M91nf/s7+++cJs6NUbUzu/XbP1vzhlh8GGZN8DyNGgl2V8I5yMaKnw -7MUKlUecKTWoSHHsC3Mcxr6vcUxW9dYeSZMj8gcleCtRIXLF4jlL8Po0nplxUEExtxJqKeZo -V6WY26LVZj4PyfNVIGrmH6nydMFGtyGxLNLjabvTaO31SJq9L3wVC19dSMD03/QpBndOebIg -EuRvRRimYnBooGfIe1QM+wf6+wd2HnWG+/v8QwPDCKAQBA8ekmdzIBSCVmDXldKhkNaIpiVq -Cao29YxTGu0DzRdAyzsqy/WWwrJch0S3QoTKgqlTMyG6BdHNBqyGOluGVQ82Q9rrl0Kbpb0S -VZjUq0zbVLA71By0jlSp5H9co3Faw3UrVP1BBRPmKQkdnF8DAc2e6uZUsaaqrRY3w6BS7pSF -SkK1j1ERPqtlQ7rRcmZf1mjvav6gnrviUxFCb//G8ds7V9v+4ufsGyzwL0MNSFsCdwHdqMaV -LG48Y1CUYl5166ob11BIL6iqQKUBqdXg1EKqL6c02lqtw+5TJPQHpUECtApBLepq8W9SuiGg -y4qsBuniwzuCL2DarIIMT3y9B9XhwvsHWsqU6zBfoyy8KX1hsduLZLVyJAmX00BhylK1SoUL -CuKpdFqwkDOePziJvURnU+ytmhY9y4n+dQgNaYKFpz73Kf/fUE4aukzjZeT/IiKfKpq/nmr5 -Puqv/BcEmlHRaDkxX4LQdvSbK+Xy2i9P/8Z883Gzi3c2Y0QtrFnpeTtLhcZ5wX0ixjR7PW/z -RqeLBXQRWaryrgK6q0ixyib1BbpaDwfFDp/L53E6vJKz0+F2uzscnV6/0xHweXweKRDY0iH4 -juBkQ6lsvEurc501kIpNT8Qns13GqejWm3px401xBgmtoqWYYimmq4CJi+jxrtb8lIiy9caT -U/7UZDY+k6U6CSDtiaczidQkbOIUFrbRZNwldrW6trhEUUTxIODv7+lqFdvFDlFydnR4XJ0d -XiMgERj0dbW6ve5Ot7PD4+mAkAJwevxdrZ6gJ+Bxtwe8fm9HQPBiSeztFINg1lnv7E1lsnZp -JhufHIun7X2T+1N31VnnVOPsOuzqdImILTj8wS2Cw+n0Bx2dktvlEASv4N/idApCu/fIbTCT -t83FEpSU6QMtg7uCcSSoNUWXU3BvsiuPDidC7a4tm+x1VmOzdAmb7HN//jqr1iDFyWJxsms+ -uexu9nsr+H8CAAAA//8DAFBLAwQUAAYACAAAACEAyRFf+qQBAABlAwAADQAAAHhsL3N0eWxl -cy54bWykU8Fq3DAQvRfyD0L3RrsLDW2xnUNhIZCUQLbQq2yNvQJpZKTxsu7XZ2Q73t1TDr1Y -T08zb55m5OLx7J04QUw2YCm39xspAJtgLHal/HPYf/0uRSKNRruAUMoRknys7r4UiUYHb0cA -EiyBqZRHov6nUqk5gtfpPvSAfNKG6DXxNnYq9RG0STnJO7XbbB6U1xZlVbQBKYkmDEjsYiGq -Iv0TJ+2Y2UpVFU1wIQpieTYyMag9zBG/tLN1tDms1d66caZ3mZgcLXHeYoiZVLnksiROss6t -BnbZABNV0WsiiLjnjVjwYey5PHI3Zpkp7pPoLupxu/t2laCmglVRh2i4+9dXn6mqcNASG422 -O+aVQs/fOhAFz8BY3QXUjqH6yFgAX6cB597yhP62N9rnVuDg956eTCl51rkJH5AvssBZb95k -/Wu1Wfu/ZcW5vdVnxSvbN6bX8iLPu5S/85NyIFcNUQ/WkcVbxen+LGrOlx5s8ghI1/x0c3fW -MtwKA60eHB3Ww1Je8AsYO/gfa9SrPQWaJEp5wc95VNuHacxp/T+qdwAAAP//AwBQSwMEFAAG -AAgAAAAhAJC+E4cwAQAA5AEAABgAAAB4bC93b3Jrc2hlZXRzL3NoZWV0MS54bWyMkU1PwzAM -hu9I/IfId9oONEBT2wlpmuAAQnzds9ZtoyVxlXgM/j1uxrjsws0feV77dcrll7PqE0M05CuY -ZQUo9A21xvcVvL+tL25BRda+1ZY8VvCNEZb1+Vm5p7CNAyIrUfCxgoF5XOR5bAZ0OmY0opdO -R8FpljT0eRwD6jZBzuaXRXGdO208HBQW4T8a1HWmwRU1O4eeDyIBrWbZPw5mjFCXacJzUGID -n7STrdfUW0MzyOuyNQJOblXAroK7VEzEh8F9/KWnWLHevKLFhrGV04CaLG+ItlPzQUrFpJef -sOtkWea32Omd5Rfa36PpBxaR+YQkYqVZSzzqHh916I2PymInb4rsBlQ4vE8x05iqc1AbYiZ3 -zAa5JsrViuwKVEfEx2Ra6+9/6h8AAAD//wMAUEsDBBQABgAIAAAAIQDUAwQvRAEAAGUCAAAR -AAgBZG9jUHJvcHMvY29yZS54bWwgogQBKKAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAACMkl9LwzAUxd8Fv0PJe5tmc+pC24HKnhwIbii+SEjutmLzhySz27c3 -bbfaMR+EvOSec38595JstpdV9A3WlVrliCQpikBxLUq1ydFqOY/vUeQ8U4JVWkGODuDQrLi+ -yrihXFt4sdqA9SW4KJCUo9zkaOu9oRg7vgXJXBIcKohrbSXz4Wo32DD+xTaAR2l6iyV4Jphn -uAHGpieiI1LwHml2tmoBgmOoQILyDpOE4F+vByvdnw2tMnDK0h9MmOkYd8gWvBN7996VvbGu -66QetzFCfoLfF8+v7ahxqZpdcUBFJjjlFpjXtljsKvBef5I0w4Nys8KKOb8I216XIB4OZ85L -NTDbETowiCiEot0IJ+Vt/Pi0nKNilJJpTEg4SzKhZEwnNx/N42f9TciuII8R/k+8o6PpgHgC -FBm++BjFDwAAAP//AwBQSwMEFAAGAAgAAAAhAEmgZLSOAQAAPAMAABAACAFkb2NQcm9wcy9h -cHAueG1sIKIEASigAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -nJPBTuMwEIbvSPsOlu/UaUErVDlGCBZxAG2lFu6DM2ktXDuyh6jdp99JotIUVnsgp5n5J7++ -mUz09W7rRYspuxhKOZ0UUmCwsXJhXcrn1f35lRSZIFTgY8BS7jHLa/PjTC9SbDCRwyzYIuRS -boiauVLZbnALecJyYKWOaQvEaVqrWNfO4l2071sMpGZF8VPhjjBUWJ03H4ZycJy39F3TKtqO -L7+s9g0DG33TNN5ZIJ7SPDmbYo41iV87i16rsaiZbon2PTnam0KrcaqXFjzesrGpwWfU6ljQ -Dwjd0hbgUja6pXmLlmIS2f3htc2keIWMHU4pW0gOAjFW1zYkfeybTMncx7V3onLCQxtT1Iq7 -BqUPxy+MY3dpLvoGDk4bO4OBhoVTzpUjj/l3vYBE/8C+GGP3DAP0CDROx4AfqP0QcfYfbYAd -D9YvjBE/QT268Jafm1W8A8LD5k+LermBhBV/rIN+LOgHXnryncntBsIaq0PPV6G7k5fhZzDT -2aTgpz+PQ02r49mbvwAAAP//AwBQSwECLQAUAAYACAAAACEA8RrlZoUBAABPBQAAEwAAAAAA -AAAAAAAAAAAAAAAAW0NvbnRlbnRfVHlwZXNdLnhtbFBLAQItABQABgAIAAAAIQC1VTAj9QAA -AEwCAAALAAAAAAAAAAAAAAAAAI8DAABfcmVscy8ucmVsc1BLAQItABQABgAIAAAAIQCcfziW -GAEAAMEDAAAaAAAAAAAAAAAAAAAAAHsGAAB4bC9fcmVscy93b3JrYm9vay54bWwucmVsc1BL -AQItABQABgAIAAAAIQA10IKBkwEAALwCAAAPAAAAAAAAAAAAAAAAANMIAAB4bC93b3JrYm9v -ay54bWxQSwECLQAUAAYACAAAACEANJKbPYMGAABVGwAAEwAAAAAAAAAAAAAAAACTCgAAeGwv -dGhlbWUvdGhlbWUxLnhtbFBLAQItABQABgAIAAAAIQDwT33EJQEAANQBAAAYAAAAAAAAAAAA -AAAAAEcRAAB4bC93b3Jrc2hlZXRzL3NoZWV0Mi54bWxQSwECLQAUAAYACAAAACEAI/zSEiUB -AADUAQAAGAAAAAAAAAAAAAAAAACiEgAAeGwvd29ya3NoZWV0cy9zaGVldDMueG1sUEsBAi0A -FAAGAAgAAAAhAC3pH5ISEgAAAD4AABEAAAAAAAAAAAAAAAAA/RMAAHhsL3ZiYVByb2plY3Qu -YmluUEsBAi0AFAAGAAgAAAAhAMkRX/qkAQAAZQMAAA0AAAAAAAAAAAAAAAAAPiYAAHhsL3N0 -eWxlcy54bWxQSwECLQAUAAYACAAAACEAkL4ThzABAADkAQAAGAAAAAAAAAAAAAAAAAANKAAA -eGwvd29ya3NoZWV0cy9zaGVldDEueG1sUEsBAi0AFAAGAAgAAAAhANQDBC9EAQAAZQIAABEA -AAAAAAAAAAAAAAAAcykAAGRvY1Byb3BzL2NvcmUueG1sUEsBAi0AFAAGAAgAAAAhAEmgZLSO -AQAAPAMAABAAAAAAAAAAAAAAAAAA7isAAGRvY1Byb3BzL2FwcC54bWxQSwUGAAAAAAwADAAJ -AwAAsi4AAAAA - ---ETDFsshmzrOmOVdZ-- - diff -Nru spamassassin-3.4.6/xt/data/spam/olevbmacro/malicemacro.eml spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/malicemacro.eml --- spamassassin-3.4.6/xt/data/spam/olevbmacro/malicemacro.eml 2019-11-20 18:19:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/malicemacro.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,263 +0,0 @@ -Date: Mon, 11 Nov 2019 16:26:37 +0100 -From: spammer@example.com -To: victim@example.com -Subject: Malice macro -Message-ID: <20191111152637.GB97706@example.com> -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="ME9WVR31lvp2jZjM" -Content-Disposition: inline - - ---ME9WVR31lvp2jZjM -Content-Type: text/plain; charset=utf-8 -Content-Disposition: inline - - ---ME9WVR31lvp2jZjM -Content-Type: application/octet-stream -Content-Disposition: attachment; filename="automacro.xlsm" -Content-Transfer-Encoding: base64 - -UEsDBBQABgAIAAAAIQDxGuVmhQEAAE8FAAATANkBW0NvbnRlbnRfVHlwZXNdLnhtbCCi1QEo -oAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzFTLbsIwELxX6j9EvlbYQKWq -qhI4tPTYcqAfYJwNuDi25TU0/H034SEhpSmUSy+J8tiZ2ZlJ0nFVmmQDAbWzGRvwPkvAKpdr -u8jYx+y198gSjNLm0jgLGdsCsvHo9iadbT1gQtMWM7aM0T8JgWoJpUTuPFh6UrhQykiXYSG8 -VCu5ADHs9x+EcjaCjb1YY7BR+gKFXJuYTCq6vVMy15Ylz7v3aqqMSe+NVjKSULGxOS+x54pC -K+CbuZwG9wkqMjFK32mboHNIpjLEN1nSqKiMiCQNdscBJ3G/oJ+usGfKnVqXJJw3YHc1ys+E -GLcG8Goq9AFkjkuAWBq+Az0wt/gWwOBlq+2T4TTZmItL7bGDodu7bk++XFjNnVud4QrFC5UC -WrlenZdSBTexcm6AopfaHhS2xU05USE8CurMGVTdWUNdyhzynidICFHD0Z02bqpavWWjGkVz -Gl6t4bQER/wuD1p03P8THdd/f3/w49gJ5QJcbsThK6mnW5ogmt/h6BsAAP//AwBQSwMEFAAG -AAgAAAAhALVVMCP1AAAATAIAAAsAzgFfcmVscy8ucmVscyCiygEooAACAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAIySz07DMAzG70i8Q+T76m5ICKGlu0xIuyFUHsAk7h+1jaMkQPf2hAOCSmPb -0fbnzz9b3u7maVQfHGIvTsO6KEGxM2J712p4rZ9WD6BiImdpFMcajhxhV93ebF94pJSbYtf7 -qLKLixq6lPwjYjQdTxQL8exypZEwUcphaNGTGahl3JTlPYa/HlAtPNXBaggHeweqPvo8+bK3 -NE1veC/mfWKXToxAnhM7y3blQ2YLqc/bqJpCy0mDFfOc0xHJ+yJjA54m2lxP9P+2OHEiS4nQ -SODzPN+Kc0Dr64Eun2ip+L3OPOKnhOFNZPhhwcUPVF8AAAD//wMAUEsDBBQABgAIAAAAIQCc -fziWGAEAAMEDAAAaAAgBeGwvX3JlbHMvd29ya2Jvb2sueG1sLnJlbHMgogQBKKAAAQAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8U0FqwzAQvBf6B6F7LdtpQymR -cymF3EpJH6DIa1uNrTVaNa1/X+GAk4DtXEougt1FMyPN7Gr929TsAI4MWsmTKOYMrMbc2FLy -z+3bwzNn5JXNVY0WJO+A+Dq7v1t9QK18uESVaYkFFEuSV963L0KQrqBRFGELNkwKdI3yoXSl -aJXeqxJEGsdL4c4xeHaByTa55G6TLzjbdm1gvo6NRWE0vKL+bsD6EQrxg25PFYAPoMqV4CUf -WiT6ySIKirkYF5PeWEw6Jya5sZhkTsxyQkxjtEPCwkcaG3F0aMyZw069O/wCfWbNqRftjJ3y -5GmCeSR81wNCvqtDwod0HOu5hz/+J70PewMn9r4U/Tl8vrhYvOwPAAD//wMAUEsDBBQABgAI -AAAAIQA10IKBkwEAALwCAAAPAAAAeGwvd29ya2Jvb2sueG1sjFLBjpswEL1X6j9Yc2cBA9lV -FLIqS6Lupeoh3ZxdPARrjY1sp2RV9d87kCZN1R568hvP8/PzG68eT71m39B5ZU0J6V0CDE1j -pTKHEr7sttEDMB+EkUJbgyW8oYfH9ft3q9G616/WvjISML6ELoRhGce+6bAX/s4OaKjTWteL -QKU7xH5wKKTvEEOvY54ki7gXysBZYen+R8O2rWqwts2xRxPOIg61CGTfd2rwsF61SuPL+UVM -DMMn0ZPvkwamhQ8bqQLKEnIq7Yh/bLjjUB2VnrpFsgBGMeD59PfqfrtZZFkePaUfeLQpkjqq -6qyOim1e52lVPfFN9gPi9TWWz+7m+K5Tfv8rL2ASW3HUYUdBXXxS8jznfDEpTKG+KBz9b7Gp -ZKe9MtKOJdCI3i44TQpg49zYKxk6Eiqy9Lr3EdWhCyU8JGkyacc34vMg6JJ5ZWZOaWsPWtmU -Rj5N6ZmSIOyWioB7lukk8Ted39AJX+n83/Tshk74Ss9mgxdXjdDNlCEtsw1e3PNiZlw+3von -AAAA//8DAFBLAwQUAAYACAAAACEANJKbPYMGAABVGwAAEwAAAHhsL3RoZW1lL3RoZW1lMS54 -bWzsWU1vG0UYviPxH0Z7b2MndhpHdarYsRto00axW9TjeHe8O/XszmpmnNQ31B6RkBAFcUHi -xgEBlVqJS/k1gSIoUv8C78zsrnfiNUnaCESpD4l39nm/P+ad8dVrD2KGDomQlCdtr3655iGS -+DygSdj27gz7lzY8JBVOAsx4QtrejEjv2tb7713FmyoiMUFAn8hN3PYipdLNlRXpwzKWl3lK -Eng35iLGCh5FuBIIfAR8Y7ayWqutr8SYJh5KcAxsh0CDAopuj8fUJ95Wzr7HQEaipF7wmRho -5iSjKWGDSV0j5Ex2mUCHmLU9kBTwoyF5oDzEsFTwou3VzMdb2bq6gjczIqaW0Jbo+uaT0WUE -wWTVyBThqBBa7zdaV3YK/gbA1CKu1+t1e/WCnwFg3wdLrS5lno3+Rr2T8yyB7NdF3t1as9Zw -8SX+aws6tzqdTrOV6WKZGpD92ljAb9TWG9urDt6ALL65gG90trvddQdvQBa/voDvX2mtN1y8 -AUWMJpMFtA5ov59xLyBjznYr4RsA36hl8DkKsqHILi1izBO1LNdifJ+LPgA0kGFFE6RmKRlj -H/K4i+ORoFgLwJsEl97YJV8uLGlZSPqCpqrtfZhiqIk5v1fPv3/1/Cl69fzJ8cNnxw9/On70 -6Pjhj5aXQ7iLk7BM+PLbz/78+mP0x9NvXj7+ohovy/hff/jkl58/rwZCBc01evHlk9+ePXnx -1ae/f/e4Ar4t8KgMH9KYSHSLHKEDHoNtxjGu5mQkzkcxjDB1KHAEvCtY91TkAG/NMKvCdYjr -vLsCmkcV8Pr0vqPrIBJTRSsk34hiB7jHOetwUemAG1pWycPDaRJWCxfTMu4A48Mq2V2cOKHt -TVPomnlSOr7vRsRRc5/hROGQJEQh/Y5PCKmw7h6ljl/3qC+45GOF7lHUwbTSJUM6chJpTrRL -Y4jLrMpmCLXjm727qMNZldU75NBFQkFgVqH8kDDHjdfxVOG4iuUQx6zs8JtYRVVKDmbCL+N6 -UkGkQ8I46gVEyiqa2wLsLQX9BoZ+VRn2PTaLXaRQdFLF8ybmvIzc4ZNuhOO0CjugSVTGfiAn -kKIY7XNVBd/jboXoZ4gDTpaG+y4lTrhPbwR3aOioNE8Q/WYqdCyhUTv9N6bJ3zVjRqEb2xx4 -14zb3jZsTVUlsXuiBS/D/Qcb7w6eJvsEcn1x43nXd9/1Xe+t77vLavms3XbeYKH36uHBzsVm -So6XDsljythAzRi5Kc2cLGGzCPqwqOnMEZEUh6Y0gq9Zc3dwocCGBgmuPqIqGkQ4hRm77mkm -ocxYhxKlXMLZzixX8tZ4mNOVPRk29ZnB9gOJ1R4P7PKaXs6PBgUbs+WE5vyZC1rTDM4qbO1K -xhTMfh1hda3UmaXVjWqm1TnSCpMhhoumwWLhTZhCEMwu4OV1OKRr0XA2wYwE2u92A87DYqJw -kSGSEQ5IFiNt92KM6iZIea6YywDInYoY6XPeKV4rSWtptm8g7SxBKotrLBGXR+9NopRn8DxK -um5PlCNLysXJEnTU9lrN1aaHfJy2vTEca+FrnELUpR78MAvhdshXwqb9qcVsqnwezVZumFsE -dbipsH5fMNjpA6mQagfLyKaGeZWlAEu0JKv/ahPcelEG2Ex/DS3WNiAZ/jUtwI9uaMl4THxV -DnZpRfvOPmatlE8VEYMoOEIjNhUHGMKvUxXsCaiE2wnTEfQDXKVpb5tXbnPOiq58gWVwdh2z -NMJZu9UlmleyhZs6LnQwTyX1wLZK3Y1x5zfFlPwFmVJO4/+ZKXo/geuCtUBHwIe7XIGRrte2 -x4WKOHShNKJ+X8DgYHoHZAtcx8JrSCq4UTb/BTnU/23NWR6mrOHUpw5oiASF/UhFgpB9aEsm -+05hVs/2LsuSZYxMRpXUlalVe0QOCRvqHriu93YPRZDqpptkbcDgTuaf+5xV0CjUQ0653pwe -Uuy9tgb+6cnHFjMY5fZhM9Dk/i9UrNhVLb0hz/fesiH6xXzMauRVAcJKW0ErK/vXVOGcW63t -WAsWrzZz5SCKixbDYjEQpXDpg/Qf2P+o8Jn9cUJvqEN+AL0VwW8NmhmkDWT1JTt4IN0g7eII -Bie7aJNJs7KuzUYn7bV8s77gSbeQe8LZWrOzxPuczi6GM1ecU4sX6ezMw46v7dpSV0NkT5Yo -LI3zg4wJjPldq/zDEx/dh0DvwBX/lClpkgl+VhIYRs+BqQMofivRkG79BQAA//8DAFBLAwQU -AAYACAAAACEA8E99xCUBAADUAQAAGAAAAHhsL3dvcmtzaGVldHMvc2hlZXQyLnhtbIxRTU/D -MAy9I/EfIt9puqEBmtpOSFMFBxBCwD1rnTZaEleJR+Hfk3bahMSFmz/ee/azi82Xs+ITQzTk -S1hkOQj0DbXGdyW8v9VXdyAiK98qSx5L+MYIm+ryohgp7GOPyCIp+FhCzzyspYxNj07FjAb0 -qaMpOMUpDZ2MQ0DVziRn5TLPb6RTxsNRYR3+o0Famwa31Bwcej6KBLSK0/6xN0OEqpgnvASR -bOCzcmnrmjpraAmyKlqTiJNbEVCXcL+YijPjw+AYf8Visrgj2k+Nx7aEfILKP9h6tpjmtajV -wfIrjQ9oup7TPVdn9a1ileiD6vBJhc74KCzqhMmzWxDhiJ9jpmGurkDsiJncKevT9TBdKc+u -QWgiPiXTWud/VD8AAAD//wMAUEsDBBQABgAIAAAAIQAj/NISJQEAANQBAAAYAAAAeGwvd29y -a3NoZWV0cy9zaGVldDMueG1sjFFNT8MwDL0j8R8i32k6pgGa2k5IUwUHEELAPWudNloSV4lH -4d+TdtqExIWbP9579rOLzZez4hNDNORLWGQ5CPQNtcZ3Jby/1Vd3ICIr3ypLHkv4xgib6vKi -GCnsY4/IIin4WELPPKyljE2PTsWMBvSpoyk4xSkNnYxDQNXOJGfldZ7fSKeMh6PCOvxHg7Q2 -DW6pOTj0fBQJaBWn/WNvhghVMU94CSLZwGfl0tY1ddbQEmRVtCYRJ7cioC7hfjEVZ8aHwTH+ -isVkcUe0nxqPbQn5BJV/sPVsMc1rUauD5VcaH9B0Pad7rs7qW8Uq0QfV4ZMKnfFRWNQJk2e3 -IMIRP8dMw1xdgdgRM7lT1qfrYbpSni1BaCI+JdNa539UPwAAAP//AwBQSwMEFAAGAAgAAAAh -APxfZDvLEgAAAEAAABEAAAB4bC92YmFQcm9qZWN0LmJpbuxbC3RcxXmee3clr9aSuBay64eE -15IhsvGauw+tJWOZfcsPCcmWXylK5NVqbdZeaZXdlZHxa21DsCkhvEocwA6vppBAMNCQ9Jw0 -mJDk9PRA41DnNE17QpPSnpOetDGtzyntId5+/5250t1l9VjjQ4Djf/Xdmfnnn5l/Xv/Mnbk6 -+5NZ//zEi/N/xQpoNTOxi7kKVm7gS/ATNFIYk+EhXMzlchoPD3iv0CeoBX4PXWeg32oBM1AG -UJ9bgKuACsAKzAQqgSqgGlCAOmAWUANcDcwGaCzMgftHwFxgHjAfWADUAxR/jXA/Qc30qVV1 -I0vil2E2FmJDcFNsL3pn+jQHI0ZvHBoXk9GZnx1d/9SJn0kmCGWXc8ktzM98kyWaIs4Ci6SX -T7aoGOnl6q5RphO1H2AjLAHXYYyYpl9hskTzh+pEekwzGbuTJhqoD78etpF1w3VyVklPlK/N -TcpuuuXT3DwmSpHgUruR/sb5T3UiGzDR/CfboACzAH3+kw0hG0Dzn+a5Pv/JT/OfXLIBNP8X -AjZgEdAANAKLgWuB64DPAE3AEmApcD2wDLADNHRuAFSA8qR2cwFuoBnwACuAFqAVWAncCKwC -2oDVwE2AF6D0frgBIAiEgDDQDqwB1gLrgPVAB9AJ3Ax0Ad0Apd8ItwfYBGwGtgBbgW3AZ4E/ -Bm4BeoHPAZ8H+oDtAKXvhxsFBoAYsAPYCdwKxIFdwG4gAQwCQ0ASGAa+AKSANJABRoA9wG3A -KLAXuB3YB+wHDgAHgUNAFpDmSMx8Hp79ZsbOwT0t8YH0DYRXlvEFHyx28lT0NMWY4Cd6BX6J -IsaGXS5nhp84pZOCJJQzCmQzALSKRpJkESGqjAxMSrz4zpCeAQlznq7s2yJMqv5hqUmricdK -WpBXXmURusmrKsd8PFbXnndHC6QlyYvWeE90lny0ViZJykGlzETtxn28jHowrhWx1NGg7fSg -tETkJyL/+xe9Y3yKMWkddIfWTy0oe1iUTbIfF5ordCL9zop66LrROkH874KfAJPa2CZkRpFO -gb+3gO81X8wRv6OA/4yQX1XA1+WXFfB/LuTrDPws8tXlKw18sBnpqcB9H+ZB15P4EMutgTuz -5jqtv+HdDoz1E/mJSI72beRyyu8/4lH/S/gZ6T0ERYI8ZyK+LmQxZGLBOkJ8YunxhS6qB2oy -ne6rYNJiGPheLIE7xG8pDHsPDPkO1g+fCtPuhu9tLcklPi7+jYTR23DYgr1tJc8jW6FVnTQz -gy8jnmpBYUmywfewmWpNljaXG4ZLMd3CVYSLFvSdZr5MJhXvH8mwmG2Lv+/myCA8bbaGziQ2 -Fomko6HK2sNG+m2RkUwyxkZj0aYlVVabt8oaGhqwsW1V2v4aGV4SpTZnkc4ItO1BWPpDlF01 -UEEeEHd5LcmU6n2vIo7a5P0f4wHiteZ+4hv7VrSdFon1oUZbl7SSuHzpT64/pcsKkF8BuL7y -2BgiPulixj7hMAVQB9B2xugdRidiGQhL5eTq0fqntcRjWH7eQUoFuVJmTyG8HnUkonFw8lQ/ -QrlcIwLHEC62/lE6xi4cenfFF69d77u/58G32H/+W2qeRVOUnUEqUJg740/Kff1PN679+rfO -rD/11O03vvy7DV9TwIMCU6yHxq6B8AeJz8LJ1kPj/tP1wQym5CjoBaq2TlMmgMB8gPY3RJuw -y4lj97IV8yyFXU4/3KS22+HxUz3nY/9NvUSjhXSYSp7i64AVtNMAhVHaTuys4nAdnFXSE/WX -rEhRSv2pnF9Q74KM5Ts5q6QntX85UtBQmG79fZDVy9f3Q7TK/GGpCVrJrKeD10JiPcqY7yHu -Q/wq7tP3QxL24ir2trRMqHh/UrHnd2DPbxccNc8XENzxWJ6OP914bzigtSWVga0t5qWcpf15 -DnuAXE7TTxofYVoEHlBbO9nQ91VehCmO3JmzmrR1msIIjrUx+YmM/LnY/FOY77Me0+LjR3n5 -xCfS09i0WOgn4mnf99caL19OT1MPC0/6HXl8vqYP5foewjR3yU9JeUq9PlyerxFoCEFeuEY5 -3T8Rn+LPIs3jgE5eWHCiC6YLJj19vkursQoJvj94m4QvlYwLv1jKsNjXIDs0N+MLP19uSAVJ -agGXfKNwHzZ78eQbAAvcV2CNOyPRVBLd7fM2yHqzkDzFk4u14tcTbgg23QpLtzWZ2t2fTCq7 -sS2w3uOPpCX5HnWfqqpOtbvF0WpnimqyBGawWrlGWqyqbs+Bw1X72xPJ/khCOqv0DEei0gPh -SMKcjlUOBFKxSMYS6U/MXtidig3cF4smIqx87QB70bIpNVLlD40OJyFYW7cpNjicYJFMLBhL -xfeY5JoH/CPpTHIw7rndHDQ5u7Nzs3W2Hgs2KXfe39c1HGNDtEfpTO9k/uSoramhM6Kg3g1Z -C7YskjS7iiweJ239PA//G1jkzhEPLrXE38H9jDBy1FInT9XeRTFTr5+USamkIMFHsl5++uwl -Wc1xi2j0lWYvveiCS7GXa5COBgyl56RPLM6nOCKK477852R8Y5zRn58DJv7ltDdczfyTCyoQ -tuHZCW1DOLkzm4hrLwvW8xaYBXmUrEIWZqHFqdqZrd5sCcAo1GlGwew5IIyCPyH9WBgFJZIQ -RsEWyQij4I0NCKPQMMCeE0ZBGU4Ko8CGE9woVMb3yIu5UZg7GNeMArXX1FTC/H/zB9QyV+Z/ -4eC7xHATOudy7JeuzP+P0fx30q7gUzr/751zZf5f4lwvluzyzH/j++clvv/jnWicpl4xGNsA -If39sw+3JXQD2IfblI24VVmHG5iAdpMynZzoLKH084cIst40k+c/gDf/1PSKKipF7yrjtee7 -lKKCBuaX4d+J7TGR8fxF1TilPRScP1D5dDJH7nRSfxVC3+cvYXhfvmL/P0b23/VJs/9vRI7R -+WhOwXiqAN4xj+/ecbOI2dEk0fF+e94pjRuzPPwh3joacSWwHHv2Rpz1NMJerEQJ3ZjHdJaX -YhHcktqQfxznejGcLdpYE+5CW3C+swRyAUgN4pfEPapRqhd3u3Hcw1IuaWCH9lVED84nI+DF -cDvbK2yV7noEJ4Scl+P2uAO/RsjQeeYIUiWQvx9uWsuXyqIzThus3TB+dOYYRWwGLumSzpu6 -dUVajc62XB+q1RzQ0wMdqeVKa7VibdOlXdhQLWJoCWPIAavSiz7ehlJCaJXlmj+EUovlE0Lv -UB7UXpSSetaG/Ppx8x1DDH2d0oFW6tf6tvALle9p10eF48uFPIzvsvpJnx0acf94rB5HLj8F -bBRaGFtqKzQYwihI4m49jdr14G6dzq27AA/S9SKU0eJp1FEtMqhRP+rcBe1DWr+PgEejb7zX -jZ3uHutzJ0ZTGCM2qGkUQE2aMZLCGDl2tJAK+OHzIz6EGF4TH2J5DdyC78R5Jq+JG27pff5h -ZkoXtA3j6wnqfz4aOtFiXWgVfZ4UGwnGMXQpY6EMpkgWPzMzY40tlyVG9y9WuIo4i6U2p5WS -ny/Sqjkd4uvruKQJ1o1WDsnYhcJ/8lQZ7t7yvy2qRQ988Fozl6uVCyVzOfrUQiPaJXhxVUEf -00x0VUIZb8m7L22GmcAnN/LEafDRCd8AHEYBR4CjwB3AncAXAZzVaddcx+HeDfwJcA/wJeBe -gE6N74N7P/AA8CDwEPCnwMPAV4ATAMk9AvdRgM60TwKngK8BjwNPAE8CTwFPA38GfB34c+AZ -4FngG8A3AcrreeG+APe08L8E92XgL4BvA68A3wG+C/wlQOmuUPEWYHNltNAGM50lVGPGGm/D -aGB91jCwnLDFUQyseozYfEmMYhowIJWys5toxOYLOfGJqYpPocbv9fXsFhZk50RaOisiWjNR -di4tu1uKZLeoIDuaCvTqSbR9PLtReCUpi2fxhsnnkh75nA8fImUmy4VNET9Z2lLj1I+gLBpp -per1Uch/6R/PL01aXg0eP/WoP8T+6Q0qk4z6ozcoqQde/177venu1y9s25zV+Qdverh+/4zX -1j+ztaH7jX1vzdP5R4LxPa/9hzX0SOSJt0603P2mznft/XKod8Gmdc+V//ZHF1ZfY9P55NKg -zNKD1UqzWY79/Drc+ZtDo9FYInu9wkzmLX7f//xaAW9rfMjhee2g8LqcMw5RNO6jXn5JYWaS -8zzfqGAP3p1K7oxlMklHsENh5eZ0ZiCZiD24XWFWEkLsrlg08/1XKa5rx454NDZ7RGEzzPha -hT5WOVeDPKBRziSxvtCeSGIEB8Rz/wFF3IFLRlzYZWLpjPubCqs04zpLv83avf9fKA8cYtMZ -9rvV4wHnfxkCrv9GoJzhXgnXSl/ZqDCLWVyH7d49l0LaJzL4Qua3jymsaiyObqSGHv0VXnXR -MdIoGouaLp+qZXoP5yt8jWyCfzaG28w8yQXYA5Szekha2ULIWNki2YwvB/JzohBeqsGFYEFc -pfadvKR90UmdVirRsMqn6XDyU+SHpOhLWXrPopcwdaks31fBhmvL15jYEZkNvGM2o5J1TO/3 -Y9FMGXaqzCvX7iqXrW2ydYackmotZeU1FXKNth16iFXK61bJ1jlMSmX52Fktzxvb2mZpb1uF -d6Jr5c8z09LednFH4XapdmapN5sD2GlVSzW4uGSeA43O5Woj9p2Blb0Yvtg635bu7dmb3mrr -2upx95piTuyRE/2NXR0hvBTh66jBSCZelxxi25l0NITBGYxH7whhT5hl8XMseiT0dHbWI1np -cIg5g+GWoOrGxrjZH/bZHWrW4bf7g6HmbOicz5cNuLNlzmOh7Am2MxUZtIXj0Dptaxpt8SzJ -9gaSg4PJIVMF6+2M41IznWQ7MraeWyMpvOL1doXDawPYsTp7O3u6lgdPdHQ03qUc7bY5shmL -rav/8A9tHfH+06lIai+7mUlXHfl7Sxm7+ojp5Kl5TJ6RtfJJpDraWbVUzk4PsCMj7CX6sGR+ -hXK3U7HUZXFOs8Yv7XL4U1526Bq/LJUt2+CfHz29yG+53i/Nk/xpMa0Y3RLvbmdzy7zlm85k -6J1yqy9r076ROSMlv31Gmv+3M52/mPmTxRu8z3/hzcX95gZ/448W+/zhbpqFIX84u3Dn78/4 -4mekkB93R/6Zlq76+2hl7qyvvWtz/SvO1/sqZjt/2Beod3bVP43FuP7NH2yud3XV73Ktq3e9 -UO16tfrJ1fda5zxbrTxpzx90htCD65cew84aHG7MaP+t+3Qx4nGScIVe/IevmDfTVjoLQR1m -fMkGVh6Q08Gk+KhrNmQrABr7Fs1lzCcm1IKT5Tc9a/5O+wvy+d/88t/PLpK00wkFWb4DENEM -z+XwxmDxiVxkNqucx1HMMPdqUhJ7t0yP4XtKCsm4BidJnYj3U3qAisX9L48qGjdL6F0s3RIR -Z2YOvSFFTrqzFt1ajOKiroVxXxW1KeQje3kGmGIxQGqZDhaNll4XEbY+P+jMD7qgFlVozABF -M8jS9Dt6MQOd0Z4sXAOpMPwwE7R4iSmrz1gxYWkWx9L6nNWn7EAvbBvBg0fIszzY0YHGgm3X -ykTR1ohoPOokag0aMMcFbxHXA/tSI5GKV1vyVbwKma6E0AQqCksCrfiS2ssdmJHQtkCoY3lo -Wwj5ydTq2tpOih0XhZNitC4RvSh4DtGfXo2rP0gxtaDt0FuHMPblhRASZla3spqR5SbcuRx2 -ljSgYjiLVHhCFEMqiJK1aUIF0isBUbf21B+kQsfZ9+z/d8sC5a/+FW9mwV9urEG+IQhM0Dbc -3k7Ufdzg6va2o0NXkjcgKfmaUIQryQO/EbzDYhxv1/XTXBp1ZA/03QTCVZX4Akq3Edp/hBzi -SYp/f4pyhU344AznFod2GPmUmepTU15gwVPMtIKzgvwpN+GbP2NiFha8jul8Zx7fiaK5vGuc -b7x/cBToNp2gotn78ZaYTprnILRRCObf+tyGs7HSqPYSyv8WijhetPzSyiZp1F8ia1IFUCsQ -byp6EQJeDPTLReOtP73y88pNav86lccqJbA22Nawz+EJhltXePx2XyDQancHAg67z+kP2n3N -Hnez6nIEAmHXAdxsaIM91ibGfJU1mIyODMaGMm3GBeaG69bgaziNDBJioE8W6Zws0pUXiW/0 -Y20N+rY4moFua2KJ4UByKBMbzVCdVLC2xFLpeHIIBmwYG9P+RMzlbGtwtbqcTifUg0Cgs72t -IewKO0LOsCPoCDcbgfhgt7+tIeQJucMrVI+jVfWpQdXPgdj2QFtDsDXoD7SEgoFWgoOu/6us -t6xJpjO20GgmNjQQS9nWDu1Ifq7KOtYsjrZ9rhaXM+hxq/ZAuFW1OxyBsL0l5HbZVRSBbByq -2uw7cCNWxBvHUqlazvS6lcY3hDFkKLqhrbV5mc2pOpfZVqjweVwrltmqrMYeaXO41GU27bHC -DV+zB3JVVtElbeCM/QV0trM421XILmWsXZG9/C3w/wIAAAD//wMAUEsDBBQABgAIAAAAIQDJ -EV/6pAEAAGUDAAANAAAAeGwvc3R5bGVzLnhtbKRTwWrcMBC9F/IPQvdGuwsNbbGdQ2EhkJRA -ttCrbI29AmlkpPGy7tdnZDve3VMOvVhPTzNvnmbk4vHsnThBTDZgKbf3GykAm2AsdqX8c9h/ -/S5FIo1Gu4BQyhGSfKzuvhSJRgdvRwASLIGplEei/qdSqTmC1+k+9IB80oboNfE2dir1EbRJ -Ock7tdtsHpTXFmVVtAEpiSYMSOxiIaoi/RMn7ZjZSlUVTXAhCmJ5NjIxqD3MEb+0s3W0OazV -3rpxpneZmBwtcd5iiJlUueSyJE6yzq0GdtkAE1XRayKIuOeNWPBh7Lk8cjdmmSnuk+gu6nG7 -+3aVoKaCVVGHaLj711efqapw0BIbjbY75pVCz986EAXPwFjdBdSOofrIWABfpwHn3vKE/rY3 -2udW4OD3np5MKXnWuQkfkC+ywFlv3mT9a7VZ+79lxbm91WfFK9s3ptfyIs+7lL/zk3IgVw1R -D9aRxVvF6f4sas6XHmzyCEjX/HRzd9Yy3AoDrR4cHdbDUl7wCxg7+B9r1Ks9BZokSnnBz3lU -24dpzGn9P6p3AAAA//8DAFBLAwQUAAYACAAAACEAkL4ThzABAADkAQAAGAAAAHhsL3dvcmtz -aGVldHMvc2hlZXQxLnhtbIyRTU/DMAyG70j8h8h32g40QFPbCWma4ABCfN2z1m2jJXGVeAz+ -PW7GuOzCzR95Xvt1yuWXs+oTQzTkK5hlBSj0DbXG9xW8v60vbkFF1r7VljxW8I0RlvX5Wbmn -sI0DIitR8LGCgXlc5HlsBnQ6ZjSil05HwWmWNPR5HAPqNkHO5pdFcZ07bTwcFBbhPxrUdabB -FTU7h54PIgGtZtk/DmaMUJdpwnNQYgOftJOt19RbQzPI67I1Ak5uVcCugrtUTMSHwX38padY -sd68osWGsZXTgJosb4i2U/NBSsWkl5+w62RZ5rfY6Z3lF9rfo+kHFpH5hCRipVlLPOoeH3Xo -jY/KYidviuwGVDi8TzHTmKpzUBtiJnfMBrkmytWK7ApUR8THZFrr73/qHwAAAP//AwBQSwME -FAAGAAgAAAAhAEXr1dJDAQAAZQIAABEACAFkb2NQcm9wcy9jb3JlLnhtbCCiBAEooAABAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIySX0vDMBTF3wW/Q8l7m2Z1 -4kLbgcqeHAhOFF8kJHdbsflDktnt25u2W+2YD0Jecs+5v5x7ST7fyzr6BusqrQpEkhRFoLgW -ldoU6HW1iO9Q5DxTgtVaQYEO4NC8vL7KuaFcW3i22oD1FbgokJSj3BRo672hGDu+BclcEhwq -iGttJfPhajfYMP7FNoAnaXqLJXgmmGe4BcZmIKIjUvABaXa27gCCY6hBgvIOk4TgX68HK92f -DZ0ycsrKH0yY6Rh3zBa8Fwf33lWDsWmapMm6GCE/we/Lp5du1LhS7a44oDIXnHILzGtbLnc1 -eK8/SZrjUbldYc2cX4ZtrysQ94cz56UamN0IPRhEFELRfoST8pY9PK4WqJykZBYTEs6KTCnJ -6PTmo338rL8N2RfkMcL/iXc0m42IJ0CZ44uPUf4AAAD//wMAUEsDBBQABgAIAAAAIQBJoGS0 -jgEAADwDAAAQAAgBZG9jUHJvcHMvYXBwLnhtbCCiBAEooAABAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyTwU7jMBCG70j7Dpbv1GlBK1Q5RggWcQBtpRbugzNp -LVw7soeo3affSaLSFFZ7IKeZ+Se/vplM9PVu60WLKbsYSjmdFFJgsLFyYV3K59X9+ZUUmSBU -4GPAUu4xy2vz40wvUmwwkcMs2CLkUm6ImrlS2W5wC3nCcmCljmkLxGlaq1jXzuJdtO9bDKRm -RfFT4Y4wVFidNx+GcnCct/Rd0yraji+/rPYNAxt90zTeWSCe0jw5m2KONYlfO4teq7GomW6J -9j052ptCq3GqlxY83rKxqcFn1OpY0A8I3dIW4FI2uqV5i5ZiEtn94bXNpHiFjB1OKVtIDgIx -Vtc2JH3sm0zJ3Me1d6JywkMbU9SKuwalD8cvjGN3aS76Bg5OGzuDgYaFU86VI4/5d72ARP/A -vhhj9wwD9Ag0TseAH6j9EHH2H22AHQ/WL4wRP0E9uvCWn5tVvAPCw+ZPi3q5gYQVf6yDfizo -B1568p3J7QbCGqtDz1ehu5OX4Wcw09mk4Kc/j0NNq+PZm78AAAD//wMAUEsBAi0AFAAGAAgA -AAAhAPEa5WaFAQAATwUAABMAAAAAAAAAAAAAAAAAAAAAAFtDb250ZW50X1R5cGVzXS54bWxQ -SwECLQAUAAYACAAAACEAtVUwI/UAAABMAgAACwAAAAAAAAAAAAAAAACPAwAAX3JlbHMvLnJl -bHNQSwECLQAUAAYACAAAACEAnH84lhgBAADBAwAAGgAAAAAAAAAAAAAAAAB7BgAAeGwvX3Jl -bHMvd29ya2Jvb2sueG1sLnJlbHNQSwECLQAUAAYACAAAACEANdCCgZMBAAC8AgAADwAAAAAA -AAAAAAAAAADTCAAAeGwvd29ya2Jvb2sueG1sUEsBAi0AFAAGAAgAAAAhADSSmz2DBgAAVRsA -ABMAAAAAAAAAAAAAAAAAkwoAAHhsL3RoZW1lL3RoZW1lMS54bWxQSwECLQAUAAYACAAAACEA -8E99xCUBAADUAQAAGAAAAAAAAAAAAAAAAABHEQAAeGwvd29ya3NoZWV0cy9zaGVldDIueG1s -UEsBAi0AFAAGAAgAAAAhACP80hIlAQAA1AEAABgAAAAAAAAAAAAAAAAAohIAAHhsL3dvcmtz -aGVldHMvc2hlZXQzLnhtbFBLAQItABQABgAIAAAAIQD8X2Q7yxIAAABAAAARAAAAAAAAAAAA -AAAAAP0TAAB4bC92YmFQcm9qZWN0LmJpblBLAQItABQABgAIAAAAIQDJEV/6pAEAAGUDAAAN -AAAAAAAAAAAAAAAAAPcmAAB4bC9zdHlsZXMueG1sUEsBAi0AFAAGAAgAAAAhAJC+E4cwAQAA -5AEAABgAAAAAAAAAAAAAAAAAxigAAHhsL3dvcmtzaGVldHMvc2hlZXQxLnhtbFBLAQItABQA -BgAIAAAAIQBF69XSQwEAAGUCAAARAAAAAAAAAAAAAAAAACwqAABkb2NQcm9wcy9jb3JlLnht -bFBLAQItABQABgAIAAAAIQBJoGS0jgEAADwDAAAQAAAAAAAAAAAAAAAAAKYsAABkb2NQcm9w -cy9hcHAueG1sUEsFBgAAAAAMAAwACQMAAGovAAAAAA== - ---ME9WVR31lvp2jZjM-- - diff -Nru spamassassin-3.4.6/xt/data/spam/olevbmacro/nomacro.eml spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/nomacro.eml --- spamassassin-3.4.6/xt/data/spam/olevbmacro/nomacro.eml 2019-11-20 18:19:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/nomacro.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,169 +0,0 @@ -Date: Mon, 11 Nov 2019 16:28:04 +0100 -From: spammer@example.com -To: victim@example.com -Subject: No macro -Message-ID: <20191111152803.GD97706@example.com> -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="a7Q7fXOA4hH72ulD" -Content-Disposition: inline - - ---a7Q7fXOA4hH72ulD -Content-Type: text/plain; charset=utf-8 -Content-Disposition: inline - - ---a7Q7fXOA4hH72ulD -Content-Type: application/octet-stream -Content-Disposition: attachment; filename="nomacro.xlsx" -Content-Transfer-Encoding: base64 - -UEsDBBQABgAIAAAAIQBYVsaPYAEAABgFAAATANoBW0NvbnRlbnRfVHlwZXNdLnhtbCCi1gEo -oAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMyUTU7DMBCF90jcIfIWJW6L -hBBK2gU/S+iiHMDYk8aqY1set7S3Z5LQSqAQqYQFm0SRNe+9+WacfLGvTbKDgNrZgk2zCUvA -Sqe0XRfsdfWU3rIEo7BKGGehYAdAtphfXuSrgwdMqNpiwaoY/R3nKCuoBWbOg6WT0oVaRPoM -a+6F3Ig18NlkcsOlsxFsTGOjweb5CwUIWkGyFCE+i5p8+N7wSGrQPacZ6bHkvitsvAsmvDda -ikjJ+c6qb66pK0stQTm5rckra8WuGhX+oyHGgwEcbYU+gFBYAcTaZJ3o0fkBSrE1MXncE4EO -egCD57X2CTOjyrZ9rLTHAYdhdsNM3l3YvDm3+WsqDZ2sFtoec/ctAU1vGZxHTrMeHQAa5ApU -6kkSQtRwYtbnTQvY9N6OEXn7mo3O8HU1TvpDDHpyXP+THONv5S94nHZCugDngzjenaa6ZxN4 -+1+bfwAAAP//AwBQSwMEFAAGAAgAAAAhALVVMCP1AAAATAIAAAsAzgFfcmVscy8ucmVscyCi -ygEooAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIySz07DMAzG70i8Q+T76m5ICKGlu0xIuyFU -HsAk7h+1jaMkQPf2hAOCSmPb0fbnzz9b3u7maVQfHGIvTsO6KEGxM2J712p4rZ9WD6BiImdp -FMcajhxhV93ebF94pJSbYtf7qLKLixq6lPwjYjQdTxQL8exypZEwUcphaNGTGahl3JTlPYa/ -HlAtPNXBaggHeweqPvo8+bK3NE1veC/mfWKXToxAnhM7y3blQ2YLqc/bqJpCy0mDFfOc0xHJ -+yJjA54m2lxP9P+2OHEiS4nQSODzPN+Kc0Dr64Eun2ip+L3OPOKnhOFNZPhhwcUPVF8AAAD/ -/wMAUEsDBBQABgAIAAAAIQC7gUTa8AAAAEcDAAAaAAgBeGwvX3JlbHMvd29ya2Jvb2sueG1s -LnJlbHMgogQBKKAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8 -ks1qwzAQhO+FvIPYe7y205YSIudSCrmW9AGEvf4htiS02x+/fYULbgPBvYRcBKNFMx+r2e2/ -hl59UODOWQ1ZkoIiW7qqs42Gt+PL+gkUi7GV6Z0lDSMx7IvV3e6VeiPxEbedZxVdLGtoRfwW -kcuWBsOJ82TjpHZhMBJlaNCb8mQawjxNHzH89YDizFMdKg3hUG1AHUcfk//3dnXdlfTsyveB -rFyIwE8XTtwSSTQ1oSHRMF8xTpNNEokBL8PkN4bJl2CyG8NkSzAP14RhGfvYs/mPfvRS/P01 -4yW2l37TJ4nTOa8Az+pffAMAAP//AwBQSwMEFAAGAAgAAAAhAFisYvldAQAAcgIAAA8AAAB4 -bC93b3JrYm9vay54bWyMUkFOwzAQvCPxB8t3msRtSlU1qYSgohfEAdqziTeJVceObIe0v2fj -KqUIDpw86x2PZ8derY+NIp9gnTQ6o8kkpgR0YYTUVUbf3zZ3C0qc51pwZTRk9ASOrvPbm1Vv -7OHDmANBAe0yWnvfLqPIFTU03E1MCxo7pbEN91jaKnKtBS5cDeAbFbE4nkcNl5qeFZb2Pxqm -LGUBj6boGtD+LGJBcY/2XS1bR/NVKRXszhMR3rYvvEHfR0WJ4s4/CelBZHSGpenhx4bt2odO -qqGbxnMa5ZchXy0RUPJO+Tccb1THvNiMscAcothJ6N33oaEkx73UwvQZxWBPI07ilJI+NPZS -+BqF0mly2XsGWdU+o4s4iQcX0ZV4iA8vCSvRYbaNqZQ0CT7UkO0W/SO2S4nAbkUySPymsys6 -4gud/U2fXtERX+jTYHB0VXBVYFbDEmyw9J6lgTF+l/wLAAD//wMAUEsDBBQABgAIAAAAIQA0 -kps9gwYAAFUbAAATAAAAeGwvdGhlbWUvdGhlbWUxLnhtbOxZTW8bRRi+I/EfRntvYyd2Gkd1 -qtixG2jTRrFb1ON4d7w79ezOamac1DfUHpGQEAVxQeLGAQGVWolL+TWBIihS/wLvzOyud+I1 -SdoIRKkPiXf2eb8/5p3x1WsPYoYOiZCUJ22vfrnmIZL4PKBJ2PbuDPuXNjwkFU4CzHhC2t6M -SO/a1vvvXcWbKiIxQUCfyE3c9iKl0s2VFenDMpaXeUoSeDfmIsYKHkW4Egh8BHxjtrJaq62v -xJgmHkpwDGyHQIMCim6Px9Qn3lbOvsdARqKkXvCZGGjmJKMpYYNJXSPkTHaZQIeYtT2QFPCj -IXmgPMSwVPCi7dXMx1vZurqCNzMippbQluj65pPRZQTBZNXIFOGoEFrvN1pXdgr+BsDUIq7X -63V79YKfAWDfB0utLmWejf5GvZPzLIHs10Xe3Vqz1nDxJf5rCzq3Op1Os5XpYpkakP3aWMBv -1NYb26sO3oAsvrmAb3S2u911B29AFr++gO9faa03XLwBRYwmkwW0Dmi/n3EvIGPOdivhGwDf -qGXwOQqyocguLWLME7Us12J8n4s+ADSQYUUTpGYpGWMf8riL45GgWAvAmwSX3tglXy4saVlI -+oKmqu19mGKoiTm/V8+/f/X8KXr1/Mnxw2fHD386fvTo+OGPlpdDuIuTsEz48tvP/vz6Y/TH -029ePv6iGi/L+F9/+OSXnz+vBkIFzTV68eWT3549efHVp79/97gCvi3wqAwf0phIdIscoQMe -g23GMa7mZCTORzGMMHUocAS8K1j3VOQAb80wq8J1iOu8uwKaRxXw+vS+o+sgElNFKyTfiGIH -uMc563BR6YAbWlbJw8NpElYLF9My7gDjwyrZXZw4oe1NU+iaeVI6vu9GxFFzn+FE4ZAkRCH9 -jk8IqbDuHqWOX/eoL7jkY4XuUdTBtNIlQzpyEmlOtEtjiMusymYIteObvbuow1mV1Tvk0EVC -QWBWofyQMMeN1/FU4biK5RDHrOzwm1hFVUoOZsIv43pSQaRDwjjqBUTKKprbAuwtBf0Ghn5V -GfY9NotdpFB0UsXzJua8jNzhk26E47QKO6BJVMZ+ICeQohjtc1UF3+NuhehniANOlob7LiVO -uE9vBHdo6Kg0TxD9Zip0LKFRO/03psnfNWNGoRvbHHjXjNveNmxNVSWxe6IFL8P9BxvvDp4m -+wRyfXHjedd33/Vd763vu8tq+azddt5goffq4cHOxWZKjpcOyWPK2EDNGLkpzZwsYbMI+rCo -6cwRkRSHpjSCr1lzd3ChwIYGCa4+oioaRDiFGbvuaSahzFiHEqVcwtnOLFfy1niY05U9GTb1 -mcH2A4nVHg/s8ppezo8GBRuz5YTm/JkLWtMMzips7UrGFMx+HWF1rdSZpdWNaqbVOdIKkyGG -i6bBYuFNmEIQzC7g5XU4pGvRcDbBjATa73YDzsNionCRIZIRDkgWI233YozqJkh5rpjLAMid -ihjpc94pXitJa2m2byDtLEEqi2ssEZdH702ilGfwPEq6bk+UI0vKxckSdNT2Ws3Vpod8nLa9 -MRxr4WucQtSlHvwwC+F2yFfCpv2pxWyqfB7NVm6YWwR1uKmwfl8w2OkDqZBqB8vIpoZ5laUA -S7Qkq/9qE9x6UQbYTH8NLdY2IBn+NS3Aj25oyXhMfFUOdmlF+84+Zq2UTxURgyg4QiM2FQcY -wq9TFewJqITbCdMR9ANcpWlvm1duc86KrnyBZXB2HbM0wlm71SWaV7KFmzoudDBPJfXAtkrd -jXHnN8WU/AWZUk7j/5kpej+B64K1QEfAh7tcgZGu17bHhYo4dKE0on5fwOBgegdkC1zHwmtI -KrhRNv8FOdT/bc1ZHqas4dSnDmiIBIX9SEWCkH1oSyb7TmFWz/Yuy5JljExGldSVqVV7RA4J -G+oeuK73dg9FkOqmm2RtwOBO5p/7nFXQKNRDTrnenB5S7L22Bv7pyccWMxjl9mEz0OT+L1Ss -2FUtvSHP996yIfrFfMxq5FUBwkpbQSsr+9dU4Zxbre1YCxavNnPlIIqLFsNiMRClcOmD9B/Y -/6jwmf1xQm+oQ34AvRXBbw2aGaQNZPUlO3gg3SDt4ggGJ7tok0mzsq7NRifttXyzvuBJt5B7 -wtlas7PE+5zOLoYzV5xTixfp7MzDjq/t2lJXQ2RPligsjfODjAmM+V2r/MMTH92HQO/AFf+U -KWmSCX5WEhhGz4GpAyh+K9GQbv0FAAD//wMAUEsDBBQABgAIAAAAIQDJEV/6pAEAAGUDAAAN -AAAAeGwvc3R5bGVzLnhtbKRTwWrcMBC9F/IPQvdGuwsNbbGdQ2EhkJRAttCrbI29AmlkpPGy -7tdnZDve3VMOvVhPTzNvnmbk4vHsnThBTDZgKbf3GykAm2AsdqX8c9h//S5FIo1Gu4BQyhGS -fKzuvhSJRgdvRwASLIGplEei/qdSqTmC1+k+9IB80oboNfE2dir1EbRJOck7tdtsHpTXFmVV -tAEpiSYMSOxiIaoi/RMn7ZjZSlUVTXAhCmJ5NjIxqD3MEb+0s3W0OazV3rpxpneZmBwtcd5i -iJlUueSyJE6yzq0GdtkAE1XRayKIuOeNWPBh7Lk8cjdmmSnuk+gu6nG7+3aVoKaCVVGHaLj7 -11efqapw0BIbjbY75pVCz986EAXPwFjdBdSOofrIWABfpwHn3vKE/rY32udW4OD3np5MKXnW -uQkfkC+ywFlv3mT9a7VZ+79lxbm91WfFK9s3ptfyIs+7lL/zk3IgVw1RD9aRxVvF6f4sas6X -HmzyCEjX/HRzd9Yy3AoDrR4cHdbDUl7wCxg7+B9r1Ks9BZokSnnBz3lU24dpzGn9P6p3AAAA -//8DAFBLAwQUAAYACAAAACEAuEpLLRMBAAC3AQAAGAAAAHhsL3dvcmtzaGVldHMvc2hlZXQz -LnhtbIxQwUrEMBC9C/5DmLtNV1mVpe0iLIseBBH1nm0nbdgkE5JZV//etGUXwYu3eXlvXua9 -av3lrPjEmAz5GhZFCQJ9S53xfQ3vb9urexCJle+UJY81fGOCdXN5UR0p7tOAyCI7+FTDwBxW -UqZ2QKdSQQF9ZjRFpzjD2MsUIqpuWnJWXpflrXTKeJgdVvE/HqS1aXFD7cGh59kkolWc70+D -CQmaqjOZGwOJiLqGhwXIppq+/TB4TL9mMabYEe1H4qmroRyl8o92O6V4iaJDrQ6WX+n4iKYf -OFe2PLtvFKu8HlSPzyr2xidhUWdNWdyBiLN+mpnC9LoEsSNmcic05IIwF1EWNyA0EZ/AeNa5 -8uYHAAD//wMAUEsDBBQABgAIAAAAIQC4SkstEwEAALcBAAAYAAAAeGwvd29ya3NoZWV0cy9z -aGVldDIueG1sjFDBSsQwEL0L/kOYu01XWZWl7SIsix4EEfWebSdt2CQTkllX/960ZRfBi7d5 -eW9e5r1q/eWs+MSYDPkaFkUJAn1LnfF9De9v26t7EImV75QljzV8Y4J1c3lRHSnu04DIIjv4 -VMPAHFZSpnZAp1JBAX1mNEWnOMPYyxQiqm5aclZel+WtdMp4mB1W8T8epLVpcUPtwaHn2SSi -VZzvT4MJCZqqM5kbA4mIuoaHBcimmr79MHhMv2YxptgR7UfiqauhHKXyj3Y7pXiJokOtDpZf -6fiIph84V7Y8u28Uq7weVI/PKvbGJ2FRZ01Z3IGIs36amcL0ugSxI2ZyJzTkgjAXURY3IDQR -n8B41rny5gcAAP//AwBQSwMEFAAGAAgAAAAhAAdfONMeAQAAxwEAABgAAAB4bC93b3Jrc2hl -ZXRzL3NoZWV0MS54bWyMUU1rwzAMvQ/2H4zui9ONbqMkKYNStsNg7OvuJHJialvBVtft389J -aBn0sps+3nvSk4r1t7PiC0M05EtYZDkI9A21xnclfLxvr+5BRFa+VZY8lvCDEdbV5UVxoLCL -PSKLpOBjCT3zsJIyNj06FTMa0KeOpuAUpzR0Mg4BVTuRnJXXeX4rnTIeZoVV+I8GaW0a3FCz -d+h5FgloFaf9Y2+GCFXRmtQbDYmAuoSHBciqmMZ+GjzEP7FgVb+hxYaxTe5BjK5qot0IfEql -fKTKM+52cvUSRIta7S2/0uERTddzElmepm0Uq0QfVIfPKnTGR2FRJ0ye3YEIM36KmYapugRR -EzO5Y9ang2E6TJ7dgNBEfEzGtU4vqH4BAAD//wMAUEsDBBQABgAIAAAAIQAOe2FPQgEAAGUC -AAARAAgBZG9jUHJvcHMvY29yZS54bWwgogQBKKAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAACMkl1LwzAUhu8F/0PJfZtmH6Kh7UBlVw4EJ4o3EpKzrth8kGR2 -+/em7VY75oWQm5z3PU/ec0i22Ms6+gbrKq1yRJIURaC4FpUqc/S6Xsa3KHKeKcFqrSBHB3Bo -UVxfZdxQri08W23A+gpcFEjKUW5ytPXeUIwd34JkLgkOFcSNtpL5cLUlNox/sRLwJE1vsATP -BPMMt8DYDER0RAo+IM3O1h1AcAw1SFDeYZIQ/Ov1YKX7s6FTRk5Z+YMJMx3jjtmC9+Lg3rtq -MDZNkzTTLkbIT/D76umlGzWuVLsrDqjIBKfcAvPaFqtdDd7rT5JmeFRuV1gz51dh25sKxP3h -zHmpBmY3Qg8GEYVQtB/hpLxNHx7XS1RMUnIXExLOmswpmdL57KN9/Ky/DdkX5DHC/4mzAB0R -T4Aiwxcfo/gBAAD//wMAUEsDBBQABgAIAAAAIQBJoGS0jgEAADwDAAAQAAgBZG9jUHJvcHMv -YXBwLnhtbCCiBAEooAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AJyTwU7jMBCG70j7Dpbv1GlBK1Q5RggWcQBtpRbugzNpLVw7soeo3affSaLSFFZ7IKeZ+Se/ -vplM9PVu60WLKbsYSjmdFFJgsLFyYV3K59X9+ZUUmSBU4GPAUu4xy2vz40wvUmwwkcMs2CLk -Um6ImrlS2W5wC3nCcmCljmkLxGlaq1jXzuJdtO9bDKRmRfFT4Y4wVFidNx+GcnCct/Rd0yra -ji+/rPYNAxt90zTeWSCe0jw5m2KONYlfO4teq7GomW6J9j052ptCq3GqlxY83rKxqcFn1OpY -0A8I3dIW4FI2uqV5i5ZiEtn94bXNpHiFjB1OKVtIDgIxVtc2JH3sm0zJ3Me1d6JywkMbU9SK -uwalD8cvjGN3aS76Bg5OGzuDgYaFU86VI4/5d72ARP/Avhhj9wwD9Ag0TseAH6j9EHH2H22A -HQ/WL4wRP0E9uvCWn5tVvAPCw+ZPi3q5gYQVf6yDfizoB1568p3J7QbCGqtDz1ehu5OX4Wcw -09mk4Kc/j0NNq+PZm78AAAD//wMAUEsBAi0AFAAGAAgAAAAhAFhWxo9gAQAAGAUAABMAAAAA -AAAAAAAAAAAAAAAAAFtDb250ZW50X1R5cGVzXS54bWxQSwECLQAUAAYACAAAACEAtVUwI/UA -AABMAgAACwAAAAAAAAAAAAAAAABrAwAAX3JlbHMvLnJlbHNQSwECLQAUAAYACAAAACEAu4FE -2vAAAABHAwAAGgAAAAAAAAAAAAAAAABXBgAAeGwvX3JlbHMvd29ya2Jvb2sueG1sLnJlbHNQ -SwECLQAUAAYACAAAACEAWKxi+V0BAAByAgAADwAAAAAAAAAAAAAAAACHCAAAeGwvd29ya2Jv -b2sueG1sUEsBAi0AFAAGAAgAAAAhADSSmz2DBgAAVRsAABMAAAAAAAAAAAAAAAAAEQoAAHhs -L3RoZW1lL3RoZW1lMS54bWxQSwECLQAUAAYACAAAACEAyRFf+qQBAABlAwAADQAAAAAAAAAA -AAAAAADFEAAAeGwvc3R5bGVzLnhtbFBLAQItABQABgAIAAAAIQC4SkstEwEAALcBAAAYAAAA -AAAAAAAAAAAAAJQSAAB4bC93b3Jrc2hlZXRzL3NoZWV0My54bWxQSwECLQAUAAYACAAAACEA -uEpLLRMBAAC3AQAAGAAAAAAAAAAAAAAAAADdEwAAeGwvd29ya3NoZWV0cy9zaGVldDIueG1s -UEsBAi0AFAAGAAgAAAAhAAdfONMeAQAAxwEAABgAAAAAAAAAAAAAAAAAJhUAAHhsL3dvcmtz -aGVldHMvc2hlZXQxLnhtbFBLAQItABQABgAIAAAAIQAOe2FPQgEAAGUCAAARAAAAAAAAAAAA -AAAAAHoWAABkb2NQcm9wcy9jb3JlLnhtbFBLAQItABQABgAIAAAAIQBJoGS0jgEAADwDAAAQ -AAAAAAAAAAAAAAAAAPMYAABkb2NQcm9wcy9hcHAueG1sUEsFBgAAAAALAAsAygIAALcbAAAA -AA== - ---a7Q7fXOA4hH72ulD-- - diff -Nru spamassassin-3.4.6/xt/data/spam/olevbmacro/renamedmacro.eml spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/renamedmacro.eml --- spamassassin-3.4.6/xt/data/spam/olevbmacro/renamedmacro.eml 2019-11-20 18:19:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/renamedmacro.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,260 +0,0 @@ -Date: Mon, 11 Nov 2019 16:29:41 +0100 -From: spammer@example.com -To: victim@example.com -Subject: renamed macro -Message-ID: <20191111152940.GE97706@example.com> -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="glH4Xu///GdMpZLh" -Content-Disposition: inline - - ---glH4Xu///GdMpZLh -Content-Type: text/plain; charset=utf-8 -Content-Disposition: inline - - ---glH4Xu///GdMpZLh -Content-Type: application/octet-stream -Content-Disposition: attachment; filename="renamed.jpg" -Content-Transfer-Encoding: base64 - -UEsDBBQABgAIAAAAIQDxGuVmhQEAAE8FAAATANkBW0NvbnRlbnRfVHlwZXNdLnhtbCCi1QEo -oAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzFTLbsIwELxX6j9EvlbYQKWq -qhI4tPTYcqAfYJwNuDi25TU0/H034SEhpSmUSy+J8tiZ2ZlJ0nFVmmQDAbWzGRvwPkvAKpdr -u8jYx+y198gSjNLm0jgLGdsCsvHo9iadbT1gQtMWM7aM0T8JgWoJpUTuPFh6UrhQykiXYSG8 -VCu5ADHs9x+EcjaCjb1YY7BR+gKFXJuYTCq6vVMy15Ylz7v3aqqMSe+NVjKSULGxOS+x54pC -K+CbuZwG9wkqMjFK32mboHNIpjLEN1nSqKiMiCQNdscBJ3G/oJ+usGfKnVqXJJw3YHc1ys+E -GLcG8Goq9AFkjkuAWBq+Az0wt/gWwOBlq+2T4TTZmItL7bGDodu7bk++XFjNnVud4QrFC5UC -WrlenZdSBTexcm6AopfaHhS2xU05USE8CurMGVTdWUNdyhzynidICFHD0Z02bqpavWWjGkVz -Gl6t4bQER/wuD1p03P8THdd/f3/w49gJ5QJcbsThK6mnW5ogmt/h6BsAAP//AwBQSwMEFAAG -AAgAAAAhALVVMCP1AAAATAIAAAsAzgFfcmVscy8ucmVscyCiygEooAACAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAIySz07DMAzG70i8Q+T76m5ICKGlu0xIuyFUHsAk7h+1jaMkQPf2hAOCSmPb -0fbnzz9b3u7maVQfHGIvTsO6KEGxM2J712p4rZ9WD6BiImdpFMcajhxhV93ebF94pJSbYtf7 -qLKLixq6lPwjYjQdTxQL8exypZEwUcphaNGTGahl3JTlPYa/HlAtPNXBaggHeweqPvo8+bK3 -NE1veC/mfWKXToxAnhM7y3blQ2YLqc/bqJpCy0mDFfOc0xHJ+yJjA54m2lxP9P+2OHEiS4nQ -SODzPN+Kc0Dr64Eun2ip+L3OPOKnhOFNZPhhwcUPVF8AAAD//wMAUEsDBBQABgAIAAAAIQCc -fziWGAEAAMEDAAAaAAgBeGwvX3JlbHMvd29ya2Jvb2sueG1sLnJlbHMgogQBKKAAAQAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8U0FqwzAQvBf6B6F7LdtpQymR -cymF3EpJH6DIa1uNrTVaNa1/X+GAk4DtXEougt1FMyPN7Gr929TsAI4MWsmTKOYMrMbc2FLy -z+3bwzNn5JXNVY0WJO+A+Dq7v1t9QK18uESVaYkFFEuSV963L0KQrqBRFGELNkwKdI3yoXSl -aJXeqxJEGsdL4c4xeHaByTa55G6TLzjbdm1gvo6NRWE0vKL+bsD6EQrxg25PFYAPoMqV4CUf -WiT6ySIKirkYF5PeWEw6Jya5sZhkTsxyQkxjtEPCwkcaG3F0aMyZw069O/wCfWbNqRftjJ3y -5GmCeSR81wNCvqtDwod0HOu5hz/+J70PewMn9r4U/Tl8vrhYvOwPAAD//wMAUEsDBBQABgAI -AAAAIQA10IKBkwEAALwCAAAPAAAAeGwvd29ya2Jvb2sueG1sjFLBjpswEL1X6j9Yc2cBA9lV -FLIqS6Lupeoh3ZxdPARrjY1sp2RV9d87kCZN1R568hvP8/PzG68eT71m39B5ZU0J6V0CDE1j -pTKHEr7sttEDMB+EkUJbgyW8oYfH9ft3q9G616/WvjISML6ELoRhGce+6bAX/s4OaKjTWteL -QKU7xH5wKKTvEEOvY54ki7gXysBZYen+R8O2rWqwts2xRxPOIg61CGTfd2rwsF61SuPL+UVM -DMMn0ZPvkwamhQ8bqQLKEnIq7Yh/bLjjUB2VnrpFsgBGMeD59PfqfrtZZFkePaUfeLQpkjqq -6qyOim1e52lVPfFN9gPi9TWWz+7m+K5Tfv8rL2ASW3HUYUdBXXxS8jznfDEpTKG+KBz9b7Gp -ZKe9MtKOJdCI3i44TQpg49zYKxk6Eiqy9Lr3EdWhCyU8JGkyacc34vMg6JJ5ZWZOaWsPWtmU -Rj5N6ZmSIOyWioB7lukk8Ted39AJX+n83/Tshk74Ss9mgxdXjdDNlCEtsw1e3PNiZlw+3von -AAAA//8DAFBLAwQUAAYACAAAACEANJKbPYMGAABVGwAAEwAAAHhsL3RoZW1lL3RoZW1lMS54 -bWzsWU1vG0UYviPxH0Z7b2MndhpHdarYsRto00axW9TjeHe8O/XszmpmnNQ31B6RkBAFcUHi -xgEBlVqJS/k1gSIoUv8C78zsrnfiNUnaCESpD4l39nm/P+ad8dVrD2KGDomQlCdtr3655iGS -+DygSdj27gz7lzY8JBVOAsx4QtrejEjv2tb7713FmyoiMUFAn8hN3PYipdLNlRXpwzKWl3lK -Eng35iLGCh5FuBIIfAR8Y7ayWqutr8SYJh5KcAxsh0CDAopuj8fUJ95Wzr7HQEaipF7wmRho -5iSjKWGDSV0j5Ex2mUCHmLU9kBTwoyF5oDzEsFTwou3VzMdb2bq6gjczIqaW0Jbo+uaT0WUE -wWTVyBThqBBa7zdaV3YK/gbA1CKu1+t1e/WCnwFg3wdLrS5lno3+Rr2T8yyB7NdF3t1as9Zw -8SX+aws6tzqdTrOV6WKZGpD92ljAb9TWG9urDt6ALL65gG90trvddQdvQBa/voDvX2mtN1y8 -AUWMJpMFtA5ov59xLyBjznYr4RsA36hl8DkKsqHILi1izBO1LNdifJ+LPgA0kGFFE6RmKRlj -H/K4i+ORoFgLwJsEl97YJV8uLGlZSPqCpqrtfZhiqIk5v1fPv3/1/Cl69fzJ8cNnxw9/On70 -6Pjhj5aXQ7iLk7BM+PLbz/78+mP0x9NvXj7+ohovy/hff/jkl58/rwZCBc01evHlk9+ePXnx -1ae/f/e4Ar4t8KgMH9KYSHSLHKEDHoNtxjGu5mQkzkcxjDB1KHAEvCtY91TkAG/NMKvCdYjr -vLsCmkcV8Pr0vqPrIBJTRSsk34hiB7jHOetwUemAG1pWycPDaRJWCxfTMu4A48Mq2V2cOKHt -TVPomnlSOr7vRsRRc5/hROGQJEQh/Y5PCKmw7h6ljl/3qC+45GOF7lHUwbTSJUM6chJpTrRL -Y4jLrMpmCLXjm727qMNZldU75NBFQkFgVqH8kDDHjdfxVOG4iuUQx6zs8JtYRVVKDmbCL+N6 -UkGkQ8I46gVEyiqa2wLsLQX9BoZ+VRn2PTaLXaRQdFLF8ybmvIzc4ZNuhOO0CjugSVTGfiAn -kKIY7XNVBd/jboXoZ4gDTpaG+y4lTrhPbwR3aOioNE8Q/WYqdCyhUTv9N6bJ3zVjRqEb2xx4 -14zb3jZsTVUlsXuiBS/D/Qcb7w6eJvsEcn1x43nXd9/1Xe+t77vLavms3XbeYKH36uHBzsVm -So6XDsljythAzRi5Kc2cLGGzCPqwqOnMEZEUh6Y0gq9Zc3dwocCGBgmuPqIqGkQ4hRm77mkm -ocxYhxKlXMLZzixX8tZ4mNOVPRk29ZnB9gOJ1R4P7PKaXs6PBgUbs+WE5vyZC1rTDM4qbO1K -xhTMfh1hda3UmaXVjWqm1TnSCpMhhoumwWLhTZhCEMwu4OV1OKRr0XA2wYwE2u92A87DYqJw -kSGSEQ5IFiNt92KM6iZIea6YywDInYoY6XPeKV4rSWtptm8g7SxBKotrLBGXR+9NopRn8DxK -um5PlCNLysXJEnTU9lrN1aaHfJy2vTEca+FrnELUpR78MAvhdshXwqb9qcVsqnwezVZumFsE -dbipsH5fMNjpA6mQagfLyKaGeZWlAEu0JKv/ahPcelEG2Ex/DS3WNiAZ/jUtwI9uaMl4THxV -DnZpRfvOPmatlE8VEYMoOEIjNhUHGMKvUxXsCaiE2wnTEfQDXKVpb5tXbnPOiq58gWVwdh2z -NMJZu9UlmleyhZs6LnQwTyX1wLZK3Y1x5zfFlPwFmVJO4/+ZKXo/geuCtUBHwIe7XIGRrte2 -x4WKOHShNKJ+X8DgYHoHZAtcx8JrSCq4UTb/BTnU/23NWR6mrOHUpw5oiASF/UhFgpB9aEsm -+05hVs/2LsuSZYxMRpXUlalVe0QOCRvqHriu93YPRZDqpptkbcDgTuaf+5xV0CjUQ0653pwe -Uuy9tgb+6cnHFjMY5fZhM9Dk/i9UrNhVLb0hz/fesiH6xXzMauRVAcJKW0ErK/vXVOGcW63t -WAsWrzZz5SCKixbDYjEQpXDpg/Qf2P+o8Jn9cUJvqEN+AL0VwW8NmhmkDWT1JTt4IN0g7eII -Bie7aJNJs7KuzUYn7bV8s77gSbeQe8LZWrOzxPuczi6GM1ecU4sX6ezMw46v7dpSV0NkT5Yo -LI3zg4wJjPldq/zDEx/dh0DvwBX/lClpkgl+VhIYRs+BqQMofivRkG79BQAA//8DAFBLAwQU -AAYACAAAACEA8E99xCUBAADUAQAAGAAAAHhsL3dvcmtzaGVldHMvc2hlZXQyLnhtbIxRTU/D -MAy9I/EfIt9puqEBmtpOSFMFBxBCwD1rnTZaEleJR+Hfk3bahMSFmz/ee/azi82Xs+ITQzTk -S1hkOQj0DbXGdyW8v9VXdyAiK98qSx5L+MYIm+ryohgp7GOPyCIp+FhCzzyspYxNj07FjAb0 -qaMpOMUpDZ2MQ0DVziRn5TLPb6RTxsNRYR3+o0Famwa31Bwcej6KBLSK0/6xN0OEqpgnvASR -bOCzcmnrmjpraAmyKlqTiJNbEVCXcL+YijPjw+AYf8Visrgj2k+Nx7aEfILKP9h6tpjmtajV -wfIrjQ9oup7TPVdn9a1ileiD6vBJhc74KCzqhMmzWxDhiJ9jpmGurkDsiJncKevT9TBdKc+u -QWgiPiXTWud/VD8AAAD//wMAUEsDBBQABgAIAAAAIQAj/NISJQEAANQBAAAYAAAAeGwvd29y -a3NoZWV0cy9zaGVldDMueG1sjFFNT8MwDL0j8R8i32k6pgGa2k5IUwUHEELAPWudNloSV4lH -4d+TdtqExIWbP9579rOLzZez4hNDNORLWGQ5CPQNtcZ3Jby/1Vd3ICIr3ypLHkv4xgib6vKi -GCnsY4/IIin4WELPPKyljE2PTsWMBvSpoyk4xSkNnYxDQNXOJGfldZ7fSKeMh6PCOvxHg7Q2 -DW6pOTj0fBQJaBWn/WNvhghVMU94CSLZwGfl0tY1ddbQEmRVtCYRJ7cioC7hfjEVZ8aHwTH+ -isVkcUe0nxqPbQn5BJV/sPVsMc1rUauD5VcaH9B0Pad7rs7qW8Uq0QfV4ZMKnfFRWNQJk2e3 -IMIRP8dMw1xdgdgRM7lT1qfrYbpSni1BaCI+JdNa539UPwAAAP//AwBQSwMEFAAGAAgAAAAh -AC3pH5ISEgAAAD4AABEAAAB4bC92YmFQcm9qZWN0LmJpbuxbfXBb1ZW/70m2ZfkDxThZJ7GJ -YgcSQhSenmTZCXFqfTzZDnLs2kkcisCRZCUIy5YrycEhJFECuyQspRQoTaHJLrS7hZa2Bjqd -6Qy7hEJ3ZneSLdtmZ7vdnWXZpf/tB2zbaafD5u3vvA/ryZVlOWSyhcmVf+/ed865X+fee+59 -916//aNl//rcy6veZfPcdmZil+RqVmmgcwgTFGdjjEeAcEmWZYWGB4LX3MdIA/+Lslah3ZYD -ZqACoDa3APVANWAFaoBaoA64DlgN2IBlQANwPdAIrACoP/wB/CZgJbAKaAaI3qL5HyMVfaKL -OsRS+GWZnUlsEn6aHUILle9WoMfoCqL+UsrZf/Ha2q+e/nvOBKFuhyq5h/mYt1SkRXgWWCQ9 -f7JFxZyer+4bZfpR+zE2zZLwnUZGmWEb4zkaP1QnKkeZ0ViSBhrcKH7DbIgNwhdV0pKeyF8Z -m5RcufnTGP2plgsHn/RG5TeOf6oT2YBi45/amWyADVgGGMc/2ZH545/eyV7o4/8GhNcAdmAt -0Aq0AeuAG4GbgPXABuBmYCNwC0DxqdtsBm4FBMAJkN5cgBtoBzxAB9AJbAG2ArcBFL8L/nbg -U0A34AV8gB8IABIQBHqAXqAP2AHcDlD8fvg7gQFgEPg0MAQMA7uA3cAeYATYC9wBfAa4E6D4 -d8G/GxgF9gERIArEgDEgDuwHDgD3AAngXmAcSAITwCSQAqaAzwJpIANkgWngIHAfMAMcAu4H -DgMPAEeAo8AxIAdwKzhW+T4CbjNjF+HPcmpHmsb78goQ4EBiZ87GZoljIgLc9xDmiDHX7WTZ -jDBRlu5siEIpU4ZVADSlOI6zaG9UGR4o6dTs+yU9ARJWaXph39HeLXNZ6FldbX+DUhOPlfKl -4CqLHuK31Wql5LepNL30alMQjeN+A+V3KvWTZf7BRp6oVCuBEtNqlw+pebSAcCNQ09CkyCO4 -D5jTBYXJkbI/vDQ+R6fYJqWBHlLaifK6Uq5X63CC5n+UdJsMabSitxjTonmi23xJ3geZJBik -YzvqSTJEnwE9XIT+OOihIvQXQKfmmZ/OOdA3FaH/FPRmAz2HvClfcrUGOshz9A/B1tMnOsn2 -wufwMzq9HxDf6Bai6zIWQyIW2H+iE0nnz/fVAXienx2tYtw6GOYwjN9+7bcRBvkuGOD9MGgC -fiIMmodxNk1MgN8Ge+1m7xhyXXLw0t9w6Iitxy1Ypmr24LiFa8AEYUNaZtB58KliVHiOExB6 -2kyKIKMpy1Pwvwc70x+JpVOshXm7W3kO5jetcGV5EHyKCSX3zzJvNptORKezLG7f4xvdGZlA -oMve2p/CmiGZcrbWWYfZdNSejWeyG9jNdVZ7f+aAj6Vm7BtakYElnWplvdLkmJ1jgTorUv4d -l96dA80IVOooLPUxEq0HqikAp/pq1cgUUh8gBfy1ZqSXVSpiyqwgUJBnt6z/8NL6Znn9NvlX -RNiaRK12hmVzWLZyWK17LOjw2+Rm+cNL6uIdPSCHhlunqE+d49RVP8UmR6t4dZ1AY4VH/+fR -p3nYCh5xaSGAeUopuSJYxkOtPwnmNFDYBqj15ef6ItGpWc0o33F6UWpP9ou+YXSnMPKPycWK -Q/Mf9z4inIcuL1JE+JTYT+Cv1yY7GmxnzkZRQ1luw8tJvBeb/ygeJbF0Z0OUxec/qn5Jp2Zf -zvxHVoWccf3pKpl2caYN+lJTUp/FpQqpq/BK6xtyu7DKSWD1MoLhl0bvicJPKasdlb/YcxXW -32gXpbdQCRaTJz714ne1pg0itwNYWSXgO8uJPE8G9edoYOs6mMcu+roJ1J8VyV8sKl2aSPqn -gU9do9z6b4Osnr9e7qvvb0ApeDYcUkvNsWHbXOgpNQT+NjWkr384rL0FrGVpeqEJRsAKyIk1 -vkOjCAUhv0bNc9V46tONyemIojvKg+O6qTw5dT62QZdK+bh8jyIpchDDtKGuo+i9F2Hyu+Gr -jsyF6oiuO6LoYaNfim7kGcPG+BTmUFMyYTQvv0OCl+todlWLWbjypkwwI84uOCPuugejeCSV -Ho+mUrZxzIvWR32RDMc/KhwWBEEUBjudWxzMJpgs/irWyDdw6wTB7TlyvO6BnmQqGklyb9uG -pyIx7olgJGnOxGvH/Ol4JGuJRJPL1wym42OPx2PJCKvsG2MvW3alp+t80sxUCoKNzbviE1NJ -FsnGA/F04qCJb3jCN53JpiYSlfebA6bFxtQS7H/jw6SZT5j9p4b9/3FXavyTFciPcGPo2vhf -shlYZPy/uOD4D6YO5JIJZUVsfd+Coc/P0MjPYeh3ioKD2VvMFj8GfrMy8M2eI9rA9yW5v9IG -vi2S1Aa+PZLVBn53fEwb+K1j7CVt4NumUtrAZ1NJdeDXJg7y69SB3zSRKGfga6pZwvi/8INr -4/8Kmopr419VJnXEYmrVx67OW0iO+Fdr/l90/Is0839Cx/9jKz6B49/4/XOZ339YI+ed3mtL -+SEw9e+PUeyW0wnQKHbTh7CrvgM78H5lJ71UCnkevv8KRk+es3AoDFZFjcofw5dfemHRRTm0 -3ZSvff5roVTEU2BGeVXC+P0tlIq0AA/ff4r+a8GnciwgVkB+Em8/p49mOGPZr274mv1X9b1Q -KyjNY2ihheQold8b++/6uNn/85GTtJ0u2zAeqoH3zPmvdw57jTz7rbJ/3VOw6+CGlQp+hK+O -NuyCb8Z3Sxv2Ltpg77ZiI121fz2wgl6c0Img+GEP+/EbwK7HUexzhBHuA5Xs5LBGUa1nWLOi -HsgQRcLexmacZ4bwawOFdtimcdaYZHZwI3hLYMvbjjrQrpsdOU7hR7tgMXCz8FM4ZczoXVDx -mzna7i/UA+2+uD6SHpwopwdlJF3oeqCt+AMoVwSnnVTGBEoWR2nsOBGewY6PB6fCpAsqLclm -gP3KHYYB5SiC6HFIGN+cikYlnMn6oZ0QcqWwhFyLpSMhH0qD9EUxqa3sSC+Ks9g4OHRfIoT8 -o0op59+ZeK1oj3F9pO/UNq0URk2NoASTOGRJ4bQ3g/oO47SXdlIHAA96WBhvWYVP+qNaZFGj -KOo8gNJLqIMXvSKL+BOGVjc2unuuzUX0piB0H0At3NChAwc9PlC8CDlBc+LNAQSQbrvWI7zg -0l6bGz+VLmLHTa2JG/7S29yvlHUCz0mUPt8ziveGYewtR9BCceiAekMQPxo/ktKmFGcY1Pw4 -KdYTjH3ocvpChXJKw8OO0AmJGbN+Jc8xC3wrfJtyCpuftdUdvMJ5uPw52oQc6EyIMzahFj5z -tgKnSYW3XRrRAr97YCfLjfx8SVmmw3/F0bplNY6cZLlpwc17SnhvwUlgDIMGl0D4hePIclRb -kjRRFg4TZVGPFjPuz1PCdxRJuAUlLpRELbBdR05YKDkRR2ACLmcYTyzVcq6Zl5yIotDXP7ne -hZJzKcndWSS5tfOScyE5+pggty+f3AyCHJfDs7ADFH+jchTnXD6VClMqNluEXyruUnnCVciL -etpSy3U15D/3T+9vTFleD5w6+6xPYv98nvKkQf3srbb0E2++1vNYZvDNX+7dndPpRz/1dMsD -VW/c/sJI6+D5wz9eqdNPBBIH3/hPq/RM5Lkfn+585IJOdx36vBRevWvHS5X/cRzJngAeBB4C -/hD4I4AGD1ZGyp2lR+D/MfAo8DngMeDzwOPAF4AnADo3eQr+F4GngS8Bp4EvA88AzwJfAc4A -Z4E/Af4UeA54Hvgq8DXgz4A/Byi9FzT/G/C/qYW/Bf/bwHeAWeBl4BXgVeC7gHp+QxW95srR -wA9/uf0GOwlyUB758FiOHqyBu57J7KGb8LFcK83E4sncLTZmqt3j8/7632yswjySmHR63jiq -BV1i1TGwzbj28OorNmY2Q87zrTYbVtWD6dSBeDabcgZCNlZZm8mOpZLxJ/fZmJUSA/feeCz7 -l68Tb2D//kQsvnzaxqpqccmC7lhcbEAaKJFs4tiodDCSnMaWb9M/IouXNqDQskyXL9zftLHa -WhxC6WdQ4w/8O6WBbWnalf6gPv8i/o/hxfULvFQyurWRmvnSkI1ZzNoh1vh4E76toRduBrog -zRS6ep4+/NUJvIE3Ibycp2vSRqnVmOIrWQskrWwNZKxsLW/GUbVRRg3jKx5UCM7j1SqXqjnl -CiG1iXo1Qg1RixW6K0UpTLXkG3f3Kzn6TqKPKGEjzz9ezaYaK3tN7ATPxt4zm1HnZqa38slY -tgJrQdbNN95byVu7eGsVn+YaLRWVDdV8g7L4eYrV8ju28dYVjEvn1J6ynV85t5DN0Uq2Duu6 -G/m7mWljuEc7Y3C7BAeztJjNfqyr6rkGHC4yz5E2cbPQhlWmf2sYnRUL5fsy4eFDmRH7wIjH -HTbFRayIk9G2gZCEpfA0zgwj2URzapLtY9yDErpiIBF7SMIKMMcSF1nshPS13LJnctxxiYmB -YGdAcGMZ3O4Leh1OIef0OXwBqT0nXfR6c353rkI8KeVOswPpyIQ9mECpM/YNM52em3Nhf2pi -IjVpqmbh/gSuIGVSbH/WPnxPJI1langgGOzzY30qhvuHBzYHTodCbQ/bHhy0O3NZi30gevwt -eygRnU1H0ofYTsZdd+IfLBXs+hOmM2dXMr4qZ1WHjODsYfVcJZsdYyem2St0sWFVte0R0WZp -zmGfqNfH3ev0pVezYzf4eK5i06d9q2Kza32WW3zcSs6X0QYRo5Pc8R7WVNFduetclr4gR7w5 -u3JH4xyXaj/HrfrbGvFnNT9a5zC9xdiFdVFzq6/th+u8Xp8y6CRf8Fe5NQfOeRPnOMmHwx/f -T2ossZbGh3e3iG+OVi9/Wnxr1N8iDrSILNay68IPdre4BlpcO1pc/d+pd71e//z2x1a8WG/j -nneU7H7syds3nsQ6GkKq6aL1rx7SY6r3pOiNw8Wv4j/cot1NC+ccpHSYcRMLpAJghB41AePa -xaLlkFdvKmFVjzC5v1M91nf/s7+++cJs6NUbUzu/XbP1vzhlh8GGZN8DyNGgl2V8I5yMaKnw -7MUKlUecKTWoSHHsC3Mcxr6vcUxW9dYeSZMj8gcleCtRIXLF4jlL8Po0nplxUEExtxJqKeZo -V6WY26LVZj4PyfNVIGrmH6nydMFGtyGxLNLjabvTaO31SJq9L3wVC19dSMD03/QpBndOebIg -EuRvRRimYnBooGfIe1QM+wf6+wd2HnWG+/v8QwPDCKAQBA8ekmdzIBSCVmDXldKhkNaIpiVq -Cao29YxTGu0DzRdAyzsqy/WWwrJch0S3QoTKgqlTMyG6BdHNBqyGOluGVQ82Q9rrl0Kbpb0S -VZjUq0zbVLA71By0jlSp5H9co3Faw3UrVP1BBRPmKQkdnF8DAc2e6uZUsaaqrRY3w6BS7pSF -SkK1j1ERPqtlQ7rRcmZf1mjvav6gnrviUxFCb//G8ds7V9v+4ufsGyzwL0MNSFsCdwHdqMaV -LG48Y1CUYl5166ob11BIL6iqQKUBqdXg1EKqL6c02lqtw+5TJPQHpUECtApBLepq8W9SuiGg -y4qsBuniwzuCL2DarIIMT3y9B9XhwvsHWsqU6zBfoyy8KX1hsduLZLVyJAmX00BhylK1SoUL -CuKpdFqwkDOePziJvURnU+ytmhY9y4n+dQgNaYKFpz73Kf/fUE4aukzjZeT/IiKfKpq/nmr5 -Puqv/BcEmlHRaDkxX4LQdvSbK+Xy2i9P/8Z883Gzi3c2Y0QtrFnpeTtLhcZ5wX0ixjR7PW/z -RqeLBXQRWaryrgK6q0ixyib1BbpaDwfFDp/L53E6vJKz0+F2uzscnV6/0xHweXweKRDY0iH4 -juBkQ6lsvEurc501kIpNT8Qns13GqejWm3px401xBgmtoqWYYimmq4CJi+jxrtb8lIiy9caT -U/7UZDY+k6U6CSDtiaczidQkbOIUFrbRZNwldrW6trhEUUTxIODv7+lqFdvFDlFydnR4XJ0d -XiMgERj0dbW6ve5Ot7PD4+mAkAJwevxdrZ6gJ+Bxtwe8fm9HQPBiSeztFINg1lnv7E1lsnZp -JhufHIun7X2T+1N31VnnVOPsOuzqdImILTj8wS2Cw+n0Bx2dktvlEASv4N/idApCu/fIbTCT -t83FEpSU6QMtg7uCcSSoNUWXU3BvsiuPDidC7a4tm+x1VmOzdAmb7HN//jqr1iDFyWJxsms+ -uexu9nsr+H8CAAAA//8DAFBLAwQUAAYACAAAACEAyRFf+qQBAABlAwAADQAAAHhsL3N0eWxl -cy54bWykU8Fq3DAQvRfyD0L3RrsLDW2xnUNhIZCUQLbQq2yNvQJpZKTxsu7XZ2Q73t1TDr1Y -T08zb55m5OLx7J04QUw2YCm39xspAJtgLHal/HPYf/0uRSKNRruAUMoRknys7r4UiUYHb0cA -EiyBqZRHov6nUqk5gtfpPvSAfNKG6DXxNnYq9RG0STnJO7XbbB6U1xZlVbQBKYkmDEjsYiGq -Iv0TJ+2Y2UpVFU1wIQpieTYyMag9zBG/tLN1tDms1d66caZ3mZgcLXHeYoiZVLnksiROss6t -BnbZABNV0WsiiLjnjVjwYey5PHI3Zpkp7pPoLupxu/t2laCmglVRh2i4+9dXn6mqcNASG422 -O+aVQs/fOhAFz8BY3QXUjqH6yFgAX6cB597yhP62N9rnVuDg956eTCl51rkJH5AvssBZb95k -/Wu1Wfu/ZcW5vdVnxSvbN6bX8iLPu5S/85NyIFcNUQ/WkcVbxen+LGrOlx5s8ghI1/x0c3fW -MtwKA60eHB3Ww1Je8AsYO/gfa9SrPQWaJEp5wc95VNuHacxp/T+qdwAAAP//AwBQSwMEFAAG -AAgAAAAhAJC+E4cwAQAA5AEAABgAAAB4bC93b3Jrc2hlZXRzL3NoZWV0MS54bWyMkU1PwzAM -hu9I/IfId9oONEBT2wlpmuAAQnzds9ZtoyVxlXgM/j1uxrjsws0feV77dcrll7PqE0M05CuY -ZQUo9A21xvcVvL+tL25BRda+1ZY8VvCNEZb1+Vm5p7CNAyIrUfCxgoF5XOR5bAZ0OmY0opdO -R8FpljT0eRwD6jZBzuaXRXGdO208HBQW4T8a1HWmwRU1O4eeDyIBrWbZPw5mjFCXacJzUGID -n7STrdfUW0MzyOuyNQJOblXAroK7VEzEh8F9/KWnWLHevKLFhrGV04CaLG+ItlPzQUrFpJef -sOtkWea32Omd5Rfa36PpBxaR+YQkYqVZSzzqHh916I2PymInb4rsBlQ4vE8x05iqc1AbYiZ3 -zAa5JsrViuwKVEfEx2Ra6+9/6h8AAAD//wMAUEsDBBQABgAIAAAAIQDUAwQvRAEAAGUCAAAR -AAgBZG9jUHJvcHMvY29yZS54bWwgogQBKKAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAACMkl9LwzAUxd8Fv0PJe5tmc+pC24HKnhwIbii+SEjutmLzhySz27c3 -bbfaMR+EvOSec38595JstpdV9A3WlVrliCQpikBxLUq1ydFqOY/vUeQ8U4JVWkGODuDQrLi+ -yrihXFt4sdqA9SW4KJCUo9zkaOu9oRg7vgXJXBIcKohrbSXz4Wo32DD+xTaAR2l6iyV4Jphn -uAHGpieiI1LwHml2tmoBgmOoQILyDpOE4F+vByvdnw2tMnDK0h9MmOkYd8gWvBN7996VvbGu -66QetzFCfoLfF8+v7ahxqZpdcUBFJjjlFpjXtljsKvBef5I0w4Nys8KKOb8I216XIB4OZ85L -NTDbETowiCiEot0IJ+Vt/Pi0nKNilJJpTEg4SzKhZEwnNx/N42f9TciuII8R/k+8o6PpgHgC -FBm++BjFDwAAAP//AwBQSwMEFAAGAAgAAAAhAEmgZLSOAQAAPAMAABAACAFkb2NQcm9wcy9h -cHAueG1sIKIEASigAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -nJPBTuMwEIbvSPsOlu/UaUErVDlGCBZxAG2lFu6DM2ktXDuyh6jdp99JotIUVnsgp5n5J7++ -mUz09W7rRYspuxhKOZ0UUmCwsXJhXcrn1f35lRSZIFTgY8BS7jHLa/PjTC9SbDCRwyzYIuRS -boiauVLZbnALecJyYKWOaQvEaVqrWNfO4l2071sMpGZF8VPhjjBUWJ03H4ZycJy39F3TKtqO -L7+s9g0DG33TNN5ZIJ7SPDmbYo41iV87i16rsaiZbon2PTnam0KrcaqXFjzesrGpwWfU6ljQ -Dwjd0hbgUja6pXmLlmIS2f3htc2keIWMHU4pW0gOAjFW1zYkfeybTMncx7V3onLCQxtT1Iq7 -BqUPxy+MY3dpLvoGDk4bO4OBhoVTzpUjj/l3vYBE/8C+GGP3DAP0CDROx4AfqP0QcfYfbYAd -D9YvjBE/QT268Jafm1W8A8LD5k+LermBhBV/rIN+LOgHXnryncntBsIaq0PPV6G7k5fhZzDT -2aTgpz+PQ02r49mbvwAAAP//AwBQSwECLQAUAAYACAAAACEA8RrlZoUBAABPBQAAEwAAAAAA -AAAAAAAAAAAAAAAAW0NvbnRlbnRfVHlwZXNdLnhtbFBLAQItABQABgAIAAAAIQC1VTAj9QAA -AEwCAAALAAAAAAAAAAAAAAAAAI8DAABfcmVscy8ucmVsc1BLAQItABQABgAIAAAAIQCcfziW -GAEAAMEDAAAaAAAAAAAAAAAAAAAAAHsGAAB4bC9fcmVscy93b3JrYm9vay54bWwucmVsc1BL -AQItABQABgAIAAAAIQA10IKBkwEAALwCAAAPAAAAAAAAAAAAAAAAANMIAAB4bC93b3JrYm9v -ay54bWxQSwECLQAUAAYACAAAACEANJKbPYMGAABVGwAAEwAAAAAAAAAAAAAAAACTCgAAeGwv -dGhlbWUvdGhlbWUxLnhtbFBLAQItABQABgAIAAAAIQDwT33EJQEAANQBAAAYAAAAAAAAAAAA -AAAAAEcRAAB4bC93b3Jrc2hlZXRzL3NoZWV0Mi54bWxQSwECLQAUAAYACAAAACEAI/zSEiUB -AADUAQAAGAAAAAAAAAAAAAAAAACiEgAAeGwvd29ya3NoZWV0cy9zaGVldDMueG1sUEsBAi0A -FAAGAAgAAAAhAC3pH5ISEgAAAD4AABEAAAAAAAAAAAAAAAAA/RMAAHhsL3ZiYVByb2plY3Qu -YmluUEsBAi0AFAAGAAgAAAAhAMkRX/qkAQAAZQMAAA0AAAAAAAAAAAAAAAAAPiYAAHhsL3N0 -eWxlcy54bWxQSwECLQAUAAYACAAAACEAkL4ThzABAADkAQAAGAAAAAAAAAAAAAAAAAANKAAA -eGwvd29ya3NoZWV0cy9zaGVldDEueG1sUEsBAi0AFAAGAAgAAAAhANQDBC9EAQAAZQIAABEA -AAAAAAAAAAAAAAAAcykAAGRvY1Byb3BzL2NvcmUueG1sUEsBAi0AFAAGAAgAAAAhAEmgZLSO -AQAAPAMAABAAAAAAAAAAAAAAAAAA7isAAGRvY1Byb3BzL2FwcC54bWxQSwUGAAAAAAwADAAJ -AwAAsi4AAAAA - ---glH4Xu///GdMpZLh-- - diff -Nru spamassassin-3.4.6/xt/data/spam/olevbmacro/zippwmacro.eml spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/zippwmacro.eml --- spamassassin-3.4.6/xt/data/spam/olevbmacro/zippwmacro.eml 2019-11-20 18:19:42.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/olevbmacro/zippwmacro.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -Date: Mon, 11 Nov 2019 16:31:32 +0100 -From: spammer@example.com -To: victim@example.com -Subject: zip pw macro -Message-ID: <20191111153132.GF97706@example.com> -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="984yO3ROVIk2UaW1" -Content-Disposition: inline - - ---984yO3ROVIk2UaW1 -Content-Type: text/plain; charset=utf-8 -Content-Disposition: inline - -Password: sa - ---984yO3ROVIk2UaW1 -Content-Type: application/x-zip-compressed -Content-Disposition: attachment; filename="macro.zip" -Content-Transfer-Encoding: base64 - -UEsDBBQACQAIAK2Ca08UA/S8cCcAANExAAAKABwAbWFjcm8ueGxzbVVUCQADdXzJXT5+yV11 -eAsAAQToAwAABAAAAACwdKIS+qdNFU/cj80YcFfvNW3wVwXKBgtY0/aiDml/Ac5jnjFCcwqv -ctAkxMcmnid4JHzhWO4wRWjEJ8S1NzqW2gQC/LNwknIRXKe4KbiATGiH8FE0TTGeJ2C995vE -kDJlsl/iUwjn6DxrAuRZ2osFytugjbYQ/GPER3bmLZz23GPh94ki5PpuqMbYG76/X5Zz+gbl -wKteZv5jkLZkzKbertEWmN4yAoF9is3bfsq0nuPh/lnNRI3ABHAh5x06T8SCEzeclpbuRqUZ -Ji28caVr/60YeS/cwhZD8TLJKjtqclX8SNwh3abcKp0dW94A5ypQZwgavYKxBS6wJzCpECW5 -9Dcr8Bef/00qPocHjFVOGy5GLM+39aBYfmqb9FBocSisUXgVJ3h0TL7XOQebqHAhltHFDINm -69PmyvjLz/jErM28Wh+IkhC2S6nVw+E7+ZlXdDM+CaiTnO7ZTbc4EcPJo1aT5Fx/ljZ25/r2 -Y+6IUi+9NTQwMjMk2KWArpVYeNsig5w4/vdiS7waqkzQTtFF8EfpHnmjznTSs6kwSYva0MEL -PuBjrUpLywZbX2wq+ZTaf33a6SSZ0Q03JaOUG4wrRQd+bbSA5phtqeY89oIkxrw9bUIVN1Gj -BFTcTl4wuvgnlDo8W9YM9XZI3lfZQkyNbF5CpaGobXF6sdhGQatnN88GeqYJ5dwnfnMDIq/x -VVA3r4O1PVZbaYRI9HtB1yT9gjKEaPswXxW1eIcxWT5Iw3SmuAFdsTFlhgsiDC9OT6jkeZkt -Xx+GzObST3AEhA9pltK5S8kMaqvbBYOlmZLR/U6AaibYPyYdonmacMyZ9VGkKtyR4opLs+zy -kJt5+W0pujGmVuHbUte+Ef6qEB6KUHRLbN8wNUqxxCULYJDlGXzQ+KBz2epQ5xPkAKTRqEBX -75NwXM3xBKbfh3r1dV5EhPGkNbB2u8T2gjo01/xgU6kEdLv45cV8j9+3ZS96vtXDlGSN/gLK -Q0HqGW957A4v/yyNITjJO1LFKONR3sifVTSVpg7grx2OcoJsW6t4Y15vJ+XulLskbLJFqCwj -wg90ZDa3n4J33TMB5UeDr6bhlD7IeGWmrOpRaQwJMf3cWemVWdj6ouLiqWMB1IllMh/cdtAi -wywOwUGc6vApgWgSCDx/LECQ/TE0y7Q/subVWCXIyVEYBK3cv5A8dy+1xjvYNoC1cXtXAPBx -oeXqvgDFZgkbNP0J1lSsZ8WVtitrKK7Ms+puB2jelvRzl6o9UljE22a4sgO/xgdPQjHRHLGP -fn4lKC648+38wrwN7CrT53boJHFpjBPYDDpkZftUaT3APbNKVTzpwt87FraB4q54zaW/pjsB -UbVKhXIqOE3TrhRhoSx0u8DvSrfoJ5/qQ8Xc2QV/UJUPtupsQ3lZ77kbHBhdOcfyOO9OlF/3 -ieFTitOXfDPIasg3Yzjgb6fK0+x7pizp0bcJOrjQEzUaobqvU3y3VBLOqw9KlILQbEhZOMMg -cQuGjyu0IuNF72LF/uas42wAjxxgZOw31MAX2FM/H1s+Xna4Icw044qudPk9Z7D86FYfziHi -pdmzxHNRNVLnpcmCyrZW4LAQpU4sRv5AoItnkXF+ZAXPJPT+3t1eCn/Kvl2l+39FceG63T5Z -W/VEJ7VheMNRqjBknwKgVZm9uhVNRAkUG4Q8qbNLYmnQF8cdHCE4SqUKtOsWCP+E/49UwlYl -sf3cu/2g2eKjzHryxkk2OxsxFtl0DfT/SUXtk0Lu2CLHX4mdGaRT599LOZzvG/0YjZBz52C0 -tRSTKPX2aTiWcNjAr6n1c/eDPel4AtcJk2dyaV2hYzZVTMw3pxZT2pfW2aXjSe+Ceijf4XSz -0YAQwUFFJPkGHqEfKm5i9dhGPuM7xAT83FHTEj6zZ5dRl9vaXjWucfTTBH01XReKIGHTnca/ -crmO3g9djlVTNhdV8aAXzrwYSxUlBW+0+ZjTbHvmi7xbwRS7taIWKaAbJxCkHlq+rCRibwDC -qDaRvvuk1TTZYXTNiOKhrBhW1BfeOxV/PJybpCNPgGp+G3HESCTOAAUsRj1pMP94hCdAFHm8 -5O06dgJrLhq3kvl9Dr1GcjRYJ5xiBGaVhHNQm2YdEldI89objJE8X1/3iqpkbIgiy1xuosgE -uvihvJMyaTYvxMqUxHo7PoJqwU8+L/zHKIBsIrzam84PogE7HN5qBcYpGDl7INaU962CZJm2 -gkFixDdzbgvKTM4VmDvCflKsKJqcQ9pgjpPCITyZYR36FEZez1TrgamK8u+IHlwfBWs90x+8 -PYi3B9j2lBZ8uSkMIQ+DavKUh+UHT11+Vz8fPilY2v/XtHqJmjk2KgDwtrwm/0x9U8yw78sI -Ixm7RJspyCUnN1RJFIP7h0ch+C6IchKerRFDIuNYQTweReExd5JT5vEgvf/oywx9AVLNl4BS -tYACRJuz3z1ycmkNRNBza7SBUEmmuQS/1RahNm3ygDw8L1Zj3HEaCJOyE1r0Zp9sIQrZmrso -bAfvVHO2n/wS2fID3QlovNxRzouHGQRhU+7o3K0ZQrkRD2kiD3Uv+FnzMcrLmNWfxGDeL2on -qn2Bw4twFgvKSQt/f7qd9nBRv9GD3Ds8DUK8vrR6JLBsMaCYyzgNBHN/B8Ggt92j4zITNsr6 -BL3orQeC3Zj1F8WvSUMB9tsHBHy5f75ZuvvRLINV3CqTSJKHU1BvhU7Nxfz0Ot7Ax7B8AxL0 -pySmOGyqvug6Kbl7HZ6Q0G1Bc/fTELmrc0L8Tj2GAFwBYWeCpITZ2OFhCI9EVQOxqC24SyT2 -Sw9SVFem0O6mYibFqhI6ygowToXdHSwouMQ3eFnUfBYe/dImRhkFDYuO4l6sGYBgQKyiXDcd -EzN9M4jyfT52EjWgRlOdKIxrkg5joJVu7WC2eRrxJ6qvrpBq9+dSG8BRI7ic7A3VQsLVmvw+ -PdKRB/GyhMfb7JktEjj46m8abJYhkLM/xW+lNPiJl3SV90q5b4HeFooal9EcYoB/bYODIKmL -zq2e4F0nksO+Sn2cZGvBCVWvGiu+f51XyfiD8BvmUOzjuseeWZpShb/wyaduUfqGwp8aRCZV -A+gp10Ry79i14a6WUTeN3mqPfxWfBb7h6bCxoMI4lJZvlVtFBvgacvAQfO57t/WXvhyTSZgW -oe/k+0B02xJC8HK/JW4ClJDHyoCv5w5K+xBqLyt3ijtMsjQ5daQ/+YMk+xBxFm3sBAkq/ESq -nXxnsJJv4VBriRQJHLUoQ05w0+Iu0cmc2/7iTYHPi7SF9PDYAyrOjaV7EnWxmnpEqbtLm1Ds -TnNSyxro38ouHMES4kyxoDydBD4U8o5Fz3gftCseAtXL597JZn+hUbOseHUoLMW0Hr4qbPCX -mUCRbEkLEzf0HxbaLDSRfoztVOgCfbLqQVYrB0GmgdquqFXfqzTUbR5UNYUjHg48CKIgpa/z -4AS95ka3bTLtfSLzR+G0NCV2GeZKZ7sFp928Rsmux7P4SG7Xd4zLhD9H+9Nhm9P5IsuOaxvG -crr2k2GBTKLzLhfw/dndsE0Jsc9q5WUqO1Pif1Q261p3SVI3R+FxmHrvlEQwqf60u36vyA9H -3CV7RV5UsxGy2aSsQUYtN3KyiVJ6IYscnBqxvpnivIoNviY2nAPM4xSfwdM9ldhoJsqMfkq5 -9QN+dhpTtCqMqUcfqnR69Aq7jh/QbGbWrKpLR44GRIsmyAHWH1PfRh+OBt8cirdeUUvpc7Qf -RWUD7QRGGktRL+o+1EV+Z7ZrpJ/llKN0ctGX4rs3NhipPOyQIppXpsGWrQRQUDb4Bu3Sc1sQ -jyANCjS2GKy7SpLwo/WKyvgELRsblrFzbhvtfIAVPrX9xGW0rSAnvzgvKDhUques8inD852R -lciqBqS/daex4miKN/CcSsUPVHPrHVVSfNtemggi27F+aDKHgUGxwVQdiAsUqCkAqS2LrmvW -EFNg4MCHwa546EZ4DAC6/PMDo+033/YtEDEN/SNp0kh8PN7ubneFLTEWLp7FDpHKpgHi3D9Z -IJzwoSCz1aThAIAJST++G5xTS0q6hX4YGSEClLTeIxk2mQT4/mYyF6F0E2EBAZdIiOqRWWnU -UP5Sw9uH/z8oEzcbwpVmMxS7EaRR0a1smxJO6uojuyyZsZzKzp6SJ96K6PePDHPD4/8zhPnS -TH9cXYkknVq/WkKHv6xKph5LQwo3scS3e8zTY6n+Wh89lsJK8TItuTa0HOvHIp7agyqTJP8S -XKV6VW5De2GE+fquY5f1Pa67VrxJaW0VEC0H5bL/6RGMGGxcqogwywPjQuocYUZHeBofbfMR -/fG5KmDsUGtfeQArosGyxkXFxV4fJo3THHu2yCzyOi3k9b7+1WMYAJLHxhE6D2vjOv7M9xoN -5dDZtnbCy9lvzLr8AnUyBwklAtRJ7R5XB5h4vK9j76hYPc+wvz123yD5UcxFj3C3A/vpXBm3 -lpfucPLnCBv9Hlcf6ki29EpfTRAn9j6P0WmM9CseVoZdn09S0zrNJmnQPDrGCuIl0TFbmTRs -/nVEbDmkLzVhmFgSEc1HPZH7+M8ExKQYa8STDiuDzV8Nsbs47eXChg0FTwBsn8JtsSozO1qe -83u64e0indpP9AoR/xao897ls6ln344VS8+6bK5jbqYIF3/zas5wKwLX8p3frcXoTp5gCTw/ -G+l9q1wr5nsrSGdra4ldCdODxsJhsdF+AIqIlSwB7B7imK2mgE/DYeVXjnQ/1L1gPL/dnyB9 -6ZgMYTNLu0w8kGY7SNDW5GQycVoImFlioSh2GbopOynh+tJ9wSFDTGnjf6h6gVpAxxfuilGW -dLJIvVpN3/4yhRilUU5ffMJWZalOZUjtlKRNcEJDUv6tKhNCfPAq0suezYDimmkUesnIgfYY -QxxlwcAK1K85bhFpuzWkJQaYiqNd2CKMyMJop/VpUfTXStzOYv51hoE6Jm3bLPob52bVCO2I -aLYT+sCVwKYAIoz0te5K94wMbbUfWMTEW4wcQ2z7hg/3bbtYNefj5VOQrKsj79reoMWGhQFj -NN31ybCFAVH0eWZylQH2I0x/Me+fdP9dnUCdgw5c84ys1VB06LuFxyg889d0SHZnE2HC9Wwd -urTGfK9QfkmVVzK1TT871YTsBMr4DBFmdRvUdy8UKKUpeleESyvD8c/8SR+ee8yZOM3e1TOS -EFlbMJfufK5sHwGaxqsCGrwgZiXaNKiHRHB5Z9NjPCg4xSpYpfu+hLTZEcJQ5jaWiR4I4SH4 -ZI8VSWvCFUUMzf0QZHo4m10zs9ThZWoA+Ifj1do5Hi3qxXmWIGa0u1lbNFRKo/EUnlYHpdbk -KGs7xUYQ8y0TCzdODhnvcHHgt5Xq7e3f2ruQFEh7Y1rHr/WA+Nf9UVZ1UKe9vU1LG893aBJK -kEFKFDANR27UxDpGvvn86C7PjlkjASR5c16OqVE5vAXgH7oj21RKFyRmu+WHYXlOAnHNORTQ -YG/7fL9rzA7BNY9OCFDyjhLxRWZv9nDL8rzAQHf6X4ak0b+bUt3l5O+4JVktrIwHD7aglSff -OeYsZGr56isLJoU2PNkgwnsZxCaBUGEKe4lxLCy1FCDpzyb7nXL4H656MR1EegEaCMuOF6mk -GU7AEFhjMtOhJLhX14rIwTxTib8pWnM6JqtIzEcxgZHutyOlIQvSFqTxgerGhf7LgVOC4VsQ -Phq7z4lv0QyaeuHwg9I5ct4n5egZjS9E/7qnVAHr7cNnym0+j2b6buxIIaRNNTM9qn/oe+Tn -NI8Zo9cBpJaxjw+HVui9P9qJTceU3MLz6xmH55++cnu15od4HDwVWfyZMnIw+CgXugD8d2JS -TVh5PBCbTmS9GpF5ZT2PKaTQLrzW+0JRUdsJ8OucG6eIpLLm3hq+1NKgc/4SwCdVzhFCXnEH -QkwtdoTqXPPYsmFhtQXg+5FbGnr7AZRGkYr92ehKjBMym+Jxcmeaev7Cge5wmgP9LsQCGR+O -Lanbf3AkUnwiICvw4+StPBOZwMclNRSIHV/c3Cs1WEAuLg80RpYy9Olnf3Wu/PdxiBDA9Ben -DZ/m/Kl6FETuhLKPy9XkmCGmp1/6d6GEmCpfHxMWKBsA+5FMKRNc2NlUlvDNV6+AtSyJXpmR -/BbW2Z4sNMgwp1D4ifXHk4CZSumdqPIo9wFrUqXY2E0vHMwUmFuEW6/FEgbCd3EHbt94cCYh -BKJl8DDT6BBvS93ND2utLXr9a+rrCPxVtLaIvIJ9MHKVnOgxG7UHjXb1RfNrJKqZiohxlmVv -+9KMNU3mfAHEoCqLK39duDq3wcM63rmkO8ftQRzH25HlLkEHFLcCgYuZedI+vmmx9vqxQNea -z3RyxRuwIMi1+i6iCgIal10wtsmJeeWs/HCHkMoCa3haj6omb76tL/ZS8q6mQNbVI0qVm3Vf -TzpUrUVvZGHMrA7Y0sEsTagn0L3dgoD5BP6bCF3ZMTWSLCKRx6xxMIWvVLxm1ewRfR59hhmH -ifkTOZmdXkqG1OmduuKgMdSpa9AHTRZRjrMePvEVD1WvxdsnCzyDbLE+R7lX7CgFdiCMhh+a -5VSjvQQKOsFFrKTL1Q5bGVpFETMM7X2KjTl6r7W9yDTpAcI8gHY9f8psZvSzPoaXj96u4WOC -oPg1FPdDWBQX5fCCbJraoFiqZPDVPuvTQvWQNNB1NmCv/lToa8XciG3CwT+c5dFBKRYlq6Pq -zUit3JfBri+PpAn/JhJ7gqeRp60O/auR827cbWnl04K25F+4OgXcfjm+tZA/GBQSXKUMoWRm -hTZRbOadC0WU9UGKAQXr79E7tHQjOeCc+/4fv3pH1zJjbf/0E26IrmBYBWLg2jW0pR0h5lA2 -qiPzs45tHHDRJ+q04QFdF/Q5IaIi8BKxZ+5xQ1IEe00rYiZa657Q2BBkWYeKiE4TSPAAV7dm -FA5/0gIkZ59W9z3l3zN0q3nqdyF0aBCGz6eRhM+1oumo5VNVySrFvLorkYUwB+klFZ+KToAJ -KCbi3vTKqhtv/WfmLQNevI7hCnfqtpqB4lEhjRfOprBT+bf3xqEuNn5yrvizGWlbMODeTcCY -c0kIlaTxxMKOrHrYG1LpShvelBG+WNzwrcp1d4WzuTzyCAMM3IaB4Q2BedQ5agXK+vRaYUfr -ZiGY7ZeES9+wF7RjP+rhtPtlVodSTmfB9svow4eHIL6UCQGA8M8+2ZQbXoMcKgqcuL/IFqSX -pDWfajDHIo6LI3Qf9WF8PaXCWfz/6s1hR6rgFaOF6azTiaO0DabmxX6/ASUXlpO65hnwuoeR -qMBj0OZ2R23QudkGrkYGSIv3fVlfu70dFBg9YfiM5cDbaiRa1X52gUzMwSPqZwUh6AoW2K2f -RZ96dgw7iTtM7cgh5zCzFD+Qegy119hwNHJmL0nVUGF290ftsSEbPLr5cGaN5HCFk7tAT+j0 -1XelWUbo++oeOiGAI6Bw8zFFjrHLTZmlrePJhy785NzobH+xIVohOfh1/t2Ii9UGNSDomhaR -VPFkMwsXgZ5c6Q8lseFrJMuylTTpL2VSAIJ+ukSMXg06C5oL8OUCcoyGMCNIA2UKRJ9/JROE -GQLajE09EFFUqXe55Z3NHc3LbD9zYyapI4nVI17xJQ2t9z+uB36VgItYrRR64PZwh0OYoONw -EnvxVCdnT4GXrK6GLWaBGLQuTAurUuhJj2Jd6HSbNTVQMka435So0YFnZHfDdE9TZOVaXCTr -s1wI7nDcI5j5re419GzIZ2en5OkixO6RZ1oIF8IkKRK4kRyYBFDuoXpcfisw/pjHVVnnu/Dn -taBN4YD9RMLv2EJkKIvM6N8Z11aixMECsl58UjGkqcQ/bkYj04xi7z+lqGf+DKtOVdCUe67h -1vogtum/5eMsVdnx11LU4QU0WzyiiQgqkplL1ls2f8eTJ2keFZ3WWLgQ2OjLGNGhrskZswK9 -kRgYQndTOaSEgNepC8PCSDaUu6Bk3ljNLhOQGxTWiJDbbeLaCK9g5/4t7hqIftI5YMV783Df -aMDgMXVcEVYRHdVYlN1f5UYKj+3oC1RqvQ4zMKItKl6vTuWhdAVUAL01CIFBv9g699YKrowc -bPETyxW45MNn/E3JvO50mT1D119j48U1ja9gjetK7S7vS+cRFn7dyC5lZHNUTQXwXnJu80y4 -RN8T7Jwo/yNVSIhsVEQ3U8FA+VXb/NBPoWARiNSpN43LdAVIVqomr5plnBsA1pv4FYURpbs+ -8BgJYGIjMaEHB7gDa21+UDzgX3vSyC/WtF/AFnWt5twNNfOsYpt9Fkc39snQ56c/ITPsA2lL -w4e+KgePyeW1rY+j+zmzPWAd/vvpmMM386tsWVxVFYoy7RwV5eVOT2dTj5zzLlVHwyG7h6mw -3zUx1RG5cqnOosc8BmUklUVWhZ60amBrgEznGUlrX8Yd34ewIQX4nCtN0e3pAVAsHc5bCtxp -cK5ZvLCY59jiL3jEBz9lX1oKKsJDENwDimd4MjdowU6PDUnKHldgm/+bu5u1knHIST2gDc8Z -Qfieh9xkzDimqIUXblCFYCFYQBbvlvZQmkCpJnWwYDbC9RXPmXB8FdBZJO93tWrW6ep3pECC -JXrTe2GN4UCPIrJg/ST6VtZJEnohbKF9D7mN67FGQB0BRdMiJO8Sabe8gpSJytPWmbMtzOTh -o6UfSVB47FCyNj92V93Thg7tDne1jlOerdRIlJ4cOE5rSQfTw0FZ5JFzSUdx/S4xKyJgzC5n -dWk/BFq5h9ENiPu1eOuh01jsj/aG0sUaI26uMxKIXriPh18TBCQ5F3Y5E3ruc3d0ebuBQ0TD -PNeMPdRCyoonOIFYfvefvYEm/rlV+F55tbRGedKj3e0OQW4Akr5AnTooOZ+TyBDqVVglBVt4 -/TvMwHyXFJgcVkV2iM3xFNpHo3ESwqRXQa7YTLD9+pw16FjmqcAA0TTeo6oCbomUfZxMmNkj -PRorR7FVReCvv/lDoU+92JuW0+Zu01ahcfRm5D3+fkhGcyzPOyDjWjJbkcjIwYOb5VuTundQ -S/WRxvbMQC6B7g7D4dOVL6Mc9npf6Iv7N0OIvcu2kwsMoO7A8sftPjlDe3JS2j5JJHZPrl1y -qjq/bEFAMRIhMxnmn8myzqP7PvHgQeWiJ4E9+xOVAiPmC+NB4uOZQ+g+blUC0sIpECFRWHOa -2/fn+4WJFHKuD/0RJWvHaY9g2/VUjwaqjAEwCxbtfrMitonBd1sg3yR7ieIvNtZGsHHrTTin -Jla9ezWfQwqX2YqVYCIY4h0K+yMaoGlTeskKa9wS7CRkP0OkEU9x4UEO+fOxe3/ys/PNdD0a -tjL6vn3M8hT2p+VpBYOt6p0f7FK7S000F9A7RR3zuJ+LylYeL+oryFKy65zGF8JWRzFsi9KT -lp5ZxIussmel+tnNqce12fdONOvkZ9zKIDQYN9tsaciapKen7VUtqBlrq6IcWvrMuvGFxffk -qkuzANaquSzE0kGjDb6Cto2EX4dnHn40eRZiVL/oPbt2tR5NMC4VbG48698WY/LuLdAt6Jhc -nEnWYlpGyKxC/cj7gi/o7UW0fEPe0puiiBVOrTkcZi+mmO5HYmdbmrlgR98f+KqPRQDfoyb4 -1KomwYTGA+pzuRjzID66j13tNHMvrDwKIGIn4z0qpX9zgOAd43iLTLJid41xBxV7HeV5Q4/H -Oo723+0fCxjFHfw/MkRopBmfcoq99VkXOzkAE6UYDmtu7hLSUxRTh+bCqTpckK7mHQDCLQ+t -Ir9S1tmjSYh3pHJ9FlQ4j0GBX1/vk1VSyykyIzp3OBp8plKkeld4VPPXuFdUBVMcfXfkim+9 -h15agwOL9RD3TwfQ0s8Qb0o6j/EpW8/bL+Pkud89gcNu0KTkN4lkLpZhulhLt4tWa/saI8gK -soxCFVpUZm1fy4r60d5JRqwI/X/l8YPcykFcz7BNkScn6E9UBXHJ0MO+lpVTTC68JUbLf2VW -xzIkQkWkbBZJX+1Oyy/mzb73Hp+D482lFLRF3jxNicDUce8qcUMb1BqomPo6F7vFj+BxCxMh -BXapfMCvJO0ZskexkiQHlv3AQreD5mithzwA7amoU+J/FtA9XVVioBJCP1aiF1BiKu0xTHUu -NXVJih1Zp8zbtAVxGQBzg595bIj4elrDZ/U+8FXvK1fRTwznxHhN1vmFmJzTGGqKUSo8ExPP -5QyGuoMK3sITrHlCSFftm36EgqFRaS6R2zq2ChC2R2PlBkv4XjNsbyXGPZUCXiI1EKMP0UpR -ZmRfiwj7+5q1Q0XkGs9hBqBZh3WYVYyiIDDEy593ZiUzVjXqtn6jt7/uiB1BWrMpUdEv+Q7s -x0bTLYIAn0EwjIoTrbOF3VncQlnomqtgXNfET+2Hq90ICEZ0rg3rXL1zIg/AnBkeFN0Ghuig -rly29MZS9KlxW7fp+BzN51LnLC7Z8jWMfQ94NIVUxe1yVTWZlhYTeSBACQogL5uJ0nYvwOTs -GGzkmI5SWT1OuaPovi45tWDo4rK27nyqRDsW64IYHE1fhl5qySj/nVrWw/QoyTMsFfR67fnZ -NhYxjqpatMLmIO++TOZV9n8qCMseePW/uo8DV1A3iWJ2FkNzpaZ0PACD8ZQvYUfHm5K1zAbK -M+et3uGKHt3g0/ep5E7yTe2g1DX0FGEudJoSwdyVKiQ2asaWLffQYEyKqs5fkZb9M/Gja8TY -6UZ55shpn0jMUiKCK08PjrswwB3a9xQs+lO4La47cC73RCbrI3GdU/OFbjfcF/ZamqSSy8e0 -/Ij/kmQ89jx8dFKCUq/VLUNPrzxB9Tca+nmg2gTM0993moKWyOo9lI4DasiTNa18xf4FOcfa -xWvOXXrZN4pNXk+1MDigmzwKATMUUwOrqaTsG089eB5QAiDeMcDBoUrkXHocUKhqXdRDPNeX -SzhZrToZQwGO15P1ssnKEuwd2872xhyePgvohWWysmzmRtgQQ+iItabYeJZqoWYurXxSdnI6 -MtJZFEYhNjg5esi3QYscJ1/CcZwSKNjOGL4/0nHpL92kvYDlqH4zGi+I3lJhkwEEBffIH7mr -uFaSk7grc/AAoF3WSR3Kb3EmPXY7KZ/bYt5+I0B7TOv8MBOHtz0+3zTX3lWJ9PzEjsTnfgS8 -Yy/Yu4D30p/CKXYEu5svSHvmiaKIsHY+cd8wXnUtfsA20jNtDCphPO5MB80JB4sVTXyffylQ -IlvrBi12W4UXESrY9MXNJRfYxY3Ka7mTpz9LhdkWnMqk0ZAvH7zS53NLx6aqEmpz6QwDI3wS -GTxqf3kyt/tZrwL2DfKQFedDbq5jGPRVI3dqdkXMpjslTsdr4qrSZSARMeM5Uxqh5fNbp5Yc -ZzbzT/JTp8Fp1T2TqAwNf33mR7VC1X6xnEYdXexU4bL0ZI1CvjRFVCKyiwRV9kSfAxUtnHWN -HFm9S7LH9unaLJ9tTwFHxWRMP5vgrF0c3Tua1hCsou9LjCnVk9P85XJ/7zCoTITI9AgUE26k -F2NxRIYiE1TQDumIP2t2+OEfxymK/szdQP6p25ASe29XpsPNZRYCGMrd6gG2xEy9AFPtDI6o -jG9nB3FIqoPRfKn3u5eAUP67+8GRbKDt0S1MjWSqy5Ub4akAU15vComOJIOKbkblbH0lnzgj -yNuFpy3MnL9aN6sZ2Hn+iBX2LGcOTWjF3Fe6zDq7j7mUWJd6bqtxvDglw/zn+PxwTZ7uzIAZ -4LXqFZaKd0QBZ710+Z8gIpRkxIyrQwYtTYpNRVksESG0VCepQgPfe+X8XT0LhhJpYDfuMiIB -P01A3dl4hjjubKil9ghRDd4A8qNkuv5LKWIBZ/L/eyspnMCzSI+LwScLrvIndAkngXjt302k -1ELRwotkOqNopuJ/nPzp2vK6XcR3cZL9LPIZyc9LOpA3QKWHC5lrRWpM3jDGiYj1Y+PxFNAK -OcONp1I36MPN29TJzvNmDYL/QZguKfgHSTBDeg2EwCAayAC4MbazxPVwFRoMQzIQ4RAqcsMl -GE7UbLDCF+TsxikEyYuoOZRxHxaNtZ6bs54Z3CR7k1zjdtnID43oRFnJHtz5i7ARhVJG9bAu -HWyujUACLvI8Wz2TK69cefvSCO6pFOP3+XpRXh8Np12NPiTXqdctOg8arDtAeWz363oZJxQv -1aeZ6hanI8UfzikarPt0/rc96yADRaH7Ke4xuQ5uKlMjmmn2poL+VBvRW4/bME7q50Xqkqa6 -Wj+Q4uuYSMTRg86DCK024Wh3/dn3tu9urhOJqGnLkE6swFpts9azZ1oSUS5XqUA9DcSazasl -defH+tDV4qqs+jXVlXD1TR+MlfnOEH/3xq/G16q/P/Z1dDBw5e7ZwN7Ytz0wnVmxX/AX+yIy -DxDfmP5ji5qRvFuq8nXjPA+zgYcwECXBG1BFPrcDvLwhxOTVcEOVvBfHPoAxEjnGbHWGo/HE -ciZghOugqbWJl4BSPv/S+1FuWU52Kosm7zvzoQRSUzpzdJCuPczvIH/XoOL9jU3digcG7PLM -rbnzecMdh3FVPgckbNFz3BfaU/2tPBrR2Nw7MOt1XpIlTbQdmlCZ+dU6IsAil5uBcIrq+yYY -WgWsOQLZ7szdWIoJ+jQAzjektlilHpeK6aS6yvs57LHq+r+xH9oNwqxs2tuEfFARgyxiAu1p -hsAw7dg6L5/8aQ/vot3qRrPFbF1oB79uCAhZ87zuT8WSvWfb14JvwX5snIfdVpUhRjG/NglF -fESZL39uVXlNuL9BQSWhTrYtHTh3A7fi1mlaPgqJ8Gzmc1RBHmm3v5EmRHupCjdlQMaSaxER -Kth39egpKrqMRf+BbDIlkpAF07xAZful0yt0Fk5Hj1WXauKvJRj1HMg/gW47rtpgeZiI5SL9 -LlPXR20wywN/7gOszEBC+QajcCIcSMWyGZrzi4xGG5bn4+S7T8CjDaHASKsCojEtut/ceeUg -W9E9guSMxAsQCxJsXfwpvYg+8s4d2/nU0aLG8dEWiC3+ACkiA/b/csnFsItN9p83geqm4v7T -4T/cjCf4QHn0w6ecBZI3TlibOQlZfug6nXOHD9RfZIAuyYJj/BpCxubp+eMaUokOkk7ksSik -DAeCfYgSbuZnLU614u1qsZQHqfTdOZ6yqQKxemiGaMcgbRrd+AKtX8kppkkTtvz60ZXzhqm1 -FTbUqtpa5KM/tO2QsJEMSDyUZs/wvYLFjjxbWazkuJ5CbU6gYKixkjV1QdAKUJBiVPxxLdwu -qbzgee17PcSfaew6ujEpvlYJomyYl157DPAaqUJAelKarZxhHrlDRKi8hjqsp7MYiDMDYW01 -zkRPvbC00UYoiuaOHI6//8LiUYEk3GzbcOs7DFFbvIzMvOcECP7Rdjw3HhSuMn079UP0hY4Y -GYZuh922gyAgI3AP5vHv6YzAEMAf/nHogfOx2AdXEtBCtg2KNXBhiF3MT25SbT2HnupiGKyk -4qpJAhHpT5up69TV+g7cZPP2Ldr/B81+Y4vRnFrUUIjjqfek7nP0MknSXbaC5cSKznr/A5NO -jpdiG65Cf+dNIqRYUEsHCBQD9LxwJwAA0TEAAFBLAQIeAxQACQAIAK2Ca08UA/S8cCcAANEx -AAAKABgAAAAAAAAAAADAgQAAAABtYWNyby54bHNtVVQFAAN1fMlddXgLAAEE6AMAAAQAAAAA -UEsFBgAAAAABAAEAUAAAAMQnAAAAAA== - ---984yO3ROVIk2UaW1-- - diff -Nru spamassassin-3.4.6/xt/data/spam/phishing_openphish.eml spamassassin-4.0.0~rc3/xt/data/spam/phishing_openphish.eml --- spamassassin-3.4.6/xt/data/spam/phishing_openphish.eml 2019-02-10 08:54:17.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/phishing_openphish.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Received: from google-public-dns-a.google.com (google-public-dns-a.google.com [8.8.8.8]) - by in.example.com (Postfix) with ESMTPS - for ; Wed, 18 Jul 2018 21:12:22 +0200 (CEST) -Received: by google-public-dns-a.google.com with SMTP id f21-v6so3811271wmc.5 - for ; Wed, 18 Jul 2018 12:12:22 -0700 (PDT) -From: -To: test@example.com -Subject: Phishing Test OpenPhish -Date: Wed, 18 Jul 2018 12:12:00 -0700 (PDT) -MIME-Version: 1.0 -Message-Id: <20011206235802.4FD6F1143D6@gmail.com> - - - -OpenPhish - - diff -Nru spamassassin-3.4.6/xt/data/spam/phishing_phishtank.eml spamassassin-4.0.0~rc3/xt/data/spam/phishing_phishtank.eml --- spamassassin-3.4.6/xt/data/spam/phishing_phishtank.eml 2019-08-09 05:55:28.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/phishing_phishtank.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Received: from google-public-dns-a.google.com (google-public-dns-a.google.com [8.8.8.8]) - by in.example.com (Postfix) with ESMTPS - for ; Wed, 18 Jul 2018 21:12:22 +0200 (CEST) -Received: by google-public-dns-a.google.com with SMTP id f21-v6so3811271wmc.5 - for ; Wed, 18 Jul 2018 12:12:22 -0700 (PDT) -From: -To: test@example.com -Subject: Phishing Test PhishTank -Date: Wed, 18 Jul 2018 12:12:00 -0700 (PDT) -MIME-Version: 1.0 -Message-Id: <20011206235802.4FD6F1143D6@gmail.com> -Content-Type: text/html; charset=UTF-8 - - - -PhishTank - - diff -Nru spamassassin-3.4.6/xt/data/spam/razor2 spamassassin-4.0.0~rc3/xt/data/spam/razor2 --- spamassassin-3.4.6/xt/data/spam/razor2 2021-01-18 05:36:12.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/razor2 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -From info@presidentsummit2021.info Sat Jan 16 17:41:58 2021 -DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; s=default; d=presidentsummit2021.info; - h=Message-ID:Date:Subject:From:Reply-To:To:MIME-Version:Content-Type:List-Unsubscribe:List-Id; i=info@presidentsummit2021.info; - bh=zCmdjXCkxF7SXehJvLELwjWIpFs=; - b=1zD+yqjMCkkPLJ1VWPlx5VNRgSOmQyhalItexvfsHcuPkTbs7kniBWH99Kd0az5cKw0uZd9wkERP - 2yhT4+KX6uY6hb9FWsbGGeZGXW7j948QdHIsO1FwfECH5wfjgIPIknzno7SZ6qeWMBlW0y6e0bET - Ngp2Ga4Ik2JGXprNW6HK3yf+s/0X5a0uNmXq3vrYKeSzKJ7vudPgE+5zmnTlBkk9pzjR9fE+vGhV - iwVPNr4nWUka27w6ebzskyiN5T3xUcPxrd9UXJ+yBQesO19jOvDjbGBFAClmmRQrMuxtdzEb/njF - Z7sfSMiNYYI+lMt04KXiiaESpATZ80ZrJ8qO0A== -DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=default; d=presidentsummit2021.info; - b=uMkknlU8C+GAM70ZbhmgIG1QwJVAyR2J3or3MC5rZdwPL5dBWSN3yCEwgK/cBptCtsW78enoZyyv - FFmcG+BILfK/b5DYPM21RjujHUQ4PPQE/nH7OtLAka8+w3S9x0lU4ldSpupgfgSAUvoMzqi43dwF - f68TdIOwHMpcql6WTud4kQCmip9LpdGVJe9e0wtqInf3qR/MmC4hRUJytdcnAAtpcA5coiYCJeRr - OMS4Y7UXoyXGMGAs9LNtDzlL2rcfvw7O7BqFKCicXVSOqj0VHovnhaftw/bW+TV81MOCGywDCkO/ - 8BP9Bx9X6xxTlyzGZiDjMv774BnatYcH1Peggg==; -Received: from presidentsummit2021.info (127.0.0.1) by ecow1.presidentsummit2021.info id h0dlrji19tki for ; Sat, 16 Jan 2021 22:41:58 +0000 (envelope-from ) -Return-Path: -Message-ID: <4b0231c00308db9c803683968797800d@presidentsummit2021.info> -Date: Sat, 16 Jan 2021 22:41:58 +0000 -Subject: RE: Campaign Leads -From: Rachel Griffin -Reply-To: Rachel Griffin -To: "redact@redact.com" -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="_=_swift_v4_1610836918_a9651a24a0eda1c77c572d4cb05bc287_=_" -X-Ybzc-Tracking-Did: 0 -X-Ybzc-Subscriber-Uid: gl421xmhpg4c3 -X-Ybzc-Mailer: SwiftMailer - 5.4.x -X-Ybzc-EBS: http://presidentsummit2021.info/emm/index.php/lists/block-address -X-Ybzc-Delivery-Sid: 1 -X-Ybzc-Customer-Uid: yc9451v43la86 -X-Ybzc-Customer-Gid: 0 -X-Ybzc-Campaign-Uid: zl108ds17n2de -X-Sender: info@presidentsummit2021.info -X-Report-Abuse: Please report abuse for this campaign here: - http://presidentsummit2021.info/emm/index.php/campaigns/zl108ds17n2de/report-abuse/mz251dhqpz1e6/gl421xmhpg4c3 -X-Receiver: redact@redact.com -Precedence: bulk -List-Unsubscribe: , - -List-Id: mz251dhqpz1e6 -Feedback-ID: zl108ds17n2de:gl421xmhpg4c3:mz251dhqpz1e6:yc9451v43la86 -X-KAM-Reverse: Passed - Reverse DNS of ip218.ip-51-83-191.eu/51.83.191.218 -X-Relay-Addr: 51.83.191.218 -X-Relay-Host: ip218.ip-51-83-191.eu -X-Relay-Time: Sat Jan 16 17:42:03 2021 -Status: RO - - ---_=_swift_v4_1610836918_a9651a24a0eda1c77c572d4cb05bc287_=_ -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - -Email marketing to your target audience(any city/any country) from our -database will generate massive leads and set appointments, we have -verified and targeted 60Mil B2B and 180 Mil B2C data for all -categories globally. We will share opens and clicks also with the -complete=C2=A0report -=C2=A0 *=C2=A0 =C2=A0Basic Plan: At=C2=A0$250=C2=A0we will send 100,000 Ema= -ils within a -month to your target audience -=C2=A0 *=C2=A0 =C2=A0Standard Plan: At $750 we will send 1Mil Emails within= - a -month to your target audience -=C2=A0 *=C2=A0 =C2=A0Premium plan: At $1,999 we will send 5Mil Emails withi= -n a -month to your target audience -Thanks and let me know if you wish to know more. -Rachel Griffin -Email Marketing -Unsubscribe -http://presidentsummit2021.info/emm/index.php/lists/mz251dhqpz1e6/unsubscri= -be/gl421xmhpg4c3/zl108ds17n2de - ---_=_swift_v4_1610836918_a9651a24a0eda1c77c572d4cb05bc287_=_ -Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - - - - - - - -

    Email marketing to your target audience(any city/any country) from our d= -atabase will generate massive leads and set appointments, we have verified = -and targeted 60Mil B2B and 180 Mil B2C data for all categories globally. We= - will share opens and clicks also with the complete=C2=A0report

    - -

    =C2=A0 *=C2=A0 =C2=A0Basic Plan: At=C2=A0$250=C2=A0we will send 100,000 = -Emails within a month to your target audience
    -=C2=A0 *=C2=A0 =C2=A0Standard Plan: At $750 we will send 1Mil Emails within= - a month to your target audience
    -=C2=A0 *=C2=A0 =C2=A0Premium plan: At $1,999 we will send 5Mil Emails withi= -n a month to your target audience
    -
    -Thanks and let me know if you wish to know more.

    - -

    Rachel Griffin
    -Email Marketing

    - -


    -
    -
    -Unsubscribe

    -3D"" - - - ---_=_swift_v4_1610836918_a9651a24a0eda1c77c572d4cb05bc287_=_-- - - diff -Nru spamassassin-3.4.6/xt/data/spam/relayUS.eml spamassassin-4.0.0~rc3/xt/data/spam/relayUS.eml --- spamassassin-3.4.6/xt/data/spam/relayUS.eml 2018-09-19 10:18:01.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/relayUS.eml 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) - by in.example.com (Postfix) with ESMTPS - for ; Wed, 18 Jul 2018 21:12:22 +0200 (CEST) -Received: by mail-wm0-f66.google.com with SMTP id f21-v6so3811271wmc.5 - for ; Wed, 18 Jul 2018 12:12:22 -0700 (PDT) -From: -To: test@example.com -Subject: Relay Country Test -Date: Wed, 18 Jul 2018 12:12:00 -0700 (PDT) -MIME-Version: 1.0 -Message-Id: <20011206235802.4FD6F1143D6@gmail.com> - - - -Dns - - diff -Nru spamassassin-3.4.6/xt/data/spam/spf1 spamassassin-4.0.0~rc3/xt/data/spam/spf1 --- spamassassin-3.4.6/xt/data/spam/spf1 2005-12-19 02:25:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/spf1 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Return-Path: -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: by proxy.google.com with SMTP id so1951389 for ; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b@persist.google.com> -Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST) -From: newsalerts-noreply@dnsbltest.spamassassin.org -To: jm-google-news-alerts@jmason.org -Subject: Google News Alert - spamassassin -MIME-Version: 1.0 -Content-Type: text/plain; charset="ISO-8859-1"; - -SWSOFT Unveils Plesk 7, Deployed by 1&1 -Web Host Industry Review - USA -... The software also features a newly designed Windows XP-like user interface, -is equipped SpamAssassin, an open source anti-spam tool, and includes -"Application ... - -See all stories on this topic: - - diff -Nru spamassassin-3.4.6/xt/data/spam/spf2 spamassassin-4.0.0~rc3/xt/data/spam/spf2 --- spamassassin-3.4.6/xt/data/spam/spf2 2005-12-19 02:25:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/spf2 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Return-Path: -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.156]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: by proxy.google.com with SMTP id so1951389 for ; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b@persist.google.com> -Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST) -From: newsalerts-noreply@dnsbltest.spamassassin.org -To: jm-google-news-alerts@jmason.org -Subject: Google News Alert - spamassassin -MIME-Version: 1.0 -Content-Type: text/plain; charset="ISO-8859-1"; - -SWSOFT Unveils Plesk 7, Deployed by 1&1 -Web Host Industry Review - USA -... The software also features a newly designed Windows XP-like user interface, -is equipped SpamAssassin, an open source anti-spam tool, and includes -"Application ... - -See all stories on this topic: - - diff -Nru spamassassin-3.4.6/xt/data/spam/spf3 spamassassin-4.0.0~rc3/xt/data/spam/spf3 --- spamassassin-3.4.6/xt/data/spam/spf3 2005-12-19 02:25:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/spam/spf3 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Return-Path: -Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.155]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) -Received: by proxy.google.com with SMTP id so1951389 for ; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST) -Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b@persist.google.com> -Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST) -From: newsalerts-noreply@dnsbltest.spamassassin.org -To: jm-google-news-alerts@jmason.org -Subject: Google News Alert - spamassassin -MIME-Version: 1.0 -Content-Type: text/plain; charset="ISO-8859-1"; - -SWSOFT Unveils Plesk 7, Deployed by 1&1 -Web Host Industry Review - USA -... The software also features a newly designed Windows XP-like user interface, -is equipped SpamAssassin, an open source anti-spam tool, and includes -"Application ... - -See all stories on this topic: - - diff -Nru spamassassin-3.4.6/xt/data/taintcheckplugin.pm spamassassin-4.0.0~rc3/xt/data/taintcheckplugin.pm --- spamassassin-3.4.6/xt/data/taintcheckplugin.pm 2010-02-15 17:47:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/taintcheckplugin.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -=head1 taintcheckplugin.pm - -To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf: - - loadplugin myTestPlugin - header MY_TEST_PLUGIN eval:check_test_plugin() - -=cut - -package myTestPlugin; - -use Mail::SpamAssassin::Plugin; -use Mail::SpamAssassin::Logger; -use strict; -use bytes; -use Test; - -our @ISA = qw(Mail::SpamAssassin::Plugin); - -# constructor: register the eval rule -sub new { - my $class = shift; - my $mailsaobject = shift; - - # some boilerplate... - $class = ref($class) || $class; - my $self = $class->SUPER::new($mailsaobject); - bless ($self, $class); - - print "registered myTestPlugin: $self\n"; - return $self; -} - -sub check_post_learn { - my ($self, $opts) = @_; - print "running check_end: $self\n"; - my $m = $opts->{permsgstatus}->{msg}; - - print "tainted get_header found\n" - if (is_tainted($m->get_header("Subject"))); - - # TODO? - # print "tainted get_all_metadata found\n" - # if (is_tainted($m->get_all_metadata())); - - print "tainted get_pristine_header found\n" - if (is_tainted($m->get_pristine_header("Subject"))); - print "tainted get_pristine found\n" - if (is_tainted($m->get_pristine())); - print "tainted get_pristine_body found\n" - if (is_tainted($m->get_pristine_body())); - - print "tainted get_body found\n" - if (is_tainted($m->get_body()->[0])); - print "tainted get_visible_rendered_body_text_array found\n" - if (is_tainted($m->get_visible_rendered_body_text_array()->[0])); - - # skip get_invisible_rendered_body_text_array; it produces no output - # on that msg (TODO) - - print "tainted get_decoded_body_text_array found\n" - if (is_tainted($m->get_decoded_body_text_array()->[0])); - print "tainted get_rendered_body_text_array found\n" - if (is_tainted($m->get_rendered_body_text_array()->[0])); - - return 1; -} - - -sub is_tainted { - # from perldoc perlsec - return ! eval { eval("#" . substr(join("", @_), 0, 0)); 1 }; -} - - -1; diff -Nru spamassassin-3.4.6/xt/data/testplugin2.pm spamassassin-4.0.0~rc3/xt/data/testplugin2.pm --- spamassassin-3.4.6/xt/data/testplugin2.pm 2010-02-15 17:47:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/testplugin2.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -=head1 testplugin2.pm - -To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf: - - loadplugin myTestPlugin - header MY_TEST_PLUGIN eval:check_test_plugin() - -=cut - -package myTestPlugin2; - -use Mail::SpamAssassin::Plugin; -use Mail::SpamAssassin::Logger; -use strict; -use bytes; - -our @ISA = qw(Mail::SpamAssassin::Plugin); - -# constructor: register the eval rule -sub new { - my $class = shift; - my $mailsaobject = shift; - - # some boilerplate... - $class = ref($class) || $class; - my $self = $class->SUPER::new($mailsaobject); - bless ($self, $class); - - $self->register_method_priority('extract_metadata', 200); - - print "registered myTestPlugin2: $self\n"; - return $self; -} - -sub extract_metadata { - my ($self, $opts) = @_; - my $msg = $opts->{msg}; - print "myTestPlugin2 extract_metadata: $self\n"; - - # note: this has to run after myTestPlugin has run, via the magic - # of priorities, otherwise 'Plugin-Meta-Test2' will not contain - # 'bar2'. - - if ($msg->get_metadata("Plugin-Meta-Test") =~ /bar/) { - $msg->put_metadata("Plugin-Meta-Test2", "bar2"); - } - return 1; -} - -1; diff -Nru spamassassin-3.4.6/xt/data/testplugin.pm spamassassin-4.0.0~rc3/xt/data/testplugin.pm --- spamassassin-3.4.6/xt/data/testplugin.pm 2010-02-15 17:47:58.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/testplugin.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -=head1 testplugin.pm - -To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf: - - loadplugin myTestPlugin - header MY_TEST_PLUGIN eval:check_test_plugin() - -=cut - -package myTestPlugin; - -use Mail::SpamAssassin::Plugin; -use Mail::SpamAssassin::Logger; -use strict; -use bytes; - -our @ISA = qw(Mail::SpamAssassin::Plugin); - -# constructor: register the eval rule -sub new { - my $class = shift; - my $mailsaobject = shift; - - # some boilerplate... - $class = ref($class) || $class; - my $self = $class->SUPER::new($mailsaobject); - bless ($self, $class); - - # the important bit! - $self->register_eval_rule ("check_test_plugin"); - $self->register_eval_rule ("check_return_2"); - $self->register_eval_rule ("sleep_based_on_header"); - - print "registered myTestPlugin: $self\n"; - return $self; -} - -# and the eval rule itself -sub check_test_plugin { - my ($self, $permsgstatus) = @_; - print "myTestPlugin eval test called: $self\n"; - - print "test: plugins loaded: ". - join(" ", sort $self->{main}->get_loaded_plugins_list()). - "\n"; - - my $file = $ENV{'SPAMD_PLUGIN_COUNTER_FILE'}; - if ($file) { - open (IN, "<$file") or warn; - my $count = ; $count += 0; - close IN; - - dbg("test: called myTestPlugin, round $count"); - - open (OUT, ">$file") or warn; - print OUT ++$count; - close OUT or warn; - } - - return 1; -} - -sub sleep_based_on_header { - my ($self, $permsgstatus) = @_; - my $secs = $permsgstatus->{msg}->get_header("Sleep-Time"); - chop $secs; - - if ($secs) { - warn "sleeping for $secs seconds..."; - sleep ($secs+0); - } - - return 1; -} - -sub check_return_2 { - return 2; -} - -sub extract_metadata { - my ($self, $opts) = @_; - my $msg = $opts->{msg}; - print "myTestPlugin extract_metadata: $self\n"; - $msg->put_metadata("Plugin-Meta-Test", "bar"); - return 1; -} - -sub per_msg_finish { - my ($self, $permsgstatus) = @_; - print "myTestPlugin finishing: $self\n"; - return 1; -} - -1; diff -Nru spamassassin-3.4.6/xt/data/validuserplugin.pm spamassassin-4.0.0~rc3/xt/data/validuserplugin.pm --- spamassassin-3.4.6/xt/data/validuserplugin.pm 2004-12-20 22:09:44.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/validuserplugin.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -=head1 WARNING - -This is a sample plugin, it may not work at all, so buyer beware. - -=cut - -package validuserplugin; - -use strict; -use bytes; - -use Mail::SpamAssassin::Plugin; - -use vars qw(@ISA); -@ISA = qw(Mail::SpamAssassin::Plugin); - -sub new { - my $class = shift; - my $mailsaobject = shift; - - # some boilerplate... - $class = ref($class) || $class; - my $self = $class->SUPER::new($mailsaobject); - bless ($self, $class); - - return $self; -} - -# test the method. only allow if the username is NOT iwillfail - -sub services_allowed_for_username { - my ($self, $options) = @_; - - my $username = $options->{username}; - - my $services = $options->{services}; - - $services->{bayessql} = 1 unless ($username eq 'iwillfail'); - - return; -} - -1; diff -Nru spamassassin-3.4.6/xt/data/whitelists/action.eff.org spamassassin-4.0.0~rc3/xt/data/whitelists/action.eff.org --- spamassassin-3.4.6/xt/data/whitelists/action.eff.org 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/action.eff.org 1970-01-01 00:00:00.000000000 +0000 @@ -1,586 +0,0 @@ -From alerts@action.eff.org Mon Aug 12 10:54:52 2002 -Return-Path: -Delivered-To: jm@localhost.netnoteinc.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 265A944100 - for ; Mon, 12 Aug 2002 05:52:11 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for jm@localhost (single-drop); Mon, 12 Aug 2002 10:52:11 +0100 (IST) -Received: from eug-app01.ctsg.com (firewall2.ctsg.com [216.210.226.98]) by - dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g7A6FDb11520 for - ; Sat, 10 Aug 2002 07:15:13 +0100 -Message-Id: <1418893.1028960179734.JavaMail.IWAM_EUG-APP01@eug-app01> -Date: Fri, 9 Aug 2002 23:16:19 -0700 (PDT) -From: Effector List -To: xxxxxxxx@xxxxx.xxx -Subject: EFFector 15.24: EFF Submits Comments to FCC, Johansen Trial - Schedule Update -MIME-Version: 1.0 -Content-Type: text/plain -Content-Transfer-Encoding: 7bit - -EFFector Vol. 15, No. 24 August 9, 2002 ren@eff.org - -A Publication of the Electronic Frontier Foundation ISSN 1062-9424 - - -In the 224th Issue of EFFector: - -* EFF Submits Letter to FCC Chairman Regarding BPDG Proposal -* Update on Intel Corp. v. Hamidi -* DeCSS Author Johansen's Trial Rescheduled -* Bunnie Presents Paper on XBox Reverse Engineering -* Thanks to DefCon! -* EFF Booth at LinuxWorld -* Deep Links: Baen Books' Releases Reader-Friendly E-Books -* Deep Links: Janis Ian on P2P -* Deep Links: Hometown Paper Discusses Rep. Coble's Support of - Berman P2P Hacking Bill -* Administrivia - - -For more information on EFF activities & alerts: http://www.eff.org/ - -To join EFF or make an additional donation: -http://www.eff.org/support/ - -EFF is a member-supported nonprofit. -Please sign up as a member today! --------------------------------------------------------------------- - -* EFF Submits Letter to FCC Chairman Regarding BPDG Proposal - -The Honorable Michael K. Powell Chairman Federal Communications -Commission 445 12th Street, S.W. Suite 8C453 Washington, DC 20554 - - -BY FACSIMILE, ELECTRONIC MAIL, AND POSTAL MAIL - -Dear Chairman Powell: - -I am writing to you today in regards to the digital television -Broadcast Flag; specifically, I write in response to Sen. Hollings' -and Representatives Dingell and Tauzin's letters of July 19, which -urged you to mandate the Broadcast Flag proposal outlined in the -final report of the Broadcast Protection Discussion Group. - -The Electronic Frontier Foundation (EFF) is a donor-supported -non-profit organization that works to uphold civil liberties -interests in technology policy and law. EFF has played a critical -role in safeguarding crucial freedoms related to computers, the -Internet and consumer electronics devices, defeating the restriction -on strong cryptography exports; securing the legal principle that -Internet wiretaps must only proceed in conjunction with a warrant; -and defending academics, researchers and commercial interests -against DMCA-related prosecution. - -EFF was an active participant in the Broadcast Protection Discussion -Group. We attended the group's meetings and conference calls and -participated in the group's policy and technical mailing-lists. EFF -also maintains a web-site that was and is the only public source of -information on the Broadcast Flag negotiations and proposal. The -site can be found at http://bpdg.blogs.eff.org. EFF devoted -thousands of staff-hours to publicizing the existence and nature of -the BPDG to the public, to civil liberties and consumer-advocacy -groups, and to entrepreneurial companies and software authors whose -products were threatened by the proceedings. - -When you and I met at Esther Dyson's PC Forum last March, we spoke -briefly about the civil liberties interests that would be undermined -by the Broadcast Protection Discussion Group's mandate. The BPDG -proposal will have grave consequences for innovation, free -expression, competition and consumer interests. Worst of all, it -will add unnecessary complexity and expense to the DTV transition, -compromising DTV adoption itself. - -As you are aware, technologists have traditionally manufactured -those devices they believed would be successful in the market, often -in spite of the misgivings of rights-holders. From the piano roll to -the PVR, technologists have enjoyed the freedom to ship whatever -products they believe the public will pay for; what's more, -innovation has always thrived best where there were the fewest -regulatory hurdles. NTSC tuners and devices are governed by precious -few regulations, and consequently we see a rich field of products -that interact with them, from the VCR Plus to tuner-cards for PCs to -the PVR. The Broadcast Flag proposal would limit technologists to -shipping those products that met with the approval of MPAA member -companies. No entrepreneur or software author will know, a priori, -whether his innovative DTV product will be legal in the market until -he has gone to the expense of building it and taking it around to -the Hollywood studios for review. - -Consumers and industry alike have benefitted greatly from the "Open -Source" or "Free Software" movement, in which technologies are -distributed in a form that encourages end-user modification. From -server-software like the web-wide success-story apache, to operating -systems like GNU/Linux, to consumer applications like the Mozilla -browser, Free Software is a powerful force for innovation, consumer -benefit and commercial activity. The BPDG proposal implicitly bans -Free Software DTV applications -- such as the DScaler de-interlacer -and the GNU Radio software-defined radio program -- as these -applications are built to be modified by end-users, something that -is banned under the BPDG proposal. The tamper-resistance component -of the BPDG's "Robustness Requirements" will create and entire class -of illegal software applications, abridging the traditional First -Amendment freedom enjoyed by software authors who create expressive -speech in code form under one of several Free Software/Open Source -licenses. - -The BPDG nominally set out to create an objective standard, a bright -line that technologists could hew to in order to avoid liability -when deploying their products. However, the end product of the BPDG -was a "standard" that contained no objective criteria for legal -technology; rather, the standard required that new technologies be -approved by MPAA member companies. Not uncoincidentally, the only -technologies that were approved by the MPAA -- and hence the only -legal technologies -- were those produced by the 4C and 5C -consortia, a group of technology companies that acted as the MPAA's -allies throughout the BPDG process. This is an harbinger of the sort -of regime that the BPDG standard will usher in: technology companies -will be able to shut their competitors out of the marketplace by -allying themselves with Hollywood, brokering deals to allow certain -technologies and outlaw others. - -The marketplace is a proven mechanism for rapidly and efficiently -producing products that increase the value and desirability of new -technologies, such as DTV. A BPDG mandate would subvert the market -for DTV innovation. Competing companies with lower-cost DTV -technology alternatives would be restrained from bringing these to -market if they failed to assuage the MPAA's concerns about -unauthorized redistribution. Furthermore, the universe of -unauthorized-but-lawful uses for DTV programming will be shrunk down -to the much smaller space of explicitly authorized uses. The ability -of the public to make unauthorized-but-lawful uses of television -programming has been an historical force for increasing the value of -broadcast programming, from the VCR to the PVR. - -Ironically, the inevitable damage that a Broadcast Flag mandate -would do to innovation, competition and consumer interests can only -slow down DTV adoption, by driving up the cost of DTV devices while -reducing the number of desirable features that an open market would -create. If the public is offered less functionality for more money, -they will not flock to DTV. - -The most disheartening thing about the Broadcast Flag is that there -is neither a strong case that the Broadcast Flag is a necessary tool -for protecting copyright, nor that the Broadcast Flag would be -effective in that role. The existing practice of Internet -infringement of broadcast programming -- analog captures from -devices that satisfy the requirements of the BPDG proposal -- would -not be stopped by the presence of a Broadcast Flag. -Higher-resolution DTV signals will likewise present no challenge to -determined infringers, who can capture full-quality analog signal -from DTV devices and then re-digitize them, suffering only a single -generation's worth of loss-of-quality before the programming enters -the Internet. - -Meanwhile, the underlying rubric for a Broadcast Flag -- that -infringement will undermine Hollywood's business to the point that -movies will no longer be available to the public, reducing the value -of DTV -- is no more than superstition. No credible study or -analysis, undertaken by a neutral party, has ever been presented to -Congress, the FCC, the CPTWG or the BPDG supporting this notion. The -public is being asked to sacrifice its rights in copyright; industry -is being asked to place its right to innovation in the hands of -entertainers; the US government is being asked to mandate -extraordinary, unprecedented regulation of the $600 billion -technology sector -- all on the uncorroborated opinions of a few -studio executives. - -EFF welcomes the FCC's oversight of the Broadcast Flag issue. The -BPDG proceedings took place behind a shroud of secrecy, in a -looking-glass "public process" where only those participants the -organizers wanted to hear from were made privy to its existence, -where the co-chairs invented rules and processes on the fly to suit -the needs of the entertainment interests and the technology -companies that had privately secured a promise of a legal monopoly -for their products, where the press was banned. - -The FCC has an admirable tradition of seeking and weighing public -opinion in its proceedings. As the FCC considers the Broadcast Flag, -EFF hopes that it will start anew, setting aside the findings of the -BPDG in light of the concerns raised by Microsoft, Philips, Sharp, -Thomson, and Zenith, as well as non-profit organizations including -EFF, Consumers Union, Consumer Federation of America, the Free -Software Foundation, Public Knowledge, digitalconsumer.org, the -Center for Democracy in Technology, and the Computer and -Communications Industry Association. - -Thank you for attention in this matter. Please let me know if we can -be of any further assistance to you. - -Sincerely yours, - -Cory Doctorow for the Electronic Frontier Foundation - - - -Links: - -EFF's BPDG Blog: -http://bpdg.blogs.eff.org - -An overview of our concerns with the broadcast flag: -http://bpdg.blogs.eff.org/archives/one-page.pdf - -Letter from Sen. Hollings: -http://bpdg.blogs.eff.org/archives/000155.html - -Letter from Rep. Tauzin: -http://bpdg.blogs.eff.org/archives/000156.html - - --------------------------------------------------------------------- - -* Update on Intel Corp. v. Hamidi - -Intel Corp. v. Hamidi is now on appeal to the California Supreme -Court. EFF filed an amicus brief in support of Ken Hamidi on Aug. 6, -2002. The facts are simple: Over about two years, Hamidi on six -occasions sent e-mail critical of Intel's employment practices to -between 8,000 and 35,000 Intel employees. Intel demanded that Hamidi -stop, but he refused. Intel obtained an injunction barring Hamidi -from e-mailing Intel employees at their Intel e-mail addresses, -based on the common-law tort of "trespass to chattels." ("Chattel" -is a legal term that refers to personal property, as opposed to -property in land.) - -EFF's amicus brief argues three main points. - -(1) Intel did not qualify for relief under "trespass to chattels" -because Intel's e-mail servers were not themselves harmed by -Hamidi's e-mails. If Intel was harmed, it was because the content of -Hamidi's e-mails affected Intel employees, not because sending the -e-mails affected the functioning of Intel's servers. - -(2) By focusing on unwanted "contact" with the chattel and ignoring -the harm requirement, the court of appeal turned "trespass to -chattels" into a doctrine that threatens common Internet activity -like search engines and linking. For example, if a website posted a -"no trespassing" sign, any "contact" by a search engine could be -considered a trespass even if it caused no harm. - -(3) The court of appeal wrongly held that the injunction did not -infringe Hamidi's freedom of speech. The First Amendment limits -private parties' legal remedies in many areas of law, such as libel, -out of concern that private parties will use the law to suppress -criticism. The same principle should apply here, where Intel's -claims of harm stem from the meaning of Hamidi's speech. - - -Links: - -The Intel v. Hamidi Archive: - -http://www.eff.org/Cases/Intel_v_Hamidi/ - -- end - - --------------------------------------------------------------------- - -* DeCSS Author Johansen's Trial Rescheduled - -The trial of Norwegian teen Jon Johansen, who created the -controversial DeCSS software, has been pushed back again. It is now -scheduled to be heard on December 9, 2002, in Oslo, Norway. In the -fall of 1999, Johansen and his team reverse-engineered the content -scrambling system (CSS) software used to encrypt DVDs in an effort -to build a DVD player for the Linux operating system. In January of -2002, the Norwegian Economic Crime Unit (OKOKRIM) charged Johansen -with a violation of Norwegian Criminal Code Section 145.2, which -outlaws breaking into a third-party's property in order to steal -data that one is not entitled to. This prosecution marks the first -time the law will be used to prosecute a person for accessing his -own property (his own DVD). Johansen faces two years in prison if -convicted. The prosecution is based on a formal complaint filed by -the Motion Picture Association. - -The trial had originally been scheduled to take place in June of -2002 but was rescheduled when the court could not find any qualified -judges to hear Johansen's case. Now the case is scheduled to be -heard by a three-judge panel. Help Jon in his battle against -Hollywood movie studios, donate to his legal defense fund at: - -http://www.eff.org/support/jonfund.html - -Links: - -The DeCSS/Johansen Archive: -http://www.eff.org/IP/Video/DeCSS_prosecutions/Johansen_DeCSS_case/ - -Digital Rights Management Archive: -http://www.eff.org/IP/DRM/ - -- end - - --------------------------------------------------------------------- - -* Bunnie Presents Paper on XBox Reverse Engineering - -Paper Explains Flaw in Videogame Security System - -Researcher Escapes Chilling Effect of Digital Copyright Law - -Electronic Frontier Foundation Media Advisory - -For Immediate Release: Thursday, August 9, 2002 - -San Francisco - The Electronic Frontier Foundation (EFF) is pleased -to announce that former MIT doctoral student Andrew "Bunnie" Huang -will present a paper explaining a security flaw in the Microsoft -Xbox (TM) videogame system. - -Huang will present his paper, "Keeping Secrets in Hardware: the -Microsoft X-BOX Case Study," at 5:25 p.m. PDT on August 13, 2002, at -the 2002 Workshop on Cryptographic Hardware and Embedded Systems -(CHES 2002) in Redwood City, California (Aug. 13-15, 2002). - -The Xbox security system is intended to allow people to play only -videogames authorized by Microsoft. Huang's paper "shows how a -person could defeat that system with a small hardware investment," -said MIT Professor Hal Abelson, one of Huang's advisors. "More -importantly, the paper relates the security vulnerability to a -general design flaw shared by other high-profile security systems -such as the government's Clipper Chip and the movie industry's -Contents Scrambling System (CSS) for DVD players." - -Huang contacted EFF in March after his advisors told him that his -preliminary findings raised potentially significant legal questions. -With the help of Boston College law professor Joe Liu, EFF worked -with Huang, Abelson, and MIT administrators to analyze the legal -issues and draft letters notifying Microsoft of Huang's research -findings and intended publication, one of the steps encouraged by -Digital Millennium Copyright Act (DMCA). - -Microsoft told Huang and Abelson that while it might prefer that the -paper not be published, it would be inappropriate to ask MIT to -withhold the paper. - -"Microsoft deserves praise for making no attempt to control -publication," said Abelson. "Their response shows that they value -academic freedom, and that they appreciate the critical role of -unfettered research and publication in advancing technology." - -Other companies have reacted otherwise, using the DMCA to threaten -researchers. The Recording Industry Association of America last year -warned Princeton Professor Edward Felten after his research team -exposed weaknesses in digital music security technologies. Last -month, Hewlett Packard (HP) threatened research collective SnoSoft -over exposing a security vulnerability in HP's Tru64 Unix operating -system. Soon after, HP clarified that it would not use the DMCA to -stifle research or impede the flow of information that would improve -computer security. - -Huang said that while he is glad he can openly present his paper, -"The DMCA clearly had a chilling effect on my work. I was afraid to -submit my research for peer review until after the EFF's efforts to -clear potential legal restraints." - -"Researchers should be analyzing security, not worrying about -getting sued," said EFF Senior Staff Attorney Lee Tien. - -Links: - -For this release: -http://www.eff.org/IP/DMCA/20020808_eff_bunnie_pr.html - -For Huang's paper: -ftp://publications.ai.mit.edu/ai-publications/2002/AIM-2002-008.pdf - -For the CHES program: http://islab.oregonstate.edu/ches/program.html - -EFF "Unintended Consequences: Three Years Under the DMCA" report: -http://www.eff.org/IP/DMCA/20020503_dmca_consequences.pdf - -RIAA sues Professor Edward Felten over SDMI: -http://www.eff.org/Legal/Cases/Felten_v_RIAA/ - -An article about Hewlett-Packard's threatening SnoSoft: -http://www.wired.com/news/technology/0,1282,54297,00.html - -- end - - --------------------------------------------------------------------- - -* EFF Thanks Defcon - -EFF thanks The Dark Tangent and other organizers of the DEF CON X -convention for their generous donation of exhibition space at DEF -CON (http://www.defcon.org/). DEF CON is an "underground" computer -security conference held each summer in Las Vegas. - -Links: - -Defcon Website: -http://www.defcon.com/ - -- end - - --------------------------------------------------------------------- - -* EFF Booth at LinuxWorld - -Come visit EFF at booth #488 at Linuxworld next week. We'll be -passing out information, good cheer, and a slew of new stickers. - -When: August 13 - 15 - 10a - 5p - -Where: Booth #5 - Moscone Center - 747 Howard Street - San Francisco, CA 94103 - -Links: - -LinuxWorld Conference Website: -http://www.linuxworldexpo.com/ - -Floor Map and EFF Booth: -http://www.linuxworldexpo.com/linuxworldexpo/v31/floorplan/floorplan -.cvn?b=97& exbID=50 - -- end - - --------------------------------------------------------------------- - -Deep Links - -Deep Links is a new department in the EFFector featuring noteworthy -news-items, victories and threats from around the Internet. - - -* Baen Books expands fair-use-friendly e-book program - -Baen Books will bind a CD-ROM into the October 2002 hardcover -edition of *War of Honor,* the latest volume in David Weber's epic -Honor Harrington space-opera. The CD will contain at least 22 -complete novels, all in open formats like html and RTF, with the -fair-use-friendly admonishment "This disk and its contents may be -copied and shared but NOT sold." Included on the disk are the entire -Honor Harrington series to date, as well as other titles from the -Baen line, including Keith Laumer's *Retief!* and Larry Niven and -Jerry Pournelle's *Fallen Angels*. - -Baen has been a banner-carrier for fair-use in electronic -publishing, shipping text and html files that can be played on a -multitude of devices. Other publishers have chosen to publish their -material in copy-controlled formats that make it impossible to -legally loan or resell the titles you purchase, are locked to a -specific device, can't play on every operating system, and -occasionally lock out assistive technology like the screen-readers -employed by the blind. - -Dmitry Skylarov, a Russian scientist, was arrested in July 2001, for -demonstrating how end-users could defeat the copy-prevention -employed by Adobe's e-book technology. Adobe asked the FBI to arrest -Skylarov for violating the Digital Millennium Copyright Act (DMCA), -which makes it a crime to describe techniques for circumventing -copy-prevention technology. Though Skylarov was later released, his -employer, ElcomSoft, is still facing charges in the USA, and the -Russian government has issued an advisory warning Russian scientists -to steer clear of American technical conferences until the DMCA is -repealed. - -Here is Baen's statement on the CD release: - -You are about to start playing with a CD-ROM that has fairly -extraordinary content. As of this writing it includes twenty-two -UNENCRYPTED novels in several formats, the ten Honor Harrington -Novels, 3 Honor Harrington Anthologies and 9 novels by friends of -Honor, and by the time of distribution it may well contain more. -(More than twenty novels for free, and with no stupid codes to work -around. Think of that.) The reason for the plethora of formats is to -try to please the people who want to read the novels on their Palm -Pilots or other text-specialized palm-sized devices. - -Links: - -Baen Books's page for *War of Honor*: -http://www.baen.com/orientation.htm - -Slashdot discussion of *War of Honor* release: -http://slashdot.org/article.pl?sid=02/08/03/2314232&mode=flat&tid= -149 - -EFF documents on Dmitry Skylarov and ElcomSoft: -http://www.eff.org/IP/DMCA/US_v_Elcomsoft/ - -EFF documents on the Digital Millennium Copyright Act (DMCA): -http://www.eff.org/IP/DMCA/ - -- end - - -* Singer/Songwriter Janis Ian on P2P Lucid article on the benefits of -peer-to-peer networks form an artists' perspective. -http://www.janisian.com/article-internet_debacle.html - -- end - - -* Hometown Paper Discusses Rep. Coble's Support of Berman P2P Hacking -Bill Column on how a good Representative can make a bad call. -http://www.news-record.com/news/columnists/staff/cone04.htm - -- end - - - --------------------------------------------------------------------- - -Administrivia - -EFFector is published by: - -The Electronic Frontier Foundation -454 Shotwell Street -San Francisco -CA 94110-1914 USA -+1 415 436 9333 (voice) -+1 415 436 9993 (fax) -http://www.eff.org/ - -Editor: Ren Bucholz, - Activist - ren@eff.org - -To Join EFF online, or make an additional donation, go to: -http://www.eff.org/support/ - -Membership & donation queries: -membership@eff.org - -General EFF, legal, policy or online resources queries: -ask@eff.org - -Reproduction of this publication in electronic media is encouraged. -Signed articles do not necessarily represent the views of EFF. To -reproduce signed articles individually, please contact the authors -for their express permission. Press releases and EFF announcements & -articles may be reproduced individually at will. - -To change your address, plese visit: -http://action.eff.org/subscribe/. - ->>From there, you can update all your information. If you have already -subscribed to the EFF Action Center, please visit: -http://action.eff.org/action/login.asp. - -(Please ask ren@eff.org to manually remove you from the list if this -does not work for you for some reason.) - -Back issues are available at: -http://www.eff.org/effector - -To get the latest issue, send any message to -effector-reflector@eff.org (or er@eff.org), and it will be mailed to -you automatically. You can also get it via the Web at: -http://www.eff.org/pub/EFF/Newsletters/EFFector/current. html - - -++++++++++++++++++++++++ -You received this message because aaaaaa@yyyyyy.zzz is a member of -the mailing list originating from alerts@action.eff.org. To unsubscribe from -all mailing lists originating from alerts@action.eff.org, send an email to -alerts@action.eff.org with "Remove" as the only text in the subject line. - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/amazon_com_ship spamassassin-4.0.0~rc3/xt/data/whitelists/amazon_com_ship --- spamassassin-3.4.6/xt/data/whitelists/amazon_com_ship 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/amazon_com_ship 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Received: (qmail 10120 invoked by uid 505); 14 Jun 2002 19:55:43 -0000 -Received: from ship-confirm@amazon.com by zzzzzzzz.iiiiiiiii.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.174777 secs); 14 Jun 2002 19:55:43 -0000 -Received: from localhost (127.0.0.1) - by localhost with SMTP; 14 Jun 2002 19:55:42 -0000 -Delivered-To: zzzzzzzzz-com-popbox@zzzzzzzzz.com -Received: from mail.zzzzzzzzz.com [64.124.162.104] - by localhost with POP3 (fetchmail-5.9.0) - for zzzzzzzzz@localhost (single-drop); Fri, 14 Jun 2002 15:55:42 -0400 (EDT) -Received: (qmail 32249 invoked by uid 1002); 14 Jun 2002 19:55:17 -0000 -Delivered-To: zzzzzzzzz-com-rod@zzzzzzzzz.com -Received: (qmail 32245 invoked from network); 14 Jun 2002 19:55:17 -0000 -Received: from unknown (HELO sas-dc-mail-102.amazon.com) (207.171.190.155) - by mail0.tyva.netherweb.com with SMTP; 14 Jun 2002 19:55:17 -0000 -Received: by sas-dc-mail-102.amazon.com (Postfix, from userid 1001) - id 0578E3F41; Fri, 14 Jun 2002 19:55:17 +0000 (GMT) -To: rod@zzzzzzzzz.com -From: ship-confirm@amazon.com -Subject: Your Amazon.com order has shipped (#888-4444444-9999999) -Message-Id: <20020614195517.0578E3F41@sas-dc-mail-102.amazon.com> -Date: Fri, 14 Jun 2002 19:55:17 +0000 (GMT) - -[Amazon shipping confirmation] - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/amazon_co_uk_ship spamassassin-4.0.0~rc3/xt/data/whitelists/amazon_co_uk_ship --- spamassassin-3.4.6/xt/data/whitelists/amazon_co_uk_ship 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/amazon_co_uk_ship 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Received: (qmail 24448 invoked by uid 505); 3 Jun 2002 13:35:25 -0000 -Received: from orders@amazon.co.uk by zzzzzzzzz.azzzzzzzzzzz.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.342757 secs); 03 Jun 2002 13:35:25 -0000 -Received: from localhost (127.0.0.1) - by localhost with SMTP; 3 Jun 2002 13:35:24 -0000 -Delivered-To: zzzzzzzzz-com-popbox@zzzzzzzzz.com -Received: from mail.zzzzzzzzz.com [64.124.162.104] - by localhost with POP3 (fetchmail-5.9.0) - for zzzzzzzzz@localhost (single-drop); Mon, 03 Jun 2002 09:35:24 -0400 (EDT) -Received: (qmail 3226 invoked by uid 1002); 3 Jun 2002 13:34:30 -0000 -Delivered-To: zzzzzzzzz-com-rod@zzzzzzzzz.com -Received: (qmail 3224 invoked from network); 3 Jun 2002 13:34:29 -0000 -Received: from unknown (HELO aprilia.amazon.com) (207.171.190.156) - by mail0.tyva.netherweb.com with SMTP; 3 Jun 2002 13:34:29 -0000 -Received: from matchless.amazon.com (matchless.amazon.com [10.16.42.218]) - by aprilia.amazon.com (Postfix) with ESMTP id 2A30D55C - for ; Mon, 3 Jun 2002 06:34:29 -0700 (PDT) -Received: from vdc-dc-batch-101.vdc.amazon.com by matchless.amazon.com with ESMTP - (crosscheck: vdc-dc-batch-101.vdc.amazon.com [10.30.41.134]) - id g53DMcd9000547 - for ; Mon, 3 Jun 2002 06:34:28 -0700 -Received: by vdc-dc-batch-101.vdc.amazon.com -Date: Mon, 3 Jun 2002 13:12:54 GMT -Message-Id: -To: rod@zzzzzzzzz.com -From: orders@amazon.co.uk -Subject: Your Amazon.co.uk order has been dispatched (#999-4444444-3333333) - -[amazon.co.uk order] - diff -Nru spamassassin-3.4.6/xt/data/whitelists/cert.org spamassassin-4.0.0~rc3/xt/data/whitelists/cert.org --- spamassassin-3.4.6/xt/data/whitelists/cert.org 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/cert.org 1970-01-01 00:00:00.000000000 +0000 @@ -1,347 +0,0 @@ -Received: from geb.xxxxxx.gen.nz (geb.xxxxxx.gen.nz [210.55.106.161]) - by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g6N1Tc414637 - for ; Tue, 23 Jul 2002 02:29:38 +0100 -Received: from uuuuuu by geb.xxxxxx.gen.nz with local (Exim 3.35 #1 (Debian)) - id 17WoTo-0002EQ-00 - for ; Tue, 23 Jul 2002 13:28:48 +1200 -Received: from mail by geb.xxxxxx.gen.nz with spam-scanned (Exim 3.35 #1 (Debian)) - id 17WoTm-0002ED-00 - for ; Tue, 23 Jul 2002 13:28:47 +1200 -Received: from firewater.pppppp.co.nz ([203.109.253.55]) - by geb.spit.gen.nz with esmtp (Exim 3.35 #1 (Debian)) - id 17WoTl-0002E6-00 - for ; Tue, 23 Jul 2002 13:28:45 +1200 -Received: from scanner1.pppppp.co.nz (scanner1.pppppp.co.nz [203.109.254.21]) - by firewater.pppppp.co.nz (8.9.2/8.9.2) with ESMTP id NAA13877 - for ; Tue, 23 Jul 2002 13:28:44 +1200 (NZST) -Received: from localhost ([127.0.0.1] helo=grunt2.pppppp.co.nz) - by scanner1.pppppp.co.nz with esmtp (Exim 3.12 #1 (Debian)) - id 17WoTk-0003Uv-00 - for ; Tue, 23 Jul 2002 13:28:44 +1200 -Received: from canaveral.red.cert.org [192.88.209.11] - by grunt2.pppppp.co.nz with esmtp (Exim 3.35 #1 (Debian)) - id 17WoTX-0004oQ-00; Tue, 23 Jul 2002 13:28:32 +1200 -Received: from localhost (lnchuser@localhost) - by canaveral.red.cert.org (8.9.3/8.9.3/1.12) with SMTP id TAA16990; - Mon, 22 Jul 2002 19:11:24 -0400 (EDT) -Date: Mon, 22 Jul 2002 19:11:24 -0400 (EDT) -Received: by canaveral.red.cert.org; Mon, 22 Jul 2002 19:05:32 -0400 -Message-Id: -From: CERT Advisory -To: cert-advisory@cert.org -Organization: CERT(R) Coordination Center - +1 412-268-7090 -List-Help: , -List-Subscribe: -List-Unsubscribe: -List-Post: NO (posting not allowed on this list) -List-Owner: -List-Archive: -Subject: CERT Advisory CA-2002-21 Vulnerability in PHP -X-Rcpt-To: uuuuuu@xxxxxx.gen.nz -Sender: Brent Addis - - - ------BEGIN PGP SIGNED MESSAGE----- - -CERT Advisory CA-2002-21 Vulnerability in PHP - - Original release date: July 22, 2002 - Last revised: -- - Source: CERT/CC - - A complete revision history can be found at the end of this file. - -Systems Affected - - * Systems running PHP versions 4.2.0 or 4.2.1 - -Overview - - A vulnerability has been discovered in PHP. This vulnerability could - be used by a remote attacker to execute arbitrary code or crash PHP - and/or the web server. - -I. Description - - PHP is a popular scripting language in widespread use. For more - information about PHP, see - - http://www.php.net/manual/en/faq.general.php - - The vulnerability occurs in the portion of PHP code responsible for - handling file uploads, specifically multipart/form-data. By sending a - specially crafted POST request to the web server, an attacker can - corrupt the internal data structures used by PHP. Specifically, an - intruder can cause an improperly initialized memory structure to be - freed. In most cases, an intruder can use this flaw to crash PHP or - the web server. Under some circumstances, an intruder may be able to - take advantage of this flaw to execute arbitrary code with the - privileges of the web server. - - You may be aware that freeing memory at inappropriate times in some - implementations of malloc and free does not usually result in the - execution of arbitrary code. However, because PHP utilizes its own - memory management system, the implementation of malloc and free is - irrelevant to this problem. - - Stefan Esser of e-matters GmbH has indicated that intruders cannot - execute code on x86 systems. However, we encourage system - administrators to apply patches on x86 systems as well to guard - against denial-of-service attacks and as-yet-unknown attack techniques - that may permit the execution of code on x86 architectures. - - This vulnerability was discovered by e-matters GmbH and is described - in detail in their advisory. The PHP Group has also issued an - advisory. A list of vendors contacted by the CERT/CC and their status - regarding this vulnerability is available in VU#929115. - - Although this vulnerability only affects PHP 4.2.0 and 4.2.1, - e-matters GmbH has previously identified vulnerabilities in older - versions of PHP. If you are running older versions of PHP, we - encourage you to review - http://security.e-matters.de/advisories/012002.html - -II. Impact - - A remote attacker can execute arbitrary code on a vulnerable system. - An attacker may not be able to execute code on x86 architectures due - to the way the stack is structured. However, an attacker can leverage - this vulnerability to crash PHP and/or the web server running on an - x86 architecture. - -III. Solution - -Apply a patch from your vendor - - Appendix A contains information provided by vendors for this advisory. - As vendors report new information to the CERT/CC, we will update this - section and note the changes in our revision history. If a particular - vendor is not listed below, we have not received their comments. - Please contact your vendor directly. - -Upgrade to the latest version of PHP - - If a patch is not available from your vendor, upgrade to version - 4.2.2. - -Deny POST requests - - Until patches or an update can be applied, you may wish to deny POST - requests. The following workaround is taken from the PHP Security - Advisory: - - If the PHP applications on an affected web server do not rely on - HTTP POST input from user agents, it is often possible to deny POST - requests on the web server. - - In the Apache web server, for example, this is possible with the - following code included in the main configuration file or a - top-level .htaccess file: - - - Order deny,allow - Deny from all - - - Note that an existing configuration and/or .htaccess file may have - parameters contradicting the example given above. - -Disable vulnerable service - - Until you can upgrade or apply patches, you may wish to disable PHP. - As a best practice, the CERT/CC recommends disabling all services that - are not explicitly required. Before deciding to disable PHP, carefully - consider your service requirements. - -Appendix A. - Vendor Information - - This appendix contains information provided by vendors for this - advisory. As vendors report new information to the CERT/CC, we will - update this section and note the changes in our revision history. If a - particular vendor is not listed below, we have not received their - comments. - -Apple Computer Inc. - - Mac OS X and Mac OS X Server are shipping with PHP version - 4.1.2 which does not contain the vulnerability described in - this alert. - -Caldera - - Caldera OpenLinux does not provide either vulnerable version - (4.2.0, 4.2.1) of PHP in their products. Therefore, Caldera - products are not vulnerable to this issue. - -Compaq Computer Corporation - - SOURCE: Compaq Computer Corporation, a wholly-owned subsidiary - of Hewlett-Packard Company and Hewlett-Packard Company HP - Services Software Security Response Team - x-ref: SSRT2300 php post requests - At the time of writing this document, Compaq is currently - investigating the potential impact to Compaq's released - Operating System software products. - As further information becomes available Compaq will provide - notice of the availability of any necessary patches through - standard security bulletin announcements and be available from - your normal HP Services supportchannel. - -Cray Inc. - - Cray, Inc. does not supply PHP on any of its systems. - -Debian - - Debian GNU/Linux stable aka 3.0 is not vulnerable. - Debian GNU/Linux testing is not vulnerable. - Debian GNU/Linux unstable is vulnerable. - The problem effects PHP versions 4.2.0 and 4.2.1. Woody ships - an older version of PHP (4.1.2), that doesn't contain the - vulnerable function. - -FreeBSD - - FreeBSD does not include any version of PHP by default, and so - is not vulnerable; however, the FreeBSD Ports Collection does - contain the PHP4 package. Updates to the PHP4 package are in - progress and a corrected package will be available in the near - future. - -Guardian Digital - - Guardian Digital has not shipped PHP 4.2.x in any versions of - EnGarde, therefore we are not believed to be vulnerable at this - time. - -Hewlett-Packard Company - - SOURCE: Hewlett-Packard Company Security Response Team - At the time of writing this document, Hewlett Packard is - currently investigating the potential impact to HP's released - Operating System software products. - As further information becomes available HP will provide notice - of the availability of any necessary patches through standard - security bulletin announcements and be available from your - normal HP Services support channel. - -IBM - - IBM is not vulnerable to the above vulnerabilities in PHP. We - do supply the PHP packages for AIX through the AIX Toolbox for - Linux Applications. However, these packages are at 4.0.6 and - also incorporate the security patch from 2/27/2002. - -Mandrakesoft - - Mandrake Linux does not ship with PHP version 4.2.x and as such - is not vulnerable. The Mandrake Linux cooker does currently - contain PHP 4.2.1 and will be updated shortly, but cooker - should not be used in a production environment and no advisory - will be issued. - -Microsoft Corporation - - Microsoft products are not affected by the issues detailed in - this advisory. - -Network Appliance - - No Netapp products are vulnerable to this. - -Red Hat Inc. - - None of our commercial releases ship with vulnerable versions - of PHP (4.2.0, 4.2.1). - -SuSE Inc. - - SuSE Linux is not vulnerable to this problem, as we do not ship - PHP 4.2.x. - _________________________________________________________________ - - The CERT/CC acknowledges e-matters GmbH for discovering and reporting - this vulnerability. - _________________________________________________________________ - - Author: Ian A. Finlay. - ______________________________________________________________________ - - This document is available from: - http://www.cert.org/advisories/CA-2002-21.html - ______________________________________________________________________ - -CERT/CC Contact Information - - Email: cert@cert.org - Phone: +1 412-268-7090 (24-hour hotline) - Fax: +1 412-268-6989 - Postal address: - CERT Coordination Center - Software Engineering Institute - Carnegie Mellon University - Pittsburgh PA 15213-3890 - U.S.A. - - CERT/CC personnel answer the hotline 08:00-17:00 EST(GMT-5) / - EDT(GMT-4) Monday through Friday; they are on call for emergencies - during other hours, on U.S. holidays, and on weekends. - -Using encryption - - We strongly urge you to encrypt sensitive information sent by email. - Our public PGP key is available from - http://www.cert.org/CERT_PGP.key - - If you prefer to use DES, please call the CERT hotline for more - information. - -Getting security information - - CERT publications and other security information are available from - our web site - http://www.cert.org/ - - To subscribe to the CERT mailing list for advisories and bulletins, - send email to majordomo@cert.org. Please include in the body of your - message - - subscribe cert-advisory - - * "CERT" and "CERT Coordination Center" are registered in the U.S. - Patent and Trademark Office. - ______________________________________________________________________ - - NO WARRANTY - Any material furnished by Carnegie Mellon University and the Software - Engineering Institute is furnished on an "as is" basis. Carnegie - Mellon University makes no warranties of any kind, either expressed or - implied as to any matter including, but not limited to, warranty of - fitness for a particular purpose or merchantability, exclusivity or - results obtained from use of the material. Carnegie Mellon University - does not make any warranty of any kind with respect to freedom from - patent, trademark, or copyright infringement. - _________________________________________________________________ - - Conditions for use, disclaimers, and sponsorship information - - Copyright 2002 Carnegie Mellon University. - - Revision History -July 22, 2002: Initial release - - - - ------BEGIN PGP SIGNATURE----- -Version: PGP 6.5.8 - -iQCVAwUBPTyOVqCVPMXQI2HJAQGK6QQAp1rR7K18PNxpQZvqKPYWxyrtpiT8mmKN -UuyERmOoX+5MAwH0hbAWCvVcyLH0gKGbTpBkRgToT8IEHZojwHCzqOaMM9kni/FG -QEVeznLfBX4GIgZGPu0XWlph3ZqaayWln57eGueYZ26zBuriIUu2cUCmyYGQkqlI -tuZdnDqUmR0= -=+829 ------END PGP SIGNATURE----- - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/debian_bts_reassign spamassassin-4.0.0~rc3/xt/data/whitelists/debian_bts_reassign --- spamassassin-3.4.6/xt/data/whitelists/debian_bts_reassign 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/debian_bts_reassign 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -Received: from dogma.slashnull.org (dogma.slashnull.org [212.17.35.15]) - by zzzzzzzzzzzzzz.zzz (Postfix) with ESMTP id 498AA132505 - for ; Thu, 1 Aug 2002 14:22:07 -0700 (PDT) -Received: from intm3.sparklist.com (intm3.sparklist.com [207.250.144.9]) - by dogma.slashnull.org (8.11.6/8.11.6) with SMTP id g71LN6230402 - for ; Thu, 1 Aug 2002 22:23:06 +0100 -Message-Id: -To: Colin Watson -Subject: Processed: reassign 126111 to cdimage.debian.org -From: owner@bugs.debian.org (Debian Bug Tracking System) -Date: Thu, 27 Dec 2001 18:48:04 -0600 -Cc: unknown-package@qa.debian.org (pseudo-image-kit-2.0.zip #126111), Debian CD-ROM Team (cdimage.debian.org #126111) -In-Reply-To: -References: -Sender: Debian BTS - -Processing commands for control@bugs.debian.org: - -> reassign 126111 cdimage.debian.org -Bug#126111: 2.2_rev4/i386/binary-i386-1.list not up to date -Bug reassigned from package `pseudo-image-kit-2.0.zip' to `cdimage.debian.org'. - -> -End of message, stopping processing here. - -Please contact me if you need assistance. - -Debian bug tracking system administrator -(administrator, Debian Bugs database) - diff -Nru spamassassin-3.4.6/xt/data/whitelists/ibm_enews_de spamassassin-4.0.0~rc3/xt/data/whitelists/ibm_enews_de --- spamassassin-3.4.6/xt/data/whitelists/ibm_enews_de 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/ibm_enews_de 1970-01-01 00:00:00.000000000 +0000 @@ -1,311 +0,0 @@ -Return-Path: -Received: (qmail 21402 invoked by alias); 4 Jul 2002 13:36:52 -0000 -Received: (qmail 21361 invoked by uid 82); 4 Jul 2002 13:36:51 -0000 -Received: from info@isource.ibm.com by mailhost with qmail-scanner-1.00 (uvscan: v4.1.40/v4210. . Clean. Processed in 2.214854 secs); 04 Jul 2002 13:36:51 -0000 -Received: from isource.boulder.ibm.com (HELO isource.ibm.com) (207.25.249.18) - by mi-1.rz.ruhr-uni-bochum.de with SMTP; 4 Jul 2002 13:36:48 -0000 -Received: from isource.boulder.ibm.com (loopback [127.0.0.1]) - by isource.ibm.com (Postfix) with ESMTP id 0585052807 - for ; Thu, 4 Jul 2002 13:32:05 +0000 (CUT) -From: IBM Deutschland -Reply-To: webmaster@de.ibm.com -Subject: IBM eNews: Aktuelle Informationen von IBM -Content-Type: text/plain; -To: XXXXXX.YYYYYYYYYY@RUHR-UNI-BOCHUM.DE -Message-Id: <20020704133206.0585052807@isource.ibm.com> -Date: Thu, 4 Jul 2002 13:32:06 +0000 (CUT) - -IBM eNews -4. Juli 2002 - -Liebe Leserin, lieber Leser, - -zur Zeit findet in Wimbledon das diesjhrige Tennisturnier -statt - mit Hilfe von IBM auch online unter -http://www.wimbledon.org ein packendes Ereignis. - -Lesen Sie mehr ber diesem Internetauftritt und zu -zahlreichen weiteren Themen aus der IT-Branche in der -aktuellen Ausgabe von IBM eNews. - -Nutzen Sie die Mglichkeit, auf folgender Webseite aus ber -40 Interessensgebieten die Themen fr Ihre persnliche -IBM eNews Ausgabe auszuwhlen. Sie erhalten dann Business- -Informationen nach Ma: -http://www.ibm.com/de/profile/change_interests.html - -Alle Artikel knnen Sie jederzeit online auf dieser Webseite -aufrufen: -http://www.ibm.com/de/news/enews/online/ - -Wir halten Sie auf dem Laufenden -IBM eNews - -Wenn Sie in Zukunft IBM eNews nicht mehr erhalten mchten, -knnen Sie sich auf dieser Webseite abmelden: -http://www.ibm.com/de/profile/unsubscribe.html - - - -In der heutigen Ausgabe: -======================== - -e-business - - o Wimbledon gewinnt: Mit Hilfe von IBM auch online ein packendes Ereignis - http://isource.ibm.com/cgi-bin/goto?on=de020756 - - o Neues Buch "Deutschland Online" weist Weg in die - Informationsgesellschaft - http://isource.ibm.com/cgi-bin/goto?on=de020757 - - o Weitere Artikel aus dem Bereich "e-business" - http://isource.ibm.com/cgi-bin/goto?on=020758 - -Business Lsungen und Services - - o Mehr Training fr alle: IBM Learning Services Corporate Card - http://isource.ibm.com/cgi-bin/goto?on=020721 - - o Weitere Artikel aus dem Bereich "Business Lsungen und Services" - http://isource.ibm.com/cgi-bin/goto?on=020759 - -IT Solutions und Services - - o e-guide aktuell: Produkte und Lsungen fr den Mittelstand - - zusammengefasst im IBM Kundenmagazin! - http://isource.ibm.com/cgi-bin/goto?on=020710 - - o Sprechen Sie mit uns: Sicherheit ist Trumpf - http://isource.ibm.com/cgi-bin/goto?on=020712 - - o Weitere Artikel aus dem Bereich "IT Solutions und Services" - http://isource.ibm.com/cgi-bin/goto?on=020760 - -Software - - o Software fr den Mittelstand - http://isource.ibm.com/cgi-bin/goto?on=020711 - - o WebSphere Integration - http://isource.ibm.com/cgi-bin/goto?on=020724 - - o Weitere Artikel aus dem Bereich "Software" - http://isource.ibm.com/cgi-bin/goto?on=020761 - -Hardware - - o Neu: IBM ThinkPad A31p - Die erste mobile 3D-Workstation! - http://isource.ibm.com/cgi-bin/goto?on=de020707 - - o IBM eServer* pSeries 630 6E4/6C4 - Ankndigung des neuen Entry Servers - http://isource.ibm.com/cgi-bin/goto?on=020713 - - o Weitere Artikel aus dem Bereich "Hardware" - http://isource.ibm.com/cgi-bin/goto?on=020762 - - - ------------------------------------------------------------- -e-business ------------------------------------------------------------- - -Wimbledon gewinnt: Mit Hilfe von IBM auch online ein packendes Ereignis - - Die neue Turnier-Website bietet Tennisfans in aller Welt - sekundenaktuelle Spielstnde, Live-Videos, Kommentare und - Interviews. Mit e-business on demand lsst sich dabei die - erforderliche Kapazitt fr den Ansturm whrend des Turniers - einfach einschalten - und anschlieend ebenso einfach wieder - abschalten. Ein echter Service-Gewinn, Klick fr Klick. - http://isource.ibm.com/cgi-bin/goto?on=de020756 - - - -Neues Buch "Deutschland Online" weist Weg in die - Informationsgesellschaft - - "Die schnelle Transformation in die Informationsgesellschaft ist - Deutschlands letzte Chance, um im Kreis der groen - Wirtschaftsmchte zu verbleiben. Deutschland muss IT-Weltmacht - werden - und das pronto!" Das verlangte der Vorsitzende der - Geschftsfhrung der IBM Deutschland, Erwin Staudt, anlsslich - der Vorstellung des Buches "Deutschland online" - Strategien und - Projekte fr die Informationsgesellschaft - in Berlin. - http://isource.ibm.com/cgi-bin/goto?on=de020757 - - -Weitere Artikel aus dem Bereich "e-business" - - Weitere Artikel aus dem Bereich "e-business" finden Sie online - auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020758 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - ------------------------------------------------------------- -Business Lsungen und Services ------------------------------------------------------------- - -Mehr Training fr alle: IBM Learning Services Corporate Card - - IBM Learning Services bietet Ihnen preisgnstige Trainings: Mit - der IBM Learning Services Corporate Card sparen Sie bis zu 1.650 - Euro. Im Unterschied zur IBM Learning Services Education Card - knnen Sie damit alle Ihre Mitarbeiter/innen zu den Trainings - senden. - http://isource.ibm.com/cgi-bin/goto?on=020721 - - -Weitere Artikel aus dem Bereich "Business Lsungen und Services" - - Weitere Artikel aus dem Bereich "Business Lsungen und Services" - finden Sie online auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020759 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - ------------------------------------------------------------- -IT Solutions und Services ------------------------------------------------------------- - -e-guide aktuell: Produkte und Lsungen fr den Mittelstand - - zusammengefasst im IBM Kundenmagazin! - - Mit dieser Ausgabe bernehmen wir Teile des Heftes auch im Web. - Lesen Sie hier mehr ber den neuen Produkt- und Lsungsteil - oder bestellen Sie sich Ihr Exemplar des IBM Kundenmagazins - "e-guide" 2/2002. - http://isource.ibm.com/cgi-bin/goto?on=020710 - - -Sprechen Sie mit uns: Sicherheit ist Trumpf - - Sie machen sich sicherlich Gedanken darber, ob Ihre e-business - Infrastruktur wirkungsvoll geschtzt ist - insbesondere vor dem - Hintergrund sich ffnender Strukturen. - IBM - als einer der Vorreiter im Bereich e-business Sicherheits- - strategien - bietet Ihnen Lsungen, mit denen Sie Ihre - IT-Infrastruktur sichern knnen. berzeugen Sie sich selbst: - http://isource.ibm.com/cgi-bin/goto?on=020712 - - -Weitere Artikel aus dem Bereich "IT Solutions und Services" - - Weitere Artikel aus dem Bereich "IT Solutions und Services" - finden Sie online auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020760 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - ------------------------------------------------------------- -Software ------------------------------------------------------------- - -Software fr den Mittelstand - - Hier finden Sie ausgewhlte Software-Produkte mit Beispielen - unserer zufriedenen Kunden. Die IBM Produktfamilien WebSphere, - DB2, Lotus und Tivoli sind die Basis fr eine Vielfalt von - e-business Lsungen. Sie sind industrie-spezifisch, skalierbar - ausgerichtet und basieren auf offenen Standards, so dass sie - speziell auf die Bedrfnisse des Mittelstandes zugeschnitten - werden knnen. - http://isource.ibm.com/cgi-bin/goto?on=020711 - - -WebSphere Integration - - Mit WebSphere Integration versucht die IBM keine Technologie zu - vermarkten, die die unberschaubare Vielfalt der Individual- - programmierungen um neue Facetten bereichert. Vielmehr agiert - sie wie ein Katalysator und ermglicht die Erweiterung und - Erneuerung von Systemlandschaften sowie die Migration von - geschftskritischen Daten. Mehr dazu im Software-Schwerpunkt - des Monats. - http://isource.ibm.com/cgi-bin/goto?on=020724 - - -Weitere Artikel aus dem Bereich "Software" - - Weitere Artikel aus dem Bereich "Software" finden Sie online - auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020761 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - ------------------------------------------------------------- -Hardware ------------------------------------------------------------- - -Neu: IBM ThinkPad A31p - Die erste mobile 3D-Workstation! - - Der ThinkPad A31p (TV2N6GE, TV2L3GE, TV2N5GE) ist ausgerstet mit - einem Intel Pentium 4 Notebookprozessor-M, schnellen DDR Speicher- - modulen und einem extrem leistungsfhigen Grafikchip. Auch die - Highspeed Festplatte lsst keine Wnsche offen. Zwei modulare - Laufwerkschchte sorgen fr ein Plus an Flexibilitt. Das Notebook - ist mit einer 10/100 Ethernet-Karte, einem 56K V.92 Modem, - integrierten 802.11b Wireless-Antennen/-Chip, Bluetooth sowie - einem IEEE 1394 (Firewire)-Anschluss ausgerstet. - http://isource.ibm.com/cgi-bin/goto?on=de020707 - - -IBM eServer* pSeries 630 6E4/6C4 - Ankndigung des neuen Entry Servers - - IBM definiert den UNIX Entry Server neu. Zuverlssigkeit und - Verfgbarkeit der POWER4-Prozessortechnologie jetzt vom Entry- - bis zum Enterprise-Bereich, mit Selbstverwaltungsfunktionen aus - dem Projekt eLiza, ultraflaches Rack- oder Deskside-Modell, die - richtige Wahl fr kleine und mittelstndische Unternehmen. - http://isource.ibm.com/cgi-bin/goto?on=020713 - - -Weitere Artikel aus dem Bereich "Hardware" - - Weitere Artikel aus dem Bereich "Hardware" finden Sie online - auf unserer IBM eNews Website: - http://isource.ibm.com/cgi-bin/goto?on=020762 - - Unter folgender Adresse knnen Sie Ihre Interessensgebiete - auswhlen und erhalten dann Business-Informationen nach Ma: - http://www-5.ibm.com/de/profile/change_interests.html - - - - -============================================================ -Sie erhalten diese E-Mail, da Sie zu IBM eNews - angemeldet sind als XXXXXX.YYYYYYYYYY@RUHR-UNI-BOCHUM.DE - - -*Das IBM eServer Warenzeichen besteht aus dem eingefhrten -IBM e-business Logo, gefolgt von dem beschreibenden Begriff -"Server". - -Nach unseren Kundendaten sind Sie an Informationsmaterial von -IBM interessiert. An- und Abmelden sowie Ihre Einstellungen -ndern knnen Sie auf folgender Website: -http://www.ibm.com/de/profile/ - -Kontakt: webmaster@de.ibm.com -Copyright (c) 2002 IBM Deutschland - - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/infoworld spamassassin-4.0.0~rc3/xt/data/whitelists/infoworld --- spamassassin-3.4.6/xt/data/whitelists/infoworld 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/infoworld 1970-01-01 00:00:00.000000000 +0000 @@ -1,188 +0,0 @@ -From Cringely@bdcimail.com Mon Aug 12 10:58:47 2002 -Return-Path: -Delivered-To: ffffff@localhost.aaaaaaaaaaaa.net -Received: from localhost (localhost.localdomain [127.0.0.1]) - by mail.aaaaaaaaaaaa.net (Postfix) with ESMTP id B3DA1BEEB2 - for ; Mon, 12 Aug 2002 14:28:07 -0700 (PDT) -Received: from mail.aaaaaaaaaaaa.com - by localhost with IMAP (fetchmail-5.9.11) - for ffffff@localhost (single-drop); Mon, 12 Aug 2002 14:28:07 -0700 (PDT) -Received: from mailcontrol.bellevuedata.com (mailcontrol.bellevuedata.com [66.37.227.18]) - by mail14.megamailservers.com (8.12.5/8.12.0.Beta10) with SMTP id g7CLKt9N008640 - for ; Mon, 12 Aug 2002 17:21:09 -0400 (EDT) -Date: Mon, 12 Aug 2002 12:58:47 -0500 -From: Cringely@bdcimail.com -Message-Id: -To: zzzzzz@aaaaaaaaaaaa.com -Subject: ROBERT X. CRINGELY(R): "Notes from the Field" from InfoWorld.com, Monday, August 12, 2002 -Reply-To: CringelyHelp@Bellevue.com -Content-Type: text/plain; - charset="iso-8859-1" -X-SpamBouncer: 1.5 (7/17/02) -X-SBNote: FROM_DAEMON/Listserv -X-SBPass: No Pattern Matching -X-SBPass: No Freemail Filtering -X-SBClass: Bulk -X-Folder: Bulk - -======================================================== -ROBERT X. CRINGELY(R): "Notes from the Field" InfoWorld.com -======================================================== - -Monday, August 12, 2002 - -Advertising Sponsor - - - - - - - - - - - - - - - - - - -Business Specials from Gateway -$100 Instant Rebate on select business notebooks, -Plus FREE Shipping (LIMITED TIME OFFER) -or call and ask about wireless networking specials -for business 1.888.851.7359 -http://63.115.136.15/go/infoworld/4524953.html - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -LOOKING TO INNOVATE - -Posted August 9, 2002 01:01 PM Pacific Time - - -AMBER FOUND A brochure I had for Kauai, Hawaii. "What -is this, Cringe? Are you planning to surprise me with -a trip there?" I just hope she doesn't discover that -single plane ticket I bought. - -Gates reveals the awful truth - -At an impromptu meeting over lunch at Microsoft's -Financial Analysts Day in July, Bill Gates said -companies are not "super" innovative and don't produce -reliable products. No earth-shattering revelations -there, but in illustrating his point he asked, "Do you -really need the next version of Office? I don't think -so." Gates' implied he acknowledged users need a -compelling reason to upgrade to the next Office, my -spy said. The only thing that sells software these -days is the innovation factor, Gates claimed. "The -Tablet is going to be the most viral thing ever," -Gates added. Of course, Microsoft has been touting the -Tablet PC for quite some time. - -JavaScript pressure - -Microsoft is looking to innovate, however, at least -when it comes to the European Computer Manufacturers -Association (ECMA). In terms of extending existing -scripting languages to support XML there appears to be -both good and bad news from ECMA, my spy said. The -good news is BEA recently showed ECMA how to better -extend scripting languages to work directly with XML. -The bad news is most people wouldn't recognize the -group today, which seems hell-bent on replacing -JavaScript (now called ECMAscript) with a derivative -that looks a lot like a C# scripting language. - -A lack of chivalry - -Big Blue is cracking the whip against employee -tailgaters, but not the variety typically associated -with college football games. Workers are being -reminded about a no tailgating policy, which means -they are forbidden from sliding their ID badge through -the security system, then holding the door for someone -who doesn't slide their badge. "We have been -instructed chivalry is dead concerning this matter," -my spy said. - -Speaking of chivalry's demise, common courtesy may be -going with it at the newly merged HP. Despite current -geopolitical situations, HP is relying on parts of its -support located in India. In so doing, HP bailed out -on a relationship with The Answer Group (TAG), with -which Compaq had a long-standing relationship. Adding -salt to the wound, though, HP's support folks in India -were telling customers and resellers about the TAG -termination before HP even told TAG. - -"I BOOKED OUR tickets for Kauai," Amber said. I guess -I'm trapped now. No more tranquil escape for me. - -Before vacation, send tips to cringe@infoworld.com. - - - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -MORE NOTES FROM THE FIELD -For a complete archive of his InfoWorld columns visit -http://www2.infoworld.com/cgi/component/columnarchive.wbs?column=notefield - -INFOWORLD OPINIONS -Weekly commentary from the most trusted voices in -IT at: http://www.infoworld.com/community/t_opinions.html - - -To join, or start, a discussion on this or any IT-related -topic, please visit our InfoWorld forums at -http://forums.infoworld.com. Here you can interact and -exchange ideas with InfoWorld staff and other readers. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - -QUOTE OF THE DAY: -"Of course, there is a lot of legislation that is -very favorable to folks that subsist on the exclusive -ownership of their code. We have lobbied against -those bills. It's easy to get negative about other -people's ideas. This is an opportunity to say, -'Here's a better idea: consider open source as an -alternative.' " - ---Jeremy Hogan, community relations manager at Red Hat -Inc., speaking about a planned march on San Francisco -city hall to promote the use of open source software -in government offices. - -http://www.infoworld.com/articles/hn/xml/02/08/09/020809hnrally.xml?0812mncr - - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SUBSCRIBE/UNSUBSCRIBE/CHANGE E-MAIL -To subscribe, unsubscribe or change your e-mail address -for any of InfoWorld's e-mail newsletters, -go to:http://www.iwsubscribe.com/newsletters/ - -To subscribe to InfoWorld.com, or InfoWorld Print, -or both, or to renew or correct a problem with any InfoWorld -subscription, go to http://www.iwsubscribe.com - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Expectations, Great and Not So Great -InfoWorld columnist Bob Lewis knows that both are part -of the job in IT management. That's what makes his Survival -Guide newsletter so fresh, so true, so funny. Do you -wonder why you have to manage up as well as down? -Or why it matters what Larry Ellison wants and Dubya's -likely to do? Bob feels your pain. He can help. Subscribe -to his Survival Guide newsletter free at -http://www.iwsubscribe.com/newsletters/ - - - -Advertising Sponsor - - - - - - - - - - - - - - - - - - -Business Specials from Gateway -$100 Instant Rebate on select business notebooks, -Plus FREE Shipping (LIMITED TIME OFFER) -or call and ask about wireless networking specials -for business 1.888.851.7359 -http://63.115.136.15/go/infoworld/4524953.html - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Copyright 2002 InfoWorld Media Group Inc. - - - - -This message was sent to: zzzzzz@aaaaaaaaaaaa.com - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/linuxplanet spamassassin-4.0.0~rc3/xt/data/whitelists/linuxplanet --- spamassassin-3.4.6/xt/data/whitelists/linuxplanet 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/linuxplanet 1970-01-01 00:00:00.000000000 +0000 @@ -1,197 +0,0 @@ -From listsupport@internet.com Mon Aug 12 12:59:02 2002 -Return-Path: -Delivered-To: ffffffff@localhost.zzzzzzzzzz-ffffffff.net -Received: from localhost (localhost.localdomain [127.0.0.1]) - by mail.zzzzzzzzzz-ffffffff.net (Postfix) with ESMTP id 98624BEE9E - for ; Mon, 12 Aug 2002 14:26:24 -0700 (PDT) -Received: from mail.zzzzzzzzzz-ffffffff.com - by localhost with IMAP (fetchmail-5.9.11) - for ffffffff@localhost (single-drop); Mon, 12 Aug 2002 14:26:24 -0700 (PDT) -Received: from mx3.megamailservers.com (ns3.meganameservers.com [64.29.144.65]) - by mail1.megamailservers.com (8.12.5/8.12.0.Beta10) with ESMTP id g7CKaOs6025662 - for ; Mon, 12 Aug 2002 16:36:24 -0400 (EDT) -Received: from r00l04.lyris.net (r00l04.lyris.net [216.91.57.134]) - by mx3.megamailservers.com (8.12.2/8.12.2) with SMTP id g7CKaNLC013752 - for ; Mon, 12 Aug 2002 16:36:24 -0400 -X-Mailer: Lyris ListManager Web Interface -Date: Mon, 12 Aug 2002 12:59:02 -0700 -Subject: LinuxPlanet Newsletter: August 12, 2002 -To: -From: LinuxPlanet -List-Unsubscribe: -Reply-To: Newsletter Support -Message-Id: -X-SpamBouncer: 1.5 (7/17/02) -X-SBNote: FROM_DAEMON/Listserv -X-SBPass: No Pattern Matching -X-SBPass: No Freemail Filtering -X-SBClass: Bulk -X-Folder: Bulk - -MyDesktop Proudly Presents: - -L I N U X P L A N E T -````` -Your Weekly Source For Linux Updates! -LinuxPlanet Newsletter for August 12, 2002 -http://www.linuxplanet.com - -___________________________ Sponsors ________________________________ - - This newsletter sponsored by: - Thawte - Journyx, Inc. -_____________________________________________________________________ - ------ -IN THIS ISSUE: - * NEW AND NOTEWORTHY - * COMING UP -_____ - - -/-------------------------------------------------------------------\ - -FREE Apache SSL Guide from Thawte Certification - -Do your online customers demand the best available protection of their -personal information? Thawte's guide explains how to give this to your -customers by implementing SSL on your Apache Web Server. Click here to -get our FREE Thawte Apache Guide: http://www.gothawte.com/rd348.html - -\--------------------------------------------------------------adv.-/ - - -NEW AND NOTEWORTHY: - -Using the InterMezzo Distributed Filesystem - -Getting connected is one of the more vital goals of any IT shop. But what -happens when users can't get commected to the network right away? Are they -just cut off altogether from their files? Not necessarily, writes Bill von -Hagen, especially if you are using the InterMezzo distributed filesystem. -In this next installment of the Distributed Filesystems series, von Hagen -examines InterMezzo in detail and shows how to install, configure, and -implement this DFS. - -Building Sounds for your Applications with SoundTracker - -Beeps, bloops, and buzzes. These are the sounds that enrich our computing -experience. When done right, these auditory cues provide instant feedback -to a user from an application. But getting the right sounds for your app -does not have to involve scrounging around for whatever you can find on -the Internet. You can professionally edit your own sounds with the Linux -program SoundTracker, as Dee-Ann LeBlanc and Andrew J.D. Bowman explain in -this tutorial. - -Modern Distributed Filesystems For Linux: An Introduction - -Data and information has become the lifeblood of many organizations of -late, and storing that information safely has led to inventive data -management. Once known as networked filesystems, distributed filesystems -are now one of the best ways of storing your data across multiple machines -on your network. Bill von Hagen begins a series of articles on distributed -filesystems with an introduction to the technology and what it can do for -your organization. - - ------ - -COMING UP: - - * An Open-Source Approach to Fighting Cancer - * Distributed File Systems: The Series Continues - * A Review of Linux Books - ------ - -/-------------------------------------------------------------------\ - -*FREE download of Journyx Timesheet for LINUX* -Have you been looking for an automated solution to -replace your paper timesheets? Do you want something -that is easy to use and integrates with your existing -business applications for payroll, HR, accounting and -project management? You need to try Journyx Timesheet! -Download Journyx Timesheet for FREE today! -http://www.journyx.com/InetL4aug02ezad - -\--------------------------------------------------------------adv.-/ - ------ - -Visit the other sites in the internet.com Linux/Open Source Channel: -Linux Today -LinuxPlanet -AllLinuxDevices -PHPBuilder -BSD Today -Apache Today -Enterprise Linux Today -Linux Central -Linuxnewbie -The ISP-Linux Moderated Digest -. - - - - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -DEDICATED EMAIL LIST SERVERS! -Get the speed, control, and responsiveness you need for your -out-sourced Email Newsletters at an AFFORDABLE price! -100% UPTIME GUARANTEED! -Sign-up by July 15th and the set-up is FREE for your -DEDICATED solution just for mentioning this ad. -Free Quote: mailto:sales@sparklist.com or surf the -website: http://SparkLIST.com/ or direct: 920.490.5901, x1 - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Advertising: If you are interested in advertising in our newsletters, call -Claudia at 1-203-662-2863 or send email to mailto:nsladsales@internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For contact information on sales offices worldwide visit -http://www.internet.com/mediakit/salescontacts.html -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For details on becoming a Commerce Partner, contact David Arganbright -on 1-203-662-2858 or mailto:commerce-licensing@internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To learn about other free newsletters offered by internet.com or -to change your subscription visit http://e-newsletters.internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -internet.com's network of more than 160 Web sites is organized into 16 -channels: -Internet Technology http://internet.com/it -E-Commerce/Marketing http://internet.com/marketing -Web Developer http://internet.com/webdev -Windows Internet Technology http://internet.com/win -Linux/Open Source http://internet.com/linux -Internet Resources http://internet.com/resources -ISP Resources http://internet.com/isp -Internet Lists http://internet.com/lists -Download http://internet.com/downloads -International http://internet.com/international -Internet News http://internet.com/news -Internet Investing http://internet.com/stocks -ASP Resources http://internet.com/asp -Wireless Internet http://internet.com/wireless -Career Resources http://internet.com/careers -EarthWeb http://www.earthweb.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To find an answer - http://search.internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Looking for a job? Filling an opening? - http://jobs.internet.com -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -This newsletter is published by INT Media Group, Incorporated -http://internet.com - The Internet & IT Network -Copyright (c) 2002 INT Media Group, Incorporated. All rights reserved. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For information on reprinting or linking to internet.com content: -http://internet.com/corporate/permissions.html -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---- -You are currently subscribed to linuxplanet-text as: lx@zzzzzzzzzz-ffffffff.com -To unsubscribe send a blank email to leave-linuxplanet-text-000000F@list4.internet.com - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/lp.org spamassassin-4.0.0~rc3/xt/data/whitelists/lp.org --- spamassassin-3.4.6/xt/data/whitelists/lp.org 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/lp.org 1970-01-01 00:00:00.000000000 +0000 @@ -1,132 +0,0 @@ -Received: from rs6000.resqnet.com (rs6000.resqnet.com [64.209.23.67]) - by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g6PIph423946 - for ; Thu, 25 Jul 2002 19:51:43 +0100 -Received: from columbia.lp.org (columbia.kia.net [205.252.89.231]) - by rs6000.resqnet.com (8.11.2/8.11.2) with ESMTP id g6PIoqe17480 - for <9999999999@kfdjgdkfgjd.com>; Thu, 25 Jul 2002 14:50:52 -0400 -Received: from localhost (daemon@localhost) - by columbia.lp.org (8.9.3/8.9.3) with SMTP id OAA51643; - Thu, 25 Jul 2002 14:47:50 -0400 (EDT) - (envelope-from owner-announce@hq.lp.org) -Received: by columbia.kia.net (bulk_mailer v1.12); Thu, 25 Jul 2002 12:02:38 -0400 -Received: (from majordom@localhost) - by columbia.lp.org (8.9.3/8.9.3) id MAA40103 - for announce-outgoing; Thu, 25 Jul 2002 12:02:38 -0400 (EDT) - (envelope-from owner-announce@hq.lp.org) -Received: (from lpadmin@localhost) - by columbia.lp.org (8.9.3/8.9.3) id MAA40088; - Thu, 25 Jul 2002 12:02:37 -0400 (EDT) - (envelope-from lpadmin) -Date: Thu, 25 Jul 2002 12:02:37 -0400 (EDT) -Message-Id: <200207251602.MAA40088@columbia.lp.org> -To: announce@hq.lp.org -Subject: LP RELEASE: Outrageous military spending -From: Libertarian Party Announcements -Reply-To: owner-announce@hq.lp.org - ------BEGIN PGP SIGNED MESSAGE----- - -=============================== -NEWS FROM THE LIBERTARIAN PARTY -2600 Virginia Avenue, NW, Suite 100 -Washington DC 20037 -World Wide Web: http://www.LP.org -=============================== -For release: July 25, 2002 -=============================== -For additional information: -George Getz, Press Secretary -Phone: (202) 333-0008 Ext. 222 -E-Mail: pressreleases@hq.LP.org -=============================== - -Thousands spent on strippers, golf memberships -shows Pentagon spending is out of control, Libertarians say - -WASHINGTON, DC -- Quiz question: Which of the following items have been -charged to the taxpayers recently by military personnel wielding -government-issued credit cards? - -(a) $38,000 for lap dancing at strip clubs near military bases. - -(b) $3,400 for a Sumo wrestling suit and $9,800 for Halloween costumes. - -(c) $7,373 for closing costs on a home and $16,000 for a corporate golf -membership. - -(d) $4,600 for white beach sand and $19,000 worth of decorative "river -rock" at a military base in the Arabian desert. - -(e) all of the above. - -"Incredibly, the answer is 'all of the above,' said Steve Dasbach, -Libertarian Party executive director. "Thanks to the federal -government's policy of doling out credit cards with no questions asked, -the military has launched a raid on your wallet." - -The shocking revelations are contained in a General Accounting Office -audit released last week that uncovered $101 million in "seemingly -unneeded expenditures" made by the Air Force and Army in 2000 and -2001. The purchases were made possible by the federal government's lax -credit card policy: At least 1.4 million Defense Department employees -carry credit cards, and last year they used them to splurge on $6.1 -billion in goods and services, the audit found. - -In one case, a group of 200 soldiers used their military IDs and -government-issued travel cards to get cash at adult-entertainment bars, -then spent the money there. The clubs charged a 10 percent fee to -supply the soldiers with cash -- then billed the full amount to their -travel cards as a restaurant charge, the GAO found. - -"Are these warriors really fighting terrorism while frolicking in a -strip club, or defending our country while wearing a Sumo wrestling -suit?" asked Dasbach. "Americans who support a bigger defense budget, -take note: The Pentagon frequently behaves like any other bloated, -reckless government agency. It promises your money will be spent on the -worthiest of causes, then squanders it on things you could never even -imagine." - -Other spending uncovered by the audit included $45,000 for luxury -cruises, $1,800 for executive pillows, and $24,000 for a sofa and -armchair at a military installation in the Middle East, Dasbach noted. - -Some military employees actually defended the purchases, the audit -noted, by saying that recreational items such as golf memberships can -be "a useful tool for building good relations with a host country" -such as Saudi Arabia or the United Arab Emirates. - -Not surprisingly, Dasbach said, the audit found "little evidence of -documented disciplinary action" against those who misused the cards, -so taxpayers may end up paying the tab. - -"It's time to impose a little military discipline on these deadbeat -Defense Department workers, and force them to personally reimburse -taxpayers for every penny of improper spending," he said. - -"Then cut the Pentagon's massive $379 billion budget to help guard -against such wasteful spending in the future. Perhaps that's one way to -force the Pentagon to spend its resources defending the country, -instead of offending the taxpayer." - - ------BEGIN PGP SIGNATURE----- -Version: 2.6.2 - -iQCVAwUBPUA6FdCSe1KnQG7RAQGAKwP/Zpfw0Uq3BPLnXXmnlWQ2aFFb1FSaj+nJ -QOMt9q4TBhiYJhIdgdd+uGxoubiPfvyIweSR1PjOdoFe8dYf2h/V4gNS9hSmkSgC -76RZVuitNf2DbEsaY8TtcUDLDC51m/jgxiGcgPkcyJ+0Wn11RRbktkVEefSNTaBz -M8ibVFiDPyI= -=9fYc ------END PGP SIGNATURE----- - - - ------------------------------------------------------------------------ -The Libertarian Party http://www.lp.org/ -2600 Virginia Ave. NW, Suite 100 voice: 202-333-0008 -Washington DC 20037 fax: 202-333-0072 ------------------------------------------------------------------------ -For subscription changes, please use the WWW form at: -http://www.lp.org/action/email.html - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/media_unspun spamassassin-4.0.0~rc3/xt/data/whitelists/media_unspun --- spamassassin-3.4.6/xt/data/whitelists/media_unspun 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/media_unspun 1970-01-01 00:00:00.000000000 +0000 @@ -1,1962 +0,0 @@ -From guterman@mediaunspun.imakenews.net Wed Aug 14 14:38:59 2002 -Return-Path: -Delivered-To: rrrrrrr@localhost.netnoteinc.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 87FA743C34 - for ; Wed, 14 Aug 2002 09:38:52 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for rrrrrrr@localhost (single-drop); Wed, 14 Aug 2002 14:38:52 +0100 (IST) -Received: from eng.imakenews.com (mailservice4.imakenews.com - [65.214.33.17]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id - g7EDZx416820 for ; Wed, 14 Aug 2002 14:35:59 +0100 -Received: by eng.imakenews.com (PowerMTA(TM) v1.5); Wed, 14 Aug 2002 - 09:35:04 -0400 (envelope-from ) -Content-Transfer-Encoding: binary -Content-Type: multipart/alternative; - boundary="----------=_1029331990-31627-4"; - charset="iso-8859-1" -Date: Wed, 14 Aug 2002 09:33:10 -0400 -Errors-To: -From: "Media Unspun" -MIME-Version: 1.0 -Message-Id: <31627$1029331990$mediaunspun$5114587@imakenews.net> -Precedence: normal -Reply-To: "Media Unspun" -Sender: "Media Unspun" -Subject: SEC Exposes Big Blue's Pink Slips -To: xxxxx@yyyyyy.zzz -X-Imn: mediaunspun,178767,5114587,0 - -This is a multi-part message in MIME format... - -------------=_1029331990-31627-4 -Content-Type: text/plain; charset="iso-8859-1" -Content-Disposition: inline -Content-Transfer-Encoding: 7bit - -To view this newsletter in full-color, visit: -http://newsletter.mediaunspun.com/index000018970.cfm - -M E D I A U N S P U N -What the Press is Reporting and Why (www.mediaunspun.com) ------------------------------------------------------------------ -August 14, 2002 - ------------------------------------------------------------------ -IN THIS ISSUE ------------------------------------------------------------------ -* SEC EXPOSES BIG BLUE'S PINK SLIPS -* SYNERGY AND BETRAYAL AT VIVENDI -* OTHER STORIES - -Media Unspun serves business news and analysis, authoritatively -and irreverently, every business day. An annual subscription -costs $50, less than a dollar a week. If your four-week free -trial is coming to an end soon, please visit -http://www.mediaunspun.com/subscribe.html and sign up via credit card -or check. - - ------------------------------------------------------------------ -ADVERTISEMENT ------------------------------------------------------------------ -Ken Fisher offers his Quarterly Report for high net worth -investors FREE of cost & without obligation. Access the same -investment research he uses to guide his clients at: -http://pcg.fisherinvestments.com/newrespond/letter.asp?site=UNSP&KC=1229EFCAD0000 - - ------------------------------------------------------------------ -SEC EXPOSES BIG BLUE'S PINK SLIPS ------------------------------------------------------------------ -Does the Securities and Exchange Commission have a press pass -yet? It seems to be bringing us all our news lately. On the day -of the deadline for companies to certify their financial -statements with the SEC, the business press squirmed and waited -for the next Enron or WorldCom. (We might eat these words -tomorrow, but we doubt it.) In an unrelated confession, IBM gave -the commission its latest layoff numbers. - -IBM talked about pink slips during its second-quarter earnings -report, but with a vagueness worthy of your daily horoscope. -("Capricorn: Career changes may be on their way...") Only after -"months of surreptitious layoff notices" did the company admit -that it's cutting more than 15,600 jobs, said the AP. That's -about 5% of its workforce, and a lot more than pundits expected. -An IBM spokesperson told the Wall Street Journal the higher -number was due to "rebalancing" and more employees than expected -taking voluntary layoffs. - -Sorry, we're still back on "rebalancing." Did IBM "rightsize" -last quarter, too? - -IBM's news was still trickling out Wednesday morning, but some -details were available. About 1,400 workers got cut from IBM's -microelectronics unit, and most of the rest were from IT -services and consulting. (That ought to make IBM's new employees -from PricewaterhouseCoopers feel all warm and fuzzy inside.) -Look for news updates from cities that will see the cuts, such -as Austin and Raleigh. - -OK, none of this is good. Two years into the tech slump, we're -still tired of seeing people get sacked. But was it really so -bad that IBM only revealed it because of new accounting -regulations? Nah, Big Blue was always known for "stealth -layoffs," as CNN put it, but current corporate scrutiny forced -it to 'fess up for once. Until now, IBM would acknowledge the -latest layoffs if reporters called and asked, but wouldn't give -specifics. Yeesh. - Jen Muehlbauer - -IBM Cut 5% of Staff in Period, Double the Expected Number -http://online.wsj.com/article/0,,SB1029282408667791835,00.html -(Paid subscription required.) - -IBM to Cut Over 15,000 Employees (AP) -http://tinyurl.com/10kz - -IBM confirms 15,600 job cuts (Reuters) -http://www.msnbc.com/news/793777.asp - -IBM cutting 15,000 jobs -http://news.com.com/2100-1001-949677.html - -IBM job cuts exceed 15,600 -http://money.cnn.com/2002/08/13/technology/ibm/index.htm - -IBM puts job cuts at 15,600, with fewer than 50 in this state -http://seattlepi.nwsource.com/business/82508_ibm14.shtml - ------------------------------------------------------------------ -ADVERTISEMENT ------------------------------------------------------------------ -You've heard about identity management, but do you know about -the opportunities and business models that will emerge as a -result? Download a free executive summary of Esther Dyson's coverage of -identity management in Release 1.0. Learn more about the -expanding market for these services and applications. -http://release1.edventure.com/executivesummary.cfm?MCode=Unspun - ------------------------------------------------------------------ -SYNERGY AND BETRAYAL AT VIVENDI ------------------------------------------------------------------ -Synergy always was a fuzzy concept. Now Vivendi Universal's top -man has slammed the lid on it. The French company announced -today that it's ready to peddle $9.8 billion in assets to rustle -up some cash. First up on the block? Synergy-less U.S. book -publisher Houghton Mifflin. - -It's unclear whether new chairman Jean-Rene Fourtou has genuine -turnaround muscle, or whether he and Vivendi's board are simply -following the winds of post-merger fashion. But when you owe -$18.7 billion, you get real practical, real fast. The Guardian -reported that Vivendi's share price sank 5% on Tuesday when -investors got the willies about the company's impending -announcement on its financial health. But the company had -positive news to report: It's making money. Revenue in the first -half was up 13%, higher than analysts' estimates of a 7.7% -boost. - -Details are scant on the breadth of Fourtou's restructuring -efforts, with more information expected at the next board -meeting on September 25, according to reporters. Houghton -Mifflin, acquired a year ago for $1.7 billion, and a vague -explanation that included the "Curious George" character, were -the only properties named for sale so far. The Guardian -speculated that Vivendi will also sell its U.S. video games -business and possibly its stake in the French mobile phone -company SFR, a debatable sale because of the cash it generates, -according to the newspaper. - -Meanwhile, Fourtou's predecessor, Jean-Marie Messier, continues -to advocate empire-building. The New York Post said its sources -say Messier hopes his former employer will feel generous enough -to let him continue to reside in his $17 million Manhattan -abode. And Bloomberg reported earlier this week that an -unrepentant Messier is penning a memoir as he vacations in the -Mediterranean. The working title? "How I Was Betrayed." - -Deborah Asbrand - -Vivendi to Sell Publisher Houghton Mifflin (Reuters) -http://www.washingtonpost.com/wp-dyn/articles/A15954-2002Aug14.html - -Vivendi investors expect the worst -http://www.guardian.co.uk/business/story/0,3604,774190,00.html - -Vivendi to Sell $9.8 Billion In Assets, Including Houghton -http://online.wsj.com/article/0,,SB102931297119161715,00.html -(Paid subscription required.) - -Ousted Messier Aims To Score $17m Vivendi Pad -http://www.nypost.com/business/54701.htm - -Ex-Chief of Vivendi Plans Tell-All Book (Bloomberg) -http://www.nytimes.com/2002/08/12/business/media/12VIVE.html - ------------------------------------------------------------------ -OTHER STORIES ------------------------------------------------------------------ -A Top AOL Manager Has Left Company -http://www.nytimes.com/2002/08/14/technology/14AOL.html - -Fed Holds Steady on Interest Rates -http://www.washingtonpost.com/wp-dyn/articles/A14636-2002Aug13.html - -Amtrak halts all high-speed service after finding cracks -http://www.sunspot.net/bal-te.train14aug14.story - -AOL lets resigning exec keep stock options -http://www.usatoday.com/money/industries/technology/2002-08-13-aol-pittman_x.htm - -Lucent licensing deal with Winstar focus of probe (AP) -http://www.bayarea.com/mld/mercurynews/business/3861117.htm - -Study Says Net Could Benefit Music Firms -http://www.latimes.com/business/la-fi-music14aug14.story - -Eisner Crimping His Own Style -http://www.latimes.com/business/la-fi-disney14aug14.story - -Severance claims by Enron former execs anger ex-workers -http://www.chron.com/cs/CDA/story.hts/business/1533657 - -Princeton removes dean after Yale Web site flap (AP) -http://www.siliconvalley.com/mld/siliconvalley/3857890.htm - -Frisbee golf creator dies, may land on someone's roof (SF -Chronicle) -http://seattlepi.nwsource.com/national/82560_frisbee14.shtml - -Will Kinsley's Slate Get Wiped? -http://www.ojr.org/ojr/kramer/1029281360.php - -Hollywood, Russian Bicker Over Bass -http://www.cnn.com/2002/SHOWBIZ/News/08/13/bassspace.hollywood.ap/ - ------------------------------------------------------------------ -Do you want to reach the Net's savviest audience? -Advertise in Media Unspun. -Contact Erik Vanderkolk for details at erikvanderkolk@yahoo.com -today. - ------------------------------------------------------------------ -STAFF ------------------------------------------------------------------ -Written by Deborah Asbrand (dasbrand@world.std.com), Keith -Dawson (dawson@world.std.com), Jen Muehlbauer -(jen@englishmajor.com), and Lori Patel (loripatel@hotmail.com). - -Copyedited by Jim Duffy (jimduffy86@yahoo.com). - -Marketing: Cowpoke Productions (cowpokeproductions.com). -Advertising: Erik Vanderkolk (erikvanderkolk@yahoo.com). - -Editor and publisher: Jimmy Guterman (guterman@vineyard.com). - -Media Unspun is produced by The Vineyard Group Inc. -Copyright 2002 Media Unspun, Inc., and The Vineyard Group, Inc. -Subscribe already, willya? http://www.mediaunspun.com - -Redistribution by email is permitted as long as a link to -http://newsletter.mediaunspun.com is included. - --|________________ -POWERED BY: http://www.imakenews.com -To be removed from this list, use this link: -http://www.imakenews.com/eletra/remove.cfm?x=mediaunspun%2Cxxxxx@yyyyyy.zzz -To receive future messages in HTML format, use this link: -http://www.imakenews.com/eletra/change.cfm?x=mediaunspun%2Cxxxxx@yyyyyy.zzz%2Chtm -To change your subscriber information, use this link: -http://www.imakenews.com/eletra/update.cfm?x=mediaunspun%2Cxxxxx@yyyyyy.zzz - - -------------=_1029331990-31627-4 -Content-Type: text/html; charset="iso-8859-1" -Content-Disposition: inline -Content-Transfer-Encoding: 7bit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -M E D I A U N S P U N - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    - - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - Pass it on... - - - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - M E D I A U N S P U N
    - -     - - - - - What the Press is Reporting and Why (www.mediaunspun.com) - - - - - -
    - - - - - - - - Wednesday, August 14, 2002 - - - - - - - - - - -
    - -
    - - - - - - - - - - - - - -
    - - -
    - - - - - - - - - - - - - - - - - - - -
    Top Spins...     - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - SEC Exposes Big Blue's Pink Slips - - - - - - - - - - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - Synergy and Betrayal at Vivendi - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - Other Stories - - - - - - - - - - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Media Unspun serves business news and analysis, authoritatively and irreverently, every business day. An annual subscription costs $50, less than a dollar a week. If your four-week free trial is coming to an end soon, please visit http://www.mediaunspun.com/subscribe.html and sign up via credit card or check.
    -

    - -
    - - -     -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Sponsor - -
    - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Ken Fisher offers his Quarterly Report for high net worth investors FREE of cost & without obligation. Access the same investment research he uses to guide his clients at:
    -http://pcg.fisherinvestments.com/newrespond/letter.asp?site=UNSP&KC=1229EFCAD0000

    - -
    - - -     -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - SEC Exposes Big Blue's Pink Slips - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Does the Securities and Exchange Commission have a press pass yet? It seems to be bringing us all our news lately. On the day of the deadline for companies to certify their financial statements with the SEC, the business press squirmed and waited for the next Enron or WorldCom. (We might eat these words tomorrow, but we doubt it.) In an unrelated confession, IBM gave the commission its latest layoff numbers.

    -IBM talked about pink slips during its second-quarter earnings report, but with a vagueness worthy of your daily horoscope. ("Capricorn: Career changes may be on their way...") Only after "months of surreptitious layoff notices" did the company admit that it's cutting more than 15,600 jobs, said the AP. That's about 5% of its workforce, and a lot more than pundits expected. An IBM spokesperson told the Wall Street Journal the higher number was due to "rebalancing" and more employees than -expected taking voluntary layoffs.

    -Sorry, we're still back on "rebalancing." Did IBM "rightsize" last quarter, too?

    -IBM's news was still trickling out Wednesday morning, but some details were available. About 1,400 workers got cut from IBM's microelectronics unit, and most of the rest were from IT services and consulting. (That ought to make IBM's new employees from PricewaterhouseCoopers feel all warm and fuzzy inside.) Look for news updates from cities that will see the cuts, such as Austin and Raleigh.

    -OK, none of this is good. Two years into the tech slump, we're still tired of seeing people get sacked. But was it really so bad that IBM only revealed it because of new accounting regulations? Nah, Big Blue was always known for "stealth layoffs," as CNN put it, but current corporate scrutiny forced it to 'fess up for once. Until now, IBM would acknowledge the latest layoffs if reporters called and asked, but wouldn't give specifics. Yeesh. - Jen Muehlbauer

    -IBM Cut 5% of Staff in Period, Double the Expected Number
    -http://online.wsj.com/article/0,,SB1029282408667791835,00.html
    -(Paid subscription required.)

    -IBM to Cut Over 15,000 Employees (AP)
    -http://tinyurl.com/10kz

    -IBM confirms 15,600 job cuts (Reuters)
    -http://www.msnbc.com/news/793777.asp

    -IBM cutting 15,000 jobs
    -http://news.com.com/2100-1001-949677.html

    -IBM job cuts exceed 15,600
    -http://money.cnn.com/2002/08/13/technology/ibm/index.htm

    -IBM puts job cuts at 15,600, with fewer than 50 in this state
    -http://seattlepi.nwsource.com/business/82508_ibm14.shtml

    - -
    - - -     -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Sponsor - -
    - - -
    - - - - - - - - - - - - - -
    - - - - - - - - You've heard about identity management, but do you know about the opportunities and business models that will emerge as a result? Download a free executive summary of Esther Dyson's coverage of identity management in Release 1.0. Learn more about the expanding market for these services and applications. - -
    - - -     -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - Synergy and Betrayal at Vivendi - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Synergy always was a fuzzy concept. Now Vivendi Universal's top man has slammed the lid on it. The French company announced today that it's ready to peddle $9.8 billion in assets to rustle up some cash. First up on the block? Synergy-less U.S. book publisher Houghton Mifflin.

    -It's unclear whether new chairman Jean-Rene Fourtou has genuine turnaround muscle, or whether he and Vivendi's board are simply following the winds of post-merger fashion. But when you owe $18.7 billion, you get real practical, real fast. The Guardian reported that Vivendi's share price sank 5% on Tuesday when investors got the willies about the company's impending announcement on its financial health. But the company had positive news to report: It's making money. Revenue in the first half was -up 13%, higher than analysts' estimates of a 7.7% boost.

    -Details are scant on the breadth of Fourtou's restructuring efforts, with more information expected at the next board meeting on September 25, according to reporters. Houghton Mifflin, acquired a year ago for $1.7 billion, and a vague explanation that included the "Curious George" character, were the only properties named for sale so far. The Guardian speculated that Vivendi will also sell its U.S. video games business and possibly its stake in the French mobile phone company SFR, a debatable -sale because of the cash it generates, according to the newspaper.

    -Meanwhile, Fourtou's predecessor, Jean-Marie Messier, continues to advocate empire-building. The New York Post said its sources say Messier hopes his former employer will feel generous enough to let him continue to reside in his $17 million Manhattan abode. And Bloomberg reported earlier this week that an unrepentant Messier is penning a memoir as he vacations in the Mediterranean. The working title? "How I Was Betrayed." - Deborah Asbrand

    -Vivendi to Sell Publisher Houghton Mifflin (Reuters)
    -http://www.washingtonpost.com/wp-dyn/articles/A15954-2002Aug14.html

    -Vivendi investors expect the worst
    -http://www.guardian.co.uk/business/story/0,3604,774190,00.html

    -Vivendi to Sell $9.8 Billion In Assets, Including Houghton
    -http://online.wsj.com/article/0,,SB102931297119161715,00.html
    -(Paid subscription required.)

    -Ousted Messier Aims To Score $17m Vivendi Pad
    -http://www.nypost.com/business/54701.htm

    -Ex-Chief of Vivendi Plans Tell-All Book (Bloomberg)
    -http://www.nytimes.com/2002/08/12/business/media/12VIVE.html

    - -
    - - -     -
    - - - - - - - - - - Other Stories - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    A Top AOL Manager Has Left Company
    -http://www.nytimes.com/2002/08/14/technology/14AOL.html

    -Fed Holds Steady on Interest Rates
    -http://www.washingtonpost.com/wp-dyn/articles/A14636-2002Aug13.html

    -Amtrak halts all high-speed service after finding cracks
    -http://www.sunspot.net/bal-te.train14aug14.story

    -AOL lets resigning exec keep stock options
    -http://www.usatoday.com/money/industries/technology/2002-08-13-aol-pittman_x.htm

    -Lucent licensing deal with Winstar focus of probe (AP)
    -http://www.bayarea.com/mld/mercurynews/business/3861117.htm

    -Study Says Net Could Benefit Music Firms
    -http://www.latimes.com/business/la-fi-music14aug14.story

    -Eisner Crimping His Own Style
    -http://www.latimes.com/business/la-fi-disney14aug14.story

    -Severance claims by Enron former execs anger ex-workers
    -http://www.chron.com/cs/CDA/story.hts/business/1533657

    -Princeton removes dean after Yale Web site flap (AP)
    -http://www.siliconvalley.com/mld/siliconvalley/3857890.htm

    -Frisbee golf creator dies, may land on someone's roof (SF Chronicle)
    -http://seattlepi.nwsource.com/national/82560_frisbee14.shtml

    -Will Kinsley's Slate Get Wiped?
    -http://www.ojr.org/ojr/kramer/1029281360.php

    -Hollywood, Russian Bicker Over Bass
    -http://www.cnn.com/2002/SHOWBIZ/News/08/13/bassspace.hollywood.ap/

    - -
    - - -     -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Sponsor - -
    - - -
    - - - - - - - - - - - - - -
    - - - - - - - - Do you want to reach the Net's savviest audience?
    -Advertise in Media Unspun.
    -Contact Erik Vanderkolk for details at erikvanderkolk@yahoo.com today. - -
    - - -     -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - Staff - - - - - - - - - -
    - - - - - - - - Written by Deborah Asbrand (dasbrand@world.std.com), Keith Dawson (dawson@world.std.com), Jen Muehlbauer (jen@englishmajor.com), and Lori Patel (loripatel@hotmail.com). -

    -Copyedited by Jim Duffy (jimduffy86@yahoo.com). -

    -Marketing: Cowpoke Productions (cowpokeproductions.com). -

    -Advertising: Erik Vanderkolk (erikvanderkolk@yahoo.com). -

    -Editor and publisher: Jimmy Guterman (guterman@vineyard.com). -

    -Media Unspun is produced by The Vineyard Group Inc. -
    Copyright 2002 Media Unspun, Inc., and The Vineyard Group, Inc. -
    Subscribe already, willya? http://www.mediaunspun.com -

    -Redistribution by email is permitted as long as a link to http://newsletter.mediaunspun.com is included. - -
    - - -     -

    - -
    - - - - - - - - - - - - - - - - - -     		- - - - - - - - - - - - - - - - -
    - - - -
    - - - SUBSCRIBE - - -
    - - - - - - - - - - - - - - - - -
    - -

    - Enter your email address in the box below to receive a free four-week trial of Media Unspun: -

    - - - - - - - - - - - - - - - - - - - - - - - - - -

    -
    - - - - - Add - - - - - - Remove
    - - - - SendasHTML
    - - -   - -

    - - - -
    - - -
    -
    -


    Newsletter Services
    Provided by
    iMakeNews.com

     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - -
    - - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - TELL A FRIEND - - - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - - -
    Powered by iMakeNews.com™
    - This email was sent to: xxxxx@yyyyyy.zzz
    Click here to be instantly removed from this list.
    Click here to receive future messages in plain text format.
    Click here to change your subscriber information and preferences.
    - - - - - - - - -

      - - - - - -

    - - - - - -
    - - - - - - - -------------=_1029331990-31627-4-- - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/mlist_mailman_message spamassassin-4.0.0~rc3/xt/data/whitelists/mlist_mailman_message --- spamassassin-3.4.6/xt/data/whitelists/mlist_mailman_message 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/mlist_mailman_message 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -Received: from usw-sf-list2.yyyyyyyyyyyy.net (usw-sf-fw2.yyyyyyyyyyyy.net - [216.136.171.252]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id - g7HFlZ603002 for ; Sat, 17 Aug 2002 16:47:35 +0100 -Received: from usw-sf-list1-b.yyyyyyyyyyyy.net ([10.3.1.13] - helo=usw-sf-list1.yyyyyyyyyyyy.net) by usw-sf-list2.yyyyyyyyyyyy.net with - esmtp (Exim 3.31-VA-mm2 #1 (Debian)) id 17g5m8-000654-00; Sat, - 17 Aug 2002 08:46:04 -0700 -Received: from dogma.slashnull.org ([212.17.35.15]) by - usw-sf-list1.yyyyyyyyyyyy.net with esmtp (Exim 3.31-VA-mm2 #1 (Debian)) id - 17g5lM-0005xL-00 for ; - Sat, 17 Aug 2002 08:45:16 -0700 -Received: (from apache@localhost) by dogma.slashnull.org (8.11.6/8.11.6) - id g7HFj8h02977; Sat, 17 Aug 2002 16:45:08 +0100 -X-Authentication-Warning: dogma.slashnull.org: apache set sender to - zzzzzz@zzzzzz.org using -f -Received: from 194.125.173.146 (SquirrelMail authenticated user zzzzzz) by - zzzzzz.org with HTTP; Sat, 17 Aug 2002 16:45:08 +0100 (IST) -Message-Id: <33025.194.125.173.146.1029599108.squirrel@zzzzzz.org> -From: "Justin Mason" -To: SpamAssassin-talk@lists.yyyyyyyyyyyy.net -X-Mailer: SquirrelMail (version 1.0.6) -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-1 -Content-Transfer-Encoding: 8bit -Subject: [SAtalk] spam-phrases existing algo -Sender: spamassassin-talk-admin@lists.yyyyyyyyyyyy.net -Errors-To: spamassassin-talk-admin@lists.yyyyyyyyyyyy.net -X-Beenthere: spamassassin-talk@lists.yyyyyyyyyyyy.net -X-Mailman-Version: 2.0.9-sf.net -Precedence: bulk -List-Help: -List-Post: -List-Subscribe: , - -List-Id: Talk about SpamAssassin -List-Unsubscribe: , - -List-Archive: -X-Original-Date: Sat, 17 Aug 2002 16:45:08 +0100 (IST) -Date: Sat, 17 Aug 2002 16:45:08 +0100 (IST) - -BTW, I should not that this algorithm Paul Graham uses is -very close to what we've got in spam-phrases code already. - -To turn it into pcode: - - mass-check for spamphrases: - - - get mail body, strip HTML, attachments and mail formatting - - strip stopwords ("to", "of", "a" etc.) - - find pairs of 3-20 letter words - - foreach pair: - - skip pair if one word is in stoplist of common terms - - ++ the frequency of that word-pair - - settle-phrases -- turn mass-check results into a spamphrases file - - - read all spam word-pairs, let NS = number of word-pairs - - read all nonspam word-pairs, let NN = number of word-pairs - - let bias = NS / NN (compensates for different corpus size) - - foreach nonspam word-pair: - - wpfreq = (freq in spam) - (frequency in nonspam * bias) - - foreach spam word-pair: - - if (wordpair was not found in nonspam): - - wpfreq *= 10 - - note the highest score of all rules - - scoring of an incoming message: - - - get mail body, strip HTML, attachments and mail formatting - - strip stopwords ("to", "of", "a" etc.) - - find pairs of 3-20 letter words - - foreach pair: - - score += ((wpfreq*10) / highest_score_of_all_rules) - - foreach "!" found in text: - - score++ - - return result as "spam phrase score". - -So it's quite close to PG's algo, but he also tracks the non-spam -word-pairs -- which we don't do for SpamAssassin, because they -overfit to the mass-checker's nonspam mail corpus (generally -names of friends, etc.) - ---j. - - - -------------------------------------------------------- -This sf.net email is sponsored by: OSDN - Tired of that same old -cell phone? Get a new here for FREE! -https://www.inphonic.com/r.asp?r=yyyyyyyyyyyy&refcode1=vs3390 -_______________________________________________ -Spamassassin-talk mailing list -Spamassassin-talk@lists.yyyyyyyyyyyy.net -https://lists.yyyyyyyyyyyy.net/lists/listinfo/spamassassin-talk diff -Nru spamassassin-3.4.6/xt/data/whitelists/mlist_yahoo_groups_message spamassassin-4.0.0~rc3/xt/data/whitelists/mlist_yahoo_groups_message --- spamassassin-3.4.6/xt/data/whitelists/mlist_yahoo_groups_message 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/mlist_yahoo_groups_message 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -Received: from dogma.slashnull.org (dogma.slashnull.org [212.17.35.15]) - by sonic.xxxxxxxxx.org (Postfix) with ESMTP id 9424D132505 - for ; Thu, 1 Aug 2002 14:21:59 -0700 (PDT) -Received: from intm3.sparklist.com (intm3.sparklist.com [207.250.144.9]) - by dogma.slashnull.org (8.11.6/8.11.6) with SMTP id g71LMw230398 - for ; Thu, 1 Aug 2002 22:22:58 +0100 -Date: Thu, 2 May 2002 00:02:49 +1200 -Subject: [Sigiii-l] [InfoInternational] REINBERGER FOUNDATION GIFT -To: -From: "Biju K Abraham" -Message-Id: -MIME-Version: 1.0 -Content-type: multipart/alternative; boundary="------=_NextPart_000_0146_01C1F16C.B224C240" - -------=_NextPart_000_0146_01C1F16C.B224C240 -Content-Type: text/plain; - charset="iso-8859-1" -Content-Transfer-Encoding: quoted-printable - -REINBERGER FOUNDATION GIFT TO=20 -KENT STATE UNIVERSITY SLIS=20 - -Kent State University's School of Library and Information Science -received a gift of $240,000 from the Reinberger Foundation of Cleveland -for the construction of a unique national center dedicated to training libr= -arians who=20 -specialize in services for children, young adults and school -librarianship. The gift was announced in anticipation of National -Library Week (April 14-20).=20 -=20 -"The Children's Resource Center will offer an environment similar to -achildren's or elementary school library complete with books, -multimedia, puppets and a storytelling area," said Associate Professor -Dr. Carolyn S.Brodie, who has built the School of Library and -Information Science's collection of materials for youth, and is a -co-recipient of the Reinberger gift. Brodie recently served as chair of -the 2000 John Newbery Award Committee.=20 -=20 -The Children's Resource Center will be unique among the nation's library -schools and will serve as a model classroom for library science programs -for children's librarians. The Center is designed to be much more than a -university classroom and will include a children's - resource area that will house more than=20 -5,000 children's books, materials, and resources to -create a focal point for instruction in children's, young adult, and -school librarianship.=20 - -The 1,700-square-foot resource center will also -include a wireless computer network installed with specialized software -and other resources used in children's and school libraries. For more -information contact Megan Harding, (330) 672-0419.=20 - - - Moderator - - - -------=_NextPart_000_0146_01C1F16C.B224C240 -Content-Type: text/html; charset=US-ASCII -Content-Transfer-Encoding: 7bit - - - - - - - - - - -
    REINBERGER FOUNDATION GIFT TO -
    -
    KENT STATE UNIVERSITY SLIS
    -

    Kent State University's School of -Library and Information Science
    received a gift of $240,000 from the Reinberger Foundation of Cleveland
    for -the construction of a unique national center dedicated to training librarians -who
    specialize in services for children, young adults and -school
    librarianship. The gift was announced in anticipation of -National
    Library Week (April 14-20).
     
    "The Children's Resource -Center will offer an environment similar to
    achildren's or elementary school -library complete with books,
    multimedia, puppets and a storytelling area," -said Associate Professor
    Dr. Carolyn S.Brodie, who has built the School of -Library and
    Information Science's collection of materials for youth, and is -a
    co-recipient of the Reinberger gift. Brodie recently served as chair -of
    the 2000 John Newbery Award Committee.
     
    The Children's Resource Center will be unique among the -nation's library
    schools and will serve as a model classroom for library -science programs
    for children's librarians. The Center is designed to be much -more than a
    university classroom and will include a children's
    -
     resource area that will house -more than
    -
    5,000 children's books, materials, and -resources to
    create a focal point for instruction in children's, young adult, -and
    school librarianship.
    -
     
    -
    The 1,700-square-foot resource center -will also
    include a wireless computer network installed with specialized -software
    and other resources used in children's and school libraries. For -more
    information contact Megan Harding, (330) -672-0419. 
    -
     - -Moderator -
    -
    - - - - - - - - - - - -
    Yahoo! Groups Sponsor
    ADVERTISEMENT
    - - - - -
    - -To unsubscribe from this group, send an email to:
    -InfoInternational-unsubscribe@yahoogroups.com
    -
    -     -
    - -
    -Your use of Yahoo! Groups is subject to the Yahoo! Terms of Service. -
    - - - -------=_NextPart_000_0146_01C1F16C.B224C240-- - diff -Nru spamassassin-3.4.6/xt/data/whitelists/mypoints spamassassin-4.0.0~rc3/xt/data/whitelists/mypoints --- spamassassin-3.4.6/xt/data/whitelists/mypoints 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/mypoints 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Return-Path: -Delivered-To: zzz-zzzzzzz@fffffffff.org -Received: (qmail 6475 invoked by uid 505); 20 Jun 2002 02:01:31 -0000 -Received: from mpmail@mpmlbx06.mypoints.com by zzzzzz.fffffffff.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.243337 secs); 20 Jun 2002 02:01:31 -0000 -Received: from mpmlbx06.mypoints.com (216.33.87.173) - by dsl092-072-213.bos1.dsl.speakeasy.net with SMTP; 20 Jun 2002 02:01:30 -0000 -Received: (from mpmail@localhost) - by mpmlbx06 (8.11.0/8.11.0) id g5K1onT23615; - Wed, 19 Jun 2002 20:50:49 -Date: Wed, 19 Jun 2002 20:50:49 -Message-ID: <2002619205049.g5K1onT23615@mpmlbx06> -To: zzz-zzzzzzz@fffffffff.org -From: BonusMail from MyPoints -Reply-To: BonusMailReply@mypoints.com -Subject: New Deals Just Added! Massive Sheet Liquidation--Now Save up to 84%! -X-Indiv: y6f6f69de10d97c7a932zzc3902bf5331 -X-JobID: 107974 -MIME-Version: 1.0 -Content-Type: text/html;charset=us-ascii -Content-Transfer-Encoding: 7bit - -[MyPoints newsletter] diff -Nru spamassassin-3.4.6/xt/data/whitelists/neat_net_tricks spamassassin-4.0.0~rc3/xt/data/whitelists/neat_net_tricks --- spamassassin-3.4.6/xt/data/whitelists/neat_net_tricks 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/neat_net_tricks 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ -From bounce-neatnettricks-1234567@silver.lyris.net Thu Aug 15 10:51:10 2002 -Return-Path: -Delivered-To: aaa@localhost.netnoteinc.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 8448D43C4F - for ; Thu, 15 Aug 2002 05:49:35 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for aaa@localhost (single-drop); Thu, 15 Aug 2002 10:49:35 +0100 (IST) -Received: from silver.lyris.net (silver.lyris.net [216.91.57.32]) by - dogma.slashnull.org (8.11.6/8.11.6) with SMTP id g7ENU3408604 for - ; Thu, 15 Aug 2002 00:30:03 +0100 -Message-Id: -X-Sender: jteems@rap.midco.net@pop.midco.net -X-Mailer: QUALCOMM Windows Eudora Version 5.1 -Date: Wed, 14 Aug 2002 16:20:00 -0700 -To: aaaaaa@yyyyyy.zzz -From: NNT@silver.lyris.net -Subject: Neat Net Tricks Standard Issue 131 - August 15, 2002 -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii"; format=flowed -List-Unsubscribe: -Reply-To: NNT@silver.lyris.net -X-Pyzor: Reported 0 times. - -IN THIS ISSUE: - -01. Secure IE -02. Disk cleanup on XP -03. Thanks but no thanks -04. Mouseless way home -05. Kartoo -06. XP time feature -07. Leaf Peeper Alert -08. Saving scraps -09. Quick access -10. Don't believe your email - -And What's Coming Up Next Week in NNT Premium - -01. SECURE IE. For the past month or so, our Software Review Panel has -been giving a grueling test to Secure IE, a piece of software that blocks -Flash and pop-ups, prevents malicious file downloads, lets you customize -Security Zone settings as you browse dozens of Web sites simultaneously up -to five times faster with a tabbed interface, annotate Web page with sticky -notes and highlighter, and save complete Web pages, even secure server -(HTTPS) pages and archive online transaction receipts. For what we believe -is one of the most thorough reviews ever conducted on a single piece of -software, check out what our Panel had to say at -http://www.NeatNetTricks.com/SoftwareReviews . For a free trial download, -visit http://www.secureie.com . And if this one sweeps you off your feet, -go to the NNT Store at http://www.NeatNetTricks.com/store and get a super -deal, just $17.50 if you order before September 14. With a 30-day -guarantee, what's to lose? - -02. DISK CLEANUP ON XP. Windows XP users can do some fast cleaning chores -with Disk Cleanup. Access this tool from the Start menu by right clicking -on your hard drive. Then select Properties and click on the Disk Cleanup -button to determine how many files can be safely deleted. - -03. THANKS BUT NO THANKS. Continuing our periodic feature of -less-than-useful sites on the Web: The International Center for Bathroom -Etiquette at http://www.icbe.org/ gets our recognition this issue. It says -it's working hard to bring you the latest in cutting edge research and -technology regarding bathroom etiquette. We'll resist some obvious puns. - -. . . . . - -West Virginia's Diane Stratton recommended NNT to some friends and is now -enjoying QuicKeys 2.0, a great Windows management software package. Diane -is our latest winner and you could be next. Just go to the NNT Web site at -http://www.NeatNetTricks.com and click on "Recommend NNT." Nothing could -be easier. - -. . . . . - -04. MOUSELESS WAY HOME. To go home quickly in Internet Explorer, touch F6 -to highlight the Address Bar and type two periods (..) there. The Enter -key then takes you home. - -05. KARTOO. Search engines are everywhere on the Internet but Kartoo at -http://www.kartoo.net is quite unusual. It's a meta search engine that -displays results on a map in the form of a ball. The larger the ball, the -more relevant the result. As you mouseover each result, site descriptions -are revealed. If all that sounds confusing, the explanation is more -complicated than the service itself. Just try it. - -. . . . . - -You should make it a habit to visit the NNT Store at -http://www.NeatNetTricks.com/store . We try to have several great products -there at a limited-time price much less than anywhere else on the Net. -Currently, you'll find excellent ebooks, a very effective popup stopper, -and the very useful utility described in item 01 above, along with the -usual opportunity to subscribe to NNT Premium and ArchivesExpress. Check -us out, you'll be glad you did. - -. . . . . - -06. XP TIME FEATURE. Windows XP added a nice feature that heretofore -required a separate software application. It will connect, either at a -programmed time or manually, to a time server via the Internet and reset -that often erroneous internal clock. Just click on the time in the systems -tray, go to Date and Time Properties and click the Internet Time tab. - -07. LEAF PEEPER ALERT. A bit early, but soon the changing colors of autumn -will begin here in the U.S. For those who like to follow the display, -consider http://www.stormfax.com/foliage.htm for a comprehensive collection -of links and toll-free numbers to each state to determine peak color times. - -08. SAVINGS SCRAPS. Some oldies are worth repeating. If you're working -with text in, for example, MS Word or WordPad, and would like a handy way -to save a portion for later easy retrieval, just select (highlight) it and -click/drag it to your desktop. When the newly created icon is clicked on, -it will show the application with which the scrap was created, along with -the first few words of the text. A double click opens the text in the -application with which it was created. - -09. QUICK ACCESS. To go to a frequently used program, you may find -yourself drilling down to the desktop and searching out the shortcut -icon. Consider instead setting up a key combination that will provide -quick access without using the shortcut. Right click on the shortcut and -select Properties. In the Shortcut key window, select any key you can -remember and click OK. Ctrl+Alt and that key will open the application -whenever needed. - -10. DON'T BELIEVE YOUR EMAIL. We've been asked about those emails with -virus attachments that appear to be coming from NNT, asking for a -confirmation of a subscription. Don't believe it, and don't open the -attachments. Maybe this exchange between NNT and Lyris (our mail manager) -will clear things up: - -NNT: Is there anything that can be done about the current strains of virus -that implant on address books and randomly send email asking alleged -subscribers to verify their subscription (when they haven't subscribed at -all)? I've received some of these as well, and I know it's become a -widespread problem with other ezine publishers, creating a lot of ill will -all around. Is there some configuration that we could change to keep -these from going out except to legitimate subscribers? - -Lyris: Unfortunately, there isn't much we can do about this since it -isn't actually ListManager doing the sending. The real problem is that -people sometimes will add the "join" address to their address book and -that is what causes the problems. The best we can do is advise people not -to have their address books set to automatically add any email address -that they send a message to even once. The main culprit here seems to be -Outlook Express. - -WHAT'S COMING NEXT WEEK: Another batch of Neat Net Tricks in the Premium -issue, including: - -* A great collection of information and free downloads to make your system -more secure. - -* Free software to measure and display your real-time Internet speed. - -* Can you handle still another popup stopper - that's interference free - -and at no cost? - -* An easy-to-use tool to store and arrange all your passwords, user IDs, -and other info. - -* A Microsoft Word tip to easily work around that pesky autocompletion -feature. - -* A whole arsenal of tools to combat spam. - -* Software that provides more than 200 interesting facts about your -computer and displays about your CPU, memory, operating system, and your -computer's power source. - -* Our in-depth article discusses how to best manage our important -passwords and get out of trouble when we -inevitably - forget those passwords. - -And more! If you haven't subscribed yet, you won't find a better source of -useful information for just 42 cents per issue. That's $10 for a year's -worth - 24 issues - at the NNT Store, http://www.NeatNetTricks.com/store . - -. . . . . . - -NNT makes no endorsement or warranty, expressed or implied, with regard to -featured products or services. Results may vary based on operating systems -and other variables beyond our control. - -For info on how to subscribe, unsubscribe, or change your address, send a -blank email to info-neatnettricks@silver.lyris.net . - -Sponsor an entire issue of NNT with your exclusive message to our readers -at very low rates. Send a blank email to -advertise-neatnettricks@silver.lyris.net . - -Comments or questions about your computer and the Internet? Visit the NNT -Bulletin Board at http://www.escribe.com/computing/neatnettricks/bb/ . - -NNT is hosted by Lyris.com, the best in email list management. - -Copyright 2002 by Jack Teems. All rights reserved. Neat Net Tricks is -registered with the U.S. Library of Congress ISSN: 1533-4619. - - ---- -You are currently subscribed to neatnettricks as: aaaaaa@yyyyyy.zzz -To unsubscribe send a blank email to leave-neatnettricks-1234567K@silver.lyris.net - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/netcenter-direct_de spamassassin-4.0.0~rc3/xt/data/whitelists/netcenter-direct_de --- spamassassin-3.4.6/xt/data/whitelists/netcenter-direct_de 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/netcenter-direct_de 1970-01-01 00:00:00.000000000 +0000 @@ -1,414 +0,0 @@ -Return-Path: -Received: (qmail 3387 invoked by alias); 15 Jul 2002 20:26:49 -0000 -Received: (qmail 26987 invoked by uid 82); 15 Jul 2002 20:23:30 -0000 -Received: from dms-errors@dms.netcenter.com by mailhost with qmail-scanner-1.00 (uvscan: v4.1.40/v4212. . Clean. Processed in 5.813084 secs); 15 Jul 2002 20:23:30 -0000 -Received: from dms-mail02.netcenter.com (207.200.87.32) - by mi-1.rz.ruhr-uni-bochum.de with SMTP; 15 Jul 2002 20:23:20 -0000 -Received: from dms-www1.netscape.com (dms-mailcaster-s07.netcenter.com) by dms-mail02.netcenter.com (LSMTP for Windows NT v1.1b) with SMTP id <8.00007AB9@dms-mail02.netcenter.com>; Mon, 15 Jul 2002 13:22:22 -0700 -To: xxxxx.yyyyy@ruhr-uni-bochum.de -Subject: Netscape News - Ausgabe Juli -From: Netscape -Date: Mon, 15 Jul 2002 13:24:23 -0800 -Reply-To: Netscape -Content-Type: multipart/alternative; - boundary="______BoundaryOfDocument______" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit - -This is a multi-part message in MIME format. - ---______BoundaryOfDocument______ -Content-Type: text/plain -Content-Transfer-Encoding: 7bit - -Netscape News - Ausgabe Juli - -Lieber Netscape-Nutzer, - -in dieser Ausgabe: - -- Mustervertrge, Rechtstipps und mehr - Die neuen Netscape Quickfinder liefern Ihnen direkte Links zu - Themen und Tools wie Downloads, Rechtstipps, Vertrgen und mehr. - -- Der neue Women-Channel - Nicht nur fr Frauen: Die Mode von Morgen, die neusten Trends in - puncto Lifestyle, leckere Rezepte und vieles mehr. - -- Netscape sucht mit Google - Ab sofort bedient sich die Netscape-Suche der Google-Suchengine. So - erhalten Sie die besten Suchergebnisse in krzester Zeit. - -- 0190-Dialer gehen um - Unserise Anbieter von 0190er-Nummern werden immer dreister. Wir zeigen - Ihnen, wie Sie sich schtzen knnen. - -- Flirten erlaubt - Sie fahren als Single in den Urlaub? Sie wollen Spa? Wir zeigen Ihnen - die besten Strnde fr einen heien Sommer-Flirt! - -http://dms-www01.netcenter.com/cgi-bin/gx.cgi/mcp?p=041H1b041H2g55Ep6l012000 -WRnwBz - ------------------------------------------------------------------- -Netscape respektiert Ihre Online-Arbeitszeit und Ihre -Privatsphre. Wenn Sie in Zukunft KEINE E-Mail-Nachrichten -mehr von Netscape erhalten mchten, klicken Sie auf untenstehenden -Link. -HINWEIS: -KLICKEN SIE NUR AUF DIESEN LINK, WENN SIE IHR ABONNEMENT -AUCH WIRKLICH BEENDEN MCHTEN! -http://dms-www01.netcenter.com/cgi-bin/gx.cgi/mcp?p=041H1d3Qxx41H2g55Ep6l012 -000WRnwBz - -Sie sind mit folgender Adresse registriert:[xxxxx.yyyyy@ruhr-uni-bochum.de] - ---______BoundaryOfDocument______ -Content-Type: text/html -Content-Transfer-Encoding: 7bit - - - - - - -Netscape News, Ausgabe -Juli - - - - - - - - - - - - - - - - - - - - -
    - NETSCAPENETSCAPE -Mail -Instant MessengerDownload
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - -
    - - -
    - - Click here to -visit our advertiser. - - - Click -here to visit our advertiser. -
    -
    - Netscape News - Juli, 2002
    -
    - - - - - - -
    - - Highlights - -
    0190-Dialer gehen um
    - Die -Abzocke nimmt kein Ende: Unserise Anbieter von 0190er-Nummern lassen sich -immer wieder neue Tricks einfallen, um die Verbraucher zu schrpfen. Wir -geben Tipps zur Vorsorge.

    - - Ab in den Urlaub
    - Noch -nichts vor im Sommer? Dann ab in den Urlaub! Unsere Last-Minute-Suche findet -sicher das passende Schnppchen fr Ihren Geldbeutel.

    - - Riester-Rente-Special
    - Jeder -spricht darber, doch wissen Sie wirklich Bescheid? Wir klren Sie ber die -Vor- und Nachteile der staatlich gefrderten Rentenform auf.

    - -
    - - -
    - -
    -     		-
    - - In dieser Ausgabe -
    - - - Zwei starke Partner:
    Netscape sucht mit -Google     -
    Die -Netscape-Suche ist jetzt noch effizienter: Sie bedient sich der -Google-Technologie, -der zur Zeit besten Such-Engine im Internet. Egal nach was Sie also suchen: -Netscape und Google liefern Ihnen in krzester Zeit die Top-Ergebnisse aus -ber 2 Milliarden Webseiten - und das bersichtlich und mit hoher -Relevanz.
     - Mehr... -

    - - Nicht nur fr Frauen:
    Der neue -Women-Channel     -
    -Netscape.de hat Nachwuchs bekommen: Im neuen Women-Channel -finden Sie alles, was das (Frauen-)Herz hher schlagen lsst. Wir verraten -Ihnen zum Beispiel, was in Sachen Mode in diesem Sommer angesagt ist, zeigen -Ihnen die neusten Trends in puncto Lifestyle und stellen leckere Rezepte -fr die leichte Sommerkche vor.
    - Mehr... -

    - -     		- - - - - - - - - - - - -
    - - Flirten erlaubt
    - Sie fahren als Single in den Urlaub? Sie wollen Spa? Wir -zeigen Ihnen die besten Strnde fr einen heien Sommer-Flirt!
    - Mehr...
    -
    - - Grukarten
    - Verschicken Sie Ihre persnlichen Gre einfach per eMail. -Das spart Zeit und kostet Sie keinen Pfennig. Jetzt testen!
    - Mehr...
    -

    -
    -
    -
    - - Mustervertrge, Rechtstipps und mehr... -
    - - Die neuen Netscape Quick Finder -
    - Das -Internet stellt eine fast grenzenlose Menge an Informationen bereit. Wer -hat da noch den Durchblick, vor allem, wenn es schnell gehen soll? Die Netscape Quick Finder -schaffen Abhilfe: Hier finden Sie direkte Links zu diversen Themen und Tools -wie Mustervertrge, Rechtstipps, Downloadarchiv, Gebrauchtwagenbewertung -und Jobbrse - um nur einige zu nennen. Schneller geht's wirklich -nicht!
     - Mehr... -
    -
    - -
    - -Um den Newsletter abzubestellen, klicken Sie bitte hier -
    oder antworten -Sie einfach auf diese email und schreiben "REMOVE" in die Betreffzeile.
    -c 2002 Netscape. Alle Rechte vorbehalten. Nutzungsbedingungen und Datenschutz     -
    - - - ---______BoundaryOfDocument______-- - - -: -annmn:[041H2g041H2g55Ep6l012000WRnwBz] - - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/netsol_renewal spamassassin-4.0.0~rc3/xt/data/whitelists/netsol_renewal --- spamassassin-3.4.6/xt/data/whitelists/netsol_renewal 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/netsol_renewal 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -From nobody@rs.internic.net Wed Jan 30 09:50:12 2002 -Delivery-Date: Tue, 13 Jun 2000 12:53:06 +0100 -Received: from zzzzzzzzz.yyyy (mail.zzzzzzzzz.yyyy [193.120.211.219]) - by zzzzzzzzzz.yyyyyyyyyyy.com (8.9.3/8.9.3) with ESMTP id MAA04894 - for ; Tue, 13 Jun 2000 12:53:04 +0100 -Received: from opsmail.internic.net (opsmail.internic.net [198.41.0.91]) - by zzzzzzzzz.yyyy (8.9.3/8.9.3) with ESMTP id MAA21530 - for ; Tue, 13 Jun 2000 12:53:03 +0100 -Received: from rs.internic.net (bipwww2.lb.internic.net [192.168.120.8]) - by opsmail.internic.net (8.9.3/8.9.1) with ESMTP id HAA23653 - for ; Tue, 13 Jun 2000 07:52:32 -0400 (EDT) -Received: (from nobody@localhost) - by rs.internic.net (8.9.3/8.8.4) - id HAA02994; Tue, 13 Jun 2000 07:52:32 -0400 (EDT) -Date: Tue, 13 Jun 2000 07:52:32 -0400 (EDT) -From: Nobody -Message-Id: <200006131152.HAA02994@rs.internic.net> -Reply-to: billing@netsol.com -To: foooooooo@yyyyyyyyyyy.com -Subject: Confirmation of yyyyyyyyyyy.com renewal order - -Dear Customer, - -Congratulations! Your Web Address (domain name) has been renewed for -an extended period. - -We will be processing your order within the next 24-48 hours. Renewal -of your domain name is effective on your current expiration date. * - -Here is a summary of your order: - - * Domain Name: yyyyyyyyyyy.com - * Total: $70.00 - * Rebate: $10.50 - -*Subject to receipt of complete and accurate information as requested -in your renewal registration order. If you have any questions, visit -the FAQ section of our website: -http://www.networksolutions.com/help/faq-multiyear-rebate.html - -Be sure to visit your website and learn more about products, services -and free resources offered by Network Solutions: -http://www.networksolutions.com/catalog/ - -Get VeriSign secure encryption on your new website, and you'll give your -customers the confidence to place orders online. Request a FREE Guide, -"Securing Your Web Site for Business." -http://www.verisign.com/cgi-bin/go.cgi?a=w000000000000000 - -Thank you for renewing the registration of your domain name with Network -Solutions! - -Sincerely, - -Network Solutions, Inc. -The dot com people (TM) - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/networkworld spamassassin-4.0.0~rc3/xt/data/whitelists/networkworld --- spamassassin-3.4.6/xt/data/whitelists/networkworld 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/networkworld 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -From NSManagement@bdcimail.com Wed Aug 14 15:30:00 2002 -Return-Path: -Delivered-To: ffffffff@localhost.zzzzzzzzzz-ffffffff.net -Received: from localhost (localhost.localdomain [127.0.0.1]) - by mail.zzzzzzzzzz-ffffffff.net (Postfix) with ESMTP id 707A9BEE4A - for ; Thu, 15 Aug 2002 06:12:03 -0700 (PDT) -Received: from mail.zzzzzzzzzz-ffffffff.com - by localhost with IMAP (fetchmail-5.9.11) - for ffffffff@localhost (single-drop); Thu, 15 Aug 2002 06:12:03 -0700 (PDT) -Received: from mailcontrol.bellevuedata.com (mailcontrol.bellevuedata.com [66.37.227.18]) - by mail44.megamailservers.com (8.12.5/8.12.0.Beta10) with SMTP id g7F78WpU002632 - for ; Thu, 15 Aug 2002 03:11:00 -0400 (EDT) -X-Mailer: ListManager Web Interface -Date: Wed, 14 Aug 2002 17:30:00 -0500 -Subject: Combining point products and suites -To: aaaaaaa@zzzzzzzzzz-ffffffff.com -From: NW on Network/Systems Management -Reply-To: Network/Systems Management Help -Message-Id: -Content-Type: text/plain; - charset="iso-8859-1" -X-SpamBouncer: 1.5 (7/17/02) -X-SBNote: FROM_DAEMON/Listserv -X-SBPass: No Pattern Matching -X-SBPass: No Freemail Filtering -X-SBClass: Bulk -X-Folder: Bulk - -NETWORK WORLD FUSION FOCUS: AUDREY RASMUSSEN on -NETWORK/SYSTEMS MANAGEMENT -08/14/02 -Today's focus: Combining point products and suites - -Dear Robin Frank, - -In this issue: - -* Readers who advocate using both point products and suites -* Links related to Network/Systems Management -* Featured reader resource - -_______________________________________________________________ -This newsletter sponsored by -Lucent - -Do you want to receive calls while online and not need a second -phone line? - -Do you want shorter connect times? - -Could you benefit from faster uploads? -For Next-Generation Dial Access, you need V.92. - -To learn more, click here for the Lucent Technologies V.92 -InfoCenter. http://www.nww1.com/go2/lucent_rc.html -_______________________________________________________________ -A NETWORK WORLD SPECIAL REPORT: BUSINESS CONTINUITY & DISASTER -RECOVERY PLANNING - -Dr. Jim Metzler of Ashton, Metzler & Associates discusses -techniques on how to proactively implement Business Continuity -and Disaster Recovery Planning. Sponsored by Syncsort, this -SPECIAL REPORT emphasizes both the tactical and strategic -considerations necessary for data and infrastructure -protection. Download your FREE copy today at: -http://nww1.com/go/ad306.html (registration required) - -_______________________________________________________________ -Today's focus: Combining point products and suites - -By Audrey Rasmussen - -Today we'll hear from readers who think the best route to take -in the debate between point products and suites is to use a -little of both. - -One reader commented that a company doesn't have to choose one -over the other. He says: - -"It has been my experience that a well-managed enterprise -monitoring system will most likely include some of both: point -solutions to address specific network/systems issues, and a -centralized, single pane of glass from a 'framework' system -providing a common platform for event and problem management." - -Another reader said organizational issues are an important -factor. An approach must work within the organizational and -political structure of a company: - -"The approach with best of breed, plus some integration tools -above it, is probably the less risky route - and for less -integrated organizations, the better way to go. If you go for -an integrated framework, you'd better be sure that you can -handle it from an organizational viewpoint; otherwise it could -be a hard, expensive landing." - -According to yet another reader, there are other factors that -affect the decision on the management approach: - -"Mostly this question is answered based on: - -* How high up in the organization the decision is being made - -* How pragmatically (quick and dirty vs. big and beautiful) - does one want to approach the issue - -* How specific the requirements are - -* Time of decision - -"Each supplier has its rise and fall; the winner of today may -be a loser tomorrow. If the different user [administrator] -groups have a different timing regarding when they need a tool, -they will probably come to different decisions." - -Another user says: - -"My personal favorite solution involves using vendor-supplied -software agents such as IBM Director or Compaq Insight Manager -and integrating them into a suite solution such as Tivoli or CA -Unicenter. This removes not only the cost of the middleware and -integration layers, but also removes the cost of the agent -technology." - -So, there you have opinions from readers who embrace point -products and suites working together. - -_______________________________________________________________ -To contact Audrey Rasmussen: - -Audrey Rasmussen is a research director with Enterprise -Management Associates in Boulder, Colorado, -(http://www.enterprisemanagement.com), a leading analyst -and market research firm focusing exclusively on all aspects -of enterprise management. Audrey has more than 20 years of -experience working with distributed systems, applications -and networks. Her current focus at EMA is e-business, SMB/SME -and MSPs. She can be reached at: -mailto:rasmussen@enterprisemanagement.com. -_______________________________________________________________ -2002 SALARY CALCULATOR - -How has the turbulent market affected your earning potential? -Find out with Network World's 2002 Salary Calculator. We've -updated the Salary Calculator and revised it to reflect the -results of the Network World 2002 Salary Survey. Give us some -details about yourself and we'll tell you if you earn as much -as your peers: http://nww1.com/go/ad324.html -_______________________________________________________________ -RELATED EDITORIAL LINKS - -SLAMming service levels into shape -Network World, 08/12/02 -http://www.nwfusion.com/news/2002/134753_08-12-2002.html - -Archive of the Network/Systems Management newsletter: -http://www.nwfusion.com/newsletters/nsm/index.html -_______________________________________________________________ -If you're concerned about the growing turbulence in the telco -industry, you are not alone. The massive financial and -organizational changes now underway at many of the largest -carriers increase the possibility of service outages, -performance degradation and poor operations support. Find out -what you can do to mitigate your risks. Attend a free web -seminar on the best practices for protecting your business from -telco turbulence. Leading industry expert, David Willis of the -META Group, will analyze the inevitable consequences of the -current environment and share pragmatic steps to shield your -users and applications from carrier failures. -http://nww1.com/go/4531858a.html -_______________________________________________________________ -FEATURED READER RESOURCE - -NW FUSION'S WHITEPAPERS CENTRAL - -A free resource to Network World Fusion visitors is the -Whitepaper Central area on NW Fusion. Here you can find vendor -and Network World produced whitepapers on a variety of network -topics. You can search our whitepapers database by company or -by title. All are available free of charge. Visit -http://www.nwfusion.com/bg/wp/wpbydate.jsp today. -_______________________________________________________________ -May We Send You a Free Print Subscription? -You've got the technology snapshot of your choice delivered -at your fingertips each day. Now, extend your knowledge by -receiving 51 FREE issues to our print publication. Apply -today at http://www.nwwsubscribe.com/nl -_______________________________________________________________ -SUBSCRIPTION SERVICES - -To subscribe or unsubscribe to any Network World e-mail -newsletters, go to: -http://www.nwwsubscribe.com/news/scripts/notprinteditnews.asp - -To unsubscribe from promotional e-mail go to: -http://www.nwwsubscribe.com/ep - -To change your e-mail address, go to: -http://www.nwwsubscribe.com/news/scripts/changeemail.asp - -Subscription questions? Contact Customer Service by replying to -this message. - -Have editorial comments? Write Jeff Caruso, Newsletter Editor, -at: mailto:jcaruso@nww.com - -For advertising information, write Alonna Doucette, V.P. of -Online Development, at: mailto:sponsorships@nwfusion.com - -Copyright Network World, Inc., 2002 - ------------------------- -This message was sent to: aaaaaaa@zzzzzzzzzz-ffffffff.com - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/oracle_net_techblast spamassassin-4.0.0~rc3/xt/data/whitelists/oracle_net_techblast --- spamassassin-3.4.6/xt/data/whitelists/oracle_net_techblast 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/oracle_net_techblast 1970-01-01 00:00:00.000000000 +0000 @@ -1,554 +0,0 @@ -Return-Path: -Received: (qmail 19678 invoked by alias); 10 Jul 2002 13:22:47 -0000 -Received: (qmail 19416 invoked by uid 82); 10 Jul 2002 13:22:42 -0000 -Received: from replies@oracleeblast.com by mailhost with qmail-scanner-1.00 (uvscan: v4.1.40/v4210. . Clean. Processed in 8.59332 secs); 10 Jul 2002 13:22:42 -0000 -Received: from inet-mail6.oracle.com (209.246.10.170) - by mi-1.rz.ruhr-uni-bochum.de with SMTP; 10 Jul 2002 13:22:30 -0000 -Received: from blaster-smtp.oracle.com (eblast01.oracleeblast.com [148.87.9.11]) - by inet-mail6.oracle.com (Switch-2.2.2/Switch-2.2.0) with ESMTP id g6ADMHs25188 - for XXXXXX.YYYYY@RUHR-UNI-BOCHUM.DE; Wed, 10 Jul 2002 06:22:17 -0700 (PDT) -Date: Wed, 10 Jul 2002 06:22:17 -0700 (PDT) -Message-Id: <200207101322.g6ADMHs25188@inet-mail6.oracle.com> -Subject: Oracle Technology Network TechBlast - July 2002 -From: Oracle Technology Network -To: XXXXXX.YYYYY@RUHR-UNI-BOCHUM.DE -Reply-To: replies@oracleeblast.com -Content-Transfer-Encoding: 8bit -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="next_part_of_message" - ---next_part_of_message - - - -e -e -ssage -Content-type: text/plain; charset=iso-8859-1 - - - ---next_part_of_message -Content-Type: text/html - - - -Oracle Technology Network -
    OTN - TechBlast
    -     July 2002 Issue
    - The monthly TechBlast is also available through the Oracle - Technology Network website.
    -
    -
    -
    -
    - - - - - - -
    In - this issue: - - - - - - - - - - - - - - - - - - - - - - - - - -
    This - Month's Feature
    - News
    Software - Downloads
    Oracle - University
    New - Books
    -

    Worldwide - Events:
    - Americas     | EMEA | APAC

    -
    -

    -     		-

    This - Month's Feature: - New Developer Services on OTN

    -

    OTN Members: Get - Oracle Software on CD Shipped - to you Today!
    -     Order OTN TechTracks - and receive Oracle9i Database Release 2, Oracle9i Application Server Release - 2, and Oracle Developer Suite (including JDeveloper) CDs for the platform - of your choice. TechTracks is a one-year subscription, and it includes - access to Oracle Support's KnowledgeBase and CD updates shipped to you - whenever there are major new releases of Oracle software. Enter promo - code OWC for a $50 savings during the month of July.

    -

    Exchange your Knowledge - through OTN Community Code Services
    -     OTN Community Code - is a web-browsable CVS repository that lets you review, customize, extend, - and share Oracle-related code and coding techniques. OTN populated it - with sample application projects, so that you can view sample code source - online, download it, submit bugs and suggestions to the development teams, - and get email notifications when code is updated. Participate in an Oracle-sponsored - project, and then create your own project and share your code with the - OTN community.

    -

    Web Services Center - Now Available on OTN
    - The OTN Web Services - Center is a new resource for the development and deployment of Web - services. Visitors to this new Center can experience live Web service - examples, access the latest Web services technical information, and build - their own Web services using Oracle9i - JDeveloper. The Web Services Center offers information of value to - Web services architects, - developers - and newcomers.

    -

    Win Great Prizes - in the OTN Web Services Challenge
    - Developers are encouraged to submit their own Web services to the OTN - Web Services Challenge. Entering your Web services makes you eligible - for fantastic prizes, including a fully decked-out Dell mobile workstation. - The Challenge starts August 1, so get - a head start today by learning more about the rules. You can even - preregister your - interest in the Challenge.

    -

    New Internet Seminar: - J2EE and Web Services on Linux with Oracle9iAS Release 2
    - Attend - this on-demand Internet Seminar to learn how to use Oracle9i Application - Server Release 2 to develop high performance J2EE and Web Services applications - on the Linux operating systems.

    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -

    News

    -

    Special - Discount on Red Hat Linux Advanced Server
    - Receive up to 45% discount on the initial purchase of Red Hat Linux Advanced - Server. Find - out how! Offer valid July 1- July 31, 2002. To get more information - on Oracle and Linux, click - here.

    -

    Helping WebGain - Developers Move to Oracle9i JDeveloper
    - With all the consolidation taking place in the Java tools space, developers - are seeking tools that provide a complete and integrated environment for - developing J2EE applications and Web services, and also offer security - and stability for the future. Oracle9i JDeveloper delivers on all counts, - and the new WebGain - Developer Center on OTN has been created to give VisualCafe users - the resources to move - rapidly and smoothly to the integrated development environment of Oracle9i - JDeveloper. Listen - to the interview with Ted Farrell, Oracle's Senior Director of Applications - Tools Technology and former WebGain CTO, on "moving to Oracle9i JDeveloper". -

    -

    Oracle9i Application - Server # 1 in ECperf Benchmarks
    - In its first ECperf submissions, Oracle9i Application Server Release 2 - achieved the industry's best ever 'performance' benchmark at 61,863 BBops/min, - beating IBM by 39% and BEA by 63%. The proof is in: Oracle9iAS is still - faster than IBM and BEA. Oracle9iAS also achieved the best results in - the ECperf 'price/performance' category at $5/BBop, 28% better than BEA's - top result, and 54% better than IBM's top result. Get the facts: read - the Oracle9iAS ECperf Benchmark Report now and tune - into a Live Internet Seminar and Q&A on Wednesday, July 17 at - 8:00 a.m. PDT for a live presentation and discussion of these record setting - results.

    -

    Four Internet Seminars - on the New Security Features in Oracle9i Application Server Release 2 -
    - Watch - these four Internet Seminars to learn about the new security features - in Oracle9i Application Server Release 2. Oracle9i Application Server - Release 2 is the first application server to offer integrated support - for Single Sign-On, JAAS and an LDAP compliant directory that together - let you cost efficiently secure all your J2EE applications, portals, and - Web services.

    -

    OTN Toolbar
    - Search OTN from anywhere on the internet with OTN Toolbar. Download - today to easily gain access to many of the key features of OTN (including - downloads, sample code, documentation, and discussion forums).

    -

    New Internet Seminar - on Oracle9iAS Web Cache and ESI
    - Watch - this Internet Seminar and learn how Oracle9iAS Web Cache lets you accelerate - any Web application running on any server by up to 20 times. Speed applications - built in Active Server Pages, Java Server Pages, Servlets, EJBs and more. - Deploy with Web servers like Apache and Microsoft IIS as well as application - servers like BEA WebLogic, IBM WebSphere, Sun/iPlanet and, of course, - Oracle9iAS. Best of all, Oracle9iAS Web Cache uniquely supports caching - of both static and dynamically generated content without changing the - application, enabling dynamic Web sites to more efficiently deliver rich - content and therefore improving the user experience.

    -

    Oracle9i Reports - data source SDK available now
    - The Oracle9i - Reports data source SDK allows you to plug in your own data sources - and benefit from the sophisticated report creation and distribution environment - of Oracle9i - Reports. Check out the new documentation and samples.

    -

    Putting Forms on - the Web
    - Looking to move your existing Forms application from client/server to - the Web? Want the easy access and maintainability of a web deployed Forms - application? Then check - out this new paper.

    -

    Struts and Oracle9i - JDeveloper
    - Here's a cool - new article with detailed instructions on how to configure and use - the Jakarta Struts open source Model-View-Controller framework with Oracle9i - JDeveloper.

    -

    Quickstart with - Oracle9i JDeveloper for BEA developers
    - Are you using BEA's WebLogic and looking for development tools? Here is - the easy way to start - using the award winning Oracle9i JDeveloper with WebLogic. And if you - want to use the fastest J2EE container, check out the migration - kit to Oracle9iAS.

    -

    Wireless and Voice - Made Easy With Oracle9i Application Server
    - New Internet lessons give viewers the low-down on how to use the wireless - and voice services of Oracle9i Application Server (Oracle9iAS Wireless) - to quickly and easily give access to applications and data using any device, - over any network. Learn why Oracle is a leader in wireless and voice infrastructure - for yourselves! Check - out the new Internet lessons in the FREE Mobile eKit!

    -

    Snapshot Seminar: - Interwoven & Oracle9iAS Content Management
    - Oracle and Interwoven together offer a portal ready, proven, and flexible - Enterprise Content Management solution. . Watch a 15 minute on-demand - snapshot seminar - and learn how you can let your users control their content through a portal - powered by Oracle and Interwoven.

    -

    Updated Oracle9iAS - Portal Developer Kit (PDK) - July
    -     The updated - Oracle9iAS Portal Developer Kit (PDK) highlights portlet communication. - Using the PDK, you can build smart portlets with such features as inter-portlet - communication, page to portlet communication, and portlet reusability. - This release includes new J2EE-based and Web Services samples.

    -

    Snapshot Seminar: - Documentum & Oracle9iAS Content Management
    - Oracle and Documentum now offer a joint solution to create, manage and - deliver content through Web sites and portals. Watch a 15 minute on-demand - snapshot - seminar and learn how you can let your users control their content - through a portal powered by Oracle and Documentum.

    -

    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -

    - New Software Downloads

    -

    Oracle9i - Application Server Release 2 for Windows NT/2000, AIX, and Compaq Tru64 - UNIX

    -

    Oracle9iAS - TopLink 4.6 for Linux, UNIX, and Windows NT/2000

    -

    Oracle9i - Lite Release 5.0.2.0.0 for Sun SPARC Solaris

    -

    Oracle - Data Provider for .NET (ODP.NET) Beta

    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -

    Oracle - University

    -

    Special Offer! - Save 45% on Oracle9i DBA Certification Training
    - The expanded Oracle Certification Program now offers a true certification - levels that are built to fit the needs of IT professionals as well as - organizations looking to hire them. Each level constitutes reaching a - benchmark of experience and expertise that is industry recognized and - approved. And, with each new credential can come increased opportunities, - higher pay, and more benefits to keep Oracle professionals successful. -

    -

    Oracle9i Certification - Savings Plan – Save 45% on 4 Instructor Led inClass courses. 4 for - the price of 2! Click - here to learn more!

    -     		-
    - - - - -
    - - - - -
    -

    -

    Seeking - a new job? Check out OTN - Skills Marketplace for all open Oracle-trained positions.

    -

    Need - help implementing technology solutions to business problems? - Oracle9i - by Example Series tutorials can save you time.

    -

    Taking - an OCP exam? OTN members, take advantage of the 20% exam - discount.

    -
    -
    -
    -
    - - - - - - - - - - - - - - - -Untitled Document - - - - - - - - - -
    -
     
    -     		-
    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -
    -
    -
    -

    New - Books

    -

    Oracle9i - DBA 101
    - Oracle9i - DBA 101 by Marlene Theriault, Rachel Carmichael, & James - Viscusi (ISBN 0-07-222474-6) explains, step-by-step, how to effectively - administer an Oracle database. Readers will find coverage of the - key Oracle9i new features as well as details on the daily responsibilities - of a DBA and tips on how to successfully accomplish those tasks. - From the exclusive publishers of Oracle Press books, this is the - ideal resource for the aspiring Oracle database administrator. -

    -

    Oracle9i - Mobile
    - Oracle9i - Mobile by Alan Yeung, Philip Stephenson, & Nicholas Pang - (ISBN 0-07-222455-X) helps readers design, deploy, and manage - flexible mobile applications on the Oracle platform. From the - exclusive publishers of Oracle Press books, this resource explains - how to use and extend the mobile services available in Oracle9iAS - Wireless and integrate with other Oracle technologies. Mobilize - any e-business, reach new customers, and deliver critical information - to mobile users with the most scalable and reliable mobile infrastructure - available.

    -

    - Oracle Press User Group Program
    - Oracle Press has a new User Group Program! Oracle Press supports - the service that User Groups provide to the technical community. - We value our relationship with community-based groups and welcome - the opportunity to form partnerships with User Groups to disseminate - the latest technological information available in Osborne publications. - Osborne encourages participation by technical User Groups that - meet regularly, discuss, teach, and troubleshoot technical topics, - write book reviews, and publish print and/or online newsletters. -

    -
    -
    -
    -
    -
    -

    Oracle Press can - provide User Groups:

    -
    -
      -
    • -
      Review - copies of Oracle Press books for newsletter reviews
      -
      • -
    • -
      Book - donations and promotional items for User Group events
      -
      • -
    • -
      30% - discount on bulk purchases of 10 or more books
      -
      • -
    • -
      And - more...
      -
      • -
    -
    -
    -
    -
    -

    - Click - here for complete details about Oracle Press' User Group Program. -

    -

    This - Month's Feature | News | Software - Downloads | Oracle University | New - Books | Worldwide Events

    -

    Worldwide - Events

    -
    -

    Americas

    -

    Oracle - User Group Events
    - Find - out where new user group events are happening in your area. -

    -

    APAC

    -
    -
    -
    -
    - - - - - -
    OracleWorld - Online - Beijing
    -     Over - 5,000 industry professionals from all over China and the world gathered - to learn how Oracle can help your business reduce costs, improve - efficiencies, and improve the way you run your business. If you - missed OracleWorld in Copenhagen, you can get all the highlights - including keynotes, conference presentations and whitepapers online.
    -
    -
    -

    Oracle - iSeminars: Free & Live @ Your Desktop
    -     Attend a FREE Oracle APAC iSeminar to learn more about how Oracle9i - - Application Server, Database & Tools could provide you with a complete - and cost-effective e-business infrastructure.

    -
    -
    -
    -
    -

    Please - click - here for further information and online registration for all - iseminars. (Please select correct time zone & click "reset"). - For any - questions, please email - us.

    -

    EMEA

    - - - - - -
    OracleWorld - Online - Copenhagen
    -     Thousands - of professionals from all over the world gathered to learn how - Oracle can help your business reduce costs, improve efficiencies, - and improve the way you run your business. If you missed OracleWorld - in Copenhagen, you can get all the highlights including keynotes, - conference presentations and whitepapers online.
    -
    -
    -

    -
    -
    Oracle - Technology Days Belgian & Luxembourg
    -     Join us - for the Oracle Technology Days - Featuring Oracle9i Release 2 – - Live, Local, Free!
    -
    -

    Join - us for this executive full-day event :
    - 29/8/2002 - Brussels (sessions in English)
    - 3/9/2002 - Gent (sessies in het Nederlands)
    - 12/9/2002 - Liège (session en français)

    -

    Click - here for more information and registration.

    -

    Regards,

    -

    Oracle - Technology Network Team

    -

    UNSUBSCRIBE
    -     When you registered at OTN, you indicated you - would like to receive e-mail updates from us. If you do not want to receive - future e-mails, please visit our update - section , log in with your username and password, and UNCHECK the - I wish to receive informational e-mails box.

    -

    USERNAME - AND PASSWORD QUESTIONS?
    -     Forget your OTN login information? Use our password - lookup.

    -

    DUPLICATE - MESSAGES?
    -     You may - have multiple accounts on OTN. Please send a message to OTN - with the username you're using to access http://otn.oracle.com. We'll - then contact you and delete the unused account. -

    		-
    -
    - - - -

    -
    To be removed from Oracle's mailing lists, send an email to: -
    unsubscribe@oracleeblast.com -
    with the following in the message body: -
    REMOVE XXXXXX.YYYYY@RUHR-UNI-BOCHUM.DE -
    STOP -

    -[250000/116/137209217] - - - - - - - - - - - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/orbitz.com spamassassin-4.0.0~rc3/xt/data/whitelists/orbitz.com --- spamassassin-3.4.6/xt/data/whitelists/orbitz.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/orbitz.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -Received: (qmail 9304 invoked by uid 505); 12 Aug 2002 16:57:57 -0000 -Delivered-To: zzzzzz@xyz.com -Received: (qmail 19051 invoked by uid 74); 12 Aug 2002 16:58:16 -0000 -Received: from travelercare@orbitz.com by agogo0 by uid 71 with qmail-scanner-1.13 - (clamscan: 0.22. Clear:SA:1(0/0):. - Processed in 0.774434 secs); 12 Aug 2002 16:58:16 -0000 -Received: from unknown (HELO mailhost.wm.orbitz.com) (65.216.67.72) - by mail0.tyva.xyz.com with SMTP; 12 Aug 2002 16:58:15 -0000 -Received: from wl14 (sim-snat-01.wm.orbitz.com [10.50.100.11]) - by mailhost.wm.orbitz.com (8.12.1/8.12.1) with ESMTP id g7CGwEsF005188 - for ; Mon, 12 Aug 2002 11:58:14 -0500 -Message-ID: <17728173.1029171478187.JavaMail.weblogic@wl14> -Date: Mon, 12 Aug 2002 11:57:58 -0500 (CDT) -From: Orbitz Traveler Care -To: Rod -Subject: Orbitz Travel Document -Mime-Version: 1.0 -Content-Type: text/html -Content-Transfer-Encoding: 7bit - - - - - -Orbitz Travel Document - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/paypal.com spamassassin-4.0.0~rc3/xt/data/whitelists/paypal.com --- spamassassin-3.4.6/xt/data/whitelists/paypal.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/paypal.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Received: (qmail 18217 invoked from network); 4 Apr 2002 21:41:45 -0000 -Received: from localhost (127.0.0.1) - by localhost with SMTP; 4 Apr 2002 21:41:45 -0000 -Delivered-To: zzzzzz@xyz.com -Received: from mail.xyz.com [64.123.162.104] - by localhost with POP3 (fetchmail-5.9.0) - for xyz@localhost (single-drop); Thu, 04 Apr 2002 16:41:45 -0500 (EST) -Received: (qmail 857 invoked from network); 4 Apr 2002 21:41:11 -0000 -Received: from unknown (HELO web18.nix.paypal.com) (65.206.229.164) - by mail0.tyva.xyz.com with SMTP; 4 Apr 2002 21:41:11 -0000 -Received: (qmail 13807 invoked by uid 99); 4 Apr 2002 21:41:10 -0000 -Date: Thu, 04 Apr 2002 13:41:10 -0800 -Message-Id: <1017000000.00000@paypal.com> -From: service@paypal.com -To: rod@xyz.com -Subject: Receipt for your Payment - -This email confirms that you have paid xyz.com Ltd. $12.00 -using PayPal. - ---------------------------------------------------------------- -This payment was sent using your bank account. - -By using your bank account to send money, you just: - -- Paid instantly and securely -- Sent money faster than writing and mailing paper checks. -- Received an additional entry in our $1,000 Sweepstakes! - -Thanks for using your bank account! - ---------------------------------------------------------------- - - -Thank you, -The PayPal Team - -Note: When you log in to your PayPal account, be sure that the website's URL always begins with "https://www.paypal.com/". The "s" in "https" at the beginning of the URL means you are logging into a secure page. If the URL does not begin with https, you are not on a PayPal page. - - - -Please do not reply to this e-mail. Mail sent to this address -cannot be answered. For assistance, log in to your PayPal -account and choose the "Help" link in the footer of any page. - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/register.com_password spamassassin-4.0.0~rc3/xt/data/whitelists/register.com_password --- spamassassin-3.4.6/xt/data/whitelists/register.com_password 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/register.com_password 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -From customersupport@register.com Wed Jan 30 09:50:12 2002 -Delivery-Date: Mon, 18 Sep 2000 16:41:35 +0100 -Return-Path: -Delivered-To: jm@ooooooooooo.com -Received: from wwwn.register.com (outgoing2.jrcy.register.com [209.67.50.16]) - by mail (Postfix) with ESMTP id 9A73FD894B - for ; Mon, 18 Sep 2000 15:41:33 +0000 (Eire) -Received: (from nobody@localhost) - by wwwn.register.com (8.9.3/8.9.3) id LAA18712 - for ppppp@ooooooooooo.com; Mon, 18 Sep 2000 11:41:22 -0400 -Date: Mon, 18 Sep 2000 11:41:22 -0400 -Message-Id: <200009181541.LAA18712@wwwn.register.com> -X-Authentication-Warning: wwwn.register.com: nobody set sender to customersupport@register.com using -f -From: Domain.Management.System@www.register.com -Reply-To: customersupport@register.com -To: ppppp@ooooooooooo.com -Subject: Domain Manager Password -Sender: customersupport@register.com - -User Name : xxxxxxxxxxxxxxx - -Thank you for using register.com's Domain Manager. - -To change or re-enter your password, please copy and paste the URL below into the "Location" or "Address" field of your web browser and hit the 'Enter' key on your keyboard. Note: If your email program supports HTML, you may be able to click on the link below. - -========================================================================================== -http://mydomain.register.com/change_password.cgi?00000000000 -========================================================================================== -Note: Above link will be expire within three days - -The page displayed will allow you to change or re-enter your Domain Manager password. - -In the event that the email program you are using does not display the URL as a hyperlink or the URL is broken into two lines, do not click on it. Instead, please follow the copy and pasting instructions below to complete the confirmation process. - -- Copy and Pasting Instructions - - -Highlight the URL with your cursor. Once you have highlighted the URL, hit CTRL + C to copy the highlighted area. - -Open an Internet browser window and click in the Address or Location field. Hit CTRL + V to paste the URL into the address field. If necessary, repeat this process with the second line of the URL. Please be sure to delete spaces if there are any embedded in the URL - otherwise you will not be able to connect to the proper confirmation page. - -Once you have entered and looked over the URL, hit the Enter key on your keyboard. The web page displayed will allow you to complete the final step in the confirmation process. - -If you have further questions, please do not hesitate to contact us at: -http://www.register.com/create_ticket.cgi - -Thank you for using register.com, the first step on the web. - -Customer Service -register.com, inc -http://www.register.com - - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/ryanairmail.com spamassassin-4.0.0~rc3/xt/data/whitelists/ryanairmail.com --- spamassassin-3.4.6/xt/data/whitelists/ryanairmail.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/ryanairmail.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,165 +0,0 @@ -From webster@ryanairmail.com Fri Aug 16 12:59:01 2002 -Return-Path: -Delivered-To: zzzz@localhost.foofoofoofoo.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.foofoofoofoo.com (Postfix) with ESMTP id E163743C32 - for ; Fri, 16 Aug 2002 07:58:59 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for zzzz@localhost (single-drop); Fri, 16 Aug 2002 12:58:59 +0100 (IST) -Received: from mail.ryanair2.ie ([193.120.152.8]) by dogma.slashnull.org - (8.11.6/8.11.6) with SMTP id g7GBwca16137 for ; - Fri, 16 Aug 2002 12:58:38 +0100 -From: webster@ryanairmail.com -To: "Customers" -Subject: Incredible Autumn Fares -Date: Fri, 16 Aug 2002 08:41:00 +0100 -X-Assembled-BY: XWall v3.21 -X-Mailer: MailBeamer v3.28 -Message-Id: -MIME-Version: 1.0 -Content-Type: text/plain; charset="iso-8859-1" -List-Unsubscribe: -Reply-To: webster@ryanairmail.com -Content-Transfer-Encoding: 8bit -X-MIME-Autoconverted: from quoted-printable to 8bit by dogma.slashnull.org - id g7GBwca16137 - -Massive seat sale this weekend on Ryanair.com -Fares from 6.25 one way including taxes -Travel between 9 September and 17 December -Sale until midnight Monday 19 August -Travel between 1200 hrs Monday and 1300 hrs Thursday or -Saturdays after 1200hrs to get these fares -Limited availability during school break periods and bank -holiday weekends. All fares quoted are one way including taxes. -Book now at http://www.ryanair.com - - -*********************** Domestic UK ************************* -London Stansted to Glasgow Prestwick from 6.25 -Glasgow Prestwick to London Stansted from 6.25 -London Stansted to City of Derry from 12.99 -City of Derry to London Stansted from 12.99 - -*********************** UK to Scandinavia ************************* -London Stansted to Gothenburg from 9.99 -London Stansted to Stockholm NYO from 12.99 -London Stansted to Stockholm VST from 12.99 -London Stansted to Aarhus from 14.99 -London Stansted to Esbjerg from 14.99 -London Stansted to Oslo Torp from 14.99 -Glasgow Prestwick to Oslo Torp from 19.99 - -****************** UK to Belgium/Netherlands ******************** -London Stansted to Brussels Charleroi from 9.99 -London Stansted to Eindhoven from 12.99 -Liverpool to Brussels Charleroi from 12.99 -Glasgow Prestwick to Brussels Charleroi from 12.99 - -****************** UK to France/Italy ******************** -London Stansted to Dinard from 14.99 -London Stansted to St Etienne from 14.99 -London Stansted to Milan Bergamo from 14.99 -Glasgow Prestwick to Paris Beauvais from 14.99 - -****************** UK to Germany/Austria ******************** -Bournemouth to Frankfurt Hahn from 12.99 -London Stansted to Frankfurt Hahn from 12.99 -London Stansted to Hamburg Lubeck from 14.99 -London Stansted to Klagenfurt from 14.99 - -*********************** UK to Ireland ************************* -Manchester to Dublin from 9.99 -Leeds Bradford to Dublin from 9.99 -Bristol to Dublin from 9.99 -Edinburgh to Dublin from 9.99 -Teesside to Dublin from 9.99 -Glasgow Prestwick to Dublin from 9.99 -Bournemouth to Dublin from 9.99 -Liverpool to Dublin from 9.99 -London Stansted to Knock from 12.99 -London Stansted to Shannon from 14.99 -London Stansted to Cork from 14.99 -London Luton to Dublin from 14.99 -London Gatwick to Dublin from 14.99 -London Stansted to Dublin from 14.99 - -*********************** Ireland to UK ************************* -Dublin to Liverpool from Eur 9.99 -Dublin to Manchester from Eur 9.99 -Dublin to Bournemouth from Eur12.99 -Dublin to Bristol from Eur12.99 -Dublin to Leeds Bradford from Eur12.99 -Dublin to Edinburgh from Eur12.99 -Dublin to Teesside from Eur12.99 -Dublin to Glasgow Prestwick from Eur12.99 -Knock to London Stansted from Eur12.99 -Cork to London Stansted from Eur14.99 -Shannon to London Stansted from Eur14.99 -Dublin to London Stansted from Eur14.99 -**************************************************************** - -==================================================================== - -E-MAIL DISCLAIMER - -This e-mail and any files and attachments transmitted with it -are confidential and may be legally privileged. They are intended -solely for the use of the intended recipient. Any views and -opinions expressed are those of the individual author/sender -and are not necessarily shared or endorsed by Ryanair Holdings plc -or any associated or related company. In particular e-mail -transmissions are not binding for the purposes of forming -a contract to sell airline seats, directly or via promotions, -and do not form a contractual obligation of any type. -Such contracts can only be formed in writing by post or fax, -duly signed by a senior company executive, subject to approval -by the Board of Directors. - -The content of this e-mail or any file or attachment transmitted -with it may have been changed or altered without the consent -of the author. If you are not the intended recipient of this e-mail, -you are hereby notified that any review, dissemination, disclosure, -alteration, printing, circulation or transmission of, or any -action taken or omitted in reliance on this e-mail or any file -or attachment transmitted with it is prohibited and may be unlawful. - -If you have received this e-mail in error -please notify Ryanair Holdings plc by emailing postmaster@ryanair.ie -or contact Ryanair Holdings plc, Dublin Airport, Co Dublin, Ireland. - -===================================================================== - -E-MAIL DISCLAIMER - -This e-mail and any files and attachments transmitted with it -are confidential and may be legally privileged. They are intended -solely for the use of the intended recipient. Any views and -opinions expressed are those of the individual author/sender -and are not necessarily shared or endorsed by Ryanair Holdings plc -or any associated or related company. In particular e-mail -transmissions are not binding for the purposes of forming -a contract to sell airline seats, directly or via promotions, -and do not form a contractual obligation of any type. -Such contracts can only be formed in writing by post or fax, -duly signed by a senior company executive, subject to approval -by the Board of Directors. - -The content of this e-mail or any file or attachment transmitted -with it may have been changed or altered without the consent -of the author. If you are not the intended recipient of this e-mail, -you are hereby notified that any review, dissemination, disclosure, -alteration, printing, circulation or transmission of, or any -action taken or omitted in reliance on this e-mail or any file -or attachment transmitted with it is prohibited and may be unlawful. - -If you have received this e-mail in error -please notify Ryanair Holdings plc by emailing postmaster@ryanair.ie -or contact Ryanair Holdings plc, Dublin Airport, Co Dublin, Ireland. - - ---- -You are currently subscribed to customers as: xxxxx@yyyyyy.zzz -To unsubscribe send a blank email to leave-customers-123546K@mail.ryanairmail.com - diff -Nru spamassassin-3.4.6/xt/data/whitelists/sf.net spamassassin-4.0.0~rc3/xt/data/whitelists/sf.net --- spamassassin-3.4.6/xt/data/whitelists/sf.net 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/sf.net 1970-01-01 00:00:00.000000000 +0000 @@ -1,263 +0,0 @@ -From noreply@sourceforge.net Wed Aug 14 17:36:08 2002 -Return-Path: -Delivered-To: aaaa@localhost.xxxxxxxxxxxx.com -Received: from localhost (localhost [127.0.0.1]) - by phobos.labs.xxxxxxxxxxxx.com (Postfix) with ESMTP id EEAC943C32 - for ; Wed, 14 Aug 2002 12:36:06 -0400 (EDT) -Received: from phobos [127.0.0.1] - by localhost with IMAP (fetchmail-5.9.0) - for aaaa@localhost (single-drop); Wed, 14 Aug 2002 17:36:07 +0100 (IST) -Received: from usw-sf-list2.sourceforge.net (usw-sf-fw2.sourceforge.net - [216.136.171.252]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id - g7EGW3424685 for ; Wed, 14 Aug 2002 17:32:04 +0100 -Received: from usw-sf-db2-b.sourceforge.net ([10.3.1.4] - helo=sourceforge.net ident=tperdue) by usw-sf-list2.sourceforge.net with - smtp (Exim 3.31-VA-mm2 #1 (Debian)) id 17f141-00043a-00 for - ; Wed, 14 Aug 2002 09:32:05 -0700 -From: Mailer -To: "" -Subject: SOURCEFORGE.NET UPDATE: August 14, 2002 -Message-Id: -Date: Wed, 14 Aug 2002 09:32:05 -0700 - - -(You are receiving this email because you subscribed to it (honest). -For information on how to unsubscribe please read the bottom of this -email). - -0. INTRO. [IBM DB2] -1. INCREASED DOWNLOAD CAPACITY. -2. AUDIO OF KERNEL SUMMIT AVAILABLE. -3. BE A SF.NET FOUNDRY GUIDE. -4. WORK FOR SOURCEFORGE.NET -5. SITE STATISTICS - - -0. INTRO - -Hello SourceForge.net Users, - -This week we've made a big announcement. As you likely know, any -large dynamic website is powered by a database that funnels data to -the web servers serving data which ultimately gets sent to you. -These databases manage everything from user authentication, session -management, site searching, etc. SourceForge.net is a database- -dependent website. - -Today we have announced that we are moving SourceForge.net to DB2, -a powerful relational database by IBM. We are doing this because -the site continues to grow at a rapid rate, with 700 new users and -70 new projects a day, and we need a database that can handle this -growth. We feel that DB2 can do this for us, and IBM is giving us -the resources to make this transition successful. You can read the -press release here: - -http://www.vasoftware.com/news/press.php/2002/1070.html - -How will this effect you? In the first phase, you won't see much -difference other then the site will continue to grow and the -SourceForge.net team will be able to handle the growth. In later -phases you will see new features on the site that take advantage of -the databases advanced capabilities. - -Today our mail archives have been converted over. The rest of the -site will make the migration to DB2 in the coming months. - -If you have questions about this or any other aspect of the site, -please feel free to email me, pat@sourceforge.net. I always -appreciate the feedback. - -Thank you for your continued support of SourceForge.net and the -Open Source Community. - -Pat- - -Patrick McGovern -Director, SourceForge.net - - - -1. INCREASED DOWNLOAD CAPACITY - -SourceForge.net continues to grow, and it's appetite for bandwidth -is never-ending. Every day SF.NET serves over 300,000 files to -ensure that developers and end-users within the Open Source -community can always obtain the software released by hosted -projects, SourceForge.net maintains a network of high-capacity -download servers. These servers are located throughout the world, -as to provide better download times regardless of which network -provider you are using, and regardless of your geographic location. - -Three new download servers have recently been added to our network, -further strengthening our file serving capabilities. These latest -additions include servers hosted by: - -Time Warner Telecom (Wisconsin,USA); -http://www.twtelecom.com/ - -University of Minnesota (Minnesota, USA) -http://www.umn.edu/ - -CESNET (Czech Republic) -http://www.cesnet.cz/ - -We thank these sponsors for their commitment to SourceForge.net and -the needs of the Open Source community. - -On a related note, we are looking for a mirror in Japan. If you are -an ISP or University in Japan and are willing to spare 20Mbps for a -SourceForge.net mirror (we'll supply the hardware), please let us -know at bandwidth@sourceforge.net - - - -2. AUDIO OF KERNEL SUMMIT AVAILABLE - -SourceForge.net now has the audio from the entire 2002 OSDN/USENIX -Kernel Summit, held in June. Listen to the Linux kernel master -discuss such hot topics as kernel modules, virtual memory, -block I/O, database scaling, security modules, and async I/O. -You may find this audio repository at: - -http://linuxkernel.foundries.sourceforge.net/article.pl?sid=02/06/26/0116225 - - - -3. CONTRIBUTE TO SOURCEFORGE.NET! BE A FOUNDRY GUIDE! - -Want to contribute to SourceForge.net, but you don't know how to -code? Be a foundry guide! Foundry guides get to hype the cool -projects that they think are worth downloading and testing. -A guide finds all the stuff on the web about their subject of -choice, and gives it prominent placement. How do you become a -foundry guide? Go to http://foundries.sourceforge.net/; find a -topic that interests you; and send email to -foundries@sourceforge.net stating your desired topic and why you -are qualified to be a foundry guide. - - - -4. WORK FOR SOURCEFORGE.NET - -We have a new position for a senior web developer available at -SourceForge.net. We are looking for someone to help us maintain, -upgrade, and add new features to SourceForge.net. Ideal person has -5+ years of development experience on high end, high volume -websites (3+ million page views a day). Has a vast level of -knowledge of Internet technologies: PHP, PostgreSQL, MySQL, DB2, -Linux, PERL, Apache, LDAP, Mailman. A flare for design / UI is a -bonus. SourceForge is a unique site with unique challenges. We are -looking for someone at the top of their game. - -Location of Job is in Fremont, California. Please send resume and -URL's of sites you have worked on to jobs@sourceforge.net. Text -resumes only. (No MS WORD files!) - - - -5. SITE STATISTICS - -Stats: (Monday 12th, 2000) -Hosted Projects: 45,194 -Registered Users: 465,530 -Page Views: 3,344,708 in a single day (Monday) -Files transfered in a single day: 340,838 (Monday) -Emails sent in a single day from Mailing lists: 851,143 (Monday) - - -Top Ten Projects - -1 phpMyAdmin -http://sourceforge.net/projects/phpmyadmin/ -phpMyAdmin is a tool written in PHP intended to handle the -administration of MySQL over the WWW. Currently it can create and -drop databases, create/drop/alter tables, delete/edit/add fields, -execute any SQL statement, manage keys on fields. - -2 Compiere ERP + CRM Business Solution -http://sourceforge.net/projects/compiere/ -Smart ERP+CRM solution for small-medium enterprises (SME) in the -global marketplace covering all areas from customer management, -supply chain and accounting. For $2-200M revenue companies looking -for "brick and click" first tier functionality. - -3 SquirrelMail -http://sourceforge.net/projects/squirrelmail/ -SquirrelMail is a PHP4-based Web email client. It includes built-in -pure PHP support for IMAP and SMTP, and renders all pages in pure -HTML 4.0 for maximum compatibility across browsers. It also has -MIME support, folder manipulation, etc - -4 TUTOS -http://sourceforge.net/projects/tutos/ -TUTOS is the ultimate team organization software, a web-based -groupware or ERP/CRM system to manage events/calendars, addresses, -teams, projects,tasks,bugs,mailboxes,documents and your time spent -with these things - -5 JBoss.org -http://sourceforge.net/projects/jboss/ -The JBoss/Server is the leading Open Source, standards-compliant, -J2EE based application server implemented in 100% Pure Java - -6 Firewall Builder -http://sourceforge.net/projects/fwbuilder/ -Object-oriented GUI and set of compilers for various firewall -platforms. Currently implemented compilers for iptables, ipfilter -and OpenBSD pf - -7 openMosix -http://sourceforge.net/projects/openmosix/ -openMosix is a Linux kernel extension for single-system image -clustering. Taking n PC boxes, openMosix gives users and -applications the illusion of one single computer with n CPUs. -openMosix is perfectly scalable and adaptive. - -8 CDex -http://sourceforge.net/projects/cdexos/ -CDex a CD-Ripper, thus extracting digital audio data from an Audio -CD. The application supports many Audio encoders, like MPEG -(MP2,MP3), VQF, AAC encoders. - -9 phpChrystal - An Open Intranet System -http://sourceforge.net/projects/phpchrystal/ -phpChrystal ist ein OpenSource-Intranetsystem welches vorrangig auf -Lan-Partys eingesetzt werden kann. Vorteile von phpChrystal sind -seine Portierbarkeit, Flexibilitt und Performance, da es vollends -auf PHP, MySQL und XML basiert - -10 Dev-C++ -http://sourceforge.net/projects/dev-cpp/ -Dev-C++ is an full-featured Integrated Development Environment -(IDE) for Win32 and Linux. It uses GCC, Mingw or Cygwin as -compiler and libraries set. - -More Top Projects: -http://sourceforge.net/top/mostactive.php?type=week - - - - - -EMAIL LIST REMOVAL: - -When the SF.NET team sends out a site-wide email, we sometimes see -replies that look like this: "Hey!! I didn't subscribe to this list!!! -You spammer. I hate you! I hate your dog! (insert other colorful -phrases here)". The truth is, when you registered on SourceForge.net -there was a check box that said "Receive Site-wide updates, low -volume". You left it checked when you submitted the registration form, -hence you are receiving this email. We send these updates every 4 to 6 -weeks, so it truly is low volume. However if you want off, this is not -a problem. Simply click on the link below. - - -================================================================== -You receive this message because you subscribed to SourceForge -site mailing(s). You may opt out from some of them selectively -by logging in to SourceForge and visiting your Account Maintenance -page (http://sourceforge.net/account/), or disable them altogether -by visiting following link: - - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/winxpnews.com spamassassin-4.0.0~rc3/xt/data/whitelists/winxpnews.com --- spamassassin-3.4.6/xt/data/whitelists/winxpnews.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/winxpnews.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,528 +0,0 @@ -Received: from ooooooooo.net (ns1.ooooooooo.net [216.27.147.130]) - by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g6J6AZJ25232 - for ; Fri, 19 Jul 2002 07:10:35 +0100 -Received: from bounce.winxpnews.com (dal21037lyr001.datareturn.com [216.46.238.20]) - by ooooooooo.net (8.11.3/8.11.1) with SMTP id g6J6ABS16827 - for ; Fri, 19 Jul 2002 02:10:12 -0400 (EDT) - (envelope-from do_not_reply@bounce.winxpnews.com) -Importance: Normal -To: zzzz@zzzzzzzz.com -Reply-To: "WinXPnews" -Content-Type: text/html; - charset="us-ascii" -Content-Transfer-Encoding: 7bit -Date: Fri, 19 Jul 2002 01:10:07 -0600 -From: "WinXPnews" -Subject: WinXPnews: Time To Patch Your Windows Media Player -Message-Id: <5ksc2.105x1y34m@bounce.winxpnews.com> -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal - - -WinXPnews™ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - -WinXPnews™ E-Zine
    -     - -Tue, Jul 9, 2002 (Vol. 2, 27 - Issue 33) - -
    -Feel free to forward this newsletter to other WinXP enthusiasts.
    -Read this newsletter online here: - -http://www.winxpnews.com/?id=33
    -For a quick unsubscribe (gasp!) click here:
    - -http://www.winxpnews.com/unsubscribe.cfm?email=zzzz@zzzzzzzz.com     -     - -
    - -Time To Patch Your Windows Media Player - -
     
    - - -  This issue of WinXPnews™ contains:
    -     -
     
    - -
      -
    1. EDITOR'S CORNER - -
    2. How to Publish Your Windows XP FTP Server to the Internet - -
    3. HINTS, TIPS, TRICKS & TWEAKS -
        -
      • Allow Dial-up Connections to Synchronize Time with Internet Time Servers -
      -
    4. HOW TO'S: ALL THE NEW XP FEATURES -
        -
      • How to Secure an FTP Server on Windows XP Professional -
      -
    5. WINXP SECURITY: UPDATES & PATCHES -
        -
      • Cumulative Patch for Windows Media Player
      • Cumulative Patches for Excel and Word for Windows -
      -
    6. UPGRADING & COMPATIBILITY ISSUES -
        -
      • A Computer May Hang During a Heavy Load with an Ericsson HIS Modem
      • Knowledge Base Search Center - If it is Not Broke, Do Not Break it! -
      -
    7. WINXP CONFIGURING & TROUBLESHOOTING -
        -
      • A Description of the Repair Option on a Local Area Network or High-Speed Internet Connection
      • Keyboard and Mouse Do Not Work When You Start Windows
      • How to Deploy Windows XP Images from Windows 2000 RIS Servers -
      -
    8. FAVE LINKS -
        -
      • This Week's Links We Like. Tips, Hints And Fun Stuff -
      -
    9. BOOK OF THE WEEK -
        -
      • Windows XP Power Tools -
      -
    -     -
     
    - - -  SPONSOR: iHateSpam - Eliminate Irritating Junk Email
    -     -
     
    - - - - -Irritated with porn, bogus business offers and viagra ads in your mailbox?
    -Angry about losing your valuable time deleting all that junk? Need a spam-
    -blocker that eliminates this annoying spam? Stop the spam in your inbox
    -with iHateSpam. It gives you control over the ever increasing flood of
    -junk email. Runs under Windows 95/98/ME/NT/2000/XP. Best of all, the limited
    -time Intro Offer is just $19.95 with online delivery of full product and a
    -30-day money back guarantee. This is a real no-brainer. Get Your Copy Now!
    -Visit iHateSpam - Eliminate Irritating Junk Email for more information. -     -
     
    - - -  EDITOR'S CORNER
    -     -
     
    - -

    How to Publish Your Windows XP FTP Server to the Internet

    -Several of you wrote in about last week's article on installing an FTP Server. You said "that was great, but you only told half the story". You wanted to know two more things: -

      -
    1. How to make the FTP Server available to Internet users -
    2. How to secure the FTP Server -
    -There are several ways to make an FTP server on the internal network available to users on the Internet. These methods are referred to as "Server Publishing". You can use a Windows XP computer running Internet Connection Services (ICS) to publish a server on your internal network. -

    -Let's take a look at a common scenario. You have a Windows XP computer connected to the Internet with an always-on cable or DSL connection. You have another computer on your private network also running Windows XP. You've installed the FTP Server on this internal network computer and put files into the FTP folder. Now you want Internet users to connect to the FTP Server through the ICS computer directly connected to the Internet. -

    -You can do this with the Windows XP ICS! Here's how: -

      -
    1. Go into the Network Connections window. You can get there from the Network applet in the Control Panel. -
    2. Right click the network interface directly connected to the Internet and click Properties. -
    3. Click on the Advanced tab in the connection's Properties dialog box. Put a checkmark in the Internet Connection Firewall checkbox. Always make sure the Internet Connection Firewall (ICF) is enabled when you connect a computer directly to the Internet. -
    4. Click the Settings button, then click on the Services tab in the Advanced Settings dialog box. -
    5. Now click the Add button. This brings up the Service Settings dialog box. Type in My FTP Server in the Description of service text box. In the Name or IP address text box, type in the IP address of the computer on your private network that's running the FTP server. Since you're using ICS, it'll have an IP address like 192.168.0.x, where x is different for each machine on your network. You might want to manually assign the IP address the FTP Server already has, so that it doesn't change in the future. You can find out what IP address your FTP server is using by opening a command prompt at the FTP server and typing in the command ipconfig. That will give you the IP address the FTP Server is using. Back to the Service Settings dialog box, select the TCP option button. For the External Port and the Internet port, put in the port number you assigned to the FTP server on your internal network. Read this week's How To section to see how to change the listening port number. Clic! -k OK -
    6. Click OK, and then click OK one more time! You might need to disable and enable the adapter after making the change. You can do that by right clicking the always-on interface. -
    -The procedure is very similar for dial-up connections. However, there are problems with dial-up connections (and many always-on connections) because the IP address on the external interface of the ICS computer changes over time. Next week I'll share with you a cool way you can get around this problem by using something called a "dynamic DNS service". I've used one for years, and it works great. Make sure to tune in next week for the details. -

    -There you have it. Is server publishing in your future? Have any questions on the method I described above? If so, let me know! There are lots of ways you can publish services. Tell me how you do it, and tricks you've learned along the way. If you're having problems with server publishing, let me know about those too! I'll be sure to include what I learn from you in upcoming newsletters. -

    -Until next week,
    -Tom Shinder, Editor
    -(email us with feedback: feedback@winxpnews.com) -     -

     
    - - -  SPONSOR: Is Your PC Spying On You?
    -     -
     
    - - - - -You are surfing the Web. Check out sites, download some music or
    -software that might be cool. Guess what? Your PC might have picked up
    -a cyber transmitted disease (CTD). These pests might now be monitoring
    -what you are doing and report this back to their "black hat" owners
    -and reveal your personal information. PestPatrol kills 'em all off.
    -Get your copy on the online shop for just 30 bucks with immediate online
    delivery. Protect your PC and your confidential data!
    -Visit Is Your PC Spying On You? for more information. -     -
     
    - - -  HINTS, TIPS, TRICKS & TWEAKS
    -     -
     
    - -

    Allow Dial-up Connections to Synchronize Time with Internet Time Servers

    -Do you use a dial-up connection but can't get your machine to synchronize its clock with an Internet time server when the Internet Connection Firewall (ICF) is enabled? If so, here's a tip Richard Surry sent in on how to fix the problem: -

      -
    1. Open your Network Connections window from the start menu. -
    2. Right click on your modem (or other dial-up connection) and click Properties. -
    3. Click on the Advanced tab. You already have a checkmark in the box that enables the ICF. Click on the Settings button. -
    4. Click on the Services tab, then click on the Add button in the Services tab. -
    5. That should open the Service Settings dialog box. In the Description box, put in Internet Time Service. For the Name or IP address of the computer hosting this service on your network, type in 127.0.0.1. Select the TCP protocol option button. For both the external and internal port numbers, type 123. -
    6. If you're online, disconnect and reconnect. Now synchronize the time by double click on the clock in the system tray and going to the Internet Time tab. -
    -This is an interesting tip, and it represents an even more interesting problem. For you network geeks out there, I'll ask you this question: Why should we allow unsolicited inbound connections for the Internet Time Service? The ICF should not block responses to solicited outbound connections, so why should we have to enable reverse NAT to make this work? -     -
     
    - - -  HOW TO'S: ALL THE NEW XP FEATURES
    -     -
     
    - -

    How to Secure an FTP Server on Windows XP Professional

    -Last week we went over how to install the Windows XP FTP Server. It will work fine after going through the steps outlined last week, but several of you asked for more information on how to secure the FTP Server because you wanted to connect it to the Internet. It's a very good idea to understand how FTP security works before putting the server on the Internet. Here are some suggestions: -

      -
    1. Open the Internet Information Services console from the Administrative Tools menu. In the left pane of the console, expand your server name and then expand the FTP Sites node. -
    2. Right click on the Default FTP Site and click the Properties command. -
    3. Click on the FTP Site tab. Notice that the default TCP Port is set to 21. This is the well-known port for FTP. You can increase security a bit by changing this port to another value that's in the 1026-65534 range. This secures it from poorly motivated click-kiddies and also allows you to get around your ISP blocking incoming connections to TCP port 21. Friends who connect to your FTP server will need to change the port number on their FTP client software as well. -
    4. The Windows XP FTP server has a hard coded limit of 10 simultaneous connections. You might want to change this to a lower number to reduce the chance of a LAN party on the external interface of the FTP server. -
    5. Put a checkmark in the Enable Logging checkbox. Click the Properties button to the right of the log format drop-down list box. Click the Daily option button on the General Properties tab. On the Extended Properties tab, select all of the Extended Properties. Click OK. -
    6. Click on the Security Accounts tab. Place a checkmark in the Allow only anonymous connections checkbox. This prevents users from sending username and password credentials to the FTP server. You don't want users to send credentials because those credentials are sent in "clear text", which can be read by anyone who's listening on the wire. -
    7. Click the Messages tab. Enter a Welcome message, an Exit message, and a message users will see if there are no available connections. -
    8. Click on the Home Directory tab. Make sure there is a checkmark in the Read and Log Visits checkboxes. REMOVE the checkmark in the Write checkbox. Note the location in the Local Path text box. Navigate to that path in the Windows Explorer. -
    9. Right click on the FTPROOT folder and click Properties. -
    10. Click on the Security tab. Make sure that SYSTEM has Full Control. Assign the IUSR_ account READ access only. Remove all other permissions for the IUSR account. Make sure you give Adminstrators Full Control tool. This allows you, the administrator on the FTP Server computer, to add, remove and change files in the FTPROOT folder. -
    -Stop and restart the FTP Server. Now your FTP server is secure and Internet bad guys won't be able to use it to distribute porno and bootlegged software. -     -
     
    - - -  WINXP SECURITY: UPDATES & PATCHES
    -     -
     
    - -

    Cumulative Patch for Windows Media Player

    -I think it was a couple months ago when I wrote about some serious problems with the Windows Media Player (WMP). At that time you could download a "cumulative" patch that would update the Media Player with the latest security fixes. Well, it's time to download another "cumulative" patch! A couple other problems were found in WMP that could cause some problems. To read more about the problem head on over to:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709SE-WMP_Patch -

    -You'll also find the download locations for Windows Media Player versions 6.4, 7.1 and 8.0 (XP) on that page. -

    Cumulative Patches for Excel and Word for Windows

    -If you run Microsoft Word or Excel, versions 2000 or 2002 (XP), then you need to head on over to the Microsoft site to download some security fixes. These fixes handle security glitches that could get you in trouble if you don't take care of them! Head on over to Microsoft's site where you can find individual fixes for each program. You only need download the fix that applies to your computer:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709SE-Word_Excel_Patch -     -

     
    - - -  UPGRADING & COMPATIBILITY ISSUES
    -     -
     
    - -

    A Computer May Hang During a Heavy Load with an Ericsson HIS Modem

    -If your computer has a Ericsson HIS modem, you might experience a dreaded blue screen and see the message IRQL_NOT_LESS_OR_EQUAL or DRIVER_CORRUPTED_EXPOOL. The problem is that you're downloading too much and your poor modem can't keep up! Microsoft recognizes that this isn't a problem with the modem, but with the modem driver. To download a fix visit Microsoft's site. After getting the fix, you can download as much as you like without worrying about blue screens!
    -http://www.winxpnews.com/rd/rd.cfm?id=020709UP-HIS_Modem -

    Knowledge Base Search Center - If it is Not Broke, Do Not Break it!

    -It wasn't so long ago when you could search the Microsoft Knowledge Base for articles that came up in the last 3 days, 7 days, 14 days, 30 days, 90 days and 6 months. It was great! But Microsoft decided to "fix" the Knowledge Base search page, and now it really sucks! It's hard to find things that used to come up easily, the site is often down, and searching based on age of articles just doesn't work anymore. -

    -Try this: go to:
    -http://support.microsoft.com/default.aspx?ln=EN-US&pr=kbinfo&
    -and on the left side of the page select Windows XP in the top drop down list box. Don't put anything in the For solutions containing...(optional) text box. Leave the Any of the words entered option selected in the Using drop down list box. For Maximum Age select 3 days. For Results Limit select 150 articles. Click Search Now. Whoa! Nothing. OK, it's reasonable to see no articles related to Windows XP in the last 3 days. Try again, this time using 7 days. Whaat? Still no articles. OK, it was a holiday week in the USA last week. Let's try 14 days. Nothing again! That seems sort of strange, doesn't it? Let's give it another try with 30 days. Still no articles! What's going on here? Keep trying for 6 months and one year. You still won't find anything. It's pretty sad, because this used to work. -     -

     
    - - -  WINXP CONFIGURING & TROUBLESHOOTING
    -     -
     
    - -

    A Description of the Repair Option on a Local Area Network or High-Speed Internet Connection

    -Here's the answer to a question I've had for a long time. What the heck does that "Repair" option for a network connection actually do? It's not in the help file, but it's on the Microsoft Web site. Here's what it does: -

      -
    • Sends an ipconfig /renew -
    • Flushes the ARP cache with a arp -d -
    • Reloads the NetBIOS name cache with a nbtstat -R -
    • Updates its WINS server with an nbtstat -RR -
    • Clear out the DNS client cache with an ipconfig /flushdns -
    • Reregisters the client with a DDNS server with a ipconfig /registerdns -
    -Check out the original article over at:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709CO-Repair_Option -

    Keyboard and Mouse Do Not Work When You Start Windows

    -Have you been hit with this one? You're working in Windows XP and shut down for the day. The next morning you start up your Windows XP computer and the mouse pointer is stuck! The only way to get it going again is to restart the computer, and for some reason the pointer starts moving again. What's up with that? I still haven't figured that one out, but Microsoft has a KB article that claims it's from a corrupt registry. I doubt that's the case in my situation because the problem is intermittent. But if you find that your mouse is always stuck, you might want to check out:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709CO-Frozen_Mouse -

    How to Deploy Windows XP Images from Windows 2000 RIS Servers

    -Are you planning to roll out lots of Windows XP computers on your network in the near future? If so, you're probably looking for a good way to automate the process. You can use the Windows 2000 Remote Installation Services (RIS) if you're running Windows 2000 Servers on your network. For the basic procedure and some tips, tricks, and gotcha's, check out:
    -http://www.winxpnews.com/rd/rd.cfm?id=020709CO-Deploy_XP_Images -     -

     
    - - -  FAVE LINKS
    -     -
     
    - -

    This Week's Links We Like. Tips, Hints And Fun Stuff

  • Be Afraid, be very afraid - the future of Big Brother in computing

    • -http://www.winxpnews.com/rd/rd.cfm?id=020709FA-Palladium_FAQ -
  • Get Revenge on your computer!

    • -http://www.winxpnews.com/rd/rd.cfm?id=020709FA-PC_Revenge -
  • Pringles Super Spud Boxing

    • -http://www.winxpnews.com/rd/rd.cfm?id=020709FA-Spud_Boxing -     -
     
    - - -  BOOK OF THE WEEK
    -     -
     
    - -

    Windows XP Power Tools

    -A book full of personal experiences and anecdotes that will equip you with the tips and tricks you need to become an XP afficionado. Coverage includes automating tasks using scripting, the Command Console Survivor Guide, networking, registry, maximizing security/firewalls, hardware, installation/configuration, and database hosting/accessing. The CD contains the best third party utilities around. -

    -Step-by-Step Instruction Helps You Harness the Full Power of Windows XP. Whether you're running Windows XP Home Edition or Professional, Windows XP Power Tools arms you with the advanced skills you need to become the ultimate power user. Full of undocumented tips and tricks and written by a Windows expert, this book provides you with step-by-step instructions for customization, optimization, troubleshooting and shortcuts for working more efficiently. A must-have for power users and network administrators, Windows XP Power Tools includes a CD filled with power tools including security, e-mail, diagnostic and data recovery utilities. -

    -http://www.winxpnews.com/rd/rd.cfm?id=020709BW-XP_Power_Tools - -

    - - - - - - - - - - - - - - - - - - - - - - -
     
    - - -  ABOUT WINXPNEWS™
    -     -
     
     
    - -What Our Lawyers Make Us Say -
    - -These documents are provided for informational purposes only. The information -contained in this document represents the current view of Sunbelt Software -Distribution on the issues discussed as of the date of publication. Because -Sunbelt must respond to changes in market conditions, it should not be -interpreted to be a commitment on the part of Sunbelt and Sunbelt cannot -guarantee the accuracy of any information presented after the date of -publication. -

    -INFORMATION PROVIDED IN THIS DOCUMENT IS PROVIDED "AS IS" WITHOUT WARRANTY OF -ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND FREEDOM -FROM INFRINGEMENT. -

    -The user assumes the entire risk as to the accuracy and the use of this -document. This document may be copied and distributed subject to the -following conditions: 1) All text must be copied without modification and all pages -must be included; 2) All copies must contain Sunbelt's copyright notice and any -other notices provided therein; and 3) This document may not be distributed -for profit. All trademarks acknowledged. Copyright Sunbelt Software -Distribution, Inc. 1996-2002. - -

     
    - -About Your Subscription to WinXPnews™ -
    - -This is a posting from WinXPnews. You are subscribed as zzzz@zzzzzzzz.com -

    -To manage your profile, please visit our site by clicking on the following link:
    - -http://www.winxpnews.com/login.cfm?id=9665862091709486
    -For a quick unsubscribe (gasp!), click here:
    - -http://www.winxpnews.com/unsubscribe.cfm?email=zzzz@zzzzzzzz.com -     -

    - - - diff -Nru spamassassin-3.4.6/xt/data/whitelists/yahoo-inc.com spamassassin-4.0.0~rc3/xt/data/whitelists/yahoo-inc.com --- spamassassin-3.4.6/xt/data/whitelists/yahoo-inc.com 2004-06-15 02:33:54.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/data/whitelists/yahoo-inc.com 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Return-Path: -Delivered-To: zzzzz@xyz.org -Received: (qmail 8790 invoked by uid 505); 29 Jul 2002 03:28:42 -0000 -Received: from yahoo-dev-null@yahoo-inc.com by blazing.xyz.org by uid 502 with qmail-scanner-1.12 (F-PROT: 3.12. Clear:. Processed in 0.195404 secs); 29 Jul 2002 03:28:42 -0000 -Received: from e5.member.yahoo.com (216.136.131.107) - by dsl092-072-xyz.bos1.dsl.speakeasy.net with SMTP; 29 Jul 2002 03:28:42 -0000 -Received: (from yahoo@localhost) - by e5.member.yahoo.com (8.11.3/8.11.3) id g6T3PIh88736; - Sun, 28 Jul 2002 20:25:18 -0700 (PDT) - (envelope-from yahoo-dev-null@yahoo-inc.com) -Date: Sun, 28 Jul 2002 20:25:18 -0700 (PDT) -Message-Id: <200207290325.g6T3PIh88736@e5.member.yahoo.com> -X-Authentication-Warning: e5.member.yahoo.com: yahoo set sender to using -f -From: Yahoo! Member Services -Errors-To: yahoo-dev-null@yahoo-inc.com -To: zzzzz@xyz.org -Subject: Yahoo! Email Verification - -[email from Yahoo!] - diff -Nru spamassassin-3.4.6/xt/run_release_test_suite.sh spamassassin-4.0.0~rc3/xt/run_release_test_suite.sh --- spamassassin-3.4.6/xt/run_release_test_suite.sh 1970-01-01 00:00:00.000000000 +0000 +++ spamassassin-4.0.0~rc3/xt/run_release_test_suite.sh 2022-05-11 01:56:18.000000000 +0000 @@ -0,0 +1,52 @@ +#!/bin/sh + +# This runs all tests, overriding the default selection used by make test +# There are some tests disabled for even this run for various reasons +# Those tests will show up in the output as being skipped +# This script is intended to be run by the developers of SpamAssassin before +# a release. It might also be useful to downstream package maintainers. +# These tests include the spamd stress test which will attempt to kill running spamd processes +# so this script should not be run on a production server that is running spamd. +# Note that some tests require certain Perl modules to be installed or else they are skipped. +# Install all optional modules on a release build/test machine so all feasable tests are run. +# The root* tests will be skipped because this script will not run as root +# Use sudo make test TEST_FILES="t/root*.t" to run just those tests separately + +# All command line arguments passed to this script are pasased to the call to prove + +if [ "$(id -u)" -eq 0 ]; then echo Do ont run this as root; exit 1; fi + +# Remove -T option from user, because this script always adds it +# Check for a verbose option and pass it to t.rules/run +for a; do + shift + case $a in + -T) taint="$a";; + -v) verbose="$a";; + --verbose) verbose="$a";; + *) set -- "$@" "$a";; + esac +done + +# Be lenient if the script was started while in its own directory +if [ -d "../t" ]; then cd ..; fi + +if [ ! -f "t/test_dir" ]; then + echo "This must be run from the source tree root directory" + exit 1 +fi + +if ! command -v prove >/dev/null 2>&1 ; then + echo "Can't find 'prove' command which is usually installed as part of perl" + exit 1 +fi + +overrideflags="run_long_tests:run_net_tests:run_dcc_tests:run_sql_pref_tests:run_spamd_prefork_stress_test" +overridevalues="1:1:1:1:1" + +# force -T on the tests, don't leave it up to the user +prove -T $verbose "$@" t/*.t xt/20_saw_ampersand.t :: --override $overrideflags $overridevalues + +# t.rules/run script takes a --verbose option but it is too verbose when used with prove -v +# If you need to see more output from a rule test use t.rules/run --verbose --tests RULENAME +prove -T $verbose t.rules/run

    I have 2 remarks to start with. -
     
    -
    I'm flabbergasted by the statement that "a= -cts do=20 -not have physical locations". If I understand this right, then docters and= -=20 -nurses work "nowhere". What about that as a justification for their salary= -=20 -?!  :-)
    -
    I think you all agree that if Dr X gives p= -atient Y=20 -an injection (in the normal non-science fiction way), then that act takes p= -lace=20 -in the room where the docter and the patient are. If he does it by using a = -robot=20 -guided over the internet while he being in Paris and the patient in the US,= - then=20 -the act happened for sure on planet Earth. I do agree that determining wher= -e=20 -"the act" happened in situations like the latter is not trivial, the proble= -m not=20 -being that much the localisation, but rather what THE act IS. Although= - we=20 -would still use the word "injection" for the latter, it is obviously someth= -ing=20 -completely different than the former, despite the fact that parts of the ac= -ts=20 -are similar (e.g. the needle being brought into the patient's=20 -body).
    -
    This said, I have no problem with the fact= - that the=20 -statement that "an Act occurs at a specific physical location" be removed f= -rom=20 -the document however: it is not because you don't state "X" in a document, = -that=20 -"not X" should be true.
    -
     
    -
    Another point that I want to raise is the = -statement=20 -"An Act is documented by an Act Record instance". It should be specified wh= -at=20 -"instance" refers to in this case, precisely in the light of what happens w= -hen=20 -that "instance" is copied into other systems. Thus if act X=20 -is injecting patient U by physician V with product W in place P a= -t=20 -time T, then Act Record instance AR1 might be the documentation o= -f it=20 -by V (thus the Dr registered what he did) and Act Record instance AR2 might= - be=20 -that the nurse who was in the room documented act X. Thus we have 2=20 -instances documenting act X. If this information gets transfered and c= -opied=20 -to other systems in persistent records, then I believe "copies" of the= -se=20 -Act Record instances are created, and not new instances. Otherwise, act X w= -ould=20 -be claimed to be documented by 2, 4, 6, 8 .... instances, which is actually= - not=20 -true.
    -
     
    -
    I know, the RIM being based on a Kantian p= -hilosophy=20 -makes it hard to deal with (and for some even to see) this problem, but I t= -hink=20 -it is important. And oh, you want for su= -re a "use=20 -case" for this: well suppose that there is some legal argument about whethe= -r or=20 -not the injection was actually given. Are ten copies of the same documentat= -ion=20 -instance more proof than just one ?   (note for Charlie: you= - can=20 -use this paragraph to build further on your file to document my "inability to productively collaborate wit= -h the=20 -community at large" and "Dr. Cuesters [sic] prefers to intermittently send= -=20 -sarcastic emails to various list servers".)
    -
     
    -
    Note that may objection is not in the use = -of the=20 -word instance in that particular sentence. In fact, I believe it is good=20 -practice, even that the statement should read "An Act instance is documente= -d by=20 -an Act Record instance", and even that the entire document should be checke= -d=20 -whether "instance" should not be used more often (I believe it=20 -does).
    -
    But even then, it should be specified what= -=20 -"instance" means in each case, e.g. a particular act in physical reality or= - an=20 -entry in a database which documents that act.
    -
     
    -
    kind regards,
    -
     
    -
    Werner
    - -
    ----- Original Message -----
    - Fro= -m:=20 - = -Dan=20 - Russler