Latest update.

dev/release-aux/README.md

@@ -1,30 +1,30 @@
 Auxilliary files for dev/release.sh
 ===================================
 
--   release-state-fn.sh
+- release-state-fn.sh
 
-    This is the main version and state update logic...  you could say
-    that it's the innermost engine for the release mechanism.  It
-    tries to be agnostic of versioning schemes, and relies on
-    release-version-fn.sh to supply necessary functions that are
-    specific for versioning schemes.
-    
--   release-version-fn.sh
+  This is the main version and state update logic...  you could say
+  that it's the innermost engine for the release mechanism.  It
+  tries to be agnostic of versioning schemes, and relies on
+  release-version-fn.sh to supply necessary functions that are
+  specific for versioning schemes.
 
-    Supplies functions that are specific to versioning schemes:
-    
-    get_version() gets the version data from appropriate files.
+- release-version-fn.sh
 
-    set_version() writes the version data to appropriate files.
+  Supplies functions that are specific to versioning schemes:
 
-    fixup_version() updates the version data, given a first argument
-    that instructs it what update to do.
-    
--   openssl-announce-pre-release.tmpl and openssl-announce-release.tmpl
+  get_version() gets the version data from appropriate files.
 
-    Templates for announcements
-    
--   fixup-*-release.pl and fixup-*-postrelease.pl
+  set_version() writes the version data to appropriate files.
 
-    Fixup scripts for specific files, to be done for the release
-    commit and for the post-release commit.
+  fixup_version() updates the version data, given a first argument
+  that instructs it what update to do.
+
+- openssl-announce-pre-release.tmpl and openssl-announce-release.tmpl
+
+  Templates for announcements
+
+- fixup-*-release.pl and fixup-*-postrelease.pl
+
+  Fixup scripts for specific files, to be done for the release
+  commit and for the post-release commit.

dev/release-aux/fixup-CHANGES.md-postrelease.pl

@@ -18,11 +18,11 @@ if (/^### Changes between (\S+) and (\S+) \[xx XXX xxxx\]/
     # If this is a pre-release, we do nothing
     if ($RELEASE !~ /^\d+\.\d+\.\d+-(?:alpha|beta)/) {
         $_ = <<_____
-### Changes between $v2 and $RELEASE_TEXT [xx XXX xxxx] ###
+### Changes between $v2 and $RELEASE_TEXT [xx XXX xxxx]
 
  * 
 
-### Changes between $v1 and $v2 [$PREV_RELEASE_DATE] ###
+### Changes between $v1 and $v2 [$PREV_RELEASE_DATE]
 _____
     }
 }

dev/release-aux/fixup-NEWS.md-postrelease.pl

@@ -18,11 +18,11 @@ if (/^### Major changes between OpenSSL (\S+) and OpenSSL (\S+) \[under developm
     # If this is a pre-release, we do nothing
     if ($RELEASE !~ /^\d+\.\d+\.\d+-(?:alpha|beta)/) {
         $_ = <<_____
-### Major changes between OpenSSL $v2 and OpenSSL $RELEASE_TEXT [under development] ###
+### Major changes between OpenSSL $v2 and OpenSSL $RELEASE_TEXT [under development]
 
  * 
 
-### Major changes between OpenSSL $v1 and OpenSSL $v2 [$PREV_RELEASE_DATE] ###
+### Major changes between OpenSSL $v1 and OpenSSL $v2 [$PREV_RELEASE_DATE]
 _____
     }
 }

dev/release.sh

@@ -24,6 +24,7 @@ Usage: release.sh [ options ... ]
                 where '{major}' and '{minor}' are the major and minor
                 version numbers.
 
+--reviewer=<id> The reviewer of the commits.
 --local-user=<keyid>
                 For the purpose of signing tags and tar files, use this
                 key (default: use the default e-mail address’ key).
@@ -65,6 +66,7 @@ do_manual=false
 
 tagkey=' -s'
 gpgkey=
+reviewers=
 
 upload_address=upload@dev.openssl.org
 
@@ -73,6 +75,7 @@ TEMP=$(getopt -l 'alpha,next-beta,beta,final' \
               -l 'no-upload,no-update' \
               -l 'verbose,debug' \
               -l 'local-user:' \
+              -l 'reviewer:' \
               -l 'force' \
               -l 'help,manual' \
               -n release.sh -- - "$@")
@@ -122,6 +125,11 @@ while true; do
         gpgkey=" -u $1"
         shift
         ;;
+    --reviewer )
+        reviewers="$reviewers $1=$2"
+        shift
+        shift
+        ;;
     --force )
         force=true
         shift
@@ -311,6 +319,9 @@ if [ -n "$(git status --porcelain)" ]; then
     $VERBOSE "== Committing updates"
     git add -u
     git commit $git_quiet -m 'make update'
+    if [ -n "$reviewers" ]; then
+        addrev --nopr $reviewers
+    fi
 fi
 
 # Write the version information we updated
@@ -339,6 +350,9 @@ done
 $VERBOSE "== Comitting updates and tagging"
 git add -u
 git commit $git_quiet -m "Prepare for release of $release_text"
+if [ -n "$reviewers" ]; then
+    addrev --nopr $reviewers
+fi
 echo "Tagging release with tag $tag.  You may need to enter a pass phrase"
 git tag$tagkey "$tag" -m "OpenSSL $release release tag"
 
@@ -436,6 +450,9 @@ done
 $VERBOSE "== Comitting updates"
 git add -u
 git commit $git_quiet -m "Prepare for $release_text"
+if [ -n "$reviewers" ]; then
+    addrev --nopr $reviewers
+fi
 
 if $do_branch; then
     $VERBOSE "== Going back to the main branch $current_branch"
@@ -460,6 +477,9 @@ if $do_branch; then
     $VERBOSE "== Comitting updates"
     git add -u
     git commit $git_quiet -m "Prepare for $release_text"
+    if [ -n "$reviewers" ]; then
+        addrev --nopr $reviewers
+    fi
 fi
 
 # Done ###############################################################
@@ -543,6 +563,7 @@ B<--beta> |
 B<--final> |
 B<--branch> |
 B<--local-user>=I<keyid> |
+B<--reviewer>=I<id> |
 B<--no-upload> |
 B<--no-update> |
 B<--verbose> |
@@ -619,6 +640,14 @@ Use I<keyid> as the local user for C<git tag> and for signing with C<gpg>.
 
 If not given, then the default e-mail address' key is used.
 
+=item B<--reviewer>=I<id>
+
+Add I<id> to the set of reviewers for the commits performed by this script.
+Multiple reviewers are allowed.
+
+If no reviewer is given, you will have to run C<addrev> manually, which
+means retagging a release commit manually as well.
+
 =item B<--force>
 
 Force execution.  Precisely, the check that the current branch is C<master>