Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/
Date: Mon, 30 May 2016 07:45:19
Message-Id: 1464594352.2dadac056e86ff0d7f7c4c09c7c704c0f21d0309.blueness@gentoo
1 commit: 2dadac056e86ff0d7f7c4c09c7c704c0f21d0309
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 30 07:45:52 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Mon May 30 07:45:52 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dadac05
7
8 net-misc/curl: version bump to 7.49.1
9
10 Package-Manager: portage-2.2.28
11
12 net-misc/curl/Manifest | 1 +
13 net-misc/curl/curl-7.49.1.ebuild | 237 +++++++++++++++++++++++++++++++++++++++
14 2 files changed, 238 insertions(+)
15
16 diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
17 index 5e2aac6..58b9360 100644
18 --- a/net-misc/curl/Manifest
19 +++ b/net-misc/curl/Manifest
20 @@ -1,3 +1,4 @@
21 DIST curl-7.45.0.tar.bz2 3473632 SHA256 65154e66b9f8a442b57c436904639507b4ac37ec13d6f8a48248f1b4012b98ea SHA512 71c557c69eb8d160f74a9b76ef83a46ce33ef4e8a66a261699329583dadf10205b4ba4783f92d4e6c8724f6610ffade5b0a9f189b0a7b9169ff839dfc8980481 WHIRLPOOL afc1627cebb64c9111f943fe63d95c8a998934fd02e3b8d12f061d23b174b7475c48451ecc1713ce54771455a6465238aa3b818b0eb9ba5c86ffd06eb1f2bc76
22 DIST curl-7.47.1.tar.bz2 3506256 SHA256 ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f SHA512 e99d94dfdd349df0603de21687039c69765d40ae6bd73bd8ccdb6d046903a94e590a9cc903f378f8d030997a29bf0394ac5e342c9989a815679f9ea4fa79913f WHIRLPOOL d8a77d9c693a7b72066d5289107a5a5afc798b4736795569350840bd41a2166fec700138244ddcb24558fdd94d91b919ff385e1bc8abcdcdad65cba842076b3d
23 DIST curl-7.49.0.tar.bz2 7458465 SHA256 14f44ed7b5207fea769ddb2c31bd9e720d37312e1c02315def67923a4a636078 SHA512 57a82185c082ea872a54c6f5a11ca24fe6131108c16255278671504afca848b9298681de9c9bb5905b9655295edf25c104d1301c4bbdb1f261d952a020d77111 WHIRLPOOL f5c4d15b7072d98e0760d7e5de59c307fb4e7f84125db7ebb2fc9f9d19e3ed35f937244579c00d9fb1e86604df277eab2a1eb14d7b339182e484a4925103dff7
24 +DIST curl-7.49.1.tar.bz2 7459866 SHA256 eb63cec4bef692eab9db459033f409533e6d10e20942f4b060b32819e81885f1 SHA512 665ef178c282c14f429498547b3711ef79faf85f6db7f4ec24259e2c6247f6ee234dda158ebc207d03f08b5198c5844480e054f24f054b2de6c6a15d4f1ce6e6 WHIRLPOOL 1c90843d78adb579ee796ceedcc2e148688dd572532c09bc62491fd82a7b859c3e27bea45fd462b78a5f3ce431b2ce833ac1772faad8b276889cdc90e44a6d98
25
26 diff --git a/net-misc/curl/curl-7.49.1.ebuild b/net-misc/curl/curl-7.49.1.ebuild
27 new file mode 100644
28 index 0000000..ae337f1
29 --- /dev/null
30 +++ b/net-misc/curl/curl-7.49.1.ebuild
31 @@ -0,0 +1,237 @@
32 +# Copyright 1999-2016 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +# $Id$
35 +
36 +EAPI="5"
37 +
38 +inherit autotools eutils prefix multilib-minimal
39 +
40 +DESCRIPTION="A Client that groks URLs"
41 +HOMEPAGE="http://curl.haxx.se/"
42 +SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
43 +
44 +LICENSE="MIT"
45 +SLOT="0"
46 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
47 +IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
48 +IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
49 +IUSE+=" elibc_Winnt"
50 +
51 +#lead to lots of false negatives, bug #285669
52 +RESTRICT="test"
53 +
54 +RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
55 + ssl? (
56 + curl_ssl_axtls? (
57 + net-libs/axtls[${MULTILIB_USEDEP}]
58 + app-misc/ca-certificates
59 + )
60 + curl_ssl_gnutls? (
61 + net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
62 + dev-libs/nettle:0=[${MULTILIB_USEDEP}]
63 + app-misc/ca-certificates
64 + )
65 + curl_ssl_libressl? (
66 + dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
67 + )
68 + curl_ssl_mbedtls? (
69 + net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
70 + app-misc/ca-certificates
71 + )
72 + curl_ssl_openssl? (
73 + dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
74 + )
75 + curl_ssl_nss? (
76 + dev-libs/nss:0[${MULTILIB_USEDEP}]
77 + app-misc/ca-certificates
78 + )
79 + curl_ssl_polarssl? (
80 + net-libs/polarssl:0=[${MULTILIB_USEDEP}]
81 + app-misc/ca-certificates
82 + )
83 + )
84 + http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
85 + idn? ( net-dns/libidn:0[static-libs?,${MULTILIB_USEDEP}] )
86 + adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
87 + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
88 + metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
89 + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
90 + ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
91 + sys-libs/zlib[${MULTILIB_USEDEP}]
92 + abi_x86_32? (
93 + !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
94 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
95 + )"
96 +
97 +# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
98 +# rtmp? (
99 +# media-video/rtmpdump
100 +# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
101 +# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
102 +# )
103 +
104 +# ssl providers to be added:
105 +# fbopenssl $(use_with spnego)
106 +
107 +DEPEND="${RDEPEND}
108 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
109 + test? (
110 + sys-apps/diffutils
111 + dev-lang/perl
112 + )"
113 +
114 +# c-ares must be disabled for threads
115 +# only one ssl provider can be enabled
116 +REQUIRED_USE="
117 + curl_ssl_winssl? ( elibc_Winnt )
118 + threads? ( !adns )
119 + ssl? (
120 + ^^ (
121 + curl_ssl_axtls
122 + curl_ssl_gnutls
123 + curl_ssl_libressl
124 + curl_ssl_mbedtls
125 + curl_ssl_nss
126 + curl_ssl_openssl
127 + curl_ssl_polarssl
128 + curl_ssl_winssl
129 + )
130 + )"
131 +
132 +DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
133 + docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE )
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 + epatch \
145 + "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
146 + "${FILESDIR}"/${PN}-respect-cflags-3.patch \
147 + "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
148 +
149 + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
150 +
151 + epatch_user
152 + eprefixify curl-config.in
153 + eautoreconf
154 +}
155 +
156 +multilib_src_configure() {
157 + einfo "\033[1;32m**************************************************\033[00m"
158 +
159 + # We make use of the fact that later flags override earlier ones
160 + # So start with all ssl providers off until proven otherwise
161 + local myconf=()
162 + myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
163 + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
164 + if use ssl ; then
165 + if use curl_ssl_axtls; then
166 + einfo "SSL provided by axtls"
167 + myconf+=( --with-axtls )
168 + elif use curl_ssl_gnutls; then
169 + einfo "SSL provided by gnutls"
170 + myconf+=( --with-gnutls --with-nettle )
171 + elif use curl_ssl_libressl; then
172 + einfo "SSL provided by LibreSSL"
173 + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
174 + elif use curl_ssl_mbedtls; then
175 + einfo "SSL provided by mbedtls"
176 + myconf+=( --with-mbedtls )
177 + elif use curl_ssl_nss; then
178 + einfo "SSL provided by nss"
179 + myconf+=( --with-nss )
180 + elif use curl_ssl_polarssl; then
181 + einfo "SSL provided by polarssl"
182 + myconf+=( --with-polarssl )
183 + elif use curl_ssl_openssl; then
184 + einfo "SSL provided by openssl"
185 + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
186 + elif use curl_ssl_winssl; then
187 + einfo "SSL provided by Windows"
188 + myconf+=( --with-winssl )
189 + else
190 + eerror "We can't be here because of REQUIRED_USE."
191 + fi
192 + else
193 + einfo "SSL disabled"
194 + fi
195 + einfo "\033[1;32m**************************************************\033[00m"
196 +
197 + # These configuration options are organized alphabetically
198 + # within each category. This should make it easier if we
199 + # ever decide to make any of them contingent on USE flags:
200 + # 1) protocols first. To see them all do
201 + # 'grep SUPPORT_PROTOCOLS configure.ac'
202 + # 2) --enable/disable options second.
203 + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
204 + # 3) --with/without options third.
205 + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
206 + ECONF_SOURCE="${S}" \
207 + econf \
208 + --enable-crypto-auth \
209 + --enable-dict \
210 + --enable-file \
211 + --enable-ftp \
212 + --enable-gopher \
213 + --enable-http \
214 + --enable-imap \
215 + $(use_enable ldap) \
216 + $(use_enable ldap ldaps) \
217 + --disable-ntlm-wb \
218 + --enable-pop3 \
219 + --enable-rt \
220 + --enable-rtsp \
221 + $(use_enable samba smb) \
222 + $(use_with ssh libssh2) \
223 + --enable-smtp \
224 + --enable-telnet \
225 + --enable-tftp \
226 + --enable-tls-srp \
227 + $(use_enable adns ares) \
228 + --enable-cookies \
229 + --enable-hidden-symbols \
230 + $(use_enable ipv6) \
231 + --enable-largefile \
232 + --without-libpsl \
233 + --enable-manual \
234 + --enable-proxy \
235 + --disable-soname-bump \
236 + --disable-sspi \
237 + $(use_enable static-libs static) \
238 + $(use_enable threads threaded-resolver) \
239 + --disable-versioned-symbols \
240 + --without-cyassl \
241 + --without-darwinssl \
242 + $(use_with idn libidn) \
243 + $(use_with kerberos gssapi "${EPREFIX}"/usr) \
244 + $(use_with metalink libmetalink) \
245 + $(use_with http2 nghttp2) \
246 + $(use_with rtmp librtmp) \
247 + --without-spnego \
248 + --without-winidn \
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 +
259 +multilib_src_install_all() {
260 + einstalldocs
261 + prune_libtool_files --all
262 +
263 + rm -rf "${ED}"/etc/
264 +
265 + # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
266 + insinto /usr/share/aclocal
267 + doins docs/libcurl/libcurl.m4
268 +}