commit: dc03d3cb39385b865e42c44a868cb340599d1d67
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 10 14:22:33 2025 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 14:28:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc03d3cb
net-misc/curl: add 8.13.0_rc1, update live
- Add logic into the cURL ebuilds to cater for RC releases
- Exclude test that doesn't like RCs (fixed upstream)
- Update deps to match upstream.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
net-misc/curl/Manifest | 2 ++
.../{curl-9999.ebuild => curl-8.13.0_rc1.ebuild} | 21 ++++++++++++++-------
net-misc/curl/curl-9999.ebuild | 18 ++++++++++++------
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 1300283d4409..92f857d2b3a9 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -6,5 +6,7 @@ DIST curl-8.12.0.tar.xz 2777552 BLAKE2B
b38c7465a38f6bbdc6daa1e8a27dc810f970c917
DIST curl-8.12.0.tar.xz.asc 488 BLAKE2B
8977dabab96b6f188e8b16497e7a4e589f05b5512a9bc6ec0ee36797615c720b9cb5c34bc90df6ee037d898b8fa7f708ad2b2ff789163adcb5308a2e0d7cf9df
SHA512
8526554ffb2187b48b6a4c6a0d4a8c73d484ef3ce4c3791add0e759baf953ac7ae0b2f88d688365b1f09c5745198611fa1761aa14d02ddf52823c4ff238779cd
DIST curl-8.12.1.tar.xz 2768160 BLAKE2B
2b3e3d91041881c0951ad470736266105d3b9720440b808fe382baa493a30075aba52eb1d329fb1f148e27cd76290d82e121e7f4abf695f215456a10e26ade3e
SHA512
88915468fa1bb7256e3dd6c9d058ada6894faa1e3e7800c7d9bfee3e8be4081ae57e7f2bf260c5342b709499fc4302ddc2d7864e25bfa3300fa07f118a3de603
DIST curl-8.12.1.tar.xz.asc 488 BLAKE2B
2a6563609c9f7ada84ca2c7048ad9406809eef4cc958760d2ab3d1b7be58d26247e579bd025870609e80ebb00295026aae30614b84e3a81bdf3ed3dbd0f5ed70
SHA512
41fc5582935090d13940d86974fdea3ea901dd5dab156c16029a87f811d2535172c59dc8dc366f2ffc37bcf85accbecb5aa765bc7b83c2991a3ef402bf25af69
+DIST curl-8.13.0-rc1.tar.xz 2788060 BLAKE2B
eb82b73ac51e93fc8e9e6040a85ce54924edc1179cc670327009c984a1d2ddd62d29080de6ee83e7fd2657b9ef2778c4324abebef846d6afd85e5016dd282129
SHA512
6890dae4abf9c9d4017c28ea8ced84ef457aa911574b261af97b81ab1631e04deef188928d015a19c861d8dd319a23d9a7725d93046fc07a39694c5dc445562e
+DIST curl-8.13.0-rc1.tar.xz.asc 488 BLAKE2B
cb4ec7c0ceee7b7bb4c92569d37b1620b7543db5b5db0939a8c03f875f7b1e495584fd9cd7d84071a477dc85b54fc4127197814f1c765e232f445b050c1869d3
SHA512
aeb6f5abcf1bd19d836ae688bebd0193c673060ed74afa7c5b63c2a0ecf7eaf00a223110cd7aa77d19183e8ba757bd0b8fb481e279cf1141c4b459f92604a740
DIST curl-8.9.1.tar.xz 2782364 BLAKE2B
6e38e20e2b03ab5bfbb8d9797442dfdd9644fc80d7b1f7c1efb1f44e0d730524e82ccf7413b2c6f4555bd61ae42f91ec7c0201e2c0d563811c85164aa234aada
SHA512
a0fe234402875db194aad4e4208b7e67e7ffc1562622eea90948d4b9b0122c95c3dde8bbe2f7445a687cb3de7cb09f20e5819d424570442d976aa4c913227fc7
DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B
437268f6e5ba5db73f205fd87f3ded1e5fc200e8bf63a83cdb7e21dfbf2f4a4620e598cd0bf5d8fa1548ade08d45b386599542cd988df46a238b85790409f42e
SHA512
18acd58436d70900ab6912b84774da2c451b9dbfc83d6d00f85bbbe7894b67075918e58956fdb753fcc1486e4f10caa31139d7c68b037d7c83dc2e9c2fae9f9b
diff --git a/net-misc/curl/curl-9999.ebuild
b/net-misc/curl/curl-8.13.0_rc1.ebuild
similarity index 94%
copy from net-misc/curl/curl-9999.ebuild
copy to net-misc/curl/curl-8.13.0_rc1.ebuild
index f8c605501860..13cfd90ad6ad 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-8.13.0_rc1.ebuild
@@ -17,11 +17,17 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/curl/curl.git";
else
+ if [[ ${P} == *rc* ]]; then
+ CURL_URI="https://curl.se/rc/";
+ S="${WORKDIR}/${P//_/-}"
+ else
+ CURL_URI="https://curl.se/download/";
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos
~ppc-macos ~x64-macos ~x64-solaris"
+ fi
SRC_URI="
- https://curl.se/download/${P}.tar.xz
- verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
+ ${CURL_URI}${P//_/-}.tar.xz
+ verify-sig? ( ${CURL_URI}${P//_/-}.tar.xz.asc )
"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
fi
LICENSE="BSD curl ISC test? ( BSD-4 )"
@@ -83,7 +89,7 @@ REQUIRED_USE="
# don't be afraid to require a later version.
# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls
backend at a time.
RDEPEND="
- >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.5[${MULTILIB_USEDEP}]
adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
@@ -97,7 +103,7 @@ RDEPEND="
curl_quic_ngtcp2? (
>=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
)
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh2-1.2.8[${MULTILIB_USEDEP}] )
ssl? (
gnutls? (
app-misc/ca-certificates
@@ -109,7 +115,7 @@ RDEPEND="
net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
)
openssl? (
-
>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+
>=dev-libs/openssl-1.0.2:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
)
rustls? (
>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
@@ -361,7 +367,8 @@ multilib_src_test() {
# this ends up breaking when nproc is huge (like -j80).
# 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
-j$((2*$(makeopts_jobs))) !241 !1083"
+ # 1022 does not like `-rc` in the version string; fixed upstream.
+ multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p
-j$((2*$(makeopts_jobs))) !241 !1083 !1022"
}
multilib_src_install() {
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index f8c605501860..5af80a37e9b1 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -17,11 +17,17 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/curl/curl.git";
else
+ if [[ ${P} == *rc* ]]; then
+ CURL_URI="https://curl.se/rc/";
+ S="${WORKDIR}/${P//_/-}"
+ else
+ CURL_URI="https://curl.se/download/";
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos
~ppc-macos ~x64-macos ~x64-solaris"
+ fi
SRC_URI="
- https://curl.se/download/${P}.tar.xz
- verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
+ ${CURL_URI}${P//_/-}.tar.xz
+ verify-sig? ( ${CURL_URI}${P//_/-}.tar.xz.asc )
"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
fi
LICENSE="BSD curl ISC test? ( BSD-4 )"
@@ -83,7 +89,7 @@ REQUIRED_USE="
# don't be afraid to require a later version.
# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls
backend at a time.
RDEPEND="
- >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.5[${MULTILIB_USEDEP}]
adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
@@ -97,7 +103,7 @@ RDEPEND="
curl_quic_ngtcp2? (
>=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
)
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh2-1.2.8[${MULTILIB_USEDEP}] )
ssl? (
gnutls? (
app-misc/ca-certificates
@@ -109,7 +115,7 @@ RDEPEND="
net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
)
openssl? (
-
>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+
>=dev-libs/openssl-1.0.2:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
)
rustls? (
>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
