[gentoo-commits] repo/proj/libressl:master commit in: dev-cpp/cpp-httplib/, dev-cpp/cpp-httplib/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "orbea" <orbea@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-cpp/cpp-httplib/, dev-cpp/cpp-httplib/files/
Date: Tue, 22 Oct 2024 18:12:55 +0000 (UTC)	[thread overview]
Message-ID: <1729616129.a72a87780a51afafd04ecdbc1bf5e9c6f7c5c74b.orbea@gentoo> (raw)

commit:     a72a87780a51afafd04ecdbc1bf5e9c6f7c5c74b
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Oct 22 16:55:29 2024 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Tue Oct 22 16:55:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a72a8778

dev-cpp/cpp-httplib: drop 0.15.3-r1, 0.16.0, 0.16.2

Signed-off-by: orbea <orbea <AT> riseup.net>

 dev-cpp/cpp-httplib/Manifest                       |  3 -
 dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild   | 87 --------------------
 dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild      | 93 ---------------------
 dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild      | 94 ----------------------
 .../files/cpp-httplib-0.16.0-libressl.patch        | 27 -------
 5 files changed, 304 deletions(-)

diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index cc2f770..85b72ef 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,4 +1 @@
-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.2.tar.gz 1157538 BLAKE2B 0fdb3946e33f3af0a6b9646d5edf53572d67fb7e2334923c3ef9784aad569672c21e12c6d0f4c1f91ceccb8d9b3e8f14d51b21f4c6cf252da98024cee47cfcbe SHA512 d0a3d5477cb76cbbbc6da53b0abff3b45fd6b77c0d1686b355ce2904593c67c25849d2b1348e49b0b57ece5be91404fe976b06d75d34eb5068b1e130fd7ddbee
 DIST cpp-httplib-0.16.3.tar.gz 1157548 BLAKE2B 986a33043ddf86623f70f50244051089cb6b824866ee247de13772263c691fde2b10e9eeef2078265f0a91b5744dafd2940892cff03c1a9cfd4b35df0d446522 SHA512 1a0d40f17b526db74dfa51903f0d15876b20c836a438be8f87ac2b18e535c3fad1822fbad9cf97053705a2cedc8171ab648e2e8c823eeb2e180c347283f3de9a

diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild
deleted file mode 100644
index 526f3e0..0000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
-
-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}"/${PN}-0.16.0-libressl.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// /:}"
-
-	GTEST_FILTER="-${failing_tests_filter}" emake -C test \
-		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
-}

diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild
deleted file mode 100644
index d531529..0000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2022-2024 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 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
-
-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}-libressl.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// /:}"
-
-	GTEST_FILTER="-${failing_tests_filter}" emake -C test \
-		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
-}

diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild
deleted file mode 100644
index 0f11f64..0000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.16.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2022-2024 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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
-
-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}-libressl.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.16.0-libressl.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.16.0-libressl.patch
deleted file mode 100644
index f23ea82..0000000
--- a/dev-cpp/cpp-httplib/files/cpp-httplib-0.16.0-libressl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ project(httplib
- 
- # Change as needed to set an OpenSSL minimum version.
- # This is used in the installed Cmake config file.
--set(_HTTPLIB_OPENSSL_MIN_VER "3.0.0")
-+set(_HTTPLIB_OPENSSL_MIN_VER "2.0.0")
- 
- # Lets you disable C++ exception during CMake configure time.
- # The value is used in the install CMake config file.
---- a/httplib.h
-+++ b/httplib.h
-@@ -269,9 +269,13 @@ using socket_t = int;
- #include <iostream>
- #include <sstream>
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define SSL_get1_peer_certificate SSL_get_peer_certificate
-+#else
- #if OPENSSL_VERSION_NUMBER < 0x30000000L
- #error Sorry, OpenSSL versions prior to 3.0.0 are not supported
- #endif
-+#endif
- 
- #endif
-

next             reply	other threads:[~2024-10-22 18:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-22 18:12 orbea [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-06 17:02 [gentoo-commits] repo/proj/libressl:master commit in: dev-cpp/cpp-httplib/, dev-cpp/cpp-httplib/files/ orbea
2024-09-06 16:46 orbea

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:cc2f770 dfblob:85b72ef dfblob:526f3e0 dfblob:d531529
dfblob:0f11f64 dfblob:f23ea82 )
 OR (
bs:"[gentoo-commits] repo/proj/libressl:master commit in: dev-cpp/cpp-httplib/, dev-cpp/cpp-httplib/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1729616129.a72a87780a51afafd04ecdbc1bf5e9c6f7c5c74b.orbea@gentoo \
    --to=orbea@riseup.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox