X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fcmake%2Fpatches%2F140-libarchive-fix-libressl.patch;h=ddddc5e836d13fa5b9bca8f186071b39ef09ed9f;hb=f6159c1e37429b6505094cfd4b6c09f4634fea38;hp=ad8a0969a8ff43d5199ed5aa27d6cee87f3daaea;hpb=9efd0cb403f68bd728a40e069a7d04b623f469e6;p=openwrt%2Fstaging%2Flynxis.git diff --git a/tools/cmake/patches/140-libarchive-fix-libressl.patch b/tools/cmake/patches/140-libarchive-fix-libressl.patch index ad8a0969a8..ddddc5e836 100644 --- a/tools/cmake/patches/140-libarchive-fix-libressl.patch +++ b/tools/cmake/patches/140-libarchive-fix-libressl.patch @@ -11,18 +11,6 @@ Signed-off-by: Bernard Spil 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 - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #include /* malloc, free */ - #include /* 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 @@