diff options
| -rw-r--r-- | net-misc/curl/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/curl/Manifest | 30 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.35.0-r1.ebuild | 216 |
3 files changed, 18 insertions, 233 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index ed4b11c1976e..daffcd313779 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/curl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.354 2014/04/19 15:43:23 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.355 2014/04/19 15:47:23 blueness Exp $ + + 19 Apr 2014; Anthony G. Basile <blueness@gentoo.org> -curl-7.35.0-r1.ebuild: + Remove 7.35.0-r1 which was just used to test tests for bug #285669 19 Apr 2014; Anthony G. Basile <blueness@gentoo.org> curl-7.35.0-r1.ebuild, curl-7.35.0.ebuild, curl-7.36.0.ebuild: diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index afcb20394ba2..999ed17be49c 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -7,28 +7,26 @@ AUX curl-7.35.0-tests.patch 1033 SHA256 ebe5ea281a4dd505cf079c0370b823e7203d513b AUX curl-7.36.0-hostcheck.patch 652 SHA256 92f25ef025037a1bf7823b4d136f00c548baec4d392e2d7bb059a7551b5f65d7 SHA512 49810a5bc4554a694d4c684aaa400d791098d50a14b0d5146c762e83ea25f18408d1e3382e3d26d76b19785c1ac0314c346e74d6bb37a408489d22243fbae9dd WHIRLPOOL b98e37de05cfe75c7be84712f641a9968528cb7f060462381031d8187e3d47cf183d87481b29ac63df8f22afd18d7ed49c89079e842acdd7c199350aaf70e8fe AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd -DIST curl-7.35.0-polarssl-1.3.x.tar.xz 4620 SHA256 2a9f4a76c3bab9eca20517e98d920582bc02a6e6c25e4800ea9369acf245487a SHA512 69c5c49ba2579548868d233e8d82eeb308ba9906619d56cf01fd17ad385e51e2ec7c78628fe7934ef1b3d63ccd87ebb8043041721348375379d0574b9902683b WHIRLPOOL d2d16c55fc298bc38e72ce051f571bba4625c9a7ba49b6347d45ffe1f2afcc54934f0cdf4dd59aa144e1b8a13758909a61b3ce28ed46a03e53eb8295363f0be4 DIST curl-7.35.0.tar.bz2 2781470 SHA256 d774d1701454f1b7d331c2075fc4f6dd972bddc2d171f43645ef3647c7fc0d83 SHA512 aa669d9f62adbdcbfb89bd00893648ddf60bf5bc2d79c65e2a202c651ff57757f6b1de9fe94fd416923b89ffa7e9ffc65b6301b1c6dd2382df6dd5dccc55a23b WHIRLPOOL cb7d71b3ff847ac0837fd6e6252f11c15bf61a1b3efba003f212b4585225a7abe0d727c16fd9f96234118c15f3a6ea837868c86a13afbc733bc2d32a214ce714 DIST curl-7.36.0.tar.bz2 2809266 SHA256 1fbe82b89bcd6b7ccda8cb0ff076edc60e911595030e27689f4abd5ef7f3cfcd SHA512 ae471d382c9c8f321a987e7a5a302abe7cb2cae4204ea65234b02c73303abef7c995c50ce8219bd90d762fa63006d50293e4350e78aee2c2086b6f7aec09b01a WHIRLPOOL 0b9f5d8a2d41126e0ff735d3f863a943e9182ec5a2abdb8caac890232432df66fe422f4dcdbfcba1fbc925880435f3733c01b747185aaa5cd1cc96571025663f -EBUILD curl-7.35.0-r1.ebuild 6723 SHA256 cd23ef97542f260d79cc15839f44d7d580c9aa903fa6d85f526dab8c0d6f4fe1 SHA512 45abb5ce252eba890139b49ecd19be613b83c0366287ce6f63e0317e1349bfc0558ad679761f84bff353993cdb0931a9f2f204a580de33f7e599756d4e452c80 WHIRLPOOL 6cd8a0c9afc45e38249105bd85bf4bff846438b70c4f186761ec05418c1717fc88148268775f9ae1620d22a3ca70f9576555d1ce0d5424c68f524f57587c58df EBUILD curl-7.35.0.ebuild 6436 SHA256 608bf6eb60a8c654825d7e4f482a536dd2165e026736ed9126c8b648440bcb1d SHA512 a867327659ca815a24a3d2f5d1bd43a3ff199fcb2c2965764f770689726f52f7263f851c23b83cd01e37d0d14dd75f61f7ad9e07025316f7e2b53c0a12ebd3b7 WHIRLPOOL 728a03ce40cd76c9b1ef26a8284d236f7236eafe823852ad3b0bc8a514bec6f7671048e7212029491568186f4f1a2353f6a57f2dd10c0e16e036ab5075d3737a EBUILD curl-7.36.0.ebuild 6437 SHA256 fa48d8fa481acc59c93ecd4bd44ee768e834a0c42c4679eeef6c9e2ddce05f77 SHA512 ae2e325bc6046159e8d4d5bf31787408c577c604acb991d93403a7ab5a27090d7777e3365c4a5ad26b55357027774877186c8f243997c35a379520aaa07864c6 WHIRLPOOL b8d7c5ec1dd7c2b25fa7b18b180145509d2d0d8ef73dedb2fe3db8016c57b57205aa4874d1f18da09d02591f3d0a219427360e0d430145d9a25d25d694c4c31f -MISC ChangeLog 53321 SHA256 754d1fa0741b50ff3e56299ab1bca633e3f77d7de6c48b502efb72cf5e58bf82 SHA512 6d26053a3e3c8e80042f1419b95cf01732dd0a492a512b280e90d41ce6ca74e79770169faa3924c6b77872e8c920e4b0d514a5d5f0db08f861bc40746c0f30aa WHIRLPOOL 4f6934d6012a894430fa839bd6971f04a76b2f79717ca7bd47e12266b88d1ef51b51175cba0b93616e3fbfd3d28eb1bbe6d951c229b80f9010a309da3f036172 +MISC ChangeLog 53470 SHA256 330bb12e2b0985b351e74614f9480c90044bd4fd26ddd37a129a90569f9504dc SHA512 15e56963bc02430fe902cbd1af0feffab9efc92c1d1efec9184ba5904e688f8b69fbf029b0c6ae2eb04c7c387e2dc204415a90e66013ac89b5f662fe797c50f6 WHIRLPOOL 7b814efb400e4f591d412761f2f63c91c83c3de0878bf3ec2db384580cc741df364b6309f18fc3d7a705bfe357e3b45d5c090eda8ee8597e6c90ae849f3f1ab2 MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJTUpmvAAoJEJOE+m71LUu60r0QAJOX+g5OlQGhok6aVdsWy91o -T1/4opEjKGroIzbRdXhvzM4AuZRAdU3FDhDAyuQ8Mi0QxkFtLUUlkgFGD/Ju4y5/ -mD4f7JExthZwqUAx35jUBNBaGFYnsKeJObwwnwkjxzSrynjCI14ltHEEgFXl7lZB -yYaMJa0Ug+ZSTFwJCadBpWFLJoJMbuCF7XjAWEBKN8YxeORwM+vSCqZJXCboF10A -EiYj7lTIrmhWtLtTzuXJzPLDcDRGNYLFyYvg0uSlGXqRL85flt3aD2XjVrgUaqyG -dxTHbQ8B+kYev8RbYLCowlzdvwuaaBukL2iyA1YiG5o6IMIcxp9AYddO05ag2rMV -1sERM4U4WydRJltLIxs8mK7GFgcQ1lL2/b0cXZ4NcA8QdhZq1ydCst4mhPiosnD8 -OoGJ16/j0GmanmjnJi+dW4ugGSKehKE3RvGdVyCIZqY7MktZkGoDORNKrkQRoaZt -UQmwMJ5Hc8vHK/IgdlZ5lzLIudQ2flzx+7wqnJoBigopwviYYgoyptf/CyurgbEm -KDMIqoh9/OVbI85Teo4bA5uJeybbsRViNMNaJLwb9rnW/Ixqc2xJr+EdjiB1kA0+ -5kQVIEhY4EhUZZ5117ry15/ZprxwgYT4RIW7OjlQVTGn+e5XszJdBqGA81MdSk+R -Yaq0vKpVf7FD0DRVPxxH -=MDAB +iQIcBAEBCAAGBQJTUpqjAAoJEJOE+m71LUu6ogEP/3pSURDng/lHYjqHLdLVxm+j +MOzaVOSUSKD+ZtZoePO7a1e7DvAPWD7pf6QBunsS0slN3q0ytnlbm4R4AYJw7Kbr +JIMMWti4/0byb8a1/KRV308FqtB0dQduLHkboxa/xtskMORkZezRhyTCj+IcMEwN +0MkR4Tx+mCQqTGYExMzvIwD6u4uPHjK8tTMOtVJ5l/cZyeaggUAfNp27ICav9bYP +D61wO2Cmf1czdr9rlwJlEDioNMobbQIEuPk6dfPx9KrqIeuoLqlCOrmALjjt6Tq5 +Y5/VPdK8PG1+bsnmYlueDR2L30d8rmmyvhMXG3X/ZEBX5vaVwfqHSHjqF3j5y56c +YtfbpFZ+HPK+CXaql6rWGDUZCc/eEKA8hohUbdHO2T2qypE+NRFUILS/MC9oDdEH +ZkZp6e+BapBREsLUgl9Cb3KO5t9E5TrguEAkDK4wYRox0FlxtRTceJim3ywBTrGH +V0LC+hUKNJM/SivJnrtj5oL7cg/0wdQ1ompra/0jWoNv1rjsypNcd9ikEHX/akwy +L6PhTlZZgPom6ZOZpTZQXIe1Ey2x3GrIFZ5bCJvOh69DwmGPEkRu4NWps8MAfqO0 +YPIh3ZLhEwFuadpwnrnPiAjsivhy+YEm9j4+6LY9kW4IolSK+So3pt5owblGR5de +PvdIAalnFGzOSFLYghet +=PAZg -----END PGP SIGNATURE----- diff --git a/net-misc/curl/curl-7.35.0-r1.ebuild b/net-misc/curl/curl-7.35.0-r1.ebuild deleted file mode 100644 index 03f1dbc43047..000000000000 --- a/net-misc/curl/curl-7.35.0-r1.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.35.0-r1.ebuild,v 1.2 2014/04/19 15:43:23 blueness Exp $ - -EAPI="5" - -PYTHON_COMPAT=( python2_6 python2_7 ) -inherit autotools eutils prefix python-any-r1 - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="http://curl.haxx.se/" -SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2 - http://dev.gentoo.org/~hasufell/distfiles/${P}-polarssl-1.3.x.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns idn ipv6 kerberos ldap metalink rtmp 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_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) - curl_ssl_gnutls? ( - || ( - ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) - ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) - ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) - ) - 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?] ) - adns? ( net-dns/c-ares ) - kerberos? ( virtual/krb5 ) - metalink? ( >=media-libs/libmetalink-0.1.0 ) - rtmp? ( media-video/rtmpdump ) - ssh? ( net-libs/libssh2[static-libs?] ) - sys-libs/zlib" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html - -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - ${PYTHON_DEPS} - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - threads? ( !adns ) - 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) - -pkg_setup() { - if use test ; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \ - "${FILESDIR}"/${PN}-7.30.0-configure.patch \ - "${FILESDIR}"/${PN}-respect-cflags-3.patch \ - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \ - "${FILESDIR}"/${PN}-7.35.0-tests.patch - - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/${P}-polarssl-1.3.x - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - - epatch_user - 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-3" || has_version "=net-libs/gnutls-2.12*[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 \ - --enable-rtsp \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-hidden-symbols \ - $(use_enable ipv6) \ - --enable-largefile \ - --enable-manual \ - --enable-proxy \ - --disable-soname-bump \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - --disable-versioned-symbols \ - --without-darwinssl \ - $(use_with idn libidn) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - --without-krb4 \ - $(use_with metalink libmetalink) \ - --without-nghttp2 \ - $(use_with rtmp librtmp) \ - --without-spnego \ - --without-winidn \ - --without-winssl \ - --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 -} |