Updated WIN32 files (rt40877)

2026-03-09 01:30:39 -04:00 · 2016-01-04 18:31:53 +01:00 · 2016-01-04 18:31:53 +01:00 · 9c88ac2977
commit 9c88ac2977
parent ae14e490cc
17 changed files with 57 additions and 17 deletions
--- a/bin/named/win32/named.dsp.in
+++ b/bin/named/win32/named.dsp.in
@ -294,6 +294,10 @@ SOURCE=..\include\named\query.h
 # End Source File
 # Begin Source File

+SOURCE=..\include\named\seccomp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\named\server.h
 # End Source File
 # Begin Source File
--- a/bin/named/win32/named.vcxproj.filters.in
+++ b/bin/named/win32/named.vcxproj.filters.in
@ -177,6 +177,9 @@
    <ClInclude Include="..\include\named\query.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\include\named\seccomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\include\named\server.h">
      <Filter>Header Files</Filter>
    </ClInclude>
--- a/bin/named/win32/named.vcxproj.in
+++ b/bin/named/win32/named.vcxproj.in
@ -156,6 +156,7 @@
    <ClInclude Include="..\include\named\main.h" />
    <ClInclude Include="..\include\named\notify.h" />
    <ClInclude Include="..\include\named\query.h" />
+    <ClInclude Include="..\include\named\seccomp.h" />
    <ClInclude Include="..\include\named\server.h" />
    <ClInclude Include="..\include\named\sortlist.h" />
    <ClInclude Include="..\include\named\statschannel.h" />
--- a/config.h.win32
+++ b/config.h.win32
@ -358,14 +358,14 @@ typedef __int64 off_t;
 /* HMAC_*() return ints */
@HMAC_RETURN_INT@

-/* Use AES for Source Identity Token generation */
-@AES_SIT@
+/* Use AES for Client Cookie generation */
+@AES_CC@

-/* Use HMAC-SHA1 for Source Identity Token generation */
-@HMAC_SHA1_SIT@
+/* Use HMAC-SHA1 for Client Cookie generation */
+@HMAC_SHA1_CC@

-/* Use HMAC-SHA256 for Source Identity Token generation */
-@HMAC_SHA256_SIT@
+/* Use HMAC-SHA256 for Client Cookie generation */
+@HMAC_SHA256_CC@

 /* Define to 1 if you have the `readline' function. */
@HAVE_READLINE@
--- a/lib/bind9/win32/libbind9.dsp.in
+++ b/lib/bind9/win32/libbind9.dsp.in
@ -118,6 +118,10 @@ SOURCE=..\include\bind9\check.h
 # End Source File
 # Begin Source File

+SOURCE=..\include\bind9\getaddresses.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\bind9\version.h
 # End Source File
 # End Group
--- a/lib/bind9/win32/libbind9.vcxproj.filters.in
+++ b/lib/bind9/win32/libbind9.vcxproj.filters.in
@ -38,5 +38,8 @@
    <ClInclude Include="..\include\bind9\getaddresses.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\include\bind9\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>
--- a/lib/bind9/win32/libbind9.vcxproj.in
+++ b/lib/bind9/win32/libbind9.vcxproj.in
@ -115,6 +115,7 @@
  <ItemGroup>
    <ClInclude Include="..\include\bind9\check.h" />
    <ClInclude Include="..\include\bind9\getaddresses.h" />
+    <ClInclude Include="..\include\bind9\version.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@ -89,9 +89,9 @@ dns_cache_getcleaninginterval
 dns_cache_getname
 dns_cache_getstats
 dns_cache_load
-@IF JSON
+@IF NOTYET
 dns_cache_renderjson
-@END JSON
+@END NOTYET
@IF LIBXML2
 dns_cache_renderxml
@END LIBXML2
--- a/lib/dns/win32/libdns.dsp.in
+++ b/lib/dns/win32/libdns.dsp.in
@ -186,6 +186,10 @@ SOURCE=..\include\dns\ecdb.h
 # End Source File
 # Begin Source File

+SOURCE=..\include\dns\edns.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\dns\enumclass.h
 # End Source File
 # Begin Source File
@ -304,6 +308,10 @@ SOURCE=..\rbtdb64.h
 # End Source File
 # Begin Source File

+SOURCE=..\rdatalist_p.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\dns\rcode.h
 # End Source File
 # Begin Source File
