be consistant when identifing/changeing openssl versions

diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index 4d65a820f78870ae3ac179deb7a086982c42dac8..5e49919950d99f211c07ea452eb403a0c0c7887c 100644 (file)
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -1,59 +1,59 @@
-echo off\r
-rem\r
-rem Copyright (C) 2004,2005  Internet Systems Consortium, Inc. ("ISC")\r
-rem Copyright (C) 2001-2003  Internet Software Consortium.\r
-rem\r
-rem Permission to use, copy, modify, and distribute this software for any\r
-rem purpose with or without fee is hereby granted, provided that the above\r
-rem copyright notice and this permission notice appear in all copies.\r
-rem\r
-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH\r
-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\r
-rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,\r
-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\r
-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE\r
-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\r
-rem PERFORMANCE OF THIS SOFTWARE.\r
-\r
-rem BuildSetup.bat\r
-rem This script sets up the files necessary ready to build BIND 9.\r
-rem This requires perl to be installed on the system.\r
-\r
-rem Set up the configuration file\r
-cd ..\r
-copy config.h.win32 config.h\r
-cd win32utils\r
-\r
-rem Generate the version information\r
-perl makeversion.pl\r
-\r
-rem Generate header files for lib/dns\r
-\r
-call dnsheadergen.bat\r
-\r
-echo Ensure that the OpenSSL sources are at the same level in\r
-echo the directory tree and is named openssl-0.9.8c or libdns\r
-echo will not build. \r
-\r
-rem Make sure that the Build directories are there.\r
-\r
-if NOT Exist ..\Build mkdir ..\Build\r
-if NOT Exist ..\Build\Release mkdir ..\Build\Release\r
-\r
-echo Copying the ARM and the Installation Notes.\r
- \r
-copy ..\COPYRIGHT ..\Build\Release\r
-copy ..\README ..\Build\Release\r
-copy readme1st.txt ..\Build\Release\r
-copy index.html ..\Build\Release\r
-copy ..\doc\arm\*.html ..\Build\Release\r
-copy ..\doc\arm\Bv9ARM.pdf ..\Build\Release\r
-copy ..\CHANGES ..\Build\Release\r
-copy ..\FAQ ..\Build\Release\r
-\r
-echo Copying the OpenSSL DLL.\r
-\r
-copy ..\..\openssl-0.9.8c\out32dll\libeay32.dll ..\Build\Release\\r
-\r
-\r
-rem Done\r
+echo off
+rem
+rem Copyright (C) 2004,2005  Internet Systems Consortium, Inc. ("ISC")
+rem Copyright (C) 2001-2003  Internet Software Consortium.
+rem
+rem Permission to use, copy, modify, and distribute this software for any
+rem purpose with or without fee is hereby granted, provided that the above
+rem copyright notice and this permission notice appear in all copies.
+rem
+rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+rem PERFORMANCE OF THIS SOFTWARE.
+
+rem BuildSetup.bat
+rem This script sets up the files necessary ready to build BIND 9.
+rem This requires perl to be installed on the system.
+
+rem Set up the configuration file
+cd ..
+copy config.h.win32 config.h
+cd win32utils
+
+rem Generate the version information
+perl makeversion.pl
+
+rem Generate header files for lib/dns
+
+call dnsheadergen.bat
+
+echo Ensure that the OpenSSL sources are at the same level in
+echo the directory tree and is named openssl-0.9.6k-x or libdns
+echo will not build. 
+
+rem Make sure that the Build directories are there.
+
+if NOT Exist ..\Build mkdir ..\Build
+if NOT Exist ..\Build\Release mkdir ..\Build\Release
+
+echo Copying the ARM and the Installation Notes.
+ 
+copy ..\COPYRIGHT ..\Build\Release
+copy ..\README ..\Build\Release
+copy readme1st.txt ..\Build\Release
+copy index.html ..\Build\Release
+copy ..\doc\arm\*.html ..\Build\Release
+copy ..\doc\arm\Bv9ARM.pdf ..\Build\Release
+copy ..\CHANGES ..\Build\Release
+copy ..\FAQ ..\Build\Release
+
+echo Copying the OpenSSL DLL.
+
+copy ..\..\openssl-0.9.6k-x\out32dll\libeay32.dll ..\Build\Release\
+
+
+rem Done

diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl
index b9798349e8833b7cf63309205e7610bdc659d14e..cdfd0117cbca21b80b985179c346c9410479996a 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.3.8.2 2006/09/28 00:03:08 marka Exp $
+# $Id: updateopenssl.pl,v 1.3.8.3 2006/10/11 03:38:25 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: $!";