Updated to 14.0.1

Fixes CVE-2012-1948, CVE-2012-1949, CVE-2012-1950, CVE-2012-1951,
CVE-2012-1952, CVE-2012-1953, CVE-2012-1954, CVE-2012-1955,
CVE-2012-1957, CVE-2012-1958, CVE-2012-1959, CVE-2012-1960,
CVE-2012-1961, CVE-2012-1962, CVE-2012-1963, CVE-2012-1964,
CVE-2012-1965, CVE-2012-1966, CVE-2012-1967

diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch
index 28185ebdcc6375f7ed7117c6d4d9ebc08cb02475..1146918fe0fe6d416cf4986394f0e6e4c560f611 100644 (file)
--- a/iceweasel-branding.patch
+++ b/iceweasel-branding.patch
@@ -35,9 +35,9 @@ diff -urN mozilla.orig/browser/components/shell/src/nsWindowsShellService.cpp mo
  
 -#define APP_REG_NAME L"Firefox"
 +#define APP_REG_NAME L"Iceweasel"
- #define CLS_HTML "FirefoxHTML"
- #define CLS_URL "FirefoxURL"
- #define CPL_DESKTOP L"Control Panel\\Desktop"
+ #define VAL_FILE_ICON "%APPPATH%,1"
+ #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
+ #define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
 diff -urN mozilla.orig/browser/confvars.sh mozilla/browser/confvars.sh
 --- mozilla.orig/browser/confvars.sh   2010-02-04 15:47:13.000000000 +0100
 +++ mozilla/browser/confvars.sh        2010-02-04 15:48:50.000000000 +0100
@@ -104,18 +104,7 @@ diff -urN mozilla.orig/browser/locales/en-US/searchplugins/answers.xml mozilla/b
 diff -urN mozilla.orig/browser/locales/en-US/searchplugins/google.xml mozilla/browser/locales/en-US/searchplugins/google.xml
 --- mozilla.orig/browser/locales/en-US/searchplugins/google.xml        2010-02-04 15:47:13.000000000 +0100
 +++ mozilla/browser/locales/en-US/searchplugins/google.xml     2010-02-04 15:48:50.000000000 +0100
-@@ -3,7 +3,7 @@
- <Description>Google Search</Description>
- <InputEncoding>UTF-8</InputEncoding>
- <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
--<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl={moz:locale}&amp;q={searchTerms}"/>
-+<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=iceweasel&amp;client=iceweasel&amp;hl={moz:locale}&amp;q={searchTerms}"/>
- <Url type="text/html" method="GET" template="http://www.google.com/search">
-   <Param name="q" value="{searchTerms}"/>
-   <Param name="ie" value="utf-8"/>
---- mozilla.org/browser/locales/en-US/searchplugins/google.xml~        2012-05-06 12:29:28.000000000 +0200
-+++ mozilla/browser/locales/en-US/searchplugins/google.xml     2012-05-06 12:30:22.178143572 +0200
-@@ -6,7 +6,7 @@
+@@ -6,14 +6,14 @@
  #elif MOZ_UPDATE_CHANNEL == nightly
  #define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-nightly" falseValue="firefox"/>
  #else
@@ -124,6 +113,14 @@ diff -urN mozilla.orig/browser/locales/en-US/searchplugins/google.xml mozilla/br
  #endif
  <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
  <ShortName>Google</ShortName>
+ <Description>Google Search</Description>
+ <InputEncoding>UTF-8</InputEncoding>
+ <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
+-<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
++<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=iceweasel&amp;q={searchTerms}"/>
+ <Url type="text/html" method="GET" template="https://www.google.com/search">
+ #expand   __GOOGLE_PARAMS__
+ #expand   __GOOGLE_CLIENT_PARAM__
 diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
 --- mozilla.orig/toolkit/xre/nsAppRunner.cpp   2010-02-04 15:47:20.000000000 +0100
 +++ mozilla/toolkit/xre/nsAppRunner.cpp        2010-02-04 15:48:50.000000000 +0100

diff --git a/iceweasel-install.patch b/iceweasel-install.patch
index 64f69fba8eefac6c59c8850987b6cfb6fe21808c..725dac27c965666f270948a70de334e50428dcf0 100644 (file)
--- a/iceweasel-install.patch
+++ b/iceweasel-install.patch
@@ -1,11 +1,11 @@
 --- mozilla/browser/app/Makefile.in    2008-06-22 22:54:03.000000000 +0200
 +++ mozilla/browser/app/Makefile.in    2008-06-23 10:34:59.000000000 +0200
 @@ -397,7 +397,7 @@
