From: Richard Levitte <levitte@openssl.org>
Date: Mon, 4 Nov 2019 09:34:10 +0000 (+0100)
Subject: util/mknum.pl: Call OpenSSL::Ordinals::renumber() for real releases
X-Git-Tag: openssl-3.0.0-alpha1~1014
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8635730333af792fae75394bb593afe4054da238;p=oweals%2Fopenssl.git

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)
---

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] },