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