From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 138DF158086 for ; Mon, 15 Nov 2021 19:32:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99A03E08F2; Mon, 15 Nov 2021 19:32:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E97D6E08F2 for ; Mon, 15 Nov 2021 19:32:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 383DC342F07 for ; Mon, 15 Nov 2021 19:32:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C0451C0 for ; Mon, 15 Nov 2021 19:32:06 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1637004593.9fa3fb2c429652631b76f18ee3feec3b9c068b04.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/files/, sys-auth/yubico-piv-tool/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild X-VCS-Directories: sys-auth/yubico-piv-tool/files/ sys-auth/yubico-piv-tool/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 9fa3fb2c429652631b76f18ee3feec3b9c068b04 X-VCS-Branch: master Date: Mon, 15 Nov 2021 19:32:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d5bce1e4-f387-4145-a140-fa3fefd69049 X-Archives-Hash: 7f473dfb41d431f636c13bfebf8795f8 commit: 9fa3fb2c429652631b76f18ee3feec3b9c068b04 Author: Marek Szuba gentoo org> AuthorDate: Mon Nov 15 19:29:53 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Nov 15 19:29:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa3fb2c sys-auth/yubico-piv-tool-2.2.1: support openssl-3.0 Backported upstream fix, i.e. should no longer be needed come next release. Closes: https://bugs.gentoo.org/805914 Signed-off-by: Marek Szuba gentoo.org> .../files/yubico-piv-tool-2.2.1-openssl3.patch | 32 ++++++++++++++++++++++ .../yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild | 1 + 2 files changed, 33 insertions(+) diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch new file mode 100644 index 000000000000..5ba807ea0c6c --- /dev/null +++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch @@ -0,0 +1,32 @@ +From 81b063f53db8a3d74077522a6ff4f1640cc3fe70 Mon Sep 17 00:00:00 2001 +From: Clemens Lang +Date: Sun, 14 Nov 2021 18:21:28 +0100 +Subject: [PATCH] Avoid header include guard conflict with OpenSSL 3 + +OpenSSL 3.x ships an openssl/types.h header that's protected with an +OPENSSL_TYPES_H include guard macro. OpenSSL's headers fail to parse +when ykcs11/openssl_types.h defines this symbol. + +Switch the include guard for the file to YKCS11_OPENSSL_TYPES_H to +prevent this from happening. + +Signed-off-by: Clemens Lang +--- + ykcs11/openssl_types.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ykcs11/openssl_types.h b/ykcs11/openssl_types.h +index c526d815..f3e1a7c0 100644 +--- a/ykcs11/openssl_types.h ++++ b/ykcs11/openssl_types.h +@@ -28,8 +28,8 @@ + * + */ + +-#ifndef OPENSSL_TYPES_H +-#define OPENSSL_TYPES_H ++#ifndef YKCS11_OPENSSL_TYPES_H ++#define YKCS11_OPENSSL_TYPES_H + + #include + #include diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild index 8cea2321eafe..a8415ba3ce87 100644 --- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild +++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild @@ -28,6 +28,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.1.1-no-Werror.patch "${FILESDIR}"/${PN}-2.1.1-tests-optional.patch "${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch + "${FILESDIR}"/${PN}-2.2.1-openssl3.patch ) S="${WORKDIR}/${PN}-${P}"