aboutsummaryrefslogtreecommitdiffstats
path: root/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2018-04-04 10:02:32 +0200
committerHans Dedecker <dedeckeh@gmail.com>2018-04-11 21:02:29 +0200
commita8c315192b750453e1b821ab735bdabca43a4d0e (patch)
tree652c014e0bdc95c00f12a3803267a4f9802c36d1 /tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
parentf6e6eadc99c6274207f8f2ebc739063549959a1f (diff)
downloadupstream-a8c315192b750453e1b821ab735bdabca43a4d0e.tar.gz
upstream-a8c315192b750453e1b821ab735bdabca43a4d0e.tar.bz2
upstream-a8c315192b750453e1b821ab735bdabca43a4d0e.zip
tools/cmake: Update to 3.11.0
Update cmake to 3.11.0 Remove 110-alpine_musl-compat.patch as it's integrated upstream Rename and refresh patches Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake/patches/120-libarchive-fix-libressl-compat.patch')
-rw-r--r--tools/cmake/patches/120-libarchive-fix-libressl-compat.patch11
1 files changed, 0 insertions, 11 deletions
diff --git a/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch b/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
deleted file mode 100644
index ba6565b6af..0000000000
--- a/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
-+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
-@@ -28,7 +28,7 @@
- #include <openssl/evp.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)