<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/dc0dccf70343d189c542ac789e612b8963a31c40">https://github.com/macports/macports-ports/commit/dc0dccf70343d189c542ac789e612b8963a31c40</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 dc0dccf p11-kit: update to 0.23.12
</span>dc0dccf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dc0dccf70343d189c542ac789e612b8963a31c40
</span>Author: Leonardo Brondani Schenkel <lbschenkel@macports.org>
AuthorDate: Wed May 30 18:29:50 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> p11-kit: update to 0.23.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also drop downstream patches for issues fixed upstream.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/p11-glue/p11-kit/releases/tag/0.23.12
</span>---
security/p11-kit/Portfile | 15 ++--
security/p11-kit/files/patch-pr160.diff | 91 --------------------
security/p11-kit/files/patch-pr162.diff | 148 --------------------------------
3 files changed, 5 insertions(+), 249 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 5380336..306a511 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;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup p11-glue p11-kit 0.23.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup p11-glue p11-kit 0.23.12
</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;'>@@ -15,9 +14,9 @@ categories security
</span> platforms darwin
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 67dbefdcd26f5bd520f37b6cfafbcec64aabd3ff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b243c8daa573f85cb9873352a4c38563812fe3045e960593eb45db7dfdea4a2b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1251600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 37220162e0a041bf388fcaaf621189ad0a8d0121 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 58bae22f19db1de1a1103e7ca4149eed6e303e727878c2cd5ea9e6fe445fd403 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1257028
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,13 +27,9 @@ 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 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pr160.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pr162.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-common-compat.c.diff
</span> patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span> configure.args --disable-doc \
--disable-silent-rules \
--with-trust-paths=${prefix}/share/curl/curl-ca-bundle.crt:${prefix}/etc/openssl
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f675519..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/p11-kit/files/patch-pr160.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,91 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 97e03dd..155ef3b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/p11-kit/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/p11-kit/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,6 +104,7 @@ noinst_LTLIBRARIES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_LTLIBRARIES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libp11-kit-testable.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libp11-kit-pkcs11-gnu.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libp11_kit_internal_la_LDFLAGS = -no-undefined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,6 +118,37 @@ libp11_kit_testable_la_SOURCES = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libp11_kit_testable_la_LIBADD = $(COMMON_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pkcs11_gnu_sources = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p11-kit/uri.gnu.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p11-kit/iter.gnu.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p11-kit/pin.gnu.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BUILT_SOURCES += $(pkcs11_gnu_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CLEANFILES += $(pkcs11_gnu_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+p11-kit/uri.gnu.c: p11-kit/uri.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+p11-kit/iter.gnu.c: p11-kit/iter.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+p11-kit/pin.gnu.c: p11-kit/pin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SUFFIXES = .h .gnu.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.h.gnu.c:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(AM_V_GEN) src=$<; dst=$@; rm -f $@-t $@ && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo '#include <stdlib.h>'; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo '#include "p11-kit/p11-kit.h"'; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cat $$src; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "void *$${dst}_funcs[] = {" | sed 's/[^][ *a-z0-9_={]/_/g'; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -n -e '/^typedef/d' -e 's/.* \(p11_kit_[^ ]*\) *(.*/ \1,/p' $<; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo '};'; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } > $@-t && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mv -f $@-t $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libp11_kit_pkcs11_gnu_la_LDFLAGS = -no-undefined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libp11_kit_pkcs11_gnu_la_SOURCES = $(pkcs11_gnu_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libp11_kit_pkcs11_gnu_la_CFLAGS = -DCRYPTOKI_GNU=1 -DP11_KIT_FUTURE_UNSTABLE_API=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libp11_kit_testable_la_CFLAGS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/p11-kit/iter.h b/p11-kit/iter.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fabcd2f..991dcc9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/p11-kit/iter.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/p11-kit/iter.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,6 +45,16 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef P11_KIT_FUTURE_UNSTABLE_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * If the caller is using the PKCS#11 GNU calling convention, then we cater
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * to that here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef CRYPTOKI_GNU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef unsigned char CK_BBOOL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef ck_object_handle_t CK_OBJECT_HANDLE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef ck_session_handle_t CK_SESSION_HANDLE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct p11_kit_iter P11KitIter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef P11KitIter p11_kit_iter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/p11-kit/uri.h b/p11-kit/uri.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6eb470f..d95bd00 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/p11-kit/uri.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/p11-kit/uri.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,11 +79,15 @@ typedef enum {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * to that here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef CRYPTOKI_GNU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef struct ck_info CK_INFO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct ck_info *CK_INFO_PTR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef struct ck_token_info CK_TOKEN_INFO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct ck_token_info *CK_TOKEN_INFO_PTR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef ck_attribute_type_t CK_ATTRIBUTE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef struct ck_attribute CK_ATTRIBUTE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct ck_attribute *CK_ATTRIBUTE_PTR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned long int CK_ULONG;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef struct ck_slot_info CK_SLOT_INFO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct ck_slot_info *CK_SLOT_INFO_PTR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef ck_slot_id_t CK_SLOT_ID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef P11KitUriType p11_kit_uri_type_t;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/p11-kit/files/patch-pr162.diff b/security/p11-kit/files/patch-pr162.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 419d9cc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/p11-kit/files/patch-pr162.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,148 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/common/compat.h b/common/compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 96a731d..d78db0c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/common/compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/common/compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -340,6 +340,12 @@ int fdwalk (int (* cb) (void *data, int fd),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* If either locale_t or newlocale() is not available, strerror_l()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * cannot be used */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(HAVE_LOCALE_T) || !defined(HAVE_NEWLOCALE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int p11_ascii_tolower (int c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int p11_ascii_toupper (int c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/common/debug.c b/common/debug.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c731305..bcf6e21 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/common/debug.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/common/debug.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@ static bool debug_strict = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* global variable exported in debug.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int p11_debug_current_flags = ~0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_LOCALE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern locale_t p11_message_locale;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +163,7 @@ p11_debug_message_err (int flag,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- va_end (args);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf (strerr, sizeof (strerr), "Unknown error %d", errnum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(HAVE_STRERROR_L) && defined(HAVE_NEWLOCALE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (p11_message_locale != (locale_t) 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strncpy (strerr, strerror_l (errnum, p11_message_locale), sizeof (strerr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/common/library.c b/common/library.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 52c3347..1f0ba41 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/common/library.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/common/library.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,7 +70,7 @@ pthread_once_t p11_library_once = PTHREAD_ONCE_INIT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int p11_forkid = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_LOCALE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern locale_t p11_message_locale;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,7 +130,7 @@ p11_library_init_impl (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p11_mutex_init (&p11_virtual_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_key_create (&thread_local, free);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p11_message_storage = thread_local_message;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_NEWLOCALE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p11_message_locale = newlocale (LC_ALL_MASK, "POSIX", (locale_t) 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,7 +152,7 @@ p11_library_uninit (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free (pthread_getspecific (thread_local));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_setspecific (thread_local, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_NEWLOCALE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- freelocale (p11_message_locale);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p11_message_storage = dont_store_message;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/common/message.c b/common/message.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e4e00d5..f9d4f57 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/common/message.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/common/message.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool print_messages = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_LOCALE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- locale_t p11_message_locale = (locale_t) 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,7 +119,7 @@ p11_message_err (int errnum,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buffer[length] = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf (strerr, sizeof (strerr), "Unknown error %d", errnum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(HAVE_STRERROR_L) && defined(HAVE_NEWLOCALE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (p11_message_locale != (locale_t) 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strncpy (strerr, strerror_l (errnum, p11_message_locale), sizeof (strerr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/common/test-message.c b/common/test-message.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 339ad4b..5f0fce4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/common/test-message.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/common/test-message.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_LOCALE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern locale_t p11_message_locale;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,7 +54,7 @@ test_with_err (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *last;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *expected;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_NEWLOCALE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p11_message_locale = newlocale (LC_ALL_MASK, "POSIX", (locale_t) 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +67,7 @@ test_with_err (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert_str_eq (expected, last);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free (expected);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_NEWLOCALE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRERROR_L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- freelocale (p11_message_locale);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5667874..5f561a1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,12 +96,17 @@ if test "$os_unix" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([could not find socket])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # These are thngs we can work around
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_HEADERS([locale.h sys/resource.h ucred.h])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_HEADERS([locale.h], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_TYPES([locale_t], [], [], [[#include <locale.h>]])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_FUNCS([newlocale strerror_l])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # These are things we can work around
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_HEADERS([sys/resource.h ucred.h])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_MEMBERS([struct dirent.d_type],,,[#include <dirent.h>])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNCS([getprogname getexecname basename mkstemp mkdtemp])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNCS([getauxval issetugid getresuid secure_getenv])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_FUNCS([strnstr memdup newlocale strndup strerror_l strerror_r])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_FUNCS([strnstr memdup strndup strerror_r])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNCS([reallocarray])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNCS([fdwalk])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNCS([setenv])
</span></pre><pre style='margin:0'>
</pre>