Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/curl: ChangeLog curl-7.25.0.ebuild
Date: Sun, 01 Apr 2012 13:50:18
Message-Id: 20120401135007.D1AFA2004B@flycatcher.gentoo.org
1 blueness 12/04/01 13:50:07
2
3 Modified: ChangeLog curl-7.25.0.ebuild
4 Log:
5 USE=ssl is no longer openssl specific, bug #410369
6
7 (Portage version: 2.1.10.49/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.212 net-misc/curl/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.212&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.212&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.211&r2=1.212
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v
19 retrieving revision 1.211
20 retrieving revision 1.212
21 diff -u -r1.211 -r1.212
22 --- ChangeLog 31 Mar 2012 18:31:54 -0000 1.211
23 +++ ChangeLog 1 Apr 2012 13:50:07 -0000 1.212
24 @@ -1,6 +1,9 @@
25 # ChangeLog for net-misc/curl
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.211 2012/03/31 18:31:54 blueness Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.212 2012/04/01 13:50:07 blueness Exp $
29 +
30 + 01 Apr 2012; Anthony G. Basile <blueness@g.o> curl-7.25.0.ebuild:
31 + USE="ssl" is no longer openssl specific, bug #410369
32
33 31 Mar 2012; Anthony G. Basile <blueness@g.o> curl-7.24.0.ebuild:
34 Reverting backport REQUIRED_USE as ssl should refer to any ssl provider,
35
36
37
38 1.5 net-misc/curl/curl-7.25.0.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild?rev=1.5&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild?rev=1.5&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild?r1=1.4&r2=1.5
43
44 Index: curl-7.25.0.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v
47 retrieving revision 1.4
48 retrieving revision 1.5
49 diff -u -r1.4 -r1.5
50 --- curl-7.25.0.ebuild 31 Mar 2012 14:11:13 -0000 1.4
51 +++ curl-7.25.0.ebuild 1 Apr 2012 13:50:07 -0000 1.5
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2012 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v 1.4 2012/03/31 14:11:13 blueness Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v 1.5 2012/04/01 13:50:07 blueness Exp $
57
58 EAPI="4"
59
60 @@ -15,10 +15,17 @@
61 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~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"
62 IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
63
64 +# The logic for Secure Socket Layer support:
65 +# 1) If USE="ssl" is selected, we definitely get one of gnutls/nss/openssl
66 +# 2) If USE="-ssl" is selected, we definitely do not get any gnutls/nss/openssl
67 +# 3) If USE="ssl -gnutls -nss" we get openssl by default
68 +# 4) Only one of gnutls/nss may be chosen and must be accomanpied by USE="ssl"
69 RDEPEND="ldap? ( net-nds/openldap )
70 - gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
71 - ssl? ( dev-libs/openssl )
72 - nss? ( dev-libs/nss app-misc/ca-certificates )
73 + ssl? (
74 + gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
75 + nss? ( dev-libs/nss app-misc/ca-certificates )
76 + !gnutls? ( !nss? ( dev-libs/openssl ) )
77 + )
78 idn? ( net-dns/libidn )
79 ares? ( net-dns/c-ares )
80 kerberos? ( virtual/krb5 )
81 @@ -39,11 +46,9 @@
82 # used - but can do without in self test: net-misc/stunnel
83
84 # ares must be disabled for threads
85 -# only zero or one of gnutls, ssl, nss, bug #410305
86 REQUIRED_USE="threads? ( !ares )
87 - gnutls? ( !ssl !nss )
88 - ssl? ( !nss !gnutls )
89 - nss? ( !gnutls !ssl )"
90 + gnutls? ( ssl !nss )
91 + nss? ( ssl !gnutls )"
92
93 src_prepare() {
94 epatch \
95 @@ -59,17 +64,22 @@
96 src_configure() {
97 local myconf=()
98
99 - #gnutls takes priority over ssl which takes priority over nss --- see RDEPENED
100 - if use gnutls; then
101 - myconf+=( --without-ssl --with-gnutls --without-nss )
102 - myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
103 - elif use ssl; then
104 - myconf+=( --with-ssl --without-gnutls --without-nss )
105 - myconf+=( --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
106 - elif use nss; then
107 - myconf+=( --without-ssl --without-gnutls --with-nss )
108 - myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
109 + if use ssl ; then
110 + if use gnutls; then
111 + einfo "SSL provided by gnutls"
112 + myconf+=( --without-ssl --with-gnutls --without-nss )
113 + myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
114 + elif use nss; then
115 + einfo "SSL provided by nss"
116 + myconf+=( --without-ssl --without-gnutls --with-nss )
117 + myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
118 + else #use openssl
119 + einfo "SSL provided by openssl"
120 + myconf+=( --with-ssl --without-gnutls --without-nss )
121 + myconf+=( --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
122 + fi
123 else
124 + einfo "SSL disabled"
125 myconf+=( --without-ssl --without-gnutls --without-nss )
126 fi
Report Message
Find on MARC Find on Google Groups