-       rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
-       $(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign
+       sed -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(dist_dest)/Contents/Resources/$(AB).lproj/InfoPlist.strings
+       rsync -a $(DIST)/bin/ $(dist_dest)/Contents/$(APPFILES)
  ifdef LIBXUL_SDK
--      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/firefox
-+      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)
+-      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(dist_dest)/Contents/MacOS/firefox
++      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)
  else
        rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
        rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
@@ -19,14 +19,14 @@
  endif
  
 @@ -433,7 +433,7 @@
-       rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks
+       rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(dist_dest)/Contents/Frameworks
  else
        $(NSINSTALL) -D $(DIST)/bin/xulrunner
 -      (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
 +      cp -rfRp $(LIBXUL_SDK)/bin $(DIST)/bin/xulrunner
- endif # cocoa
- endif # SKIP_COPY_XULRUNNER
- endif # LIBXUL_SDK
+ endif #} cocoa
+ endif #} SKIP_COPY_XULRUNNER
+ endif #} LIBXUL_SDK
 --- mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-03-19 00:34:12.000000000 +0100
 +++ mozilla/toolkit/mozapps/installer/packager.mk      2011-03-22 23:53:43.877485659 +0100
 @@ -708,35 +708,35 @@

diff --git a/iceweasel-nss_cflags.patch b/iceweasel-nss_cflags.patch
deleted file mode 100644 (file)
index ff64329..0000000
--- a/iceweasel-nss_cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mozilla/config/rules.mk.orig       2008-06-19 18:45:00.000000000 +0200
-+++ mozilla/config/rules.mk    2008-06-19 18:42:40.000000000 +0200
-@@ -1365,23 +1365,23 @@
- # Rules for building native targets must come first because of the host_ prefix
- host_%.$(OBJ_SUFFIX): %.c $(GLOBAL_DEPS)
-       $(REPORT_BUILD)
--      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
-+      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
- 
- host_%.$(OBJ_SUFFIX): %.cpp $(GLOBAL_DEPS)
-       $(REPORT_BUILD)
--      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
-+      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
- 
- host_%.$(OBJ_SUFFIX): %.cc $(GLOBAL_DEPS)
-       $(REPORT_BUILD)
--      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
-+      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
- 
- host_%.$(OBJ_SUFFIX): %.m $(GLOBAL_DEPS)
-       $(REPORT_BUILD)
--      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
-+      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
- 
- host_%.$(OBJ_SUFFIX): %.mm $(GLOBAL_DEPS)
-       $(REPORT_BUILD)
--      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
-+      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
- 
- %:: %.c $(GLOBAL_DEPS)
-       $(REPORT_BUILD)

diff --git a/iceweasel.spec b/iceweasel.spec
index fd21849b4d92bfc78743c25472aed209d04b216f..2cc9ba57b763a41f8a500dd730cd420e357bc0ff 100644 (file)
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -18,8 +18,8 @@
 %endif
 
 # convert firefox release number to platform version: 9.0.x -> 9.0.x
-%define                xulrunner_main  13.0
-%define                xulrunner_ver   %(v=%{version}; echo %{xulrunner_main}${v#13.0})
+%define                xulrunner_main  14.0
+%define                xulrunner_ver   %(v=%{version}; echo %{xulrunner_main}${v#14.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -30,12 +30,12 @@ Summary:    Iceweasel web browser
 Summary(hu.UTF-8):     Iceweasel web böngésző
 Summary(pl.UTF-8):     Iceweasel - przeglądarka WWW
 Name:          iceweasel
-Version:       13.0.1
+Version:       14.0.1
 Release:       1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Networking
 Source0:       ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 82deadb501c7fc0e9fa6b025f51f05a1
+# Source0-md5: c2f884f0f6c41c65cf20f678a1ee7191
 Source1:       %{name}-branding.tar.bz2
 # Source1-md5: 7ab5e80db1ffe8784f1cb55dc5651e2f
 Source2:       %{name}-rm_nonfree.sh
@@ -47,7 +47,6 @@ Patch2:               %{name}-gcc3.patch
 Patch3:                %{name}-agent.patch
 Patch4:                %{name}-ac-agent.patch
 Patch5:                %{name}-ti-agent.patch
-Patch6:                %{name}-nss_cflags.patch
 Patch7:                %{name}-prefs.patch
 Patch8:                %{name}-pld-branding.patch
 Patch9:                %{name}-no-subshell.patch
@@ -175,7 +174,6 @@ cd mozilla
 %patch5 -p1
 %endif
 
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p2