Wolfgang Rosenauer 2010-10-19 22:30:24 +00:00 committed by Git OBS Bridge
parent 1ae193c0b5
commit 19f4f25b31
9 changed files with 43 additions and 96 deletions

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Wed Oct 6 23:19:15 CEST 2010 - wr@rosenauer.org
- security update to version 3.1.5 (bnc#645315)
* MFSA 2010-64/CVE-2010-3174/CVE-2010-3175/CVE-2010-3176
Miscellaneous memory safety hazards
* MFSA 2010-65/CVE-2010-3179 (bmo#583077)
Buffer overflow and memory corruption using document.write
* MFSA 2010-66/CVE-2010-3180 (bmo#588929)
Use-after-free error in nsBarProp
* MFSA 2010-67/CVE-2010-3183 (bmo#598669)
Dangling pointer vulnerability in LookupGetterOrSetter
* MFSA 2010-69/CVE-2010-3178 (bmo#576616)
Cross-site information disclosure via modal calls
* MFSA 2010-70/CVE-2010-3170 (bmo#578697)
SSL wildcard certificate matching IP addresses
* MFSA 2010-71/CVE-2010-3182 (bmo#590753, bnc#642502)
Unsafe library loading vulnerabilities
* MFSA 2010-72/CVE-2010-3173
Insecure Diffie-Hellman key exchange
* new extra locales
* removed upstreamed mozilla-helper-app.patch
- require mozilla-nss >= 3.12.8
-------------------------------------------------------------------
Wed Sep 15 08:19:49 CEST 2010 - wr@rosenauer.org

View File

@ -1,5 +1,5 @@
#
# spec file for package MozillaThunderbird (Version 3.1.4)
# spec file for package MozillaThunderbird (Version 3.1.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2010 Wolfgang Rosenauer <wr@rosenauer.org>
@ -20,15 +20,16 @@
Name: MozillaThunderbird
BuildRequires: autoconf213 fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel mozilla-nss-devel python startup-notification-devel unzip update-desktop-files zip
BuildRequires: autoconf213 fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files zip
BuildRequires: mozilla-nss-devel >= 3.12.8
%if %suse_version > 1100
BuildRequires: nss-shared-helper-devel
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
%define mainversion 3.1.4
%define mainversion 3.1.5
Version: %{mainversion}
Release: 1
%define releasedate 2010091400
%define releasedate 2010101300
Summary: The Stand-Alone Mozilla Mail Component
Url: http://www.mozilla.org/products/thunderbird/
Group: Productivity/Networking/Email/Clients
@ -46,7 +47,6 @@ Source10: create-tar.sh
Patch2: thunderbird-appname.patch
Patch4: tb-ssldap.patch
Patch5: tb-develdirs.patch
Patch8: mozilla-helper-app.patch
Patch9: mozilla-shared-nss-db.patch
Patch10: mozilla-gdk-pixbuf.patch
Patch11: thunderbird-shared-nss-db.patch
@ -95,7 +95,7 @@ of MozillaThunderbird.
%package translations-other
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Summary: Extra translations for MozillaThunderbird
Provides: locale(%{name}:af;be;bg;bn_BD;el;et;eu;fy_NL;ga_IE;he;id;is;lt;nn_NO;pa_IN;ro;si;sk;sl;sq;tr;uk;vi)
Provides: locale(%{name}:af;be;bg;bn_BD;el;et;eu;fy_NL;ga_IE;gd;gl;he;id;is;lt;nn_NO;pa_IN;ro;si;sk;sl;sq;sr;tr;uk;vi)
Group: System/Localization
PreReq: %{name} = %{mainversion}
Obsoletes: %{name}-translations < %{version}-%{release}
@ -157,7 +157,6 @@ This package contains the Enigmail OpenPGP Addon for Thunderbird and SeaMonkey.
%endif
# xulrunner patches
pushd mozilla
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch13 -p1
@ -408,6 +407,7 @@ exit 0
%attr(755,root,root) %{progdir}/add-plugins.sh
%dir %{progdir}
%{progdir}/application.ini
%{progdir}/blocklist.xml
%{progdir}/res/
%{progdir}/README.txt
%{progdir}/libldap60.so

View File

@ -2,8 +2,8 @@
BRANCH="releases/comm-1.9.2" # comm-central
RELEASE_TAG="THUNDERBIRD_3_1_4_RELEASE"
VERSION="3.1.4"
RELEASE_TAG="THUNDERBIRD_3_1_5_RELEASE"
VERSION="3.1.5"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH thunderbird

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cd1e3d7b18a56d2d7153ffe7d2b7b23c97b5e697cc223e1343904861e8bcaedf
size 17904529

3
l10n-3.1.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e4f9bad6f668b2540457c6e302d56f6cdd707f0f0a323474d9197b5c7b7bfd3
size 20463163

View File

@ -1,77 +0,0 @@
From: Wolfgang Rosenauer <wr@rosenauer.org>
Subject: no helper app for application/octet-stream but recognized extensions
References:
https://bugzilla.novell.com/show_bug.cgi?id=406979
https://bugzilla.mozilla.org/show_bug.cgi?id=327323
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -47,6 +47,7 @@
#include "nsMIMEInfoUnix.h"
#include "nsGNOMERegistry.h"
#include "nsIGnomeVFSService.h"
+#include "nsAutoPtr.h"
#ifdef MOZ_ENABLE_DBUS
#include "nsDBusHandlerApp.h"
#endif
@@ -74,13 +75,16 @@ NS_IMETHODIMP
nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval)
{
*_retval = PR_FALSE;
- nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
- if (vfs) {
- nsCOMPtr<nsIGnomeVFSMimeApp> app;
- if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
- *_retval = PR_TRUE;
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mType);
+ if (!mimeInfo) {
+ nsCAutoString ext;
+ GetPrimaryExtension(ext);
+ mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
}
+ if (mimeInfo)
+ *_retval = PR_TRUE;
+
if (*_retval)
return NS_OK;
@@ -113,6 +117,16 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
return app->Launch(nativePath);
+
+ // If we haven't got an app we try to get a valid one by searching for the
+ // extension mapped type
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
+ if (mimeInfo) {
+ nsCAutoString type;
+ mimeInfo->GetType(type);
+ if (NS_SUCCEEDED(vfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
+ return app->Launch(nativePath);
+ }
}
if (!mDefaultApplication)
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
@@ -1580,8 +1580,16 @@ nsOSHelperAppService::GetMIMEInfoFromOS(
return retval;
}
- // Copy the attributes of retval onto miByExt, to return it
+ // Copy the attributes of retval (mimeinfo from type) onto miByExt, to
+ // return it
+ // but reset to just collected mDefaultAppDescription (from ext)
+ // and preserve the primary extension as well
+ nsAutoString byExtDefault;
+ miByExt->GetDefaultDescription(byExtDefault);
+ retval->SetDefaultDescription(byExtDefault);
retval->CopyBasicDataTo(miByExt);
+ if (!aFileExt.IsEmpty())
+ miByExt->SetPrimaryExtension(aFileExt);
miByExt.swap(retval);
}

View File

@ -72,7 +72,7 @@ fi
MOZILLA_FIVE_HOME="$MOZ_DIST_LIB"
export MOZILLA_FIVE_HOME
LD_LIBRARY_PATH=$MOZ_DIST_LIB:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
# ignore composite extension (needed for Flash)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:896db9ec577101bff83ed1083e3f33c137d4509fd774be83a2d530913170b6f0
size 66070688

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:673d90fee828283494a626b31a9d6e79ca03d9c44f25f89ff8ee477bbf6285bd
size 66143857