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