summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/curl/ChangeLog8
-rw-r--r--net-misc/curl/Manifest18
-rw-r--r--net-misc/curl/curl-7.21.2.ebuild122
3 files changed, 132 insertions, 16 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 990247b61e9b..1d78c9816b0c 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/curl
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.168 2010/08/30 18:10:29 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.169 2010/12/01 20:42:44 scarabeus Exp $
+
+*curl-7.21.2 (01 Dec 2010)
+
+ 01 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> +curl-7.21.2.ebuild:
+ QA: version bump, fixes one issue i had during writting my app. Also should
+ fix some security issue based on changelog i found upstream.
*curl-7.21.1 (30 Aug 2010)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 37bb6555aca6..82059efac441 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
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-7.20.0-libcurlm4.patch 490 RMD160 d4b821bf728286011ce11d7ccc9704522afae98a SHA1 2c592feba55b77965a8cf7e5491f7d0d1db9305e SHA256 b302bcce3d5fccf017eb80dc56e5e129164614c8b24b4c2415aaf63149362f55
@@ -9,20 +6,11 @@ DIST curl-7.20.0.tar.bz2 2088522 RMD160 9418ab686551af58df84960277868c77836d6817
DIST curl-7.20.1.tar.bz2 2097637 RMD160 0ba44872862788ab315c12a13a50c200096a4eee SHA1 bc3ba6d83069ef1f13d320f29b26f1c63f6056b3 SHA256 70664da8e2a8c84327abd10ed30d5a3fc9fa2151def9ee5b75f27e3538554e56
DIST curl-7.21.0.tar.bz2 2130889 RMD160 121eb3645c1286d583462244c1d7e7356129c440 SHA1 5cb1213187fb25d1b4392ddaca3a7945c749d083 SHA256 fe95b4c414951b28987df9c31baea83013cca757124bac4e59869c8806d487ba
DIST curl-7.21.1.tar.bz2 2150291 RMD160 3acc531f70adf68ce64bf8ccd198cbc33b6d5246 SHA1 d6ad8d7caf6e15f318e7b9f69dee8f67c807b1a0 SHA256 653b3214005c778a8c642af4e5dea46c74f7bf51017a568bb8725ea9eda73643
+DIST curl-7.21.2.tar.bz2 2167919 RMD160 fcb1302f79741bc3e488fcee1206284f4cb9e6ca SHA1 f729552a905033dbd0d2cf56e40c7048f2d8331e SHA256 f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21
EBUILD curl-7.20.0-r2.ebuild 3179 RMD160 14c6f1199f9e9761b16a49305e7662b54480cc5f SHA1 1045c7db6f92ab99d6eb6b753d2fd60aafafc9e3 SHA256 7d5508d6598a883ff9712eee2641b8326266bf83ba13fc8b3bea5ffe06950e8c
EBUILD curl-7.20.1.ebuild 3114 RMD160 5370a37cdc2353ed30cccdd41e135c730f05c758 SHA1 0083c6143f8eb0725334f541bfdf2b0df56aa033 SHA256 75846dbc30ec6ce02a016efbab10dd41616170b6353bb653aeb12341f831d5af
EBUILD curl-7.21.0.ebuild 3815 RMD160 e1c9d5adb33e704b0410fd00dbe4b17b1c34a5d3 SHA1 ad1f502d76173d19effd09527be7167094219a31 SHA256 8660bd8d6faba5a4b53f4c1339bd7dfa9f3b7ec46242c6f7263896f601aa43d3
EBUILD curl-7.21.1.ebuild 3809 RMD160 8ae08b601e642bc040d5a5458d29c9f611b8e499 SHA1 1270963689308aaaddea9e031f4172b4f8283633 SHA256 607b9210a42d0f2e7b2fa413a6de8af5847c10d4d31b70f3a78c43627f54a558
-MISC ChangeLog 28433 RMD160 c4bcdee0dbe6726170cf2d457ae01c136e031cb6 SHA1 4d09a528231c9104bf557e443df7149f0efd4858 SHA256 21bd51abeaee1fd994fdecb004efc8cc87031d2c9d653c94fe73c9e49a0ecffe
+EBUILD curl-7.21.2.ebuild 3813 RMD160 827f439bc09852a5f9776b8c45dddebb94100054 SHA1 c0695d34310b1b93d6459306f5ad66f21ef9ad68 SHA256 188d4cee857647c87dfc514082b8205dd4dc445b2c0fbe335140f06166c5ebec
+MISC ChangeLog 28683 RMD160 f8d000516c0495d4180b0ed108d789da393e4789 SHA1 d647eb11a5b93812c0b3404e2b6dee5dfc02b60b SHA256 198a9e7436577c690c06653aaba8d4bb3bb3576382142a625f08bbb093022009
MISC metadata.xml 632 RMD160 880f74804f58930ece5181aec729c39d3a5827e2 SHA1 f576b1b42403cde8c506d0deec8ba52634459389 SHA256 9d71150a8a4f182f5d6a9f9a33161ef0944437bec38fd05857dea2972f294d7c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBCgAGBQJMe/QdAAoJEAWF714uGAc6hdoH/RpA8q5S4quk3GHYjFByvjEh
-usW7ZbeTCzYW47YefhLaHp+gRlV1+Zwz5gB1u8HxD0wzPLskNTim4ICPa4OrQ0Cp
-XP7jrUE0Cykehyd6eJ0NgfpJidrPxO9jmC0JJ5r068EPlYk2Tvm37E9UFtQdiRMq
-AmAOk9S6SENC7Md3yPJlbGasJbSyPmeT+p1bN5dND0hfnXomBD+zktXeeUieLDnC
-QSt3spw+/LD1Zs4viaRggARL/dVymm+M1/7LaZl0C64QvqxD/vk9P54Ucf/4JcGz
-f9Xu7Y5j8IA3qvHgtmKlWAI8l45Q+N7GJcKeCIY1SAYI9Zyww0yJ6OCBjt+Z3o0=
-=wrDH
------END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.21.2.ebuild b/net-misc/curl/curl-7.21.2.ebuild
new file mode 100644
index 000000000000..68d8f91c5291
--- /dev/null
+++ b/net-misc/curl/curl-7.21.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.2.ebuild,v 1.1 2010/12/01 20:42:44 scarabeus Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+EAPI=3
+
+inherit multilib eutils libtool prefix
+
+#MY_P=${P/_pre/-}
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/"
+#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
+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 test threads"
+
+RDEPEND="ldap? ( net-nds/openldap )
+ ssl? (
+ gnutls? ( net-libs/gnutls app-misc/ca-certificates )
+ nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
+ !gnutls? ( !nss? ( dev-libs/openssl ) )
+ )
+ idn? ( net-dns/libidn )
+ !threads? ( ares? ( >=net-dns/c-ares-1.4.0 ) )
+ 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}
+ test? (
+ sys-apps/diffutils
+ dev-lang/perl
+ )"
+# used - but can do without in self test: net-misc/stunnel
+
+pkg_setup() {
+ if ! use ssl && ( use gnutls || use nss ) ; then
+ ewarn "USE='gnutls nss' are ignored without USE='ssl'."
+ ewarn "Please review the local USE flags for this package."
+ fi
+ if use ares && use threads; then
+ ewarn "USE flags 'ares' and 'threads' are mutually exclusive,"
+ ewarn "disabling 'ares', please review and re-emerge if needed."
+ fi
+}
+
+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
+
+ eprefixify curl-config.in
+ # for FreeMiNT
+ elibtoolize
+}
+
+src_configure() {
+ myconf="$(use_enable ldap)
+ $(use_enable ldap ldaps)
+ $(use_with idn libidn)
+ $(use_with kerberos gssapi "${EPREFIX}"/usr)
+ $(use_with libssh2)
+ $(use_enable ipv6)
+ $(use_enable threads threaded-resolver)
+ $(use threads && echo --disable-ares || 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"
+
+ if use ssl ; then
+ if use gnutls; then
+ myconf="${myconf} --without-ssl --with-gnutls --without-nss"
+ myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+ elif use nss; then
+ myconf="${myconf} --without-ssl --without-gnutls --with-nss"
+ myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+ else
+ myconf="${myconf} --without-gnutls --without-nss --with-ssl"
+ myconf="${myconf} --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
+ fi
+ else
+ myconf="${myconf} --without-gnutls --without-nss --without-ssl"
+ fi
+
+ econf ${myconf} || die 'configure failed'
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "installed failed for current version"
+ 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 || die
+
+ dodoc CHANGES README || die
+ dodoc docs/FEATURES docs/INTERNALS || die
+ dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE || die
+}