2515. [port] win32: build dnssec-dsfromkey and dnssec-keyfromlabel.

                        [RT #19063]

diff --git a/CHANGES b/CHANGES
index 562f4f6e73d4eade2a68acc1f60384b5630f8be6..413839a772c5482f4294035d1a0395b1dd95366a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
        --- 9.6.0rc2 released ---
 
+2515.  [port]          win32: build dnssec-dsfromkey and dnssec-keyfromlabel.
+                       [RT #19063]
+
 2513   [bug]           Fix windows cli build. [RT #19062]
 
 2510.  [bug]           "dig +sigchase" could trigger REQUIRE failures.

diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index 48a56c7f07147bbfb7ea68f76f9f27d9eaa23533..d961b53b6b09eca67b702860759ecc7af1786af6 100644 (file)
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -830,6 +830,7 @@ dst_key_frombuffer
 dst_key_fromdns
 dst_key_fromfile
 dst_key_fromgssapi
+dst_key_fromlabel
 dst_key_fromnamedfile
 dst_key_generate
 dst_key_id

diff --git a/win32utils/BINDBuild.dsw b/win32utils/BINDBuild.dsw
index b4af5c3b1aa7c0d723362d8ee8a0901e5d876015..93071521fae5597a55ba09759feafe408ea4cf87 100644 (file)
--- a/win32utils/BINDBuild.dsw
+++ b/win32utils/BINDBuild.dsw
@@ -93,6 +93,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "dsfromkey"="..\bin\dnssec\win32\dsfromkey.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>
@@ -390,6 +411,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "keyfromlabel"="..\bin\dnssec\win32\keyfromlabel.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: "dnssectool"="..\bin\dnssec\win32\dnssectool.dsp" - Package Owner=<4>
 
 Package=<5>

diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat
index 762d1828ea71d491286a938b6e79f0cdf6530d68..e668de8b540473e42c4bb3102c2598bef1e222c7 100644 (file)
--- a/win32utils/BuildAll.bat
+++ b/win32utils/BuildAll.bat
@@ -101,9 +101,9 @@ cd ..\..
 
 cd dnssec\win32
 nmake /nologo -f keygen.mak CFG="keygen - Win32 Release"  NO_EXTERNAL_DEPS="1"
-rem nmake /nologo -f makekeyset.mak CFG="makekeyset - Win32 Release"  NO_EXTERNAL_DEPS="1"
-rem nmake /nologo -f signkey.mak CFG="signkey - Win32 Release"  NO_EXTERNAL_DEPS="1"
 nmake /nologo -f signzone.mak CFG="signzone - Win32 Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f dsfromkey.mak CFG="dsfromkey - Win32 Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f keyfromlabel.mak CFG="keyfromlabel - Win32 Release"  NO_EXTERNAL_DEPS="1"
 cd ..\..
 
 rem This is the BIND 9 Installer

diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index be9eed2438398919d4a49b6be1fc34b10787a22b..bc667d8bf4496db7f42ac8ab30f02edc7adab1ed 100644 (file)
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -60,6 +60,8 @@ copy ..\bin\nsupdate\*.html ..\Build\Release
 copy ..\bin\check\*.html ..\Build\Release
 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
 
 echo Copying the migration notes.
 

diff --git a/win32utils/index.html b/win32utils/index.html
index 07b6f261cf3ac49e00036202a571da136a00f50a..f62c1dcc97dbdde80e291235a5ce77ac9cd6d8c2 100644 (file)
--- a/win32utils/index.html
+++ b/win32utils/index.html
@@ -14,7 +14,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: index.html,v 1.6 2007/06/19 23:47:24 tbox Exp $ -->
+<!-- $Id: index.html,v 1.6.332.1 2008/12/14 21:18:34 marka Exp $ -->
 
 <html>
 <head>
@@ -38,6 +38,7 @@
 <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="host.html">host</a>
     <li>
     <a href="named-checkconf.html">named-checkconf</a> |

diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index 83b6cd525812cbf387370ed2f550eb25b0ce37a8..2977c92f7f6d9a247ae455cb140ec54f3e31f007 100644 (file)
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -2,7 +2,7 @@ Copyright (C) 2004, 2005, 2007  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: readme1st.txt,v 1.18 2007/05/02 23:46:54 tbox Exp $
+$Id: readme1st.txt,v 1.18.372.1 2008/12/14 21:18:34 marka Exp $
 
           Release of BIND 9.5 for Window 2000/XP/2003
 
@@ -124,9 +124,10 @@ BIND 9 applications.
 
 The following tools have been built for Windows NT: dig, nslookup,
 host, nsupdate, rndc, rndc-confgen, named-checkconf, named-checkzone,
-dnssec-keygen, dnssec-signzone. The tools will NOT run on Win9x,
-only WinNT and Win2000. The latter tools are for use with DNSSEC.
-All tools are installed in the dns/bin directory.
+dnssec-keygen, dnssec-signzone, dnssec-dsfromkey and dnssec-keyfromlabel.
+The tools will NOT run on Win9x, only WinNT and Win2000. The latter
+tools are for use with DNSSEC.  All tools are installed in the
+dns/bin directory.
 
 IMPORTANT NOTE ON USING THE TOOLS:
 

diff --git a/win32utils/win32-build.txt b/win32utils/win32-build.txt
index fdc10283374c80345e9eacbf0a968d4691f155a2..94b93d99c5ea5164e205ca8376950fa3fc3f974f 100644 (file)
--- a/win32utils/win32-build.txt
+++ b/win32utils/win32-build.txt
@@ -2,7 +2,7 @@ Copyright (C) 2004, 2005  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: win32-build.txt,v 1.11 2005/11/01 05:49:15 marka Exp $
+$Id: win32-build.txt,v 1.11.692.1 2008/12/14 21:18:34 marka Exp $
 
        BIND 9.4 for Win32 Source Build Instructions.  28-May-2005
 
@@ -103,6 +103,8 @@ named-checkzone.exe
 
 dnssec-keygen.exe
 dnssec-signzone.exe
+dnssec-dsfromkey.exe
+dnssec-keyfromlabel.exe
 
 If you are building with VS.NET (aka VC++ V7) you will need additional
 system DLL's: