diff options
| author | Matt Caswell <matt@openssl.org> | 2021-06-24 16:07:03 +0100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-06-29 09:51:30 +1000 |
| commit | 6ee4741281f032e13423a1e05c4fb9a90454e748 (patch) | |
| tree | 48c40c37f2b8a89d63e5fb12456d181ec1852cdf /util | |
| parent | 52f5407dc1ed67d0baace3c39b69bc9f07f4454a (diff) | |
Ensure ordinals are created during release process
We introduce a new makefile target "make release-update" that forces
ordinal file renumbering, and also does the fips checksum updates. We
then call that from the release script.
Fixes #15806
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15901)
Diffstat (limited to 'util')
| -rw-r--r-- | util/mknum.pl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/util/mknum.pl b/util/mknum.pl index 284fe891ef..8c978dfe2d 100644 --- a/util/mknum.pl +++ b/util/mknum.pl @@ -22,6 +22,7 @@ my $symhacks_file = undef; # a symbol hacking file (optional) my $version = undef; # the version to use for added symbols my $checkexist = 0; # (unsure yet) my $warnings = 1; +my $renumber = 0; my $verbose = 0; my $debug = 0; @@ -29,6 +30,7 @@ GetOptions('ordinals=s' => \$ordinals_file, 'symhacks=s' => \$symhacks_file, 'version=s' => \$version, 'exist' => \$checkexist, + 'renumber' => \$renumber, 'warnings!' => \$warnings, 'verbose' => \$verbose, 'debug' => \$debug) @@ -88,12 +90,7 @@ foreach my $f (($symhacks_file // (), @ARGV)) { close IN; } -# As long as we're running in development or alpha releases, we can have -# symbols without specific numbers assigned. In beta or final release, all -# symbols MUST have an assigned number. -if ($version !~ m/^\d+\.\d+\.\d+(?:-alpha|(?:-.*?)?-dev$)/) { - $ordinals->renumber(); -} +$ordinals->renumber() if $renumber; if ($checkexist) { my %new_names = map { $_->name() => 1 } |