From 8e9557e8017c5d9fcf32b4d01f1674caf4f9d0ee Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 11 Oct 2006 03:54:19 +0000 Subject: [PATCH] be consistant when identifing/changing openssl versions --- win32utils/updateopenssl.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl index 65d73a236d..819d674526 100644 --- a/win32utils/updateopenssl.pl +++ b/win32utils/updateopenssl.pl @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: updateopenssl.pl,v 1.4 2006/09/28 00:03:11 marka Exp $ +# $Id: updateopenssl.pl,v 1.5 2006/10/11 03:54:19 marka Exp $ # updateopenssl.pl # This script locates the latest version of OpenSSL in the grandparent @@ -22,7 +22,6 @@ # # Path and directory $path = "..\\..\\"; -$SSLDirprefix = "openssl-*"; # List of files that need to be updated with the actual version of the # openssl directory @@ -54,7 +53,7 @@ sub getdirectory { my($file, $name); my($cnt); opendir(DIR,$path) || die "No Directory: $!"; - @namelist = grep (/^$SSLDirprefix/i, readdir(DIR)); + @namelist = grep (/^openssl-[0-9]+\.[0-9]+\.[0-9]+[a-z]$/i, readdir(DIR)); closedir(DIR); # Make sure we have something @@ -95,7 +94,7 @@ sub updatefile { # Replace the string foreach $line (@Lines) { - $line =~ s/openssl\-[0-9]+\.[0-9]+\.[0-9]+[a-z]/$substr/gi; + $line =~ s/openssl-[0-9]+\.[0-9]+\.[0-9]+[a-z]/$substr/gi; } #update the file open (RFILE, ">$filename") || die "Can't open file $filename: $!";