From: Mark Andrews <marka@isc.org>
Date: Wed, 11 Oct 2006 03:51:45 +0000 (+0000)
Subject: be consistant when identifing/changing openssl versions
X-Git-Tag: v9.3.2-P2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb5e77b3c7e871eea2e39e9195390b147196e758;p=thirdparty%2Fbind9.git

be consistant when identifing/changing openssl versions
---

diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl
index 65d73a236dd..3799527b745 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.4.4.2 2006/10/11 03:51:45 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: $!";