commit: 31e47e54f33d6aea9cd40b72be0775e9102b19aa Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Mon Oct 3 10:07:22 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Oct 3 10:07:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e47e54
dev-libs/openpace: fix openssl conditional include Closes: https://bugs.gentoo.org/872518 Signed-off-by: David Seifert <soap <AT> gentoo.org> ...sl.patch => openpace-1.1.2-openssl-3.0-1.patch} | 0 ....0.patch => openpace-1.1.2-openssl-3.0-2.patch} | 0 .../files/openpace-1.1.2-openssl-3.0-3.patch | 23 ++++++++++++++++++++++ dev-libs/openpace/openpace-1.1.2.ebuild | 5 +++-- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl.patch b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch similarity index 100% rename from dev-libs/openpace/files/openpace-1.1.2-openssl.patch rename to dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0.patch b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch similarity index 100% rename from dev-libs/openpace/files/openpace-1.1.2-openssl-3.0.patch rename to dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-3.patch b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-3.patch new file mode 100644 index 000000000000..9ae0221adb7b --- /dev/null +++ b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-3.patch @@ -0,0 +1,23 @@ +From 4c22789d264bd249cfff1c3e69466991e58a76cf Mon Sep 17 00:00:00 2001 +From: Frank Morgner <[email protected]> +Date: Mon, 20 Dec 2021 02:32:58 +0100 +Subject: [PATCH] fixed openssl 3 include + +--- + src/eac_util.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/eac_util.c b/src/eac_util.c +index 6e518e0..c9196fd 100644 +--- a/src/eac_util.c ++++ b/src/eac_util.c +@@ -321,7 +321,9 @@ randb(int numbytes) + return NULL; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L + #include <openssl/provider.h> ++#endif + + BUF_MEM * + retail_mac_des(const BUF_MEM * key, const BUF_MEM * in) diff --git a/dev-libs/openpace/openpace-1.1.2.ebuild b/dev-libs/openpace/openpace-1.1.2.ebuild index 308f5d566c47..71a45675d0f0 100644 --- a/dev-libs/openpace/openpace-1.1.2.ebuild +++ b/dev-libs/openpace/openpace-1.1.2.ebuild @@ -21,8 +21,9 @@ DEPEND="dev-libs/openssl:=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${P}-openssl.patch - "${FILESDIR}"/${P}-openssl-3.0.patch + "${FILESDIR}"/${P}-openssl-3.0-1.patch + "${FILESDIR}"/${P}-openssl-3.0-2.patch + "${FILESDIR}"/${P}-openssl-3.0-3.patch ) src_prepare() {
