From 122e5ce39fdfe299059d11c4fe43f80bc24e7514 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 14 Apr 2025 07:10:35 +0000 Subject: [PATCH] net-libs/libmicrohttpd: Sync with Gentoo It's from Gentoo commit 2d39e230d9f4e899241ff6e7aeb97ebf4cad5a52. --- .../net-libs/libmicrohttpd/Manifest | 2 - ...httpd-0.9.76-fix-test_tricky-libcurl.patch | 62 +++++++++++ .../libmicrohttpd-0.9.76-r1.ebuild | 104 ------------------ .../libmicrohttpd/libmicrohttpd-0.9.76.ebuild | 98 ----------------- .../libmicrohttpd-0.9.77-r1.ebuild | 6 +- .../libmicrohttpd/libmicrohttpd-0.9.77.ebuild | 6 +- .../libmicrohttpd-1.0.1-r1.ebuild | 6 +- .../libmicrohttpd/libmicrohttpd-1.0.1.ebuild | 6 +- 8 files changed, 82 insertions(+), 208 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test_tricky-libcurl.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.76-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/Manifest index fed90be311..93b31ec092 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/Manifest @@ -1,5 +1,3 @@ -DIST libmicrohttpd-0.9.76.tar.gz 2199858 BLAKE2B 2c2de77d731ff130bb1491733b91e9e0b0c68bc30ea1a826f7f1d97aaf83fa7f6bec3c219f81c5293de72595b26d1e6eb66cdd4bfe3b16bd37a10e3acd3c6446 SHA512 9ff8a837892142376eaeaf50c0b0dba76697d0ff44b908434cba8db4324c57dfb8bbcc1a922b97d825891ac10f50693dee9388531856e0fa81fa2cfeac538581 -DIST libmicrohttpd-0.9.76.tar.gz.sig 566 BLAKE2B 84c9ecf45cdd24223374831a1a635db389119196312685d74d6324bbe133a075615026252e4317baf0496bb4ddb249d76560ade5a91cf5995bfc8cca4699957f SHA512 304421dbf2b0763113affa50dcdcefd6d44bcc33b8af521ac9a3002ba4befafe9b78d49a3ab63bd8972e95e65c7bac47592b7bb05a78de1e84d4690220dbceaa DIST libmicrohttpd-0.9.77.tar.gz 1896679 BLAKE2B 09a07c7da77d6072e5aa0fb121aedffb66b6cfdb2da30d1809583469282365832beb935417e779ddb31876949358d25c10bf79616079393503ca5860d88ac052 SHA512 001025c023dd94c4a0cf017ed575e65a577b5ce595e7e450346bfb75def77eaa8a4cfbeffb9f4b912e34165c2cfca147c02c895e067a4f6c5a321a12035758a5 DIST libmicrohttpd-0.9.77.tar.gz.sig 581 BLAKE2B 99ea14c7a80b0ed542672752617b045bea9a16a906e43422a130e83de048ea4d989ab53978b25b77f2982da9599aea711357c05b5a48fb5be84583c04596686c SHA512 60489620bfb2388afb19dd91c105927e593c6a17ba0293b4814c746b66d4f0418edafe49837de333640c1479bacde3e46740b031c2d4ec5bd106493122c87b19 DIST libmicrohttpd-1.0.1.tar.gz 2239593 BLAKE2B a29e49c719fc544ae72224d81cba7b7ef914f2641efe4b90d580d2212f2c3357a6d70499c43a6f50d14f4ec9d3102da8de899fe0420bf6660eb413080d89b7f7 SHA512 c99b8b93cae5feee8debcc5667ee3ff043412a84b30696fe852e6c138f3c890bb43c8fcd7199f1d2f809d522fef159e83b607c743d6cf3401a57050fbdf9b5c1 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test_tricky-libcurl.patch b/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.76-fix-test_tricky-libcurl.patch new file mode 100644 index 0000000000..8b44438c16 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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)" +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/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.76-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.76-r1.ebuild deleted file mode 100644 index 58dd993e0c..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.76-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit multilib-minimal verify-sig - -MY_P="${P/_/}" - -DESCRIPTION="Small C library to run an HTTP server as part of another application" -HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" -SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz - verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" -S="${WORKDIR}"/${MY_P} - -LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )" -SLOT="0/12" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="+epoll ssl static-libs test +thread-names verify-sig" -RESTRICT="!test? ( test )" - -KEYRING_VER=201906 - -RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )" -# libcurl and the curl binary are used during tests on CHOST -DEPEND="${RDEPEND} - test? ( net-misc/curl[ssl?] )" -BDEPEND="ssl? ( virtual/pkgconfig ) - verify-sig? ( ~sec-keys/openpgp-keys-libmicrohttpd-${KEYRING_VER} )" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libmicrohttpd-${KEYRING_VER}.asc - -DOCS=( AUTHORS NEWS COPYING README ChangeLog ) - -PATCHES=( "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch ) - -# All checks in libmicrohttpd's configure are correct -# Gentoo Bug #898662 -# Gentoo Bug #923760 -QA_CONFIG_IMPL_DECL_SKIP=( - 'pthread_sigmask' - 'CreateThread' - 'pthread_attr_init' - 'pthread_attr_setname_np' - 'pthread_setname_np' - '__builtin_bswap32' - '__builtin_bswap64' - 'WSAPoll' - 'epoll_create1' - 'eventfd' - 'pipe' - 'pipe2' - 'socketpair' - 'gmtime_s' - 'host_get_clock_service' - 'clock_get_time' - 'mach_port_deallocate' - 'gethrtime' - 'timespec_get' - 'gettimeofday' - 'sendfile' - 'gnutls_privkey_import_x509_raw' - 'calloc' - 'fork' - 'waitpid' - 'random' - 'rand' - 'getsockname' - 'sysconf' - 'sysctl' - 'sysctlbyname' - 'usleep' - 'nanosleep' - 'stpncpy' -) - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - --disable-nls \ - --enable-bauth \ - --enable-dauth \ - --disable-examples \ - --enable-messages \ - --enable-postprocessor \ - --enable-httpupgrade \ - --disable-experimental \ - --disable-heavy-tests \ - $(use_enable thread-names) \ - $(use_enable epoll) \ - $(use_enable test curl) \ - $(use_enable ssl https) \ - $(use_with ssl gnutls) -} - -multilib_src_install_all() { - default - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild deleted file mode 100644 index 814c7a7fb3..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit multilib-minimal - -MY_P="${P/_/}" - -DESCRIPTION="Small C library to run an HTTP server as part of another application" -HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" -SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )" -SLOT="0/12" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+epoll ssl static-libs test +thread-names" -RESTRICT="!test? ( test )" - -RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )" -# libcurl and the curl binary are used during tests on CHOST -DEPEND="${RDEPEND} - test? ( net-misc/curl[ssl?] )" -BDEPEND="ssl? ( virtual/pkgconfig )" - -DOCS=( AUTHORS NEWS COPYING README ChangeLog ) - -PATCHES=( "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch ) - -# All checks in libmicrohttpd's configure are correct -# Gentoo Bug #898662 -# Gentoo Bug #923760 -QA_CONFIG_IMPL_DECL_SKIP=( - 'pthread_sigmask' - 'CreateThread' - 'pthread_attr_init' - 'pthread_attr_setname_np' - 'pthread_setname_np' - '__builtin_bswap32' - '__builtin_bswap64' - 'WSAPoll' - 'epoll_create1' - 'eventfd' - 'pipe' - 'pipe2' - 'socketpair' - 'gmtime_s' - 'host_get_clock_service' - 'clock_get_time' - 'mach_port_deallocate' - 'gethrtime' - 'timespec_get' - 'gettimeofday' - 'sendfile' - 'gnutls_privkey_import_x509_raw' - 'calloc' - 'fork' - 'waitpid' - 'random' - 'rand' - 'getsockname' - 'sysconf' - 'sysctl' - 'sysctlbyname' - 'usleep' - 'nanosleep' - 'stpncpy' -) - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - --disable-nls \ - --enable-bauth \ - --enable-dauth \ - --disable-examples \ - --enable-messages \ - --enable-postprocessor \ - --enable-httpupgrade \ - --disable-experimental \ - --disable-heavy-tests \ - $(use_enable thread-names) \ - $(use_enable epoll) \ - $(use_enable test curl) \ - $(use_enable ssl https) \ - $(use_with ssl gnutls) -} - -multilib_src_install_all() { - default - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild index b0d9af648e..4809b2606c 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.77-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild index 5b2d7ac477..e21c8449ed 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild index 00b5a46c27..2ba8759910 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-1.0.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild index b196d442e8..5122d6e835 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/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=(