File p11-kit-0.20.1-shlext.patch of Package mingw32-p11-kit
---
configure.ac | 4 ++++
p11-kit/Makefile.am | 2 +-
p11-kit/p11-kit-1.pc.in | 2 +-
trust/Makefile.am | 5 ++++-
trust/p11-kit-trust.module.in | 17 +++++++++++++++++
5 files changed, 27 insertions(+), 3 deletions(-)
Index: p11-kit-0.23.2/configure.ac
===================================================================
--- p11-kit-0.23.2.orig/configure.ac
+++ p11-kit-0.23.2/configure.ac
@@ -491,6 +491,9 @@ case "$host" in
# https://bugs.freedesktop.org/show_bug.cgi?id=57714
SHLEXT='.so'
;;
+*mingw*)
+ SHLEXT='.dll'
+ ;;
*)
eval SHLEXT=$shrext_cmds
;;
@@ -509,6 +512,7 @@ AC_CONFIG_FILES([Makefile
p11-kit/p11-kit-1.pc
p11-kit/pkcs11.conf.example
trust/trust-extract-compat
+ trust/p11-kit-trust.module
trust/test-extract
])
AC_OUTPUT
Index: p11-kit-0.23.2/p11-kit/Makefile.am
===================================================================
--- p11-kit-0.23.2.orig/p11-kit/Makefile.am
+++ p11-kit-0.23.2/p11-kit/Makefile.am
@@ -87,7 +87,7 @@ libp11_kit_testable_la_CFLAGS = \
# Proxy module is actually same as library, so install a link
install-exec-hook:
- $(LN_S) -f `readlink $(DESTDIR)$(libdir)/libp11-kit.so` $(DESTDIR)$(libdir)/p11-kit-proxy.so
+ $(LN_S) -f `readlink $(DESTDIR)$(libdir)/libp11-kit@SHLEXT@` $(DESTDIR)$(libdir)/p11-kit-proxy@SHLEXT@
$(MKDIR_P) $(DESTDIR)$(p11_package_config_modules)
endif
Index: p11-kit-0.23.2/p11-kit/p11-kit-1.pc.in
===================================================================
--- p11-kit-0.23.2.orig/p11-kit/p11-kit-1.pc.in
+++ p11-kit-0.23.2/p11-kit/p11-kit-1.pc.in
@@ -8,7 +8,7 @@ pkgdatadir=@datadir@/p11-kit
sysconfdir=@sysconfdir@
p11_module_configs=@p11_package_config_modules@
p11_module_path=@p11_module_path@
-proxy_module=@libdir@/p11-kit-proxy.so
+proxy_module=@libdir@/p11-kit-proxy@SHLEXT@
# This is for compatibility. Other packages were using this to determine
# the directory they should install their module configs to, so override
Index: p11-kit-0.23.2/trust/Makefile.am
===================================================================
--- p11-kit-0.23.2.orig/trust/Makefile.am
+++ p11-kit-0.23.2/trust/Makefile.am
@@ -110,7 +110,10 @@ externaldir = $(privatedir)
external_SCRIPTS = \
trust/trust-extract-compat
-EXTRA_DIST += \
+EXTRA_DIST = \
+ trust/p11-kit-trust.module.in
+
+BUILD_EXTRA_DIST = \
trust/p11-kit-trust.module
asn:
Index: p11-kit-0.23.2/trust/p11-kit-trust.module.in
===================================================================
--- /dev/null
+++ p11-kit-0.23.2/trust/p11-kit-trust.module.in
@@ -0,0 +1,17 @@
+# See pkcs11.conf(5) to understand this file
+
+# This is a module config for the 'included' p11-kit trust module
+module: p11-kit-trust@SHLEXT@
+
+# This setting affects the order that trust policy and other information
+# is looked up when going across various modules. Other trust policy modules
+# need to specify the priority where they slot into things.
+priority: 1
+
+# Mark this module as a viable source of trust policy information
+trust-policy: yes
+
+# This is for drop-in compatibilty with glib-networking and gcr. Those
+# projects used this non-standard attribute to denote slots to use to
+# retrieve trust information.
+x-trust-lookup: pkcs11:library-description=PKCS%2311%20Kit%20Trust%20Module