From cd09274aa2c59b5a06508ed00bf5bded7b7b6213 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Fri, 6 May 2022 17:31:40 +0900
Subject: security/opencryptoki: update to 3.18.0

---
 .../opencryptoki/files/patch-usr-lib-common-trace.c  | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'security/opencryptoki/files/patch-usr-lib-common-trace.c')

diff --git a/security/opencryptoki/files/patch-usr-lib-common-trace.c b/security/opencryptoki/files/patch-usr-lib-common-trace.c
index 8af744f2dced..fbc6fefa6289 100644
--- a/security/opencryptoki/files/patch-usr-lib-common-trace.c
+++ b/security/opencryptoki/files/patch-usr-lib-common-trace.c
@@ -1,14 +1,26 @@
---- usr/lib/common/trace.c.orig	2018-11-16 14:53:03 UTC
+--- usr/lib/common/trace.c.orig	2022-04-25 11:04:51 UTC
 +++ usr/lib/common/trace.c
-@@ -21,6 +21,7 @@
- #include <unistd.h>
+@@ -23,7 +23,10 @@
  #include <sys/file.h>
  #include <sys/types.h>
+ #include <sys/syscall.h>
 +#include <sys/stat.h>
  
++#include <pthread_np.h>
++
  #include "pkcs11types.h"
  #include "defs.h"
-@@ -170,7 +171,7 @@ CK_RV trace_initialize(void)
+ #include "host_defs.h"
+@@ -34,7 +37,7 @@
+ #ifdef SYS_gettid
+ #define __gettid() syscall(SYS_gettid)
+ #else
+-#define __gettid() gettid()
++#define __gettid() pthread_getthreadid_np()
+ #endif
+ 
+ pthread_mutex_t tlmtx = PTHREAD_MUTEX_INITIALIZER;
+@@ -178,7 +181,7 @@ CK_RV trace_initialize(void)
          return (CKR_FUNCTION_FAILED);
      }
  
-- 
cgit v1.2.3