mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
Merge pull request #878 from PimentNoir/cmake-update
CMake: update to 3.6.2
This commit is contained in:
commit
3a276dff8d
@ -17,12 +17,12 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="cmake"
|
PKG_NAME="cmake"
|
||||||
PKG_VERSION="3.5.2"
|
PKG_VERSION="3.6.2"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="BSD"
|
PKG_LICENSE="BSD"
|
||||||
PKG_SITE="http://www.cmake.org/"
|
PKG_SITE="http://www.cmake.org/"
|
||||||
PKG_URL="http://www.cmake.org/files/v3.5/$PKG_NAME-$PKG_VERSION.tar.gz"
|
PKG_URL="http://www.cmake.org/files/v3.6/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||||
PKG_DEPENDS_HOST="ccache:host libressl:host"
|
PKG_DEPENDS_HOST="ccache:host libressl:host"
|
||||||
PKG_SECTION="toolchain/devel"
|
PKG_SECTION="toolchain/devel"
|
||||||
PKG_SHORTDESC="cmake: A cross-platform, open-source make system"
|
PKG_SHORTDESC="cmake: A cross-platform, open-source make system"
|
||||||
|
26
packages/devel/cmake/patches/cmake-000-disable-sslv3.patch
Normal file
26
packages/devel/cmake/patches/cmake-000-disable-sslv3.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
--- 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
|
@ -0,0 +1,14 @@
|
|||||||
|
--- a/Utilities/cmcurl/lib/vtls/openssl.c.orig 2016-10-19 19:17:49.615923691 +0200
|
||||||
|
+++ b/Utilities/cmcurl/lib/vtls/openssl.c 2016-10-19 19:22:50.849565684 +0200
|
||||||
|
@@ -134,6 +134,11 @@
|
||||||
|
#define HAVE_SSL_COMP_FREE_COMPRESSION_METHODS 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if !defined(OPENSSL_NO_COMP) || \
|
||||||
|
+ OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0+ has no free compression methods */
|
||||||
|
+#undef HAVE_SSL_COMP_FREE_COMPRESSION_METHODS /* undef */
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#if (OPENSSL_VERSION_NUMBER < 0x0090808fL)
|
||||||
|
/* not present in older OpenSSL */
|
||||||
|
#define OPENSSL_load_builtin_modules(x)
|
Loading…
x
Reference in New Issue
Block a user