diff --git a/CHANGES b/CHANGES index 69e5885ba6..94b5b89af7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +3596. [port] Updated win32 build documentation, added + dnssec-verify. [RT #22067] + 3595. [port] win32: Fix build problems introduced by change #3550. [RT #33807] diff --git a/bin/dnssec/win32/verify.dsp b/bin/dnssec/win32/verify.dsp new file mode 100644 index 0000000000..aa6bc0ced5 --- /dev/null +++ b/bin/dnssec/win32/verify.dsp @@ -0,0 +1,103 @@ +# Microsoft Developer Studio Project File - Name="verify" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=verify - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "verify.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "verify.mak" CFG="verify - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "verify - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "verify - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "verify - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-verify.exe" + +!ELSEIF "$(CFG)" == "verify - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +# SUBTRACT CPP /X /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-verify.exe" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "verify - Win32 Release" +# Name "verify - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE="..\dnssec-verify.c" +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/bin/dnssec/win32/verify.dsw b/bin/dnssec/win32/verify.dsw new file mode 100644 index 0000000000..4553264149 --- /dev/null +++ b/bin/dnssec/win32/verify.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "verify"=".\verify.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/bin/dnssec/win32/verify.mak b/bin/dnssec/win32/verify.mak new file mode 100644 index 0000000000..371d029c3c --- /dev/null +++ b/bin/dnssec/win32/verify.mak @@ -0,0 +1,324 @@ +# Microsoft Developer Studio Generated NMAKE File, Based on verify.dsp +!IF "$(CFG)" == "" +CFG=verify - Win32 Debug +!MESSAGE No configuration specified. Defaulting to verify - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "verify - Win32 Release" && "$(CFG)" != "verify - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "verify.mak" CFG="verify - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "verify - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "verify - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +!IF "$(CFG)" == "verify - Win32 Release" +_VC_MANIFEST_INC=0 +_VC_MANIFEST_BASENAME=__VC80 +!ELSE +_VC_MANIFEST_INC=1 +_VC_MANIFEST_BASENAME=__VC80.Debug +!ENDIF + +#################################################### +# Specifying name of temporary resource file used only in incremental builds: + +!if "$(_VC_MANIFEST_INC)" == "1" +_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res +!else +_VC_MANIFEST_AUTO_RES= +!endif + +#################################################### +# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE: + +!if "$(_VC_MANIFEST_INC)" == "1" + +#MT_SPECIAL_RETURN=1090650113 +#MT_SPECIAL_SWITCH=-notify_resource_update +MT_SPECIAL_RETURN=0 +MT_SPECIAL_SWITCH= +_VC_MANIFEST_EMBED_EXE= \ +if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \ +if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \ +rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \ +link $** /out:$@ $(LFLAGS) + +!else + +_VC_MANIFEST_EMBED_EXE= \ +if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 + +!endif + +#################################################### +# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL: + +!if "$(_VC_MANIFEST_INC)" == "1" + +#MT_SPECIAL_RETURN=1090650113 +#MT_SPECIAL_SWITCH=-notify_resource_update +MT_SPECIAL_RETURN=0 +MT_SPECIAL_SWITCH= +_VC_MANIFEST_EMBED_EXE= \ +if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \ +if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \ +rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \ +link $** /out:$@ $(LFLAGS) + +!else + +_VC_MANIFEST_EMBED_EXE= \ +if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 + +!endif +#################################################### +# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily: + +!if "$(_VC_MANIFEST_INC)" == "1" + +_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \ + $(_VC_MANIFEST_BASENAME).auto.rc \ + $(_VC_MANIFEST_BASENAME).auto.manifest + +!else + +_VC_MANIFEST_CLEAN= + +!endif + +!IF "$(CFG)" == "verify - Win32 Release" + +OUTDIR=.\Release +INTDIR=.\Release + +ALL : "..\..\..\Build\Release\dnssec-verify.exe" + + +CLEAN : + -@erase "$(INTDIR)\dnssec-verify.obj" + -@erase "$(INTDIR)\dnssectool.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "..\..\..\Build\Release\dnssec-verify.exe" + -@$(_VC_MANIFEST_CLEAN) + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\verify.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\verify.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-verify.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-verify.exe" +LINK32_OBJS= \ + "$(INTDIR)\dnssec-verify.obj" \ + "$(INTDIR)\dnssectool.obj" + +"..\..\..\Build\Release\dnssec-verify.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + $(_VC_MANIFEST_EMBED_EXE) + +!ELSEIF "$(CFG)" == "verify - Win32 Debug" + +OUTDIR=.\Debug +INTDIR=.\Debug +# Begin Custom Macros +OutDir=.\Debug +# End Custom Macros + +ALL : "..\..\..\Build\Debug\dnssec-verify.exe" "$(OUTDIR)\verify.bsc" + + +CLEAN : + -@erase "$(INTDIR)\dnssec-verify.obj" + -@erase "$(INTDIR)\dnssec-verify.sbr" + -@erase "$(INTDIR)\dnssectool.obj" + -@erase "$(INTDIR)\dnssectool.sbr" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(INTDIR)\vc60.pdb" + -@erase "$(OUTDIR)\dnssec-verify.pdb" + -@erase "$(OUTDIR)\verify.bsc" + -@erase "..\..\..\Build\Debug\dnssec-verify.exe" + -@erase "..\..\..\Build\Debug\dnssec-verify.ilk" + -@$(_VC_MANIFEST_CLEAN) + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\verify.bsc" +BSC32_SBRS= \ + "$(INTDIR)\dnssec-verify.sbr" \ + "$(INTDIR)\dnssectool.sbr" + +"$(OUTDIR)\verify.bsc" : "$(OUTDIR)" $(BSC32_SBRS) + $(BSC32) @<< + $(BSC32_FLAGS) $(BSC32_SBRS) +<< + +LINK32=link.exe +LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-verify.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-verify.exe" /pdbtype:sept +LINK32_OBJS= \ + "$(INTDIR)\dnssec-verify.obj" \ + "$(INTDIR)\dnssectool.obj" + +"..\..\..\Build\Debug\dnssec-verify.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + $(_VC_MANIFEST_EMBED_EXE) + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("verify.dep") +!INCLUDE "verify.dep" +!ELSE +!MESSAGE Warning: cannot find "verify.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "verify - Win32 Release" || "$(CFG)" == "verify - Win32 Debug" +SOURCE="..\dnssec-verify.c" + +!IF "$(CFG)" == "verify - Win32 Release" + + +"$(INTDIR)\dnssec-verify.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "verify - Win32 Debug" + + +"$(INTDIR)\dnssec-verify.obj" "$(INTDIR)\dnssec-verify.sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=..\dnssectool.c + +!IF "$(CFG)" == "verify - Win32 Release" + + +"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "verify - Win32 Debug" + + +"$(INTDIR)\dnssectool.obj" "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + + +!ENDIF + +#################################################### +# Commands to generate initial empty manifest file and the RC file +# that references it, and for generating the .res file: + +$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc + +$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest + type <<$@ +#include +1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" +<< KEEP + +$(_VC_MANIFEST_BASENAME).auto.manifest : + type <<$@ + + + +<< KEEP diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index ab9ecc925d..559293645f 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -550,7 +550,7 @@ serialize_nodes(FILE *file, dns_rbtnode_t *node, uintptr_t parent, { uintptr_t left = 0, right = 0, down = 0, data = 0; long location = 0; - isc_uint64_t offset_adjust; + long offset_adjust; isc_result_t result; if (node == NULL) { diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 455407c98c..f9a34883da 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -1107,7 +1107,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, isc_boolean_t log, isc_event_t *event) { isc_mem_detach(&rbtdb->hmctx); if (rbtdb->mmap_location != NULL) - isc_file_munmap(rbtdb->mmap_location, rbtdb->mmap_size); + isc_file_munmap(rbtdb->mmap_location, (size_t) rbtdb->mmap_size); isc_mem_putanddetach(&rbtdb->common.mctx, rbtdb, sizeof(*rbtdb)); isc_ondestroy_notify(&ondest, rbtdb); @@ -7088,7 +7088,7 @@ deserialize(void *arg, FILE *f, off_t offset) { if (header->tree != 0) { result = dns_rbt_deserialize_tree(base, filesize, - header->tree, + (size_t) header->tree, rbtdb->common.mctx, delete_callback, rbtdb, rbt_datafixer, @@ -7108,7 +7108,7 @@ deserialize(void *arg, FILE *f, off_t offset) { if (header->nsec != 0) { result = dns_rbt_deserialize_tree(base, filesize, - header->nsec, + (size_t) header->nsec, rbtdb->common.mctx, delete_callback, rbtdb, rbt_datafixer, @@ -7124,7 +7124,7 @@ deserialize(void *arg, FILE *f, off_t offset) { if (header->nsec3 != 0) { result = dns_rbt_deserialize_tree(base, filesize, - header->nsec3, + (size_t) header->nsec3, rbtdb->common.mctx, delete_callback, rbtdb, rbt_datafixer, @@ -7401,13 +7401,13 @@ serialize(dns_db_t *db, dns_dbversion_t *ver, FILE *rbtfile) { CHECK(rbtdb_zero_header(rbtfile)); CHECK(dns_rbt_serialize_tree(rbtfile, rbtdb->tree, rbt_datawriter, - version->serial, + (isc_uint32_t) version->serial, &tree_location)); CHECK(dns_rbt_serialize_tree(rbtfile, rbtdb->nsec, rbt_datawriter, - version->serial, + (isc_uint32_t) version->serial, &nsec_location)); CHECK(dns_rbt_serialize_tree(rbtfile, rbtdb->nsec3, rbt_datawriter, - version->serial, + (isc_uint32_t) version->serial, &nsec3_location)); CHECK(isc_stdio_seek(rbtfile, header_location, SEEK_SET)); diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def index 8e42da4667..5409435c28 100644 --- a/lib/dns/win32/libdns.def +++ b/lib/dns/win32/libdns.def @@ -872,7 +872,7 @@ dns_zone_getoptions dns_zone_getorigin dns_zone_getprivatetype dns_zone_getqueryacl -dns_zone_getqueryaoncl +dns_zone_getqueryonacl dns_zone_getraw dns_zone_getrcvquerystats dns_zone_getrefreshkeytime diff --git a/win32utils/BINDBuild.dsw b/win32utils/BINDBuild.dsw index 1bcfa73490..93eb6c2510 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 d56e1776ce..a6d61bc815 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 f323e5d26f..21f7e38a05 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 diff --git a/win32utils/index.html b/win32utils/index.html index b0559ea2b7..5f40cb79fe 100644 --- a/win32utils/index.html +++ b/win32utils/index.html @@ -36,18 +36,26 @@ BIND tools: diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt index b4e52fa5ad..19adb7123d 100644 --- a/win32utils/readme1st.txt +++ b/win32utils/readme1st.txt @@ -4,9 +4,9 @@ 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.10 for Windows and later. -This is a release of BIND 9.7 for Windows XP and later. +This is a release of BIND 9.10 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 9cdcf207b7..b3bbd7aa16 100644 --- a/win32utils/updatelibxml2.pl +++ b/win32utils/updatelibxml2.pl @@ -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 0e94874fe5..a7db3c83d4 100644 --- a/win32utils/win32-build.txt +++ b/win32utils/win32-build.txt @@ -4,9 +4,10 @@ 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.10 for Win32 Source Build Instructions. 12-June-2013 -Building BIND 9.7 on Windows XP/2003/2008 has the following prerequisites: +Building BIND 9.10 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 @@ -47,42 +48,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.10.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.10.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 +97,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.10.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: