<pre style='margin:0'>
Leonardo Brondani Schenkel (lbschenkel) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c20d25fb2585663c681f9f3e32f1750dee7e020a">https://github.com/macports/macports-ports/commit/c20d25fb2585663c681f9f3e32f1750dee7e020a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c20d25fb2585663c681f9f3e32f1750dee7e020a
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun Nov 14 18:31:44 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> yubico-piv-tool: Fix incompatibility with openssl3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/63945
</span>---
security/yubico-piv-tool/Portfile | 9 ++----
.../81b063f53db8a3d74077522a6ff4f1640cc3fe70.patch | 33 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/yubico-piv-tool/Portfile b/security/yubico-piv-tool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa4c315b47a..bc27fe04472 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/yubico-piv-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/yubico-piv-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,14 +3,9 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note yet ready for openssl 3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check on future updates by removing this line
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-openssl.branch 1.1
</span>
github.setup Yubico yubico-piv-tool 2.2.1 yubico-piv-tool-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories security
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +24,8 @@ checksums rmd160 ddc9c1607c90d4514880d8a74682b53ca5ad1ff1 \
</span> sha256 27d98723473cb4af8d5f692e0453102201690b4337d2a7b276a102e0eb57ed08 \
size 1310292
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 81b063f53db8a3d74077522a6ff4f1640cc3fe70.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:check \
port:gengetopt \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/yubico-piv-tool/files/81b063f53db8a3d74077522a6ff4f1640cc3fe70.patch b/security/yubico-piv-tool/files/81b063f53db8a3d74077522a6ff4f1640cc3fe70.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cd3e81527a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/yubico-piv-tool/files/81b063f53db8a3d74077522a6ff4f1640cc3fe70.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 81b063f53db8a3d74077522a6ff4f1640cc3fe70 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Clemens Lang <cal@macports.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 14 Nov 2021 18:21:28 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Avoid header include guard conflict with OpenSSL 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OpenSSL 3.x ships an openssl/types.h header that's protected with an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OPENSSL_TYPES_H include guard macro. OpenSSL's headers fail to parse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+when ykcs11/openssl_types.h defines this symbol.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Switch the include guard for the file to YKCS11_OPENSSL_TYPES_H to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+prevent this from happening.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Clemens Lang <cal@macports.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Submitted [https://github.com/Yubico/yubico-piv-tool/pull/334]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ykcs11/openssl_types.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ykcs11/openssl_types.h b/ykcs11/openssl_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c526d815..f3e1a7c0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ykcs11/openssl_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ykcs11/openssl_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,8 +28,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef OPENSSL_TYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define OPENSSL_TYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef YKCS11_OPENSSL_TYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define YKCS11_OPENSSL_TYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/bn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/x509.h>
</span></pre><pre style='margin:0'>
</pre>