* [gentoo-commits] dev/blueness:master commit in: net-misc/curl/
@ 2012-04-09 17:01 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-04-09 17:01 UTC (permalink / raw
To: gentoo-commits
commit: fae65d5222ff6887a26862665469db1c16e54ed7
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 9 16:24:09 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 16:24:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=fae65d52
net-misc/curl: economize on ssl provider configuration
(Portage version: 2.1.10.49/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0xD0455535)
---
net-misc/curl/ChangeLog | 3 +++
net-misc/curl/Manifest | 14 ++++++++++++--
net-misc/curl/curl-7.25.0-r1.ebuild | 35 ++++++++++++++++-------------------
3 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 2ffaa2a..583dfef 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 09 Apr 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.25.0-r1.ebuild:
+ Economize ssl provider configuration
+
*curl-7.25.0-r1 (04 Apr 2012)
04 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e859ec2..0842153 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX curl-7.18.2-prefix.patch 662 RMD160 a5cf90f3b93acd610adf116d00383ec8f792105e SHA1 5424f70aaf0ed9843bb84bc5e3e9e3654aca66a9 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8
AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
AUX curl-fix-gnutls-nettle.patch 1186 RMD160 548495bb07bf24031bb3309509dc80c10d67e129 SHA1 e0ebd17ba1c1f1e1d32724cfb50fdac7b8122465 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679
AUX curl-respect-cflags-3.patch 406 RMD160 4c569104bf7025676275f8df4b4c0337435145ef SHA1 569295c4a7ed58c790dea64fc3412f814924cee5 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d
DIST curl-7.25.0.tar.bz2 2418060 RMD160 e35b46a17fc2fc2a23fd12ed9488cc753bd941c5 SHA1 f6016a24051d98806ca3ddf754592701cb66e00c SHA256 cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491
-EBUILD curl-7.25.0-r1.ebuild 5993 RMD160 8484eb46cc08f00a9ab484ebf0ab85c0a1fab4dd SHA1 5f69f5bee1432085010bba3f5148328dc1d93717 SHA256 3545c99f7b64b82f33f1f130bac195d72115cef4c3f1cc7b6a2c630a5637f8eb
-MISC ChangeLog 430 RMD160 bebe3ad7fc9cb42001caa8f431532e7a4ed13b5c SHA1 4916227f3470a17cf929e7eb64ea01d57c7f8531 SHA256 9d51430449fed031e0402eee618f1be9e01aeb894e7378e89c2182f0b6b2e148
+EBUILD curl-7.25.0-r1.ebuild 5424 RMD160 9df714e04ab4aa38c1dc6fa852bb14920a73d473 SHA1 131214b5cebdecfd659de9e4c035585f52893f35 SHA256 6dd4ffd4154c4f3441d3682fc03b662d1221c6039a34092176202ed05ffd4756
+MISC ChangeLog 548 RMD160 6a3bef5fffc244edbed68a81989851dea2f64243 SHA1 46c2297b16182700f89f43516b650dc6243e0ea8 SHA256 506e7f81bd775b57e9c40128fd21ba5f4e1fa612be088ee36dc75d500250bda9
MISC metadata.xml 488 RMD160 5b3487cf3f62c93923b0ba919fa22be6b7b1c1d3 SHA1 8d45b1b5f04c4c4f7cc146acf4a6770cd8fc9222 SHA256 e7f92e874709df69db561e06a461d6ac107222399b02367d8c2ba59f549de8c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk+DDSkACgkQl5yvQNBFVTWPHwCfZ0SGoXZLZJDP0Vw5I1+7jr0P
+VrYAn29oC253U4tRresdx0CqfZ0pH68y
+=0ztI
+-----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.25.0-r1.ebuild
index f958f6f..8d02545 100644
--- a/net-misc/curl/curl-7.25.0-r1.ebuild
+++ b/net-misc/curl/curl-7.25.0-r1.ebuild
@@ -81,45 +81,43 @@ src_prepare() {
}
src_configure() {
- local myconf=()
-
einfo "\033[1;32m**************************************************\033[00m"
+
+ # We make use of the fact that later flags override earlier ones
+ # So start with all ssl providers off until proven otherwise
+ local myconf=()
+ myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl )
+ myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
if use ssl ; then
if use curl_ssl_axtls; then
einfo "SSL provided by axTLS"
- myconf+=( --with-axtls --without-ssl --without-gnutls --without-nss --without-polarssl )
- myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ myconf+=( --with-axtls )
fi
+ #cyassl will go here
if use curl_ssl_gnutls; then
einfo "SSL provided by gnutls"
if has_version net-libs/gnutls[nettle] ; then
einfo "gnutls compiled with dev-libs/nettle"
- myconf+=( --without-axtls --without-ssl --with-gnutls --with-nettle --without-nss --without-polarssl )
- myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ myconf+=( --with-gnutls --with-nettle )
else
einfo "gnutls compiled with dev-libs/libgcrypt"
- myconf+=( --without-axtls --without-ssl --with-gnutls --without-nettle --without-nss --without-polarssl )
- myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ myconf+=( --with-gnutls --without-nettle )
fi
fi
if use curl_ssl_nss; then
einfo "SSL provided by nss"
- myconf+=( --without-axtls --without-ssl --without-gnutls --with-nss --without-polarssl )
- myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- fi
- if use curl_ssl_openssl; then
- einfo "SSL provided by openssl"
- myconf+=( --without-axtls --with-ssl --without-gnutls --without-nss --without-polarssl )
- myconf+=( --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ myconf+=( --with-nss )
fi
if use curl_ssl_polarssl; then
einfo "SSL provided by polarssl"
- myconf+=( --with-axtls --without-ssl --without-gnutls --without-nss --with-polarssl )
- myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ myconf+=( --with-polarssl )
+ fi
+ if use curl_ssl_openssl; then
+ einfo "SSL provided by openssl"
+ myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
fi
else
einfo "SSL disabled"
- myconf+=( --without-axtls --without-ssl --without-gnutls --without-nss --without-polarssl )
fi
einfo "\033[1;32m**************************************************\033[00m"
@@ -161,7 +159,6 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable threads threaded-resolver) \
--disable-versioned-symbols \
- --without-cyassl \
$(use_with idn libidn) \
$(use_with kerberos gssapi "${EPREFIX}"/usr) \
--without-krb4 \
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/blueness:master commit in: net-misc/curl/
@ 2012-04-15 13:31 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-04-15 13:31 UTC (permalink / raw
To: gentoo-commits
commit: 34b9e88a2ddf817372acf8b1cee410f7a35571e1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 13:31:44 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 13:31:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=34b9e88a
net-misc/curl: push static-lib to deps, bug #405789
---
net-misc/curl/Manifest | 2 +-
net-misc/curl/curl-7.25.0-r1.ebuild | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 75d2533..a7a88ce 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,6 +3,6 @@ AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c47
AUX curl-fix-gnutls-nettle.patch 1186 RMD160 548495bb07bf24031bb3309509dc80c10d67e129 SHA1 e0ebd17ba1c1f1e1d32724cfb50fdac7b8122465 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679
AUX curl-respect-cflags-3.patch 406 RMD160 4c569104bf7025676275f8df4b4c0337435145ef SHA1 569295c4a7ed58c790dea64fc3412f814924cee5 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d
DIST curl-7.25.0.tar.bz2 2418060 RMD160 e35b46a17fc2fc2a23fd12ed9488cc753bd941c5 SHA1 f6016a24051d98806ca3ddf754592701cb66e00c SHA256 cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491
-EBUILD curl-7.25.0-r1.ebuild 5850 RMD160 45cde13069cbe333fc787b895d53a5d5b5836a9c SHA1 8a0694ba088e68adb54a4ce455a842cddf474d4b SHA256 076ab5b008887c49c63ee7ee3b0010feba8bb6a34eb5d53cca29a3108508d4d5
+EBUILD curl-7.25.0-r1.ebuild 5974 RMD160 f3e14f311e8d899e454bc7d614d20d97f207ed71 SHA1 efe701c764b68e5055306372b2452681b47520a5 SHA256 10581c5ebd7ae0b445e60e6b8b7a13e12dbfcda2e6dc845dd10a8aaf6f06a923
MISC ChangeLog 548 RMD160 6a3bef5fffc244edbed68a81989851dea2f64243 SHA1 46c2297b16182700f89f43516b650dc6243e0ea8 SHA256 506e7f81bd775b57e9c40128fd21ba5f4e1fa612be088ee36dc75d500250bda9
MISC metadata.xml 488 RMD160 5b3487cf3f62c93923b0ba919fa22be6b7b1c1d3 SHA1 8d45b1b5f04c4c4f7cc146acf4a6770cd8fc9222 SHA256 e7f92e874709df69db561e06a461d6ac107222399b02367d8c2ba59f549de8c7
diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.25.0-r1.ebuild
index ca80a4a..d15726f 100644
--- a/net-misc/curl/curl-7.25.0-r1.ebuild
+++ b/net-misc/curl/curl-7.25.0-r1.ebuild
@@ -21,19 +21,19 @@ RDEPEND="ldap? ( net-nds/openldap )
curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates )
curl_ssl_gnutls? (
|| (
- ( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt app-misc/ca-certificates )
- ( net-libs/gnutls[-nettle] dev-libs/libgcrypt app-misc/ca-certificates )
- ( net-libs/gnutls[nettle] dev-libs/nettle app-misc/ca-certificates )
+ ( <=net-libs/gnutls-2.10.5[static-libs?] dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates )
+ ( net-libs/gnutls[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates )
+ ( net-libs/gnutls[nettle,static-libs?] dev-libs/nettle app-misc/ca-certificates )
)
)
- curl_ssl_openssl? ( dev-libs/openssl )
+ curl_ssl_openssl? ( dev-libs/openssl[static-libs?] )
curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates )
)
- idn? ( net-dns/libidn )
+ idn? ( net-dns/libidn[static-libs?] )
ares? ( net-dns/c-ares )
- kerberos? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
+ kerberos? ( virtual/krb5[static-libs?] )
+ ssh? ( net-libs/libssh2[static-libs?] )
sys-libs/zlib"
# ssl providers to be added:
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: net-misc/curl/
@ 2012-04-15 10:17 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-04-15 10:17 UTC (permalink / raw
To: gentoo-commits
commit: 8d329b59fffc64132e10a7c6b8409e81bf3090dd
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 10:17:32 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 10:17:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=8d329b59
net-misc/curl: adds info about embedded ssl providers
---
net-misc/curl/Manifest | 12 +-----------
net-misc/curl/curl-7.25.0-r1.ebuild | 15 ++++++++++++---
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 0842153..75d2533 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX curl-7.18.2-prefix.patch 662 RMD160 a5cf90f3b93acd610adf116d00383ec8f792105e SHA1 5424f70aaf0ed9843bb84bc5e3e9e3654aca66a9 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8
AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
AUX curl-fix-gnutls-nettle.patch 1186 RMD160 548495bb07bf24031bb3309509dc80c10d67e129 SHA1 e0ebd17ba1c1f1e1d32724cfb50fdac7b8122465 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679
AUX curl-respect-cflags-3.patch 406 RMD160 4c569104bf7025676275f8df4b4c0337435145ef SHA1 569295c4a7ed58c790dea64fc3412f814924cee5 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d
DIST curl-7.25.0.tar.bz2 2418060 RMD160 e35b46a17fc2fc2a23fd12ed9488cc753bd941c5 SHA1 f6016a24051d98806ca3ddf754592701cb66e00c SHA256 cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491
-EBUILD curl-7.25.0-r1.ebuild 5424 RMD160 9df714e04ab4aa38c1dc6fa852bb14920a73d473 SHA1 131214b5cebdecfd659de9e4c035585f52893f35 SHA256 6dd4ffd4154c4f3441d3682fc03b662d1221c6039a34092176202ed05ffd4756
+EBUILD curl-7.25.0-r1.ebuild 5850 RMD160 45cde13069cbe333fc787b895d53a5d5b5836a9c SHA1 8a0694ba088e68adb54a4ce455a842cddf474d4b SHA256 076ab5b008887c49c63ee7ee3b0010feba8bb6a34eb5d53cca29a3108508d4d5
MISC ChangeLog 548 RMD160 6a3bef5fffc244edbed68a81989851dea2f64243 SHA1 46c2297b16182700f89f43516b650dc6243e0ea8 SHA256 506e7f81bd775b57e9c40128fd21ba5f4e1fa612be088ee36dc75d500250bda9
MISC metadata.xml 488 RMD160 5b3487cf3f62c93923b0ba919fa22be6b7b1c1d3 SHA1 8d45b1b5f04c4c4f7cc146acf4a6770cd8fc9222 SHA256 e7f92e874709df69db561e06a461d6ac107222399b02367d8c2ba59f549de8c7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk+DDSkACgkQl5yvQNBFVTWPHwCfZ0SGoXZLZJDP0Vw5I1+7jr0P
-VrYAn29oC253U4tRresdx0CqfZ0pH68y
-=0ztI
------END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.25.0-r1.ebuild
index 8d02545..ca80a4a 100644
--- a/net-misc/curl/curl-7.25.0-r1.ebuild
+++ b/net-misc/curl/curl-7.25.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="MIT"
SLOT="0"
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"
IUSE="ares idn ipv6 kerberos ldap ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_openssl curl_ssl_polarssl"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
RDEPEND="ldap? ( net-nds/openldap )
ssl? (
@@ -37,7 +37,6 @@ RDEPEND="ldap? ( net-nds/openldap )
sys-libs/zlib"
# ssl providers to be added:
-# cyassl $(use_with cyassl)
# fbopenssl $(use_with spnego)
# rtmpdump ( media-video/rtmpdump ) / --with-librtmp
@@ -58,6 +57,7 @@ REQUIRED_USE="threads? ( !ares )
ssl? (
^^ (
curl_ssl_axtls
+ curl_ssl_cyassl
curl_ssl_gnutls
curl_ssl_openssl
curl_ssl_nss
@@ -91,9 +91,16 @@ src_configure() {
if use ssl ; then
if use curl_ssl_axtls; then
einfo "SSL provided by axTLS"
+ einfo "NOTE: axTLS is meant for embedded systems and"
+ einfo "may not be the best choice as an ssl provider"
myconf+=( --with-axtls )
fi
- #cyassl will go here
+ if use curl_ssl_cyassl; then
+ einfo "SSL provided by cyassl"
+ einfo "NOTE: cyassl is meant for embedded systems and"
+ einfo "may not be the best choice as an ssl provider"
+ myconf+=( --with-cyassl )
+ fi
if use curl_ssl_gnutls; then
einfo "SSL provided by gnutls"
if has_version net-libs/gnutls[nettle] ; then
@@ -110,6 +117,8 @@ src_configure() {
fi
if use curl_ssl_polarssl; then
einfo "SSL provided by polarssl"
+ einfo "NOTE: polarssl is meant for embedded systems and"
+ einfo "may not be the best choice as an ssl provider"
myconf+=( --with-polarssl )
fi
if use curl_ssl_openssl; then
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/blueness:master commit in: net-misc/curl/
@ 2012-04-07 4:35 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-04-07 4:35 UTC (permalink / raw
To: gentoo-commits
commit: 29afcf6d7baae950770d3468961da30b8d453913
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 7 04:35:42 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 7 04:35:42 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=29afcf6d
net-misc/curl: add axTLS and polarssl backends
---
net-misc/curl/Manifest | 2 +-
net-misc/curl/curl-7.25.0-r1.ebuild | 38 ++++++++++++++++++++++++----------
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e329458..e859ec2 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,6 +3,6 @@ AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c47
AUX curl-fix-gnutls-nettle.patch 1186 RMD160 548495bb07bf24031bb3309509dc80c10d67e129 SHA1 e0ebd17ba1c1f1e1d32724cfb50fdac7b8122465 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679
AUX curl-respect-cflags-3.patch 406 RMD160 4c569104bf7025676275f8df4b4c0337435145ef SHA1 569295c4a7ed58c790dea64fc3412f814924cee5 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d
DIST curl-7.25.0.tar.bz2 2418060 RMD160 e35b46a17fc2fc2a23fd12ed9488cc753bd941c5 SHA1 f6016a24051d98806ca3ddf754592701cb66e00c SHA256 cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491
-EBUILD curl-7.25.0-r1.ebuild 5230 RMD160 cb76b95ac71283a37b57800869494b50e1d02bbf SHA1 43163c3d6070f3216068a924e521522270dbe293 SHA256 ab27c592a429f9a9474611b44e4b8fd863ed877b6d26a24ad833f37c57617761
+EBUILD curl-7.25.0-r1.ebuild 5993 RMD160 8484eb46cc08f00a9ab484ebf0ab85c0a1fab4dd SHA1 5f69f5bee1432085010bba3f5148328dc1d93717 SHA256 3545c99f7b64b82f33f1f130bac195d72115cef4c3f1cc7b6a2c630a5637f8eb
MISC ChangeLog 430 RMD160 bebe3ad7fc9cb42001caa8f431532e7a4ed13b5c SHA1 4916227f3470a17cf929e7eb64ea01d57c7f8531 SHA256 9d51430449fed031e0402eee618f1be9e01aeb894e7378e89c2182f0b6b2e148
MISC metadata.xml 488 RMD160 5b3487cf3f62c93923b0ba919fa22be6b7b1c1d3 SHA1 8d45b1b5f04c4c4f7cc146acf4a6770cd8fc9222 SHA256 e7f92e874709df69db561e06a461d6ac107222399b02367d8c2ba59f549de8c7
diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.25.0-r1.ebuild
index d6985b9..f958f6f 100644
--- a/net-misc/curl/curl-7.25.0-r1.ebuild
+++ b/net-misc/curl/curl-7.25.0-r1.ebuild
@@ -14,10 +14,11 @@ LICENSE="MIT"
SLOT="0"
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"
IUSE="ares idn ipv6 kerberos ldap ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_gnutls curl_ssl_nss curl_ssl_openssl"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_openssl curl_ssl_polarssl"
RDEPEND="ldap? ( net-nds/openldap )
ssl? (
+ curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates )
curl_ssl_gnutls? (
|| (
( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt app-misc/ca-certificates )
@@ -27,6 +28,7 @@ RDEPEND="ldap? ( net-nds/openldap )
)
curl_ssl_openssl? ( dev-libs/openssl )
curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
+ curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates )
)
idn? ( net-dns/libidn )
ares? ( net-dns/c-ares )
@@ -35,10 +37,8 @@ RDEPEND="ldap? ( net-nds/openldap )
sys-libs/zlib"
# ssl providers to be added:
-# axtls $(use_with axtls)
# cyassl $(use_with cyassl)
# fbopenssl $(use_with spnego)
-# polarssl $(use_with polarssl)
# rtmpdump ( media-video/rtmpdump ) / --with-librtmp
# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
@@ -55,7 +55,15 @@ DEPEND="${RDEPEND}
# ares must be disabled for threads
# only one ssl provider can be enabled
REQUIRED_USE="threads? ( !ares )
- ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss ) )"
+ ssl? (
+ ^^ (
+ curl_ssl_axtls
+ curl_ssl_gnutls
+ curl_ssl_openssl
+ curl_ssl_nss
+ curl_ssl_polarssl
+ )
+ )"
DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
@@ -77,31 +85,41 @@ src_configure() {
einfo "\033[1;32m**************************************************\033[00m"
if use ssl ; then
+ if use curl_ssl_axtls; then
+ einfo "SSL provided by axTLS"
+ myconf+=( --with-axtls --without-ssl --without-gnutls --without-nss --without-polarssl )
+ myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ fi
if use curl_ssl_gnutls; then
einfo "SSL provided by gnutls"
if has_version net-libs/gnutls[nettle] ; then
einfo "gnutls compiled with dev-libs/nettle"
- myconf+=( --without-ssl --with-gnutls --with-nettle --without-nss )
+ myconf+=( --without-axtls --without-ssl --with-gnutls --with-nettle --without-nss --without-polarssl )
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
else
einfo "gnutls compiled with dev-libs/libgcrypt"
- myconf+=( --without-ssl --with-gnutls --without-nettle --without-nss )
+ myconf+=( --without-axtls --without-ssl --with-gnutls --without-nettle --without-nss --without-polarssl )
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
fi
fi
if use curl_ssl_nss; then
einfo "SSL provided by nss"
- myconf+=( --without-ssl --without-gnutls --with-nss )
+ myconf+=( --without-axtls --without-ssl --without-gnutls --with-nss --without-polarssl )
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
fi
if use curl_ssl_openssl; then
einfo "SSL provided by openssl"
- myconf+=( --with-ssl --without-gnutls --without-nss )
+ myconf+=( --without-axtls --with-ssl --without-gnutls --without-nss --without-polarssl )
myconf+=( --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
fi
+ if use curl_ssl_polarssl; then
+ einfo "SSL provided by polarssl"
+ myconf+=( --with-axtls --without-ssl --without-gnutls --without-nss --with-polarssl )
+ myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ fi
else
einfo "SSL disabled"
- myconf+=( --without-ssl --without-gnutls --without-nss )
+ myconf+=( --without-axtls --without-ssl --without-gnutls --without-nss --without-polarssl )
fi
einfo "\033[1;32m**************************************************\033[00m"
@@ -143,12 +161,10 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable threads threaded-resolver) \
--disable-versioned-symbols \
- --without-axtls \
--without-cyassl \
$(use_with idn libidn) \
$(use_with kerberos gssapi "${EPREFIX}"/usr) \
--without-krb4 \
- --without-polarssl \
--without-spnego \
--with-zlib \
"${myconf[@]}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-15 13:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-09 17:01 [gentoo-commits] dev/blueness:master commit in: net-misc/curl/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2012-04-15 13:31 Anthony G. Basile
2012-04-15 10:17 Anthony G. Basile
2012-04-07 4:35 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox