From 042f1c3eda14d93761508069cdc20eaa429bd16a Mon Sep 17 00:00:00 2001 From: Jack Magne Date: Thu, 14 Feb 2008 23:58:51 +0000 Subject: [PATCH] Work with latest version of nss-devel. --- esc.spec | 6 +++++- firefox.secalg.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 firefox.secalg.patch diff --git a/esc.spec b/esc.spec index 1839820..9a07a29 100644 --- a/esc.spec +++ b/esc.spec @@ -1,6 +1,6 @@ Name: esc Version: 1.0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Enterprise Security Client Smart Card Client License: GPL+ URL: http://directory.fedora.redhat.com/wiki/CoolKey @@ -17,6 +17,7 @@ Patch6: esc-1.0.1-log-fixes-1.patch Patch7: esc-1.0.1-lic-fix.patch Patch8: esc-1.0.1-misc.patch Patch9: esc-1.0.1-nss-devel-fix.patch +Patch10: firefox.secalg.patch BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel @@ -88,6 +89,7 @@ cd mozilla %patch1 -p1 -b .fix1 %patch2 -p1 -b .fix2 +%patch10 -p1 -b .secalg %build @@ -191,6 +193,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then fi %changelog +* Wed Feb 13 2008 Jack Magne +- Fix xulrunner build problem. * Fri Jan 18 2008 Jack Magne - Fix tray icon menu issue #253248. * Thu Aug 30 2007 Jack Magne diff --git a/firefox.secalg.patch b/firefox.secalg.patch new file mode 100644 index 0000000..355a426 --- /dev/null +++ b/firefox.secalg.patch @@ -0,0 +1,12 @@ +diff -up ./security/manager/ssl/src/nsKeygenHandler.cpp.secalg ./security/manager/ssl/src/nsKeygenHandler.cpp +--- ./security/manager/ssl/src/nsKeygenHandler.cpp.secalg 2008-02-13 17:25:11.000000000 -0800 ++++ ./security/manager/ssl/src/nsKeygenHandler.cpp 2008-02-13 17:26:42.000000000 -0800 +@@ -63,6 +63,8 @@ extern "C" { + #include "nsIGenKeypairInfoDlg.h" + #include "nsNSSShutDown.h" + ++extern DERTemplate SECAlgorithmIDTemplate[]; ++ + //These defines are taken from the PKCS#11 spec + #define CKM_RSA_PKCS_KEY_PAIR_GEN 0x00000000 + #define CKM_DH_PKCS_KEY_PAIR_GEN 0x00000020