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

diff --git a/CHANGES b/CHANGES
index 9a5a544dfe0b3730dc8e458d339377155fc3aac6..7ee5e41fa76aeef154e5449a46f4a4a76a6658dc 100644 (file)
--- 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 b2b848dda34253da23ceeb7fd4c3c6a8b7d433ea..afdd51a8c36cb5c48a817cb9f8d555199d837749 100644 (file)
--- 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: $!";