<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/901d5c7e19e5a91c2fde8b1f2a47f2e5b6863003">https://github.com/macports/macports-ports/commit/901d5c7e19e5a91c2fde8b1f2a47f2e5b6863003</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 901d5c7e19e yubico-piv-tool: update to 2.3.1, fix build on old systems
</span>901d5c7e19e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 901d5c7e19e5a91c2fde8b1f2a47f2e5b6863003
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Aug 23 07:32:53 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> yubico-piv-tool: update to 2.3.1, fix build on old systems
</span>---
security/yubico-piv-tool/Portfile | 22 +++++++++---
.../yubico-piv-tool/files/patch-older-systems.diff | 40 ++++++++++++++++++++++
2 files changed, 58 insertions(+), 4 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 6202b132a50..0f29682be7f 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,8 +3,18 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Yubico yubico-piv-tool 2.3.0 yubico-piv-tool-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see lib/internal.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {(${os.platform} eq "darwin" && ${os.major} < 13) || ${os.platform} eq "linux"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</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;'>+github.setup Yubico yubico-piv-tool 2.3.1 yubico-piv-tool-
</span> revision 0
categories security
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +30,9 @@ long_description \
</span> homepage https://developers.yubico.com/yubico-piv-tool
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 41da2580a42a25ba96227ff0948c869710736dff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 65dcc3b77b0a9d5bafb66943070e5c593c44fd9d63c9f1147ba960cd25df680a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1315434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cdf8273fe002a3bd5b1890f060bb2e60e5ec3920 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 11de1b708c6b917bec3da7d584f534a4314c51ccd461840fd16f15478ac2668f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1316046
</span>
depends_build-append \
port:check \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +40,10 @@ depends_build-append \
</span> port:help2man \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-older-systems.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args-replace \
-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/yubico-piv-tool/files/patch-older-systems.diff b/security/yubico-piv-tool/files/patch-older-systems.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aff6b3398fc
</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/patch-older-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/internal.h.orig 2023-02-01 18:12:14.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/internal.h 2023-08-23 07:21:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Typedef DWORD (defined by pcsc lib) to pcsc_word to make it clear that this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // is not the Windows meaning of DWORD, but the PCSC library's meaning. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // differs: Windows defines a DWORD as 32-bits, but pcsclite defines it as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,7 +255,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(HAVE_EXPLICIT_BZERO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <strings.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define yc_memzero explicit_bzero
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__linux__) || (defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED < 1090)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/crypto.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define yc_memzero OPENSSL_cleanse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</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;'>+--- lib/ykpiv.c.orig 2023-02-01 18:12:14.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/ykpiv.c 2023-08-23 07:28:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -641,11 +641,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = SCardListReaders(state->context, NULL, readers, &num_readers);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rc != SCARD_S_SUCCESS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DBG("SCardListReaders failed, rc=%lx", (long)rc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SCARD_E_NO_READERS_AVAILABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(rc == SCARD_E_NO_READERS_AVAILABLE || rc == SCARD_E_SERVICE_STOPPED) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *readers = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *len = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return YKPIV_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SCardReleaseContext(state->context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state->context = (SCARDCONTEXT)-1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return pcsc_to_yrc(rc);
</span></pre><pre style='margin:0'>
</pre>