From cbba082fc071de82ffb53844586cdcc26251e32b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 2 Jun 2021 06:20:05 +0200 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/15578) --- util/mknum.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(); } -- 2.47.3