Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tcs/rpc/tcstp/rpc_audit.c

Index: src/tcs/rpc/tcstp/rpc_audit.c
diff --git a/src/tcs/rpc/tcstp/rpc_audit.c b/src/tcs/rpc/tcstp/rpc_audit.c
index 323102b6f61630b640e20c63c594e10d39d67f2d..0fcfd180df7ca5441404d3a504c173285381d5b6 100644
--- a/src/tcs/rpc/tcstp/rpc_audit.c
+++ b/src/tcs/rpc/tcstp/rpc_audit.c
@@ -39,7 +39,7 @@ tcs_wrap_SetOrdinalAuditStatus(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &ulOrdinal, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -84,7 +84,7 @@ tcs_wrap_GetAuditDigest(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &startOrdinal, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -158,7 +158,7 @@ tcs_wrap_GetAuditDigestSigned(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &keyHandle, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);