From: Anthony G. Basile Date: Tue, 11 Nov 2014 00:10:39 +0000 (+0000) Subject: Remove all older unstable versions that are vuln, and add newest version, bug #528840... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03293e83ad6e2db37b34ec1821f6a3223beeb208;p=gentoo.git Remove all older unstable versions that are vuln, and add newest version, bug #528840. Addresses CVE-2014-3707. Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA --- diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 3d484c935c59..dc22003bb901 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,14 @@ # 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.378 2014/10/21 14:49:37 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.379 2014/11/11 00:10:29 blueness Exp $ + +*curl-7.39.0 (11 Nov 2014) + + 11 Nov 2014; Anthony G. Basile +curl-7.39.0.ebuild, + -curl-7.36.0-r1.ebuild, -curl-7.37.0-r1.ebuild, -curl-7.37.0.ebuild, + -curl-7.38.0.ebuild: + Remove all older unstable versions that are vuln, and add newest version, bug + #528840. Addresses CVE-2014-3707. 21 Oct 2014; Anthony G. Basile curl-7.37.1.ebuild: Stable on ppc and ppc64, bug #522502 diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index dbdea89ed03e..6b6ad1737723 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -9,31 +9,27 @@ AUX curl-7.37.0-host-krb5-config.patch 1819 SHA256 19a84c8d9763856968cefd8af84c2 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.36.0.tar.bz2 2809266 SHA256 1fbe82b89bcd6b7ccda8cb0ff076edc60e911595030e27689f4abd5ef7f3cfcd SHA512 ae471d382c9c8f321a987e7a5a302abe7cb2cae4204ea65234b02c73303abef7c995c50ce8219bd90d762fa63006d50293e4350e78aee2c2086b6f7aec09b01a WHIRLPOOL 0b9f5d8a2d41126e0ff735d3f863a943e9182ec5a2abdb8caac890232432df66fe422f4dcdbfcba1fbc925880435f3733c01b747185aaa5cd1cc96571025663f -DIST curl-7.37.0.tar.bz2 2870197 SHA256 24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239b3e09e SHA512 67f0eafec79790753227e31c875f62e760041d5053d368a189d84ea4ef764112b87f17504e33d1e8d5212966d34ef0cc5626139857d9384cfa7b7ed55bfd0639 WHIRLPOOL 25c328e4246779db1d877f7ace0bf7859e8834b0f6f25a2203e249c9227a90f6552eebe2ad5940ab004136bbe96ff768b65658e74216e17b13cfcc2abc9c38a4 DIST curl-7.37.1.tar.bz2 3151531 SHA256 c3ef3cd148f3778ddbefb344117d7829db60656efe1031f9e3065fc0faa25136 SHA512 b6e3dacff43f5b3a47b1f927b14d6adb133e31b34d9ae76af0a3446dfe017351c3fc25daad4a604514843c8d0c6a4b06a7bd71908c9068d420180d1f486784fd WHIRLPOOL 2792e84d54297a8c14730156cfee1ce76542613c2e35ad6072861dd2eea2aa1289eb4e80eb221c124a3ea69466e465cfc305adae29fe089391064735e45f0bab -DIST curl-7.38.0.tar.bz2 3159331 SHA256 035bd41e99aa1a4e64713f4cea5ccdf366ca8199e9be1b53d5a043d5165f9eba SHA512 85f5addb316f21fd0eb3c5fde3ca5f9e99c6cdcc6eaf29c820f81abb41cd1b743620e840a92cd7f84076db31a6ae85c2c4b571c2aeac92d1ca06c733c5d08858 WHIRLPOOL ca88d189bbae9cda094a2dfdf86368f018f835504910e379aeea597f320a8e72b5cd9b8759ba7e90d7f9c8de148513b802f99f4b0eb132645071752f5bc2322a -EBUILD curl-7.36.0-r1.ebuild 6352 SHA256 08ced76939fd4bacfc0704467e5900d0f6e591b8273f54a836be6ad09b7b9b44 SHA512 d3a4f02353853ba077febf56af3910b48d8a35be2b32fd9bc7a31dbbf3ceb9d1831ad092ddc0279380e101643c3cc81a2c6d2c4aeb28aca65b177f56f2f5aed9 WHIRLPOOL 66ca90db63b04fce2dccf416fad58f677db62a3e3c4c65581654ecd4e49e1e26b69af5d9ee9b70408b1258c846a89268057e2cbefaeb47516cb631c8be51c585 +DIST curl-7.39.0.tar.bz2 3241619 SHA256 b222566e7087cd9701b301dd6634b360ae118cc1cbc7697e534dc451102ea4e0 SHA512 9d82e29c0b40530080c62bc3b81e729092b6de0dc3551e709ab1e65cb451259a5380f155fc911664ef523f57ea4be80bb27b330b720ad9a8bc3d9b967bdc3fd2 WHIRLPOOL 05fe3cd33a7716f88b63d3f3d8e9da49dec166cb42064d52ec2a182f68e792e83dd16d53edd1cd1b996a5f262faed1e1163197e1c3f717827859bd73e1570c36 EBUILD curl-7.36.0.ebuild 6124 SHA256 c36ec20cc6eb01b38c2f83ff0e6ba61336201cd76486d473cf4594d839dc236c SHA512 cd64a8e0d474ce9eb53a30bb2c2f52855a037ca50ccf79233a1d16c3f92c2abaa55c57a4ee0b66356b4121c7923e688b78c2df331cb2bfccbaee940085f4e52b WHIRLPOOL de73a5f404d6556995385568623580c460c116d15c56ad2cb837ceb239f4593460f266d4a831909bea136a52d204abe19fb9c06451a4a12f048b44affb03211a -EBUILD curl-7.37.0-r1.ebuild 7428 SHA256 acced6744d6bcd5b210b6e7f650636c52d6b8115fa71291959008f6e3bf6bddc SHA512 092dffef2f5ac91993dbaf1b3a7a567b1c409fc6a42bfa08822f1e892d997eba38ab81d42aec4bc26f721045ebb814c07f13bf03120b193ea1c015d9392e15c7 WHIRLPOOL a7d3428d599217897b5e745af1a1802419b615c699e59abd1702a242039f971800957491e9248ca030197db389bafbbb928694694055be501a12fb8e8fe9499a -EBUILD curl-7.37.0.ebuild 6352 SHA256 c00d915f886124d6ac51acffee3c24ade4723ee1a92f26e2f4d838d95f8964b3 SHA512 13032d54af487886ba52ff12081ef95c204c412b1a0331223591897e510d7d46fdcb16f800b2514f9cb6f95e9fc548eb122c61125eac08e9af38caed70246e55 WHIRLPOOL e37ef1ca577ee1e9a32ab51dfe6e058d7a5c88d9cfe3120b03a6cbe29e94756f17ff44ead5e7ffbdbfc6b31d62265608c83cb149cc97240f985d4ccdfeb8baaf EBUILD curl-7.37.1.ebuild 7373 SHA256 67ba66277113c293c229fd332cff7e7e0ba413c80f0a80816b52d96b52e9c161 SHA512 94ffa9d6dab626cd85470d0d897d2876a4eb01e84a9689de7b65dbe144adfcc680976350d1d0b755d2bb1c3fd17a7a2b377a1a551087b7af1f06eb110ef7a6aa WHIRLPOOL 9ff7c967fed13648990d365afa52647b44ff0d4e5d8c964528a21143d9832c1065679e94b64b0afe40bd657733de606dcd79f39e0836a68edc16539d34cf1536 -EBUILD curl-7.38.0.ebuild 7329 SHA256 cb467d0a98d00f360eeccb9c28f8bf4d43c11bce926a6ad922f1067fb5a75b5e SHA512 488da64b46d3f31899bb544749fd8c8d70b3fa8bf62a22a660d59d07dec7f516956d5ce120f3607ff7b8648ed55debc498fd1be76e8df4c416fac993daeead09 WHIRLPOOL 814c172800536a26dbd06551ca65da8d1cecf3d80e3e5f30885dc00b85a634f11015b09f10086f4ea216240800bb24078278eba47b8940a698d20b3fad7e9076 -MISC ChangeLog 56102 SHA256 84c50bbc13bbaad7b1a42314b8238fdbab16cba58bbf878d799caf98259ceef7 SHA512 3642fb0dfe0d3367817c004f5f0eb908e13a0722d10f5e0134dba305932ae6bf2c99b05fddc8b822d284f6c1ac5fa7c06f4f646c06e5fe6db0e91e9c798c9986 WHIRLPOOL 72a37da3bd820c59c04da304d14c2400f8edbf9f9d9ab10a4716da346357604a9036e5b3a59e043687fc883103262df6b62645626f084e892fd4b8f4c476d710 +EBUILD curl-7.39.0.ebuild 7329 SHA256 58ee5d6c9097442346a0788c5521918ba4b6175d50c41526b3aa238c4b1a45c0 SHA512 acd9248561f33d615b56ab18de3f12414fdc4acc588265d9518b5cdb04f7a658be4fba1a64241eb1242db1d2e2e9076d8b4ba9e1a8bd364e2a642819231f3ecd WHIRLPOOL 22c7018c926331b16bdb16eb38f9f54f7c1f4c9cc123d5a21737806993808cdc6a046ac8003c2faa6e99be8eb9bfb594754ec389c23da27b8f3d4b367479ffe5 +MISC ChangeLog 56418 SHA256 827f487c95d317d322799f7c531614ea944406667cdd2063bba878b5b47033bf SHA512 6f4042c19de5972a5b6dc7e2d24a7844929a3faf41ffee8b56f5e71848291bd26785f93d09c9afde8b7ba717d39cec50f6c13398744fc7d1dce7cada9efcf628 WHIRLPOOL 4aa793b2f1cc059b1de189b417d17d0613dbff81004d5ea5744f3b7a07c723cb0ca8b59c039b4d337234772dd1badefb9aa775d5ac1d196f6f88e1ec2084ce1e MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJURnLVAAoJEJOE+m71LUu6nKYP/i361HDarWeBbnBZu3fgbzI6 -DEOROTik46DwueG421M7cHF0+gzSJCdqB62iSiV/LU9pI+2xnE0zZ5jz1hY1DiVT -w+eZdoU8Jtr5gP9LsR/GGKZGP55NNe8ty+7fA4LOZUcUimMTRgPndxpJfFomWJL1 -4jbp2cpyIaOApWb78s7dGJaqnDgHdsJ5g9zHIppeuPuKWwLvvjexmeNiwnSbl10t -ExRXXw5UeX88hFUIejB+aKBK//1pNzgwN2yLXgxr5IdceCOJdo2mJroWwZX+xBBK -iEXBBPg+JFsqZZ2KsR0yOmc7WAAt0fNY0qYSZjlc0yiGScWo4cGZzR1HOxR07Rr5 -QyhkFVanKM1LPw2iMQ8C2vvgDilMJHjFefSiS6TKnyFJEYR/r4DEht0iq1fss77j -lMjmWkuK6ybFnRu5QpQpUiEmS+AKBLXfseQotCRIXBjf6CikE89fig4iqikav/EY -oXWj7DJS7E/8GFEHVknUxY1N1OZ7cNTswTurXEyvlenk8g/VgMvWIZQMIyZMub6k -eZczhhTD9a5PT5Xqp9gWB5ztUohRF+AQGJIoVUA3/ND84obvuIu+cN1RClTtJM5s -axaIpK5p+SaGR3j85pUdp931tULi9F1f0RI2RQhArzN02eboEnyA3+ubNUD8ERVJ -DFxzSlPxzI2yBxrxPwtS -=3g4F +iQIcBAEBCAAGBQJUYVR6AAoJEJOE+m71LUu62YwP/10+bliNFD4fTmTR7+YiKFo/ +oWPoRkkOPm8je7KJpskBo2aRS0jeoCJiyzVqjhAQ07+OmPAJwahLqnqZrtNOqjVD +lOzeA8DmzVeyanwLKXwWHNfk1TXjy6oOILkEvLrm99fR4g6NOJKP4GI9EL5SdWk/ +7I7qgLhrta0j0pUjMNetuAbb6zCK542hxgKcvt5QA2L/N6YmNG71pMDswlpCT/O3 +8/iUUlidGQNb6YpAWtJttboOOJ0YtVDNGYUkDMPYbTlHYyF34D8AdJ5MfJQUizj3 +l/yjVGGqMPTcx7/ZvewkNPd4B1xjZMdE//6/z5oCNMlv+zK1hGysN6ynConJlxPu +Cm0C71cfu7sWgUW3rNZIIKwf6LI0m7tDk3HvPqy9jNWQFJDfVKiw59ftLZcujwqw +bI+kaZDzCxF9R9yy2i7zIIC1Xk9MnSCNyVZPtU21E6drIowgUfPVfHEdvHtF+vaU +qifq0+sCMnA5cS2g9DqtTIGsw9EP6KZgZ3Eq01F+/fmYyh6DtgiG4uP3aZm1YEzo +/mrF7teiOytnhaN3hYUmNWdTymyUrfNMevg44po6AkFseGblm73/UEBgGl3kvrHD +FqfvpjWsS1YsfqfKrVB2cahBSD8+Mxjq6Ci/+6+TDXB1vEh0A+nt4UQaKuX2CXZG +ILWhMMtF05ZrIOVBHXxR +=QoYT -----END PGP SIGNATURE----- diff --git a/net-misc/curl/curl-7.36.0-r1.ebuild b/net-misc/curl/curl-7.36.0-r1.ebuild deleted file mode 100644 index 8e831b891b28..000000000000 --- a/net-misc/curl/curl-7.36.0-r1.ebuild +++ /dev/null @@ -1,205 +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.36.0-r1.ebuild,v 1.4 2014/07/15 13:33:30 blueness Exp $ - -EAPI="5" - -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 ~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_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 ) - ssl? ( - curl_ssl_axtls? ( net-libs/axtls 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? ( - 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) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \ - "${FILESDIR}"/${PN}-respect-cflags-3.patch \ - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \ - "${FILESDIR}"/${P}-hostcheck.patch #507494 - - 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-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" || 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 - 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 \ - --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-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 \ - --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 -} diff --git a/net-misc/curl/curl-7.37.0-r1.ebuild b/net-misc/curl/curl-7.37.0-r1.ebuild deleted file mode 100644 index 969c9a479aab..000000000000 --- a/net-misc/curl/curl-7.37.0-r1.ebuild +++ /dev/null @@ -1,244 +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.37.0-r1.ebuild,v 1.7 2014/07/15 09:40:13 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 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 ) - metalink? ( !curl_ssl_axtls !curl_ssl_polarssl ) - 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 \ - "${FILESDIR}"/${P}-host-krb5-config.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 --without-ca-bundle --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_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 -} diff --git a/net-misc/curl/curl-7.37.0.ebuild b/net-misc/curl/curl-7.37.0.ebuild deleted file mode 100644 index 22e07be37523..000000000000 --- a/net-misc/curl/curl-7.37.0.ebuild +++ /dev/null @@ -1,205 +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.37.0.ebuild,v 1.5 2014/07/15 13:33:30 blueness Exp $ - -EAPI="5" - -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 ~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_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 ) - ssl? ( - curl_ssl_axtls? ( net-libs/axtls 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? ( - 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 ) - metalink? ( !curl_ssl_axtls !curl_ssl_polarssl ) - 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) - -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 -} - -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" || 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 - 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 \ - --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-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 \ - --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 -} diff --git a/net-misc/curl/curl-7.38.0.ebuild b/net-misc/curl/curl-7.39.0.ebuild similarity index 98% rename from net-misc/curl/curl-7.38.0.ebuild rename to net-misc/curl/curl-7.39.0.ebuild index 3ad8e31dbd0d..726bb47b2677 100644 --- a/net-misc/curl/curl-7.38.0.ebuild +++ b/net-misc/curl/curl-7.39.0.ebuild @@ -1,6 +1,6 @@ # 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.38.0.ebuild,v 1.2 2014/09/10 10:56:39 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.39.0.ebuild,v 1.1 2014/11/11 00:10:29 blueness Exp $ EAPI="5"