svn commit: r358466 - in /spamassassin/trunk/build/mkupdates: listpromotable run_nightly run_part2

[jm...@apache.org]

Author: jm
Date: Wed Dec 21 19:16:24 2005
New Revision: 358466

URL: http://svn.apache.org/viewcvs?rev=358466&view=rev
Log:
a little closer to updates

Modified:
    spamassassin/trunk/build/mkupdates/listpromotable
    spamassassin/trunk/build/mkupdates/run_nightly
    spamassassin/trunk/build/mkupdates/run_part2

Modified: spamassassin/trunk/build/mkupdates/listpromotable
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/mkupdates/listpromotable?rev=358466&r1=358465&r2=358466&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/listpromotable (original)
+++ spamassassin/trunk/build/mkupdates/listpromotable Wed Dec 21 19:16:24 2005
@@ -105,8 +105,8 @@
 
 $mailsa->lint_rules();
 
-my $date = scalar localtime time;
-# print "# active ruleset list generated on $date\n";
+print "# active ruleset list (automatically generated from $cgi_url)\n";
+
 foreach my $name (sort keys %$plist) {
   my $obj = $plist->{$name};
   my $notes = '';
@@ -142,7 +142,9 @@
   # rules that fail lint
   next if $rules_with_errors{$name};
 
+  # don't include ever-changing bits of data
   # $notes = "spam=$obj->{spc} ham=$obj->{hpc} so=$obj->{so}";
+  $notes = "good enough";
 
 publish:
 

Modified: spamassassin/trunk/build/mkupdates/run_nightly
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/mkupdates/run_nightly?rev=358466&r1=358465&r2=358466&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/run_nightly (original)
+++ spamassassin/trunk/build/mkupdates/run_nightly Wed Dec 21 19:16:24 2005
@@ -18,13 +18,14 @@
 (
 echo "
 
-To enact this, someone log into the zone and type:
+To commit this and proceed with update tarball creation:
 
         ssh spamassassin.zones.apache.org
         cd /home/updatesd/svn/spamassassin
-        sudo -u updatesd svn commit -m 'daily promotions' rules/active.list
+        sudo -u updatesd /home/updatesd/svn/spamassassin/build/mkupdates/run_part2
 
 "
+
 svn diff
 ) > mail.tmp
 

Modified: spamassassin/trunk/build/mkupdates/run_part2
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/mkupdates/run_part2?rev=358466&r1=358465&r2=358466&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/run_part2 (original)
+++ spamassassin/trunk/build/mkupdates/run_part2 Wed Dec 21 19:16:24 2005
@@ -12,6 +12,7 @@
 
 cd /home/updatesd/svn/spamassassin
 
+
 PERL=/local/perl586/bin/perl
 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
 
@@ -30,7 +31,7 @@
 # live:
 # dnsdir=/var/named/updates.spamassassin.org.d
 #
-dnsdir=/var/named/updates.dev.spamassassin.org.d
+dnsdir=/var/named/updates.spamassassin.org.d
 
 # directory where "counter", "soa_line.tmpl", "soa_line" live.
 # it's assumed that the *real* zone $INCLUDEs files from this dir.
@@ -41,6 +42,12 @@
 versions="3.2.0"
 
 # ---------------------------------------------------------------------------
+# TODO: if/when this becomes fully automatic, this commit will be superfluous
+
+echo "Committing promotions in rules/active.list..."
+svn commit -m 'promotions validated' rules/active.list
+
+# ---------------------------------------------------------------------------
 
 make_tarball_for_version () {
 
@@ -60,6 +67,12 @@
 # version's branch.  right now we're only using 1 version though
 $PERL Makefile.PL PREFIX=$tmpdir < /dev/null || exit $?
 make                                     || exit $?
+
+# remove the rules files for rules we won't be shipping
+rm rules/70_sandbox.cf rules/70_inactive.cf
+# and ensure the ruleset lints!
+./spamassassin --lint                    || exit $?
+
 make install                             || exit $?
 
 rulesdir=$tmpdir/share/spamassassin