From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 509671581B9 for ; Mon, 22 Sep 2025 02:41:22 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 36B72341A5B for ; Mon, 22 Sep 2025 02:41:22 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2C672110574; Mon, 22 Sep 2025 02:41:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 23D90110574 for ; Mon, 22 Sep 2025 02:41:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB667341030 for ; Mon, 22 Sep 2025 02:41:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C2FA38CD for ; Mon, 22 Sep 2025 02:41:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1758508815.72c8d81471764e7447a5606e60a7fd9fd08e1e0d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libmicrohttpd/, net-libs/libmicrohttpd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test-with-curl-8-16.patch net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild X-VCS-Directories: net-libs/libmicrohttpd/ net-libs/libmicrohttpd/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 72c8d81471764e7447a5606e60a7fd9fd08e1e0d X-VCS-Branch: master Date: Mon, 22 Sep 2025 02:41:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7c986fd1-f174-446d-a98b-e5d64b829619 X-Archives-Hash: 7bb6a3b939d429248447c62e7bc2bb47 commit: 72c8d81471764e7447a5606e60a7fd9fd08e1e0d Author: Evgeny Grin (Karlson2k) drgrin dev> AuthorDate: Sun Sep 21 14:49:08 2025 +0000 Commit: Sam James gentoo 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) drgrin.dev> Part-of: https://github.com/gentoo/gentoo/pull/43889 Closes: https://github.com/gentoo/gentoo/pull/43889 Signed-off-by: Sam James 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)" +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