p11-kit: bump to 0.23.12.

app-crypt/p11-kit/p11_kit-0.23.12.recipe

@@ -7,7 +7,7 @@ COPYRIGHT="2017 Red Hat, Inc."
 LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/p11-glue/p11-kit/releases/download/$portVersion/p11-kit-$portVersion.tar.gz"
-CHECKSUM_SHA256="e1c1649c335107a8d33cf3762eb7f57b2d0681f0c7d8353627293a58d6b4db63"
+CHECKSUM_SHA256="58bae22f19db1de1a1103e7ca4149eed6e303e727878c2cd5ea9e6fe445fd403"
 SOURCE_DIR="p11-kit-$portVersion"
 PATCHES="p11_kit-$portVersion.patchset"
 

app-crypt/p11-kit/patches/p11_kit-0.23.12.patchset

@@ -17,10 +17,10 @@ index 7fe2eea..f4c6789 100644
  #ifdef HAVE_UCRED_H
  #  include <ucred.h>
 diff --git a/p11-kit/server.c b/p11-kit/server.c
-index 97e18e2..9c2a0e0 100644
+index e64890c..c02aec0 100644
 --- a/p11-kit/server.c
 +++ b/p11-kit/server.c
-@@ -55,6 +55,7 @@
+@@ -56,6 +56,7 @@
  #include <grp.h>
  #include <pwd.h>
  #include <signal.h>
@@ -28,7 +28,7 @@ index 97e18e2..9c2a0e0 100644
  #include <sys/socket.h>
  #include <sys/types.h>
  #include <sys/un.h>
-@@ -266,7 +267,7 @@ create_socket (const char *address,
+@@ -271,7 +272,7 @@ create_socket (const char *address,
  	}
  
  	umask (066);
@@ -48,10 +48,10 @@ Subject: fix frob_setuid dependency
 
 
 diff --git a/Makefile.in b/Makefile.in
-index a2b1553..e8d5f83 100644
+index 1df290e..d425140 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -549,7 +549,7 @@ am_frob_setuid_OBJECTS = p11-kit/frob-setuid.$(OBJEXT)
+@@ -591,7 +591,7 @@ am_frob_setuid_OBJECTS = p11-kit/frob-setuid.$(OBJEXT)
  frob_setuid_OBJECTS = $(am_frob_setuid_OBJECTS)
  am__DEPENDENCIES_6 = libp11-kit-testable.la libp11-test.la \
  	libp11-common.la $(am__DEPENDENCIES_1)
@@ -71,7 +71,7 @@ Subject: avoid segfault caused by ffi closures
 
 
 diff --git a/p11-kit/virtual.c b/p11-kit/virtual.c
-index a2853bb..2dca77d 100644
+index 67b3eed..4ac86b8 100644
 --- a/p11-kit/virtual.c
 +++ b/p11-kit/virtual.c
 @@ -65,6 +65,10 @@
@@ -100,10 +100,10 @@ in this program, but doing the same with __thread doesn't.
 This is just a workaround.
 
 diff --git a/common/library.c b/common/library.c
-index 37cb1c8..569f2d2 100644
+index 1f0ba41..bd70df1 100644
 --- a/common/library.c
 +++ b/common/library.c
-@@ -55,8 +55,6 @@ typedef struct {
+@@ -58,8 +58,6 @@ typedef struct {
  	char message[P11_MESSAGE_MAX];
  } p11_local;
  
@@ -112,7 +112,7 @@ index 37cb1c8..569f2d2 100644
  p11_mutex_t p11_library_mutex;
  
  p11_mutex_t p11_virtual_mutex;
-@@ -70,9 +68,8 @@ unsigned int p11_forkid = 1;
+@@ -77,9 +75,8 @@ extern locale_t p11_message_locale;
  static char *
  thread_local_message (void)
  {
@@ -124,7 +124,7 @@ index 37cb1c8..569f2d2 100644
  }
  
  static char *
-@@ -89,24 +86,6 @@ uninit_common (void)
+@@ -96,24 +93,6 @@ uninit_common (void)
  
  #ifdef OS_UNIX
  
@@ -149,15 +149,15 @@ index 37cb1c8..569f2d2 100644
  static void
  count_forks (void)
  {
-@@ -121,7 +100,6 @@ p11_library_init_impl (void)
+@@ -128,7 +107,6 @@ p11_library_init_impl (void)
  	p11_debug ("initializing library");
  	p11_mutex_init (&p11_library_mutex);
  	p11_mutex_init (&p11_virtual_mutex);
 -	pthread_key_create (&thread_local, free);
  	p11_message_storage = thread_local_message;
- 
- 	pthread_atfork (NULL, NULL, count_forks);
-@@ -138,12 +116,7 @@ p11_library_uninit (void)
+ #ifdef HAVE_STRERROR_L
+ 	p11_message_locale = newlocale (LC_ALL_MASK, "POSIX", (locale_t) 0);
+@@ -148,15 +126,10 @@ p11_library_uninit (void)
  {
  	uninit_common ();
  
@@ -165,6 +165,9 @@ index 37cb1c8..569f2d2 100644
 -	free (pthread_getspecific (thread_local));
 -	pthread_setspecific (thread_local, NULL);
 -
+ #ifdef HAVE_STRERROR_L
+ 	freelocale (p11_message_locale);
+ #endif
  	p11_message_storage = dont_store_message;
 -	pthread_key_delete (thread_local);
  	p11_mutex_uninit (&p11_virtual_mutex);
@@ -241,3 +244,35 @@ index abff864..7efc30a 100644
 -- 
 2.15.0
 
+
+From 83b286e7300d0b609eec4d6dfdc6fce4381de0ae Mon Sep 17 00:00:00 2001
+From: fbrosson <fbrosson@localhost>
+Date: Tue, 29 May 2018 16:08:23 +0000
+Subject: fix incorrect printf format for pid_t.
+
+
+diff --git a/common/debug.c b/common/debug.c
+index bcf6e21..cf18090 100644
+--- a/common/debug.c
++++ b/common/debug.c
+@@ -140,7 +140,7 @@ p11_debug_message (int flag,
+ 	va_list args;
+ 
+ 	if (flag & p11_debug_current_flags) {
+-		fprintf (stderr, "(p11-kit:%d) ", getpid());
++		fprintf (stderr, "(p11-kit:%ld) ", getpid());
+ 		va_start (args, format);
+ 		vfprintf (stderr, format, args);
+ 		va_end (args);
+@@ -157,7 +157,7 @@ p11_debug_message_err (int flag,
+ 	char strerr[P11_DEBUG_MESSAGE_MAX];
+ 
+ 	if (flag & p11_debug_current_flags) {
+-		fprintf (stderr, "(p11-kit:%d) ", getpid());
++		fprintf (stderr, "(p11-kit:%ld) ", getpid());
+ 		va_start (args, format);
+ 		vfprintf (stderr, format, args);
+ 		va_end (args);
+-- 
+2.17.0
+