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