From: Anthony G. Basile Date: Wed, 22 Apr 2015 11:51:42 +0000 (+0000) Subject: Version bump. Security bug #547376. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=08fdd6cba4906e4472dea7e770ec909ca167cc4b;p=gentoo.git Version bump. Security bug #547376. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA --- diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index d2dd20013b6b..1dc9eed1af02 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/curl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.391 2015/03/04 14:44:59 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.392 2015/04/22 11:51:22 blueness Exp $ + +*curl-7.42.0 (22 Apr 2015) + + 22 Apr 2015; Anthony G. Basile +curl-7.42.0.ebuild: + Version bump. Security bug #547376. 04 Mar 2015; Anthony G. Basile curl-7.41.0.ebuild: ca-bundle and ca-path are no longer mutually exclusive. Bug #539260. diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 9fac79e32c29..55ea729bb6cc 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -11,25 +11,27 @@ AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86 DIST curl-7.39.0.tar.bz2 3241619 SHA256 b222566e7087cd9701b301dd6634b360ae118cc1cbc7697e534dc451102ea4e0 SHA512 9d82e29c0b40530080c62bc3b81e729092b6de0dc3551e709ab1e65cb451259a5380f155fc911664ef523f57ea4be80bb27b330b720ad9a8bc3d9b967bdc3fd2 WHIRLPOOL 05fe3cd33a7716f88b63d3f3d8e9da49dec166cb42064d52ec2a182f68e792e83dd16d53edd1cd1b996a5f262faed1e1163197e1c3f717827859bd73e1570c36 DIST curl-7.40.0.tar.bz2 3266944 SHA256 899109eb3900fa6b8a2f995df7f449964292776a04763e94fae640700f883fba SHA512 4d1cd0aa0c4fd9f14559e2824389ed42222a456c268e92107ef4d3257af76d64e5a8f69e9a3fccb9d4c9ae232426ee8f8f58f7d2eaa3db789dfa4d919cf229a3 WHIRLPOOL 5e3f9038696d7476e76b1a848766a2068f20c6aa0392d4018e2d90529914a059b771d66937bbe28697925acaf96a2025eba77e4af9b331ab66ee1323cf079678 DIST curl-7.41.0.tar.bz2 3304508 SHA256 9f8b546bdc5c57d959151acae7ce6610fe929d82b8d0fc5b25a3a2296e5f8bea SHA512 fc4d14a51740d1752c653d2e48c6721b1ba1cc9959d7b9d1f77fd534d4db90d93fd4d0ad05adfdac082593b5886f5d662b7e4541f5f226514c59f643348287ff WHIRLPOOL b12eb86c6b82b77430ee2169d6021c2401d5712a1e998d096f833f79237810d1a4ae4dbc3815dcdbb3ea9217004930c3a600c2550516b73f1f3411c2720a1d3d +DIST curl-7.42.0.tar.bz2 3330103 SHA256 32557d68542f5c6cc8437b5b8a945857b4c5c6b6276da909e35b783d1d66d08f SHA512 8a6bf3ad4462ee8b2370e85382275f1d646565bcedded070c4cd5c87a610bae200c5c2803515514796357b82cddcc4c0c82ad04793a3c5ea4f4230c51720aed6 WHIRLPOOL 9da3108732680c26d12dc8f55b6ec6294995cfca53d7fe7be5387c04466d51cd96439b9c0ca30335b1124bc5e287dc18a62c090c71e9f3b4eb084cdd821d5b77 EBUILD curl-7.39.0.ebuild 7315 SHA256 0a1c49652d6d65d672b0a6b5fcdcd1446e9665443460566d09d2e1e9426fb894 SHA512 48d6b89855d43359f166493dbcb08157bdc7dc63105190791dc8350567a9685071a5fe9761b124d6d43012c941ccf8f394e9ba9eecc1f20f673587650c4a2ae8 WHIRLPOOL e4f6f349a0ddc117bfe6c6d020482cfd9474b27312edcfb27c0af4783175f646cd0e2e3c29f306b266838f7f38511fec6dfd3cafcf973a4d4d4ae117a407bc16 EBUILD curl-7.40.0.ebuild 7363 SHA256 1f4c57807c01eee23c15917c8686d8eef54f1cb3fdb5bbc69027d9620147aebe SHA512 1e5b8b35d1c63783b2f4fbc0d94783251fca08dd9409c58353e8e75cac0f5a68f1245ea459d0133929d26adb59791a260af9d2e1c9bf826078d9de4a74308575 WHIRLPOOL ad25ce9e3ec4854222412c0f3104c4f6b3ae5c1a58cf6a532335745b7719d6425c3f489b98f0da7ddf4de7cc0e304ccdb98a02eeb0e579eece1279b38a785e04 EBUILD curl-7.41.0.ebuild 7343 SHA256 25c5cad3460289b51990515adbcca54d17deaf1209a823dcb67aa08e10035f17 SHA512 08e08fd22883642300266a3e0a411bf6cf40f3f3a03b0c4ae5b658da80a1cd0a6e43a8c498fa0e666b9f0810a5e4a2d6d5dfaf5b578b71a665d76e7752bd7fc1 WHIRLPOOL 65667a09e14c49c575ac50d35d443f3ecdb9aa564d9a3fd39f32366c343e439c4081ee09cc667fe59ff9419ff90075f68f496990e1c7f2456d3e72539ae03e36 -MISC ChangeLog 57808 SHA256 7b37075cf76af067c27c5437bec7284480fb48e87e087c5470db94069ae376ad SHA512 975081bf1787cd9040c3fa146941409912c0748669c52a7c4fabb16affe89b5fdd6355ca27bec6b500306e4e3d9b12e3fbd2f73844af973c697faa9ed227db66 WHIRLPOOL d60a57f86cf172ced670245f62537ef2a713a55815187529e7eb1ccc64370b8afb28dd0534ca9286a6fc5c7fa46a0f2d02f7fed3fdbc2ce61cb85eae2bd63711 +EBUILD curl-7.42.0.ebuild 7343 SHA256 1917f5e3ff2f18aafca3c79766d59c88f311b09e0ba3ccf14610a96717172312 SHA512 5ac526d5829bf41dd89f41f9a1c2637fe9bbd30d3691f4ad67bc9623ae442cc6671f526d2282609b2cc5c089ef1aaa65b3e7ccc7d996c05da5a06528a3f3181c WHIRLPOOL ce92fbe8192a74ad91c31d4b3102e867b574c42f9ae0ee1885494870fbe011863ff9914f8001621a9d43393fcee0376716dc37b0663d768b113241044c29cc10 +MISC ChangeLog 57952 SHA256 4b5bacf14d1e2e0bacf4431cec5dce8966ddaeb9ec9fa25f3d3bfd629366a371 SHA512 a5de351413d9476e62fccdfe0fc732e30f331c857ffe498f8278a7460776e3ad243d617fcbb2c7e5ec26454c53f87a572d818ef77b6614dd8826dce17109cd8f WHIRLPOOL f5889a197cb1692c3017050db8c2e9f2d77c84b31f64e6526b7807c24fefe4104c55f724da32f723949c6e2155c0cd3afd833834da2b2c61ae0338facb2d4022 MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU9xrzAAoJEJOE+m71LUu6i2AP/RlfE02e46FyOq8vnDT8nIbZ -h1qWTn2JZRReJpy7pO7eHxUOFuoDywy9zJzokfrmgxIUlhgMtpAZBb9W2mrmLMGo -qIvR+3drIWZhJ/C1+gqnWCDjA3KZGiqjui7OoYruWbSXeku1YyUj3/tceexh66mW -/Xo4tOHcKdaLcLtD51VzdicdVLFgKoE4lygVIIFRdvHPt5vtf+9nNfmung7882IF -sV+FwtWvah4c55vVhd5TQpXLn1gs7BB/BtEpiuhJd5DlNVTZxep/7jqa72grkUw3 -k4IuX8ITYMynPK2j34B6XnJBakp4QEakHDhheig0rMPTzhH+ZeJTyhuULcw5Ll05 -9Nuh2PqmeNzFppgbFX3rqvrawxey+Q22XhSfUQ4T1Kl+JG8fvD2JXXoskwTubCXz -fGdMtDo+mddE+Zavlk6BJicEOPv4BNguJt+rnH7DU5oa4OfQIuOAtmjd4CT2lPQv -m3tzjOc/mrJHS9TX3QYis3uGGMWGwMoToBKZc9cfjIQLaQosQxq2FcYFdhP4SP0u -eJchqcGpVVJKwpr912oUoS+WZGhnwFoZPAVINWGc6P7tRBowChQCATEEBGHbQe7F -9DTMi+VuF8TA6wZq7zRWEVni2aKUC6Svelu0Cy5gsTvnWC5q8a1uKAXQQ/luOPIP -WAW04P8HuSpk6krlZubW -=GnAf +iQIcBAEBCAAGBQJVN4veAAoJEJOE+m71LUu6R7QQAI3lbl8dVIKvrUACN355uXY9 +0ZGhvO2unNfXHehKLyISHkMquDlP3R2cW9Y6TBUNJpw7RM/1bs4VtAAY3Pfp90Kg +P+O1CAhAlr+jq6BkVgsZF88jaatK4MTP93vj9b5XkZD5ylMWIkVAVtwuCjbBt6Ej +yrirayR2XH7b7waO42b+chAUCwYs58I3FawtHV3MTEEjQl4XW3YWX2fES/fi3+bS +IH8HI1j7c8+q4bDF7m0JL6SNnBN4G7R+FVm4guVOrAliKRXMB5hTK7qjtRTNFqsb +A9s1k6P1nxJBW4SBMsM1h0cWNc7g7JzufBbPbk9HyeKwdHj1KGpLTkUr3kN6RL8e +mm+6FsZKV6xSx8IZ7U/dfEih9ZaZagRSHouHN01iB+z5h1M9oi8bFRoweah62f2e +H+HJ8BEpe7pSViyTsDdv9f0pfi5FJ294A8yW86JGIWFKRJWMht7CS0tj7E0Yg8sb +KgG0BbKwhOB7PVc+jIKTRhmyzMy/Yv5aT25FzATxGc+7W9l6SrC9eqs+KiUZbFB4 +Ug4RCMyf94Kwmhme1jcJbKZqJPAOPh6F9U5vuH2b6xllQnPqagfIsWh0ZtwEEnd1 +b/J/AAOlukVp4iNlcrZ/DcEw+KkMxzWEkf1oJCLUoHmng8GhC1QgrqrJRsw6NAzG ++x8QMK9k9fGRadV7EM9P +=JjiH -----END PGP SIGNATURE----- diff --git a/net-misc/curl/curl-7.42.0.ebuild b/net-misc/curl/curl-7.42.0.ebuild new file mode 100644 index 000000000000..9898f1ee40cf --- /dev/null +++ b/net-misc/curl/curl-7.42.0.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.42.0.ebuild,v 1.1 2015/04/22 11:51:22 blueness Exp $ + +EAPI="5" + +inherit autotools eutils prefix multilib-minimal + +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 ~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 samba ssh ssl static-libs test threads" +IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl" +IUSE="${IUSE} elibc_Winnt" + +#lead to lots of false negatives, bug #285669 +RESTRICT="test" + +RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) + ssl? ( + curl_ssl_axtls? ( + >=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + curl_ssl_gnutls? ( + || ( + ( + >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] + ) + ( + =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] + ) + ( + =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}] + ) + ) + app-misc/ca-certificates + ) + curl_ssl_openssl? ( + >=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}] + ) + curl_ssl_nss? ( + >=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + curl_ssl_polarssl? ( + >=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + ) + idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] ) + adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) + rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] ) + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" + +# 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-0-r1[${MULTILIB_USEDEP}] + test? ( + sys-apps/diffutils + dev-lang/perl + )" + +# c-ares must be disabled for threads +# only one ssl provider can be enabled +REQUIRED_USE=" + curl_ssl_winssl? ( elibc_Winnt ) + threads? ( !adns ) + ssl? ( + ^^ ( + curl_ssl_axtls + curl_ssl_gnutls + curl_ssl_openssl + curl_ssl_nss + curl_ssl_polarssl + curl_ssl_winssl + ) + )" + +DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ + docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-7.30.0-prefix.patch \ + "${FILESDIR}"/${PN}-respect-cflags-3.patch \ + "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch + + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 + + epatch_user + eprefixify curl-config.in + eautoreconf +} + +multilib_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-gnutls --without-nss --without-polarssl --without-ssl --without-winssl ) + 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_gnutls; then + einfo "SSL provided by gnutls" + if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; 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 --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use curl_ssl_winssl; then + einfo "SSL provided by Windows" + myconf+=( --with-winssl ) + 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_SOURCE="${S}" \ + 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_enable samba smb) \ + $(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-cyassl \ + --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 \ + --with-zlib \ + "${myconf[@]}" + + if ! multilib_is_native_abi; then + # avoid building the client + sed -i -e '/SUBDIRS/s:src::' Makefile || die + fi +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files --all + + 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 +}