diff --git a/bug399589.patch b/bug399589.patch new file mode 100644 index 0000000..052aa93 --- /dev/null +++ b/bug399589.patch @@ -0,0 +1,57 @@ +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, } + }; + diff --git a/seamonkey-mozconfig b/seamonkey-mozconfig index b813a2e..919e257 100644 --- a/seamonkey-mozconfig +++ b/seamonkey-mozconfig @@ -20,6 +20,9 @@ ac_add_options --enable-extensions=default,irc ac_add_options --enable-application=suite ac_add_options --enable-crypto +#bug 432138 +ac_cv_visibility_pragma=no + export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/seamonkey.spec b/seamonkey.spec index 4dd6c6b..9e827eb 100644 --- a/seamonkey.spec +++ b/seamonkey.spec @@ -11,7 +11,7 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor Version: 1.1.8 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPLv1.1 Group: Applications/Internet @@ -49,6 +49,7 @@ Patch220: seamonkey-fedora-home-page.patch Patch225: mozilla-nspr-packages.patch Patch301: mozilla-1.7.3-gnome-vfs-default-app.patch Patch304: mozilla-1.7.5-g-application-name.patch +Patch305: bug399589.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nspr-devel >= %{minimum_build_nspr_version} @@ -132,6 +133,7 @@ application formerly known as Mozilla Application Suite. %patch225 -p1 %patch301 -p1 %patch304 -p0 +%patch305 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -433,6 +435,9 @@ update-desktop-database %{_datadir}/applications %changelog +* Fri Feb 09 2008 Kai Engert - 1.1.8-2 +- make it build with nss 3.12, mozilla bug 399589 +- work around an issue with gcc 4.3.0, redhat bug 432138 * Fri Feb 08 2008 Kai Engert - 1.1.8-2 - SeaMonkey 1.1.8 * Mon Jan 07 2008 Kai Engert - 1.1.7-4