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/06/04 17:04:49 UTC
svn commit: r1797593 - in /spamassassin/tags/sa-update_3.4.2_20170604100333:
./ build/mkupdates/run_nightly masses/rule-qa/automc/gen_info_xml
masses/rule-qa/corpus-nightly
Author: spamassassin_role
Date: Sun Jun 4 17:04:49 2017
New Revision: 1797593
URL: http://svn.apache.org/viewvc?rev=1797593&view=rev
Log:
promotions validated
Added:
spamassassin/tags/sa-update_3.4.2_20170604100333/
- copied from r1797592, spamassassin/trunk/
Modified:
spamassassin/tags/sa-update_3.4.2_20170604100333/build/mkupdates/run_nightly
spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/automc/gen_info_xml
spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/corpus-nightly
Modified: spamassassin/tags/sa-update_3.4.2_20170604100333/build/mkupdates/run_nightly
URL: http://svn.apache.org/viewvc/spamassassin/tags/sa-update_3.4.2_20170604100333/build/mkupdates/run_nightly?rev=1797593&r1=1797592&r2=1797593&view=diff
==============================================================================
--- spamassassin/tags/sa-update_3.4.2_20170604100333/build/mkupdates/run_nightly (original)
+++ spamassassin/tags/sa-update_3.4.2_20170604100333/build/mkupdates/run_nightly Sun Jun 4 17:04:49 2017
@@ -74,6 +74,11 @@ make_tarball_for_version() {
# 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_active.cf in the update.tgz
+ svn co http://svn.apache.org/repos/asf/spamassassin/trunk/rulesrc
+ cp -a rulesrc/scores/72_active.cf rules/
+ rm -rf rulesrc
+
# double check we still lint without those 2 files
./spamassassin --lint || exit $?
Modified: spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/automc/gen_info_xml
URL: http://svn.apache.org/viewvc/spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/automc/gen_info_xml?rev=1797593&r1=1797592&r2=1797593&view=diff
==============================================================================
--- spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/automc/gen_info_xml (original)
+++ spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/automc/gen_info_xml Sun Jun 4 17:04:49 2017
@@ -1,5 +1,5 @@
-#!/local/perl586/bin/perl -w
-my $automcdir = "/export/home/svn-trunk/masses/rule-qa/automc";
+#!/usr/bin/perl -w
+my $automcdir = "/usr/local/spamassassin/automc/svn/masses/rule-qa/automc";
# need this to ensure that 'svn log' will include ALL changes
my $svn_checkins_root = "http://svn.apache.org/repos/asf/spamassassin/";
Modified: spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/corpus-nightly
URL: http://svn.apache.org/viewvc/spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/corpus-nightly?rev=1797593&r1=1797592&r2=1797593&view=diff
==============================================================================
--- spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/corpus-nightly (original)
+++ spamassassin/tags/sa-update_3.4.2_20170604100333/masses/rule-qa/corpus-nightly Sun Jun 4 17:04:49 2017
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# settings are located in $HOME/.corpus
@@ -33,12 +33,12 @@ net=""
if date | egrep '^Sat' || [ "$1" = "net" ]; then net="net-" ; fi
# enter tree
-if [ -d $tree ] ; then
- cd $tree
-else
- echo "$tree does not exist yet. you need to check it out first" 1>&2
- exit 2
-fi
+#if [ -d $tree ] ; then
+# cd $tree
+#else
+# echo "$tree does not exist yet. you need to check it out first" 1>&2
+# exit 2
+#fi
# find current revision
rm -f weekly-versions.txt nightly-versions.txt
@@ -56,42 +56,51 @@ else
revision=$(tail -1 nightly-versions.txt|awk '{print $2}')
fi
+mkdir -p $tree
+rm -rf $tree/*
+
+cd $tree
+
+pwd
+
+svn co -r $revision https://svn.apache.org/repos/asf/spamassassin/trunk . < /dev/null
+
# update
# TODO: replace all this with rsync, it's much safer ;)
-set +e
-retry=0
-while true; do
- rm -rf rules # causing trouble for some reason
- rm -rf rulesrc/sandbox
-
- if svn update -r $revision < /dev/null && \
- svn update -r $revision rulesrc < /dev/null
- then
- break;
- fi
+#set +e
+#retry=0
+#while true; do
+# rm -rf rules # causing trouble for some reason
+# rm -rf rulesrc/sandbox
+#
+# if svn update -r $revision < /dev/null && \
+# svn update -r $revision rulesrc < /dev/null
+# then
+# break;
+# fi
# if that failed, get aggressive about getting a full
# checkout, regardless of what may have been here already;
# delete most of the checkout to do so, and just use "svn co"
# instead of "svn up".
-
- svnpath=`svn info .| grep -i ^URL: | cut -d ' ' -f 2`
-
- rm -rf rules lib build rulesrc spamd spamc
- svn cleanup < /dev/null
- svn co --non-interactive $svnpath .
-
- # just 10 times; our SVN repo shouldn't be *that* unreliable!
- if [ $retry -eq 20 ]; then
- echo "svn update/co failed" 1>&2
- exit 1
- fi
-
- retry=$(( $retry + 1 ))
-
- # longer and longer between retries
- sleep `expr 20 '*' $retry`
-done
+#
+# svnpath=`svn info .| grep -i ^URL: | cut -d ' ' -f 2`
+#
+# rm -rf rules lib build rulesrc spamd spamc
+# svn cleanup < /dev/null
+# svn co --non-interactive $svnpath .
+#
+# # just 10 times; our SVN repo shouldn't be *that* unreliable!
+# if [ $retry -eq 20 ]; then
+# echo "svn update/co failed" 1>&2
+# exit 1
+# fi
+#
+# retry=$(( $retry + 1 ))
+#
+# # longer and longer between retries
+# sleep `expr 20 '*' $retry`
+#done
set -e
# once we have everything checked out, run "part 2"