curl: upgraded package to upstream
Upgraded net-misc/curl to version 7.60.0 on amd64
Changed back to EAPI 5 (including eapply->epatch), to avoid problems
bootstrapping our (old) early stage SDK tarballs.
BUG=chromium:859032
TEST=chromiumos-sdk trybot; preCQ; a few manual tests
Change-Id: Iabb6aefadfb9399ea23ed2bf925bd8ae2d2a92cb
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1132391
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Daniel Wang <wonderfly@google.com>
Tested-by: Daniel Wang <wonderfly@google.com>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 1a04c19..11a1038 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1 +1 @@
-DIST curl-7.58.0.tar.bz2 2891868 SHA256 1cb081f97807c01e3ed747b6e1c9fee7a01cb10048f1cd0b5f56cfe0209de731 SHA512 853b945fbfe87e8dcf2186d8cc6609681b9ed3727f9f075bb434d5df07dcccc633fdf30795f6d5956e3355a5cf94a3780e4a3603b08cbd0368e44103de27085b WHIRLPOOL 92e98f8df9c8903e1e9370775b1e664c6dd1defc8cf22e3d4deadb5b1c5cbbbbf3a5f69d90bf5b66db8cc15deac0a29cac3eed885555fa34803e77c01cfaec1b
+DIST curl-7.60.0.tar.bz2 2938400 SHA256 897dfb2204bd99be328279f88f55b7c61592216b0542fcbe995c60aa92871e9b SHA512 c7566bbe7289cd75d34a65b457905d54b5d07543b9fed5a762c889eb09114ad66de62c3edafd1973e87bc8e303a434e77b4e40eea1718801e79ae9256531abe9 WHIRLPOOL f6d339b098862489f5ec80c0cb078f3285c843b3b53c772df8627380fc0608ac653f3d06feeb55ec1036f8a3a489e8efaf5b1546ebb8bfe87784718018059dad
diff --git a/net-misc/curl/curl-7.58.0-r1.ebuild b/net-misc/curl/curl-7.60.0.ebuild
similarity index 97%
rename from net-misc/curl/curl-7.58.0-r1.ebuild
rename to net-misc/curl/curl-7.60.0.ebuild
index 539ed37..b066cfc 100644
--- a/net-misc/curl/curl-7.58.0-r1.ebuild
+++ b/net-misc/curl/curl-7.60.0.ebuild
@@ -53,11 +53,7 @@
metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
- sys-libs/zlib[${MULTILIB_USEDEP}]
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
+ sys-libs/zlib[${MULTILIB_USEDEP}]"
# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
# rtmp? (
@@ -125,6 +121,7 @@
multilib_src_configure() {
# We make use of the fact that later flags override earlier ones
# So start with all ssl providers off until proven otherwise
+ # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
local myconf=()
myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
@@ -210,6 +207,7 @@
$(use_with brotli) \
--without-spnego \
--without-winidn \
+ --without-wolfssl \
--with-zlib \
"${myconf[@]}"
