1 |
commit: 209eae868a3591f5e85db2cc11eab87e90d78647 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 30 20:51:48 2020 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 30 20:52:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209eae86 |
7 |
|
8 |
net-misc/curl: version bump to 7.70.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
net-misc/curl/Manifest | 1 + |
14 |
net-misc/curl/curl-7.70.0.ebuild | 266 +++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 267 insertions(+) |
16 |
|
17 |
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest |
18 |
index c1a5f6e45fc..98e5487c785 100644 |
19 |
--- a/net-misc/curl/Manifest |
20 |
+++ b/net-misc/curl/Manifest |
21 |
@@ -3,3 +3,4 @@ DIST curl-7.67.0.tar.xz 2418548 BLAKE2B 818b3d03ac8c4adb8a629147feccebcbd3d89164 |
22 |
DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c |
23 |
DIST curl-7.69.0.tar.xz 2466092 BLAKE2B e47abb6410dff25f642971646ce3bec3dd119e70a6eb53abc21826b315f88db2e180fb7cc0ea2a0435816a3b090cd2926fd1f27e02ba7aa75aad37ba0a298ceb SHA512 8c151201b09c51cc1437c2f6345036fce88ea5402cd1fd62b76c093e294b87d0c1f61e1dcf6f799f508d8dcfe381589a3815001a8c8bbc085aed0fdca6f2536d |
24 |
DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937 SHA512 dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa |
25 |
+DIST curl-7.70.0.tar.xz 2348780 BLAKE2B 6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf SHA512 ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6 |
26 |
|
27 |
diff --git a/net-misc/curl/curl-7.70.0.ebuild b/net-misc/curl/curl-7.70.0.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..6d8ee271731 |
30 |
--- /dev/null |
31 |
+++ b/net-misc/curl/curl-7.70.0.ebuild |
32 |
@@ -0,0 +1,266 @@ |
33 |
+# Copyright 1999-2020 Gentoo Authors |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI="7" |
37 |
+ |
38 |
+inherit autotools eutils prefix multilib-minimal |
39 |
+ |
40 |
+DESCRIPTION="A Client that groks URLs" |
41 |
+HOMEPAGE="https://curl.haxx.se/" |
42 |
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" |
43 |
+ |
44 |
+LICENSE="MIT" |
45 |
+SLOT="0" |
46 |
+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" |
47 |
+IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads" |
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" |
54 |
+ |
55 |
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
56 |
+ brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
57 |
+ ssl? ( |
58 |
+ curl_ssl_gnutls? ( |
59 |
+ net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
60 |
+ dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
61 |
+ app-misc/ca-certificates |
62 |
+ ) |
63 |
+ curl_ssl_libressl? ( |
64 |
+ dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] |
65 |
+ ) |
66 |
+ curl_ssl_mbedtls? ( |
67 |
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
68 |
+ app-misc/ca-certificates |
69 |
+ ) |
70 |
+ curl_ssl_openssl? ( |
71 |
+ dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] |
72 |
+ ) |
73 |
+ curl_ssl_nss? ( |
74 |
+ dev-libs/nss:0[${MULTILIB_USEDEP}] |
75 |
+ app-misc/ca-certificates |
76 |
+ ) |
77 |
+ ) |
78 |
+ http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) |
79 |
+ nghttp3? ( |
80 |
+ net-libs/nghttp3[${MULTILIB_USEDEP}] |
81 |
+ net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] |
82 |
+ ) |
83 |
+ quiche? ( >=net-libs/quiche-0.3.0[${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[${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 |
+BDEPEND=">=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_gnutls |
117 |
+ curl_ssl_libressl |
118 |
+ curl_ssl_mbedtls |
119 |
+ curl_ssl_nss |
120 |
+ curl_ssl_openssl |
121 |
+ curl_ssl_winssl |
122 |
+ ) |
123 |
+ )" |
124 |
+ |
125 |
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ |
126 |
+ docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) |
127 |
+ |
128 |
+MULTILIB_WRAPPED_HEADERS=( |
129 |
+ /usr/include/curl/curlbuild.h |
130 |
+) |
131 |
+ |
132 |
+MULTILIB_CHOST_TOOLS=( |
133 |
+ /usr/bin/curl-config |
134 |
+) |
135 |
+ |
136 |
+src_prepare() { |
137 |
+ eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
138 |
+ eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch |
139 |
+ eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch |
140 |
+ |
141 |
+ sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 |
142 |
+ sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 |
143 |
+ |
144 |
+ eapply_user |
145 |
+ eprefixify curl-config.in |
146 |
+ eautoreconf |
147 |
+} |
148 |
+ |
149 |
+multilib_src_configure() { |
150 |
+ # We make use of the fact that later flags override earlier ones |
151 |
+ # So start with all ssl providers off until proven otherwise |
152 |
+ # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) |
153 |
+ local myconf=() |
154 |
+ myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) |
155 |
+ myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
156 |
+ if use ssl ; then |
157 |
+ if use curl_ssl_gnutls; then |
158 |
+ einfo "SSL provided by gnutls" |
159 |
+ myconf+=( --with-gnutls --with-nettle ) |
160 |
+ elif use curl_ssl_libressl; then |
161 |
+ einfo "SSL provided by LibreSSL" |
162 |
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
163 |
+ elif use curl_ssl_mbedtls; then |
164 |
+ einfo "SSL provided by mbedtls" |
165 |
+ myconf+=( --with-mbedtls ) |
166 |
+ elif use curl_ssl_nss; then |
167 |
+ einfo "SSL provided by nss" |
168 |
+ myconf+=( --with-nss ) |
169 |
+ elif use curl_ssl_openssl; then |
170 |
+ einfo "SSL provided by openssl" |
171 |
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
172 |
+ elif use curl_ssl_winssl; then |
173 |
+ einfo "SSL provided by Windows" |
174 |
+ myconf+=( --with-winssl ) |
175 |
+ else |
176 |
+ eerror "We can't be here because of REQUIRED_USE." |
177 |
+ fi |
178 |
+ else |
179 |
+ einfo "SSL disabled" |
180 |
+ fi |
181 |
+ |
182 |
+ # These configuration options are organized alphabetically |
183 |
+ # within each category. This should make it easier if we |
184 |
+ # ever decide to make any of them contingent on USE flags: |
185 |
+ # 1) protocols first. To see them all do |
186 |
+ # 'grep SUPPORT_PROTOCOLS configure.ac' |
187 |
+ # 2) --enable/disable options second. |
188 |
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
189 |
+ # 3) --with/without options third. |
190 |
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
191 |
+ |
192 |
+ ECONF_SOURCE="${S}" \ |
193 |
+ econf \ |
194 |
+ $(use_enable alt-svc) \ |
195 |
+ --enable-crypto-auth \ |
196 |
+ --enable-dict \ |
197 |
+ --disable-esni \ |
198 |
+ --enable-file \ |
199 |
+ $(use_enable ftp) \ |
200 |
+ $(use_enable gopher) \ |
201 |
+ --enable-http \ |
202 |
+ $(use_enable imap) \ |
203 |
+ $(use_enable ldap) \ |
204 |
+ $(use_enable ldap ldaps) \ |
205 |
+ --disable-mqtt \ |
206 |
+ --disable-ntlm-wb \ |
207 |
+ $(use_enable pop3) \ |
208 |
+ --enable-rt \ |
209 |
+ --enable-rtsp \ |
210 |
+ $(use_enable samba smb) \ |
211 |
+ $(use_with ssh libssh2) \ |
212 |
+ $(use_enable smtp) \ |
213 |
+ $(use_enable telnet) \ |
214 |
+ $(use_enable tftp) \ |
215 |
+ --enable-tls-srp \ |
216 |
+ $(use_enable adns ares) \ |
217 |
+ --enable-cookies \ |
218 |
+ --enable-dateparse \ |
219 |
+ --enable-dnsshuffle \ |
220 |
+ --enable-doh \ |
221 |
+ --enable-hidden-symbols \ |
222 |
+ --enable-http-auth \ |
223 |
+ $(use_enable ipv6) \ |
224 |
+ --enable-largefile \ |
225 |
+ --enable-manual \ |
226 |
+ --enable-mime \ |
227 |
+ --enable-netrc \ |
228 |
+ $(use_enable progress-meter) \ |
229 |
+ --enable-proxy \ |
230 |
+ --disable-sspi \ |
231 |
+ $(use_enable static-libs static) \ |
232 |
+ $(use_enable threads threaded-resolver) \ |
233 |
+ $(use_enable threads pthreads) \ |
234 |
+ --disable-versioned-symbols \ |
235 |
+ --without-amissl \ |
236 |
+ --without-bearssl \ |
237 |
+ --without-cyassl \ |
238 |
+ --without-darwinssl \ |
239 |
+ --without-fish-functions-dir \ |
240 |
+ $(use_with idn libidn2) \ |
241 |
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
242 |
+ $(use_with metalink libmetalink) \ |
243 |
+ $(use_with http2 nghttp2) \ |
244 |
+ --without-libpsl \ |
245 |
+ $(use_with nghttp3) \ |
246 |
+ $(use_with nghttp3 ngtcp2) \ |
247 |
+ $(use_with quiche) \ |
248 |
+ $(use_with rtmp librtmp) \ |
249 |
+ $(use_with brotli) \ |
250 |
+ --without-schannel \ |
251 |
+ --without-secure-transport \ |
252 |
+ --without-spnego \ |
253 |
+ --without-winidn \ |
254 |
+ --without-wolfssl \ |
255 |
+ --with-zlib \ |
256 |
+ "${myconf[@]}" |
257 |
+ |
258 |
+ if ! multilib_is_native_abi; then |
259 |
+ # avoid building the client |
260 |
+ sed -i -e '/SUBDIRS/s:src::' Makefile || die |
261 |
+ sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
262 |
+ fi |
263 |
+ |
264 |
+ # Fix up the pkg-config file to be more robust. |
265 |
+ # https://github.com/curl/curl/issues/864 |
266 |
+ local priv=() libs=() |
267 |
+ # We always enable zlib. |
268 |
+ libs+=( "-lz" ) |
269 |
+ priv+=( "zlib" ) |
270 |
+ if use http2; then |
271 |
+ libs+=( "-lnghttp2" ) |
272 |
+ priv+=( "libnghttp2" ) |
273 |
+ fi |
274 |
+ if use quiche; then |
275 |
+ libs+=( "-lquiche" ) |
276 |
+ priv+=( "quiche" ) |
277 |
+ fi |
278 |
+ if use nghttp3; then |
279 |
+ libs+=( "-lnghttp3" "-lngtcp2" ) |
280 |
+ priv+=( "libnghttp3" "-libtcp2" ) |
281 |
+ fi |
282 |
+ if use ssl && use curl_ssl_openssl; then |
283 |
+ libs+=( "-lssl" "-lcrypto" ) |
284 |
+ priv+=( "openssl" ) |
285 |
+ fi |
286 |
+ grep -q Requires.private libcurl.pc && die "need to update ebuild" |
287 |
+ libs=$(printf '|%s' "${libs[@]}") |
288 |
+ sed -i -r \ |
289 |
+ -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
290 |
+ libcurl.pc || die |
291 |
+ echo "Requires.private: ${priv[*]}" >> libcurl.pc |
292 |
+} |
293 |
+ |
294 |
+multilib_src_install_all() { |
295 |
+ einstalldocs |
296 |
+ find "${ED}" -type f -name '*.la' -delete |
297 |
+ rm -rf "${ED}"/etc/ |
298 |
+} |