1 |
commit: f9660ab502123ed7012950079809c0536779dc08 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 30 20:56:02 2020 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 30 20:56:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9660ab5 |
7 |
|
8 |
net-misc/curl: remove older versions |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
net-misc/curl/Manifest | 3 - |
14 |
net-misc/curl/curl-7.66.0.ebuild | 263 ----------------------------------- |
15 |
net-misc/curl/curl-7.67.0-r1.ebuild | 264 ----------------------------------- |
16 |
net-misc/curl/curl-7.69.0.ebuild | 265 ------------------------------------ |
17 |
4 files changed, 795 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest |
20 |
index 98e5487c785..0a0b0ff2587 100644 |
21 |
--- a/net-misc/curl/Manifest |
22 |
+++ b/net-misc/curl/Manifest |
23 |
@@ -1,6 +1,3 @@ |
24 |
-DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab SHA512 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35 |
25 |
-DIST curl-7.67.0.tar.xz 2418548 BLAKE2B 818b3d03ac8c4adb8a629147feccebcbd3d89164a77d7cb457924bd44c3069f1b03326861b73c51a6427d7169d40485a509f74edd89b99b760649e7adcdce693 SHA512 1d5a344be92dd61b1ba5189eff0fe337e492f2e850794943570fe71c985d0af60bd412082be646e07aaa8639908593e1ce4bb2d07db35394ec377e8ce8b9ae29 |
26 |
DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c |
27 |
-DIST curl-7.69.0.tar.xz 2466092 BLAKE2B e47abb6410dff25f642971646ce3bec3dd119e70a6eb53abc21826b315f88db2e180fb7cc0ea2a0435816a3b090cd2926fd1f27e02ba7aa75aad37ba0a298ceb SHA512 8c151201b09c51cc1437c2f6345036fce88ea5402cd1fd62b76c093e294b87d0c1f61e1dcf6f799f508d8dcfe381589a3815001a8c8bbc085aed0fdca6f2536d |
28 |
DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937 SHA512 dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa |
29 |
DIST curl-7.70.0.tar.xz 2348780 BLAKE2B 6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf SHA512 ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6 |
30 |
|
31 |
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild |
32 |
deleted file mode 100644 |
33 |
index 85a43d48022..00000000000 |
34 |
--- a/net-misc/curl/curl-7.66.0.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,263 +0,0 @@ |
37 |
-# Copyright 1999-2020 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI="7" |
41 |
- |
42 |
-inherit autotools eutils 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="MIT" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
51 |
-IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" |
52 |
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
53 |
-IUSE+=" nghttp3 quiche" |
54 |
-IUSE+=" elibc_Winnt" |
55 |
- |
56 |
-#lead to lots of false negatives, bug #285669 |
57 |
-RESTRICT="test" |
58 |
- |
59 |
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
60 |
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
61 |
- ssl? ( |
62 |
- curl_ssl_gnutls? ( |
63 |
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
64 |
- dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
65 |
- app-misc/ca-certificates |
66 |
- ) |
67 |
- curl_ssl_libressl? ( |
68 |
- dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] |
69 |
- ) |
70 |
- curl_ssl_mbedtls? ( |
71 |
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
72 |
- app-misc/ca-certificates |
73 |
- ) |
74 |
- curl_ssl_openssl? ( |
75 |
- dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] |
76 |
- ) |
77 |
- curl_ssl_nss? ( |
78 |
- dev-libs/nss:0[${MULTILIB_USEDEP}] |
79 |
- app-misc/ca-certificates |
80 |
- ) |
81 |
- ) |
82 |
- http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) |
83 |
- nghttp3? ( |
84 |
- net-libs/nghttp3[${MULTILIB_USEDEP}] |
85 |
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] |
86 |
- ) |
87 |
- quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] ) |
88 |
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) |
89 |
- adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) |
90 |
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
91 |
- metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) |
92 |
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) |
93 |
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) |
94 |
- sys-libs/zlib[${MULTILIB_USEDEP}]" |
95 |
- |
96 |
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 |
97 |
-# rtmp? ( |
98 |
-# media-video/rtmpdump |
99 |
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) |
100 |
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) |
101 |
-# ) |
102 |
- |
103 |
-# ssl providers to be added: |
104 |
-# fbopenssl $(use_with spnego) |
105 |
- |
106 |
-DEPEND="${RDEPEND}" |
107 |
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
108 |
- test? ( |
109 |
- sys-apps/diffutils |
110 |
- dev-lang/perl |
111 |
- )" |
112 |
- |
113 |
-# c-ares must be disabled for threads |
114 |
-# only one ssl provider can be enabled |
115 |
-REQUIRED_USE=" |
116 |
- curl_ssl_winssl? ( elibc_Winnt ) |
117 |
- threads? ( !adns ) |
118 |
- ssl? ( |
119 |
- ^^ ( |
120 |
- curl_ssl_gnutls |
121 |
- curl_ssl_libressl |
122 |
- curl_ssl_mbedtls |
123 |
- curl_ssl_nss |
124 |
- curl_ssl_openssl |
125 |
- curl_ssl_winssl |
126 |
- ) |
127 |
- )" |
128 |
- |
129 |
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ |
130 |
- docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) |
131 |
- |
132 |
-MULTILIB_WRAPPED_HEADERS=( |
133 |
- /usr/include/curl/curlbuild.h |
134 |
-) |
135 |
- |
136 |
-MULTILIB_CHOST_TOOLS=( |
137 |
- /usr/bin/curl-config |
138 |
-) |
139 |
- |
140 |
-src_prepare() { |
141 |
- eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
142 |
- eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch |
143 |
- eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch |
144 |
- |
145 |
- sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 |
146 |
- sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 |
147 |
- |
148 |
- eapply_user |
149 |
- eprefixify curl-config.in |
150 |
- eautoreconf |
151 |
-} |
152 |
- |
153 |
-multilib_src_configure() { |
154 |
- # We make use of the fact that later flags override earlier ones |
155 |
- # So start with all ssl providers off until proven otherwise |
156 |
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) |
157 |
- local myconf=() |
158 |
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) |
159 |
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
160 |
- if use ssl ; then |
161 |
- if use curl_ssl_gnutls; then |
162 |
- einfo "SSL provided by gnutls" |
163 |
- myconf+=( --with-gnutls --with-nettle ) |
164 |
- elif use curl_ssl_libressl; then |
165 |
- einfo "SSL provided by LibreSSL" |
166 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
167 |
- elif use curl_ssl_mbedtls; then |
168 |
- einfo "SSL provided by mbedtls" |
169 |
- myconf+=( --with-mbedtls ) |
170 |
- elif use curl_ssl_nss; then |
171 |
- einfo "SSL provided by nss" |
172 |
- myconf+=( --with-nss ) |
173 |
- elif use curl_ssl_openssl; then |
174 |
- einfo "SSL provided by openssl" |
175 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
176 |
- elif use curl_ssl_winssl; then |
177 |
- einfo "SSL provided by Windows" |
178 |
- myconf+=( --with-winssl ) |
179 |
- else |
180 |
- eerror "We can't be here because of REQUIRED_USE." |
181 |
- fi |
182 |
- else |
183 |
- einfo "SSL disabled" |
184 |
- fi |
185 |
- |
186 |
- # These configuration options are organized alphabetically |
187 |
- # within each category. This should make it easier if we |
188 |
- # ever decide to make any of them contingent on USE flags: |
189 |
- # 1) protocols first. To see them all do |
190 |
- # 'grep SUPPORT_PROTOCOLS configure.ac' |
191 |
- # 2) --enable/disable options second. |
192 |
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
193 |
- # 3) --with/without options third. |
194 |
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
195 |
- |
196 |
- ECONF_SOURCE="${S}" \ |
197 |
- econf \ |
198 |
- $(use_enable alt-svc) \ |
199 |
- --enable-crypto-auth \ |
200 |
- --enable-dict \ |
201 |
- --enable-file \ |
202 |
- --enable-ftp \ |
203 |
- --enable-gopher \ |
204 |
- --enable-http \ |
205 |
- --enable-imap \ |
206 |
- $(use_enable ldap) \ |
207 |
- $(use_enable ldap ldaps) \ |
208 |
- --disable-ntlm-wb \ |
209 |
- --enable-pop3 \ |
210 |
- --enable-rt \ |
211 |
- --enable-rtsp \ |
212 |
- $(use_enable samba smb) \ |
213 |
- $(use_with ssh libssh2) \ |
214 |
- --enable-smtp \ |
215 |
- --enable-telnet \ |
216 |
- --enable-tftp \ |
217 |
- --enable-tls-srp \ |
218 |
- $(use_enable adns ares) \ |
219 |
- --enable-cookies \ |
220 |
- --enable-dateparse \ |
221 |
- --enable-dnsshuffle \ |
222 |
- --enable-doh \ |
223 |
- --enable-hidden-symbols \ |
224 |
- --enable-http-auth \ |
225 |
- $(use_enable ipv6) \ |
226 |
- --enable-largefile \ |
227 |
- --without-libpsl \ |
228 |
- --enable-manual \ |
229 |
- --enable-mime \ |
230 |
- --enable-netrc \ |
231 |
- $(use_enable progress-meter) \ |
232 |
- --enable-proxy \ |
233 |
- --disable-sspi \ |
234 |
- $(use_enable static-libs static) \ |
235 |
- $(use_enable threads threaded-resolver) \ |
236 |
- $(use_enable threads pthreads) \ |
237 |
- --disable-versioned-symbols \ |
238 |
- --without-amissl \ |
239 |
- --without-cyassl \ |
240 |
- --without-darwinssl \ |
241 |
- --without-fish-functions-dir \ |
242 |
- $(use_with idn libidn2) \ |
243 |
- $(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
244 |
- $(use_with metalink libmetalink) \ |
245 |
- $(use_with http2 nghttp2) \ |
246 |
- $(use_with nghttp3) \ |
247 |
- $(use_with nghttp3 ngtcp2) \ |
248 |
- $(use_with quiche) \ |
249 |
- $(use_with rtmp librtmp) \ |
250 |
- $(use_with brotli) \ |
251 |
- --without-schannel \ |
252 |
- --without-secure-transport \ |
253 |
- --without-spnego \ |
254 |
- --without-winidn \ |
255 |
- --without-wolfssl \ |
256 |
- --with-zlib \ |
257 |
- "${myconf[@]}" |
258 |
- |
259 |
- if ! multilib_is_native_abi; then |
260 |
- # avoid building the client |
261 |
- sed -i -e '/SUBDIRS/s:src::' Makefile || die |
262 |
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
263 |
- fi |
264 |
- |
265 |
- # Fix up the pkg-config file to be more robust. |
266 |
- # https://github.com/curl/curl/issues/864 |
267 |
- local priv=() libs=() |
268 |
- # We always enable zlib. |
269 |
- libs+=( "-lz" ) |
270 |
- priv+=( "zlib" ) |
271 |
- if use http2; then |
272 |
- libs+=( "-lnghttp2" ) |
273 |
- priv+=( "libnghttp2" ) |
274 |
- fi |
275 |
- if use quiche; then |
276 |
- libs+=( "-lquiche" ) |
277 |
- priv+=( "libquiche" ) |
278 |
- fi |
279 |
- if use nghttp3; then |
280 |
- libs+=( "-lnghttp3" "-lngtcp2" ) |
281 |
- priv+=( "libnghttp3" "-libtcp2" ) |
282 |
- fi |
283 |
- if use ssl && use curl_ssl_openssl; then |
284 |
- libs+=( "-lssl" "-lcrypto" ) |
285 |
- priv+=( "openssl" ) |
286 |
- fi |
287 |
- grep -q Requires.private libcurl.pc && die "need to update ebuild" |
288 |
- libs=$(printf '|%s' "${libs[@]}") |
289 |
- sed -i -r \ |
290 |
- -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
291 |
- libcurl.pc || die |
292 |
- echo "Requires.private: ${priv[*]}" >> libcurl.pc |
293 |
-} |
294 |
- |
295 |
-multilib_src_install_all() { |
296 |
- einstalldocs |
297 |
- find "${ED}" -type f -name '*.la' -delete |
298 |
- rm -rf "${ED}"/etc/ |
299 |
-} |
300 |
|
301 |
diff --git a/net-misc/curl/curl-7.67.0-r1.ebuild b/net-misc/curl/curl-7.67.0-r1.ebuild |
302 |
deleted file mode 100644 |
303 |
index 9fe9aaefbf2..00000000000 |
304 |
--- a/net-misc/curl/curl-7.67.0-r1.ebuild |
305 |
+++ /dev/null |
306 |
@@ -1,264 +0,0 @@ |
307 |
-# Copyright 1999-2020 Gentoo Authors |
308 |
-# Distributed under the terms of the GNU General Public License v2 |
309 |
- |
310 |
-EAPI="7" |
311 |
- |
312 |
-inherit autotools eutils prefix multilib-minimal |
313 |
- |
314 |
-DESCRIPTION="A Client that groks URLs" |
315 |
-HOMEPAGE="https://curl.haxx.se/" |
316 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" |
317 |
- |
318 |
-LICENSE="MIT" |
319 |
-SLOT="0" |
320 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
321 |
-IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" |
322 |
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
323 |
-IUSE+=" nghttp3 quiche" |
324 |
-IUSE+=" elibc_Winnt" |
325 |
- |
326 |
-#lead to lots of false negatives, bug #285669 |
327 |
-RESTRICT="test" |
328 |
- |
329 |
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
330 |
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
331 |
- ssl? ( |
332 |
- curl_ssl_gnutls? ( |
333 |
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
334 |
- dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
335 |
- app-misc/ca-certificates |
336 |
- ) |
337 |
- curl_ssl_libressl? ( |
338 |
- dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] |
339 |
- ) |
340 |
- curl_ssl_mbedtls? ( |
341 |
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
342 |
- app-misc/ca-certificates |
343 |
- ) |
344 |
- curl_ssl_openssl? ( |
345 |
- dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] |
346 |
- ) |
347 |
- curl_ssl_nss? ( |
348 |
- dev-libs/nss:0[${MULTILIB_USEDEP}] |
349 |
- app-misc/ca-certificates |
350 |
- ) |
351 |
- ) |
352 |
- http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) |
353 |
- nghttp3? ( |
354 |
- net-libs/nghttp3[${MULTILIB_USEDEP}] |
355 |
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] |
356 |
- ) |
357 |
- quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] ) |
358 |
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) |
359 |
- adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) |
360 |
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
361 |
- metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) |
362 |
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) |
363 |
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) |
364 |
- sys-libs/zlib[${MULTILIB_USEDEP}]" |
365 |
- |
366 |
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 |
367 |
-# rtmp? ( |
368 |
-# media-video/rtmpdump |
369 |
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) |
370 |
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) |
371 |
-# ) |
372 |
- |
373 |
-# ssl providers to be added: |
374 |
-# fbopenssl $(use_with spnego) |
375 |
- |
376 |
-DEPEND="${RDEPEND}" |
377 |
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
378 |
- test? ( |
379 |
- sys-apps/diffutils |
380 |
- dev-lang/perl |
381 |
- )" |
382 |
- |
383 |
-# c-ares must be disabled for threads |
384 |
-# only one ssl provider can be enabled |
385 |
-REQUIRED_USE=" |
386 |
- curl_ssl_winssl? ( elibc_Winnt ) |
387 |
- threads? ( !adns ) |
388 |
- ssl? ( |
389 |
- ^^ ( |
390 |
- curl_ssl_gnutls |
391 |
- curl_ssl_libressl |
392 |
- curl_ssl_mbedtls |
393 |
- curl_ssl_nss |
394 |
- curl_ssl_openssl |
395 |
- curl_ssl_winssl |
396 |
- ) |
397 |
- )" |
398 |
- |
399 |
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ |
400 |
- docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) |
401 |
- |
402 |
-MULTILIB_WRAPPED_HEADERS=( |
403 |
- /usr/include/curl/curlbuild.h |
404 |
-) |
405 |
- |
406 |
-MULTILIB_CHOST_TOOLS=( |
407 |
- /usr/bin/curl-config |
408 |
-) |
409 |
- |
410 |
-src_prepare() { |
411 |
- eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
412 |
- eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch |
413 |
- eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch |
414 |
- |
415 |
- sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 |
416 |
- sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 |
417 |
- |
418 |
- eapply_user |
419 |
- eprefixify curl-config.in |
420 |
- eautoreconf |
421 |
-} |
422 |
- |
423 |
-multilib_src_configure() { |
424 |
- # We make use of the fact that later flags override earlier ones |
425 |
- # So start with all ssl providers off until proven otherwise |
426 |
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) |
427 |
- local myconf=() |
428 |
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) |
429 |
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
430 |
- if use ssl ; then |
431 |
- if use curl_ssl_gnutls; then |
432 |
- einfo "SSL provided by gnutls" |
433 |
- myconf+=( --with-gnutls --with-nettle ) |
434 |
- elif use curl_ssl_libressl; then |
435 |
- einfo "SSL provided by LibreSSL" |
436 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
437 |
- elif use curl_ssl_mbedtls; then |
438 |
- einfo "SSL provided by mbedtls" |
439 |
- myconf+=( --with-mbedtls ) |
440 |
- elif use curl_ssl_nss; then |
441 |
- einfo "SSL provided by nss" |
442 |
- myconf+=( --with-nss ) |
443 |
- elif use curl_ssl_openssl; then |
444 |
- einfo "SSL provided by openssl" |
445 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
446 |
- elif use curl_ssl_winssl; then |
447 |
- einfo "SSL provided by Windows" |
448 |
- myconf+=( --with-winssl ) |
449 |
- else |
450 |
- eerror "We can't be here because of REQUIRED_USE." |
451 |
- fi |
452 |
- else |
453 |
- einfo "SSL disabled" |
454 |
- fi |
455 |
- |
456 |
- # These configuration options are organized alphabetically |
457 |
- # within each category. This should make it easier if we |
458 |
- # ever decide to make any of them contingent on USE flags: |
459 |
- # 1) protocols first. To see them all do |
460 |
- # 'grep SUPPORT_PROTOCOLS configure.ac' |
461 |
- # 2) --enable/disable options second. |
462 |
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
463 |
- # 3) --with/without options third. |
464 |
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
465 |
- |
466 |
- ECONF_SOURCE="${S}" \ |
467 |
- econf \ |
468 |
- $(use_enable alt-svc) \ |
469 |
- --enable-crypto-auth \ |
470 |
- --enable-dict \ |
471 |
- --disable-esni \ |
472 |
- --enable-file \ |
473 |
- --enable-ftp \ |
474 |
- --enable-gopher \ |
475 |
- --enable-http \ |
476 |
- --enable-imap \ |
477 |
- $(use_enable ldap) \ |
478 |
- $(use_enable ldap ldaps) \ |
479 |
- --disable-ntlm-wb \ |
480 |
- --enable-pop3 \ |
481 |
- --enable-rt \ |
482 |
- --enable-rtsp \ |
483 |
- $(use_enable samba smb) \ |
484 |
- $(use_with ssh libssh2) \ |
485 |
- --enable-smtp \ |
486 |
- --enable-telnet \ |
487 |
- --enable-tftp \ |
488 |
- --enable-tls-srp \ |
489 |
- $(use_enable adns ares) \ |
490 |
- --enable-cookies \ |
491 |
- --enable-dateparse \ |
492 |
- --enable-dnsshuffle \ |
493 |
- --enable-doh \ |
494 |
- --enable-hidden-symbols \ |
495 |
- --enable-http-auth \ |
496 |
- $(use_enable ipv6) \ |
497 |
- --enable-largefile \ |
498 |
- --without-libpsl \ |
499 |
- --enable-manual \ |
500 |
- --enable-mime \ |
501 |
- --enable-netrc \ |
502 |
- $(use_enable progress-meter) \ |
503 |
- --enable-proxy \ |
504 |
- --disable-sspi \ |
505 |
- $(use_enable static-libs static) \ |
506 |
- $(use_enable threads threaded-resolver) \ |
507 |
- $(use_enable threads pthreads) \ |
508 |
- --disable-versioned-symbols \ |
509 |
- --without-amissl \ |
510 |
- --without-cyassl \ |
511 |
- --without-darwinssl \ |
512 |
- --without-fish-functions-dir \ |
513 |
- $(use_with idn libidn2) \ |
514 |
- $(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
515 |
- $(use_with metalink libmetalink) \ |
516 |
- $(use_with http2 nghttp2) \ |
517 |
- $(use_with nghttp3) \ |
518 |
- $(use_with nghttp3 ngtcp2) \ |
519 |
- $(use_with quiche) \ |
520 |
- $(use_with rtmp librtmp) \ |
521 |
- $(use_with brotli) \ |
522 |
- --without-schannel \ |
523 |
- --without-secure-transport \ |
524 |
- --without-spnego \ |
525 |
- --without-winidn \ |
526 |
- --without-wolfssl \ |
527 |
- --with-zlib \ |
528 |
- "${myconf[@]}" |
529 |
- |
530 |
- if ! multilib_is_native_abi; then |
531 |
- # avoid building the client |
532 |
- sed -i -e '/SUBDIRS/s:src::' Makefile || die |
533 |
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
534 |
- fi |
535 |
- |
536 |
- # Fix up the pkg-config file to be more robust. |
537 |
- # https://github.com/curl/curl/issues/864 |
538 |
- local priv=() libs=() |
539 |
- # We always enable zlib. |
540 |
- libs+=( "-lz" ) |
541 |
- priv+=( "zlib" ) |
542 |
- if use http2; then |
543 |
- libs+=( "-lnghttp2" ) |
544 |
- priv+=( "libnghttp2" ) |
545 |
- fi |
546 |
- if use quiche; then |
547 |
- libs+=( "-lquiche" ) |
548 |
- priv+=( "quiche" ) |
549 |
- fi |
550 |
- if use nghttp3; then |
551 |
- libs+=( "-lnghttp3" "-lngtcp2" ) |
552 |
- priv+=( "libnghttp3" "-libtcp2" ) |
553 |
- fi |
554 |
- if use ssl && use curl_ssl_openssl; then |
555 |
- libs+=( "-lssl" "-lcrypto" ) |
556 |
- priv+=( "openssl" ) |
557 |
- fi |
558 |
- grep -q Requires.private libcurl.pc && die "need to update ebuild" |
559 |
- libs=$(printf '|%s' "${libs[@]}") |
560 |
- sed -i -r \ |
561 |
- -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
562 |
- libcurl.pc || die |
563 |
- echo "Requires.private: ${priv[*]}" >> libcurl.pc |
564 |
-} |
565 |
- |
566 |
-multilib_src_install_all() { |
567 |
- einstalldocs |
568 |
- find "${ED}" -type f -name '*.la' -delete |
569 |
- rm -rf "${ED}"/etc/ |
570 |
-} |
571 |
|
572 |
diff --git a/net-misc/curl/curl-7.69.0.ebuild b/net-misc/curl/curl-7.69.0.ebuild |
573 |
deleted file mode 100644 |
574 |
index cf06aa6240d..00000000000 |
575 |
--- a/net-misc/curl/curl-7.69.0.ebuild |
576 |
+++ /dev/null |
577 |
@@ -1,265 +0,0 @@ |
578 |
-# Copyright 1999-2020 Gentoo Authors |
579 |
-# Distributed under the terms of the GNU General Public License v2 |
580 |
- |
581 |
-EAPI="7" |
582 |
- |
583 |
-inherit autotools eutils prefix multilib-minimal |
584 |
- |
585 |
-DESCRIPTION="A Client that groks URLs" |
586 |
-HOMEPAGE="https://curl.haxx.se/" |
587 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" |
588 |
- |
589 |
-LICENSE="MIT" |
590 |
-SLOT="0" |
591 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
592 |
-IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" |
593 |
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
594 |
-IUSE+=" nghttp3 quiche" |
595 |
-IUSE+=" elibc_Winnt" |
596 |
- |
597 |
-#lead to lots of false negatives, bug #285669 |
598 |
-RESTRICT="test" |
599 |
- |
600 |
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
601 |
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
602 |
- ssl? ( |
603 |
- curl_ssl_gnutls? ( |
604 |
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
605 |
- dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
606 |
- app-misc/ca-certificates |
607 |
- ) |
608 |
- curl_ssl_libressl? ( |
609 |
- dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] |
610 |
- ) |
611 |
- curl_ssl_mbedtls? ( |
612 |
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
613 |
- app-misc/ca-certificates |
614 |
- ) |
615 |
- curl_ssl_openssl? ( |
616 |
- dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] |
617 |
- ) |
618 |
- curl_ssl_nss? ( |
619 |
- dev-libs/nss:0[${MULTILIB_USEDEP}] |
620 |
- app-misc/ca-certificates |
621 |
- ) |
622 |
- ) |
623 |
- http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) |
624 |
- nghttp3? ( |
625 |
- net-libs/nghttp3[${MULTILIB_USEDEP}] |
626 |
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] |
627 |
- ) |
628 |
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) |
629 |
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) |
630 |
- adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) |
631 |
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
632 |
- metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) |
633 |
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) |
634 |
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) |
635 |
- sys-libs/zlib[${MULTILIB_USEDEP}]" |
636 |
- |
637 |
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 |
638 |
-# rtmp? ( |
639 |
-# media-video/rtmpdump |
640 |
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) |
641 |
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) |
642 |
-# ) |
643 |
- |
644 |
-# ssl providers to be added: |
645 |
-# fbopenssl $(use_with spnego) |
646 |
- |
647 |
-DEPEND="${RDEPEND}" |
648 |
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
649 |
- test? ( |
650 |
- sys-apps/diffutils |
651 |
- dev-lang/perl |
652 |
- )" |
653 |
- |
654 |
-# c-ares must be disabled for threads |
655 |
-# only one ssl provider can be enabled |
656 |
-REQUIRED_USE=" |
657 |
- curl_ssl_winssl? ( elibc_Winnt ) |
658 |
- threads? ( !adns ) |
659 |
- ssl? ( |
660 |
- ^^ ( |
661 |
- curl_ssl_gnutls |
662 |
- curl_ssl_libressl |
663 |
- curl_ssl_mbedtls |
664 |
- curl_ssl_nss |
665 |
- curl_ssl_openssl |
666 |
- curl_ssl_winssl |
667 |
- ) |
668 |
- )" |
669 |
- |
670 |
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ |
671 |
- docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) |
672 |
- |
673 |
-MULTILIB_WRAPPED_HEADERS=( |
674 |
- /usr/include/curl/curlbuild.h |
675 |
-) |
676 |
- |
677 |
-MULTILIB_CHOST_TOOLS=( |
678 |
- /usr/bin/curl-config |
679 |
-) |
680 |
- |
681 |
-src_prepare() { |
682 |
- eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
683 |
- eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch |
684 |
- eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch |
685 |
- |
686 |
- sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 |
687 |
- sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 |
688 |
- |
689 |
- eapply_user |
690 |
- eprefixify curl-config.in |
691 |
- eautoreconf |
692 |
-} |
693 |
- |
694 |
-multilib_src_configure() { |
695 |
- # We make use of the fact that later flags override earlier ones |
696 |
- # So start with all ssl providers off until proven otherwise |
697 |
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) |
698 |
- local myconf=() |
699 |
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) |
700 |
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
701 |
- if use ssl ; then |
702 |
- if use curl_ssl_gnutls; then |
703 |
- einfo "SSL provided by gnutls" |
704 |
- myconf+=( --with-gnutls --with-nettle ) |
705 |
- elif use curl_ssl_libressl; then |
706 |
- einfo "SSL provided by LibreSSL" |
707 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
708 |
- elif use curl_ssl_mbedtls; then |
709 |
- einfo "SSL provided by mbedtls" |
710 |
- myconf+=( --with-mbedtls ) |
711 |
- elif use curl_ssl_nss; then |
712 |
- einfo "SSL provided by nss" |
713 |
- myconf+=( --with-nss ) |
714 |
- elif use curl_ssl_openssl; then |
715 |
- einfo "SSL provided by openssl" |
716 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
717 |
- elif use curl_ssl_winssl; then |
718 |
- einfo "SSL provided by Windows" |
719 |
- myconf+=( --with-winssl ) |
720 |
- else |
721 |
- eerror "We can't be here because of REQUIRED_USE." |
722 |
- fi |
723 |
- else |
724 |
- einfo "SSL disabled" |
725 |
- fi |
726 |
- |
727 |
- # These configuration options are organized alphabetically |
728 |
- # within each category. This should make it easier if we |
729 |
- # ever decide to make any of them contingent on USE flags: |
730 |
- # 1) protocols first. To see them all do |
731 |
- # 'grep SUPPORT_PROTOCOLS configure.ac' |
732 |
- # 2) --enable/disable options second. |
733 |
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
734 |
- # 3) --with/without options third. |
735 |
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
736 |
- |
737 |
- ECONF_SOURCE="${S}" \ |
738 |
- econf \ |
739 |
- $(use_enable alt-svc) \ |
740 |
- --enable-crypto-auth \ |
741 |
- --enable-dict \ |
742 |
- --disable-esni \ |
743 |
- --enable-file \ |
744 |
- --enable-ftp \ |
745 |
- --enable-gopher \ |
746 |
- --enable-http \ |
747 |
- --enable-imap \ |
748 |
- $(use_enable ldap) \ |
749 |
- $(use_enable ldap ldaps) \ |
750 |
- --disable-ntlm-wb \ |
751 |
- --enable-pop3 \ |
752 |
- --enable-rt \ |
753 |
- --enable-rtsp \ |
754 |
- $(use_enable samba smb) \ |
755 |
- $(use_with ssh libssh2) \ |
756 |
- --enable-smtp \ |
757 |
- --enable-telnet \ |
758 |
- --enable-tftp \ |
759 |
- --enable-tls-srp \ |
760 |
- $(use_enable adns ares) \ |
761 |
- --enable-cookies \ |
762 |
- --enable-dateparse \ |
763 |
- --enable-dnsshuffle \ |
764 |
- --enable-doh \ |
765 |
- --enable-hidden-symbols \ |
766 |
- --enable-http-auth \ |
767 |
- $(use_enable ipv6) \ |
768 |
- --enable-largefile \ |
769 |
- --enable-manual \ |
770 |
- --enable-mime \ |
771 |
- --enable-netrc \ |
772 |
- $(use_enable progress-meter) \ |
773 |
- --enable-proxy \ |
774 |
- --disable-sspi \ |
775 |
- $(use_enable static-libs static) \ |
776 |
- $(use_enable threads threaded-resolver) \ |
777 |
- $(use_enable threads pthreads) \ |
778 |
- --disable-versioned-symbols \ |
779 |
- --without-amissl \ |
780 |
- --without-bearssl \ |
781 |
- --without-cyassl \ |
782 |
- --without-darwinssl \ |
783 |
- --without-fish-functions-dir \ |
784 |
- $(use_with idn libidn2) \ |
785 |
- $(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
786 |
- $(use_with metalink libmetalink) \ |
787 |
- $(use_with http2 nghttp2) \ |
788 |
- --without-libpsl \ |
789 |
- $(use_with nghttp3) \ |
790 |
- $(use_with nghttp3 ngtcp2) \ |
791 |
- $(use_with quiche) \ |
792 |
- $(use_with rtmp librtmp) \ |
793 |
- $(use_with brotli) \ |
794 |
- --without-schannel \ |
795 |
- --without-secure-transport \ |
796 |
- --without-spnego \ |
797 |
- --without-winidn \ |
798 |
- --without-wolfssl \ |
799 |
- --with-zlib \ |
800 |
- "${myconf[@]}" |
801 |
- |
802 |
- if ! multilib_is_native_abi; then |
803 |
- # avoid building the client |
804 |
- sed -i -e '/SUBDIRS/s:src::' Makefile || die |
805 |
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
806 |
- fi |
807 |
- |
808 |
- # Fix up the pkg-config file to be more robust. |
809 |
- # https://github.com/curl/curl/issues/864 |
810 |
- local priv=() libs=() |
811 |
- # We always enable zlib. |
812 |
- libs+=( "-lz" ) |
813 |
- priv+=( "zlib" ) |
814 |
- if use http2; then |
815 |
- libs+=( "-lnghttp2" ) |
816 |
- priv+=( "libnghttp2" ) |
817 |
- fi |
818 |
- if use quiche; then |
819 |
- libs+=( "-lquiche" ) |
820 |
- priv+=( "quiche" ) |
821 |
- fi |
822 |
- if use nghttp3; then |
823 |
- libs+=( "-lnghttp3" "-lngtcp2" ) |
824 |
- priv+=( "libnghttp3" "-libtcp2" ) |
825 |
- fi |
826 |
- if use ssl && use curl_ssl_openssl; then |
827 |
- libs+=( "-lssl" "-lcrypto" ) |
828 |
- priv+=( "openssl" ) |
829 |
- fi |
830 |
- grep -q Requires.private libcurl.pc && die "need to update ebuild" |
831 |
- libs=$(printf '|%s' "${libs[@]}") |
832 |
- sed -i -r \ |
833 |
- -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
834 |
- libcurl.pc || die |
835 |
- echo "Requires.private: ${priv[*]}" >> libcurl.pc |
836 |
-} |
837 |
- |
838 |
-multilib_src_install_all() { |
839 |
- einstalldocs |
840 |
- find "${ED}" -type f -name '*.la' -delete |
841 |
- rm -rf "${ED}"/etc/ |
842 |
-} |