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 2018/09/16 16:06:45 UTC
svn commit: r1841023 - in /spamassassin/trunk/build: README
announcements/3.4.2.txt update_website_docs
Author: kmcgrail
Date: Sun Sep 16 16:06:45 2018
New Revision: 1841023
URL: http://svn.apache.org/viewvc?rev=1841023&view=rev
Log:
Syncing build process changes and the final 3.4.2 announcement
Modified:
spamassassin/trunk/build/README
spamassassin/trunk/build/announcements/3.4.2.txt
spamassassin/trunk/build/update_website_docs
Modified: spamassassin/trunk/build/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/README?rev=1841023&r1=1841022&r2=1841023&view=diff
==============================================================================
--- spamassassin/trunk/build/README (original)
+++ spamassassin/trunk/build/README Sun Sep 16 16:06:45 2018
@@ -136,7 +136,7 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
There are two options here:
- - For releases on a maintainance branch (e.g. 3.0.1, .2, etc.):
+ - For releases on a maintenance branch (e.g. 3.0.1, .2, etc.):
TZ=UTC svn log --non-interactive --stop-on-copy > Changes
@@ -247,7 +247,7 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
- SVN tag the release files. This is done using "svn copy".
- - For a maintainance release (x.y.1, x.y.2):
+ - For a maintenance release (x.y.1, x.y.2):
vers=3_4_2
@@ -255,11 +255,10 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
repo=https://svn.apache.org/repos/asf/spamassassin
svn delete -m "replaced old tag" $repo/tags/spamassassin_release_$vers
- svn copy -m "creating tag for release $vers" \
- $repo/branches/3.4 $repo/tags/spamassassin_release_$vers
+ svn copy -m "creating tag for release $vers" $repo/branches/3.4 $repo/tags/spamassassin_release_$vers
- - For a maintainance release candidate(x.y.1-rc1), pre-release (x.y.1-preZ) or alpha (x.y.1-alphaZ):
+ - For a maintenance release candidate(x.y.1-rc1), pre-release (x.y.1-preZ) or alpha (x.y.1-alphaZ):
vers=3_4_2_rc_1
@@ -327,14 +326,17 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
NOTE: running gpg-agent with the proper homedir is needed for
non-privileged users.
-- run "./build/repackage_latest_update_rules" package a rule file for
- people who can't run sa-update:
-
- ./build/repackage_latest_update_rules
-
- WARNING: this will use the most recently-created "sa-update" tarball for
- the rules tgz, so if changes have been committed to the "rules" dir in
- SVN since then, they will not be released!
+# This step is part of the step above already
+#
+#- run "./build/repackage_latest_update_rules" package a rule file for
+# people who can't run sa-update:
+#
+# ./build/repackage_latest_update_rules
+#
+# WARNING: this will use the most recently-created "sa-update" tarball for
+# the rules tgz, so if changes have been committed to the "rules" dir in
+# SVN since then, they will not be released!
+#
- test the files! redo until they work!! ;)
@@ -373,6 +375,11 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
Pre-releases and RCs require just lazy consensus -- ie. no objections.
+ NOTE: It's also feasible that you could publish via SVNPubSub as noted
+ below but using the SVN repository at:
+
+ https://dist.apache.org/repos/dist/dev/SpamAssassin
+
- (for a pre or rc release), - upload .tar.gz (not .bz2) tarball to CPAN
at http://pause.cpan.org/:
@@ -387,8 +394,6 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
Mail-SpamAssassin-3.4.1-rc2-TRIAL.tar.gz
-**** TESTED TO HERE
-
- (for a full release) 3 +1's votes from PMC members are required to
proceed with an official, non pre-release ASF software release.
@@ -429,13 +434,14 @@ APACHE 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).
+#- In build/mkupdates/run_part2 change versions="X.Y.Z" to the new
+# development version (A.B.C).
+- DNS Steps TBD - Talk to sysadmins@spamassassin.apache.org
-- [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:
+#- [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:
# - Create an empty file for the new version number in
# /var/named/updates.dev.spamassassin.org.d/ on the zone and chown to
@@ -444,13 +450,13 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
# 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
- /var/named/spamassassin.org zone file OR use a CNAME (see below)
-
- NOTE: Per bug 6644, using a CNAME for 3.4.1, 3.4.2, 4.0.0 to 3.3.2
+# - Add "$INCLUDE /var/named/updates.spamassassin.org.d/X.Y+1.0" to the
+# /var/named/spamassassin.org zone file OR use a CNAME (see below)
+#
+# 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
+# - 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
- !WARNING! After the next step, the version number will be considered
"burned". The number is locked for this particular code. The same
@@ -465,17 +471,17 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
svn commit -m "oops, had to redo: THIS IS THE REAL X.Y.Z RELEASE"
-- Release a new rules update matching the released code:
- #2014-02-11 switched to su - instead of sudo because of .ssh and .svn
- stored config items
-
- ssh spamassassin.zones.apache.org
- su - updatesd
- cd /home/updatesd/svn/spamassassin/build/mkupdates
- ./update-rules-3.3 3.4
-
- NOTE: Is this needed with our rule update process? not convinced it
- is... 2015-04-28
+#- Release a new rules update matching the released code:
+# #2014-02-11 switched to su - instead of sudo because of .ssh and .svn
+# stored config items
+#
+# ssh spamassassin.zones.apache.org
+# su - updatesd
+# cd /home/updatesd/svn/spamassassin/build/mkupdates
+# ./update-rules-3.3 3.4
+#
+# NOTE: Is this needed with our rule update process? not convinced it
+# is... 2015-04-28
- publish the tarballs
@@ -497,7 +503,7 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
For full release builds, you need to publish using SVNPubSub.
This is a simple matter of committing the new artifacts and signature
- files to https://dist.apache.org/repos/dist/spamassassin once a
+ files to https://dist.apache.org/repos/dist/release/spamassassin/ once a
release vote passes.
[note: Symlinks may not work on all mirrors even though there may be
@@ -522,34 +528,35 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
run, so the old downloads page will stick around for a while before it's
safe to do so.)
-- (for full release builds) update the main website "downloads" page in
- svn:
+- (for full release builds) update the main website "downloads.html" and
+ all the links to downloads.cgi on all the pages in svn:
https://svn.apache.org/repos/asf/spamassassin/site
- 2018-09-01: Not sure what this warning means:
-
When changing the timestamp in the downloads.cgi link URL, ensure you
use a time 2 hours from now. The ASF websites are synced internally to
the public HTTP servers on a bi-hourly basis, so it may take up to this
long for a file-download link to become valid and not a 404.
+- Update the "news.html" and the announcement on the home page.
+
+- Log on to: https://reporter.apache.org/addrelease.html?spamassassin
+ and add your release data (version and date) to the database.
+
- update the 'doc' tree in the SpamAssassin website
- 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 (NOTE: this works on the
- spamassassin-vm.apache.org box), the PERL and WEBDIR
- vars may need tweaking:
+ WARNING: edit 'build/update_website_docs' beforehand and set the "PERL"
+ "WEBDIR" and "vers" lines. On my build system, the website checkout is
+ in ~/asf/spamassassin/site and perl is in the path so nothing special is
+ needed.
- cd /var/www/buildbot.spamassassin.org/staging/website
+ cd ~/asf/spamassassin/site
svn up
svn delete --force full/3.4.x
- svn commit -m "removing old doc tree from website" full
#Checkout the current release
cd /tmp
- svn checkout http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_4_1/ release
+ svn checkout http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_4_2/ release
cd /tmp/release
build/update_website_docs
@@ -557,13 +564,6 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
svn add full/3.4.x
svn commit -m "updating new doc tree on website" full
-- and check the entire website into SVN (see bug 4998 for reasons why).
- Note that you may need to resolve conflicts and ensure the contents of
- 'full/3.4.x' are all added successfully:
-
- svn up
- svn commit -m "added new release to website"
-
- update the tag used to point to "current release":
repo=https://svn.apache.org/repos/asf/spamassassin
Modified: spamassassin/trunk/build/announcements/3.4.2.txt
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/announcements/3.4.2.txt?rev=1841023&r1=1841022&r2=1841023&view=diff
==============================================================================
--- spamassassin/trunk/build/announcements/3.4.2.txt (original)
+++ spamassassin/trunk/build/announcements/3.4.2.txt Sun Sep 16 16:06:45 2018
@@ -77,8 +77,8 @@ For security reasons SSLv3 support has b
The spamd(1) daemon now is faster to start, thanks to code optimizations.
-Four CVE security bugs are included in this release for PDFInfo.pm and the
-SA core:
+Four CVE security bug fixes are included in this release for PDFInfo.pm and
+the SA core:
CVE-2017-15705, CVE-2016-1238, CVE-2018-11780 & CVE-2018-11781
In sa-update script, optional support for SHA-256 / SHA-512 in addition
@@ -155,23 +155,23 @@ Downloading and availability
Downloads are available from:
-http://spamassassin.apache.org/downloads.cgi
+https://spamassassin.apache.org/downloads.cgi
sha256sum of archive files:
- f5562f0779be2b84d7f0fd55faf15338e65938eafbba94cfae2f09f134dedcea Mail-SpamAssassin-3.4.2-rc1.tar.bz2
- 7996c062bcb0d4160944fc25dde005fb4bc94a9e65597fda85e2c93b156c2220 Mail-SpamAssassin-3.4.2-rc1.tar.gz
- ac20095aa6f8922ba472b0a3b4eb51ef03515e8cffb82bc3f5c37b39d050d1bd Mail-SpamAssassin-3.4.2-rc1.zip
- 297fb75d61566e948e138a6c56efb6df36d22ae2da28a0f16508fa6ffae2a7e4 Mail-SpamAssassin-rules-3.4.2-rc1.r1840104.tgz
+ cf03045a4991752145eed007e75737f3e4c7f34cf225db411ce3fd359280e8da Mail-SpamAssassin-3.4.2.tar.bz2
+ 8a1c139ee08f140d3d3fdf13e03d98cf68a5cae27a082c4a614d154565a3c34f Mail-SpamAssassin-3.4.2.tar.gz
+ c76841929fa53cf0adeb924797195c66da207ab6739553fd62634f94f2dcd875 Mail-SpamAssassin-3.4.2.zip
+ 8d481a2081f1e62a2579238f66b58d2124f7a2e9f3cfa3d4aa2b03fe7b0199bb Mail-SpamAssassin-rules-3.4.2.r1840640.tgz
sha512sum of archive files:
- 156c3c91616d81e65f010b4bb6147b1b919586d12ea252b7b934a1f9755a7dd8c1ca9812a266d9987d01591dbc2ea5115f62dbde10650da91c68dd49cd8c6388 Mail-SpamAssassin-3.4.2-rc1.tar.bz2
- fc63cdd1261236d91edf7e2468fb18f5daefa2e2ead55fa052a6fa1b16b2085cc7ea6ca7569bd24f9c5adfcbd01de83eb0d7c105a54ab2a89181e120c998f0b3 Mail-SpamAssassin-3.4.2-rc1.tar.gz
- 8934a71a244ff9ca73843b6e015deb6dd1e8e053f8f9e08688675c6fba51c6e342e3cfe045a4541632ac8c22a60cac64f2c061eab33566d7b6ff5f409f8e3497 Mail-SpamAssassin-3.4.2-rc1.zip
- ecde74b54b69b9d2ca54fcf027d81e5b234e55ceef957818e464a1db842d5e08a31bae91958c13c1f3e71880971d98f86c6713a586476fd6a048d60abfeb60f8 Mail-SpamAssassin-rules-3.4.2-rc1.r1840104.tgz
+ fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885 Mail-SpamAssassin-3.4.2.tar.bz2
+ 85e3d78bb885ad1d0bf2066d1bc919d6ad5e9f86795069397e7c28cc1ba02870566ec014c08c81f68e7ed03b7f60d2de0b9730b3415b35d848abde2c8920a28f Mail-SpamAssassin-3.4.2.tar.gz
+ 9545c1cd55c31f23ba8f8421f78306657a068004a27cab8cd094eb9bc7c8d94cdb4803089318f2c0cefb9b817fa3f1cfb7cb817913027c0c93b5d639937ee05c Mail-SpamAssassin-3.4.2.zip
+ 38b5f4dc6e6776937e787123c265ecd9a0a2f60aca1b57d6ed4a8f78cf81550478eddd0829b1255e9e8ce64421e06cc13ae82f1a597e893b65f0d07ba8c53a7f Mail-SpamAssassin-rules-3.4.2.r1840640.tgz
-Note that the *-rules-*.tar.gz files are only necessary if you cannot,
+Note that the *-rules-*.tgz files are only necessary if you cannot,
or do not wish to, run "sa-update" after install to download the latest
fresh rules.
@@ -184,7 +184,7 @@ GPG Verification Procedure
The release files also have a .asc accompanying them. The file serves
as an external GPG signature for the given release file. The signing
key is available via the wwwkeys.pgp.net key server, as well as
-http://www.apache.org/dist/spamassassin/KEYS
+https://www.apache.org/dist/spamassassin/KEYS
The key information is:
@@ -207,7 +207,7 @@ Note that older versions of gnupg may no
above. Specifically, GnuPG v1.0.6, 1.0.7 & 1.2.6 failed while v1.4.11
worked flawlessly.
-See http://www.apache.org/info/verification.html for more information
+See https://www.apache.org/info/verification.html for more information
on verifying Apache releases.
@@ -234,7 +234,7 @@ POSIX platforms.
The server and the Perl library feels at home on Unix and Linux platforms
and reportedly also works on MS Windows systems under ActivePerl.
-For more information, visit http://spamassassin.apache.org/
+For more information, visit https://spamassassin.apache.org/
About The Apache Software Foundation
@@ -247,4 +247,4 @@ pragmatic Apache License enables individ
easily deploy Apache software; the Foundation's intellectual property
framework limits the legal exposure of its 2,500+ contributors.
-For more information, visit http://www.apache.org/
+For more information, visit https://www.apache.org/
Modified: spamassassin/trunk/build/update_website_docs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/update_website_docs?rev=1841023&r1=1841022&r2=1841023&view=diff
==============================================================================
--- spamassassin/trunk/build/update_website_docs (original)
+++ spamassassin/trunk/build/update_website_docs Sun Sep 16 16:06:45 2018
@@ -1,19 +1,10 @@
#!/bin/sh
-#IF RUNNING ON ZONES
-WEBDIR=/var/www/buildbot.spamassassin.org/staging/website
-#WEBDIR=/usr/src/Mail-SpamAssassin/site
+WEBDIR=~/asf/spamassassin/site
vers=3.4.x
-if [ -z "$PERL" ]; then
- if [ -x /home/jm/perl584/bin/perl ]; then
- PERL=/home/jm/perl584/bin/perl
- else
- #IF RUNNING ON ZONES
- PERL=perl
- #PERL=/usr/local/bin/perl
- fi
-fi
+PERL=/usr/bin/perl
+#PERL=/usr/local/bin/perl
fulldir=$WEBDIR/full/$vers
[ -d $fulldir ] || mkdir -p $fulldir