upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 09:20:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updated WIN32 files (rt40877) bis

Browse source
This commit is contained in:
Francis Dupont 2016-01-04 18:55:57 +01:00
parent 9c88ac2977
commit def7e9796f
12 changed files with 76 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/isc/win32/libisc.vcxproj.filters.in
View file

@ -229,6 +229,9 @@
<ClInclude Include="..\include\isc\socket.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\isc\stats.h">
<Filter>Library Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\isc\stdio.h">
<Filter>Library Header Files</Filter>
</ClInclude>

1
lib/isc/win32/libisc.vcxproj.in
View file

@ -348,6 +348,7 @@ copy InstallFiles ..\Build\Release\
<ClInclude Include="..\include\isc\sha2.h" />
<ClInclude Include="..\include\isc\sockaddr.h" />
<ClInclude Include="..\include\isc\socket.h" />
<ClInclude Include="..\include\isc\stats.h" />
<ClInclude Include="..\include\isc\stdio.h" />
<ClInclude Include="..\include\isc\stdlib.h" />
<ClInclude Include="..\include\isc\string.h" />

4
lib/isccc/win32/libisccc.dsp.in
View file

@ -184,6 +184,10 @@ SOURCE=..\include\isccc\types.h
SOURCE=..\include\isccc\util.h
# End Source File
# Begin Source File
SOURCE=..\include\isccc\version.h
# End Source File
# End Group
# Begin Group "Resource Files"

3
lib/isccc/win32/libisccc.vcxproj.filters.in
View file

@ -86,5 +86,8 @@
<ClInclude Include="..\include\isccc\util.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\isccc\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

1
lib/isccc/win32/libisccc.vcxproj.in
View file

@ -131,6 +131,7 @@
<ClInclude Include="..\include\isccc\symtype.h" />
<ClInclude Include="..\include\isccc\types.h" />
<ClInclude Include="..\include\isccc\util.h" />
<ClInclude Include="..\include\isccc\version.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

4
lib/isccfg/win32/libisccfg.dsp.in
View file

@ -152,6 +152,10 @@ SOURCE=..\include\isccfg\log.h
SOURCE=..\include\isccfg\namedconf.h
# End Source File
# Begin Source File
SOURCE=..\include\isccfg\version.h
# End Source File
# End Group
# Begin Group "Resource Files"

3
lib/isccfg/win32/libisccfg.vcxproj.filters.in
View file

@ -59,5 +59,8 @@
<ClInclude Include="..\include\isccfg\namedconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\isccfg\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

1
lib/isccfg/win32/libisccfg.vcxproj.in
View file

@ -122,6 +122,7 @@
<ClInclude Include="..\include\isccfg\grammar.h" />
<ClInclude Include="..\include\isccfg\log.h" />
<ClInclude Include="..\include\isccfg\namedconf.h" />
<ClInclude Include="..\include\isccfg\version.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

4
lib/lwres/win32/liblwres.dsp.in
View file

@ -244,6 +244,10 @@ SOURCE=..\include\lwres\stdlib.h
SOURCE=..\include\lwres\string.h
# End Source File
# Begin Source File
SOURCE=..\include\lwres\version.h
# End Source File
# End Group
# Begin Group "Resource Files"

3
lib/lwres/win32/liblwres.vcxproj.filters.in
View file

@ -131,5 +131,8 @@
<ClInclude Include="..\include\lwres\string.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\lwres\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

1
lib/lwres/win32/liblwres.vcxproj.in
View file

@ -140,6 +140,7 @@
<ClInclude Include="..\include\lwres\result.h" />
<ClInclude Include="..\include\lwres\stdlib.h" />
<ClInclude Include="..\include\lwres\string.h" />
<ClInclude Include="..\include\lwres\version.h" />
<ClInclude Include="include\lwres\int.h" />
<ClInclude Include="include\lwres\net.h" />
<ClInclude Include="include\lwres\netdb.h" />

107
win32utils/Configure
View file

