1
0

- update to version 8.0 (bnc#728520)

* MFSA 2011-47/CVE-2011-3648 (bmo#690225)
    Potential XSS against sites using Shift-JIS
  * MFSA 2011-48/CVE-2011-3651/CVE-2011-3652/CVE-2011-3654
    Miscellaneous memory safety hazards
  * MFSA 2011-49/CVE-2011-3650 (bmo#674776)
    Memory corruption while profiling using Firebug
  * MFSA 2011-52/CVE-2011-3655 (bmo#672182)
    Code execution via NoWaiverWrapper
- rebased patches
- update enigmail to 1.3.3

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=142
This commit is contained in:
Wolfgang Rosenauer 2011-11-09 12:52:23 +00:00 committed by Git OBS Bridge
parent 30c89a4624
commit 0bda57a54e
13 changed files with 41 additions and 141 deletions

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon Nov 7 20:23:30 UTC 2011 - wr@rosenauer.org
- update to version 8.0 (bnc#728520)
* MFSA 2011-47/CVE-2011-3648 (bmo#690225)
Potential XSS against sites using Shift-JIS
* MFSA 2011-48/CVE-2011-3651/CVE-2011-3652/CVE-2011-3654
Miscellaneous memory safety hazards
* MFSA 2011-49/CVE-2011-3650 (bmo#674776)
Memory corruption while profiling using Firebug
* MFSA 2011-52/CVE-2011-3655 (bmo#672182)
Code execution via NoWaiverWrapper
- rebased patches
- update enigmail to 1.3.3
-------------------------------------------------------------------
Fri Sep 30 09:59:15 UTC 2011 - wr@rosenauer.org

View File

@ -25,10 +25,10 @@ BuildRequires: mozilla-nspr-devel >= 4.8.8
BuildRequires: mozilla-nss-devel >= 3.12.10
BuildRequires: nss-shared-helper-devel
License: MPLv1.1 or GPLv2+ or LGPLv2+
%define mainversion 7.0.1
%define mainversion 8.0
Version: %{mainversion}
Release: 1
%define releasedate 2011092900
%define releasedate 2011110500
Provides: thunderbird = %{version}
Summary: The Stand-Alone Mozilla Mail Component
Url: http://www.mozilla.org/products/thunderbird/
@ -42,16 +42,14 @@ Source4: l10n-%{version}.tar.bz2
Source6: suse-default-prefs.js
Source7: find-external-requires.sh
Source8: MozillaThunderbird-rpmlintrc
Source9: enigmail-1.3.2.tar.gz
Source9: enigmail-1.3.3.tar.gz
Source10: create-tar.sh
Source11: compare-locales.tar.bz2
# Gecko/Toolkit
Patch1: mozilla-shared-nss-db.patch
Patch3: mozilla-language.patch
Patch4: mozilla-linux3.patch
Patch5: mozilla-cairo-return.patch
Patch6: mozilla-dump_syms-static.patch
Patch7: mozilla-curl.patch
Patch2: mozilla-language.patch
Patch3: mozilla-linux3.patch
Patch4: mozilla-dump_syms-static.patch
# Thunderbird/mail
Patch10: tb-ssldap.patch
Patch11: tb-develdirs.patch
@ -140,7 +138,7 @@ symbols meant for upload to Mozilla's crash collector database.
%if %build_enigmail
%package -n enigmail
Version: 1.3.2+%{mainversion}
Version: 1.3.3+%{mainversion}
Release: 1
License: MPLv1.1 or GPLv2+
Summary: OpenPGP addon for Thunderbird and SeaMonkey
@ -166,11 +164,9 @@ This package contains the Enigmail OpenPGP Addon for Thunderbird and SeaMonkey.
# xulrunner patches
pushd mozilla
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
popd
# comm-central patches
%patch10 -p1
@ -280,7 +276,7 @@ for locale in $(awk '{ print $1; }' ../thunderbird/mail/locales/all-locales); do
popd
LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \
make -C mail/locales langpack-$locale || continue
cp -r mozilla/dist/xpi-stage/locale-$locale \
cp -rL mozilla/dist/xpi-stage/locale-$locale \
$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org
# remove prefs and profile defaults from langpack
rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org/defaults
@ -443,7 +439,6 @@ exit 0
%{progdir}/application.ini
%{progdir}/blocklist.xml
%{progdir}/chrome.manifest
%{progdir}/README.txt
%{progdir}/*.so
%{progdir}/mozilla-xremote-client
%{progdir}/omni.jar

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13c43f149789dac5bd32e6c0991136314f4fe1cd7289d655c833ca0e92bb30ad
size 25682
oid sha256:843a2d9c40e7aea08b5ff1d78baf881053362df3c5bd204ce3d3c0d6b7eff064
size 25669

View File

@ -2,8 +2,8 @@
BRANCH="releases/comm-release"
RELEASE_TAG="THUNDERBIRD_7_0_1_RELEASE"
VERSION="7.0.1"
RELEASE_TAG="THUNDERBIRD_8_0_RELEASE"
VERSION="8.0"
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:46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d
size 1371388

3
enigmail-1.3.3.tar.gz Normal file
View File

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

View File

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

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

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

View File

@ -1,21 +0,0 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 43cb27a012f2532add0e9791c1b5a7d0c3b03f9b
Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush'
diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
--- a/gfx/cairo/cairo/src/cairo-surface-wrapper.c
+++ b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
@@ -526,9 +526,12 @@ _cairo_surface_wrapper_fini (cairo_surfa
}
cairo_status_t
_cairo_surface_wrapper_flush (cairo_surface_wrapper_t *wrapper)
{
if (wrapper->target->backend->flush) {
return wrapper->target->backend->flush(wrapper->target);
}
+
+ // this is preliminary to cool down gcc and build checks
+ return CAIRO_STATUS_SUCCESS;
}

View File

@ -1,89 +0,0 @@
# HG changeset patch
# User Evan Shaw <edsrzf@gmail.com>
# Parent 891179411e19ab39f95bd7769c0e58db6f22f9e4
bug 673072 - remove deprecated curl header curl/types.h from Breakpad includes. r=ted
diff --git a/config/system-headers b/config/system-headers
--- a/config/system-headers
+++ b/config/system-headers
@@ -199,17 +199,16 @@ crypt.h
cstddef
cstdio
cstdlib
cstring
ctime
ctype.h
curl/curl.h
curl/easy.h
-curl/types.h
curses.h
cxxabi.h
DateTimeUtils.h
dbus/dbus.h
dbus/dbus-glib.h
dbus/dbus-glib-lowlevel.h
ddeml.h
Debug.h
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -199,17 +199,16 @@ crypt.h
cstddef
cstdio
cstdlib
cstring
ctime
ctype.h
curl/curl.h
curl/easy.h
-curl/types.h
curses.h
cxxabi.h
DateTimeUtils.h
dbus/dbus.h
dbus/dbus-glib.h
dbus/dbus-glib-lowlevel.h
ddeml.h
Debug.h
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
@@ -28,17 +28,16 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "common/linux/http_upload.h"
#include <assert.h>
#include <dlfcn.h>
#include <curl/curl.h>
#include <curl/easy.h>
-#include <curl/types.h>
namespace {
// Callback to get the response data from server.
static size_t WriteCallback(void *ptr, size_t size,
size_t nmemb, void *userp) {
if (!userp)
return 0;
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
@@ -24,17 +24,16 @@
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <curl/curl.h>
#include <curl/easy.h>
-#include <curl/types.h>
#include <dlfcn.h>
#include <iostream>
#include <string>
#include "common/linux/libcurl_wrapper.h"
using std::string;

View File

@ -7,7 +7,7 @@ References:
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS
@@ -577,16 +577,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
@ -31,7 +31,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS)
@@ -8680,16 +8680,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@ -109,7 +109,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
#include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h"
@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
@@ -1748,18 +1755,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@ -167,4 +167,4 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
-framework SystemConfiguration \
-framework QuickTime \
-framework IOKit \
-lcrypto \
-F/System/Library/PrivateFrameworks -framework CoreUI \

View File

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

View File

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