[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  56afc18714664e8fb395a2e143e48be3ab146d43 (commit)
      from  bdcadca24e65ac3cd59a75bf748b22c46ec98fdc (commit)


- Log -----------------------------------------------------------------
commit 56afc18714664e8fb395a2e143e48be3ab146d43
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 14 20:22:36 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/mkdef.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 0ad1a2d..a2cc126 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);
 		}