diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 5db3c12..fc15a42 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Jun 20 19:37:01 UTC 2011 - wr@rosenauer.org + +- update to 5.0 final +- included fixes for security issues: (bnc#701296, bnc#700578) + * MFSA 2011-19/CVE-2011-2374 CVE-2011-2375 + Miscellaneous memory safety hazards + * MFSA 2011-20/CVE-2011-2373 (bmo#617247) + Use-after-free vulnerability when viewing XUL document with + script disabled + * MFSA 2011-21/CVE-2011-2377 (bmo#638018, bmo#639303) + Memory corruption due to multipart/x-mixed-replace images + * MFSA 2011-22/CVE-2011-2371 (bmo#664009) + Integer overflow and arbitrary code execution in + Array.reduceRight() + * MFSA 2011-25/CVE-2011-2366 + Stealing of cross-domain images using WebGL textures + * MFSA 2011-26/CVE-2011-2367 CVE-2011-2368 + Multiple WebGL crashes + * MFSA 2011-27/CVE-2011-2369 (bmo#650001) + XSS encoding hazard with inline SVG + * MFSA 2011-28/CVE-2011-2370 (bmo#645699) + Non-whitelisted site can trigger xpinstall + ------------------------------------------------------------------- Mon Jun 20 09:17:42 UTC 2011 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 6c16df4..95c112e 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -18,11 +18,11 @@ # norootforbuild -%define major 4 -%define mainver %major.99 +%define major 5 +%define mainver %major.0 Name: MozillaFirefox -BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip +BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm %if %suse_version > 1110 BuildRequires: libiw-devel BuildRequires: libproxy-devel @@ -34,8 +34,8 @@ BuildRequires: mozilla-nss-devel >= 3.12.8 BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver} -Release: 5 -%define releasedate 2011061400 +Release: 1 +%define releasedate 2011061500 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -132,7 +132,6 @@ Requires: perl(Archive::Zip) Development files for Firefox to make packaging of addons easier. %if %localize - %package translations-common Summary: Common translations for MozillaFirefox License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -180,7 +179,6 @@ This package provides upstream look and feel for MozillaFirefox. %if %crashreporter - %package buildsymbols License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Breakpad buildsymbols for %{name} @@ -191,6 +189,7 @@ This subpackage contains the Breakpad created and compatible debugging symbols meant for upload to Mozilla's crash collector database. %endif + %prep %setup -q -n mozilla -b 7 -b 10 cd $RPM_BUILD_DIR/mozilla @@ -272,7 +271,7 @@ ac_add_options --disable-updater ac_add_options --disable-tests ac_add_options --disable-debug #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=beta +ac_add_options --enable-update-channel=default EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG @@ -537,7 +536,6 @@ exit 0 %config /etc/rpm/macros.%{progname} %if %localize - %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} @@ -556,7 +554,6 @@ exit 0 #%{progdir}/defaults/profile/bookmarks.html %if %crashreporter - %files buildsymbols %defattr(-,root,root) %{_datadir}/mozilla/*.zip diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index d0adcd3..3936363 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d75b5963522398528102263d8da2d57d5eadae3611853b74f58728605a8e69be -size 25677 +oid sha256:975887be612f645ef36442a32bfc4eb39d04ceda612f77aaff18c336e4815238 +size 25684 diff --git a/create-tar.sh b/create-tar.sh index 74e9bbc..a95faef 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,8 +1,8 @@ #!/bin/bash -BRANCH="mozilla-beta" -RELEASE_TAG="FIREFOX_5_0b7_RELEASE" -VERSION="4.99" +BRANCH="releases/mozilla-release" +RELEASE_TAG="FIREFOX_5_0_RELEASE" +VERSION="5.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla @@ -23,7 +23,7 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do ja-JP-mac|en-US) ;; *) - hg clone http://hg.mozilla.org/releases/l10n/mozilla-beta/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac diff --git a/firefox-4.99-source.tar.bz2 b/firefox-4.99-source.tar.bz2 deleted file mode 100644 index 181e2d7..0000000 --- a/firefox-4.99-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:887d410a35fb4583e0cf6c469a3a076c3d312d0014086af7ecb727d3b2003fd0 -size 68757199 diff --git a/firefox-5.0-source.tar.bz2 b/firefox-5.0-source.tar.bz2 new file mode 100644 index 0000000..a477f57 --- /dev/null +++ b/firefox-5.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73693461ffe498055577d6d7d211b42f2ad71577124dfb6cb566ee52603eafa7 +size 68756958 diff --git a/l10n-4.99.tar.bz2 b/l10n-4.99.tar.bz2 deleted file mode 100644 index 7de0e00..0000000 --- a/l10n-4.99.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f4f7a156e88171389beba130f56353f7801803670b7b640eb430d491d852573 -size 43094243 diff --git a/l10n-5.0.tar.bz2 b/l10n-5.0.tar.bz2 new file mode 100644 index 0000000..98a4335 --- /dev/null +++ b/l10n-5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6a3577a86ff535815031ecdb957b24f55cf10ff615c5c99f15209d62e0e8afa +size 43102319 diff --git a/source-stamp.txt b/source-stamp.txt index 42ca185..f026da7 100644 --- a/source-stamp.txt +++ b/source-stamp.txt @@ -1,2 +1,2 @@ -REV=3fb6ad7c725e -REPO=http://hg.mozilla.org/mozilla-beta +REV=7b56ff900c2a +REPO=http://hg.mozilla.org/releases/mozilla-release