9.4.0b3

5 files changed, 250 insertions, 2 deletions

diff --git a/win32utils/BINDBuild.dsw b/win32utils/BINDBuild.dsw
index 98b473c6..4b3fcf43 100644
--- a/win32utils/BINDBuild.dsw
+++ b/win32utils/BINDBuild.dsw
@@ -44,6 +44,24 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libbind9

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name liblwres

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name dighost

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "dighost"="..\bin\dig\win32\dighost.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

 }}}

 

 ###############################################################################

@@ -65,6 +83,12 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libbind9

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name liblwres

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name dighost

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -83,6 +107,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libisc

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name dnssectool

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -224,6 +251,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libdns

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name checktool

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -242,6 +272,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libisc

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name checktool

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -263,6 +296,12 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libbind9

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name liblwres

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name dighost

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -308,6 +347,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libbind9

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name rndcutil

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -320,6 +362,9 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name rndcutil

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -338,6 +383,45 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libisc

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name dnssectool

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "dnssectool"="..\bin\dnssec\win32\dnssectool.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "rndcutil"="..\bin\rndc\win32\rndcutil.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "checktool"="..\bin\check\win32\checktool.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

 }}}

 

 ###############################################################################

diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat
index 88571c58..024d8fc1 100644
--- a/win32utils/BuildAll.bat
+++ b/win32utils/BuildAll.bat
@@ -30,6 +30,10 @@ rem a future release of BIND 9 for Windows NT/2000/XP.
 

 echo Setting up the BIND files required for the build

 

+rem Get and update for the latest build of the openssl library

+perl updateopenssl.pl

+

+rem Setup the files

 call BuildSetup.bat

 

 echo Build all of the Library files

diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index b7f6790f..0c4c51b7 100644
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -32,7 +32,7 @@ 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 or libdns

+echo the directory tree and is named openssl-0.9.8d or libdns

 echo will not build. 

 

 rem Make sure that the Build directories are there.

@@ -43,7 +43,9 @@ 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

@@ -51,7 +53,7 @@ copy ..\FAQ ..\Build\Release
 

 echo Copying the OpenSSL DLL.

 

-copy ..\..\openssl-0.9.6k\out32dll\libeay32.dll ..\Build\Release\

+copy ..\..\openssl-0.9.8d\out32dll\libeay32.dll ..\Build\Release\

 

 

 rem Done

diff --git a/win32utils/index.html b/win32utils/index.html
new file mode 100644
index 00000000..12ad0b23
--- /dev/null
+++ b/win32utils/index.html
@@ -0,0 +1,52 @@
+<!--
+ - Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+ -
+ - Permission to use, copy, modify, and distribute this software for any
+ - purpose with or without fee is hereby granted, provided that the above
+ - copyright notice and this permission notice appear in all copies.
+ -
+ - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ - AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ - PERFORMANCE OF THIS SOFTWARE.
+-->
+
+<!-- $Id: index.html,v 1.1.6.3 2006/10/02 07:14:36 marka Exp $ -->
+
+<html>
+<head>
+<title>Bind9 docs index</title>
+</head>
+<body>
+<big><b>Bind 9.x documents</b></big>
+<ul>
+    <li><a href="readme1st.txt">readme1st.txt</a> |
+    <a href="README">README</a>
+    <li><a href="FAQ">FAQ</a> |
+    <a href="CHANGES">CHANGES</a> |
+    <a href="COPYRIGHT">COPYRIGHT</a>
+    <li>Migration: <a href="migration">v8 to v9</a> |
+    <a href="migration-4to9">v4 to v9</a>
+    <li><a href="named.html">named</a> |
+    <a href="Bv9ARM.html"><b>BIND 9 Administrator Reference Manual</b></a> (ARM) |
+    <a href="Bv9ARM.pdf">ARM</a> (PDF version)
+</ul>
+<b>BIND tools:</b>
+<ul>
+    <li><a href="dig.html">dig</a><br>
+    <li><a href="dnssec-keygen.html">dnssec-keygen</a> | <a href="dnssec-signzone.html">dnssec-signzone</a>
+    <li><a href="host.html">host</a>
+    <li>
+    <a href="named-checkconf.html">named-checkconf</a> |
+    <a href="named-checkzone.html">named-checkzone</a>
+    <li><a href="nslookup.html">nslookup</a>
+    <li><a href="nsupdate.html">nsupdate</a>
+    <li><a href="rndc.html">rndc</a> |
+    <a href="rndc.conf.html">rndc.conf</a> |
+    <a href="rndc-confgen.html">rndc-confgen</a>
+</ul>
+</body>
+</html>
diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl
new file mode 100644
index 00000000..f22c80ba
--- /dev/null
+++ b/win32utils/updateopenssl.pl
@@ -0,0 +1,106 @@
+#!/usr/bin/perl
+#
+# Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+# $Id: updateopenssl.pl,v 1.3.12.3 2006/10/11 03:49:20 marka Exp $
+
+# updateopenssl.pl
+# This script locates the latest version of OpenSSL in the grandparent
+# directory and updates the build scripts to use that version.
+#
+# Path and directory
+$path = "..\\..\\";
+
+# List of files that need to be updated with the actual version of the
+# openssl directory
+@filelist = ("BuildSetup.bat",
+             "../lib/dns/win32/libdns.mak",
+             "../lib/dns/win32/libdns.dsp");
+
+# Locate the openssl directory
+$substr = getdirectory();
+if ($substr eq 0) {
+     print "No directory found\n";
+}
+else {
+     print "Found $substr directory\n";
+}
+#Update the list of files
+if ($substr ne 0) {
+   $ind = 0;
+   foreach $file (@filelist) {
+        print "Updating file $file\n";
+	updatefile($file, $substr);
+	$ind++;
+   }
+}
+
+# Function to find the
+sub getdirectory {
+    my(@namelist);
+    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));
+    closedir(DIR);
+
+    # Make sure we have something
+    if (scalar(@namelist) == 0) {
+        return (0);
+    }
+    # Now see if we have a directory or just a file.
+    # Make sure we are case insensitive
+    foreach $file (sort {uc($a) cmp uc($b)} @namelist) {
+        if (-d $path.$file) {
+           $name = $file;
+        }
+    }
+
+    # If we have one use it otherwise report the error
+    # Note that we are only interested in the last one
+    # since the sort should have taken care of getting
+    # the latest
+    if (defined($name)) {
+        return ($name);
+    }
+    else {
+        return (0);
+    }
+}
+
+# function to replace the openssl directory name with the latest one
+sub updatefile {
+        my($filename, $substr, $line);
+        my(@Lines);
+
+        $filename = $_[0];
+        $substr   = $_[1];
+
+        open (RFILE, $filename) || die "Can't open file $filename: $!";
+        @Lines = <RFILE>;
+        close (RFILE);
+
+        # Replace the string
+        foreach $line (@Lines) {
+                $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: $!";
+        foreach $line (@Lines) {
+               print RFILE $line;
+        }
+        close(RFILE);
+}
+