* [gentoo-commits] repo/gentoo:master commit in: net-libs/libmicrohttpd/files/, net-libs/libmicrohttpd/
@ 2025-04-13 20:38 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2025-04-13 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 2d39e230d9f4e899241ff6e7aeb97ebf4cad5a52
Author: Evgeny Grin (Karlson2k) <k2k <AT> drgrin <DOT> dev>
AuthorDate: Sun Apr 13 13:27:34 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 20:37:31 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d39e230
net-libs/libmicrohttpd: fix tests with curl-8.13
libcurl changed behaviour, tests needs to be adapted.
Closes: https://bugs.gentoo.org/953520
Signed-off-by: Evgeny Grin (Karlson2k) <k2k <AT> drgrin.dev>
Closes: https://github.com/gentoo/gentoo/pull/41572
Signed-off-by: Sam James <sam <AT> gentoo.org>
...microhttpd-0.9.76-fix-test_tricky-libcurl.patch | 62 ++++++++++++++++++++++
.../libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild | 6 ++-
net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild | 6 ++-
.../libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild | 6 ++-
net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild | 6 ++-
5 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test_tricky-libcurl.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test_tricky-libcurl.patch
new file mode 100644
index 000000000000..8b44438c1673
--- /dev/null
+++ b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test_tricky-libcurl.patch
@@ -0,0 +1,62 @@
+From 036f8fdec2802e48e2555b2caf381bb1c565ab82 Mon Sep 17 00:00:00 2001
+From: "Evgeny Grin (Karlson2k)" <k2k@narod.ru>
+Date: Fri, 11 Apr 2025 20:13:48 +0300
+Subject: test_tricky.c: applied a minimal fix for the libcurl >= 8.13.0
+
+---
+ src/testcurl/test_tricky.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c
+index 8cb53a80..bcbcf1ce 100644
+--- a/src/testcurl/test_tricky.c
++++ b/src/testcurl/test_tricky.c
+@@ -452,6 +452,11 @@ struct curlQueryParams
+ CURLU *url;
+ #endif /* CURL_AT_LEAST_VERSION(7, 62, 0) */
+
++#if CURL_AT_LEAST_VERSION (7, 55, 0)
++ /* A string used as the request target directly, without modifications */
++ const char *queryTarget;
++#endif /* CURL_AT_LEAST_VERSION(7, 55, 0) */
++
+ /* Custom query method, NULL for default */
+ const char *method;
+
+@@ -520,6 +525,16 @@ curlEasyInitForTest (struct curlQueryParams *p,
+ libcurlErrorExitDesc ("curl_easy_setopt() failed");
+ }
+ #endif /* CURL_AT_LEAST_VERSION(7, 62, 0) */
++
++#if CURL_AT_LEAST_VERSION (7, 55, 0)
++ if (NULL != p->queryTarget)
++ {
++ if (CURLE_OK != curl_easy_setopt (c, CURLOPT_REQUEST_TARGET,
++ p->queryTarget))
++ libcurlErrorExitDesc ("curl_easy_setopt() failed");
++ }
++#endif /* CURL_AT_LEAST_VERSION(7, 55, 0) */
++
+ return c;
+ }
+
+@@ -738,6 +753,9 @@ performTestQueries (struct MHD_Daemon *d, uint16_t d_port,
+ qParam.queryPort = d_port;
+ qParam.method = NULL; /* Use libcurl default: GET */
+ qParam.queryPath = URL_SCHEME_HOST EXPECTED_URI_BASE_PATH;
++#if CURL_AT_LEAST_VERSION (7, 55, 0)
++ qParam.queryTarget = NULL;
++#endif /* CURL_AT_LEAST_VERSION(7, 55, 0) */
+ #if CURL_AT_LEAST_VERSION (7, 62, 0)
+ qParam.url = NULL;
+ #endif /* CURL_AT_LEAST_VERSION(7, 62, 0) */
+@@ -781,6 +799,7 @@ performTestQueries (struct MHD_Daemon *d, uint16_t d_port,
+ libcurlErrorExit ();
+
+ qParam.queryPath = NULL;
++ qParam.queryTarget = EXPECTED_URI_BASE_PATH_TRICKY;
+ uri_cb_param->uri = EXPECTED_URI_BASE_PATH_TRICKY;
+ ahc_param->rq_url = EXPECTED_URI_BASE_PATH_TRICKY;
+
+--
+cgit v1.2.3
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild
index b0d9af648ee3..4809b2606c1b 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -33,6 +33,10 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libmicrohttpd-${KEYRING_VER}
DOCS=( AUTHORS NEWS COPYING README ChangeLog )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.76-fix-test_tricky-libcurl.patch # Gentoo Bug #953520
+)
+
# All checks in libmicrohttpd's configure are correct
# Gentoo Bug #923760
QA_CONFIG_IMPL_DECL_SKIP=(
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild
index 5b2d7ac4777c..e21c8449ed7f 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -27,6 +27,10 @@ BDEPEND="ssl? ( virtual/pkgconfig )"
DOCS=( AUTHORS NEWS COPYING README ChangeLog )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.76-fix-test_tricky-libcurl.patch # Gentoo Bug #953520
+)
+
# All checks in libmicrohttpd's configure are correct
# Gentoo Bug #923760
QA_CONFIG_IMPL_DECL_SKIP=(
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild
index 00b5a46c2753..2ba87599103c 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -33,6 +33,10 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libmicrohttpd-${KEYRING_VER}
DOCS=( AUTHORS NEWS COPYING README ChangeLog )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.76-fix-test_tricky-libcurl.patch # Gentoo Bug #953520
+)
+
# All checks in libmicrohttpd's configure are correct
# Gentoo Bug #923760
QA_CONFIG_IMPL_DECL_SKIP=(
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild
index b196d442e85e..5122d6e83571 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -27,6 +27,10 @@ BDEPEND="ssl? ( virtual/pkgconfig )"
DOCS=( AUTHORS NEWS COPYING README ChangeLog )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.76-fix-test_tricky-libcurl.patch # Gentoo Bug #953520
+)
+
# All checks in libmicrohttpd's configure are correct
# Gentoo Bug #923760
QA_CONFIG_IMPL_DECL_SKIP=(
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-04-13 20:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-13 20:38 [gentoo-commits] repo/gentoo:master commit in: net-libs/libmicrohttpd/files/, net-libs/libmicrohttpd/ Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox