1 |
commit: 1bb00d713cdcd5cae25315667cbef77bb5aa654e |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 19 16:49:39 2020 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 19 16:49:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb00d71 |
7 |
|
8 |
net-misc/curl: version bump to 7.72.0, bug #737990 |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
net-misc/curl/Manifest | 1 + |
14 |
net-misc/curl/curl-7.72.0.ebuild | 289 +++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 290 insertions(+) |
16 |
|
17 |
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest |
18 |
index 4ae3273fda0..867dc9f7d36 100644 |
19 |
--- a/net-misc/curl/Manifest |
20 |
+++ b/net-misc/curl/Manifest |
21 |
@@ -1,2 +1,3 @@ |
22 |
DIST curl-7.71.0.tar.xz 2379056 BLAKE2B 50d7369e4335823c3032b8801b270f7d8e687b0552f25ed5f9752549483cf68870e0422132ecf86e756e1c7c27cdf60048a7765850608c3a1b734cffb1fe7b99 SHA512 f1ea045f23b6a7e2c84ea83954d3299c612f57c3b1e5fee0b39493dc92fc4e95e7af2a5424c2e5bc480659e80cf1adce1fc528fc816f8ff2d0e7bfcfe4c5830a |
23 |
DIST curl-7.71.1.tar.xz 2387660 BLAKE2B 47b3a4704ae8b09b37f7a9d8850fd7d692d91db3dd4ad776aad9a57d0162e0f4091e0387a850eb048f834e6dfee5bcb36da56493a106696c72072c612b47f623 SHA512 631e0ee8562e5029fe022bfab4222836a3e6d666e82e2bfbd78311fe5985105218a36d1ea68c93472fc57a12b713957a3bcca6e385eda4e58a47ca8d5d50265b |
24 |
+DIST curl-7.72.0.tar.xz 2390040 BLAKE2B 8f20efe7255ffe6d68619645b634b9cb10557ba0ca458904e99105133fb54cfafe4cafa0e7a1c5e20bbf5b5d24c8c44670cb5ddc1a2035ca43eadd24899ea953 SHA512 e5025a32eac6108ccb13d1fcce9c2de28b3a6d6e9a258a647c4be45d71718f75653e1ccd477ef5f29242a15588255c4ef43fe47bf9908b938b6769fccfaac107 |
25 |
|
26 |
diff --git a/net-misc/curl/curl-7.72.0.ebuild b/net-misc/curl/curl-7.72.0.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..598b09eed1c |
29 |
--- /dev/null |
30 |
+++ b/net-misc/curl/curl-7.72.0.ebuild |
31 |
@@ -0,0 +1,289 @@ |
32 |
+# Copyright 1999-2020 Gentoo Authors |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI="7" |
36 |
+ |
37 |
+inherit autotools eutils prefix multilib-minimal |
38 |
+ |
39 |
+DESCRIPTION="A Client that groks URLs" |
40 |
+HOMEPAGE="https://curl.haxx.se/" |
41 |
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" |
42 |
+ |
43 |
+LICENSE="curl" |
44 |
+SLOT="0" |
45 |
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
46 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
47 |
+IUSE="adns alt-svc brotli +ftp gnutls gopher +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl" |
48 |
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
49 |
+IUSE+=" nghttp3 quiche" |
50 |
+IUSE+=" elibc_Winnt" |
51 |
+ |
52 |
+#lead to lots of false negatives, bug #285669 |
53 |
+RESTRICT="!test? ( test )" |
54 |
+ |
55 |
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
56 |
+ brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
57 |
+ ssl? ( |
58 |
+ gnutls? ( |
59 |
+ net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
60 |
+ dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
61 |
+ app-misc/ca-certificates |
62 |
+ ) |
63 |
+ mbedtls? ( |
64 |
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
65 |
+ app-misc/ca-certificates |
66 |
+ ) |
67 |
+ openssl? ( |
68 |
+ !libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] ) |
69 |
+ libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] ) |
70 |
+ ) |
71 |
+ nss? ( |
72 |
+ dev-libs/nss:0[${MULTILIB_USEDEP}] |
73 |
+ app-misc/ca-certificates |
74 |
+ ) |
75 |
+ ) |
76 |
+ http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) |
77 |
+ nghttp3? ( |
78 |
+ net-libs/nghttp3[${MULTILIB_USEDEP}] |
79 |
+ net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] |
80 |
+ ) |
81 |
+ quiche? ( >=net-libs/quiche-0.3.0[${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 |
+BDEPEND="virtual/pkgconfig |
102 |
+ test? ( |
103 |
+ sys-apps/diffutils |
104 |
+ dev-lang/perl |
105 |
+ )" |
106 |
+ |
107 |
+# c-ares must be disabled for threads |
108 |
+# only one default ssl provider can be enabled |
109 |
+REQUIRED_USE=" |
110 |
+ 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/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 |
+ |
153 |
+ myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) |
154 |
+ myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
155 |
+ #myconf+=( --without-default-ssl-backend ) |
156 |
+ if use ssl ; then |
157 |
+ if use gnutls || use curl_ssl_gnutls; then |
158 |
+ einfo "SSL provided by gnutls" |
159 |
+ myconf+=( --with-gnutls --with-nettle ) |
160 |
+ fi |
161 |
+ if use mbedtls || use curl_ssl_mbedtls; then |
162 |
+ einfo "SSL provided by mbedtls" |
163 |
+ myconf+=( --with-mbedtls ) |
164 |
+ fi |
165 |
+ if use nss || use curl_ssl_nss; then |
166 |
+ einfo "SSL provided by nss" |
167 |
+ myconf+=( --with-nss ) |
168 |
+ fi |
169 |
+ if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then |
170 |
+ einfo "SSL provided by openssl" |
171 |
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
172 |
+ fi |
173 |
+ if use winssl || use curl_ssl_winssl; then |
174 |
+ einfo "SSL provided by Windows" |
175 |
+ myconf+=( --with-winssl ) |
176 |
+ fi |
177 |
+ |
178 |
+ if use curl_ssl_gnutls; then |
179 |
+ einfo "Default SSL provided by gnutls" |
180 |
+ myconf+=( --with-default-ssl-backend=gnutls ) |
181 |
+ elif use curl_ssl_libressl; then |
182 |
+ einfo "Default SSL provided by LibreSSL" |
183 |
+ myconf+=( --with-default-ssl-backend=openssl ) # NOTE THE HACK HERE |
184 |
+ elif use curl_ssl_mbedtls; then |
185 |
+ einfo "Default SSL provided by mbedtls" |
186 |
+ myconf+=( --with-default-ssl-backend=mbedtls ) |
187 |
+ elif use curl_ssl_nss; then |
188 |
+ einfo "Default SSL provided by nss" |
189 |
+ myconf+=( --with-default-ssl-backend=nss ) |
190 |
+ elif use curl_ssl_openssl; then |
191 |
+ einfo "Default SSL provided by openssl" |
192 |
+ myconf+=( --with-default-ssl-backend=openssl ) |
193 |
+ elif use curl_ssl_winssl; then |
194 |
+ einfo "Default SSL provided by Windows" |
195 |
+ myconf+=( --with-default-ssl-backend=winssl ) |
196 |
+ else |
197 |
+ eerror "We can't be here because of REQUIRED_USE." |
198 |
+ fi |
199 |
+ |
200 |
+ else |
201 |
+ einfo "SSL disabled" |
202 |
+ fi |
203 |
+ |
204 |
+ # These configuration options are organized alphabetically |
205 |
+ # within each category. This should make it easier if we |
206 |
+ # ever decide to make any of them contingent on USE flags: |
207 |
+ # 1) protocols first. To see them all do |
208 |
+ # 'grep SUPPORT_PROTOCOLS configure.ac' |
209 |
+ # 2) --enable/disable options second. |
210 |
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
211 |
+ # 3) --with/without options third. |
212 |
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
213 |
+ |
214 |
+ ECONF_SOURCE="${S}" \ |
215 |
+ econf \ |
216 |
+ $(use_enable alt-svc) \ |
217 |
+ --enable-crypto-auth \ |
218 |
+ --enable-dict \ |
219 |
+ --disable-esni \ |
220 |
+ --enable-file \ |
221 |
+ $(use_enable ftp) \ |
222 |
+ $(use_enable gopher) \ |
223 |
+ --enable-http \ |
224 |
+ $(use_enable imap) \ |
225 |
+ $(use_enable ldap) \ |
226 |
+ $(use_enable ldap ldaps) \ |
227 |
+ --disable-mqtt \ |
228 |
+ --disable-ntlm-wb \ |
229 |
+ $(use_enable pop3) \ |
230 |
+ --enable-rt \ |
231 |
+ --enable-rtsp \ |
232 |
+ $(use_enable samba smb) \ |
233 |
+ $(use_with ssh libssh2) \ |
234 |
+ $(use_enable smtp) \ |
235 |
+ $(use_enable telnet) \ |
236 |
+ $(use_enable tftp) \ |
237 |
+ --enable-tls-srp \ |
238 |
+ $(use_enable adns ares) \ |
239 |
+ --enable-cookies \ |
240 |
+ --enable-dateparse \ |
241 |
+ --enable-dnsshuffle \ |
242 |
+ --enable-doh \ |
243 |
+ --enable-hidden-symbols \ |
244 |
+ --enable-http-auth \ |
245 |
+ $(use_enable ipv6) \ |
246 |
+ --enable-largefile \ |
247 |
+ --enable-manual \ |
248 |
+ --enable-mime \ |
249 |
+ --enable-netrc \ |
250 |
+ $(use_enable progress-meter) \ |
251 |
+ --enable-proxy \ |
252 |
+ --disable-sspi \ |
253 |
+ $(use_enable static-libs static) \ |
254 |
+ $(use_enable threads threaded-resolver) \ |
255 |
+ $(use_enable threads pthreads) \ |
256 |
+ --disable-versioned-symbols \ |
257 |
+ --without-amissl \ |
258 |
+ --without-bearssl \ |
259 |
+ --without-cyassl \ |
260 |
+ --without-darwinssl \ |
261 |
+ --without-fish-functions-dir \ |
262 |
+ $(use_with idn libidn2) \ |
263 |
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
264 |
+ $(use_with metalink libmetalink) \ |
265 |
+ $(use_with http2 nghttp2) \ |
266 |
+ --without-libpsl \ |
267 |
+ $(use_with nghttp3) \ |
268 |
+ $(use_with nghttp3 ngtcp2) \ |
269 |
+ $(use_with quiche) \ |
270 |
+ $(use_with rtmp librtmp) \ |
271 |
+ $(use_with brotli) \ |
272 |
+ --without-schannel \ |
273 |
+ --without-secure-transport \ |
274 |
+ --without-spnego \ |
275 |
+ --without-winidn \ |
276 |
+ --without-wolfssl \ |
277 |
+ --with-zlib \ |
278 |
+ "${myconf[@]}" |
279 |
+ |
280 |
+ if ! multilib_is_native_abi; then |
281 |
+ # avoid building the client |
282 |
+ sed -i -e '/SUBDIRS/s:src::' Makefile || die |
283 |
+ sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
284 |
+ fi |
285 |
+ |
286 |
+ # Fix up the pkg-config file to be more robust. |
287 |
+ # https://github.com/curl/curl/issues/864 |
288 |
+ local priv=() libs=() |
289 |
+ # We always enable zlib. |
290 |
+ libs+=( "-lz" ) |
291 |
+ priv+=( "zlib" ) |
292 |
+ if use http2; then |
293 |
+ libs+=( "-lnghttp2" ) |
294 |
+ priv+=( "libnghttp2" ) |
295 |
+ fi |
296 |
+ if use quiche; then |
297 |
+ libs+=( "-lquiche" ) |
298 |
+ priv+=( "quiche" ) |
299 |
+ fi |
300 |
+ if use nghttp3; then |
301 |
+ libs+=( "-lnghttp3" "-lngtcp2" ) |
302 |
+ priv+=( "libnghttp3" "-libtcp2" ) |
303 |
+ fi |
304 |
+ if use ssl && use curl_ssl_openssl; then |
305 |
+ libs+=( "-lssl" "-lcrypto" ) |
306 |
+ priv+=( "openssl" ) |
307 |
+ fi |
308 |
+ grep -q Requires.private libcurl.pc && die "need to update ebuild" |
309 |
+ libs=$(printf '|%s' "${libs[@]}") |
310 |
+ sed -i -r \ |
311 |
+ -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
312 |
+ libcurl.pc || die |
313 |
+ echo "Requires.private: ${priv[*]}" >> libcurl.pc |
314 |
+} |
315 |
+ |
316 |
+multilib_src_install_all() { |
317 |
+ einstalldocs |
318 |
+ find "${ED}" -type f -name '*.la' -delete |
319 |
+ rm -rf "${ED}"/etc/ |
320 |
+} |