1 |
commit: f007bd7066d87237d64cf1be77a5ffae3683c972 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 18 20:17:49 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 18 20:18:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f007bd70 |
7 |
|
8 |
net-misc/curl: version bump to 7.65.2 |
9 |
|
10 |
This version introduces experimental flags to disable |
11 |
the following: dateparse, dnsshuffle, doh, http-auth, |
12 |
mime, netrc, progress-meter. These are enabled by default |
13 |
in the current ebuild, but we may want to test adding |
14 |
USE flags for them. |
15 |
|
16 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
17 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
18 |
|
19 |
net-misc/curl/Manifest | 1 + |
20 |
net-misc/curl/curl-7.65.2.ebuild | 246 +++++++++++++++++++++++++++++++++++++++ |
21 |
2 files changed, 247 insertions(+) |
22 |
|
23 |
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest |
24 |
index 3fcad8758ec..106e8a34472 100644 |
25 |
--- a/net-misc/curl/Manifest |
26 |
+++ b/net-misc/curl/Manifest |
27 |
@@ -2,3 +2,4 @@ DIST curl-7.64.0.tar.bz2 3012077 BLAKE2B 512edeaa7a4ff3a998903771307070b08f1dc53 |
28 |
DIST curl-7.64.1.tar.bz2 3000536 BLAKE2B 787b9f9662dad4e3497357dc3f9cff0fb2c997e2603cf3c621633d9983fd011c346640be5227ddc4b363bdb7e1a64532a44ae9d5ccc27e405275e08f150d63fa SHA512 e04532d68896b79f28aea3b30aec2d5b53076d0d27c8f6404769618300828eed96633e7bd5945125bca76241bb1e169f5002ac9566108bcaddc8c51b513106b6 |
29 |
DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba1541011658892bb883e917541aaffe6ebfb0d2b9f18e2357059a7bc1e3a8db47b2aed7a74597b21c14f0892ad6e9eb68 SHA512 032c065c1d4bd07ba028625f8fab6a09e7cb8505a5f19339b3abdee5a9cda7d091c11f075fe3fc227d082690a66c558c770a4cd9fb17b52acc13794976a770c5 |
30 |
DIST curl-7.65.1.tar.xz 2392672 BLAKE2B 96519ad3b342944d2e6ae645a8435ba902e319830a95a2f873f4ab71cf2585daf98b5e44509dd394eaa6db71ac3d2cc6dd9e45deead7021e5d2e96db5de295ab SHA512 aba2d979a416d14a0f0852d595665e49fc4f7bff3bee31f3a52b90ba9dc5ffdb09c092777f124215470b72c47ebca7ddb47844cbf5c0e9142099272b6ac55df4 |
31 |
+DIST curl-7.65.2.tar.xz 2388668 BLAKE2B 815c38b73ce66877711e4e706763402df0486ec8806926760b48e42b3eb2e9feae024d72aa4f7ef3112b340825b7adc9a46679b71e34481a228ae77295e0fe53 SHA512 a411cf19c389301473d74b85d775e3ba0c7c2f6e74d7e0f8de47dace1a709bfba552c483c3faf94101f741a5478800284c475422844cedb6a7a070e2f78af263 |
32 |
|
33 |
diff --git a/net-misc/curl/curl-7.65.2.ebuild b/net-misc/curl/curl-7.65.2.ebuild |
34 |
new file mode 100644 |
35 |
index 00000000000..5b71ec9c0ab |
36 |
--- /dev/null |
37 |
+++ b/net-misc/curl/curl-7.65.2.ebuild |
38 |
@@ -0,0 +1,246 @@ |
39 |
+# Copyright 1999-2019 Gentoo Authors |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+ |
42 |
+EAPI="7" |
43 |
+ |
44 |
+inherit autotools eutils prefix multilib-minimal |
45 |
+ |
46 |
+DESCRIPTION="A Client that groks URLs" |
47 |
+HOMEPAGE="https://curl.haxx.se/" |
48 |
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" |
49 |
+ |
50 |
+LICENSE="MIT" |
51 |
+SLOT="0" |
52 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
53 |
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" |
54 |
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
55 |
+IUSE+=" elibc_Winnt" |
56 |
+ |
57 |
+#lead to lots of false negatives, bug #285669 |
58 |
+RESTRICT="test" |
59 |
+ |
60 |
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
61 |
+ brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
62 |
+ ssl? ( |
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[${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_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 |
+ --disable-alt-svc \ |
195 |
+ --enable-crypto-auth \ |
196 |
+ --enable-dict \ |
197 |
+ --enable-file \ |
198 |
+ --enable-ftp \ |
199 |
+ --enable-gopher \ |
200 |
+ --enable-http \ |
201 |
+ --enable-imap \ |
202 |
+ $(use_enable ldap) \ |
203 |
+ $(use_enable ldap ldaps) \ |
204 |
+ --disable-ntlm-wb \ |
205 |
+ --enable-pop3 \ |
206 |
+ --enable-rt \ |
207 |
+ --enable-rtsp \ |
208 |
+ $(use_enable samba smb) \ |
209 |
+ $(use_with ssh libssh2) \ |
210 |
+ --enable-smtp \ |
211 |
+ --enable-telnet \ |
212 |
+ --enable-tftp \ |
213 |
+ --enable-tls-srp \ |
214 |
+ $(use_enable adns ares) \ |
215 |
+ --enable-cookies \ |
216 |
+ --enable-dateparse \ |
217 |
+ --enable-dnsshuffle \ |
218 |
+ --enable-doh \ |
219 |
+ --enable-hidden-symbols \ |
220 |
+ --enable-http-auth \ |
221 |
+ $(use_enable ipv6) \ |
222 |
+ --enable-largefile \ |
223 |
+ --without-libpsl \ |
224 |
+ --enable-manual \ |
225 |
+ --enable-mime \ |
226 |
+ --enable-netrc \ |
227 |
+ --enable-progress-meter \ |
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-amissl \ |
235 |
+ --without-cyassl \ |
236 |
+ --without-darwinssl \ |
237 |
+ --without-fish-functions-dir \ |
238 |
+ $(use_with idn libidn2) \ |
239 |
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
240 |
+ $(use_with metalink libmetalink) \ |
241 |
+ $(use_with http2 nghttp2) \ |
242 |
+ $(use_with rtmp librtmp) \ |
243 |
+ $(use_with brotli) \ |
244 |
+ --without-schannel \ |
245 |
+ --without-secure-transport \ |
246 |
+ --without-spnego \ |
247 |
+ --without-winidn \ |
248 |
+ --without-wolfssl \ |
249 |
+ --with-zlib \ |
250 |
+ "${myconf[@]}" |
251 |
+ |
252 |
+ if ! multilib_is_native_abi; then |
253 |
+ # avoid building the client |
254 |
+ sed -i -e '/SUBDIRS/s:src::' Makefile || die |
255 |
+ sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
256 |
+ fi |
257 |
+ |
258 |
+ # Fix up the pkg-config file to be more robust. |
259 |
+ # https://github.com/curl/curl/issues/864 |
260 |
+ local priv=() libs=() |
261 |
+ # We always enable zlib. |
262 |
+ libs+=( "-lz" ) |
263 |
+ priv+=( "zlib" ) |
264 |
+ if use http2; then |
265 |
+ libs+=( "-lnghttp2" ) |
266 |
+ priv+=( "libnghttp2" ) |
267 |
+ fi |
268 |
+ if use ssl && use curl_ssl_openssl; then |
269 |
+ libs+=( "-lssl" "-lcrypto" ) |
270 |
+ priv+=( "openssl" ) |
271 |
+ fi |
272 |
+ grep -q Requires.private libcurl.pc && die "need to update ebuild" |
273 |
+ libs=$(printf '|%s' "${libs[@]}") |
274 |
+ sed -i -r \ |
275 |
+ -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
276 |
+ libcurl.pc || die |
277 |
+ echo "Requires.private: ${priv[*]}" >> libcurl.pc |
278 |
+} |
279 |
+ |
280 |
+multilib_src_install_all() { |
281 |
+ einstalldocs |
282 |
+ find "${ED}" -type f -name '*.la' -delete |
283 |
+ rm -rf "${ED}"/etc/ |
284 |
+} |