[gnome-keyring] pkcs11: Don't install p11-kit module configuration
- From: Daiki Ueno <dueno src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] pkcs11: Don't install p11-kit module configuration
- Date: Thu, 1 Mar 2018 13:25:18 +0000 (UTC)
commit 5d8326eaf1ebce1cde2ee797c03f261da3159aae
Author: Ray Strode <rstrode redhat com>
Date: Fri Dec 8 13:17:45 2017 -0500
pkcs11: Don't install p11-kit module configuration
It doesn't work well in multithreaded environments, and it overlaps
with better maintained options like SoftHSM. To avoid any confusion,
stop installing the p11-kit configuration for that module so that it
is not registered by default.
https://bugzilla.gnome.org/show_bug.cgi?id=791401
.gitignore | 3 ---
configure.ac | 1 -
pkcs11/rpc-layer/Makefile.am | 5 -----
pkcs11/rpc-layer/gnome-keyring.module.in | 7 -------
4 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f153d29..106e9df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,9 +146,6 @@ depcomp
/pkcs11/gnome2-store/tests/check-gnome2-module
/pkcs11/gnome2-store/tests/check-module
-/pkcs11/rpc-layer/gnome-keyring-module
-/pkcs11/rpc-layer/gnome-keyring.module
-
/pkcs11/secret-store/tests/test-secret-binary
/pkcs11/secret-store/tests/test-secret-collection
/pkcs11/secret-store/tests/test-secret-compat
diff --git a/configure.ac b/configure.ac
index 6a04be5..3a6a196 100644
--- a/configure.ac
+++ b/configure.ac
@@ -638,7 +638,6 @@ AC_SUBST(P11_TESTS_LIBS)
AC_OUTPUT([
Makefile
-pkcs11/rpc-layer/gnome-keyring.module
po/Makefile.in
])
diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
index ccdff91..c6443d6 100644
--- a/pkcs11/rpc-layer/Makefile.am
+++ b/pkcs11/rpc-layer/Makefile.am
@@ -45,11 +45,6 @@ gnome_keyring_pkcs11_la_LDFLAGS = \
-module -avoid-version \
-no-undefined -export-symbols-regex 'C_GetFunctionList'
-# This is the configuration file that p11-kit uses to load the module
-pkcs11configdir = $(P11_SYSTEM_CONFIG_MODULES)
-pkcs11config_DATA = \
- pkcs11/rpc-layer/gnome-keyring.module
-
# -----------------------------------------------------------------------------
# The tests
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]