| 1 |
angelos 11/11/14 17:10:55 |
| 2 |
|
| 3 |
Modified: ChangeLog curl-7.22.0.ebuild |
| 4 |
Log: |
| 5 |
Prefer openssl over nss |
| 6 |
|
| 7 |
(Portage version: 2.1.10.31/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.193 net-misc/curl/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.193&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.193&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.192&r2=1.193 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v |
| 19 |
retrieving revision 1.192 |
| 20 |
retrieving revision 1.193 |
| 21 |
diff -u -r1.192 -r1.193 |
| 22 |
--- ChangeLog 17 Sep 2011 08:55:15 -0000 1.192 |
| 23 |
+++ ChangeLog 14 Nov 2011 17:10:55 -0000 1.193 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-misc/curl |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.192 2011/09/17 08:55:15 angelos Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.193 2011/11/14 17:10:55 angelos Exp $ |
| 29 |
+ |
| 30 |
+ 14 Nov 2011; Christoph Mende <angelos@g.o> curl-7.22.0.ebuild: |
| 31 |
+ Prefer openssl over nss |
| 32 |
|
| 33 |
*curl-7.22.0 (17 Sep 2011) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 net-misc/curl/curl-7.22.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: curl-7.22.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- curl-7.22.0.ebuild 17 Sep 2011 08:55:15 -0000 1.1 |
| 51 |
+++ curl-7.22.0.ebuild 14 Nov 2011 17:10:55 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2011 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.22.0.ebuild,v 1.1 2011/09/17 08:55:15 angelos Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.2 2011/11/14 17:10:55 angelos Exp $ |
| 57 |
|
| 58 |
EAPI=4 |
| 59 |
|
| 60 |
@@ -16,11 +16,9 @@ |
| 61 |
IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads" |
| 62 |
|
| 63 |
RDEPEND="ldap? ( net-nds/openldap ) |
| 64 |
- ssl? ( |
| 65 |
- gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) |
| 66 |
- nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) |
| 67 |
- !gnutls? ( !nss? ( dev-libs/openssl ) ) |
| 68 |
- ) |
| 69 |
+ gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) |
| 70 |
+ ssl? ( !gnutls? ( dev-libs/openssl ) ) |
| 71 |
+ nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) |
| 72 |
idn? ( net-dns/libidn ) |
| 73 |
ares? ( >=net-dns/c-ares-1.6 ) |
| 74 |
kerberos? ( virtual/krb5 ) |
| 75 |
@@ -41,8 +39,6 @@ |
| 76 |
# ares must be disabled for threads and both can be disabled |
| 77 |
# one can use wether gnutls or nss if ssl is enabled |
| 78 |
REQUIRED_USE="threads? ( !ares ) |
| 79 |
- gnutls? ( ssl ) |
| 80 |
- nss? ( ssl ) |
| 81 |
nss? ( !gnutls )" |
| 82 |
|
| 83 |
src_prepare() { |
| 84 |
@@ -86,17 +82,15 @@ |
| 85 |
--without-librtmp |
| 86 |
--without-spnego" |
| 87 |
|
| 88 |
- if use ssl ; then |
| 89 |
- if use gnutls; then |
| 90 |
- myconf+=" --without-ssl --with-gnutls --without-nss" |
| 91 |
- myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" |
| 92 |
- elif use nss; then |
| 93 |
- myconf+=" --without-ssl --without-gnutls --with-nss" |
| 94 |
- myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" |
| 95 |
- else |
| 96 |
- myconf+=" --without-gnutls --without-nss --with-ssl" |
| 97 |
- myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs" |
| 98 |
- fi |
| 99 |
+ if use gnutls; then |
| 100 |
+ myconf+=" --without-ssl --with-gnutls --without-nss" |
| 101 |
+ myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" |
| 102 |
+ elif use ssl; then |
| 103 |
+ myconf+=" --without-gnutls --without-nss --with-ssl" |
| 104 |
+ myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs" |
| 105 |
+ elif use nss; then |
| 106 |
+ myconf+=" --without-ssl --without-gnutls --with-nss" |
| 107 |
+ myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" |
| 108 |
else |
| 109 |
myconf+=" --without-gnutls --without-nss --without-ssl" |
| 110 |
fi |
Archives