From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- net-misc/curl/Manifest | 3 +- net-misc/curl/curl-7.59.0.ebuild | 2 + .../files/curl-7.59.0-libressl-compatibility.patch | 70 ++++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch (limited to 'net-misc/curl') diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index cfc413c8b087..c4dd62ddb395 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,4 +1,5 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f +AUX curl-7.59.0-libressl-compatibility.patch 2838 BLAKE2B 95726ee47d375a98e85145fa52cd9d9d8d0048a3d83059c8c24e5275ef0f5e137ecfd5f3a5cc718f49b6ced84dc49f7c06c2da5584391bd8619194e5069d7736 SHA512 2a9fe255c0117421da3e7cc080f84e129460982deaea666e13007d775d682d8becc9c48e3f2ba26a15ffa2f5dd021e33437283aaad953c92d0d50f9cf668b636 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377 @@ -7,5 +8,5 @@ DIST curl-7.59.0.tar.bz2 2904158 BLAKE2B c44d9985a19cb7b1e273f868181b0017c7b0068 EBUILD curl-7.57.0-r1.ebuild 7234 BLAKE2B 9ddf61766ebc6378b9b86446b4dd761630cb7a24a1293a3552d57e360c26d85ec38ac311f66bca6eb6c041f8922e91a587768c5417411842d5bd7850ebd73a9c SHA512 164351baedae507342aa4182882e7122be03964e3355c8e087a425f7c3595cc34dcb4303e781dbfb2576f02623595a1f5399f8dccb462759b1cb2593bf449e3e EBUILD curl-7.57.0.ebuild 7181 BLAKE2B 6b64ba502ac4b586b689b42b90d009c682f1df867e1f0aaa2964c51f5b22b4bd1f8a6da5376d9b3858821708e7a257a2b190188aaf0de2f821d86a80c82cd853 SHA512 65a2058ee302123fc3d18551b68c8be5efa2640f621620084df6d27772e7bdfb6ad8dcc36acb46dfaf63c8f883e6c68933d35a471951ec587d509d6a2c4db9b8 EBUILD curl-7.58.0.ebuild 7224 BLAKE2B c87344a4b7a4a96668e8b4b483f2a93763ed8cd31b2ccc4f2c5946cb71aab90b770507d1aff22032f9171ec819be457f98c8ab0022a2fce1ed14b62c0ef2b0da SHA512 9954591b40a37617c9717780c426a1c400c376e9343d85b0d1f5a5b3cf8cc214d180d87bc67004abc538dd727dae31a8146e42127203f7a3f8cdcc57558fec8b -EBUILD curl-7.59.0.ebuild 7224 BLAKE2B c87344a4b7a4a96668e8b4b483f2a93763ed8cd31b2ccc4f2c5946cb71aab90b770507d1aff22032f9171ec819be457f98c8ab0022a2fce1ed14b62c0ef2b0da SHA512 9954591b40a37617c9717780c426a1c400c376e9343d85b0d1f5a5b3cf8cc214d180d87bc67004abc538dd727dae31a8146e42127203f7a3f8cdcc57558fec8b +EBUILD curl-7.59.0.ebuild 7398 BLAKE2B e283bf0466a098391eb3cb83f2091a16c176ebc0f45408a392d8064c185da4891c6e4318474336a8819c04e6bc708f9fd0827ec61b7c16504b6f977ca5a44b29 SHA512 6308685a668564672b0f74c81127e78cb902c899032fd755ae50600a5dcd48ddc1d143d36ef574230e9ee382eae41cd5af3deb88231cf454170a53286411ac94 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad diff --git a/net-misc/curl/curl-7.59.0.ebuild b/net-misc/curl/curl-7.59.0.ebuild index 2240efbd3a89..ffbfa22f6c56 100644 --- a/net-misc/curl/curl-7.59.0.ebuild +++ b/net-misc/curl/curl-7.59.0.ebuild @@ -108,6 +108,8 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch + # the next curl release (7.60.0) *should* contain this patch as it is in Git head and 7.60.0 has been tagged + eapply "${FILESDIR}"/${PN}-7.59.0-libressl-compatibility.patch sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 diff --git a/net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch b/net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch new file mode 100644 index 000000000000..e7ee6c3ab157 --- /dev/null +++ b/net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch @@ -0,0 +1,70 @@ +From da51ddee81e10398172f0baf3327b5db82846175 Mon Sep 17 00:00:00 2001 +From: Bernard Spil +Date: Mon, 2 Apr 2018 19:04:06 +0200 +Subject: [PATCH] openssl: fix build with LibreSSL 2.7 + + - LibreSSL 2.7 implements (most of) OpenSSL 1.1 API + +Fixes #2319 +Closes #2447 +Closes #2448 + +Signed-off-by: Bernard Spil +--- + lib/vtls/openssl.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c +index 2a6b3cfac..bbb8ec766 100644 +--- a/lib/vtls/openssl.c ++++ b/lib/vtls/openssl.c +@@ -104,7 +104,8 @@ + #endif + + #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \ +- !defined(LIBRESSL_VERSION_NUMBER) ++ !(defined(LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x20700000L) + #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER + #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */ + #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */ +@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num(void) + #endif + + #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \ +- !defined(LIBRESSL_VERSION_NUMBER) ++ !(defined(LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x20700000L) + #define HAVE_X509_GET0_SIGNATURE 1 + #endif + +@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num(void) + * Whether SSL_CTX_set_keylog_callback is available. + * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287 + * BoringSSL: supported since d28f59c27bac (committed 2015-11-19) +- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it ++ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it + * lies and pretends to be OpenSSL 2.0.0). + */ + #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \ +@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl, ssl_tap_state_t *state) + if(!session || !keylog_file_fp) + return; + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x20700000L) + /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that + * we have a valid SSL context if we have a non-NULL session. */ + SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE); +@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) + case CURL_SSLVERSION_TLSv1_2: + case CURL_SSLVERSION_TLSv1_3: + /* it will be handled later with the context options */ +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ +- !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + req_method = TLS_client_method(); + #else + req_method = SSLv23_client_method(); -- cgit v1.2.3