<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a65fd956995b1ec72495b12ecfb71bd0fc3e68ab">https://github.com/macports/macports-ports/commit/a65fd956995b1ec72495b12ecfb71bd0fc3e68ab</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 a65fd95 p11-kit: pkcs11: Exercise GNU calling convention at compile time
</span>a65fd95 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a65fd956995b1ec72495b12ecfb71bd0fc3e68ab
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Tue May 29 10:41:35 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> p11-kit: pkcs11: Exercise GNU calling convention at compile time
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56557
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/p11-glue/p11-kit/pull/160
</span>---
security/p11-kit/Portfile | 7 ++-
security/p11-kit/files/patch-pr160.diff | 91 +++++++++++++++++++++++++++++++++
2 files changed, 96 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/p11-kit/Portfile b/security/p11-kit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d56d16..5380336 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/p11-kit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/p11-kit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup p11-glue p11-kit 0.23.11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> license Permissive
description Provides a way to load and enumerate PKCS#11 modules and a standard \
configuration setup for installing PKCS#11 modules in such a way that \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,10 @@ depends_lib port:gettext \
</span>
depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-common-compat.c.diff patch-pr162.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-common-compat.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pr160.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pr162.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patch.pre_args -p1
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/p11-kit/files/patch-pr160.diff b/security/p11-kit/files/patch-pr160.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f675519
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/p11-kit/files/patch-pr160.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,91 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 97e03dd..155ef3b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/p11-kit/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/p11-kit/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,6 +104,7 @@ noinst_LTLIBRARIES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_LTLIBRARIES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libp11-kit-testable.la \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libp11-kit-pkcs11-gnu.la \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libp11_kit_internal_la_LDFLAGS = -no-undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,6 +118,37 @@ libp11_kit_testable_la_SOURCES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libp11_kit_testable_la_LIBADD = $(COMMON_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pkcs11_gnu_sources = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p11-kit/uri.gnu.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p11-kit/iter.gnu.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p11-kit/pin.gnu.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BUILT_SOURCES += $(pkcs11_gnu_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CLEANFILES += $(pkcs11_gnu_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++p11-kit/uri.gnu.c: p11-kit/uri.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++p11-kit/iter.gnu.c: p11-kit/iter.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++p11-kit/pin.gnu.c: p11-kit/pin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SUFFIXES = .h .gnu.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.h.gnu.c:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(AM_V_GEN) src=$<; dst=$@; rm -f $@-t $@ && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo '#include <stdlib.h>'; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo '#include "p11-kit/p11-kit.h"'; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat $$src; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "void *$${dst}_funcs[] = {" | sed 's/[^][ *a-z0-9_={]/_/g'; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed -n -e '/^typedef/d' -e 's/.* \(p11_kit_[^ ]*\) *(.*/ \1,/p' $<; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo '};'; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } > $@-t && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mv -f $@-t $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libp11_kit_pkcs11_gnu_la_LDFLAGS = -no-undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libp11_kit_pkcs11_gnu_la_SOURCES = $(pkcs11_gnu_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libp11_kit_pkcs11_gnu_la_CFLAGS = -DCRYPTOKI_GNU=1 -DP11_KIT_FUTURE_UNSTABLE_API=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if OS_WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libp11_kit_testable_la_CFLAGS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/p11-kit/iter.h b/p11-kit/iter.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fabcd2f..991dcc9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/p11-kit/iter.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/p11-kit/iter.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,16 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef P11_KIT_FUTURE_UNSTABLE_API
</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;'>++ * If the caller is using the PKCS#11 GNU calling convention, then we cater
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * to that here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CRYPTOKI_GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned char CK_BBOOL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef ck_object_handle_t CK_OBJECT_HANDLE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef ck_session_handle_t CK_SESSION_HANDLE;
</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 struct p11_kit_iter P11KitIter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef P11KitIter p11_kit_iter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/p11-kit/uri.h b/p11-kit/uri.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6eb470f..d95bd00 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/p11-kit/uri.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/p11-kit/uri.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,11 +79,15 @@ typedef enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * to that here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef CRYPTOKI_GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef struct ck_info CK_INFO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct ck_info *CK_INFO_PTR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef struct ck_token_info CK_TOKEN_INFO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct ck_token_info *CK_TOKEN_INFO_PTR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ck_attribute_type_t CK_ATTRIBUTE_TYPE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef struct ck_attribute CK_ATTRIBUTE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct ck_attribute *CK_ATTRIBUTE_PTR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned long int CK_ULONG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef struct ck_slot_info CK_SLOT_INFO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct ck_slot_info *CK_SLOT_INFO_PTR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ck_slot_id_t CK_SLOT_ID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef P11KitUriType p11_kit_uri_type_t;
</span></pre><pre style='margin:0'>
</pre>