@ -344,7 +344,7 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj",
my %configdefh;
my @substdefh = ("AES_SIT",
my @substdefh = ("AES_CC",
"ALLOW_FILTER_AAAA",
"CONFIGARGS",
"DNS_RDATASET_FIXED",
@ -366,8 +366,8 @@ my @substdefh = ("AES_SIT",
"HAVE_PKCS11_GOST",
"HAVE_READLINE",
"HMAC_RETURN_INT",
"HMAC_SHA1_SIT",
"HMAC_SHA256_SIT",
"HMAC_SHA1_CC",
"HMAC_SHA256_CC",
"ISC_LIST_CHECKINIT",
"PREFER_GOSTASN1",
"TUNE_LARGE",
@ -385,7 +385,6 @@ my @substdefp = ("ISC_PLATFORM_HAVEATOMICSTORE",
"ISC_PLATFORM_HAVEXADDQ",
"ISC_PLATFORM_NEEDSTRCASESTR",
"ISC_PLATFORM_USEBACKTRACE",
"ISC_PLATFORM_USESIT",
"ISC_PLATFORM_WANTAES");
# includes
@ -475,6 +474,8 @@ my @substcond = ("AES",
"TESTS",
"XTESTS");
my @allcond = (@substcond, "NOTYET", "NOLONGER");
# arguments
# enable-xxx/disable-xxx
@ -488,8 +489,7 @@ my @enablelist = ("developer",
"filter-aaaa",
"querytrace",
"rpz-nsdname",
"rpz-nsip",
"sit");
"rpz-nsip");
# with-xxx/without-xxx
@ -547,7 +547,6 @@ my @help = (
" enable-querytrace enable very verbose query trace [default=no]\n",
" enable-rpz-nsip enable rpz-nsip rules [default=yes]\n",
" enable-rpz-nsdname enable rpz-nsdname rules [default=yes]\n",
" enable-sit enable source identity token [default=yes]\n",
"\nOptional Packages:\n",
" with-tests build with test suite\n",
" with-extra-tests build with extra test suite\n",
@ -557,7 +556,7 @@ my @help = (
" with-ecdsa crypto ECDSA\n",
" with-gost[=ENC] crypto GOST yes|no|raw|ans1\n",
" with-aes crypto AES\n",
" with-sit-alg choose the algorithm for SIT aes|sha1|sha256\n",
" with-cc-alg choose the algorithm for cookies aes|sha1|sha256\n",
" with-gssapi[=PATH] build with MIT KfW GSSAPI yes|no|path\n",
" with-libxml2[=PATH] build with libxml2 library yes|no|path\n",
" with-geoip[=PATH] build with GeoIP support yes|no|path\n",
@ -589,7 +588,6 @@ my $enable_developer = "no";
my $enable_querytrace = "no";
my $enable_rpz_nsip = "yes";
my $enable_rpz_nsdname = "yes";
my $enable_sit = "yes";
my $use_tests = "no";
my $use_xtests = "no";
my $use_samples = "no";
@ -601,7 +599,7 @@ my $use_ecdsa = "auto";
my $use_gost = "auto";
my $gost_encoding = "raw";
my $use_aes = "auto";
my $sit_algorithm = "aes";
my $cookie_algorithm = "aes";
my $use_gssapi = "no";
my $gssapi_path = "C:\\Program\ Files\\MIT\\Kerberos\\";
my $use_geoip = "no";
@ -757,10 +755,6 @@ sub myenable {
if ($val =~ /^no$/i) {
$enable_rpz_nsdname = "no";
}
} elsif ($key =~ /^sit$/i) {
if ($val =~ /^no$/i) {
$enable_sit = "no";
}
} else {
$want_unknown = "yes";
if ($val eq "no") {
@ -782,7 +776,6 @@ if ($enable_developer eq "yes") {
# TODO: dlz filesystem
$use_tests = "yes";
$use_samples = "yes";
$enable_sit = "yes";
}
# parse with/without
@ -838,8 +831,8 @@ sub mywith {
} elsif ($val =~ /^yes$/i) {
$use_aes = "yes";
}
} elsif ($key =~ /^sit-alg$/i) {
$sit_algorithm = $val;
} elsif ($key =~ /^cc-alg$/i) {
$cookie_algorithm = $val;
} elsif ($key =~ /^gssapi$/i) {
if ($val !~ /^no$/i) {
$use_gssapi = "yes";
@ -1022,12 +1015,7 @@ if ($verbose) {
} else {
print "rpz-nsdname: disabled\n";
}
if ($enable_sit eq "yes") {
print "sit: enabled\n";
print "sit algorithm: $sit_algorithm\n";
} else {
print "sit: disabled\n";
}
print "cookie algorithm: $cookie_algorithm\n";
if ($use_openssl eq "no") {
print "openssl: disabled\n";
} else {
@ -1387,11 +1375,6 @@ if ($enable_rpz_nsdname ne "no") {
$configdefh{"ENABLE_RPZ_NSDNAME"} = 1;
}
# enable-sit
if ($enable_sit ne "no") {
$configdefp{"ISC_PLATFORM_USESIT"} = 1;
}
# with-tests
if ($use_tests eq "yes") {
$configcond{"TESTS"} = 1;
@ -1874,23 +1857,21 @@ if ($use_aes eq "yes") {
$configcond{"AES"} = 1;
}
# with-sit-alg
if ($enable_sit ne "no") {
if ($sit_algorithm eq "aes") {
if ($use_aes ne "yes") {
$sit_algorithm = "sha256";
} else {
$configdefh{"AES_SIT"} = 1;
}
}
if ($sit_algorithm eq "sha1") {
$configdefh{"HMAC_SHA1_SIT"} = 1;
} elsif ($sit_algorithm eq "sha256") {
$configdefh{"HMAC_SHA256_SIT"} = 1;
} elsif ($sit_algorithm ne "aes") {
die "Unrecognized SIT algorithm: $sit_algorithm\n";
# with-cc-alg
if ($cookie_algorithm eq "aes") {
if ($use_aes ne "yes") {
$cookie_algorithm = "sha256";
} else {
$configdefh{"AES_CC"} = 1;
}
}
if ($cookie_algorithm eq "sha1") {
$configdefh{"HMAC_SHA1_CC"} = 1;
} elsif ($cookie_algorithm eq "sha256") {
$configdefh{"HMAC_SHA256_CC"} = 1;
} elsif ($cookie_algorithm ne "aes") {
die "Unrecognized cookie algorithm: $cookie_algorithm\n";
}
# enable-openssl-hash
if ($enable_openssl_hash eq "yes") {
@ -2422,11 +2403,15 @@ sub setupfile {
unshift(@conds, $cond);
unshift(@passes, $pass);
}
$cond = $1;
if (defined($configcond{$cond})) {
# do nothing
if ($1 ~~ @allcond) {
$cond = $1;
if (defined($configcond{$cond})) {
# do nothing
} else {
$pass = 0;
}
} else {
$pass = 0;
die "unknown condition \@IF $1 in $filename\n";
}
next;
} elsif ($line =~ /^\@ELSE (.*)$/) {
@ -2537,11 +2522,15 @@ sub setupproject {
unshift(@conds, $cond);
unshift(@passes, $pass);
}
$cond = $1;
if (defined($configcond{$cond})) {
# do nothing
if ($1 ~~ @allcond) {
$cond = $1;
if (defined($configcond{$cond})) {
# do nothing
} else {
$pass = 0;
}
} else {
$pass = 0;
die "unknown condition \@IF $1 in $projectname\n";
}
next;
} elsif ($line =~ /^\@ELSE (.*)$/) {
@ -3054,35 +3043,35 @@ exit 0;
# --enable-threads included without a way to disable it
# --enable-backtrace backtrace included without a way to disable it
# --enable-symtable incompatible with DLLs (or libtool)
# --enable-exportlib TODO (obsolete)
# --enable-ipv6 included without a way to disable it
# --enable-atomic supported (renamed to intrinsic)
# --enable-spnego support (part of GSSAPI)
# --enable-isc-spnego supported (part of GSSAPI)
# --enable-fixed-rrset supported
# --enable-querytrace supported
# --disable-rpz-nsip supported
# --disable-rpz-nsdname supported
# --enable-filter-aaaa supported
# --enable-sit supported
# --enable-full-report supported by verbose
# --enable-seccomp not supported (Linux specific)
# --with-python supported
# --with-openssl supported
# --with-pkcs11 supported
# --with-ecdsa supported
# --with-gost supported
# --with-aes supported
# --with-sit-alg supported
# --with-cc-alg supported
# --with-geoip supported
# --with-gssapi supported with MIT (K)erberos (f)or (W)indows
# --with-libxml2 supported
# --with-libjson not supported on WIN32 (package not available on WIN32)
# --with-purify ? (package available on WIN32 but for free?)
# --with-gperftools-profiler (package not available on WIN32)
# --with-purify not supported (package available on WIN32 but for free?)
# --with-gperftools-profiler not supported (package not available on WIN32)
# --with-libtool not supported on WIN32 (never)
# --with-locktype not supported on WIN32 (not yet available on WIN32)
# --with-readline supported
# --with-idn support
# --with-[lib]iconv (part of IDN)
# --with-docbook-xsl not supported (?)
# --with-idn[lib] supported
# --with-[lib]iconv supported (part of IDN)
# --with-atf not supported on WIN32 (package not available on WIN32)
# --with-tuning supported
# --with-dlopen included without a way to disable it