[firefox-esteidpkcs11loader] Use onepin module patch with opensc 0.14

mihkel mihkel at fedoraproject.org
Wed Nov 12 20:31:32 UTC 2014


commit 5bfcea9fa846d709475123f672dffc0ddedaa24a
Author: Mihkel Vain <mihkel at fedoraproject.org>
Date:   Wed Nov 12 22:31:13 2014 +0200

    Use onepin module patch with opensc 0.14

 firefox-esteidpkcs11loader.spec |    9 +++++++--
 use_onepin.patch                |   17 +++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/firefox-esteidpkcs11loader.spec b/firefox-esteidpkcs11loader.spec
index 1cdd10c..dd599b7 100644
--- a/firefox-esteidpkcs11loader.spec
+++ b/firefox-esteidpkcs11loader.spec
@@ -2,13 +2,14 @@
 
 Name:           firefox-esteidpkcs11loader
 Version:        3.8.0.1052
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Estonian ID card extension for Mozilla
 License:        LGPLv2+
 URL:            http://www.ria.ee
 Source:         https://installer.id.ee/media/sources/%{source_name}-%{version}.tar.gz
 BuildArch:      noarch
-
+# This patch neeeds opensc 0.14
+Patch0:         use_onepin.patch
 
 BuildRequires:  cmake
 Requires:       esteidcerts
@@ -25,6 +26,7 @@ Loads PKCS#11 module for web authentication with smart cards.
 
 %prep
 %setup -q -n %{source_name}-%{version}
+%patch0 -p0
 %{cmake} .
 
 %build
@@ -40,6 +42,9 @@ make install DESTDIR=%{buildroot}
 
 
 %changelog
+* Wed Nov 12 2014 Mihkel Vain <mihkel at fedoraproject.org> - 3.8.0.1052-4
+- Use onepin module patch with opensc 0.14
+
 * Sun Jun 22 2014 Mihkel Vain <mihkel at fedoraproject.org> - 3.8.0.1052-3
 - Rename package to firefox-esteidpkcs11loader and obsolete mozilla-esteid
 
diff --git a/use_onepin.patch b/use_onepin.patch
new file mode 100644
index 0000000..aa1eaca
--- /dev/null
+++ b/use_onepin.patch
@@ -0,0 +1,17 @@
+--- chrome_orig/content/pkcs11-loader.js	2014-07-22 21:09:08.410572162 +0300
++++ chrome/content/pkcs11-loader.js	2014-07-22 21:09:57.970722383 +0300
+@@ -59,10 +59,10 @@
+   if (platform == "Macintosh") {
+     moduleDll = "/Library/EstonianIDCard/lib/esteid-pkcs11.so";
+   } else if (platform == "X11") {
+-    [ "/usr/lib64/opensc-pkcs11.so",
+-      "/usr/lib/x86_64-linux-gnu/opensc-pkcs11.so",
+-      "/usr/lib/i386-linux-gnu/opensc-pkcs11.so",
+-      "/usr/lib/opensc-pkcs11.so"
++    [ "/usr/lib64/onepin-opensc-pkcs11.so",
++      "/usr/lib/x86_64-linux-gnu/onepin-opensc-pkcs11.so",
++      "/usr/lib/i386-linux-gnu/onepin-opensc-pkcs11.so",
++      "/usr/lib/onepin-opensc-pkcs11.so"
+     ].forEach(function(path) {
+       log(path);
+       var f = Cc[nsFile].createInstance(Ci.nsILocalFile);


More information about the scm-commits mailing list