aboutsummaryrefslogtreecommitdiffstats
path: root/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2017-09-30 11:00:32 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2017-09-30 22:41:12 +0200
commit839129b86453f0b0b2b47dac5502ecc3dae7ffb3 (patch)
tree390fb5c911ec87150081eacd08098a3a01ec5f4f /tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
parent3adafda07c8509267e3321f4861f620ec3b2f37e (diff)
downloadupstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.gz
upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.bz2
upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.zip
tools/cmake: Update to 3.9.3
Update CMake to 3.9.3 Remove FreeBSD patch (not needed) Rearrage and update 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.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch b/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
new file mode 100644
index 0000000000..a56ac2ed0c
--- /dev/null
+++ b/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
@@ -0,0 +1,22 @@
+--- 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)
+--- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
++++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
+@@ -28,7 +28,7 @@
+ #include <openssl/hmac.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 HMAC_CTX *HMAC_CTX_new(void)