| 1 |
commit: 29afcf6d7baae950770d3468961da30b8d453913 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 7 04:35:42 2012 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 7 04:35:42 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=29afcf6d |
| 7 |
|
| 8 |
net-misc/curl: add axTLS and polarssl backends |
| 9 |
|
| 10 |
--- |
| 11 |
net-misc/curl/Manifest | 2 +- |
| 12 |
net-misc/curl/curl-7.25.0-r1.ebuild | 38 ++++++++++++++++++++++++---------- |
| 13 |
2 files changed, 28 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest |
| 16 |
index e329458..e859ec2 100644 |
| 17 |
--- a/net-misc/curl/Manifest |
| 18 |
+++ b/net-misc/curl/Manifest |
| 19 |
@@ -3,6 +3,6 @@ AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c47 |
| 20 |
AUX curl-fix-gnutls-nettle.patch 1186 RMD160 548495bb07bf24031bb3309509dc80c10d67e129 SHA1 e0ebd17ba1c1f1e1d32724cfb50fdac7b8122465 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 |
| 21 |
AUX curl-respect-cflags-3.patch 406 RMD160 4c569104bf7025676275f8df4b4c0337435145ef SHA1 569295c4a7ed58c790dea64fc3412f814924cee5 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d |
| 22 |
DIST curl-7.25.0.tar.bz2 2418060 RMD160 e35b46a17fc2fc2a23fd12ed9488cc753bd941c5 SHA1 f6016a24051d98806ca3ddf754592701cb66e00c SHA256 cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491 |
| 23 |
-EBUILD curl-7.25.0-r1.ebuild 5230 RMD160 cb76b95ac71283a37b57800869494b50e1d02bbf SHA1 43163c3d6070f3216068a924e521522270dbe293 SHA256 ab27c592a429f9a9474611b44e4b8fd863ed877b6d26a24ad833f37c57617761 |
| 24 |
+EBUILD curl-7.25.0-r1.ebuild 5993 RMD160 8484eb46cc08f00a9ab484ebf0ab85c0a1fab4dd SHA1 5f69f5bee1432085010bba3f5148328dc1d93717 SHA256 3545c99f7b64b82f33f1f130bac195d72115cef4c3f1cc7b6a2c630a5637f8eb |
| 25 |
MISC ChangeLog 430 RMD160 bebe3ad7fc9cb42001caa8f431532e7a4ed13b5c SHA1 4916227f3470a17cf929e7eb64ea01d57c7f8531 SHA256 9d51430449fed031e0402eee618f1be9e01aeb894e7378e89c2182f0b6b2e148 |
| 26 |
MISC metadata.xml 488 RMD160 5b3487cf3f62c93923b0ba919fa22be6b7b1c1d3 SHA1 8d45b1b5f04c4c4f7cc146acf4a6770cd8fc9222 SHA256 e7f92e874709df69db561e06a461d6ac107222399b02367d8c2ba59f549de8c7 |
| 27 |
|
| 28 |
diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.25.0-r1.ebuild |
| 29 |
index d6985b9..f958f6f 100644 |
| 30 |
--- a/net-misc/curl/curl-7.25.0-r1.ebuild |
| 31 |
+++ b/net-misc/curl/curl-7.25.0-r1.ebuild |
| 32 |
@@ -14,10 +14,11 @@ LICENSE="MIT" |
| 33 |
SLOT="0" |
| 34 |
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" |
| 35 |
IUSE="ares idn ipv6 kerberos ldap ssh ssl static-libs test threads" |
| 36 |
-IUSE="${IUSE} curl_ssl_gnutls curl_ssl_nss curl_ssl_openssl" |
| 37 |
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_openssl curl_ssl_polarssl" |
| 38 |
|
| 39 |
RDEPEND="ldap? ( net-nds/openldap ) |
| 40 |
ssl? ( |
| 41 |
+ curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) |
| 42 |
curl_ssl_gnutls? ( |
| 43 |
|| ( |
| 44 |
( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt app-misc/ca-certificates ) |
| 45 |
@@ -27,6 +28,7 @@ RDEPEND="ldap? ( net-nds/openldap ) |
| 46 |
) |
| 47 |
curl_ssl_openssl? ( dev-libs/openssl ) |
| 48 |
curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) |
| 49 |
+ curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) |
| 50 |
) |
| 51 |
idn? ( net-dns/libidn ) |
| 52 |
ares? ( net-dns/c-ares ) |
| 53 |
@@ -35,10 +37,8 @@ RDEPEND="ldap? ( net-nds/openldap ) |
| 54 |
sys-libs/zlib" |
| 55 |
|
| 56 |
# ssl providers to be added: |
| 57 |
-# axtls $(use_with axtls) |
| 58 |
# cyassl $(use_with cyassl) |
| 59 |
# fbopenssl $(use_with spnego) |
| 60 |
-# polarssl $(use_with polarssl) |
| 61 |
|
| 62 |
# rtmpdump ( media-video/rtmpdump ) / --with-librtmp |
| 63 |
# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html |
| 64 |
@@ -55,7 +55,15 @@ DEPEND="${RDEPEND} |
| 65 |
# ares must be disabled for threads |
| 66 |
# only one ssl provider can be enabled |
| 67 |
REQUIRED_USE="threads? ( !ares ) |
| 68 |
- ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss ) )" |
| 69 |
+ ssl? ( |
| 70 |
+ ^^ ( |
| 71 |
+ curl_ssl_axtls |
| 72 |
+ curl_ssl_gnutls |
| 73 |
+ curl_ssl_openssl |
| 74 |
+ curl_ssl_nss |
| 75 |
+ curl_ssl_polarssl |
| 76 |
+ ) |
| 77 |
+ )" |
| 78 |
|
| 79 |
DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ |
| 80 |
docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) |
| 81 |
@@ -77,31 +85,41 @@ src_configure() { |
| 82 |
|
| 83 |
einfo "\033[1;32m**************************************************\033[00m" |
| 84 |
if use ssl ; then |
| 85 |
+ if use curl_ssl_axtls; then |
| 86 |
+ einfo "SSL provided by axTLS" |
| 87 |
+ myconf+=( --with-axtls --without-ssl --without-gnutls --without-nss --without-polarssl ) |
| 88 |
+ myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
| 89 |
+ fi |
| 90 |
if use curl_ssl_gnutls; then |
| 91 |
einfo "SSL provided by gnutls" |
| 92 |
if has_version net-libs/gnutls[nettle] ; then |
| 93 |
einfo "gnutls compiled with dev-libs/nettle" |
| 94 |
- myconf+=( --without-ssl --with-gnutls --with-nettle --without-nss ) |
| 95 |
+ myconf+=( --without-axtls --without-ssl --with-gnutls --with-nettle --without-nss --without-polarssl ) |
| 96 |
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
| 97 |
else |
| 98 |
einfo "gnutls compiled with dev-libs/libgcrypt" |
| 99 |
- myconf+=( --without-ssl --with-gnutls --without-nettle --without-nss ) |
| 100 |
+ myconf+=( --without-axtls --without-ssl --with-gnutls --without-nettle --without-nss --without-polarssl ) |
| 101 |
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
| 102 |
fi |
| 103 |
fi |
| 104 |
if use curl_ssl_nss; then |
| 105 |
einfo "SSL provided by nss" |
| 106 |
- myconf+=( --without-ssl --without-gnutls --with-nss ) |
| 107 |
+ myconf+=( --without-axtls --without-ssl --without-gnutls --with-nss --without-polarssl ) |
| 108 |
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
| 109 |
fi |
| 110 |
if use curl_ssl_openssl; then |
| 111 |
einfo "SSL provided by openssl" |
| 112 |
- myconf+=( --with-ssl --without-gnutls --without-nss ) |
| 113 |
+ myconf+=( --without-axtls --with-ssl --without-gnutls --without-nss --without-polarssl ) |
| 114 |
myconf+=( --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
| 115 |
fi |
| 116 |
+ if use curl_ssl_polarssl; then |
| 117 |
+ einfo "SSL provided by polarssl" |
| 118 |
+ myconf+=( --with-axtls --without-ssl --without-gnutls --without-nss --with-polarssl ) |
| 119 |
+ myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
| 120 |
+ fi |
| 121 |
else |
| 122 |
einfo "SSL disabled" |
| 123 |
- myconf+=( --without-ssl --without-gnutls --without-nss ) |
| 124 |
+ myconf+=( --without-axtls --without-ssl --without-gnutls --without-nss --without-polarssl ) |
| 125 |
fi |
| 126 |
einfo "\033[1;32m**************************************************\033[00m" |
| 127 |
|
| 128 |
@@ -143,12 +161,10 @@ src_configure() { |
| 129 |
$(use_enable static-libs static) \ |
| 130 |
$(use_enable threads threaded-resolver) \ |
| 131 |
--disable-versioned-symbols \ |
| 132 |
- --without-axtls \ |
| 133 |
--without-cyassl \ |
| 134 |
$(use_with idn libidn) \ |
| 135 |
$(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
| 136 |
--without-krb4 \ |
| 137 |
- --without-polarssl \ |
| 138 |
--without-spnego \ |
| 139 |
--with-zlib \ |
| 140 |
"${myconf[@]}" |
Archives