1 |
blueness 14/04/29 13:27:40 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: curl-7.36.0-r1.ebuild |
5 |
Log: |
6 |
Add WinSSL support to build against elibc_Winnt, bug #508808 |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) |
9 |
|
10 |
Revision Changes Path |
11 |
1.357 net-misc/curl/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.357&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.357&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.356&r2=1.357 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v |
20 |
retrieving revision 1.356 |
21 |
retrieving revision 1.357 |
22 |
diff -u -r1.356 -r1.357 |
23 |
--- ChangeLog 21 Apr 2014 10:50:05 -0000 1.356 |
24 |
+++ ChangeLog 29 Apr 2014 13:27:40 -0000 1.357 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-misc/curl |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.356 2014/04/21 10:50:05 ago Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.357 2014/04/29 13:27:40 blueness Exp $ |
30 |
+ |
31 |
+*curl-7.36.0-r1 (29 Apr 2014) |
32 |
+ |
33 |
+ 29 Apr 2014; Anthony G. Basile <blueness@g.o> +curl-7.36.0-r1.ebuild: |
34 |
+ Add WinSSL support to build against elibc_Winnt, bug #508808 |
35 |
|
36 |
21 Apr 2014; Agostino Sarubbo <ago@g.o> curl-7.36.0.ebuild: |
37 |
Stable for alpha, wrt bug #505864 |
38 |
|
39 |
|
40 |
|
41 |
1.1 net-misc/curl/curl-7.36.0-r1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.36.0-r1.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.36.0-r1.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: curl-7.36.0-r1.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2014 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0-r1.ebuild,v 1.1 2014/04/29 13:27:40 blueness Exp $ |
51 |
|
52 |
EAPI="5" |
53 |
|
54 |
inherit autotools eutils prefix |
55 |
|
56 |
DESCRIPTION="A Client that groks URLs" |
57 |
HOMEPAGE="http://curl.haxx.se/" |
58 |
SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" |
59 |
|
60 |
LICENSE="MIT" |
61 |
SLOT="0" |
62 |
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" |
63 |
IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads" |
64 |
IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl" |
65 |
IUSE="${IUSE} elibc_Winnt" |
66 |
|
67 |
#lead to lots of false negatives, bug #285669 |
68 |
RESTRICT="test" |
69 |
|
70 |
RDEPEND="ldap? ( net-nds/openldap ) |
71 |
ssl? ( |
72 |
curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) |
73 |
curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) |
74 |
curl_ssl_gnutls? ( |
75 |
|| ( |
76 |
( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) |
77 |
( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) |
78 |
( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) |
79 |
) |
80 |
app-misc/ca-certificates |
81 |
) |
82 |
curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) |
83 |
curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) |
84 |
curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) |
85 |
) |
86 |
idn? ( net-dns/libidn[static-libs?] ) |
87 |
adns? ( net-dns/c-ares ) |
88 |
kerberos? ( virtual/krb5 ) |
89 |
metalink? ( >=media-libs/libmetalink-0.1.0 ) |
90 |
rtmp? ( media-video/rtmpdump ) |
91 |
ssh? ( net-libs/libssh2[static-libs?] ) |
92 |
sys-libs/zlib" |
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 |
# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html |
105 |
|
106 |
DEPEND="${RDEPEND} |
107 |
virtual/pkgconfig |
108 |
test? ( |
109 |
sys-apps/diffutils |
110 |
dev-lang/perl |
111 |
)" |
112 |
|
113 |
# c-ares must be disabled for threads |
114 |
# only one ssl provider can be enabled |
115 |
REQUIRED_USE=" |
116 |
curl_ssl_winssl? ( elibc_Winnt ) |
117 |
threads? ( !adns ) |
118 |
ssl? ( |
119 |
^^ ( |
120 |
curl_ssl_axtls |
121 |
curl_ssl_cyassl |
122 |
curl_ssl_gnutls |
123 |
curl_ssl_openssl |
124 |
curl_ssl_nss |
125 |
curl_ssl_polarssl |
126 |
curl_ssl_winssl |
127 |
) |
128 |
)" |
129 |
|
130 |
DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ |
131 |
docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) |
132 |
|
133 |
src_prepare() { |
134 |
epatch \ |
135 |
"${FILESDIR}"/${PN}-7.30.0-prefix.patch \ |
136 |
"${FILESDIR}"/${PN}-respect-cflags-3.patch \ |
137 |
"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \ |
138 |
"${FILESDIR}"/${P}-hostcheck.patch #507494 |
139 |
|
140 |
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 |
141 |
|
142 |
epatch_user |
143 |
eprefixify curl-config.in |
144 |
eautoreconf |
145 |
} |
146 |
|
147 |
src_configure() { |
148 |
einfo "\033[1;32m**************************************************\033[00m" |
149 |
|
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 |
local myconf=() |
153 |
myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl ) |
154 |
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
155 |
if use ssl ; then |
156 |
if use curl_ssl_axtls; then |
157 |
einfo "SSL provided by axtls" |
158 |
einfo "NOTE: axtls is meant for embedded systems and" |
159 |
einfo "may not be the best choice as an ssl provider" |
160 |
myconf+=( --with-axtls ) |
161 |
fi |
162 |
if use curl_ssl_cyassl; then |
163 |
einfo "SSL provided by cyassl" |
164 |
einfo "NOTE: cyassl is meant for embedded systems and" |
165 |
einfo "may not be the best choice as an ssl provider" |
166 |
myconf+=( --with-cyassl ) |
167 |
fi |
168 |
if use curl_ssl_gnutls; then |
169 |
einfo "SSL provided by gnutls" |
170 |
if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then |
171 |
einfo "gnutls compiled with dev-libs/nettle" |
172 |
myconf+=( --with-gnutls --with-nettle ) |
173 |
else |
174 |
einfo "gnutls compiled with dev-libs/libgcrypt" |
175 |
myconf+=( --with-gnutls --without-nettle ) |
176 |
fi |
177 |
fi |
178 |
if use curl_ssl_nss; then |
179 |
einfo "SSL provided by nss" |
180 |
myconf+=( --with-nss ) |
181 |
fi |
182 |
if use curl_ssl_polarssl; then |
183 |
einfo "SSL provided by polarssl" |
184 |
einfo "NOTE: polarssl is meant for embedded systems and" |
185 |
einfo "may not be the best choice as an ssl provider" |
186 |
myconf+=( --with-polarssl ) |
187 |
fi |
188 |
if use curl_ssl_openssl; then |
189 |
einfo "SSL provided by openssl" |
190 |
myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
191 |
fi |
192 |
if use curl_ssl_winssl; then |
193 |
einfo "SSL provided by Windows" |
194 |
myconf+=( --with-winssl ) |
195 |
fi |
196 |
else |
197 |
einfo "SSL disabled" |
198 |
fi |
199 |
einfo "\033[1;32m**************************************************\033[00m" |
200 |
|
201 |
# These configuration options are organized alphabetically |
202 |
# within each category. This should make it easier if we |
203 |
# ever decide to make any of them contingent on USE flags: |
204 |
# 1) protocols first. To see them all do |
205 |
# 'grep SUPPORT_PROTOCOLS configure.ac' |
206 |
# 2) --enable/disable options second. |
207 |
# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
208 |
# 3) --with/without options third. |
209 |
# grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
210 |
econf \ |
211 |
--enable-dict \ |
212 |
--enable-file \ |
213 |
--enable-ftp \ |
214 |
--enable-gopher \ |
215 |
--enable-http \ |
216 |
--enable-imap \ |
217 |
$(use_enable ldap) \ |
218 |
$(use_enable ldap ldaps) \ |
219 |
--enable-pop3 \ |
220 |
--enable-rtsp \ |
221 |
$(use_with ssh libssh2) \ |
222 |
--enable-smtp \ |
223 |
--enable-telnet \ |
224 |
--enable-tftp \ |
225 |
$(use_enable adns ares) \ |
226 |
--enable-cookies \ |
227 |
--enable-hidden-symbols \ |
228 |
$(use_enable ipv6) \ |
229 |
--enable-largefile \ |
230 |
--enable-manual \ |
231 |
--enable-proxy \ |
232 |
--disable-soname-bump \ |
233 |
--disable-sspi \ |
234 |
$(use_enable static-libs static) \ |
235 |
$(use_enable threads threaded-resolver) \ |
236 |
--disable-versioned-symbols \ |
237 |
--without-darwinssl \ |
238 |
$(use_with idn libidn) \ |
239 |
$(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
240 |
--without-krb4 \ |
241 |
$(use_with metalink libmetalink) \ |
242 |
--without-nghttp2 \ |
243 |
$(use_with rtmp librtmp) \ |
244 |
--without-spnego \ |
245 |
--without-winidn \ |
246 |
--without-winssl \ |
247 |
--with-zlib \ |
248 |
"${myconf[@]}" |
249 |
} |
250 |
|
251 |
src_install() { |
252 |
default |
253 |
find "${ED}" -name '*.la' -delete |
254 |
rm -rf "${ED}"/etc/ |
255 |
|
256 |
# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976 |
257 |
insinto /usr/share/aclocal |
258 |
doins docs/libcurl/libcurl.m4 |
259 |
} |