Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
angelos 11/11/14 17:10:55
Modified: ChangeLog curl-7.22.0.ebuild
Log:
Prefer openssl over nss
(Portage version: 2.1.10.31/cvs/Linux x86_64)
Revision Changes Path
1.193 net-misc/curl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.193&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.193&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.192&r2=1.193
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- ChangeLog 17 Sep 2011 08:55:15 -0000 1.192
+++ ChangeLog 14 Nov 2011 17:10:55 -0000 1.193
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/curl
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.192 2011/09/17 08:55:15 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.193 2011/11/14 17:10:55 angelos Exp $
+
+ 14 Nov 2011; Christoph Mende <angelos@g.o> curl-7.22.0.ebuild:
+ Prefer openssl over nss
*curl-7.22.0 (17 Sep 2011)
1.2 net-misc/curl/curl-7.22.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild?r1=1.1&r2=1.2
Index: curl-7.22.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- curl-7.22.0.ebuild 17 Sep 2011 08:55:15 -0000 1.1
+++ curl-7.22.0.ebuild 14 Nov 2011 17:10:55 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.1 2011/09/17 08:55:15 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.2 2011/11/14 17:10:55 angelos Exp $
EAPI=4
@@ -16,11 +16,9 @@
IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads"
RDEPEND="ldap? ( net-nds/openldap )
- ssl? (
- gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
- nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
- !gnutls? ( !nss? ( dev-libs/openssl ) )
- )
+ gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
+ ssl? ( !gnutls? ( dev-libs/openssl ) )
+ nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) )
idn? ( net-dns/libidn )
ares? ( >=net-dns/c-ares-1.6 )
kerberos? ( virtual/krb5 )
@@ -41,8 +39,6 @@
# ares must be disabled for threads and both can be disabled
# one can use wether gnutls or nss if ssl is enabled
REQUIRED_USE="threads? ( !ares )
- gnutls? ( ssl )
- nss? ( ssl )
nss? ( !gnutls )"
src_prepare() {
@@ -86,17 +82,15 @@
--without-librtmp
--without-spnego"
- if use ssl ; then
- if use gnutls; then
- myconf+=" --without-ssl --with-gnutls --without-nss"
- myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
- elif use nss; then
- myconf+=" --without-ssl --without-gnutls --with-nss"
- myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
- else
- myconf+=" --without-gnutls --without-nss --with-ssl"
- myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
- fi
+ if use gnutls; then
+ myconf+=" --without-ssl --with-gnutls --without-nss"
+ myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+ elif use ssl; then
+ myconf+=" --without-gnutls --without-nss --with-ssl"
+ myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
+ elif use nss; then
+ myconf+=" --without-ssl --without-gnutls --with-nss"
+ myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
else
myconf+=" --without-gnutls --without-nss --without-ssl"
fi
|
|
