Bug#783961: (no subject)

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

       - debian/control, debian/*.install:
         + Install pkcs11 in its own binary.

This change is strongly related to bug #686843 on BTS.

We thought you might be interested in doing the same


-------------- next part --------------
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/control gnome-keyring-3.16.0/debian/control
--- gnome-keyring-3.16.0.orig/debian/control	2015-07-01 22:39:27.000000000 +0200
+++ gnome-keyring-3.16.0/debian/control	2015-07-01 22:47:53.108825799 +0200
@@ -43,7 +43,7 @@ Depends: ${misc:Depends},
          dbus-x11,
          p11-kit (>= 0.16),
          libcap2-bin [linux-any]
-Recommends: libpam-gnome-keyring
+Recommends: libpam-gnome-keyring, libp11-kit-gnome-keyring
 Breaks: libgnome-keyring0 (<< 3.0),
         seahorse-plugins (<< 3.0)
 Description: GNOME keyring services (daemon and tools)
@@ -55,6 +55,24 @@ Description: GNOME keyring services (dae
  password, and there is also a session keyring which is never stored to
  disk, but forgotten when the session ends.
 
+Package: libp11-kit-gnome-keyring
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+             multiarch-support
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: gnome-keyring (<< 3.6.2-0ubuntu2~)
+Replaces: gnome-keyring (<< 3.6.2-0ubuntu2~)
+Description: GNOME keyring module for the PKCS#11 module loading library
+ gnome-keyring is a daemon in the session, similar to ssh-agent,
+ and other applications can use it to store passwords and other
+ sensitive information.
+ .
+ This package contains a PKCS#11 module that will allow using the GNOME
+ keyring as a certificate database.
+
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/control.in gnome-keyring-3.16.0/debian/control.in
--- gnome-keyring-3.16.0.orig/debian/control.in	2015-07-01 22:40:07.000000000 +0200
+++ gnome-keyring-3.16.0/debian/control.in	2015-07-01 22:47:36.420483673 +0200
@@ -39,7 +39,7 @@ Depends: ${misc:Depends},
          dbus-x11,
          p11-kit (>= 0.16),
          libcap2-bin [linux-any]
-Recommends: libpam-gnome-keyring
+Recommends: libpam-gnome-keyring, libp11-kit-gnome-keyring
 Breaks: libgnome-keyring0 (<< 3.0),
         seahorse-plugins (<< 3.0)
 Description: GNOME keyring services (daemon and tools)
@@ -51,6 +51,24 @@ Description: GNOME keyring services (dae
  password, and there is also a session keyring which is never stored to
  disk, but forgotten when the session ends.
 
+Package: libp11-kit-gnome-keyring
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+             multiarch-support
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: gnome-keyring (<< 3.6.2-0ubuntu2~)
+Replaces: gnome-keyring (<< 3.6.2-0ubuntu2~)
+Description: GNOME keyring module for the PKCS#11 module loading library
+ gnome-keyring is a daemon in the session, similar to ssh-agent,
+ and other applications can use it to store passwords and other
+ sensitive information.
+ .
+ This package contains a PKCS#11 module that will allow using the GNOME
+ keyring as a certificate database.
+
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/gnome-keyring.install gnome-keyring-3.16.0/debian/gnome-keyring.install
--- gnome-keyring-3.16.0.orig/debian/gnome-keyring.install	2015-04-17 14:03:16.000000000 +0200
+++ gnome-keyring-3.16.0/debian/gnome-keyring.install	2015-07-01 22:44:12.832179586 +0200
@@ -7,5 +7,4 @@ usr/share/man/man1/gnome-keyring.1
 usr/share/man/man1/gnome-keyring-daemon.1
 usr/share/p11-kit
 usr/lib/gnome-keyring/devel/*.so
-usr/lib/*/pkcs11/*.so
 etc/xdg/autostart
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/libp11-kit-gnome-keyring.install gnome-keyring-3.16.0/debian/libp11-kit-gnome-keyring.install
--- gnome-keyring-3.16.0.orig/debian/libp11-kit-gnome-keyring.install	1970-01-01 01:00:00.000000000 +0100
+++ gnome-keyring-3.16.0/debian/libp11-kit-gnome-keyring.install	2015-04-08 16:09:49.000000000 +0200
@@ -0,0 +1,2 @@
+usr/lib/*/pkcs11/*.so
+usr/share/p11-kit