summaryrefslogtreecommitdiffstats
path: root/archive-libs
diff options
context:
space:
mode:
authorVlad Glagolev2021-05-11 00:12:59 +0000
committerVlad Glagolev2021-05-11 00:12:59 +0000
commit3528b50651a66ce29ce264bb905b5b68aedbee32 (patch)
tree2f089ee05e70cc6d0d8025dc265f7a679cf7ecf6 /archive-libs
parent10730cb2a4cd6dd39e3f2f1ce394b82e1b70463a (diff)
libarchive: fixed build against libressl
Diffstat (limited to 'archive-libs')
-rw-r--r--archive-libs/libarchive/HISTORY3
-rwxr-xr-xarchive-libs/libarchive/PRE_BUILD4
-rw-r--r--archive-libs/libarchive/libressl.patch25
3 files changed, 3 insertions, 29 deletions
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY
index d28fa02748..ba554006fd 100644
--- a/archive-libs/libarchive/HISTORY
+++ b/archive-libs/libarchive/HISTORY
@@ -1,3 +1,6 @@
+2021-05-10 Vlad Glagolev <stealth@sourcemage.org>
+ * PRE_BUILD, libressl.patch: removed, no longer needed
+
2020-12-31 Florian Franzmann <bwlf@bandrate.org>
* DETAILS: version 3.5.1
diff --git a/archive-libs/libarchive/PRE_BUILD b/archive-libs/libarchive/PRE_BUILD
deleted file mode 100755
index 2af8029185..0000000000
--- a/archive-libs/libarchive/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-patch -p1 < "${SPELL_DIRECTORY}/libressl.patch"
diff --git a/archive-libs/libarchive/libressl.patch b/archive-libs/libarchive/libressl.patch
deleted file mode 100644
index 6cc6aba229..0000000000
--- a/archive-libs/libarchive/libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 966f2546cba91e53e1c5afce6969752ad90f8adc Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf@bandrate.org>
-Date: Mon, 10 Jul 2017 19:02:12 +0200
-Subject: [PATCH] libressl
-
----
- libarchive/archive_openssl_evp_private.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_openssl_evp_private.h b/libarchive/archive_openssl_evp_private.h
-index 43a3ccc..90b1c8f 100644
---- a/libarchive/archive_openssl_evp_private.h
-+++ b/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)
---
-2.13.2
-