Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/, app-arch/libarchive/files/
Date: Fri, 30 Apr 2021 23:27:51
Message-Id: 1619825236.2ae8978f4d5c5116173e06e166aad3ef37b296d2.sam@gentoo
1 commit: 2ae8978f4d5c5116173e06e166aad3ef37b296d2
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 11:34:48 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 23:27:16 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ae8978f
7
8 app-arch/libarchive: drop obsolete LibreSSL patch
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 app-arch/libarchive/files/libarchive-3.3.3-libressl.patch | 12 ------------
13 app-arch/libarchive/libarchive-3.5.1.ebuild | 1 -
14 2 files changed, 13 deletions(-)
15
16 diff --git a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch
17 deleted file mode 100644
18 index 4d7c0ec7cf3..00000000000
19 --- a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch
20 +++ /dev/null
21 @@ -1,12 +0,0 @@
22 ---- a/libarchive/archive_openssl_evp_private.h
23 -+++ b/libarchive/archive_openssl_evp_private.h
24 -@@ -28,7 +28,8 @@
25 - #include <openssl/evp.h>
26 - #include <openssl/opensslv.h>
27 -
28 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
29 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
30 -+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
31 - #include <stdlib.h> /* malloc, free */
32 - #include <string.h> /* memset */
33 - static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
34
35 diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild
36 index 55c89c4ef51..1319a7f8b96 100644
37 --- a/app-arch/libarchive/libarchive-3.5.1.ebuild
38 +++ b/app-arch/libarchive/libarchive-3.5.1.ebuild
39 @@ -37,7 +37,6 @@ DEPEND="${RDEPEND}
40 )"
41
42 PATCHES=(
43 - "${FILESDIR}"/${PN}-3.3.3-libressl.patch
44 "${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch # drop on next release
45 )