diff options
author | Daniel Black <dragonheart@gentoo.org> | 2007-11-12 20:11:07 +0000 |
---|---|---|
committer | Daniel Black <dragonheart@gentoo.org> | 2007-11-12 20:11:07 +0000 |
commit | 72e6f8a828b87452229283595cbd03e0db0fb591 (patch) | |
tree | a5dc7a26fb76036ec25f1255df0e5885c8d276fb /net-misc/curl | |
parent | amd64 stable wrt #198845 (diff) | |
download | historical-72e6f8a828b87452229283595cbd03e0db0fb591.tar.gz historical-72e6f8a828b87452229283595cbd03e0db0fb591.tar.bz2 historical-72e6f8a828b87452229283595cbd03e0db0fb591.zip |
version bump + patch thanks to Robin - bug #198931
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'net-misc/curl')
-rw-r--r-- | net-misc/curl/ChangeLog | 8 | ||||
-rw-r--r-- | net-misc/curl/Manifest | 20 | ||||
-rw-r--r-- | net-misc/curl/curl-7.17.1.ebuild | 114 | ||||
-rw-r--r-- | net-misc/curl/files/curl-7.17.1-null-handler-segfault.patch | 69 | ||||
-rw-r--r-- | net-misc/curl/files/digest-curl-7.17.1 | 3 |
5 files changed, 209 insertions, 5 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index ee5f61c31c4c..ff7c992c6d88 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/curl # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.108 2007/10/17 20:32:13 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.109 2007/11/12 20:11:06 dragonheart Exp $ + +*curl-7.17.1 (12 Nov 2007) + + 12 Nov 2007; Daniel Black <dragonheart@gentoo.org> + +files/curl-7.17.1-null-handler-segfault.patch, +curl-7.17.1.ebuild: + version bump + patch thanks to Robin - bug #198931 17 Oct 2007; Daniel Black <dragonheart@gentoo.org> curl-7.17.0.ebuild, curl-7.17.1_pre20071013.ebuild: diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 7abe788cb9d5..bad4cb80a3ab 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -14,6 +14,10 @@ AUX curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5 MD5 8062c3874a2b2d30f28234098fd44d4e files/curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5e52c29c files/curl-7.17.0-strip-ldflags.patch 796 SHA256 f3892c3d2a16f96319fd11cb516f66b5df0ece18ca8271cf3b9c1f286e9b5d73 files/curl-7.17.0-strip-ldflags.patch 796 +AUX curl-7.17.1-null-handler-segfault.patch 2560 RMD160 3f1ce2cab67588b132fa6ad30e49f887e6d16f0a SHA1 e6b20baa6306b26c3dc8ffe78fc0d34c5b531b1b SHA256 6f696c4b1d6ae216225fb2cd9e95527d7513872aae06abef05c35758a3d30887 +MD5 067960857f2f8b2a90b11e7a4c521383 files/curl-7.17.1-null-handler-segfault.patch 2560 +RMD160 3f1ce2cab67588b132fa6ad30e49f887e6d16f0a files/curl-7.17.1-null-handler-segfault.patch 2560 +SHA256 6f696c4b1d6ae216225fb2cd9e95527d7513872aae06abef05c35758a3d30887 files/curl-7.17.1-null-handler-segfault.patch 2560 AUX libcurl-gnutlscert.patch 1498 RMD160 286859e0870c6e5aa21047b28b2c256f7b7bfffe SHA1 6ef8e0887431e62328cc020cad5fb10673336ad3 SHA256 4b0a9db99ddc698c39484a95cba1f52c0dc17ed34f2d7e1dd780f925bf21761b MD5 c92c1997f7cf421df077b1e176708f8c files/libcurl-gnutlscert.patch 1498 RMD160 286859e0870c6e5aa21047b28b2c256f7b7bfffe files/libcurl-gnutlscert.patch 1498 @@ -22,6 +26,7 @@ DIST curl-7.15.5.tar.bz2 1543007 RMD160 4494cffb382c81b7211830c7e6e40ef9ed8f4ef0 DIST curl-7.16.4.tar.bz2 1668101 RMD160 ee59976f7ce9161be3d5ebdb44903dee597fbd68 SHA1 a26a8796f5fc851b23423bc419c80e27d3e09483 SHA256 45c69529126b6ff50e7ebe2c2b8157a4ecb405174a1349234903021e9ac5c87b DIST curl-7.17.0.tar.bz2 1698728 RMD160 12141ad0f5de32e9d496f3d499bf6fda80a4308e SHA1 78e08bac74952e2af612f20759a330f580c122b3 SHA256 3aabf85ef56afeddd66c7180971fbd6412133d85311a76b7a274f80982301cc3 DIST curl-7.17.1-20071013.tar.bz2 1766588 RMD160 1cf52a1ed6d187bdcaea7de0331b54a11260c38d SHA1 8e361895f2e99eabf4cc5eac188f7975e5186945 SHA256 5e702c0bc1e9c51f3b19e1e9f6e013310836f60f831bc50debc599192e792537 +DIST curl-7.17.1.tar.bz2 1721551 RMD160 8ab8dc7a33a5265dfe25eb0725248c3cd6519510 SHA1 ad34b9386e7fd1c8f2a8025e2716a8047b194970 SHA256 7f668ec49506ffc968a54fde9404183212bb40b226626e9417d941594e06e57b EBUILD curl-7.15.5-r1.ebuild 2236 RMD160 e52ae4d3420183ff90088e8f9391f4706982876b SHA1 610f71dff18426d9efac0cd7075acc5bc42b3730 SHA256 3f257480df0b9fe040d374740a9654688b484065c0cdd284787a0a6d314da04d MD5 8bd220034f660234d6a179ba4e7f896d curl-7.15.5-r1.ebuild 2236 RMD160 e52ae4d3420183ff90088e8f9391f4706982876b curl-7.15.5-r1.ebuild 2236 @@ -34,14 +39,18 @@ EBUILD curl-7.17.0.ebuild 3332 RMD160 cc28091be032c3223ea7b16c75166bb9a8192865 S MD5 75fd550e9eb102a0700889cbbb837bcb curl-7.17.0.ebuild 3332 RMD160 cc28091be032c3223ea7b16c75166bb9a8192865 curl-7.17.0.ebuild 3332 SHA256 5b1cbb50236ceeac5f614bc1e4750f5f386e2120cb92e95538d1d68763324f89 curl-7.17.0.ebuild 3332 +EBUILD curl-7.17.1.ebuild 3391 RMD160 4de0c6d2fbc2184a894c2c2723b70b1e9016b4d1 SHA1 c3291a460f5c586774b05670d48e577b7ed59fab SHA256 5c8c9271bdaefca1fa19e421e4b04d0f2e31f340c3d3cfebadcd4456f102f3c5 +MD5 490eeb8f98dac5f39f78772db59fec63 curl-7.17.1.ebuild 3391 +RMD160 4de0c6d2fbc2184a894c2c2723b70b1e9016b4d1 curl-7.17.1.ebuild 3391 +SHA256 5c8c9271bdaefca1fa19e421e4b04d0f2e31f340c3d3cfebadcd4456f102f3c5 curl-7.17.1.ebuild 3391 EBUILD curl-7.17.1_pre20071013.ebuild 3346 RMD160 b40029445b74b29e5e041d279abfb58a162dd60b SHA1 44e2f98f747e2244b7cd54c2aca039b7c78548cd SHA256 056e8060c9aa346c0c00441fd95f7cc6d35ed9d451c5eed98a2d9d9ca8f0c249 MD5 3147935f5879f564d29cae2327162897 curl-7.17.1_pre20071013.ebuild 3346 RMD160 b40029445b74b29e5e041d279abfb58a162dd60b curl-7.17.1_pre20071013.ebuild 3346 SHA256 056e8060c9aa346c0c00441fd95f7cc6d35ed9d451c5eed98a2d9d9ca8f0c249 curl-7.17.1_pre20071013.ebuild 3346 -MISC ChangeLog 19695 RMD160 3a5d77341cd971161ba3c9577fc3a2bc7cf64055 SHA1 817e2abdc161b8be35b48610933f50b2229ea5f8 SHA256 979cfad5793d7437554f723a8ea6e1f73c4fcfa276d9bb9e5c4382afd1690d5b -MD5 222ea454e8a0ea2fae0b6adba84f4134 ChangeLog 19695 -RMD160 3a5d77341cd971161ba3c9577fc3a2bc7cf64055 ChangeLog 19695 -SHA256 979cfad5793d7437554f723a8ea6e1f73c4fcfa276d9bb9e5c4382afd1690d5b ChangeLog 19695 +MISC ChangeLog 19901 RMD160 18a7bc449be2840d71b24f218887a3cdd868e22a SHA1 6f5c739995f7f0d4b8ca0d5a7bdb799702265a66 SHA256 4a11f1b727dc1bcc17c798706f9ebf6d559722c5b436daff441e992ca599141b +MD5 889b2706c4869d6b6a22222bdcababbb ChangeLog 19901 +RMD160 18a7bc449be2840d71b24f218887a3cdd868e22a ChangeLog 19901 +SHA256 4a11f1b727dc1bcc17c798706f9ebf6d559722c5b436daff441e992ca599141b ChangeLog 19901 MISC metadata.xml 223 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 SHA1 620bcbfe3e4f48937207c8c4d03a1c5ae594632c SHA256 a7a47d67e632d5aa22da27dd605894f524342fe0475ddae5113d037f81a6c180 MD5 2fca58a7644b7fd5e240d2054ab94fbe metadata.xml 223 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 metadata.xml 223 @@ -55,6 +64,9 @@ SHA256 2b765d39cc17a0f808332063befb10677953b486ab76e28df8f4057871d7701e files/di MD5 3b30e3be5c19699270846e3d28f80d2d files/digest-curl-7.17.0 241 RMD160 3fccb93297740b2d8bae8277c9c73c53ff8045a2 files/digest-curl-7.17.0 241 SHA256 6600d70dd0a428eca7a16dd928a82bb32b88fb4d1c7729d5147372cd7d9ff350 files/digest-curl-7.17.0 241 +MD5 9472141bdf38fba69d992ea3b5283574 files/digest-curl-7.17.1 241 +RMD160 73ee468a0eee090035ab6fec4bdf01fc8f36f125 files/digest-curl-7.17.1 241 +SHA256 0eca69bc1bef6bd67fbd29ef0ef7f8cb8cbb3159f305ec6df289ac50444ae69f files/digest-curl-7.17.1 241 MD5 681d1133f1d36f628d9114bbdb54ac8c files/digest-curl-7.17.1_pre20071013 268 RMD160 9b4a5d2364d3389313bae898da67db15ea6c2cff files/digest-curl-7.17.1_pre20071013 268 SHA256 a7034bba6c0c9902ad916bbaa9b102b1013949c228fba87dceb9738017cbc2b6 files/digest-curl-7.17.1_pre20071013 268 diff --git a/net-misc/curl/curl-7.17.1.ebuild b/net-misc/curl/curl-7.17.1.ebuild new file mode 100644 index 000000000000..fb68c563f9e1 --- /dev/null +++ b/net-misc/curl/curl-7.17.1.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.1.ebuild,v 1.1 2007/11/12 20:11:06 dragonheart Exp $ + +# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! + +inherit libtool eutils + +#MY_P=${P/_pre/-} +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com" +#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2" +SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2" + +LICENSE="MIT X11" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test" +#IUSE="ssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test" + +RDEPEND="gnutls? ( net-libs/gnutls app-misc/ca-certificates ) + nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) + ssl? ( !gnutls? ( !nss? ( dev-libs/openssl app-misc/ca-certificates ) ) ) + ldap? ( net-nds/openldap ) + idn? ( net-dns/libidn ) + ares? ( >=net-dns/c-ares-1.4.0 ) + kerberos? ( virtual/krb5 )" +# libssh2? ( >=net-libs/libssh2-0.16 )" + +# net-libs/libssh2 (masked) --with-libssh2 +# 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 +#S="${WORKDIR}"/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" +# epatch "${FILESDIR}"/${P}-strip-ldflags.patch + epatch "${FILESDIR}"/curl-7.16.2-strip-ldflags.patch + epatch "${FILESDIR}"/${P}-null-handler-segfault.patch + elibtoolize +} + +src_compile() { + + myconf="$(use_enable ldap) + $(use_with idn libidn) + $(use_enable kerberos gssapi) + $(use_enable ipv6) + --enable-http + --enable-ftp + --enable-gopher + --enable-file + --enable-dict + --enable-manual + --enable-telnet + --enable-nonblocking + --enable-largefile + --enable-maintainer-mode + --disable-sspi + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + --without-krb4 + --without-libssh2 + --without-spnego" +# $(use_with libssh2) + + if use ipv6 && use ares; then + elog "c-ares support disabled because it is incompatible with ipv6." + myconf="${myconf} --disable-ares" + else + myconf="${myconf} $(use_enable ares)" + fi + + if use gnutls; then + myconf="${myconf} --without-ssl --with-gnutls --without-nss" + elif use nss; then + myconf="${myconf} --without-ssl --without-gnutls --with-nss" + elif use ssl; then + myconf="${myconf} --without-gnutls --without-nss --with-ssl" + else + myconf="${myconf} --without-gnutls --without-nss --without-ssl" + fi + + econf ${myconf} || die 'configure failed' + emake || die "install failed for current version" +} + +src_install() { + emake DESTDIR="${D}" install || die "installed failed for current version" + rm -rf "${D}"/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 +} + +pkg_postinst() { + if [[ -e "${ROOT}"/usr/$(get_libdir)/libcurl.so.3 ]] ; then + elog "You must re-compile all packages that are linked against" + elog "curl-7.15.* by using revdep-rebuild from gentoolkit:" + elog "# revdep-rebuild --library libcurl.so.3" + fi +} diff --git a/net-misc/curl/files/curl-7.17.1-null-handler-segfault.patch b/net-misc/curl/files/curl-7.17.1-null-handler-segfault.patch new file mode 100644 index 000000000000..0d3b766e9175 --- /dev/null +++ b/net-misc/curl/files/curl-7.17.1-null-handler-segfault.patch @@ -0,0 +1,69 @@ +Segfault in CURL (used from PHP) +Found by Robin H. Johnson <robbat2@gentoo.org> +This was because of an invalid URL: /hash/597cfbe5740d2bf91eb4b037e6750bacd76d3729/added + +#0 0x00002b33e61ba166 in Curl_disconnect (conn=0xe46210) at url.c:2077 +2077 if(conn->handler->disconnect) +(gdb) print conn->handler +$1 = (const struct Curl_handler *) 0x0 +(gdb) bt full +#0 0x00002b33e61ba166 in Curl_disconnect (conn=0xe46210) at url.c:2077 + data = (struct SessionHandle *) 0xe363d0 +#1 0x00002b33e61bc27e in Curl_connect (data=0xe363d0, in_connect=0x7fffc6067818, asyncp=0x7fffc6067827, protocol_done=0x7fffc6067826) at url.c:4255 + connected = false + code = CURLE_OK + dns = (struct Curl_dns_entry *) 0x0 +#2 0x00002b33e61c67db in Curl_perform (data=0xe363d0) at transfer.c:2333 + res = CURLE_OK + res2 = <value optimized out> + conn = (struct connectdata *) 0xe46210 + newurl = 0x0 + retry = 232 +#3 0x0000000000472005 in zif_curl_exec () +#4 0x000000000061bd42 in ?? () +#5 0x000000000061ae23 in execute () +#6 0x000000000061b815 in ?? () +#7 0x000000000061ae23 in execute () +#8 0x00000000005fcef3 in zend_execute_scripts () +#9 0x00000000005bd468 in php_execute_script () +#10 0x00000000006791ab in main () + +diff -Nuar curl-7.17.1-20071013.orig/lib/url.c curl-7.17.1-20071013/lib/url.c +--- curl-7.17.1-20071013.orig/lib/url.c 2007-10-13 02:00:02.000000000 +0000 ++++ curl-7.17.1-20071013/lib/url.c 2007-11-12 13:13:37.401514781 +0000 +@@ -2594,7 +2594,7 @@ + curl_socket_t *socks, + int numsocks) + { +- if(conn->handler->proto_getsock) ++ if(conn && conn->handler && conn->handler->proto_getsock) + return conn->handler->proto_getsock(conn, socks, numsocks); + return GETSOCK_BLANK; + } +@@ -4325,7 +4325,7 @@ + } + + /* this calls the protocol-specific function pointer previously set */ +- if(conn->handler->done) ++ if(conn->handler && conn->handler->done) + result = conn->handler->done(conn, status, premature); + else + result = CURLE_OK; +@@ -4378,7 +4378,7 @@ + conn->bits.done = FALSE; /* Curl_done() is not called yet */ + conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to use */ + +- if(conn->handler->do_it) { ++ if(conn->handler && conn->handler->do_it) { + /* generic protocol-specific function pointer set in curl_connect() */ + result = conn->handler->do_it(conn, done); + +@@ -4441,7 +4441,7 @@ + { + CURLcode result=CURLE_OK; + +- if(conn->handler->do_more) ++ if(conn->handler && conn->handler->do_more) + result = conn->handler->do_more(conn); + + return result; diff --git a/net-misc/curl/files/digest-curl-7.17.1 b/net-misc/curl/files/digest-curl-7.17.1 new file mode 100644 index 000000000000..40241f108c80 --- /dev/null +++ b/net-misc/curl/files/digest-curl-7.17.1 @@ -0,0 +1,3 @@ +MD5 1fa635d1dfde8337c98c82749d75c1de curl-7.17.1.tar.bz2 1721551 +RMD160 8ab8dc7a33a5265dfe25eb0725248c3cd6519510 curl-7.17.1.tar.bz2 1721551 +SHA256 7f668ec49506ffc968a54fde9404183212bb40b226626e9417d941594e06e57b curl-7.17.1.tar.bz2 1721551 |