9.9.4b1

7 files changed, 117 insertions, 41 deletions

diff --git a/win32utils/BINDBuild.dsw b/win32utils/BINDBuild.dsw
index 1bcfa734..93eb6c25 100644
--- a/win32utils/BINDBuild.dsw
+++ b/win32utils/BINDBuild.dsw
@@ -168,6 +168,27 @@ Package=<4>
 

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

 

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name libdns

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name libisc

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name dnssectool

+    End Project Dependency

+}}}

+

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

+

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

 

 Package=<5>

diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat
index f0e5fc3b..e5d02ee4 100644
--- a/win32utils/BuildAll.bat
+++ b/win32utils/BuildAll.bat
@@ -111,6 +111,7 @@ nmake /nologo -f dsfromkey.mak CFG="dsfromkey - Win32 Release"  NO_EXTERNAL_DEPS
 nmake /nologo -f keyfromlabel.mak CFG="keyfromlabel - Win32 Release"  NO_EXTERNAL_DEPS="1"

 nmake /nologo -f revoke.mak CFG="revoke - Win32 Release"  NO_EXTERNAL_DEPS="1"

 nmake /nologo -f settime.mak CFG="settime - Win32 Release"  NO_EXTERNAL_DEPS="1"

+nmake /nologo -f verify.mak CFG="verify - Win32 Release"  NO_EXTERNAL_DEPS="1"

 cd ..\..

 

 cd pkcs11\win32

diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index 055b0261..5494b26b 100644
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -67,6 +67,9 @@ copy ..\bin\dnssec\dnssec-keygen.html ..\Build\Release
 copy ..\bin\dnssec\dnssec-signzone.html ..\Build\Release

 copy ..\bin\dnssec\dnssec-dsfromkey.html ..\Build\Release

 copy ..\bin\dnssec\dnssec-keyfromlabel.html ..\Build\Release

+copy ..\bin\dnssec\dnssec-settime.html ..\Build\Release

+copy ..\bin\dnssec\dnssec-revoke.html ..\Build\Release

+copy ..\bin\dnssec\dnssec-verify.html ..\Build\Release

 copy ..\bin\pkcs11\pkcs11-keygen.html ..\Build\Release

 copy ..\bin\pkcs11\pkcs11-list.html ..\Build\Release

 copy ..\bin\pkcs11\pkcs11-destroy.html ..\Build\Release

@@ -79,16 +82,41 @@ copy ..\doc\misc\migration-4to9 ..\Build\Release
 call SetupLibs.bat

 

 rem

-rem set vcredist here so that it is correctly expanded in the if body 

+rem try to find vcredist_x86.exe upper

+rem

+if Not Defined VCRedistPath (

+if Exist ..\..\vcredist_x86.exe set VCRedistPath=..\..\vcredist_x86.exe

+)

+

+rem

+rem get vcredist where someone said it should be

+rem

