From: Matt Caswell <matt@openssl.org>
Date: Wed, 29 Dec 2021 14:44:00 +0000 (+0000)
Subject: Fix the symbol_presence test with a shlib_variant
X-Git-Tag: openssl-3.2.0-alpha1~3161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=805bdac5f37bb820658f70269941086bef6c085b;p=thirdparty%2Fopenssl.git

Fix the symbol_presence test with a shlib_variant

If a shlib_variant is used then the dynamic version information for
symbols will be different from what the symbol presence test was
expecting. We just make it more liberal about what it accepts as dynamic
version information.

Fixes #17366

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17372)
---

diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
index efe0760c252..5530ade0add 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -76,7 +76,7 @@ foreach my $libname (@libnames) {
                 # Drop the first space and everything following it
                 s| .*||;
                 # Drop OpenSSL dynamic version information if there is any
-                s|\@\@OPENSSL_[0-9._]+[a-z]?$||;
+                s|\@\@.+$||;
                 # Return the result
                 $_
             }