You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by da...@apache.org on 2017/10/25 12:53:01 UTC
svn commit: r1813275 - in /spamassassin/trunk:
build/mkupdates/do-stable-update-with-scores
build/mkupdates/mkupdate-with-scores
masses/contrib/automasscheck-minimal/automasscheck-minimal.sh
masses/rule-update-score-gen/generate-new-scores.sh
Author: davej
Date: Wed Oct 25 12:53:00 2017
New Revision: 1813275
URL: http://svn.apache.org/viewvc?rev=1813275&view=rev
Log:
Temp fix for last known good 72_scores.cf plus other minor adjustments.
Modified:
spamassassin/trunk/build/mkupdates/do-stable-update-with-scores
spamassassin/trunk/build/mkupdates/mkupdate-with-scores
spamassassin/trunk/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh
spamassassin/trunk/masses/rule-update-score-gen/generate-new-scores.sh
Modified: spamassassin/trunk/build/mkupdates/do-stable-update-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/do-stable-update-with-scores?rev=1813275&r1=1813274&r2=1813275&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/do-stable-update-with-scores (original)
+++ spamassassin/trunk/build/mkupdates/do-stable-update-with-scores Wed Oct 25 12:53:00 2017
@@ -14,7 +14,7 @@ RV=$?
if [ $RV -ne 0 ] ; then
echo "Exit Status $RV is not zero for do-nightly-rescore-example"
(
- echo "From: noreply@spamassassin.apache.org ($USER Cron)"
+ 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."
@@ -27,7 +27,7 @@ else
if [ $RV -ne 0 ] ; then
echo "Exit Status $RV is not zero for mkupdate-with-scores"
(
- echo "From: noreply@spamassassin.apache.org ($USER Cron)"
+ 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"
Modified: spamassassin/trunk/build/mkupdates/mkupdate-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/mkupdate-with-scores?rev=1813275&r1=1813274&r2=1813275&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/mkupdate-with-scores (original)
+++ spamassassin/trunk/build/mkupdates/mkupdate-with-scores Wed Oct 25 12:53:00 2017
@@ -131,6 +131,10 @@ make_rule_update_from_trunk() {
cp trunk-rulesrc-scores/72_scores.cf trunk/rules/72_scores.cf
+ # Temp fix to force the last known good 72_scores.cf
+ svn co --revision=1786976 --force https://svn.apache.org/repos/asf/spamassassin/trunk/rulesrc/scores last_known_good
+ cp last_known_good/72_scores.cf trunk/rules/72_scores.cf
+
# note: one of set0 or set1 stats might be incorrect (not all of their rules
# are included in the update) I can't remember if we eliminate dropped
# rules in generate-new-scores or not (we run the sets in a particular
@@ -280,10 +284,13 @@ if [[ ! -z "$TESTED_VERSIONS" ]]; then
else
# 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
- # 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
+ 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
Modified: spamassassin/trunk/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh?rev=1813275&r1=1813274&r2=1813275&view=diff
==============================================================================
--- spamassassin/trunk/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh (original)
+++ spamassassin/trunk/masses/contrib/automasscheck-minimal/automasscheck-minimal.sh Wed Oct 25 12:53:00 2017
@@ -59,6 +59,9 @@ setup_checktype() {
if [[ "$RC" -ne 0 ]]; then
echo "ERROR: rsync failure $RC, aborting..."
exit 1
+ else
+ SVNREV=`awk '/Revision:/ {print $2}' $WORKDIR/$TYPE/masses/svninfo.tmp`
+ [[ ! -z "$SVNREV" ]] && echo "SVN revision = $SVNREV"
fi
}
Modified: spamassassin/trunk/masses/rule-update-score-gen/generate-new-scores.sh
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-update-score-gen/generate-new-scores.sh?rev=1813275&r1=1813274&r2=1813275&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-update-score-gen/generate-new-scores.sh (original)
+++ spamassassin/trunk/masses/rule-update-score-gen/generate-new-scores.sh Wed Oct 25 12:53:00 2017
@@ -175,7 +175,7 @@ svn up -r $REVISION trunk-new-rules-set$
svn up trunk-new-rules-set$SCORESET/masses/
svn up trunk-new-rules-set$SCORESET/build/
-set +x
+#set +x
# we need to patch the Makefile to get it to mangle some data for us
cd trunk-new-rules-set${SCORESET}/masses