+if Defined VCRedistPath (

+

+if Exist "%VCRedistPath%" (

+

+echo Copying Visual C x86 Redistributable Installer

+

+rem

+rem Use /Y so we always have the current version of the installer.

 rem

-set vcredist=BootStrapper\Packages\vcredist_x86\vcredist_x86.exe

+

+copy /Y "%VCRedistPath%" ..\Build\Release\

+copy /Y	"%VCRedistPath%" ..\Build\Debug\

+

+) else (

+

+	echo "**** %VCRedistPath% not found ****"

+

+)

+) else (

 

 if Defined FrameworkSDKDir (

 

 rem

 rem vcredist_x86.exe path relative to FrameworkSDKDir

 rem 

-if Exist "%FrameworkSDKDir%\%vcredist%" (

+if Exist "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe" (

 

 echo Copying Visual C x86 Redistributable Installer

 

@@ -96,15 +124,21 @@ rem
 rem Use /Y so we allways have the current version of the installer.

 rem

 

-copy /Y "%FrameworkSDKDir%\%vcredist%" ..\Build\Release\

-copy /Y "%FrameworkSDKDir%\%vcredist%" ..\Build\Debug\

+copy /Y "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"  ..\Build\Release\

+copy /Y "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"  ..\Build\Debug\

 

 ) else (

 	echo "**** %FrameworkSDKDir%\%vcredist% not found ****"

 )

 ) else (

+if NOT Defined FrameworkDir (

 	echo "**** Warning FrameworkSDKDir not defined ****"

 	echo "****         Run vsvars32.bat            ****"

+) else (

+	echo "**** vcredist_x86.exe not found ****"

+	echo "**** please set VCRedistPath ****"

+)

+)

 )

 

 echo Running Message Compiler

diff --git a/win32utils/index.html b/win32utils/index.html
index b0559ea2..05151cb0 100644
--- a/win32utils/index.html
+++ b/win32utils/index.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2006-2008, 2012  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2006-2008, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -36,18 +36,26 @@
 </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="dnssec-dsfromkey.html">dnssec-dsfromkey</a> | <a href="dnssec-keyfromlabel.html">dnssec-keyfromlabel</a>
+    <li><a href="ddns-confgen.html">ddns-confgen</a><br>
+    <li><a href="dig.html">dig</a>
+    <li><a href="dnssec-dsfromkey.html">dnssec-dsfromkey</a>
+    <li><a href="dnssec-keygen.html">dnssec-keygen</a> |
+     <a href="dnssec-keyfromlabel.html">dnssec-keyfromlabel</a>
+    <li><a href="dnssec-settime.html">dnssec-settime</a> |
+     <a href="dnssec-revoke.html">dnssec-revoke</a>
+    <li><a href="dnssec-signzone.html">dnssec-signzone</a> |
+     <a href="dnssec-verify.html">dnssec-verify</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="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="pkcs11-keygen.html">pkcs11-keygen</a> |
+     <a href="pkcs11-list.html">pkcs11-list</a> |
+     <a href="pkcs11-destroy.html">pkcs11-destroy</a>
     <li><a href="rndc.html">rndc</a> |
-    <a href="rndc.conf.html">rndc.conf</a> |
-    <a href="rndc-confgen.html">rndc-confgen</a>
+     <a href="rndc.conf.html">rndc.conf</a> |
+     <a href="rndc-confgen.html">rndc-confgen</a>
 </ul>
 </body>
 </html>
diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index ea0a85a3..c94eb54a 100644
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,12 +1,12 @@
-Copyright (C) 2004, 2005, 2007-2009, 2012  Internet Systems Consortium, Inc. ("ISC")

+Copyright (C) 2004, 2005, 2007-2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")

 Copyright (C) 2001, 2003  Internet Software Consortium.

 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.

 

 $Id$

 

-	   Release of BIND 9.7 for Windows and later.

+	   Release of BIND 9.9 for Windows and later.

 

-This is a release of BIND 9.7 for Windows XP and later.

+This is a release of BIND 9.9 for Windows XP and later.

   

 	Important Kit Installation Information

 

@@ -123,9 +123,10 @@ are HTML pages for each of the BIND 9 applications.
 

 	DNS Tools

 

-The following tools have been built for Windows: dig, nslookup,

-host, nsupdate, rndc, rndc-confgen, named-checkconf, named-checkzone,

-dnssec-keygen, dnssec-signzone, dnssec-dsfromkey and dnssec-keyfromlabel.

+The following tools have been built for Windows: dig, nslookup, host,

+nsupdate, rndc, rndc-confgen, named-checkconf, named-checkzone,

+ddns-confgen, dnssec-keygen, dnssec-signzone, dnssec-dsfromkey,

+dnssec-keyfromlabel, dnssec-revoke, dnssec-settime and dnssec-verify.

 The latter tools are for use with DNSSEC.  All tools are installed

 in the dns/bin directory.

 

diff --git a/win32utils/updatelibxml2.pl b/win32utils/updatelibxml2.pl
index 9cdcf207..3b6377eb 100644
--- a/win32utils/updatelibxml2.pl
+++ b/win32utils/updatelibxml2.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2009, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2010, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -59,6 +59,8 @@ $path = "..\\..\\";
              "../bin/dnssec/win32/settime.mak",
              "../bin/dnssec/win32/signzone.dsp",
              "../bin/dnssec/win32/signzone.mak",
+             "../bin/dnssec/win32/verify.dsp",
+             "../bin/dnssec/win32/verify.mak",
              "../bin/named/win32/named.dsp",
              "../bin/named/win32/named.mak",
              "../bin/nsupdate/win32/nsupdate.dsp",
diff --git a/win32utils/win32-build.txt b/win32utils/win32-build.txt
index e80637bc..76a3ea9a 100644
--- a/win32utils/win32-build.txt
+++ b/win32utils/win32-build.txt
@@ -1,12 +1,13 @@
-Copyright (C) 2004, 2005, 2008, 2009, 2012  Internet Systems Consortium, Inc. ("ISC")

+Copyright (C) 2004, 2005, 2008, 2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")

 Copyright (C) 2001, 2002  Internet Software Consortium.

 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.

 

 $Id$

 

-       BIND 9.7 for Win32 Source Build Instructions.  02-Jul-2009

+       BIND 9.9 for Win32 Source Build Instructions.  24-June-2013

 

-Building BIND 9.7 on Windows XP/2003/2008 has the following prerequisites:

+Building BIND 9.9 on Windows XP/Vista/7/8 or server 2003/2008/2008R2

+has the following prerequisites:

 

 1) You need to install Perl for Windows.  ActivePerl

 (http://www.activestate.com/) and Strawberry Perl

@@ -21,7 +22,12 @@ on the system on which you are building BIND.
 the system on which you are building BIND.  (If you do not wish

 to use the statistics channel, remove HAVE_LIBXML2 from config.h.win32.)

 

-4) If you want to build using Visual C++ 6.0, you'll need some extra

