# HG changeset patch # User Wolfgang Rosenauer # Date 1268891136 -3600 # Node ID 604517bb16d81507388196d47543f62497f950e1 # Parent e0951c708771e2f3c2bd5277299518bb7efd73c3 Update to 1.9.2.2/3.6.2 diff -r e0951c708771 -r 604517bb16d8 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Wed Mar 17 23:38:40 2010 +0100 +++ b/MozillaFirefox/MozillaFirefox.changes Thu Mar 18 06:45:36 2010 +0100 @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 18 06:43:33 CET 2010 - wr@rosenauer.org + +- security update to version 3.6.2 (bnc#586567) + ------------------------------------------------------------------- Mon Jan 18 09:42:50 CET 2010 - wr@rosenauer.org - update to 3.6rc2 (already named 3.6.0) +- removed obsolete orbit-devel build requirement ------------------------------------------------------------------- Wed Jan 6 17:15:40 CET 2010 - wr@rosenauer.org diff -r e0951c708771 -r 604517bb16d8 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Wed Mar 17 23:38:40 2010 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Thu Mar 18 06:45:36 2010 +0100 @@ -1,7 +1,7 @@ # -# spec file for package MozillaFirefox (Version 3.6.0) +# spec file for package MozillaFirefox (Version 3.6.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties @@ -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.0 +BuildRequires: %{xulrunner}-devel = 1.9.2.2 %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -34,9 +34,9 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: web_browser Provides: firefox -Version: 3.6.0 +Version: 3.6.2 Release: 1 -%define releasedate 2010011500 +%define releasedate 2010031700 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers diff -r e0951c708771 -r 604517bb16d8 mozilla-gconf-backend.patch --- a/mozilla-gconf-backend.patch Wed Mar 17 23:38:40 2010 +0100 +++ b/mozilla-gconf-backend.patch Thu Mar 18 06:45:36 2010 +0100 @@ -3466,9 +3466,9 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -229,16 +229,20 @@ endif - ifdef NS_OSSO - EXTRA_DSO_LDOPTS += $(LIBOSSO_LIBS) +@@ -225,16 +225,20 @@ endif + ifdef MOZ_ENABLE_LIBCONIC + EXTRA_DSO_LDOPTS += $(LIBCONIC_LIBS) endif ifdef MOZ_ENABLE_DBUS @@ -3490,7 +3490,7 @@ diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk --- a/toolkit/toolkit-tiers.mk +++ b/toolkit/toolkit-tiers.mk -@@ -253,16 +253,23 @@ endif +@@ -254,16 +254,23 @@ endif ifdef MOZ_ENABLE_LIBXUL tier_toolkit_dirs += xpcom/stub endif diff -r e0951c708771 -r 604517bb16d8 mozilla-kde.patch --- a/mozilla-kde.patch Wed Mar 17 23:38:40 2010 +0100 +++ b/mozilla-kde.patch Thu Mar 18 06:45:36 2010 +0100 @@ -40,7 +40,7 @@ #define SELECTED_SKIN_PREF "general.skins.selectedSkin" static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID); -@@ -1607,16 +1608,17 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1608,16 +1609,17 @@ nsChromeRegistry::ProcessManifestBuffer( NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); @@ -58,7 +58,7 @@ rv = io->GetProtocolHandler("resource", getter_AddRefs(ph)); NS_ENSURE_SUCCESS(rv, rv); -@@ -1650,35 +1652,39 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1651,35 +1653,39 @@ nsChromeRegistry::ProcessManifestBuffer( if (NS_SUCCEEDED(rv)) { CopyUTF8toUTF16(s, osTarget); ToLowerCase(osTarget); @@ -98,7 +98,7 @@ // outer loop tokenizes by newline while (nsnull != (token = nsCRT::strtok(newline, kNewlines, &newline))) { -@@ -1712,41 +1718,43 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1713,41 +1719,43 @@ nsChromeRegistry::ProcessManifestBuffer( PRBool platform = PR_FALSE; PRBool xpcNativeWrappers = PR_TRUE; @@ -143,7 +143,7 @@ if (NS_FAILED(rv)) continue; -@@ -1797,38 +1805,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1798,38 +1806,40 @@ nsChromeRegistry::ProcessManifestBuffer( } EnsureLowerCase(package); @@ -185,7 +185,7 @@ if (NS_FAILED(rv)) continue; -@@ -1859,38 +1869,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1860,38 +1870,40 @@ nsChromeRegistry::ProcessManifestBuffer( } EnsureLowerCase(package); @@ -227,7 +227,7 @@ if (NS_FAILED(rv)) continue; -@@ -1923,38 +1935,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1924,38 +1936,40 @@ nsChromeRegistry::ProcessManifestBuffer( "Warning: malformed chrome overlay instruction."); continue; } @@ -269,7 +269,7 @@ rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull, getter_AddRefs(overlayuri)); if (NS_FAILED(rv)) { -@@ -1979,38 +1993,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -1980,38 +1994,40 @@ nsChromeRegistry::ProcessManifestBuffer( "Warning: malformed chrome style instruction."); continue; } @@ -311,7 +311,7 @@ rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull, getter_AddRefs(overlayuri)); if (NS_FAILED(rv)) -@@ -2039,38 +2055,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -2040,38 +2056,40 @@ nsChromeRegistry::ProcessManifestBuffer( "Warning: malformed chrome override instruction."); continue; } @@ -353,7 +353,7 @@ rv |= io->NewURI(nsDependentCString(resolved), nsnull, manifestURI, getter_AddRefs(resolveduri)); if (NS_FAILED(rv)) -@@ -2101,38 +2119,40 @@ nsChromeRegistry::ProcessManifestBuffer( +@@ -2102,38 +2120,40 @@ nsChromeRegistry::ProcessManifestBuffer( } EnsureLowerCase(package); @@ -2593,7 +2593,7 @@ content \ docshell \ dom \ -@@ -131,17 +133,17 @@ CMMSRCS = nsNativeAppSupportCocoa.mm +@@ -132,17 +134,17 @@ CMMSRCS = nsNativeAppSupportCocoa.mm else ifeq ($(MOZ_WIDGET_TOOLKIT),os2) CPPSRCS += nsNativeAppSupportOS2.cpp @@ -3404,7 +3404,7 @@ --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp @@ -40,27 +40,30 @@ - #ifdef MOZ_PLATFORM_HILDON + #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS) #include #include #include @@ -3428,7 +3428,7 @@ { - nsresult rv = nsGNOMERegistry::LoadURL(aURI); + nsresult rv = nsCommonRegistry::LoadURL(aURI); - #ifdef MOZ_PLATFORM_HILDON + #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS) if (NS_FAILED(rv)){ HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull); if (action) { @@ -3545,7 +3545,7 @@ // Check the GConf registry for a protocol handler - *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme); + *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme); - #ifdef MOZ_PLATFORM_HILDON + #ifdef MOZ_PLATFORM_MAEMO *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme); #endif #endif @@ -3651,7 +3651,7 @@ #include "nsAccessibilityHelper.h" +#include "nsKDEUtils.h" - #ifdef MOZ_PLATFORM_HILDON + #ifdef MOZ_PLATFORM_MAEMO #include #endif @@ -3969,9 +3969,9 @@ LOCAL_INCLUDES = -I.. +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre - ifdef MOZ_PLATFORM_HILDON - CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS) - CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS) + ifeq ($(MOZ_PLATFORM_MAEMO), 5) + CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS) + CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS) endif diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp @@ -3989,7 +3989,7 @@ +#include "nsKDEUtils.h" #endif - #ifdef MOZ_PLATFORM_HILDON + #if (MOZ_PLATFORM_MAEMO == 5) #include #include #include diff -r e0951c708771 -r 604517bb16d8 mozilla-libproxy.patch --- a/mozilla-libproxy.patch Wed Mar 17 23:38:40 2010 +0100 +++ b/mozilla-libproxy.patch Thu Mar 18 06:45:36 2010 +0100 @@ -30,30 +30,22 @@ diff --git a/config/system-headers b/config/system-headers --- a/config/system-headers +++ b/config/system-headers -@@ -1007,15 +1007,19 @@ libsn/sn-monitor.h - libsn/sn-util.h - #endif - #if MOZ_NATIVE_HUNSPELL==1 - hunspell.hxx - #endif +@@ -1012,8 +1012,11 @@ hunspell.hxx #if MOZ_NATIVE_BZ2==1 bzlib.h #endif + #if MOZ_PLATFORM_MAEMO==5 + hildon-uri.h + hildon-mime.h + libosso.h + #endif +#ifdef MOZ_ENABLE_LIBPROXY +proxy.h +#endif -+ - #ifdef MOZ_PLATFORM_HILDON - hildon-uri.h - hildon-mime.h - #endif - #ifdef NS_OSSO - libosso.h - #endif diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -5280,16 +5280,39 @@ then +@@ -5289,16 +5289,39 @@ then AC_DEFINE(MOZ_ENABLE_DBUS) fi fi @@ -96,7 +88,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -247,16 +247,20 @@ endif +@@ -243,16 +243,20 @@ endif ifdef MOZ_TREE_FREETYPE EXTRA_DSO_LDOPTS += $(FT2_LIBS) endif diff -r e0951c708771 -r 604517bb16d8 mozilla-xulrunner192/create-tar.sh --- a/mozilla-xulrunner192/create-tar.sh Wed Mar 17 23:38:40 2010 +0100 +++ b/mozilla-xulrunner192/create-tar.sh Thu Mar 18 06:45:36 2010 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6rc2_RELEASE" -VERSION="1.9.2.0" +RELEASE_TAG="FIREFOX_3_6_2_RELEASE" +VERSION="1.9.2.2" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla diff -r e0951c708771 -r 604517bb16d8 mozilla-xulrunner192/mozilla-xulrunner192.changes --- a/mozilla-xulrunner192/mozilla-xulrunner192.changes Wed Mar 17 23:38:40 2010 +0100 +++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes Thu Mar 18 06:45:36 2010 +0100 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- -Thu Feb 25 23:17:08 CET 2010 - wr@rosenauer.org +Thu Mar 18 06:41:03 CET 2010 - wr@rosenauer.org +- security update to 1.9.2.2 (bnc#586567) + * requires NSS 3.12.6 - general.useragent.locale in profile overrides intl.locale.matchOS (bmo#542999) diff -r e0951c708771 -r 604517bb16d8 mozilla-xulrunner192/mozilla-xulrunner192.spec --- a/mozilla-xulrunner192/mozilla-xulrunner192.spec Wed Mar 17 23:38:40 2010 +0100 +++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec Thu Mar 18 06:45:36 2010 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner192 (Version 1.9.2.0) +# spec file for package mozilla-xulrunner192 (Version 1.9.2.2) # # 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.0 +Version: 1.9.2.2 Release: 1 -%define releasedate 2010011500 -%define version_internal 1.9.2.0 +%define releasedate 2010031700 +%define version_internal 1.9.2.2 %define apiversion 1.9.2 -%define uaweight 192000 +%define uaweight 192020 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other @@ -115,7 +115,7 @@ Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) %endif %if %has_system_nss -BuildRequires: mozilla-nss-devel >= 3.12.3 +BuildRequires: mozilla-nss-devel >= 3.12.6 Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) %endif Recommends: %{name}-gnome diff -r e0951c708771 -r 604517bb16d8 series --- a/series Wed Mar 17 23:38:40 2010 +0100 +++ b/series Thu Mar 18 06:45:36 2010 +0100 @@ -14,7 +14,6 @@ toolkit-ui-lockdown.patch mozilla-breakpad-update.patch mozilla-ua-locale-pref.patch -mozilla-milestone.patch # Firefox patches firefox-libxul-sdk.patch