summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-11-04 10:34:10 +0100
committerRichard Levitte <levitte@openssl.org>2019-11-05 22:44:21 +0100
commit8635730333af792fae75394bb593afe4054da238 (patch)
tree9b875da88c056775ab301e56cc19d45d99fde40e
parente4f2d539f631060654faf3b45f54e222637109ac (diff)
util/mknum.pl: Call OpenSSL::Ordinals::renumber() for real releases
When the source isn't in development any more (the version number doesn't the tags 'dev' or 'alpha'), we renumber the unassigned symbols to ensure that we have fixed numbers on all. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/10348)
-rw-r--r--util/mknum.pl7
1 files changed, 7 insertions, 0 deletions
diff --git a/util/mknum.pl b/util/mknum.pl
index 1fa1b958dc..bf73797c3f 100644
--- a/util/mknum.pl
+++ b/util/mknum.pl
@@ -88,6 +88,13 @@ 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. When in beta or final release,
+# all symbols MUST have an assigned number.
+if ($version !~ m/^\d+\.\d+\.\d+(?:[a-z]+)?-(?:dev|alpha)/) {
+ $ordinals->renumber();
+}
+
if ($checkexist) {
my %new_names = map { $_->name() => 1 }
$ordinals->items(comparator => sub { $_[0] cmp $_[1] },