You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2015/04/29 19:19:13 UTC
svn commit: r1676800 - /spamassassin/branches/3.4/build/README
Author: kmcgrail
Date: Wed Apr 29 17:19:13 2015
New Revision: 1676800
URL: http://svn.apache.org/r1676800
Log:
unifying 3.4 branch build readme with trunk
Modified:
spamassassin/branches/3.4/build/README
Modified: spamassassin/branches/3.4/build/README
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/build/README?rev=1676800&r1=1676799&r2=1676800&view=diff
==============================================================================
--- spamassassin/branches/3.4/build/README (original)
+++ spamassassin/branches/3.4/build/README Wed Apr 29 17:19:13 2015
@@ -7,6 +7,10 @@ SPAMASSASSIN DEVELOPMENT SNAPSHOT PROCED
ssh spamassassin.zones.apache.org
cd [checkedoutdir]
+ NOTE: SpamAssassin.Zones is a crashed box replaced by SpamAssassin-vm.
+ A copy of the sabuildtools is in
+ /root/zonestorage-restore/spamassassin/export/home/kmcgrail/sabuildtools
+
- ensure the required code and data is available for the build scripts:
$HOME/sabuildtools
@@ -27,6 +31,12 @@ SPAMASSASSIN DEVELOPMENT SNAPSHOT PROCED
- by default, they're written to ~/public_html/devel/ .
Copy them to wherever you want, yourself.
+- KAM has included all of these on one of his devel systems with perl
+ 5.8.6 (the earliest supported version of Perl as of 4/28/2015). One
+ note is that you need webmake 2.4 from
+ http://webmake.taint.org/devel/HTML-WebMake-2.4.tar.gz
+
+ Also, a copy is mirrored at www.pccc.com/downloads/SpamAssassin
SPAMASSASSIN RELEASE PROCEDURE
@@ -124,7 +134,14 @@ SPAMASSASSIN RELEASE PROCEDURE
3.1.0 work (created 3.0 branch); replace with the correct rev number
for the point you want to start at if different. I used r1149751 to
produce the first 3.4.0-pre release, for example. r1567124 is the
- 3.4.0 release tag revision.
+ 3.4.0 release tag revision. r1676613 is the 3.4.1 release tag
+ revision.
+
+ To find the release tag revision, use the tags website, i.e.:
+ https://svn.apache.org/repos/asf/spamassassin/tags/
+
+ NOTE: 3.4.1 is currently on trunk and will be branched to 3.4 because
+ 3.4 branch was not used.
- Exclude some automated changes from the logs:
@@ -178,7 +195,7 @@ SPAMASSASSIN RELEASE PROCEDURE
- For a maintainance release (x.y.1, x.y.2):
- vers=3_1_7
+ vers=3_4_2
Then run:
@@ -189,7 +206,7 @@ SPAMASSASSIN RELEASE PROCEDURE
- For a trunk release (x.y.0):
- vers=3_4_0
+ vers=3_4_1
repo=https://svn.apache.org/repos/asf/spamassassin
svn delete -m "replaced old tag" $repo/tags/spamassassin_release_$vers
@@ -223,7 +240,7 @@ SPAMASSASSIN RELEASE PROCEDURE
#These should be set from the previous command unless you are on a
# different server
- #vers=3_3_0_alpha_2
+ #vers=3_4_1
#repo=https://svn.apache.org/repos/asf/spamassassin
rm -rf ~/relbuild
svn co $repo/tags/spamassassin_release_$vers ~/relbuild
@@ -246,7 +263,8 @@ SPAMASSASSIN RELEASE PROCEDURE
module, you didn't update your $PATH.
- run "./build/repackage_latest_update_rules" to repackage the
- latest file on updates.spamassassin.org.
+ latest rules file for the purpose of publishing a starter rule file
+ for people who can't run sa-update:
PATH=$HOME/sabuildtools/bin:$PATH
./build/repackage_latest_update_rules
@@ -258,13 +276,13 @@ SPAMASSASSIN RELEASE PROCEDURE
links, fixing the MD5 and SHA1 checksums in this mail, and summarising
the important changes from the Changes file.
- cp build/announcements/3.3.2.txt build/announcements/3.4.0.txt
+ cp build/announcements/3.4.0.txt build/announcements/3.4.1.txt
svn add !$
vi !$
NOTE: Here's a quick example to concat the MD5 or SHA1 checksums:
- ls *3.4.1*rc2* | grep md5 | xargs cat --
- ls *3.4.1*rc2* | grep sha1 | xargs cat --
+ ls *3.4.1.* | grep md5 | xargs cat --
+ ls *3.4.1.* | grep sha1 | xargs cat --
- If there are any issues to note, make sure to edit the UPGRADE file.
Every x.x.0 release at a minimum should include a section.
@@ -272,12 +290,12 @@ SPAMASSASSIN RELEASE PROCEDURE
- Check the README file for any items to change.
- (for any rc, prerelease, or full release) Place the tarballs in a
- discrete location (discrete means not linked from the "downloads" page
+ discreet location (discreet means not linked from the "downloads" page
of the website, but included in the vote mail) and request a vote on the
development mailing list to make the release. Post the URL,
md5sums/sha1sums, and proposed release announcement mail to the dev
list. The default location -- ~/public_html/devel/ , or
- http://people.apache.org/~jm/devel/ , qualifies as "discrete".
+ http://people.apache.org/~jm/devel/ , qualifies as "discreet".
If you build on the zone, you will need to scp them over:
@@ -323,7 +341,8 @@ SPAMASSASSIN RELEASE PROCEDURE
branch, off the trunk.
repo=https://svn.apache.org/repos/asf/spamassassin
- svn copy $repo/tags/spamassassin_release_3_4_0 $repo/branches/3.4 -m 'Creating 3.4 branch'
+ svn copy $repo/tags/spamassassin_release_3_4_1 $repo/branches/3.4 \
+ -m 'Creating 3.4 branch based on 3.4.1 so that trunk can go to 4.0'
"trunk" is SVN's concept of head. Typically, our branches are named
for their minor version number. In the example above, 3.4 is the
@@ -343,24 +362,26 @@ SPAMASSASSIN RELEASE PROCEDURE
- lib/Mail/SpamAssassin.pm
+
+- In build/mkupdates/run_part2 change versions="X.Y.Z" to the new
+ development version (A.B.C).
+
+
- [X.Y.0 RELEASES ONLY]: NOTE: This may change, make sure this info is
still accurate before changing this (preferrably find out BEFORE doing
an X.Y.0 release. Update the mkupdates stuff:
- - In build/mkupdates/run_part2 change versions="X.Y.0" to the new
- development version (X.Y+1.0).
-
- - Create an empty file for the new version number in
- /var/named/updates.dev.spamassassin.org.d/ on the zone and chown to
- updatesd and chgrp to others.
-
- NOTE: I don't believe this does anything KAM: 2014-02-11
+# - Create an empty file for the new version number in
+# /var/named/updates.dev.spamassassin.org.d/ on the zone and chown to
+# updatesd and chgrp to others.
+#
+# NOTE: I don't believe this does anything KAM: 2014-02-11 and the
+# directory doesn't exist.
- Add "$INCLUDE /var/named/updates.spamassassin.org.d/X.Y+1.0" to the
- spamassassin.org zone file in spamassassin/dns/
+ /var/named/spamassassin.org zone file OR use a CNAME (see below)
- NOTE: I don't believe this is right. Per bug 6644, using a CNAME for
- 3.4.1 to 3.4.0 - KAM: 2014-02-11
+ NOTE: Per bug 6644, using a CNAME for 3.4.1, 3.4.2, 4.0.0 to 3.3.2
- commit the changes, update the zone (if not doing above on the zone -
NOTE: See /var/named/README) and tick the zone file using build/mkupdates/tick_zone_serial
@@ -388,7 +409,7 @@ SPAMASSASSIN RELEASE PROCEDURE
./update-rules-3.3 3.4
NOTE: Is this needed with our rule update process? not convinced it
- is...
+ is... 2015-04-28
- publish the tarballs
@@ -461,7 +482,8 @@ SPAMASSASSIN RELEASE PROCEDURE
WARNING: if you're moving to a new major release, x.y.0, you need to edit
'build/update_website_docs' beforehand and set the "vers" line. And if
- you are running on a server other than buildbot, the PERL and WEBDIR
+ you are running on a server other than buildbot (NOTE: this works on the
+ spamassassin-vm.apache.org box), the PERL and WEBDIR
vars may need tweaking:
cd /var/www/buildbot.spamassassin.org/staging/website
@@ -469,7 +491,10 @@ SPAMASSASSIN RELEASE PROCEDURE
svn delete --force full/3.4.x
svn commit -m "removing old doc tree from website" full
- cd [checkedoutdir]
+ #Checkout the current release
+ cd /tmp
+ svn checkout http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_4_1/ release
+ cd /tmp/release
build/update_website_docs
cd /var/www/buildbot.spamassassin.org/staging/website
@@ -487,7 +512,7 @@ SPAMASSASSIN RELEASE PROCEDURE
repo=https://svn.apache.org/repos/asf/spamassassin
svn delete -m "updating for new release" $repo/tags/spamassassin_current_release_3.4.x
- svn copy -m "updating for new release" $repo/tags/spamassassin_release_3_4_0 $repo/tags/spamassassin_current_release_3.4.x
+ svn copy -m "updating for new release" $repo/tags/spamassassin_release_3_4_1 $repo/tags/spamassassin_current_release_3.4.x
- upload release .tar.gz (not .bz2) tarball to CPAN at http://pause.cpan.org/:
@@ -553,7 +578,8 @@ SPAMASSASSIN RELEASE PROCEDURE
- Reviewed the Project Branding Report Checklist
-- Issues not resolved with the release of 3.4.0 2014-02-11
+- Issues not resolved with the release of 3.4.0 2014-02-11 and still not
+ resolved with the release of 3.4.1 2015-04-28
- We updated to 3.4.0 and 3.4.1 is the current trunk version. Need to
confirm what needs to change on the updatesd scripts to make this