* [gentoo-commits] dev/blueness:master commit in: net-misc/curl/files/, net-misc/curl/
@ 2012-04-04 22:35 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-04-04 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 1e769551a873d63377b8b4399a101eeacebd7997
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 4 22:35:26 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Apr 4 22:35:26 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=1e769551
net-misc/curl: address bugs #410305, #410369 and #401299
---
net-misc/curl/ChangeLog | 12 ++
net-misc/curl/Manifest | 8 +
net-misc/curl/curl-7.25.0-r1.ebuild | 165 ++++++++++++++++++++++
net-misc/curl/files/curl-7.18.2-prefix.patch | 20 +++
net-misc/curl/files/curl-7.19.7-test241.patch | 20 +++
net-misc/curl/files/curl-fix-gnutls-nettle.patch | 27 ++++
net-misc/curl/files/curl-respect-cflags-3.patch | 14 ++
net-misc/curl/metadata.xml | 16 ++
8 files changed, 282 insertions(+), 0 deletions(-)
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
new file mode 100644
index 0000000..2ffaa2a
--- /dev/null
+++ b/net-misc/curl/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for net-misc/curl
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*curl-7.25.0-r1 (04 Apr 2012)
+
+ 04 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+ +files/curl-respect-cflags-3.patch, +files/curl-7.18.2-prefix.patch,
+ +files/curl-7.19.7-test241.patch, +curl-7.25.0-r1.ebuild,
+ +files/curl-fix-gnutls-nettle.patch, +metadata.xml:
+ Address bugs #410305, #410369 and #401299
+
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
new file mode 100644
index 0000000..e329458
--- /dev/null
+++ b/net-misc/curl/Manifest
@@ -0,0 +1,8 @@
+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 5230 RMD160 cb76b95ac71283a37b57800869494b50e1d02bbf SHA1 43163c3d6070f3216068a924e521522270dbe293 SHA256 ab27c592a429f9a9474611b44e4b8fd863ed877b6d26a24ad833f37c57617761
+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
new file mode 100644
index 0000000..d6985b9
--- /dev/null
+++ b/net-misc/curl/curl-7.25.0-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v 1.5 2012/04/01 13:50:07 blueness Exp $
+
+EAPI="4"
+
+inherit autotools eutils prefix
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
+
+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"
+
+RDEPEND="ldap? ( net-nds/openldap )
+ ssl? (
+ 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 )
+ )
+ )
+ curl_ssl_openssl? ( dev-libs/openssl )
+ curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
+ )
+ idn? ( net-dns/libidn )
+ ares? ( net-dns/c-ares )
+ kerberos? ( virtual/krb5 )
+ ssh? ( net-libs/libssh2 )
+ 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
+
+DEPEND="${RDEPEND}
+ sys-apps/ed
+ dev-util/pkgconfig
+ test? (
+ sys-apps/diffutils
+ dev-lang/perl
+ )"
+# used - but can do without in self test: net-misc/stunnel
+
+# 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 ) )"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
+ docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-7.19.7-test241.patch \
+ "${FILESDIR}"/${PN}-7.18.2-prefix.patch \
+ "${FILESDIR}"/${PN}-respect-cflags-3.patch \
+ "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+ sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+ eprefixify curl-config.in
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=()
+
+ einfo "\033[1;32m**************************************************\033[00m"
+ if use ssl ; then
+ 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+=( --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+=( --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+=( --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-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ fi
+ else
+ einfo "SSL disabled"
+ myconf+=( --without-ssl --without-gnutls --without-nss )
+ fi
+ einfo "\033[1;32m**************************************************\033[00m"
+
+ # These configuration options are organized alphabetically
+ # within each category. This should make it easier if we
+ # ever decide to make any of them contingent on USE flags:
+ # 1) protocols first. To see them all do
+ # 'grep SUPPORT_PROTOCOLS configure.ac'
+ # 2) --enable/disable options second.
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+ # 3) --with/without options third.
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+ econf \
+ --enable-dict \
+ --enable-file \
+ --enable-ftp \
+ --enable-gopher \
+ --enable-http \
+ --enable-imap \
+ $(use_enable ldap) \
+ $(use_enable ldap ldaps) \
+ --enable-pop3 \
+ --without-librtmp \
+ --enable-rtsp \
+ $(use_with ssh libssh2) \
+ --enable-smtp \
+ --enable-telnet \
+ --enable-tftp \
+ $(use_enable ares) \
+ --enable-cookies \
+ --enable-hidden-symbols \
+ $(use_enable ipv6) \
+ --enable-largefile \
+ --enable-manual \
+ --enable-nonblocking \
+ --enable-proxy \
+ --disable-soname-bump \
+ --disable-sspi \
+ $(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[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete
+ rm -rf "${ED}"/etc/
+
+ # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
+ insinto /usr/share/aclocal
+ doins docs/libcurl/libcurl.m4
+}
diff --git a/net-misc/curl/files/curl-7.18.2-prefix.patch b/net-misc/curl/files/curl-7.18.2-prefix.patch
new file mode 100644
index 0000000..9f7761f
--- /dev/null
+++ b/net-misc/curl/files/curl-7.18.2-prefix.patch
@@ -0,0 +1,20 @@
+--- curl-config.in.orig 2008-10-10 13:43:19.000000000 +0200
++++ curl-config.in 2008-10-10 13:43:56.000000000 +0200
+@@ -181,7 +181,7 @@
+ ;;
+
+ --cflags)
+- if test "X@includedir@" = "X/usr/include"; then
++ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
+ echo ""
+ else
+ echo "-I@includedir@"
+@@ -189,7 +189,7 @@
+ ;;
+
+ --libs)
+- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
++ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
+ CURLLIBDIR="-L@libdir@ "
+ else
+ CURLLIBDIR=""
diff --git a/net-misc/curl/files/curl-7.19.7-test241.patch b/net-misc/curl/files/curl-7.19.7-test241.patch
new file mode 100644
index 0000000..7297c1b
--- /dev/null
+++ b/net-misc/curl/files/curl-7.19.7-test241.patch
@@ -0,0 +1,20 @@
+--- tests/data/test241.orig 2008-11-20 08:12:35.000000000 +1100
++++ tests/data/test241 2009-11-05 14:22:07.000000000 +1100
+@@ -33,7 +33,7 @@
+ HTTP-IPv6 GET (using ip6-localhost)
+ </name>
+ <command>
+--g "http://ip6-localhost:%HTTP6PORT/241"
++-g "http://::1:%HTTP6PORT/241"
+ </command>
+ <precheck>
+ ./server/resolve --ipv6 ip6-localhost
+@@ -48,7 +48,7 @@
+ </strip>
+ <protocol>
+ GET /241 HTTP/1.1
+-Host: ip6-localhost:%HTTP6PORT
++Host: ::1:%HTTP6PORT
+ Accept: */*
+
+ </protocol>
diff --git a/net-misc/curl/files/curl-fix-gnutls-nettle.patch b/net-misc/curl/files/curl-fix-gnutls-nettle.patch
new file mode 100644
index 0000000..fbacb77
--- /dev/null
+++ b/net-misc/curl/files/curl-fix-gnutls-nettle.patch
@@ -0,0 +1,27 @@
+diff -Naur curl-7.25.0.orig//configure.ac curl-7.25.0/configure.ac
+--- curl-7.25.0.orig//configure.ac 2012-04-04 17:24:48.000000000 -0400
++++ curl-7.25.0/configure.ac 2012-04-04 17:23:07.000000000 -0400
+@@ -1823,20 +1823,9 @@
+
+ if test "$GNUTLS_ENABLED" = "1"; then
+ USE_GNUTLS_NETTLE=
+- # First check if we can detect either crypto library via transitive linking
+- AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
+- if test "$USE_GNUTLS_NETTLE" = ""; then
+- AC_CHECK_LIB(gnutls, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
+- fi
+- # If not, try linking directly to both of them to see if they are available
+- if test "$USE_GNUTLS_NETTLE" = ""; then
+- AC_CHECK_LIB(nettle, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
+- fi
+- if test "$USE_GNUTLS_NETTLE" = ""; then
+- AC_CHECK_LIB(gcrypt, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
+- fi
+- if test "$USE_GNUTLS_NETTLE" = ""; then
+- AC_MSG_ERROR([GnuTLS found, but neither gcrypt nor nettle found])
++ AC_ARG_WITH(nettle)
++ if test "x$withval" = "xyes"; then
++ USE_GNUTLS_NETTLE=1
+ fi
+ if test "$USE_GNUTLS_NETTLE" = "1"; then
+ AC_DEFINE(USE_GNUTLS_NETTLE, 1, [if GnuTLS uses nettle as crypto backend])
diff --git a/net-misc/curl/files/curl-respect-cflags-3.patch b/net-misc/curl/files/curl-respect-cflags-3.patch
new file mode 100644
index 0000000..4a4a614
--- /dev/null
+++ b/net-misc/curl/files/curl-respect-cflags-3.patch
@@ -0,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index e9b49c7..e374ab6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -280,9 +280,6 @@ dnl **********************************************************************
+
+ CURL_CHECK_COMPILER
+ CURL_SET_COMPILER_BASIC_OPTS
+-CURL_SET_COMPILER_DEBUG_OPTS
+-CURL_SET_COMPILER_OPTIMIZE_OPTS
+-CURL_SET_COMPILER_WARNING_OPTS
+
+ if test "$compiler_id" = "INTEL_UNIX_C"; then
+ #
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
new file mode 100644
index 0000000..fd52c96
--- /dev/null
+++ b/net-misc/curl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <maintainer>
+ <email>gregkh@gentoo.org</email>
+ <name>Greg Kroah-Hartman</name>
+ </maintainer>
+ <use>
+ <flag name="ares">Enabled c-ares dns support</flag>
+ <flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: net-misc/curl/files/, net-misc/curl/
@ 2012-04-15 17:53 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-04-15 17:53 UTC (permalink / raw
To: gentoo-commits
commit: 9b1b8f919d8c1ebc13f3a0532f88cdebe322f7d1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 17:53:34 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 17:53:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=9b1b8f91
net-misc/curl: moved to tree
(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)
---
net-misc/curl/ChangeLog | 15 --
net-misc/curl/Manifest | 8 -
net-misc/curl/curl-7.25.0-r1.ebuild | 187 ----------------------
net-misc/curl/files/curl-7.18.2-prefix.patch | 20 ---
net-misc/curl/files/curl-7.19.7-test241.patch | 20 ---
net-misc/curl/files/curl-fix-gnutls-nettle.patch | 27 ---
net-misc/curl/files/curl-respect-cflags-3.patch | 14 --
net-misc/curl/metadata.xml | 16 --
8 files changed, 0 insertions(+), 307 deletions(-)
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
deleted file mode 100644
index 583dfef..0000000
--- a/net-misc/curl/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-# ChangeLog for net-misc/curl
-# 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>
- +files/curl-respect-cflags-3.patch, +files/curl-7.18.2-prefix.patch,
- +files/curl-7.19.7-test241.patch, +curl-7.25.0-r1.ebuild,
- +files/curl-fix-gnutls-nettle.patch, +metadata.xml:
- Address bugs #410305, #410369 and #401299
-
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
deleted file mode 100644
index a7a88ce..0000000
--- a/net-misc/curl/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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 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
deleted file mode 100644
index d15726f..0000000
--- a/net-misc/curl/curl-7.25.0-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v 1.5 2012/04/01 13:50:07 blueness Exp $
-
-EAPI="4"
-
-inherit autotools eutils prefix
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-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_cyassl 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[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[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[static-libs?] )
- ares? ( net-dns/c-ares )
- kerberos? ( virtual/krb5[static-libs?] )
- ssh? ( net-libs/libssh2[static-libs?] )
- sys-libs/zlib"
-
-# ssl providers to be added:
-# fbopenssl $(use_with spnego)
-
-# rtmpdump ( media-video/rtmpdump ) / --with-librtmp
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
- sys-apps/ed
- dev-util/pkgconfig
- test? (
- sys-apps/diffutils
- dev-lang/perl
- )"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="threads? ( !ares )
- ssl? (
- ^^ (
- curl_ssl_axtls
- curl_ssl_cyassl
- 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)
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-7.19.7-test241.patch \
- "${FILESDIR}"/${PN}-7.18.2-prefix.patch \
- "${FILESDIR}"/${PN}-respect-cflags-3.patch \
- "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
- sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
- eprefixify curl-config.in
- eautoreconf
-}
-
-src_configure() {
- 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"
- einfo "NOTE: axTLS is meant for embedded systems and"
- einfo "may not be the best choice as an ssl provider"
- myconf+=( --with-axtls )
- fi
- 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
- einfo "gnutls compiled with dev-libs/nettle"
- myconf+=( --with-gnutls --with-nettle )
- else
- einfo "gnutls compiled with dev-libs/libgcrypt"
- myconf+=( --with-gnutls --without-nettle )
- fi
- fi
- if use curl_ssl_nss; then
- einfo "SSL provided by nss"
- myconf+=( --with-nss )
- 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
- einfo "SSL provided by openssl"
- myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
- else
- einfo "SSL disabled"
- fi
- einfo "\033[1;32m**************************************************\033[00m"
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
- econf \
- --enable-dict \
- --enable-file \
- --enable-ftp \
- --enable-gopher \
- --enable-http \
- --enable-imap \
- $(use_enable ldap) \
- $(use_enable ldap ldaps) \
- --enable-pop3 \
- --without-librtmp \
- --enable-rtsp \
- $(use_with ssh libssh2) \
- --enable-smtp \
- --enable-telnet \
- --enable-tftp \
- $(use_enable ares) \
- --enable-cookies \
- --enable-hidden-symbols \
- $(use_enable ipv6) \
- --enable-largefile \
- --enable-manual \
- --enable-nonblocking \
- --enable-proxy \
- --disable-soname-bump \
- --disable-sspi \
- $(use_enable static-libs static) \
- $(use_enable threads threaded-resolver) \
- --disable-versioned-symbols \
- $(use_with idn libidn) \
- $(use_with kerberos gssapi "${EPREFIX}"/usr) \
- --without-krb4 \
- --without-spnego \
- --with-zlib \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete
- rm -rf "${ED}"/etc/
-
- # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
- insinto /usr/share/aclocal
- doins docs/libcurl/libcurl.m4
-}
diff --git a/net-misc/curl/files/curl-7.18.2-prefix.patch b/net-misc/curl/files/curl-7.18.2-prefix.patch
deleted file mode 100644
index 9f7761f..0000000
--- a/net-misc/curl/files/curl-7.18.2-prefix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- curl-config.in.orig 2008-10-10 13:43:19.000000000 +0200
-+++ curl-config.in 2008-10-10 13:43:56.000000000 +0200
-@@ -181,7 +181,7 @@
- ;;
-
- --cflags)
-- if test "X@includedir@" = "X/usr/include"; then
-+ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
- echo ""
- else
- echo "-I@includedir@"
-@@ -189,7 +189,7 @@
- ;;
-
- --libs)
-- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
-+ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
- CURLLIBDIR="-L@libdir@ "
- else
- CURLLIBDIR=""
diff --git a/net-misc/curl/files/curl-7.19.7-test241.patch b/net-misc/curl/files/curl-7.19.7-test241.patch
deleted file mode 100644
index 7297c1b..0000000
--- a/net-misc/curl/files/curl-7.19.7-test241.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tests/data/test241.orig 2008-11-20 08:12:35.000000000 +1100
-+++ tests/data/test241 2009-11-05 14:22:07.000000000 +1100
-@@ -33,7 +33,7 @@
- HTTP-IPv6 GET (using ip6-localhost)
- </name>
- <command>
---g "http://ip6-localhost:%HTTP6PORT/241"
-+-g "http://::1:%HTTP6PORT/241"
- </command>
- <precheck>
- ./server/resolve --ipv6 ip6-localhost
-@@ -48,7 +48,7 @@
- </strip>
- <protocol>
- GET /241 HTTP/1.1
--Host: ip6-localhost:%HTTP6PORT
-+Host: ::1:%HTTP6PORT
- Accept: */*
-
- </protocol>
diff --git a/net-misc/curl/files/curl-fix-gnutls-nettle.patch b/net-misc/curl/files/curl-fix-gnutls-nettle.patch
deleted file mode 100644
index fbacb77..0000000
--- a/net-misc/curl/files/curl-fix-gnutls-nettle.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur curl-7.25.0.orig//configure.ac curl-7.25.0/configure.ac
---- curl-7.25.0.orig//configure.ac 2012-04-04 17:24:48.000000000 -0400
-+++ curl-7.25.0/configure.ac 2012-04-04 17:23:07.000000000 -0400
-@@ -1823,20 +1823,9 @@
-
- if test "$GNUTLS_ENABLED" = "1"; then
- USE_GNUTLS_NETTLE=
-- # First check if we can detect either crypto library via transitive linking
-- AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
-- if test "$USE_GNUTLS_NETTLE" = ""; then
-- AC_CHECK_LIB(gnutls, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
-- fi
-- # If not, try linking directly to both of them to see if they are available
-- if test "$USE_GNUTLS_NETTLE" = ""; then
-- AC_CHECK_LIB(nettle, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
-- fi
-- if test "$USE_GNUTLS_NETTLE" = ""; then
-- AC_CHECK_LIB(gcrypt, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
-- fi
-- if test "$USE_GNUTLS_NETTLE" = ""; then
-- AC_MSG_ERROR([GnuTLS found, but neither gcrypt nor nettle found])
-+ AC_ARG_WITH(nettle)
-+ if test "x$withval" = "xyes"; then
-+ USE_GNUTLS_NETTLE=1
- fi
- if test "$USE_GNUTLS_NETTLE" = "1"; then
- AC_DEFINE(USE_GNUTLS_NETTLE, 1, [if GnuTLS uses nettle as crypto backend])
diff --git a/net-misc/curl/files/curl-respect-cflags-3.patch b/net-misc/curl/files/curl-respect-cflags-3.patch
deleted file mode 100644
index 4a4a614..0000000
--- a/net-misc/curl/files/curl-respect-cflags-3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e9b49c7..e374ab6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -280,9 +280,6 @@ dnl **********************************************************************
-
- CURL_CHECK_COMPILER
- CURL_SET_COMPILER_BASIC_OPTS
--CURL_SET_COMPILER_DEBUG_OPTS
--CURL_SET_COMPILER_OPTIMIZE_OPTS
--CURL_SET_COMPILER_WARNING_OPTS
-
- if test "$compiler_id" = "INTEL_UNIX_C"; then
- #
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
deleted file mode 100644
index fd52c96..0000000
--- a/net-misc/curl/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
- <maintainer>
- <email>gregkh@gentoo.org</email>
- <name>Greg Kroah-Hartman</name>
- </maintainer>
- <use>
- <flag name="ares">Enabled c-ares dns support</flag>
- <flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-15 17:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-04 22:35 [gentoo-commits] dev/blueness:master commit in: net-misc/curl/files/, net-misc/curl/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2012-04-15 17:53 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