commit:     e2d944728bb65bd912801dba74104c1b65049dd2
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 11:32:41 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 11:33:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d94472

net-misc/curl: clean up vulnerable versions, bug #638734

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 net-misc/curl/Manifest           |   3 -
 net-misc/curl/curl-7.55.1.ebuild | 243 --------------------------------------
 net-misc/curl/curl-7.56.0.ebuild | 241 --------------------------------------
 net-misc/curl/curl-7.56.1.ebuild | 247 ---------------------------------------
 4 files changed, 734 deletions(-)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 7a2b8c59206..e637f9b6c72 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,4 +1 @@
-DIST curl-7.55.1.tar.bz2 2786830 BLAKE2B 
8de6a383b0ad850c88dce78ef68ec320001b6dd20749293395872d8c87ba79a16b4c0da91299afb0368ebff83c1becb360b402cfe3308374eeeb5e71e443f39b
 SHA512 
bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b
-DIST curl-7.56.0.tar.bz2 2838517 BLAKE2B 
efe2c213f27ffd1f80a45eed67898b2d9c01192fd3abbe65436fd74afe5235e645905a32dd9b3a01872742b152bdb43ff785ea20f317503d634fd68d31449c89
 SHA512 
ba17a9fdc4b540d6053fa542bd875f321d009b9ba0cb56b16fe6c217f3856ab061f2a6c735771a0eadc28338889d071884680b4d4c243b4179872abb29915e3b
-DIST curl-7.56.1.tar.bz2 2824548 BLAKE2B 
8c191db379dc3f66d03b46158bf9da936c12b72c7361f4c36ff12a3af818322bb777b6f23eb9b95cfd576704f2e9b73ca87d7327734b2d3e6268b9079d718a7a
 SHA512 
f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68
 DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 
05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3
 SHA512 
f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377

