From 31e9f3739f0dcb4f2e9e285d4072460e11d27fe4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 1 Dec 2011 18:35:02 +0000 Subject: [PATCH] Version bump. Should include fix for #387641 by Tim Harder and for #382241 by Alessandro Surace. Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64 --- net-misc/curl/ChangeLog | 8 +- net-misc/curl/Manifest | 10 ++- net-misc/curl/curl-7.23.1.ebuild | 121 +++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+), 5 deletions(-) create mode 100644 net-misc/curl/curl-7.23.1.ebuild diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 28dcf3d71590..6051de19fee7 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,12 @@ # 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.193 2011/11/14 17:10:55 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.194 2011/12/01 18:35:02 vapier Exp $ + +*curl-7.23.1 (01 Dec 2011) + + 01 Dec 2011; Mike Frysinger +curl-7.23.1.ebuild: + Version bump. Should include fix for #387641 by Tim Harder and for #382241 by + Alessandro Surace. 14 Nov 2011; Christoph Mende curl-7.22.0.ebuild: Prefer openssl over nss diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index c3a6a81d7baf..fb9bd6e63c53 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -14,17 +14,19 @@ DIST curl-7.21.4.tar.bz2 2256354 RMD160 c18710206d30a0f1078b2156df25ded30443f7cf DIST curl-7.21.6.tar.bz2 2311355 RMD160 25741abc0ec79d6f0da249aa50d310397bb92d17 SHA1 049a3aff13d283f6e4ea1f9aa3aa6abc067fd42e SHA256 d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955 DIST curl-7.21.7.tar.bz2 2319682 RMD160 c4c8afe66fb30be9eec8233c22db6d5beed00e39 SHA1 88aab0188ac86c3d13118bb5b6ee49a83e53b0ce SHA256 1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a DIST curl-7.22.0.tar.bz2 2337931 RMD160 c65a5f2c4454ec5be3db66d4816bd8c0fcc7a91a SHA1 8e7b2b0ca933812614ec0eade2f83e77632247d6 SHA256 bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112 +DIST curl-7.23.1.tar.bz2 2376653 RMD160 96c45f38361d04a939e135c9e5fcf27ca1180abe SHA1 9bac69696446ead85e59d8488098ee84cf897b7e SHA256 7d8c8cef8f244118245c37853cb175bd95c156ff453730ec2c88189b05a7c06e EBUILD curl-7.21.4.ebuild 3500 RMD160 da59518fe336b44075f2b93524fa48e57db94401 SHA1 3d318ddd125f1c6f723a9f96af895e74202808ce SHA256 a3c54ce1f7690fa7396236be7d2b247d4cd0ec9fe3b0ee8dc7b9c52261080de6 EBUILD curl-7.21.6.ebuild 3491 RMD160 ff149e8b7243622e68984589b289914cce039ee3 SHA1 37e45a232c442d363460d6bcf06a50734a6f645e SHA256 2fe3323f68bd5e3a37bb06ab8d0a650ce467556e06233a776712a3e115f17c6d EBUILD curl-7.21.7-r2.ebuild 3716 RMD160 a3ef5e30a134b232bca6c9b273283fefef076f95 SHA1 196de6831df4b1065f0bda045a46cdddafa8c00b SHA256 27d0c8d72c7c13fcf1f9d0a40b5962e9e48cd9296140520c92b6326ac41109c0 EBUILD curl-7.21.7.ebuild 3537 RMD160 d18c4326bd7b53625019add90b6e68cb03871442 SHA1 9d95054e41000a5d042e3df2dd7018367e696d09 SHA256 2fce4d8718548f70f1c7328cf922d31e038bfa7e68a3cec3cbc7046d6db10603 EBUILD curl-7.22.0.ebuild 3608 RMD160 5e7890f20ef35b492a6f1ddd6d96734a21d78830 SHA1 4507f96241275e6fa87121b0323d7b25a5e0d296 SHA256 95933208c4c0d1814310ae5521ffe827a58f012191c49cef512faa034eb80c59 -MISC ChangeLog 32281 RMD160 bcc73ef711373fc51948266c3fbe8fe0c0af9be6 SHA1 c83a0bd8a8c212c974a3da3b0219c8c5bcfc8603 SHA256 182fc99697ef3e7a0519118f6d8676fe9639ef1fe7cfe64d22f6d8fe7ef1979f +EBUILD curl-7.23.1.ebuild 3689 RMD160 6d23cd317a11a109635eb8197b9ea8058736a5c3 SHA1 a90b83a8517c538940eb8520f53d04eed9a99e8b SHA256 b66a808ecb67748acaeafe4e84c1549a930d07cb6c602acc692d622e1891187b +MISC ChangeLog 32481 RMD160 9e6dc7f46283ec1a37b61e555612ea04960b901d SHA1 a8075a5223408ffae94b72f29588575656e606a1 SHA256 6cdfd4156cad565e29b0e82c5ca6c652ac20e226f32fe946238aefb1147dd8f1 MISC metadata.xml 638 RMD160 6e685dbc2c33ff964b46795a7083b45d03c6ba4d SHA1 eec3433434ad3574c097b24b51eb58f4ecb2bbad SHA256 3d7a27dacbea52f5aa76206ccdc7926bddcd3c0eb1751a881cb8aec332b5f7d6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7BS6MACgkQmWq1bYTyC0OSbQEAxhqO66I8rtSZaOHcu6xUYa7Y -VH/jIuIoWUa7cqwuJsAA/jJiSG3BILr4VJkzx+vTufsneQ0C9WSgdJia3YKqU7HD -=we0H +iF4EAREIAAYFAk7XyNwACgkQaC/OocHi7JavXwD+M3lp3/HiExXOXvYP5tBc1T8L ++eEHDmbCeyit6vMCthgA/2y1I1MVPPbpcn5Dmu+21TjTVUGO7jELKxh8RMiDk+ii +=6yRn -----END PGP SIGNATURE----- diff --git a/net-misc/curl/curl-7.23.1.ebuild b/net-misc/curl/curl-7.23.1.ebuild new file mode 100644 index 000000000000..b339d308d2e2 --- /dev/null +++ b/net-misc/curl/curl-7.23.1.ebuild @@ -0,0 +1,121 @@ +# 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.23.1.ebuild,v 1.1 2011/12/01 18:35:02 vapier 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 gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads" + +RDEPEND="ldap? ( net-nds/openldap ) + 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 ) + libssh2? ( >=net-libs/libssh2-0.16 )" + +# rtmpdump ( media-video/rtmpdump ) / --with-librtmp +# fbopenssl (not in gentoo) --with-spnego +# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html + +DEPEND="${RDEPEND} + sys-apps/ed + test? ( + sys-apps/diffutils + dev-lang/perl + )" +# used - but can do without in self test: net-misc/stunnel + +# 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 ) + nss? ( !gnutls )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \ + "${FILESDIR}"/${PN}-7.19.7-test241.patch \ + "${FILESDIR}"/${PN}-7.18.2-prefix.patch \ + "${FILESDIR}"/${PN}-respect-cflags-3.patch + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 + + eprefixify curl-config.in + eautoreconf +} + +src_configure() { + local myconf + + 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 + + econf \ + $(use_enable ldap) \ + $(use_enable ldap ldaps) \ + $(use_with idn libidn) \ + $(use_with kerberos gssapi "${EPREFIX}"/usr) \ + $(use_with libssh2) \ + $(use_enable static-libs static) \ + $(use_enable ipv6) \ + $(use_enable threads threaded-resolver) \ + $(use_enable ares) \ + --enable-http \ + --enable-ftp \ + --enable-gopher \ + --enable-file \ + --enable-dict \ + --enable-manual \ + --enable-telnet \ + --enable-smtp \ + --enable-pop3 \ + --enable-imap \ + --enable-rtsp \ + --enable-nonblocking \ + --enable-largefile \ + --enable-maintainer-mode \ + --disable-sspi \ + --without-krb4 \ + --without-librtmp \ + --without-spnego \ + ${myconf} +} + +src_compile() { + default + ed - lib/curl_config.h < "${FILESDIR}"/config.h.ed || die + ed - src/curl_config.h < "${FILESDIR}"/config.h.ed || die + ed - include/curl/curlbuild.h < "${FILESDIR}"/curlbuild.h.ed || die +} + +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 + + dodoc CHANGES README + dodoc docs/FEATURES docs/INTERNALS + dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE +} -- 2.26.2