From: Richard Levitte <levitte@openssl.org>
Date: Thu, 14 Jan 2016 19:22:36 +0000 (+0100)
Subject: Avoid the r modifier for s/// (perl)
X-Git-Tag: OpenSSL_1_1_0-pre3~526
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=56afc18714664e8fb395a2e143e48be3ab146d43;p=oweals%2Fopenssl.git

Avoid the r modifier for s/// (perl)

It seems that the r modifier for s/// is fairly new.  It's reported
not to exist in perl 5.10.1, so it's better to avoid it when
possible.

Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 0ad1a2d3e3..a2cc12619b 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1572,7 +1572,7 @@ sub get_openssl_version()
 	while(<IN>) {
 		if (/OPENSSL_VERSION_TEXT\s+"OpenSSL (\d\.\d\.)(\d[a-z]*)(-| )/) {
 			my $suffix = $2;
-			my $baseversion = $1 =~ s/\./_/gr;
+			(my $baseversion = $1) =~ s/\./_/g;
 			close IN;
 			return ($baseversion."0", $baseversion.$suffix);
 		}