rpms/thunderbird/devel thunderbird-2.0.0.12-SECAlgorithmID.patch, NONE, 1.1 thunderbird.spec, 1.112, 1.113

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32343

Modified Files:
	thunderbird.spec 
Added Files:
	thunderbird-2.0.0.12-SECAlgorithmID.patch 
Log Message:
Also need thunderbird-2.0.0.12-SECAlgorithmID.patch from 
https://bugzilla.mozilla.org/show_bug.cgi?id=399589 to compile


thunderbird-2.0.0.12-SECAlgorithmID.patch:

--- NEW FILE thunderbird-2.0.0.12-SECAlgorithmID.patch ---
---
 security/manager/ssl/src/nsKeygenHandler.cpp |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Index: mozilla/security/manager/ssl/src/nsKeygenHandler.cpp
===================================================================
--- mozilla.orig/security/manager/ssl/src/nsKeygenHandler.cpp	2005-07-20 21:31:22.000000000 +0200
+++ mozilla/security/manager/ssl/src/nsKeygenHandler.cpp	2008-02-02 00:08:05.000000000 +0100
@@ -70,16 +70,25 @@
 
 //All possible key size choices.
 static SECKeySizeChoiceInfo SECKeySizeChoiceList[] = {
     { nsnull, 2048 },
     { nsnull, 1024 },
     { nsnull, 0 }, 
 };
 
+DERTemplate SECAlgorithmIDTemplate[] = {
+    { DER_SEQUENCE,
+	  0, NULL, sizeof(SECAlgorithmID) },
+    { DER_OBJECT_ID,
+	  offsetof(SECAlgorithmID,algorithm), },
+    { DER_OPTIONAL | DER_ANY,
+	  offsetof(SECAlgorithmID,parameters), },
+    { 0, }
+};
 
 DERTemplate CERTSubjectPublicKeyInfoTemplate[] = {
     { DER_SEQUENCE,
           0, nsnull, sizeof(CERTSubjectPublicKeyInfo) },
     { DER_INLINE,
           offsetof(CERTSubjectPublicKeyInfo,algorithm),
           SECAlgorithmIDTemplate, },
     { DER_BIT_STRING,
@@ -90,26 +99,16 @@
 DERTemplate CERTPublicKeyAndChallengeTemplate[] =
 {
     { DER_SEQUENCE, 0, nsnull, sizeof(CERTPublicKeyAndChallenge) },
     { DER_ANY, offsetof(CERTPublicKeyAndChallenge,spki), },
     { DER_IA5_STRING, offsetof(CERTPublicKeyAndChallenge,challenge), },
     { 0, }
 };
 
-DERTemplate SECAlgorithmIDTemplate[] = {
-    { DER_SEQUENCE,
-	  0, NULL, sizeof(SECAlgorithmID) },
-    { DER_OBJECT_ID,
-	  offsetof(SECAlgorithmID,algorithm), },
-    { DER_OPTIONAL | DER_ANY,
-	  offsetof(SECAlgorithmID,parameters), },
-    { 0, }
-};
-
 const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = {
     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) },
     { SEC_ASN1_INTEGER, offsetof(PQGParams,prime) },
     { SEC_ASN1_INTEGER, offsetof(PQGParams,subPrime) },
     { SEC_ASN1_INTEGER, offsetof(PQGParams,base) },
     { 0, }
 };
 


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- thunderbird.spec	27 Feb 2008 01:57:41 -0000	1.112
+++ thunderbird.spec	27 Feb 2008 14:19:33 -0000	1.113
@@ -32,6 +32,7 @@
 Patch1:         firefox-2.0-link-layout.patch
 Patch2:         firefox-1.0-prdtoa.patch
 Patch3:         thunderbird-2.0.0.12-gcc43.patch
+Patch4:         thunderbird-2.0.0.12-SECAlgorithmID.patch
 
 Patch10:        thunderbird-0.7.3-psfonts.patch
 Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
@@ -104,6 +105,7 @@
 %patch1 -p1 -b .link-layout
 %patch2 -p0
 %patch3 -p0 -b .gcc43
+%patch4 -p1 -b .SECAlgorithmID
 
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader