|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: Makefile.in
|
|
|
|
|
--- Makefile.in.orig 2014-09-17 13:42:41.000000000 +0200
|
|
|
|
|
+++ Makefile.in 2014-09-18 13:05:59.280395929 +0200
|
|
|
|
|
@@ -1264,7 +1264,7 @@
|
|
|
|
|
--- Makefile.in.orig 2020-01-29 17:42:32.000000000 +0100
|
|
|
|
|
+++ Makefile.in 2020-03-12 20:13:16.002628000 +0100
|
|
|
|
|
@@ -1941,7 +1941,7 @@
|
|
|
|
|
p11-kit/p11-kit.c \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
@ -10,9 +10,18 @@ Index: Makefile.in
|
|
|
|
|
libp11-kit.la \
|
|
|
|
|
libp11-tool.la \
|
|
|
|
|
libp11-common.la \
|
|
|
|
|
@@ -2147,7 +2147,7 @@
|
|
|
|
|
@WITH_TRUST_MODULE_TRUE@libtrust_testable_la_LIBADD = \
|
|
|
|
|
@WITH_TRUST_MODULE_TRUE@ $(LIBTASN1_LIBS)
|
|
|
|
|
|
|
|
|
|
-@WITH_TRUST_MODULE_TRUE@trust_trust_LDADD = \
|
|
|
|
|
+@WITH_TRUST_MODULE_TRUE@trust_trust_LDADD = -static \
|
|
|
|
|
@WITH_TRUST_MODULE_TRUE@ libtrust-data.la \
|
|
|
|
|
@WITH_TRUST_MODULE_TRUE@ libp11-kit.la \
|
|
|
|
|
@WITH_TRUST_MODULE_TRUE@ libp11-common.la \
|
|
|
|
|
Index: common/compat.c
|
|
|
|
|
--- common/compat.c.orig 2014-09-17 09:50:07.000000000 +0200
|
|
|
|
|
+++ common/compat.c 2014-09-18 13:10:51.500424515 +0200
|
|
|
|
|
--- common/compat.c.orig 2020-01-07 16:15:00.000000000 +0100
|
|
|
|
|
+++ common/compat.c 2020-03-12 20:12:13.757486000 +0100
|
|
|
|
|
@@ -39,6 +39,9 @@
|
|
|
|
|
* on older pthreads implementations
|
|
|
|
|
*/
|
|
|
|
|
@ -22,11 +31,11 @@ Index: common/compat.c
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
#include "compat.h"
|
|
|
|
|
|
|
|
|
|
#include "debug.h"
|
|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2014-09-17 13:42:40.000000000 +0200
|
|
|
|
|
+++ configure 2014-09-18 13:05:59.280395929 +0200
|
|
|
|
|
@@ -16007,9 +16007,6 @@
|
|
|
|
|
--- configure.orig 2020-01-29 17:42:31.000000000 +0100
|
|
|
|
|
+++ configure 2020-03-12 20:12:13.759065000 +0100
|
|
|
|
|
@@ -16178,9 +16178,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -37,9 +46,9 @@ Index: configure
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for win32" >&5
|
|
|
|
|
$as_echo_n "checking for win32... " >&6; }
|
|
|
|
|
Index: p11-kit/modules.c
|
|
|
|
|
--- p11-kit/modules.c.orig 2014-09-17 09:50:08.000000000 +0200
|
|
|
|
|
+++ p11-kit/modules.c 2014-09-18 13:05:59.280395929 +0200
|
|
|
|
|
@@ -68,6 +68,7 @@
|
|
|
|
|
--- p11-kit/modules.c.orig 2020-01-07 16:15:00.000000000 +0100
|
|
|
|
|
+++ p11-kit/modules.c 2020-03-12 20:12:13.759347000 +0100
|
|
|
|
|
@@ -69,6 +69,7 @@
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|