Skip to content

Commit 7077a44

Browse files
jiayuehuaMonicaLiu
jiayuehua
and
MonicaLiu
authored
[getdns] update to 1.7.3 (#34188)
* [getdns] update to 1.7.3 * [getdns] update to 1.7.3 * fix deps * delete nouse patch chunk * fix deps * fix deps --------- Co-authored-by: MonicaLiu <liuyumei01@beyondsoft.com>
1 parent 8abeb71 commit 7077a44

File tree

7 files changed

+89
-24
lines changed

7 files changed

+89
-24
lines changed

‎ports/getdns/disable-docs.patch‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 413709da..d3dd03f0 100644
2+
index 9170be7..def3758 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -1039,9 +1039,9 @@ configure_file(src/version.c.in version.c)
5+
@@ -1036,9 +1036,9 @@ configure_file(src/version.c.in version.c)
66

77
set(version ${PACKAGE_VERSION})
88
set(date ${API_VERSION})
@@ -15,28 +15,26 @@ index 413709da..d3dd03f0 100644
1515
get_filename_component(out ${man} NAME_WE)
1616
configure_file(${man} man3/${out}.3 @ONLY)
1717

18-
@@ -1061,7 +1061,7 @@ foreach (man ${mans})
18+
@@ -1058,7 +1058,7 @@ foreach (man ${mans})
1919
configure_file(${man} man3/${alt}.3 @ONLY)
2020
endif ()
2121
endforeach()
2222
-endforeach()
2323
+endif()
2424

2525
set(prefix ${CMAKE_INSTALL_PREFIX})
26-
configure_file(getdns.pc.in getdns.pc @ONLY)
27-
@@ -1099,11 +1099,11 @@ if (BUILD_GETDNS_SERVER_MON)
26+
cmake_path(APPEND libdir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
27+
@@ -1098,10 +1098,10 @@ if (BUILD_GETDNS_SERVER_MON)
2828
endif ()
2929

3030
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
31-
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
32-
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
31+
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION ${CMAKE_INSTALL_MANDIR})
32+
+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION ${CMAKE_INSTALL_MANDIR})
3333

34-
-set(docdir share/doc/getdns)
35-
-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir})
36-
-install(FILES spec/index.html DESTINATION ${docdir}/spec)
37-
+#set(docdir share/doc/getdns)
38-
+#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir})
39-
+#install(FILES spec/index.html DESTINATION ${docdir}/spec)
34+
-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
35+
-install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec)
36+
+#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
37+
+#install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec)
4038
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
4139

4240
install(CODE "message(\"\

‎ports/getdns/fix-include.patch‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/src/gldns/parse.c b/src/gldns/parse.c
2+
index 367fa80..79fa527 100644
3+
--- a/src/gldns/parse.c
4+
+++ b/src/gldns/parse.c
5+
@@ -13,7 +13,7 @@
6+
#include "gldns/gbuffer.h"
7+
8+
#include <limits.h>
9+
-#include <strings.h>
10+
+#include <stdlib.h>
11+
12+
gldns_lookup_table gldns_directive_types[] = {
13+
{ GLDNS_DIR_TTL, "$TTL" },
14+
diff --git a/src/gldns/parseutil.c b/src/gldns/parseutil.c
15+
index 293496a..bcd8e6f 100644
16+
--- a/src/gldns/parseutil.c
17+
+++ b/src/gldns/parseutil.c
18+
@@ -14,8 +14,12 @@
19+
20+
#include "config.h"
21+
#include "gldns/parseutil.h"
22+
+#ifdef HAVE_SYS_TIME_H
23+
#include <sys/time.h>
24+
+#endif
25+
+#ifdef HAVE_TIME_H
26+
#include <time.h>
27+
+#endif
28+
#include <ctype.h>
29+
30+
gldns_lookup_table *

‎ports/getdns/fix-libuv-deps.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index c5b711e..6bd9ee2 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -872,7 +872,7 @@ endif ()
6+
7+
# libuv extension.
8+
if (USE_LIBUV)
9+
- find_package(Libuv)
10+
+ find_package(libuv CONFIG REQUIRED)
11+
if (Libuv_FOUND)
12+
# Check for new-style callbacks.
13+
try_compile(HAVE_NEW_UV_TIMER_CB
14+
@@ -894,8 +894,7 @@ if (USE_LIBUV)
15+
set_property(TARGET uv_objects PROPERTY C_STANDARD 11)
16+
if (ENABLE_STATIC)
17+
add_library(getdns_ext_uv STATIC $<TARGET_OBJECTS:uv_objects>)
18+
- target_include_directories(getdns_ext_uv PRIVATE Libuv::Libuv)
19+
- target_link_libraries(getdns_ext_uv PUBLIC getdns Libuv::Libuv)
20+
+ target_link_libraries(getdns_ext_uv PUBLIC getdns $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
21+
if (Libunbound_FOUND)
22+
target_link_libraries(getdns_ext_uv PUBLIC Libunbound::Libunbound)
23+
endif ()
24+
@@ -903,8 +902,7 @@ if (USE_LIBUV)
25+
endif ()
26+
if (ENABLE_SHARED)
27+
add_library(getdns_ext_uv_shared SHARED $<TARGET_OBJECTS:uv_objects>)
28+
- target_include_directories(getdns_ext_uv_shared PRIVATE Libuv::Libuv)
29+
- target_link_libraries(getdns_ext_uv_shared PUBLIC getdns_shared Libuv::Libuv)
30+
+ target_link_libraries(getdns_ext_uv_shared PUBLIC getdns $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
31+
if (Libunbound_FOUND)
32+
target_link_libraries(getdns_ext_uv_shared PUBLIC Libunbound::Libunbound)
33+
endif ()

‎ports/getdns/portfile.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
set(GETDNS_VERSION 1.7.0)
2-
set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6)
3-
41
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GETDNS_ENABLE_STATIC)
52
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GETDNS_ENABLE_SHARED)
63

74
vcpkg_download_distfile(ARCHIVE
8-
URLS "https://getdnsapi.net/dist/getdns-${GETDNS_VERSION}.tar.gz"
9-
FILENAME "getdns-${GETDNS_VERSION}.tar.gz"
10-
SHA512 ${GETDNS_HASH}
5+
URLS "https://getdnsapi.net/dist/getdns-${VERSION}.tar.gz"
6+
FILENAME "getdns-${VERSION}.tar.gz"
7+
SHA512 d5725a24378b6fe0018daefdaba5565d2d4d51109ef66609fc34270a0a69accb95f5f895d0cdfc5caca51d2ec586db126f367439f05aed12507395af26739e2f
118
)
129

1310
vcpkg_extract_source_archive(
1411
SOURCE_PATH
1512
ARCHIVE "${ARCHIVE}"
16-
PATCHES disable-docs.patch
13+
PATCHES
14+
disable-docs.patch
15+
fix-include.patch
16+
fix-libuv-deps.patch
1717
)
1818

1919
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)

‎ports/getdns/vcpkg.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "getdns",
3-
"version": "1.7.0",
4-
"port-version": 3,
3+
"version": "1.7.3",
54
"description": "GetDNS is a modern asynchronous DNS API",
65
"homepage": "https://getdnsapi.net/",
76
"license": "BSD-3-Clause",

‎versions/baseline.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2921,8 +2921,8 @@
29212921
"port-version": 1
29222922
},
29232923
"getdns": {
2924-
"baseline": "1.7.0",
2925-
"port-version": 3
2924+
"baseline": "1.7.3",
2925+
"port-version": 0
29262926
},
29272927
"getopt": {
29282928
"baseline": "0",

‎versions/g-/getdns.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "bc99e968335624d1ff606befa894103b540fbde2",
5+
"version": "1.7.3",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "b604fb24c9b81bf4bc5c30e7ca86e52750a86935",
510
"version": "1.7.0",

0 commit comments

Comments
 (0)