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

src/tcs/rpc/tcstp/rpc_pcr_extend.c

Index: src/tcs/rpc/tcstp/rpc_pcr_extend.c
diff --git a/src/tcs/rpc/tcstp/rpc_pcr_extend.c b/src/tcs/rpc/tcstp/rpc_pcr_extend.c
index 050ca38baa0692340135065e3ca0f8b0e062df3f..e9fd9cd193063666bcc5b82a7a786e1eed75b915 100644
--- a/src/tcs/rpc/tcstp/rpc_pcr_extend.c
+++ b/src/tcs/rpc/tcstp/rpc_pcr_extend.c
@@ -39,7 +39,7 @@ tcs_wrap_Extend(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, &pcrIndex, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -75,7 +75,7 @@ tcs_wrap_PcrRead(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, &pcrIndex, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -109,7 +109,7 @@ tcs_wrap_PcrReset(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, &pcrDataSizeIn, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);