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