From: Richard Levitte <levitte@openssl.org>
Date: Wed, 2 Jun 2021 04:20:05 +0000 (+0200)
Subject: util/mknum.pl: Really allow unset ordinals in development
X-Git-Tag: openssl-3.0.0-beta1~223
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbba082fc071de82ffb53844586cdcc26251e32b;p=thirdparty%2Fopenssl.git

util/mknum.pl: Really allow unset ordinals in development

Any pre-release tag that includes '-dev' is development.  The ordinals
don't need to be finalized before '-dev' is removed (i.e. a release is
made).

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15578)
---

diff --git a/util/mknum.pl b/util/mknum.pl
index 92435a87122..284fe891ef4 100644
--- a/util/mknum.pl
+++ b/util/mknum.pl
@@ -89,9 +89,9 @@ foreach my $f (($symhacks_file // (), @ARGV)) {
 }
 
 # 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)/) {
+# 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();
 }