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