From 7a0ae053fb66d6e8de157608969244dfc30739bdc1060f63cf14ae6c0338e5a9 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 26 Mar 2008 15:01:59 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=21

---
 MozillaThunderbird.changes |  6 ++++
 MozillaThunderbird.spec    |  7 ++++-
 mozilla-missing-decl.patch | 61 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-missing-decl.patch

diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index 9f3bfcc..844c8b6 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 24 20:17:09 CET 2008 - maw@suse.de
+
+- Add mozilla-missing-decl.patch, which is necessary when building
+  against new versions of mozilla-nss (bmo#399589).
+
 -------------------------------------------------------------------
 Fri Mar  7 18:34:42 CET 2008 - maw@suse.de
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index c14c454..61b7773 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -15,7 +15,7 @@ Name:           MozillaThunderbird
 BuildRequires:  fdupes gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel unzip update-desktop-files zip
 License:        GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
 Version:        2.0.0.12
-Release:        1
+Release:        7
 Summary:        The Stand-Alone Mozilla Mail Component
 Url:            http://www.mozilla.org/products/thunderbird/
 Group:          Productivity/Networking/Email/Clients
@@ -51,6 +51,7 @@ Patch26:        cups-paper.patch
 Patch27:        thunderbird-1.5.0.8-uninitalized-vars-232305.patch
 #Patch28:        thunderbird-gcc4.3-fixes.patch
 Patch29:        visibility.patch
+Patch30:        mozilla-missing-decl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         libstdc++ fileutils textutils /bin/sh
 %if %suse_version > 1000
@@ -181,6 +182,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch26
 %patch27 -p0
 # %patch28 -p1
+%patch30 -p1
 
 %build
 export MOZ_BUILD_DATE=%{releasedate}
@@ -669,6 +671,9 @@ exit 0
 %{_bindir}/thunderbird-config
 
 %changelog
+* Mon Mar 24 2008 maw@suse.de
+- Add mozilla-missing-decl.patch, which is necessary when building
+  against new versions of mozilla-nss (bmo#399589).
 * Fri Mar 07 2008 maw@suse.de
 - Security update to version 2.0.0.12 (bnc#354469)
   * MFSA 2008-12 Buffer overflow in external MIME bodies
diff --git a/mozilla-missing-decl.patch b/mozilla-missing-decl.patch
new file mode 100644
index 0000000..4395f9c
--- /dev/null
+++ b/mozilla-missing-decl.patch
@@ -0,0 +1,61 @@
+---
+ 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, }
+ };
+