1 |
blueness 12/07/31 21:14:35 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: curl-7.27.0-r2.ebuild |
5 |
Removed: curl-7.27.0-r1.ebuild |
6 |
Log: |
7 |
Fix bug #429100 |
8 |
|
9 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.235 net-misc/curl/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.235&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.235&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.234&r2=1.235 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v |
21 |
retrieving revision 1.234 |
22 |
retrieving revision 1.235 |
23 |
diff -u -r1.234 -r1.235 |
24 |
--- ChangeLog 31 Jul 2012 12:29:29 -0000 1.234 |
25 |
+++ ChangeLog 31 Jul 2012 21:14:35 -0000 1.235 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for net-misc/curl |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.234 2012/07/31 12:29:29 blueness Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.235 2012/07/31 21:14:35 blueness Exp $ |
31 |
+ |
32 |
+*curl-7.27.0-r2 (31 Jul 2012) |
33 |
+ |
34 |
+ 31 Jul 2012; Anthony G. Basile <blueness@g.o> -curl-7.27.0-r1.ebuild, |
35 |
+ +curl-7.27.0-r2.ebuild, +files/curl-7.27.0-curl-config.patch, |
36 |
+ files/curl-7.27.0-prefix.patch: |
37 |
+ Fix bug #429100 |
38 |
|
39 |
*curl-7.27.0-r1 (31 Jul 2012) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 net-misc/curl/curl-7.27.0-r2.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.27.0-r2.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.27.0-r2.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: curl-7.27.0-r2.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2012 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.27.0-r2.ebuild,v 1.1 2012/07/31 21:14:35 blueness Exp $ |
54 |
|
55 |
EAPI="4" |
56 |
|
57 |
inherit autotools eutils prefix |
58 |
|
59 |
DESCRIPTION="A Client that groks URLs" |
60 |
HOMEPAGE="http://curl.haxx.se/" |
61 |
SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" |
62 |
|
63 |
LICENSE="MIT" |
64 |
SLOT="0" |
65 |
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
66 |
IUSE="ares idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads" |
67 |
IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl" |
68 |
|
69 |
#lead to lots of false negatives, bug #285669 |
70 |
RESTRICT="test" |
71 |
|
72 |
RDEPEND="ldap? ( net-nds/openldap ) |
73 |
ssl? ( |
74 |
curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) |
75 |
curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) |
76 |
curl_ssl_gnutls? ( |
77 |
|| ( |
78 |
( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) |
79 |
( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) |
80 |
( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) |
81 |
) |
82 |
app-misc/ca-certificates |
83 |
) |
84 |
curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) |
85 |
curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) |
86 |
curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) |
87 |
) |
88 |
idn? ( net-dns/libidn[static-libs?] ) |
89 |
ares? ( net-dns/c-ares ) |
90 |
kerberos? ( virtual/krb5 ) |
91 |
metalink? ( media-libs/libmetalink ) |
92 |
rtmp? ( media-video/rtmpdump ) |
93 |
ssh? ( net-libs/libssh2[static-libs?] ) |
94 |
sys-libs/zlib" |
95 |
|
96 |
# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 |
97 |
# rtmp? ( |
98 |
# media-video/rtmpdump |
99 |
# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) |
100 |
# curl_ssl_polarssl? ( media-video/rtmpdump[polarssl] ) |
101 |
# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,-polarssl,ssl] ) |
102 |
# ) |
103 |
|
104 |
# ssl providers to be added: |
105 |
# fbopenssl $(use_with spnego) |
106 |
|
107 |
# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html |
108 |
|
109 |
DEPEND="${RDEPEND} |
110 |
sys-apps/ed |
111 |
virtual/pkgconfig |
112 |
test? ( |
113 |
sys-apps/diffutils |
114 |
dev-lang/perl |
115 |
)" |
116 |
|
117 |
# ares must be disabled for threads |
118 |
# only one ssl provider can be enabled |
119 |
REQUIRED_USE=" |
120 |
threads? ( !ares ) |
121 |
ssl? ( |
122 |
^^ ( |
123 |
curl_ssl_axtls |
124 |
curl_ssl_cyassl |
125 |
curl_ssl_gnutls |
126 |
curl_ssl_openssl |
127 |
curl_ssl_nss |
128 |
curl_ssl_polarssl |
129 |
) |
130 |
)" |
131 |
|
132 |
DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ |
133 |
docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) |
134 |
|
135 |
src_prepare() { |
136 |
epatch \ |
137 |
"${FILESDIR}"/${PN}-7.27.0-curl-config.patch \ |
138 |
"${FILESDIR}"/${PN}-7.27.0-prefix.patch \ |
139 |
"${FILESDIR}"/${PN}-respect-cflags-3.patch \ |
140 |
"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch |
141 |
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 |
142 |
|
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 ) |
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 |
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 \ |
207 |
--enable-dict \ |
208 |
--enable-file \ |
209 |
--enable-ftp \ |
210 |
--enable-gopher \ |
211 |
--enable-http \ |
212 |
--enable-imap \ |
213 |
$(use_enable ldap) \ |
214 |
$(use_enable ldap ldaps) \ |
215 |
--enable-pop3 \ |
216 |
--enable-rtsp \ |
217 |
$(use_with ssh libssh2) \ |
218 |
--enable-smtp \ |
219 |
--enable-telnet \ |
220 |
--enable-tftp \ |
221 |
$(use_enable ares) \ |
222 |
--enable-cookies \ |
223 |
--enable-hidden-symbols \ |
224 |
$(use_enable ipv6) \ |
225 |
--enable-largefile \ |
226 |
--enable-manual \ |
227 |
--enable-nonblocking \ |
228 |
--enable-proxy \ |
229 |
--disable-soname-bump \ |
230 |
--disable-sspi \ |
231 |
$(use_enable static-libs static) \ |
232 |
$(use_enable threads threaded-resolver) \ |
233 |
--disable-versioned-symbols \ |
234 |
--without-darwinssl \ |
235 |
$(use_with idn libidn) \ |
236 |
$(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
237 |
--without-krb4 \ |
238 |
$(use_with metalink libmetalink) \ |
239 |
$(use_with rtmp librtmp) \ |
240 |
--without-spnego \ |
241 |
--without-winidn \ |
242 |
--without-winssl \ |
243 |
--with-zlib \ |
244 |
"${myconf[@]}" |
245 |
} |
246 |
|
247 |
src_install() { |
248 |
default |
249 |
find "${ED}" -name '*.la' -delete |
250 |
rm -rf "${ED}"/etc/ |
251 |
|
252 |
# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976 |
253 |
insinto /usr/share/aclocal |
254 |
doins docs/libcurl/libcurl.m4 |
255 |
} |