You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by sp...@apache.org on 2017/05/30 11:56:10 UTC
svn commit: r1796841 - in /spamassassin/tags/sa-update_3.3.2_20170530045454:
./ build/automc/freqsd build/mkupdates/do-stable-update-with-scores
build/mkupdates/mkupdate-with-scores build/mkupdates/run_nightly
Author: spamassassin_role
Date: Tue May 30 11:56:10 2017
New Revision: 1796841
URL: http://svn.apache.org/viewvc?rev=1796841&view=rev
Log:
promotions validated
Added:
spamassassin/tags/sa-update_3.3.2_20170530045454/
- copied from r1796840, spamassassin/trunk/
Modified:
spamassassin/tags/sa-update_3.3.2_20170530045454/build/automc/freqsd
spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/do-stable-update-with-scores
spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/mkupdate-with-scores
spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/run_nightly
Modified: spamassassin/tags/sa-update_3.3.2_20170530045454/build/automc/freqsd
URL: http://svn.apache.org/viewvc/spamassassin/tags/sa-update_3.3.2_20170530045454/build/automc/freqsd?rev=1796841&r1=1796840&r2=1796841&view=diff
==============================================================================
--- spamassassin/tags/sa-update_3.3.2_20170530045454/build/automc/freqsd (original)
+++ spamassassin/tags/sa-update_3.3.2_20170530045454/build/automc/freqsd Tue May 30 11:56:10 2017
@@ -1,4 +1,4 @@
-#!/local/perl586/bin/perl
+#!/usr/bin/perl
#
# freqsd - perform "background" operations required by the automc
# infrastructure, such as building indices and "hit-frequencies" reports
@@ -20,10 +20,10 @@ GetOptions(
"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);
Modified: spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/do-stable-update-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/do-stable-update-with-scores?rev=1796841&r1=1796840&r2=1796841&view=diff
==============================================================================
--- spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/do-stable-update-with-scores (original)
+++ spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/do-stable-update-with-scores Tue May 30 11:56:10 2017
@@ -8,7 +8,7 @@ set -x
#ADDING MORE EXIT STATUS CHECKS FOR BUG 6702
echo "'Running do-nightly-rescore-example.sh ..."
echo ""
-/usr/local/spamassassin/automc/svn/masses/rule-update-score-gen/do-nightly-rescore-example.sh
+/usr/local/spamassassin/automc/svn/masses/rule-update-score-gen/do-nightly-rescore-example.sh $1
RV=$?
if [ $RV -ne 0 ] ; then
@@ -22,7 +22,7 @@ if [ $RV -ne 0 ] ; then
else
echo "Running mkupdate-with-scores..."
echo ""
- /usr/local/spamassassin/automc/svn/trunk/build/mkupdates/mkupdate-with-scores
+ /usr/local/spamassassin/automc/svn/trunk/build/mkupdates/mkupdate-with-scores $1
RV=$?
if [ $RV -ne 0 ] ; then
echo "Exit Status $RV is not zero for mkupdate-with-scores"
Modified: spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/mkupdate-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/mkupdate-with-scores?rev=1796841&r1=1796840&r2=1796841&view=diff
==============================================================================
--- spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/mkupdate-with-scores (original)
+++ spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/mkupdate-with-scores Tue May 30 11:56:10 2017
@@ -97,26 +97,6 @@ test_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 | rev`
-
- DNS_RECORD="$RVERS TXT \"$UPDATE_REVISION\""
- echo "DNS Record: $DNS_RECORD"
-
- /usr/local/bin/updateDNS.sh ${RVERS}.updates TXT $UPDATE_REVISION
-
- return 0
-}
-
copy_update_paranoid() {
SRC=$1
DST=$2
@@ -283,9 +263,9 @@ MINOR_VERS=0
#for (( MINOR_VERS=3; 1; MINOR_VERS++ )); do
# for (( UPDATE_VERS=0; 1; UPDATE_VERS++ )); do
-# Temporarily only check against 3.3.3 since the DNS TXT records all CNAME to 3.3.3.updates.spamassassin.org
+# Temporarily only check against 3.3.2 -davej 5/29/17
MINOR_VERS=3
-UPDATE_VERS=3
+UPDATE_VERS=2
set +e
svn info https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_${MINOR_VERS}_${UPDATE_VERS} | grep Revision
VERSION_EXISTS=$?
@@ -312,8 +292,9 @@ if [ $UPDATED_VERSIONS -gt 0 ]; then
if [ $AUTOUPDATESDISABLED -eq 1 -a $REVERT_REVISION -eq 0 ]; then
echo "DNS updating disabled (auto update publishing disabled), skipping DNS reload"
else
- # Currently all supported sa-updated DNS records are CNAMEd to 3.3.3.updates.spamassassin.org
- update_dns_record 3.3.3 $REVISION
+ # Temporary: See above. -davej 5/29/17
+ /usr/local/bin/updateDNS.sh 3.3.3.updates TXT $REVISION
+ /usr/local/bin/updateDNS.sh 2.3.3.updates TXT $REVISION
fi
fi
Modified: spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/run_nightly
URL: http://svn.apache.org/viewvc/spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/run_nightly?rev=1796841&r1=1796840&r2=1796841&view=diff
==============================================================================
--- spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/run_nightly (original)
+++ spamassassin/tags/sa-update_3.3.2_20170530045454/build/mkupdates/run_nightly Tue May 30 11:56:10 2017
@@ -6,7 +6,7 @@ LOGDIR="/var/www/bbmass.spamassassin.org
REPDIR="/var/www/ruleqa.spamassassin.org/reports"
UPDDIR="/var/www/bbmass.spamassassin.org/updates"
-VERSIONS="3.3.3"
+VERSIONS="3.3.2"
cd /usr/local/spamassassin/automc/svn/trunk
@@ -169,10 +169,11 @@ make_tarball_for_version() {
# next, create/update the new DNS record....
- # turn "3.2.0" into "0.2.3"
- rvers=`echo "$version" | rev`
+ # Newer versions of SA are CNAMEd to this DNS record:
+ /usr/local/bin/updateDNS.sh 3.3.3.updates TXT ${svnrev}
- /usr/local/bin/updateDNS.sh ${rvers}.updates TXT ${svnrev}
+ # Set older version TXT records for older sa-update
+ /usr/local/bin/updateDNS.sh 2.3.3.updates TXT ${svnrev}
# clean up 4-day-old (and older) update tarballs. This seems as
# good a place as any to do this!