diff --git a/ports/oatpp-consul/CONTROL b/ports/oatpp-consul/CONTROL index d6722dcbe3f044..468f48f30d820a 100644 --- a/ports/oatpp-consul/CONTROL +++ b/ports/oatpp-consul/CONTROL @@ -1,4 +1,5 @@ Source: oatpp-consul -Version: 1.0.0 +Version: 1.1.0 Description: OAT++ Modern web framework consul module Build-Depends: oatpp +Homepage: https://github.com/oatpp/oatpp-consul diff --git a/ports/oatpp-consul/portfile.cmake b/ports/oatpp-consul/portfile.cmake index f7568990c04bee..8c61812e4d36d7 100644 --- a/ports/oatpp-consul/portfile.cmake +++ b/ports/oatpp-consul/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.0.0") +set(OATPP_VERSION "1.1.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-consul - REF 4fb420fdf9286f0e0f8d2a1dbd30a56024f10529 # 1.0.0 - SHA512 fa26ed7b12ed1cc6bf0a969628b4e70a911bfba76562a6c7406a13875dae88f5125349107e3278362441b518d556ac75c926994b21f93e02e2decc80883e3bfa + REF e8da386f8f21bc416329aa1f72507ba710ac8d94 # 1.1.0 + SHA512 69d159a8fb3887fdc0654598d14b3320d04bb91baff7113f7cf95394f28e29a3e78014c42d135825c17ecbaab456784b36983527161f8f694ee8b6f62aefee4e HEAD_REF master ) diff --git a/ports/oatpp-curl/CONTROL b/ports/oatpp-curl/CONTROL index 1b80b3883ef339..974c5e92b67e3e 100644 --- a/ports/oatpp-curl/CONTROL +++ b/ports/oatpp-curl/CONTROL @@ -1,4 +1,5 @@ Source: oatpp-curl -Version: 1.0.0 +Version: 1.1.0 Description: Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient Build-Depends: curl,oatpp +Homepage: https://github.com/oatpp/oatpp-curl diff --git a/ports/oatpp-curl/portfile.cmake b/ports/oatpp-curl/portfile.cmake index 0e2388fa2f9a9d..d5187190e69ae0 100644 --- a/ports/oatpp-curl/portfile.cmake +++ b/ports/oatpp-curl/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.0.0") +set(OATPP_VERSION "1.1.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-curl - REF 03a3f336be70c71d0547489aa0ed50206f46dcf8 # 1.0.0 - SHA512 799cbddeb6e9d90eb43911845dd33ee272c4e86c86a07bb710ceb8c0e1722cda15412fdca10c4228a77f38e3b9e3d5d5248c8cd4366cbb9c369db4a830e29496 + REF 7cf7a5acf7e79612598f38f4d7966ddbe498b846 # 1.1.0 + SHA512 77f02e53c4a2d28c689169b1d0aad9f8e7f28c03c31e0512624cd51a6f2ddd3f863a6a48631fc560311015108263bcd31d6e1a7e092e8c45595ea50b00d51df3 HEAD_REF master PATCHES "curl-submodule-no-pkg-config-in-vcpkg.patch" ) diff --git a/ports/oatpp-libressl/CONTROL b/ports/oatpp-libressl/CONTROL index dd867ff361ff34..fc95db3d4978f3 100644 --- a/ports/oatpp-libressl/CONTROL +++ b/ports/oatpp-libressl/CONTROL @@ -1,4 +1,5 @@ Source: oatpp-libressl -Version: 1.0.0 +Version: 1.1.0 Build-Depends: libressl, oatpp Description: Oat++ libressl module providing secure server and client connection providers +Homepage: https://github.com/oatpp/oatpp-libressl diff --git a/ports/oatpp-libressl/portfile.cmake b/ports/oatpp-libressl/portfile.cmake index 14bb9f5e27508a..f453507f7420ab 100644 --- a/ports/oatpp-libressl/portfile.cmake +++ b/ports/oatpp-libressl/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.0.0") +set(OATPP_VERSION "1.1.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,8 +6,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-libressl - REF 2cf02b6fd08bb9be29bdbe5188f35f2155c0c843 # 1.0.0 - SHA512 053d017690d318edeeda63f782ee4845280b0f405e02249b18c30ac3d88cbfb1d3090bb6b60c0c8742f73357d60fa1695c369bef56a5ab7985d9773ea1fd52a2 + REF 8a7f0f4449b9dbf63fb60fb892bd16a2f5fb0fab # 1.1.0 + SHA512 f6400e3d3976de1ab0d220f4c7bd84cbeafa6263671511a7ac113f855ad6a63470cab0571320d37ccd55a768ef9f3ca61adfa9066aadfd61bd00f5020c90777c HEAD_REF master PATCHES "libress-submodule-downgrade-required-libressl-version.patch" ) diff --git a/ports/oatpp-mbedtls/CONTROL b/ports/oatpp-mbedtls/CONTROL index c4edffd72004d5..e1bacf1c2498ca 100644 --- a/ports/oatpp-mbedtls/CONTROL +++ b/ports/oatpp-mbedtls/CONTROL @@ -1,4 +1,5 @@ Source: oatpp-mbedtls -Version: 1.0.0 +Version: 1.1.0 Build-Depends: mbedtls, oatpp Description: Oat++ Mbed TLS submodule providing secure server and client connection providers +Homepage: https://github.com/oatpp/oatpp-mbedtls diff --git a/ports/oatpp-mbedtls/find-mbedtls.patch b/ports/oatpp-mbedtls/find-mbedtls.patch new file mode 100644 index 00000000000000..533fd26d7d770e --- /dev/null +++ b/ports/oatpp-mbedtls/find-mbedtls.patch @@ -0,0 +1,135 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6b1e8c0f2..b0ef5518d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,7 +97,7 @@ message("## ${OATPP_THIS_MODULE_NAME} module. Resolving dependencies...\n") + include(FindPkgConfig) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/module") + +-find_package(mbedtls 2.16.0 REQUIRED) ++find_package(mbedtls 2.16.3 REQUIRED) + + message("MBEDTLS_INCLUDE_DIR=${MBEDTLS_INCLUDE_DIR}") + message("MBEDTLS_TLS_LIBRARY=${MBEDTLS_TLS_LIBRARY}") +diff --git a/cmake/module/Findmbedtls.cmake b/cmake/module/Findmbedtls.cmake +index 8c76d0a73..5c223a615 100644 +--- a/cmake/module/Findmbedtls.cmake ++++ b/cmake/module/Findmbedtls.cmake +@@ -14,10 +14,10 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-FindmbedTLS ++Findmbedtls + ------------ + +-Find the mbedTLS encryption library. ++Find the mbedtls encryption library. + + Optional Components + ^^^^^^^^^^^^^^^^^^^ +@@ -31,16 +31,16 @@ Imported Targets + This module defines the following imported targets: + + mbedtls::Crypto +- The mbedTLS crypto library, if found. ++ The mbedtls crypto library, if found. + + mbedtls::X509 +- The mbedTLS x509 library, if found. ++ The mbedtls x509 library, if found. + + mbedtls::SSL +- The mbedTLS ssl library, if found. Requires and includes mbedtls::Crypto automatically. ++ The mbedtls ssl library, if found. Requires and includes mbedtls::Crypto automatically. + + mbedtls::TLS +- The mbedTLS tls library, if found. Requires and includes mbedtls::SSL and mbedtls::Crypto automatically. ++ The mbedtls tls library, if found. Requires and includes mbedtls::SSL and mbedtls::Crypto automatically. + + Result Variables + ^^^^^^^^^^^^^^^^ +@@ -48,26 +48,26 @@ Result Variables + This module will set the following variables in your project: + + MBEDTLS_FOUND +- System has the mbedTLS library. If no components are requested it only requires the crypto library. ++ System has the mbedtls library. If no components are requested it only requires the crypto library. + MBEDTLS_INCLUDE_DIR +- The mbedTLS include directory. ++ The mbedtls include directory. + MBEDTLS_X509_LIBRARY +- The mbedTLS crypto library. ++ The mbedtls crypto library. + MBEDTLS_CRYPTO_LIBRARY +- The mbedTLS crypto library. ++ The mbedtls crypto library. + MBEDTLS_SSL_LIBRARY +- The mbedTLS SSL library. ++ The mbedtls SSL library. + MBEDTLS_TLS_LIBRARY +- The mbedTLS TLS library. ++ The mbedtls TLS library. + MBEDTLS_LIBRARIES +- All mbedTLS libraries. ++ All mbedtls libraries. + MBEDTLS_VERSION + This is set to $major.$minor.$revision (e.g. 2.6.8). + + Hints + ^^^^^ + +-Set MBEDTLS_ROOT_DIR to the root directory of an mbedTLS installation. ++Set MBEDTLS_ROOT_DIR to the root directory of an mbedtls installation. + + ]=======================================================================] + +@@ -175,7 +175,7 @@ if(MBEDTLS_INCLUDE_DIR AND EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h") + endif() + + # Set Find Package Arguments +-find_package_handle_standard_args(mbedTLS ++find_package_handle_standard_args(mbedtls + REQUIRED_VARS + MBEDTLS_X509_LIBRARY + MBEDTLS_TLS_LIBRARY +@@ -185,12 +185,12 @@ find_package_handle_standard_args(mbedTLS + MBEDTLS_VERSION + HANDLE_COMPONENTS + FAIL_MESSAGE +- "Could NOT find mbedTLS, try setting the path to mbedTLS using the MBEDTLS_ROOT_DIR environment variable" ++ "Could NOT find mbedtls, try setting the path to mbedtls using the MBEDTLS_ROOT_DIR environment variable" + ) + +-# mbedTLS Found +-if(MBEDTLS_FOUND) +- ++# mbedtls Found ++if(mbedtls_FOUND) ++ set(MBEDTLS_FOUND ${mbedtls_FOUND}) + # Set mbedtls::Crypto + if(NOT TARGET mbedtls::Crypto AND EXISTS "${MBEDTLS_CRYPTO_LIBRARY}") + +@@ -257,4 +257,4 @@ if(MBEDTLS_FOUND) + + endif() # mbedtls::TLS + +-endif(MBEDTLS_FOUND) ++endif(mbedtls_FOUND) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6811f05ea..d80430c3e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,9 +31,9 @@ target_include_directories(${OATPP_THIS_MODULE_NAME} + ) + + target_link_libraries(${OATPP_THIS_MODULE_NAME} +- PRIVATE mbedtls::TLS +- PRIVATE mbedtls::X509 +- PRIVATE mbedtls::Crypto ++ PRIVATE ${MBEDTLS_TLS_LIBRARY} ++ PRIVATE ${MBEDTLS_X509_LIBRARY} ++ PRIVATE ${MBEDTLS_CRYPTO_LIBRARY} + ) + + if(${OATPP_MBEDTLS_DEBUG} GREATER 0) diff --git a/ports/oatpp-mbedtls/portfile.cmake b/ports/oatpp-mbedtls/portfile.cmake index 18538fcf58f5f1..82eea23174a5a0 100644 --- a/ports/oatpp-mbedtls/portfile.cmake +++ b/ports/oatpp-mbedtls/portfile.cmake @@ -1,13 +1,14 @@ -set(OATPP_VERSION "1.0.0") +set(OATPP_VERSION "1.1.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-mbedtls - REF f4223fe43c3db3d5a8638f5682ab19ce9f2c8342 # 1.0.0 - SHA512 ff36d74d295f4351b2b10df585c76704f9f63a65fa91856c32f65d914e1cae8bcdd866310d8a2d6ac6f1b4af1ebc610b607327669be6d13b1773dd5117707c25 + REF 847b9562ddcd40f1d2b340177028b3519fb1f58a # 1.1.0 + SHA512 70559a33fb7a827714c353b158af8ef90fc5cd792e7f59bcf833ebd203874370e6f8f5b7a531497ea44d406cc515c42bfbef8d4f98e5e8074a141ba2ba78890b HEAD_REF master + PATCHES find-mbedtls.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/oatpp-swagger/CONTROL b/ports/oatpp-swagger/CONTROL index bb320bc2f61ddd..d45a5e7de9bc19 100644 --- a/ports/oatpp-swagger/CONTROL +++ b/ports/oatpp-swagger/CONTROL @@ -1,4 +1,5 @@ Source: oatpp-swagger -Version: 1.0.0 +Version: 1.1.0 Description: Oat++ OpenApi (Swagger) UI submodule Build-Depends: oatpp +Homepage: https://github.com/oatpp/oatpp-swagger diff --git a/ports/oatpp-swagger/portfile.cmake b/ports/oatpp-swagger/portfile.cmake index a39b11a8ed7613..c8773b64392b64 100644 --- a/ports/oatpp-swagger/portfile.cmake +++ b/ports/oatpp-swagger/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.0.0") +set(OATPP_VERSION "1.1.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-swagger - REF 8e4a5d32f82ff71ad645fbfb7e5257a6b611ecfd # 1.0.0 - SHA512 9ae31686689862667871531e92625239fd8b54a6ed77b54ab85ecb09633afae0d450be5bcee6e266d01b2edc602bae6c0ab59dd12f926d689f7183373a39bb21 + REF 7aa5ecb07bfbf9931aa7906247d8c8f59f35a4b4 # 1.1.0 + SHA512 df1f61e69ad2a7a533bc2b2a78342edb6954ba77980cf941d22f09e86d2fe85073863061aec44ccd80f15b8ea70d5fc70024c806f85cddc6790331ee718ad8bc HEAD_REF master ) diff --git a/ports/oatpp-websocket/CONTROL b/ports/oatpp-websocket/CONTROL index 75d9104ae286fc..cf6ca6c18f8aa4 100644 --- a/ports/oatpp-websocket/CONTROL +++ b/ports/oatpp-websocket/CONTROL @@ -1,4 +1,5 @@ Source: oatpp-websocket -Version: 1.0.0 +Version: 1.1.0 Description: Oat++ websocket module Build-Depends: oatpp +Homepage: https://github.com/oatpp/oatpp-websocket diff --git a/ports/oatpp-websocket/portfile.cmake b/ports/oatpp-websocket/portfile.cmake index ed871ab22f5341..51181527658b1f 100644 --- a/ports/oatpp-websocket/portfile.cmake +++ b/ports/oatpp-websocket/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.0.0") +set(OATPP_VERSION "1.1.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-websocket - REF d047321db5ca9194b0035eea481623983a59c82c # 1.0.0 - SHA512 76e411557a790fccbd346241826a89a01f707ecb6bf3295fd4c7af706d376d5cb21070ee375b45ce1aa14ad8d79db753c1adbc2b503b79c8b8e5ae59a044b03b + REF 41a0480fdd4cf8a076c9fbd79959be1156ecb204 # 1.1.0 + SHA512 7237e6d94ebc4873ee9a3350b01f2a841f419dc8fbc917a51aebd2dcd89927e1a58816dc83040bb7da1cee36d81aba6cf17833c58831c8693fd1454021610908 HEAD_REF master ) diff --git a/ports/oatpp/CONTROL b/ports/oatpp/CONTROL index fa72f6939bca39..7b100d4cd1b609 100644 --- a/ports/oatpp/CONTROL +++ b/ports/oatpp/CONTROL @@ -1,3 +1,4 @@ Source: oatpp -Version: 1.0.0 +Version: 1.1.0 Description: Modern web framework +Homepage: https://github.com/oatpp/oatpp diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index 2be9bc0c596d49..4b870197a86a9c 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -1,12 +1,12 @@ -set(OATPP_VERSION "1.0.0") +set(OATPP_VERSION "1.1.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp - REF 5a9f042a78e7a47d1788407c99f6257fc7b40fa9 # 1.0.0 - SHA512 133f69e43608b3b5eda929952c8fb49f08bbc114d75b326293a7ddf5f40b7b94ffcff7df2d999c91195ba9939166143ad173b27a962f4fb661f731f63a44116e + REF 4427123bb3608a78806ebce654cfe74605a389bf # 1.0.0 + SHA512 91f3b66d573b918836bb2190fbaa5579da0f5b93b4905ed44ec63db2e947c64fa1be00f14f4ce85ff1103ab59f79506abf6dfbfe7edf7176f2365613e7aef825 HEAD_REF master )