From daa7215f3d68c2a2f2e18c398cb73dab63cda829 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Wed, 23 Feb 2022 10:28:14 +1100 Subject: [PATCH] [libcurl-simple-https] New port (#22917) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [ports/libcurl-simple-https] Init * [versions/d-/dmon.json,versions/baseline.json] `./vcpkg x-add-version --all --overwrite-version` * [versions/l-/libcurl-simple-https.json] Add file forgotten from `git add` * [ports/libcurl-simple-https/portfile.cmake] Upgrade (uses latest FindCurl impl) * [versions/l-/libcurl-simple-https.json] `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] Upgrade to boilerplate conforming version * [versions/l-/libcurl-simple-https.json] `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] Upgrade to latest libcurl-simple-https * [versions/l-/libcurl-simple-https.json] `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https] Upgrade to latest version (which actually exports targets… and renames to dashes not underscore) * [versions/baseline.json,versions/l-/libcurl-simple-https.json] `./vcpkg x-add-version --all --overwrite-version` + manually remove yesterdays * [ports/libcurl-simple-https] Upgrade to latest version (renames "_" to "-"; installs config file * [versions/baseline.json,versions/l-/libcurl-simple-https.json] `./vcpkg x-add-version --all --overwrite-version` + manually remove yesterdays * [ports/libcurl-simple-https/portfile.cmake] `configure_package_config_file` with `INSTALL_DESTINATION` from `"lib/cmake/${PROJECT_NAME}"` to `"share/${PROJECT_NAME}"` * [versions/l-/libcurl-simple-https.json] ./vcpkg x-add-version --all --overwrite-version * [ports/libcurl-simple-https/portfile.cmake] Manual `install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" DESTINATION "share/${LIBRARY_NAME}")` because `configure_package_config_file` `INSTALL_DESTINATION` does not seem to actually `install`… * [versions/l-/libcurl-simple-https.json] ./vcpkg x-add-version --all --overwrite-version * [ports/libcurl-simple-https/portfile.cmake] `install` ""${PROJECT_NAME}Config.cmake" to "share/${PROJECT_NAME}/${LIBRARY_NAME}" * [versions/l-/libcurl-simple-https.json] ./vcpkg x-add-version --all --overwrite-version * [ports/libcurl-simple-https] Upgrade to latest version (which should support vcpkg install hierarchy) * [versions/baseline.json,versions/l-/libcurl-simple-https.json] `./vcpkg x-add-version --all --overwrite-version` + manually remove old * [ports/libcurl-simple-https/portfile.cmake] `file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")` * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] Use `ARCHIVE` and `LIBRARY` DESTINATION * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] Remove `file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")` * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" ${CURRENT_PACKAGES_DIR}/debug/share") * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" ${CURRENT_PACKAGES_DIR}/debug/share") * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] `install` `"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake` to `DESTINATION` `"${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}"` not `TYPE "DATA"` * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] [CMakeLists.txt] Bump `cmake_minimum_required` from `3.0` to `3.3`; [libcurl-simple-https/curl_simple_https.c] Use `calloc`; add debug statements * [ports/libcurl-simple-https/portfile.cmake] [libcurl-simple-https/curl_simple_https.c] No alt option set when body is NULL * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] [libcurl-simple-https/curl_simple_https.c] More debug statements * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] [libcurl-simple-https/curl_simple_https.c] More debug statements * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] [libcurl-simple-https/curl_simple_https.c] More debug statements * [ports/libcurl-simple-https/portfile.cmake] [libcurl-simple-https/curl_simple_https.c] Replace `assert` with `if` for `curl_url_get` * `./vcpkg x-add-version --all --overwrite-version` * `./vcpkg x-add-version --all --overwrite-version` * [ports/libcurl-simple-https/portfile.cmake] [libcurl-simple-https/curl_simple_https.c] Set `CURLOPT_READDATA`, `CURLOPT_READFUNCTION`, `CURLOPT_POSTFIELDSIZE`: even with an empty HTTPS POST * `./vcpkg x-add-version --all --overwrite-version` --- ports/libcurl-simple-https/portfile.cmake | 19 +++++++++++++++++++ ports/libcurl-simple-https/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libcurl-simple-https.json | 9 +++++++++ 4 files changed, 50 insertions(+) create mode 100644 ports/libcurl-simple-https/portfile.cmake create mode 100644 ports/libcurl-simple-https/vcpkg.json create mode 100644 versions/l-/libcurl-simple-https.json diff --git a/ports/libcurl-simple-https/portfile.cmake b/ports/libcurl-simple-https/portfile.cmake new file mode 100644 index 0000000000..4ea56bdd11 --- /dev/null +++ b/ports/libcurl-simple-https/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SamuelMarks/curl-simple-https + REF 5a115053ba4d249fc1af22c3673b4d014e56bcf5 + SHA512 6274bfeec5235d39c627850b1b6ef03c3f1982c74f937b604137cf3cf87e982f971c4681760b42926a3fb15bc8268f2fa48c197919516066d73f53425aa24545 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_CLI=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/cmake/License.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libcurl-simple-https/vcpkg.json b/ports/libcurl-simple-https/vcpkg.json new file mode 100644 index 0000000000..beac2afdd5 --- /dev/null +++ b/ports/libcurl-simple-https/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libcurl-simple-https", + "version-date": "2022-02-14", + "description": "Very simple HTTPS interface built atop libcurl", + "license": "Apache-2.0 OR MIT", + "supports": "!uwp", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 63a142b537..fb07913cbc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3412,6 +3412,10 @@ "baseline": "0.3", "port-version": 1 }, + "libcurl-simple-https": { + "baseline": "2022-02-14", + "port-version": 0 + }, "libdatachannel": { "baseline": "0.16.4", "port-version": 0 diff --git a/versions/l-/libcurl-simple-https.json b/versions/l-/libcurl-simple-https.json new file mode 100644 index 0000000000..3c91befa83 --- /dev/null +++ b/versions/l-/libcurl-simple-https.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6b22a1dafa22c05f8eed41236534a247a28c23d0", + "version-date": "2022-02-14", + "port-version": 0 + } + ] +}