You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@spamassassin.apache.org by Rule Updates Daemon <up...@spamassassin.zones.apache.org> on 2005/12/21 01:10:32 UTC
[admin] planned commit for active.list
To enact this, someone log into the zone and type:
ssh spamassassin.zones.apache.org
cd /home/updatesd/svn/spamassassin
sudo -u updatesd svn commit -m 'daily promotions' rules/active.list
Index: rules/active.list
===================================================================
--- rules/active.list (revision 357926)
+++ rules/active.list (working copy)
@@ -1,18 +1,18 @@
-# active ruleset list generated on Sun Dec 18 13:53:39 2005
+# active ruleset list generated on Wed Dec 21 00:10:23 2005
-# spam=3.3365 ham=0.0501 so=0.985
+#
ADVANCE_FEE_2
-# spam=2.8995 ham=0.0017 so=0.999
+#
ADVANCE_FEE_3
-# spam=2.4005 ham=0.0000 so=1.000
+#
ADVANCE_FEE_4
-# spam=0.2593 ham=0.0095 so=0.965
+#
ALL_NATURAL
-# spam=0.0000 ham=0.2788 so=0.000
+#
ALL_TRUSTED
# tflags userconf
@@ -45,7 +45,7 @@
# tflags learn
BAYES_99
-# spam=1.2672 ham=0.0035 so=0.997
+#
BODY_ENHANCEMENT2
# tflags userconf
@@ -54,193 +54,193 @@
# tflags userconf
CHARSET_FARAWAY_HEADER
-# spam=0.8824 ham=0.0112 so=0.987
+#
DATE_IN_FUTURE_03_06
-# spam=2.8968 ham=0.0078 so=0.997
+#
DATE_IN_FUTURE_12_24
-# spam=1.8400 ham=0.0026 so=0.999
+#
DATE_IN_FUTURE_96_XX
-# spam=0.9838 ham=0.0285 so=0.972
+#
DATE_IN_PAST_96_XX
-# spam=0.9428 ham=0.0000 so=1.000
+#
DATE_SPAMWARE_Y2K
-# spam=0.2815 ham=0.0078 so=0.973
+#
DISGUISE_PORN_MUNDANE
-# spam=0.2883 ham=0.0026 so=0.991
+#
DOMAIN_4U2
-# spam=0.8341 ham=0.0086 so=0.990
+#
DRUGS_ANXIETY
-# spam=0.6474 ham=0.0009 so=0.999
+#
DRUGS_ANXIETY_EREC
-# spam=0.4651 ham=0.0052 so=0.989
+#
DRUGS_DIET
-# spam=4.3389 ham=0.0345 so=0.992
+#
DRUGS_ERECTILE
-# spam=1.3601 ham=0.0000 so=1.000
+#
DRUGS_ERECTILE_OBFU
-# spam=0.5015 ham=0.0017 so=0.997
+#
DRUGS_MANYKINDS
-# spam=0.5665 ham=0.0216 so=0.963
+#
DRUGS_MUSCLE
-# spam=0.4214 ham=0.0121 so=0.972
+#
DRUGS_SLEEP
-# spam=0.3810 ham=0.0000 so=1.000
+#
DRUGS_SLEEP_EREC
-# spam=0.3277 ham=0.0017 so=0.995
+#
DRUG_DOSAGE
-# spam=0.2755 ham=0.0017 so=0.994
+#
DRUG_ED_CAPS
-# spam=0.4911 ham=0.0060 so=0.988
+#
EMPTY_MESSAGE
-# spam=0.2837 ham=0.0000 so=1.000
+#
EM_ROLEX
# tflags userconf
ENV_AND_HDR_SPF_MATCH
-# spam=0.2558 ham=0.0000 so=1.000
+#
FAKE_OUTBLAZE_RCVD
-# spam=0.8964 ham=0.0000 so=1.000
+#
FORGED_AOL_TAGS
-# spam=3.1182 ham=0.0777 so=0.976
+#
FORGED_HOTMAIL_RCVD2
-# spam=1.4104 ham=0.0000 so=1.000
+#
FORGED_IMS_HTML
-# spam=0.9898 ham=0.0000 so=1.000
+#
FORGED_IMS_TAGS
-# spam=0.2558 ham=0.0000 so=1.000
+#
FORGED_MSGID_HOTMAIL
-# spam=2.6973 ham=0.0000 so=1.000
+#
FORGED_MSGID_YAHOO
-# spam=1.4774 ham=0.0095 so=0.994
+#
FORGED_MUA_AOL_FROM
-# spam=1.3325 ham=0.0000 so=1.000
+#
FORGED_MUA_EUDORA
-# spam=1.7919 ham=0.0017 so=0.999
+#
FORGED_MUA_IMS
-# spam=1.3451 ham=0.0009 so=0.999
+#
FORGED_MUA_OIMO
-# spam=15.0243 ham=0.0060 so=1.000
+#
FORGED_MUA_OUTLOOK
-# spam=1.3208 ham=0.0000 so=1.000
+#
FORGED_MUA_THEBAT_BOUN
-# spam=13.7297 ham=0.0052 so=1.000
+#
FORGED_OUTLOOK_HTML
-# spam=11.1407 ham=0.0052 so=1.000
+#
FORGED_OUTLOOK_TAGS
-# spam=0.8838 ham=0.0000 so=1.000
+#
FORGED_QUALCOMM_TAGS
-# spam=1.3186 ham=0.0000 so=1.000
+#
FORGED_THEBAT_HTML
-# spam=8.2991 ham=0.1122 so=0.987
+#
FORGED_YAHOO_RCVD
-# spam=0.7215 ham=0.0000 so=1.000
+#
FROM_ALL_NUMS
-# spam=1.0573 ham=0.0026 so=0.998
+#
FROM_BLANK_NAME
-# spam=0.2632 ham=0.0052 so=0.981
+#
FROM_DOMAIN_NOVOWEL
-# spam=0.7696 ham=0.0043 so=0.994
+#
FROM_ENDS_IN_NUMS
-# spam=2.0761 ham=0.0302 so=0.986
+#
FROM_HAS_MIXED_NUMS
-# spam=7.3062 ham=0.0000 so=1.000
+#
FROM_ILLEGAL_CHARS
-# spam=0.4987 ham=0.0069 so=0.986
+#
FROM_LOCAL_HEX
-# spam=7.5380 ham=0.0259 so=0.997
+#
FROM_LOCAL_NOVOWEL
-# spam=0.9057 ham=0.0173 so=0.981
+#
FRONTPAGE
-# spam=1.0847 ham=0.0000 so=1.000
+#
FUZZY_BILLION
-# spam=0.7455 ham=0.0017 so=0.998
+#
FUZZY_CPILL
-# spam=0.5190 ham=0.0000 so=1.000
+#
FUZZY_ERECT
-# spam=0.7698 ham=0.0000 so=1.000
+#
FUZZY_GUARANTEE
-# spam=0.4233 ham=0.0000 so=1.000
+#
FUZZY_MEDICATION
-# spam=1.6170 ham=0.0000 so=1.000
+#
FUZZY_MILLION
-# spam=0.5605 ham=0.0026 so=0.995
+#
FUZZY_MORTGAGE
-# spam=0.2744 ham=0.0000 so=1.000
+#
FUZZY_OBLIGATION
-# spam=0.3044 ham=0.0000 so=1.000
+#
FUZZY_PRICES
-# spam=1.1306 ham=0.0043 so=0.996
+#
FUZZY_REFINANCE
-# spam=0.3777 ham=0.0000 so=1.000
+#
FUZZY_THOUSANDS
-# spam=0.5250 ham=0.0026 so=0.995
+#
FUZZY_VLIUM
-# spam=0.9117 ham=0.0009 so=0.999
+#
FUZZY_VPILL
-# spam=0.5285 ham=0.0078 so=0.986
+#
FUZZY_XPILL
-# spam=0.2812 ham=0.0035 so=0.988
+#
GAPPY_SUBJECT
# tflags userconf
@@ -270,124 +270,124 @@
# tflags userconf
HASHCASH_HIGH
-# spam=0.5457 ham=0.0000 so=1.000
+#
HEADER_SPAM
-# spam=3.8981 ham=0.0104 so=0.997
+#
HEAD_ILLEGAL_CHARS
-# spam=0.3383 ham=0.0000 so=1.000
+#
HELO_DYNAMIC_COMCAST
-# spam=1.3615 ham=0.0078 so=0.994
+#
HELO_DYNAMIC_DHCP
-# spam=1.5941 ham=0.0000 so=1.000
+#
HELO_DYNAMIC_HCC
-# spam=3.5412 ham=0.0138 so=0.996
+#
HELO_DYNAMIC_IPADDR
-# spam=2.5325 ham=0.0060 so=0.998
+#
HELO_DYNAMIC_IPADDR2
-# spam=0.5597 ham=0.0000 so=1.000
+#
HELO_DYNAMIC_SPLIT_IP
-# spam=0.6633 ham=0.0026 so=0.996
+#
HG_HORMONE
# tflags userconf
HTML_CHARSET_FARAWAY
-# spam=3.1258 ham=0.0000 so=1.000
+#
HTTP_77
-# spam=12.4355 ham=0.0009 so=1.000
+#
HTTP_EXCESSIVE_ESCAPES
-# spam=3.5248 ham=0.0915 so=0.975
+#
INVALID_DATE
-# spam=1.8097 ham=0.0371 so=0.980
+#
INVALID_MSGID
-# spam=2.3554 ham=0.0129 so=0.995
+#
INVESTMENT_ADVICE
-# spam=0.8160 ham=0.0000 so=1.000
+#
KOREAN_UCE_SUBJECT
-# spam=0.6160 ham=0.0138 so=0.978
+#
LONGWORDS
-# spam=0.3607 ham=0.0000 so=1.000
+#
MALE_ENHANCE
-# spam=1.0871 ham=0.0000 so=1.000
+#
MILLION_USD
-# spam=0.6045 ham=0.0000 so=1.000
+#
MIME_BAD_ISO_CHARSET
-# spam=7.5984 ham=0.0466 so=0.994
+#
MIME_BASE64_TEXT
-# spam=7.1360 ham=0.0000 so=1.000
+#
MIME_BOUND_DD_DIGITS
# tflags userconf
MIME_CHARSET_FARAWAY
-# spam=1.4364 ham=0.0492 so=0.967
+#
MIME_HTML_MOSTLY
-# spam=21.8304 ham=0.5266 so=0.976
+#
MIME_HTML_ONLY_MULTI
-# spam=8.7257 ham=0.1493 so=0.983
+#
MISSING_MIMEOLE
-# spam=0.2511 ham=0.0112 so=0.957
+#
MONEY_BACK
-# spam=0.9554 ham=0.0026 so=0.997
+#
MORE_SEX
-# spam=24.3175 ham=0.5853 so=0.976
+#
MPART_ALT_DIFF
-# spam=5.0068 ham=0.0216 so=0.996
+#
MSGID_DOLLARS
-# spam=1.1330 ham=0.0000 so=1.000
+#
MSGID_DOLLARS_RANDOM
-# spam=0.4772 ham=0.0043 so=0.991
+#
MSGID_MULTIPLE_AT
-# spam=0.4949 ham=0.0181 so=0.965
+#
MSGID_NO_HOST
-# spam=0.8576 ham=0.0000 so=1.000
+#
MSGID_OUTLOOK_INVALID
-# spam=11.9559 ham=0.0121 so=0.999
+#
MSGID_RANDY
-# spam=0.7269 ham=0.0009 so=0.999
+#
MSGID_SHORT
-# spam=6.6670 ham=0.0000 so=1.000
+#
MSGID_SPAM_CAPS
-# spam=3.7287 ham=0.0000 so=1.000
+#
MSGID_YAHOO_CAPS
-# spam=0.4217 ham=0.0121 so=0.972
+#
NA_DOLLARS
-# spam=1.3886 ham=0.0009 so=0.999
+#
NO_PRESCRIPTION
# tflags userconf
@@ -396,94 +396,94 @@
# tflags userconf
NO_RELAYS
-# spam=0.4184 ham=0.0017 so=0.996
+#
NUMERIC_HTTP_ADDR
-# spam=0.6059 ham=0.0164 so=0.974
+#
ONLINE_PHARMACY
-# spam=0.3432 ham=0.0000 so=1.000
+#
PERCENT_RANDOM
-# spam=0.8229 ham=0.0268 so=0.969
+#
PRIORITY_NO_NAME
-# spam=0.9521 ham=0.0000 so=1.000
+#
RATWARE_EFROM
-# spam=1.4085 ham=0.0000 so=1.000
+#
RATWARE_EGROUPS
-# spam=0.2886 ham=0.0000 so=1.000
+#
RATWARE_GECKO_BUILD
-# spam=0.2886 ham=0.0000 so=1.000
+#
RATWARE_MOZ_MALFORMED
-# spam=5.1596 ham=0.0060 so=0.999
+#
RATWARE_MS_HASH
-# spam=4.8215 ham=0.0000 so=1.000
+#
RATWARE_NAME_ID
-# spam=0.2733 ham=0.0000 so=1.000
+#
RATWARE_OE_MALFORMED
-# spam=5.1467 ham=0.0060 so=0.999
+#
RATWARE_OUTLOOK_NONAME
-# spam=1.2134 ham=0.0000 so=1.000
+#
RATWARE_RCVD_PF
-# spam=18.9719 ham=0.8045 so=0.959
+#
RCVD_BY_IP
-# spam=6.1800 ham=0.0233 so=0.996
+#
RCVD_DOUBLE_IP_LOOSE
-# spam=6.4749 ham=0.0000 so=1.000
+#
RCVD_DOUBLE_IP_SPAM
-# spam=0.4509 ham=0.0017 so=0.996
+#
RCVD_FAKE_HELO_DOTCOM
-# spam=16.6285 ham=0.0009 so=1.000
+#
RCVD_HELO_IP_MISMATCH
-# spam=3.3808 ham=0.0406 so=0.988
+#
RCVD_ILLEGAL_IP
-# spam=24.0060 ham=0.3375 so=0.986
+#
RCVD_NUMERIC_HELO
-# spam=1.7586 ham=0.0777 so=0.958
+#
REMOVE_BEFORE_LINK
-# spam=0.5179 ham=0.0000 so=1.000
+#
REPLICA_WATCH
-# spam=0.8291 ham=0.0026 so=0.997
+#
REPTO_OVERQUOTE_THEBAT
-# spam=1.4563 ham=0.0000 so=1.000
+#
REPTO_QUOTE_AOL
-# spam=1.4309 ham=0.0000 so=1.000
+#
REPTO_QUOTE_IMS
-# spam=0.2585 ham=0.0000 so=1.000
+#
REPTO_QUOTE_MSN
-# spam=1.3763 ham=0.0535 so=0.963
+#
REPTO_QUOTE_QUALCOMM
-# spam=9.4493 ham=0.0026 so=1.000
+#
REPTO_QUOTE_YAHOO
-# spam=0.2845 ham=0.0009 so=0.997
+#
RUDE_HTML
-# spam=1.6375 ham=0.0069 so=0.996
+#
SORTED_RECIPS
# tflags userconf
@@ -492,25 +492,22 @@
# tflags userconf
SPF_PASS
-# spam=0.3293 ham=0.0052 so=0.985
+#
SPOOF_OURI
-# spam=0.2596 ham=0.0009 so=0.997
-STOCK_ALERT
-
-# spam=0.4107 ham=0.0035 so=0.992
+#
STRONG_BUY
-# spam=0.4717 ham=0.0000 so=1.000
+#
SUBJECT_DRUG_GAP_C
-# spam=2.5773 ham=0.0811 so=0.969
+#
SUBJECT_EXCESS_BASE64
-# spam=0.4277 ham=0.0035 so=0.992
+#
SUBJECT_FUZZY_MEDS
-# spam=0.3569 ham=0.0000 so=1.000
+#
SUBJECT_FUZZY_PENIS
# tflags userconf
@@ -519,46 +516,46 @@
# tflags userconf
SUBJECT_IN_WHITELIST
-# spam=23.5239 ham=0.0060 so=1.000
+#
SUBJ_ILLEGAL_CHARS
-# spam=0.8710 ham=0.0311 so=0.966
+#
SUSPICIOUS_RECIPS
-# spam=1.1071 ham=0.0483 so=0.958
+#
TO_CC_NONE
-# spam=0.4312 ham=0.0017 so=0.996
+#
UNCLAIMED_MONEY
-# spam=0.3293 ham=0.0000 so=1.000
+#
UNCLOSED_BRACKET
-# spam=5.0604 ham=0.2054 so=0.961
+#
UNDISC_RECIPS
-# spam=0.6357 ham=0.0207 so=0.968
+#
UNIQUE_WORDS
# tflags userconf
UNPARSEABLE_RELAY
-# spam=0.8524 ham=0.0000 so=1.000
+#
UNRESOLVED_TEMPLATE
-# spam=0.4121 ham=0.0035 so=0.992
+#
UPPERCASE_75_100
-# spam=0.6548 ham=0.0147 so=0.978
+#
URG_BIZ
-# spam=3.3335 ham=0.0233 so=0.993
+#
URI_NOVOWEL
-# spam=1.9067 ham=0.0009 so=1.000
+#
URI_NO_WWW_INFO_CGI
-# spam=0.2596 ham=0.0078 so=0.971
+#
URI_SCHEME_MIXED_CASE
# tflags userconf
@@ -588,20 +585,20 @@
# tflags userconf
USER_IN_WHITELIST_TO
-# spam=1.5779 ham=0.0527 so=0.968
+#
US_DOLLARS_3
-# spam=0.3670 ham=0.0086 so=0.977
+#
WEIRD_QUOTING
-# spam=0.9841 ham=0.0319 so=0.969
+#
WHY_WAIT
-# spam=0.3602 ham=0.0043 so=0.988
+#
X_IP
-# spam=0.7168 ham=0.0000 so=1.000
+#
X_MESSAGE_INFO
-# spam=0.5974 ham=0.0000 so=1.000
+#
X_PRIORITY_CC
Index: build/mkupdates/run_part2
===================================================================
--- build/mkupdates/run_part2 (revision 357926)
+++ build/mkupdates/run_part2 (working copy)
@@ -4,18 +4,34 @@
# 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
PERL=/local/perl586/bin/perl
-PATH=$PATH:/usr/sfw/bin:/opt/sfw/bin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:/opt/subversion-1.1.4/bin:/usr/apache2/bin:/local/bin
+PATH=/local/gnupg-1.4.2/bin:$PATH:/usr/sfw/bin:/opt/sfw/bin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:/opt/subversion-1.1.4/bin:/usr/apache2/bin:/local/bin
export PERL PATH
+# download stage, where update tarballs are deposited for downloaders
+#
stagedir=/var/www/buildbot.spamassassin.org/updatestage
+# directory where "counter", "soa_line.tmpl", "soa_line" and "0.2.3" 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.dev.spamassassin.org.d
+
versions="3.2.0"
# ---------------------------------------------------------------------------
@@ -28,10 +44,14 @@
tmpdir=/home/updatesd/tmp/stage
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
+# version's branch. right now we're only using 1 version though
$PERL Makefile.PL PREFIX=$tmpdir < /dev/null || exit $?
make || exit $?
make install || exit $?
@@ -51,11 +71,16 @@
gunzip -cd < $tmpdir/update.tgz | tar tf - || exit 4
-# TODO: sign! currently requires passphrase, this is a problem
-# gpg -bas $tmpdir/update.tgz || 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
@@ -78,10 +103,69 @@
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 $?
+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. we use a counter, with rollover at 100,
+# and a datestamp too.
+
+oldcount=`cat $dnsdir/counter`
+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, ">'"$dnsdir"'/counter"); print INCR $count,"\n"; close INCR;
+
+' $oldcount`
+
+soafile=$dnsdir/soa_line
+rm -f $soafile.bak \
+ $soafile.new
+
+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 of that changed zone
+sudo rndc reload
+
+
+
+# clean up 4-day-old (and older) update tarballs. This seems as
+# good a place as any to do this!
+find $stagedir -mtime 4 -type f | xargs rm
+
}
# ---------------------------------------------------------------------------