diff options
author | Daiki Ueno <ueno@gnu.org> | 2018-12-29 15:35:14 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2018-12-29 15:35:14 +0000 |
commit | 2d03ae466eb3b02b74466b396624debddc377fcf (patch) | |
tree | b86b90bcf47d5cbfa133bedfda5b3fb630446a8a | |
parent | c897a1633b3da2da1b766f50e405dbd727a63dde (diff) | |
parent | a955ae82a9828ec115bc6fadd56abe00bc49f3ae (diff) | |
download | gnome-keyring-2d03ae466eb3b02b74466b396624debddc377fcf.tar.gz |
Merge branch 'mjog/reinstate-p11kit-module' into 'master'
Revert "pkcs11: Don't install p11-kit module configuration"
Closes #20
See merge request GNOME/gnome-keyring!7
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | pkcs11/rpc-layer/Makefile.am | 5 | ||||
-rw-r--r-- | pkcs11/rpc-layer/gnome-keyring.module.in | 7 |
4 files changed, 16 insertions, 0 deletions
@@ -146,6 +146,9 @@ 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 a240536e..5572752d 100644 --- a/configure.ac +++ b/configure.ac @@ -649,6 +649,7 @@ 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 c6443d67..ccdff919 100644 --- a/pkcs11/rpc-layer/Makefile.am +++ b/pkcs11/rpc-layer/Makefile.am @@ -45,6 +45,11 @@ 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 diff --git a/pkcs11/rpc-layer/gnome-keyring.module.in b/pkcs11/rpc-layer/gnome-keyring.module.in new file mode 100644 index 00000000..3ee20181 --- /dev/null +++ b/pkcs11/rpc-layer/gnome-keyring.module.in @@ -0,0 +1,7 @@ + +# The file is installed/loaded from the default module p11-kit directory +module: gnome-keyring-pkcs11.so + +# And where to store and lookup trust objects +x-trust-store: pkcs11:library-manufacturer=GNOME%20Keyring;serial=1:XDG:DEFAULT +x-trust-lookup: pkcs11:library-manufacturer=GNOME%20Keyring |