domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/cmake: Update to 3.12.3

Browse Source 
Update CMake to 3.12.3

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
This commit is contained in:
Daniel Engberg
2018-10-06 12:37:22 +02:00
committed by Hauke Mehrtens
parent 9efd0cb403
commit f6159c1e37
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/cmake/patches/140-libarchive-fix-libressl.patch
View File

@@ -11,18 +11,6 @@ Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
libarchive/archive_openssl_hmac_private.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
@@ -28,7 +28,8 @@
#include <openssl/hmac.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline HMAC_CTX *HMAC_CTX_new(void)
--- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
@@ -28,7 +28,8 @@