commit: 72c8d81471764e7447a5606e60a7fd9fd08e1e0d Author: Evgeny Grin (Karlson2k) <k2k <AT> drgrin <DOT> dev> AuthorDate: Sun Sep 21 14:49:08 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Sep 22 02:40:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c8d814
net-libs/libmicrohttpd: fix testing with curl-8.16 Closes: https://bugs.gentoo.org/962980 Signed-off-by: Evgeny Grin (Karlson2k) <k2k <AT> drgrin.dev> Part-of: https://github.com/gentoo/gentoo/pull/43889 Closes: https://github.com/gentoo/gentoo/pull/43889 Signed-off-by: Sam James <sam <AT> gentoo.org> ...microhttpd-0.9.76-fix-test-with-curl-8-16.patch | 32 ++++++++++++++++++++++ .../libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild | 1 + net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild | 1 + .../libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild | 1 + net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild | 1 + 5 files changed, 36 insertions(+) diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test-with-curl-8-16.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test-with-curl-8-16.patch new file mode 100644 index 000000000000..d227fd11caf8 --- /dev/null +++ b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test-with-curl-8-16.patch @@ -0,0 +1,32 @@ +From b03f13f32c2547b050f88e0a5ad758734c9be96c Mon Sep 17 00:00:00 2001 +From: "Evgeny Grin (Karlson2k)" <[email protected]> +Date: Sun, 21 Sep 2025 16:20:49 +0200 +Subject: test_get_close_keep_alive: a minimal fix for curl 8.16 + +curl 8.16 is silently dropping second 'Connection: ' header from +requests, making some of the checks in the test unreliable. + +See https://bugs.gnunet.org/view.php?id=10403 +--- + src/testcurl/test_get_close_keep_alive.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/testcurl/test_get_close_keep_alive.c b/src/testcurl/test_get_close_keep_alive.c +index 243a8087..0e70a348 100644 +--- a/src/testcurl/test_get_close_keep_alive.c ++++ b/src/testcurl/test_get_close_keep_alive.c +@@ -919,6 +919,11 @@ performTestQueries (struct MHD_Daemon *d, uint16_t d_port) + if ((! ! res_close) != (! ! conn_close)) + continue; /* Another mode is in test currently */ + ++#if CURL_AT_LEAST_VERSION (8,16,0) ++ if ((f_client_close) && (f_client_k_alive)) ++ continue; ++#endif /* CURL >= 8.16.0 */ ++ + mhd_add_close = f_mhd_close; + mhd_set_10_cmptbl = f_10_cmptbl; + mhd_set_10_server = f_10_server; +-- +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 4809b2606c1b..fe3223ca1a71 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild @@ -35,6 +35,7 @@ DOCS=( AUTHORS NEWS COPYING README ChangeLog ) PATCHES=( "${FILESDIR}"/${PN}-0.9.76-fix-test_tricky-libcurl.patch # Gentoo Bug #953520 + "${FILESDIR}"/${PN}-0.9.76-fix-test-with-curl-8-16.patch # Gentoo Bug #962980 ) # All checks in libmicrohttpd's configure are correct diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild index 3564374f832b..63aeb9b94ccc 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild @@ -29,6 +29,7 @@ DOCS=( AUTHORS NEWS COPYING README ChangeLog ) PATCHES=( "${FILESDIR}"/${PN}-0.9.76-fix-test_tricky-libcurl.patch # Gentoo Bug #953520 + "${FILESDIR}"/${PN}-0.9.76-fix-test-with-curl-8-16.patch # Gentoo Bug #962980 ) # All checks in libmicrohttpd's configure are correct diff --git a/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild index 8826509fe97b..8c3bbd8837fe 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild @@ -35,6 +35,7 @@ DOCS=( AUTHORS NEWS COPYING README ChangeLog ) PATCHES=( "${FILESDIR}"/${PN}-0.9.76-fix-test_tricky-libcurl.patch # Gentoo Bug #953520 + "${FILESDIR}"/${PN}-0.9.76-fix-test-with-curl-8-16.patch # Gentoo Bug #962980 ) # All checks in libmicrohttpd's configure are correct diff --git a/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild index 5122d6e83571..c78ba3889418 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild @@ -29,6 +29,7 @@ DOCS=( AUTHORS NEWS COPYING README ChangeLog ) PATCHES=( "${FILESDIR}"/${PN}-0.9.76-fix-test_tricky-libcurl.patch # Gentoo Bug #953520 + "${FILESDIR}"/${PN}-0.9.76-fix-test-with-curl-8-16.patch # Gentoo Bug #962980 ) # All checks in libmicrohttpd's configure are correct
