commit: eca7a62a071f953c342f310591a6b8dc9a11cdd1 Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja> AuthorDate: Tue May 30 10:17:54 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 30 13:15:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eca7a62a
net-misc/curl: add 8.1.2 - put `einfo` messages in configure behind `multilib_is_native_abi` so that they aren't duplicated when built in multilib. Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja> Closes: https://github.com/gentoo/gentoo/pull/31226 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/curl/Manifest | 2 ++ .../curl/{curl-9999.ebuild => curl-8.1.2.ebuild} | 26 +++++++++++++--------- net-misc/curl/curl-9999.ebuild | 22 +++++++++--------- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 2d5667e3574a..11654edee63b 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -4,3 +4,5 @@ DIST curl-8.1.0.tar.xz 2612568 BLAKE2B 768a824b8f5f6ddaa073599c4106f07a8134bcbe0 DIST curl-8.1.0.tar.xz.asc 488 BLAKE2B c1a8e50eddc7dd140af2af29736eb486e96a6d3b67a9161244daa86558f65522527380c92597a5f10e5dad187f0bda6ac5b9cadc29386bef4492bc047c77b423 SHA512 191a74c7a6b6aa78b7f36e1535fda0701bde8b333a61c90343e1f1b2d65cc5097b5febc5fa42b2f373795ef1b34078790deaaa71c8aaa45eed1c753729a45f3d DIST curl-8.1.1.tar.xz 2613348 BLAKE2B 465a3237335e73665086ac43f5c66cfbab7e9b163e1ae0e2345da82f9c736d87fccf4d76369cc069abc29621f10db7ddbf22d0337db9ca85042bb12438d4aaed SHA512 d034b1ab9c00e8a0acf7ba6c6344734945d45666b4f38394f5456fcd9b22623146a897270861b7411412ca25c912e1bbf24eb139a6dfc1a8c00d098b3b925399 DIST curl-8.1.1.tar.xz.asc 488 BLAKE2B c92017d0fe4933d6c27d833944c231967263607a7871a658e0cbb9de46f7df8dfbec141e269296caf17ced004fb2b237b8311ec9f7bf98f03fb405b5755950fc SHA512 6a71c18d67de8c340b5d80c7452a82c00f7ef466f690eec12edcd6123aee6866e8a0e757e1cc6c9af87a63fdeaafbc9fc1b1a4e2e0fd8a75b5952d4738fd0b27 +DIST curl-8.1.2.tar.xz 2612652 BLAKE2B 66d0828912bb9971dac99025aa8b5c1c2fac1f8b568f2a8a97bd9f66986bdb164b603b539ec3e123cd6a26ea65829e58c90fc9852be88b42074cf40c89c566d1 SHA512 532ab96eba6dea66d272f3be56f5af5c5da922480f9a10e203de98037c311f12f8145ba6bf813831e42815e068874ccfd108f84f7650743f5dbb3ebc3bc9c4f4 +DIST curl-8.1.2.tar.xz.asc 488 BLAKE2B 304dbdb51aa113c0b70b2662e29b1be3294b04f5f00264ce60703756363999cd567dcd0301e27b294d1d53f16ecc016ba429fcbea240949b372750f7e6e7375a SHA512 d120299a2d59259aeb19ae0fa3a3e181e25b6927677187037c61a0901879956177ce8dda10764073a47848f81dcbbcb94e0b6008742994042b6b8fd194e169c3 diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-8.1.2.ebuild similarity index 89% copy from net-misc/curl/curl-9999.ebuild copy to net-misc/curl/curl-8.1.2.ebuild index 4b5e216ca819..550db16e60df 100644 --- a/net-misc/curl/curl-9999.ebuild +++ b/net-misc/curl/curl-8.1.2.ebuild @@ -141,39 +141,39 @@ multilib_src_configure() { myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) if use gnutls; then - einfo "SSL provided by gnutls" + multilib_is_native_abi && einfo "SSL provided by gnutls" myconf+=( --with-gnutls ) fi if use mbedtls; then - einfo "SSL provided by mbedtls" + multilib_is_native_abi && einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) fi if use nss; then - einfo "SSL provided by nss" + multilib_is_native_abi && einfo "SSL provided by nss" myconf+=( --with-nss --with-nss-deprecated ) fi if use openssl; then - einfo "SSL provided by openssl" + multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) fi if use rustls; then - einfo "SSL provided by rustls" + multilib_is_native_abi && einfo "SSL provided by rustls" myconf+=( --with-rustls ) fi if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" + multilib_is_native_abi && einfo "Default SSL provided by gnutls" myconf+=( --with-default-ssl-backend=gnutls ) elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" myconf+=( --with-default-ssl-backend=mbedtls ) elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" + multilib_is_native_abi && einfo "Default SSL provided by nss" myconf+=( --with-default-ssl-backend=nss ) elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" + multilib_is_native_abi && einfo "Default SSL provided by openssl" myconf+=( --with-default-ssl-backend=openssl ) elif use curl_ssl_rustls; then - einfo "Default SSL provided by rustls" + multilib_is_native_abi && einfo "Default SSL provided by rustls" myconf+=( --with-default-ssl-backend=rustls ) else eerror "We can't be here because of REQUIRED_USE." @@ -305,6 +305,8 @@ multilib_src_configure() { echo "Requires.private: ${priv[*]}" >> libcurl.pc || die } +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. multilib_src_test() { # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) @@ -316,7 +318,9 @@ multilib_src_test() { # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging # or just read https://github.com/curl/curl/tree/master/tests#run. # Note: we don't run the testsuite for cross-compilation. - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p !241 !1083" } multilib_src_install_all() { diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild index 4b5e216ca819..bd074d803563 100644 --- a/net-misc/curl/curl-9999.ebuild +++ b/net-misc/curl/curl-9999.ebuild @@ -141,39 +141,39 @@ multilib_src_configure() { myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) if use gnutls; then - einfo "SSL provided by gnutls" + multilib_is_native_abi && einfo "SSL provided by gnutls" myconf+=( --with-gnutls ) fi if use mbedtls; then - einfo "SSL provided by mbedtls" + multilib_is_native_abi && einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) fi if use nss; then - einfo "SSL provided by nss" + multilib_is_native_abi && einfo "SSL provided by nss" myconf+=( --with-nss --with-nss-deprecated ) fi if use openssl; then - einfo "SSL provided by openssl" + multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) fi if use rustls; then - einfo "SSL provided by rustls" + multilib_is_native_abi && einfo "SSL provided by rustls" myconf+=( --with-rustls ) fi if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" + multilib_is_native_abi && einfo "Default SSL provided by gnutls" myconf+=( --with-default-ssl-backend=gnutls ) elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" myconf+=( --with-default-ssl-backend=mbedtls ) elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" + multilib_is_native_abi && einfo "Default SSL provided by nss" myconf+=( --with-default-ssl-backend=nss ) elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" + multilib_is_native_abi && einfo "Default SSL provided by openssl" myconf+=( --with-default-ssl-backend=openssl ) elif use curl_ssl_rustls; then - einfo "Default SSL provided by rustls" + multilib_is_native_abi && einfo "Default SSL provided by rustls" myconf+=( --with-default-ssl-backend=rustls ) else eerror "We can't be here because of REQUIRED_USE." @@ -305,6 +305,8 @@ multilib_src_configure() { echo "Requires.private: ${priv[*]}" >> libcurl.pc || die } +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. multilib_src_test() { # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
