1 |
commit: e3e0f31d5fba1c5d854e6c8d007d802e6608e7a6 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 24 21:11:18 2017 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 24 21:11:43 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3e0f31d |
7 |
|
8 |
net-misc/curl: version bump to 7.56.1, bug #635140 |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
net-misc/curl/Manifest | 1 + |
13 |
net-misc/curl/curl-7.56.1.ebuild | 241 +++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 242 insertions(+) |
15 |
|
16 |
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest |
17 |
index 52a01a9e9a9..7ec3c89966b 100644 |
18 |
--- a/net-misc/curl/Manifest |
19 |
+++ b/net-misc/curl/Manifest |
20 |
@@ -1,2 +1,3 @@ |
21 |
DIST curl-7.55.1.tar.bz2 2786830 SHA256 e5b1a92ed3b0c11f149886458fa063419500819f1610c020d62f25b8e4b16cfb SHA512 bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b WHIRLPOOL 287f6f4f5464a780c338755e4e9870381937768c9f4c9545436856ea690ae6bf4d3f886dd816cf080d2ee84e2a3fbf1a0a5a78e5fbc9d9d18bde428458819a8e |
22 |
DIST curl-7.56.0.tar.bz2 2838517 SHA256 de60a4725a3d461c70aa571d7d69c788f1816d9d1a8a2ef05f864ce8f01279df SHA512 ba17a9fdc4b540d6053fa542bd875f321d009b9ba0cb56b16fe6c217f3856ab061f2a6c735771a0eadc28338889d071884680b4d4c243b4179872abb29915e3b WHIRLPOOL 89bdd5fdf4c99fd30bd7a63ad19d2285591b19134911160c94bf46bb4cdf6156544142b47e29d7c0c9cf06536215604cfc6bc59a5ba570dc16b23626fd1b44b2 |
23 |
+DIST curl-7.56.1.tar.bz2 2824548 SHA256 2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90 SHA512 f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68 WHIRLPOOL 428a2f90657cbe3fdc8a837b28f7ad7d80a1c1321a6976e885f79bc3a428c187e1fbc2c6ec48ffa99773aecb27647a46867c35b2fc0c29dbb6fb7f4e7d13f442 |
24 |
|
25 |
diff --git a/net-misc/curl/curl-7.56.1.ebuild b/net-misc/curl/curl-7.56.1.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..862f9c9b1bf |
28 |
--- /dev/null |
29 |
+++ b/net-misc/curl/curl-7.56.1.ebuild |
30 |
@@ -0,0 +1,241 @@ |
31 |
+# Copyright 1999-2017 Gentoo Foundation |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+ |
34 |
+EAPI="6" |
35 |
+ |
36 |
+inherit autotools eutils prefix multilib-minimal |
37 |
+ |
38 |
+DESCRIPTION="A Client that groks URLs" |
39 |
+HOMEPAGE="https://curl.haxx.se/" |
40 |
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2" |
41 |
+ |
42 |
+LICENSE="MIT" |
43 |
+SLOT="0" |
44 |
+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" |
45 |
+IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" |
46 |
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
47 |
+IUSE+=" elibc_Winnt" |
48 |
+ |
49 |
+#lead to lots of false negatives, bug #285669 |
50 |
+RESTRICT="test" |
51 |
+ |
52 |
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
53 |
+ ssl? ( |
54 |
+ curl_ssl_axtls? ( |
55 |
+ net-libs/axtls:0=[${MULTILIB_USEDEP}] |
56 |
+ app-misc/ca-certificates |
57 |
+ ) |
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 |
+ idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] ) |
80 |
+ adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) |
81 |
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
82 |
+ metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) |
83 |
+ rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) |
84 |
+ ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] ) |
85 |
+ sys-libs/zlib[${MULTILIB_USEDEP}] |
86 |
+ abi_x86_32? ( |
87 |
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 |
88 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
89 |
+ )" |
90 |
+ |
91 |
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 |
92 |
+# rtmp? ( |
93 |
+# media-video/rtmpdump |
94 |
+# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) |
95 |
+# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) |
96 |
+# ) |
97 |
+ |
98 |
+# ssl providers to be added: |
99 |
+# fbopenssl $(use_with spnego) |
100 |
+ |
101 |
+DEPEND="${RDEPEND} |
102 |
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
103 |
+ test? ( |
104 |
+ sys-apps/diffutils |
105 |
+ dev-lang/perl |
106 |
+ )" |
107 |
+ |
108 |
+# c-ares must be disabled for threads |
109 |
+# only one ssl provider can be enabled |
110 |
+REQUIRED_USE=" |
111 |
+ curl_ssl_winssl? ( elibc_Winnt ) |
112 |
+ threads? ( !adns ) |
113 |
+ ssl? ( |
114 |
+ ^^ ( |
115 |
+ curl_ssl_axtls |
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/MANUAL 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 |
+ |
143 |
+ eapply_user |
144 |
+ eprefixify curl-config.in |
145 |
+ eautoreconf |
146 |
+} |
147 |
+ |
148 |
+multilib_src_configure() { |
149 |
+ # We make use of the fact that later flags override earlier ones |
150 |
+ # So start with all ssl providers off until proven otherwise |
151 |
+ local myconf=() |
152 |
+ myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) |
153 |
+ myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
154 |
+ if use ssl ; then |
155 |
+ if use curl_ssl_axtls; then |
156 |
+ einfo "SSL provided by axtls" |
157 |
+ myconf+=( --with-axtls ) |
158 |
+ elif use curl_ssl_gnutls; then |
159 |
+ einfo "SSL provided by gnutls" |
160 |
+ myconf+=( --with-gnutls --with-nettle ) |
161 |
+ elif use curl_ssl_libressl; then |
162 |
+ einfo "SSL provided by LibreSSL" |
163 |
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
164 |
+ elif use curl_ssl_mbedtls; then |
165 |
+ einfo "SSL provided by mbedtls" |
166 |
+ myconf+=( --with-mbedtls ) |
167 |
+ elif use curl_ssl_nss; then |
168 |
+ einfo "SSL provided by nss" |
169 |
+ myconf+=( --with-nss ) |
170 |
+ elif use curl_ssl_openssl; then |
171 |
+ einfo "SSL provided by openssl" |
172 |
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
173 |
+ elif use curl_ssl_winssl; then |
174 |
+ einfo "SSL provided by Windows" |
175 |
+ myconf+=( --with-winssl ) |
176 |
+ else |
177 |
+ eerror "We can't be here because of REQUIRED_USE." |
178 |
+ fi |
179 |
+ else |
180 |
+ einfo "SSL disabled" |
181 |
+ fi |
182 |
+ |
183 |
+ # These configuration options are organized alphabetically |
184 |
+ # within each category. This should make it easier if we |
185 |
+ # ever decide to make any of them contingent on USE flags: |
186 |
+ # 1) protocols first. To see them all do |
187 |
+ # 'grep SUPPORT_PROTOCOLS configure.ac' |
188 |
+ # 2) --enable/disable options second. |
189 |
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
190 |
+ # 3) --with/without options third. |
191 |
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
192 |
+ ECONF_SOURCE="${S}" \ |
193 |
+ econf \ |
194 |
+ --enable-crypto-auth \ |
195 |
+ --enable-dict \ |
196 |
+ --enable-file \ |
197 |
+ --enable-ftp \ |
198 |
+ --enable-gopher \ |
199 |
+ --enable-http \ |
200 |
+ --enable-imap \ |
201 |
+ $(use_enable ldap) \ |
202 |
+ $(use_enable ldap ldaps) \ |
203 |
+ --disable-ntlm-wb \ |
204 |
+ --enable-pop3 \ |
205 |
+ --enable-rt \ |
206 |
+ --enable-rtsp \ |
207 |
+ $(use_enable samba smb) \ |
208 |
+ $(use_with ssh libssh2) \ |
209 |
+ --enable-smtp \ |
210 |
+ --enable-telnet \ |
211 |
+ --enable-tftp \ |
212 |
+ --enable-tls-srp \ |
213 |
+ $(use_enable adns ares) \ |
214 |
+ --enable-cookies \ |
215 |
+ --enable-hidden-symbols \ |
216 |
+ $(use_enable ipv6) \ |
217 |
+ --enable-largefile \ |
218 |
+ --without-libpsl \ |
219 |
+ --enable-manual \ |
220 |
+ --enable-proxy \ |
221 |
+ --disable-sspi \ |
222 |
+ $(use_enable static-libs static) \ |
223 |
+ $(use_enable threads threaded-resolver) \ |
224 |
+ $(use_enable threads pthreads) \ |
225 |
+ --disable-versioned-symbols \ |
226 |
+ --without-cyassl \ |
227 |
+ --without-darwinssl \ |
228 |
+ $(use_with idn libidn2) \ |
229 |
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
230 |
+ $(use_with metalink libmetalink) \ |
231 |
+ $(use_with http2 nghttp2) \ |
232 |
+ $(use_with rtmp librtmp) \ |
233 |
+ --without-spnego \ |
234 |
+ --without-winidn \ |
235 |
+ --with-zlib \ |
236 |
+ "${myconf[@]}" |
237 |
+ |
238 |
+ if ! multilib_is_native_abi; then |
239 |
+ # avoid building the client |
240 |
+ sed -i -e '/SUBDIRS/s:src::' Makefile || die |
241 |
+ sed -i -e '/SUBDIRS/s:scripts::' Makefile || die |
242 |
+ fi |
243 |
+ |
244 |
+ # Fix up the pkg-config file to be more robust. |
245 |
+ # https://github.com/curl/curl/issues/864 |
246 |
+ local priv=() libs=() |
247 |
+ # We always enable zlib. |
248 |
+ libs+=( "-lz" ) |
249 |
+ priv+=( "zlib" ) |
250 |
+ if use http2; then |
251 |
+ libs+=( "-lnghttp2" ) |
252 |
+ priv+=( "libnghttp2" ) |
253 |
+ fi |
254 |
+ if use curl_ssl_openssl; then |
255 |
+ libs+=( "-lssl" "-lcrypto" ) |
256 |
+ priv+=( "openssl" ) |
257 |
+ fi |
258 |
+ grep -q Requires.private libcurl.pc && die "need to update ebuild" |
259 |
+ libs=$(printf '|%s' "${libs[@]}") |
260 |
+ sed -i -r \ |
261 |
+ -e "/^Libs.private/s:(${libs#|})( |$)::g" \ |
262 |
+ libcurl.pc || die |
263 |
+ echo "Requires.private: ${priv[*]}" >> libcurl.pc |
264 |
+} |
265 |
+ |
266 |
+multilib_src_install_all() { |
267 |
+ einstalldocs |
268 |
+ prune_libtool_files --all |
269 |
+ |
270 |
+ rm -rf "${ED}"/etc/ |
271 |
+} |