Work with latest version of nss-devel.

This commit is contained in:
Jack Magne 2008-02-14 23:58:51 +00:00
parent fca182140c
commit 042f1c3eda
2 changed files with 17 additions and 1 deletions

View File

@ -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 <jmagne@redhat.com>
- Fix xulrunner build problem.
* Fri Jan 18 2008 Jack Magne <jmagne@redhat.com>
- Fix tray icon menu issue #253248.
* Thu Aug 30 2007 Jack Magne <jmagne@redhat.com>

12
firefox.secalg.patch Normal file
View File

@ -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