[esteid-browser-plugin] Use certificates from the esteidcerts package

Kalev Lember kalev at fedoraproject.org
Sat May 3 10:44:30 UTC 2014


commit debbe4520dd22916f6b42e8d87ed356c92300b67
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat May 3 12:39:40 2014 +0200

    Use certificates from the esteidcerts package

 esteid-browser-plugin-esteidcerts.patch |   11 +++++++++++
 esteid-browser-plugin.spec              |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/esteid-browser-plugin-esteidcerts.patch b/esteid-browser-plugin-esteidcerts.patch
new file mode 100644
index 0000000..c4d6021
--- /dev/null
+++ b/esteid-browser-plugin-esteidcerts.patch
@@ -0,0 +1,11 @@
+--- esteid-browser-plugin-1.3.4/Mozilla/chrome/content/config.js.esteidcerts	2014-05-03 12:36:29.614449164 +0200
++++ esteid-browser-plugin-1.3.4/Mozilla/chrome/content/config.js	2014-05-03 12:36:53.375447939 +0200
+@@ -237,7 +237,7 @@
+             moduleDlls = [ "/Library/OpenSC/lib/" + soName + ".so" ];
+         } else if (platform == "X11") { // Linux/Unix
+             var libdir = (bits == 64) ? "/usr/lib64/" : "/usr/lib/";
+-            certDir = "/etc/digidocpp/certs";
++            certDir = "/usr/share/esteid/certs";
+             moduleDlls = [ libdir + soName + ".so",
+                            libdir + "pkcs11/" + soName + ".so",
+                            "/usr/pkg/lib/" + soName + ".so",
diff --git a/esteid-browser-plugin.spec b/esteid-browser-plugin.spec
index 1d210eb..53c9ad2 100644
--- a/esteid-browser-plugin.spec
+++ b/esteid-browser-plugin.spec
@@ -12,7 +12,7 @@
 
 Name:           esteid-browser-plugin
 Version:        1.3.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Estonian ID card digital signing browser plugin
 
 # The source files from esteid-browser-plugin and Firebreath are compiled
@@ -35,6 +35,8 @@ Source1:        http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2
 
 # onepin-opensc-pkcs11.so is gone in opensc 0.13.0
 Patch1:         esteid-browser-plugin-opensc-0.13.patch
+# Use certificates from the esteidcerts package
+Patch2:         esteid-browser-plugin-esteidcerts.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -56,7 +58,7 @@ access for web sites in an editable whitelist.
 Summary:        Estonian ID card Mozilla extension
 BuildArch:      noarch
 Requires:       esteid-browser-plugin = %{version}-%{release}
-Requires:       %{_sysconfdir}/digidocpp/certs
+Requires:       esteidcerts
 Requires:       opensc >= 0.13.0
 Obsoletes:      thunderbird-esteid < 1.2.1
 
@@ -135,6 +137,9 @@ done
 
 
 %changelog
+* Sat May 03 2014 Kalev Lember <kalevlember at gmail.com> - 1.3.4-4
+- Use certificates from the esteidcerts package
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list