diff --git a/net-misc/curl/curl-7.55.1.ebuild b/net-misc/curl/curl-7.55.1.ebuild
deleted file mode 100644
index 83451ec25ba..00000000000
--- a/net-misc/curl/curl-7.55.1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/";
-SRC_URI="https://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 ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
-IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl 
static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls 
curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       ssl? (
-               curl_ssl_axtls? (
-                       net-libs/axtls:0=[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-               curl_ssl_gnutls? (
-                       net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-                       dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-               curl_ssl_libressl? (
-                       dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-               )
-               curl_ssl_mbedtls? (
-                       net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-               curl_ssl_openssl? (
-                       dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-               )
-               curl_ssl_nss? (
-                       dev-libs/nss:0[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-       )
-       http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-       idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-       adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-       kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-       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(-)]
-       )"
-
-# 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)
-
-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_libressl
-                       curl_ssl_mbedtls
-                       curl_ssl_nss
-                       curl_ssl_openssl
-                       curl_ssl_winssl
-               )
-       )"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-       docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/curl-config
-)
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-       eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-       eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-       eapply "${FILESDIR}"/${P}-fix-build.patch
-
-       sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-       eapply_user
-       eprefixify curl-config.in
-       eautoreconf
-}
-
-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
-       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  )
-       if use ssl ; then
-               if use curl_ssl_axtls; then
-                       einfo "SSL provided by axtls"
-                       myconf+=( --with-axtls )
-               elif use curl_ssl_gnutls; then
-                       einfo "SSL provided by gnutls"
-                       myconf+=( --with-gnutls --with-nettle )
-               elif use curl_ssl_libressl; then
-                       einfo "SSL provided by LibreSSL"
-                       myconf+=( --with-ssl 
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
-               elif use curl_ssl_mbedtls; then
-                       einfo "SSL provided by mbedtls"
-                       myconf+=( --with-mbedtls )
-               elif use curl_ssl_nss; then
-                       einfo "SSL provided by nss"
-                       myconf+=( --with-nss )
-               elif use curl_ssl_openssl; then
-                       einfo "SSL provided by openssl"
-                       myconf+=( --with-ssl 
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
-               elif use curl_ssl_winssl; then
-                       einfo "SSL provided by Windows"
-                       myconf+=( --with-winssl )
-               else
-                       eerror "We can't be here because of REQUIRED_USE."
-               fi
-       else
-               einfo "SSL disabled"
-       fi
-
-       # 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-crypto-auth \
-               --enable-dict \
-               --enable-file \
-               --enable-ftp \
-               --enable-gopher \
-               --enable-http \
-               --enable-imap \
-               $(use_enable ldap) \
-               $(use_enable ldap ldaps) \
-               --disable-ntlm-wb \
-               --enable-pop3 \
-               --enable-rt  \
-               --enable-rtsp \
-               $(use_enable samba smb) \
-               $(use_with ssh libssh2) \
-               --enable-smtp \
-               --enable-telnet \
-               --enable-tftp \
-               --enable-tls-srp \
-               $(use_enable adns ares) \
-               --enable-cookies \
-               --enable-hidden-symbols \
-               $(use_enable ipv6) \
-               --enable-largefile \
-               --without-libpsl \
-               --enable-manual \
-               --enable-proxy \
-               --disable-soname-bump \
-               --disable-sspi \
-               $(use_enable static-libs static) \
-               $(use_enable threads threaded-resolver) \
-               $(use_enable threads pthreads) \
-               --disable-versioned-symbols \
-               --without-cyassl \
-               --without-darwinssl \
-               $(use_with idn libidn2) \
-               $(use_with kerberos gssapi "${EPREFIX}"/usr) \
-               $(use_with metalink libmetalink) \
-               $(use_with http2 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
-               sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-       fi
-
-       # Fix up the pkg-config file to be more robust.
-       # https://github.com/curl/curl/issues/864
-       local priv=() libs=()
-       # We always enable zlib.
-       libs+=( "-lz" )
-       priv+=( "zlib" )
-       if use http2; then
-               libs+=( "-lnghttp2" )
-               priv+=( "libnghttp2" )
-       fi
-       if use curl_ssl_openssl; then
-               libs+=( "-lssl" "-lcrypto" )
-               priv+=( "openssl" )
-       fi
-       grep -q Requires.private libcurl.pc && die "need to update ebuild"
-       libs=$(printf '|%s' "${libs[@]}")
-       sed -i -r \
-               -e "/^Libs.private/s:(${libs#|})( |$)::g" \
-               libcurl.pc || die
-       echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-       einstalldocs
-       prune_libtool_files --all
-
-       rm -rf "${ED}"/etc/
-}

diff --git a/net-misc/curl/curl-7.56.0.ebuild b/net-misc/curl/curl-7.56.0.ebuild
deleted file mode 100644
index 862f9c9b1bf..00000000000
--- a/net-misc/curl/curl-7.56.0.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/";
-SRC_URI="https://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 ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
-IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl 
static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls 
curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       ssl? (
-               curl_ssl_axtls? (
-                       net-libs/axtls:0=[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-               curl_ssl_gnutls? (
-                       net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-                       dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-               curl_ssl_libressl? (
-                       dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-               )
-               curl_ssl_mbedtls? (
-                       net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-               curl_ssl_openssl? (
-                       dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-               )
-               curl_ssl_nss? (
-                       dev-libs/nss:0[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-       )
-       http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-       idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-       adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-       kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-       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(-)]
-       )"
-
-# 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)
-
-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_libressl
-                       curl_ssl_mbedtls
-                       curl_ssl_nss
-                       curl_ssl_openssl
-                       curl_ssl_winssl
-               )
-       )"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-       docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/curl-config
-)
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-       eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-       eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-       sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-       eapply_user
-       eprefixify curl-config.in
-       eautoreconf
-}
-
-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
-       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  )
-       if use ssl ; then
-               if use curl_ssl_axtls; then
-                       einfo "SSL provided by axtls"
-                       myconf+=( --with-axtls )
-               elif use curl_ssl_gnutls; then
-                       einfo "SSL provided by gnutls"
-                       myconf+=( --with-gnutls --with-nettle )
-               elif use curl_ssl_libressl; then
-                       einfo "SSL provided by LibreSSL"
-                       myconf+=( --with-ssl 
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
-               elif use curl_ssl_mbedtls; then
-                       einfo "SSL provided by mbedtls"
-                       myconf+=( --with-mbedtls )
-               elif use curl_ssl_nss; then
-                       einfo "SSL provided by nss"
-                       myconf+=( --with-nss )
-               elif use curl_ssl_openssl; then
-                       einfo "SSL provided by openssl"
-                       myconf+=( --with-ssl 
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
-               elif use curl_ssl_winssl; then
-                       einfo "SSL provided by Windows"
-                       myconf+=( --with-winssl )
-               else
-                       eerror "We can't be here because of REQUIRED_USE."
-               fi
-       else
-               einfo "SSL disabled"
-       fi
-
-       # 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-crypto-auth \
-               --enable-dict \
-               --enable-file \
-               --enable-ftp \
-               --enable-gopher \
-               --enable-http \
-               --enable-imap \
-               $(use_enable ldap) \
-               $(use_enable ldap ldaps) \
-               --disable-ntlm-wb \
-               --enable-pop3 \
-               --enable-rt  \
-               --enable-rtsp \
-               $(use_enable samba smb) \
-               $(use_with ssh libssh2) \
-               --enable-smtp \
-               --enable-telnet \
-               --enable-tftp \
-               --enable-tls-srp \
-               $(use_enable adns ares) \
-               --enable-cookies \
-               --enable-hidden-symbols \
-               $(use_enable ipv6) \
-               --enable-largefile \
-               --without-libpsl \
-               --enable-manual \
-               --enable-proxy \
-               --disable-sspi \
-               $(use_enable static-libs static) \
-               $(use_enable threads threaded-resolver) \
-               $(use_enable threads pthreads) \
-               --disable-versioned-symbols \
-               --without-cyassl \
-               --without-darwinssl \
-               $(use_with idn libidn2) \
-               $(use_with kerberos gssapi "${EPREFIX}"/usr) \
-               $(use_with metalink libmetalink) \
-               $(use_with http2 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
-               sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-       fi
-
-       # Fix up the pkg-config file to be more robust.
-       # https://github.com/curl/curl/issues/864
-       local priv=() libs=()
-       # We always enable zlib.
-       libs+=( "-lz" )
-       priv+=( "zlib" )
-       if use http2; then
-               libs+=( "-lnghttp2" )
-               priv+=( "libnghttp2" )
-       fi
-       if use curl_ssl_openssl; then
-               libs+=( "-lssl" "-lcrypto" )
-               priv+=( "openssl" )
-       fi
-       grep -q Requires.private libcurl.pc && die "need to update ebuild"
-       libs=$(printf '|%s' "${libs[@]}")
-       sed -i -r \
-               -e "/^Libs.private/s:(${libs#|})( |$)::g" \
-               libcurl.pc || die
-       echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-       einstalldocs
-       prune_libtool_files --all
-
-       rm -rf "${ED}"/etc/
-}

diff --git a/net-misc/curl/curl-7.56.1.ebuild b/net-misc/curl/curl-7.56.1.ebuild
deleted file mode 100644
index fabca45feca..00000000000
--- a/net-misc/curl/curl-7.56.1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/";
-SRC_URI="https://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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl 
static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls 
curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       ssl? (
-               curl_ssl_axtls? (
-                       net-libs/axtls:0=[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-               curl_ssl_gnutls? (
-                       net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-                       dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-               curl_ssl_libressl? (
-                       dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-               )
-               curl_ssl_mbedtls? (
-                       net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-               curl_ssl_openssl? (
-                       dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-               )
-               curl_ssl_nss? (
-                       dev-libs/nss:0[${MULTILIB_USEDEP}]
-                       app-misc/ca-certificates
-               )
-       )
-       http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-       idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-       adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-       kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-       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(-)]
-       )"
-
-# 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)
-
-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_libressl
-                       curl_ssl_mbedtls
-                       curl_ssl_nss
-                       curl_ssl_openssl
-                       curl_ssl_winssl
-               )
-       )"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-       docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/curl-config
-)
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-       eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-       eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-       sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-       eapply_user
-       eprefixify curl-config.in
-       eautoreconf
-
-       if [[ ${CHOST} == *-darwin17 ]] ; then
-               # https://bugs.gentoo.org/show_bug.cgi?id=637252
-               sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-                       configure || die
-       fi
-}
-
-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
-       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  )
-       if use ssl ; then
-               if use curl_ssl_axtls; then
-                       einfo "SSL provided by axtls"
-                       myconf+=( --with-axtls )
-               elif use curl_ssl_gnutls; then
-                       einfo "SSL provided by gnutls"
-                       myconf+=( --with-gnutls --with-nettle )
-               elif use curl_ssl_libressl; then
-                       einfo "SSL provided by LibreSSL"
-                       myconf+=( --with-ssl 
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
-               elif use curl_ssl_mbedtls; then
-                       einfo "SSL provided by mbedtls"
-                       myconf+=( --with-mbedtls )
-               elif use curl_ssl_nss; then
-                       einfo "SSL provided by nss"
-                       myconf+=( --with-nss )
-               elif use curl_ssl_openssl; then
-                       einfo "SSL provided by openssl"
-                       myconf+=( --with-ssl 
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
-               elif use curl_ssl_winssl; then
-                       einfo "SSL provided by Windows"
-                       myconf+=( --with-winssl )
-               else
-                       eerror "We can't be here because of REQUIRED_USE."
-               fi
-       else
-               einfo "SSL disabled"
-       fi
-
-       # 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-crypto-auth \
-               --enable-dict \
-               --enable-file \
-               --enable-ftp \
-               --enable-gopher \
-               --enable-http \
-               --enable-imap \
-               $(use_enable ldap) \
-               $(use_enable ldap ldaps) \
-               --disable-ntlm-wb \
-               --enable-pop3 \
-               --enable-rt  \
-               --enable-rtsp \
-               $(use_enable samba smb) \
-               $(use_with ssh libssh2) \
-               --enable-smtp \
-               --enable-telnet \
-               --enable-tftp \
-               --enable-tls-srp \
-               $(use_enable adns ares) \
-               --enable-cookies \
-               --enable-hidden-symbols \
-               $(use_enable ipv6) \
-               --enable-largefile \
-               --without-libpsl \
-               --enable-manual \
-               --enable-proxy \
-               --disable-sspi \
-               $(use_enable static-libs static) \
-               $(use_enable threads threaded-resolver) \
-               $(use_enable threads pthreads) \
-               --disable-versioned-symbols \
-               --without-cyassl \
-               --without-darwinssl \
-               $(use_with idn libidn2) \
-               $(use_with kerberos gssapi "${EPREFIX}"/usr) \
-               $(use_with metalink libmetalink) \
-               $(use_with http2 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
-               sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-       fi
-
-       # Fix up the pkg-config file to be more robust.
-       # https://github.com/curl/curl/issues/864
-       local priv=() libs=()
-       # We always enable zlib.
-       libs+=( "-lz" )
-       priv+=( "zlib" )
-       if use http2; then
-               libs+=( "-lnghttp2" )
-               priv+=( "libnghttp2" )
-       fi
-       if use curl_ssl_openssl; then
-               libs+=( "-lssl" "-lcrypto" )
-               priv+=( "openssl" )
-       fi
-       grep -q Requires.private libcurl.pc && die "need to update ebuild"
-       libs=$(printf '|%s' "${libs[@]}")
-       sed -i -r \
-               -e "/^Libs.private/s:(${libs#|})( |$)::g" \
-               libcurl.pc || die
-       echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-       einstalldocs
-       prune_libtool_files --all
-
-       rm -rf "${ED}"/etc/
-}

Reply via email to