-
Notifications
You must be signed in to change notification settings - Fork 6.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[getdns] update to 1.7.3 #34188
Merged
Merged
[getdns] update to 1.7.3 #34188
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
dc14095
[getdns] update to 1.7.3
jiayuehua 5fd54d8
[getdns] update to 1.7.3
jiayuehua c1f2139
fix deps
jiayuehua 098761b
delete nouse patch chunk
jiayuehua baafd3f
fix deps
jiayuehua a8da7e6
fix deps
jiayuehua 1038154
Merge branch 'master' of https://github.com/microsoft/vcpkg into getdns
MonicaLiu0311 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| diff --git a/src/gldns/parse.c b/src/gldns/parse.c | ||
| index 367fa80..79fa527 100644 | ||
| --- a/src/gldns/parse.c | ||
| +++ b/src/gldns/parse.c | ||
| @@ -13,7 +13,7 @@ | ||
| #include "gldns/gbuffer.h" | ||
|
|
||
| #include <limits.h> | ||
| -#include <strings.h> | ||
| +#include <stdlib.h> | ||
|
|
||
| gldns_lookup_table gldns_directive_types[] = { | ||
| { GLDNS_DIR_TTL, "$TTL" }, | ||
| diff --git a/src/gldns/parseutil.c b/src/gldns/parseutil.c | ||
| index 293496a..bcd8e6f 100644 | ||
| --- a/src/gldns/parseutil.c | ||
| +++ b/src/gldns/parseutil.c | ||
| @@ -14,8 +14,12 @@ | ||
|
|
||
| #include "config.h" | ||
| #include "gldns/parseutil.h" | ||
| +#ifdef HAVE_SYS_TIME_H | ||
| #include <sys/time.h> | ||
| +#endif | ||
| +#ifdef HAVE_TIME_H | ||
| #include <time.h> | ||
| +#endif | ||
| #include <ctype.h> | ||
|
|
||
| gldns_lookup_table * | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index c5b711e..6bd9ee2 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -872,7 +872,7 @@ endif () | ||
|
|
||
| # libuv extension. | ||
| if (USE_LIBUV) | ||
| - find_package(Libuv) | ||
| + find_package(libuv CONFIG REQUIRED) | ||
| if (Libuv_FOUND) | ||
| # Check for new-style callbacks. | ||
| try_compile(HAVE_NEW_UV_TIMER_CB | ||
| @@ -894,8 +894,7 @@ if (USE_LIBUV) | ||
| set_property(TARGET uv_objects PROPERTY C_STANDARD 11) | ||
| if (ENABLE_STATIC) | ||
| add_library(getdns_ext_uv STATIC $<TARGET_OBJECTS:uv_objects>) | ||
| - target_include_directories(getdns_ext_uv PRIVATE Libuv::Libuv) | ||
| - target_link_libraries(getdns_ext_uv PUBLIC getdns Libuv::Libuv) | ||
| + target_link_libraries(getdns_ext_uv PUBLIC getdns $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>) | ||
| if (Libunbound_FOUND) | ||
| target_link_libraries(getdns_ext_uv PUBLIC Libunbound::Libunbound) | ||
| endif () | ||
| @@ -903,8 +902,7 @@ if (USE_LIBUV) | ||
| endif () | ||
| if (ENABLE_SHARED) | ||
| add_library(getdns_ext_uv_shared SHARED $<TARGET_OBJECTS:uv_objects>) | ||
| - target_include_directories(getdns_ext_uv_shared PRIVATE Libuv::Libuv) | ||
| - target_link_libraries(getdns_ext_uv_shared PUBLIC getdns_shared Libuv::Libuv) | ||
| + target_link_libraries(getdns_ext_uv_shared PUBLIC getdns $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>) | ||
| if (Libunbound_FOUND) | ||
| target_link_libraries(getdns_ext_uv_shared PUBLIC Libunbound::Libunbound) | ||
| endif () |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would like to see what happens with getdnsapi/getdns#538 before proceeding here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, upstream has had a couple months to respond and they have not so I think you can proceed but please evaluate just taking that patch submitted upstream.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getdnsapi/getdns#543