promotions validated
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/tags/sa-update_3.4.2_20170604083042@1797561 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build/automc/freqsd b/build/automc/freqsd
index fe2777f..55ee754 100755
--- a/build/automc/freqsd
+++ b/build/automc/freqsd
@@ -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 @@
"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 --git a/build/mkupdates/mkupdate-with-scores b/build/mkupdates/mkupdate-with-scores
index f689a2f..02f7bd1 100755
--- a/build/mkupdates/mkupdate-with-scores
+++ b/build/mkupdates/mkupdate-with-scores
@@ -104,21 +104,6 @@
return $STATUS
}
-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() {
# to heck with dealing with svn update failures
rm -rf trunk trunk-rulesrc-scores
@@ -286,10 +271,8 @@
# publish update
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*
+ chmod 544 $TMPDIR/$REVISION.tar.gz* &&
+ cp -a $TMPDIR/$REVISION.tar.gz* $UPDATEDIR/
) || exit 5
if [ $AUTOUPDATESDISABLED -eq 1 -a $REVERT_REVISION -eq 0 ]; then
diff --git a/masses/rule-qa/automc/gen_info_xml b/masses/rule-qa/automc/gen_info_xml
index 86dfc98..2a321b1 100755
--- a/masses/rule-qa/automc/gen_info_xml
+++ b/masses/rule-qa/automc/gen_info_xml
@@ -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/";
diff --git a/masses/rule-qa/corpus-nightly b/masses/rule-qa/corpus-nightly
index 99de833..4c490f7 100755
--- a/masses/rule-qa/corpus-nightly
+++ b/masses/rule-qa/corpus-nightly
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# settings are located in $HOME/.corpus
@@ -33,12 +33,12 @@
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 @@
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"
