Skip to content

GitLab

BIND
BIND
Commit c99381ce authored by Evan Hunt's avatar Evan Hunt
Browse files
Options

Merge branch '2050-libuv-version' into 'main' 

report libuv version string in `named -V`

Closes #2050

See merge request !3887
parents 730226b6 1036338a
Pipeline #47731 canceled with stages
                  in 28 minutes and 51 seconds
                  Hide whitespace changes
                  Inline Side-by-side
                  Showing with 10 additions and 4 deletions
                  bin/named/Makefile.am
                  View file @ c99381ce
                  ...@@ -15,6 +15,7 @@ AM_CPPFLAGS += \ ...@@ -15,6 +15,7 @@ AM_CPPFLAGS += \
                  $(LMDB_CFLAGS) \ $(LMDB_CFLAGS) \
                  $(MAXMINDDB_CFLAGS) \ $(MAXMINDDB_CFLAGS) \
                  $(DNSTAP_CFLAGS) \ $(DNSTAP_CFLAGS) \
                  $(LIBUV_CFLAGS) \
                  $(ZLIB_CFLAGS) $(ZLIB_CFLAGS)
                  if HAVE_JSON_C if HAVE_JSON_C
                  ...@@ -102,6 +103,7 @@ named_LDADD = \ ...@@ -102,6 +103,7 @@ named_LDADD = \
                  $(LMDB_LIBS) \ $(LMDB_LIBS) \
                  $(MAXMINDDB_LIBS) \ $(MAXMINDDB_LIBS) \
                  $(DNSTAP_LIBS) \ $(DNSTAP_LIBS) \
                  $(LIBUV_LIBS) \
                  $(LIBXML2_LIBS) \ $(LIBXML2_LIBS) \
                  $(ZLIB_LIBS) $(ZLIB_LIBS)
                  ......
                  bin/named/main.c
                  View file @ c99381ce
                  ...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
                  #include <stdbool.h> #include <stdbool.h>
                  #include <stdlib.h> #include <stdlib.h>
                  #include <string.h> #include <string.h>
                  #include <uv.h>
                  #include <isc/app.h> #include <isc/app.h>
                  #include <isc/attributes.h> #include <isc/attributes.h>
                  ...@@ -525,6 +526,9 @@ printversion(bool verbose) { ...@@ -525,6 +526,9 @@ printversion(bool verbose) {
                  printf("linked to OpenSSL version: %s\n", printf("linked to OpenSSL version: %s\n",
                  SSLeay_version(SSLEAY_VERSION)); SSLeay_version(SSLEAY_VERSION));
                  #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
                  printf("compiled with libuv version: %d.%d.%d\n", UV_VERSION_MAJOR,
                  UV_VERSION_MINOR, UV_VERSION_PATCH);
                  printf("linked to libuv version: %s\n", uv_version_string());
                  #ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
                  printf("compiled with libxml2 version: %s\n", LIBXML_DOTTED_VERSION); printf("compiled with libxml2 version: %s\n", LIBXML_DOTTED_VERSION);
                  printf("linked to libxml2 version: %s\n", xmlParserVersion); printf("linked to libxml2 version: %s\n", xmlParserVersion);
                  ......
                  bin/named/win32/named.vcxproj.in
                  View file @ c99381ce
                  ...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
                  <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
                  <BrowseInformation>true</BrowseInformation> <BrowseInformation>true</BrowseInformation>
                  <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles> <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles>
                  <AdditionalIncludeDirectories>@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>@LIBUV_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
                  <CompileAs>CompileAsC</CompileAs> <CompileAs>CompileAsC</CompileAs>
                  </ClCompile> </ClCompile>
                  <Link> <Link>
                  ...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
                  <GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
                  <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
                  <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
                  <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
                  </Link> </Link>
                  <PreBuildEvent> <PreBuildEvent>
                  <Command>cd .. <Command>cd ..
                  ...@@ -103,7 +103,7 @@ perl -e "print \";\";" &gt;&gt; xsl.c ...@@ -103,7 +103,7 @@ perl -e "print \";\";" &gt;&gt; xsl.c
                  <ObjectFileName>.\$(Configuration)\</ObjectFileName> <ObjectFileName>.\$(Configuration)\</ObjectFileName>
                  <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
                  <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles> <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles>
                  <AdditionalIncludeDirectories>@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>@LIBUV_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
                  <CompileAs>CompileAsC</CompileAs> <CompileAs>CompileAsC</CompileAs>
                  </ClCompile> </ClCompile>
                  <Link> <Link>
                  ...@@ -114,7 +114,7 @@ perl -e "print \";\";" &gt;&gt; xsl.c ...@@ -114,7 +114,7 @@ perl -e "print \";\";" &gt;&gt; xsl.c
                  <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
                  <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
                  <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
                  <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
                  </Link> </Link>
                  <PreBuildEvent> <PreBuildEvent>
                  <Command>cd .. <Command>cd ..
                  ......
                  Markdown is supported
                  0% or .
                  You are about to add 0 people to the discussion. Proceed with caution.
                  Finish editing this message first!
                  Please register or to comment