+4) The BIND Installer (BINDInstall) includes a copy of the

+redistributable runtime object vcredist_x86.exe, which is included

+with Visual Studio and can be downloaded from Microsoft.  This file

+must be in place prior to running the build setup script.

+

+5) If you want to build using Visual C++ 6.0, you'll need some extra

 files that are to be found in the Platform SDK (which you will need

 to install), namely:

 

@@ -47,42 +53,45 @@ versions but it has not been tested. The binaries may be built and run on
 any of the following platforms: NT 4.0 Workstation (SP3 or later), NT 4.0

 Server (SP3 or later), Windows 2000 Professional (SP1 or later),

 Windows 2000 Server or any kind (SP1 or later), Windows XP, Windows 2003

-Server. It will NOT build or run on Windows 95, Windows 98, etc. platforms.

+Server, Windows Vista, Windows 2008 Server, Windows 7, Windows 2008 R2

+Server, Windows 8, and Windows 2012 Server (untested). It will NOT build

+or run on Windows 95, Windows 98, etc., or Windows RT platforms.

 

 Step 1: Download and build OpenSSL

 

 Download and untar the OpenSSL sources from http://www.openssl.org/.

 Extract them at in the same directory in which you extracted the BIND9

-source:  If BIND9 is in \build\bind-9.7.0, for instance, OpenSSL should be

-in \build\openssl-0.9.8l (subject to version number changes).

+source:  If BIND9 is in \build\bind-9.9.0, for instance, OpenSSL should be

+in \build\openssl-1.0.1e (subject to version number changes).

 

 Note: Building OpenSSL requires that you install Perl as it uses

 it during its build process. The following commands work as of

-openssl-0.9.8l, but you should check the OpenSSL distribution 

-to see if the build instructions have changed:

+openssl-1.0.1e, but you should check the OpenSSL distribution 

+to see if the build instructions in the INSTALL.W32 file have changed:

 

-  cd openssl-0.9.8l

+  cd openssl-1.0.1e

   perl Configure VC-WIN32 --prefix=c:/openssl

-  ms\do_masm

+  ms\do_ms

   nmake /f ms\ntdll.mak

 

-If you wish to use PKCS #11 to control a cryptographic hardware service

-module, please see bind9\README.pkcs11.  You will need to apply the patch

-in bind9\bin\pkcs11\openssl-0.9.8l-patch (this can be done using the Cygwin

-'patch' utility) and add --pk11-libname and --pk11-flavor to the Configure

-command above.

+If you wish to use PKCS #11 to control a cryptographic hardware

+service module, please see "PKCS #11 (Cryptoki) support" in chapter 4

+of the BIND 9 Administrator Reference Guide.  You will need to apply

+the patch in bind9\bin\pkcs11\openssl-1.0.1e-patch (this can be done

+using the Cygwin 'patch' utility) and add --pk11-libname and

+--pk11-flavor to the Configure command above.

 

 Step 2: Download and build libxml2

 

 Download and untar the libxml2 sources from ftp://xmlsoft.org/libxml2.

 Extract them at in the same directory in which you extracted the BIND9

-source:  If BIND9 is in \build\bind-9.7.0, for instance, libxml2 should

-be in \build\libxml2-2.7.3 (subject to version number changes).

+source:  If BIND9 is in \build\bind-9.9.0, for instance, libxml2 should

+be in \build\libxml2-2.7.7 (subject to version number changes).

 

 Now build libxml2, and copy the resulting files into the include and lib

 directories:

 

- cd libxml2-2.7.3\win32

+ cd libxml2-2.7.7\win32

  cscript configure.js compiler=msvc vcmanifest=yes static=yes debug=no iconv=no

  nmake /f Makefile.msvc libxml

 

@@ -93,7 +102,7 @@ You must build openssl and libxml2 first.
 From the command prompt cd to the win32utils directory under

 the BIND9 root:

 

-  cd bind-9.7.0\win32utils

+  cd bind-9.9.0\win32utils

 

 If you wish to use PKCS #11 to control a cryptographic hardware service

 module, set the path to the PKCS #11 provider library: