Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[getdns] update to 1.7.3 #34188

Merged
merged 7 commits into from
Dec 14, 2023
Merged

[getdns] update to 1.7.3 #34188

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc14095
[getdns] update to 1.7.3
jiayuehua Oct 1, 2023
5fd54d8
[getdns] update to 1.7.3
jiayuehua Oct 1, 2023
c1f2139
fix deps
jiayuehua Oct 3, 2023
098761b
delete nouse patch chunk
jiayuehua Nov 30, 2023
baafd3f
fix deps
jiayuehua Dec 5, 2023
a8da7e6
fix deps
jiayuehua Dec 5, 2023
1038154
Merge branch 'master' of https://github.com/microsoft/vcpkg into getdns
MonicaLiu0311 Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions ports/getdns/disable-docs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 413709da..d3dd03f0 100644
index 9170be7..def3758 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1039,9 +1039,9 @@ configure_file(src/version.c.in version.c)
@@ -955,7 +955,7 @@ if (BUILD_TESTING)
message(WARNING "Test programs require libcheck and so do not build on Windows, skipping.")
else ()
find_package(Check "0.9.6" REQUIRED)
- set(GETDNS_TEST_SOURCE_FILES
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be removable from the patch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just has removed

+ set(GETDNS_TEST_SOURCE_FILES
src/test/check_getdns_common.c
src/test/check_getdns_context_set_timeout.c
src/test/check_getdns_transport.c
@@ -1036,9 +1036,9 @@ configure_file(src/version.c.in version.c)

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

@@ -1061,7 +1061,7 @@ foreach (man ${mans})
@@ -1058,7 +1058,7 @@ foreach (man ${mans})
configure_file(${man} man3/${alt}.3 @ONLY)
endif ()
endforeach()
-endforeach()
+endif()

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

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

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

install(CODE "message(\"\
30 changes: 30 additions & 0 deletions ports/getdns/fix-include.patch
View file
Open in desktop
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
Copy link
Member

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.

Copy link
Member

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getdnsapi/getdns#543

#include <sys/time.h>
+#endif
+#ifdef HAVE_TIME_H
#include <time.h>
+#endif
#include <ctype.h>

gldns_lookup_table *
13 changes: 6 additions & 7 deletions ports/getdns/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
set(GETDNS_VERSION 1.7.0)
set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GETDNS_ENABLE_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GETDNS_ENABLE_SHARED)

vcpkg_download_distfile(ARCHIVE
URLS "https://getdnsapi.net/dist/getdns-${GETDNS_VERSION}.tar.gz"
FILENAME "getdns-${GETDNS_VERSION}.tar.gz"
SHA512 ${GETDNS_HASH}
URLS "https://getdnsapi.net/dist/getdns-${VERSION}.tar.gz"
FILENAME "getdns-${VERSION}.tar.gz"
SHA512 d5725a24378b6fe0018daefdaba5565d2d4d51109ef66609fc34270a0a69accb95f5f895d0cdfc5caca51d2ec586db126f367439f05aed12507395af26739e2f
)

vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES disable-docs.patch
PATCHES
disable-docs.patch
fix-include.patch
)

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
Expand Down
3 changes: 1 addition & 2 deletions ports/getdns/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "getdns",
"version": "1.7.0",
"port-version": 3,
"version": "1.7.3",
"description": "GetDNS is a modern asynchronous DNS API",
"homepage": "https://getdnsapi.net/",
"license": "BSD-3-Clause",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2837,8 +2837,8 @@
"port-version": 1
},
"getdns": {
"baseline": "1.7.0",
"port-version": 3
"baseline": "1.7.3",
"port-version": 0
},
"getopt": {
"baseline": "0",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/getdns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ae187e49e240199049dbb860bf61f1b47a282c6a",
"version": "1.7.3",
"port-version": 0
},
{
"git-tree": "b604fb24c9b81bf4bc5c30e7ca86e52750a86935",
"version": "1.7.0",
Expand Down