commit: c7fab4a9cb79e0cb5346a256490db91f41077cdd Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Fri Feb 7 23:52:47 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 8 03:09:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7fab4a9
dev-cpp/cpp-httplib: add 0.18.6 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/40482 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/cpp-httplib/Manifest | 1 + dev-cpp/cpp-httplib/cpp-httplib-0.18.6.ebuild | 96 ++++++++++++++++++++++ .../files/cpp-httplib-0.18.6-onlinetest.patch | 13 +++ 3 files changed, 110 insertions(+) diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest index 4178faed563b..a104866b6d12 100644 --- a/dev-cpp/cpp-httplib/Manifest +++ b/dev-cpp/cpp-httplib/Manifest @@ -1,2 +1,3 @@ DIST cpp-httplib-0.18.1.tar.gz 1323636 BLAKE2B 8335c9a4d69d7e9b2e7e3c4036b49627536c8d6cffa7a5ae2c3dff693c5458f7fa2f89f3da2c130325069225d3204ec579900d5c5266dff7a9c732c134b39907 SHA512 6dd1054d0171594bf871a918b5540cc67981a48f7dbb82e9029a4877afc6d8c36e2f69411f5eec7b052bf0245554d01f33ef2180f42a15f6b8dd86ebb2427a41 DIST cpp-httplib-0.18.3.tar.gz 1324253 BLAKE2B 995ae8cd63013ec03e86f56e089b4f1374a8913eaf02d8fc07997b986dc8f65b1bda710ed686b6cc111e6203d15bbcb9db08cd810d2167c1658bfa99dc9b61b2 SHA512 d9eb70dfd8ebde658852d1a8cf9f96419ca11cad889b54672aa4812c0b5db0c3f1fddf63f536aec19fc4a849f41ed22461581a18f0733d3f906e45dd096bafd8 +DIST cpp-httplib-0.18.6.tar.gz 1326428 BLAKE2B bee65790b8f2a19f80fd8f38799d650ceaef021b6e9f28b2fd0678f4c50b95d210f9764775d67365e65e6f9e03d6999091f28aa553655444c8ff369172cf13f9 SHA512 326c1b3315256c1e1e8b6406b9209215f5c264e1071ab3de400011486713b90cb8f88b48ac979fb024ba91441c2fb00aa40a15b85bfac9895c052f2131773249 diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.18.6.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.18.6.ebuild new file mode 100644 index 000000000000..965ef9b2eb87 --- /dev/null +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.18.6.ebuild @@ -0,0 +1,96 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) + +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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0/${PV}" # soversion / /usr/include/httplib.h: CPPHTTPLIB_VERSION + +IUSE="brotli ssl test zlib" +REQUIRED_USE="test? ( brotli ssl zlib )" +RESTRICT="!test? ( test )" + +RDEPEND=" + brotli? ( + app-arch/brotli:=[${MULTILIB_USEDEP}] + ) + ssl? ( + >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] + ) + zlib? ( + sys-libs/zlib[${MULTILIB_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} +" + +PATCHES=( + "${FILESDIR}/${P}-onlinetest.patch" +) + +src_configure() { + local -a mycmakeargs=( + -DHTTPLIB_COMPILE=yes + -DBUILD_SHARED_LIBS=yes + -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no + -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no + -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no + -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) + -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl) + -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) + -DPython3_EXECUTABLE="${PYTHON}" + ) + cmake-multilib_src_configure +} + +multilib_src_test() { + cp -p -R --reflink=auto "${S}/test" ./test || die + + local -a failing_tests=( + # Disable all online tests. + "*.*_Online" + + # Fails on musl x86: + ServerTest.GetRangeWithMaxLongLength + ServerTest.GetStreamedWithTooManyRanges + + # https://github.com/yhirose/cpp-httplib/issues/1798 + # Filed by mgorny's testing, fails on openssl >=3.2: + SSLClientServerTest.ClientCertPresent + SSLClientServerTest.ClientEncryptedCertPresent + SSLClientServerTest.CustomizeServerSSLCtx + SSLClientServerTest.MemoryClientCertPresent + SSLClientServerTest.MemoryClientEncryptedCertPresent + SSLClientServerTest.TrustDirOptional + ) + + # Little dance to please the GTEST filter (join array using ":"). + failing_tests_str="${failing_tests[@]}" + failing_tests_filter="${failing_tests_str// /:}" + + # PREFIX is . to avoid calling "brew" and relying on stuff in /opt + GTEST_FILTER="-${failing_tests_filter}" emake -C test \ + CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=. +} diff --git a/dev-cpp/cpp-httplib/files/cpp-httplib-0.18.6-onlinetest.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.18.6-onlinetest.patch new file mode 100644 index 000000000000..6a12251a644f --- /dev/null +++ b/dev-cpp/cpp-httplib/files/cpp-httplib-0.18.6-onlinetest.patch @@ -0,0 +1,13 @@ +https://github.com/yhirose/cpp-httplib/issues/2042 + +--- a/test/test.cc ++++ b/test/test.cc +@@ -6189,7 +6189,7 @@ TEST(SSLClientTest, WildcardHostNameMatch_Online) { + ASSERT_EQ(StatusCode::OK_200, res->status); + } + +-TEST(SSLClientTest, Issue2004) { ++TEST(SSLClientTest, Issue2004_Online) { + Client client("https://google.com";); + client.set_follow_location(true); +
