diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-08-07 18:34:18 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-08-07 18:34:18 +0000 |
| commit | ac448403b0b99947600681f5828e8456d5bbdfa5 (patch) | |
| tree | d1731ba7706c9baf9b95240c72005cd0b4683471 /dev-cpp/cpp-httplib | |
| parent | ce8004e4e9d484234994b9dacc3c09ea894812ea (diff) | |
| download | baldeagleos-repo-ac448403b0b99947600681f5828e8456d5bbdfa5.tar.gz baldeagleos-repo-ac448403b0b99947600681f5828e8456d5bbdfa5.tar.xz baldeagleos-repo-ac448403b0b99947600681f5828e8456d5bbdfa5.zip | |
Adding metadata
Diffstat (limited to 'dev-cpp/cpp-httplib')
| -rw-r--r-- | dev-cpp/cpp-httplib/Manifest | 2 | ||||
| -rw-r--r-- | dev-cpp/cpp-httplib/cpp-httplib-0.16.1.ebuild (renamed from dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild) | 30 | ||||
| -rw-r--r-- | dev-cpp/cpp-httplib/files/cpp-httplib-0.16.1-httplib_h.patch | 33 |
3 files changed, 51 insertions, 14 deletions
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest index a46a3958fa01..7408dd9cc4d2 100644 --- a/dev-cpp/cpp-httplib/Manifest +++ b/dev-cpp/cpp-httplib/Manifest @@ -1,2 +1,2 @@ -DIST cpp-httplib-0.15.3.tar.gz 1151398 BLAKE2B 8ce7d7e59c0954efb14a11e565f9cdf02c007a3b6d39dbdcb21b412906eed3ceeca3182096f4b4eadb32a5886e839e64774ae9a1110ddb60fb7cdea35b5b7d50 SHA512 f7fc9c9eb71f091b82958e023a7b417b30d2590fd5d1a920d1c98361f34bcaca796dbeda7f9fdb8b2c722a8968977b77463c6cbb252cba9823a79c22471fa439 DIST cpp-httplib-0.16.0.tar.gz 1156790 BLAKE2B 4a75059f16f6e46685c2cf028c6fa4c9cd50c35273795a8dbb6ca9d2997146b04b305893ad50adbb62c39db14ab3f589e902353bb199ee167d2648fe3621aee1 SHA512 63dc5a50f425e7be909d60db138caa1b9d7260c5d4db26603011a329f0d6a645d56f436c79466fbe662f24a94bc0f72926062b3ed49cb658eb91a6bdb2ddf25b +DIST cpp-httplib-0.16.1.tar.gz 1157395 BLAKE2B 5fb5b5508411819be66df1b3365511d76958715eab7da48022388c8de6332c3726aa1d49d81bbe194ccdb3af2206f6dc1d93c0375cd9452d9c90dc405cc47a99 SHA512 ddd9cedb08a892ff550d6188f91f49fe634dbc86c828a83a58068adf6fae950294a95621729e6203d5df8670c2a8c5ea9ca035ef6948067ae5ca300190cb6f0f diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.1.ebuild index 540afb02dbe8..7e47d15b3de1 100644 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.1.ebuild @@ -9,17 +9,8 @@ inherit cmake-multilib python-any-r1 toolchain-funcs DESCRIPTION="C++ HTTP/HTTPS server and client library" HOMEPAGE="https://github.com/yhirose/cpp-httplib/" -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/yhirose/${PN}.git" -else - SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" -fi - +SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" # soversion @@ -28,12 +19,16 @@ REQUIRED_USE="test? ( brotli ssl zlib )" RESTRICT="!test? ( test )" RDEPEND=" - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + brotli? ( + app-arch/brotli:=[${MULTILIB_USEDEP}] + ) ssl? ( !libressl? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zlib? ( + sys-libs/zlib[${MULTILIB_USEDEP}] + ) " DEPEND=" ${RDEPEND} @@ -42,6 +37,15 @@ BDEPEND=" ${PYTHON_DEPS} " +src_prepare() { + if use libressl; then + eapply -p1 $FILESDIR/cmakelists.patch + eapply -p1 $FILESDIR/${PN}-0.16.1-httplib_h.patch + fi + + cmake_src_prepare +} + src_configure() { local -a mycmakeargs=( -DHTTPLIB_COMPILE=yes diff --git a/dev-cpp/cpp-httplib/files/cpp-httplib-0.16.1-httplib_h.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.16.1-httplib_h.patch new file mode 100644 index 000000000000..069469fc1fc9 --- /dev/null +++ b/dev-cpp/cpp-httplib/files/cpp-httplib-0.16.1-httplib_h.patch @@ -0,0 +1,33 @@ +diff '--color=auto' -urN cpp-httplib-0.16.1.orig/httplib.h cpp-httplib-0.16.1/httplib.h +--- cpp-httplib-0.16.1.orig/httplib.h 2024-08-07 18:39:18.623564657 +0200 ++++ cpp-httplib-0.16.1/httplib.h 2024-08-07 18:43:50.987584273 +0200 +@@ -269,7 +269,7 @@ + #include <iostream> + #include <sstream> + +-#if OPENSSL_VERSION_NUMBER < 0x30000000L ++#if OPENSSL_VERSION_NUMBER < 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER) + #error Sorry, OpenSSL versions prior to 3.0.0 are not supported + #endif + +@@ -727,8 +727,10 @@ + fn(); + } + +-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT ++#if defined(CPPHTTPLIB_OPENSSL_SUPPORT) && !defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_thread_stop(); ++#else ++ ERR_remove_state(0); + #endif + } + +@@ -9078,7 +9080,7 @@ + return false; + } + +- auto server_cert = SSL_get1_peer_certificate(ssl2); ++ auto server_cert = SSL_get_peer_certificate(ssl2); + + if (server_cert == nullptr) { + error = Error::SSLServerVerification; |