--- a/lib/dns/win32/libdns.vcxproj.filters.in
+++ b/lib/dns/win32/libdns.vcxproj.filters.in
@ -335,6 +335,9 @@
    <ClInclude Include="..\rbtdb64.h">
      <Filter>Library Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\rdatalist_p.h">
+      <Filter>Library Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\include\dns\acache.h">
      <Filter>Library Header Files</Filter>
    </ClInclude>
@ -401,6 +404,9 @@
    <ClInclude Include="..\include\dns\ecdb.h">
      <Filter>Library Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\include\dns\edns.h">
+      <Filter>Library Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\include\dns\enumclass.h">
      <Filter>Library Header Files</Filter>
    </ClInclude>
--- a/lib/dns/win32/libdns.vcxproj.in
+++ b/lib/dns/win32/libdns.vcxproj.in
@ -245,6 +245,7 @@
    <ClInclude Include="..\include\dns\ds.h" />
    <ClInclude Include="..\include\dns\dsdigest.h" />
    <ClInclude Include="..\include\dns\ecdb.h" />
+    <ClInclude Include="..\include\dns\edns.h" />
    <ClInclude Include="..\include\dns\enumclass.h" />
    <ClInclude Include="..\include\dns\enumtype.h" />
    <ClInclude Include="..\include\dns\events.h" />
@ -320,6 +321,7 @@
    <ClInclude Include="..\include\dst\result.h" />
    <ClInclude Include="..\rbtdb.h" />
    <ClInclude Include="..\rbtdb64.h" />
+    <ClInclude Include="..\rdatalist_p.h" />
    <ClInclude Include="..\spnego.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/lib/irs/win32/libirs.vcxproj.filters.in
+++ b/lib/irs/win32/libirs.vcxproj.filters.in
@ -62,5 +62,8 @@
    <ClInclude Include="..\include\irs\types.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\include\irs\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>
--- a/lib/irs/win32/libirs.vcxproj.in
+++ b/lib/irs/win32/libirs.vcxproj.in
@ -123,6 +123,7 @@
    <ClInclude Include="..\include\irs\platform.h" />
    <ClInclude Include="..\include\irs\resconf.h" />
    <ClInclude Include="..\include\irs\types.h" />
+    <ClInclude Include="..\include\irs\version.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/lib/isc/win32/libisc.def.in
+++ b/lib/isc/win32/libisc.def.in
@ -398,9 +398,9 @@ isc_mem_ondestroy
 isc_mem_printallactive
 isc_mem_references
 isc_mem_register
-@IF JSON
+@IF NOTYET
 isc_mem_renderjson
-@END JSON
+@END NOTYET
@IF LIBXML2
 isc_mem_renderxml
@END LIBXML2
@ -644,9 +644,9 @@ isc_taskmgr_createinctx
 isc_taskmgr_destroy
 isc_taskmgr_excltask
 isc_taskmgr_mode
-@IF JSON
+@IF NOTYET
 isc_taskmgr_renderjson
-@END JSON
+@END NOTYET
@IF LIBXML2
 isc_taskmgr_renderxml
@END LIBXML2
--- a/lib/isc/win32/libisc.dsp.in
+++ b/lib/isc/win32/libisc.dsp.in
@ -563,7 +563,11 @@ SOURCE=..\include\isc\socket.h
 # End Source File
 # Begin Source File

-SOURCE=.\include\isc\stats.h
+SOURCE=.\include\isc\stat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isc\stats.h
 # End Source File
 # Begin Source File

--- a/win32utils/Configure
+++ b/win32utils/Configure
@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  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
@ -508,7 +508,7 @@ my @withlist = ("aes",
                "python",
                "readline",
                "samples",
-                "sit-alg",
+                "cc-alg",
                "tests",
                "tuning",
                "vcredist");
--- a/win32utils/build.txt
+++ b/win32utils/build.txt
@ -1,4 +1,4 @@
-Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.

       BIND 9.10 for Win32 Source Build Instructions.  17-Apr-2015
@ -125,7 +125,7 @@ Step 4: Download and build Readline
  step 5.

  Because the original GNU source for the readline library has no WIN32
-  support, it will be necessary to download  a version of the static
+  support, it will be necessary to download a version of the static
  readline library source that is ready to be built by Visual Studio.  One
  such version is available at: