Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
185 changes: 82 additions & 103 deletions ports/curl/dependencies.patch

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions ports/curl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF ${curl_version}
SHA512 1dca42354d29b9326a3e9be34c74433c3a7364318d69519e2f5b9a164e81db739d3ef1eed79e3313296fe72af73281e0fc61e57a21e9dede1ef240c8fa6af4fe
SHA512 1ce097d400da48e038f64e637ed338ab5873b2a961b1837b615ef890e530fd711fe44d47527eecbc3652e67e09bed2bb81bb2045b8e0f5b5137236e74b458f96
HEAD_REF master
PATCHES
dependencies.patch
winsock.diff
)
# The on-the-fly tarballs do not carry the details of release tarballs.
vcpkg_replace_string("${SOURCE_PATH}/include/curl/curlver.h" [[-DEV"]] [["]])
Expand Down
3 changes: 1 addition & 2 deletions ports/curl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "curl",
"version": "8.18.0",
"port-version": 1,
"version": "8.19.0",
"description": "A library for transferring data with URLs",
"homepage": "https://curl.se/",
"license": "curl AND ISC AND BSD-3-Clause",
Expand Down
13 changes: 0 additions & 13 deletions ports/curl/winsock.diff

This file was deleted.

27 changes: 27 additions & 0 deletions ports/wolfssl/have-limits-h.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/cmake/config.in b/cmake/config.in
index f2524e4..6054b6d 100644
--- a/cmake/config.in
+++ b/cmake/config.in
@@ -19,9 +19,6 @@
/* Define to 1 if you have the `gmtime_r' function. */
#cmakedefine HAVE_GMTIME_R @HAVE_GMTIME_R@

-/* Define to 1 if you have the <limits.h> header file. */
-#cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@
-
/* Define to 1 if you have the <pcap/pcap.h> header file. */
#cmakedefine HAVE_PCAP_PCAP_H @HAVE_PCAP_PCAP_H@

diff --git a/cmake/options.h.in b/cmake/options.h.in
index 7446b1b..615cc9b 100644
--- a/cmake/options.h.in
+++ b/cmake/options.h.in
@@ -122,6 +122,8 @@ extern "C" {
#cmakedefine HAVE_KEYING_MATERIAL
#undef HAVE_LIBOQS
#cmakedefine HAVE_LIBOQS
+#undef HAVE_LIMITS_H
+#cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@
#undef HAVE_MAX_FRAGMENT
#cmakedefine HAVE_MAX_FRAGMENT
#undef HAVE_OCSP
3 changes: 2 additions & 1 deletion ports/wolfssl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ vcpkg_from_github(
SHA512 6f191c218b270bd4dc90d6f07a80416e6bc8d049f3f49ea84c38a2af40ae9588a4fe306860fbb8696c5af15c4ca359818e3955069389d33269eee0101c270439
HEAD_REF master
PATCHES
)
have-limits-h.diff
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

)

if ("asio" IN_LIST FEATURES)
set(ENABLE_ASIO yes)
Expand Down
2 changes: 1 addition & 1 deletion ports/wolfssl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "wolfssl",
"version": "5.8.4",
"port-version": 1,
"port-version": 2,
"description": "TLS and Cryptographic library for many platforms",
"homepage": "https://wolfssl.com",
"license": "GPL-3.0-or-later",
Expand Down
6 changes: 3 additions & 3 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2281,8 +2281,8 @@
"port-version": 8
},
"curl": {
"baseline": "8.18.0",
"port-version": 1
"baseline": "8.19.0",
"port-version": 0
},
"curlcpp": {
"baseline": "3.1",
Expand Down Expand Up @@ -10730,7 +10730,7 @@
},
"wolfssl": {
"baseline": "5.8.4",
"port-version": 1
"port-version": 2
},
"wolftpm": {
"baseline": "3.10.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/curl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2826bbcd8b83d191393e58842c2baa969b9363f9",
"version": "8.19.0",
"port-version": 0
},
{
"git-tree": "6f60b9a4e17664b88fc87f7abe8ea4949abac959",
"version": "8.18.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wolfssl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4bf11023b3b64a5202cfba5a2f129f8368a6ae69",
"version": "5.8.4",
"port-version": 2
},
{
"git-tree": "20f0274c9dd43541ec99a3678ce958a7f1009841",
"version": "5.8.4",
Expand Down