From: Mark Andrews <marka@isc.org>
Date: Tue, 18 May 2010 06:11:58 +0000 (+0000)
Subject: 2899.   [port]          win32: Support linking against OpenSSL 1.0.0
X-Git-Tag: v9.7.1b1^3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaf0bd1fd7e9dc461495ac4dd41a88dc34bd4460;p=thirdparty%2Fbind9.git

2899.   [port]          win32: Support linking against OpenSSL 1.0.0
---

diff --git a/CHANGES b/CHANGES
index 9a5a544dfe0..7ee5e41fa76 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 
 	--- 9.7.1b1 released ---
 
+2899.	[port]		win32: Support linking against OpenSSL 1.0.0.
+
 2898.	[bug]		nslookup leaked memory when -domain=value was 
 			specified. [RT #21301]
 
diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl
index b2b848dda34..afdd51a8c36 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.11 2009/12/04 21:59:24 marka Exp $
+# $Id: updateopenssl.pl,v 1.11.4.1 2010/05/18 06:11:58 marka Exp $
 
 # updateopenssl.pl
 # This script locates the latest version of OpenSSL in the grandparent
@@ -53,7 +53,7 @@ sub getdirectory {
     my($file, $name);
     my($cnt);
     opendir(DIR,$path) || die "No Directory: $!";
-    @namelist = grep (/^openssl-[0-9]+\.[0-9]+\.[0-9]+[a-z]$/i, readdir(DIR));
+    @namelist = grep (/^openssl-[0-9]+\.[0-9]+\.[0-9]+[a-z]{0,1}$/i, readdir(DIR));
     closedir(DIR);
 
     # Make sure we have something
@@ -94,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]{0,1}/$substr/gi;
         }
         #update the file
         open (RFILE, ">$filename") || die "Can't open file $filename: $!";