1 |
commit: f90d9adc6ad7919f87723f0777282b772f198377 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 1 16:13:03 2022 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 1 16:13:16 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90d9adc |
7 |
|
8 |
net-misc/curl: remove older unstable versions |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
net-misc/curl/Manifest | 8 - |
14 |
net-misc/curl/curl-7.80.0-r1.ebuild | 278 ---------------------------------- |
15 |
net-misc/curl/curl-7.81.0-r1.ebuild | 278 ---------------------------------- |
16 |
net-misc/curl/curl-7.82.0-r2.ebuild | 279 ---------------------------------- |
17 |
net-misc/curl/curl-7.83.0.ebuild | 290 ------------------------------------ |
18 |
5 files changed, 1133 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest |
21 |
index 47dec81c652b..26281353165e 100644 |
22 |
--- a/net-misc/curl/Manifest |
23 |
+++ b/net-misc/curl/Manifest |
24 |
@@ -1,12 +1,4 @@ |
25 |
DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d |
26 |
DIST curl-7.79.1.tar.xz.asc 488 BLAKE2B cf1864b15ee4b47a61a03968c4fd9526d4c8d0c5a8a0a1357de61758640e6dfda57334df1e63afd94c0064b7e61527623dd20446b27fa0130e0bf92c647d9820 SHA512 4f7930fde0a21358cf0bd8d5cbde5a05efc34202265b4744e59f49d9dc269987f47b4ead77c33e2ae03acabd7b6d6a731c69b91999eea70542f49d9ea0c2ba94 |
27 |
-DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab |
28 |
-DIST curl-7.80.0.tar.xz.asc 488 BLAKE2B 5cde8a91059bb19b9ee9b1aa4c3225522398a0d5837edf3d99b7f9ea758e5df2a729ce1d0a9763967c2319c30d94ba80ff50888dec07665a818216d42b91feee SHA512 e11adb85fb061bba8838f435f6afb200924f24cb7351d9a8208ec3d317d8ef8c1e16f06dedfc623acc749931015c42dcd86236a53602c6632b3a750841345b05 |
29 |
-DIST curl-7.81.0.tar.xz 2486388 BLAKE2B bf8a3a03564648a9d7a5b4e7a523d840230f03237cf9eb5b07dcb4f531b036eb8111c1944bedd0c1df188e09a09468b3487d24ea50781124bc33d194546691f4 SHA512 38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df |
30 |
-DIST curl-7.81.0.tar.xz.asc 488 BLAKE2B 9280f10b14ddd95a1405fda79f8c51528c91c5e86b8f90d16d20d7f11d212e6e4391377eed971d0b0b27f5f4692c702e9d7a11705f0558ad39df38608d6a0648 SHA512 ca32a639900a9f8211005227dfb594f809c5ca5ec1eb87e944ef33cca60e4844f5b6ebe49de79fba53068e5dee9652b1d43a7d3a74e05419a2ffb5b40dab8176 |
31 |
-DIST curl-7.82.0.tar.xz 2446764 BLAKE2B 838accae4a45c090909cff91477a023789a79535691c80e507fd9e9712861b0c08e25ecd26079cb8ac8946cdf429a50991a7521e7b550b43c19e455625bc0750 SHA512 a977d69360d1793f8872096a21f5c0271e7ad145cd69ad45f4056a0657772f0f298b04bdb41aefd4ea5c4478352c60d80b5a118642280a07a7198aa80ffb1d57 |
32 |
-DIST curl-7.82.0.tar.xz.asc 488 BLAKE2B 9da4ea63671621df956aa5dc191cfc6c8d2a8b1958416ca58ffc04d43ed65b89244968588879e6bd3299ca8f60b1eccb34dede012f8a2a37acf3ca34021da958 SHA512 1f14d8ab55360ba735dff916369ee318e98767718394654ce9443b6013509b6d3ed5597685b142e9823cec7496373b709a8656515d66039c06783879655151fe |
33 |
-DIST curl-7.83.0.tar.xz 2472560 BLAKE2B 0669f40265a56e7549e8038ed8421680d7264bff44dcc0692cf9f5248621311be5e228314710149bf9d2ccbe739f929039e04402c1d04a1362d0bbf08cb8cdc7 SHA512 be02bb2a8a3140eff3a9046f27cd4f872ed9ddaa644af49e56e5ef7dfec84a15b01db133469269437cddc937eda73953fa8c51bb758f7e98873822cd2290d3a9 |
34 |
-DIST curl-7.83.0.tar.xz.asc 488 BLAKE2B a8f6dcf00f1b01b457a7eecc8364538393f414df60757f3664709c62b6007023a34ddf4ecb4688734e396031d30905b490dd0c115f09a9428db6a6be97cdf72c SHA512 8fb90f9692f4fdb82ea49f0e5151219b2334da5d3910f28e787bb688fb055b8b028ccf75cdcc15cd9f86d780d479f88f902fef7d7b9e007a4b849cb25c6c13cc |
35 |
DIST curl-7.83.1.tar.xz 2474940 BLAKE2B 491427b12f082c2246ef6cb2a129340079db28bd93b4381889e7328bef1d61a79bb57cba4b8372759baa4f6e77644966ed95cfa8f839ee9db634786757fb1ce0 SHA512 2f63327d6d3687ba36fb7b8d5d3d15599eca33ebfb08681613612ea9c4b629d3b6ce4d2742fa1ebd7a997ed332001d3a4c798985f9277c83b9e7a9aecdb1b1ee |
36 |
DIST curl-7.83.1.tar.xz.asc 488 BLAKE2B 78f7a6d9a32cab97e9ce26430eb2be2bc4e20552cf8c59238f30f127e9d7af5b4f9808c3fe0846c18c8f7a67b49f2f75d865d17b7760bb664872934799949441 SHA512 f0d29de315488c844eb81ed5a89ed6334910970224c8cac43e7e6f2d58c35ad0064c0b6122e69b3a34ce91f4b56873c63e2e8aea1c602ef40711bfd62a01b191 |
37 |
|
38 |
diff --git a/net-misc/curl/curl-7.80.0-r1.ebuild b/net-misc/curl/curl-7.80.0-r1.ebuild |
39 |
deleted file mode 100644 |
40 |
index f1c2d6838600..000000000000 |
41 |
--- a/net-misc/curl/curl-7.80.0-r1.ebuild |
42 |
+++ /dev/null |
43 |
@@ -1,278 +0,0 @@ |
44 |
-# Copyright 1999-2022 Gentoo Authors |
45 |
-# Distributed under the terms of the GNU General Public License v2 |
46 |
- |
47 |
-EAPI="7" |
48 |
- |
49 |
-inherit autotools prefix multilib-minimal verify-sig |
50 |
- |
51 |
-DESCRIPTION="A Client that groks URLs" |
52 |
-HOMEPAGE="https://curl.haxx.se/" |
53 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz |
54 |
- verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" |
55 |
- |
56 |
-LICENSE="curl" |
57 |
-SLOT="0" |
58 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
59 |
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" |
60 |
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" |
61 |
-IUSE+=" nghttp3 quiche" |
62 |
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc |
63 |
- |
64 |
-# c-ares must be disabled for threads |
65 |
-# only one default ssl provider can be enabled |
66 |
-REQUIRED_USE=" |
67 |
- threads? ( !adns ) |
68 |
- ssl? ( |
69 |
- ^^ ( |
70 |
- curl_ssl_gnutls |
71 |
- curl_ssl_mbedtls |
72 |
- curl_ssl_nss |
73 |
- curl_ssl_openssl |
74 |
- ) |
75 |
- )" |
76 |
- |
77 |
-# lead to lots of false negatives, bug #285669 |
78 |
-RESTRICT="!test? ( test )" |
79 |
- |
80 |
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
81 |
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
82 |
- ssl? ( |
83 |
- gnutls? ( |
84 |
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
85 |
- dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
86 |
- app-misc/ca-certificates |
87 |
- ) |
88 |
- mbedtls? ( |
89 |
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
90 |
- app-misc/ca-certificates |
91 |
- ) |
92 |
- openssl? ( |
93 |
- dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] |
94 |
- ) |
95 |
- nss? ( |
96 |
- dev-libs/nss:0[${MULTILIB_USEDEP}] |
97 |
- app-misc/ca-certificates |
98 |
- ) |
99 |
- ) |
100 |
- http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) |
101 |
- nghttp3? ( |
102 |
- net-libs/nghttp3[${MULTILIB_USEDEP}] |
103 |
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] |
104 |
- ) |
105 |
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) |
106 |
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) |
107 |
- adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] ) |
108 |
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
109 |
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) |
110 |
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) |
111 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
112 |
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" |
113 |
- |
114 |
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 |
115 |
-# rtmp? ( |
116 |
-# media-video/rtmpdump |
117 |
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) |
118 |
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) |
119 |
-# ) |
120 |
- |
121 |
-DEPEND="${RDEPEND}" |
122 |
-BDEPEND="dev-lang/perl |
123 |
- virtual/pkgconfig |
124 |
- test? ( |
125 |
- sys-apps/diffutils |
126 |
- ) |
127 |
- verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" |
128 |
- |
129 |
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) |
130 |
- |
131 |
-MULTILIB_WRAPPED_HEADERS=( |
132 |
- /usr/include/curl/curlbuild.h |
133 |
-) |
134 |
- |
135 |
-MULTILIB_CHOST_TOOLS=( |
136 |
- /usr/bin/curl-config |
137 |
-) |
138 |
- |
139 |
-PATCHES=( |
140 |
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
141 |
- "${FILESDIR}"/${PN}-respect-cflags-3.patch |
142 |
-) |
143 |
- |
144 |
-src_prepare() { |
145 |
- default |
146 |
- |
147 |
- eprefixify curl-config.in |
148 |
- eautoreconf |
149 |
-} |
150 |
- |
151 |
-multilib_src_configure() { |
152 |
- # We make use of the fact that later flags override earlier ones |
153 |
- # So start with all ssl providers off until proven otherwise |
154 |
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) |
155 |
- local myconf=() |
156 |
- |
157 |
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl ) |
158 |
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
159 |
- #myconf+=( --without-default-ssl-backend ) |
160 |
- if use ssl ; then |
161 |
- if use gnutls || use curl_ssl_gnutls; then |
162 |
- einfo "SSL provided by gnutls" |
163 |
- myconf+=( --with-gnutls --with-nettle ) |
164 |
- fi |
165 |
- if use mbedtls || use curl_ssl_mbedtls; then |
166 |
- einfo "SSL provided by mbedtls" |
167 |
- myconf+=( --with-mbedtls ) |
168 |
- fi |
169 |
- if use nss || use curl_ssl_nss; then |
170 |
- einfo "SSL provided by nss" |
171 |
- myconf+=( --with-nss ) |
172 |
- fi |
173 |
- if use openssl || use curl_ssl_openssl; then |
174 |
- einfo "SSL provided by openssl" |
175 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
176 |
- fi |
177 |
- |
178 |
- if use curl_ssl_gnutls; then |
179 |
- einfo "Default SSL provided by gnutls" |
180 |
- myconf+=( --with-default-ssl-backend=gnutls ) |
181 |
- elif use curl_ssl_mbedtls; then |
182 |
- einfo "Default SSL provided by mbedtls" |
183 |
- myconf+=( --with-default-ssl-backend=mbedtls ) |
184 |
- elif use curl_ssl_nss; then |
185 |
- einfo "Default SSL provided by nss" |
186 |
- myconf+=( --with-default-ssl-backend=nss ) |
187 |
- elif use curl_ssl_openssl; then |
188 |
- einfo "Default SSL provided by openssl" |
189 |
- myconf+=( --with-default-ssl-backend=openssl ) |
190 |
- else |
191 |
- eerror "We can't be here because of REQUIRED_USE." |
192 |
- fi |
193 |
- |
194 |
- else |
195 |
- einfo "SSL disabled" |
196 |
- fi |
197 |
- |
198 |
- # These configuration options are organized alphabetically |
199 |
- # within each category. This should make it easier if we |
200 |
- # ever decide to make any of them contingent on USE flags: |
201 |
- # 1) protocols first. To see them all do |
202 |
- # 'grep SUPPORT_PROTOCOLS configure.ac' |
203 |
- # 2) --enable/disable options second. |
204 |
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
205 |
- # 3) --with/without options third. |
206 |
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
207 |
- |
208 |
- myconf+=( |
209 |
- $(use_enable alt-svc) |
210 |
- --enable-crypto-auth |
211 |
- --enable-dict |
212 |
- --disable-ech |
213 |
- --enable-file |
214 |
- $(use_enable ftp) |
215 |
- $(use_enable gopher) |
216 |
- $(use_enable hsts) |
217 |
- --enable-http |
218 |
- $(use_enable imap) |
219 |
- $(use_enable ldap) |
220 |
- $(use_enable ldap ldaps) |
221 |
- --enable-ntlm |
222 |
- --disable-ntlm-wb |
223 |
- $(use_enable pop3) |
224 |
- --enable-rt |
225 |
- --enable-rtsp |
226 |
- $(use_enable samba smb) |
227 |
- $(use_with ssh libssh2) |
228 |
- $(use_enable smtp) |
229 |
- $(use_enable telnet) |
230 |
- $(use_enable tftp) |
231 |
- --enable-tls-srp |
232 |
- $(use_enable adns ares) |
233 |
- --enable-cookies |
234 |
- --enable-dateparse |
235 |
- --enable-dnsshuffle |
236 |
- --enable-doh |
237 |
- --enable-symbol-hiding |
238 |
- --enable-http-auth |
239 |
- $(use_enable ipv6) |
240 |
- --enable-largefile |
241 |
- --enable-manual |
242 |
- --enable-mime |
243 |
- --enable-netrc |
244 |
- $(use_enable progress-meter) |
245 |
- --enable-proxy |
246 |
- --disable-sspi |
247 |
- $(use_enable static-libs static) |
248 |
- $(use_enable threads threaded-resolver) |
249 |
- $(use_enable threads pthreads) |
250 |
- --disable-versioned-symbols |
251 |
- --without-amissl |
252 |
- --without-bearssl |
253 |
- $(use_with brotli) |
254 |
- --without-fish-functions-dir |
255 |
- $(use_with http2 nghttp2) |
256 |
- --without-hyper |
257 |
- $(use_with idn libidn2) |
258 |
- $(use_with kerberos gssapi "${EPREFIX}"/usr) |
259 |
- --without-libgsasl |
260 |
- --without-libpsl |
261 |
- $(use_with nghttp3) |
262 |
- $(use_with nghttp3 ngtcp2) |
263 |
- $(use_with quiche) |
264 |
- $(use_with rtmp librtmp) |
265 |
- --without-rustls |
266 |
- --without-schannel |
267 |
- --without-secure-transport |
268 |
- --without-winidn |
269 |
- --without-wolfssl |
270 |
- --with-zlib |
271 |
- $(use_with zstd) |
272 |
- ) |
273 |
- |
274 |
- ECONF_SOURCE="${S}" \ |
275 |
- econf "${myconf[@]}" |
276 |
- |
277 |
- if ! multilib_is_native_abi; then |
278 |
- # avoid building the client |
279 |
- sed -i -e '/SUBDIRS/s:src::' Makefile || die |
280 |
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
281 |
- fi |
282 |
- |
283 |
- # Fix up the pkg-config file to be more robust. |
284 |
- # https://github.com/curl/curl/issues/864 |
285 |
- local priv=() libs=() |
286 |
- # We always enable zlib. |
287 |
- libs+=( "-lz" ) |
288 |
- priv+=( "zlib" ) |
289 |
- if use http2; then |
290 |
- libs+=( "-lnghttp2" ) |
291 |
- priv+=( "libnghttp2" ) |
292 |
- fi |
293 |
- if use quiche; then |
294 |
- libs+=( "-lquiche" ) |
295 |
- priv+=( "quiche" ) |
296 |
- fi |
297 |
- if use nghttp3; then |
298 |
- libs+=( "-lnghttp3" "-lngtcp2" ) |
299 |
- priv+=( "libnghttp3" "-libtcp2" ) |
300 |
- fi |
301 |
- if use ssl && use curl_ssl_openssl; then |
302 |
- libs+=( "-lssl" "-lcrypto" ) |
303 |
- priv+=( "openssl" ) |
304 |
- fi |
305 |
- grep -q Requires.private libcurl.pc && die "need to update ebuild" |
306 |
- libs=$(printf '|%s' "${libs[@]}") |
307 |
- sed -i -r \ |
308 |
- -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
309 |
- libcurl.pc || die |
310 |
- echo "Requires.private: ${priv[*]}" >> libcurl.pc |
311 |
-} |
312 |
- |
313 |
-multilib_src_test() { |
314 |
- multilib_is_native_abi && default_src_test |
315 |
-} |
316 |
- |
317 |
-multilib_src_install_all() { |
318 |
- einstalldocs |
319 |
- find "${ED}" -type f -name '*.la' -delete || die |
320 |
- rm -rf "${ED}"/etc/ || die |
321 |
-} |
322 |
|
323 |
diff --git a/net-misc/curl/curl-7.81.0-r1.ebuild b/net-misc/curl/curl-7.81.0-r1.ebuild |
324 |
deleted file mode 100644 |
325 |
index e47b2c09b3db..000000000000 |
326 |
--- a/net-misc/curl/curl-7.81.0-r1.ebuild |
327 |
+++ /dev/null |
328 |
@@ -1,278 +0,0 @@ |
329 |
-# Copyright 1999-2022 Gentoo Authors |
330 |
-# Distributed under the terms of the GNU General Public License v2 |
331 |
- |
332 |
-EAPI="8" |
333 |
- |
334 |
-inherit autotools prefix multilib-minimal verify-sig |
335 |
- |
336 |
-DESCRIPTION="A Client that groks URLs" |
337 |
-HOMEPAGE="https://curl.haxx.se/" |
338 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz |
339 |
- verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" |
340 |
- |
341 |
-LICENSE="curl" |
342 |
-SLOT="0" |
343 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
344 |
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" |
345 |
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" |
346 |
-IUSE+=" nghttp3 quiche" |
347 |
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc |
348 |
- |
349 |
-# c-ares must be disabled for threads |
350 |
-# only one default ssl provider can be enabled |
351 |
-REQUIRED_USE=" |
352 |
- threads? ( !adns ) |
353 |
- ssl? ( |
354 |
- ^^ ( |
355 |
- curl_ssl_gnutls |
356 |
- curl_ssl_mbedtls |
357 |
- curl_ssl_nss |
358 |
- curl_ssl_openssl |
359 |
- ) |
360 |
- )" |
361 |
- |
362 |
-# lead to lots of false negatives, bug #285669 |
363 |
-RESTRICT="!test? ( test )" |
364 |
- |
365 |
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
366 |
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
367 |
- ssl? ( |
368 |
- gnutls? ( |
369 |
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
370 |
- dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
371 |
- app-misc/ca-certificates |
372 |
- ) |
373 |
- mbedtls? ( |
374 |
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
375 |
- app-misc/ca-certificates |
376 |
- ) |
377 |
- openssl? ( |
378 |
- dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] |
379 |
- ) |
380 |
- nss? ( |
381 |
- dev-libs/nss:0[${MULTILIB_USEDEP}] |
382 |
- app-misc/ca-certificates |
383 |
- ) |
384 |
- ) |
385 |
- http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) |
386 |
- nghttp3? ( |
387 |
- net-libs/nghttp3[${MULTILIB_USEDEP}] |
388 |
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] |
389 |
- ) |
390 |
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) |
391 |
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) |
392 |
- adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] ) |
393 |
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
394 |
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) |
395 |
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) |
396 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
397 |
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" |
398 |
- |
399 |
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 |
400 |
-# rtmp? ( |
401 |
-# media-video/rtmpdump |
402 |
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) |
403 |
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) |
404 |
-# ) |
405 |
- |
406 |
-DEPEND="${RDEPEND}" |
407 |
-BDEPEND="dev-lang/perl |
408 |
- virtual/pkgconfig |
409 |
- test? ( |
410 |
- sys-apps/diffutils |
411 |
- ) |
412 |
- verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" |
413 |
- |
414 |
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) |
415 |
- |
416 |
-MULTILIB_WRAPPED_HEADERS=( |
417 |
- /usr/include/curl/curlbuild.h |
418 |
-) |
419 |
- |
420 |
-MULTILIB_CHOST_TOOLS=( |
421 |
- /usr/bin/curl-config |
422 |
-) |
423 |
- |
424 |
-PATCHES=( |
425 |
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
426 |
- "${FILESDIR}"/${PN}-respect-cflags-3.patch |
427 |
-) |
428 |
- |
429 |
-src_prepare() { |
430 |
- default |
431 |
- |
432 |
- eprefixify curl-config.in |
433 |
- eautoreconf |
434 |
-} |
435 |
- |
436 |
-multilib_src_configure() { |
437 |
- # We make use of the fact that later flags override earlier ones |
438 |
- # So start with all ssl providers off until proven otherwise |
439 |
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) |
440 |
- local myconf=() |
441 |
- |
442 |
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl ) |
443 |
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
444 |
- #myconf+=( --without-default-ssl-backend ) |
445 |
- if use ssl ; then |
446 |
- if use gnutls || use curl_ssl_gnutls; then |
447 |
- einfo "SSL provided by gnutls" |
448 |
- myconf+=( --with-gnutls --with-nettle ) |
449 |
- fi |
450 |
- if use mbedtls || use curl_ssl_mbedtls; then |
451 |
- einfo "SSL provided by mbedtls" |
452 |
- myconf+=( --with-mbedtls ) |
453 |
- fi |
454 |
- if use nss || use curl_ssl_nss; then |
455 |
- einfo "SSL provided by nss" |
456 |
- myconf+=( --with-nss ) |
457 |
- fi |
458 |
- if use openssl || use curl_ssl_openssl; then |
459 |
- einfo "SSL provided by openssl" |
460 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
461 |
- fi |
462 |
- |
463 |
- if use curl_ssl_gnutls; then |
464 |
- einfo "Default SSL provided by gnutls" |
465 |
- myconf+=( --with-default-ssl-backend=gnutls ) |
466 |
- elif use curl_ssl_mbedtls; then |
467 |
- einfo "Default SSL provided by mbedtls" |
468 |
- myconf+=( --with-default-ssl-backend=mbedtls ) |
469 |
- elif use curl_ssl_nss; then |
470 |
- einfo "Default SSL provided by nss" |
471 |
- myconf+=( --with-default-ssl-backend=nss ) |
472 |
- elif use curl_ssl_openssl; then |
473 |
- einfo "Default SSL provided by openssl" |
474 |
- myconf+=( --with-default-ssl-backend=openssl ) |
475 |
- else |
476 |
- eerror "We can't be here because of REQUIRED_USE." |
477 |
- fi |
478 |
- |
479 |
- else |
480 |
- einfo "SSL disabled" |
481 |
- fi |
482 |
- |
483 |
- # These configuration options are organized alphabetically |
484 |
- # within each category. This should make it easier if we |
485 |
- # ever decide to make any of them contingent on USE flags: |
486 |
- # 1) protocols first. To see them all do |
487 |
- # 'grep SUPPORT_PROTOCOLS configure.ac' |
488 |
- # 2) --enable/disable options second. |
489 |
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
490 |
- # 3) --with/without options third. |
491 |
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
492 |
- |
493 |
- myconf+=( |
494 |
- $(use_enable alt-svc) |
495 |
- --enable-crypto-auth |
496 |
- --enable-dict |
497 |
- --disable-ech |
498 |
- --enable-file |
499 |
- $(use_enable ftp) |
500 |
- $(use_enable gopher) |
501 |
- $(use_enable hsts) |
502 |
- --enable-http |
503 |
- $(use_enable imap) |
504 |
- $(use_enable ldap) |
505 |
- $(use_enable ldap ldaps) |
506 |
- --enable-ntlm |
507 |
- --disable-ntlm-wb |
508 |
- $(use_enable pop3) |
509 |
- --enable-rt |
510 |
- --enable-rtsp |
511 |
- $(use_enable samba smb) |
512 |
- $(use_with ssh libssh2) |
513 |
- $(use_enable smtp) |
514 |
- $(use_enable telnet) |
515 |
- $(use_enable tftp) |
516 |
- --enable-tls-srp |
517 |
- $(use_enable adns ares) |
518 |
- --enable-cookies |
519 |
- --enable-dateparse |
520 |
- --enable-dnsshuffle |
521 |
- --enable-doh |
522 |
- --enable-symbol-hiding |
523 |
- --enable-http-auth |
524 |
- $(use_enable ipv6) |
525 |
- --enable-largefile |
526 |
- --enable-manual |
527 |
- --enable-mime |
528 |
- --enable-netrc |
529 |
- $(use_enable progress-meter) |
530 |
- --enable-proxy |
531 |
- --disable-sspi |
532 |
- $(use_enable static-libs static) |
533 |
- $(use_enable threads threaded-resolver) |
534 |
- $(use_enable threads pthreads) |
535 |
- --disable-versioned-symbols |
536 |
- --without-amissl |
537 |
- --without-bearssl |
538 |
- $(use_with brotli) |
539 |
- --without-fish-functions-dir |
540 |
- $(use_with http2 nghttp2) |
541 |
- --without-hyper |
542 |
- $(use_with idn libidn2) |
543 |
- $(use_with kerberos gssapi "${EPREFIX}"/usr) |
544 |
- --without-libgsasl |
545 |
- --without-libpsl |
546 |
- $(use_with nghttp3) |
547 |
- $(use_with nghttp3 ngtcp2) |
548 |
- $(use_with quiche) |
549 |
- $(use_with rtmp librtmp) |
550 |
- --without-rustls |
551 |
- --without-schannel |
552 |
- --without-secure-transport |
553 |
- --without-winidn |
554 |
- --without-wolfssl |
555 |
- --with-zlib |
556 |
- $(use_with zstd) |
557 |
- ) |
558 |
- |
559 |
- ECONF_SOURCE="${S}" \ |
560 |
- econf "${myconf[@]}" |
561 |
- |
562 |
- if ! multilib_is_native_abi; then |
563 |
- # avoid building the client |
564 |
- sed -i -e '/SUBDIRS/s:src::' Makefile || die |
565 |
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
566 |
- fi |
567 |
- |
568 |
- # Fix up the pkg-config file to be more robust. |
569 |
- # https://github.com/curl/curl/issues/864 |
570 |
- local priv=() libs=() |
571 |
- # We always enable zlib. |
572 |
- libs+=( "-lz" ) |
573 |
- priv+=( "zlib" ) |
574 |
- if use http2; then |
575 |
- libs+=( "-lnghttp2" ) |
576 |
- priv+=( "libnghttp2" ) |
577 |
- fi |
578 |
- if use quiche; then |
579 |
- libs+=( "-lquiche" ) |
580 |
- priv+=( "quiche" ) |
581 |
- fi |
582 |
- if use nghttp3; then |
583 |
- libs+=( "-lnghttp3" "-lngtcp2" ) |
584 |
- priv+=( "libnghttp3" "-libtcp2" ) |
585 |
- fi |
586 |
- if use ssl && use curl_ssl_openssl; then |
587 |
- libs+=( "-lssl" "-lcrypto" ) |
588 |
- priv+=( "openssl" ) |
589 |
- fi |
590 |
- grep -q Requires.private libcurl.pc && die "need to update ebuild" |
591 |
- libs=$(printf '|%s' "${libs[@]}") |
592 |
- sed -i -r \ |
593 |
- -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
594 |
- libcurl.pc || die |
595 |
- echo "Requires.private: ${priv[*]}" >> libcurl.pc |
596 |
-} |
597 |
- |
598 |
-multilib_src_test() { |
599 |
- multilib_is_native_abi && default_src_test |
600 |
-} |
601 |
- |
602 |
-multilib_src_install_all() { |
603 |
- einstalldocs |
604 |
- find "${ED}" -type f -name '*.la' -delete || die |
605 |
- rm -rf "${ED}"/etc/ || die |
606 |
-} |
607 |
|
608 |
diff --git a/net-misc/curl/curl-7.82.0-r2.ebuild b/net-misc/curl/curl-7.82.0-r2.ebuild |
609 |
deleted file mode 100644 |
610 |
index e4a7ea60d92d..000000000000 |
611 |
--- a/net-misc/curl/curl-7.82.0-r2.ebuild |
612 |
+++ /dev/null |
613 |
@@ -1,279 +0,0 @@ |
614 |
-# Copyright 1999-2022 Gentoo Authors |
615 |
-# Distributed under the terms of the GNU General Public License v2 |
616 |
- |
617 |
-EAPI="8" |
618 |
- |
619 |
-inherit autotools prefix multilib-minimal verify-sig |
620 |
- |
621 |
-DESCRIPTION="A Client that groks URLs" |
622 |
-HOMEPAGE="https://curl.haxx.se/" |
623 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz |
624 |
- verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" |
625 |
- |
626 |
-LICENSE="curl" |
627 |
-SLOT="0" |
628 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
629 |
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" |
630 |
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" |
631 |
-IUSE+=" nghttp3 quiche" |
632 |
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc |
633 |
- |
634 |
-# c-ares must be disabled for threads |
635 |
-# only one default ssl provider can be enabled |
636 |
-REQUIRED_USE=" |
637 |
- threads? ( !adns ) |
638 |
- ssl? ( |
639 |
- ^^ ( |
640 |
- curl_ssl_gnutls |
641 |
- curl_ssl_mbedtls |
642 |
- curl_ssl_nss |
643 |
- curl_ssl_openssl |
644 |
- ) |
645 |
- )" |
646 |
- |
647 |
-# lead to lots of false negatives, bug #285669 |
648 |
-RESTRICT="!test? ( test )" |
649 |
- |
650 |
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
651 |
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
652 |
- ssl? ( |
653 |
- gnutls? ( |
654 |
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
655 |
- dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
656 |
- app-misc/ca-certificates |
657 |
- ) |
658 |
- mbedtls? ( |
659 |
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
660 |
- app-misc/ca-certificates |
661 |
- ) |
662 |
- openssl? ( |
663 |
- dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] |
664 |
- ) |
665 |
- nss? ( |
666 |
- dev-libs/nss:0[${MULTILIB_USEDEP}] |
667 |
- app-misc/ca-certificates |
668 |
- ) |
669 |
- ) |
670 |
- http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) |
671 |
- nghttp3? ( |
672 |
- net-libs/nghttp3[${MULTILIB_USEDEP}] |
673 |
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] |
674 |
- ) |
675 |
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) |
676 |
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) |
677 |
- adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] ) |
678 |
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
679 |
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) |
680 |
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) |
681 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
682 |
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" |
683 |
- |
684 |
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 |
685 |
-# rtmp? ( |
686 |
-# media-video/rtmpdump |
687 |
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) |
688 |
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) |
689 |
-# ) |
690 |
- |
691 |
-DEPEND="${RDEPEND}" |
692 |
-BDEPEND="dev-lang/perl |
693 |
- virtual/pkgconfig |
694 |
- test? ( |
695 |
- sys-apps/diffutils |
696 |
- ) |
697 |
- verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" |
698 |
- |
699 |
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) |
700 |
- |
701 |
-MULTILIB_WRAPPED_HEADERS=( |
702 |
- /usr/include/curl/curlbuild.h |
703 |
-) |
704 |
- |
705 |
-MULTILIB_CHOST_TOOLS=( |
706 |
- /usr/bin/curl-config |
707 |
-) |
708 |
- |
709 |
-PATCHES=( |
710 |
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
711 |
- "${FILESDIR}"/${PN}-respect-cflags-3.patch |
712 |
- "${FILESDIR}"/${P}-certs-processing.patch |
713 |
-) |
714 |
- |
715 |
-src_prepare() { |
716 |
- default |
717 |
- |
718 |
- eprefixify curl-config.in |
719 |
- eautoreconf |
720 |
-} |
721 |
- |
722 |
-multilib_src_configure() { |
723 |
- # We make use of the fact that later flags override earlier ones |
724 |
- # So start with all ssl providers off until proven otherwise |
725 |
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) |
726 |
- local myconf=() |
727 |
- |
728 |
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl ) |
729 |
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
730 |
- #myconf+=( --without-default-ssl-backend ) |
731 |
- if use ssl ; then |
732 |
- if use gnutls || use curl_ssl_gnutls; then |
733 |
- einfo "SSL provided by gnutls" |
734 |
- myconf+=( --with-gnutls --with-nettle ) |
735 |
- fi |
736 |
- if use mbedtls || use curl_ssl_mbedtls; then |
737 |
- einfo "SSL provided by mbedtls" |
738 |
- myconf+=( --with-mbedtls ) |
739 |
- fi |
740 |
- if use nss || use curl_ssl_nss; then |
741 |
- einfo "SSL provided by nss" |
742 |
- myconf+=( --with-nss --with-nss-deprecated ) |
743 |
- fi |
744 |
- if use openssl || use curl_ssl_openssl; then |
745 |
- einfo "SSL provided by openssl" |
746 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
747 |
- fi |
748 |
- |
749 |
- if use curl_ssl_gnutls; then |
750 |
- einfo "Default SSL provided by gnutls" |
751 |
- myconf+=( --with-default-ssl-backend=gnutls ) |
752 |
- elif use curl_ssl_mbedtls; then |
753 |
- einfo "Default SSL provided by mbedtls" |
754 |
- myconf+=( --with-default-ssl-backend=mbedtls ) |
755 |
- elif use curl_ssl_nss; then |
756 |
- einfo "Default SSL provided by nss" |
757 |
- myconf+=( --with-default-ssl-backend=nss ) |
758 |
- elif use curl_ssl_openssl; then |
759 |
- einfo "Default SSL provided by openssl" |
760 |
- myconf+=( --with-default-ssl-backend=openssl ) |
761 |
- else |
762 |
- eerror "We can't be here because of REQUIRED_USE." |
763 |
- fi |
764 |
- |
765 |
- else |
766 |
- einfo "SSL disabled" |
767 |
- fi |
768 |
- |
769 |
- # These configuration options are organized alphabetically |
770 |
- # within each category. This should make it easier if we |
771 |
- # ever decide to make any of them contingent on USE flags: |
772 |
- # 1) protocols first. To see them all do |
773 |
- # 'grep SUPPORT_PROTOCOLS configure.ac' |
774 |
- # 2) --enable/disable options second. |
775 |
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
776 |
- # 3) --with/without options third. |
777 |
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
778 |
- |
779 |
- myconf+=( |
780 |
- $(use_enable alt-svc) |
781 |
- --enable-crypto-auth |
782 |
- --enable-dict |
783 |
- --disable-ech |
784 |
- --enable-file |
785 |
- $(use_enable ftp) |
786 |
- $(use_enable gopher) |
787 |
- $(use_enable hsts) |
788 |
- --enable-http |
789 |
- $(use_enable imap) |
790 |
- $(use_enable ldap) |
791 |
- $(use_enable ldap ldaps) |
792 |
- --enable-ntlm |
793 |
- --disable-ntlm-wb |
794 |
- $(use_enable pop3) |
795 |
- --enable-rt |
796 |
- --enable-rtsp |
797 |
- $(use_enable samba smb) |
798 |
- $(use_with ssh libssh2) |
799 |
- $(use_enable smtp) |
800 |
- $(use_enable telnet) |
801 |
- $(use_enable tftp) |
802 |
- --enable-tls-srp |
803 |
- $(use_enable adns ares) |
804 |
- --enable-cookies |
805 |
- --enable-dateparse |
806 |
- --enable-dnsshuffle |
807 |
- --enable-doh |
808 |
- --enable-symbol-hiding |
809 |
- --enable-http-auth |
810 |
- $(use_enable ipv6) |
811 |
- --enable-largefile |
812 |
- --enable-manual |
813 |
- --enable-mime |
814 |
- --enable-netrc |
815 |
- $(use_enable progress-meter) |
816 |
- --enable-proxy |
817 |
- --disable-sspi |
818 |
- $(use_enable static-libs static) |
819 |
- $(use_enable threads threaded-resolver) |
820 |
- $(use_enable threads pthreads) |
821 |
- --disable-versioned-symbols |
822 |
- --without-amissl |
823 |
- --without-bearssl |
824 |
- $(use_with brotli) |
825 |
- --without-fish-functions-dir |
826 |
- $(use_with http2 nghttp2) |
827 |
- --without-hyper |
828 |
- $(use_with idn libidn2) |
829 |
- $(use_with kerberos gssapi "${EPREFIX}"/usr) |
830 |
- --without-libgsasl |
831 |
- --without-libpsl |
832 |
- $(use_with nghttp3) |
833 |
- $(use_with nghttp3 ngtcp2) |
834 |
- $(use_with quiche) |
835 |
- $(use_with rtmp librtmp) |
836 |
- --without-rustls |
837 |
- --without-schannel |
838 |
- --without-secure-transport |
839 |
- --without-winidn |
840 |
- --without-wolfssl |
841 |
- --with-zlib |
842 |
- $(use_with zstd) |
843 |
- ) |
844 |
- |
845 |
- ECONF_SOURCE="${S}" \ |
846 |
- econf "${myconf[@]}" |
847 |
- |
848 |
- if ! multilib_is_native_abi; then |
849 |
- # avoid building the client |
850 |
- sed -i -e '/SUBDIRS/s:src::' Makefile || die |
851 |
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
852 |
- fi |
853 |
- |
854 |
- # Fix up the pkg-config file to be more robust. |
855 |
- # https://github.com/curl/curl/issues/864 |
856 |
- local priv=() libs=() |
857 |
- # We always enable zlib. |
858 |
- libs+=( "-lz" ) |
859 |
- priv+=( "zlib" ) |
860 |
- if use http2; then |
861 |
- libs+=( "-lnghttp2" ) |
862 |
- priv+=( "libnghttp2" ) |
863 |
- fi |
864 |
- if use quiche; then |
865 |
- libs+=( "-lquiche" ) |
866 |
- priv+=( "quiche" ) |
867 |
- fi |
868 |
- if use nghttp3; then |
869 |
- libs+=( "-lnghttp3" "-lngtcp2" ) |
870 |
- priv+=( "libnghttp3" "-libtcp2" ) |
871 |
- fi |
872 |
- if use ssl && use curl_ssl_openssl; then |
873 |
- libs+=( "-lssl" "-lcrypto" ) |
874 |
- priv+=( "openssl" ) |
875 |
- fi |
876 |
- grep -q Requires.private libcurl.pc && die "need to update ebuild" |
877 |
- libs=$(printf '|%s' "${libs[@]}") |
878 |
- sed -i -r \ |
879 |
- -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
880 |
- libcurl.pc || die |
881 |
- echo "Requires.private: ${priv[*]}" >> libcurl.pc |
882 |
-} |
883 |
- |
884 |
-multilib_src_test() { |
885 |
- multilib_is_native_abi && default_src_test |
886 |
-} |
887 |
- |
888 |
-multilib_src_install_all() { |
889 |
- einstalldocs |
890 |
- find "${ED}" -type f -name '*.la' -delete || die |
891 |
- rm -rf "${ED}"/etc/ || die |
892 |
-} |
893 |
|
894 |
diff --git a/net-misc/curl/curl-7.83.0.ebuild b/net-misc/curl/curl-7.83.0.ebuild |
895 |
deleted file mode 100644 |
896 |
index 041b6cd5a2e4..000000000000 |
897 |
--- a/net-misc/curl/curl-7.83.0.ebuild |
898 |
+++ /dev/null |
899 |
@@ -1,290 +0,0 @@ |
900 |
-# Copyright 1999-2022 Gentoo Authors |
901 |
-# Distributed under the terms of the GNU General Public License v2 |
902 |
- |
903 |
-EAPI="8" |
904 |
- |
905 |
-inherit autotools prefix multilib-minimal verify-sig |
906 |
- |
907 |
-DESCRIPTION="A Client that groks URLs" |
908 |
-HOMEPAGE="https://curl.haxx.se/" |
909 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz |
910 |
- verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" |
911 |
- |
912 |
-LICENSE="curl" |
913 |
-SLOT="0" |
914 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
915 |
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" |
916 |
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" |
917 |
-IUSE+=" nghttp3 quiche" |
918 |
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc |
919 |
- |
920 |
-# c-ares must be disabled for threads |
921 |
-# only one default ssl provider can be enabled |
922 |
-REQUIRED_USE=" |
923 |
- threads? ( !adns ) |
924 |
- ssl? ( |
925 |
- ^^ ( |
926 |
- curl_ssl_gnutls |
927 |
- curl_ssl_mbedtls |
928 |
- curl_ssl_nss |
929 |
- curl_ssl_openssl |
930 |
- ) |
931 |
- )" |
932 |
- |
933 |
-# lead to lots of false negatives, bug #285669 |
934 |
-RESTRICT="!test? ( test )" |
935 |
- |
936 |
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
937 |
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
938 |
- ssl? ( |
939 |
- gnutls? ( |
940 |
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
941 |
- dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
942 |
- app-misc/ca-certificates |
943 |
- ) |
944 |
- mbedtls? ( |
945 |
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
946 |
- app-misc/ca-certificates |
947 |
- ) |
948 |
- openssl? ( |
949 |
- dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] |
950 |
- ) |
951 |
- nss? ( |
952 |
- dev-libs/nss:0[${MULTILIB_USEDEP}] |
953 |
- app-misc/ca-certificates |
954 |
- ) |
955 |
- ) |
956 |
- http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) |
957 |
- nghttp3? ( |
958 |
- net-libs/nghttp3[${MULTILIB_USEDEP}] |
959 |
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] |
960 |
- ) |
961 |
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) |
962 |
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) |
963 |
- adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] ) |
964 |
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
965 |
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) |
966 |
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) |
967 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
968 |
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" |
969 |
- |
970 |
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 |
971 |
-# rtmp? ( |
972 |
-# media-video/rtmpdump |
973 |
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) |
974 |
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) |
975 |
-# ) |
976 |
- |
977 |
-DEPEND="${RDEPEND}" |
978 |
-BDEPEND="dev-lang/perl |
979 |
- virtual/pkgconfig |
980 |
- test? ( |
981 |
- sys-apps/diffutils |
982 |
- ) |
983 |
- verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" |
984 |
- |
985 |
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) |
986 |
- |
987 |
-MULTILIB_WRAPPED_HEADERS=( |
988 |
- /usr/include/curl/curlbuild.h |
989 |
-) |
990 |
- |
991 |
-MULTILIB_CHOST_TOOLS=( |
992 |
- /usr/bin/curl-config |
993 |
-) |
994 |
- |
995 |
-PATCHES=( |
996 |
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
997 |
- "${FILESDIR}"/${PN}-respect-cflags-3.patch |
998 |
- # Bug 842780, fixed upstream, drop on next version bump |
999 |
- "${FILESDIR}"/${P}-http2.patch |
1000 |
-) |
1001 |
- |
1002 |
-src_prepare() { |
1003 |
- default |
1004 |
- |
1005 |
- eprefixify curl-config.in |
1006 |
- eautoreconf |
1007 |
-} |
1008 |
- |
1009 |
-multilib_src_configure() { |
1010 |
- # We make use of the fact that later flags override earlier ones |
1011 |
- # So start with all ssl providers off until proven otherwise |
1012 |
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) |
1013 |
- local myconf=() |
1014 |
- |
1015 |
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl ) |
1016 |
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
1017 |
- #myconf+=( --without-default-ssl-backend ) |
1018 |
- if use ssl ; then |
1019 |
- if use gnutls || use curl_ssl_gnutls; then |
1020 |
- einfo "SSL provided by gnutls" |
1021 |
- myconf+=( --with-gnutls --with-nettle ) |
1022 |
- fi |
1023 |
- if use mbedtls || use curl_ssl_mbedtls; then |
1024 |
- einfo "SSL provided by mbedtls" |
1025 |
- myconf+=( --with-mbedtls ) |
1026 |
- fi |
1027 |
- if use nss || use curl_ssl_nss; then |
1028 |
- einfo "SSL provided by nss" |
1029 |
- myconf+=( --with-nss --with-nss-deprecated ) |
1030 |
- fi |
1031 |
- if use openssl || use curl_ssl_openssl; then |
1032 |
- einfo "SSL provided by openssl" |
1033 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
1034 |
- fi |
1035 |
- |
1036 |
- if use curl_ssl_gnutls; then |
1037 |
- einfo "Default SSL provided by gnutls" |
1038 |
- myconf+=( --with-default-ssl-backend=gnutls ) |
1039 |
- elif use curl_ssl_mbedtls; then |
1040 |
- einfo "Default SSL provided by mbedtls" |
1041 |
- myconf+=( --with-default-ssl-backend=mbedtls ) |
1042 |
- elif use curl_ssl_nss; then |
1043 |
- einfo "Default SSL provided by nss" |
1044 |
- myconf+=( --with-default-ssl-backend=nss ) |
1045 |
- elif use curl_ssl_openssl; then |
1046 |
- einfo "Default SSL provided by openssl" |
1047 |
- myconf+=( --with-default-ssl-backend=openssl ) |
1048 |
- else |
1049 |
- eerror "We can't be here because of REQUIRED_USE." |
1050 |
- fi |
1051 |
- |
1052 |
- else |
1053 |
- einfo "SSL disabled" |
1054 |
- fi |
1055 |
- |
1056 |
- # These configuration options are organized alphabetically |
1057 |
- # within each category. This should make it easier if we |
1058 |
- # ever decide to make any of them contingent on USE flags: |
1059 |
- # 1) protocols first. To see them all do |
1060 |
- # 'grep SUPPORT_PROTOCOLS configure.ac' |
1061 |
- # 2) --enable/disable options second. |
1062 |
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
1063 |
- # 3) --with/without options third. |
1064 |
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
1065 |
- |
1066 |
- myconf+=( |
1067 |
- $(use_enable alt-svc) |
1068 |
- --enable-crypto-auth |
1069 |
- --enable-dict |
1070 |
- --disable-ech |
1071 |
- --enable-file |
1072 |
- $(use_enable ftp) |
1073 |
- $(use_enable gopher) |
1074 |
- $(use_enable hsts) |
1075 |
- --enable-http |
1076 |
- $(use_enable imap) |
1077 |
- $(use_enable ldap) |
1078 |
- $(use_enable ldap ldaps) |
1079 |
- --enable-ntlm |
1080 |
- --disable-ntlm-wb |
1081 |
- $(use_enable pop3) |
1082 |
- --enable-rt |
1083 |
- --enable-rtsp |
1084 |
- $(use_enable samba smb) |
1085 |
- $(use_with ssh libssh2) |
1086 |
- $(use_enable smtp) |
1087 |
- $(use_enable telnet) |
1088 |
- $(use_enable tftp) |
1089 |
- --enable-tls-srp |
1090 |
- $(use_enable adns ares) |
1091 |
- --enable-cookies |
1092 |
- --enable-dateparse |
1093 |
- --enable-dnsshuffle |
1094 |
- --enable-doh |
1095 |
- --enable-symbol-hiding |
1096 |
- --enable-http-auth |
1097 |
- $(use_enable ipv6) |
1098 |
- --enable-largefile |
1099 |
- --enable-manual |
1100 |
- --enable-mime |
1101 |
- --enable-netrc |
1102 |
- $(use_enable progress-meter) |
1103 |
- --enable-proxy |
1104 |
- --disable-sspi |
1105 |
- $(use_enable static-libs static) |
1106 |
- $(use_enable threads threaded-resolver) |
1107 |
- $(use_enable threads pthreads) |
1108 |
- --disable-versioned-symbols |
1109 |
- --without-amissl |
1110 |
- --without-bearssl |
1111 |
- $(use_with brotli) |
1112 |
- --without-fish-functions-dir |
1113 |
- $(use_with http2 nghttp2) |
1114 |
- --without-hyper |
1115 |
- $(use_with idn libidn2) |
1116 |
- $(use_with kerberos gssapi "${EPREFIX}"/usr) |
1117 |
- --without-libgsasl |
1118 |
- --without-libpsl |
1119 |
- --without-msh3 |
1120 |
- $(use_with nghttp3) |
1121 |
- $(use_with nghttp3 ngtcp2) |
1122 |
- $(use_with quiche) |
1123 |
- $(use_with rtmp librtmp) |
1124 |
- --without-rustls |
1125 |
- --without-schannel |
1126 |
- --without-secure-transport |
1127 |
- --without-winidn |
1128 |
- --without-wolfssl |
1129 |
- --with-zlib |
1130 |
- $(use_with zstd) |
1131 |
- ) |
1132 |
- |
1133 |
- ECONF_SOURCE="${S}" \ |
1134 |
- econf "${myconf[@]}" |
1135 |
- |
1136 |
- if ! multilib_is_native_abi; then |
1137 |
- # avoid building the client |
1138 |
- sed -i -e '/SUBDIRS/s:src::' Makefile || die |
1139 |
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
1140 |
- fi |
1141 |
- |
1142 |
- # Fix up the pkg-config file to be more robust. |
1143 |
- # https://github.com/curl/curl/issues/864 |
1144 |
- local priv=() libs=() |
1145 |
- # We always enable zlib. |
1146 |
- libs+=( "-lz" ) |
1147 |
- priv+=( "zlib" ) |
1148 |
- if use http2; then |
1149 |
- libs+=( "-lnghttp2" ) |
1150 |
- priv+=( "libnghttp2" ) |
1151 |
- fi |
1152 |
- if use quiche; then |
1153 |
- libs+=( "-lquiche" ) |
1154 |
- priv+=( "quiche" ) |
1155 |
- fi |
1156 |
- if use nghttp3; then |
1157 |
- libs+=( "-lnghttp3" "-lngtcp2" ) |
1158 |
- priv+=( "libnghttp3" "-libtcp2" ) |
1159 |
- fi |
1160 |
- if use ssl && use curl_ssl_openssl; then |
1161 |
- libs+=( "-lssl" "-lcrypto" ) |
1162 |
- priv+=( "openssl" ) |
1163 |
- fi |
1164 |
- grep -q Requires.private libcurl.pc && die "need to update ebuild" |
1165 |
- libs=$(printf '|%s' "${libs[@]}") |
1166 |
- sed -i -r \ |
1167 |
- -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
1168 |
- libcurl.pc || die |
1169 |
- echo "Requires.private: ${priv[*]}" >> libcurl.pc |
1170 |
-} |
1171 |
- |
1172 |
-multilib_src_test() { |
1173 |
- # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 |
1174 |
- # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) |
1175 |
- # -v: verbose |
1176 |
- # -a: keep going on failure (so we see everything which breaks, not just 1st test) |
1177 |
- # -k: keep test files after completion |
1178 |
- # -am: automake style TAP output |
1179 |
- # -p: print logs if test fails |
1180 |
- # Note: if needed, we can disable tests. See e.g. Fedora's packaging |
1181 |
- # or just read https://github.com/curl/curl/tree/master/tests#run. |
1182 |
- multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" |
1183 |
-} |
1184 |
- |
1185 |
-multilib_src_install_all() { |
1186 |
- einstalldocs |
1187 |
- find "${ED}" -type f -name '*.la' -delete || die |
1188 |
- rm -rf "${ED}"/etc/ || die |
1189 |
-} |