From a8c83f87d04e4fc6d3f508d2a4a61f8ea141874b Mon Sep 17 00:00:00 2001 From: heitbaum Date: Thu, 21 Jan 2021 07:35:42 +0000 Subject: [PATCH] cmake: update to 3.21.2 update 3.19.2 to 3.21.2 release notes: - https://cmake.org/cmake/help/latest/release/3.19.html#id6 - https://cmake.org/cmake/help/latest/release/3.20.html - https://cmake.org/cmake/help/latest/release/3.21.html --- packages/devel/cmake/package.mk | 4 +-- .../patches/cmake-000-disable-sslv3.patch | 26 ------------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 packages/devel/cmake/patches/cmake-000-disable-sslv3.patch diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk index d0986997f9..19bfae806e 100644 --- a/packages/devel/cmake/package.mk +++ b/packages/devel/cmake/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="cmake" -PKG_VERSION="3.19.2" -PKG_SHA256="e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0" +PKG_VERSION="3.21.2" +PKG_SHA256="94275e0b61c84bb42710f5320a23c6dcb2c6ee032ae7d2a616f53f68b3d21659" PKG_LICENSE="BSD" PKG_SITE="https://cmake.org/" PKG_URL="https://cmake.org/files/v$(get_pkg_version_maj_min)/cmake-${PKG_VERSION}.tar.gz" diff --git a/packages/devel/cmake/patches/cmake-000-disable-sslv3.patch b/packages/devel/cmake/patches/cmake-000-disable-sslv3.patch deleted file mode 100644 index 4e184d66a9..0000000000 --- a/packages/devel/cmake/patches/cmake-000-disable-sslv3.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Utilities/cmcurl/lib/vtls/openssl.c.orig 2016-10-06 15:52:59.115761563 +0200 -+++ b/Utilities/cmcurl/lib/vtls/openssl.c 2016-10-06 16:20:36.172690961 +0200 -@@ -108,6 +108,12 @@ - #define OPENSSL_NO_SSL2 - #endif - -+#if !defined(HAVE_SSLV3_CLIENT_METHOD) || \ -+ OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0+ has no SSLv3 support */ -+#undef OPENSSL_NO_SSL3 /* undef first to avoid compiler warnings */ -+#define OPENSSL_NO_SSL3 -+#endif -+ - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \ - !defined(LIBRESSL_VERSION_NUMBER) - #define SSLeay_add_ssl_algorithms() SSL_library_init() ---- a/Utilities/cmcurl/lib/vtls/openssl.c.orig 2016-10-19 19:06:52.439430376 +0200 -+++ b/Utilities/cmcurl/lib/vtls/openssl.c 2016-10-19 19:04:21.327612220 +0200 -@@ -1737,7 +1737,7 @@ - break; - #endif - case CURL_SSLVERSION_SSLv3: --#ifdef OPENSSL_NO_SSL3_METHOD -+#ifdef OPENSSL_NO_SSL3 - failf(data, OSSL_PACKAGE " was built without SSLv3 support"); - return CURLE_NOT_BUILT_IN; - #else