prepare 1.9.2.13/3.6.13 release mozilla-1.9.2
authorWolfgang Rosenauer <wr@rosenauer.org>
Thu, 25 Nov 2010 10:29:35 +0100
branchmozilla-1.9.2
changeset 202 3306109c5899
parent 201 06f5402b858a
child 204 b61163298b02
prepare 1.9.2.13/3.6.13 release
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
mozilla-gdk-pixbuf.patch
mozilla-pkgconfig.patch
mozilla-shared-nss-db.patch
mozilla-xulrunner192/create-tar.sh
mozilla-xulrunner192/mozilla-xulrunner192.changes
mozilla-xulrunner192/mozilla-xulrunner192.spec
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Nov 24 17:37:56 2010 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Thu Nov 25 10:29:35 2010 +0100
@@ -1,8 +1,15 @@
+-------------------------------------------------------------------
+Thu Nov 25 09:28:25 UTC 2010 - wr@rosenauer.org
+
+- security update to 3.6.13 (bnc#)
+- export a versioned provides for "firefox"
+
 -------------------------------------------------------------------
 Wed Oct 27 07:12:14 CEST 2010 - wr@rosenauer.org
 
-- security update to 3.6.12 (bnc#)
-  * CVE-2010-3765
+- security update to 3.6.12 (bnc#649492)
+  * MFSA 2010-73/CVE-2010-3765 (bmo#607222)
+    Heap buffer overflow mixing document.write and DOM insertion
 
 -------------------------------------------------------------------
 Wed Oct  6 07:13:52 CEST 2010 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Nov 24 17:37:56 2010 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Nov 25 10:29:35 2010 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package MozillaFirefox (Version 3.6.12)
+# spec file for package MozillaFirefox (Version 3.6.13)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2010 Wolfgang Rosenauer
@@ -22,7 +22,7 @@
 Name:           MozillaFirefox
 %define xulrunner mozilla-xulrunner192
 BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip
-BuildRequires:  %{xulrunner}-devel = 1.9.2.12
+BuildRequires:  %{xulrunner}-devel = 1.9.2.13
 %if %suse_version > 1020
 BuildRequires:  fdupes
 %endif
@@ -32,11 +32,11 @@
 BuildRequires:  wireless-tools
 %endif
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version:        3.6.12
+Version:        3.6.13
 Provides:       web_browser
 Provides:       firefox = %{version}
 Release:        1
-%define         releasedate 2010102600
+%define         releasedate 2010112400
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
--- a/mozilla-gdk-pixbuf.patch	Wed Nov 24 17:37:56 2010 +0100
+++ b/mozilla-gdk-pixbuf.patch	Thu Nov 25 10:29:35 2010 +0100
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent bad58443f421fd09ef6366d359b8405ed50c3731
+# Parent ca3a2bf92df09c5425fa1b2486366d40ed757fa1
 Fix compilation with Gnome > 2.30
 
 diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
 --- a/toolkit/system/gnome/Makefile.in
 +++ b/toolkit/system/gnome/Makefile.in
-@@ -77,20 +77,22 @@ endif
+@@ -77,21 +77,23 @@ endif
  EXTRA_DSO_LDOPTS += \
  		$(XPCOM_GLUE_LDOPTS) \
  		$(XPCOM_FROZEN_LDOPTS) \
@@ -22,6 +22,7 @@
  include $(topsrcdir)/config/rules.mk
  
  CXXFLAGS += \
+ 	$(MOZ_GTK2_CFLAGS) \
  	$(MOZ_GCONF_CFLAGS) \
  	$(MOZ_GNOMEVFS_CFLAGS) \
  	$(GLIB_CFLAGS) \
--- a/mozilla-pkgconfig.patch	Wed Nov 24 17:37:56 2010 +0100
+++ b/mozilla-pkgconfig.patch	Thu Nov 25 10:29:35 2010 +0100
@@ -115,17 +115,3 @@
 -Libs: -L${sdkdir}/lib -lmozjs
 +Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib -lmozjs
  Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-diff --git a/xulrunner/installer/mozilla-plugin.pc.in b/xulrunner/installer/mozilla-plugin.pc.in
---- a/xulrunner/installer/mozilla-plugin.pc.in
-+++ b/xulrunner/installer/mozilla-plugin.pc.in
-@@ -1,9 +1,9 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
- includedir=%includedir%
- 
- Name: Mozilla Plug-In API
- Description: Mozilla Plug-In API
- Version: %MOZILLA_VERSION%
--Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
-+Cflags: -I${includedir} -DXP_UNIX %ojidef%
- 
--- a/mozilla-shared-nss-db.patch	Wed Nov 24 17:37:56 2010 +0100
+++ b/mozilla-shared-nss-db.patch	Thu Nov 25 10:29:35 2010 +0100
@@ -7,7 +7,7 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -548,16 +548,20 @@ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNO
+@@ -561,16 +561,20 @@ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNO
  
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
@@ -31,19 +31,19 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -7756,16 +7756,31 @@ AC_SUBST(MOZ_CAIRO_LIBS)
+@@ -8016,16 +8016,32 @@ AC_SUBST(QCMS_LIBS)
  
- dnl qcms
  dnl ========================================================
- 
- QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'
- AC_SUBST(QCMS_LIBS)
+ dnl OTS
+ dnl ========================================================
+ MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
+ AC_SUBST(MOZ_OTS_LIBS)
  
  dnl ========================================================
 +dnl Check for nss-shared-helper
 +dnl ========================================================
 +
-+  PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, 
++  PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper,
 +   [MOZ_ENABLE_NSSHELPER=1],
 +   [MOZ_ENABLE_NSSHELPER=])
 +
@@ -54,6 +54,7 @@
 +AC_SUBST(NSSHELPER_CFLAGS)
 +AC_SUBST(NSSHELPER_LIBS)
 +
++
 +dnl ========================================================
  dnl disable xul
  dnl ========================================================
@@ -115,7 +116,7 @@
  
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -1600,17 +1607,31 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1606,17 +1613,31 @@ nsNSSComponent::InitializeNSS(PRBool sho
      // The call to ConfigureInternalPKCS11Token needs to be done before NSS is initialized, 
      // but affects only static data.
      // If we could assume i18n will not change between profiles, one call per application
--- a/mozilla-xulrunner192/create-tar.sh	Wed Nov 24 17:37:56 2010 +0100
+++ b/mozilla-xulrunner192/create-tar.sh	Thu Nov 25 10:29:35 2010 +0100
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-RELEASE_TAG="FIREFOX_3_6_12_RELEASE"
-VERSION="1.9.2.12"
+RELEASE_TAG="FIREFOX_3_6_13_RELEASE"
+VERSION="1.9.2.13"
 
 # mozilla
 hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla
--- a/mozilla-xulrunner192/mozilla-xulrunner192.changes	Wed Nov 24 17:37:56 2010 +0100
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes	Thu Nov 25 10:29:35 2010 +0100
@@ -1,8 +1,14 @@
+-------------------------------------------------------------------
+Thu Nov 25 09:25:50 UTC 2010 - wr@rosenauer.org
+
+- security update to 1.9.2.13 (bnc#)
+
 -------------------------------------------------------------------
 Wed Oct 27 07:12:14 CEST 2010 - wr@rosenauer.org
 
-- security update to 1.9.2.12 (bnc#)
-  * CVE-2010-3765
+- security update to 1.9.2.12 (bnc#649492)
+  * MFSA 2010-73/CVE-2010-3765 (bmo#607222)
+    Heap buffer overflow mixing document.write and DOM insertion
 - ignore empty LANGUAGE environment variable (bnc#648854)
 
 -------------------------------------------------------------------
--- a/mozilla-xulrunner192/mozilla-xulrunner192.spec	Wed Nov 24 17:37:56 2010 +0100
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec	Thu Nov 25 10:29:35 2010 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package mozilla-xulrunner192 (Version 1.9.2.12)
+# spec file for package mozilla-xulrunner192 (Version 1.9.2.13)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2010 Wolfgang Rosenauer
@@ -39,12 +39,12 @@
 BuildRequires:  wireless-tools
 %endif
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version:        1.9.2.12
+Version:        1.9.2.13
 Release:        1
-%define         releasedate 2010102600
-%define         version_internal 1.9.2.12
+%define         releasedate 2010112400
+%define         version_internal 1.9.2.13
 %define         apiversion 1.9.2
-%define         uaweight 192120
+%define         uaweight 192130
 Summary:        Mozilla Runtime Environment 1.9.2
 Url:            http://www.mozilla.org
 Group:          Productivity/Other